StabilityReport proto changes for multi-process support

components/browser_watcher/stability_report.proto

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 
 package browser_watcher;
 
@@ skipping 69 matching lines @@
     string string_value = 3;
     Reference string_reference = 4;
     string char_value = 5;
     bool bool_value = 6;
     int64 signed_value = 7;
     uint64 unsigned_value = 8;
   }
 }
 
 // An activity represents information about something of interest on a thread.
-// Next id: 14
+// Next id: 18
 message Activity {
   enum Type {
     UNKNOWN = 0;
     ACT_TASK_RUN = 1;
     ACT_LOCK_ACQUIRE = 2;
     ACT_EVENT_WAIT = 3;
     ACT_THREAD_JOIN = 4;
     ACT_PROCESS_WAIT = 5;
     ACT_GENERIC = 6;
   }
@@ skipping 28 matching lines @@
 
   // A unique identifier for a process.
   optional int64 process_id = 8;
 
   // An arbitrary identifier used for association.
   optional uint32 generic_id = 12;
 
   // An arbitrary value used for information purposes.
   optional int32 generic_data = 13;
 
-  // Tag id 10 is reserved for server side augmentation.
+  // Tag ids 10 and 14-17 are reserved for server side augmentation.
 
   // A key-value store.
   map<string, TypedValue> user_data = 9;
 }
 
 // Details about an exception.
 // Next id: 5
 message Exception {
   optional uint32 code = 1;
   optional uint64 program_counter = 2;
@@ skipping 14 matching lines @@
   // stack and |activities| holds the base of the stack (up to a maximum size).
   optional int32 activity_count = 3;
   repeated Activity activities = 4;
 
   // The last exception to be successfully captured. Note this exception may
   // have been recovered from.
   optional Exception exception = 5;
 }
 
 // The state of a process.
-// Next id: 5
+// Next id: 7
 message ProcessState {
+  enum Type {
+    UNKNOWN_PROCESS = 0;
+    BROWSER_PROCESS = 1;
+    WATCHER_PROCESS = 2;
+  }
+
   message MemoryState {
     message WindowsMemory {
       // The private byte usage of the process. Unit is 4K pages.
       optional uint32 process_private_usage = 1;
       // The peak working set usage of the process. Unit is 4K pages.
       optional uint32 process_peak_workingset_size = 2;
       // The peak pagefile usage of the process. Unit is 4K pages.
       optional uint32 process_peak_pagefile_usage = 3;
       // The allocation request that caused OOM, bytes.
       optional uint32 process_allocation_attempt = 4;
     }
 
     optional WindowsMemory windows_memory = 1;
   }
 
   // The identifier of the process.
   optional int64 process_id = 3;
+  optional Type process_type = 5;
 
   // Note: likely only a subset of modules of interest (e.g. Chromium's own
   // modules).
   repeated CodeModule modules = 1;
   repeated ThreadState threads = 2;
-  // TODO(manzagop): add experiment state.
 
   optional MemoryState memory_state = 4;
+
+  // A key-value store global to the process.
+  map<string, TypedValue> data = 6;
 }
 
 // Description of a field trial or experiment that the user is currently
 // enrolled in. This message is an analogue of the UMA proto in
 // components/metrics/proto/system_profile.proto. For details about generating
 // the identifiers from the field trial and group names, see
 // variations::MakeActiveGroupId().
 // Next id: 3
 message FieldTrial {
   // A 32-bit identifier for the name of the field trial.
@@ skipping 12 matching lines @@
     // The amount of system commit remaining. Unit is number of 4K pages.
     optional uint32 system_commit_remaining = 2;
   }
 
   optional WindowsMemory windows_memory = 1;
 }
 
 // A stability report contains information pertaining to the execution of a
 // single logical instance of a "chrome browser". It is comprised of information
 // about the system state and about the chrome browser's processes.
-// Next id: 8
+// Next id: 9
 message StabilityReport {
   // Whether the report is complete. Reports can be incomplete when the
   // recording size quota is hit.
   optional bool is_complete = 6;
 
+  // The process identifier of the crashed process.
+  optional int64 crashed_process_id = 8;
+
+  // State pertaining to the system.
   optional SystemState system_state = 1;
-  // TODO(manzagop): revisit whether a single repeated field should contain all
-  //     processes, or whether it's preferable to have separate fields per type.
-  // TODO(manzagop): add information about the type of process, pid, process
-  //     times (e.g. start time), hierarchical relationships (e.g. parent pid),
-  //     command line, etc.
+
+  // State pertaining to Chrome's processes.
   repeated ProcessState process_states = 2;
-  // TODO(manzagop): if/when reports contain multiple processes, attribute and
-  //     relocate these to their process (and perhaps thread).
+
+  // Log messages. This is empty on official builds.
+  // TODO(manzagop): attribute messages to their process.
   repeated string log_messages = 3;
+
+  // A global key-value store.
   map<string, TypedValue> global_data = 4;
 
   // The field trials the user is currently enrolled in.
   repeated FieldTrial field_trials = 5;
 
   optional SystemMemoryState system_memory_state = 7;
 }