Merge "processor: Parse TrackEvent arguments"
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
index fb15d07..e404c75 100644
--- a/protos/perfetto/trace/perfetto_trace.proto
+++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -3132,29 +3132,29 @@
optional int32 legacy_sort_index = 3;
enum ChromeThreadType {
- THREAD_TYPE_UNSPECIFIED = 0;
+ CHROME_THREAD_UNSPECIFIED = 0;
- THREAD_TYPE_MAIN = 1;
- THREAD_TYPE_IO = 2;
+ CHROME_THREAD_MAIN = 1;
+ CHROME_THREAD_IO = 2;
// Scheduler:
- THREAD_TYPE_THREAD_POOL_BG_WORKER = 3;
- THREAD_TYPE_THREAD_POOL_FG_WORKER = 4;
- THREAD_TYPE_THREAD_POOL_FB_BLOCKING = 5;
- THREAD_TYPE_THREAD_POOL_BG_BLOCKING = 6;
- THREAD_TYPE_THREAD_POOL_SERVICE = 7;
+ CHROME_THREAD_POOL_BG_WORKER = 3;
+ CHROME_THREAD_POOL_FG_WORKER = 4;
+ CHROME_THREAD_POOL_FB_BLOCKING = 5;
+ CHROME_THREAD_POOL_BG_BLOCKING = 6;
+ CHROME_THREAD_POOL_SERVICE = 7;
// Compositor:
- THREAD_TYPE_COMPOSITOR = 8;
- THREAD_TYPE_VIZ_COMPOSITOR = 9;
- THREAD_TYPE_COMPOSITOR_WORKER = 10;
+ CHROME_THREAD_COMPOSITOR = 8;
+ CHROME_THREAD_VIZ_COMPOSITOR = 9;
+ CHROME_THREAD_COMPOSITOR_WORKER = 10;
// Renderer:
- THREAD_TYPE_SERVICE_WORKER = 11;
+ CHROME_THREAD_SERVICE_WORKER = 11;
// Tracing related threads:
- THREAD_TYPE_MEMORY_INFRA = 50;
- THREAD_TYPE_SAMPLING_PROFILER = 51;
+ CHROME_THREAD_MEMORY_INFRA = 50;
+ CHROME_THREAD_SAMPLING_PROFILER = 51;
};
optional ChromeThreadType chrome_thread_type = 4;
diff --git a/protos/perfetto/trace/track_event/thread_descriptor.proto b/protos/perfetto/trace/track_event/thread_descriptor.proto
index 85a5824..78afc36 100644
--- a/protos/perfetto/trace/track_event/thread_descriptor.proto
+++ b/protos/perfetto/trace/track_event/thread_descriptor.proto
@@ -32,29 +32,29 @@
optional int32 legacy_sort_index = 3;
enum ChromeThreadType {
- THREAD_TYPE_UNSPECIFIED = 0;
+ CHROME_THREAD_UNSPECIFIED = 0;
- THREAD_TYPE_MAIN = 1;
- THREAD_TYPE_IO = 2;
+ CHROME_THREAD_MAIN = 1;
+ CHROME_THREAD_IO = 2;
// Scheduler:
- THREAD_TYPE_THREAD_POOL_BG_WORKER = 3;
- THREAD_TYPE_THREAD_POOL_FG_WORKER = 4;
- THREAD_TYPE_THREAD_POOL_FB_BLOCKING = 5;
- THREAD_TYPE_THREAD_POOL_BG_BLOCKING = 6;
- THREAD_TYPE_THREAD_POOL_SERVICE = 7;
+ CHROME_THREAD_POOL_BG_WORKER = 3;
+ CHROME_THREAD_POOL_FG_WORKER = 4;
+ CHROME_THREAD_POOL_FB_BLOCKING = 5;
+ CHROME_THREAD_POOL_BG_BLOCKING = 6;
+ CHROME_THREAD_POOL_SERVICE = 7;
// Compositor:
- THREAD_TYPE_COMPOSITOR = 8;
- THREAD_TYPE_VIZ_COMPOSITOR = 9;
- THREAD_TYPE_COMPOSITOR_WORKER = 10;
+ CHROME_THREAD_COMPOSITOR = 8;
+ CHROME_THREAD_VIZ_COMPOSITOR = 9;
+ CHROME_THREAD_COMPOSITOR_WORKER = 10;
// Renderer:
- THREAD_TYPE_SERVICE_WORKER = 11;
+ CHROME_THREAD_SERVICE_WORKER = 11;
// Tracing related threads:
- THREAD_TYPE_MEMORY_INFRA = 50;
- THREAD_TYPE_SAMPLING_PROFILER = 51;
+ CHROME_THREAD_MEMORY_INFRA = 50;
+ CHROME_THREAD_SAMPLING_PROFILER = 51;
};
optional ChromeThreadType chrome_thread_type = 4;
diff --git a/tools/heap_profile b/tools/heap_profile
index 7f9395a..40debf1 100755
--- a/tools/heap_profile
+++ b/tools/heap_profile
@@ -30,8 +30,8 @@
import urllib
TRACE_TO_TEXT_SHAS = {
- 'linux': 'a8171d85c5964ccafe457142dbb7df68ca8da543',
- 'mac': '268c2fc096039566979d16c1a7a99eabef0d9682',
+ 'linux': '2ef44a2ce2f9cfdccd3a21c80299fa6c0e6b4e38',
+ 'mac': '32f29cf000e1e4638f8b96c7d004586a74a72f72',
}
TRACE_TO_TEXT_PATH = tempfile.gettempdir()
TRACE_TO_TEXT_BASE_URL = (
diff --git a/tools/idle_alloc.cc b/tools/idle_alloc.cc
index 09dc645..1a1dd5a 100644
--- a/tools/idle_alloc.cc
+++ b/tools/idle_alloc.cc
@@ -19,6 +19,7 @@
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
+#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
