diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-09-28 23:23:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-28 23:23:13 +0000 |
| commit | e6b1e40fc3672a5c15e778d73a32846af648a6ee (patch) | |
| tree | c27463074987895fb83f69ad64dc25a83ec2c299 | |
| parent | 73d109408b8146af5e24d1fe7eff8a87a375d3ad (diff) | |
| parent | 64fcbf7c0949abb217ab81132f31e49b10521139 (diff) | |
| download | platform_system_extras-e6b1e40fc3672a5c15e778d73a32846af648a6ee.tar.gz platform_system_extras-e6b1e40fc3672a5c15e778d73a32846af648a6ee.tar.bz2 platform_system_extras-e6b1e40fc3672a5c15e778d73a32846af648a6ee.zip | |
Merge "Add pid & tid labels to pprof_proto_generator.py" am: 64fcbf7c09
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1838418
Change-Id: If2b1fc5c4983e19b9eaaac284d84d03bf73f331d
| -rwxr-xr-x | simpleperf/scripts/pprof_proto_generator.py | 6 | ||||
| -rw-r--r-- | simpleperf/scripts/test/pprof_proto_generator_test.py | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/simpleperf/scripts/pprof_proto_generator.py b/simpleperf/scripts/pprof_proto_generator.py index b29634daa..09d54d5f7 100755 --- a/simpleperf/scripts/pprof_proto_generator.py +++ b/simpleperf/scripts/pprof_proto_generator.py @@ -332,6 +332,12 @@ class PprofProfileGenerator(object): self.get_string_id("threadpool"), self.get_string_id( numbers_re.sub("%d", report_sample.thread_comm)))) + sample.labels.append(Label( + self.get_string_id("pid"), + self.get_string_id(str(report_sample.pid)))) + sample.labels.append(Label( + self.get_string_id("tid"), + self.get_string_id(str(report_sample.tid)))) if self._filter_symbol(symbol): location_id = self.get_location_id(report_sample.ip, symbol) sample.add_location_id(location_id) diff --git a/simpleperf/scripts/test/pprof_proto_generator_test.py b/simpleperf/scripts/test/pprof_proto_generator_test.py index 4a8de00b6..e246faa79 100644 --- a/simpleperf/scripts/test/pprof_proto_generator_test.py +++ b/simpleperf/scripts/test/pprof_proto_generator_test.py @@ -57,6 +57,8 @@ class TestPprofProtoGenerator(TestBase): self.assertIn('label[0] = thread:Binder:10419_3', output) self.assertIn('label[0] = thread:Binder:10419_4', output) self.assertIn('label[1] = threadpool:Binder:%d_%d', output) + self.assertIn('label[2] = pid:10419', output) + self.assertIn('label[3] = tid:10459', output) def test_tid_filter(self): key1 = 'art::ProfileSaver::Run()' # function in thread 10459 |