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

use of mutexed cache to store the valid lcids that can be checked from gw thread

This commit is contained in:
Francisco Paisana 2020-03-23 13:31:33 +00:00 committed by Francisco Paisana
parent a2866f661b
commit f3890b2908
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/include/srslte/upper/pdcp.h
View File

@ -76,6 +76,9 @@ private:
pdcp_map_t pdcp_array, pdcp_array_mrb;
pthread_rwlock_t rwlock;
std::mutex cache_mutex;
std::set<uint32_t> valid_lcids_cached;
bool valid_lcid(uint32_t lcid);
bool valid_mch_lcid(uint32_t lcid);
};

35
lib/src/upper/pdcp.cc
View File

@ -30,6 +30,10 @@ pdcp::pdcp(srslte::timer_handler* timers_, srslte::log* log_) : timers(timers_),
pdcp::~pdcp()
{
{
std::lock_guard<std::mutex> lock(cache_mutex);
valid_lcids_cached.clear();
}
// destroy all remaining entities
pthread_rwlock_wrlock(&rwlock);
for (pdcp_map_t::iterator it = pdcp_array.begin(); it != pdcp_array.end(); ++it) {
@ -75,6 +79,10 @@ void pdcp::reestablish(uint32_t lcid)
void pdcp::reset()
{
{
std::lock_guard<std::mutex> lock(cache_mutex);
valid_lcids_cached.clear();
}
// destroy all bearers
pthread_rwlock_wrlock(&rwlock);
for (pdcp_map_t::iterator it = pdcp_array.begin(); it != pdcp_array.end(); /* post increment in erase */) {
@ -88,15 +96,12 @@ void pdcp::reset()
/*******************************************************************************
RRC/GW interface
*******************************************************************************/
// NOTE: Called from separate thread
bool pdcp::is_lcid_enabled(uint32_t lcid)
{
pthread_rwlock_rdlock(&rwlock);
bool ret = false;
if (valid_lcid(lcid)) {
ret = pdcp_array.at(lcid)->is_active();
}
pthread_rwlock_unlock(&rwlock);
return ret;
std::lock_guard<std::mutex> lock(cache_mutex);
return valid_lcids_cached.count(lcid) > 0;
}
void pdcp::write_sdu(uint32_t lcid, unique_byte_buffer_t sdu, bool blocking)
@ -133,6 +138,10 @@ void pdcp::add_bearer(uint32_t lcid, pdcp_config_t cfg)
lcid,
cfg.bearer_id,
cfg.sn_len);
{
std::lock_guard<std::mutex> lock(cache_mutex);
valid_lcids_cached.insert(lcid);
}
} else {
pdcp_log->warning("Bearer %s already configured. Reconfiguration not supported\n", rrc->get_rb_name(lcid).c_str());
}
@ -163,6 +172,10 @@ unlock_and_exit:
void pdcp::del_bearer(uint32_t lcid)
{
{
std::lock_guard<std::mutex> lock(cache_mutex);
valid_lcids_cached.erase(lcid);
}
pthread_rwlock_wrlock(&rwlock);
if (valid_lcid(lcid)) {
pdcp_map_t::iterator it = pdcp_array.find(lcid);
@ -188,6 +201,11 @@ void pdcp::change_lcid(uint32_t old_lcid, uint32_t new_lcid)
pdcp_log->error("Error inserting PDCP entity into array\n.");
goto exit;
}
{
std::lock_guard<std::mutex> lock(cache_mutex);
valid_lcids_cached.erase(old_lcid);
valid_lcids_cached.insert(new_lcid);
}
// erase from old position
pdcp_array.erase(it);
pdcp_log->warning("Changed LCID of PDCP bearer from %d to %d\n", old_lcid, new_lcid);
@ -285,9 +303,6 @@ void pdcp::write_pdu_mch(uint32_t lcid, unique_byte_buffer_t sdu)
}
}
/*******************************************************************************
Helpers (Lock must be hold when calling those)
*******************************************************************************/
bool pdcp::valid_lcid(uint32_t lcid)
{
if (lcid >= SRSLTE_N_RADIO_BEARERS) {