bootconfig/tracing/ktest: Update ktest example for boot-time tracing

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>

diff --git a/tools/testing/ktest/examples/bootconfigs/boottrace.bconf b/tools/testing/ktest/examples/bootconfigs/boottrace.bconf
index 9db64ec589d56f0a74371c0eebdda001416814d2..7aa706cccb3b5525a5290002e267318613ef48dc 100644 (file)
--- 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 f271940ce7fbc470c1b5041e0d0ad872b8990ed2..233e95cfcf206922c50bbf2ab0b580b3ef6d5883 100755 (executable)
--- 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"