Merge branch 'episys/master' into episys-merge

Conflicts:
	common/utils/LOG/log.h
	common/utils/ocp_itti/intertask_interface.cpp
	nfapi/oai_integration/nfapi_vnf.c
	nfapi/open-nFAPI/nfapi/src/nfapi.c
	openair2/LAYER2/MAC/main_ue.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/PHY_INTERFACE/phy_stub_UE.c
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	openair3/NAS/UE/ESM/esm_ebr_context.c
	targets/COMMON/openairinterface5g_limits.h
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c

cmake_targets/.gitignore

@@ -0,0 +1,5 @@
+/.ue.nvram0
+/.ue_emm.nvram0
+/.usim.nvram0
+/nvram
+/usim

cmake_targets/CMakeLists.txt

@@ -333,6 +333,14 @@ else (CUDA_FOUND)
     )
 endif ()
 
+# Uncomment these lines to enable the address sanitizer
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+
+# Uncomment these lines to enable gprof profiling
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg -DUSING_GPROF")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg -DUSING_GPROF")
+
 add_definitions("-DASN_DISABLE_OER_SUPPORT")
 
 #########################
@@ -2095,6 +2103,7 @@ set (MAC_NR_SRC
 
 set (MAC_SRC_UE
   ${PHY_INTERFACE_DIR}/phy_stub_UE.c
+  ${PHY_INTERFACE_DIR}/queue.c
   ${MAC_DIR}/main_ue.c
   ${MAC_DIR}/ue_procedures.c
   ${MAC_DIR}/ra_procedures.c

cmake_targets/gdb-helper

@@ -0,0 +1,13 @@
+#!/bin/bash
+cd "$(dirname "$0")/.." || exit
+source oaienv
+cd cmake_targets || exit
+
+cmd=(
+    ./ran_build/build/lte-softmodem
+    -O ../ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf
+    --noS1
+    "$@"
+)
+
+exec sudo -E gdb "$@" --args "${cmd[@]}"

cmake_targets/gdb.txt

@@ -0,0 +1,83 @@
+-------------------------------------------------------------------------------
+Build.
+
+Make sure you've built with debug info:
+
+  cd ~/openairinterface5g # or wherever
+  source oaienv
+  cd cmake_targets
+  ./build_oai --UE --eNB --verbose-compile --run-with-gdb RelWithDebInfo
+  make -C ran_build/build -j4 lte-softmodem lte-uesoftmodem
+
+-------------------------------------------------------------------------------
+Verify.
+
+Verify the build was done correctly:
+
+$ ./gdb-helper
+...
+Reading symbols from ./ran_build/build/lte-softmodem...done.
+(gdb) b main
+Breakpoint 1 at 0x59f110: file /local/episys/openairinterface5g/targets/RT/USER/lte-softmodem.c, line 516.
+(gdb) run
+Starting program: /local/episys/openairinterface5g/cmake_targets/ran_build/build/lte-softmodem -O ../ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf --noS1
+[Thread debugging using libthread_db enabled]
+Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
+
+Breakpoint 1, main (argc=4, argv=0x7fffffffe058) at /local/episys/openairinterface5g/targets/RT/USER/lte-softmodem.c:516
+516     {
+(gdb) list
+511       pthread_mutex_unlock(&nfapi_sync_mutex);
+512       printf( "NFAPI: got sync (%s)\n", thread_name);
+513     }
+514
+515     int main ( int argc, char **argv )
+516     {
+517       struct sched_param param =
+518       {
+519         .sched_priority = 79
+520       };
+(gdb) n
+521       if (sched_setscheduler( 0, SCHED_RR, &param ) == -1 )
+(gdb) quit
+A debugging session is active.
+
+        Inferior 1 [process 19964] will be killed.
+
+Quit anyway? (y or n) y
+$
+
+If gdb says "no debugging symbols found" then clean your workspace and re-do
+the build as above.
+
+(gdb) b main
+
+-------------------------------------------------------------------------------
+Password-less sudo.
+
+Vscode launches lte-softmodem via sudo.  Make sure sudo does not prompt you
+for a password:
+
+  sudo -n id
+
+If that command fails, do the following:
+
+  echo "$USER ALL=(ALL) NOPASSWD: ALL" | sudo tee -a /etc/sudoers
+
+Then verify:
+
+  sudo -n id
+
+-------------------------------------------------------------------------------
+Vscode.
+
+Launch Vscode:
+
+  cd ~/openairinterface5g # or wherever
+  code . targets/RT/USER/lte-softmodem.c .vscode/launch.json
+
+See launch.json for details about how vscode launches lte-softmodem for debugging.
+
+For example, in lte-softmodem.c, scroll to main() and click the line number to
+the left of main to add a breakpoint.  then do Run => Start debugging (F5) to
+run lte-softmodem in the debugger

cmake_targets/sudo-gdb

@@ -0,0 +1,6 @@
+#!/bin/bash
+# Helper script for Vscode. See .vscode/launch.json "miDebuggerPath"
+cd "$(dirname "$0")/.." || exit
+source oaienv
+cd cmake_targets || exit
+exec sudo -nE gdb "$@"