Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3a8c6fd authored by zhangwei(Jovi)'s avatar zhangwei(Jovi) Committed by Steven Rostedt
Browse files

tracing: Move find_event_field() into trace_events.c 

By moving find_event_field() and trace_find_field() into trace_events.c,
the ftrace_common_fields list and trace_get_fields() can become local to
the trace_events.c file.

find_event_field() is renamed to trace_find_event_field() to conform to
the tracing global function names.

Link: http://lkml.kernel.org/r/513D8426.9070109@huawei.com



Signed-off-by: default avatarzhangwei(Jovi) <jovi.zhangwei@huawei.com>
[ rostedt: Modified trace_find_field() to trace_find_event_field() ]
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent bd6df187

kernel/trace/trace.h

+2 −4
Original line number Diff line number Diff line
@@ -995,8 +995,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,
@@ -1009,8 +1007,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_event_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
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 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);



#define GFP_TRACE (GFP_KERNEL | __GFP_ZERO)
@@ -54,7 +54,7 @@ static struct kmem_cache *file_cachep; 
#define while_for_each_event_file()		\

	}



struct list_head *

static struct list_head *

trace_get_fields(struct ftrace_event_call *event_call)

{

	if (!event_call->class->get_fields)
@@ -62,6 +62,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_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 __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
Original line number Diff line number Diff line
@@ -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_event_field(call, operand1);

	if (!field) {

		parse_error(ps, FILT_ERR_FIELD_NOT_FOUND, 0);

		return NULL;