PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rlc_am_nr: Change rlc_am_base to use unique_ptr to hold rx/tx entities

This commit is contained in:
Pedro Alvarez 2021-11-10 15:25:10 +00:00
parent 779eda98bd
commit aef87d5366
4 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/include/srsran/rlc/rlc_am_base.h
View File

@ -53,9 +53,9 @@ public:
srsue::pdcp_interface_rlc* pdcp_,
srsue::rrc_interface_rlc* rrc_,
srsran::timer_handler* timers_,
rlc_am_base_tx* tx_,
rlc_am_base_rx* rx_) :
logger(logger), rrc(rrc_), pdcp(pdcp_), timers(timers_), lcid(lcid_), tx_base(tx_), rx_base(rx_)
rlc_am_base_tx* tx_base_,
rlc_am_base_rx* rx_base_) :
logger(logger), rrc(rrc_), pdcp(pdcp_), timers(timers_), lcid(lcid_), tx_base(tx_base_), rx_base(rx_base_)
{}
bool configure(const rlc_config_t& cfg_) final;
@ -181,8 +181,8 @@ protected:
rlc_am_base* parent = nullptr;
};
rlc_am_base_tx* tx_base = nullptr;
rlc_am_base_rx* rx_base = nullptr;
std::unique_ptr<rlc_am_base_tx> tx_base = {};
std::unique_ptr<rlc_am_base_rx> rx_base = {};
};
} // namespace srsran

9
lib/include/srsran/rlc/rlc_am_lte.h
View File

@ -94,6 +94,9 @@ public:
srsue::rrc_interface_rlc* rrc_,
srsran::timer_handler* timers_);
class rlc_am_lte_tx;
class rlc_am_lte_rx;
/******************************
* RLC AM LTE TX entity
*****************************/
@ -144,6 +147,7 @@ public:
void get_buffer_state_nolock(uint32_t& new_tx, uint32_t& prio_tx);
rlc_am_lte* parent = nullptr;
rlc_am_lte_rx* rx = nullptr;
byte_buffer_pool* pool = nullptr;
rlc_am_pdu_segment_pool<rlc_amd_pdu_header_t> segment_pool;
@ -233,6 +237,7 @@ public:
void reset_status();
rlc_am_lte* parent = nullptr;
rlc_am_lte_tx* tx = nullptr;
byte_buffer_pool* pool = nullptr;
/****************************************************************************
@ -275,10 +280,6 @@ public:
srsran::rolling_average<double> sdu_rx_latency_ms;
};
private:
rlc_am_lte_tx* tx = nullptr;
rlc_am_lte_rx* rx = nullptr;
};
} // namespace srsran

22
lib/src/rlc/rlc_am_lte.cc
View File

@ -37,18 +37,20 @@ rlc_am_lte::rlc_am_lte(srslog::basic_logger& logger,
srsue::pdcp_interface_rlc* pdcp_,
srsue::rrc_interface_rlc* rrc_,
srsran::timer_handler* timers_) :
rlc_am_base(logger, lcid_, pdcp_, rrc_, timers_, nullptr, nullptr)
{
tx = new rlc_am_lte::rlc_am_lte_tx(this);
rx = new rlc_am_lte::rlc_am_lte_rx(this);
tx_base = tx;
rx_base = rx;
}
rlc_am_base(logger,
lcid_,
pdcp_,
rrc_,
timers_,
new rlc_am_lte::rlc_am_lte_tx(this),
new rlc_am_lte::rlc_am_lte_rx(this))
{}
/****************************************************************************
* Tx subclass implementation
***************************************************************************/
rlc_am_lte::rlc_am_lte_tx::rlc_am_lte_tx(rlc_am_lte* parent_) :
parent(parent_),
rx(dynamic_cast<rlc_am_lte_rx*>(parent->rx_base.get())),
pool(byte_buffer_pool::get_instance()),
poll_retx_timer(parent_->timers->get_unique_timer()),
status_prohibit_timer(parent_->timers->get_unique_timer()),
@ -160,7 +162,7 @@ void rlc_am_lte::rlc_am_lte_tx::reestablish()
bool rlc_am_lte::rlc_am_lte_tx::do_status()
{
return parent->rx->get_do_status();
return rx->get_do_status();
}
// Function is supposed to return as fast as possible
@ -225,7 +227,7 @@ void rlc_am_lte::rlc_am_lte_tx::get_buffer_state_nolock(uint32_t& n_bytes_newtx,
// Bytes needed for status report
if (do_status() && not status_prohibit_timer.is_running()) {
n_bytes_prio += parent->rx->get_status_pdu_length();
n_bytes_prio += rx->get_status_pdu_length();
logger->debug("%s Buffer state - total status report: %d bytes", RB_NAME, n_bytes_prio);
}
@ -437,7 +439,7 @@ bool rlc_am_lte::rlc_am_lte_tx::poll_required()
int rlc_am_lte::rlc_am_lte_tx::build_status_pdu(uint8_t* payload, uint32_t nof_bytes)
{
logger->debug("%s Generating status PDU. Nof bytes %d", RB_NAME, nof_bytes);
int pdu_len = parent->rx->get_status_pdu(&tx_status, nof_bytes);
int pdu_len = rx->get_status_pdu(&tx_status, nof_bytes);
if (pdu_len == SRSRAN_ERROR) {
logger->debug("%s Deferred Status PDU. Cause: Failed to acquire Rx lock", RB_NAME);
pdu_len = 0;

9
lib/src/rlc/rlc_am_nr.cc
View File

@ -27,13 +27,8 @@ rlc_am_nr::rlc_am_nr(srslog::basic_logger& logger,
srsue::pdcp_interface_rlc* pdcp_,
srsue::rrc_interface_rlc* rrc_,
srsran::timer_handler* timers_) :
rlc_am_base(logger, lcid_, pdcp_, rrc_, timers_, nullptr, nullptr)
{
tx = new rlc_am_nr::rlc_am_nr_tx(this);
rx = new rlc_am_nr::rlc_am_nr_rx(this);
tx_base = tx;
rx_base = rx;
}
rlc_am_base(logger, lcid_, pdcp_, rrc_, timers_, new rlc_am_nr::rlc_am_nr_tx(this), new rlc_am_nr::rlc_am_nr_rx(this))
{}
/***************************************************************************
* Tx subclass implementation