commit 8842c8c42d194d0c69e35280b24bafa890325514
author Darin Petkov <petkov@chromium.org> Thu Feb 24 12:48:30 2011 -0800
committer Darin Petkov <petkov@chromium.org> Thu Feb 24 12:48:30 2011 -0800
tree 68aa8f5f7735dc5b3237f6a72bab7f5446c15ab5
parent c88e42dea9826857c8c9a966b7669b733ba40c7b

libmetrics -- release the shared file lock when closing, handle EINTR.

BUG=chromium-os:11125
TEST=unit tests, tested on device

Change-Id: I126af62f77e4fd0f098d441038f8dc94c0020ac2

Review URL: http://codereview.chromium.org/6576048

metrics/metrics_library.cc

diff --git a/metrics/metrics_library.cc b/metrics/metrics_library.cc
index f2046a3..3bc8007 100644
--- a/metrics/metrics_library.cc
+++ b/metrics/metrics_library.cc
@@ -12,6 +12,8 @@
 #include <cstdio>
 #include <cstring>
 
+#include <base/eintr_wrapper.h>
+
 #define READ_WRITE_ALL_FILE_FLAGS \
   (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
 
@@ -130,9 +132,9 @@
   if (!AreMetricsEnabled())
     return true;
 
-  int chrome_fd = open(uma_events_file_,
-                       O_WRONLY | O_APPEND | O_CREAT,
-                       READ_WRITE_ALL_FILE_FLAGS);
+  int chrome_fd = HANDLE_EINTR(open(uma_events_file_,
+                                    O_WRONLY | O_APPEND | O_CREAT,
+                                    READ_WRITE_ALL_FILE_FLAGS));
   // If we failed to open it, return.
   if (chrome_fd < 0) {
     PrintError("open", uma_events_file_, errno);
@@ -146,24 +148,20 @@
 
   // Grab an exclusive lock to protect Chrome from truncating
   // underneath us. Keep the file locked as briefly as possible.
-  if (flock(chrome_fd, LOCK_EX) < 0) {
+  if (HANDLE_EINTR(flock(chrome_fd, LOCK_EX)) < 0) {
     PrintError("flock", uma_events_file_, errno);
-    close(chrome_fd);
+    HANDLE_EINTR(close(chrome_fd));
     return false;
   }
 
   bool success = true;
-  if (write(chrome_fd, message, length) != length) {
+  if (HANDLE_EINTR(write(chrome_fd, message, length)) != length) {
     PrintError("write", uma_events_file_, errno);
     success = false;
   }
 
-  // Release the file lock and close file.
-  if (flock(chrome_fd, LOCK_UN) < 0) {
-    PrintError("unlock", uma_events_file_, errno);
-    success = false;
-  }
-  close(chrome_fd);
+  // Close the file and release the lock.
+  HANDLE_EINTR(close(chrome_fd));
   return success;
 }