use IGNORE_EINTR w/close
HANDLE_EINTR is both not safe and not useful on Linux systems.
Switch to IGNORE_EINTR like Chromium has done everywhere.
See http://crbug.com/269623 for details.
BUG=chromium:373154
TEST=`cbuildbot {arm,amd64,x86}-generic-full` passes
Change-Id: I3d99bb2376cb7961ac31ba0fa82bafc1b4c14bd9
Reviewed-on: https://chromium-review.googlesource.com/199821
Reviewed-by: Daniel Erat <derat@chromium.org>
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/metrics/metrics_daemon.cc b/metrics/metrics_daemon.cc
index 97c099c..e3f6bf7 100644
--- a/metrics/metrics_daemon.cc
+++ b/metrics/metrics_daemon.cc
@@ -481,7 +481,7 @@
<< diskstats_path_ << ", expected 2";
}
}
- HANDLE_EINTR(close(file));
+ IGNORE_EINTR(close(file));
return success;
}
diff --git a/metrics/metrics_library.cc b/metrics/metrics_library.cc
index 1214dd0..32bacf6 100644
--- a/metrics/metrics_library.cc
+++ b/metrics/metrics_library.cc
@@ -209,7 +209,7 @@
// underneath us. Keep the file locked as briefly as possible.
if (HANDLE_EINTR(flock(chrome_fd, LOCK_EX)) < 0) {
PrintError("flock", uma_events_file_, errno);
- HANDLE_EINTR(close(chrome_fd));
+ IGNORE_EINTR(close(chrome_fd));
return false;
}
@@ -220,7 +220,7 @@
}
// Close the file and release the lock.
- HANDLE_EINTR(close(chrome_fd));
+ IGNORE_EINTR(close(chrome_fd));
return success;
}