Commit 0c1865c1 authored by Raymond Knopp's avatar Raymond Knopp

simplified pdcp_benchmark rule for building standalone. Will later also serve...

simplified pdcp_benchmark rule for building standalone. Will later also serve for isolated CU-U implementation. minor compilation issue remaining
parent 824731ac
...@@ -1697,8 +1697,7 @@ set(NR_RLC_SRC ...@@ -1697,8 +1697,7 @@ set(NR_RLC_SRC
${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_ue_manager.c ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_ue_manager.c
) )
set(L2_SRC set(PDCP_SRC
${OPENAIR2_DIR}/LAYER2/openair2_proc.c
${PDCP_DIR}/pdcp.c ${PDCP_DIR}/pdcp.c
${PDCP_DIR}/pdcp_fifo.c ${PDCP_DIR}/pdcp_fifo.c
${PDCP_DIR}/pdcp_sequence_manager.c ${PDCP_DIR}/pdcp_sequence_manager.c
...@@ -1706,6 +1705,11 @@ set(L2_SRC ...@@ -1706,6 +1705,11 @@ set(L2_SRC
${PDCP_DIR}/pdcp_util.c ${PDCP_DIR}/pdcp_util.c
${PDCP_DIR}/pdcp_security.c ${PDCP_DIR}/pdcp_security.c
${PDCP_DIR}/pdcp_netlink.c ${PDCP_DIR}/pdcp_netlink.c
)
set(L2_SRC
${OPENAIR2_DIR}/LAYER2/openair2_proc.c
${PDCP_SRC}
# ${RRC_DIR}/rrc_UE.c # ${RRC_DIR}/rrc_UE.c
${RRC_DIR}/rrc_eNB.c ${RRC_DIR}/rrc_eNB.c
${RRC_DIR}/rrc_eNB_endc.c ${RRC_DIR}/rrc_eNB_endc.c
...@@ -2599,18 +2603,30 @@ target_link_libraries(du_test ...@@ -2599,18 +2603,30 @@ target_link_libraries(du_test
add_executable(pdcp_benchmark add_executable(pdcp_benchmark
${PDCP_DIR}/BENCHMARK/pdcp_benchmark.c ${PDCP_DIR}/BENCHMARK/pdcp_benchmark.c
${PDCP_SRC}
${OPENAIR2_DIR}/RRC/NAS/nas_config.c
${OPENAIR2_DIR}/RRC/NAS/rb_config.c
${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/socket.c
${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
${OPENAIR_DIR}/common/utils/utils.c
${OPENAIR_DIR}/common/utils/system.c ${OPENAIR_DIR}/common/utils/system.c
${CONFIG_SOURCES}
${T_SOURCE} ${T_SOURCE}
) )
target_link_libraries (pdcp_benchmark target_link_libraries (pdcp_benchmark
-Wl,--start-group -Wl,--start-group
RRC_LIB NR_RRC_LIB CONFIG_LIB S1AP_LIB S1AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB X2AP_LIB X2AP_ENB M3AP_LIB M3AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP UDP SCHED_LIB SCHED_RU_LIB RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB X2AP_LIB X2AP_ENB M3AP_LIB M3AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP UDP
PHY_COMMON PHY PHY_RU LFDS L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB LFDS7 LFDS LFDS7
${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${FSPT_MSG_LIB} ${PROTO_AGENT_LIB} ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${FSPT_MSG_LIB} ${PROTO_AGENT_LIB}
-Wl,--end-group z dl) -Wl,--end-group z dl)
target_link_libraries (pdcp_benchmark ${LIBXML2_LIBRARIES})
target_link_libraries (pdcp_benchmark pthread m ${CONFIG_LIB} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
target_link_libraries (pdcp_benchmark ${LIB_LMS_LIBRARIES})
target_link_libraries (pdcp_benchmark ${T_LIB})
target_link_libraries (pdcp_benchmark ${LIBXML2_LIBRARIES} ${CONFIG_LIB} pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${LIB_LMS_LIBRARIES} ${T_LIB})
# lte-uesoftmodem is UE implementation # lte-uesoftmodem is UE implementation
......
...@@ -29,20 +29,52 @@ ...@@ -29,20 +29,52 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "openair2/COMMON/platform_types.h"
#include "common/config/config_load_configmodule.h"
#include "common/utils/LOG/log.h"
#include "openair2/UTIL/MEM/mem_block.h" #include "openair2/UTIL/MEM/mem_block.h"
#include "openair2/LAYER2/RLC/rlc.h"
#include "openair2/LAYER2/PDCP_v10.1.0/pdcp.h" #include "openair2/LAYER2/PDCP_v10.1.0/pdcp.h"
#include "openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.h" #include "openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.h"
#include "openair2/UTIL/OSA/osa_defs.h" #include "openair2/UTIL/OSA/osa_defs.h"
#include "common/config/config_load_configmodule.h"
#include "common/utils/LOG/log.h"
#include "SIMULATION/TOOLS/sim.h"
#include "UTIL/LISTS/list.h"
#include "OCG_vars.h"
#include "common/config/config_userapi.h" #include "common/config/config_userapi.h"
#include "LTE_RLC-Config.h"
#include "LTE_DRB-ToAddMod.h"
#include "LTE_DRB-ToAddModList.h"
#include "LTE_SRB-ToAddMod.h"
#include "LTE_SRB-ToAddModList.h"
#include "LTE_DL-UM-RLC.h"
#include "LTE_PMCH-InfoList-r9.h"
#define DUMMY_BUFFER ((unsigned char*)"123456789") #define DUMMY_BUFFER ((unsigned char*)"123456789")
#define DUMMY_BUFFER_SIZE 10 #define DUMMY_BUFFER_SIZE 10
uint64_t get_softmodem_optmask(void) {return 0;}
nfapi_mode_t nfapi_getmode(void) {return 0;}
softmodem_params_t *get_softmodem_params(void) {return NULL;}
rlc_op_status_t rrc_rlc_config_req(const protocol_ctxt_t *const ctxt_pP,
const LTE_SRB_ToAddModList_t *const srb2add_listP,
const LTE_DRB_ToAddModList_t *const drb2add_listP,
const LTE_DRB_ToReleaseList_t *const drb2release_listP,
const LTE_PMCH_InfoList_r9_t *const pmch_InfoList_r9_pP,
const uint32_t sourceL2Id,
const uint32_t destinationL2Id
) {return 0;}
int mbms_rab_id = 2047;
int otg_enabled=0;
int opp_enabled=0;
pdcp_t pdcp_el; pdcp_t pdcp_el;
list_t pdu_tx_list; list_t pdu_tx_list;
//Not sure at all about that, but I didn't knew which library I should include and I try with that. //Not sure at all about that, but I didn't knew which library I should include and I try with that.
...@@ -52,7 +84,8 @@ volatile int oai_exit=0; ...@@ -52,7 +84,8 @@ volatile int oai_exit=0;
void exit_function(const char *file, const char *function, const int line, const char *s) { void exit_function(const char *file, const char *function, const int line, const char *s) {
} }
#include "common/ran_context.h"
RAN_CONTEXT_t RC;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment