diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-05-13 13:44:36 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2015-05-13 14:06:42 -0400 |
commit | 609a74045238c303bbe9396775eacf5bac1f51cc (patch) | |
tree | f63a3f751c0e6195dc1f3a0aded60e27d44fead7 | |
parent | 892c505aac2bdded3c8ec2ec27abc6d74fd210f5 (diff) |
tracing: Rename FTRACE_MAX_EVENT to TRACE_EVENT_TYPE_MAX
The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. Rename the max trace_event type size to
something more descriptive and appropriate.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r-- | include/linux/trace_events.h | 2 | ||||
-rw-r--r-- | kernel/trace/trace_output.c | 4 | ||||
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-perl.c | 4 | ||||
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index 12ca46322a94..6f28464be418 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h | |||
@@ -68,7 +68,7 @@ struct trace_entry { | |||
68 | int pid; | 68 | int pid; |
69 | }; | 69 | }; |
70 | 70 | ||
71 | #define FTRACE_MAX_EVENT \ | 71 | #define TRACE_EVENT_TYPE_MAX \ |
72 | ((1 << (sizeof(((struct trace_entry *)0)->type) * 8)) - 1) | 72 | ((1 << (sizeof(((struct trace_entry *)0)->type) * 8)) - 1) |
73 | 73 | ||
74 | /* | 74 | /* |
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index d1a2feb54d06..74dfe2e01d68 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c | |||
@@ -675,7 +675,7 @@ static int trace_search_list(struct list_head **list) | |||
675 | } | 675 | } |
676 | 676 | ||
677 | /* Did we used up all 65 thousand events??? */ | 677 | /* Did we used up all 65 thousand events??? */ |
678 | if ((last + 1) > FTRACE_MAX_EVENT) | 678 | if ((last + 1) > TRACE_EVENT_TYPE_MAX) |
679 | return 0; | 679 | return 0; |
680 | 680 | ||
681 | *list = &e->list; | 681 | *list = &e->list; |
@@ -725,7 +725,7 @@ int register_trace_event(struct trace_event *event) | |||
725 | if (!event->type) { | 725 | if (!event->type) { |
726 | struct list_head *list = NULL; | 726 | struct list_head *list = NULL; |
727 | 727 | ||
728 | if (next_event_type > FTRACE_MAX_EVENT) { | 728 | if (next_event_type > TRACE_EVENT_TYPE_MAX) { |
729 | 729 | ||
730 | event->type = trace_search_list(&list); | 730 | event->type = trace_search_list(&list); |
731 | if (!event->type) | 731 | if (!event->type) |
diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c index 430b5d27828e..1bd593bbf7a5 100644 --- a/tools/perf/util/scripting-engines/trace-event-perl.c +++ b/tools/perf/util/scripting-engines/trace-event-perl.c | |||
@@ -55,10 +55,10 @@ void xs_init(pTHX) | |||
55 | 55 | ||
56 | INTERP my_perl; | 56 | INTERP my_perl; |
57 | 57 | ||
58 | #define FTRACE_MAX_EVENT \ | 58 | #define TRACE_EVENT_TYPE_MAX \ |
59 | ((1 << (sizeof(unsigned short) * 8)) - 1) | 59 | ((1 << (sizeof(unsigned short) * 8)) - 1) |
60 | 60 | ||
61 | static DECLARE_BITMAP(events_defined, FTRACE_MAX_EVENT); | 61 | static DECLARE_BITMAP(events_defined, TRACE_EVENT_TYPE_MAX); |
62 | 62 | ||
63 | extern struct scripting_context *scripting_context; | 63 | extern struct scripting_context *scripting_context; |
64 | 64 | ||
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 5544b8cdd1ee..ace2484985cb 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c | |||
@@ -44,10 +44,10 @@ | |||
44 | 44 | ||
45 | PyMODINIT_FUNC initperf_trace_context(void); | 45 | PyMODINIT_FUNC initperf_trace_context(void); |
46 | 46 | ||
47 | #define FTRACE_MAX_EVENT \ | 47 | #define TRACE_EVENT_TYPE_MAX \ |
48 | ((1 << (sizeof(unsigned short) * 8)) - 1) | 48 | ((1 << (sizeof(unsigned short) * 8)) - 1) |
49 | 49 | ||
50 | static DECLARE_BITMAP(events_defined, FTRACE_MAX_EVENT); | 50 | static DECLARE_BITMAP(events_defined, TRACE_EVENT_TYPE_MAX); |
51 | 51 | ||
52 | #define MAX_FIELDS 64 | 52 | #define MAX_FIELDS 64 |
53 | #define N_COMMON_FIELDS 7 | 53 | #define N_COMMON_FIELDS 7 |