Handle EINTR on read

It seems read(2) for files may be interrupted on Mac when ckati is running under a debugger.
google · Apr 11, 2016 · 706c27f · 706c27f
1 parent 84ddbd2
commit 706c27f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/file.cc b/file.cc
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "fileutil.h"
 #include "log.h"
 #include "parser.h"
 #include "stmt.h"
@@ -41,7 +42,7 @@ Makefile::Makefile(const string& filename)
   mtime_ = st.st_mtime;
   buf_.resize(len);
   exists_ = true;
-  ssize_t r = read(fd, &buf_[0], len);
+  ssize_t r = HANDLE_EINTR(read(fd, &buf_[0], len));
   if (r != static_cast<ssize_t>(len)) {
     if (r < 0)
       PERROR("read failed for %s", filename.c_str());

diff --git a/fileutil.cc b/fileutil.cc
@@ -84,7 +84,7 @@ int RunCommand(const string& shell, const string& cmd,
 
       while (true) {
         char buf[4096];
-        ssize_t r = read(pipefd[0], buf, 4096);
+        ssize_t r = HANDLE_EINTR(read(pipefd[0], buf, 4096));
         if (r < 0)
           PERROR("read failed");
         if (r == 0)

diff --git a/fileutil.h b/fileutil.h
@@ -15,6 +15,8 @@
 #ifndef FILEUTIL_H_
 #define FILEUTIL_H_
 
+#include <errno.h>
+
 #include <memory>
 #include <string>
 #include <unordered_map>
@@ -46,4 +48,12 @@ const unordered_map<string, vector<string>*>& GetAllGlobCache();
 
 void ClearGlobCache();
 
+#define HANDLE_EINTR(x) ({                                \
+      int r;                                              \
+      do {                                                \
+        r = (x);                                          \
+      } while (r == -1 && errno == EINTR);                \
+      r;                                                  \
+    })
+
 #endif  // FILEUTIL_H_