From feccce5a016abb45bc712e67316cbffc2f1bede2 Mon Sep 17 00:00:00 2001 From: Francisco Paisana Date: Tue, 9 Oct 2018 14:33:05 +0100 Subject: [PATCH] fixed the deadlock issue --- srsue/src/phy/phch_worker.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srsue/src/phy/phch_worker.cc b/srsue/src/phy/phch_worker.cc index 53ca93273..0e4d6bcc4 100644 --- a/srsue/src/phy/phch_worker.cc +++ b/srsue/src/phy/phch_worker.cc @@ -463,11 +463,6 @@ void phch_worker::work_imp() tr_log_end(); - if (next_offset > 0) { - phy->worker_end(tx_tti, signal_ready, signal_ptr, SRSLTE_SF_LEN_PRB(cell.nof_prb)+next_offset, tx_time); - } else { - phy->worker_end(tx_tti, signal_ready, &signal_ptr[-next_offset], SRSLTE_SF_LEN_PRB(cell.nof_prb)+next_offset, tx_time); - } if(SUBFRAME_TYPE_REGULAR == sf_cfg.sf_type) { if (!dl_action.generate_ack_callback) { @@ -491,6 +486,13 @@ void phch_worker::work_imp() phy->set_mch_period_stop(0); } } + + if (next_offset > 0) { + phy->worker_end(tx_tti, signal_ready, signal_ptr, SRSLTE_SF_LEN_PRB(cell.nof_prb)+next_offset, tx_time); + } else { + phy->worker_end(tx_tti, signal_ready, &signal_ptr[-next_offset], SRSLTE_SF_LEN_PRB(cell.nof_prb)+next_offset, tx_time); + } + if(SUBFRAME_TYPE_REGULAR == sf_cfg.sf_type){ update_measurements(); }