perf hists browser: Introduce perf_evsel_browser constructor
authorJiri Olsa <jolsa@kernel.org>
Mon, 20 Jun 2016 21:58:17 +0000 (23:58 +0200)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 22 Jun 2016 12:56:35 +0000 (09:56 -0300)
So we could use hist_browser__new for generic hist browser in following
patches.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1466459899-1166-7-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/ui/browsers/hists.c
tools/perf/ui/browsers/hists.h

index ccb9ed62a0370c10e239904c44b5cd23ec39bbb2..a81b298b79f98bfe988973bb980ac4d1a2ba9640 100644 (file)
@@ -2042,9 +2042,7 @@ 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)
+struct hist_browser *hist_browser__new(struct hists *hists)
 {
        struct hist_browser *browser = zalloc(sizeof(*browser));
 
@@ -2057,9 +2055,6 @@ struct hist_browser *hist_browser__new(struct hists *hists,
                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->title = perf_evsel_browser_title;
 
                hists__for_each_format(hists, fmt) {
                        perf_hpp__reset_width(fmt, hists);
@@ -2070,6 +2065,21 @@ struct hist_browser *hist_browser__new(struct hists *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->hbt   = hbt;
+               browser->env   = env;
+               browser->title = perf_evsel_browser_title;
+       }
+       return browser;
+}
+
 void hist_browser__delete(struct hist_browser *browser)
 {
        free(browser);
@@ -2652,7 +2662,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];
index cf9d04928cccfb7ce06ac9a782bcbb16b326bf42..ec55a511d9109e22c8491b31856210e2f319a2c6 100644 (file)
@@ -24,9 +24,7 @@ struct hist_browser {
                             char *bf, size_t size);
 };
 
-struct hist_browser *hist_browser__new(struct hists *hists,
-                                      struct hist_browser_timer *hbt,
-                                      struct perf_env *env);
+struct hist_browser *hist_browser__new(struct hists *hists);
 void hist_browser__delete(struct hist_browser *browser);
 int hist_browser__run(struct hist_browser *browser, const char *help);
 #endif /* _PERF_UI_BROWSER_HISTS_H_ */