Skip to content

Commit

Permalink
tracing: Change event_trigger_ops func() to trigger()
Browse files Browse the repository at this point in the history 
The name of the func() callback on event_trigger_ops is too generic
and is easily confused with other callbacks with that name, so change
it to something that reflects its actual purpose.

In this case, the main purpose of the callback is to implement an
event trigger, so call it trigger() instead.

Also add some more documentation to event_trigger_ops describing the
callbacks a bit better.

Link: https://lkml.kernel.org/r/36ab812e3ee74ee03ae0043fda41a858ee728c00.1641823001.git.zanussi@kernel.org

Signed-off-by: Tom Zanussi <zanussi@kernel.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
  • Loading branch information
Tom Zanussi authored and Steven Rostedt committed Jan 10, 2022
1 parent 9ec5a7d commit fb339e5
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 26 deletions.
19 changes: 15 additions & 4 deletions kernel/trace/trace.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1619,10 +1619,20 @@ extern int register_trigger_hist_enable_disable_cmds(void);
* The methods in this structure provide per-event trigger hooks for
* various trigger operations.
*
* The @init and @free methods are used during trigger setup and
* teardown, typically called from an event_command's @parse()
* function implementation.
*
* The @print method is used to print the trigger spec.
*
* The @trigger method is the function that actually implements the
* trigger and is called in the context of the triggering event
* whenever that event occurs.
*
* All the methods below, except for @init() and @free(), must be
* implemented.
*
* @func: The trigger 'probe' function called when the triggering
* @trigger: The trigger 'probe' function called when the triggering
* event occurs. The data passed into this callback is the data
* that was supplied to the event_command @reg() function that
* registered the trigger (see struct event_command) along with
Expand Down Expand Up @@ -1651,9 +1661,10 @@ extern int register_trigger_hist_enable_disable_cmds(void);
* (see trace_event_triggers.c).
*/
struct event_trigger_ops {
void (*func)(struct event_trigger_data *data,
struct trace_buffer *buffer, void *rec,
struct ring_buffer_event *rbe);
void (*trigger)(struct event_trigger_data *data,
struct trace_buffer *buffer,
void *rec,
struct ring_buffer_event *rbe);
int (*init)(struct event_trigger_ops *ops,
struct event_trigger_data *data);
void (*free)(struct event_trigger_ops *ops,
Expand Down
2 changes: 1 addition & 1 deletion kernel/trace/trace_eprobe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ static void eprobe_trigger_func(struct event_trigger_data *data,
}

static struct event_trigger_ops eprobe_trigger_ops = {
.func = eprobe_trigger_func,
.trigger = eprobe_trigger_func,
.print = eprobe_trigger_print,
.init = eprobe_trigger_init,
.free = eprobe_trigger_free,
Expand Down
12 changes: 6 additions & 6 deletions kernel/trace/trace_events_hist.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5759,7 +5759,7 @@ static void event_hist_trigger_free(struct event_trigger_ops *ops,
}

static struct event_trigger_ops event_hist_trigger_ops = {
.func = event_hist_trigger,
.trigger = event_hist_trigger,
.print = event_hist_trigger_print,
.init = event_hist_trigger_init,
.free = event_hist_trigger_free,
Expand Down Expand Up @@ -5793,7 +5793,7 @@ static void event_hist_trigger_named_free(struct event_trigger_ops *ops,
}

static struct event_trigger_ops event_hist_trigger_named_ops = {
.func = event_hist_trigger,
.trigger = event_hist_trigger,
.print = event_hist_trigger_print,
.init = event_hist_trigger_named_init,
.free = event_hist_trigger_named_free,
Expand Down Expand Up @@ -6383,28 +6383,28 @@ hist_enable_count_trigger(struct event_trigger_data *data,
}

static struct event_trigger_ops hist_enable_trigger_ops = {
.func = hist_enable_trigger,
.trigger = hist_enable_trigger,
.print = event_enable_trigger_print,
.init = event_trigger_init,
.free = event_enable_trigger_free,
};

static struct event_trigger_ops hist_enable_count_trigger_ops = {
.func = hist_enable_count_trigger,
.trigger = hist_enable_count_trigger,
.print = event_enable_trigger_print,
.init = event_trigger_init,
.free = event_enable_trigger_free,
};

static struct event_trigger_ops hist_disable_trigger_ops = {
.func = hist_enable_trigger,
.trigger = hist_enable_trigger,
.print = event_enable_trigger_print,
.init = event_trigger_init,
.free = event_enable_trigger_free,
};

static struct event_trigger_ops hist_disable_count_trigger_ops = {
.func = hist_enable_count_trigger,
.trigger = hist_enable_count_trigger,
.print = event_enable_trigger_print,
.init = event_trigger_init,
.free = event_enable_trigger_free,
Expand Down
30 changes: 15 additions & 15 deletions kernel/trace/trace_events_trigger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ event_triggers_call(struct trace_event_file *file,
if (data->paused)
continue;
if (!rec) {
data->ops->func(data, buffer, rec, event);
data->ops->trigger(data, buffer, rec, event);
continue;
}
filter = rcu_dereference_sched(data->filter);
Expand All @@ -78,7 +78,7 @@ event_triggers_call(struct trace_event_file *file,
tt |= data->cmd_ops->trigger_type;
continue;
}
data->ops->func(data, buffer, rec, event);
data->ops->trigger(data, buffer, rec, event);
}
return tt;
}
Expand Down Expand Up @@ -106,7 +106,7 @@ event_triggers_post_call(struct trace_event_file *file,
if (data->paused)
continue;
if (data->cmd_ops->trigger_type & tt)
data->ops->func(data, NULL, NULL, NULL);
data->ops->trigger(data, NULL, NULL, NULL);
}
}
EXPORT_SYMBOL_GPL(event_triggers_post_call);
Expand Down Expand Up @@ -1023,28 +1023,28 @@ traceoff_trigger_print(struct seq_file *m, struct event_trigger_ops *ops,
}

static struct event_trigger_ops traceon_trigger_ops = {
.func = traceon_trigger,
.trigger = traceon_trigger,
.print = traceon_trigger_print,
.init = event_trigger_init,
.free = event_trigger_free,
};

static struct event_trigger_ops traceon_count_trigger_ops = {
.func = traceon_count_trigger,
.trigger = traceon_count_trigger,
.print = traceon_trigger_print,
.init = event_trigger_init,
.free = event_trigger_free,
};

static struct event_trigger_ops traceoff_trigger_ops = {
.func = traceoff_trigger,
.trigger = traceoff_trigger,
.print = traceoff_trigger_print,
.init = event_trigger_init,
.free = event_trigger_free,
};

static struct event_trigger_ops traceoff_count_trigger_ops = {
.func = traceoff_count_trigger,
.trigger = traceoff_count_trigger,
.print = traceoff_trigger_print,
.init = event_trigger_init,
.free = event_trigger_free,
Expand Down Expand Up @@ -1135,14 +1135,14 @@ snapshot_trigger_print(struct seq_file *m, struct event_trigger_ops *ops,
}

static struct event_trigger_ops snapshot_trigger_ops = {
.func = snapshot_trigger,
.trigger = snapshot_trigger,
.print = snapshot_trigger_print,
.init = event_trigger_init,
.free = event_trigger_free,
};

static struct event_trigger_ops snapshot_count_trigger_ops = {
.func = snapshot_count_trigger,
.trigger = snapshot_count_trigger,
.print = snapshot_trigger_print,
.init = event_trigger_init,
.free = event_trigger_free,
Expand Down Expand Up @@ -1226,14 +1226,14 @@ stacktrace_trigger_print(struct seq_file *m, struct event_trigger_ops *ops,
}

static struct event_trigger_ops stacktrace_trigger_ops = {
.func = stacktrace_trigger,
.trigger = stacktrace_trigger,
.print = stacktrace_trigger_print,
.init = event_trigger_init,
.free = event_trigger_free,
};

static struct event_trigger_ops stacktrace_count_trigger_ops = {
.func = stacktrace_count_trigger,
.trigger = stacktrace_count_trigger,
.print = stacktrace_trigger_print,
.init = event_trigger_init,
.free = event_trigger_free,
Expand Down Expand Up @@ -1353,28 +1353,28 @@ void event_enable_trigger_free(struct event_trigger_ops *ops,
}

static struct event_trigger_ops event_enable_trigger_ops = {
.func = event_enable_trigger,
.trigger = event_enable_trigger,
.print = event_enable_trigger_print,
.init = event_trigger_init,
.free = event_enable_trigger_free,
};

static struct event_trigger_ops event_enable_count_trigger_ops = {
.func = event_enable_count_trigger,
.trigger = event_enable_count_trigger,
.print = event_enable_trigger_print,
.init = event_trigger_init,
.free = event_enable_trigger_free,
};

static struct event_trigger_ops event_disable_trigger_ops = {
.func = event_enable_trigger,
.trigger = event_enable_trigger,
.print = event_enable_trigger_print,
.init = event_trigger_init,
.free = event_enable_trigger_free,
};

static struct event_trigger_ops event_disable_count_trigger_ops = {
.func = event_enable_count_trigger,
.trigger = event_enable_count_trigger,
.print = event_enable_trigger_print,
.init = event_trigger_init,
.free = event_enable_trigger_free,
Expand Down

0 comments on commit fb339e5

Please sign in to comment.