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

clause should not do write locking

Browse Source 
expand_index should not care whether read_locks are held.


git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@996 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
2004-02-18 01:43:32 +00:00
parent 6031b7f049
commit d3f49b75df
3 changed files with 71 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
C/index.c
View File

@@ -6382,6 +6382,14 @@ Yap_FollowIndexingCode(PredEntry *ap, yamop *ipc, Term t1, Term tb, Term tr, yam
ipc = NEXTOP(ipc,l);
break;
case _stale_lu_index:
#if defined(YAPOR) || defined(THREADS)
LOCK(ap->PELock);
if (*jbl != ipc) {
ipc = *jbl;
UNLOCK(ap->PELock);
break;
}
#endif
while (TRUE) {
yamop *nipc = clean_up_index(ipc->u.Ill.I, jlbl, ap);
if (nipc == NULL) {
@@ -6391,6 +6399,7 @@ Yap_FollowIndexingCode(PredEntry *ap, yamop *ipc, Term t1, Term tb, Term tr, yam
H[2] = tr;
H += 3;
if (!Yap_growheap(FALSE, Yap_Error_Size, NULL)) {
UNLOCK(ap->PELock);
Yap_Error(OUT_OF_HEAP_ERROR, TermNil, Yap_ErrorMessage);
return NULL;
}
@@ -6399,6 +6408,7 @@ Yap_FollowIndexingCode(PredEntry *ap, yamop *ipc, Term t1, Term tb, Term tr, yam
tb = H[1];
tr = H[2];
} else {
UNLOCK(ap->PELock);
ipc = nipc;
break;
}
@@ -6574,7 +6584,16 @@ Yap_FollowIndexingCode(PredEntry *ap, yamop *ipc, Term t1, Term tb, Term tr, yam
}
break;
case _expand_index:
#if defined(YAPOR) || defined(THREADS)
LOCK(ap->PELock);
if (*jbl != ipc) {
ipc = *jbl;
UNLOCK(ap->PELock);
break;
}
#endif
ipc = ExpandIndex(ap);
UNLOCK(pe->PELock);
break;
case _op_fail:
/*
@@ -6629,12 +6648,6 @@ Yap_FollowIndexingCode(PredEntry *ap, yamop *ipc, Term t1, Term tb, Term tr, yam
abolish_incomplete_subgoals(B);
#endif /* TABLING */
}
#if defined(YAPOR) || defined(THREADS)
if (PP == ap) {
PP = NULL;
READ_UNLOCK(ap->PRWLock);
}
#endif
return NULL;
}
@@ -6736,15 +6749,25 @@ Yap_NthClause(PredEntry *ap, Int ncls)
case _trust_logical_pred:
ipc = NEXTOP(ipc,l);
case _stale_lu_index:
#if defined(YAPOR) || defined(THREADS)
LOCK(ap->PELock);
if (*jbl != ipc) {
ipc = *jbl;
UNLOCK(ap->PELock);
break;
}
#endif
while (TRUE) {
yamop *nipc = clean_up_index(ipc->u.Ill.I, jlbl, ap);
if (nipc == NULL) {
/* not enough space */
if (!Yap_growheap(FALSE, Yap_Error_Size, NULL)) {
UNLOCK(ap->PELock);
Yap_Error(OUT_OF_HEAP_ERROR, TermNil, Yap_ErrorMessage);
return NULL;
}
} else {
UNLOCK(ap->PELock);
ipc = nipc;
break;
}
@@ -6789,7 +6812,16 @@ Yap_NthClause(PredEntry *ap, Int ncls)
ipc = ipc->u.clll.l3;
break;
case _expand_index:
#if defined(YAPOR) || defined(THREADS)
LOCK(ap->PELock);
if (*jbl != (yamop *)&(ap->cs.p_code.ExpandCode)) {
ipc = *jbl;
UNLOCK(pe->PELock);
break;
}
#endif
ipc = ExpandIndex(ap);
UNLOCK(ap->PELock);
break;
case _op_fail:
ipc = alt;