diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-11-05 13:32:36 -0500 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-11-05 13:32:36 -0500 |
| commit | 316c7136f8bad924609163b9b115f68d59a68c82 (patch) | |
| tree | ba664f98d92563544aa63dfb63ae4b49c27929c6 /tools/perf/ui/stdio | |
| parent | 714647bdc516330e4405b39677d7f763e016c685 (diff) | |
perf tools: Finish the removal of 'self' arguments
They convey no information, perhaps I was bitten by some snake at some
point, complete the detox by naming the last of those arguments more
sensibly.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-u1r0dnjoro08dgztiy2g3t2q@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/ui/stdio')
| -rw-r--r-- | tools/perf/ui/stdio/hist.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c index 6c152686e837..c244cb524ef2 100644 --- a/tools/perf/ui/stdio/hist.c +++ b/tools/perf/ui/stdio/hist.c | |||
| @@ -213,20 +213,19 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root, | |||
| 213 | return ret; | 213 | return ret; |
| 214 | } | 214 | } |
| 215 | 215 | ||
| 216 | static size_t __callchain__fprintf_flat(FILE *fp, | 216 | static size_t __callchain__fprintf_flat(FILE *fp, struct callchain_node *node, |
| 217 | struct callchain_node *self, | ||
| 218 | u64 total_samples) | 217 | u64 total_samples) |
| 219 | { | 218 | { |
| 220 | struct callchain_list *chain; | 219 | struct callchain_list *chain; |
| 221 | size_t ret = 0; | 220 | size_t ret = 0; |
| 222 | 221 | ||
| 223 | if (!self) | 222 | if (!node) |
| 224 | return 0; | 223 | return 0; |
| 225 | 224 | ||
| 226 | ret += __callchain__fprintf_flat(fp, self->parent, total_samples); | 225 | ret += __callchain__fprintf_flat(fp, node->parent, total_samples); |
| 227 | 226 | ||
| 228 | 227 | ||
| 229 | list_for_each_entry(chain, &self->val, list) { | 228 | list_for_each_entry(chain, &node->val, list) { |
| 230 | if (chain->ip >= PERF_CONTEXT_MAX) | 229 | if (chain->ip >= PERF_CONTEXT_MAX) |
| 231 | continue; | 230 | continue; |
| 232 | if (chain->ms.sym) | 231 | if (chain->ms.sym) |
| @@ -239,15 +238,14 @@ static size_t __callchain__fprintf_flat(FILE *fp, | |||
| 239 | return ret; | 238 | return ret; |
| 240 | } | 239 | } |
| 241 | 240 | ||
| 242 | static size_t callchain__fprintf_flat(FILE *fp, struct rb_root *self, | 241 | static size_t callchain__fprintf_flat(FILE *fp, struct rb_root *tree, |
| 243 | u64 total_samples) | 242 | u64 total_samples) |
| 244 | { | 243 | { |
| 245 | size_t ret = 0; | 244 | size_t ret = 0; |
| 246 | u32 entries_printed = 0; | 245 | u32 entries_printed = 0; |
| 247 | struct rb_node *rb_node; | ||
| 248 | struct callchain_node *chain; | 246 | struct callchain_node *chain; |
| 247 | struct rb_node *rb_node = rb_first(tree); | ||
| 249 | 248 | ||
| 250 | rb_node = rb_first(self); | ||
| 251 | while (rb_node) { | 249 | while (rb_node) { |
| 252 | double percent; | 250 | double percent; |
| 253 | 251 | ||
