10.6 runtime compatibility for ProcessReader and MachOImageReader test

util/mac/process_reader.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,
@@ skipping 11 matching lines @@
 #include <time.h>
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "util/mach/task_memory.h"
 #include "util/misc/initialization_state_dcheck.h"
+#include "util/stdlib/pointer_container.h"
 
 namespace crashpad {
 
+class MachOImageReader;
+
 //! \brief Accesses information about another process, identified by a Mach
 //!     task.
 class ProcessReader {
  public:
   //! \brief Contains information about a thread that belongs to a task
   //!     (process).
   struct Thread {
 #if defined(ARCH_CPU_X86_FAMILY)
     union ThreadContext {
       x86_thread_state64_t t64;
@@ skipping 25 matching lines @@
   };
 
   //! \brief Contains information about a module loaded into a process.
   struct Module {
     Module();
     ~Module();
 
     //! \brief The pathname used to load the module from disk.
     std::string name;
 
-    //! \brief The address where the base of the module is loaded in the remote
-    //!     process.
-    mach_vm_address_t address;
+    //! \brief An image reader for the module.
+    //!
+    //! The lifetime of this MachOImageReader is scoped to the lifetime of the
+    //! ProcessReader that created it.
+    const MachOImageReader* reader;
 
     //! \brief The module’s timestamp.
     //!
     //! This field will be `0` if its value cannot be determined. It can only be
     //! determined for images that are loaded by dyld, so it will be `0` for the
     //! main executable and for dyld itself.
     time_t timestamp;
   };
 
   ProcessReader();
@@ skipping 104 matching lines @@
   //!     these initial values if the user tag is appropriate for stack memory
   //!     and the expanded region has the same user tag value.
   void LocateRedZone(mach_vm_address_t* start_address,
                      mach_vm_address_t* region_base,
                      mach_vm_address_t* region_size,
                      unsigned int user_tag);
 
   kinfo_proc kern_proc_info_;
   std::vector<Thread> threads_;  // owns send rights
   std::vector<Module> modules_;
+  PointerVector<MachOImageReader> module_readers_;
   scoped_ptr<TaskMemory> task_memory_;
   task_t task_;  // weak
   InitializationStateDcheck initialized_;
 
   // This shadows a bit in kern_proc_info_, but it’s accessed so frequently that
   // it’s given a first-class field to save a few bit operations on each access.
   bool is_64_bit_;
 
   bool initialized_threads_;
   bool initialized_modules_;
 
   DISALLOW_COPY_AND_ASSIGN(ProcessReader);
 };
 
 }  // namespace crashpad
 
 #endif  // CRASHPAD_UTIL_MAC_PROCESS_READER_H_