diff options
| author | Andreas Gampe <agampe@google.com> | 2018-01-18 21:19:06 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2018-01-28 19:59:15 -0800 |
| commit | e303374b946c36043ae65ef48cde4d188b2babab (patch) | |
| tree | 7e8498c2c96eee132679a6e9121e516cf5ace587 | |
| parent | 74ffa03189676d35ebd95abded8ea926d83466f5 (diff) | |
| download | extras-e303374b946c36043ae65ef48cde4d188b2babab.tar.gz | |
Perfprofd: Backport elf symbolizer config to ConfigReader
Add an entry to ConfigReader to initialize usage of the ELF symbolizer.
Use this to turn off on-device symbolization for live testing, as
warnings about missing DSOs will pollute the logs and make the tests
fail.
Test: mmma system/extras/perfprofd
Test: perfprofd_test
Change-Id: I3e13db9779e5d2edfb14e2fbe2b3d186ef7af0bd
| -rw-r--r-- | perfprofd/configreader.cc | 5 | ||||
| -rw-r--r-- | perfprofd/tests/perfprofd_test.cc | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/perfprofd/configreader.cc b/perfprofd/configreader.cc index 4fcd5cee..f8fb3d6d 100644 --- a/perfprofd/configreader.cc +++ b/perfprofd/configreader.cc @@ -124,6 +124,9 @@ void ConfigReader::addDefaultEntries() addUnsignedEntry("collect_charging_state", 1, 0, 1); addUnsignedEntry("collect_booting", 1, 0, 1); addUnsignedEntry("collect_camera_active", 0, 0, 1); + + // If true, use an ELF symbolizer to on-device symbolize. + addUnsignedEntry("use_elf_symbolizer", 1, 0, 1); } void ConfigReader::addUnsignedEntry(const char *key, @@ -321,5 +324,5 @@ void ConfigReader::FillConfig(Config* config) { config->collect_camera_active = getBoolValue("collect_camera_active"); config->process = -1; - config->use_elf_symbolizer = true; + config->use_elf_symbolizer = getBoolValue("use_elf_symbolizer"); } diff --git a/perfprofd/tests/perfprofd_test.cc b/perfprofd/tests/perfprofd_test.cc index 599bb501..c36ea7d7 100644 --- a/perfprofd/tests/perfprofd_test.cc +++ b/perfprofd/tests/perfprofd_test.cc @@ -861,6 +861,8 @@ TEST_F(PerfProfdTest, BasicRunWithLivePerf) runner.addToConfig("max_unprocessed_profiles=100"); runner.addToConfig("collection_interval=9999"); runner.addToConfig("sample_duration=2"); + // Avoid the symbolizer for spurious messages. + runner.addToConfig("use_elf_symbolizer=0"); // Create semaphore file runner.create_semaphore_file(); @@ -912,6 +914,8 @@ TEST_F(PerfProfdTest, MultipleRunWithLivePerf) runner.addToConfig("use_fixed_seed=12345678"); runner.addToConfig("collection_interval=9999"); runner.addToConfig("sample_duration=2"); + // Avoid the symbolizer for spurious messages. + runner.addToConfig("use_elf_symbolizer=0"); runner.write_processed_file(1, 2); // Create semaphore file @@ -980,6 +984,8 @@ TEST_F(PerfProfdTest, CallChainRunWithLivePerf) runner.addToConfig("collection_interval=9999"); runner.addToConfig("stack_profile=1"); runner.addToConfig("sample_duration=2"); + // Avoid the symbolizer for spurious messages. + runner.addToConfig("use_elf_symbolizer=0"); // Create semaphore file runner.create_semaphore_file(); |