Merge branch 'pm-sleep'

[cascardo/linux.git] / tools / perf / ui / browsers / hists.c

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index a74cbd3..13d4143 100644 (file)
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -2029,7 +2029,7 @@ static int hist_browser__dump(struct hist_browser *browser)
        fp = fopen(filename, "w");
        if (fp == NULL) {
                char bf[64];
-               const char *err = strerror_r(errno, bf, sizeof(bf));
+               const char *err = str_error_r(errno, bf, sizeof(bf));
                ui_helpline__fpush("Couldn't write to %s: %s", filename, err);
                return -1;
        }
@@ -2042,24 +2042,46 @@ static int hist_browser__dump(struct hist_browser *browser)
        return 0;
 }
 
-struct hist_browser *hist_browser__new(struct hists *hists,
-                                      struct hist_browser_timer *hbt,
-                                      struct perf_env *env)
+void hist_browser__init(struct hist_browser *browser,
+                       struct hists *hists)
+{
+       struct perf_hpp_fmt *fmt;
+
+       browser->hists                  = hists;
+       browser->b.refresh              = hist_browser__refresh;
+       browser->b.refresh_dimensions   = hist_browser__refresh_dimensions;
+       browser->b.seek                 = ui_browser__hists_seek;
+       browser->b.use_navkeypressed    = true;
+       browser->show_headers           = symbol_conf.show_hist_headers;
+
+       hists__for_each_format(hists, fmt) {
+               perf_hpp__reset_width(fmt, hists);
+               ++browser->b.columns;
+       }
+}
+
+struct hist_browser *hist_browser__new(struct hists *hists)
 {
        struct hist_browser *browser = zalloc(sizeof(*browser));
 
+       if (browser)
+               hist_browser__init(browser, hists);
+
+       return browser;
+}
+
+static struct hist_browser *
+perf_evsel_browser__new(struct perf_evsel *evsel,
+                       struct hist_browser_timer *hbt,
+                       struct perf_env *env)
+{
+       struct hist_browser *browser = hist_browser__new(evsel__hists(evsel));
+
        if (browser) {
-               browser->hists = hists;
-               browser->b.refresh = hist_browser__refresh;
-               browser->b.refresh_dimensions = hist_browser__refresh_dimensions;
-               browser->b.seek = ui_browser__hists_seek;
-               browser->b.use_navkeypressed = true;
-               browser->show_headers = symbol_conf.show_hist_headers;
-               browser->hbt = hbt;
-               browser->env = env;
+               browser->hbt   = hbt;
+               browser->env   = env;
                browser->title = perf_evsel_browser_title;
        }
-
        return browser;
 }
 
@@ -2645,7 +2667,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
                                    struct perf_env *env)
 {
        struct hists *hists = evsel__hists(evsel);
-       struct hist_browser *browser = hist_browser__new(hists, hbt, env);
+       struct hist_browser *browser = perf_evsel_browser__new(evsel, hbt, env);
        struct branch_info *bi;
 #define MAX_OPTIONS  16
        char *options[MAX_OPTIONS];
@@ -2654,7 +2676,6 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
        int key = -1;
        char buf[64];
        int delay_secs = hbt ? hbt->refresh : 0;
-       struct perf_hpp_fmt *fmt;
 
 #define HIST_BROWSER_HELP_COMMON                                       \
        "h/?/F1        Show this window\n"                              \
@@ -2713,18 +2734,6 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
        memset(options, 0, sizeof(options));
        memset(actions, 0, sizeof(actions));
 
-       hists__for_each_format(browser->hists, fmt) {
-               perf_hpp__reset_width(fmt, hists);
-               /*
-                * This is done just once, and activates the horizontal scrolling
-                * code in the ui_browser code, it would be better to have a the
-                * counter in the perf_hpp code, but I couldn't find doing it here
-                * works, FIXME by setting this in hist_browser__new, for now, be
-                * clever 8-)
-                */
-               ++browser->b.columns;
-       }
-
        if (symbol_conf.col_width_list_str)
                perf_hpp__set_user_width(symbol_conf.col_width_list_str);
 
@@ -3190,7 +3199,7 @@ static int __perf_evlist__tui_browse_hists(struct perf_evlist *evlist,
 
        ui_helpline__push("Press ESC to exit");
 
-       evlist__for_each(evlist, pos) {
+       evlist__for_each_entry(evlist, pos) {
                const char *ev_name = perf_evsel__name(pos);
                size_t line_len = strlen(ev_name) + 7;
 
@@ -3221,7 +3230,7 @@ single_entry:
                struct perf_evsel *pos;
 
                nr_entries = 0;
-               evlist__for_each(evlist, pos) {
+               evlist__for_each_entry(evlist, pos) {
                        if (perf_evsel__is_group_leader(pos))
                                nr_entries++;
                }