Merge remote-tracking branch 'origin/split73' into develop_integration_2020_w17

cmake_targets/nas_sim_tools/CMakeLists.txt

@@ -14,6 +14,7 @@ set(CMAKE_C_FLAGS
 
 set(OPENAIR_DIR     $ENV{OPENAIR_DIR})
 set(OPENAIR3_DIR    $ENV{OPENAIR_DIR}/openair3)
+include_directories (${OPENAIR_DIR}/openair2/COMMON)
 
 set(CONF2UEDATA_LIB_SRC
     ${OPENAIR_DIR}/openair3/NAS/TOOLS/conf_emm.c

common/utils/ocp_itti/intertask_interface.h

@@ -288,7 +288,7 @@ void * rrc_enb_process_msg(void*);
   TASK_DEF(TASK_PDCP_ENB, TASK_PRIORITY_MED, 200, NULL, NULL)   \
   TASK_DEF(TASK_DATA_FORWARDING, TASK_PRIORITY_MED, 200, NULL, NULL)   \
   TASK_DEF(TASK_END_MARKER, TASK_PRIORITY_MED, 200, NULL, NULL)   \
-  TASK_DEF(TASK_RRC_ENB,  TASK_PRIORITY_MED,  200, rrc_enb_process_msg,NULL)\
+  TASK_DEF(TASK_RRC_ENB,  TASK_PRIORITY_MED,  200, NULL,NULL)\
   TASK_DEF(TASK_RRC_GNB,  TASK_PRIORITY_MED,  200, NULL,NULL)\
   TASK_DEF(TASK_RAL_ENB,  TASK_PRIORITY_MED,  200, NULL, NULL)  \
   TASK_DEF(TASK_S1AP,     TASK_PRIORITY_MED,  200, NULL, NULL)  \

openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c

@@ -780,7 +780,6 @@ void ulsch_channel_compensation(int32_t **rxdataF_ext,
 #endif
 
     for (rb=0; rb<nb_rb; rb++) {
-      LOG_D(PHY,"comp: symbol %d rb %d\n",symbol,rb);
       // just compute channel magnitude without scaling, this is done after equalization for SC-FDMA
 #if defined(__x86_64__) || defined(__i386__)
       mmtmpU0 = _mm_madd_epi16(ul_ch128[0],ul_ch128[0]);

openair2/RRC/LTE/rrc_eNB.c

@@ -9095,29 +9095,26 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
   return NULL;
 }
 
-// as there are race conditions, no rrc thread
 //-----------------------------------------------------------------------------
 void *
-rrc_enb_process_msg(
+rrc_enb_task(
   void *args_p
 )
 //-----------------------------------------------------------------------------
 {
+  rrc_enb_init();
 
+  itti_mark_task_ready(TASK_RRC_ENB);
+  LOG_I(RRC,"Entering main loop of RRC message task\n");
 
-  //while (1) {
-    //(void) rrc_enb_process_itti_msg(NULL);
-  //}
-
-  //while (1) {
+  while (1) {
     (void) rrc_enb_process_itti_msg(NULL);
 {
   //extern volatile int go_nr;
   void rrc_go_nr(void);
   //if (go_nr) rrc_go_nr();
 }
-  //}
-return NULL;
+  }
   }
 
 /*------------------------------------------------------------------------------*/

targets/COMMON/create_tasks.c

@@ -56,9 +56,9 @@ int create_tasks(uint32_t enb_nb) {
   rc = itti_create_task (TASK_ENB_APP, eNB_app_task, NULL);
   AssertFatal(rc >= 0, "Create task for eNB APP failed\n");
 
-  // No more rrc thread, as many race conditions are hidden behind
-  rrc_enb_init();
-  itti_mark_task_ready(TASK_RRC_ENB);
+  LOG_I(RRC,"Creating RRC eNB Task\n");
+  rc = itti_create_task (TASK_RRC_ENB, rrc_enb_task, NULL);
+  AssertFatal(rc >= 0, "Create task for RRC eNB failed\n");
 
   if (EPC_MODE_ENABLED && ! ( split73==SPLIT73_DU ) ) {
     rc = itti_create_task(TASK_SCTP, sctp_eNB_task, NULL);

targets/RT/USER/lte-softmodem.c

@@ -446,9 +446,12 @@ int restart_L1L2(module_id_t enb_id) {
   init_UE_info(&RC.mac[enb_id]->UE_info);
   LOG_I(ENB_APP, "attempting to create ITTI tasks\n");
 
-  // No more rrc thread, as many race conditions are hidden behind
-  rrc_enb_init();
-  itti_mark_task_ready(TASK_RRC_ENB);
+  if (itti_create_task (TASK_RRC_ENB, rrc_enb_task, NULL) < 0) {
+    LOG_E(RRC, "Create task for RRC eNB failed\n");
+    return -1;
+  } else {
+    LOG_I(RRC, "Re-created task for RRC eNB successfully\n");
+  }
 
   /* pass a reconfiguration request which will configure everything down to
    * RC.eNB[i][j]->frame_parms, too */

targets/RT/USER/lte-uesoftmodem.c

@@ -541,12 +541,6 @@ void init_pdcp(void) {
   pdcp_set_pdcp_data_ind_func((pdcp_data_ind_func_t) pdcp_data_ind);
 }
 
-// Stupid function addition because UE itti messages queues definition is common with eNB
-void *rrc_enb_process_msg(void *notUsed) {
-AssertFatal(false,"");
-	return NULL;
-}
-
 int main( int argc, char **argv ) {
   int CC_id;
   uint8_t  abstraction_flag=0;