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

Unified Diff: snapshot/mac/process_snapshot_mac.h

Issue 924673003: Add MinidumpCrashpadInfo::simple_annotations (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Address review feedback Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « minidump/minidump_extensions.h ('k') | snapshot/mac/process_snapshot_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: snapshot/mac/process_snapshot_mac.h
diff --git a/snapshot/mac/process_snapshot_mac.h b/snapshot/mac/process_snapshot_mac.h
index 4c1278e75f4c8cae36e34de98a089370ee7bcb41..ef50b70c1525c451b8aca69880ea572f2c61680a 100644
--- a/snapshot/mac/process_snapshot_mac.h
+++ b/snapshot/mac/process_snapshot_mac.h
@@ -19,6 +19,8 @@
#include <sys/time.h>
#include <unistd.h>
+#include <map>
+#include <string>
#include <vector>
#include "base/basictypes.h"
@@ -72,6 +74,17 @@ class ProcessSnapshotMac final : public ProcessSnapshot {
const natural_t* state,
mach_msg_type_number_t state_count);
+ //! \brief Sets the value to be returned by AnnotationsSimpleMap().
+ //!
+ //! On Mac OS X, all process annotations are under the control of the snapshot
+ //! producer, which may call this method to establish these annotations.
+ //! Contrast this with module annotations, which are under the control of the
+ //! process being snapshotted.
+ void SetAnnotationsSimpleMap(
+ const std::map<std::string, std::string>& annotations_simple_map) {
+ annotations_simple_map_ = annotations_simple_map;
+ }
+
// ProcessSnapshot:
pid_t ProcessID() const override;
@@ -79,6 +92,8 @@ class ProcessSnapshotMac final : public ProcessSnapshot {
void SnapshotTime(timeval* snapshot_time) const override;
void ProcessStartTime(timeval* start_time) const override;
void ProcessCPUTimes(timeval* user_time, timeval* system_time) const override;
+ const std::map<std::string, std::string>& AnnotationsSimpleMap()
+ const override;
const SystemSnapshot* System() const override;
std::vector<const ThreadSnapshot*> Threads() const override;
std::vector<const ModuleSnapshot*> Modules() const override;
@@ -96,6 +111,7 @@ class ProcessSnapshotMac final : public ProcessSnapshot {
PointerVector<internal::ModuleSnapshotMac> modules_;
scoped_ptr<internal::ExceptionSnapshotMac> exception_;
ProcessReader process_reader_;
+ std::map<std::string, std::string> annotations_simple_map_;
timeval snapshot_time_;
InitializationStateDcheck initialized_;
« no previous file with comments | « minidump/minidump_extensions.h ('k') | snapshot/mac/process_snapshot_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698