X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Types.xs;h=f3ce903ecbdbc9fc6953312c8cbc465b3b48f957;hb=c00bbcee86add7a0549dd9bfb9a6ddbcaa62b256;hp=338201462e072b96920c9450c3c68305c44ad392;hpb=802bedc36b8f65e33ea579641fe0dc70b4e59e9d;p=perl%2Fmodules%2FLexical-Types.git diff --git a/Types.xs b/Types.xs index 3382014..f3ce903 100644 --- a/Types.xs +++ b/Types.xs @@ -23,6 +23,10 @@ # endif #endif +#ifndef LT_WORKAROUND_REQUIRE_PROPAGATION +# define LT_WORKAROUND_REQUIRE_PROPAGATION !LT_HAS_PERL(5, 10, 1) +#endif + #ifndef HvNAME_get # define HvNAME_get(H) HvNAME(H) #endif @@ -59,16 +63,43 @@ # endif #else # define LT_THREADSAFE 0 +# undef dMY_CXT +# define dMY_CXT dNOOP +# undef MY_CXT +# define MY_CXT lt_globaldata +# undef START_MY_CXT +# define START_MY_CXT STATIC my_cxt_t MY_CXT; +# undef MY_CXT_INIT +# define MY_CXT_INIT NOOP +# undef MY_CXT_CLONE +# define MY_CXT_CLONE NOOP +# undef pMY_CXT +# define pMY_CXT +# undef pMY_CXT_ +# define pMY_CXT_ +# undef aMY_CXT +# define aMY_CXT +# undef aMY_CXT_ +# define aMY_CXT_ #endif /* --- Helpers ------------------------------------------------------------- */ /* ... Thread-safe hints ................................................... */ -#if LT_THREADSAFE +/* If any of those is true, we need to store the hint in a global table. */ + +#if LT_THREADSAFE || LT_WORKAROUND_REQUIRE_PROPAGATION + +typedef struct { + SV *code; +#if LT_WORKAROUND_REQUIRE_PROPAGATION + UV requires; +#endif +} lt_hint_t; #define PTABLE_NAME ptable_hints -#define PTABLE_VAL_FREE(V) if ((V) && !SvIS_FREED((SV *) (V))) SvREFCNT_dec(V) +#define PTABLE_VAL_FREE(V) { lt_hint_t *h = (V); SvREFCNT_dec(h->code); PerlMemShared_free(h); } #define pPTBL pTHX #define pPTBL_ pTHX_ @@ -80,41 +111,69 @@ #define ptable_hints_store(T, K, V) ptable_hints_store(aTHX_ (T), (K), (V)) #define ptable_hints_free(T) ptable_hints_free(aTHX_ (T)) +#endif /* LT_THREADSAFE || LT_WORKAROUND_REQUIRE_PROPAGATION */ + +/* ... Global data ......................................................... */ + #define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION typedef struct { - ptable *tbl; +#if LT_THREADSAFE || LT_WORKAROUND_REQUIRE_PROPAGATION + ptable *tbl; /* It really is a ptable_hints */ +#endif +#if LT_THREADSAFE tTHX owner; +#endif + OP * (*pp_padsv_saved)(pTHX); } my_cxt_t; START_MY_CXT -STATIC void lt_ptable_hints_clone(pTHX_ ptable_ent *ent, void *ud_) { - my_cxt_t *ud = ud_; - SV *val = ent->val; - - if (ud->owner != aTHX) { - CLONE_PARAMS param; - AV *stashes = (SvTYPE(val) == SVt_PVHV && HvNAME_get(val)) ? newAV() : NULL; - param.stashes = stashes; - param.flags = 0; - param.proto_perl = ud->owner; - val = sv_dup(val, ¶m); - if (stashes) { - av_undef(stashes); - SvREFCNT_dec(stashes); - } +/* ... Cloning global data ................................................. */ + +#if LT_THREADSAFE + +STATIC SV *lt_clone(pTHX_ SV *sv, tTHX owner) { +#define lt_clone(S, O) lt_clone(aTHX_ (S), (O)) + CLONE_PARAMS param; + AV *stashes = NULL; + SV *dupsv; + + if (SvTYPE(sv) == SVt_PVHV && HvNAME_get(sv)) + stashes = newAV(); + + param.stashes = stashes; + param.flags = 0; + param.proto_perl = owner; + + dupsv = sv_dup(sv, ¶m); + + if (stashes) { + av_undef(stashes); + SvREFCNT_dec(stashes); } - ptable_hints_store(ud->tbl, ent->key, val); - SvREFCNT_inc(val); + return dupsv; +} + +STATIC void lt_ptable_hints_clone(pTHX_ ptable_ent *ent, void *ud_) { + my_cxt_t *ud = ud_; + lt_hint_t *h1 = ent->val; + lt_hint_t *h2 = PerlMemShared_malloc(sizeof *h2); + + *h2 = *h1; + + if (ud->owner != aTHX) + h2->code = lt_clone(h1->code, ud->owner); + + ptable_hints_store(ud->tbl, ent->key, h2); + SvREFCNT_inc(h2->code); } STATIC void lt_thread_cleanup(pTHX_ void *); STATIC void lt_thread_cleanup(pTHX_ void *ud) { int *level = ud; - SV *id; if (*level) { *level = 0; @@ -128,35 +187,80 @@ STATIC void lt_thread_cleanup(pTHX_ void *ud) { } } +#endif /* LT_THREADSAFE */ + +/* ... Hint tags ........................................................... */ + +#if LT_THREADSAFE || LT_WORKAROUND_REQUIRE_PROPAGATION + STATIC SV *lt_tag(pTHX_ SV *value) { #define lt_tag(V) lt_tag(aTHX_ (V)) + lt_hint_t *h; dMY_CXT; value = SvOK(value) && SvROK(value) ? SvRV(value) : NULL; + + h = PerlMemShared_malloc(sizeof *h); + h->code = SvREFCNT_inc(value); + +#if LT_WORKAROUND_REQUIRE_PROPAGATION + { + const PERL_SI *si; + UV requires = 0; + + for (si = PL_curstackinfo; si; si = si->si_prev) { + I32 cxix; + + for (cxix = si->si_cxix; cxix >= 0; --cxix) { + const PERL_CONTEXT *cx = si->si_cxstack + cxix; + + if (CxTYPE(cx) == CXt_EVAL && cx->blk_eval.old_op_type == OP_REQUIRE) + ++requires; + } + } + + h->requires = requires; + } +#endif + /* We only need for the key to be an unique tag for looking up the value later. * Allocated memory provides convenient unique identifiers, so that's why we * use the value pointer as the key itself. */ - ptable_hints_store(MY_CXT.tbl, value, value); - SvREFCNT_inc(value); + ptable_hints_store(MY_CXT.tbl, value, h); return newSVuv(PTR2UV(value)); } STATIC SV *lt_detag(pTHX_ const SV *hint) { #define lt_detag(H) lt_detag(aTHX_ (H)) - void *tag; - SV *value; + lt_hint_t *h; + dMY_CXT; - if (!hint || !SvOK(hint) || !SvIOK(hint)) - croak("Wrong hint"); + if (!(hint && SvOK(hint) && SvIOK(hint))) + return NULL; - tag = INT2PTR(void *, SvIVX(hint)); + h = ptable_fetch(MY_CXT.tbl, INT2PTR(void *, SvUVX(hint))); + +#if LT_WORKAROUND_REQUIRE_PROPAGATION { - dMY_CXT; - value = ptable_fetch(MY_CXT.tbl, tag); + const PERL_SI *si; + UV requires = 0; + + for (si = PL_curstackinfo; si; si = si->si_prev) { + I32 cxix; + + for (cxix = si->si_cxix; cxix >= 0; --cxix) { + const PERL_CONTEXT *cx = si->si_cxstack + cxix; + + if (CxTYPE(cx) == CXt_EVAL && cx->blk_eval.old_op_type == OP_REQUIRE + && ++requires > h->requires) + return NULL; + } + } } +#endif - return value; + return h->code; } #else @@ -174,28 +278,28 @@ STATIC SV *lt_tag(pTHX_ SV *value) { return newSVuv(tag); } -#define lt_detag(H) INT2PTR(SV *, SvUVX(H)) +#define lt_detag(H) (((H) && SvOK(H)) ? INT2PTR(SV *, SvUVX(H)) : NULL) -#endif /* LT_THREADSAFE */ +#endif /* LT_THREADSAFE || LT_WORKAROUND_REQUIRE_PROPAGATION */ STATIC U32 lt_hash = 0; STATIC SV *lt_hint(pTHX) { #define lt_hint() lt_hint(aTHX) - SV *id; -#if LT_HAS_PERL(5, 10, 0) - id = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash, - NULL, - __PACKAGE__, __PACKAGE_LEN__, - 0, - lt_hash); + SV *hint; +#if LT_HAS_PERL(5, 9, 5) + hint = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash, + NULL, + __PACKAGE__, __PACKAGE_LEN__, + 0, + lt_hash); #else SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__, lt_hash); if (!val) return 0; - id = *val; + hint = *val; #endif - return (id && SvOK(id)) ? id : NULL; + return lt_detag(hint); } /* ... op => info map ...................................................... */ @@ -264,6 +368,19 @@ STATIC const lt_op_info *lt_map_fetch(const OP *o, lt_op_info *oi) { return val; } +STATIC void lt_map_delete(pTHX_ const OP *o) { +#define lt_map_delete(O) lt_map_delete(aTHX_ (O)) +#ifdef USE_ITHREADS + MUTEX_LOCK(<_op_map_mutex); +#endif + + ptable_map_store(lt_op_map, o, NULL); + +#ifdef USE_ITHREADS + MUTEX_UNLOCK(<_op_map_mutex); +#endif +} + /* --- Hooks --------------------------------------------------------------- */ /* ... Our pp_padsv ........................................................ */ @@ -313,25 +430,27 @@ STATIC OP *lt_pp_padsv(pTHX) { return CALL_FPTR(PL_ppaddr[OP_PADSV])(aTHX); } -STATIC OP *(*lt_pp_padsv_saved)(pTHX) = 0; - -STATIC void lt_pp_padsv_save(void) { - if (lt_pp_padsv_saved) +STATIC void lt_pp_padsv_save(pMY_CXT) { +#define lt_pp_padsv_save() lt_pp_padsv_save(aMY_CXT) + if (MY_CXT.pp_padsv_saved) return; - lt_pp_padsv_saved = PL_ppaddr[OP_PADSV]; - PL_ppaddr[OP_PADSV] = lt_pp_padsv; + MY_CXT.pp_padsv_saved = PL_ppaddr[OP_PADSV]; + PL_ppaddr[OP_PADSV] = lt_pp_padsv; } -STATIC void lt_pp_padsv_restore(OP *o) { - if (!lt_pp_padsv_saved) +STATIC void lt_pp_padsv_restore(pMY_CXT_ OP *o) { +#define lt_pp_padsv_restore(O) lt_pp_padsv_restore(aMY_CXT_ (O)) + OP *(*saved)(pTHX) = MY_CXT.pp_padsv_saved; + + if (!saved) return; if (o->op_ppaddr == lt_pp_padsv) - o->op_ppaddr = lt_pp_padsv_saved; + o->op_ppaddr = saved; - PL_ppaddr[OP_PADSV] = lt_pp_padsv_saved; - lt_pp_padsv_saved = 0; + PL_ppaddr[OP_PADSV] = saved; + MY_CXT.pp_padsv_saved = 0; } /* ... Our ck_pad{any,sv} .................................................. */ @@ -350,63 +469,61 @@ STATIC OP *(*lt_old_ck_padany)(pTHX_ OP *) = 0; STATIC OP *lt_ck_padany(pTHX_ OP *o) { HV *stash; - SV *hint; + SV *code; + dMY_CXT; lt_pp_padsv_restore(o); o = CALL_FPTR(lt_old_ck_padany)(aTHX_ o); stash = PL_in_my_stash; - if (stash && (hint = lt_hint())) { + if (stash && (code = lt_hint())) { SV *orig_pkg = newSVpvn(HvNAME_get(stash), HvNAMELEN_get(stash)); SV *orig_meth = lt_default_meth; SV *type_pkg = NULL; SV *type_meth = NULL; - SV *code = lt_detag(hint); - - SvREADONLY_on(orig_pkg); - - if (code) { - int items; - dSP; + int items; - ENTER; - SAVETMPS; + dSP; - PUSHMARK(SP); - EXTEND(SP, 2); - PUSHs(orig_pkg); - PUSHs(orig_meth); - PUTBACK; - - items = call_sv(code, G_ARRAY); + SvREADONLY_on(orig_pkg); - SPAGAIN; - if (items > 2) - croak(__PACKAGE__ " mangler should return zero, one or two scalars, but got %d", items); - if (items == 0) { - SvREFCNT_dec(orig_pkg); - goto skip; - } else { - SV *rsv; - if (items > 1) { - rsv = POPs; - if (SvOK(rsv)) { - type_meth = newSVsv(rsv); - SvREADONLY_on(type_meth); - } - } + ENTER; + SAVETMPS; + + PUSHMARK(SP); + EXTEND(SP, 2); + PUSHs(orig_pkg); + PUSHs(orig_meth); + PUTBACK; + + items = call_sv(code, G_ARRAY); + + SPAGAIN; + if (items > 2) + croak(__PACKAGE__ " mangler should return zero, one or two scalars, but got %d", items); + if (items == 0) { + SvREFCNT_dec(orig_pkg); + goto skip; + } else { + SV *rsv; + if (items > 1) { rsv = POPs; if (SvOK(rsv)) { - type_pkg = newSVsv(rsv); - SvREADONLY_on(type_pkg); + type_meth = newSVsv(rsv); + SvREADONLY_on(type_meth); } } - PUTBACK; - - FREETMPS; - LEAVE; + rsv = POPs; + if (SvOK(rsv)) { + type_pkg = newSVsv(rsv); + SvREADONLY_on(type_pkg); + } } + PUTBACK; + + FREETMPS; + LEAVE; if (!type_pkg) { type_pkg = orig_pkg; @@ -420,18 +537,24 @@ STATIC OP *lt_ck_padany(pTHX_ OP *o) { lt_pp_padsv_save(); - lt_map_store(o, orig_pkg, type_pkg, type_meth, lt_pp_padsv_saved); + lt_map_store(o, orig_pkg, type_pkg, type_meth, MY_CXT.pp_padsv_saved); + } else { +skip: + lt_map_delete(o); } -skip: return o; } STATIC OP *(*lt_old_ck_padsv)(pTHX_ OP *) = 0; STATIC OP *lt_ck_padsv(pTHX_ OP *o) { + dMY_CXT; + lt_pp_padsv_restore(o); + lt_map_delete(o); + return CALL_FPTR(lt_old_ck_padsv)(aTHX_ o); } @@ -447,11 +570,15 @@ BOOT: { if (!lt_initialized++) { HV *stash; -#if LT_THREADSAFE + MY_CXT_INIT; - MY_CXT.tbl = ptable_new(); - MY_CXT.owner = aTHX; +#if LT_THREADSAFE || LT_WORKAROUND_REQUIRE_PROPAGATION + MY_CXT.tbl = ptable_new(); +#endif +#if LT_THREADSAFE + MY_CXT.owner = aTHX; #endif + MY_CXT.pp_padsv_saved = 0; lt_op_map = ptable_new(); #ifdef USE_ITHREADS @@ -491,8 +618,9 @@ CODE: } { MY_CXT_CLONE; - MY_CXT.tbl = t; - MY_CXT.owner = aTHX; + MY_CXT.tbl = t; + MY_CXT.owner = aTHX; + MY_CXT.pp_padsv_saved = 0; } { level = PerlMemShared_malloc(sizeof *level);