tracing: Add enable_hist/disable_hist triggers
Similar to enable_event/disable_event triggers, these triggers enable and disable the aggregation of events into maps rather than enabling and disabling their writing into the trace buffer. They can be used to automatically start and stop hist triggers based on a matching filter condition. If there's a paused hist trigger on system:event, the following would start it when the filter condition was hit: # echo enable_hist:system:event [ if filter] > event/trigger And the following would disable a running system:event hist trigger: # echo disable_hist:system:event [ if filter] > event/trigger See Documentation/trace/events.txt for real examples. Link: http://lkml.kernel.org/r/f812f086e52c8b7c8ad5443487375e03c96a601f.1457029949.git.tom.zanussi@linux.intel.com 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> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:

committed by
Steven Rostedt

parent
6a475cb17f
commit
d0bad49bb0
@@ -347,7 +347,7 @@ __init int register_event_command(struct event_command *cmd)
|
||||
* Currently we only unregister event commands from __init, so mark
|
||||
* this __init too.
|
||||
*/
|
||||
static __init int unregister_event_command(struct event_command *cmd)
|
||||
__init int unregister_event_command(struct event_command *cmd)
|
||||
{
|
||||
struct event_command *p, *n;
|
||||
int ret = -ENODEV;
|
||||
@@ -1062,15 +1062,6 @@ static __init void unregister_trigger_traceon_traceoff_cmds(void)
|
||||
unregister_event_command(&trigger_traceoff_cmd);
|
||||
}
|
||||
|
||||
/* Avoid typos */
|
||||
#define ENABLE_EVENT_STR "enable_event"
|
||||
#define DISABLE_EVENT_STR "disable_event"
|
||||
|
||||
struct enable_trigger_data {
|
||||
struct trace_event_file *file;
|
||||
bool enable;
|
||||
};
|
||||
|
||||
static void
|
||||
event_enable_trigger(struct event_trigger_data *data, void *rec)
|
||||
{
|
||||
@@ -1100,14 +1091,16 @@ event_enable_count_trigger(struct event_trigger_data *data, void *rec)
|
||||
event_enable_trigger(data, rec);
|
||||
}
|
||||
|
||||
static int
|
||||
event_enable_trigger_print(struct seq_file *m, struct event_trigger_ops *ops,
|
||||
struct event_trigger_data *data)
|
||||
int event_enable_trigger_print(struct seq_file *m,
|
||||
struct event_trigger_ops *ops,
|
||||
struct event_trigger_data *data)
|
||||
{
|
||||
struct enable_trigger_data *enable_data = data->private_data;
|
||||
|
||||
seq_printf(m, "%s:%s:%s",
|
||||
enable_data->enable ? ENABLE_EVENT_STR : DISABLE_EVENT_STR,
|
||||
enable_data->hist ?
|
||||
(enable_data->enable ? ENABLE_HIST_STR : DISABLE_HIST_STR) :
|
||||
(enable_data->enable ? ENABLE_EVENT_STR : DISABLE_EVENT_STR),
|
||||
enable_data->file->event_call->class->system,
|
||||
trace_event_name(enable_data->file->event_call));
|
||||
|
||||
@@ -1124,9 +1117,8 @@ event_enable_trigger_print(struct seq_file *m, struct event_trigger_ops *ops,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
event_enable_trigger_free(struct event_trigger_ops *ops,
|
||||
struct event_trigger_data *data)
|
||||
void event_enable_trigger_free(struct event_trigger_ops *ops,
|
||||
struct event_trigger_data *data)
|
||||
{
|
||||
struct enable_trigger_data *enable_data = data->private_data;
|
||||
|
||||
@@ -1171,10 +1163,9 @@ static struct event_trigger_ops event_disable_count_trigger_ops = {
|
||||
.free = event_enable_trigger_free,
|
||||
};
|
||||
|
||||
static int
|
||||
event_enable_trigger_func(struct event_command *cmd_ops,
|
||||
struct trace_event_file *file,
|
||||
char *glob, char *cmd, char *param)
|
||||
int event_enable_trigger_func(struct event_command *cmd_ops,
|
||||
struct trace_event_file *file,
|
||||
char *glob, char *cmd, char *param)
|
||||
{
|
||||
struct trace_event_file *event_enable_file;
|
||||
struct enable_trigger_data *enable_data;
|
||||
@@ -1183,6 +1174,7 @@ event_enable_trigger_func(struct event_command *cmd_ops,
|
||||
struct trace_array *tr = file->tr;
|
||||
const char *system;
|
||||
const char *event;
|
||||
bool hist = false;
|
||||
char *trigger;
|
||||
char *number;
|
||||
bool enable;
|
||||
@@ -1207,8 +1199,15 @@ event_enable_trigger_func(struct event_command *cmd_ops,
|
||||
if (!event_enable_file)
|
||||
goto out;
|
||||
|
||||
enable = strcmp(cmd, ENABLE_EVENT_STR) == 0;
|
||||
#ifdef CONFIG_HIST_TRIGGERS
|
||||
hist = ((strcmp(cmd, ENABLE_HIST_STR) == 0) ||
|
||||
(strcmp(cmd, DISABLE_HIST_STR) == 0));
|
||||
|
||||
enable = ((strcmp(cmd, ENABLE_EVENT_STR) == 0) ||
|
||||
(strcmp(cmd, ENABLE_HIST_STR) == 0));
|
||||
#else
|
||||
enable = strcmp(cmd, ENABLE_EVENT_STR) == 0;
|
||||
#endif
|
||||
trigger_ops = cmd_ops->get_trigger_ops(cmd, trigger);
|
||||
|
||||
ret = -ENOMEM;
|
||||
@@ -1228,6 +1227,7 @@ event_enable_trigger_func(struct event_command *cmd_ops,
|
||||
INIT_LIST_HEAD(&trigger_data->list);
|
||||
RCU_INIT_POINTER(trigger_data->filter, NULL);
|
||||
|
||||
enable_data->hist = hist;
|
||||
enable_data->enable = enable;
|
||||
enable_data->file = event_enable_file;
|
||||
trigger_data->private_data = enable_data;
|
||||
@@ -1305,10 +1305,10 @@ event_enable_trigger_func(struct event_command *cmd_ops,
|
||||
goto out;
|
||||
}
|
||||
|
||||
static int event_enable_register_trigger(char *glob,
|
||||
struct event_trigger_ops *ops,
|
||||
struct event_trigger_data *data,
|
||||
struct trace_event_file *file)
|
||||
int event_enable_register_trigger(char *glob,
|
||||
struct event_trigger_ops *ops,
|
||||
struct event_trigger_data *data,
|
||||
struct trace_event_file *file)
|
||||
{
|
||||
struct enable_trigger_data *enable_data = data->private_data;
|
||||
struct enable_trigger_data *test_enable_data;
|
||||
@@ -1318,6 +1318,8 @@ static int event_enable_register_trigger(char *glob,
|
||||
list_for_each_entry_rcu(test, &file->triggers, list) {
|
||||
test_enable_data = test->private_data;
|
||||
if (test_enable_data &&
|
||||
(test->cmd_ops->trigger_type ==
|
||||
data->cmd_ops->trigger_type) &&
|
||||
(test_enable_data->file == enable_data->file)) {
|
||||
ret = -EEXIST;
|
||||
goto out;
|
||||
@@ -1343,10 +1345,10 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void event_enable_unregister_trigger(char *glob,
|
||||
struct event_trigger_ops *ops,
|
||||
struct event_trigger_data *test,
|
||||
struct trace_event_file *file)
|
||||
void event_enable_unregister_trigger(char *glob,
|
||||
struct event_trigger_ops *ops,
|
||||
struct event_trigger_data *test,
|
||||
struct trace_event_file *file)
|
||||
{
|
||||
struct enable_trigger_data *test_enable_data = test->private_data;
|
||||
struct enable_trigger_data *enable_data;
|
||||
@@ -1356,6 +1358,8 @@ static void event_enable_unregister_trigger(char *glob,
|
||||
list_for_each_entry_rcu(data, &file->triggers, list) {
|
||||
enable_data = data->private_data;
|
||||
if (enable_data &&
|
||||
(data->cmd_ops->trigger_type ==
|
||||
test->cmd_ops->trigger_type) &&
|
||||
(enable_data->file == test_enable_data->file)) {
|
||||
unregistered = true;
|
||||
list_del_rcu(&data->list);
|
||||
@@ -1375,8 +1379,12 @@ event_enable_get_trigger_ops(char *cmd, char *param)
|
||||
struct event_trigger_ops *ops;
|
||||
bool enable;
|
||||
|
||||
#ifdef CONFIG_HIST_TRIGGERS
|
||||
enable = ((strcmp(cmd, ENABLE_EVENT_STR) == 0) ||
|
||||
(strcmp(cmd, ENABLE_HIST_STR) == 0));
|
||||
#else
|
||||
enable = strcmp(cmd, ENABLE_EVENT_STR) == 0;
|
||||
|
||||
#endif
|
||||
if (enable)
|
||||
ops = param ? &event_enable_count_trigger_ops :
|
||||
&event_enable_trigger_ops;
|
||||
@@ -1447,6 +1455,7 @@ __init int register_trigger_cmds(void)
|
||||
register_trigger_snapshot_cmd();
|
||||
register_trigger_stacktrace_cmd();
|
||||
register_trigger_enable_disable_cmds();
|
||||
register_trigger_hist_enable_disable_cmds();
|
||||
register_trigger_hist_cmd();
|
||||
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user