1 files changed, 55 insertions, 32 deletions

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 377971dc89a3..fc3d55f832ac 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -59,7 +59,7 @@
 
 #include <sys/syscall.h>
 #include <sys/ioctl.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/prctl.h>
 #include <sys/wait.h>
 #include <sys/uio.h>
@@ -276,11 +276,17 @@ static void perf_top__print_sym_table(struct perf_top *top)
                 return;
         }
 
+        if (top->zero) {
+                hists__delete_entries(&top->sym_evsel->hists);
+        } else {
+                hists__decay_entries(&top->sym_evsel->hists,
+                                     top->hide_user_symbols,
+                                     top->hide_kernel_symbols);
+        }
+
         hists__collapse_resort(&top->sym_evsel->hists, NULL);
         hists__output_resort(&top->sym_evsel->hists);
-        hists__decay_entries(&top->sym_evsel->hists,
-                             top->hide_user_symbols,
-                             top->hide_kernel_symbols);
+
         hists__output_recalc_col_len(&top->sym_evsel->hists,
                                      top->print_entries - printed);
         putchar('\n');
@@ -427,18 +433,13 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c)
 
         if (!perf_top__key_mapped(top, c)) {
                 struct pollfd stdin_poll = { .fd = 0, .events = POLLIN };
-                struct termios tc, save;
+                struct termios save;
 
                 perf_top__print_mapped_keys(top);
                 fprintf(stdout, "\nEnter selection, or unmapped key to continue: ");
                 fflush(stdout);
 
-                tcgetattr(0, &save);
-                tc = save;
-                tc.c_lflag &= ~(ICANON | ECHO);
-                tc.c_cc[VMIN] = 0;
-                tc.c_cc[VTIME] = 0;
-                tcsetattr(0, TCSANOW, &tc);
+                set_term_quiet_input(&save);
 
                 poll(&stdin_poll, 1, -1);
                 c = getc(stdin);
@@ -542,11 +543,16 @@ static void perf_top__sort_new_samples(void *arg)
         if (t->evlist->selected != NULL)
                 t->sym_evsel = t->evlist->selected;
 
+        if (t->zero) {
+                hists__delete_entries(&t->sym_evsel->hists);
+        } else {
+                hists__decay_entries(&t->sym_evsel->hists,
+                                     t->hide_user_symbols,
+                                     t->hide_kernel_symbols);
+        }
+
         hists__collapse_resort(&t->sym_evsel->hists, NULL);
         hists__output_resort(&t->sym_evsel->hists);
-        hists__decay_entries(&t->sym_evsel->hists,
-                             t->hide_user_symbols,
-                             t->hide_kernel_symbols);
 }
 
 static void *display_thread_tui(void *arg)
@@ -577,23 +583,32 @@ static void *display_thread_tui(void *arg)
         return NULL;
 }
 
+static void display_sig(int sig __maybe_unused)
+{
+        done = 1;
+}
+
+static void display_setup_sig(void)
+{
+        signal(SIGSEGV, display_sig);
+        signal(SIGFPE,  display_sig);
+        signal(SIGINT,  display_sig);
+        signal(SIGQUIT, display_sig);
+        signal(SIGTERM, display_sig);
+}
+
 static void *display_thread(void *arg)
 {
         struct pollfd stdin_poll = { .fd = 0, .events = POLLIN };
-        struct termios tc, save;
+        struct termios save;
         struct perf_top *top = arg;
         int delay_msecs, c;
 
-        tcgetattr(0, &save);
-        tc = save;
-        tc.c_lflag &= ~(ICANON | ECHO);
-        tc.c_cc[VMIN] = 0;
-        tc.c_cc[VTIME] = 0;
-
+        display_setup_sig();
         pthread__unblock_sigwinch();
 repeat:
         delay_msecs = top->delay_secs * 1000;
-        tcsetattr(0, TCSANOW, &tc);
+        set_term_quiet_input(&save);
         /* trash return*/
         getc(stdin);
 
@@ -620,13 +635,16 @@ repeat:
                 }
         }
 
+        tcsetattr(0, TCSAFLUSH, &save);
         return NULL;
 }
 
-static int symbol_filter(struct map *map __maybe_unused, struct symbol *sym)
+static int symbol_filter(struct map *map, struct symbol *sym)
 {
         const char *name = sym->name;
 
+        if (!map->dso->kernel)
+                return 0;
         /*
          * ppc64 uses function descriptors and appends a '.' to the
          * start of every instruction address. Remove it.
@@ -876,7 +894,7 @@ try_again:
 
         if (perf_evlist__mmap(evlist, opts->mmap_pages, false) < 0) {
                 ui__error("Failed to mmap with %d (%s)\n",
-                            errno, strerror(errno));
+                            errno, strerror_r(errno, msg, sizeof(msg)));
                 goto out_err;
         }
 
@@ -911,7 +929,7 @@ static int __cmd_top(struct perf_top *top)
 
         top->session = perf_session__new(NULL, false, NULL);
         if (top->session == NULL)
-                return -ENOMEM;
+                return -1;
 
         machines__set_symbol_filter(&top->session->machines, symbol_filter);
 
@@ -946,7 +964,7 @@ static int __cmd_top(struct perf_top *top)
                 perf_evlist__enable(top->evlist);
 
         /* Wait for a minimal set of events before starting the snapshot */
-        poll(top->evlist->pollfd, top->evlist->nr_fds, 100);
+        perf_evlist__poll(top->evlist, 100);
 
         perf_top__mmap_read(top);
 
@@ -963,7 +981,7 @@ static int __cmd_top(struct perf_top *top)
                 param.sched_priority = top->realtime_prio;
                 if (sched_setscheduler(0, SCHED_FIFO, &param)) {
                         ui__error("Could not set realtime priority.\n");
-                        goto out_delete;
+                        goto out_join;
                 }
         }
 
@@ -973,10 +991,12 @@ static int __cmd_top(struct perf_top *top)
                 perf_top__mmap_read(top);
 
                 if (hits == top->samples)
-                        ret = poll(top->evlist->pollfd, top->evlist->nr_fds, 100);
+                        ret = perf_evlist__poll(top->evlist, 100);
         }
 
         ret = 0;
+out_join:
+        pthread_join(thread, NULL);
 out_delete:
         perf_session__delete(top->session);
         top->session = NULL;
@@ -1000,10 +1020,8 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)
 
 static int perf_top_config(const char *var, const char *value, void *cb)
 {
-        struct perf_top *top = cb;
-
         if (!strcmp(var, "top.call-graph"))
-                return record_parse_callchain(value, &top->record_opts);
+                var = "call-graph.record-mode"; /* fall-through */
         if (!strcmp(var, "top.children")) {
                 symbol_conf.cumulate_callchain = perf_config_bool(var, value);
                 return 0;
@@ -1122,6 +1140,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
                     "Interleave source code with assembly code (default)"),
         OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw,
                     "Display raw encoding of assembly instructions (default)"),
+        OPT_BOOLEAN(0, "demangle-kernel", &symbol_conf.demangle_kernel,
+                    "Enable kernel symbol demangling"),
         OPT_STRING(0, "objdump", &objdump_path, "path",
                     "objdump binary to use for disassembly and annotations"),
         OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",
@@ -1131,6 +1151,9 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
                      "Don't show entries under that percent", parse_percent_limit),
         OPT_CALLBACK(0, "percentage", NULL, "relative|absolute",
                      "How to display percentage of filtered entries", parse_filter_percentage),
+        OPT_STRING('w', "column-widths", &symbol_conf.col_width_list_str,
+                   "width[,width...]",
+                   "don't try to adjust column width, use these fixed values"),
         OPT_END()
         };
         const char * const top_usage[] = {
@@ -1217,7 +1240,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
         symbol_conf.priv_size = sizeof(struct annotation);
 
         symbol_conf.try_vmlinux_path = (symbol_conf.vmlinux_name == NULL);
-        if (symbol__init() < 0)
+        if (symbol__init(NULL) < 0)
                 return -1;
 
         sort__setup_elide(stdout);