debugability: Add components ids to trace_event macros

2 arbitrary IDs may now be passed to specialized versions of
trace_event macro: trace_event_with_ids. Also optimized runtime
stack usage of _trace_event functions.

Signed-off-by: ArturX Kloniecki <arturx.kloniecki@linux.intel.com>

Author: akloniex

src/host/trace.c

@@ -49,7 +49,7 @@ int num_trace_classes;
 int setup_trace_table(void)
 {
 	char buffer[2048];
-	char *trace = "sof/trace.h";
+	char *trace = "uapi/logging.h";
 	char *trace_filename = malloc(strlen(SOF_INC) + strlen(trace) + 2);
 	char *token;
 	int ret, i = 0;
@@ -143,47 +143,55 @@ static char *get_trace_class(uint32_t trace_class)
 	return "value";
 }
 
-#define META_SEQ_STEP_param_procD(i, _) META_CONCAT(param, i) %d
+#define META_SEQ_STEP_param_procU(i, _) META_CONCAT(param, i) %u
 
-#define HOST_TRACE_EVENT_NTH(postfix, vararg_count)\
-	META_FUNC_WITH_VARARGS(_trace_event, postfix, void,\
-	META_CONCAT(, uint32_t event),\
-	vararg_count, META_SEQ_STEP_param_uint32_t)
+#define HOST_TRACE_EVENT_NTH_PARAMS(id_count, param_count)		\
+	uintptr_t event							\
+	META_SEQ_FROM_0_TO(id_count   , META_SEQ_STEP_id_uint32_t)	\
+	META_SEQ_FROM_0_TO(param_count, META_SEQ_STEP_param_uint32_t)
+
+#define HOST_TRACE_EVENT_NTH(postfix, param_count)			\
+	META_FUNC_WITH_VARARGS(						\
+		_trace_event, META_CONCAT(postfix, param_count),	\
+		 void, HOST_TRACE_EVENT_NTH_PARAMS(2, param_count)	\
+	)
 
 /* print trace event */
-#define HOST_TRACE_EVENT_NTH_IMPL(arg_count)\
-HOST_TRACE_EVENT_NTH(, arg_count)\
-{\
-	char a, b, c;\
-	\
-	if (test_bench_trace > 0) {\
-		/* look up subsystem from trace class table */\
+#define HOST_TRACE_EVENT_NTH_IMPL(arg_count)				\
+HOST_TRACE_EVENT_NTH(, arg_count)					\
+{									\
+	char a, b, c;							\
+									\
+	if (test_bench_trace > 0) {					\
+		/* look up subsystem from trace class table */		\
 		char *trace_class = strdup(get_trace_class(event >> 24));\
-		\
-		a = event & 0xff;\
-		b = (event >> 8) & 0xff;\
-		c = (event >> 16) & 0xff;\
-		\
-		/* print trace event stderr*/\
-		if (!strcmp(trace_class, "value"))\
-			fprintf(stderr,\
-			"Trace value %d, "META_QUOTE(\
-				META_SEQ_FROM_0_TO(\
-					arg_count, META_SEQ_STEP_param_procD\
-				))"\n"\
-			, event META_SEQ_FROM_0_TO(arg_count, META_SEQ_STEP_param));\
-		else\
-			fprintf(stderr,\
-			"Trace %s %c%c%c\n"\
-			, trace_class, c, b, a);\
-		if (trace_class)\
-			free(trace_class);\
-	}\
-}\
-HOST_TRACE_EVENT_NTH(_mbox_atomic, arg_count)\
-{\
-	META_CONCAT(_trace_event, arg_count)\
-		(event META_SEQ_FROM_0_TO(arg_count,META_SEQ_STEP_param));\
+									\
+		a = event & 0xff;					\
+		b = (event >> 8) & 0xff;				\
+		c = (event >> 16) & 0xff;				\
+									\
+		/* print trace event stderr*/				\
+		if (!strcmp(trace_class, "value"))			\
+			fprintf(stderr,					\
+			"Trace value %lu, "META_QUOTE(			\
+				META_SEQ_FROM_0_TO(arg_count,		\
+					META_SEQ_STEP_param_procU	\
+				))"\n"					\
+			, event META_SEQ_FROM_0_TO(arg_count,		\
+				META_SEQ_STEP_param));			\
+		else							\
+			fprintf(stderr,					\
+			"Trace %s %c%c%c\n"				\
+			, trace_class, c, b, a);			\
+		if (trace_class)					\
+			free(trace_class);				\
+	}								\
+}									\
+HOST_TRACE_EVENT_NTH(_mbox_atomic, arg_count)				\
+{									\
+	META_CONCAT(_trace_event, arg_count)				\
+		(event META_SEQ_FROM_0_TO(2, META_SEQ_STEP_id)		\
+		 META_SEQ_FROM_0_TO(arg_count, META_SEQ_STEP_param));	\
 }
 
 /* Implementation of

src/include/sof/preproc-private.h

@@ -65,7 +65,7 @@
  * META_COUNT_VARAGS_BEFORE_COMPILE(A,B,C,D) evaluates to 4
  */
 #define _META_PP_NARG_BEFORE_COMPILE_(...) \
-		_META_PP_ARG_N(__VA_ARGS__)
+	META_DEC(_META_PP_ARG_N(__VA_ARGS__))
 #define _META_PP_ARG_N(\
 	_1,   _2,  _3,  _4,  _5,  _6,  _7,  _8,  _9, _10, \
 	_11, _12, _13, _14, _15, _16, _17, _18, _19, _20, \

src/include/sof/preproc.h

@@ -46,12 +46,7 @@
  * META_COUNT_VARAGS_BEFORE_COMPILE(A,B,C,D) evaluates to 4
  */
 #define META_COUNT_VARAGS_BEFORE_COMPILE(...)\
-	META_IF_ELSE(META_HAS_ARGS(__VA_ARGS__)) (\
-		_META_PP_NARG_BEFORE_COMPILE_(__VA_ARGS__, _META_PP_RSEQ_N())\
-	)\
-	(\
-		0\
-	)
+	_META_PP_NARG_BEFORE_COMPILE_(_, ##__VA_ARGS__, _META_PP_RSEQ_N())
 
 /* treat x as string while forcing x expansion beforehand */
 #define META_QUOTE(x) _META_QUOTE(x)
@@ -167,19 +162,17 @@
 #define META_SEQ_STEP_param_int32_t( i, _) ,  int32_t META_CONCAT(param, i)
 #define META_SEQ_STEP_param_int64_t( i, _) ,  int64_t META_CONCAT(param, i)
 
+#define META_SEQ_STEP_id(i, _) , META_CONCAT(id_, i)
+#define META_SEQ_STEP_id_uint32_t(i, _) , uint32_t META_CONCAT(id_, i)
+
 /* generates function signature
  * for instance with:
  *   prefix=foo ; postfix=__bar ; return_t=void
- *   fixed_args=(int x, int y)
- *   vararg_count=3
- *   vararg_gen_step=
- *     #define META_SEQ_STEP_param_float(i, _) , float META_CONCAT(param, i)
+ *   args=(int x, int y)
  * will produce:
- *  void foo_bar(int x, int y , float param0 , float param1 , float param2)
+ *  void foo_bar(int x, int y)
  */
-#define META_FUNC_WITH_VARARGS(prefix, postfix, return_t,\
-	fixed_args, vararg_count, vararg_gen_step)\
-		return_t META_CONCAT_SEQ(prefix, postfix, vararg_count)\
-		(fixed_args META_SEQ_FROM_0_TO(vararg_count, vararg_gen_step))
+#define META_FUNC_WITH_VARARGS(prefix, postfix, return_t, args)\
+		return_t META_CONCAT(prefix, postfix) (args)
 
 #endif // __INCLUDE_MACRO_METAPROGRAMMING__