Reorganize Multiprocess and implement for Windows

snapshot/mac/process_reader_test.cc

Index: snapshot/mac/process_reader_test.cc
diff --git a/snapshot/mac/process_reader_test.cc b/snapshot/mac/process_reader_test.cc
index 51034882946dcd17cd4d4cd067b381da2cf13db4..bae66ba63914505df69478169c277ca516ab6b65 100644
--- a/snapshot/mac/process_reader_test.cc
+++ b/snapshot/mac/process_reader_test.cc
@@ -88,7 +88,7 @@ class ProcessReaderChild final : public MachMultiprocess {
     EXPECT_EQ(getpid(), process_reader.ParentProcessID());
     EXPECT_EQ(ChildPID(), process_reader.ProcessID());
 
-    int read_fd = ReadPipeFD();
+    int read_fd = ReadPipeHandle();
 
     mach_vm_address_t address;
     CheckedReadFile(read_fd, &address, sizeof(address));
@@ -99,7 +99,7 @@ class ProcessReaderChild final : public MachMultiprocess {
   }
 
   void MachMultiprocessChild() override {
-    int write_fd = WritePipeFD();
+    int write_fd = WritePipeHandle();

[Mark Mentovai, 2015/01/28 19:58:27]

This is in platform-specific code, so the int is kinda OK, but it’s better to
use the abstraction and call it “FileHandle write_handle” now. The same pattern
recurs elsewhere in this file.

[scottmg, 2015/01/28 22:14:57]

Done.

 
     mach_vm_address_t address =
         reinterpret_cast<mach_vm_address_t>(kTestMemory);
@@ -107,7 +107,7 @@ class ProcessReaderChild final : public MachMultiprocess {
 
     // Wait for the parent to signal that it’s OK to exit by closing its end of
     // the pipe.
-    CheckedReadFileAtEOF(ReadPipeFD());
+    CheckedReadFileAtEOF(ReadPipeHandle());
   }
 
   DISALLOW_COPY_AND_ASSIGN(ProcessReaderChild);
@@ -424,7 +424,7 @@ class ProcessReaderThreadedChild final : public MachMultiprocess {
     ProcessReader process_reader;
     ASSERT_TRUE(process_reader.Initialize(ChildTask()));
 
-    int read_fd = ReadPipeFD();
+    int read_fd = ReadPipeHandle();
 
     // Build a map of all expected threads, keyed by each thread’s ID, and with
     // addresses that should lie somewhere within each thread’s stack as values.
@@ -461,7 +461,7 @@ class ProcessReaderThreadedChild final : public MachMultiprocess {
     TestThreadPool thread_pool;
     ASSERT_NO_FATAL_FAILURE(thread_pool.StartThreads(thread_count_));
 
-    int write_fd = WritePipeFD();
+    int write_fd = WritePipeHandle();
 
     // This thread isn’t part of the thread pool, but the parent will be able
     // to inspect it. Write an entry for it.
@@ -498,7 +498,7 @@ class ProcessReaderThreadedChild final : public MachMultiprocess {
 
     // Wait for the parent to signal that it’s OK to exit by closing its end of
     // the pipe.
-    CheckedReadFileAtEOF(ReadPipeFD());
+    CheckedReadFileAtEOF(ReadPipeHandle());
   }
 
   size_t thread_count_;
@@ -594,7 +594,7 @@ class ProcessReaderModulesChild final : public MachMultiprocess {
     // and for dyld.
     ASSERT_GE(modules.size(), 3u);
 
-    int read_fd = ReadPipeFD();
+    int read_fd = ReadPipeHandle();
 
     uint32_t expect_modules;
     CheckedReadFile(read_fd, &expect_modules, sizeof(expect_modules));
@@ -635,7 +635,7 @@ class ProcessReaderModulesChild final : public MachMultiprocess {
   }
 
   void MachMultiprocessChild() override {
-    int write_fd = WritePipeFD();
+    int write_fd = WritePipeHandle();
 
     uint32_t dyld_image_count = _dyld_image_count();
     const struct dyld_all_image_infos* dyld_image_infos =
@@ -677,7 +677,7 @@ class ProcessReaderModulesChild final : public MachMultiprocess {
 
     // Wait for the parent to signal that it’s OK to exit by closing its end of
     // the pipe.
-    CheckedReadFileAtEOF(ReadPipeFD());
+    CheckedReadFileAtEOF(ReadPipeHandle());
   }
 
   DISALLOW_COPY_AND_ASSIGN(ProcessReaderModulesChild);