Reorganize Multiprocess and implement for Windows

util/test/multiprocess.h

 // 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,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #ifndef CRASHPAD_UTIL_TEST_MULTIPROCESS_H_
 #define CRASHPAD_UTIL_TEST_MULTIPROCESS_H_
 
-#include <unistd.h>
+#include <sys/types.h>
 
 #include "base/basictypes.h"
+#include "util/file/file_io.h"
 
 namespace crashpad {
 namespace test {
 
 namespace internal {
 struct MultiprocessInfo;
 };
 
 //! \brief Manages a multiprocess test.
 //!
@@ skipping 70 matching lines @@
   //!
   //! Subclass implementations may signal failure by raising their own fatal
   //! gtest assertions.
   virtual void PreFork();
 
   //! \brief Returns the child process’ process ID.
   //!
   //! This method may only be called by the parent process.
   pid_t ChildPID() const;
 
-  //! \brief Returns the read pipe’s file descriptor.
+  //! \brief Returns the read pipe’s file handle.
   //!
   //! This method may be called by either the parent or the child process.
   //! Anything written to the write pipe in the partner process will appear
-  //! on the this file descriptor in this process.
+  //! on this file handle in this process.
   //!
   //! It is an error to call this after CloseReadPipe() has been called.
   //!
-  //! \return The read pipe’s file descriptor.
-  int ReadPipeFD() const;
+  //! \return The read pipe’s file handle.
+  FileHandle ReadPipeHandle() const;
 
-  //! \brief Returns the write pipe’s file descriptor.
+  //! \brief Returns the write pipe’s file handle.
   //!
   //! This method may be called by either the parent or the child process.
-  //! Anything written to this file descriptor in this process will appear on
+  //! Anything written to this file handle in this process will appear on
   //! the read pipe in the partner process.
   //!
   //! It is an error to call this after CloseWritePipe() has been called.
   //!
-  //! \return The write pipe’s file descriptor.
-  int WritePipeFD() const;
+  //! \return The write pipe’s file handle.
+  FileHandle WritePipeHandle() const;
 
   //! \brief Closes the read pipe.
   //!
   //! This method may be called by either the parent or the child process. An
   //! attempt to write to the write pipe in the partner process will fail with
-  //! `EPIPE` or `SIGPIPE`. ReadPipeFD() must not be called after this.
+  //! `EPIPE` or `SIGPIPE`. ReadPipeHandle() must not be called after this.
   void CloseReadPipe();
 
   //! \brief Closes the write pipe.
   //!
   //! This method may be called by either the parent or the child process. An
   //! attempt to read from the read pipe in the partner process will indicate
-  //! end-of-file. WritePipeFD() must not be called after this.
+  //! end-of-file. WritePipeHandle() must not be called after this.
   void CloseWritePipe();
 
+  void set_info(internal::MultiprocessInfo* info) { info_ = info; }
+  internal::MultiprocessInfo* info() { return info_; }

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

This should be const.

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

Done. It still has to return a non-const* though as MultiprocessExec::PreFork is
modifying it.

[Mark Mentovai, 2015/01/28 22:32:54]

scottmg wrote:
Oh, I wrote this comment as I was reading from top to bottom and meant to take
it out after I saw how you were using it. No, I don’t think this should be const
at all.

+
  private:
   //! \brief Runs the parent side of the test.
   //!
   //! This method establishes the parent’s environment and calls
   //! MultiprocessParent().
   void RunParent();
 
   //! \brief Runs the child side of the test.
   //!
   //! This method establishes the child’s environment, calls
@@ skipping 25 matching lines @@
   int code_;
   TerminationReason reason_;
 
   DISALLOW_COPY_AND_ASSIGN(Multiprocess);
 };
 
 }  // namespace test
 }  // namespace crashpad
 
 #endif  // CRASHPAD_UTIL_TEST_MULTIPROCESS_H_