Merge remote-tracking branch 'origin/clean-shutdown' into bupt-ulmimo-4

executables/main-ocp.c

@@ -1150,7 +1150,7 @@ int main ( int argc, char **argv ) {
 #if T_TRACER
   T_Config_Init();
 #endif
-  configure_linux();
+  set_latency_target();
   set_softmodem_sighandler();
   cpuf=get_cpu_freq_GHz();
   set_taus_seed (0);

executables/nr-ru.c

@@ -77,6 +77,7 @@ static int DEFBFW[] = {0x00007fff};
 
 #include "T.h"
 #include "nfapi_interface.h"
+#include <nfapi/oai_integration/vendor_ext.h>
 
 extern volatile int oai_exit;
 
@@ -1335,24 +1336,22 @@ void *ru_thread( void *param ) {
   
 
   while (!oai_exit) {
-    // these are local subframe/frame counters to check that we are in synch with the fronthaul timing.
-    // They are set on the first rx/tx in the underly FH routines.
-    slot_start = timespec_add(slot_start,slot_duration);
-    struct timespec curr_time;
-    clock_gettime(CLOCK_MONOTONIC, &curr_time);
-
-    struct timespec sleep_time;
-
-    if((slot_start.tv_sec > curr_time.tv_sec) || (slot_start.tv_sec == curr_time.tv_sec && slot_start.tv_nsec > curr_time.tv_nsec)){
-      sleep_time = timespec_sub(slot_start,curr_time);
+    
+    if (NFAPI_MODE==NFAPI_MODE_VNF) {
+      // We should make a VNF main loop with proper tasks calls in case of VNF
+      slot_start = timespec_add(slot_start,slot_duration);
+      struct timespec curr_time;
+      clock_gettime(CLOCK_MONOTONIC, &curr_time);
       
-      usleep(sleep_time.tv_nsec * 1e-3); 
+      struct timespec sleep_time;
+      
+      if((slot_start.tv_sec > curr_time.tv_sec) || (slot_start.tv_sec == curr_time.tv_sec && slot_start.tv_nsec > curr_time.tv_nsec)){
+	sleep_time = timespec_sub(slot_start,curr_time);
+	
+	usleep(sleep_time.tv_nsec * 1e-3); 
+      }
     }
-    else{//continue
-    }
-
-   // clock_gettime(CLOCK_MONOTONIC, &curr_time);
-    //printf("sfn:%d, slot:%d, start time %d.%d slot start %d.%d \n",frame,slot,curr_time.tv_sec,curr_time.tv_nsec,slot_start.tv_sec,slot_start.tv_nsec);
+    
     if (slot==(fp->slots_per_frame-1)) {
       slot=0;
       frame++;

executables/nr-softmodem.c

@@ -656,7 +656,7 @@ int main( int argc, char **argv ) {
   memset(&openair0_cfg[0],0,sizeof(openair0_config_t)*MAX_CARDS);
   memset(tx_max_power,0,sizeof(int)*MAX_NUM_CCs);
   logInit();
-  configure_linux();
+  set_latency_target();
   printf("Reading in command-line options\n");
   get_options ();
 
@@ -873,10 +873,10 @@ int main( int argc, char **argv ) {
   }
 
   for (int inst = 0; inst < NB_RU; inst++) {
+    kill_NR_RU_proc(inst);
     nr_phy_free_RU(RC.ru[inst]);
   }
 
-  free_lte_top();
   pthread_cond_destroy(&sync_cond);
   pthread_mutex_destroy(&sync_mutex);
   pthread_cond_destroy(&nfapi_sync_cond);
@@ -886,9 +886,6 @@ int main( int argc, char **argv ) {
   // *** Handle per CC_id openair0
 
   for(ru_id=0; ru_id<NB_RU; ru_id++) {
-    if (RC.ru[ru_id]->rfdevice.trx_end_func)
-      RC.ru[ru_id]->rfdevice.trx_end_func(&RC.ru[ru_id]->rfdevice);
-
     if (RC.ru[ru_id]->ifdevice.trx_end_func)
       RC.ru[ru_id]->ifdevice.trx_end_func(&RC.ru[ru_id]->ifdevice);
   }

executables/nr-ue.c

@@ -700,6 +700,16 @@ void processSlotRX(void *arg) {
   int tx_slot_type = nr_ue_slot_select(cfg, proc->frame_tx, proc->nr_slot_tx);
   uint8_t gNB_id = 0;
 
+  if (IS_SOFTMODEM_NOS1 || get_softmodem_params()->sa) {
+    /* send tick to RLC and PDCP every ms */
+    if (proc->nr_slot_rx % UE->frame_parms.slots_per_subframe == 0) {
+      void nr_rlc_tick(int frame, int subframe);
+      void nr_pdcp_tick(int frame, int subframe);
+      nr_rlc_tick(proc->frame_rx, proc->nr_slot_rx / UE->frame_parms.slots_per_subframe);
+      nr_pdcp_tick(proc->frame_rx, proc->nr_slot_rx / UE->frame_parms.slots_per_subframe);
+    }
+  }
+
   if (rx_slot_type == NR_DOWNLINK_SLOT || rx_slot_type == NR_MIXED_SLOT){
 
     if(UE->if_inst != NULL && UE->if_inst->dl_indication != NULL) {
@@ -722,14 +732,6 @@ void processSlotRX(void *arg) {
       protocol_ctxt_t ctxt;
       PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, UE->Mod_id, ENB_FLAG_NO, mac->crnti, proc->frame_rx, proc->nr_slot_rx, 0);
       pdcp_run(&ctxt);
-
-      /* send tick to RLC and PDCP every ms */
-      if (proc->nr_slot_rx % UE->frame_parms.slots_per_subframe == 0) {
-        void nr_rlc_tick(int frame, int subframe);
-        void nr_pdcp_tick(int frame, int subframe);
-        nr_rlc_tick(proc->frame_rx, proc->nr_slot_rx / UE->frame_parms.slots_per_subframe);
-        nr_pdcp_tick(proc->frame_rx, proc->nr_slot_rx / UE->frame_parms.slots_per_subframe);
-      }
     }
     // calling UL_indication to schedule things other than PUSCH (eg, PUCCH)
     rxtxD->ue_sched_mode = NOT_PUSCH;

executables/nr-uesoftmodem.c

@@ -84,6 +84,7 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "executables/thread-common.h"
 
 #include "nr_nas_msg_sim.h"
+#include <openair1/PHY/MODULATION/nr_modulation.h>
 
 extern const char *duplex_mode[];
 THREAD_STRUCT thread_struct;
@@ -522,7 +523,7 @@ int main( int argc, char **argv ) {
     // init UE_PF_PO and mutex lock
     pthread_mutex_init(&ue_pf_po_mutex, NULL);
     memset (&UE_PF_PO[0][0], 0, sizeof(UE_PF_PO_t)*NUMBER_OF_UE_MAX*MAX_NUM_CCs);
-    configure_linux();
+    set_latency_target();
     mlockall(MCL_CURRENT | MCL_FUTURE);
 
     if(IS_SOFTMODEM_DOSCOPE) {

executables/ocp-gnb.c

@@ -920,7 +920,7 @@ int main( int argc, char **argv ) {
 #  define PACKAGE_VERSION "UNKNOWN"
 #endif
   LOG_I(HW, "Version: %s\n", PACKAGE_VERSION);
-  configure_linux();
+  set_latency_target();
   get_options ();
   get_common_options(SOFTMODEM_GNB_BIT );
   AssertFatal(!CONFIG_ISFLAGSET(CONFIG_ABORT),"Getting configuration failed\n");