aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2015-12-10 13:50:43 -0500
committerSteven Rostedt <rostedt@goodmis.org>2016-03-08 11:19:29 -0500
commit4ef56902fba4d9949918c6266e67ba7d05fba7a4 (patch)
treea33b34c775da1af722fd4365d1416bad03c4ca77
parent633f6f58af445022e38417599a4789b5fc510b71 (diff)
tracing: Make ftrace_event_field checking functions available
Make is_string_field() and is_function_field() accessible outside of trace_event_filters.c for other users of ftrace_event_fields. Link: http://lkml.kernel.org/r/2d3f00d3311702e556e82eed7754bae6f017939f.1449767187.git.tom.zanussi@linux.intel.com Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Tested-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Reviewed-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--kernel/trace/trace.h12
-rw-r--r--kernel/trace/trace_events_filter.c12
2 files changed, 12 insertions, 12 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index b4cae47f283e..81a8359e9c29 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -1112,6 +1112,18 @@ struct filter_pred {
1112 unsigned short right; 1112 unsigned short right;
1113}; 1113};
1114 1114
1115static inline bool is_string_field(struct ftrace_event_field *field)
1116{
1117 return field->filter_type == FILTER_DYN_STRING ||
1118 field->filter_type == FILTER_STATIC_STRING ||
1119 field->filter_type == FILTER_PTR_STRING;
1120}
1121
1122static inline bool is_function_field(struct ftrace_event_field *field)
1123{
1124 return field->filter_type == FILTER_TRACE_FN;
1125}
1126
1115extern enum regex_type 1127extern enum regex_type
1116filter_parse_regex(char *buff, int len, char **search, int *not); 1128filter_parse_regex(char *buff, int len, char **search, int *not);
1117extern void print_event_filter(struct trace_event_file *file, 1129extern 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 6816302542b2..b3f5051cd4e9 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -961,18 +961,6 @@ int filter_assign_type(const char *type)
961 return FILTER_OTHER; 961 return FILTER_OTHER;
962} 962}
963 963
964static bool is_function_field(struct ftrace_event_field *field)
965{
966 return field->filter_type == FILTER_TRACE_FN;
967}
968
969static bool is_string_field(struct ftrace_event_field *field)
970{
971 return field->filter_type == FILTER_DYN_STRING ||
972 field->filter_type == FILTER_STATIC_STRING ||
973 field->filter_type == FILTER_PTR_STRING;
974}
975
976static bool is_legal_op(struct ftrace_event_field *field, int op) 964static bool is_legal_op(struct ftrace_event_field *field, int op)
977{ 965{
978 if (is_string_field(field) && 966 if (is_string_field(field) &&