Merge branch 'develop-nr' into 'nr_pdsch'

# Conflicts:
#   cmake_targets/CMakeLists.txt

ci-scripts/Jenkinsfile-gitlab

@@ -313,7 +313,7 @@ pipeline {
                 stage ("Test physical simulators") {
                     steps {
                         gitlabCommitStatus(name: "Test phy-sim") {
-                            timeout (time: 30, unit: 'MINUTES') {
+                            timeout (time: 45, unit: 'MINUTES') {
                                 sh "./ci-scripts/runTestOnVM.sh --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
                             }
                         }
@@ -328,12 +328,9 @@ pipeline {
                         }
                     }
                 }
-                stage ("Test on CI bench #1") {
-                    stages {
                 stage ("Test FDD - Band 7 - B210") {
                     steps {
                         script {
-                                    try {
                             if ("MERGE".equals(env.gitlabActionType)) {
                                 gitlabCommitStatus(name: "Test-FDD-Band7") {
                                     build job: 'eNB-CI-FDD-Band7-B210',
@@ -355,9 +352,6 @@ pipeline {
                                        ]
                                 }
                             }
-                                    } catch (Exception e) {
-                                        currentBuild.result = 'FAILURE'
-                                    }
                         }
                     }
                     post {
@@ -382,7 +376,6 @@ pipeline {
                 stage ("Test TDD - Band 40 - B210") {
                     steps {
                         script {
-                                    try {
                             if ("MERGE".equals(env.gitlabActionType)) {
                                 gitlabCommitStatus(name: "Test-TDD-Band40") {
                                     build job: 'eNB-CI-TDD-Band40-B210',
@@ -404,9 +397,6 @@ pipeline {
                                        ]
                                 }
                             }
-                                    } catch (Exception e) {
-                                        currentBuild.result = 'FAILURE'
-                                    }
                         }
                     }
                     post {
@@ -431,7 +421,6 @@ pipeline {
                 stage ("Test IF4p5 - FDD - Band 7 - B210") {
                     steps {
                         script {
-                                    try {
                             if ("MERGE".equals(env.gitlabActionType)) {
                                 gitlabCommitStatus(name: "Test-IF4p5-FDD-Band7") {
                                     build job: 'eNB-CI-IF4p5-FDD-Band7-B210',
@@ -453,9 +442,6 @@ pipeline {
                                        ]
                                 }
                             }
-                                    } catch (Exception e) {
-                                        currentBuild.result = 'FAILURE'
-                                    }
                         }
                     }
                     post {
@@ -480,7 +466,6 @@ pipeline {
                 stage ("Test IF4p5 - TDD - Band 40 - B210") {
                     steps {
                         script {
-                                    try {
                             if ("MERGE".equals(env.gitlabActionType)) {
                                 gitlabCommitStatus(name: "Test-IF4p5-TDD-Band40") {
                                     build job: 'eNB-CI-IF4p5-TDD-Band40-B210',
@@ -502,9 +487,6 @@ pipeline {
                                        ]
                                 }
                             }
-                                    } catch (Exception e) {
-                                        currentBuild.result = 'FAILURE'
-                                    }
                         }
                     }
                     post {
@@ -527,8 +509,6 @@ pipeline {
                     }
                 }
             }
-                }
-            }
             post {
                 always {
                     script {

ci-scripts/Jenkinsfile-tmp-ran

@@ -61,6 +61,7 @@ pipeline {
     options {
         disableConcurrentBuilds()
         ansiColor('xterm')
+        lock (ciSmartPhoneResource)
     }
     // the following parameter options are commented out so it shows the ones
     // that you SHALL have to run the job.
@@ -184,7 +185,6 @@ pipeline {
             steps {
                 script {
                     dir ('ci-scripts') {
-                      lock (ciSmartPhoneResource) {
                         try {
                             echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
                             withCredentials([
@@ -201,7 +201,6 @@ pipeline {
                 }
             }
         }
-        }
         stage ("Terminate") {
             parallel {
                 stage('Terminate UE') {

cmake_targets/CMakeLists.txt

@@ -2556,9 +2556,8 @@ add_executable(nr_dlschsim  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c
     ${CONFIG_SOURCES})
 target_link_libraries(nr_dlschsim  -Wl,--start-group UTIL SIMU PHY PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB ${CONFIG_LIBRARIES} -Wl,--end-group m pthread dl rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES})
 
-add_executable(nr_pbchsim  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c )
-target_link_libraries(nr_pbchsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} dl)
-
+add_executable(nr_pbchsim  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c ${T_SOURCE})
+target_link_libraries(nr_pbchsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
 
 
 foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)

cmake_targets/phy_simulators/CMakeLists.txt

@@ -9,5 +9,5 @@ set(MU_RECIEVER False)
 set(NAS_UE False)
 set(MESSAGE_CHART_GENERATOR False)
 set(RRC_ASN1_VERSION "Rel14")
-set(T_TRACER False)
+set(T_TRACER True)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)

openair1/SIMULATION/LTE_PHY/dlsim.c

@@ -546,7 +546,7 @@ int main(int argc, char **argv)
   int c;
   int k,i,j,aa;
   int re;
-  int loglvl=OAILOG_DEBUG;
+  int loglvl=OAILOG_WARNING;
 
   int s,Kr,Kr_bytes;
 
@@ -1073,12 +1073,8 @@ int main(int argc, char **argv)
   AssertFatal(load_configmodule(argc,argv) != NULL,
 	      "cannot load configuration module, exiting\n");
   logInit();
-  // enable these lines if you need debug info
   set_glog(loglvl);
-  // moreover you need to init itti with the following line
-  // however itti will catch all signals, so ctrl-c won't work anymore
-  // alternatively you can disable ITTI completely in CMakeLists.txt
-  //itti_init(TASK_MAX, THREAD_MAX, MESSAGES_ID_MAX, tasks_info, messages_info, messages_definition_xml, NULL);
+  T_stdout = 1;
 
 
   if (common_flag == 0) {

openair1/SIMULATION/LTE_PHY/ulsim.c

@@ -497,6 +497,8 @@ int main(int argc, char **argv) {
   AssertFatal(load_configmodule(argc,argv) != NULL,
               "cannot load configuration module, exiting\n");
   logInit();
+  set_glog(OAILOG_WARNING);
+  T_stdout = 1;
   // enable these lines if you need debug info
   // however itti will catch all signals, so ctrl-c won't work anymore
   // alternatively you can disable ITTI completely in CMakeLists.txt

openair1/SIMULATION/NR_PHY/pbchsim.c

@@ -131,16 +131,17 @@ int main(int argc, char **argv)
   int ret;
   int run_initial_sync=0;
 
+  int loglvl=OAILOG_WARNING;
+
   cpuf = get_cpu_freq_GHz();
 
   if ( load_configmodule(argc,argv) == 0) {
     exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
   }
 
-  logInit();
   randominit(0);
 
-  while ((c = getopt (argc, argv, "f:hA:pf:g:i:j:n:s:S:t:x:y:z:N:F:GR:dP:I")) != -1) {
+  while ((c = getopt (argc, argv, "f:hA:pf:g:i:j:n:s:S:t:x:y:z:N:F:GR:dP:IL:")) != -1) {
     switch (c) {
     case 'f':
       write_output_file=1;
@@ -296,6 +297,11 @@ int main(int argc, char **argv)
     case 'I':
       run_initial_sync=1;
       break;
+
+    case 'L':
+      loglvl = atoi(optarg);
+      break;
+
     default:
     case 'h':
       printf("%s -h(elp) -p(extended_prefix) -N cell_id -f output_filename -F input_filename -g channel_model -n n_frames -t Delayspread -s snr0 -S snr1 -x transmission_mode -y TXant -z RXant -i Intefrence0 -j Interference1 -A interpolation_file -C(alibration offset dB) -N CellId\n",
@@ -325,6 +331,10 @@ int main(int argc, char **argv)
     }
   }
 
+  logInit();
+  set_glog(loglvl);
+  T_stdout = 1;
+
   if (snr1set==0)
     snr1 = snr0+10;
 

targets/RT/USER/nr-ue.c

@@ -59,8 +59,13 @@
 
 #include "T.h"
 
+#ifdef XFORMS
 #include "PHY/TOOLS/nr_phy_scope.h"
 
+extern char do_forms;
+#endif
+
+
 extern double cpuf;
 //static  nfapi_nr_config_request_t config_t;
 //static  nfapi_nr_config_request_t* config =&config_t;
@@ -589,11 +594,15 @@ static void *UE_thread_synch(void *arg) {
             break;
         }
 
+#ifdef XFORMS
+	if (do_forms) {
 	  extern FD_lte_phy_scope_ue  *form_ue[NUMBER_OF_UE_MAX];
 	  
 	  phy_scope_UE(form_ue[0],
 		       PHY_vars_UE_g[0][0],
 		       0,0,7);
+	}
+#endif
 	
         AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
         // indicate readiness