4 files changed, 146 insertions, 51 deletions

diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
index 3ccf6e14f89b..6680fa5cb9dd 100644
--- a/tools/perf/ui/browser.c
+++ b/tools/perf/ui/browser.c
@@ -150,7 +150,7 @@ unsigned int ui_browser__rb_tree_refresh(struct ui_browser *browser)
         while (nd != NULL) {
                 ui_browser__gotorc(browser, row, 0);
                 browser->write(browser, nd, row);
-                if (++row == browser->height)
+                if (++row == browser->rows)
                         break;
                 nd = rb_next(nd);
         }
@@ -166,7 +166,7 @@ bool ui_browser__is_current_entry(struct ui_browser *browser, unsigned row)
 void ui_browser__refresh_dimensions(struct ui_browser *browser)
 {
         browser->width = SLtt_Screen_Cols - 1;
-        browser->height = SLtt_Screen_Rows - 2;
+        browser->height = browser->rows = SLtt_Screen_Rows - 2;
         browser->y = 1;
         browser->x = 0;
 }
@@ -250,7 +250,10 @@ int ui_browser__show(struct ui_browser *browser, const char *title,
         int err;
         va_list ap;
 
-        ui_browser__refresh_dimensions(browser);
+        if (browser->refresh_dimensions == NULL)
+                browser->refresh_dimensions = ui_browser__refresh_dimensions;
+
+        browser->refresh_dimensions(browser);
 
         pthread_mutex_lock(&ui__lock);
         __ui_browser__show_title(browser, title);
@@ -279,7 +282,7 @@ static void ui_browser__scrollbar_set(struct ui_browser *browser)
 {
         int height = browser->height, h = 0, pct = 0,
             col = browser->width,
-            row = browser->y - 1;
+            row = 0;
 
         if (browser->nr_entries > 1) {
                 pct = ((browser->index * (browser->height - 1)) /
@@ -367,7 +370,7 @@ int ui_browser__run(struct ui_browser *browser, int delay_secs)
 
                 if (key == K_RESIZE) {
                         ui__refresh_dimensions(false);
-                        ui_browser__refresh_dimensions(browser);
+                        browser->refresh_dimensions(browser);
                         __ui_browser__show_title(browser, browser->title);
                         ui_helpline__puts(browser->helpline);
                         continue;
@@ -389,7 +392,7 @@ int ui_browser__run(struct ui_browser *browser, int delay_secs)
                         if (browser->index == browser->nr_entries - 1)
                                 break;
                         ++browser->index;
-                        if (browser->index == browser->top_idx + browser->height) {
+                        if (browser->index == browser->top_idx + browser->rows) {
                                 ++browser->top_idx;
                                 browser->seek(browser, +1, SEEK_CUR);
                         }
@@ -405,10 +408,10 @@ int ui_browser__run(struct ui_browser *browser, int delay_secs)
                         break;
                 case K_PGDN:
                 case ' ':
-                        if (browser->top_idx + browser->height > browser->nr_entries - 1)
+                        if (browser->top_idx + browser->rows > browser->nr_entries - 1)
                                 break;
 
-                        offset = browser->height;
+                        offset = browser->rows;
                         if (browser->index + offset > browser->nr_entries - 1)
                                 offset = browser->nr_entries - 1 - browser->index;
                         browser->index += offset;
@@ -419,10 +422,10 @@ int ui_browser__run(struct ui_browser *browser, int delay_secs)
                         if (browser->top_idx == 0)
                                 break;
 
-                        if (browser->top_idx < browser->height)
+                        if (browser->top_idx < browser->rows)
                                 offset = browser->top_idx;
                         else
-                                offset = browser->height;
+                                offset = browser->rows;
 
                         browser->index -= offset;
                         browser->top_idx -= offset;
@@ -432,7 +435,7 @@ int ui_browser__run(struct ui_browser *browser, int delay_secs)
                         ui_browser__reset_index(browser);
                         break;
                 case K_END:
-                        offset = browser->height - 1;
+                        offset = browser->rows - 1;
                         if (offset >= browser->nr_entries)
                                 offset = browser->nr_entries - 1;
 
@@ -462,7 +465,7 @@ unsigned int ui_browser__list_head_refresh(struct ui_browser *browser)
                 if (!browser->filter || !browser->filter(browser, pos)) {
                         ui_browser__gotorc(browser, row, 0);
                         browser->write(browser, pos, row);
-                        if (++row == browser->height)
+                        if (++row == browser->rows)
                                 break;
                 }
         }
@@ -587,7 +590,7 @@ unsigned int ui_browser__argv_refresh(struct ui_browser *browser)
                 if (!browser->filter || !browser->filter(browser, *pos)) {
                         ui_browser__gotorc(browser, row, 0);
                         browser->write(browser, pos, row);
-                        if (++row == browser->height)
+                        if (++row == browser->rows)
                                 break;
                 }
 
@@ -623,7 +626,7 @@ static void __ui_browser__line_arrow_up(struct ui_browser *browser,
 
         SLsmg_set_char_set(1);
 
-        if (start < browser->top_idx + browser->height) {
+        if (start < browser->top_idx + browser->rows) {
                 row = start - browser->top_idx;
                 ui_browser__gotorc(browser, row, column);
                 SLsmg_write_char(SLSMG_LLCORN_CHAR);
@@ -633,7 +636,7 @@ static void __ui_browser__line_arrow_up(struct ui_browser *browser,
                 if (row-- == 0)
                         goto out;
         } else
-                row = browser->height - 1;
+                row = browser->rows - 1;
 
         if (end > browser->top_idx)
                 end_row = end - browser->top_idx;
@@ -675,8 +678,8 @@ static void __ui_browser__line_arrow_down(struct ui_browser *browser,
         } else
                 row = 0;
 
-        if (end >= browser->top_idx + browser->height)
-                end_row = browser->height - 1;
+        if (end >= browser->top_idx + browser->rows)
+                end_row = browser->rows - 1;
         else
                 end_row = end - browser->top_idx;
 
@@ -684,7 +687,7 @@ static void __ui_browser__line_arrow_down(struct ui_browser *browser,
         SLsmg_draw_vline(end_row - row + 1);
 
         ui_browser__gotorc(browser, end_row, column);
-        if (end < browser->top_idx + browser->height) {
+        if (end < browser->top_idx + browser->rows) {
                 SLsmg_write_char(SLSMG_LLCORN_CHAR);
                 ui_browser__gotorc(browser, end_row, column + 1);
                 SLsmg_write_char(SLSMG_HLINE_CHAR);
diff --git a/tools/perf/ui/browser.h b/tools/perf/ui/browser.h
index 03d4d6295f10..92ae72113965 100644
--- a/tools/perf/ui/browser.h
+++ b/tools/perf/ui/browser.h
@@ -14,11 +14,12 @@
 struct ui_browser {
         u64           index, top_idx;
         void          *top, *entries;
-        u16           y, x, width, height;
+        u16           y, x, width, height, rows;
         int           current_color;
         void          *priv;
         const char    *title;
         char          *helpline;
+        void          (*refresh_dimensions)(struct ui_browser *browser);
         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);
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 04a229aa5c0f..a94b11fc5e00 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -26,6 +26,7 @@ struct hist_browser {
         struct map_symbol   *selection;
         int                  print_seq;
         bool                 show_dso;
+        bool                 show_headers;
         float                min_pcnt;
         u64                  nr_non_filtered_entries;
         u64                  nr_callchain_rows;
@@ -33,8 +34,7 @@ struct hist_browser {
 
 extern void hist_browser__init_hpp(void);
 
-static int hists__browser_title(struct hists *hists, char *bf, size_t size,
-                                const char *ev_name);
+static int hists__browser_title(struct hists *hists, char *bf, size_t size);
 static void hist_browser__update_nr_entries(struct hist_browser *hb);
 
 static struct rb_node *hists__filter_entries(struct rb_node *nd,
@@ -57,11 +57,42 @@ static u32 hist_browser__nr_entries(struct hist_browser *hb)
         return nr_entries + hb->nr_callchain_rows;
 }
 
-static void hist_browser__refresh_dimensions(struct hist_browser *browser)
+static void hist_browser__update_rows(struct hist_browser *hb)
 {
+        struct ui_browser *browser = &hb->b;
+        u16 header_offset = hb->show_headers ? 1 : 0, index_row;
+
+        browser->rows = browser->height - header_offset;
+        /*
+         * Verify if we were at the last line and that line isn't
+         * visibe because we now show the header line(s).
+         */
+        index_row = browser->index - browser->top_idx;
+        if (index_row >= browser->rows)
+                browser->index -= index_row - browser->rows + 1;
+}
+
+static void hist_browser__refresh_dimensions(struct ui_browser *browser)
+{
+        struct hist_browser *hb = container_of(browser, struct hist_browser, b);
+
         /* 3 == +/- toggle symbol before actual hist_entry rendering */
-        browser->b.width = 3 + (hists__sort_list_width(browser->hists) +
-                             sizeof("[k]"));
+        browser->width = 3 + (hists__sort_list_width(hb->hists) + sizeof("[k]"));
+        /*
+         * FIXME: Just keeping existing behaviour, but this really should be
+         *        before updating browser->width, as it will invalidate the
+         *        calculation above. Fix this and the fallout in another
+         *        changeset.
+         */
+        ui_browser__refresh_dimensions(browser);
+        hist_browser__update_rows(hb);
+}
+
+static void hist_browser__gotorc(struct hist_browser *browser, int row, int column)
+{
+        u16 header_offset = browser->show_headers ? 1 : 0;
+
+        ui_browser__gotorc(&browser->b, row + header_offset, column);
 }
 
 static void hist_browser__reset(struct hist_browser *browser)
@@ -74,7 +105,7 @@ static void hist_browser__reset(struct hist_browser *browser)
 
         hist_browser__update_nr_entries(browser);
         browser->b.nr_entries = hist_browser__nr_entries(browser);
-        hist_browser__refresh_dimensions(browser);
+        hist_browser__refresh_dimensions(&browser->b);
         ui_browser__reset_index(&browser->b);
 }
 
@@ -346,7 +377,7 @@ static void ui_browser__warn_lost_events(struct ui_browser *browser)
                 "Or reduce the sampling frequency.");
 }
 
-static int hist_browser__run(struct hist_browser *browser, const char *ev_name,
+static int hist_browser__run(struct hist_browser *browser,
                              struct hist_browser_timer *hbt)
 {
         int key;
@@ -356,8 +387,7 @@ static int hist_browser__run(struct hist_browser *browser, const char *ev_name,
         browser->b.entries = &browser->hists->entries;
         browser->b.nr_entries = hist_browser__nr_entries(browser);
 
-        hist_browser__refresh_dimensions(browser);
-        hists__browser_title(browser->hists, title, sizeof(title), ev_name);
+        hists__browser_title(browser->hists, title, sizeof(title));
 
         if (ui_browser__show(&browser->b, title,
                              "Press '?' for help on key bindings") < 0)
@@ -384,7 +414,7 @@ static int hist_browser__run(struct hist_browser *browser, const char *ev_name,
                                 ui_browser__warn_lost_events(&browser->b);
                         }
 
-                        hists__browser_title(browser->hists, title, sizeof(title), ev_name);
+                        hists__browser_title(browser->hists, title, sizeof(title));
                         ui_browser__show_title(&browser->b, title);
                         continue;
                 }
@@ -393,10 +423,10 @@ static int hist_browser__run(struct hist_browser *browser, const char *ev_name,
                         struct hist_entry *h = rb_entry(browser->b.top,
                                                         struct hist_entry, rb_node);
                         ui_helpline__pop();
-                        ui_helpline__fpush("%d: nr_ent=(%d,%d), height=%d, idx=%d, fve: idx=%d, row_off=%d, nrows=%d",
+                        ui_helpline__fpush("%d: nr_ent=(%d,%d), rows=%d, idx=%d, fve: idx=%d, row_off=%d, nrows=%d",
                                            seq++, browser->b.nr_entries,
                                            browser->hists->nr_entries,
-                                           browser->b.height,
+                                           browser->b.rows,
                                            browser->b.index,
                                            browser->b.top_idx,
                                            h->row_offset, h->nr_rows);
@@ -410,6 +440,10 @@ static int hist_browser__run(struct hist_browser *browser, const char *ev_name,
                         /* Expand the whole world. */
                         hist_browser__set_folding(browser, true);
                         break;
+                case 'H':
+                        browser->show_headers = !browser->show_headers;
+                        hist_browser__update_rows(browser);
+                        break;
                 case K_ENTER:
                         if (hist_browser__toggle_fold(browser))
                                 break;
@@ -509,13 +543,13 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browse
                         }
 
                         ui_browser__set_color(&browser->b, color);
-                        ui_browser__gotorc(&browser->b, row, 0);
+                        hist_browser__gotorc(browser, row, 0);
                         slsmg_write_nstring(" ", offset + extra_offset);
                         slsmg_printf("%c ", folded_sign);
                         slsmg_write_nstring(str, width);
                         free(alloc_str);
 
-                        if (++row == browser->b.height)
+                        if (++row == browser->b.rows)
                                 goto out;
 do_next:
                         if (folded_sign == '+')
@@ -528,7 +562,7 @@ do_next:
                                                                          new_level, row, row_offset,
                                                                          is_current_entry);
                 }
-                if (row == browser->b.height)
+                if (row == browser->b.rows)
                         goto out;
                 node = next;
         }
@@ -568,13 +602,13 @@ static int hist_browser__show_callchain_node(struct hist_browser *browser,
 
                 s = callchain_list__sym_name(chain, bf, sizeof(bf),
                                              browser->show_dso);
-                ui_browser__gotorc(&browser->b, row, 0);
+                hist_browser__gotorc(browser, row, 0);
                 ui_browser__set_color(&browser->b, color);
                 slsmg_write_nstring(" ", offset);
                 slsmg_printf("%c ", folded_sign);
                 slsmg_write_nstring(s, width - 2);
 
-                if (++row == browser->b.height)
+                if (++row == browser->b.rows)
                         goto out;
         }
 
@@ -603,7 +637,7 @@ static int hist_browser__show_callchain(struct hist_browser *browser,
                 row += hist_browser__show_callchain_node(browser, node, level,
                                                          row, row_offset,
                                                          is_current_entry);
-                if (row == browser->b.height)
+                if (row == browser->b.rows)
                         break;
         }
 
@@ -733,7 +767,7 @@ static int hist_browser__show_entry(struct hist_browser *browser,
                         .ptr            = &arg,
                 };
 
-                ui_browser__gotorc(&browser->b, row, 0);
+                hist_browser__gotorc(browser, row, 0);
 
                 perf_hpp__for_each_format(fmt) {
                         if (perf_hpp__should_skip(fmt))
@@ -777,7 +811,7 @@ static int hist_browser__show_entry(struct hist_browser *browser,
         } else
                 --row_offset;
 
-        if (folded_sign == '-' && row != browser->b.height) {
+        if (folded_sign == '-' && row != browser->b.rows) {
                 printed += hist_browser__show_callchain(browser, &entry->sorted_chain,
                                                         1, row, &row_offset,
                                                         &current_entry);
@@ -788,6 +822,56 @@ static int hist_browser__show_entry(struct hist_browser *browser,
         return printed;
 }
 
+static int advance_hpp_check(struct perf_hpp *hpp, int inc)
+{
+        advance_hpp(hpp, inc);
+        return hpp->size <= 0;
+}
+
+static int hists__scnprintf_headers(char *buf, size_t size, struct hists *hists)
+{
+        struct perf_hpp dummy_hpp = {
+                .buf    = buf,
+                .size   = size,
+        };
+        struct perf_hpp_fmt *fmt;
+        size_t ret = 0;
+
+        if (symbol_conf.use_callchain) {
+                ret = scnprintf(buf, size, "  ");
+                if (advance_hpp_check(&dummy_hpp, ret))
+                        return ret;
+        }
+
+        perf_hpp__for_each_format(fmt) {
+                if (perf_hpp__should_skip(fmt))
+                        continue;
+
+                /* We need to add the length of the columns header. */
+                perf_hpp__reset_width(fmt, hists);
+
+                ret = fmt->header(fmt, &dummy_hpp, hists_to_evsel(hists));
+                if (advance_hpp_check(&dummy_hpp, ret))
+                        break;
+
+                ret = scnprintf(dummy_hpp.buf, dummy_hpp.size, "  ");
+                if (advance_hpp_check(&dummy_hpp, ret))
+                        break;
+        }
+
+        return ret;
+}
+
+static void hist_browser__show_headers(struct hist_browser *browser)
+{
+        char headers[1024];
+
+        hists__scnprintf_headers(headers, sizeof(headers), browser->hists);
+        ui_browser__gotorc(&browser->b, 0, 0);
+        ui_browser__set_color(&browser->b, HE_COLORSET_ROOT);
+        slsmg_write_nstring(headers, browser->b.width + 1);
+}
+
 static void ui_browser__hists_init_top(struct ui_browser *browser)
 {
         if (browser->top == NULL) {
@@ -801,9 +885,15 @@ static void ui_browser__hists_init_top(struct ui_browser *browser)
 static unsigned int hist_browser__refresh(struct ui_browser *browser)
 {
         unsigned row = 0;
+        u16 header_offset = 0;
         struct rb_node *nd;
         struct hist_browser *hb = container_of(browser, struct hist_browser, b);
 
+        if (hb->show_headers) {
+                hist_browser__show_headers(hb);
+                header_offset = 1;
+        }
+
         ui_browser__hists_init_top(browser);
 
         for (nd = browser->top; nd; nd = rb_next(nd)) {
@@ -818,11 +908,11 @@ static unsigned int hist_browser__refresh(struct ui_browser *browser)
                         continue;
 
                 row += hist_browser__show_entry(hb, h, row);
-                if (row == browser->height)
+                if (row == browser->rows)
                         break;
         }
 
-        return row;
+        return row + header_offset;
 }
 
 static struct rb_node *hists__filter_entries(struct rb_node *nd,
@@ -1191,8 +1281,10 @@ static struct hist_browser *hist_browser__new(struct hists *hists)
         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;
         }
 
         return browser;
@@ -1213,8 +1305,7 @@ static struct thread *hist_browser__selected_thread(struct hist_browser *browser
         return browser->he_selection->thread;
 }
 
-static int hists__browser_title(struct hists *hists, char *bf, size_t size,
-                                const char *ev_name)
+static int hists__browser_title(struct hists *hists, char *bf, size_t size)
 {
         char unit;
         int printed;
@@ -1223,6 +1314,7 @@ static int hists__browser_title(struct hists *hists, char *bf, size_t size,
         unsigned long nr_samples = hists->stats.nr_events[PERF_RECORD_SAMPLE];
         u64 nr_events = hists->stats.total_period;
         struct perf_evsel *evsel = hists_to_evsel(hists);
+        const char *ev_name = perf_evsel__name(evsel);
         char buf[512];
         size_t buflen = sizeof(buf);
 
@@ -1390,7 +1482,7 @@ static void hist_browser__update_nr_entries(struct hist_browser *hb)
 }
 
 static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
-                                    const char *helpline, const char *ev_name,
+                                    const char *helpline,
                                     bool left_exits,
                                     struct hist_browser_timer *hbt,
                                     float min_pcnt,
@@ -1422,6 +1514,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
         "d             Zoom into current DSO\n"                         \
         "E             Expand all callchains\n"                         \
         "F             Toggle percentage of filtered entries\n"         \
+        "H             Display column headers\n"                        \
 
         /* help messages are sorted by lexical order of the hotkey */
         const char report_help[] = HIST_BROWSER_HELP_COMMON
@@ -1465,7 +1558,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
 
                 nr_options = 0;
 
-                key = hist_browser__run(browser, ev_name, hbt);
+                key = hist_browser__run(browser, hbt);
 
                 if (browser->he_selection != NULL) {
                         thread = hist_browser__selected_thread(browser);
@@ -1843,7 +1936,7 @@ static int perf_evsel_menu__run(struct perf_evsel_menu *menu,
 {
         struct perf_evlist *evlist = menu->b.priv;
         struct perf_evsel *pos;
-        const char *ev_name, *title = "Available samples";
+        const char *title = "Available samples";
         int delay_secs = hbt ? hbt->refresh : 0;
         int key;
 
@@ -1876,9 +1969,8 @@ browse_hists:
                          */
                         if (hbt)
                                 hbt->timer(hbt->arg);
-                        ev_name = perf_evsel__name(pos);
                         key = perf_evsel__hists_browse(pos, nr_events, help,
-                                                       ev_name, true, hbt,
+                                                       true, hbt,
                                                        menu->min_pcnt,
                                                        menu->env);
                         ui_browser__show_title(&menu->b, title);
@@ -1982,10 +2074,9 @@ int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help,
 single_entry:
         if (nr_entries == 1) {
                 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,
-                                                ev_name, false, hbt, min_pcnt,
+                                                false, hbt, min_pcnt,
                                                 env);
         }
 
diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index 90122abd3721..40af0acb4fe9 100644
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -479,7 +479,7 @@ print_entries:
 
                 if (h->ms.map == NULL && verbose > 1) {
                         __map_groups__fprintf_maps(h->thread->mg,
-                                                   MAP__FUNCTION, verbose, fp);
+                                                   MAP__FUNCTION, fp);
                         fprintf(fp, "%.10s end\n", graph_dotted_line);
                 }
         }