New(2555,ssv,1,shared_sv);
MUTEX_INIT(&ssv->mutex);
COND_INIT(&ssv->cond);
+ COND_INIT(&ssv->user_cond);
+ ssv->owner = 0;
ssv->locks = 0;
return ssv;
}
{
if(!ssv)
return;
+ MUTEX_LOCK(&ssv->mutex);
if(ssv->owner && ssv->owner == my_perl) {
ssv->locks++;
+ MUTEX_UNLOCK(&ssv->mutex);
return;
}
- MUTEX_LOCK(&ssv->mutex);
+ while(ssv->owner)
+ COND_WAIT(&ssv->cond,&ssv->mutex);
ssv->locks++;
ssv->owner = my_perl;
if(ssv->locks == 1)
SAVEDESTRUCTOR_X(Perl_sharedsv_unlock_scope,ssv);
+ MUTEX_UNLOCK(&ssv->mutex);
}
/*
void
Perl_sharedsv_unlock(pTHX_ shared_sv* ssv)
{
- if(ssv->owner != my_perl)
+ MUTEX_LOCK(&ssv->mutex);
+ if(ssv->owner != my_perl) {
+ Perl_croak(aTHX_ "panic: Perl_sharedsv_unlock unlocking mutex that we don't own");
+ MUTEX_UNLOCK(&ssv->mutex);
return;
+ }
if(--ssv->locks == 0) {
ssv->owner = NULL;
- MUTEX_UNLOCK(&ssv->mutex);
+ COND_SIGNAL(&ssv->cond);
}
+ MUTEX_UNLOCK(&ssv->mutex);
}
void
Perl_sharedsv_unlock_scope(pTHX_ shared_sv* ssv)
{
- if(ssv->owner != my_perl)
+ MUTEX_LOCK(&ssv->mutex);
+ if(ssv->owner != my_perl) {
+ MUTEX_UNLOCK(&ssv->mutex);
return;
+ }
ssv->locks = 0;
ssv->owner = NULL;
+ COND_SIGNAL(&ssv->cond);
MUTEX_UNLOCK(&ssv->mutex);
}
switch (SvTYPE(sv)) {
case SVt_RV:
if (SvROK(sv))
- Perl_sharedsv_thrcnt_dec(aTHX_ (shared_sv *)SvIV(SvRV(sv)));
+ Perl_sharedsv_thrcnt_dec(aTHX_ INT2PTR(shared_sv *, SvIV(SvRV(sv))));
break;
case SVt_PVAV: {
SV **src_ary = AvARRAY((AV *)sv);
while (items-- > 0) {
if(SvTYPE(*src_ary))
- Perl_sharedsv_thrcnt_dec(aTHX_ (shared_sv *)SvIV(*src_ary++));
+ Perl_sharedsv_thrcnt_dec(aTHX_ INT2PTR(shared_sv *, SvIV(*src_ary++)));
}
break;
}
(void)hv_iterinit((HV *)sv);
while ((entry = hv_iternext((HV *)sv)))
Perl_sharedsv_thrcnt_dec(
- aTHX_ (shared_sv *)SvIV(hv_iterval((HV *)sv, entry))
+ aTHX_ INT2PTR(shared_sv *, SvIV(hv_iterval((HV *)sv, entry)))
);
break;
}
}
#endif /* USE_ITHREADS */
+