merge develop

executables/nr-ru.c

@@ -80,7 +80,8 @@ static int DEFBFW[] = {0x00007fff};
 
 extern volatile int oai_exit;
 
-
+extern struct timespec timespec_sub(struct timespec lhs, struct timespec rhs);
+extern struct timespec timespec_add(struct timespec lhs, struct timespec rhs);
 extern void  nr_phy_free_RU(RU_t *);
 extern void  nr_phy_config_request(NR_PHY_Config_t *gNB);
 #include "executables/thread-common.h"
@@ -1323,9 +1324,35 @@ void *ru_thread( void *param ) {
   }
 
   // This is a forever while loop, it loops over subframes which are scheduled by incoming samples from HW devices
+  struct timespec slot_start;
+	clock_gettime(CLOCK_MONOTONIC, &slot_start);
+  
+  struct timespec slot_duration; 
+	slot_duration.tv_sec = 0;
+	//slot_duration.tv_nsec = 0.5e6;
+	slot_duration.tv_nsec = 0.5e6;
+
+  
+
   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);
+      
+      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++;