OSDN Git Service

perf report: Support running scripts for current time range
authorAndi Kleen <ak@linux.intel.com>
Mon, 11 Mar 2019 14:44:56 +0000 (07:44 -0700)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 11 Mar 2019 19:33:19 +0000 (16:33 -0300)
When using the time sort key, add new context menus to run scripts for
only the currently selected time range. Compute the correct range for
the selection add pass it as the --time option to perf script.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/20190311144502.15423-6-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/ui/browsers/hists.c

index aef800d..f98aeac 100644 (file)
@@ -7,6 +7,7 @@
 #include <string.h>
 #include <linux/rbtree.h>
 #include <sys/ttydefaults.h>
+#include <linux/time64.h>
 
 #include "../../util/callchain.h"
 #include "../../util/evsel.h"
@@ -30,6 +31,7 @@
 #include "srcline.h"
 #include "string2.h"
 #include "units.h"
+#include "time-utils.h"
 
 #include "sane_ctype.h"
 
@@ -2338,6 +2340,7 @@ close_file_and_continue:
 }
 
 struct popup_action {
+       unsigned long           time;
        struct thread           *thread;
        struct map_symbol       ms;
        int                     socket;
@@ -2527,36 +2530,64 @@ static int
 do_run_script(struct hist_browser *browser __maybe_unused,
              struct popup_action *act)
 {
-       char script_opt[64];
-       memset(script_opt, 0, sizeof(script_opt));
+       char *script_opt;
+       int len;
+       int n = 0;
+
+       len = 100;
+       if (act->thread)
+               len += strlen(thread__comm_str(act->thread));
+       else if (act->ms.sym)
+               len += strlen(act->ms.sym->name);
+       script_opt = malloc(len);
+       if (!script_opt)
+               return -1;
 
+       script_opt[0] = 0;
        if (act->thread) {
-               scnprintf(script_opt, sizeof(script_opt), " -c %s ",
+               n = scnprintf(script_opt, len, " -c %s ",
                          thread__comm_str(act->thread));
        } else if (act->ms.sym) {
-               scnprintf(script_opt, sizeof(script_opt), " -S %s ",
+               n = scnprintf(script_opt, len, " -S %s ",
                          act->ms.sym->name);
        }
 
+       if (act->time) {
+               char start[32], end[32];
+               unsigned long starttime = act->time;
+               unsigned long endtime = act->time + symbol_conf.time_quantum;
+
+               if (starttime == endtime) { /* Display 1ms as fallback */
+                       starttime -= 1*NSEC_PER_MSEC;
+                       endtime += 1*NSEC_PER_MSEC;
+               }
+               timestamp__scnprintf_usec(starttime, start, sizeof start);
+               timestamp__scnprintf_usec(endtime, end, sizeof end);
+               n += snprintf(script_opt + n, len - n, " --time %s,%s", start, end);
+       }
+
        script_browse(script_opt);
+       free(script_opt);
        return 0;
 }
 
 static int
-add_script_opt(struct hist_browser *browser __maybe_unused,
+add_script_opt_2(struct hist_browser *browser __maybe_unused,
               struct popup_action *act, char **optstr,
-              struct thread *thread, struct symbol *sym)
+              struct thread *thread, struct symbol *sym,
+              const char *tstr)
 {
+
        if (thread) {
-               if (asprintf(optstr, "Run scripts for samples of thread [%s]",
-                            thread__comm_str(thread)) < 0)
+               if (asprintf(optstr, "Run scripts for samples of thread [%s]%s",
+                            thread__comm_str(thread), tstr) < 0)
                        return 0;
        } else if (sym) {
-               if (asprintf(optstr, "Run scripts for samples of symbol [%s]",
-                            sym->name) < 0)
+               if (asprintf(optstr, "Run scripts for samples of symbol [%s]%s",
+                            sym->name, tstr) < 0)
                        return 0;
        } else {
-               if (asprintf(optstr, "Run scripts for all samples") < 0)
+               if (asprintf(optstr, "Run scripts for all samples%s", tstr) < 0)
                        return 0;
        }
 
@@ -2567,6 +2598,36 @@ add_script_opt(struct hist_browser *browser __maybe_unused,
 }
 
 static int
+add_script_opt(struct hist_browser *browser,
+              struct popup_action *act, char **optstr,
+              struct thread *thread, struct symbol *sym)
+{
+       int n, j;
+       struct hist_entry *he;
+
+       n = add_script_opt_2(browser, act, optstr, thread, sym, "");
+
+       he = hist_browser__selected_entry(browser);
+       if (sort_order && strstr(sort_order, "time")) {
+               char tstr[128];
+
+               optstr++;
+               act++;
+               j = sprintf(tstr, " in ");
+               j += timestamp__scnprintf_usec(he->time, tstr + j,
+                                              sizeof tstr - j);
+               j += sprintf(tstr + j, "-");
+               timestamp__scnprintf_usec(he->time + symbol_conf.time_quantum,
+                                         tstr + j,
+                                         sizeof tstr - j);
+               n += add_script_opt_2(browser, act, optstr, thread, sym,
+                                         tstr);
+               act->time = he->time;
+       }
+       return n;
+}
+
+static int
 do_switch_data(struct hist_browser *browser __maybe_unused,
               struct popup_action *act __maybe_unused)
 {