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

fixes for getting config by command line

Browse Source
This commit is contained in:
Wang Tsu-Han
2018-11-29 16:11:58 +01:00
parent 5d0fe4cea7
commit f88a43ca60
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/ENB_APP/enb_config.c
+19 -13
View File
@@ -69,6 +69,8 @@ extern PARALLEL_CONF_t get_thread_parallel_conf(void);
extern WORKER_CONF_t get_thread_worker_conf(void); extern WORKER_CONF_t get_thread_worker_conf(void);
extern uint32_t to_earfcn_DL(int eutra_bandP, uint32_t dl_CarrierFreq, uint32_t bw); extern uint32_t to_earfcn_DL(int eutra_bandP, uint32_t dl_CarrierFreq, uint32_t bw);
extern uint32_t to_earfcn_UL(int eutra_bandP, uint32_t ul_CarrierFreq, uint32_t bw); extern uint32_t to_earfcn_UL(int eutra_bandP, uint32_t ul_CarrierFreq, uint32_t bw);
extern char *parallel_config;
extern char *worker_config;
void RCconfig_flexran() { void RCconfig_flexran() {
uint16_t i; uint16_t i;
@@ -2673,28 +2675,32 @@ int RCconfig_parallel(void) {
char *parallel_conf = NULL; char *parallel_conf = NULL;
char *worker_conf = NULL; char *worker_conf = NULL;
paramdef_t ThreadParams[] = THREAD_CONF_DESC; paramdef_t ThreadParams[] = THREAD_CONF_DESC;
paramlist_def_t THREADParamList = {THREAD_CONFIG_STRING_THREAD_STRUCT,NULL,0}; paramlist_def_t THREADParamList = {THREAD_CONFIG_STRING_THREAD_STRUCT,NULL,0};
config_getlist( &THREADParamList,NULL,0,NULL); config_getlist( &THREADParamList,NULL,0,NULL);
if(THREADParamList.numelt>0) { if(parallel_config == NULL){
config_getlist( &THREADParamList,ThreadParams,sizeof(ThreadParams)/sizeof(paramdef_t),NULL); if(THREADParamList.numelt>0) {
parallel_conf = strdup(*(THREADParamList.paramarray[0][THREAD_PARALLEL_IDX].strptr)); config_getlist( &THREADParamList,ThreadParams,sizeof(ThreadParams)/sizeof(paramdef_t),NULL);
} else { parallel_conf = strdup(*(THREADParamList.paramarray[0][THREAD_PARALLEL_IDX].strptr));
parallel_conf = strdup("PARALLEL_RU_L1_TRX_SPLIT"); } else {
parallel_conf = strdup("PARALLEL_RU_L1_TRX_SPLIT");
}
set_parallel_conf(parallel_conf);
} }
if(THREADParamList.numelt>0) { if(worker_config == NULL){
config_getlist( &THREADParamList,ThreadParams,sizeof(ThreadParams)/sizeof(paramdef_t),NULL); if(THREADParamList.numelt>0) {
worker_conf = strdup(*(THREADParamList.paramarray[0][THREAD_WORKER_IDX].strptr)); config_getlist( &THREADParamList,ThreadParams,sizeof(ThreadParams)/sizeof(paramdef_t),NULL);
} else { worker_conf = strdup(*(THREADParamList.paramarray[0][THREAD_WORKER_IDX].strptr));
worker_conf = strdup("WORKER_ENABLE"); } else {
worker_conf = strdup("WORKER_ENABLE");
}
set_worker_conf(worker_conf);
} }
set_parallel_conf(parallel_conf);
set_worker_conf(worker_conf);
return 0; return 0;
} }
targets/RT/USER/lte-softmodem-common.c
+2 -2
View File
@@ -35,6 +35,8 @@
#include "common/config/config_userapi.h" #include "common/config/config_userapi.h"
#include "common/utils/load_module_shlib.h" #include "common/utils/load_module_shlib.h"
static softmodem_params_t softmodem_params; static softmodem_params_t softmodem_params;
char *parallel_config=NULL;
char *worker_config=NULL;
uint64_t get_softmodem_optmask(void) { uint64_t get_softmodem_optmask(void) {
return softmodem_params.optmask; return softmodem_params.optmask;
@@ -74,8 +76,6 @@ WORKER_CONF_t get_thread_worker_conf(void)
#endif #endif
void get_common_options(void) void get_common_options(void)
{ {
char *parallel_config=NULL;
char *worker_config=NULL;
uint32_t online_log_messages; uint32_t online_log_messages;