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

Fix concurrency issue in set_crnti()

This commit is contained in:
Ismael Gomez 2020-02-06 15:41:50 +01:00 committed by Andre Puschmann
parent 2f3a125757
commit f2851b037e
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
srsue/hdr/phy/phy_common.h
View File

@ -214,6 +214,7 @@ private:
received_ack_t pending_dl_ack[TTIMOD_SZ][SRSLTE_MAX_CARRIERS] = {};
uint32_t pending_dl_dai[TTIMOD_SZ][SRSLTE_MAX_CARRIERS] = {};
std::mutex pending_dl_ack_mutex;
std::mutex pending_dl_grant_mutex;
// Cross-carried grants scheduled from PCell
typedef struct {

2
srsue/src/phy/phy_common.cc
View File

@ -428,6 +428,7 @@ void phy_common::set_dl_pending_grant(uint32_t tti,
uint32_t grant_cc_idx,
const srslte_dci_dl_t* dl_dci)
{
std::lock_guard<std::mutex> lock(pending_dl_grant_mutex);
if (!pending_dl_grant[tti % FDD_HARQ_DELAY_MS][cc_idx].enable) {
pending_dl_grant[tti % FDD_HARQ_DELAY_MS][cc_idx].dl_dci = *dl_dci;
pending_dl_grant[tti % FDD_HARQ_DELAY_MS][cc_idx].grant_cc_idx = grant_cc_idx;
@ -439,6 +440,7 @@ void phy_common::set_dl_pending_grant(uint32_t tti,
bool phy_common::get_dl_pending_grant(uint32_t tti, uint32_t cc_idx, uint32_t* grant_cc_idx, srslte_dci_dl_t* dl_dci)
{
std::lock_guard<std::mutex> lock(pending_dl_grant_mutex);
if (pending_dl_grant[tti % FDD_HARQ_DELAY_MS][cc_idx].enable) {
// Read grant
if (dl_dci) {

3
srsue/src/phy/sf_worker.cc
View File

@ -149,6 +149,7 @@ void sf_worker::set_cfo(const uint32_t& cc_idx, float cfo)
void sf_worker::set_crnti(uint16_t rnti)
{
std::lock_guard<std::mutex> lock(mutex);
for (auto& cc_worker : cc_workers) {
cc_worker->set_crnti(rnti);
}
@ -156,6 +157,7 @@ void sf_worker::set_crnti(uint16_t rnti)
void sf_worker::set_tdd_config(srslte_tdd_config_t config)
{
std::lock_guard<std::mutex> lock(mutex);
for (auto& cc_worker : cc_workers) {
cc_worker->set_tdd_config(config);
}
@ -164,6 +166,7 @@ void sf_worker::set_tdd_config(srslte_tdd_config_t config)
void sf_worker::enable_pregen_signals(bool enabled)
{
std::lock_guard<std::mutex> lock(mutex);
for (auto& cc_worker : cc_workers) {
cc_worker->enable_pregen_signals(enabled);
}