Skip to content

Commit fb339e5

Browse files
Tom Zanussirostedt
Tom Zanussi
authored and
rostedt
committed
tracing: Change event_trigger_ops func() to trigger()
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 <[email protected]> Signed-off-by: Steven Rostedt <[email protected]>
1 parent 9ec5a7d commit fb339e5

File tree

4 files changed

+37
-26
lines changed

4 files changed

+37
-26
lines changed

‎kernel/trace/trace.h

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1619,10 +1619,20 @@ extern int register_trigger_hist_enable_disable_cmds(void);
16191619
* The methods in this structure provide per-event trigger hooks for
16201620
* various trigger operations.
16211621
*
1622+
* The @init and @free methods are used during trigger setup and
1623+
* teardown, typically called from an event_command's @parse()
1624+
* function implementation.
1625+
*
1626+
* The @print method is used to print the trigger spec.
1627+
*
1628+
* The @trigger method is the function that actually implements the
1629+
* trigger and is called in the context of the triggering event
1630+
* whenever that event occurs.
1631+
*
16221632
* All the methods below, except for @init() and @free(), must be
16231633
* implemented.
16241634
*
1625-
* @func: The trigger 'probe' function called when the triggering
1635+
* @trigger: The trigger 'probe' function called when the triggering
16261636
* event occurs. The data passed into this callback is the data
16271637
* that was supplied to the event_command @reg() function that
16281638
* registered the trigger (see struct event_command) along with
@@ -1651,9 +1661,10 @@ extern int register_trigger_hist_enable_disable_cmds(void);
16511661
* (see trace_event_triggers.c).
16521662
*/
16531663
struct event_trigger_ops {
1654-
void (*func)(struct event_trigger_data *data,
1655-
struct trace_buffer *buffer, void *rec,
1656-
struct ring_buffer_event *rbe);
1664+
void (*trigger)(struct event_trigger_data *data,
1665+
struct trace_buffer *buffer,
1666+
void *rec,
1667+
struct ring_buffer_event *rbe);
16571668
int (*init)(struct event_trigger_ops *ops,
16581669
struct event_trigger_data *data);
16591670
void (*free)(struct event_trigger_ops *ops,

‎kernel/trace/trace_eprobe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ static void eprobe_trigger_func(struct event_trigger_data *data,
543543
}
544544

545545
static struct event_trigger_ops eprobe_trigger_ops = {
546-
.func = eprobe_trigger_func,
546+
.trigger = eprobe_trigger_func,
547547
.print = eprobe_trigger_print,
548548
.init = eprobe_trigger_init,
549549
.free = eprobe_trigger_free,

‎kernel/trace/trace_events_hist.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5759,7 +5759,7 @@ static void event_hist_trigger_free(struct event_trigger_ops *ops,
57595759
}
57605760

57615761
static struct event_trigger_ops event_hist_trigger_ops = {
5762-
.func = event_hist_trigger,
5762+
.trigger = event_hist_trigger,
57635763
.print = event_hist_trigger_print,
57645764
.init = event_hist_trigger_init,
57655765
.free = event_hist_trigger_free,
@@ -5793,7 +5793,7 @@ static void event_hist_trigger_named_free(struct event_trigger_ops *ops,
57935793
}
57945794

57955795
static struct event_trigger_ops event_hist_trigger_named_ops = {
5796-
.func = event_hist_trigger,
5796+
.trigger = event_hist_trigger,
57975797
.print = event_hist_trigger_print,
57985798
.init = event_hist_trigger_named_init,
57995799
.free = event_hist_trigger_named_free,
@@ -6383,28 +6383,28 @@ hist_enable_count_trigger(struct event_trigger_data *data,
63836383
}
63846384

63856385
static struct event_trigger_ops hist_enable_trigger_ops = {
6386-
.func = hist_enable_trigger,
6386+
.trigger = hist_enable_trigger,
63876387
.print = event_enable_trigger_print,
63886388
.init = event_trigger_init,
63896389
.free = event_enable_trigger_free,
63906390
};
63916391

63926392
static struct event_trigger_ops hist_enable_count_trigger_ops = {
6393-
.func = hist_enable_count_trigger,
6393+
.trigger = hist_enable_count_trigger,
63946394
.print = event_enable_trigger_print,
63956395
.init = event_trigger_init,
63966396
.free = event_enable_trigger_free,
63976397
};
63986398

63996399
static struct event_trigger_ops hist_disable_trigger_ops = {
6400-
.func = hist_enable_trigger,
6400+
.trigger = hist_enable_trigger,
64016401
.print = event_enable_trigger_print,
64026402
.init = event_trigger_init,
64036403
.free = event_enable_trigger_free,
64046404
};
64056405

64066406
static struct event_trigger_ops hist_disable_count_trigger_ops = {
6407-
.func = hist_enable_count_trigger,
6407+
.trigger = hist_enable_count_trigger,
64086408
.print = event_enable_trigger_print,
64096409
.init = event_trigger_init,
64106410
.free = event_enable_trigger_free,

‎kernel/trace/trace_events_trigger.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ event_triggers_call(struct trace_event_file *file,
6868
if (data->paused)
6969
continue;
7070
if (!rec) {
71-
data->ops->func(data, buffer, rec, event);
71+
data->ops->trigger(data, buffer, rec, event);
7272
continue;
7373
}
7474
filter = rcu_dereference_sched(data->filter);
@@ -78,7 +78,7 @@ event_triggers_call(struct trace_event_file *file,
7878
tt |= data->cmd_ops->trigger_type;
7979
continue;
8080
}
81-
data->ops->func(data, buffer, rec, event);
81+
data->ops->trigger(data, buffer, rec, event);
8282
}
8383
return tt;
8484
}
@@ -106,7 +106,7 @@ event_triggers_post_call(struct trace_event_file *file,
106106
if (data->paused)
107107
continue;
108108
if (data->cmd_ops->trigger_type & tt)
109-
data->ops->func(data, NULL, NULL, NULL);
109+
data->ops->trigger(data, NULL, NULL, NULL);
110110
}
111111
}
112112
EXPORT_SYMBOL_GPL(event_triggers_post_call);
@@ -1023,28 +1023,28 @@ traceoff_trigger_print(struct seq_file *m, struct event_trigger_ops *ops,
10231023
}
10241024

10251025
static struct event_trigger_ops traceon_trigger_ops = {
1026-
.func = traceon_trigger,
1026+
.trigger = traceon_trigger,
10271027
.print = traceon_trigger_print,
10281028
.init = event_trigger_init,
10291029
.free = event_trigger_free,
10301030
};
10311031

10321032
static struct event_trigger_ops traceon_count_trigger_ops = {
1033-
.func = traceon_count_trigger,
1033+
.trigger = traceon_count_trigger,
10341034
.print = traceon_trigger_print,
10351035
.init = event_trigger_init,
10361036
.free = event_trigger_free,
10371037
};
10381038

10391039
static struct event_trigger_ops traceoff_trigger_ops = {
1040-
.func = traceoff_trigger,
1040+
.trigger = traceoff_trigger,
10411041
.print = traceoff_trigger_print,
10421042
.init = event_trigger_init,
10431043
.free = event_trigger_free,
10441044
};
10451045

10461046
static struct event_trigger_ops traceoff_count_trigger_ops = {
1047-
.func = traceoff_count_trigger,
1047+
.trigger = traceoff_count_trigger,
10481048
.print = traceoff_trigger_print,
10491049
.init = event_trigger_init,
10501050
.free = event_trigger_free,
@@ -1135,14 +1135,14 @@ snapshot_trigger_print(struct seq_file *m, struct event_trigger_ops *ops,
11351135
}
11361136

11371137
static struct event_trigger_ops snapshot_trigger_ops = {
1138-
.func = snapshot_trigger,
1138+
.trigger = snapshot_trigger,
11391139
.print = snapshot_trigger_print,
11401140
.init = event_trigger_init,
11411141
.free = event_trigger_free,
11421142
};
11431143

11441144
static struct event_trigger_ops snapshot_count_trigger_ops = {
1145-
.func = snapshot_count_trigger,
1145+
.trigger = snapshot_count_trigger,
11461146
.print = snapshot_trigger_print,
11471147
.init = event_trigger_init,
11481148
.free = event_trigger_free,
@@ -1226,14 +1226,14 @@ stacktrace_trigger_print(struct seq_file *m, struct event_trigger_ops *ops,
12261226
}
12271227

12281228
static struct event_trigger_ops stacktrace_trigger_ops = {
1229-
.func = stacktrace_trigger,
1229+
.trigger = stacktrace_trigger,
12301230
.print = stacktrace_trigger_print,
12311231
.init = event_trigger_init,
12321232
.free = event_trigger_free,
12331233
};
12341234

12351235
static struct event_trigger_ops stacktrace_count_trigger_ops = {
1236-
.func = stacktrace_count_trigger,
1236+
.trigger = stacktrace_count_trigger,
12371237
.print = stacktrace_trigger_print,
12381238
.init = event_trigger_init,
12391239
.free = event_trigger_free,
@@ -1353,28 +1353,28 @@ void event_enable_trigger_free(struct event_trigger_ops *ops,
13531353
}
13541354

13551355
static struct event_trigger_ops event_enable_trigger_ops = {
1356-
.func = event_enable_trigger,
1356+
.trigger = event_enable_trigger,
13571357
.print = event_enable_trigger_print,
13581358
.init = event_trigger_init,
13591359
.free = event_enable_trigger_free,
13601360
};
13611361

13621362
static struct event_trigger_ops event_enable_count_trigger_ops = {
1363-
.func = event_enable_count_trigger,
1363+
.trigger = event_enable_count_trigger,
13641364
.print = event_enable_trigger_print,
13651365
.init = event_trigger_init,
13661366
.free = event_enable_trigger_free,
13671367
};
13681368

13691369
static struct event_trigger_ops event_disable_trigger_ops = {
1370-
.func = event_enable_trigger,
1370+
.trigger = event_enable_trigger,
13711371
.print = event_enable_trigger_print,
13721372
.init = event_trigger_init,
13731373
.free = event_enable_trigger_free,
13741374
};
13751375

13761376
static struct event_trigger_ops event_disable_count_trigger_ops = {
1377-
.func = event_enable_count_trigger,
1377+
.trigger = event_enable_count_trigger,
13781378
.print = event_enable_trigger_print,
13791379
.init = event_trigger_init,
13801380
.free = event_enable_trigger_free,

0 commit comments

Comments
 (0)