maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put local tracer in tracee

Browse Source 
plus some cleanup here and there
This commit is contained in:
Cedric Roux
2016-06-01 15:42:29 +02:00
parent 05afc953e8
commit 358a37910c
13 changed files with 103 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/SIMU/USER/oaisim.c
+13 -7
View File
@@ -250,6 +250,10 @@ help (void)
printf ("-Y Set the global log verbosity (none, low, medium, high, full) \n");
printf ("-z Set the cooperation flag (0 for no cooperation, 1 for delay diversity and 2 for distributed alamouti\n");
printf ("-Z Reserved\n");
#if T_TRACER
printf ("--T_port [port] use given port\n");
printf ("--T_nowait don't wait for tracer, start immediately\n");
#endif
}
pthread_t log_thread;
@@ -1252,6 +1256,11 @@ l2l1_task (void *args_p)
return NULL;
}
#if T_TRACER
int T_wait = 1; /* by default we wait for the tracer */
int T_port = 2021; /* default port to listen to to wait for the tracer */
#endif
/*------------------------------------------------------------------------------*/
int
main (int argc, char **argv)
@@ -1269,13 +1278,6 @@ main (int argc, char **argv)
int port,Process_Flag=0,wgt,Channel_Flag=0,temp;
#endif
#if T_TRACER
char *T_ip = "127.0.0.1";
int T_port = 2020;
printf("connecting to T tracer IP %s port %d\n", T_ip, T_port);
T_connect_to_tracer(T_ip, T_port);
#endif
//default parameters
oai_emulation.info.n_frames = 0xffff; //1024; //10;
oai_emulation.info.n_frames_flag = 0; //fixme
@@ -1292,6 +1294,10 @@ main (int argc, char **argv)
// get command-line options
get_simulation_options (argc, argv); //Command-line options
#if T_TRACER
T_init(T_port, T_wait);
#endif
// Initialize VCD LOG module
VCD_SIGNAL_DUMPER_INIT (oai_emulation.info.vcd_file);
targets/SIMU/USER/oaisim_functions.c
+25
View File
@@ -213,6 +213,11 @@ void get_simulation_options(int argc, char *argv[])
LONG_OPTION_PHYTEST,
LONG_OPTION_XFORMS,
#if T_TRACER
LONG_OPTION_T_PORT,
LONG_OPTION_T_NOWAIT,
#endif
};
static struct option long_options[] = {
@@ -247,6 +252,11 @@ void get_simulation_options(int argc, char *argv[])
{"phy-test", no_argument, NULL, LONG_OPTION_PHYTEST},
{"xforms", no_argument, 0, LONG_OPTION_XFORMS},
#if T_TRACER
{"T_port", required_argument, 0, LONG_OPTION_T_PORT},
{"T_nowait", no_argument, 0, LONG_OPTION_T_NOWAIT},
#endif
{NULL, 0, NULL, 0}
};
@@ -414,6 +424,21 @@ void get_simulation_options(int argc, char *argv[])
xforms=1;
break;
#if T_TRACER
case LONG_OPTION_T_PORT: {
extern int T_port;
if (optarg == NULL) abort(); /* should not happen */
T_port = atoi(optarg);
break;
}
case LONG_OPTION_T_NOWAIT: {
extern int T_wait;
T_wait = 0;
break;
}
#endif
case 'a':
abstraction_flag = 1;
break;