diff options
author | 2014-11-19 21:32:12 +1100 | |
---|---|---|
committer | 2014-11-19 21:32:12 +1100 | |
commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /tools/perf/scripts/python/Perf-Trace-Util | |
parent | integrity: do zero padding of the key id (diff) | |
parent | Linux 3.17 (diff) | |
download | linux-rng-b10778a00d40b3d9fdaaf5891e802794781ff71c.tar.xz linux-rng-b10778a00d40b3d9fdaaf5891e802794781ff71c.zip |
Merge commit 'v3.17' into next
Diffstat (limited to 'tools/perf/scripts/python/Perf-Trace-Util')
-rw-r--r-- | tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py index de7211e4fa47..38dfb720fb6f 100644 --- a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py +++ b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py @@ -107,12 +107,13 @@ def taskState(state): class EventHeaders: def __init__(self, common_cpu, common_secs, common_nsecs, - common_pid, common_comm): + common_pid, common_comm, common_callchain): self.cpu = common_cpu self.secs = common_secs self.nsecs = common_nsecs self.pid = common_pid self.comm = common_comm + self.callchain = common_callchain def ts(self): return (self.secs * (10 ** 9)) + self.nsecs |