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

runtime/bin/directory_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/directory.h"
 
 #include <dirent.h>  // NOLINT
 #include <errno.h>  // NOLINT
 #include <string.h>  // NOLINT
 #include <sys/param.h>  // NOLINT
 #include <sys/stat.h>  // NOLINT
 #include <unistd.h>  // NOLINT
 
 #include "bin/file.h"
 #include "bin/platform.h"
 
+#include "platform/signal_blocker.h"
+
 
 namespace dart {
 namespace bin {
 
 
 PathBuffer::PathBuffer() : length_(0) {
   data_ = calloc(PATH_MAX + 1,  sizeof(char));  // NOLINT
 }
 
 bool PathBuffer::AddW(const wchar_t* name) {
@@ skipping 67 matching lines @@
   }
   // Reset.
   listing->path_buffer().Reset(path_length_);
   ResetLink();
 
   // Iterate the directory and post the directories and files to the
   // ports.
   int status = 0;
   dirent entry;
   dirent* result;
-  if ((status = TEMP_FAILURE_RETRY(readdir_r(reinterpret_cast<DIR*>(lister_),
-                                    &entry,
-                                    &result))) == 0 &&
+  if ((status = NO_RETRY_EXPECTED(readdir_r(reinterpret_cast<DIR*>(lister_),
+                                            &entry,
+                                            &result))) == 0 &&
       result != NULL) {
     if (!listing->path_buffer().Add(entry.d_name)) {
       done_ = true;
       return kListError;
     }
     switch (entry.d_type) {
       case DT_DIR:
         if (strcmp(entry.d_name, ".") == 0) return Next(listing);
         if (strcmp(entry.d_name, "..") == 0) return Next(listing);
         return kListDirectory;
       case DT_REG:
         return kListFile;
       case DT_LNK:
         if (!listing->follow_links()) {
           return kListLink;
         }
         // Else fall through to next case.
         // Fall through.
       case DT_UNKNOWN: {
         // On some file systems the entry type is not determined by
         // readdir_r. For those and for links we use stat to determine
         // the actual entry type. Notice that stat returns the type of
         // the file pointed to.
         struct stat entry_info;
         int stat_success;
-        stat_success = TEMP_FAILURE_RETRY(
+        stat_success = NO_RETRY_EXPECTED(
             lstat(listing->path_buffer().AsString(), &entry_info));
         if (stat_success == -1) {
           return kListError;
         }
         if (listing->follow_links() && S_ISLNK(entry_info.st_mode)) {
           // Check to see if we are in a loop created by a symbolic link.
           LinkList current_link = { entry_info.st_dev,
                                     entry_info.st_ino,
                                     link_ };
           LinkList* previous = link_;
           while (previous != NULL) {
             if (previous->dev == current_link.dev &&
                 previous->ino == current_link.ino) {
               // Report the looping link as a link, rather than following it.
               return kListLink;
             }
             previous = previous->next;
           }
-          stat_success = TEMP_FAILURE_RETRY(
+          stat_success = NO_RETRY_EXPECTED(
               stat(listing->path_buffer().AsString(), &entry_info));
           if (stat_success == -1) {
             // Report a broken link as a link, even if follow_links is true.
             return kListLink;
           }
           if (S_ISDIR(entry_info.st_mode)) {
             // Recurse into the subdirectory with current_link added to the
             // linked list of seen file system links.
             link_ = new LinkList(current_link);
             if (strcmp(entry.d_name, ".") == 0) return Next(listing);
@@ skipping 60 matching lines @@
   if (strcmp(dir_name, ".") == 0) return true;
   if (strcmp(dir_name, "..") == 0) return true;
   return path->Add(dir_name) && DeleteRecursively(path);
 }
 
 
 static bool DeleteRecursively(PathBuffer* path) {
   // Do not recurse into links for deletion. Instead delete the link.
   // If it's a file, delete it.
   struct stat st;
-  if (TEMP_FAILURE_RETRY(lstat(path->AsString(), &st)) == -1) {
+  if (NO_RETRY_EXPECTED(lstat(path->AsString(), &st)) == -1) {
     return false;
   } else if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
     return (unlink(path->AsString()) == 0);
   }
 
   if (!path->Add(File::PathSeparator())) return false;
 
   // Not a link. Attempt to open as a directory and recurse into the
   // directory.
   DIR* dir_pointer;
   do {
     dir_pointer = opendir(path->AsString());
   } while (dir_pointer == NULL && errno == EINTR);
 
   if (dir_pointer == NULL) {
     return false;
   }
 
   // Iterate the directory and delete all files and directories.
   int path_length = path->length();
   int read = 0;
   bool success = true;
   dirent entry;
   dirent* result;
-  while ((read = TEMP_FAILURE_RETRY(readdir_r(dir_pointer,
-                                              &entry,
-                                              &result))) == 0 &&
+  while ((read = NO_RETRY_EXPECTED(readdir_r(dir_pointer,
+                                             &entry,
+                                             &result))) == 0 &&
          result != NULL &&
          success) {
     switch (entry.d_type) {
       case DT_DIR:
         success = success && DeleteDir(entry.d_name, path);
         break;
       case DT_REG:
       case DT_LNK:
         // Treat all links as files. This will delete the link which
         // is what we want no matter if the link target is a file or a
         // directory.
         success = success && DeleteFile(entry.d_name, path);
         break;
       case DT_UNKNOWN: {
         // On some file systems the entry type is not determined by
         // readdir_r. For those we use lstat to determine the entry
         // type.
         struct stat entry_info;
         if (!path->Add(entry.d_name)) {
           success = false;
           break;
         }
-        int lstat_success = TEMP_FAILURE_RETRY(
+        int lstat_success = NO_RETRY_EXPECTED(
             lstat(path->AsString(), &entry_info));
         if (lstat_success == -1) {
           success = false;
           break;
         }
         path->Reset(path_length);
         if (S_ISDIR(entry_info.st_mode)) {
           success = success && DeleteDir(entry.d_name, path);
         } else if (S_ISREG(entry_info.st_mode) || S_ISLNK(entry_info.st_mode)) {
           // Treat links as files. This will delete the link which is
@@ skipping 13 matching lines @@
       (closedir(dir_pointer) == -1) ||
       (remove(path->AsString()) == -1)) {
     return false;
   }
   return success;
 }
 
 
 Directory::ExistsResult Directory::Exists(const char* dir_name) {
   struct stat entry_info;
-  int success = TEMP_FAILURE_RETRY(stat(dir_name, &entry_info));
+  int success = NO_RETRY_EXPECTED(stat(dir_name, &entry_info));
   if (success == 0) {
     if (S_ISDIR(entry_info.st_mode)) {
       return EXISTS;
     } else {
       return DOES_NOT_EXIST;
     }
   } else {
     if (errno == EACCES ||
         errno == EBADF ||
         errno == EFAULT ||
@@ skipping 20 matching lines @@
   char buffer[PATH_MAX];
   if (NULL == getcwd(buffer, PATH_MAX)) {
     return NULL;
   }
 
   return strdup(buffer);
 }
 
 
 bool Directory::SetCurrent(const char* path) {
-  int result = TEMP_FAILURE_RETRY(chdir(path));
+  int result = NO_RETRY_EXPECTED(chdir(path));
   return result == 0;
 }
 
 
 bool Directory::Create(const char* dir_name) {
   // Create the directory with the permissions specified by the
   // process umask.
-  int result = TEMP_FAILURE_RETRY(mkdir(dir_name, 0777));
+  int result = NO_RETRY_EXPECTED(mkdir(dir_name, 0777));
   // If the directory already exists, treat it as a success.
   if (result == -1 && errno == EEXIST) {
     return (Exists(dir_name) == EXISTS);
   }
   return (result == 0);
 }
 
 
 // Android doesn't currently provide mkdtemp.  Once Android provied mkdtemp,
 // remove this function in favor of calling mkdtemp directly.
@@ skipping 44 matching lines @@
     return NULL;
   }
   return strdup(result);
 }
 
 
 bool Directory::Delete(const char* dir_name, bool recursive) {
   if (!recursive) {
     if (File::GetType(dir_name, false) == File::kIsLink &&
         File::GetType(dir_name, true) == File::kIsDirectory) {
-      return (TEMP_FAILURE_RETRY(unlink(dir_name)) == 0);
+      return (NO_RETRY_EXPECTED(unlink(dir_name)) == 0);
     }
-    return (TEMP_FAILURE_RETRY(rmdir(dir_name)) == 0);
+    return (NO_RETRY_EXPECTED(rmdir(dir_name)) == 0);
   } else {
     PathBuffer path;
     if (!path.Add(dir_name)) {
       return false;
     }
     return DeleteRecursively(&path);
   }
 }
 
 
 bool Directory::Rename(const char* path, const char* new_path) {
   ExistsResult exists = Exists(path);
   if (exists != EXISTS) return false;
-  return (TEMP_FAILURE_RETRY(rename(path, new_path)) == 0);
+  return (NO_RETRY_EXPECTED(rename(path, new_path)) == 0);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)