Moved lib RLC into it's own folder

lib/include/srsran/interfaces/enb_metrics_interface.h

@@ -22,9 +22,9 @@
 #include "srsenb/hdr/stack/s1ap/s1ap_metrics.h"
 #include "srsran/common/metrics_hub.h"
 #include "srsran/radio/radio_metrics.h"
+#include "srsran/rlc/rlc_metrics.h"
 #include "srsran/system/sys_metrics.h"
 #include "srsran/upper/pdcp_metrics.h"
-#include "srsran/upper/rlc_metrics.h"
 #include "srsue/hdr/stack/upper/gw_metrics.h"
 
 namespace srsenb {

lib/include/srsran/rlc/rlc.h

@@ -19,8 +19,8 @@
 #include "srsran/interfaces/ue_pdcp_interfaces.h"
 #include "srsran/interfaces/ue_rlc_interfaces.h"
 #include "srsran/interfaces/ue_rrc_interfaces.h"
-#include "srsran/upper/rlc_common.h"
-#include "srsran/upper/rlc_metrics.h"
+#include "srsran/rlc/rlc_common.h"
+#include "srsran/rlc/rlc_metrics.h"
 
 namespace srsran {
 

lib/include/srsran/rlc/rlc_am_base.h

@@ -15,8 +15,8 @@
 
 #include "srsran/common/buffer_pool.h"
 #include "srsran/common/common.h"
+#include "srsran/rlc/rlc_common.h"
 #include "srsran/upper/byte_buffer_queue.h"
-#include "srsran/upper/rlc_common.h"
 #include <map>
 #include <mutex>
 #include <pthread.h>

lib/include/srsran/rlc/rlc_am_lte.h

@@ -23,9 +23,9 @@
 #include "srsran/common/task_scheduler.h"
 #include "srsran/common/timeout.h"
 #include "srsran/interfaces/pdcp_interface_types.h"
+#include "srsran/rlc/rlc_am_base.h"
+#include "srsran/rlc/rlc_common.h"
 #include "srsran/upper/byte_buffer_queue.h"
-#include "srsran/upper/rlc_am_base.h"
-#include "srsran/upper/rlc_common.h"
 #include <deque>
 #include <list>
 #include <map>

lib/include/srsran/rlc/rlc_am_nr.h

@@ -15,8 +15,8 @@
 
 #include "srsran/common/buffer_pool.h"
 #include "srsran/common/common.h"
+#include "srsran/rlc/rlc_am_base.h"
 #include "srsran/upper/byte_buffer_queue.h"
-#include "srsran/upper/rlc_am_base.h"
 #include <map>
 #include <mutex>
 #include <pthread.h>

lib/include/srsran/rlc/rlc_common.h

@@ -15,8 +15,8 @@
 
 #include "srsran/adt/circular_buffer.h"
 #include "srsran/interfaces/rlc_interface_types.h"
-#include "srsran/upper/bearer_mem_pool.h"
-#include "srsran/upper/rlc_metrics.h"
+#include "srsran/rlc/bearer_mem_pool.h"
+#include "srsran/rlc/rlc_metrics.h"
 #include <stdlib.h>
 
 namespace srsran {

lib/include/srsran/rlc/rlc_tm.h

@@ -15,8 +15,8 @@
 
 #include "srsran/common/buffer_pool.h"
 #include "srsran/common/common.h"
+#include "srsran/rlc/rlc_common.h"
 #include "srsran/upper/byte_buffer_queue.h"
-#include "srsran/upper/rlc_common.h"
 
 namespace srsue {
 

lib/include/srsran/rlc/rlc_um_base.h

@@ -17,8 +17,8 @@
 #include "srsran/common/buffer_pool.h"
 #include "srsran/common/common.h"
 #include "srsran/common/task_scheduler.h"
+#include "srsran/rlc/rlc_common.h"
 #include "srsran/upper/byte_buffer_queue.h"
-#include "srsran/upper/rlc_common.h"
 #include <map>
 #include <mutex>
 #include <pthread.h>

lib/include/srsran/rlc/rlc_um_lte.h

@@ -15,8 +15,8 @@
 
 #include "srsran/common/buffer_pool.h"
 #include "srsran/common/common.h"
+#include "srsran/rlc/rlc_um_base.h"
 #include "srsran/upper/byte_buffer_queue.h"
-#include "srsran/upper/rlc_um_base.h"
 #include <map>
 #include <mutex>
 #include <pthread.h>

lib/include/srsran/rlc/rlc_um_nr.h

@@ -16,8 +16,8 @@
 #include "srsran/common/buffer_pool.h"
 #include "srsran/common/common.h"
 #include "srsran/interfaces/ue_interfaces.h"
+#include "srsran/rlc/rlc_um_base.h"
 #include "srsran/upper/byte_buffer_queue.h"
-#include "srsran/upper/rlc_um_base.h"
 #include <map>
 #include <mutex>
 #include <pthread.h>

lib/src/CMakeLists.txt

@@ -11,6 +11,7 @@ add_subdirectory(common)
 add_subdirectory(mac)
 add_subdirectory(phy)
 add_subdirectory(radio)
+add_subdirectory(rlc)
 add_subdirectory(srslog)
 add_subdirectory(system)
 add_subdirectory(upper)

lib/src/rlc/CMakeLists.txt

@@ -0,0 +1,21 @@
+#
+# Copyright 2013-2021 Software Radio Systems Limited
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the distribution.
+#
+
+set(SOURCES rlc.cc
+            rlc_tm.cc
+            rlc_um_base.cc
+            rlc_um_lte.cc
+            rlc_am_base.cc
+            rlc_am_lte.cc
+            rlc_um_nr.cc
+            rlc_am_nr.cc
+            bearer_mem_pool.cc)
+
+add_library(srsran_rlc STATIC ${SOURCES})
+target_link_libraries(srsran_rlc srsran_common ${ATOMIC_LIBS})
+INSTALL(TARGETS srsran_rlc DESTINATION ${LIBRARY_DIR})

lib/src/rlc/bearer_mem_pool.cc

@@ -10,11 +10,11 @@
  *
  */
 
-#include "srsran/upper/bearer_mem_pool.h"
+#include "srsran/rlc/bearer_mem_pool.h"
 #include "srsran/adt/pool/batch_mem_pool.h"
-#include "srsran/upper/rlc_am_lte.h"
-#include "srsran/upper/rlc_um_lte.h"
-#include "srsran/upper/rlc_um_nr.h"
+#include "srsran/rlc/rlc_am_lte.h"
+#include "srsran/rlc/rlc_um_lte.h"
+#include "srsran/rlc/rlc_um_nr.h"
 
 namespace srsran {
 

lib/src/rlc/rlc.cc

@@ -10,12 +10,12 @@
  *
  */
 
-#include "srsran/upper/rlc.h"
+#include "srsran/rlc/rlc.h"
 #include "srsran/common/rwlock_guard.h"
-#include "srsran/upper/rlc_am_lte.h"
-#include "srsran/upper/rlc_tm.h"
-#include "srsran/upper/rlc_um_lte.h"
-#include "srsran/upper/rlc_um_nr.h"
+#include "srsran/rlc/rlc_am_lte.h"
+#include "srsran/rlc/rlc_tm.h"
+#include "srsran/rlc/rlc_um_lte.h"
+#include "srsran/rlc/rlc_um_nr.h"
 
 namespace srsran {
 

lib/src/rlc/rlc_am_base.cc

@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsran/upper/rlc_am_base.h"
+#include "srsran/rlc/rlc_am_base.h"
 #include <sstream>
 
 namespace srsran {

lib/src/rlc/rlc_am_lte.cc

@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsran/upper/rlc_am_lte.h"
+#include "srsran/rlc/rlc_am_lte.h"
 #include "srsran/common/string_helpers.h"
 #include "srsran/interfaces/ue_pdcp_interfaces.h"
 #include "srsran/interfaces/ue_rrc_interfaces.h"

lib/src/rlc/rlc_am_nr.cc

@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsran/upper/rlc_am_nr.h"
+#include "srsran/rlc/rlc_am_nr.h"
 #include <sstream>
 
 namespace srsran {

lib/src/rlc/rlc_tm.cc

@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsran/upper/rlc_tm.h"
+#include "srsran/rlc/rlc_tm.h"
 #include "srsran/common/common_lte.h"
 #include "srsran/interfaces/ue_pdcp_interfaces.h"
 #include "srsran/interfaces/ue_rrc_interfaces.h"

lib/src/rlc/rlc_um_base.cc

@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsran/upper/rlc_um_base.h"
+#include "srsran/rlc/rlc_um_base.h"
 #include "srsran/interfaces/ue_rrc_interfaces.h"
 #include <sstream>
 

lib/src/rlc/rlc_um_lte.cc

@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsran/upper/rlc_um_lte.h"
+#include "srsran/rlc/rlc_um_lte.h"
 #include "srsran/interfaces/ue_pdcp_interfaces.h"
 #include <sstream>
 

lib/src/rlc/rlc_um_nr.cc

@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsran/upper/rlc_um_nr.h"
+#include "srsran/rlc/rlc_um_nr.h"
 #include "srsran/interfaces/ue_pdcp_interfaces.h"
 #include <sstream>
 

lib/src/upper/CMakeLists.txt

@@ -10,16 +10,7 @@ set(SOURCES gtpu.cc
             pdcp.cc
             pdcp_entity_base.cc
             pdcp_entity_lte.cc
-            rlc.cc
-            rlc_tm.cc
-            rlc_um_base.cc
-            rlc_um_lte.cc
-            rlc_am_base.cc
-            rlc_am_lte.cc
-            pdcp_entity_nr.cc
-            rlc_um_nr.cc
-            rlc_am_nr.cc
-            bearer_mem_pool.cc)
+            pdcp_entity_nr.cc)
 
 add_library(srsran_upper STATIC ${SOURCES})
 target_link_libraries(srsran_upper srsran_common srsran_asn1 ${ATOMIC_LIBS})

lib/test/rlc/CMakeLists.txt

@@ -0,0 +1,64 @@
+#
+# Copyright 2013-2021 Software Radio Systems Limited
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the distribution.
+#
+
+set(CTEST_LABELS "lib;rlc")
+
+add_executable(rlc_am_data_test rlc_am_data_test.cc)
+target_link_libraries(rlc_am_data_test srsran_upper srsran_phy srsran_common)
+add_lte_test(rlc_am_data_test rlc_am_data_test)
+
+add_executable(rlc_am_control_test rlc_am_control_test.cc)
+target_link_libraries(rlc_am_control_test srsran_upper srsran_phy)
+add_lte_test(rlc_am_control_test rlc_am_control_test)
+
+add_executable(rlc_am_test rlc_am_test.cc)
+target_link_libraries(rlc_am_test srsran_upper srsran_phy srsran_common)
+add_lte_test(rlc_am_test rlc_am_test)
+
+add_executable(rlc_am_nr_pdu_test rlc_am_nr_pdu_test.cc)
+target_link_libraries(rlc_am_nr_pdu_test srsran_upper srsran_phy)
+add_nr_test(rlc_am_nr_pdu_test rlc_am_nr_pdu_test)
+
+add_executable(rlc_stress_test rlc_stress_test.cc)
+target_link_libraries(rlc_stress_test srsran_upper srsran_mac srsran_phy srsran_common ${Boost_LIBRARIES} ${ATOMIC_LIBS})
+add_lte_test(rlc_am_stress_test rlc_stress_test --mode=AM --loglevel 1 --sdu_gen_delay 250)
+add_lte_test(rlc_um_stress_test rlc_stress_test --mode=UM --loglevel 1)
+add_lte_test(rlc_tm_stress_test rlc_stress_test --mode=TM --loglevel 1 --random_opp=false)
+
+add_nr_test(rlc_um6_nr_stress_test rlc_stress_test --rat NR --mode=UM6 --loglevel 1)
+add_nr_test(rlc_um12_nr_stress_test rlc_stress_test --rat NR --mode=UM12 --loglevel 1) 
+
+add_executable(rlc_um_data_test rlc_um_data_test.cc)
+target_link_libraries(rlc_um_data_test srsran_upper srsran_phy srsran_common)
+add_test(rlc_um_data_test rlc_um_data_test)
+
+add_executable(rlc_um_test rlc_um_test.cc)
+target_link_libraries(rlc_um_test srsran_upper srsran_phy)
+add_test(rlc_um_test rlc_um_test)
+
+add_executable(rlc_common_test rlc_common_test.cc)
+target_link_libraries(rlc_common_test srsran_upper srsran_phy)
+add_test(rlc_common_test rlc_common_test)
+
+add_executable(rlc_um_nr_pdu_test rlc_um_nr_pdu_test.cc)
+target_link_libraries(rlc_um_nr_pdu_test srsran_upper srsran_mac srsran_phy)
+add_nr_test(rlc_um_nr_pdu_test rlc_um_nr_pdu_test)
+
+add_executable(rlc_um_nr_test rlc_um_nr_test.cc)
+target_link_libraries(rlc_um_nr_test srsran_upper srsran_phy)
+add_nr_test(rlc_um_nr_test rlc_um_nr_test)
+
+########################################################################
+# Option to run command after build (useful for remote builds)
+########################################################################
+if (NOT ${BUILD_CMD} STREQUAL "")
+  message(STATUS "Added custom post-build command: ${BUILD_CMD}")
+  add_custom_command(TARGET ip_test POST_BUILD COMMAND ${BUILD_CMD})
+else(NOT ${BUILD_CMD} STREQUAL "")
+  message(STATUS "No post-build command defined")
+endif (NOT ${BUILD_CMD} STREQUAL "")

lib/test/upper/CMakeLists.txt

@@ -8,51 +8,6 @@
 
 set(CTEST_LABELS "lib;upper")
 
-add_executable(rlc_am_data_test rlc_am_data_test.cc)
-target_link_libraries(rlc_am_data_test srsran_upper srsran_phy srsran_common)
-add_lte_test(rlc_am_data_test rlc_am_data_test)
-
-add_executable(rlc_am_control_test rlc_am_control_test.cc)
-target_link_libraries(rlc_am_control_test srsran_upper srsran_phy)
-add_lte_test(rlc_am_control_test rlc_am_control_test)
-
-add_executable(rlc_am_test rlc_am_test.cc)
-target_link_libraries(rlc_am_test srsran_upper srsran_phy srsran_common)
-add_lte_test(rlc_am_test rlc_am_test)
-
-add_executable(rlc_am_nr_pdu_test rlc_am_nr_pdu_test.cc)
-target_link_libraries(rlc_am_nr_pdu_test srsran_upper srsran_phy)
-add_nr_test(rlc_am_nr_pdu_test rlc_am_nr_pdu_test)
-
-add_executable(rlc_stress_test rlc_stress_test.cc)
-target_link_libraries(rlc_stress_test srsran_upper srsran_mac srsran_phy srsran_common ${Boost_LIBRARIES} ${ATOMIC_LIBS})
-add_lte_test(rlc_am_stress_test rlc_stress_test --mode=AM --loglevel 1 --sdu_gen_delay 250)
-add_lte_test(rlc_um_stress_test rlc_stress_test --mode=UM --loglevel 1)
-add_lte_test(rlc_tm_stress_test rlc_stress_test --mode=TM --loglevel 1 --random_opp=false)
-
-add_nr_test(rlc_um6_nr_stress_test rlc_stress_test --rat NR --mode=UM6 --loglevel 1)
-add_nr_test(rlc_um12_nr_stress_test rlc_stress_test --rat NR --mode=UM12 --loglevel 1) 
-
-add_executable(rlc_um_data_test rlc_um_data_test.cc)
-target_link_libraries(rlc_um_data_test srsran_upper srsran_phy srsran_common)
-add_test(rlc_um_data_test rlc_um_data_test)
-
-add_executable(rlc_um_test rlc_um_test.cc)
-target_link_libraries(rlc_um_test srsran_upper srsran_phy)
-add_test(rlc_um_test rlc_um_test)
-
-add_executable(rlc_common_test rlc_common_test.cc)
-target_link_libraries(rlc_common_test srsran_upper srsran_phy)
-add_test(rlc_common_test rlc_common_test)
-
-add_executable(rlc_um_nr_pdu_test rlc_um_nr_pdu_test.cc)
-target_link_libraries(rlc_um_nr_pdu_test srsran_upper srsran_mac srsran_phy)
-add_nr_test(rlc_um_nr_pdu_test rlc_um_nr_pdu_test)
-
-add_executable(rlc_um_nr_test rlc_um_nr_test.cc)
-target_link_libraries(rlc_um_nr_test srsran_upper srsran_phy)
-add_nr_test(rlc_um_nr_test rlc_um_nr_test)
-
 add_executable(pdcp_nr_test_tx pdcp_nr_test_tx.cc)
 target_link_libraries(pdcp_nr_test_tx srsran_upper srsran_common)
 add_nr_test(pdcp_nr_test_tx pdcp_nr_test_tx)

srsenb/hdr/stack/upper/rlc.h

@@ -14,8 +14,8 @@
 #include "srsran/interfaces/enb_metrics_interface.h"
 #include "srsran/interfaces/enb_rlc_interfaces.h"
 #include "srsran/interfaces/ue_interfaces.h"
+#include "srsran/rlc/rlc.h"
 #include "srsran/srslog/srslog.h"
-#include "srsran/upper/rlc.h"
 #include <map>
 
 #ifndef SRSENB_RLC_H

srsenb/hdr/stack/upper/rlc_nr.h

@@ -14,7 +14,7 @@
 #define SRSENB_RLC_NR_H
 
 #include "srsran/interfaces/gnb_interfaces.h"
-#include "srsran/upper/rlc.h"
+#include "srsran/rlc/rlc.h"
 #include <map>
 
 namespace srsenb {

srsenb/src/CMakeLists.txt

@@ -27,7 +27,7 @@ target_link_libraries(enb_cfg_parser ${LIBCONFIGPP_LIBRARIES})
 add_executable(srsenb main.cc enb.cc metrics_stdout.cc metrics_csv.cc metrics_json.cc)
 
 set(SRSENB_SOURCES srsenb_phy srsenb_stack srsenb_common srsenb_s1ap srsenb_upper srsenb_mac srsenb_rrc srslog system)
-set(SRSRAN_SOURCES srsran_common srsran_mac srsran_phy srsran_upper srsran_radio rrc_asn1 s1ap_asn1 enb_cfg_parser srslog system)
+set(SRSRAN_SOURCES srsran_common srsran_mac srsran_phy srsran_upper srsran_rlc srsran_radio rrc_asn1 s1ap_asn1 enb_cfg_parser srslog system)
 
 set(SRSENB_SOURCES ${SRSENB_SOURCES} srsgnb_phy srsgnb_stack srsgnb_ngap srsgnb_upper srsgnb_mac srsgnb_rrc)
 set(SRSRAN_SOURCES ${SRSRAN_SOURCES} rrc_nr_asn1 ngap_nr_asn1)

srsenb/src/common/rnti_pool.cc

@@ -16,8 +16,8 @@
 #include "srsenb/hdr/stack/rrc/rrc_mobility.h"
 #include "srsenb/hdr/stack/rrc/rrc_ue.h"
 #include "srsran/adt/pool/circular_stack_pool.h"
+#include "srsran/rlc/rlc.h"
 #include "srsran/upper/pdcp.h"
-#include "srsran/upper/rlc.h"
 
 namespace srsenb {
 

srsenb/src/stack/enb_stack_lte.cc

@@ -14,8 +14,8 @@
 #include "srsenb/hdr/common/rnti_pool.h"
 #include "srsenb/hdr/enb.h"
 #include "srsran/interfaces/enb_metrics_interface.h"
+#include "srsran/rlc/bearer_mem_pool.h"
 #include "srsran/srslog/event_trace.h"
-#include "srsran/upper/bearer_mem_pool.h"
 
 using namespace srsran;
 

srsue/hdr/stack/ue_stack_lte.h

@@ -26,8 +26,8 @@
 #include "mac_nr/mac_nr.h"
 #include "rrc/rrc.h"
 #include "srsran/radio/radio.h"
+#include "srsran/rlc/rlc.h"
 #include "srsran/upper/pdcp.h"
-#include "srsran/upper/rlc.h"
 #include "upper/nas.h"
 #include "upper/usim.h"
 

srsue/hdr/stack/ue_stack_nr.h

@@ -21,8 +21,8 @@
 #include "mac_nr/mac_nr.h"
 #include "rrc/rrc_nr.h"
 #include "srsran/radio/radio.h"
+#include "srsran/rlc/rlc.h"
 #include "srsran/upper/pdcp.h"
-#include "srsran/upper/rlc.h"
 #include "upper/nas.h"
 #include "upper/usim.h"
 

srsue/hdr/ue_metrics_interface.h

@@ -18,8 +18,8 @@
 #include "phy/phy_metrics.h"
 #include "srsran/common/metrics_hub.h"
 #include "srsran/radio/radio_metrics.h"
+#include "srsran/rlc/rlc_metrics.h"
 #include "srsran/system/sys_metrics.h"
-#include "srsran/upper/rlc_metrics.h"
 #include "stack/mac/mac_metrics.h"
 #include "stack/rrc/rrc_metrics.h"
 #include "stack/upper/gw_metrics.h"

srsue/src/CMakeLists.txt

@@ -22,7 +22,7 @@ endif (RPATH)
 add_executable(srsue main.cc ue.cc metrics_stdout.cc metrics_csv.cc metrics_json.cc)
 
 set(SRSUE_SOURCES srsue_phy srsue_stack srsue_upper srsue_mac srsue_rrc srslog system)
-set(SRSRAN_SOURCES srsran_common srsran_mac srsran_phy srsran_radio srsran_upper rrc_asn1 srslog system)
+set(SRSRAN_SOURCES srsran_common srsran_mac srsran_phy srsran_radio srsran_upper srsran_rlc rrc_asn1 srslog system)
 
 set(SRSUE_SOURCES ${SRSUE_SOURCES} srsue_nr_stack srsue_rrc_nr srsue_mac_nr)
 set(SRSRAN_SOURCES ${SRSRAN_SOURCES} rrc_nr_asn1 ngap_nr_asn1)

srsue/src/test/ttcn3/hdr/ttcn3_syssim.h

@@ -14,9 +14,9 @@
 #define SRSUE_TTCN3_SYSSIM_H
 
 #include "srsran/mac/pdu_queue.h"
+#include "srsran/rlc/rlc.h"
 #include "srsran/test/ue_test_interfaces.h"
 #include "srsran/upper/pdcp.h"
-#include "srsran/upper/rlc.h"
 #include "ttcn3_common.h"
 #include "ttcn3_drb_interface.h"
 #include "ttcn3_ip_ctrl_interface.h"

srsue/src/test/ttcn3/src/CMakeLists.txt

@@ -14,6 +14,7 @@ set(LINK_LIBRARIES srsue_stack
                     srsue_rrc
                     srsue_rrc_nr
                     srsran_upper
+                    srsran_rlc
                     srsran_common
                     srsran_mac
                     srsran_phy

srsue/src/test/ttcn3/src/ttcn3_syssim.cc

@@ -13,10 +13,10 @@
 #include "ttcn3_syssim.h"
 #include "dut_utils.h"
 #include "srsran/mac/pdu_queue.h"
+#include "srsran/rlc/rlc.h"
 #include "srsran/srslog/srslog.h"
 #include "srsran/test/ue_test_interfaces.h"
 #include "srsran/upper/pdcp.h"
-#include "srsran/upper/rlc.h"
 #include "swappable_sink.h"
 #include "ttcn3_common.h"
 #include "ttcn3_drb_interface.h"