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>

3 files changed, 14 insertions, 9 deletions

diff --git a/tools/perf/ui/browsers/header.c b/tools/perf/ui/browsers/header.c
index 89c16b988618..e8278c558d4a 100644
--- a/tools/perf/ui/browsers/header.c
+++ b/tools/perf/ui/browsers/header.c
@@ -1,6 +1,7 @@
 #include "util/cache.h"
 #include "util/debug.h"
 #include "ui/browser.h"
+#include "ui/keysyms.h"
 #include "ui/ui.h"
 #include "ui/util.h"
 #include "ui/libslang.h"
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 8f60a970404f..68eab9ea1634 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1229,12 +1229,14 @@ static int hists__browser_title(struct hists *hists, char *bf, size_t size)
                 ev_name = buf;
 
                 for_each_group_member(pos, evsel) {
+                        struct hists *pos_hists = evsel__hists(pos);
+
                         if (symbol_conf.filter_relative) {
-                                nr_samples += pos->hists.stats.nr_non_filtered_samples;
-                                nr_events += pos->hists.stats.total_non_filtered_period;
+                                nr_samples += pos_hists->stats.nr_non_filtered_samples;
+                                nr_events += pos_hists->stats.total_non_filtered_period;
                         } else {
-                                nr_samples += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE];
-                                nr_events += pos->hists.stats.total_period;
+                                nr_samples += pos_hists->stats.nr_events[PERF_RECORD_SAMPLE];
+                                nr_events += pos_hists->stats.total_period;
                         }
                 }
         }
@@ -1387,7 +1389,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
                                     float min_pcnt,
                                     struct perf_session_env *env)
 {
-        struct hists *hists = &evsel->hists;
+        struct hists *hists = evsel__hists(evsel);
         struct hist_browser *browser = hist_browser__new(hists);
         struct branch_info *bi;
         struct pstack *fstack;
@@ -1802,8 +1804,9 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
         struct perf_evsel_menu *menu = container_of(browser,
                                                     struct perf_evsel_menu, b);
         struct perf_evsel *evsel = list_entry(entry, struct perf_evsel, node);
+        struct hists *hists = evsel__hists(evsel);
         bool current_entry = ui_browser__is_current_entry(browser, row);
-        unsigned long nr_events = evsel->hists.stats.nr_events[PERF_RECORD_SAMPLE];
+        unsigned long nr_events = hists->stats.nr_events[PERF_RECORD_SAMPLE];
         const char *ev_name = perf_evsel__name(evsel);
         char bf[256], unit;
         const char *warn = " ";
@@ -1818,7 +1821,8 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
                 ev_name = perf_evsel__group_name(evsel);
 
                 for_each_group_member(pos, evsel) {
-                        nr_events += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE];
+                        struct hists *pos_hists = evsel__hists(pos);
+                        nr_events += pos_hists->stats.nr_events[PERF_RECORD_SAMPLE];
                 }
         }
 
@@ -1827,7 +1831,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
                            unit, unit == ' ' ? "" : " ", ev_name);
         slsmg_printf("%s", bf);
 
-        nr_events = evsel->hists.stats.nr_events[PERF_RECORD_LOST];
+        nr_events = hists->stats.nr_events[PERF_RECORD_LOST];
         if (nr_events != 0) {
                 menu->lost_events = true;
                 if (!current_entry)
diff --git a/tools/perf/ui/gtk/hists.c b/tools/perf/ui/gtk/hists.c
index f3fa4258b256..fc654fb77ace 100644
--- a/tools/perf/ui/gtk/hists.c
+++ b/tools/perf/ui/gtk/hists.c
@@ -319,7 +319,7 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist,
         gtk_container_add(GTK_CONTAINER(window), vbox);
 
         evlist__for_each(evlist, pos) {
-                struct hists *hists = &pos->hists;
+                struct hists *hists = evsel__hists(pos);
                 const char *evname = perf_evsel__name(pos);
                 GtkWidget *scrolled_window;
                 GtkWidget *tab_label;