Don't HANDLE_EINTR(close). Either IGNORE_EINTR(close) or just close.

base/posix/eintr_wrapper.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This provides a wrapper around system calls which may be interrupted by a
 // signal and return EINTR. See man 7 signal.
 // To prevent long-lasting loops (which would likely be a bug, such as a signal
 // that should be masked) to go unnoticed, there is a limit after which the
 // caller will nonetheless see an EINTR in Debug builds.
 //
 // On Windows, this wrapper macro does nothing.
+//
+// Don't wrap close calls in HANDLE_EINTR. Use IGNORE_EINTR if the return
+// value of close is significant. See http://crbug.com/269623.
 
 #ifndef BASE_POSIX_EINTR_WRAPPER_H_
 #define BASE_POSIX_EINTR_WRAPPER_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_POSIX)
 
 #include <errno.h>
 
 #if defined(NDEBUG)
+
 #define HANDLE_EINTR(x) ({ \
   typeof(x) eintr_wrapper_result; \
   do { \
     eintr_wrapper_result = (x); \
   } while (eintr_wrapper_result == -1 && errno == EINTR); \
   eintr_wrapper_result; \
 })
 
 #else
 
 #define HANDLE_EINTR(x) ({ \
   int eintr_wrapper_counter = 0; \
   typeof(x) eintr_wrapper_result; \
   do { \
     eintr_wrapper_result = (x); \
   } while (eintr_wrapper_result == -1 && errno == EINTR && \
            eintr_wrapper_counter++ < 100); \
   eintr_wrapper_result; \
 })
 
 #endif  // NDEBUG
 
+#define IGNORE_EINTR(x) ({ \
+  typeof(x) eintr_wrapper_result; \
+  do { \
+    eintr_wrapper_result = (x); \
+    if (eintr_wrapper_result == -1 && errno == EINTR) { \
+      eintr_wrapper_result = 0; \

[jln (very slow on Chromium), 2013/12/02 23:50:31]

Shouldn't you patch errno as well ?

[Mark Mentovai, 2013/12/03 03:30:53]

jln wrote:
Why? And how? Reset it to its original value? I don’t think that’s necessary,
since nobody should be examining errno after close returns 0 (success), or after
any other system call indicates success. I avoided it because it’s extra code
that gets inlined in over a hundred places with no tangible benefit.

http://pubs.opengroup.org/onlinepubs/9699919799/functions/errno.html:
and
The description of “close” doesn’t say that errno shall not be modified.

On Linux, “man 3 errno”:

+    } \
+  } while (0); \
+  eintr_wrapper_result; \
+})
+
 #else
 
 #define HANDLE_EINTR(x) (x)
+#define IGNORE_EINTR(x) (x)
 
 #endif  // OS_POSIX
 
 #endif  // BASE_POSIX_EINTR_WRAPPER_H_