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

implemented andre's PR review requests

This commit is contained in:
Francisco Paisana 2019-09-17 12:54:12 +01:00 committed by Andre Puschmann
parent b2bc05c50a
commit 14267640ee
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/include/srslte/common/multiqueue.h
View File

@ -221,7 +221,7 @@ private:
uint32_t spin_idx = 0; uint32_t spin_idx = 0;
bool running = true; bool running = true;
std::vector<queue_wrapper> queues; std::vector<queue_wrapper> queues;
uint32_t capacity; uint32_t capacity = 0;
uint32_t nof_threads_waiting = 0; uint32_t nof_threads_waiting = 0;
}; };

15
srsue/src/stack/ue_stack_lte.cc
View File

@ -207,7 +207,7 @@ bool ue_stack_lte::get_metrics(stack_metrics_t* metrics)
void ue_stack_lte::run_thread() void ue_stack_lte::run_thread()
{ {
while (running) { while (running) {
task_t task; task_t task{};
pending_tasks.wait_pop(&task); pending_tasks.wait_pop(&task);
task(); task();
} }
@ -229,10 +229,13 @@ void ue_stack_lte::run_thread()
*/ */
void ue_stack_lte::write_sdu(uint32_t lcid, srslte::unique_byte_buffer_t sdu, bool blocking) void ue_stack_lte::write_sdu(uint32_t lcid, srslte::unique_byte_buffer_t sdu, bool blocking)
{ {
task_t task; task_t task{};
task.pdu = std::move(sdu); task.pdu = std::move(sdu);
task.func = [this, lcid, blocking](task_t* task_ctxt) { pdcp.write_sdu(lcid, std::move(task_ctxt->pdu), blocking); }; task.func = [this, lcid, blocking](task_t* task_ctxt) { pdcp.write_sdu(lcid, std::move(task_ctxt->pdu), blocking); };
pending_tasks.try_push(gw_queue_id, std::move(task)); std::pair<bool, task_t> ret = pending_tasks.try_push(gw_queue_id, std::move(task));
if (not ret.first) {
pdcp_log.warning("GW SDU with lcid=%d was discarded.\n", lcid);
}
} }
/******************** /********************
@ -244,17 +247,17 @@ void ue_stack_lte::write_sdu(uint32_t lcid, srslte::unique_byte_buffer_t sdu, bo
*/ */
void ue_stack_lte::in_sync() void ue_stack_lte::in_sync()
{ {
pending_tasks.try_push(sync_queue_id, task_t{[this](task_t*) { rrc.in_sync(); }}); pending_tasks.push(sync_queue_id, task_t{[this](task_t*) { rrc.in_sync(); }});
} }
void ue_stack_lte::out_of_sync() void ue_stack_lte::out_of_sync()
{ {
pending_tasks.try_push(sync_queue_id, task_t{[this](task_t*) { rrc.out_of_sync(); }}); pending_tasks.push(sync_queue_id, task_t{[this](task_t*) { rrc.out_of_sync(); }});
} }
void ue_stack_lte::run_tti(uint32_t tti) void ue_stack_lte::run_tti(uint32_t tti)
{ {
pending_tasks.try_push(sync_queue_id, task_t{[this, tti](task_t*) { run_tti_impl(tti); }}); pending_tasks.push(sync_queue_id, task_t{[this, tti](task_t*) { run_tti_impl(tti); }});
} }
void ue_stack_lte::run_tti_impl(uint32_t tti) void ue_stack_lte::run_tti_impl(uint32_t tti)