time management module

This commit introduces a time management module.

See doc/time_management.md for details.

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -177,16 +177,6 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frame, slot_t slo
   start_meas(&gNB->eNB_scheduler);
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_gNB_DLSCH_ULSCH_SCHEDULER,VCD_FUNCTION_IN);
 
-  /* send tick to RLC, PDCP, and X2AP every ms */
-  if ((slot & ((1 << *scc->ssbSubcarrierSpacing) - 1)) == 0) {
-    void nr_rlc_tick(int frame, int subframe);
-    void nr_pdcp_tick(int frame, int subframe);
-    nr_rlc_tick(frame, slot >> *scc->ssbSubcarrierSpacing);
-    nr_pdcp_tick(frame, slot >> *scc->ssbSubcarrierSpacing);
-    if (is_x2ap_enabled())
-      x2ap_trigger();
-  }
-
   for (int CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
     int num_beams = 1;
     if(gNB->beam_info.beam_allocation)

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

@@ -74,11 +74,6 @@
 
 static nr_pdcp_ue_manager_t *nr_pdcp_ue_manager;
 
-/* TODO: handle time a bit more properly */
-static uint64_t nr_pdcp_current_time;
-static int      nr_pdcp_current_time_last_frame;
-static int      nr_pdcp_current_time_last_subframe;
-
 /* necessary globals for OAI, not used internally */
 hash_table_t  *pdcp_coll_p;
 static uint64_t pdcp_optmask;
@@ -422,9 +417,6 @@ void nr_pdcp_layer_init(void)
   nr_pdcp_e1_if_init(node_type == ngran_gNB_CUUP || node_type == ngran_gNB_CUCP);
   init_nr_pdcp_data_ind_queue();
   nr_pdcp_init_timer_thread(nr_pdcp_ue_manager);
-  if (NODE_IS_CU(node_type)) {
-    nr_pdcp_init_tick_thread();
-  }
 }
 
 #include "nfapi/oai_integration/vendor_ext.h"
@@ -1052,17 +1044,6 @@ bool cu_f1u_data_req(protocol_ctxt_t  *ctxt_pP,
   return ret;
 }
 
-void nr_pdcp_tick(int frame, int subframe)
-{
-  if (frame != nr_pdcp_current_time_last_frame ||
-      subframe != nr_pdcp_current_time_last_subframe) {
-    nr_pdcp_current_time_last_frame = frame;
-    nr_pdcp_current_time_last_subframe = subframe;
-    nr_pdcp_current_time++;
-    nr_pdcp_wakeup_timer_thread(nr_pdcp_current_time);
-  }
-}
-
 /*
  * For the SDAP API
  */

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.h

@@ -127,8 +127,6 @@ bool nr_pdcp_data_req_drb(protocol_ctxt_t *ctxt_pP,
                           const uint32_t *const sourceL2Id,
                           const uint32_t *const destinationL2Id);
 
-void nr_pdcp_tick(int frame, int subframe);
-
 nr_pdcp_ue_manager_t *nr_pdcp_sdap_get_ue_manager();
 
 int nr_pdcp_get_num_ues(ue_id_t *ue_list, int len);

openair2/LAYER2/nr_pdcp/nr_pdcp_timer_thread.c

@@ -70,26 +70,6 @@ static void *nr_pdcp_timer_thread(void *_nr_pdcp_ue_manager)
   return NULL;
 }
 
-static void *nr_pdcp_tick_thread() {
-  pthread_setname_np(pthread_self(),"nr_pdcp_tick_thread");
-  uint64_t curr_time = 0;
-  while (1) {
-    usleep(1000);
-    curr_time++;
-    nr_pdcp_wakeup_timer_thread(curr_time);
-  }
-  return NULL;
-}
-
-void nr_pdcp_init_tick_thread() 
-{
-  pthread_t t;
-  if (pthread_create(&t, NULL, nr_pdcp_tick_thread, NULL) != 0) {
-    LOG_E(PDCP, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
-    exit(1);
-  }
-}
-
 void nr_pdcp_init_timer_thread(nr_pdcp_ue_manager_t *nr_pdcp_ue_manager)
 {
   pthread_t t;
@@ -100,10 +80,10 @@ void nr_pdcp_init_timer_thread(nr_pdcp_ue_manager_t *nr_pdcp_ue_manager)
   }
 }
 
-void nr_pdcp_wakeup_timer_thread(uint64_t time)
+void nr_pdcp_ms_tick(void)
 {
   if (pthread_mutex_lock(&timer_thread_mutex)) abort();
-  timer_thread_curtime = time;
+  timer_thread_curtime++;
   if (pthread_cond_broadcast(&timer_thread_cond)) abort();
   if (pthread_mutex_unlock(&timer_thread_mutex)) abort();
 }

openair2/LAYER2/nr_pdcp/nr_pdcp_timer_thread.h

@@ -26,8 +26,7 @@
 
 #include <stdint.h>
 
-void nr_pdcp_init_tick_thread();
 void nr_pdcp_init_timer_thread(nr_pdcp_ue_manager_t *nr_pdcp_ue_manager);
-void nr_pdcp_wakeup_timer_thread(uint64_t time);
+void nr_pdcp_ms_tick(void);
 
 #endif /* _NR_PDCP_TIMER_THREAD_H_ */

openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c

@@ -50,8 +50,6 @@ static nr_rlc_ue_manager_t *nr_rlc_ue_manager;
 /* TODO: handle time a bit more properly */
 static pthread_mutex_t nr_rlc_current_time_mutex = PTHREAD_MUTEX_INITIALIZER;
 static uint64_t nr_rlc_current_time;
-static int      nr_rlc_current_time_last_frame;
-static int      nr_rlc_current_time_last_subframe;
 
 void lock_nr_rlc_current_time(void)
 {
@@ -956,15 +954,10 @@ void nr_rlc_test_trigger_reestablishment(int ue_id)
   nr_rlc_manager_unlock(nr_rlc_ue_manager);
 }
 
-void nr_rlc_tick(int frame, int subframe)
+void nr_rlc_ms_tick(void)
 {
   lock_nr_rlc_current_time();
-  if (frame != nr_rlc_current_time_last_frame ||
-      subframe != nr_rlc_current_time_last_subframe) {
-    nr_rlc_current_time_last_frame = frame;
-    nr_rlc_current_time_last_subframe = subframe;
-    nr_rlc_current_time++;
-  }
+  nr_rlc_current_time++;
   unlock_nr_rlc_current_time();
 }
 

openair2/X2AP/x2ap_eNB.c

@@ -756,7 +756,7 @@ mutex_error:
   exit(1);
 }
 
-void x2ap_trigger(void)
+void x2ap_ms_tick(void)
 {
   MessageDef *msg = itti_alloc_new_message(TASK_X2AP, 0, X2AP_SUBFRAME_PROCESS);
   itti_send_msg_to_task(TASK_X2AP, 0, msg);

openair2/X2AP/x2ap_eNB.h

@@ -47,7 +47,6 @@ int x2ap_eNB_init_sctp (x2ap_eNB_instance_t *instance_p,
 void *x2ap_task(void *arg);
 
 int is_x2ap_enabled(void);
-void x2ap_trigger(void);
 
 #endif /* X2AP_H_ */
 

openair2/X2AP/x2ap_timers.c

@@ -52,7 +52,8 @@ void x2ap_check_timers(instance_t instance)
   int                          x2_ongoing;
 
   instance_p = x2ap_eNB_get_instance(instance);
-  DevAssert(instance_p != NULL);
+  if (instance_p == NULL)
+    return;
 
   t = &instance_p->timers;
   m = &instance_p->id_manager;