mirror of https://github.com/PentHertz/srsLTE.git
lib,rlc_am_nr: fix wrong full sdu queue check
This commit is contained in:
parent
9dbb7acffa
commit
ee06a8893b
|
@ -134,13 +134,13 @@ public:
|
||||||
virtual void get_buffer_state(uint32_t& tx_queue, uint32_t& prio_tx_queue) = 0;
|
virtual void get_buffer_state(uint32_t& tx_queue, uint32_t& prio_tx_queue) = 0;
|
||||||
virtual void reestablish() = 0;
|
virtual void reestablish() = 0;
|
||||||
virtual void empty_queue() = 0;
|
virtual void empty_queue() = 0;
|
||||||
virtual bool sdu_queue_is_full() = 0;
|
|
||||||
virtual bool has_data() = 0;
|
virtual bool has_data() = 0;
|
||||||
virtual void stop() = 0;
|
virtual void stop() = 0;
|
||||||
|
|
||||||
void set_bsr_callback(bsr_callback_t callback);
|
void set_bsr_callback(bsr_callback_t callback);
|
||||||
|
|
||||||
int write_sdu(unique_byte_buffer_t sdu);
|
int write_sdu(unique_byte_buffer_t sdu);
|
||||||
|
bool sdu_queue_is_full();
|
||||||
virtual void discard_sdu(uint32_t pdcp_sn);
|
virtual void discard_sdu(uint32_t pdcp_sn);
|
||||||
virtual uint32_t read_pdu(uint8_t* payload, uint32_t nof_bytes) = 0;
|
virtual uint32_t read_pdu(uint8_t* payload, uint32_t nof_bytes) = 0;
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,6 @@ public:
|
||||||
void stop();
|
void stop();
|
||||||
|
|
||||||
uint32_t read_pdu(uint8_t* payload, uint32_t nof_bytes);
|
uint32_t read_pdu(uint8_t* payload, uint32_t nof_bytes);
|
||||||
bool sdu_queue_is_full();
|
|
||||||
|
|
||||||
bool has_data();
|
bool has_data();
|
||||||
uint32_t get_buffer_state();
|
uint32_t get_buffer_state();
|
||||||
|
|
|
@ -96,7 +96,6 @@ public:
|
||||||
uint32_t read_pdu(uint8_t* payload, uint32_t nof_bytes) final;
|
uint32_t read_pdu(uint8_t* payload, uint32_t nof_bytes) final;
|
||||||
void handle_control_pdu(uint8_t* payload, uint32_t nof_bytes) final;
|
void handle_control_pdu(uint8_t* payload, uint32_t nof_bytes) final;
|
||||||
|
|
||||||
bool sdu_queue_is_full() final;
|
|
||||||
void reestablish() final;
|
void reestablish() final;
|
||||||
void stop() final;
|
void stop() final;
|
||||||
|
|
||||||
|
|
|
@ -272,6 +272,11 @@ void rlc_am::rlc_am_base_tx::discard_sdu(uint32_t discard_sn)
|
||||||
RlcInfo("%s PDU with PDCP_SN=%d", discarded ? "Discarding" : "Couldn't discard", discard_sn);
|
RlcInfo("%s PDU with PDCP_SN=%d", discarded ? "Discarding" : "Couldn't discard", discard_sn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool rlc_am::rlc_am_base_tx::sdu_queue_is_full()
|
||||||
|
{
|
||||||
|
return tx_sdu_queue.is_full();
|
||||||
|
}
|
||||||
|
|
||||||
void rlc_am::rlc_am_base_tx::set_bsr_callback(bsr_callback_t callback)
|
void rlc_am::rlc_am_base_tx::set_bsr_callback(bsr_callback_t callback)
|
||||||
{
|
{
|
||||||
bsr_callback = callback;
|
bsr_callback = callback;
|
||||||
|
|
|
@ -268,11 +268,6 @@ void rlc_am_lte_tx::get_buffer_state_nolock(uint32_t& n_bytes_newtx, uint32_t& n
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool rlc_am_lte_tx::sdu_queue_is_full()
|
|
||||||
{
|
|
||||||
return tx_sdu_queue.is_full();
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t rlc_am_lte_tx::read_pdu(uint8_t* payload, uint32_t nof_bytes)
|
uint32_t rlc_am_lte_tx::read_pdu(uint8_t* payload, uint32_t nof_bytes)
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(mutex);
|
std::lock_guard<std::mutex> lock(mutex);
|
||||||
|
|
|
@ -1154,11 +1154,6 @@ void rlc_am_nr_tx::reestablish()
|
||||||
stop();
|
stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool rlc_am_nr_tx::sdu_queue_is_full()
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void rlc_am_nr_tx::empty_queue()
|
void rlc_am_nr_tx::empty_queue()
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(mutex);
|
std::lock_guard<std::mutex> lock(mutex);
|
||||||
|
|
Loading…
Reference in New Issue