POSIX: Add a macro for handling EINTR.

base/process_util_unittest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #define _CRT_SECURE_NO_WARNINGS
 
 #include "base/command_line.h"
+#include "base/eintr_wrappers.h"
 #include "base/file_path.h"
 #include "base/multiprocess_test.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/process_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_LINUX)
 #include <dlfcn.h>
 #endif
@@ skipping 166 matching lines @@
 
 const int kChildPipe = 20;  // FD # for write end of pipe in child process.
 MULTIPROCESS_TEST_MAIN(ProcessUtilsLeakFDChildProcess) {
   // This child process counts the number of open FDs, it then writes that
   // number out to a pipe connected to the parent.
   int num_open_files = 0;
   int write_pipe = kChildPipe;
   int max_files = GetMaxFilesOpenInProcess();
   for (int i = STDERR_FILENO + 1; i < max_files; i++) {
     if (i != kChildPipe) {
-      if (close(i) != -1) {
+      if (HANDLE_EINTR(close(i)) != -1) {
         LOG(WARNING) << "Leaked FD " << i;
         num_open_files += 1;
       }
     }
   }
 
   // InitLogging always opens a file at startup.
   int expected_num_open_fds = 1;
 #if defined(OS_LINUX)
   // On Linux, '/etc/localtime' is opened before the test's main() enters.
   expected_num_open_fds += 1;
 #endif  // defined(OS_LINUX)
   num_open_files -= expected_num_open_fds;
 
-  int written = write(write_pipe, &num_open_files, sizeof(num_open_files));
+  int written = HANDLE_EINTR(write(write_pipe, &num_open_files,
+                                   sizeof(num_open_files)));
   DCHECK_EQ(static_cast<size_t>(written), sizeof(num_open_files));
-  close(write_pipe);
+  HANDLE_EINTR(close(write_pipe));
 
   return 0;
 }
 
 TEST_F(ProcessUtilTest, FDRemapping) {
   // Open some files to check they don't get leaked to the child process.
   int fds[2];
   if (pipe(fds) < 0)
     NOTREACHED();
   int pipe_read_fd = fds[0];
   int pipe_write_fd = fds[1];
 
   // open some dummy fds to make sure they don't propogate over to the
   // child process.
   int dev_null = open("/dev/null", O_RDONLY);
   int sockets[2];
   socketpair(AF_UNIX, SOCK_STREAM, 0, sockets);
 
   file_handle_mapping_vector fd_mapping_vec;
   fd_mapping_vec.push_back(std::pair<int,int>(pipe_write_fd, kChildPipe));
   ProcessHandle handle = this->SpawnChild(L"ProcessUtilsLeakFDChildProcess",
                                           fd_mapping_vec,
                                           false);
   ASSERT_NE(static_cast<ProcessHandle>(NULL), handle);
-  close(pipe_write_fd);
+  HANDLE_EINTR(close(pipe_write_fd));
 
   // Read number of open files in client process from pipe;
   int num_open_files = -1;
-  ssize_t bytes_read = read(pipe_read_fd, &num_open_files,
-                            sizeof(num_open_files));
+  ssize_t bytes_read =
+      HANDLE_EINTR(read(pipe_read_fd, &num_open_files, sizeof(num_open_files)));
   ASSERT_EQ(bytes_read, static_cast<ssize_t>(sizeof(num_open_files)));
 
   // Make sure 0 fds are leaked to the client.
   ASSERT_EQ(0, num_open_files);
 
   EXPECT_TRUE(WaitForSingleProcess(handle, 1000));
   base::CloseProcessHandle(handle);
-  close(fds[0]);
-  close(sockets[0]);
-  close(sockets[1]);
-  close(dev_null);
+  HANDLE_EINTR(close(fds[0]));
+  HANDLE_EINTR(close(sockets[0]));
+  HANDLE_EINTR(close(sockets[1]));
+  HANDLE_EINTR(close(dev_null));
 }
 
 TEST_F(ProcessUtilTest, GetAppOutput) {
   std::string output;
   EXPECT_TRUE(GetAppOutput(CommandLine(L"true"), &output));
   EXPECT_STREQ("", output.c_str());
 
   EXPECT_FALSE(GetAppOutput(CommandLine(L"false"), &output));
 
   std::vector<std::string> argv;
   argv.push_back("/bin/echo");
   argv.push_back("-n");
   argv.push_back("foobar42");
   EXPECT_TRUE(GetAppOutput(CommandLine(argv), &output));
   EXPECT_STREQ("foobar42", output.c_str());
 }
 
 #endif  // defined(OS_POSIX)
 
 }  // namespace base