Move signal_blocker to platform and use it by default in TEMP_FAILURE_RETRY.

runtime/bin/file_android.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_ANDROID)
 
 #include "bin/file.h"
 
 #include <errno.h>  // NOLINT
 #include <fcntl.h>  // NOLINT
 #include <sys/stat.h>  // NOLINT
 #include <sys/types.h>  // NOLINT
 #include <sys/sendfile.h>  // NOLINT
 #include <unistd.h>  // NOLINT
 #include <libgen.h>  // NOLINT
 
 #include "bin/builtin.h"
 #include "bin/log.h"
-#include "bin/signal_blocker.h"
+
+#include "platform/signal_blocker.h"
 
 
 namespace dart {
 namespace bin {
 
 class FileHandle {
  public:
   explicit FileHandle(int fd) : fd_(fd) { }
   ~FileHandle() { }
   int fd() const { return fd_; }
@@ skipping 14 matching lines @@
 
 void File::Close() {
   ASSERT(handle_->fd() >= 0);
   if (handle_->fd() == STDOUT_FILENO) {
     // If stdout, redirect fd to /dev/null.
     int null_fd = TEMP_FAILURE_RETRY(open("/dev/null", O_WRONLY));
     ASSERT(null_fd >= 0);
     VOID_TEMP_FAILURE_RETRY(dup2(null_fd, handle_->fd()));
     VOID_TEMP_FAILURE_RETRY(close(null_fd));
   } else {
-    int err = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(handle_->fd()));
+    int err = TEMP_FAILURE_RETRY(close(handle_->fd()));
     if (err != 0) {
       const int kBufferSize = 1024;
       char error_message[kBufferSize];
       strerror_r(errno, error_message, kBufferSize);
       Log::PrintErr("%s\n", error_message);
     }
   }
   handle_->set_fd(kClosedFd);
 }
 
 
 bool File::IsClosed() {
   return handle_->fd() == kClosedFd;
 }
 
 
 int64_t File::Read(void* buffer, int64_t num_bytes) {
   ASSERT(handle_->fd() >= 0);
-  return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(read(handle_->fd(), buffer,
-                                               num_bytes));
+  return TEMP_FAILURE_RETRY(read(handle_->fd(), buffer, num_bytes));
 }
 
 
 int64_t File::Write(const void* buffer, int64_t num_bytes) {
   ASSERT(handle_->fd() >= 0);
-  return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(write(handle_->fd(), buffer,
-                                                num_bytes));
+  return TEMP_FAILURE_RETRY(write(handle_->fd(), buffer, num_bytes));
 }
 
 
 int64_t File::Position() {
   ASSERT(handle_->fd() >= 0);
-  return lseek64(handle_->fd(), 0, SEEK_CUR);
+  return NO_RETRY_EXPECTED(lseek64(handle_->fd(), 0, SEEK_CUR));
 }
 
 
 bool File::SetPosition(int64_t position) {
   ASSERT(handle_->fd() >= 0);
-  return lseek64(handle_->fd(), position, SEEK_SET) >= 0;
+  return NO_RETRY_EXPECTED(lseek64(handle_->fd(), position, SEEK_SET)) >= 0;
 }
 
 
 bool File::Truncate(int64_t length) {
   ASSERT(handle_->fd() >= 0);
-  return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
-      ftruncate(handle_->fd(), length) != -1);
+  return TEMP_FAILURE_RETRY(ftruncate(handle_->fd(), length) != -1);
 }
 
 
 bool File::Flush() {
   ASSERT(handle_->fd() >= 0);
-  return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(fsync(handle_->fd()) != -1);
+  return NO_RETRY_EXPECTED(fsync(handle_->fd()) != -1);
 }
 
 
 int64_t File::Length() {
   ASSERT(handle_->fd() >= 0);
   struct stat st;
-  if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(fstat(handle_->fd(), &st)) == 0) {
+  if (NO_RETRY_EXPECTED(fstat(handle_->fd(), &st)) == 0) {
     return st.st_size;
   }
   return -1;
 }
 
 
 File* File::Open(const char* name, FileOpenMode mode) {
   // Report errors for non-regular files.
   struct stat st;
-  if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(stat(name, &st)) == 0) {
+  if (NO_RETRY_EXPECTED(stat(name, &st)) == 0) {
     if (!S_ISREG(st.st_mode)) {
       errno = (S_ISDIR(st.st_mode)) ? EISDIR : ENOENT;
       return NULL;
     }
   }
   int flags = O_RDONLY;
   if ((mode & kWrite) != 0) {
     flags = (O_RDWR | O_CREAT);
   }
   if ((mode & kTruncate) != 0) {
     flags = flags | O_TRUNC;
   }
   flags |= O_CLOEXEC;
-  int fd = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(open(name, flags, 0666));
+  int fd = TEMP_FAILURE_RETRY(open(name, flags, 0666));
   if (fd < 0) {
     return NULL;
   }
   if (((mode & kWrite) != 0) && ((mode & kTruncate) == 0)) {
     int64_t position = lseek64(fd, 0, SEEK_END);
     if (position < 0) {
       return NULL;
     }
   }
   return new File(new FileHandle(fd));
 }
 
 
 File* File::OpenStdio(int fd) {
   if (fd < 0 || 2 < fd) return NULL;
   return new File(new FileHandle(fd));
 }
 
 
 bool File::Exists(const char* name) {
   struct stat st;
-  if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(stat(name, &st)) == 0) {
+  if (NO_RETRY_EXPECTED(stat(name, &st)) == 0) {
     return S_ISREG(st.st_mode);
   } else {
     return false;
   }
 }
 
 
 bool File::Create(const char* name) {
-  int fd = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(open(name,
-                                                 O_RDONLY | O_CREAT | O_CLOEXEC,
-                                                 0666));
+  int fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_CREAT | O_CLOEXEC, 0666));
   if (fd < 0) {
     return false;
   }
   return (close(fd) == 0);
 }
 
 
 bool File::CreateLink(const char* name, const char* target) {
-  int status = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(symlink(target, name));
+  int status = NO_RETRY_EXPECTED(symlink(target, name));
   return (status == 0);
 }
 
 
 bool File::Delete(const char* name) {
   File::Type type = File::GetType(name, true);
   if (type == kIsFile) {
-    return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(unlink(name)) == 0;
+    return NO_RETRY_EXPECTED(unlink(name)) == 0;
   } else if (type == kIsDirectory) {
     errno = EISDIR;
   } else {
     errno = ENOENT;
   }
   return false;
 }
 
 
 bool File::DeleteLink(const char* name) {
   File::Type type = File::GetType(name, false);
   if (type == kIsLink) {
-    return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(unlink(name)) == 0;
+    return NO_RETRY_EXPECTED(unlink(name)) == 0;
   }
   errno = EINVAL;
   return false;
 }
 
 
 bool File::Rename(const char* old_path, const char* new_path) {
   File::Type type = File::GetType(old_path, true);
   if (type == kIsFile) {
-    return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(rename(old_path, new_path)) == 0;
+    return NO_RETRY_EXPECTED(rename(old_path, new_path)) == 0;
   } else if (type == kIsDirectory) {
     errno = EISDIR;
   } else {
     errno = ENOENT;
   }
   return false;
 }
 
 
 bool File::RenameLink(const char* old_path, const char* new_path) {
   File::Type type = File::GetType(old_path, false);
   if (type == kIsLink) {
-    return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(rename(old_path, new_path)) == 0;
+    return NO_RETRY_EXPECTED(rename(old_path, new_path)) == 0;
   } else if (type == kIsDirectory) {
     errno = EISDIR;
   } else {
     errno = EINVAL;
   }
   return false;
 }
 
 
 bool File::Copy(const char* old_path, const char* new_path) {
   File::Type type = File::GetType(old_path, true);
   if (type == kIsFile) {
     struct stat st;
-    if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(stat(old_path, &st)) != 0) {
+    if (NO_RETRY_EXPECTED(stat(old_path, &st)) != 0) {
       return false;
     }
-    int old_fd = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(open(old_path,
-                                                       O_RDONLY | O_CLOEXEC));
+    int old_fd = TEMP_FAILURE_RETRY(open(old_path, O_RDONLY | O_CLOEXEC));
     if (old_fd < 0) {
       return false;
     }
-    int new_fd = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
+    int new_fd = TEMP_FAILURE_RETRY(
         open(new_path, O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, st.st_mode));
     if (new_fd < 0) {
-      VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(old_fd));
+      VOID_TEMP_FAILURE_RETRY(close(old_fd));
       return false;
     }
     off_t offset = 0;
     int result = 1;
     while (result > 0) {
       // Loop to ensure we copy everything, and not only up to 2GB.
-      result = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
+      result = NO_RETRY_EXPECTED(
           sendfile(new_fd, old_fd, &offset, kMaxUint32));
     }
     // From sendfile man pages:
     //   Applications may wish to fall back to read(2)/write(2) in the case
     //   where sendfile() fails with EINVAL or ENOSYS.
     if (result < 0 && (errno == EINVAL || errno == ENOSYS)) {
       const intptr_t kBufferSize = 8 * KB;
       uint8_t buffer[kBufferSize];
-      while ((result = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
+      while ((result = TEMP_FAILURE_RETRY(
           read(old_fd, buffer, kBufferSize))) > 0) {
-        int wrote = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(write(new_fd, buffer,
-                                                           result));
+        int wrote = TEMP_FAILURE_RETRY(write(new_fd, buffer, result));
         if (wrote != result) {
           result = -1;
           break;
         }
       }
     }
     if (result < 0) {
       int e = errno;
-      VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(old_fd));
-      VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(new_fd));
-      VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(unlink(new_path));
+      VOID_TEMP_FAILURE_RETRY(close(old_fd));
+      VOID_TEMP_FAILURE_RETRY(close(new_fd));
+      VOID_NO_RETRY_EXPECTED(unlink(new_path));
       errno = e;
       return false;
     }
     return true;
   } else if (type == kIsDirectory) {
     errno = EISDIR;
   } else {
     errno = ENOENT;
   }
   return false;
 }
 
 
 int64_t File::LengthFromPath(const char* name) {
   struct stat st;
-  if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(stat(name, &st)) == 0) {
+  if (NO_RETRY_EXPECTED(stat(name, &st)) == 0) {
     return st.st_size;
   }
   return -1;
 }
 
 
 void File::Stat(const char* name, int64_t* data) {
   struct stat st;
-  if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(stat(name, &st)) == 0) {
+  if (NO_RETRY_EXPECTED(stat(name, &st)) == 0) {
     if (S_ISREG(st.st_mode)) {
       data[kType] = kIsFile;
     } else if (S_ISDIR(st.st_mode)) {
       data[kType] = kIsDirectory;
     } else if (S_ISLNK(st.st_mode)) {
       data[kType] = kIsLink;
     } else {
       data[kType] = kDoesNotExist;
     }
     data[kCreatedTime] = st.st_ctime;
     data[kModifiedTime] = st.st_mtime;
     data[kAccessedTime] = st.st_atime;
     data[kMode] = st.st_mode;
     data[kSize] = st.st_size;
   } else {
     data[kType] = kDoesNotExist;
   }
 }
 
 
 time_t File::LastModified(const char* name) {
   struct stat st;
-  if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(stat(name, &st)) == 0) {
+  if (NO_RETRY_EXPECTED(stat(name, &st)) == 0) {
     return st.st_mtime;
   }
   return -1;
 }
 
 
 char* File::LinkTarget(const char* pathname) {
   struct stat link_stats;
   if (lstat(pathname, &link_stats) != 0) return NULL;
   if (!S_ISLNK(link_stats.st_mode)) {
@@ skipping 61 matching lines @@
   if (S_ISSOCK(buf.st_mode)) return kSocket;
   if (S_ISREG(buf.st_mode)) return kFile;
   return kOther;
 }
 
 
 File::Type File::GetType(const char* pathname, bool follow_links) {
   struct stat entry_info;
   int stat_success;
   if (follow_links) {
-    stat_success = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(stat(pathname,
-                                                         &entry_info));
+    stat_success = NO_RETRY_EXPECTED(stat(pathname, &entry_info));
   } else {
-    stat_success = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(lstat(pathname,
-                                                          &entry_info));
+    stat_success = NO_RETRY_EXPECTED(lstat(pathname, &entry_info));
   }
   if (stat_success == -1) return File::kDoesNotExist;
   if (S_ISDIR(entry_info.st_mode)) return File::kIsDirectory;
   if (S_ISREG(entry_info.st_mode)) return File::kIsFile;
   if (S_ISLNK(entry_info.st_mode)) return File::kIsLink;
   return File::kDoesNotExist;
 }
 
 
 File::Identical File::AreIdentical(const char* file_1, const char* file_2) {
   struct stat file_1_info;
   struct stat file_2_info;
-  if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(lstat(file_1, &file_1_info)) == -1 ||
-      TEMP_FAILURE_RETRY_BLOCK_SIGNALS(lstat(file_2, &file_2_info)) == -1) {
+  if (NO_RETRY_EXPECTED(lstat(file_1, &file_1_info)) == -1 ||
+      NO_RETRY_EXPECTED(lstat(file_2, &file_2_info)) == -1) {
     return File::kError;
   }
   return (file_1_info.st_ino == file_2_info.st_ino &&
           file_1_info.st_dev == file_2_info.st_dev) ?
       File::kIdentical :
       File::kDifferent;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)