Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1004)

Side by Side Diff: snapshot/mac/process_snapshot_mac.h

Issue 1377133006: Mostly-boilerplate to add MemoryMapSnapshot (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@memory-info-to-misc
Patch Set: 80col Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Crashpad Authors. All rights reserved. 1 // Copyright 2014 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
(...skipping 15 matching lines...) Expand all
26 #include "base/basictypes.h" 26 #include "base/basictypes.h"
27 #include "base/memory/scoped_ptr.h" 27 #include "base/memory/scoped_ptr.h"
28 #include "client/crashpad_info.h" 28 #include "client/crashpad_info.h"
29 #include "snapshot/crashpad_info_client_options.h" 29 #include "snapshot/crashpad_info_client_options.h"
30 #include "snapshot/exception_snapshot.h" 30 #include "snapshot/exception_snapshot.h"
31 #include "snapshot/mac/exception_snapshot_mac.h" 31 #include "snapshot/mac/exception_snapshot_mac.h"
32 #include "snapshot/mac/module_snapshot_mac.h" 32 #include "snapshot/mac/module_snapshot_mac.h"
33 #include "snapshot/mac/process_reader.h" 33 #include "snapshot/mac/process_reader.h"
34 #include "snapshot/mac/system_snapshot_mac.h" 34 #include "snapshot/mac/system_snapshot_mac.h"
35 #include "snapshot/mac/thread_snapshot_mac.h" 35 #include "snapshot/mac/thread_snapshot_mac.h"
36 #include "snapshot/memory_map_region_snapshot.h"
36 #include "snapshot/module_snapshot.h" 37 #include "snapshot/module_snapshot.h"
37 #include "snapshot/process_snapshot.h" 38 #include "snapshot/process_snapshot.h"
38 #include "snapshot/system_snapshot.h" 39 #include "snapshot/system_snapshot.h"
39 #include "snapshot/thread_snapshot.h" 40 #include "snapshot/thread_snapshot.h"
40 #include "util/mach/mach_extensions.h" 41 #include "util/mach/mach_extensions.h"
41 #include "util/misc/initialization_state_dcheck.h" 42 #include "util/misc/initialization_state_dcheck.h"
42 #include "util/misc/uuid.h" 43 #include "util/misc/uuid.h"
43 #include "util/stdlib/pointer_container.h" 44 #include "util/stdlib/pointer_container.h"
44 45
45 namespace crashpad { 46 namespace crashpad {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 void ProcessStartTime(timeval* start_time) const override; 120 void ProcessStartTime(timeval* start_time) const override;
120 void ProcessCPUTimes(timeval* user_time, timeval* system_time) const override; 121 void ProcessCPUTimes(timeval* user_time, timeval* system_time) const override;
121 void ReportID(UUID* report_id) const override; 122 void ReportID(UUID* report_id) const override;
122 void ClientID(UUID* client_id) const override; 123 void ClientID(UUID* client_id) const override;
123 const std::map<std::string, std::string>& AnnotationsSimpleMap() 124 const std::map<std::string, std::string>& AnnotationsSimpleMap()
124 const override; 125 const override;
125 const SystemSnapshot* System() const override; 126 const SystemSnapshot* System() const override;
126 std::vector<const ThreadSnapshot*> Threads() const override; 127 std::vector<const ThreadSnapshot*> Threads() const override;
127 std::vector<const ModuleSnapshot*> Modules() const override; 128 std::vector<const ModuleSnapshot*> Modules() const override;
128 const ExceptionSnapshot* Exception() const override; 129 const ExceptionSnapshot* Exception() const override;
130 std::vector<const MemoryMapRegionSnapshot*> MemoryMap() const override;
129 std::vector<const MemorySnapshot*> ExtraMemory() const override; 131 std::vector<const MemorySnapshot*> ExtraMemory() const override;
130 132
131 private: 133 private:
132 // Initializes threads_ on behalf of Initialize(). 134 // Initializes threads_ on behalf of Initialize().
133 void InitializeThreads(); 135 void InitializeThreads();
134 136
135 // Initializes modules_ on behalf of Initialize(). 137 // Initializes modules_ on behalf of Initialize().
136 void InitializeModules(); 138 void InitializeModules();
137 139
138 internal::SystemSnapshotMac system_; 140 internal::SystemSnapshotMac system_;
139 PointerVector<internal::ThreadSnapshotMac> threads_; 141 PointerVector<internal::ThreadSnapshotMac> threads_;
140 PointerVector<internal::ModuleSnapshotMac> modules_; 142 PointerVector<internal::ModuleSnapshotMac> modules_;
141 scoped_ptr<internal::ExceptionSnapshotMac> exception_; 143 scoped_ptr<internal::ExceptionSnapshotMac> exception_;
142 ProcessReader process_reader_; 144 ProcessReader process_reader_;
143 UUID report_id_; 145 UUID report_id_;
144 UUID client_id_; 146 UUID client_id_;
145 std::map<std::string, std::string> annotations_simple_map_; 147 std::map<std::string, std::string> annotations_simple_map_;
146 timeval snapshot_time_; 148 timeval snapshot_time_;
147 InitializationStateDcheck initialized_; 149 InitializationStateDcheck initialized_;
148 150
149 DISALLOW_COPY_AND_ASSIGN(ProcessSnapshotMac); 151 DISALLOW_COPY_AND_ASSIGN(ProcessSnapshotMac);
150 }; 152 };
151 153
152 } // namespace crashpad 154 } // namespace crashpad
153 155
154 #endif // CRASHPAD_SNAPSHOT_MAC_PROCESS_SNAPSHOT_MAC_H_ 156 #endif // CRASHPAD_SNAPSHOT_MAC_PROCESS_SNAPSHOT_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698