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

Fix deadlocks

Browse Source
This commit is contained in:
Vitor Santos Costa 2014-10-23 01:21:40 +01:00
parent d2984b6548
commit e25e7dab7b
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
C/absmi.c
View File

@ -1379,7 +1379,7 @@ spy_goal( USES_REGS1 )
/* IPred can generate errors, it thus must get rid of the lock itself */ /* IPred can generate errors, it thus must get rid of the lock itself */
if (P == FAILCODE) { if (P == FAILCODE) {
#if defined(YAPOR) || defined(THREADS) #if defined(YAPOR) || defined(THREADS)
if (PP) { if (PP && !(PP->PredFlags & LogUpdatePredFlag)){
UNLOCKPE(20,pe); UNLOCKPE(20,pe);
PP = NULL; PP = NULL;
} }
@ -2821,7 +2821,7 @@ Yap_absmi(int inp)
if (LOCAL_Error_TYPE == OUT_OF_ATTVARS_ERROR) { if (LOCAL_Error_TYPE == OUT_OF_ATTVARS_ERROR) {
LOCAL_Error_TYPE = YAP_NO_ERROR; LOCAL_Error_TYPE = YAP_NO_ERROR;
if (!Yap_growglobal(NULL)) { if (!Yap_growglobal(NULL)) {
UNLOCKPE(3,PP); if (PP) UNLOCKPE(3,PP);
#if defined(YAPOR) || defined(THREADS) #if defined(YAPOR) || defined(THREADS)
PP = NULL; PP = NULL;
#endif #endif
@ -2831,7 +2831,7 @@ Yap_absmi(int inp)
} else { } else {
LOCAL_Error_TYPE = YAP_NO_ERROR; LOCAL_Error_TYPE = YAP_NO_ERROR;
if (!Yap_gc(3, ENV, CP)) { if (!Yap_gc(3, ENV, CP)) {
UNLOCKPE(4,PP); if (PP) UNLOCKPE(4,PP);
#if defined(YAPOR) || defined(THREADS) #if defined(YAPOR) || defined(THREADS)
PP = NULL; PP = NULL;
#endif #endif
@ -2839,19 +2839,23 @@ Yap_absmi(int inp)
FAIL(); FAIL();
} }
} }
#if defined(YAPOR) || defined(THREADS)
PELOCK(5,ClauseCodeToLogUpdClause(PREG)->ClPred);
PP = ClauseCodeToLogUpdClause(PREG)->ClPred;
#endif
} }
if (!Yap_IUnify(ARG2, t)) { if (!Yap_IUnify(ARG2, t)) {
setregs(); setregs();
UNLOCKPE(5,PP);
#if defined(YAPOR) || defined(THREADS) #if defined(YAPOR) || defined(THREADS)
if (PP) UNLOCKPE(6,PP);
PP = NULL; PP = NULL;
#endif #endif
FAIL(); FAIL();
} }
if (!Yap_IUnify(ARG3, MkDBRefTerm((DBRef)cl))) { if (!Yap_IUnify(ARG3, MkDBRefTerm((DBRef)cl))) {
setregs(); setregs();
UNLOCKPE(6,PP);
#if defined(YAPOR) || defined(THREADS) #if defined(YAPOR) || defined(THREADS)
if (PP) UNLOCKPE(5,PP);
PP = NULL; PP = NULL;
#endif #endif
FAIL(); FAIL();
@ -2862,7 +2866,7 @@ Yap_absmi(int inp)
/* always add an extra reference */ /* always add an extra reference */
INC_CLREF_COUNT(cl); INC_CLREF_COUNT(cl);
TRAIL_CLREF(cl); TRAIL_CLREF(cl);
UNLOCKPE(7,PP); if (PP) UNLOCKPE(7,PP);
PP = NULL; PP = NULL;
#else #else
if (!(cl->ClFlags & InUseMask)) { if (!(cl->ClFlags & InUseMask)) {