commit eee773dcbe461020b95509b81adf80b44b78b51c
author Yabin Cui <yabinc@google.com> Fri May 12 20:34:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 12 20:34:12 2017 +0000
tree e7fff48c2ad899a92b5bb5b83a14a3f05e2e70eb
parent 057668237ced3e654a6a13a9c5afcc6dd2321b10
parent 62fca012be1907f7def9d40351be1ae2ebf55520

Merge "simpleperf: make pprof_proto_generator.py work without binary_cache_dir." am: de5a219880
am: 62fca012be

Change-Id: I80073e30bdb126542dad9a42a9d0cd0ee485879b

simpleperf/scripts/pprof_proto_generator.py

diff --git a/simpleperf/scripts/pprof_proto_generator.py b/simpleperf/scripts/pprof_proto_generator.py
index c09469a..fa2fdb1 100644
--- a/simpleperf/scripts/pprof_proto_generator.py
+++ b/simpleperf/scripts/pprof_proto_generator.py
@@ -256,7 +256,10 @@
         self.lib = ReportLib()
 
         if config.get('binary_cache_dir'):
-            self.lib.SetSymfs(config['binary_cache_dir'])
+            if not os.path.isdir(config.get('binary_cache_dir')):
+                config['binary_cache_dir'] = ''
+            else:
+                self.lib.SetSymfs(config['binary_cache_dir'])
         if config.get('record_file'):
             self.lib.SetRecordFile(config['record_file'])
         if config.get('kallsyms'):
@@ -315,7 +318,8 @@
                 self.add_sample(sample)
 
         # 2. Generate line info for locations and functions.
-        self.gen_source_lines()
+        if self.config.get('binary_cache_dir'):
+            self.gen_source_lines()
 
         # 3. Produce samples/locations/functions in profile
         for sample in self.sample_list:
@@ -510,8 +514,12 @@
         profile_mapping.build_id = mapping.build_id_id
         profile_mapping.has_filenames = True
         profile_mapping.has_functions = True
-        profile_mapping.has_line_numbers = True
-        profile_mapping.has_inline_frames = True
+        if self.config.get('binary_cache_dir'):
+            profile_mapping.has_line_numbers = True
+            profile_mapping.has_inline_frames = True
+        else:
+            profile_mapping.has_line_numbers = False
+            profile_mapping.has_inline_frames = False
 
     def gen_profile_location(self, location):
         profile_location = self.profile.location.add()