Skip to content

Commit 9ec5a7d

Browse files
Tom Zanussirostedt
Tom Zanussi
authored and
rostedt
committed
tracing: Change event_command func() to parse()
The name of the func() callback on event_command 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 parse an event command, so call it parse() instead. Link: https://lkml.kernel.org/r/7784e321840752ed88aac0b349c0c685fc9247b1.1641823001.git.zanussi@kernel.org Signed-off-by: Tom Zanussi <[email protected]> Signed-off-by: Steven Rostedt <[email protected]>
1 parent 2768c1e commit 9ec5a7d

File tree

4 files changed

+44
-39
lines changed

4 files changed

+44
-39
lines changed

‎kernel/trace/trace.h

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,9 +1578,9 @@ extern int event_enable_trigger_print(struct seq_file *m,
15781578
struct event_trigger_data *data);
15791579
extern void event_enable_trigger_free(struct event_trigger_ops *ops,
15801580
struct event_trigger_data *data);
1581-
extern int event_enable_trigger_func(struct event_command *cmd_ops,
1582-
struct trace_event_file *file,
1583-
char *glob, char *cmd, char *param);
1581+
extern int event_enable_trigger_parse(struct event_command *cmd_ops,
1582+
struct trace_event_file *file,
1583+
char *glob, char *cmd, char *param);
15841584
extern int event_enable_register_trigger(char *glob,
15851585
struct event_trigger_ops *ops,
15861586
struct event_trigger_data *data,
@@ -1702,7 +1702,7 @@ struct event_trigger_ops {
17021702
* All the methods below, except for @set_filter() and @unreg_all(),
17031703
* must be implemented.
17041704
*
1705-
* @func: The callback function responsible for parsing and
1705+
* @parse: The callback function responsible for parsing and
17061706
* registering the trigger written to the 'trigger' file by the
17071707
* user. It allocates the trigger instance and registers it with
17081708
* the appropriate trace event. It makes use of the other
@@ -1737,15 +1737,20 @@ struct event_trigger_ops {
17371737
*
17381738
* @get_trigger_ops: The callback function invoked to retrieve the
17391739
* event_trigger_ops implementation associated with the command.
1740+
* This callback function allows a single event_command to
1741+
* support multiple trigger implementations via different sets of
1742+
* event_trigger_ops, depending on the value of the @param
1743+
* string.
17401744
*/
17411745
struct event_command {
17421746
struct list_head list;
17431747
char *name;
17441748
enum event_trigger_type trigger_type;
17451749
int flags;
1746-
int (*func)(struct event_command *cmd_ops,
1747-
struct trace_event_file *file,
1748-
char *glob, char *cmd, char *params);
1750+
int (*parse)(struct event_command *cmd_ops,
1751+
struct trace_event_file *file,
1752+
char *glob, char *cmd,
1753+
char *param_and_filter);
17491754
int (*reg)(char *glob,
17501755
struct event_trigger_ops *ops,
17511756
struct event_trigger_data *data,

‎kernel/trace/trace_eprobe.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -549,9 +549,9 @@ static struct event_trigger_ops eprobe_trigger_ops = {
549549
.free = eprobe_trigger_free,
550550
};
551551

552-
static int eprobe_trigger_cmd_func(struct event_command *cmd_ops,
553-
struct trace_event_file *file,
554-
char *glob, char *cmd, char *param)
552+
static int eprobe_trigger_cmd_parse(struct event_command *cmd_ops,
553+
struct trace_event_file *file,
554+
char *glob, char *cmd, char *param)
555555
{
556556
return -1;
557557
}
@@ -580,7 +580,7 @@ static struct event_command event_trigger_cmd = {
580580
.name = "eprobe",
581581
.trigger_type = ETT_EVENT_EPROBE,
582582
.flags = EVENT_CMD_FL_NEEDS_REC,
583-
.func = eprobe_trigger_cmd_func,
583+
.parse = eprobe_trigger_cmd_parse,
584584
.reg = eprobe_trigger_reg_func,
585585
.unreg = eprobe_trigger_unreg_func,
586586
.unreg_all = NULL,

‎kernel/trace/trace_events_hist.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2761,9 +2761,9 @@ static char *find_trigger_filter(struct hist_trigger_data *hist_data,
27612761
}
27622762

27632763
static struct event_command trigger_hist_cmd;
2764-
static int event_hist_trigger_func(struct event_command *cmd_ops,
2765-
struct trace_event_file *file,
2766-
char *glob, char *cmd, char *param);
2764+
static int event_hist_trigger_parse(struct event_command *cmd_ops,
2765+
struct trace_event_file *file,
2766+
char *glob, char *cmd, char *param);
27672767

27682768
static bool compatible_keys(struct hist_trigger_data *target_hist_data,
27692769
struct hist_trigger_data *hist_data,
@@ -2966,8 +2966,8 @@ create_field_var_hist(struct hist_trigger_data *target_hist_data,
29662966
var_hist->hist_data = hist_data;
29672967

29682968
/* Create the new histogram with our variable */
2969-
ret = event_hist_trigger_func(&trigger_hist_cmd, file,
2970-
"", "hist", cmd);
2969+
ret = event_hist_trigger_parse(&trigger_hist_cmd, file,
2970+
"", "hist", cmd);
29712971
if (ret) {
29722972
kfree(cmd);
29732973
kfree(var_hist->cmd);
@@ -5729,8 +5729,8 @@ static void unregister_field_var_hists(struct hist_trigger_data *hist_data)
57295729
for (i = 0; i < hist_data->n_field_var_hists; i++) {
57305730
file = hist_data->field_var_hists[i]->hist_data->event_file;
57315731
cmd = hist_data->field_var_hists[i]->cmd;
5732-
ret = event_hist_trigger_func(&trigger_hist_cmd, file,
5733-
"!hist", "hist", cmd);
5732+
ret = event_hist_trigger_parse(&trigger_hist_cmd, file,
5733+
"!hist", "hist", cmd);
57345734
WARN_ON_ONCE(ret < 0);
57355735
}
57365736
}
@@ -6146,9 +6146,9 @@ static void hist_unreg_all(struct trace_event_file *file)
61466146
}
61476147
}
61486148

6149-
static int event_hist_trigger_func(struct event_command *cmd_ops,
6150-
struct trace_event_file *file,
6151-
char *glob, char *cmd, char *param)
6149+
static int event_hist_trigger_parse(struct event_command *cmd_ops,
6150+
struct trace_event_file *file,
6151+
char *glob, char *cmd, char *param)
61526152
{
61536153
unsigned int hist_trigger_bits = TRACING_MAP_BITS_DEFAULT;
61546154
struct event_trigger_data *trigger_data;
@@ -6331,7 +6331,7 @@ static struct event_command trigger_hist_cmd = {
63316331
.name = "hist",
63326332
.trigger_type = ETT_EVENT_HIST,
63336333
.flags = EVENT_CMD_FL_NEEDS_REC,
6334-
.func = event_hist_trigger_func,
6334+
.parse = event_hist_trigger_parse,
63356335
.reg = hist_register_trigger,
63366336
.unreg = hist_unregister_trigger,
63376337
.unreg_all = hist_unreg_all,
@@ -6446,7 +6446,7 @@ static void hist_enable_unreg_all(struct trace_event_file *file)
64466446
static struct event_command trigger_hist_enable_cmd = {
64476447
.name = ENABLE_HIST_STR,
64486448
.trigger_type = ETT_HIST_ENABLE,
6449-
.func = event_enable_trigger_func,
6449+
.parse = event_enable_trigger_parse,
64506450
.reg = event_enable_register_trigger,
64516451
.unreg = event_enable_unregister_trigger,
64526452
.unreg_all = hist_enable_unreg_all,
@@ -6457,7 +6457,7 @@ static struct event_command trigger_hist_enable_cmd = {
64576457
static struct event_command trigger_hist_disable_cmd = {
64586458
.name = DISABLE_HIST_STR,
64596459
.trigger_type = ETT_HIST_ENABLE,
6460-
.func = event_enable_trigger_func,
6460+
.parse = event_enable_trigger_parse,
64616461
.reg = event_enable_register_trigger,
64626462
.unreg = event_enable_unregister_trigger,
64636463
.unreg_all = hist_enable_unreg_all,

‎kernel/trace/trace_events_trigger.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ int trigger_process_regex(struct trace_event_file *file, char *buff)
245245
mutex_lock(&trigger_cmd_mutex);
246246
list_for_each_entry(p, &trigger_commands, list) {
247247
if (strcmp(p->name, command) == 0) {
248-
ret = p->func(p, file, buff, command, next);
248+
ret = p->parse(p, file, buff, command, next);
249249
goto out_unlock;
250250
}
251251
}
@@ -622,7 +622,7 @@ static void unregister_trigger(char *glob, struct event_trigger_ops *ops,
622622
}
623623

624624
/**
625-
* event_trigger_callback - Generic event_command @func implementation
625+
* event_trigger_parse - Generic event_command @parse implementation
626626
* @cmd_ops: The command ops, used for trigger registration
627627
* @file: The trace_event_file associated with the event
628628
* @glob: The raw string used to register the trigger
@@ -632,15 +632,15 @@ static void unregister_trigger(char *glob, struct event_trigger_ops *ops,
632632
* Common implementation for event command parsing and trigger
633633
* instantiation.
634634
*
635-
* Usually used directly as the @func method in event command
635+
* Usually used directly as the @parse method in event command
636636
* implementations.
637637
*
638638
* Return: 0 on success, errno otherwise
639639
*/
640640
static int
641-
event_trigger_callback(struct event_command *cmd_ops,
642-
struct trace_event_file *file,
643-
char *glob, char *cmd, char *param)
641+
event_trigger_parse(struct event_command *cmd_ops,
642+
struct trace_event_file *file,
643+
char *glob, char *cmd, char *param)
644644
{
645645
struct event_trigger_data *trigger_data;
646646
struct event_trigger_ops *trigger_ops;
@@ -1069,7 +1069,7 @@ onoff_get_trigger_ops(char *cmd, char *param)
10691069
static struct event_command trigger_traceon_cmd = {
10701070
.name = "traceon",
10711071
.trigger_type = ETT_TRACE_ONOFF,
1072-
.func = event_trigger_callback,
1072+
.parse = event_trigger_parse,
10731073
.reg = register_trigger,
10741074
.unreg = unregister_trigger,
10751075
.get_trigger_ops = onoff_get_trigger_ops,
@@ -1080,7 +1080,7 @@ static struct event_command trigger_traceoff_cmd = {
10801080
.name = "traceoff",
10811081
.trigger_type = ETT_TRACE_ONOFF,
10821082
.flags = EVENT_CMD_FL_POST_TRIGGER,
1083-
.func = event_trigger_callback,
1083+
.parse = event_trigger_parse,
10841084
.reg = register_trigger,
10851085
.unreg = unregister_trigger,
10861086
.get_trigger_ops = onoff_get_trigger_ops,
@@ -1157,7 +1157,7 @@ snapshot_get_trigger_ops(char *cmd, char *param)
11571157
static struct event_command trigger_snapshot_cmd = {
11581158
.name = "snapshot",
11591159
.trigger_type = ETT_SNAPSHOT,
1160-
.func = event_trigger_callback,
1160+
.parse = event_trigger_parse,
11611161
.reg = register_snapshot_trigger,
11621162
.unreg = unregister_trigger,
11631163
.get_trigger_ops = snapshot_get_trigger_ops,
@@ -1249,7 +1249,7 @@ static struct event_command trigger_stacktrace_cmd = {
12491249
.name = "stacktrace",
12501250
.trigger_type = ETT_STACKTRACE,
12511251
.flags = EVENT_CMD_FL_POST_TRIGGER,
1252-
.func = event_trigger_callback,
1252+
.parse = event_trigger_parse,
12531253
.reg = register_trigger,
12541254
.unreg = unregister_trigger,
12551255
.get_trigger_ops = stacktrace_get_trigger_ops,
@@ -1380,9 +1380,9 @@ static struct event_trigger_ops event_disable_count_trigger_ops = {
13801380
.free = event_enable_trigger_free,
13811381
};
13821382

1383-
int event_enable_trigger_func(struct event_command *cmd_ops,
1384-
struct trace_event_file *file,
1385-
char *glob, char *cmd, char *param)
1383+
int event_enable_trigger_parse(struct event_command *cmd_ops,
1384+
struct trace_event_file *file,
1385+
char *glob, char *cmd, char *param)
13861386
{
13871387
struct trace_event_file *event_enable_file;
13881388
struct enable_trigger_data *enable_data;
@@ -1628,7 +1628,7 @@ event_enable_get_trigger_ops(char *cmd, char *param)
16281628
static struct event_command trigger_enable_cmd = {
16291629
.name = ENABLE_EVENT_STR,
16301630
.trigger_type = ETT_EVENT_ENABLE,
1631-
.func = event_enable_trigger_func,
1631+
.parse = event_enable_trigger_parse,
16321632
.reg = event_enable_register_trigger,
16331633
.unreg = event_enable_unregister_trigger,
16341634
.get_trigger_ops = event_enable_get_trigger_ops,
@@ -1638,7 +1638,7 @@ static struct event_command trigger_enable_cmd = {
16381638
static struct event_command trigger_disable_cmd = {
16391639
.name = DISABLE_EVENT_STR,
16401640
.trigger_type = ETT_EVENT_ENABLE,
1641-
.func = event_enable_trigger_func,
1641+
.parse = event_enable_trigger_parse,
16421642
.reg = event_enable_register_trigger,
16431643
.unreg = event_enable_unregister_trigger,
16441644
.get_trigger_ops = event_enable_get_trigger_ops,

0 commit comments

Comments
 (0)