Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

  - Allow selecting the type of callchains per event, including disabling
    callchains in all but one entry in an event list, to save space, and also
    to ask for the callchains collected in one event to be used in other
    events. (Kan Liang)

  - Beautify more syscall arguments in 'perf trace': (Arnaldo Carvalho de Melo)
    - A bunch more translate file/pathnames from pointers to strings.
    - Convert numbers to strings for the 'keyctl' syscall 'option' arg.
    - Add missing 'clockid' entries.

  - Fix 'perf probe -L sys_*' as it was not showing all the source code for
    syscall functions in the kernel. (Masami Hiramatsu)

  - Make ESC unzoom as well in the hists browser, i.e. in 'report' and 'top',
    as we're considering repurposing the right and left arrow keys to use in
    horizontal scrolling, i.e. leave just ESC to be used for what <- works
    now, and ENTER for what -> does (they are already aliases for ages).
    (Arnaldo Carvalho de Melo)

Infrastructure fixes:

  - Check for SRCLINE_UNKNOWN case in "srcfile" processing (Andi Kleen)

  - Wrap the slsmg_{printf,write_nstring} slang functions behind ui_browser, so
    that we can make the ui_browser based browsers (annotate, menus, hists, etc) UI
    library agnostic and usable with multiple backends (slang now, GTK+ and others
    in the future, maybe) (Arnaldo Carvalho de Melo)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

5 files changed, 57 insertions, 55 deletions

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index b5fc847f9660..29739b347599 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -1,7 +1,6 @@
 #include "../../util/util.h"
 #include "../browser.h"
 #include "../helpline.h"
-#include "../libslang.h"
 #include "../ui.h"
 #include "../util.h"
 #include "../../util/annotate.h"
@@ -134,29 +133,31 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
                                 ui_browser__set_percent_color(browser,
                                                         bdl->samples[i].percent,
                                                         current_entry);
-                                if (annotate_browser__opts.show_total_period)
-                                        slsmg_printf("%6" PRIu64 " ",
-                                                     bdl->samples[i].nr);
-                                else
-                                        slsmg_printf("%6.2f ", bdl->samples[i].percent);
+                                if (annotate_browser__opts.show_total_period) {
+                                        ui_browser__printf(browser, "%6" PRIu64 " ",
+                                                           bdl->samples[i].nr);
+                                } else {
+                                        ui_browser__printf(browser, "%6.2f ",
+                                                           bdl->samples[i].percent);
+                                }
                         }
                 } else {
-                        slsmg_write_nstring(" ", 7 * ab->nr_events);
+                        ui_browser__write_nstring(browser, " ", 7 * ab->nr_events);
                 }
         } else {
                 ui_browser__set_percent_color(browser, 0, current_entry);
-                slsmg_write_nstring(" ", 7 * ab->nr_events);
+                ui_browser__write_nstring(browser, " ", 7 * ab->nr_events);
         }
         if (ab->have_cycles) {
                 if (dl->ipc)
-                        slsmg_printf("%*.2f ", IPC_WIDTH - 1, dl->ipc);
+                        ui_browser__printf(browser, "%*.2f ", IPC_WIDTH - 1, dl->ipc);
                 else
-                        slsmg_write_nstring(" ", IPC_WIDTH);
+                        ui_browser__write_nstring(browser, " ", IPC_WIDTH);
                 if (dl->cycles)
-                        slsmg_printf("%*" PRIu64 " ",
-                                     CYCLES_WIDTH - 1, dl->cycles);
+                        ui_browser__printf(browser, "%*" PRIu64 " ",
+                                           CYCLES_WIDTH - 1, dl->cycles);
                 else
-                        slsmg_write_nstring(" ", CYCLES_WIDTH);
+                        ui_browser__write_nstring(browser, " ", CYCLES_WIDTH);
         }
 
         SLsmg_write_char(' ');
@@ -166,7 +167,7 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
                 width += 1;
 
         if (!*dl->line)
-                slsmg_write_nstring(" ", width - pcnt_width);
+                ui_browser__write_nstring(browser, " ", width - pcnt_width);
         else if (dl->offset == -1) {
                 if (dl->line_nr && annotate_browser__opts.show_linenr)
                         printed = scnprintf(bf, sizeof(bf), "%-*d ",
@@ -174,8 +175,8 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
                 else
                         printed = scnprintf(bf, sizeof(bf), "%*s  ",
                                     ab->addr_width, " ");
-                slsmg_write_nstring(bf, printed);
-                slsmg_write_nstring(dl->line, width - printed - pcnt_width + 1);
+                ui_browser__write_nstring(browser, bf, printed);
+                ui_browser__write_nstring(browser, dl->line, width - printed - pcnt_width + 1);
         } else {
                 u64 addr = dl->offset;
                 int color = -1;
@@ -194,7 +195,7 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
                                                             bdl->jump_sources);
                                         prev = annotate_browser__set_jumps_percent_color(ab, bdl->jump_sources,
                                                                                          current_entry);
-                                        slsmg_write_nstring(bf, printed);
+                                        ui_browser__write_nstring(browser, bf, printed);
                                         ui_browser__set_color(browser, prev);
                                 }
 
@@ -208,7 +209,7 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
 
                 if (change_color)
                         color = ui_browser__set_color(browser, HE_COLORSET_ADDR);
-                slsmg_write_nstring(bf, printed);
+                ui_browser__write_nstring(browser, bf, printed);
                 if (change_color)
                         ui_browser__set_color(browser, color);
                 if (dl->ins && dl->ins->ops->scnprintf) {
@@ -222,11 +223,11 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
                                 ui_browser__write_graph(browser, SLSMG_RARROW_CHAR);
                                 SLsmg_write_char(' ');
                         } else {
-                                slsmg_write_nstring(" ", 2);
+                                ui_browser__write_nstring(browser, " ", 2);
                         }
                 } else {
                         if (strcmp(dl->name, "retq")) {
-                                slsmg_write_nstring(" ", 2);
+                                ui_browser__write_nstring(browser, " ", 2);
                         } else {
                                 ui_browser__write_graph(browser, SLSMG_LARROW_CHAR);
                                 SLsmg_write_char(' ');
@@ -234,7 +235,7 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
                 }
 
                 disasm_line__scnprintf(dl, bf, sizeof(bf), !annotate_browser__opts.use_offset);
-                slsmg_write_nstring(bf, width - pcnt_width - 3 - printed);
+                ui_browser__write_nstring(browser, bf, width - pcnt_width - 3 - printed);
         }
 
         if (current_entry)
diff --git a/tools/perf/ui/browsers/header.c b/tools/perf/ui/browsers/header.c
index e8278c558d4a..f10681717f93 100644
--- a/tools/perf/ui/browsers/header.c
+++ b/tools/perf/ui/browsers/header.c
@@ -25,7 +25,7 @@ static void ui_browser__argv_write(struct ui_browser *browser,
         ui_browser__set_color(browser, current_entry ? HE_COLORSET_SELECTED :
                                                        HE_COLORSET_NORMAL);
 
-        slsmg_write_nstring(str, browser->width);
+        ui_browser__write_nstring(browser, str, browser->width);
 }
 
 static int list_menu__run(struct ui_browser *menu)
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index fa67613976a8..10c7ec041039 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "../libslang.h"
 #include <stdlib.h>
 #include <string.h>
 #include <linux/rbtree.h>
@@ -540,10 +539,10 @@ static void hist_browser__show_callchain_entry(struct hist_browser *browser,
 
         ui_browser__set_color(&browser->b, color);
         hist_browser__gotorc(browser, row, 0);
-        slsmg_write_nstring(" ", offset);
-        slsmg_printf("%c", folded_sign);
+        ui_browser__write_nstring(&browser->b, " ", offset);
+        ui_browser__printf(&browser->b, "%c", folded_sign);
         ui_browser__write_graph(&browser->b, show_annotated ? SLSMG_RARROW_CHAR : ' ');
-        slsmg_write_nstring(str, width);
+        ui_browser__write_nstring(&browser->b, str, width);
 }
 
 static void hist_browser__fprintf_callchain_entry(struct hist_browser *b __maybe_unused,
@@ -680,7 +679,7 @@ static int __hpp__slsmg_color_printf(struct perf_hpp *hpp, const char *fmt, ...)
         ui_browser__set_percent_color(arg->b, percent, arg->current_entry);
 
         ret = scnprintf(hpp->buf, hpp->size, fmt, len, percent);
-        slsmg_printf("%s", hpp->buf);
+        ui_browser__printf(arg->b, "%s", hpp->buf);
 
         advance_hpp(hpp, ret);
         return ret;
@@ -713,10 +712,11 @@ hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt,		\
                                 struct hist_entry *he)                  \
 {                                                                       \
         if (!symbol_conf.cumulate_callchain) {                          \
+                struct hpp_arg *arg = hpp->ptr;                         \
                 int len = fmt->user_len ?: fmt->len;                    \
                 int ret = scnprintf(hpp->buf, hpp->size,                \
                                     "%*s", len, "N/A");                 \
-                slsmg_printf("%s", hpp->buf);                           \
+                ui_browser__printf(arg->b, "%s", hpp->buf);             \
                                                                         \
                 return ret;                                             \
         }                                                               \
@@ -801,12 +801,12 @@ static int hist_browser__show_entry(struct hist_browser *browser,
 
                         if (first) {
                                 if (symbol_conf.use_callchain) {
-                                        slsmg_printf("%c ", folded_sign);
+                                        ui_browser__printf(&browser->b, "%c ", folded_sign);
                                         width -= 2;
                                 }
                                 first = false;
                         } else {
-                                slsmg_printf("  ");
+                                ui_browser__printf(&browser->b, "  ");
                                 width -= 2;
                         }
 
@@ -814,7 +814,7 @@ static int hist_browser__show_entry(struct hist_browser *browser,
                                 width -= fmt->color(fmt, &hpp, entry);
                         } else {
                                 width -= fmt->entry(fmt, &hpp, entry);
-                                slsmg_printf("%s", s);
+                                ui_browser__printf(&browser->b, "%s", s);
                         }
                 }
 
@@ -822,7 +822,7 @@ static int hist_browser__show_entry(struct hist_browser *browser,
                 if (!browser->b.navkeypressed)
                         width += 1;
 
-                slsmg_write_nstring("", width);
+                ui_browser__write_nstring(&browser->b, "", width);
 
                 ++row;
                 ++printed;
@@ -899,7 +899,7 @@ static void hist_browser__show_headers(struct hist_browser *browser)
         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);
+        ui_browser__write_nstring(&browser->b, headers, browser->b.width + 1);
 }
 
 static void ui_browser__hists_init_top(struct ui_browser *browser)
@@ -1267,6 +1267,8 @@ static int hists__browser_title(struct hists *hists,
         const char *ev_name = perf_evsel__name(evsel);
         char buf[512];
         size_t buflen = sizeof(buf);
+        char ref[30] = " show reference callgraph, ";
+        bool enable_ref = false;
 
         if (symbol_conf.filter_relative) {
                 nr_samples = hists->stats.nr_non_filtered_samples;
@@ -1292,10 +1294,13 @@ static int hists__browser_title(struct hists *hists,
                 }
         }
 
+        if (symbol_conf.show_ref_callgraph &&
+            strstr(ev_name, "call-graph=no"))
+                enable_ref = true;
         nr_samples = convert_unit(nr_samples, &unit);
         printed = scnprintf(bf, size,
-                           "Samples: %lu%c of event '%s', Event count (approx.): %" PRIu64,
-                           nr_samples, unit, ev_name, nr_events);
+                           "Samples: %lu%c of event '%s',%sEvent count (approx.): %" PRIu64,
+                           nr_samples, unit, ev_name, enable_ref ? ref : " ", nr_events);
 
 
         if (hists->uid_filter_str)
@@ -1868,6 +1873,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
                 case K_RIGHT:
                         /* menu */
                         break;
+                case K_ESC:
                 case K_LEFT: {
                         const void *top;
 
@@ -1877,6 +1883,12 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
                                  */
                                 if (left_exits)
                                         goto out_free_stack;
+
+                                if (key == K_ESC &&
+                                    ui_browser__dialog_yesno(&browser->b,
+                                                             "Do you really want to exit?"))
+                                        goto out_free_stack;
+
                                 continue;
                         }
                         top = pstack__peek(browser->pstack);
@@ -1892,12 +1904,6 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
                                 do_zoom_thread(browser, actions);
                         continue;
                 }
-                case K_ESC:
-                        if (!left_exits &&
-                            !ui_browser__dialog_yesno(&browser->b,
-                                               "Do you really want to exit?"))
-                                continue;
-                        /* Fall thru */
                 case 'q':
                 case CTRL('c'):
                         goto out_free_stack;
@@ -2044,7 +2050,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
         nr_events = convert_unit(nr_events, &unit);
         printed = scnprintf(bf, sizeof(bf), "%lu%c%s%s", nr_events,
                            unit, unit == ' ' ? "" : " ", ev_name);
-        slsmg_printf("%s", bf);
+        ui_browser__printf(browser, "%s", bf);
 
         nr_events = hists->stats.nr_events[PERF_RECORD_LOST];
         if (nr_events != 0) {
@@ -2057,7 +2063,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
                 warn = bf;
         }
 
-        slsmg_write_nstring(warn, browser->width - printed);
+        ui_browser__write_nstring(browser, warn, browser->width - printed);
 
         if (current_entry)
                 menu->selection = evsel;
@@ -2120,15 +2126,11 @@ browse_hists:
                                 else
                                         pos = perf_evsel__prev(pos);
                                 goto browse_hists;
-                        case K_ESC:
-                                if (!ui_browser__dialog_yesno(&menu->b,
-                                                "Do you really want to exit?"))
-                                        continue;
-                                /* Fall thru */
                         case K_SWITCH_INPUT_DATA:
                         case 'q':
                         case CTRL('c'):
                                 goto out;
+                        case K_ESC:
                         default:
                                 continue;
                         }
diff --git a/tools/perf/ui/browsers/map.c b/tools/perf/ui/browsers/map.c
index b11639f33682..8c154c7d4669 100644
--- a/tools/perf/ui/browsers/map.c
+++ b/tools/perf/ui/browsers/map.c
@@ -1,4 +1,3 @@
-#include "../libslang.h"
 #include <elf.h>
 #include <inttypes.h>
 #include <sys/ttydefaults.h>
@@ -26,13 +25,13 @@ static void map_browser__write(struct ui_browser *browser, void *nd, int row)
         int width;
 
         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');
+        ui_browser__printf(browser, "%*" PRIx64 " %*" PRIx64 " %c ",
+                           mb->addrlen, sym->start, mb->addrlen, sym->end,
+                           sym->binding == STB_GLOBAL ? 'g' :
+                                sym->binding == STB_LOCAL  ? 'l' : 'w');
         width = browser->width - ((mb->addrlen * 2) + 4);
         if (width > 0)
-                slsmg_write_nstring(sym->name, width);
+                ui_browser__write_nstring(browser, sym->name, width);
 }
 
 /* FIXME uber-kludgy, see comment on cmd_report... */
diff --git a/tools/perf/ui/browsers/scripts.c b/tools/perf/ui/browsers/scripts.c
index 402d2bd30b09..e13b48d705ef 100644
--- a/tools/perf/ui/browsers/scripts.c
+++ b/tools/perf/ui/browsers/scripts.c
@@ -81,7 +81,7 @@ static void script_browser__write(struct ui_browser *browser,
         ui_browser__set_color(browser, current_entry ? HE_COLORSET_SELECTED :
                                                        HE_COLORSET_NORMAL);
 
-        slsmg_write_nstring(sline->line, browser->width);
+        ui_browser__write_nstring(browser, sline->line, browser->width);
 }
 
 static int script_browser__run(struct perf_script_browser *browser)