X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Types.xs;h=46aa91628eec598ce7bbf3f1e95e8147138b5078;hb=560cde18a2e72b9d674617c7570cd3cafc498779;hp=f22d034577974e4dbd7dea2575e87f15b006b80e;hpb=0452d568e77d6b3dbb1242e14deb4fe356c48bcc;p=perl%2Fmodules%2FLexical-Types.git diff --git a/Types.xs b/Types.xs index f22d034..46aa916 100644 --- a/Types.xs +++ b/Types.xs @@ -124,6 +124,7 @@ typedef struct { #if LT_THREADSAFE tTHX owner; #endif + SV *default_meth; OP * (*pp_padsv_saved)(pTHX); } my_cxt_t; @@ -133,6 +134,29 @@ START_MY_CXT #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); + } + + return SvREFCNT_inc(dupsv); +} + STATIC void lt_ptable_hints_clone(pTHX_ ptable_ent *ent, void *ud_) { my_cxt_t *ud = ud_; lt_hint_t *h1 = ent->val; @@ -140,19 +164,8 @@ STATIC void lt_ptable_hints_clone(pTHX_ ptable_ent *ent, void *ud_) { *h2 = *h1; - if (ud->owner != aTHX) { - SV *val = h1->code; - 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; - h2->code = sv_dup(val, ¶m); - if (stashes) { - av_undef(stashes); - SvREFCNT_dec(stashes); - } - } + if (ud->owner != aTHX) + h2->code = lt_clone(h1->code, ud->owner); ptable_hints_store(ud->tbl, ent->key, h2); SvREFCNT_inc(h2->code); @@ -307,14 +320,19 @@ STATIC perl_mutex lt_op_map_mutex; #endif typedef struct { +#ifdef MULTIPLICITY + STRLEN buf_size, orig_pkg_len, type_pkg_len, type_meth_len; + char *buf; +#else /* MULTIPLICITY */ SV *orig_pkg; SV *type_pkg; SV *type_meth; +#endif /* !MULTIPLICITY */ OP *(*pp_padsv)(pTHX); } lt_op_info; -STATIC void lt_map_store(pPTBLMS_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*pp_padsv)(pTHX)) { -#define lt_map_store(O, OP, TP, TM, PP) lt_map_store(aPTBLMS_ (O), (OP), (TP), (TM), (PP)) +STATIC void lt_map_store(pTHX_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*pp_padsv)(pTHX)) { +#define lt_map_store(O, OP, TP, TM, PP) lt_map_store(aTHX_ (O), (OP), (TP), (TM), (PP)) lt_op_info *oi; #ifdef USE_ITHREADS @@ -324,11 +342,48 @@ STATIC void lt_map_store(pPTBLMS_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *t if (!(oi = ptable_fetch(lt_op_map, o))) { oi = PerlMemShared_malloc(sizeof *oi); ptable_map_store(lt_op_map, o, oi); +#ifdef MULTIPLICITY + oi->buf = NULL; + oi->buf_size = 0; +#else /* MULTIPLICITY */ + } else { + SvREFCNT_dec(oi->orig_pkg); + SvREFCNT_dec(oi->type_pkg); + SvREFCNT_dec(oi->type_meth); +#endif /* !MULTIPLICITY */ } +#ifdef MULTIPLICITY + { + STRLEN op_len = SvCUR(orig_pkg); + STRLEN tp_len = SvCUR(type_pkg); + STRLEN tm_len = SvCUR(type_meth); + STRLEN new_buf_size = op_len + tp_len + tm_len; + char *buf; + if (new_buf_size > oi->buf_size) { + PerlMemShared_free(oi->buf); + oi->buf = PerlMemShared_malloc(new_buf_size); + oi->buf_size = new_buf_size; + } + buf = oi->buf; + Copy(SvPVX(orig_pkg), buf, op_len, char); + buf += op_len; + Copy(SvPVX(type_pkg), buf, tp_len, char); + buf += tp_len; + Copy(SvPVX(type_meth), buf, tm_len, char); + oi->orig_pkg_len = op_len; + oi->type_pkg_len = tp_len; + oi->type_meth_len = tm_len; + SvREFCNT_dec(orig_pkg); + SvREFCNT_dec(type_pkg); + SvREFCNT_dec(type_meth); + } +#else /* MULTIPLICITY */ oi->orig_pkg = orig_pkg; oi->type_pkg = type_pkg; oi->type_meth = type_meth; +#endif /* !MULTIPLICITY */ + oi->pp_padsv = pp_padsv; #ifdef USE_ITHREADS @@ -381,20 +436,40 @@ STATIC OP *lt_pp_padsv(pTHX) { SV *sv = PAD_SVl(targ); if (sv) { + SV *orig_pkg, *type_pkg, *type_meth; int items; dSP; ENTER; SAVETMPS; +#ifdef MULTIPLICITY + { + STRLEN op_len = oi.orig_pkg_len, tp_len = oi.type_pkg_len; + char *buf = oi.buf; + orig_pkg = sv_2mortal(newSVpvn(buf, op_len)); + SvREADONLY_on(orig_pkg); + buf += op_len; + type_pkg = sv_2mortal(newSVpvn(buf, tp_len)); + SvREADONLY_on(type_pkg); + buf += tp_len; + type_meth = sv_2mortal(newSVpvn(buf, oi.type_meth_len)); + SvREADONLY_on(type_meth); + } +#else /* MULTIPLICITY */ + orig_pkg = oi.orig_pkg; + type_pkg = oi.type_pkg; + type_meth = oi.type_meth; +#endif /* !MULTIPLICITY */ + PUSHMARK(SP); EXTEND(SP, 3); - PUSHs(oi.type_pkg); + PUSHs(type_pkg); PUSHs(sv); - PUSHs(oi.orig_pkg); + PUSHs(orig_pkg); PUTBACK; - items = call_sv(oi.type_meth, G_ARRAY | G_METHOD); + items = call_sv(type_meth, G_ARRAY | G_METHOD); SPAGAIN; switch (items) { @@ -451,8 +526,6 @@ STATIC void lt_pp_padsv_restore(pMY_CXT_ OP *o) { * pp_padsv, but much less than if we would have set PL_ppaddr[OP_PADSV] * globally. */ -STATIC SV *lt_default_meth = NULL; - STATIC OP *(*lt_old_ck_padany)(pTHX_ OP *) = 0; STATIC OP *lt_ck_padany(pTHX_ OP *o) { @@ -467,7 +540,7 @@ STATIC OP *lt_ck_padany(pTHX_ OP *o) { stash = PL_in_my_stash; if (stash && (code = lt_hint())) { SV *orig_pkg = newSVpvn(HvNAME_get(stash), HvNAMELEN_get(stash)); - SV *orig_meth = lt_default_meth; + SV *orig_meth = MY_CXT.default_meth; SV *type_pkg = NULL; SV *type_meth = NULL; int items; @@ -567,15 +640,14 @@ BOOT: MY_CXT.owner = aTHX; #endif MY_CXT.pp_padsv_saved = 0; + MY_CXT.default_meth = newSVpvn("TYPEDSCALAR", 11); + SvREADONLY_on(MY_CXT.default_meth); lt_op_map = ptable_new(); #ifdef USE_ITHREADS MUTEX_INIT(<_op_map_mutex); #endif - lt_default_meth = newSVpvn("TYPEDSCALAR", 11); - SvREADONLY_on(lt_default_meth); - PERL_HASH(lt_hash, __PACKAGE__, __PACKAGE_LEN__); lt_old_ck_padany = PL_check[OP_PADANY]; @@ -596,6 +668,7 @@ PROTOTYPE: DISABLE PREINIT: ptable *t; int *level; + SV *cloned_default_meth; CODE: { my_cxt_t ud; @@ -603,12 +676,14 @@ CODE: ud.tbl = t = ptable_new(); ud.owner = MY_CXT.owner; ptable_walk(MY_CXT.tbl, lt_ptable_hints_clone, &ud); + cloned_default_meth = lt_clone(MY_CXT.default_meth, MY_CXT.owner); } { MY_CXT_CLONE; MY_CXT.tbl = t; MY_CXT.owner = aTHX; MY_CXT.pp_padsv_saved = 0; + MY_CXT.default_meth = cloned_default_meth; } { level = PerlMemShared_malloc(sizeof *level);