diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c index 47210fc0f7b1731c4ee2c36c0a62be5294fb7386..e8720d00ade44340980afbb864536387b824430c 100644 --- a/executables/nr-gnb.c +++ b/executables/nr-gnb.c @@ -247,13 +247,11 @@ void rx_func(void *param) // Call the scheduler start_meas(&gNB->ul_indication_stats); -// pthread_mutex_lock(&gNB->UL_INFO_mutex); gNB->UL_INFO.frame = frame_rx; gNB->UL_INFO.slot = slot_rx; gNB->UL_INFO.module_id = gNB->Mod_id; gNB->UL_INFO.CC_id = gNB->CC_id; gNB->if_inst->NR_UL_indication(&gNB->UL_INFO); -// pthread_mutex_unlock(&gNB->UL_INFO_mutex); stop_meas(&gNB->ul_indication_stats); int tx_slot_type = nr_slot_select(cfg,frame_tx,slot_tx); @@ -499,19 +497,6 @@ void term_gNB_Tpool(int inst) { pthread_join(proc->pthread_tx_reorder, NULL); } -/*! - * \brief Terminate gNB TX and RX threads. - */ -void kill_gNB_proc(int inst) { - PHY_VARS_gNB *gNB; - - gNB=RC.gNB[inst]; - - LOG_I(PHY, "Destroying UL_INFO mutex\n"); - pthread_mutex_destroy(&gNB->UL_INFO_mutex); - -} - void reset_opp_meas(void) { int sfn; reset_meas(&softmodem_stats_mt); @@ -640,6 +625,5 @@ void stop_gNB(int nb_inst) { for (int inst=0; inst<nb_inst; inst++) { LOG_I(PHY,"Killing gNB %d processing threads\n",inst); term_gNB_Tpool(inst); - kill_gNB_proc(inst); } } diff --git a/executables/nr-softmodem.h b/executables/nr-softmodem.h index e7eed10cff729a959ed1be4bd926bd8d45ce96b4..cc76e9e375d140287af2b31912dce643660c0d84 100644 --- a/executables/nr-softmodem.h +++ b/executables/nr-softmodem.h @@ -47,7 +47,6 @@ extern char *uecap_file; // In nr-gnb.c extern void init_gNB(int single_thread_flag,int wait_for_sync); extern void stop_gNB(int); -extern void kill_gNB_proc(int inst); // In nr-ru.c extern void init_NR_RU(configmodule_interface_t *cfg, char *); diff --git a/nfapi/oai_integration/nfapi_vnf.c b/nfapi/oai_integration/nfapi_vnf.c index 67f6c346c7067b8b4a731b9084fd26c451eef912..71bda068004e65e285463125a650e813d58c7037 100644 --- a/nfapi/oai_integration/nfapi_vnf.c +++ b/nfapi/oai_integration/nfapi_vnf.c @@ -1244,7 +1244,6 @@ int phy_nr_slot_indication(nfapi_nr_slot_indication_scf_t *ind) { int phy_nr_srs_indication(nfapi_nr_srs_indication_t *ind) { struct PHY_VARS_gNB_s *gNB = RC.gNB[0]; - pthread_mutex_lock(&gNB->UL_INFO_mutex); gNB->UL_INFO.srs_ind = *ind; @@ -1260,8 +1259,6 @@ int phy_nr_srs_indication(nfapi_nr_srs_indication_t *ind) { ); } - pthread_mutex_unlock(&gNB->UL_INFO_mutex); - return 1; } //end NR phy indication diff --git a/nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c b/nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c index e12b10ec52fa4a11be517459a86251194a162280..6bba112c50f7509265d67c19f374067ad85cdf7c 100644 --- a/nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c +++ b/nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c @@ -182,7 +182,6 @@ int nfapi_nr_vnf_p7_start(nfapi_vnf_p7_config_t* config) NFAPI_TRACE(NFAPI_TRACE_DEBUG, "This is the slot_ind queue size %ld in %s():%d\n", gnb_slot_ind_queue.num_items, __FUNCTION__, __LINE__); if (slot_ind) { - pthread_mutex_lock(&gNB->UL_INFO_mutex); gNB->UL_INFO.frame = slot_ind->sfn; gNB->UL_INFO.slot = slot_ind->slot; @@ -198,7 +197,6 @@ int nfapi_nr_vnf_p7_start(nfapi_vnf_p7_config_t* config) gNB->if_inst->NR_UL_indication(&gNB->UL_INFO); prev_slot = gNB->UL_INFO.slot; } - pthread_mutex_unlock(&gNB->UL_INFO_mutex); free(slot_ind); slot_ind = NULL; } diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h index b5f830df19e024e452850e852365f7ff878dc193..4132642a4699e250a449329717c5ab5ccd4cc956 100644 --- a/openair1/PHY/defs_gNB.h +++ b/openair1/PHY/defs_gNB.h @@ -562,7 +562,6 @@ typedef struct PHY_VARS_gNB_s { PHY_MEASUREMENTS_gNB measurements; NR_IF_Module_t *if_inst; NR_UL_IND_t UL_INFO; - pthread_mutex_t UL_INFO_mutex; /// NFAPI RX ULSCH information nfapi_nr_rx_data_pdu_t rx_pdu_list[MAX_UL_PDUS_PER_SLOT];