Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

Infrastructure fixes and changes:

  * Fix off-by-one bugs in map->end handling (Stephane Eranian)

  * Fix off-by-one bug in maps__find(), also related to map->end handling (Namhyung Kim)

  * Make struct symbol->end be the first addr after the symbol range, to make it
    match the convention used for struct map->end. (Arnaldo Carvalho de Melo)

  * Fix perf_evlist__add_pollfd() error handling in 'perf kvm stat live' (Jiri Olsa)

  * Fix python test build by moving callchain_param to an object linked into the
    python binding (Jiri Olsa)

  * Do not include a struct hists per perf_evsel, untangling the histogram code
    from perf_evsel, to pave the way for exporting a minimalistic
    tools/lib/api/perf/ library usable by tools/perf and initially by the rasd
    daemon being developed by Borislav Petkov, Robert Richter and Jean Pihet.
    (Arnaldo Carvalho de Melo)

  * Make perf_evlist__open(evlist, NULL, NULL), i.e. without cpu and thread
    maps mean syswide monitoring, reducing the boilerplate for tools that
    only want system wide mode. (Arnaldo Carvalho de Melo)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

35 files changed, 392 insertions, 229 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index be5939418425..e7417fe97a97 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -51,6 +51,7 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel,
                                   struct addr_location *al,
                                   struct perf_annotate *ann)
 {
+        struct hists *hists = evsel__hists(evsel);
         struct hist_entry *he;
         int ret;
 
@@ -66,13 +67,12 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel,
                 return 0;
         }
 
-        he = __hists__add_entry(&evsel->hists, al, NULL, NULL, NULL, 1, 1, 0,
-                                true);
+        he = __hists__add_entry(hists, al, NULL, NULL, NULL, 1, 1, 0, true);
         if (he == NULL)
                 return -ENOMEM;
 
         ret = hist_entry__inc_addr_samples(he, evsel->idx, al->addr);
-        hists__inc_nr_samples(&evsel->hists, true);
+        hists__inc_nr_samples(hists, true);
         return ret;
 }
 
@@ -214,6 +214,7 @@ static int __cmd_annotate(struct perf_annotate *ann)
 
         if (dump_trace) {
                 perf_session__fprintf_nr_events(session, stdout);
+                perf_evlist__fprintf_nr_events(session->evlist, stdout);
                 goto out;
         }
 
@@ -225,7 +226,7 @@ static int __cmd_annotate(struct perf_annotate *ann)
 
         total_nr_samples = 0;
         evlist__for_each(session->evlist, pos) {
-                struct hists *hists = &pos->hists;
+                struct hists *hists = evsel__hists(pos);
                 u32 nr_samples = hists->stats.nr_events[PERF_RECORD_SAMPLE];
 
                 if (nr_samples > 0) {
@@ -325,7 +326,10 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused)
                     "Show event group information together"),
         OPT_END()
         };
-        int ret;
+        int ret = hists__init();
+
+        if (ret < 0)
+                return ret;
 
         argc = parse_options(argc, argv, options, annotate_usage, 0);
 
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index a3ce19f7aebd..8c5c11ca8c53 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -327,6 +327,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
                                       struct machine *machine)
 {
         struct addr_location al;
+        struct hists *hists = evsel__hists(evsel);
 
         if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) {
                 pr_warning("problem processing %d event, skipping it.\n",
@@ -334,7 +335,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
                 return -1;
         }
 
-        if (hists__add_entry(&evsel->hists, &al, sample->period,
+        if (hists__add_entry(hists, &al, sample->period,
                              sample->weight, sample->transaction)) {
                 pr_warning("problem incrementing symbol period, skipping event\n");
                 return -1;
@@ -346,9 +347,9 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
          * hists__output_resort() and precompute needs the total
          * period in order to sort entries by percentage delta.
          */
-        evsel->hists.stats.total_period += sample->period;
+        hists->stats.total_period += sample->period;
         if (!al.filtered)
-                evsel->hists.stats.total_non_filtered_period += sample->period;
+                hists->stats.total_non_filtered_period += sample->period;
 
         return 0;
 }
@@ -382,7 +383,7 @@ static void perf_evlist__collapse_resort(struct perf_evlist *evlist)
         struct perf_evsel *evsel;
 
         evlist__for_each(evlist, evsel) {
-                struct hists *hists = &evsel->hists;
+                struct hists *hists = evsel__hists(evsel);
 
                 hists__collapse_resort(hists, NULL);
         }
@@ -631,24 +632,26 @@ static void data_process(void)
         bool first = true;
 
         evlist__for_each(evlist_base, evsel_base) {
+                struct hists *hists_base = evsel__hists(evsel_base);
                 struct data__file *d;
                 int i;
 
                 data__for_each_file_new(i, d) {