Skip to content

Commit

Permalink
tracing: Rename the staging files for trace_events
Browse files Browse the repository at this point in the history
When looking for implementation of different phases of the creation of the
TRACE_EVENT() macro, it is pretty useless when all helper macro
redefinitions are in files labeled "stageX_defines.h". Rename them to
state which phase the files are for. For instance, when looking for the
defines that are used to create the event fields, seeing
"stage4_event_fields.h" gives the developer a good idea that the defines
are in that file.

Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
  • Loading branch information
Steven Rostedt (Google) committed Apr 2, 2022
1 parent 1bc1910 commit 8405541
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions include/trace/trace_custom_events.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

/* Stage 1 creates the structure of the recorded event layout */

#include "stages/stage1_defines.h"
#include "stages/stage1_struct_define.h"

#undef DECLARE_CUSTOM_EVENT_CLASS
#define DECLARE_CUSTOM_EVENT_CLASS(name, proto, args, tstruct, assign, print) \
Expand All @@ -56,7 +56,7 @@

/* Stage 2 creates the custom class */

#include "stages/stage2_defines.h"
#include "stages/stage2_data_offsets.h"

#undef DECLARE_CUSTOM_EVENT_CLASS
#define DECLARE_CUSTOM_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
Expand All @@ -71,7 +71,7 @@

/* Stage 3 create the way to print the custom event */

#include "stages/stage3_defines.h"
#include "stages/stage3_trace_output.h"

#undef DECLARE_CUSTOM_EVENT_CLASS
#define DECLARE_CUSTOM_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
Expand Down Expand Up @@ -102,7 +102,7 @@ static struct trace_event_functions trace_custom_event_type_funcs_##call = { \

/* Stage 4 creates the offset layout for the fields */

#include "stages/stage4_defines.h"
#include "stages/stage4_event_fields.h"

#undef DECLARE_CUSTOM_EVENT_CLASS
#define DECLARE_CUSTOM_EVENT_CLASS(call, proto, args, tstruct, func, print) \
Expand All @@ -114,7 +114,7 @@ static struct trace_event_fields trace_custom_event_fields_##call[] = { \

/* Stage 5 creates the helper function for dynamic fields */

#include "stages/stage5_defines.h"
#include "stages/stage5_get_offsets.h"

#undef DECLARE_CUSTOM_EVENT_CLASS
#define DECLARE_CUSTOM_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
Expand All @@ -134,7 +134,7 @@ static inline notrace int trace_custom_event_get_offsets_##call( \

/* Stage 6 creates the probe function that records the event */

#include "stages/stage6_defines.h"
#include "stages/stage6_event_callback.h"

#undef DECLARE_CUSTOM_EVENT_CLASS
#define DECLARE_CUSTOM_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
Expand Down Expand Up @@ -182,7 +182,7 @@ static inline void ftrace_test_custom_probe_##call(void) \

/* Stage 7 creates the actual class and event structure for the custom event */

#include "stages/stage7_defines.h"
#include "stages/stage7_class_define.h"

#undef DECLARE_CUSTOM_EVENT_CLASS
#define DECLARE_CUSTOM_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
Expand Down
14 changes: 7 additions & 7 deletions include/trace/trace_events.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
PARAMS(print)); \
DEFINE_EVENT(name, name, PARAMS(proto), PARAMS(args));

#include "stages/stage1_defines.h"
#include "stages/stage1_struct_define.h"

#undef DECLARE_EVENT_CLASS
#define DECLARE_EVENT_CLASS(name, proto, args, tstruct, assign, print) \
Expand Down Expand Up @@ -109,7 +109,7 @@
* The size of an array is also encoded, in the higher 16 bits of <item>.
*/

#include "stages/stage2_defines.h"
#include "stages/stage2_data_offsets.h"

#undef DECLARE_EVENT_CLASS
#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
Expand Down Expand Up @@ -181,7 +181,7 @@
* in binary.
*/

#include "stages/stage3_defines.h"
#include "stages/stage3_trace_output.h"

#undef DECLARE_EVENT_CLASS
#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
Expand Down Expand Up @@ -236,7 +236,7 @@ static struct trace_event_functions trace_event_type_funcs_##call = { \

#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)

#include "stages/stage4_defines.h"
#include "stages/stage4_event_fields.h"

#undef DECLARE_EVENT_CLASS
#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, func, print) \
Expand All @@ -249,7 +249,7 @@ static struct trace_event_fields trace_event_fields_##call[] = { \

#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)

#include "stages/stage5_defines.h"
#include "stages/stage5_get_offsets.h"

#undef DECLARE_EVENT_CLASS
#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
Expand Down Expand Up @@ -372,7 +372,7 @@ static inline notrace int trace_event_get_offsets_##call( \
#define _TRACE_PERF_INIT(call)
#endif /* CONFIG_PERF_EVENTS */

#include "stages/stage6_defines.h"
#include "stages/stage6_event_callback.h"

#undef DECLARE_EVENT_CLASS
#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
Expand Down Expand Up @@ -418,7 +418,7 @@ static inline void ftrace_test_probe_##call(void) \

#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)

#include "stages/stage7_defines.h"
#include "stages/stage7_class_define.h"

#undef DECLARE_EVENT_CLASS
#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
Expand Down

0 comments on commit 8405541

Please sign in to comment.