remove dead code

executables/nr-gnb.c

@@ -86,18 +86,8 @@
 #include <PHY/NR_ESTIMATION/nr_ul_estimation.h>
 
 // #define USRP_DEBUG 1
-//  Fix per CC openair rf/if device update
-
-time_stats_t softmodem_stats_mt; // main thread
-time_stats_t softmodem_stats_hw; //  hw acquisition
-time_stats_t softmodem_stats_rxtx_sf; // total tx time
-time_stats_t nfapi_meas; // total tx time
-time_stats_t softmodem_stats_rx_sf; // total rx time
-
-
 #include "executables/thread-common.h"
 
-
 //#define TICK_TO_US(ts) (ts.diff)
 #define TICK_TO_US(ts) (ts.trials==0?0:ts.diff/ts.trials)
 #define L1STATSSTRLEN 16384
@@ -213,18 +203,14 @@ static void rx_func(processingData_L1_t *info)
   int64_t absslot_tx = info->timestamp_tx / samples;
   int64_t absslot_rx = absslot_tx - gNB->RU_list[0]->sl_ahead;
   int rt_prof_idx = absslot_rx % RT_PROF_DEPTH;
-  clock_gettime(CLOCK_MONOTONIC,&info->gNB->rt_L1_profiling.start_L1_RX[rt_prof_idx]);
-  start_meas(&softmodem_stats_rxtx_sf);
+  clock_gettime(CLOCK_MONOTONIC, &info->gNB->rt_L1_profiling.start_L1_RX[rt_prof_idx]);
 
   // *******************************************************************
 
   if (NFAPI_MODE == NFAPI_MODE_PNF) {
     // I am a PNF and I need to let nFAPI know that we have a (sub)frame tick
-    //LOG_D(PHY, "oai_nfapi_slot_ind(frame:%u, slot:%d) ********\n", frame_rx, slot_rx);
-    start_meas(&nfapi_meas);
+    // LOG_D(PHY, "oai_nfapi_slot_ind(frame:%u, slot:%d) ********\n", frame_rx, slot_rx);
     handle_nr_slot_ind(frame_rx, slot_rx);
-    stop_meas(&nfapi_meas);
-
   }
   // ****************************************
 
@@ -277,7 +263,6 @@ static void rx_func(processingData_L1_t *info)
 #endif
   }
 
-  stop_meas(&softmodem_stats_rxtx_sf);
   clock_gettime(CLOCK_MONOTONIC, &info->gNB->rt_L1_profiling.return_L1_RX[rt_prof_idx]);
 }
 
@@ -394,7 +379,6 @@ void init_gNB_Tpool(int inst) {
 
 }
 
-
 void term_gNB_Tpool(int inst) {
   PHY_VARS_gNB *gNB = RC.gNB[inst];
   abortTpool(&gNB->threadPool);
@@ -410,30 +394,6 @@ void term_gNB_Tpool(int inst) {
     pthread_join(proc->L1_stats_thread, NULL);
 }
 
-void reset_opp_meas(void) {
-  int sfn;
-  reset_meas(&softmodem_stats_mt);
-  reset_meas(&softmodem_stats_hw);
-
-  for (sfn=0; sfn < 10; sfn++) {
-    reset_meas(&softmodem_stats_rxtx_sf);
-    reset_meas(&softmodem_stats_rx_sf);
-  }
-}
-
-
-void print_opp_meas(void) {
-  int sfn=0;
-  print_meas(&softmodem_stats_mt, "Main gNB Thread", NULL, NULL);
-  print_meas(&softmodem_stats_hw, "HW Acquisation", NULL, NULL);
-
-  for (sfn=0; sfn < 10; sfn++) {
-    print_meas(&softmodem_stats_rxtx_sf,"[gNB][total_phy_proc_rxtx]",NULL, NULL);
-    print_meas(&softmodem_stats_rx_sf,"[gNB][total_phy_proc_rx]",NULL,NULL);
-  }
-}
-
-
 /// eNB kept in function name for nffapi calls, TO FIX
 void init_eNB_afterRU(void) {
   int inst,ru_id,i,aa;

executables/nr-softmodem.c

@@ -141,9 +141,6 @@ uint8_t nb_antenna_rx = 1;
 
 int otg_enabled;
 
-extern void reset_opp_meas(void);
-extern void print_opp_meas(void);
-
 extern void *udp_eNB_task(void *args_p);
 
 int transmission_mode=1;
@@ -631,10 +628,6 @@ int main( int argc, char **argv ) {
   set_taus_seed (0);
   printf("configuring for RAU/RRU\n");
 
-  if (cpu_meas_enabled) {
-    reset_opp_meas();
-  }
-
   cpuf=get_cpu_freq_GHz();
   itti_init(TASK_MAX, tasks_info);
   // initialize mscgen log after ITTI

executables/nr-softmodem.h

@@ -52,8 +52,6 @@ extern void stop_RU(int nb_ru);
 extern void kill_NR_RU_proc(int inst);
 extern void set_function_spec_param(RU_t *ru);
 
-extern void reset_opp_meas(void);
-extern void print_opp_meas(void);
 void init_gNB_afterRU(void);
 
 void init_pdcp(void);

executables/nr-uesoftmodem.h

@@ -120,8 +120,6 @@ extern int setup_nr_ue_buffers(PHY_VARS_NR_UE **phy_vars_ue, openair0_config_t *
 extern void fill_ue_band_info(void);
 extern void init_NR_UE(int, char *, char *, char *);
 extern void init_NR_UE_threads(PHY_VARS_NR_UE *ue);
-extern void reset_opp_meas(void);
-extern void print_opp_meas(void);
 void start_oai_nrue_threads(void);
 void *UE_thread(void *arg);
 void init_nr_ue_vars(PHY_VARS_NR_UE *ue, uint8_t UE_id);

openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c

@@ -189,7 +189,6 @@ static void nr_processULSegment(void *arg)
   memset(ulsch_harq->c[r], 0, Kr_bytes);
   p_decoderParms->crc_type = crcType(ulsch_harq->C, A);
   p_decoderParms->E = lenWithCrc(ulsch_harq->C, A);
-  // start_meas(&phy_vars_gNB->ulsch_ldpc_decoding_stats);
 
   // set first 2*Z_c bits to zeros
 

openair1/PHY/defs_gNB.h

@@ -533,7 +533,6 @@ typedef struct PHY_VARS_gNB_s {
   time_stats_t slot_indication_stats;
   time_stats_t schedule_response_stats;
   time_stats_t ulsch_decoding_stats;
-  time_stats_t ulsch_ldpc_decoding_stats;
   time_stats_t ulsch_deinterleaving_stats;
   time_stats_t ulsch_channel_estimation_stats;
   time_stats_t ulsch_llr_stats;