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

fix trying to remove the same atom twice

Browse Source
This commit is contained in:
Vítor Santos Costa 2016-03-16 23:53:15 +00:00
parent 17ef6ddf34
commit b4742fb3cf
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
C/adtdefs.c
View File

@ -67,7 +67,7 @@ uint64_t WideHashFunction(wchar_t *CHP) {
/* this routine must be run at least having a read lock on ae */ /* this routine must be run at least having a read lock on ae */
static Prop static Prop
GetFunctorProp(AtomEntry *ae, GetFunctorProp(AtomEntry *ae,
unsigned int arity) { /* look property list of atom a for kind */ arity_t arity) { /* look property list of atom a for kind */
FunctorEntry *pp; FunctorEntry *pp;
pp = RepFunctorProp(ae->PropsOfAE); pp = RepFunctorProp(ae->PropsOfAE);
@ -79,7 +79,7 @@ GetFunctorProp(AtomEntry *ae,
/* vsc: We must guarantee that IsVarTerm(functor) returns true! */ /* vsc: We must guarantee that IsVarTerm(functor) returns true! */
static inline Functor InlinedUnlockedMkFunctor(AtomEntry *ae, static inline Functor InlinedUnlockedMkFunctor(AtomEntry *ae,
unsigned int arity) { arity_t arity) {
FunctorEntry *p; FunctorEntry *p;
Prop p0; Prop p0;
@ -100,12 +100,12 @@ static inline Functor InlinedUnlockedMkFunctor(AtomEntry *ae,
return ((Functor)p); return ((Functor)p);
} }
Functor Yap_UnlockedMkFunctor(AtomEntry *ae, unsigned int arity) { Functor Yap_UnlockedMkFunctor(AtomEntry *ae, arity_t arity) {
return (InlinedUnlockedMkFunctor(ae, arity)); return (InlinedUnlockedMkFunctor(ae, arity));
} }
/* vsc: We must guarantee that IsVarTerm(functor) returns true! */ /* vsc: We must guarantee that IsVarTerm(functor) returns true! */
Functor Yap_MkFunctor(Atom ap, unsigned int arity) { Functor Yap_MkFunctor(Atom ap, arity_t arity) {
AtomEntry *ae = RepAtom(ap); AtomEntry *ae = RepAtom(ap);
Functor f; Functor f;
@ -453,12 +453,15 @@ void Yap_ReleaseAtom(Atom atom) { /* Releases an atom from the hash chain */
} }
/* else */ /* else */
inChain = RepAtom(HashChain[hash].Entry); inChain = RepAtom(HashChain[hash].Entry);
while (inChain->NextOfAE != atom) while (inChain && inChain->NextOfAE != atom)
inChain = RepAtom(inChain->NextOfAE); inChain = RepAtom(inChain->NextOfAE);
if (!inChain)
return;
WRITE_LOCK(inChain->ARWLock); WRITE_LOCK(inChain->ARWLock);
inChain->NextOfAE = ap->NextOfAE; inChain->NextOfAE = ap->NextOfAE;
WRITE_UNLOCK(inChain->ARWLock); WRITE_UNLOCK(inChain->ARWLock);
WRITE_UNLOCK(HashChain[hash].AERWLock); WRITE_UNLOCK(HashChain[hash].AERWLock);
ap->NextOfAE = NULL;
} }
static Prop static Prop