From 7ebdde13050a7d880ef7403fd10c30f5167b6f0b Mon Sep 17 00:00:00 2001 From: "Steven Rostedt (Google)" Date: Tue, 29 Mar 2022 16:50:44 -0400 Subject: [PATCH] tracing: Rename the staging files for trace_events 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) --- .../{stage1_defines.h => stage1_struct_define.h} | 0 .../{stage2_defines.h => stage2_data_offsets.h} | 0 .../{stage3_defines.h => stage3_trace_output.h} | 0 .../{stage4_defines.h => stage4_event_fields.h} | 0 .../{stage5_defines.h => stage5_get_offsets.h} | 0 .../{stage6_defines.h => stage6_event_callback.h} | 0 .../{stage7_defines.h => stage7_class_define.h} | 0 include/trace/trace_events.h | 14 +++++++------- 8 files changed, 7 insertions(+), 7 deletions(-) rename include/trace/stages/{stage1_defines.h => stage1_struct_define.h} (100%) rename include/trace/stages/{stage2_defines.h => stage2_data_offsets.h} (100%) rename include/trace/stages/{stage3_defines.h => stage3_trace_output.h} (100%) rename include/trace/stages/{stage4_defines.h => stage4_event_fields.h} (100%) rename include/trace/stages/{stage5_defines.h => stage5_get_offsets.h} (100%) rename include/trace/stages/{stage6_defines.h => stage6_event_callback.h} (100%) rename include/trace/stages/{stage7_defines.h => stage7_class_define.h} (100%) diff --git a/include/trace/stages/stage1_defines.h b/include/trace/stages/stage1_struct_define.h similarity index 100% rename from include/trace/stages/stage1_defines.h rename to include/trace/stages/stage1_struct_define.h diff --git a/include/trace/stages/stage2_defines.h b/include/trace/stages/stage2_data_offsets.h similarity index 100% rename from include/trace/stages/stage2_defines.h rename to include/trace/stages/stage2_data_offsets.h diff --git a/include/trace/stages/stage3_defines.h b/include/trace/stages/stage3_trace_output.h similarity index 100% rename from include/trace/stages/stage3_defines.h rename to include/trace/stages/stage3_trace_output.h diff --git a/include/trace/stages/stage4_defines.h b/include/trace/stages/stage4_event_fields.h similarity index 100% rename from include/trace/stages/stage4_defines.h rename to include/trace/stages/stage4_event_fields.h diff --git a/include/trace/stages/stage5_defines.h b/include/trace/stages/stage5_get_offsets.h similarity index 100% rename from include/trace/stages/stage5_defines.h rename to include/trace/stages/stage5_get_offsets.h diff --git a/include/trace/stages/stage6_defines.h b/include/trace/stages/stage6_event_callback.h similarity index 100% rename from include/trace/stages/stage6_defines.h rename to include/trace/stages/stage6_event_callback.h diff --git a/include/trace/stages/stage7_defines.h b/include/trace/stages/stage7_class_define.h similarity index 100% rename from include/trace/stages/stage7_defines.h rename to include/trace/stages/stage7_class_define.h diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h index 8a8cd66cc6d54..c2f9cabf154d1 100644 --- a/include/trace/trace_events.h +++ b/include/trace/trace_events.h @@ -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) \ @@ -109,7 +109,7 @@ * The size of an array is also encoded, in the higher 16 bits of . */ -#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) \ @@ -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) \ @@ -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) \ @@ -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) \ @@ -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) \ @@ -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) \