From: Tom Zanussi <tom.zanussi@linux.intel.com>
To: rostedt@goodmis.org
Cc: masami.hiramatsu.pt@hitachi.com, namhyung@kernel.org,
josh@joshtriplett.org, andi@firstfloor.org,
mathieu.desnoyers@efficios.com, peterz@infradead.org,
linux-kernel@vger.kernel.org,
Tom Zanussi <tom.zanussi@linux.intel.com>
Subject: [PATCH v14 05/22] tracing: Add hist trigger support for user-defined sorting ('sort=' param)
Date: Wed, 24 Feb 2016 12:31:40 -0600 [thread overview]
Message-ID: <e49603c21011df3d0a289ec3813360940d437f60.1456333190.git.tom.zanussi@linux.intel.com> (raw)
In-Reply-To: <cover.1456333190.git.tom.zanussi@linux.intel.com>
In-Reply-To: <cover.1456333190.git.tom.zanussi@linux.intel.com>
Allow users to specify keys and/or values to sort on. With this
addition, keys and values specified using the 'keys=' and 'vals='
keywords can be used to sort the hist trigger output via a new 'sort='
keyword. If multiple sort keys are specified, the output will be
sorted using the second key as a secondary sort key, etc. The default
sort order is ascending; if the user wants a different sort order,
'.descending' can be appended to the specific sort key. Before this
addition, output was always sorted by 'hitcount' in ascending order.
This expands the hist trigger syntax from this:
# echo hist:keys=xxx:vals=yyy \
[ if filter] > event/trigger
to this:
# echo hist:keys=xxx:vals=yyy:sort=zzz.descending \
[ if filter] > event/trigger
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Tested-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Reviewed-by: Namhyung Kim <namhyung@kernel.org>
---
kernel/trace/trace.c | 6 ++-
kernel/trace/trace_events_hist.c | 112 +++++++++++++++++++++++++++++++++++++--
2 files changed, 114 insertions(+), 4 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 1a97671..641ccae 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3826,6 +3826,7 @@ static const char readme_msg[] =
" hist trigger\t- If set, event hits are aggregated into a hash table\n"
"\t Format: hist:keys=<field1[,field2,...]>\n"
"\t [:values=<field1[,field2,...]>]\n"
+ "\t [:sort=<field1[,field2,...]>]\n"
"\t [:size=#entries]\n"
"\t [if <filter>]\n\n"
"\t When a matching event is hit, an entry is added to a hash\n"
@@ -3834,7 +3835,10 @@ static const char readme_msg[] =
"\t correspond to fields in the event's format description. Keys\n"
"\t can be any field. Compound keys consisting of up to two\n"
"\t fields can be specified by the 'keys' keyword. Values must\n"
- "\t correspond to numeric fields. The 'size' parameter can be\n"
+ "\t correspond to numeric fields. Sort keys consisting of up to\n"
+ "\t two fields can be specified using the 'sort' keyword. The\n"
+ "\t sort direction can be modified by appending '.descending' or\n"
+ "\t '.ascending' to a sort field. The 'size' parameter can be\n"
"\t used to specify more or fewer than the default 2048 entries\n"
"\t for the hashtable size.\n\n"
"\t Reading the 'hist' file for the event will dump the hash\n"
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index cbd72f0..42ceff0 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -85,6 +85,7 @@ enum hist_field_flags {
struct hist_trigger_attrs {
char *keys_str;
char *vals_str;
+ char *sort_key_str;
unsigned int map_bits;
};
@@ -165,6 +166,7 @@ static void destroy_hist_trigger_attrs(struct hist_trigger_attrs *attrs)
if (!attrs)
return;
+ kfree(attrs->sort_key_str);
kfree(attrs->keys_str);
kfree(attrs->vals_str);
kfree(attrs);
@@ -189,6 +191,8 @@ static struct hist_trigger_attrs *parse_hist_trigger_attrs(char *trigger_str)
(strncmp(str, "vals=", strlen("vals=")) == 0) ||
(strncmp(str, "values=", strlen("values=")) == 0))
attrs->vals_str = kstrdup(str, GFP_KERNEL);
+ else if (strncmp(str, "sort=", strlen("sort=")) == 0)
+ attrs->sort_key_str = kstrdup(str, GFP_KERNEL);
else if (strncmp(str, "size=", strlen("size=")) == 0) {
int map_bits = parse_map_size(str);
@@ -444,12 +448,92 @@ static int create_hist_fields(struct hist_trigger_data *hist_data,
return ret;
}
+static int is_descending(const char *str)
+{
+ if (!str)
+ return 0;
+
+ if (strcmp(str, "descending") == 0)
+ return 1;
+
+ if (strcmp(str, "ascending") == 0)
+ return 0;
+
+ return -EINVAL;
+}
+
static int create_sort_keys(struct hist_trigger_data *hist_data)
{
- int ret = 0;
+ char *fields_str = hist_data->attrs->sort_key_str;
+ struct ftrace_event_field *field = NULL;
+ struct tracing_map_sort_key *sort_key;
+ int descending, ret = 0;
+ unsigned int i, j;
+
+ hist_data->n_sort_keys = 1; /* we always have at least one, hitcount */
+
+ if (!fields_str)
+ goto out;
+
+ strsep(&fields_str, "=");
+ if (!fields_str) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ for (i = 0; i < TRACING_MAP_SORT_KEYS_MAX; i++) {
+ char *field_str, *field_name;
+
+ sort_key = &hist_data->sort_keys[i];
+
+ field_str = strsep(&fields_str, ",");
+ if (!field_str) {
+ if (i == 0)
+ ret = -EINVAL;
+ break;
+ }
+
+ if ((i == TRACING_MAP_SORT_KEYS_MAX - 1) && fields_str) {
+ ret = -EINVAL;
+ break;
+ }
- hist_data->n_sort_keys = 1; /* sort_keys[0] is always hitcount */
+ field_name = strsep(&field_str, ".");
+ if (!field_name) {
+ ret = -EINVAL;
+ break;
+ }
+
+ if (strcmp(field_name, "hitcount") == 0) {
+ descending = is_descending(field_str);
+ if (descending < 0) {
+ ret = descending;
+ break;
+ }
+ sort_key->descending = descending;
+ continue;
+ }
+ for (j = 1; j < hist_data->n_fields; j++) {
+ field = hist_data->fields[j]->field;
+ if (field && (strcmp(field_name, field->name) == 0)) {
+ sort_key->field_idx = j;
+ descending = is_descending(field_str);
+ if (descending < 0) {
+ ret = descending;
+ goto out;
+ }
+ sort_key->descending = descending;
+ break;
+ }
+ }
+ if (j == hist_data->n_fields) {
+ ret = -EINVAL;
+ break;
+ }
+ }
+ hist_data->n_sort_keys = i;
+ out:
return ret;
}
@@ -752,7 +836,29 @@ static int event_hist_trigger_print(struct seq_file *m,
}
seq_puts(m, ":sort=");
- seq_puts(m, "hitcount");
+
+ for (i = 0; i < hist_data->n_sort_keys; i++) {
+ struct tracing_map_sort_key *sort_key;
+
+ sort_key = &hist_data->sort_keys[i];
+
+ if (i > 0)
+ seq_puts(m, ",");
+
+ if (sort_key->field_idx == HITCOUNT_IDX)
+ seq_puts(m, "hitcount");
+ else {
+ unsigned int idx = sort_key->field_idx;
+
+ if (WARN_ON(idx >= TRACING_MAP_FIELDS_MAX))
+ return -EINVAL;
+
+ hist_field_print(m, hist_data->fields[idx]);
+ }
+
+ if (sort_key->descending)
+ seq_puts(m, ".descending");
+ }
seq_printf(m, ":size=%u", (1 << hist_data->map->map_bits));
--
1.9.3
next prev parent reply other threads:[~2016-02-24 18:32 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 18:31 [PATCH 00/22] tracing: 'hist' triggers Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 01/22] tracing: Update some tracing_map constants and comments Tom Zanussi
2016-02-25 5:55 ` 平松雅巳 / HIRAMATU,MASAMI
2016-02-25 14:54 ` Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 02/22] tracing: Add 'hist' event trigger command Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 03/22] tracing: Add hist trigger support for multiple values ('vals=' param) Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 04/22] tracing: Add hist trigger support for compound keys Tom Zanussi
2016-02-24 18:31 ` Tom Zanussi [this message]
2016-02-24 18:31 ` [PATCH v14 06/22] tracing: Add hist trigger support for pausing and continuing a trace Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 07/22] tracing: Add hist trigger support for clearing " Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 08/22] tracing: Add hist trigger 'hex' modifier for displaying numeric fields Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 09/22] tracing: Add hist trigger 'sym' and 'sym-offset' modifiers Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 10/22] tracing: Add hist trigger 'execname' modifier Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 11/22] tracing: Add hist trigger 'syscall' modifier Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 12/22] tracing: Add hist trigger support for stacktraces as keys Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 13/22] tracing: Support string type key properly Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 14/22] tracing: Remove restriction on string position in hist trigger keys Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 15/22] tracing: Add enable_hist/disable_hist triggers Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 16/22] tracing: Add 'hist' trigger Documentation Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 17/22] tracing: Add support for multiple hist triggers per event Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 18/22] tracing: Add support for named triggers Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 19/22] tracing: Add support for named hist triggers Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 20/22] kselftests/ftrace : Add event trigger testcases Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 21/22] kselftests/ftrace: Add hist " Tom Zanussi
2016-02-24 18:31 ` [PATCH v14 22/22] tracing: Add hist trigger 'log2' modifier Tom Zanussi
2016-02-25 9:19 ` [PATCH] kselftests/ftrace: Add a test for log2 modifier of hist trigger Masami Hiramatsu
2016-02-25 14:56 ` Tom Zanussi
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=e49603c21011df3d0a289ec3813360940d437f60.1456333190.git.tom.zanussi@linux.intel.com \
--to=tom.zanussi@linux.intel.com \
--cc=andi@firstfloor.org \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.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.