Commit a28ae2a7 authored by roux's avatar roux

Fix a bug. If phy_procedures_eNB_TX exits with the lock

acquired, lte-softmodem will never finish properly.


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7703 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent e09d843d
...@@ -1150,17 +1150,22 @@ static void* eNB_thread_tx( void* param ) ...@@ -1150,17 +1150,22 @@ static void* eNB_thread_tx( void* param )
&sync_phy_proc[proc->subframe].mutex_phy_proc_tx); &sync_phy_proc[proc->subframe].mutex_phy_proc_tx);
} }
if (oai_exit) {
if (pthread_mutex_unlock(&sync_phy_proc[proc->subframe].mutex_phy_proc_tx) != 0) { if (pthread_mutex_unlock(&sync_phy_proc[proc->subframe].mutex_phy_proc_tx) != 0) {
LOG_E(PHY, "[SCHED][eNB] error unlocking PHY proc mutex for eNB TX proc %d\n", proc->subframe); LOG_E(PHY, "[SCHED][eNB] error unlocking PHY proc mutex for eNB TX proc %d\n", proc->subframe);
exit_fun("nothing to add"); exit_fun("nothing to add");
} }
if (oai_exit)
break; break;
}
phy_procedures_eNB_TX( proc->subframe, PHY_vars_eNB_g[0][proc->CC_id], 0, no_relay, NULL ); phy_procedures_eNB_TX( proc->subframe, PHY_vars_eNB_g[0][proc->CC_id], 0, no_relay, NULL );
/* we're done, let the next one proceed */ /* we're done, let the next one proceed */
if (pthread_mutex_lock(&sync_phy_proc[proc->subframe].mutex_phy_proc_tx) != 0) {
LOG_E(PHY, "[SCHED][eNB] error locking PHY proc mutex for eNB TX proc %d\n", proc->subframe);
exit_fun("nothing to add");
break;
}
sync_phy_proc[proc->subframe].phy_proc_CC_id++; sync_phy_proc[proc->subframe].phy_proc_CC_id++;
sync_phy_proc[proc->subframe].phy_proc_CC_id %= MAX_NUM_CCs; sync_phy_proc[proc->subframe].phy_proc_CC_id %= MAX_NUM_CCs;
pthread_cond_broadcast(&sync_phy_proc[proc->subframe].cond_phy_proc_tx); pthread_cond_broadcast(&sync_phy_proc[proc->subframe].cond_phy_proc_tx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment