From 42969ad992a570121ddb7a27ea5d867e5dd56cf2 Mon Sep 17 00:00:00 2001 From: Francisco Paisana Date: Tue, 16 Jun 2020 18:06:35 +0100 Subject: [PATCH] add tb size as argument to gnb --- lib/include/srslte/interfaces/enb_interfaces.h | 1 + lib/src/upper/rlc_um_nr.cc | 6 ++---- srsenb/src/main.cc | 1 + srsenb/src/stack/gnb_stack_nr.cc | 3 +++ srsenb/src/stack/upper/pdcp_nr.cc | 3 +++ srsenb/src/stack/upper/rlc_nr.cc | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/include/srslte/interfaces/enb_interfaces.h b/lib/include/srslte/interfaces/enb_interfaces.h index 7820311bc..5dcf0271c 100644 --- a/lib/include/srslte/interfaces/enb_interfaces.h +++ b/lib/include/srslte/interfaces/enb_interfaces.h @@ -545,6 +545,7 @@ typedef struct { uint32_t nof_prb; ///< Needed to dimension MAC softbuffers for all cells sched_interface::sched_args_t sched; int link_failure_nof_err; + int nr_tb_size = -1; } mac_args_t; class stack_interface_s1ap_lte diff --git a/lib/src/upper/rlc_um_nr.cc b/lib/src/upper/rlc_um_nr.cc index f49f1f9bd..b1d12fe14 100644 --- a/lib/src/upper/rlc_um_nr.cc +++ b/lib/src/upper/rlc_um_nr.cc @@ -32,8 +32,7 @@ rlc_um_nr::rlc_um_nr(srslte::log_ref log_, srsue::rrc_interface_rlc* rrc_, srslte::timer_handler* timers_) : rlc_um_base(log_, lcid_, pdcp_, rrc_, timers_) -{ -} +{} rlc_um_nr::~rlc_um_nr() { @@ -216,8 +215,7 @@ void rlc_um_nr::rlc_um_nr_tx::debug_state() rlc_um_nr::rlc_um_nr_rx::rlc_um_nr_rx(rlc_um_base* parent_) : rlc_um_base_rx(parent_), reassembly_timer(timers->get_unique_timer()) -{ -} +{} bool rlc_um_nr::rlc_um_nr_rx::configure() { diff --git a/srsenb/src/main.cc b/srsenb/src/main.cc index 7548ce6fd..92e7015e0 100644 --- a/srsenb/src/main.cc +++ b/srsenb/src/main.cc @@ -200,6 +200,7 @@ void parse_args(all_args_t* args, int argc, char* argv[]) // NR section ("enb.stack", bpo::value(&args->stack.type)->default_value("lte"), "Type of the upper stack [lte]") + ("scheduler.tb_len", bpo::value(&args->stack.mac.nr_tb_size)->default_value(1520), "Default TB size") // VNF params ("vnf.type", bpo::value(&args->phy.vnf_args.type)->default_value("gnb"), "VNF instance type [gnb,ue]") diff --git a/srsenb/src/stack/gnb_stack_nr.cc b/srsenb/src/stack/gnb_stack_nr.cc index ec1ebfc70..aa1e79645 100644 --- a/srsenb/src/stack/gnb_stack_nr.cc +++ b/srsenb/src/stack/gnb_stack_nr.cc @@ -78,10 +78,13 @@ int gnb_stack_nr::init(const srsenb::stack_args_t& args_, const rrc_nr_cfg_t& rr mac_args.log_hex_limit = args.log.mac_hex_limit; mac_args.pcap = args.mac_pcap; mac_args.sched = args.mac.sched; + mac_args.tb_size = args.mac.nr_tb_size; mac_args.rnti = args.coreless.rnti; mac_args.drb_lcid = args.coreless.drb_lcid; m_mac->init(mac_args, phy, this, m_rlc.get(), m_rrc.get()); + srslte::logmap::get("RLC")->set_level(args.log.rlc_level); + srslte::logmap::get("RLC")->set_hex_limit(args.log.rlc_hex_limit); m_rlc->init(m_pdcp.get(), m_rrc.get(), m_mac.get(), &timers); pdcp_nr_args_t pdcp_args = {}; diff --git a/srsenb/src/stack/upper/pdcp_nr.cc b/srsenb/src/stack/upper/pdcp_nr.cc index 3846691ef..93851f486 100644 --- a/srsenb/src/stack/upper/pdcp_nr.cc +++ b/srsenb/src/stack/upper/pdcp_nr.cc @@ -39,6 +39,9 @@ void pdcp_nr::init(const pdcp_nr_args_t& args_, m_rlc = rlc_; m_rrc = rrc_; m_sdap = sdap_; + + m_log->set_level(m_args.log_level); + m_log->set_hex_limit(m_args.log_hex_limit); } void pdcp_nr::stop() diff --git a/srsenb/src/stack/upper/rlc_nr.cc b/srsenb/src/stack/upper/rlc_nr.cc index f8c1b77bf..9498e4a02 100644 --- a/srsenb/src/stack/upper/rlc_nr.cc +++ b/srsenb/src/stack/upper/rlc_nr.cc @@ -53,7 +53,7 @@ void rlc_nr::add_user(uint16_t rnti) user_itf.m_pdcp = m_pdcp; user_itf.m_rrc = m_rrc; user_itf.parent = this; - user_itf.m_rlc.reset(new srslte::rlc("RLC")); + user_itf.m_rlc.reset(new srslte::rlc(m_log->get_service_name().c_str())); users[rnti] = std::move(user_itf); users[rnti].m_rlc->init(&users[rnti], &users[rnti], timers, (int)srslte::rb_id_nr_t::NR_SRB0); }