tracing: move find_event_field function into trace_events.c
PATCH 3/13 tracing: move find_event_field function into trace_events.c
move location of find_event_field function, put together with trace_get_fields in trace_events.c, this will make some variable and function become to static.
This patch also rename find_event_field to trace_find_field.
Signed-off-by zhangwei(Jovi) <[email protected]>
--- kernel/trace/trace.h | 6 ++---- kernel/trace/trace_events.c | 31 +++++++++++++++++++++++++++++-- kernel/trace/trace_events_filter.c | 29 +---------------------------- 3 files changed, 32 insertions(+), 34 deletions(-)
kernel/trace/trace.h +2 -4
@@ -902,8 +902,6 @@ struct filter_pred {unsigned short right; }; -extern struct list_head ftrace_common_fields; -extern enum regex_type filter_parse_regex (char *buff,int len,char **search,int *not); extern void print_event_filter(struct ftrace_event_call *call,
@@ -916,8 +914,8 @@ extern void print_subsystem_event_filter(struct event_subsystem *system, struct trace_seq *s);extern int filter_assign_type (const char *type); -struct list_head * -trace_get_fields (struct ftrace_event_call *event_call); +struct ftrace_event_field * +trace_find_field (struct ftrace_event_call *call,char *name); static inline int filter_check_discard(struct ftrace_event_call *call, void *rec,
kernel/trace/trace_events.c +29 -2
@@ -34,9 +34,9 @@ char event_storage[EVENT_STORAGE_SIZE];EXPORT_SYMBOL_GPL (event_storage);LIST_HEAD (ftrace_events); -LIST_HEAD (ftrace_common_fields); +static LIST_HEAD (ftrace_common_fields); -struct list_head * +static struct list_head *trace_get_fields (struct ftrace_event_call *event_call) {if (!event_call->class->get_fields)
@@ -44,6 +44,33 @@ trace_get_fields(struct ftrace_event_call *event_call)return event_call->class->get_fields (event_call); } +static struct ftrace_event_field * +__find_event_field (struct list_head *head,char *name) +{ +struct ftrace_event_field *field; + +list_for_each_entry (field, head, link) { +if (!strcmp (field->name, name)) +return field; + } + +return NULL ; +} + +struct ftrace_event_field * +trace_find_field (struct ftrace_event_call *call,char *name) +{ +struct ftrace_event_field *field; +struct list_head *head; + + field =__find_event_field (&ftrace_common_fields, name); +if (field) +return field; + + head =trace_get_fields (call); +return __find_event_field (head, name); +} +static int __trace_define_field (struct list_head *head,const char *type,const char *name,int offset,int size,int is_signed,int filter_type)
kernel/trace/trace_events_filter.c +1 -28
@@ -658,33 +658,6 @@ void print_subsystem_event_filter(struct event_subsystem *system,mutex_unlock (&event_mutex); } -static struct ftrace_event_field * -__find_event_field (struct list_head *head,char *name) -{ -struct ftrace_event_field *field; - -list_for_each_entry (field, head, link) { -if (!strcmp (field->name, name)) -return field; - } - -return NULL ; -} - -static struct ftrace_event_field * -find_event_field (struct ftrace_event_call *call,char *name) -{ -struct ftrace_event_field *field; -struct list_head *head; - - field =__find_event_field (&ftrace_common_fields, name); -if (field) -return field; - - head =trace_get_fields (call); -return __find_event_field (head, name); -} -static int __alloc_pred_stack (struct pred_stack *stack,int n_preds) { stack->preds =kcalloc (n_preds +1 ,sizeof (*stack->preds),GFP_KERNEL );
@@ -1337,7 +1310,7 @@ static struct filter_pred *create_pred(struct filter_parse_state *ps,return NULL ; } - field =find_event_field (call, operand1); + field =trace_find_field (call, operand1);if (!field) {parse_error (ps,FILT_ERR_FIELD_NOT_FOUND ,0 );return NULL ;
Signature · 1 line
1.7.9.7