Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (35 commits)
  perf: Fix unexported generic perf_arch_fetch_caller_regs
  perf record: Don't try to find buildids in a zero sized file
  perf: export perf_trace_regs and perf_arch_fetch_caller_regs
  perf, x86: Fix hw_perf_enable() event assignment
  perf, ppc: Fix compile error due to new cpu notifiers
  perf: Make the install relative to DESTDIR if specified
  kprobes: Calculate the index correctly when freeing the out-of-line execution slot
  perf tools: Fix sparse CPU numbering related bugs
  perf_event: Fix oops triggered by cpu offline/online
  perf: Drop the obsolete profile naming for trace events
  perf: Take a hot regs snapshot for trace events
  perf: Introduce new perf_fetch_caller_regs() for hot regs snapshot
  perf/x86-64: Use frame pointer to walk on irq and process stacks
  lockdep: Move lock events under lockdep recursion protection
  perf report: Print the map table just after samples for which no map was found
  perf report: Add multiple event support
  perf session: Change perf_session post processing functions to take histogram tree
  perf session: Add storage for seperating event types in report
  perf session: Change add_hist_entry to take the tree root instead of session
  perf record: Add ID and to recorded event data when recording multiple events
  ...

1 files changed, 100 insertions, 12 deletions

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index cfc655d40bb7..f815de25d0fc 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -45,28 +45,71 @@ static char		*pretty_printing_style = default_pretty_printing_style;
 
 static char             callchain_default_opt[] = "fractal,0.5";
 
+static struct event_stat_id *get_stats(struct perf_session *self,
+                                       u64 event_stream, u32 type, u64 config)
+{
+        struct rb_node **p = &self->stats_by_id.rb_node;
+        struct rb_node *parent = NULL;
+        struct event_stat_id *iter, *new;
+
+        while (*p != NULL) {
+                parent = *p;
+                iter = rb_entry(parent, struct event_stat_id, rb_node);
+                if (iter->config == config)
+                        return iter;
+
+
+                if (config > iter->config)
+                        p = &(*p)->rb_right;
+                else
+                        p = &(*p)->rb_left;
+        }
+
+        new = malloc(sizeof(struct event_stat_id));
+        if (new == NULL)
+                return NULL;
+        memset(new, 0, sizeof(struct event_stat_id));
+        new->event_stream = event_stream;
+        new->config = config;
+        new->type = type;
+        rb_link_node(&new->rb_node, parent, p);
+        rb_insert_color(&new->rb_node, &self->stats_by_id);
+        return new;
+}
+
 static int perf_session__add_hist_entry(struct perf_session *self,
                                         struct addr_location *al,
-                                        struct ip_callchain *chain, u64 count)
+                                        struct sample_data *data)
 {
         struct symbol **syms = NULL, *parent = NULL;
         bool hit;
         struct hist_entry *he;
+        struct event_stat_id *stats;
+        struct perf_event_attr *attr;
 
-        if ((sort__has_parent || symbol_conf.use_callchain) && chain)
+        if ((sort__has_parent || symbol_conf.use_callchain) && data->callchain)
                 syms = perf_session__resolve_callchain(self, al->thread,
-                                                       chain, &parent);
-        he = __perf_session__add_hist_entry(self, al, parent, count, &hit);
+                                                       data->callchain, &parent);
+
+        attr = perf_header__find_attr(data->id, &self->header);
+        if (attr)
+                stats = get_stats(self, data->id, attr->type, attr->config);
+        else
+                stats = get_stats(self, data->id, 0, 0);
+        if (stats == NULL)
+                return -ENOMEM;
+        he = __perf_session__add_hist_entry(&stats->hists, al, parent,
+                                            data->period, &hit);
         if (he == NULL)
                 return -ENOMEM;
 
         if (hit)
-                he->count += count;
+                he->count += data->period;
 
         if (symbol_conf.use_callchain) {
                 if (!hit)
                         callchain_init(&he->callchain);
-                append_chain(&he->callchain, chain, syms);
+                append_chain(&he->callchain, data->callchain, syms);
                 free(syms);
         }
 
@@ -86,10 +129,30 @@ static int validate_chain(struct ip_callchain *chain, event_t *event)
         return 0;
 }
 
+static int add_event_total(struct perf_session *session,
+                           struct sample_data *data,
+                           struct perf_event_attr *attr)
+{
+        struct event_stat_id *stats;
+
+        if (attr)
+                stats = get_stats(session, data->id, attr->type, attr->config);
+        else
+                stats = get_stats(session, data->id, 0, 0);
+
+        if (!stats)
+                return -ENOMEM;
+
+        stats->stats.total += data->period;
+        session->events_stats.total += data->period;
+        return 0;
+}
+
 static int process_sample_event(event_t *event, struct perf_session *session)
 {
         struct sample_data data = { .period = 1, };
         struct addr_location al;
+        struct perf_event_attr *attr;
 
         event__parse_sample(event, session->sample_type, &data);
 
@@ -123,12 +186,18 @@ static int process_sample_event(event_t *event, struct perf_session *session)
         if (al.filtered || (hide_unresolved && al.sym == NULL))
                 return 0;
 
-        if (perf_session__add_hist_entry(session, &al, data.callchain, data.period)) {
+        if (perf_session__add_hist_entry(session, &al, &data)) {
                 pr_debug("problem incrementing symbol count, skipping event\n");
                 return -1;
         }
 
-        session->events_stats.total += data.period;
+        attr = perf_header__find_attr(data.id, &session->header);
+
+        if (add_event_total(session, &data, attr)) {
+                pr_debug("problem adding event count\n");
+                return -1;
+        }
+
         return 0;
 }
 
@@ -197,6 +266,7 @@ static int __cmd_report(void)
 {
         int ret = -EINVAL;
         struct perf_session *session;
+        struct rb_node *next;
 
         session = perf_session__new(input_name, O_RDONLY, force);
         if (session == NULL)
@@ -224,10 +294,28 @@ static int __cmd_report(void)
         if (verbose > 2)
                 dsos__fprintf(stdout);
 
-        perf_session__collapse_resort(session);
-        perf_session__output_resort(session, session->events_stats.total);
-        fprintf(stdout, "# Samples: %Ld\n#\n", session->events_stats.total);
-        perf_session__fprintf_hists(session, NULL, false, stdout);
+        next = rb_first(&session->stats_by_id);
+        while (next) {
+                struct event_stat_id *stats;
+
+                stats = rb_entry(next, struct event_stat_id, rb_node);
+                perf_session__collapse_resort(&stats->hists);
+                perf_session__output_resort(&stats->hists, stats->stats.total);
+                if (rb_first(&session->stats_by_id) ==
+                    rb_last(&session->stats_by_id))
+                        fprintf(stdout, "# Samples: %Ld\n#\n",
+                                stats->stats.total);
+                else
+                        fprintf(stdout, "# Samples: %Ld %s\n#\n",
+                                stats->stats.total,
+                                __event_name(stats->type, stats->config));
+
+                perf_session__fprintf_hists(&stats->hists, NULL, false, stdout,
+                                            stats->stats.total);
+                fprintf(stdout, "\n\n");
+                next = rb_next(&stats->rb_node);
+        }
+
         if (sort_order == default_sort_order &&
             parent_pattern == default_parent_pattern)
                 fprintf(stdout, "#\n# (For a higher level overview, try: perf report --sort comm,dso)\n#\n");