Merge remote-tracking branch 'origin/t-tracer-isolation' into integration_2023_w47

common/utils/T/.gitignore

@@ -1,7 +1,5 @@
 *.o
 *.a
-T_IDs.h
-T_messages.txt.h
 genids
 tracer/enb
 tracer/gnb
@@ -18,3 +16,4 @@ tracer/extract_output_subframe
 tracer/extract
 tracer/multi
 tracee/tracee
+incgen

common/utils/T/CMakeLists.txt

@@ -8,11 +8,12 @@ else()
 endif()
 add_custom_command(OUTPUT T_IDs.h
                    COMMAND genids ${CMAKE_CURRENT_SOURCE_DIR}/T_messages.txt T_IDs.h
-                   DEPENDS genids
+                   DEPENDS genids T_messages.txt
                    COMMENT "Generating T_IDs.h from T_messages.txt"
 )
 add_custom_command(OUTPUT T_messages.txt.h
                    COMMAND xxd -i T_messages.txt ${CMAKE_CURRENT_BINARY_DIR}/T_messages.txt.h
+                   DEPENDS T_messages.txt
                    COMMENT "Generating T_messages.txt.h from T_messages.txt"
                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )

common/utils/T/Makefile

@@ -1,10 +1,10 @@
 CC=gcc
-CFLAGS=-Wall -g
+CFLAGS=-Wall -g -Iincgen
 
 GENIDS=genids
 GENIDS_OBJS=genids.o
 
-all : $(GENIDS) T_messages.txt.h T_IDs.h
+all : $(GENIDS) incgen/T_messages.txt.h incgen/T_IDs.h
 
 $(GENIDS): $(GENIDS_OBJS)
 	$(CC) $(CFLAGS) -o $(GENIDS) $(GENIDS_OBJS)
@@ -12,21 +12,24 @@ $(GENIDS): $(GENIDS_OBJS)
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-T_messages.txt.h: T_messages.txt
-	xxd -i T_messages.txt T_messages.txt.h
+incgen/T_messages.txt.h: T_messages.txt
+	mkdir -p incgen
+	xxd -i T_messages.txt incgen/T_messages.txt.h
 
-T_IDs.h: $(GENIDS) T_messages.txt
-	./$(GENIDS) T_messages.txt T_IDs.h
+incgen/T_IDs.h: $(GENIDS) T_messages.txt
+	mkdir -p incgen
+	./$(GENIDS) T_messages.txt incgen/T_IDs.h
 
-check_vcd: T_IDs.h T_messages.txt.h
+check_vcd: incgen/T_IDs.h incgen/T_messages.txt.h
 	gcc -Wall -I. -I.. -I../itti -I../../../openair2/COMMON -Itracer -o _check_vcd check_vcd.c tracer/database.c tracer/utils.c -lm -pthread
-	./_check_vcd T_messages.txt ../LOG/vcd_signal_dumper.h || (rm -f ./_check_vcd ./T_IDs.h ./T_messages.txt.h && false)
+	./_check_vcd T_messages.txt ../LOG/vcd_signal_dumper.h || (rm -rf ./_check_vcd ./incgen && false)
 	rm -f ./_check_vcd
 
 .PHONY: check_vcd
 
 clean:
-	rm -f *.o $(GENIDS) core T_IDs.h T_messages.txt.h _check_vcd
+	rm -f *.o $(GENIDS) core _check_vcd
+	rm -rf incgen
 
 cleanall: clean
 	cd tracer && $(MAKE) clean

common/utils/T/tracee/Makefile

@@ -1,8 +1,10 @@
 CC=gcc
-CFLAGS=-Wall -g -pthread -DT_TRACER -I.
+CFLAGS=-Wall -g -pthread -DT_TRACER -I. -I../incgen
 
 PROG=tracee
-OBJS=tracee.o ../T.o ../local_tracer.o
+OBJS=tracee.o T.o ../local_tracer.o
+
+all: T_dep $(PROG)
 
 $(PROG): $(OBJS)
 	$(CC) $(CFLAGS) -o $(PROG) $(OBJS) -lrt
@@ -10,5 +12,11 @@ $(PROG): $(OBJS)
 tracee.o: tracee.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
+T.o: ../T.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+T_dep:
+	cd .. && make
+
 clean:
 	rm -f *.o $(PROG) core

common/utils/T/tracee/common/config/config_userapi.h

@@ -0,0 +1,14 @@
+#ifndef _CONFIG_USERAPI_H_
+#define _CONFIG_USERAPI_H_
+
+typedef int paramdef_t;
+
+#ifdef CMDLINE_TTRACEPARAMS_DESC
+#undef CMDLINE_TTRACEPARAMS_DESC
+#endif
+#define CMDLINE_TTRACEPARAMS_DESC {}
+
+#define config_get(dummy, ...) (void)(dummy)
+#define config_process_cmdline(...) /**/
+
+#endif /* _CONFIG_USERAPI_H_ */

common/utils/T/tracee/tracee.c

@@ -6,7 +6,8 @@
 int main(void)
 {
   int frame = 0;
-  T_init(2021, 1, 0);
+  T_init(2021, 1);
+  T_stdout = 0;
   while (1) {
     getchar();
     T(T_ENB_PHY_PUCCH_1AB_IQ, T_INT(0), T_INT(0), T_INT(frame), T_INT(0), T_INT(0), T_INT(0));

common/utils/T/tracer/Makefile

@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-Wall -g -pthread -DT_TRACER -I.
+CFLAGS=-Wall -g -pthread -DT_TRACER -I. -I../incgen
 
 #CFLAGS += -O3 -ffast-math -fomit-frame-pointer
 
@@ -66,9 +66,9 @@ gnb: utils.o gnb.o database.o event.o handler.o configuration.o \
          filter/filter.a
 	$(CC) $(CFLAGS) -o gnb $^ $(LIBS) $(XLIBS)
 
-multi.o: ../T_IDs.h
+multi.o: ../incgen/T_IDs.h
 
-../T_IDs.h:
+../incgen/T_IDs.h: ../T_messages.txt
 	cd .. && $(MAKE)
 
 .PHONY: all gui/gui.a view/view.a logger/logger.a filter/filter.a