Reorganize Multiprocess and implement for Windows

snapshot/mac/process_reader_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 70 matching lines @@
 
 #if !defined(ARCH_CPU_64_BITS)
     EXPECT_FALSE(process_reader.Is64Bit());
 #else
     EXPECT_TRUE(process_reader.Is64Bit());
 #endif
 
     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));
 
     std::string read_string;
     ASSERT_TRUE(process_reader.Memory()->ReadCString(address, &read_string));
     EXPECT_EQ(kTestMemory, read_string);
   }
 
   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);
     CheckedWriteFile(write_fd, &address, sizeof(address));
 
     // 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);
 };
 
 TEST(ProcessReader, ChildBasic) {
   ProcessReaderChild process_reader_child;
   process_reader_child.Run();
 }
 
@@ skipping 296 matching lines @@
         thread_count_(thread_count) {
   }
 
   ~ProcessReaderThreadedChild() {}
 
  private:
   void MachMultiprocessParent() override {
     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.
     // These IDs and addresses all come from the child process via the pipe.
     ThreadMap thread_map;
     for (size_t thread_index = 0;
          thread_index < thread_count_ + 1;
          ++thread_index) {
       uint64_t thread_id;
       CheckedReadFile(read_fd, &thread_id, sizeof(thread_id));
@@ skipping 16 matching lines @@
 
     // The child shouldn’t have any threads other than its main thread and the
     // ones it created in its pool, so pass false for |tolerate_extra_threads|.
     ExpectSeveralThreads(&thread_map, threads, false);
   }
 
   void MachMultiprocessChild() override {
     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.
     uint64_t thread_id = PthreadToThreadID(pthread_self());
 
     CheckedWriteFile(write_fd, &thread_id, sizeof(thread_id));
 
     TestThreadPool::ThreadExpectation expectation;
     expectation.stack_address = reinterpret_cast<mach_vm_address_t>(&thread_id);
     expectation.suspend_count = 0;
@@ skipping 16 matching lines @@
       CheckedWriteFile(write_fd,
                        &expectation.stack_address,
                        sizeof(expectation.stack_address));
       CheckedWriteFile(write_fd,
                        &expectation.suspend_count,
                        sizeof(expectation.suspend_count));
     }
 
     // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(ProcessReaderThreadedChild);
 };
 
 TEST(ProcessReader, ChildOneThread) {
   // The main thread plus zero child threads equals one thread.
   const size_t kChildThreads = 0;
@@ skipping 75 matching lines @@
     ProcessReader process_reader;
     ASSERT_TRUE(process_reader.Initialize(ChildTask()));
 
     const std::vector<ProcessReader::Module>& modules =
         process_reader.Modules();
 
     // There needs to be at least an entry for the main executable, for a dylib,
     // 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));
 
     ASSERT_EQ(expect_modules, modules.size());
 
     for (size_t index = 0; index < modules.size(); ++index) {
       SCOPED_TRACE(base::StringPrintf(
           "index %zu, name %s", index, modules[index].name.c_str()));
 
@@ skipping 20 matching lines @@
         int rv = stat(expect_name.c_str(), &stat_buf);
         EXPECT_EQ(0, rv) << ErrnoMessage("stat");
         if (rv == 0) {
           EXPECT_EQ(stat_buf.st_mtime, modules[index].timestamp);
         }
       }
     }
   }
 
   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 =
         _dyld_get_all_image_infos();
 
     uint32_t write_image_count = dyld_image_count;
     if (dyld_image_infos->version >= 2) {
       // dyld_image_count doesn’t include an entry for dyld itself, but one will
       // be written.
       ++write_image_count;
@@ skipping 21 matching lines @@
 
       // The NUL terminator is not written.
       CheckedWriteFile(write_fd, dyld_image_name, dyld_image_name_length);
 
       CheckedWriteFile(
           write_fd, &dyld_image_address, sizeof(dyld_image_address));
     }
 
     // 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);
 };
 
 TEST(ProcessReader, ChildModules) {
   ProcessReaderModulesChild process_reader_modules_child;
   process_reader_modules_child.Run();
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad