Merge "compact_sched: remove "unstable" notices"

am: d801f56ce3

Change-Id: I742c348a8abcfba494869c04a841c6149e64223a

5 files changed, 4 insertions, 9 deletions

diff --git a/protos/perfetto/config/ftrace/ftrace_config.proto b/protos/perfetto/config/ftrace/ftrace_config.proto
index 3b1e6a248..a612d89fe 100644
--- a/protos/perfetto/config/ftrace/ftrace_config.proto
+++ b/protos/perfetto/config/ftrace/ftrace_config.proto
@@ -28,9 +28,8 @@ message FtraceConfig {
   optional uint32 drain_period_ms = 11;
 
   // Configuration for compact encoding of scheduler events. When enabled (and
-  // recording the relevant ftrace events), the most high-volume events are
+  // recording the relevant ftrace events), specific high-volume events are
   // encoded in a denser format than normal.
-  // TODO(rsavitski): unstable, do not use.
   message CompactSchedConfig {
     // If true, and sched_switch or sched_waking ftrace events are enabled,
     // record those events in the compact format.
diff --git a/protos/perfetto/config/perfetto_config.proto b/protos/perfetto/config/perfetto_config.proto
index 670e584f7..1ba3c082e 100644
--- a/protos/perfetto/config/perfetto_config.proto
+++ b/protos/perfetto/config/perfetto_config.proto
@@ -632,9 +632,8 @@ message FtraceConfig {
   optional uint32 drain_period_ms = 11;
 
   // Configuration for compact encoding of scheduler events. When enabled (and
-  // recording the relevant ftrace events), the most high-volume events are
+  // recording the relevant ftrace events), specific high-volume events are
   // encoded in a denser format than normal.
-  // TODO(rsavitski): unstable, do not use.
   message CompactSchedConfig {
     // If true, and sched_switch or sched_waking ftrace events are enabled,
     // record those events in the compact format.
diff --git a/protos/perfetto/trace/ftrace/ftrace_event_bundle.proto b/protos/perfetto/trace/ftrace/ftrace_event_bundle.proto
index a65191d36..1d69b1f0a 100644
--- a/protos/perfetto/trace/ftrace/ftrace_event_bundle.proto
+++ b/protos/perfetto/trace/ftrace/ftrace_event_bundle.proto
@@ -36,7 +36,6 @@ message FtraceEventBundle {
   // a subset of events & their fields is recorded.
   // All fields (except comms) are stored in a structure-of-arrays form, one
   // entry in each repeated field per event.
-  // TODO(rsavitski): unstable, do not use.
   message CompactSched {
     // Interned table of unique strings for this bundle.
     repeated string intern_table = 5;
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
index a9cc0ff96..abd3af1cc 100644
--- a/protos/perfetto/trace/perfetto_trace.proto
+++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -2316,7 +2316,6 @@ message FtraceEventBundle {
   // a subset of events & their fields is recorded.
   // All fields (except comms) are stored in a structure-of-arrays form, one
   // entry in each repeated field per event.
-  // TODO(rsavitski): unstable, do not use.
   message CompactSched {
     // Interned table of unique strings for this bundle.
     repeated string intern_table = 5;
@@ -4469,9 +4468,8 @@ message FtraceConfig {
   optional uint32 drain_period_ms = 11;
 
   // Configuration for compact encoding of scheduler events. When enabled (and
-  // recording the relevant ftrace events), the most high-volume events are
+  // recording the relevant ftrace events), specific high-volume events are
   // encoded in a denser format than normal.
-  // TODO(rsavitski): unstable, do not use.
   message CompactSchedConfig {
     // If true, and sched_switch or sched_waking ftrace events are enabled,
     // record those events in the compact format.
diff --git a/src/perfetto_cmd/perfetto_config.descriptor.h b/src/perfetto_cmd/perfetto_config.descriptor.h
index f480e88a7..00d754734 100644
--- a/src/perfetto_cmd/perfetto_config.descriptor.h
+++ b/src/perfetto_cmd/perfetto_config.descriptor.h
@@ -12,7 +12,7 @@
 // SHA1(tools/gen_binary_descriptors)
 // 192b582ae52bb07b3d3ba66a94bcfd3127a5f42f
 // SHA1(protos/perfetto/config/perfetto_config.proto)
-// 7e29ded10dd6cff450d72d81dbaba1f8ef65c64f
+// 5cfe80d665da1604176ba404025526c8f293b0f5
 
 // This is the proto PerfettoConfig encoded as a ProtoFileDescriptor to allow
 // for reflection without libprotobuf full/non-lite protos.