Skip to content

Commit 9528c19

Browse files
committed
tracing: Clean up alloc_synth_event()
alloc_synth_event() currently has the following code to initialize the event fields and dynamic_fields: for (i = 0, j = 0; i < n_fields; i++) { event->fields[i] = fields[i]; if (fields[i]->is_dynamic) { event->dynamic_fields[j] = fields[i]; event->dynamic_fields[j]->field_pos = i; event->dynamic_fields[j++] = fields[i]; event->n_dynamic_fields++; } } 1) It would make more sense to have all fields keep track of their field_pos. 2) event->dynmaic_fields[j] is assigned twice for no reason. 3) We can move updating event->n_dynamic_fields outside the loop, and just assign it to j. This combination makes the code much cleaner. Link: https://lkml.kernel.org/r/20210721195341.29bb0f77@oasis.local.home Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
1 parent 1e3bac7 commit 9528c19

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

kernel/trace/trace_events_synth.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -893,15 +893,13 @@ static struct synth_event *alloc_synth_event(const char *name, int n_fields,
893893
dyn_event_init(&event->devent, &synth_event_ops);
894894

895895
for (i = 0, j = 0; i < n_fields; i++) {
896+
fields[i]->field_pos = i;
896897
event->fields[i] = fields[i];
897898

898-
if (fields[i]->is_dynamic) {
899-
event->dynamic_fields[j] = fields[i];
900-
event->dynamic_fields[j]->field_pos = i;
899+
if (fields[i]->is_dynamic)
901900
event->dynamic_fields[j++] = fields[i];
902-
event->n_dynamic_fields++;
903-
}
904901
}
902+
event->n_dynamic_fields = j;
905903
event->n_fields = n_fields;
906904
out:
907905
return event;

0 commit comments

Comments
 (0)