Messages in this thread | | | Subject | Re: [PATCH v9 02/22] tracing: Make ftrace_event_field checking functions available | From | Tom Zanussi <> | Date | Tue, 21 Jul 2015 09:26:00 -0500 |
| |
On Tue, 2015-07-21 at 19:04 +0900, Masami Hiramatsu wrote: > On 2015/07/17 2:22, Tom Zanussi wrote: > > Make is_string_field() and is_function_field() accessible outside of > > trace_event_filters.c for other users of ftrace_event_fields. > > > > Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com > > Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> > > BTW, is there any reason why we split this from caller-side change? > this short change can be merged into the patch which actual requires this. >
I kept it separate because I thought it would be useful regardless of whether the rest of the hist triggers patchset got merged or not. So I'd rather keep it separate for that reason.
Tom
> Thanks, > > > --- > > kernel/trace/trace.h | 12 ++++++++++++ > > kernel/trace/trace_events_filter.c | 12 ------------ > > 2 files changed, 12 insertions(+), 12 deletions(-) > > > > diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h > > index 4c41fcd..891c5b0 100644 > > --- a/kernel/trace/trace.h > > +++ b/kernel/trace/trace.h > > @@ -1050,6 +1050,18 @@ struct filter_pred { > > unsigned short right; > > }; > > > > +static inline bool is_string_field(struct ftrace_event_field *field) > > +{ > > + return field->filter_type == FILTER_DYN_STRING || > > + field->filter_type == FILTER_STATIC_STRING || > > + field->filter_type == FILTER_PTR_STRING; > > +} > > + > > +static inline bool is_function_field(struct ftrace_event_field *field) > > +{ > > + return field->filter_type == FILTER_TRACE_FN; > > +} > > + > > extern enum regex_type > > filter_parse_regex(char *buff, int len, char **search, int *not); > > extern void print_event_filter(struct trace_event_file *file, > > diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c > > index 71511eb..245ee5d 100644 > > --- a/kernel/trace/trace_events_filter.c > > +++ b/kernel/trace/trace_events_filter.c > > @@ -917,18 +917,6 @@ int filter_assign_type(const char *type) > > return FILTER_OTHER; > > } > > > > -static bool is_function_field(struct ftrace_event_field *field) > > -{ > > - return field->filter_type == FILTER_TRACE_FN; > > -} > > - > > -static bool is_string_field(struct ftrace_event_field *field) > > -{ > > - return field->filter_type == FILTER_DYN_STRING || > > - field->filter_type == FILTER_STATIC_STRING || > > - field->filter_type == FILTER_PTR_STRING; > > -} > > - > > static int is_legal_op(struct ftrace_event_field *field, int op) > > { > > if (is_string_field(field) && > > > >
| |