Fix ll_prof.py for static binaries.

tools/ll_prof.py

 #!/usr/bin/env python
 #
 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 693 matching lines @@
 KERNEL_ALLSYMS_LINE_RE = re.compile(
   r"^([a-f0-9]+)\s(?:t|T)\s(\S+)$")
 
 
 class LibraryRepo(object):
   def __init__(self):
     self.infos = []
     self.names = set()
     self.ticks = {}
 
+
+  def HasDynamicSymbols(self, filename):
+    if filename.endswith(".ko"): return False
+    process = subprocess.Popen(
+      "%s -h %s" % (OBJDUMP_BIN, filename),
+      shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    pipe = process.stdout
+    try:
+      for line in pipe:
+        match = OBJDUMP_SECTION_HEADER_RE.match(line)
+        if match and match.group(1) == 'dynsym': return True
+    finally:
+      pipe.close()
+    assert process.wait() == 0, "Failed to objdump -h %s" % filename

[ulan, 2015/03/16 08:58:05]

Let's make the result explicit instead of returning None:
return False

+
+
   def Load(self, mmap_info, code_map, options):
     # Skip kernel mmaps when requested using the fact that their tid
     # is 0.
     if mmap_info.tid == 0 and not options.kernel:
       return True
     if OBJDUMP_SKIP_RE.match(mmap_info.filename):
       return True
     if PERF_KERNEL_ALLSYMS_RE.match(mmap_info.filename):
       return self._LoadKernelSymbols(code_map)
     self.infos.append(mmap_info)
     mmap_info.ticks = 0
     mmap_info.unique_name = self._UniqueMmapName(mmap_info)
     if not os.path.exists(mmap_info.filename):
       return True
     # Request section headers (-h), symbols (-t), and dynamic symbols
     # (-T) from objdump.
     # Unfortunately, section headers span two lines, so we have to
     # keep the just seen section name (from the first line in each
     # section header) in the after_section variable.
-    if mmap_info.filename.endswith(".ko"):
+    if self.HasDynamicSymbols(mmap_info.filename):
+      dynamic_symbols = "-T"
+    else:
       dynamic_symbols = ""
-    else:
-      dynamic_symbols = "-T"
     process = subprocess.Popen(
       "%s -h -t %s -C %s" % (OBJDUMP_BIN, dynamic_symbols, mmap_info.filename),
       shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     pipe = process.stdout
     after_section = None
     code_sections = set()
     reloc_sections = set()
     dynamic = False
     try:
       for line in pipe:
@@ skipping 256 matching lines @@
       PrintTicks(optimized_ticks, ticks, "ticks in optimized code")
       PrintTicks(generated_ticks, ticks, "ticks in other lazily compiled code")
       PrintTicks(v8_internal_ticks, ticks, "ticks in v8::internal::*")
       print "%10d total symbols" % len([c for c in code_map.AllCode()])
       print "%10d used symbols" % len([c for c in code_map.UsedCode()])
       print "%9.2fs library processing time" % mmap_time
       print "%9.2fs tick processing time" % sample_time
 
   log_reader.Dispose()
   trace_reader.Dispose()