Various places: remove printf and/or transform to LOG_D
This commit is contained in:
@@ -406,7 +406,7 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config)
|
|||||||
LOG_I(PHY, "DL frequency %lu Hz, UL frequency %lu Hz: band %d, uldl offset %d Hz\n", fp->dl_CarrierFreq, fp->ul_CarrierFreq, fp->nr_band, dlul_offset);
|
LOG_I(PHY, "DL frequency %lu Hz, UL frequency %lu Hz: band %d, uldl offset %d Hz\n", fp->dl_CarrierFreq, fp->ul_CarrierFreq, fp->nr_band, dlul_offset);
|
||||||
|
|
||||||
fp->threequarter_fs = get_softmodem_params()->threequarter_fs;
|
fp->threequarter_fs = get_softmodem_params()->threequarter_fs;
|
||||||
LOG_A(PHY,"Configuring MIB for instance %d, : (Nid_cell %d,DL freq %llu, UL freq %llu)\n",
|
LOG_D(PHY,"Configuring MIB for instance %d, : (Nid_cell %d,DL freq %llu, UL freq %llu)\n",
|
||||||
Mod_id,
|
Mod_id,
|
||||||
gNB_config->cell_config.phy_cell_id.value,
|
gNB_config->cell_config.phy_cell_id.value,
|
||||||
(unsigned long long)fp->dl_CarrierFreq,
|
(unsigned long long)fp->dl_CarrierFreq,
|
||||||
|
|||||||
@@ -1050,21 +1050,17 @@ typedef uint8_t(encoder_if_t)(uint8_t *input,
|
|||||||
|
|
||||||
extern int oai_exit;
|
extern int oai_exit;
|
||||||
|
|
||||||
static inline void wait_sync(char *thread_name) {
|
static inline void wait_sync(char *thread_name)
|
||||||
|
{
|
||||||
int rc;
|
int rc;
|
||||||
printf( "waiting for sync (%s,%d/%p,%p,%p)\n",thread_name,sync_var,&sync_var,&sync_cond,&sync_mutex);
|
LOG_D(PHY, "waiting for sync (%s,%d/%p,%p,%p)\n", thread_name, sync_var, &sync_var, &sync_cond, &sync_mutex);
|
||||||
AssertFatal((rc = pthread_mutex_lock( &sync_mutex ))==0,"sync mutex lock error");
|
AssertFatal((rc = pthread_mutex_lock( &sync_mutex ))==0,"sync mutex lock error");
|
||||||
|
|
||||||
while (sync_var<0 && !oai_exit)
|
while (sync_var<0 && !oai_exit)
|
||||||
pthread_cond_wait( &sync_cond, &sync_mutex );
|
pthread_cond_wait( &sync_cond, &sync_mutex );
|
||||||
|
|
||||||
AssertFatal((rc = pthread_mutex_unlock( &sync_mutex ))==0,"sync mutex unlock error");
|
AssertFatal((rc = pthread_mutex_unlock( &sync_mutex ))==0,"sync mutex unlock error");
|
||||||
printf( "got sync (%s)\n", thread_name);
|
LOG_D(PHY, "got sync (%s)\n", thread_name);
|
||||||
/*
|
|
||||||
* Raphael Defosseux: added for CI to get faster the got sync message.
|
|
||||||
*/
|
|
||||||
fflush(stdout);
|
|
||||||
fflush(stderr);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -946,7 +946,6 @@ void RCconfig_NR_L1(void)
|
|||||||
} else { // other midhaul
|
} else { // other midhaul
|
||||||
}
|
}
|
||||||
} // for (j = 0; j < RC.nb_nr_L1_inst; j++)
|
} // for (j = 0; j < RC.nb_nr_L1_inst; j++)
|
||||||
printf("Initializing northbound interface for L1\n");
|
|
||||||
l1_north_init_gNB();
|
l1_north_init_gNB();
|
||||||
} else {
|
} else {
|
||||||
LOG_I(PHY, "No " CONFIG_STRING_L1_LIST " configuration found");
|
LOG_I(PHY, "No " CONFIG_STRING_L1_LIST " configuration found");
|
||||||
@@ -1422,7 +1421,6 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg)
|
|||||||
|
|
||||||
} else if (strcmp(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_N_PREFERENCE_IDX].strptr), "f1") == 0
|
} else if (strcmp(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_N_PREFERENCE_IDX].strptr), "f1") == 0
|
||||||
|| strcmp(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_N_PREFERENCE_IDX].strptr), "cudu") == 0) {
|
|| strcmp(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_N_PREFERENCE_IDX].strptr), "cudu") == 0) {
|
||||||
printf("Configuring F1 interfaces for MACRLC\n");
|
|
||||||
char **f1caddr = MacRLC_ParamList.paramarray[j][MACRLC_LOCAL_N_ADDRESS_IDX].strptr;
|
char **f1caddr = MacRLC_ParamList.paramarray[j][MACRLC_LOCAL_N_ADDRESS_IDX].strptr;
|
||||||
RC.nrmac[j]->eth_params_n.my_addr = strdup(*f1caddr);
|
RC.nrmac[j]->eth_params_n.my_addr = strdup(*f1caddr);
|
||||||
char **f1uaddr = MacRLC_ParamList.paramarray[j][MACRLC_LOCAL_N_ADDRESS_F1U_IDX].strptr;
|
char **f1uaddr = MacRLC_ParamList.paramarray[j][MACRLC_LOCAL_N_ADDRESS_F1U_IDX].strptr;
|
||||||
@@ -1447,16 +1445,14 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg)
|
|||||||
RC.nrmac[j]->eth_params_s.remote_portd = *(MacRLC_ParamList.paramarray[j][MACRLC_REMOTE_S_PORTD_IDX].iptr);
|
RC.nrmac[j]->eth_params_s.remote_portd = *(MacRLC_ParamList.paramarray[j][MACRLC_REMOTE_S_PORTD_IDX].iptr);
|
||||||
RC.nrmac[j]->eth_params_s.transp_preference = ETH_UDP_MODE;
|
RC.nrmac[j]->eth_params_s.transp_preference = ETH_UDP_MODE;
|
||||||
|
|
||||||
printf("**************** vnf_port:%d\n", RC.nrmac[j]->eth_params_s.my_portc);
|
|
||||||
configure_nr_nfapi_vnf(
|
configure_nr_nfapi_vnf(
|
||||||
RC.nrmac[j]->eth_params_s.my_addr, RC.nrmac[j]->eth_params_s.my_portc, RC.nrmac[j]->eth_params_s.remote_addr, RC.nrmac[j]->eth_params_s.remote_portd, RC.nrmac[j]->eth_params_s.my_portd);
|
RC.nrmac[j]->eth_params_s.my_addr, RC.nrmac[j]->eth_params_s.my_portc, RC.nrmac[j]->eth_params_s.remote_addr, RC.nrmac[j]->eth_params_s.remote_portd, RC.nrmac[j]->eth_params_s.my_portd);
|
||||||
printf("**************** RETURNED FROM configure_nfapi_vnf() vnf_port:%d\n", RC.nrmac[j]->eth_params_s.my_portc);
|
|
||||||
} else if(strcmp(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_S_PREFERENCE_IDX].strptr), "aerial") == 0){
|
} else if(strcmp(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_S_PREFERENCE_IDX].strptr), "aerial") == 0){
|
||||||
#ifdef ENABLE_AERIAL
|
#ifdef ENABLE_AERIAL
|
||||||
RC.nrmac[j]->nvipc_params_s.nvipc_shm_prefix =
|
RC.nrmac[j]->nvipc_params_s.nvipc_shm_prefix =
|
||||||
strdup(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_S_SHM_PREFIX].strptr));
|
strdup(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_S_SHM_PREFIX].strptr));
|
||||||
RC.nrmac[j]->nvipc_params_s.nvipc_poll_core = *(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_S_POLL_CORE].i8ptr);
|
RC.nrmac[j]->nvipc_params_s.nvipc_poll_core = *(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_S_POLL_CORE].i8ptr);
|
||||||
printf("Configuring VNF for Aerial connection with prefix %s\n", RC.nrmac[j]->eth_params_s.local_if_name);
|
LOG_I(GNB_APP, "Configuring VNF for Aerial connection with prefix %s\n", RC.nrmac[j]->eth_params_s.local_if_name);
|
||||||
aerial_configure_nr_fapi_vnf();
|
aerial_configure_nr_fapi_vnf();
|
||||||
#endif
|
#endif
|
||||||
} else { // other midhaul
|
} else { // other midhaul
|
||||||
@@ -1839,7 +1835,7 @@ void RCconfig_NRRRC(gNB_RRC_INST *rrc)
|
|||||||
|
|
||||||
sprintf(aprefix, "%s.[%i]", GNB_CONFIG_STRING_GNB_LIST, 0);
|
sprintf(aprefix, "%s.[%i]", GNB_CONFIG_STRING_GNB_LIST, 0);
|
||||||
|
|
||||||
printf("NRRRC %d: Southbound Transport %s\n", i, *(GNBParamList.paramarray[i][GNB_TRANSPORT_S_PREFERENCE_IDX].strptr));
|
LOG_D(GNB_APP, "NRRRC %d: Southbound Transport %s\n", i, *(GNBParamList.paramarray[i][GNB_TRANSPORT_S_PREFERENCE_IDX].strptr));
|
||||||
|
|
||||||
rrc->node_type = get_node_type();
|
rrc->node_type = get_node_type();
|
||||||
rrc->node_id = gnb_id;
|
rrc->node_id = gnb_id;
|
||||||
|
|||||||
@@ -823,7 +823,7 @@ void dl_rrc_message_transfer(const f1ap_dl_rrc_message_t *dl_rrc)
|
|||||||
pthread_mutex_unlock(&mac->sched_lock);
|
pthread_mutex_unlock(&mac->sched_lock);
|
||||||
|
|
||||||
if (!du_exists_f1_ue_data(dl_rrc->gNB_DU_ue_id)) {
|
if (!du_exists_f1_ue_data(dl_rrc->gNB_DU_ue_id)) {
|
||||||
LOG_I(NR_MAC, "No CU UE ID stored for UE RNTI %04x, adding CU UE ID %d\n", dl_rrc->gNB_DU_ue_id, dl_rrc->gNB_CU_ue_id);
|
LOG_D(NR_MAC, "No CU UE ID stored for UE RNTI %04x, adding CU UE ID %d\n", dl_rrc->gNB_DU_ue_id, dl_rrc->gNB_CU_ue_id);
|
||||||
f1_ue_data_t new_ue_data = {.secondary_ue = dl_rrc->gNB_CU_ue_id};
|
f1_ue_data_t new_ue_data = {.secondary_ue = dl_rrc->gNB_CU_ue_id};
|
||||||
du_add_f1_ue_data(dl_rrc->gNB_DU_ue_id, &new_ue_data);
|
du_add_f1_ue_data(dl_rrc->gNB_DU_ue_id, &new_ue_data);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user