aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dbus/metrics_event/metrics_event.proto9
-rw-r--r--dbus/service_constants.h8
-rw-r--r--system_api.gyp23
3 files changed, 38 insertions, 2 deletions
diff --git a/dbus/metrics_event/metrics_event.proto b/dbus/metrics_event/metrics_event.proto
index 48fd473..c1a2762 100644
--- a/dbus/metrics_event/metrics_event.proto
+++ b/dbus/metrics_event/metrics_event.proto
@@ -8,13 +8,18 @@ option optimize_for = LITE_RUNTIME;
package metrics_event;
-// Content of MetricsEvent signals emitted by Chrome.
+// Content of signals emitted by Chrome (the ChromeEvent signal in the
+// MetricsEventService) and the anomaly_collector daemon (the AnomalyEvent
+// signal in the AnomalyEventService) to report events of interest for
+// measurements.
message Event {
// Event types.
enum Type {
TAB_DISCARD = 0;
- OOM_KILL = 1;
+ OOM_KILL = 1; // obsolete---use OOM_KILL_BROWSER instead
TAB_SWITCH = 2;
+ OOM_KILL_BROWSER = 3;
+ OOM_KILL_KERNEL = 4;
}
// The type of the event being signaled.
diff --git a/dbus/service_constants.h b/dbus/service_constants.h
index 37b50fa..9de9dc6 100644
--- a/dbus/service_constants.h
+++ b/dbus/service_constants.h
@@ -1187,4 +1187,12 @@ constexpr char kOpenFileMethod[] = "OpenFile";
} // namespace arc
+namespace anomaly_collector {
+const char kAnomalyEventServiceName[] = "org.chromium.AnomalyEventService";
+const char kAnomalyEventServicePath[] = "/org/chromium/AnomalyEventService";
+const char kAnomalyEventServiceInterface[] =
+ "org.chromium.AnomalyEventServiceInterface";
+const char kAnomalyEventSignalName[] = "AnomalyEvent";
+} // namespace anomaly_collector
+
#endif // SYSTEM_API_DBUS_SERVICE_CONSTANTS_H_
diff --git a/system_api.gyp b/system_api.gyp
index f227307..a29cf4a 100644
--- a/system_api.gyp
+++ b/system_api.gyp
@@ -192,6 +192,29 @@
]
},
{
+ 'target_name': 'system_api-metrics_event-protos-gen',
+ 'type': 'none',
+ 'variables': {
+ 'proto_in_dir': 'dbus/metrics_event',
+ 'proto_out_dir': 'include/metrics_event/proto_bindings',
+ },
+ 'sources': [
+ '<(proto_in_dir)/metrics_event.proto',
+ ],
+ 'includes': ['../../platform2/common-mk/protoc.gypi'],
+ },
+ {
+ 'target_name': 'system_api-metrics_event-protos',
+ 'type': 'static_library',
+ 'standalone_static_library': 1,
+ 'dependencies': [
+ 'system_api-metrics_event-protos-gen',
+ ],
+ 'sources': [
+ '<(SHARED_INTERMEDIATE_DIR)/include/metrics_event/proto_bindings/metrics_event.pb.cc',
+ ]
+ },
+ {
'target_name': 'system_api-smbprovider-protos-gen',
'type': 'none',
'variables': {