Rename T files to avoid name clashes
There is already common/utils/config.h. This file(name) is hardcoded as it is included into asn1c, and cannot be renamed. To avoid a name clash and confusing, we rename T's config.h/c to configuration.h/c.
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
add_library(tracer_utils OBJECT config.c database.c event.c handler.c utils.c)
|
add_library(tracer_utils OBJECT configuration.c database.c event.c handler.c utils.c)
|
||||||
target_link_libraries(tracer_utils PUBLIC m pthread)
|
target_link_libraries(tracer_utils PUBLIC m pthread)
|
||||||
|
|
||||||
add_library(tracer_events OBJECT event_selector.c)
|
add_library(tracer_events OBJECT event_selector.c)
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ all: record replay extract_config textlog enb ue vcd macpdu2wireshark \
|
|||||||
extract_input_subframe extract_output_subframe to_vcd extract multi \
|
extract_input_subframe extract_output_subframe to_vcd extract multi \
|
||||||
gnb
|
gnb
|
||||||
|
|
||||||
record: utils.o record.o database.o config.o
|
record: utils.o record.o database.o configuration.o
|
||||||
$(CC) $(CFLAGS) -o record $^ $(LIBS)
|
$(CC) $(CFLAGS) -o record $^ $(LIBS)
|
||||||
|
|
||||||
replay: utils.o replay.o
|
replay: utils.o replay.o
|
||||||
@@ -20,48 +20,48 @@ extract_config: extract_config.o
|
|||||||
$(CC) $(CFLAGS) -o extract_config $^ $(LIBS)
|
$(CC) $(CFLAGS) -o extract_config $^ $(LIBS)
|
||||||
|
|
||||||
extract_input_subframe: extract_input_subframe.o database.o event.o utils.o \
|
extract_input_subframe: extract_input_subframe.o database.o event.o utils.o \
|
||||||
config.o
|
configuration.o
|
||||||
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
|
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
|
||||||
|
|
||||||
extract_output_subframe: extract_output_subframe.o database.o event.o utils.o \
|
extract_output_subframe: extract_output_subframe.o database.o event.o utils.o \
|
||||||
config.o
|
configuration.o
|
||||||
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
|
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
|
||||||
|
|
||||||
extract: extract.o database.o event.o utils.o config.o
|
extract: extract.o database.o event.o utils.o configuration.o
|
||||||
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
|
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
|
||||||
|
|
||||||
textlog: utils.o textlog.o database.o event.o handler.o config.o \
|
textlog: utils.o textlog.o database.o event.o handler.o configuration.o \
|
||||||
event_selector.o view/view.a gui/gui.a logger/logger.a \
|
event_selector.o view/view.a gui/gui.a logger/logger.a \
|
||||||
filter/filter.a
|
filter/filter.a
|
||||||
$(CC) $(CFLAGS) -o textlog $^ $(LIBS) $(XLIBS)
|
$(CC) $(CFLAGS) -o textlog $^ $(LIBS) $(XLIBS)
|
||||||
|
|
||||||
enb: utils.o enb.o database.o event.o handler.o config.o \
|
enb: utils.o enb.o database.o event.o handler.o configuration.o \
|
||||||
event_selector.o view/view.a gui/gui.a logger/logger.a \
|
event_selector.o view/view.a gui/gui.a logger/logger.a \
|
||||||
filter/filter.a
|
filter/filter.a
|
||||||
$(CC) $(CFLAGS) -o enb $^ $(LIBS) $(XLIBS)
|
$(CC) $(CFLAGS) -o enb $^ $(LIBS) $(XLIBS)
|
||||||
|
|
||||||
ue: utils.o ue.o database.o event.o handler.o config.o \
|
ue: utils.o ue.o database.o event.o handler.o configuration.o \
|
||||||
event_selector.o view/view.a gui/gui.a logger/logger.a \
|
event_selector.o view/view.a gui/gui.a logger/logger.a \
|
||||||
filter/filter.a
|
filter/filter.a
|
||||||
$(CC) $(CFLAGS) -o ue $^ $(LIBS) $(XLIBS)
|
$(CC) $(CFLAGS) -o ue $^ $(LIBS) $(XLIBS)
|
||||||
|
|
||||||
vcd: utils.o vcd.o database.o event.o handler.o config.o \
|
vcd: utils.o vcd.o database.o event.o handler.o configuration.o \
|
||||||
event_selector.o view/view.a gui/gui.a logger/logger.a \
|
event_selector.o view/view.a gui/gui.a logger/logger.a \
|
||||||
filter/filter.a
|
filter/filter.a
|
||||||
$(CC) $(CFLAGS) -o vcd $^ $(LIBS) $(XLIBS)
|
$(CC) $(CFLAGS) -o vcd $^ $(LIBS) $(XLIBS)
|
||||||
|
|
||||||
to_vcd: to_vcd.o database.o event.o handler.o utils.o config.o \
|
to_vcd: to_vcd.o database.o event.o handler.o utils.o configuration.o \
|
||||||
logger/logger.a filter/filter.a
|
logger/logger.a filter/filter.a
|
||||||
$(CC) $(CFLAGS) -o to_vcd $^ $(LIBS)
|
$(CC) $(CFLAGS) -o to_vcd $^ $(LIBS)
|
||||||
|
|
||||||
macpdu2wireshark: macpdu2wireshark.o database.o utils.o handler.o event.o \
|
macpdu2wireshark: macpdu2wireshark.o database.o utils.o handler.o event.o \
|
||||||
config.o
|
configuration.o
|
||||||
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
|
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
|
||||||
|
|
||||||
multi: multi.o utils.o database.o config.o
|
multi: multi.o utils.o database.o configuration.o
|
||||||
$(CC) $(CFLAGS) -o multi $^ $(LIBS)
|
$(CC) $(CFLAGS) -o multi $^ $(LIBS)
|
||||||
|
|
||||||
gnb: utils.o gnb.o database.o event.o handler.o config.o \
|
gnb: utils.o gnb.o database.o event.o handler.o configuration.o \
|
||||||
view/view.a gui/gui.a logger/logger.a \
|
view/view.a gui/gui.a logger/logger.a \
|
||||||
filter/filter.a
|
filter/filter.a
|
||||||
$(CC) $(CFLAGS) -o gnb $^ $(LIBS) $(XLIBS)
|
$(CC) $(CFLAGS) -o gnb $^ $(LIBS) $(XLIBS)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "config.h"
|
#include "configuration.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "event_selector.h"
|
#include "event_selector.h"
|
||||||
#include "openair_logo.h"
|
#include "openair_logo.h"
|
||||||
#include "config.h"
|
#include "configuration.h"
|
||||||
|
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
/* conversion from rnti to "ue_id" (which does not really exists) */
|
/* conversion from rnti to "ue_id" (which does not really exists) */
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#include "event.h"
|
#include "event.h"
|
||||||
#include "database.h"
|
#include "database.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "config.h"
|
#include "configuration.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include "database.h"
|
#include "database.h"
|
||||||
#include "event.h"
|
#include "event.h"
|
||||||
#include "config.h"
|
#include "configuration.h"
|
||||||
|
|
||||||
void usage(void)
|
void usage(void)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include "database.h"
|
#include "database.h"
|
||||||
#include "event.h"
|
#include "event.h"
|
||||||
#include "config.h"
|
#include "configuration.h"
|
||||||
|
|
||||||
void usage(void)
|
void usage(void)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include "database.h"
|
#include "database.h"
|
||||||
#include "event.h"
|
#include "event.h"
|
||||||
#include "config.h"
|
#include "configuration.h"
|
||||||
|
|
||||||
void usage(void)
|
void usage(void)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
#include "database.h"
|
#include "database.h"
|
||||||
#include "event.h"
|
#include "event.h"
|
||||||
#include "handler.h"
|
#include "handler.h"
|
||||||
#include "config.h"
|
#include "configuration.h"
|
||||||
#include "logger/logger.h"
|
#include "logger/logger.h"
|
||||||
#include "gui/gui.h"
|
#include "gui/gui.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
|
|||||||
@@ -5,18 +5,18 @@ LIBS=-lX11 -lm -lpng -lXft
|
|||||||
|
|
||||||
all: dump_nack_signal time_meas timeplot multi-rru-clean
|
all: dump_nack_signal time_meas timeplot multi-rru-clean
|
||||||
|
|
||||||
dump_nack_signal: ../utils.o ../database.o ../config.o ../event.o \
|
dump_nack_signal: ../utils.o ../database.o ../configuration.o ../event.o \
|
||||||
dump_nack_signal.o
|
dump_nack_signal.o
|
||||||
$(CC) $(CFLAGS) -o dump_nack_signal $^ $(LIBS)
|
$(CC) $(CFLAGS) -o dump_nack_signal $^ $(LIBS)
|
||||||
|
|
||||||
time_meas: ../utils.o ../database.o ../config.o ../event.o \
|
time_meas: ../utils.o ../database.o ../configuration.o ../event.o \
|
||||||
time_meas.o
|
time_meas.o
|
||||||
$(CC) $(CFLAGS) -o time_meas $^ $(LIBS)
|
$(CC) $(CFLAGS) -o time_meas $^ $(LIBS)
|
||||||
|
|
||||||
timplot: timeplot.o
|
timplot: timeplot.o
|
||||||
$(CC) $(CFLAGS) -o timeplot $^ $(LIBS)
|
$(CC) $(CFLAGS) -o timeplot $^ $(LIBS)
|
||||||
|
|
||||||
multi-rru-clean: ../utils.o ../database.o ../event.o ../config.o multi-rru-clean.o
|
multi-rru-clean: ../utils.o ../database.o ../event.o ../configuration.o multi-rru-clean.o
|
||||||
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
|
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
|
||||||
|
|
||||||
.PHONY: all
|
.PHONY: all
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
#include "database.h"
|
#include "database.h"
|
||||||
#include "event.h"
|
#include "event.h"
|
||||||
#include "handler.h"
|
#include "handler.h"
|
||||||
#include "config.h"
|
#include "configuration.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "packet-mac-lte.h"
|
#include "packet-mac-lte.h"
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
#include "database.h"
|
#include "database.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "../T.h"
|
#include "../T.h"
|
||||||
#include "config.h"
|
#include "configuration.h"
|
||||||
|
|
||||||
#define DEFAULT_LOCAL_PORT 2022
|
#define DEFAULT_LOCAL_PORT 2022
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
#include "database.h"
|
#include "database.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "../T_defs.h"
|
#include "../T_defs.h"
|
||||||
#include "config.h"
|
#include "configuration.h"
|
||||||
|
|
||||||
void usage(void)
|
void usage(void)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
#include "gui/gui.h"
|
#include "gui/gui.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "event_selector.h"
|
#include "event_selector.h"
|
||||||
#include "config.h"
|
#include "configuration.h"
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int socket;
|
int socket;
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
#include "database.h"
|
#include "database.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "handler.h"
|
#include "handler.h"
|
||||||
#include "config.h"
|
#include "configuration.h"
|
||||||
#include "logger/logger.h"
|
#include "logger/logger.h"
|
||||||
#include "view/view.h"
|
#include "view/view.h"
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "event_selector.h"
|
#include "event_selector.h"
|
||||||
#include "openair_logo.h"
|
#include "openair_logo.h"
|
||||||
#include "config.h"
|
#include "configuration.h"
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
view *phyview;
|
view *phyview;
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
#include "gui/gui.h"
|
#include "gui/gui.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "event_selector.h"
|
#include "event_selector.h"
|
||||||
#include "config.h"
|
#include "configuration.h"
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int socket;
|
int socket;
|
||||||
|
|||||||
Reference in New Issue
Block a user