tracing: Move is_good_name() from trace_probe.h to trace.h (42d120e2) · Commits · 戴 / test

kernel/trace/trace.h

+13 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#include <linux/glob.h>
		#include <linux/irq_work.h>
		#include <linux/workqueue.h>
		#include <linux/ctype.h>

		#ifdef CONFIG_FTRACE_SYSCALLS
		#include <asm/unistd.h> /* For NR_SYSCALLS */
		@@ -2090,4 +2091,16 @@ static __always_inline void trace_iterator_reset(struct trace_iterator *iter)
		iter->pos = -1;
		}

		/* Check the name is good for event/group/fields */
		static inline bool is_good_name(const char *name)
		{
		if (!isalpha(name) && name != '_')
		return false;
		while (*++name != '\0') {
		if (!isalpha(name) && !isdigit(name) && *name != '_')
		return false;
		}
		return true;
		}

		#endif /* _LINUX_KERNEL_TRACE_H */

+0 −13

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		#include <linux/tracefs.h>
		#include <linux/types.h>
		#include <linux/string.h>
		#include <linux/ctype.h>
		#include <linux/ptrace.h>
		#include <linux/perf_event.h>
		#include <linux/kprobes.h>
		@@ -348,18 +347,6 @@ bool trace_probe_match_command_args(struct trace_probe *tp,
		#define trace_probe_for_each_link_rcu(pos, tp) \
		list_for_each_entry_rcu(pos, &(tp)->event->files, list)

		/* Check the name is good for event/group/fields */
		static inline bool is_good_name(const char *name)
		{
		if (!isalpha(name) && name != '_')
		return false;
		while (*++name != '\0') {
		if (!isalpha(name) && !isdigit(name) && *name != '_')
		return false;
		}
		return true;
		}

		#define TPARG_FL_RETURN BIT(0)
		#define TPARG_FL_KERNEL BIT(1)
		#define TPARG_FL_FENTRY BIT(2)