22 files changed, 234 insertions, 140 deletions

diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
index bbc782e364b0..cbaa7af45513 100644
--- a/tools/perf/ui/browser.c
+++ b/tools/perf/ui/browser.c
@@ -569,7 +569,7 @@ void ui_browser__argv_seek(struct ui_browser *browser, off_t offset, int whence)
                 browser->top = browser->top + browser->top_idx + offset;
                 break;
         case SEEK_END:
-                browser->top = browser->top + browser->nr_entries + offset;
+                browser->top = browser->top + browser->nr_entries - 1 + offset;
                 break;
         default:
                 return;
@@ -680,7 +680,7 @@ static void __ui_browser__line_arrow_down(struct ui_browser *browser,
         if (end >= browser->top_idx + browser->height)
                 end_row = browser->height - 1;
         else
-                end_row = end - browser->top_idx;;
+                end_row = end - browser->top_idx;
 
         ui_browser__gotorc(browser, row, column);
         SLsmg_draw_vline(end_row - row + 1);
diff --git a/tools/perf/ui/browser.h b/tools/perf/ui/browser.h
index 404ff66a3e36..7d45d2f53601 100644
--- a/tools/perf/ui/browser.h
+++ b/tools/perf/ui/browser.h
@@ -21,32 +21,32 @@ struct ui_browser {
         void          *priv;
         const char    *title;
         char          *helpline;
-        unsigned int  (*refresh)(struct ui_browser *self);
-        void          (*write)(struct ui_browser *self, void *entry, int row);
-        void          (*seek)(struct ui_browser *self, off_t offset, int whence);
-        bool          (*filter)(struct ui_browser *self, void *entry);
+        unsigned int  (*refresh)(struct ui_browser *browser);
+        void          (*write)(struct ui_browser *browser, void *entry, int row);
+        void          (*seek)(struct ui_browser *browser, off_t offset, int whence);
+        bool          (*filter)(struct ui_browser *browser, void *entry);
         u32           nr_entries;
         bool          navkeypressed;
         bool          use_navkeypressed;
 };
 
 int  ui_browser__set_color(struct ui_browser *browser, int color);
-void ui_browser__set_percent_color(struct ui_browser *self,
+void ui_browser__set_percent_color(struct ui_browser *browser,
                                    double percent, bool current);
-bool ui_browser__is_current_entry(struct ui_browser *self, unsigned row);
-void ui_browser__refresh_dimensions(struct ui_browser *self);
-void ui_browser__reset_index(struct ui_browser *self);
+bool ui_browser__is_current_entry(struct ui_browser *browser, unsigned row);
+void ui_browser__refresh_dimensions(struct ui_browser *browser);
+void ui_browser__reset_index(struct ui_browser *browser);
 
-void ui_browser__gotorc(struct ui_browser *self, int y, int x);
+void ui_browser__gotorc(struct ui_browser *browser, int y, int x);
 void ui_browser__write_graph(struct ui_browser *browser, int graph);
 void __ui_browser__line_arrow(struct ui_browser *browser, unsigned int column,
                               u64 start, u64 end);
 void __ui_browser__show_title(struct ui_browser *browser, const char *title);
 void ui_browser__show_title(struct ui_browser *browser, const char *title);
-int ui_browser__show(struct ui_browser *self, const char *title,
+int ui_browser__show(struct ui_browser *browser, const char *title,
                      const char *helpline, ...);
-void ui_browser__hide(struct ui_browser *self);
-int ui_browser__refresh(struct ui_browser *self);
+void ui_browser__hide(struct ui_browser *browser);
+int ui_browser__refresh(struct ui_browser *browser);
 int ui_browser__run(struct ui_browser *browser, int delay_secs);
 void ui_browser__update_nr_entries(struct ui_browser *browser, u32 nr_entries);
 void ui_browser__handle_resize(struct ui_browser *browser);
@@ -63,11 +63,11 @@ int ui_browser__input_window(const char *title, const char *text, char *input,
 void ui_browser__argv_seek(struct ui_browser *browser, off_t offset, int whence);
 unsigned int ui_browser__argv_refresh(struct ui_browser *browser);
 
-void ui_browser__rb_tree_seek(struct ui_browser *self, off_t offset, int whence);
-unsigned int ui_browser__rb_tree_refresh(struct ui_browser *self);
+void ui_browser__rb_tree_seek(struct ui_browser *browser, off_t offset, int whence);
+unsigned int ui_browser__rb_tree_refresh(struct ui_browser *browser);
 
-void ui_browser__list_head_seek(struct ui_browser *self, off_t offset, int whence);
-unsigned int ui_browser__list_head_refresh(struct ui_browser *self);
+void ui_browser__list_head_seek(struct ui_browser *browser, off_t offset, int whence);
+unsigned int ui_browser__list_head_refresh(struct ui_browser *browser);
 
 void ui_browser__init(void);
 void annotate_browser__init(void);
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 08545ae46992..f0697a3aede0 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -442,35 +442,37 @@ static bool annotate_browser__callq(struct annotate_browser *browser,
 {
         struct map_symbol *ms = browser->b.priv;
         struct disasm_line *dl = browser->selection;
-        struct symbol *sym = ms->sym;
         struct annotation *notes;
-        struct symbol *target;
-        u64 ip;
+        struct addr_map_symbol target = {
+                .map = ms->map,
+                .addr = map__objdump_2mem(ms->map, dl->ops.target.addr),
+        };
         char title[SYM_TITLE_MAX_SIZE];
 
         if (!ins__is_call(dl->ins))
                 return false;
 
-        ip = ms->map->map_ip(ms->map, dl->ops.target.addr);
-        target = map__find_symbol(ms->map, ip, NULL);
-        if (target == NULL) {
+        if (map_groups__find_ams(&target, NULL) ||
+            map__rip_2objdump(target.map, target.map->map_ip(target.map,
+                                                             target.addr)) !=
+            dl->ops.target.addr) {
                 ui_helpline__puts("The called function was not found.");
                 return true;
         }
 
-        notes = symbol__annotation(target);
+        notes = symbol__annotation(target.sym);
         pthread_mutex_lock(&notes->lock);
 
-        if (notes->src == NULL && symbol__alloc_hist(target) < 0) {
+        if (notes->src == NULL && symbol__alloc_hist(target.sym) < 0) {
                 pthread_mutex_unlock(&notes->lock);
                 ui__warning("Not enough memory for annotating '%s' symbol!\n",
-                            target->name);
+                            target.sym->name);
                 return true;
         }
 
         pthread_mutex_unlock(&notes->lock);
-        symbol__tui_annotate(target, ms->map, evsel, hbt);
-        sym_title(sym, ms->map, title, sizeof(title));
+        symbol__tui_annotate(target.sym, target.map, evsel, hbt);
+        sym_title(ms->sym, ms->map, title, sizeof(title));
         ui_browser__show_title(&browser->b, title);
         return true;
 }
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 7ef36c360471..a440e03cd8c2 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1255,7 +1255,7 @@ static int hists__browser_title(struct hists *hists, char *bf, size_t size,
         if (thread)
                 printed += scnprintf(bf + printed, size - printed,
                                     ", Thread: %s(%d)",
-                                    (thread->comm_set ? thread->comm : ""),
+                                     (thread->comm_set ? thread__comm_str(thread) : ""),
                                     thread->tid);
         if (dso)
                 printed += scnprintf(bf + printed, size - printed,
@@ -1578,7 +1578,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
                 if (thread != NULL &&
                     asprintf(&options[nr_options], "Zoom %s %s(%d) thread",
                              (browser->hists->thread_filter ? "out of" : "into"),
-                             (thread->comm_set ? thread->comm : ""),
+                             (thread->comm_set ? thread__comm_str(thread) : ""),
                              thread->tid) > 0)
                         zoom_thread = nr_options++;
 
@@ -1598,7 +1598,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
                         struct symbol *sym;
 
                         if (asprintf(&options[nr_options], "Run scripts for samples of thread [%s]",
-                                browser->he_selection->thread->comm) > 0)
+                                     thread__comm_str(browser->he_selection->thread)) > 0)
                                 scripts_comm = nr_options++;
 
                         sym = browser->he_selection->ms.sym;
@@ -1701,7 +1701,7 @@ zoom_out_thread:
                                 sort_thread.elide = false;
                         } else {
                                 ui_helpline__fpush("To zoom out press <- or -> + \"Zoom out of %s(%d) thread\"",
-                                                   thread->comm_set ? thread->comm : "",
+                                                   thread->comm_set ? thread__comm_str(thread) : "",
                                                    thread->tid);
                                 browser->hists->thread_filter = thread;
                                 sort_thread.elide = true;
@@ -1717,7 +1717,7 @@ do_scripts:
                         memset(script_opt, 0, 64);
 
                         if (choice == scripts_comm)
-                                sprintf(script_opt, " -c %s ", browser->he_selection->thread->comm);
+                                sprintf(script_opt, " -c %s ", thread__comm_str(browser->he_selection->thread));
 
                         if (choice == scripts_symbol)
                                 sprintf(script_opt, " -S %s ", browser->he_selection->ms.sym->name);
@@ -1847,15 +1847,15 @@ browse_hists:
                         switch (key) {
                         case K_TAB:
                                 if (pos->node.next == &evlist->entries)
-                                        pos = list_entry(evlist->entries.next, struct perf_evsel, node);
+                                        pos = perf_evlist__first(evlist);
                                 else
-                                        pos = list_entry(pos->node.next, struct perf_evsel, node);
+                                        pos = perf_evsel__next(pos);
                                 goto browse_hists;
                         case K_UNTAB:
                                 if (pos->node.prev == &evlist->entries)
-                                        pos = list_entry(evlist->entries.prev, struct perf_evsel, node);
+                                        pos = perf_evlist__last(evlist);
                                 else
-                                        pos = list_entry(pos->node.prev, struct perf_evsel, node);
+                                        pos = perf_evsel__prev(pos);
                                 goto browse_hists;
                         case K_ESC:
                                 if (!ui_browser__dialog_yesno(&menu->b,
@@ -1889,7 +1889,7 @@ out:
         return key;
 }
 
-static bool filter_group_entries(struct ui_browser *self __maybe_unused,
+static bool filter_group_entries(struct ui_browser *browser __maybe_unused,
                                  void *entry)
 {
         struct perf_evsel *evsel = list_entry(entry, struct perf_evsel, node);
@@ -1943,8 +1943,7 @@ int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help,
 
 single_entry:
         if (nr_entries == 1) {
-                struct perf_evsel *first = list_entry(evlist->entries.next,
-                                                      struct perf_evsel, node);
+                struct perf_evsel *first = perf_evlist__first(evlist);
                 const char *ev_name = perf_evsel__name(first);
 
                 return perf_evsel__hists_browse(first, nr_entries, help,
diff --git a/tools/perf/ui/browsers/map.c b/tools/perf/ui/browsers/map.c
index 95c7cfb8f2c6..b11639f33682 100644
--- a/tools/perf/ui/browsers/map.c
+++ b/tools/perf/ui/browsers/map.c
@@ -18,30 +18,30 @@ struct map_browser {
         u8                addrlen;
 };
 
-static void map_browser__write(struct ui_browser *self, void *nd, int row)
+static void map_browser__write(struct ui_browser *browser, void *nd, int row)
 {
         struct symbol *sym = rb_entry(nd, struct symbol, rb_node);
-        struct map_browser *mb = container_of(self, struct map_browser, b);
-        bool current_entry = ui_browser__is_current_entry(self, row);
+        struct map_browser *mb = container_of(browser, struct map_browser, b);
+        bool current_entry = ui_browser__is_current_entry(browser, row);
         int width;
 
-        ui_browser__set_percent_color(self, 0, current_entry);
+        ui_browser__set_percent_color(browser, 0, current_entry);
         slsmg_printf("%*" PRIx64 " %*" PRIx64 " %c ",
                      mb->addrlen, sym->start, mb->addrlen, sym->end,
                      sym->binding == STB_GLOBAL ? 'g' :
                      sym->binding == STB_LOCAL  ? 'l' : 'w');
-        width = self->width - ((mb->addrlen * 2) + 4);
+        width = browser->width - ((mb->addrlen * 2) + 4);
         if (width > 0)
                 slsmg_write_nstring(sym->name, width);
 }
 
 /* FIXME uber-kludgy, see comment on cmd_report... */
-static u32 *symbol__browser_index(struct symbol *self)
+static u32 *symbol__browser_index(struct symbol *browser)
 {
-        return ((void *)self) - sizeof(struct rb_node) - sizeof(u32);
+        return ((void *)browser) - sizeof(struct rb_node) - sizeof(u32);
 }
 
-static int map_browser__search(struct map_browser *self)
+static int map_browser__search(struct map_browser *browser)
 {
         char target[512];
         struct symbol *sym;
@@ -53,37 +53,37 @@ static int map_browser__search(struct map_browser *self)
 
         if (target[0] == '0' && tolower(target[1]) == 'x') {
                 u64 addr = strtoull(target, NULL, 16);
-                sym = map__find_symbol(self->map, addr, NULL);
+                sym = map__find_symbol(browser->map, addr, NULL);
         } else
-                sym = map__find_symbol_by_name(self->map, target, NULL);
+                sym = map__find_symbol_by_name(browser->map, target, NULL);
 
         if (sym != NULL) {
                 u32 *idx = symbol__browser_index(sym);
 
-                self->b.top = &sym->rb_node;
-                self->b.index = self->b.top_idx = *idx;
+                browser->b.top = &sym->rb_node;
+                browser->b.index = browser->b.top_idx = *idx;
         } else
                 ui_helpline__fpush("%s not found!", target);
 
         return 0;
 }
 
-static int map_browser__run(struct map_browser *self)
+static int map_browser__run(struct map_browser *browser)
 {
         int key;
 
-        if (ui_browser__show(&self->b, self->map->dso->long_name,
+        if (ui_browser__show(&browser->b, browser->map->dso->long_name,
                              "Press <- or ESC to exit, %s / to search",
                              verbose ? "" : "restart with -v to use") < 0)
                 return -1;
 
         while (1) {
-                key = ui_browser__run(&self->b, 0);
+                key = ui_browser__run(&browser->b, 0);
 
                 switch (key) {
                 case '/':
                         if (verbose)
-                                map_browser__search(self);
+                                map_browser__search(browser);
                 default:
                         break;
                 case K_LEFT:
@@ -94,20 +94,20 @@ static int map_browser__run(struct map_browser *self)
                 }
         }
 out:
-        ui_browser__hide(&self->b);
+        ui_browser__hide(&browser->b);
         return key;
 }
 
-int map__browse(struct map *self)
+int map__browse(struct map *map)
 {
         struct map_browser mb = {
                 .b = {
-                        .entries = &self->dso->symbols[self->type],
+                        .entries = &map->dso->symbols[map->type],
                         .refresh = ui_browser__rb_tree_refresh,
                         .seek    = ui_browser__rb_tree_seek,
                         .write   = map_browser__write,
                 },
-                .map = self,
+                .map = map,
         };
         struct rb_node *nd;
         char tmp[BITS_PER_LONG / 4];
diff --git a/tools/perf/ui/browsers/map.h b/tools/perf/ui/browsers/map.h
index df8581a43e17..2d58e4b3eb6f 100644
--- a/tools/perf/ui/browsers/map.h
+++ b/tools/perf/ui/browsers/map.h
@@ -2,5 +2,5 @@
 #define _PERF_UI_MAP_BROWSER_H_ 1
 struct map;
 
-int map__browse(struct map *self);
+int map__browse(struct map *map);
 #endif /* _PERF_UI_MAP_BROWSER_H_ */
diff --git a/tools/perf/ui/browsers/scripts.c b/tools/perf/ui/browsers/scripts.c
index 12f009e61e94..d63c68ea02a8 100644
--- a/tools/perf/ui/browsers/scripts.c
+++ b/tools/perf/ui/browsers/scripts.c
@@ -84,22 +84,22 @@ static void script_browser__write(struct ui_browser *browser,
         slsmg_write_nstring(sline->line, browser->width);
 }
 
-static int script_browser__run(struct perf_script_browser *self)
+static int script_browser__run(struct perf_script_browser *browser)
 {
         int key;
 
-        if (ui_browser__show(&self->b, self->script_name,
+        if (ui_browser__show(&browser->b, browser->script_name,
                              "Press <- or ESC to exit") < 0)
                 return -1;
 
         while (1) {
-                key = ui_browser__run(&self->b, 0);
+                key = ui_browser__run(&browser->b, 0);
 
                 /* We can add some special key handling here if needed */
                 break;
         }
 
-        ui_browser__hide(&self->b);
+        ui_browser__hide(&browser->b);
         return key;
 }
 
diff --git a/tools/perf/ui/gtk/annotate.c b/tools/perf/ui/gtk/annotate.c
index f538794615db..9c7ff8d31b27 100644
--- a/tools/perf/ui/gtk/annotate.c
+++ b/tools/perf/ui/gtk/annotate.c
@@ -154,9 +154,9 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,
         return 0;
 }
 
-int symbol__gtk_annotate(struct symbol *sym, struct map *map,
-                         struct perf_evsel *evsel,
-                         struct hist_browser_timer *hbt)
+static int symbol__gtk_annotate(struct symbol *sym, struct map *map,
+                                struct perf_evsel *evsel,
+                                struct hist_browser_timer *hbt)
 {
         GtkWidget *window;
         GtkWidget *notebook;
@@ -226,6 +226,13 @@ int symbol__gtk_annotate(struct symbol *sym, struct map *map,
         return 0;
 }
 
+int hist_entry__gtk_annotate(struct hist_entry *he,
+                             struct perf_evsel *evsel,
+                             struct hist_browser_timer *hbt)
+{
+        return symbol__gtk_annotate(he->ms.sym, he->ms.map, evsel, hbt);
+}
+
 void perf_gtk__show_annotations(void)
 {
         GtkWidget *window;
diff --git a/tools/perf/ui/gtk/browser.c b/tools/perf/ui/gtk/browser.c
index c95012cdb438..c24d91221290 100644
--- a/tools/perf/ui/gtk/browser.c
+++ b/tools/perf/ui/gtk/browser.c
@@ -43,7 +43,7 @@ const char *perf_gtk__get_percent_color(double percent)
         return NULL;
 }
 
-#ifdef HAVE_GTK_INFO_BAR
+#ifdef HAVE_GTK_INFO_BAR_SUPPORT
 GtkWidget *perf_gtk__setup_info_bar(void)
 {
         GtkWidget *info_bar;
diff --git a/tools/perf/ui/gtk/gtk.h b/tools/perf/ui/gtk/gtk.h
index 3d96785ef155..0a9173ff9a61 100644
--- a/tools/perf/ui/gtk/gtk.h
+++ b/tools/perf/ui/gtk/gtk.h
@@ -12,7 +12,7 @@ struct perf_gtk_context {
         GtkWidget *main_window;
         GtkWidget *notebook;
 
-#ifdef HAVE_GTK_INFO_BAR
+#ifdef HAVE_GTK_INFO_BAR_SUPPORT
         GtkWidget *info_bar;
         GtkWidget *message_label;
 #endif
@@ -20,6 +20,9 @@ struct perf_gtk_context {
         guint statbar_ctx_id;
 };
 
+int perf_gtk__init(void);
+void perf_gtk__exit(bool wait_for_ok);
+
 extern struct perf_gtk_context *pgctx;
 
 static inline bool perf_gtk__is_active_context(struct perf_gtk_context *ctx)
@@ -31,7 +34,7 @@ struct perf_gtk_context *perf_gtk__activate_context(GtkWidget *window);
 int perf_gtk__deactivate_context(struct perf_gtk_context **ctx);
 
 void perf_gtk__init_helpline(void);
-void perf_gtk__init_progress(void);
+void gtk_ui_progress__init(void);
 void perf_gtk__init_hpp(void);
 
 void perf_gtk__signal(int sig);
@@ -39,7 +42,7 @@ void perf_gtk__resize_window(GtkWidget *window);
 const char *perf_gtk__get_percent_color(double percent);
 GtkWidget *perf_gtk__setup_statusbar(void);
 
-#ifdef HAVE_GTK_INFO_BAR
+#ifdef HAVE_GTK_INFO_BAR_SUPPORT
 GtkWidget *perf_gtk__setup_info_bar(void);
 #else
 static inline GtkWidget *perf_gtk__setup_info_bar(void)
@@ -48,4 +51,17 @@ static inline GtkWidget *perf_gtk__setup_info_bar(void)
 }
 #endif
 
+struct perf_evsel;
+struct perf_evlist;
+struct hist_entry;
+struct hist_browser_timer;
+
+int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist, const char *help,
+                                  struct hist_browser_timer *hbt,
+                                  float min_pcnt);
+int hist_entry__gtk_annotate(struct hist_entry *he,
+                             struct perf_evsel *evsel,
+                             struct hist_browser_timer *hbt);
+void perf_gtk__show_annotations(void);
+
 #endif /* _PERF_GTK_H_ */
diff --git a/tools/perf/ui/gtk/progress.c b/tools/perf/ui/gtk/progress.c
index 482bcf3df9b7..b656655fbc39 100644
--- a/tools/perf/ui/gtk/progress.c
+++ b/tools/perf/ui/gtk/progress.c
@@ -7,14 +7,14 @@
 static GtkWidget *dialog;
 static GtkWidget *progress;
 
-static void gtk_progress_update(u64 curr, u64 total, const char *title)
+static void gtk_ui_progress__update(struct ui_progress *p)
 {
-        double fraction = total ? 1.0 * curr / total : 0.0;
+        double fraction = p->total ? 1.0 * p->curr / p->total : 0.0;
         char buf[1024];
 
         if (dialog == NULL) {
                 GtkWidget *vbox = gtk_vbox_new(TRUE, 5);
-                GtkWidget *label = gtk_label_new(title);
+                GtkWidget *label = gtk_label_new(p->title);
 
                 dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
                 progress = gtk_progress_bar_new();
@@ -32,7 +32,7 @@ static void gtk_progress_update(u64 curr, u64 total, const char *title)
         }
 
         gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress), fraction);
-        snprintf(buf, sizeof(buf), "%"PRIu64" / %"PRIu64, curr, total);
+        snprintf(buf, sizeof(buf), "%"PRIu64" / %"PRIu64, p->curr, p->total);
         gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), buf);
 
         /* we didn't call gtk_main yet, so do it manually */
@@ -40,7 +40,7 @@ static void gtk_progress_update(u64 curr, u64 total, const char *title)
                 gtk_main_iteration();
 }
 
-static void gtk_progress_finish(void)
+static void gtk_ui_progress__finish(void)
 {
         /* this will also destroy all of its children */
         gtk_widget_destroy(dialog);
@@ -48,12 +48,12 @@ static void gtk_progress_finish(void)
         dialog = NULL;
 }
 
-static struct ui_progress gtk_progress_fns = {
-        .update         = gtk_progress_update,
-        .finish         = gtk_progress_finish,
+static struct ui_progress_ops gtk_ui_progress__ops = {
+        .update         = gtk_ui_progress__update,
+        .finish         = gtk_ui_progress__finish,
 };
 
-void perf_gtk__init_progress(void)
+void gtk_ui_progress__init(void)
 {
-        progress_fns = &gtk_progress_fns;
+        ui_progress__ops = &gtk_ui_progress__ops;
 }
diff --git a/tools/perf/ui/gtk/setup.c b/tools/perf/ui/gtk/setup.c
index 6c2dd2e423f3..1d57676f8212 100644
--- a/tools/perf/ui/gtk/setup.c
+++ b/tools/perf/ui/gtk/setup.c
@@ -8,7 +8,7 @@ int perf_gtk__init(void)
 {
         perf_error__register(&perf_gtk_eops);
         perf_gtk__init_helpline();
-        perf_gtk__init_progress();
+        gtk_ui_progress__init();
         perf_gtk__init_hpp();
 
         return gtk_init_check(NULL, NULL) ? 0 : -1;
diff --git a/tools/perf/ui/gtk/util.c b/tools/perf/ui/gtk/util.c
index c06942a41c78..696c1fbe4248 100644
--- a/tools/perf/ui/gtk/util.c
+++ b/tools/perf/ui/gtk/util.c
@@ -53,7 +53,7 @@ static int perf_gtk__error(const char *format, va_list args)
         return 0;
 }
 
-#ifdef HAVE_GTK_INFO_BAR
+#ifdef HAVE_GTK_INFO_BAR_SUPPORT
 static int perf_gtk__warning_info_bar(const char *format, va_list args)
 {
         char *msg;
@@ -105,7 +105,7 @@ static int perf_gtk__warning_statusbar(const char *format, va_list args)
 
 struct perf_error_ops perf_gtk_eops = {
         .error          = perf_gtk__error,
-#ifdef HAVE_GTK_INFO_BAR
+#ifdef HAVE_GTK_INFO_BAR_SUPPORT
         .warning        = perf_gtk__warning_info_bar,
 #else
         .warning        = perf_gtk__warning_statusbar,
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 0a193281eba8..78f4c92e9b73 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -117,7 +117,7 @@ static int hpp__color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,		\
                               struct perf_hpp *hpp, struct hist_entry *he)      \
 {                                                                               \
         return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%",                 \
-                          (hpp_snprint_fn)percent_color_snprintf, true);        \
+                          percent_color_snprintf, true);                        \
 }
 
 #define __HPP_ENTRY_PERCENT_FN(_type, _field)                                   \
diff --git a/tools/perf/ui/progress.c b/tools/perf/ui/progress.c
index 3ec695607a4d..a0f24c7115c5 100644
--- a/tools/perf/ui/progress.c
+++ b/tools/perf/ui/progress.c
@@ -1,26 +1,38 @@
 #include "../cache.h"
 #include "progress.h"
 
-static void nop_progress_update(u64 curr __maybe_unused,
-                                u64 total __maybe_unused,
-                                const char *title __maybe_unused)
+static void null_progress__update(struct ui_progress *p __maybe_unused)
 {
 }
 
-static struct ui_progress default_progress_fns =
+static struct ui_progress_ops null_progress__ops =
 {
-        .update         = nop_progress_update,
+        .update = null_progress__update,
 };
 
-struct ui_progress *progress_fns = &default_progress_fns;
+struct ui_progress_ops *ui_progress__ops = &null_progress__ops;
 
-void ui_progress__update(u64 curr, u64 total, const char *title)
+void ui_progress__update(struct ui_progress *p, u64 adv)
 {
-        return progress_fns->update(curr, total, title);
+        p->curr += adv;
+
+        if (p->curr >= p->next) {
+                p->next += p->step;
+                ui_progress__ops->update(p);
+        }
+}
+
+void ui_progress__init(struct ui_progress *p, u64 total, const char *title)
+{
+        p->curr = 0;
+        p->next = p->step = total / 16;
+        p->total = total;
+        p->title = title;
+
 }
 
 void ui_progress__finish(void)
 {
-        if (progress_fns->finish)
-                progress_fns->finish();
+        if (ui_progress__ops->finish)
+                ui_progress__ops->finish();
 }
diff --git a/tools/perf/ui/progress.h b/tools/perf/ui/progress.h
index 257cc224f9cf..29ec8efffefb 100644
--- a/tools/perf/ui/progress.h
+++ b/tools/perf/ui/progress.h
@@ -3,16 +3,21 @@
 
 #include <../types.h>
 
+void ui_progress__finish(void);
+ 
 struct ui_progress {
-        void (*update)(u64, u64, const char *);
-        void (*finish)(void);
+        const char *title;
+        u64 curr, next, step, total;
 };
+ 
+void ui_progress__init(struct ui_progress *p, u64 total, const char *title);
+void ui_progress__update(struct ui_progress *p, u64 adv);
 
-extern struct ui_progress *progress_fns;
-
-void ui_progress__init(void);
+struct ui_progress_ops {
+        void (*update)(struct ui_progress *p);
+        void (*finish)(void);
+};
 
-void ui_progress__update(u64 curr, u64 total, const char *title);
-void ui_progress__finish(void);
+extern struct ui_progress_ops *ui_progress__ops;
 
 #endif
diff --git a/tools/perf/ui/setup.c b/tools/perf/ui/setup.c
index 47d9a571f261..5df5140a9f29 100644
--- a/tools/perf/ui/setup.c
+++ b/tools/perf/ui/setup.c
@@ -1,10 +1,64 @@
 #include <pthread.h>
+#include <dlfcn.h>
 
 #include "../util/cache.h"
 #include "../util/debug.h"
 #include "../util/hist.h"
 
 pthread_mutex_t ui__lock = PTHREAD_MUTEX_INITIALIZER;
+void *perf_gtk_handle;
+
+#ifdef HAVE_GTK2_SUPPORT
+static int setup_gtk_browser(void)
+{
+        int (*perf_ui_init)(void);
+
+        if (perf_gtk_handle)
+                return 0;
+
+        perf_gtk_handle = dlopen(PERF_GTK_DSO, RTLD_LAZY);
+        if (perf_gtk_handle == NULL) {
+                char buf[PATH_MAX];
+                scnprintf(buf, sizeof(buf), "%s/%s", LIBDIR, PERF_GTK_DSO);
+                perf_gtk_handle = dlopen(buf, RTLD_LAZY);
+        }
+        if (perf_gtk_handle == NULL)
+                return -1;
+
+        perf_ui_init = dlsym(perf_gtk_handle, "perf_gtk__init");
+        if (perf_ui_init == NULL)
+                goto out_close;
+
+        if (perf_ui_init() == 0)
+                return 0;
+
+out_close:
+        dlclose(perf_gtk_handle);
+        return -1;
+}
+
+static void exit_gtk_browser(bool wait_for_ok)
+{
+        void (*perf_ui_exit)(bool);
+
+        if (perf_gtk_handle == NULL)
+                return;
+
+        perf_ui_exit = dlsym(perf_gtk_handle, "perf_gtk__exit");
+        if (perf_ui_exit == NULL)
+                goto out_close;
+
+        perf_ui_exit(wait_for_ok);
+
+out_close:
+        dlclose(perf_gtk_handle);
+
+        perf_gtk_handle = NULL;
+}
+#else
+static inline int setup_gtk_browser(void) { return -1; }
+static inline void exit_gtk_browser(bool wait_for_ok __maybe_unused) {}
+#endif
 
 void setup_browser(bool fallback_to_pager)
 {
@@ -17,8 +71,11 @@ void setup_browser(bool fallback_to_pager)
 
         switch (use_browser) {
         case 2:
-                if (perf_gtk__init() == 0)
+                if (setup_gtk_browser() == 0)
                         break;
+                printf("GTK browser requested but could not find %s\n",
+                       PERF_GTK_DSO);
+                sleep(1);
                 /* fall through */
         case 1:
                 use_browser = 1;
@@ -39,7 +96,7 @@ void exit_browser(bool wait_for_ok)
 {
         switch (use_browser) {
         case 2:
-                perf_gtk__exit(wait_for_ok);
+                exit_gtk_browser(wait_for_ok);
                 break;
 
         case 1:
diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index 194e2f42ff5d..c244cb524ef2 100644
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -213,20 +213,19 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root,
         return ret;
 }
 
-static size_t __callchain__fprintf_flat(FILE *fp,
-                                        struct callchain_node *self,
+static size_t __callchain__fprintf_flat(FILE *fp, struct callchain_node *node,
                                         u64 total_samples)
 {
         struct callchain_list *chain;
         size_t ret = 0;
 
-        if (!self)
+        if (!node)
                 return 0;
 
-        ret += __callchain__fprintf_flat(fp, self->parent, total_samples);
+        ret += __callchain__fprintf_flat(fp, node->parent, total_samples);
 
 
-        list_for_each_entry(chain, &self->val, list) {
+        list_for_each_entry(chain, &node->val, list) {
                 if (chain->ip >= PERF_CONTEXT_MAX)
                         continue;
                 if (chain->ms.sym)
@@ -239,15 +238,14 @@ static size_t __callchain__fprintf_flat(FILE *fp,
         return ret;
 }
 
-static size_t callchain__fprintf_flat(FILE *fp, struct rb_root *self,
+static size_t callchain__fprintf_flat(FILE *fp, struct rb_root *tree,
                                       u64 total_samples)
 {
         size_t ret = 0;
         u32 entries_printed = 0;
-        struct rb_node *rb_node;
         struct callchain_node *chain;
+        struct rb_node *rb_node = rb_first(tree);
 
-        rb_node = rb_first(self);
         while (rb_node) {
                 double percent;
 
@@ -315,8 +313,7 @@ static inline void advance_hpp(struct perf_hpp *hpp, int inc)
 }
 
 static int hist_entry__period_snprintf(struct perf_hpp *hpp,
-                                       struct hist_entry *he,
-                                       bool color)
+                                       struct hist_entry *he)
 {
         const char *sep = symbol_conf.field_sep;
         struct perf_hpp_fmt *fmt;
@@ -338,7 +335,7 @@ static int hist_entry__period_snprintf(struct perf_hpp *hpp,
                 } else
                         first = false;
 
-                if (color && fmt->color)
+                if (perf_hpp__use_color() && fmt->color)
                         ret = fmt->color(fmt, hpp, he);
                 else
                         ret = fmt->entry(fmt, hpp, he);
@@ -358,12 +355,11 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
                 .buf            = bf,
                 .size           = size,
         };
-        bool color = !symbol_conf.field_sep;
 
         if (size == 0 || size > bfsz)
                 size = hpp.size = bfsz;
 
-        ret = hist_entry__period_snprintf(&hpp, he, color);
+        ret = hist_entry__period_snprintf(&hpp, he);
         hist_entry__sort_snprintf(he, bf + ret, size - ret, hists);
 
         ret = fprintf(fp, "%s\n", bf);
@@ -482,6 +478,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
 
 print_entries:
         linesz = hists__sort_list_width(hists) + 3 + 1;
+        linesz += perf_hpp__color_overhead();
         line = malloc(linesz);
         if (line == NULL) {
                 ret = -1;
diff --git a/tools/perf/ui/tui/progress.c b/tools/perf/ui/tui/progress.c
index 6c2184d53cbf..c61d14b101e0 100644
--- a/tools/perf/ui/tui/progress.c
+++ b/tools/perf/ui/tui/progress.c
@@ -2,9 +2,10 @@
 #include "../progress.h"
 #include "../libslang.h"
 #include "../ui.h"
+#include "tui.h"
 #include "../browser.h"
 
-static void tui_progress__update(u64 curr, u64 total, const char *title)
+static void tui_progress__update(struct ui_progress *p)
 {
         int bar, y;
         /*
@@ -14,29 +15,30 @@ static void tui_progress__update(u64 curr, u64 total, const char *title)
         if (use_browser <= 0)
                 return;
 
-        if (total == 0)
+        if (p->total == 0)
                 return;
 
-        ui__refresh_dimensions(true);
+        ui__refresh_dimensions(false);
         pthread_mutex_lock(&ui__lock);
         y = SLtt_Screen_Rows / 2 - 2;
         SLsmg_set_color(0);
         SLsmg_draw_box(y, 0, 3, SLtt_Screen_Cols);
         SLsmg_gotorc(y++, 1);
-        SLsmg_write_string((char *)title);
+        SLsmg_write_string((char *)p->title);
+        SLsmg_fill_region(y, 1, 1, SLtt_Screen_Cols - 2, ' ');
         SLsmg_set_color(HE_COLORSET_SELECTED);
-        bar = ((SLtt_Screen_Cols - 2) * curr) / total;
+        bar = ((SLtt_Screen_Cols - 2) * p->curr) / p->total;
         SLsmg_fill_region(y, 1, 1, bar, ' ');
         SLsmg_refresh();
         pthread_mutex_unlock(&ui__lock);
 }
 
-static struct ui_progress tui_progress_fns =
+static struct ui_progress_ops tui_progress__ops =
 {
         .update         = tui_progress__update,
 };
 
-void ui_progress__init(void)
+void tui_progress__init(void)
 {
-        progress_fns = &tui_progress_fns;
+        ui_progress__ops = &tui_progress__ops;
 }
diff --git a/tools/perf/ui/tui/setup.c b/tools/perf/ui/tui/setup.c
index b9401482d110..2f612562978c 100644
--- a/tools/perf/ui/tui/setup.c
+++ b/tools/perf/ui/tui/setup.c
@@ -9,6 +9,7 @@
 #include "../util.h"
 #include "../libslang.h"
 #include "../keysyms.h"
+#include "tui.h"
 
 static volatile int ui__need_resize;
 
@@ -119,7 +120,7 @@ int ui__init(void)
 
         ui_helpline__init();
         ui_browser__init();
-        ui_progress__init();
+        tui_progress__init();
 
         signal(SIGSEGV, ui__signal);
         signal(SIGFPE, ui__signal);
diff --git a/tools/perf/ui/tui/tui.h b/tools/perf/ui/tui/tui.h
new file mode 100644
index 000000000000..18961c7b6ec5
--- /dev/null
+++ b/tools/perf/ui/tui/tui.h
@@ -0,0 +1,6 @@
+#ifndef _PERF_TUI_H_
+#define _PERF_TUI_H_ 1
+
+void tui_progress__init(void);
+
+#endif /* _PERF_TUI_H_ */
diff --git a/tools/perf/ui/ui.h b/tools/perf/ui/ui.h
index 70cb0d4eb8aa..ab88383f8be8 100644
--- a/tools/perf/ui/ui.h
+++ b/tools/perf/ui/ui.h
@@ -6,13 +6,14 @@
 #include <linux/compiler.h>
 
 extern pthread_mutex_t ui__lock;
+extern void *perf_gtk_handle;
 
 extern int use_browser;
 
 void setup_browser(bool fallback_to_pager);
 void exit_browser(bool wait_for_ok);
 
-#ifdef SLANG_SUPPORT
+#ifdef HAVE_SLANG_SUPPORT
 int ui__init(void);
 void ui__exit(bool wait_for_ok);
 #else
@@ -23,17 +24,6 @@ static inline int ui__init(void)
 static inline void ui__exit(bool wait_for_ok __maybe_unused) {}
 #endif
 
-#ifdef GTK2_SUPPORT
-int perf_gtk__init(void);
-void perf_gtk__exit(bool wait_for_ok);
-#else
-static inline int perf_gtk__init(void)
-{
-        return -1;
-}
-static inline void perf_gtk__exit(bool wait_for_ok __maybe_unused) {}
-#endif
-
 void ui__refresh_dimensions(bool force);
 
 #endif /* _PERF_UI_H_ */