Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa

openair1/PHY/TOOLS/nr_phy_scope.c

@@ -449,6 +449,7 @@ static OAI_phy_scope_t *create_phy_scope_gnb(void) {
   OAI_phy_scope_t *fdui = calloc(( sizeof *fdui ),1);
   // Define form
   fdui->phy_scope = fl_bgn_form( FL_NO_BOX, 800, 800 );
+  fl_set_form_dblbuffer(fdui->phy_scope, 1);
   // This the whole UI box
   obj = fl_add_box( FL_BORDER_BOX, 0, 0, 800, 800, "" );
   fl_set_object_color( obj, FL_BLACK, FL_WHITE );
@@ -530,7 +531,10 @@ static void *scope_thread_gNB(void *arg) {
   OAI_phy_scope_t  *form_gnb = create_phy_scope_gnb();
 
   while (!oai_exit) {
+    fl_freeze_form(form_gnb->phy_scope);
     phy_scope_gNB(form_gnb, p, nb_ue);
+    fl_unfreeze_form(form_gnb->phy_scope);
+    fl_redraw_form(form_gnb->phy_scope);
     usleep(99*1000);
   }
 
@@ -801,6 +805,7 @@ static OAI_phy_scope_t *create_phy_scope_nrue( int ID ) {
   OAI_phy_scope_t *fdui = calloc(( sizeof *fdui ),1);
   // Define form
   fdui->phy_scope = fl_bgn_form( FL_NO_BOX, 800, 900 );
+  fl_set_form_dblbuffer(fdui->phy_scope, 1);
   // This the whole UI box
   obj = fl_add_box( FL_BORDER_BOX, 0, 0, 800, 900, "" );
   fl_set_object_color( obj, FL_BLACK, FL_BLACK );

openair1/PHY/TOOLS/time_meas.c

@@ -25,20 +25,17 @@
 #include <unistd.h>
 #include <string.h>
 #include "assertions.h"
-#ifndef PHYSIM
-  #include <pthread.h>
-  #include "common/config/config_userapi.h"
-#endif
+#include <pthread.h>
+#include "common/config/config_userapi.h"
+#include <common/utils/threadPool/thread-pool.h>
 // global var for openair performance profiler
 int opp_enabled = 0;
 double cpu_freq_GHz  __attribute__ ((aligned(32)));
 
 double cpu_freq_GHz  __attribute__ ((aligned(32)))=0.0;
-#ifndef PHYSIM
 static uint32_t    max_cpumeasur;
 static time_stats_t  **measur_table;
 notifiedFIFO_t measur_fifo;
-#endif
 double get_cpu_freq_GHz(void)
 {
   if (cpu_freq_GHz <1 ) {
@@ -187,7 +184,6 @@ double get_time_meas_us(time_stats_t *ts)
   return 0;
 }
 
-#ifndef PHYSIM
 /* function for the asynchronous measurment module: cpu stat are sent to a dedicated thread
  * which is in charge of computing the cpu time spent in a given function/algorithm...
  */
@@ -294,4 +290,3 @@ void end_meas(void) {
     msg->msgid = TIMESTAT_MSGID_END ;
     pushNotifiedFIFO(&measur_fifo, nfe);
 }
-#endif

openair1/PHY/TOOLS/time_meas.h

@@ -31,9 +31,7 @@
 #include <pthread.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
-#ifndef PHYSIM
-  #include "common/utils/threadPool/thread-pool.h"
-#endif
+#include "common/utils/threadPool/thread-pool.h"
 // global var to enable openair performance profiler
 extern int opp_enabled;
 extern double cpu_freq_GHz  __attribute__ ((aligned(32)));;
@@ -72,10 +70,8 @@ typedef struct {
   char *meas_name;           /*!< \brief name to use when printing the measure (not used for PHY simulators)*/
   int meas_index;            /*!< \brief index of this measure in the measure array (not used for PHY simulators)*/
   int meas_enabled;         /*!< \brief per measure enablement flag. send_meas tests this flag, unused today in start_meas and stop_meas*/
-#ifndef PHYSIM
   notifiedFIFO_elt_t *tpoolmsg; /*!< \brief message pushed to the cpu measurment queue to report a measure START or STOP */
   time_stats_msg_t *tstatptr;   /*!< \brief pointer to the time_stats_msg_t data in the tpoolmsg, stored here for perf considerations*/
-#endif
 } time_stats_t;
 #define MEASURE_ENABLED(X)       (X->meas_enabled)
 
@@ -165,7 +161,6 @@ static inline void copy_meas(time_stats_t *dst_ts,time_stats_t *src_ts) {
   }
 }
 
-#ifndef PHYSIM
 extern notifiedFIFO_t measur_fifo;
 #define CPUMEASUR_SECTION "cpumeasur"
 
@@ -187,5 +182,4 @@ extern notifiedFIFO_t measur_fifo;
   }
   void end_meas(void);
 
-#endif  //ifndef PHYSIM
 #endif