public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Masami Hiramatsu <mhiramat@kernel.org>
Subject: [for-next][PATCH 17/19] bootconfig/tracing/ktest: Update ktest example for boot-time tracing
Date: Tue, 17 Aug 2021 15:42:24 -0400	[thread overview]
Message-ID: <20210817194305.742530204@goodmis.org> (raw)
In-Reply-To: 20210817194207.947725935@goodmis.org

From: Masami Hiramatsu <mhiramat@kernel.org>

Update ktest example for the boot-time tracing with histogram
options. Note that since the histogram option uses "trace()" action
instead of "EVENT()", this updates the matching pattern too.

Link: https://lkml.kernel.org/r/162856130208.203126.4458319094852152589.stgit@devnote2

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
 .../examples/bootconfigs/boottrace.bconf      | 20 ++++++++++++++-----
 .../examples/bootconfigs/verify-boottrace.sh  |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tools/testing/ktest/examples/bootconfigs/boottrace.bconf b/tools/testing/ktest/examples/bootconfigs/boottrace.bconf
index 9db64ec589d5..7aa706cccb3b 100644
--- a/tools/testing/ktest/examples/bootconfigs/boottrace.bconf
+++ b/tools/testing/ktest/examples/bootconfigs/boottrace.bconf
@@ -10,13 +10,23 @@ ftrace.event {
 	}
 	synthetic.initcall_latency {
 		fields = "unsigned long func", "u64 lat"
-		actions = "hist:keys=func.sym,lat:vals=lat:sort=lat"
+		hist {
+			keys = func.sym,lat
+			values = lat
+			sort = lat
+		}
 	}
-	initcall.initcall_start {
-		actions = "hist:keys=func:ts0=common_timestamp.usecs"
+	initcall.initcall_start.hist {
+		keys = func;
+		var.ts0 = common_timestamp.usecs
 	}
-	initcall.initcall_finish {
-		actions = "hist:keys=func:lat=common_timestamp.usecs-$ts0:onmatch(initcall.initcall_start).initcall_latency(func,$lat)"
+	initcall.initcall_finish.hist {
+		keys = func
+		var.lat = common_timestamp.usecs - $ts0
+		onmatch {
+			event = initcall.initcall_start
+			trace = initcall_latency, func, $lat
+		}
 	}
 }
 
diff --git a/tools/testing/ktest/examples/bootconfigs/verify-boottrace.sh b/tools/testing/ktest/examples/bootconfigs/verify-boottrace.sh
index f271940ce7fb..233e95cfcf20 100755
--- a/tools/testing/ktest/examples/bootconfigs/verify-boottrace.sh
+++ b/tools/testing/ktest/examples/bootconfigs/verify-boottrace.sh
@@ -58,7 +58,7 @@ compare_file_partial "events/synthetic/initcall_latency/enable" "0"
 compare_file_partial "events/initcall/initcall_start/trigger" "hist:keys=func:vals=hitcount:ts0=common_timestamp.usecs"
 compare_file_partial "events/initcall/initcall_start/enable" "1"
 
-compare_file_partial "events/initcall/initcall_finish/trigger" 'hist:keys=func:vals=hitcount:lat=common_timestamp.usecs-\$ts0:sort=hitcount:size=2048:clock=global:onmatch(initcall.initcall_start).initcall_latency(func,\$lat)'
+compare_file_partial "events/initcall/initcall_finish/trigger" 'hist:keys=func:vals=hitcount:lat=common_timestamp.usecs-\$ts0:sort=hitcount:size=2048:clock=global:onmatch(initcall.initcall_start).trace(initcall_latency,func,\$lat)'
 compare_file_partial "events/initcall/initcall_finish/enable" "1"
 
 compare_file "instances/foo/current_tracer" "function"
-- 
2.30.2

  parent reply	other threads:[~2021-08-17 19:43 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-17 19:42 [for-next][PATCH 00/19] tracing: Updates for 5.15 Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 01/19] tracing/boot: Fix a hist trigger dependency for boot time tracing Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 02/19] tracing: Add linear buckets to histogram logic Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 03/19] tracing/histogram: Update the documentation for the buckets modifier Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 04/19] tracing: Have histogram types be constant when possible Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 05/19] tracing: Allow execnames to be passed as args for synthetic events Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 06/19] tracing: Simplify the Kconfig dependency of FTRACE Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 08/19] tracing: Fix a typo in tracepoint.h Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 09/19] tracing/boot: Add per-event histogram action options Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 10/19] tracing/boot: Support multiple handlers for per-event histogram Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 11/19] tracing/boot: Support multiple histograms for each event Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 12/19] tracing/boot: Show correct histogram error command Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 13/19] Documentation: tracing: Add histogram syntax to boot-time tracing Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 14/19] tools/bootconfig: Support per-group/all event enabling option Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 15/19] tools/bootconfig: Add histogram syntax support to bconf2ftrace.sh Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 16/19] tools/bootconfig: Use per-group/all enable option in ftrace2bconf script Steven Rostedt
2021-08-17 19:42 ` Steven Rostedt [this message]
2021-08-17 19:42 ` [for-next][PATCH 18/19] tracepoint: Fix kerneldoc comments Steven Rostedt
2021-08-17 19:42 ` [for-next][PATCH 19/19] MAINTAINERS: Add an entry for os noise/latency Steven Rostedt

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=20210817194305.742530204@goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@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