linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, linux-perf-users@vger.kernel.org,
	linux-kernel@vger.kernel.org, Andi Kleen <ak@linux.intel.com>
Subject: [PATCH v6 05/11] perf tools report: Support running scripts for current time range
Date: Mon, 11 Mar 2019 07:44:56 -0700	[thread overview]
Message-ID: <20190311144502.15423-6-andi@firstfloor.org> (raw)
In-Reply-To: <20190311144502.15423-1-andi@firstfloor.org>

From: Andi Kleen <ak@linux.intel.com>

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>

---
v2:
Use symbol_conf.time_quantum
v3:
Work around broken gcc fortify code warning
Use _NSEC defines
---
 tools/perf/ui/browsers/hists.c | 83 +++++++++++++++++++++++++++++-----
 1 file changed, 72 insertions(+), 11 deletions(-)

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index aef800d97ea1..f98aeac607dd 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -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 @@ static int switch_data_file(void)
 }
 
 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;
 	}
 
@@ -2566,6 +2597,36 @@ add_script_opt(struct hist_browser *browser __maybe_unused,
 	return 1;
 }
 
+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)
-- 
2.20.1


  parent reply	other threads:[~2019-03-11 14:46 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-11 14:44 Support sample context in perf report Andi Kleen
2019-03-11 14:44 ` [PATCH v6 01/11] perf tools script: Filter COMM/FORK/.. events by CPU Andi Kleen
2019-03-11 16:58   ` Arnaldo Carvalho de Melo
2019-03-22 22:12   ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2019-03-11 14:44 ` [PATCH v6 02/11] perf tools report: Parse time quantum Andi Kleen
2019-03-11 16:59   ` Arnaldo Carvalho de Melo
2019-03-11 14:44 ` [PATCH v6 03/11] perf tools report: Support time sort key Andi Kleen
2019-03-11 17:04   ` Arnaldo Carvalho de Melo
2019-03-22 22:13   ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2019-03-11 14:44 ` [PATCH v6 04/11] perf tools report: Use less for scripts output Andi Kleen
2019-03-11 17:05   ` Arnaldo Carvalho de Melo
2019-03-11 14:44 ` Andi Kleen [this message]
2019-03-11 17:06   ` [PATCH v6 05/11] perf tools report: Support running scripts for current time range Arnaldo Carvalho de Melo
2019-03-22 22:13   ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2019-03-11 14:44 ` [PATCH v6 06/11] perf tools report: Support builtin perf script in scripts menu Andi Kleen
2019-03-11 17:09   ` Arnaldo Carvalho de Melo
2019-03-22 22:14   ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2019-03-11 14:44 ` [PATCH v6 07/11] perf tools report: Implement browsing of individual samples Andi Kleen
2019-03-11 17:24   ` Jiri Olsa
2019-03-11 17:46     ` Andi Kleen
2019-03-11 18:35       ` Arnaldo Carvalho de Melo
2019-03-11 19:04         ` Andi Kleen
2019-03-22 22:15       ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2019-03-11 14:44 ` [PATCH v6 08/11] perf tools: Add some new tips describing the new options Andi Kleen
2019-03-22 22:15   ` [tip:perf/urgent] " tip-bot for Andi Kleen
2019-03-11 14:45 ` [PATCH v6 09/11] perf tools report: Add custom scripts to script menu Andi Kleen
2019-03-11 18:10   ` Arnaldo Carvalho de Melo
2019-03-11 18:34     ` Andi Kleen
2019-03-11 18:45       ` Arnaldo Carvalho de Melo
2019-03-22 22:17   ` [tip:perf/urgent] " tip-bot for Andi Kleen
2019-03-11 14:45 ` [PATCH v6 10/11] perf tools script: Add array bound checking to list_scripts Andi Kleen
2019-03-11 18:18   ` Arnaldo Carvalho de Melo
2019-03-22 22:16   ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2019-03-11 14:45 ` [PATCH v6 11/11] perf tools ui: Fix ui popup browser for many entries Andi Kleen
2019-03-11 18:17   ` Arnaldo Carvalho de Melo
2019-03-22 22:17   ` [tip:perf/urgent] perf ui browser: Fix ui popup argv " tip-bot for Andi Kleen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190311144502.15423-6-andi@firstfloor.org \
    --to=andi@firstfloor.org \
    --cc=acme@kernel.org \
    --cc=ak@linux.intel.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).