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

ensure things get locked when enterng dynamic code.

Browse Source
This commit is contained in:
Vitor Santos Costa 2014-03-20 13:32:35 +00:00
parent e337d6aba0
commit 8dd1ddbca3
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
C/absmi.c
View File

@ -7967,25 +7967,6 @@ Yap_absmi(int inp)
pt0 = Yap_ExpandIndex(pe, 0); pt0 = Yap_ExpandIndex(pe, 0);
/* restart index */ /* restart index */
setregs(); setregs();
UNLOCKPE(17,pe);
#ifdef DEBUG_LOCK
{ PredEntry *ap = pe;
if (ap->ArityOfPE) {
if ( ap->ModuleOfPred != IDB_MODULE)
printf("L9 %s\n", AtomName(NameOfFunctor(ap->FunctorOfPred)));
else
{
if (ap->PredFlags & NumberDBPredFlag) {
printf("L9 %ld\n", ap->src.IndxId);
} else if (ap->PredFlags & AtomDBPredFlag) {
printf("L9 %s\n", AtomName((Atom)(ap->FunctorOfPred)));
} else {
printf("L9 %s\n", AtomName(NameOfFunctor(ap->FunctorOfPred)));
}
}
}
}
#endif
PREG = pt0; PREG = pt0;
#if defined(YAPOR) || defined(THREADS) #if defined(YAPOR) || defined(THREADS)
if (!PP) { if (!PP) {
@ -8002,14 +7983,20 @@ Yap_absmi(int inp)
PredEntry *pe = PredFromDefCode(PREG); PredEntry *pe = PredFromDefCode(PREG);
BEGD(d0); BEGD(d0);
/* avoid trouble with undefined dynamic procedures */ /* avoid trouble with undefined dynamic procedures */
/* I assume they were not locked beforehand */
#if defined(YAPOR) || defined(THREADS)
if (!PP)
PELOCK(19,pe);
#endif
if ((pe->PredFlags & (DynamicPredFlag|LogUpdatePredFlag|MultiFileFlag)) || if ((pe->PredFlags & (DynamicPredFlag|LogUpdatePredFlag|MultiFileFlag)) ||
(UndefCode->OpcodeOfPred == UNDEF_OPCODE)) { (UndefCode->OpcodeOfPred == UNDEF_OPCODE)) {
#if defined(YAPOR) || defined(THREADS) #if defined(YAPOR) || defined(THREADS)
PP = NULL; PP = NULL;
#endif
UNLOCKPE(19,pe); UNLOCKPE(19,pe);
#endif
FAIL(); FAIL();
} }
UNLOCKPE(19,pe);
d0 = pe->ArityOfPE; d0 = pe->ArityOfPE;
if (d0 == 0) { if (d0 == 0) {
HR[1] = MkAtomTerm((Atom)(pe->FunctorOfPred)); HR[1] = MkAtomTerm((Atom)(pe->FunctorOfPred));