diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix deadlock

Browse Source
This commit is contained in:
Vítor Santos Costa 2014-03-27 15:35:18 +00:00
parent f7283f6b70
commit a6c115b248
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
C/signals.c
View File

@ -311,7 +311,6 @@ p_first_signal( USES_REGS1 )
yap_signals sig; yap_signals sig;
LOCK(LOCAL_SignalLock); LOCK(LOCAL_SignalLock);
MUTEX_LOCK(&(LOCAL_ThreadHandle.tlock));
/* always do wakeups first, because you don't want to keep the /* always do wakeups first, because you don't want to keep the
non-backtrackable variable bad */ non-backtrackable variable bad */
if (LOCAL_FirstActiveSignal != LOCAL_LastActiveSignal) { if (LOCAL_FirstActiveSignal != LOCAL_LastActiveSignal) {
@ -385,7 +384,6 @@ p_first_signal( USES_REGS1 )
break; break;
#endif #endif
default: default:
MUTEX_UNLOCK(&(LOCAL_ThreadHandle.tlock));
UNLOCK(LOCAL_SignalLock); UNLOCK(LOCAL_SignalLock);
return FALSE; return FALSE;
} }
@ -398,11 +396,19 @@ p_continue_signals( USES_REGS1 )
{ {
yap_signals sig; yap_signals sig;
/* hack to force the signal anew */ /* hack to force the signal anew */
LOCK(LOCAL_SignalLock);
if (LOCAL_InterruptsDisabled) {
return TRUE;
}
if (LOCAL_FirstActiveSignal != LOCAL_LastActiveSignal) { if (LOCAL_FirstActiveSignal != LOCAL_LastActiveSignal) {
sig = LOCAL_ActiveSignals[LOCAL_FirstActiveSignal]; sig = LOCAL_ActiveSignals[LOCAL_FirstActiveSignal];
Yap_signal(sig); CreepFlag =
Unsigned(LCL0);
if (sig != YAP_CREEP_SIGNAL)
EventFlag =
Unsigned(LCL0);
} }
MUTEX_UNLOCK(&(LOCAL_ThreadHandle.tlock)); UNLOCK(LOCAL_SignalLock);
return TRUE; return TRUE;
} }