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 15/19] tools/bootconfig: Add histogram syntax support to bconf2ftrace.sh
Date: Tue, 17 Aug 2021 15:42:22 -0400 [thread overview]
Message-ID: <20210817194305.361166358@goodmis.org> (raw)
In-Reply-To: 20210817194207.947725935@goodmis.org
From: Masami Hiramatsu <mhiramat@kernel.org>
Add histogram syntax support to bconf2ftrace.sh script.
Link: https://lkml.kernel.org/r/162856128672.203126.8240335908303312607.stgit@devnote2
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
tools/bootconfig/scripts/bconf2ftrace.sh | 88 ++++++++++++++++++++++++
tools/bootconfig/scripts/xbc.sh | 4 +-
2 files changed, 90 insertions(+), 2 deletions(-)
diff --git a/tools/bootconfig/scripts/bconf2ftrace.sh b/tools/bootconfig/scripts/bconf2ftrace.sh
index 651049c782c0..850c2073433e 100755
--- a/tools/bootconfig/scripts/bconf2ftrace.sh
+++ b/tools/bootconfig/scripts/bconf2ftrace.sh
@@ -94,6 +94,92 @@ compose_synth() { # event_name branch
xbc_get_val $2 | while read field; do echo -n "$field; "; done
}
+print_hist_array() { # prefix key
+ __sep="="
+ if xbc_has_key ${1}.${2}; then
+ echo -n ":$2"
+ xbc_get_val ${1}.${2} | while read field; do
+ echo -n "$__sep$field"; __sep=","
+ done
+ fi
+}
+
+print_hist_action_array() { # prefix key
+ __sep="("
+ echo -n ".$2"
+ xbc_get_val ${1}.${2} | while read field; do
+ echo -n "$__sep$field"; __sep=","
+ done
+ echo -n ")"
+}
+
+print_hist_one_action() { # prefix handler param
+ echo -n ":${2}("`xbc_get_val ${1}.${3}`")"
+ if xbc_has_key "${1}.trace"; then
+ print_hist_action_array ${1} "trace"
+ elif xbc_has_key "${1}.save"; then
+ print_hist_action_array ${1} "save"
+ elif xbc_has_key "${1}.snapshot"; then
+ echo -n ".snapshot()"
+ fi
+}
+
+print_hist_actions() { # prefix handler param
+ for __hdr in `xbc_subkeys ${1}.${2} 1 ".[0-9]"`; do
+ print_hist_one_action ${1}.${2}.$__hdr ${2} ${3}
+ done
+ if xbc_has_key ${1}.${2}.${3} ; then
+ print_hist_one_action ${1}.${2} ${2} ${3}
+ fi
+}
+
+print_hist_var() { # prefix varname
+ echo -n ":${2}="`xbc_get_val ${1}.var.${2} | tr -d [:space:]`
+}
+
+print_one_histogram() { # prefix
+ echo -n "hist"
+ print_hist_array $1 "keys"
+ print_hist_array $1 "values"
+ print_hist_array $1 "sort"
+ if xbc_has_key "${1}.size"; then
+ echo -n ":size="`xbc_get_val ${1}.size`
+ fi
+ if xbc_has_key "${1}.name"; then
+ echo -n ":name="`xbc_get_val ${1}.name`
+ fi
+ for __var in `xbc_subkeys "${1}.var" 1`; do
+ print_hist_var ${1} ${__var}
+ done
+ if xbc_has_key "${1}.pause"; then
+ echo -n ":pause"
+ elif xbc_has_key "${1}.continue"; then
+ echo -n ":continue"
+ elif xbc_has_key "${1}.clear"; then
+ echo -n ":clear"
+ fi
+ print_hist_actions ${1} "onmax" "var"
+ print_hist_actions ${1} "onchange" "var"
+ print_hist_actions ${1} "onmatch" "event"
+
+ if xbc_has_key "${1}.filter"; then
+ echo -n " if "`xbc_get_val ${1}.filter`
+ fi
+}
+
+setup_one_histogram() { # prefix trigger-file
+ run_cmd "echo '`print_one_histogram ${1}`' >> ${2}"
+}
+
+setup_histograms() { # prefix trigger-file
+ for __hist in `xbc_subkeys ${1} 1 ".[0-9]"`; do
+ setup_one_histogram ${1}.$__hist ${2}
+ done
+ if xbc_has_key ${1}.keys; then
+ setup_one_histogram ${1} ${2}
+ fi
+}
+
setup_event() { # prefix group event [instance]
branch=$1.$2.$3
if [ "$4" ]; then
@@ -121,6 +207,8 @@ setup_event() { # prefix group event [instance]
set_value_of ${branch}.filter ${eventdir}/filter
set_array_of ${branch}.actions ${eventdir}/trigger
+ setup_histograms ${branch}.hist ${eventdir}/trigger
+
if xbc_has_key ${branch}.enable; then
run_cmd "echo 1 > ${eventdir}/enable"
fi
diff --git a/tools/bootconfig/scripts/xbc.sh b/tools/bootconfig/scripts/xbc.sh
index b8c84e654556..1f0ebf50dd2d 100644
--- a/tools/bootconfig/scripts/xbc.sh
+++ b/tools/bootconfig/scripts/xbc.sh
@@ -49,8 +49,8 @@ xbc_has_branch() { # prefix-key
grep -q "^$1" $XBC_TMPFILE
}
-xbc_subkeys() { # prefix-key depth
+xbc_subkeys() { # prefix-key depth [subkey-pattern]
__keys=`echo $1 | sed "s/\./ /g"`
__s=`nr_args $__keys`
- grep "^$1" $XBC_TMPFILE | cut -d= -f1| cut -d. -f$((__s + 1))-$((__s + $2)) | uniq
+ grep "^$1$3" $XBC_TMPFILE | cut -d= -f1| cut -d. -f$((__s + 1))-$((__s + $2)) | uniq
}
--
2.30.2
next prev 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 ` Steven Rostedt [this message]
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 ` [for-next][PATCH 17/19] bootconfig/tracing/ktest: Update ktest example for boot-time tracing Steven Rostedt
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.361166358@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.