Messages in this thread Patch in this message | | | From | Namhyung Kim <> | Subject | [PATCH 08/21] perf tools: Save callchain info for each cumulative entry | Date | Thu, 20 Mar 2014 14:36:33 +0900 |
| |
When accumulating callchain entry, also save current snapshot of the chain so that it can show the rest of the chain.
Tested-by: Arun Sharma <asharma@fb.com> Acked-by: Jiri Olsa <jolsa@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Namhyung Kim <namhyung@kernel.org> --- tools/perf/util/hist.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index c393f13789cb..898cf0155c60 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -752,6 +752,14 @@ iter_add_single_cumulative_entry(struct hist_entry_iter *iter, he_cache[iter->curr++] = he; + callchain_append(he->callchain, &callchain_cursor, sample->period); + + /* + * We need to re-initialize the cursor since callchain_append() + * advanced the cursor to the end. + */ + callchain_cursor_commit(&callchain_cursor); + return hist_entry__inc_addr_samples(he, evsel->idx, al->addr); } @@ -765,8 +773,6 @@ iter_next_cumulative_entry(struct hist_entry_iter *iter, if (node == NULL) return 0; - callchain_cursor_advance(&callchain_cursor); - return fill_callchain_info(al, node, iter->hide_unresolved); } @@ -790,6 +796,11 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter, .parent = iter->parent, }; int i; + struct callchain_cursor cursor; + + callchain_cursor_snapshot(&cursor, &callchain_cursor); + + callchain_cursor_advance(&callchain_cursor); /* * Check if there's duplicate entries in the callchain. @@ -808,6 +819,8 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter, he_cache[iter->curr++] = he; + callchain_append(he->callchain, &cursor, sample->period); + return hist_entry__inc_addr_samples(he, evsel->idx, al->addr); } -- 1.7.11.7
| |