Moved lib PDCP to its own folder

3 years ago · 865298f8d5
parent 171d5727be
commit 865298f8d5
33 changed files with 57 additions and 42 deletions
--- a/lib/src/CMakeLists.txt
+++ b/lib/src/CMakeLists.txt
@ -12,6 +12,7 @@ add_subdirectory(mac)
 add_subdirectory(phy)
 add_subdirectory(radio)
 add_subdirectory(rlc)
 add_subdirectory(pdcp)
 add_subdirectory(srslog)
 add_subdirectory(system)
 add_subdirectory(upper)
--- a/lib/src/pdcp/CMakeLists.txt
+++ b/lib/src/pdcp/CMakeLists.txt
@ -0,0 +1,16 @@
 #
 # 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 pdcp.cc
            pdcp_entity_base.cc
            pdcp_entity_lte.cc
            pdcp_entity_nr.cc)
 add_library(srsran_pdcp STATIC ${SOURCES})
 target_link_libraries(srsran_pdcp srsran_common srsran_asn1 ${ATOMIC_LIBS})
 INSTALL(TARGETS srsran_pdcp DESTINATION ${LIBRARY_DIR})
--- a/lib/src/upper/pdcp.cc
+++ b/lib/src/upper/pdcp.cc
--- a/lib/src/upper/pdcp_entity_base.cc
+++ b/lib/src/upper/pdcp_entity_base.cc
--- a/lib/src/upper/pdcp_entity_lte.cc
+++ b/lib/src/upper/pdcp_entity_lte.cc
--- a/lib/src/upper/pdcp_entity_nr.cc
+++ b/lib/src/upper/pdcp_entity_nr.cc
--- a/lib/src/upper/CMakeLists.txt
+++ b/lib/src/upper/CMakeLists.txt
@ -6,11 +6,7 @@
 # the distribution.
 #
-set(SOURCES gtpu.cc
+set(SOURCES gtpu.cc)
            pdcp.cc
            pdcp_entity_base.cc
            pdcp_entity_lte.cc
            pdcp_entity_nr.cc)
 add_library(srsran_upper STATIC ${SOURCES})
 target_link_libraries(srsran_upper srsran_common srsran_asn1 ${ATOMIC_LIBS})
--- a/lib/test/CMakeLists.txt
+++ b/lib/test/CMakeLists.txt
@ -11,5 +11,6 @@ add_subdirectory(common)
 add_subdirectory(mac)
 add_subdirectory(phy)
 add_subdirectory(srslog)
-add_subdirectory(upper)
+add_subdirectory(rlc)
 add_subdirectory(pdcp)
 add_subdirectory(adt)
--- a/lib/test/upper/CMakeLists.txt
+++ b/lib/test/upper/CMakeLists.txt
@ -6,30 +6,30 @@
 # the distribution.
 #
-set(CTEST_LABELS "lib;upper")
+set(CTEST_LABELS "lib;pdcp")
 add_executable(pdcp_nr_test_tx pdcp_nr_test_tx.cc)
-target_link_libraries(pdcp_nr_test_tx srsran_upper srsran_common)
+target_link_libraries(pdcp_nr_test_tx srsran_pdcp srsran_common)
 add_nr_test(pdcp_nr_test_tx pdcp_nr_test_tx)
 add_executable(pdcp_nr_test_rx pdcp_nr_test_rx.cc)
-target_link_libraries(pdcp_nr_test_rx srsran_upper srsran_common)
+target_link_libraries(pdcp_nr_test_rx srsran_pdcp srsran_common)
 add_nr_test(pdcp_nr_test_rx pdcp_nr_test_rx)
 add_executable(pdcp_nr_test_discard_sdu pdcp_nr_test_discard_sdu.cc)
-target_link_libraries(pdcp_nr_test_discard_sdu srsran_upper srsran_common ${ATOMIC_LIBS})
+target_link_libraries(pdcp_nr_test_discard_sdu srsran_pdcp srsran_common ${ATOMIC_LIBS})
 add_nr_test(pdcp_nr_test_discard_sdu pdcp_nr_test_discard_sdu)
 add_executable(pdcp_lte_test_rx pdcp_lte_test_rx.cc)
-target_link_libraries(pdcp_lte_test_rx srsran_upper srsran_common)
+target_link_libraries(pdcp_lte_test_rx srsran_pdcp srsran_common)
 add_test(pdcp_lte_test_rx pdcp_lte_test_rx)
 add_executable(pdcp_lte_test_discard_sdu pdcp_lte_test_discard_sdu.cc)
-target_link_libraries(pdcp_lte_test_discard_sdu srsran_upper srsran_common)
+target_link_libraries(pdcp_lte_test_discard_sdu srsran_pdcp srsran_common)
 add_test(pdcp_lte_test_discard_sdu pdcp_lte_test_discard_sdu)
 add_executable(pdcp_lte_test_status_report pdcp_lte_test_status_report.cc)
-target_link_libraries(pdcp_lte_test_status_report srsran_upper srsran_common)
+target_link_libraries(pdcp_lte_test_status_report srsran_pdcp srsran_common)
 add_test(pdcp_lte_test_status_report pdcp_lte_test_status_report)
 ########################################################################
--- a/lib/test/upper/pdcp_base_test.h
+++ b/lib/test/upper/pdcp_base_test.h
--- a/lib/test/upper/pdcp_lte_test.h
+++ b/lib/test/upper/pdcp_lte_test.h
--- a/lib/test/upper/pdcp_lte_test_discard_sdu.cc
+++ b/lib/test/upper/pdcp_lte_test_discard_sdu.cc
--- a/lib/test/upper/pdcp_lte_test_rx.cc
+++ b/lib/test/upper/pdcp_lte_test_rx.cc
--- a/lib/test/upper/pdcp_lte_test_status_report.cc
+++ b/lib/test/upper/pdcp_lte_test_status_report.cc
--- a/lib/test/upper/pdcp_nr_test.h
+++ b/lib/test/upper/pdcp_nr_test.h
--- a/lib/test/upper/pdcp_nr_test_discard_sdu.cc
+++ b/lib/test/upper/pdcp_nr_test_discard_sdu.cc
--- a/lib/test/upper/pdcp_nr_test_rx.cc
+++ b/lib/test/upper/pdcp_nr_test_rx.cc
--- a/lib/test/upper/pdcp_nr_test_tx.cc
+++ b/lib/test/upper/pdcp_nr_test_tx.cc
--- a/lib/test/rlc/CMakeLists.txt
+++ b/lib/test/rlc/CMakeLists.txt
@ -9,23 +9,23 @@
 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)
+target_link_libraries(rlc_am_data_test srsran_rlc 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)
+target_link_libraries(rlc_am_control_test srsran_rlc 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)
+target_link_libraries(rlc_am_test srsran_rlc 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)
+target_link_libraries(rlc_am_nr_pdu_test srsran_rlc 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})
+target_link_libraries(rlc_stress_test srsran_rlc 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)
@ -34,23 +34,23 @@ add_nr_test(rlc_um6_nr_stress_test rlc_stress_test --rat NR --mode=UM6 --logleve
 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)
+target_link_libraries(rlc_um_data_test srsran_rlc 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)
+target_link_libraries(rlc_um_test srsran_rlc 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)
+target_link_libraries(rlc_common_test srsran_rlc 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)
+target_link_libraries(rlc_um_nr_pdu_test srsran_rlc 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)
+target_link_libraries(rlc_um_nr_test srsran_rlc srsran_phy)
 add_nr_test(rlc_um_nr_test rlc_um_nr_test)
 ########################################################################
--- a/lib/test/rlc/rlc_am_control_test.cc
+++ b/lib/test/rlc/rlc_am_control_test.cc
@ -11,7 +11,7 @@
 */
 #include "srsran/common/test_common.h"
-#include "srsran/upper/rlc_am_lte.h"
+#include "srsran/rlc/rlc_am_lte.h"
 #include <iostream>
 // Simple status PDU
--- a/lib/test/rlc/rlc_am_data_test.cc
+++ b/lib/test/rlc/rlc_am_data_test.cc
@ -11,7 +11,7 @@
 */
 #include "srsran/common/test_common.h"
-#include "srsran/upper/rlc_am_lte.h"
+#include "srsran/rlc/rlc_am_lte.h"
 #include <iostream>
 // Fixed header only
--- a/lib/test/rlc/rlc_am_nr_pdu_test.cc
+++ b/lib/test/rlc/rlc_am_nr_pdu_test.cc
@ -11,8 +11,8 @@
 */
 #include "srsran/config.h"
-#include "srsran/upper/rlc.h"
+#include "srsran/rlc/rlc.h"
-#include "srsran/upper/rlc_am_nr.h"
+#include "srsran/rlc/rlc_am_nr.h"
 #include <array>
 #include <iostream>
--- a/lib/test/rlc/rlc_am_test.cc
+++ b/lib/test/rlc/rlc_am_test.cc
@ -16,7 +16,7 @@
 #include "srsran/common/threads.h"
 #include "srsran/interfaces/ue_pdcp_interfaces.h"
 #include "srsran/interfaces/ue_rrc_interfaces.h"
-#include "srsran/upper/rlc_am_lte.h"
+#include "srsran/rlc/rlc_am_lte.h"
 #define NBUFS 5
 #define HAVE_PCAP 0
@ -75,8 +75,8 @@ public:
  const char* get_rb_name(uint32_t lcid) { return ""; }
  std::vector<unique_byte_buffer_t> sdus;
-  rlc_pcap*                         pcap               = nullptr;
+  rlc_pcap*                         pcap                       = nullptr;
-  bool                              max_retx_triggered = false;
+  bool                              max_retx_triggered         = false;
  bool                              protocol_failure_triggered = false;
  std::map<uint32_t, uint32_t> notified_counts; // Map of PDCP SNs to number of notifications
--- a/lib/test/rlc/rlc_common_test.cc
+++ b/lib/test/rlc/rlc_common_test.cc
@ -10,7 +10,7 @@
 *
 */
-#include "srsran/upper/rlc.h"
+#include "srsran/rlc/rlc.h"
 #include <iostream>
 #define TESTASSERT(cond)                                                                                               \
--- a/lib/test/rlc/rlc_stress_test.cc
+++ b/lib/test/rlc/rlc_stress_test.cc
@ -16,7 +16,7 @@
 #include "srsran/common/test_common.h"
 #include "srsran/common/threads.h"
 #include "srsran/common/tsan_options.h"
-#include "srsran/upper/rlc.h"
+#include "srsran/rlc/rlc.h"
 #include <boost/program_options.hpp>
 #include <boost/program_options/parsers.hpp>
 #include <cassert>
--- a/lib/test/rlc/rlc_um_data_test.cc
+++ b/lib/test/rlc/rlc_um_data_test.cc
@ -11,7 +11,7 @@
 */
 #include "srsran/common/test_common.h"
-#include "srsran/upper/rlc_um_lte.h"
+#include "srsran/rlc/rlc_um_lte.h"
 #include <iostream>
 // Fixed header only
--- a/lib/test/rlc/rlc_um_nr_pdu_test.cc
+++ b/lib/test/rlc/rlc_um_nr_pdu_test.cc
@ -11,8 +11,8 @@
 */
 #include "srsran/config.h"
-#include "srsran/upper/rlc.h"
+#include "srsran/rlc/rlc.h"
-#include "srsran/upper/rlc_um_nr.h"
+#include "srsran/rlc/rlc_um_nr.h"
 #include <array>
 #include <iostream>
--- a/lib/test/rlc/rlc_um_nr_test.cc
+++ b/lib/test/rlc/rlc_um_nr_test.cc
@ -13,8 +13,8 @@
 #include "rlc_test_common.h"
 #include "srsran/config.h"
 #include "srsran/interfaces/ue_pdcp_interfaces.h"
-#include "srsran/upper/rlc.h"
+#include "srsran/rlc/rlc.h"
-#include "srsran/upper/rlc_um_nr.h"
+#include "srsran/rlc/rlc_um_nr.h"
 #include <array>
 #include <iostream>
--- a/lib/test/rlc/rlc_um_test.cc
+++ b/lib/test/rlc/rlc_um_test.cc
@ -11,7 +11,7 @@
 */
 #include "rlc_test_common.h"
-#include "srsran/upper/rlc_um_lte.h"
+#include "srsran/rlc/rlc_um_lte.h"
 #include <iostream>
 #define TESTASSERT(cond)                                                                                               \
--- a/srsenb/src/CMakeLists.txt
+++ b/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_rlc 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_pdcp 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)
--- a/srsue/src/CMakeLists.txt
+++ b/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 srsran_rlc rrc_asn1 srslog system)
+set(SRSRAN_SOURCES srsran_common srsran_mac srsran_phy srsran_radio srsran_upper srsran_rlc srsran_pdcp 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)
--- a/srsue/src/stack/rrc/test/CMakeLists.txt
+++ b/srsue/src/stack/rrc/test/CMakeLists.txt
@ -11,7 +11,7 @@ target_link_libraries(rrc_reconfig_test srsue_upper srsran_upper srsran_phy rrc_
 add_test(rrc_reconfig_test rrc_reconfig_test)
 add_executable(rrc_meas_test rrc_meas_test.cc)
-target_link_libraries(rrc_meas_test srsue_rrc srsue_upper srsran_upper srsran_phy rrc_asn1 rrc_nr_asn1)
+target_link_libraries(rrc_meas_test srsue_rrc srsue_upper srsran_upper srsran_pdcp srsran_phy rrc_asn1 rrc_nr_asn1)
 add_test(rrc_meas_test rrc_meas_test)
 add_executable(rrc_phy_ctrl_test rrc_phy_ctrl_test.cc)
@ -33,4 +33,4 @@ if (NOT ${BUILD_CMD} STREQUAL "")
  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 "")
+endif (NOT ${BUILD_CMD} STREQUAL "")
--- a/srsue/src/test/ttcn3/src/CMakeLists.txt
+++ b/srsue/src/test/ttcn3/src/CMakeLists.txt
@ -20,6 +20,7 @@ set(LINK_LIBRARIES srsue_stack
                    srsran_phy
                    srsran_radio
                    srsran_upper
                    srsran_pdcp
                    srsue_phy
                    srsue_mac
                    srsue_mac_nr