Remove the assumption that stat64 and lstat64 cannot return EINTR on Linux

runtime/bin/file_linux.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_LINUX)
 
 #include "bin/file.h"
 
 #include <errno.h>  // NOLINT
@@ skipping 94 matching lines @@
 
 bool File::Flush() {
   ASSERT(handle_->fd() >= 0);
   return NO_RETRY_EXPECTED(fsync(handle_->fd())) != -1;
 }
 
 
 int64_t File::Length() {
   ASSERT(handle_->fd() >= 0);
   struct stat64 st;
-  if (NO_RETRY_EXPECTED(fstat64(handle_->fd(), &st)) == 0) {
+  if (TEMP_FAILURE_RETRY(fstat64(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 stat64 st;
-  if (NO_RETRY_EXPECTED(stat64(name, &st)) == 0) {
+  if (TEMP_FAILURE_RETRY(stat64(name, &st)) == 0) {
     // Only accept regular files and character devices.
     if (!S_ISREG(st.st_mode) && !S_ISCHR(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);
   }
@@ skipping 16 matching lines @@
 
 
 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 stat64 st;
-  if (NO_RETRY_EXPECTED(stat64(name, &st)) == 0) {
+  if (TEMP_FAILURE_RETRY(stat64(name, &st)) == 0) {
     return S_ISREG(st.st_mode);
   } else {
     return false;
   }
 }
 
 
 bool File::Create(const char* name) {
   int fd = TEMP_FAILURE_RETRY(
       open64(name, O_RDONLY | O_CREAT | O_CLOEXEC, 0666));
@@ skipping 55 matching lines @@
     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 stat64 st;
-    if (NO_RETRY_EXPECTED(stat64(old_path, &st)) != 0) {
+    if (TEMP_FAILURE_RETRY(stat64(old_path, &st)) != 0) {
       return false;
     }
     int old_fd = TEMP_FAILURE_RETRY(open64(old_path, O_RDONLY | O_CLOEXEC));
     if (old_fd < 0) {
       return false;
     }
     int new_fd = TEMP_FAILURE_RETRY(
         open64(new_path, O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, st.st_mode));
     if (new_fd < 0) {
       VOID_TEMP_FAILURE_RETRY(close(old_fd));
@@ skipping 34 matching lines @@
     errno = EISDIR;
   } else {
     errno = ENOENT;
   }
   return false;
 }
 
 
 int64_t File::LengthFromPath(const char* name) {
   struct stat64 st;
-  if (NO_RETRY_EXPECTED(stat64(name, &st)) == 0) {
+  if (TEMP_FAILURE_RETRY(stat64(name, &st)) == 0) {
     return st.st_size;
   }
   return -1;
 }
 
 
 static int64_t TimespecToMilliseconds(const struct timespec& t) {
   return static_cast<int64_t>(t.tv_sec) * 1000L +
       static_cast<int64_t>(t.tv_nsec) / 1000000L;
 }
 
 
 void File::Stat(const char* name, int64_t* data) {
   struct stat64 st;
-  if (NO_RETRY_EXPECTED(stat64(name, &st)) == 0) {
+  if (TEMP_FAILURE_RETRY(stat64(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] = TimespecToMilliseconds(st.st_ctim);
     data[kModifiedTime] = TimespecToMilliseconds(st.st_mtim);
     data[kAccessedTime] = TimespecToMilliseconds(st.st_atim);
     data[kMode] = st.st_mode;
     data[kSize] = st.st_size;
   } else {
     data[kType] = kDoesNotExist;
   }
 }
 
 
 time_t File::LastModified(const char* name) {
   struct stat64 st;
-  if (NO_RETRY_EXPECTED(stat64(name, &st)) == 0) {
+  if (TEMP_FAILURE_RETRY(stat64(name, &st)) == 0) {
     return st.st_mtime;
   }
   return -1;
 }
 
 
 char* File::LinkTarget(const char* pathname) {
   struct stat64 link_stats;
-  if (NO_RETRY_EXPECTED(lstat64(pathname, &link_stats)) != 0) return NULL;
+  if (TEMP_FAILURE_RETRY(lstat64(pathname, &link_stats)) != 0) return NULL;
   if (!S_ISLNK(link_stats.st_mode)) {
     errno = ENOENT;
     return NULL;
   }
   size_t target_size = link_stats.st_size;
   char* target_name = reinterpret_cast<char*>(malloc(target_size + 1));
   size_t read_size = NO_RETRY_EXPECTED(
       readlink(pathname, target_name, target_size + 1));
   if (read_size != target_size) {
     free(target_name);
@@ skipping 27 matching lines @@
 
 
 const char* File::StringEscapedPathSeparator() {
   return "/";
 }
 
 
 File::StdioHandleType File::GetStdioHandleType(int fd) {
   ASSERT(0 <= fd && fd <= 2);
   struct stat64 buf;
-  int result = NO_RETRY_EXPECTED(fstat64(fd, &buf));
+  int result = TEMP_FAILURE_RETRY(fstat64(fd, &buf));
   if (result == -1) {
     const int kBufferSize = 1024;
     char error_buf[kBufferSize];
     FATAL2("Failed stat on file descriptor %d: %s", fd,
            strerror_r(errno, error_buf, kBufferSize));
   }
   if (S_ISCHR(buf.st_mode)) return kTerminal;
   if (S_ISFIFO(buf.st_mode)) return kPipe;
   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 stat64 entry_info;
   int stat_success;
   if (follow_links) {
-    stat_success = NO_RETRY_EXPECTED(stat64(pathname, &entry_info));
+    stat_success = TEMP_FAILURE_RETRY(stat64(pathname, &entry_info));
   } else {
-    stat_success = NO_RETRY_EXPECTED(lstat64(pathname, &entry_info));
+    stat_success = TEMP_FAILURE_RETRY(lstat64(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 stat64 file_1_info;
   struct stat64 file_2_info;
-  if (NO_RETRY_EXPECTED(lstat64(file_1, &file_1_info)) == -1 ||
-      NO_RETRY_EXPECTED(lstat64(file_2, &file_2_info)) == -1) {
+  if (TEMP_FAILURE_RETRY(lstat64(file_1, &file_1_info)) == -1 ||
+      TEMP_FAILURE_RETRY(lstat64(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_LINUX)