add address to function id

juliantaylor · juliantaylor · commit e4ba560675b4 · 2016-06-28T11:35:36.000+02:00
splits different calls to the same function into multiple stacks and
allows addr2line use to get the line number
diff --git a/perf-syscollapse.py b/perf-syscollapse.py
@@ -53,20 +53,21 @@ def demangle(s):
         p = sp.Popen(['c++filt', s], stdout=sp.PIPE)
         return p.communicate(s)[0]
     else:
-        p = sp.Popen(['c++filt'] + s, stdout=sp.PIPE)
+        p = sp.Popen(['c++filt'] + list(s), stdout=sp.PIPE)
         return p.communicate(s)[0].splitlines()
 
 
 jtraces = dict()
 trace = None
 for l in sys.stdin:
     if not l.strip():
-	key = tuple(trace.bt)
-	if key in jtraces:
-	    jtraces[key].data['count'] += trace.data['count']
-	else:
-	    trace.bt = demangle(trace.bt)
-	    jtraces[key] = trace
+        key = tuple(trace.bt)
+        if key in jtraces:
+            jtraces[key].data['count'] += trace.data['count']
+        else:
+            fun = demangle(x[0] for x in trace.bt)
+            trace.bt = [' '.join(y) for y in zip(fun, (x[1] for x in trace.bt))]
+            jtraces[key] = trace
         trace = None
         continue
     if trace is None:
@@ -76,8 +77,9 @@ def demangle(s):
         trace.fun = fun[:-1]
         trace.data = parse_data(trace.fun, rest)
     else:
+        # addr2line could be used to get line number in function
         addr, fun, rest = l.split(None, 2)
-        trace.bt.append(fun)
+        trace.bt.append((fun, addr))
 
 
 for t in jtraces.values():
