1 files changed, 52 insertions, 38 deletions

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 5b389ce4cd15..377971dc89a3 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -196,6 +196,12 @@ static void perf_top__record_precise_ip(struct perf_top *top,
 
         pthread_mutex_unlock(&notes->lock);
 
+        /*
+         * This function is now called with he->hists->lock held.
+         * Release it before going to sleep.
+         */
+        pthread_mutex_unlock(&he->hists->lock);
+
         if (err == -ERANGE && !he->ms.map->erange_warned)
                 ui__warn_map_erange(he->ms.map, sym, ip);
         else if (err == -ENOMEM) {
@@ -203,6 +209,8 @@ static void perf_top__record_precise_ip(struct perf_top *top,
                        sym->name);
                 sleep(1);
         }
+
+        pthread_mutex_lock(&he->hists->lock);
 }
 
 static void perf_top__show_details(struct perf_top *top)
@@ -238,27 +246,6 @@ out_unlock:
         pthread_mutex_unlock(&notes->lock);
 }
 
-static struct hist_entry *perf_evsel__add_hist_entry(struct perf_evsel *evsel,
-                                                     struct addr_location *al,
-                                                     struct perf_sample *sample)
-{
-        struct hist_entry *he;
-
-        pthread_mutex_lock(&evsel->hists.lock);
-        he = __hists__add_entry(&evsel->hists, al, NULL, NULL, NULL,
-                                sample->period, sample->weight,
-                                sample->transaction);
-        pthread_mutex_unlock(&evsel->hists.lock);
-        if (he == NULL)
-                return NULL;
-
-        hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);
-        if (!he->filtered)
-                evsel->hists.stats.nr_non_filtered_samples++;
-
-        return he;
-}
-
 static void perf_top__print_sym_table(struct perf_top *top)
 {
         char bf[160];
@@ -662,6 +649,26 @@ static int symbol_filter(struct map *map __maybe_unused, struct symbol *sym)
         return 0;
 }
 
+static int hist_iter__top_callback(struct hist_entry_iter *iter,
+                                   struct addr_location *al, bool single,
+                                   void *arg)
+{
+        struct perf_top *top = arg;
+        struct hist_entry *he = iter->he;
+        struct perf_evsel *evsel = iter->evsel;
+
+        if (sort__has_sym && single) {
+                u64 ip = al->addr;
+
+                if (al->map)
+                        ip = al->map->unmap_ip(al->map, ip);
+
+                perf_top__record_precise_ip(top, he, evsel->idx, ip);
+        }
+
+        return 0;
+}
+
 static void perf_event__process_sample(struct perf_tool *tool,
                                        const union perf_event *event,
                                        struct perf_evsel *evsel,
@@ -669,8 +676,6 @@ static void perf_event__process_sample(struct perf_tool *tool,
                                        struct machine *machine)
 {
         struct perf_top *top = container_of(tool, struct perf_top, tool);
-        struct symbol *parent = NULL;
-        u64 ip = sample->ip;
         struct addr_location al;
         int err;
 
@@ -745,25 +750,23 @@ static void perf_event__process_sample(struct perf_tool *tool,
         }
 
         if (al.sym == NULL || !al.sym->ignore) {
-                struct hist_entry *he;
+                struct hist_entry_iter iter = {
+                        .add_entry_cb = hist_iter__top_callback,
+                };
 
-                err = sample__resolve_callchain(sample, &parent, evsel, &al,
-                                                top->max_stack);
-                if (err)
-                        return;
+                if (symbol_conf.cumulate_callchain)
+                        iter.ops = &hist_iter_cumulative;
+                else
+                        iter.ops = &hist_iter_normal;
 
-                he = perf_evsel__add_hist_entry(evsel, &al, sample);
-                if (he == NULL) {
-                        pr_err("Problem incrementing symbol period, skipping event\n");
-                        return;
-                }
+                pthread_mutex_lock(&evsel->hists.lock);
 
-                err = hist_entry__append_callchain(he, sample);
-                if (err)
-                        return;
+                err = hist_entry_iter__add(&iter, &al, evsel, sample,
+                                           top->max_stack, top);
+                if (err < 0)
+                        pr_err("Problem incrementing symbol period, skipping event\n");
 
-                if (sort__has_sym)
-                        perf_top__record_precise_ip(top, he, evsel->idx, ip);
+                pthread_mutex_unlock(&evsel->hists.lock);
         }
 
         return;
@@ -1001,6 +1004,10 @@ static int perf_top_config(const char *var, const char *value, void *cb)
 
         if (!strcmp(var, "top.call-graph"))
                 return record_parse_callchain(value, &top->record_opts);
+        if (!strcmp(var, "top.children")) {
+                symbol_conf.cumulate_callchain = perf_config_bool(var, value);
+                return 0;
+        }
 
         return perf_default_config(var, value, cb);
 }
@@ -1095,6 +1102,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
         OPT_CALLBACK(0, "call-graph", &top.record_opts,
                      "mode[,dump_size]", record_callchain_help,
                      &parse_callchain_opt),
+        OPT_BOOLEAN(0, "children", &symbol_conf.cumulate_callchain,
+                    "Accumulate callchains of children and show total overhead as well"),
         OPT_INTEGER(0, "max-stack", &top.max_stack,
                     "Set the maximum stack depth when parsing the callchain. "
                     "Default: " __stringify(PERF_MAX_STACK_DEPTH)),
@@ -1200,6 +1209,11 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
 
         top.sym_evsel = perf_evlist__first(top.evlist);
 
+        if (!symbol_conf.use_callchain) {
+                symbol_conf.cumulate_callchain = false;
+                perf_hpp__cancel_cumulate();
+        }
+
         symbol_conf.priv_size = sizeof(struct annotation);
 
         symbol_conf.try_vmlinux_path = (symbol_conf.vmlinux_name == NULL);