commit af81d7432594d8459c4fb9f76c5e8a981f69a94c
author David 'Digit' Turner <digit@google.com> Mon Feb 03 17:11:18 2014 +0100
committer David 'Digit' Turner <digit@google.com> Tue Feb 11 00:47:06 2014 +0100
tree b300a8f82491f2ec79a8fa998007a68e6e66e453
parent b6bd3ac4d6576e6280469be01685747ffa255874

Add android/utils/eintr_wrapper.h

Add a new Android-specific header that defines two macros to
handle EINTR in a consistent way, as well as allow detecting
when a system call loops too many times and exit with a fatal
error message when that happens.

+ Unit tests.

+ Update existing code under android/ which uses to deal directly
  with EINTR to use the new HANDLE_EINTR() and IGNORE_EINTR()

+ Remove EINTR checks for functions that call socket_xxx() functions
  which already loop around EINTR.

Change-Id: I1d2ee64d9743a2edc506f616465ea091878db620

android/sockets.c

diff --git a/android/sockets.c b/android/sockets.c
index fec87bf..697501e 100644
--- a/android/sockets.c
+++ b/android/sockets.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include "android/utils/path.h"
 #include "android/utils/debug.h"
+#include "android/utils/eintr_wrapper.h"
 #include "android/utils/misc.h"
 #include "android/utils/system.h"
 
@@ -59,7 +60,7 @@
 #  define  QSOCKET_CALL(_ret,_cmd)   \
     do { \
         errno = 0; \
-        do { _ret = (_cmd); } while ( _ret < 0 && errno == EINTR ); \
+        _ret = HANDLE_EINTR(_cmd); \
     } while (0);
 #endif
 
@@ -1096,10 +1097,11 @@
         int  opt  = -1;
 #endif
         socklen_t  optlen = sizeof(opt);
-        ret = getsockopt(fd, domain, option, (char*)&opt, &optlen);
+        ret = HANDLE_EINTR(
+                getsockopt(fd, domain, option, (char*)&opt, &optlen));
         if (ret == 0)
             return (int)opt;
-        if (errno != EINTR)
+        else
             return defaut;
     }
 #undef OPT_CAST
@@ -1263,7 +1265,7 @@
     int  old_errno = errno;
 
     shutdown( fd, SHUT_RDWR );
-    close( fd );
+    IGNORE_EINTR(close( fd ));
 
     errno = old_errno;
 }
@@ -1405,9 +1407,7 @@
 
     sock_address_init_unix( &addr, name );
 
-    do {
-        ret = unlink( name );
-    } while (ret < 0 && errno == EINTR);
+    HANDLE_EINTR(unlink(name));
 
     ret = socket_bind_server( s, &addr, type );