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

fix thread bootup (with mutex/2).

Browse Source
This commit is contained in:
Vitor Santos Costa 2012-06-26 13:02:44 +01:00
parent 0228bfbb30
commit 051936ca50
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
C/stdpreds.c
View File

@ -3227,7 +3227,7 @@ cont_current_predicate_for_atom( USES_REGS1 )
FunctorEntry *pp = RepFunctorProp(pf); FunctorEntry *pp = RepFunctorProp(pf);
if (IsFunctorProperty(pp->KindOfPE)) { if (IsFunctorProperty(pp->KindOfPE)) {
Prop p0; Prop p0;
READ_LOCK(pp->RWLock); READ_LOCK(pp->FRWLock);
p0 = pp->PropsOfFE; p0 = pp->PropsOfFE;
if (p0) { if (p0) {
PredEntry *p = RepPredProp(p0); PredEntry *p = RepPredProp(p0);
@ -3236,7 +3236,7 @@ cont_current_predicate_for_atom( USES_REGS1 )
UInt ar = p->ArityOfPE; UInt ar = p->ArityOfPE;
/* we found the predicate */ /* we found the predicate */
EXTRA_CBACK_ARG(3,1) = MkIntegerTerm((Int)(pp->NextOfPE)); EXTRA_CBACK_ARG(3,1) = MkIntegerTerm((Int)(pp->NextOfPE));
READ_UNLOCK(pp->RWLock); READ_UNLOCK(pp->FRWLock);
return return
Yap_unify(ARG3,MkIntegerTerm(ar)); Yap_unify(ARG3,MkIntegerTerm(ar));
} else if (p->NextOfPE) { } else if (p->NextOfPE) {
@ -3249,7 +3249,7 @@ cont_current_predicate_for_atom( USES_REGS1 )
p->ModuleOfPred == mod) p->ModuleOfPred == mod)
{ {
READ_UNLOCK(PredHashRWLock); READ_UNLOCK(PredHashRWLock);
READ_UNLOCK(pp->RWLock); READ_UNLOCK(pp->FRWLock);
/* we found the predicate */ /* we found the predicate */
EXTRA_CBACK_ARG(3,1) = MkIntegerTerm((Int)(p->NextOfPE)); EXTRA_CBACK_ARG(3,1) = MkIntegerTerm((Int)(p->NextOfPE));
return Yap_unify(ARG3,MkIntegerTerm(p->ArityOfPE)); return Yap_unify(ARG3,MkIntegerTerm(p->ArityOfPE));
@ -3259,18 +3259,18 @@ cont_current_predicate_for_atom( USES_REGS1 )
READ_UNLOCK(PredHashRWLock); READ_UNLOCK(PredHashRWLock);
} }
} }
READ_UNLOCK(pp->RWLock); READ_UNLOCK(pp->FRWLock);
} else if (pp->KindOfPE == PEProp) { } else if (pp->KindOfPE == PEProp) {
PredEntry *pe = RepPredProp(pf); PredEntry *pe = RepPredProp(pf);
READ_LOCK(pp->RWLock); READ_LOCK(pp->FRWLock);
if (pe->ModuleOfPred == mod || if (pe->ModuleOfPred == mod ||
pe->ModuleOfPred == 0) { pe->ModuleOfPred == 0) {
/* we found the predicate */ /* we found the predicate */
EXTRA_CBACK_ARG(3,1) = MkIntegerTerm((Int)(pp->NextOfPE)); EXTRA_CBACK_ARG(3,1) = MkIntegerTerm((Int)(pp->NextOfPE));
READ_UNLOCK(pp->RWLock); READ_UNLOCK(pp->FRWLock);
return Yap_unify(ARG3,MkIntTerm(0)); return Yap_unify(ARG3,MkIntTerm(0));
} }
READ_UNLOCK(pp->RWLock); READ_UNLOCK(pp->FRWLock);
} }
pf = pp->NextOfPE; pf = pp->NextOfPE;
} }

6
pl/threads.yap
View File

@ -53,6 +53,12 @@ volatile(P) :-
'$new_mutex'(Id), '$new_mutex'(Id),
assert_static(prolog:'$with_mutex_mutex'(Id)). assert_static(prolog:'$with_mutex_mutex'(Id)).
'$reinit_thread0' :-
'$create_thread_mq'(0),
% abolish(prolog:'$with_mutex_mutex',1),
'$new_mutex'(Id),
asserta_static((prolog:'$with_mutex_mutex'(Id) :- !)).
'$top_thread_goal'(G, Detached) :- '$top_thread_goal'(G, Detached) :-
'$thread_self'(Id), '$thread_self'(Id),
(Detached == true -> '$detach_thread'(Id) ; true), (Detached == true -> '$detach_thread'(Id) ; true),