diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c index 47210fc0f7..e8720d00ad 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; instUL_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 e12b10ec52..6bba112c50 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 b5f830df19..4132642a46 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];