diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-09-29 05:26:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-29 05:26:17 +0000 |
| commit | 74558cbfdc37295add7371fa45edf8b882bb65a6 (patch) | |
| tree | c75ff049c1adf83ce6cd526006d78adfe33bc1be | |
| parent | c1aefdae1e4827ad1701875112b704d1a2eb48ca (diff) | |
| parent | 149e735479e5803969d0a75b38f672c5eb183e52 (diff) | |
| download | extras-74558cbfdc37295add7371fa45edf8b882bb65a6.tar.gz | |
Merge "pprof_proto_generator: friendlier sample_types" am: 149e735479
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1838426
Change-Id: I4d20960058d962d159edf4f87129336d420f127d
| -rwxr-xr-x | simpleperf/scripts/pprof_proto_generator.py | 4 | ||||
| -rw-r--r-- | simpleperf/scripts/test/pprof_proto_generator_test.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/simpleperf/scripts/pprof_proto_generator.py b/simpleperf/scripts/pprof_proto_generator.py index 43ba5fd7..a002f897 100755 --- a/simpleperf/scripts/pprof_proto_generator.py +++ b/simpleperf/scripts/pprof_proto_generator.py @@ -412,10 +412,10 @@ class PprofProfileGenerator(object): return sample_type_id sample_type_id = len(self.profile.sample_type) sample_type = self.profile.sample_type.add() - sample_type.type = self.get_string_id('event_' + name + '_samples') + sample_type.type = self.get_string_id(name + '_samples') sample_type.unit = self.get_string_id('samples') sample_type = self.profile.sample_type.add() - sample_type.type = self.get_string_id('event_' + name + '_count') + sample_type.type = self.get_string_id(name) units = EVENT_UNITS.get(name, 'count') sample_type.unit = self.get_string_id(units) self.sample_types[name] = sample_type_id diff --git a/simpleperf/scripts/test/pprof_proto_generator_test.py b/simpleperf/scripts/test/pprof_proto_generator_test.py index bc33fb58..f9e2680c 100644 --- a/simpleperf/scripts/test/pprof_proto_generator_test.py +++ b/simpleperf/scripts/test/pprof_proto_generator_test.py @@ -106,8 +106,8 @@ class TestPprofProtoGenerator(TestBase): def test_sample_type(self): """Test sample types have the right units.""" output = self.run_generator() - self.assertIn('sample_type[0] = ValueType(typeID=1, unitID=2, type=event_cpu-cycles_samples, unit=samples)', output) - self.assertIn('sample_type[1] = ValueType(typeID=3, unitID=4, type=event_cpu-cycles_count, unit=cpu-cycles)', output) + self.assertIn('type=cpu-cycles_samples, unit=samples', output) + self.assertIn('type=cpu-cycles, unit=cpu-cycles', output) def test_multiple_perf_data(self): """ Test reporting multiple recording file. """ |