From 71a98a977e5eb45a267491a047b4f44e431a20ae Mon Sep 17 00:00:00 2001
From: Wang Tsu-Han <wangts@eurecom.fr>
Date: Fri, 16 Mar 2018 18:18:55 +0100
Subject: [PATCH] bug fix for killing thread
---
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c | 1 +
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c | 1 +
openair1/SCHED/phy_procedures_lte_eNb.c | 4 ++--
targets/RT/USER/lte-enb.c | 2 ++
targets/RT/USER/lte-ru.c | 20 +++++++++++++-------
5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
index dd073584f0..4c08c74c34 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
@@ -368,6 +368,7 @@ void *te_thread(void *param) {
while (!oai_exit) {
if (wait_on_condition(&tep->mutex_te,&tep->cond_te,&tep->instance_cnt_te,"te thread")<0) break;
+ if(oai_exit) break;
dlsch_encoding_2threads0(tep);
diff --git a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
index b76bfc2d37..b2c6d9986d 100644
--- a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
+++ b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
@@ -428,6 +428,7 @@ void *td_thread(void *param) {
while (!oai_exit) {
if (wait_on_condition(&proc->mutex_td,&proc->cond_td,&proc->instance_cnt_td,"td thread")<0) break;
+ if(oai_exit) break;
((td_params*)param)->ret = ulsch_decoding_data_2thread0((td_params*)param);
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index b1927b1bd9..31b327f992 100644
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -1415,8 +1415,8 @@ void kill_te_thread(PHY_VARS_eNB *eNB) {
proc->tep[i].instance_cnt_te = 0;
pthread_cond_signal(&proc->tep[i].cond_te);
pthread_join(proc->tep[i].pthread_te, NULL);
- pthread_mutex_init( &proc->tep[i].mutex_te, NULL);
- pthread_cond_init( &proc->tep[i].cond_te, NULL);
+ pthread_mutex_destroy( &proc->tep[i].mutex_te);
+ pthread_cond_destroy( &proc->tep[i].cond_te);
}
}
diff --git a/targets/RT/USER/lte-enb.c b/targets/RT/USER/lte-enb.c
index ae95e161a8..5d2f79a45b 100644
--- a/targets/RT/USER/lte-enb.c
+++ b/targets/RT/USER/lte-enb.c
@@ -1040,6 +1040,8 @@ void kill_eNB_proc(int inst) {
for (i=0; i<2; i++) {
pthread_mutex_lock(&proc_rxtx[i].mutex_rxtx);
proc_rxtx[i].instance_cnt_rxtx = 0;
+ proc_rxtx[i].pipe_ready = 0;
+ pthread_cond_signal( &proc_rxtx[i].cond_rxtx );
pthread_mutex_unlock(&proc_rxtx[i].mutex_rxtx);
}
proc->instance_cnt_prach = 0;
diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c
index ae07d61ebf..795635ce9d 100644
--- a/targets/RT/USER/lte-ru.c
+++ b/targets/RT/USER/lte-ru.c
@@ -1901,35 +1901,41 @@ void kill_RU_proc(int inst)
pthread_mutex_lock(&proc->mutex_FH);
proc->instance_cnt_FH = 0;
- pthread_mutex_unlock(&proc->mutex_FH);
pthread_cond_signal(&proc->cond_FH);
+ pthread_mutex_unlock(&proc->mutex_FH);
+
+ pthread_mutex_lock(&proc->mutex_FH1);
+ proc->instance_cnt_FH1 = 0;
+ pthread_cond_signal(&proc->cond_FH1);
+ pthread_mutex_unlock(&proc->mutex_FH1);
pthread_mutex_lock(&proc->mutex_prach);
proc->instance_cnt_prach = 0;
- pthread_mutex_unlock(&proc->mutex_prach);
pthread_cond_signal(&proc->cond_prach);
+ pthread_mutex_unlock(&proc->mutex_prach);
#ifdef Rel14
pthread_mutex_lock(&proc->mutex_prach_br);
proc->instance_cnt_prach_br = 0;
- pthread_mutex_unlock(&proc->mutex_prach_br);
pthread_cond_signal(&proc->cond_prach_br);
+ pthread_mutex_unlock(&proc->mutex_prach_br);
#endif
pthread_mutex_lock(&proc->mutex_synch);
proc->instance_cnt_synch = 0;
- pthread_mutex_unlock(&proc->mutex_synch);
pthread_cond_signal(&proc->cond_synch);
+ pthread_mutex_unlock(&proc->mutex_synch);
pthread_mutex_lock(&proc->mutex_eNBs);
+ proc->ru_tx_ready = 0;
proc->instance_cnt_eNBs = 0;
- pthread_mutex_unlock(&proc->mutex_eNBs);
pthread_cond_signal(&proc->cond_eNBs);
+ pthread_mutex_unlock(&proc->mutex_eNBs);
pthread_mutex_lock(&proc->mutex_asynch_rxtx);
proc->instance_cnt_asynch_rxtx = 0;
- pthread_mutex_unlock(&proc->mutex_asynch_rxtx);
pthread_cond_signal(&proc->cond_asynch_rxtx);
+ pthread_mutex_unlock(&proc->mutex_asynch_rxtx);
LOG_D(PHY, "Joining pthread_FH\n");
pthread_join(proc->pthread_FH, NULL);
@@ -1952,7 +1958,7 @@ void kill_RU_proc(int inst)
pthread_join(proc->pthread_asynch_rxtx, NULL);
}
}
- if (get_nprocs() >= 2) {
+ if (get_nprocs() >= 2 && fepw) {
if (ru->feprx) {
pthread_mutex_lock(&proc->mutex_fep);
proc->instance_cnt_fep = 0;
--
GitLab