X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FVariable-Magic.git;a=blobdiff_plain;f=Magic.xs;h=c199f7eb2e5847a3e411c4c9b32fe73f3a46073a;hp=70b26173e11b3f9b128967cc9489cd746c6cd4fc;hb=ae89b589d2187cf0ed57bbb6132b9d4a8da29abb;hpb=c82a0127ec7ea6da80e943d0bf32bcf4052f429c diff --git a/Magic.xs b/Magic.xs index 70b2617..c199f7e 100644 --- a/Magic.xs +++ b/Magic.xs @@ -12,6 +12,13 @@ #define __PACKAGE__ "Variable::Magic" +#undef VOID2 +#ifdef __cplusplus +# define VOID2(T, P) static_cast(P) +#else +# define VOID2(T, P) (P) +#endif + #ifndef VMG_PERL_PATCHLEVEL # ifdef PERL_PATCHNUM # define VMG_PERL_PATCHLEVEL PERL_PATCHNUM @@ -48,9 +55,6 @@ # define VMG_MULTIPLICITY 0 # endif #endif -#if VMG_MULTIPLICITY && !defined(tTHX) -# define tTHX PerlInterpreter* -#endif #if VMG_MULTIPLICITY && defined(USE_ITHREADS) && defined(dMY_CXT) && defined(MY_CXT) && defined(START_MY_CXT) && defined(MY_CXT_INIT) && (defined(MY_CXT_CLONE) || defined(dMY_CXT_SV)) # define VMG_THREADSAFE 1 @@ -76,19 +80,12 @@ #endif #if VMG_THREADSAFE - -STATIC SV *vmg_clone(pTHX_ SV *sv, tTHX owner) { -#define vmg_clone(P, O) vmg_clone(aTHX_ (P), (O)) - CLONE_PARAMS param; - - param.stashes = NULL; /* don't need it unless sv is a PVHV */ - param.flags = 0; - param.proto_perl = owner; - - return SvREFCNT_inc(sv_dup(sv, ¶m)); -} - -#endif /* VMG_THREADSAFE */ +# define VMG_LOCK(M) MUTEX_LOCK(M) +# define VMG_UNLOCK(M) MUTEX_UNLOCK(M) +#else +# define VMG_LOCK(M) +# define VMG_UNLOCK(M) +#endif /* --- Compatibility ------------------------------------------------------- */ @@ -100,12 +97,16 @@ STATIC SV *vmg_clone(pTHX_ SV *sv, tTHX owner) { # define SvMAGIC_set(sv, val) (SvMAGIC(sv) = (val)) #endif -#ifndef mPUSHu -# define mPUSHu(U) PUSHs(sv_2mortal(newSVuv(U))) +#ifndef SvRV_const +# define SvRV_const(sv) SvRV((SV *) sv) #endif -#ifndef SvPV_const -# define SvPV_const SvPV +#ifndef SvREFCNT_inc_simple_void +# define SvREFCNT_inc_simple_void(sv) ((void) SvREFCNT_inc(sv)) +#endif + +#ifndef mPUSHu +# define mPUSHu(U) PUSHs(sv_2mortal(newSVuv(U))) #endif #ifndef PERL_MAGIC_ext @@ -116,14 +117,6 @@ STATIC SV *vmg_clone(pTHX_ SV *sv, tTHX owner) { # define PERL_MAGIC_tied 'P' #endif -#ifndef MGf_COPY -# define MGf_COPY 0 -#endif - -#ifndef MGf_DUP -# define MGf_DUP 0 -#endif - #ifndef MGf_LOCAL # define MGf_LOCAL 0 #endif @@ -132,31 +125,35 @@ STATIC SV *vmg_clone(pTHX_ SV *sv, tTHX owner) { # define IN_PERL_COMPILETIME (PL_curcop == &PL_compiling) #endif -#if VMG_HAS_PERL(5, 10, 0) || defined(PL_parser) -# ifndef PL_error_count -# define PL_error_count PL_parser->error_count -# endif -#else -# ifndef PL_error_count -# define PL_error_count PL_Ierror_count -# endif -#endif - -/* uvar magic and Hash::Util::FieldHash were commited with 28419, but only - * enable it on 5.10 */ +/* uvar magic and Hash::Util::FieldHash were commited with 28419, but we only + * enable them on 5.10 */ #if VMG_HAS_PERL(5, 10, 0) # define VMG_UVAR 1 #else # define VMG_UVAR 0 #endif +#if VMG_HAS_PERL_MAINT(5, 11, 0, 32969) || VMG_HAS_PERL(5, 12, 0) +# define VMG_COMPAT_SCALAR_LENGTH_NOLEN 1 +#else +# define VMG_COMPAT_SCALAR_LENGTH_NOLEN 0 +#endif + +#if VMG_HAS_PERL(5, 17, 4) +# define VMG_COMPAT_SCALAR_NOLEN 1 +#else +# define VMG_COMPAT_SCALAR_NOLEN 0 +#endif + /* Applied to dev-5.9 as 25854, integrated to maint-5.8 as 28160, partially * reverted to dev-5.11 as 9cdcb38b */ #if VMG_HAS_PERL_MAINT(5, 8, 9, 28160) || VMG_HAS_PERL_MAINT(5, 9, 3, 25854) || VMG_HAS_PERL(5, 10, 0) # ifndef VMG_COMPAT_ARRAY_PUSH_NOLEN -/* This branch should only apply for perls before the official 5.11.0 release. - * Makefile.PL takes care of the higher ones. */ -# define VMG_COMPAT_ARRAY_PUSH_NOLEN 1 +# if VMG_HAS_PERL(5, 11, 0) +# define VMG_COMPAT_ARRAY_PUSH_NOLEN 0 +# else +# define VMG_COMPAT_ARRAY_PUSH_NOLEN 1 +# endif # endif # ifndef VMG_COMPAT_ARRAY_PUSH_NOLEN_VOID # define VMG_COMPAT_ARRAY_PUSH_NOLEN_VOID 1 @@ -171,7 +168,7 @@ STATIC SV *vmg_clone(pTHX_ SV *sv, tTHX owner) { #endif /* Applied to dev-5.11 as 34908 */ -#if VMG_HAS_PERL_MAINT(5, 11, 0, 34908) +#if VMG_HAS_PERL_MAINT(5, 11, 0, 34908) || VMG_HAS_PERL(5, 12, 0) # define VMG_COMPAT_ARRAY_UNSHIFT_NOLEN_VOID 1 #else # define VMG_COMPAT_ARRAY_UNSHIFT_NOLEN_VOID 0 @@ -184,35 +181,152 @@ STATIC SV *vmg_clone(pTHX_ SV *sv, tTHX owner) { # define VMG_COMPAT_ARRAY_UNDEF_CLEAR 0 #endif -#if VMG_HAS_PERL_MAINT(5, 11, 0, 32969) -# define VMG_COMPAT_SCALAR_LENGTH_NOLEN 1 +#if VMG_HAS_PERL(5, 11, 0) +# define VMG_COMPAT_HASH_DELETE_NOUVAR_VOID 1 #else -# define VMG_COMPAT_SCALAR_LENGTH_NOLEN 0 +# define VMG_COMPAT_HASH_DELETE_NOUVAR_VOID 0 #endif -#if VMG_UVAR +#if VMG_HAS_PERL(5, 13, 2) +# define VMG_COMPAT_GLOB_GET 1 +#else +# define VMG_COMPAT_GLOB_GET 0 +#endif + +#define VMG_PROPAGATE_ERRSV_NEEDS_TRAMPOLINE (VMG_HAS_PERL(5, 10, 0) && !VMG_HAS_PERL(5, 10, 1)) + +/* NewOp() isn't public in perl 5.8.0. */ +#define VMG_RESET_RMG_NEEDS_TRAMPOLINE (VMG_UVAR && (VMG_THREADSAFE || !VMG_HAS_PERL(5, 8, 1))) + +/* ... Bug-free mg_magical ................................................. */ + +/* See the discussion at http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2008-01/msg00036.html */ + +#if VMG_HAS_PERL(5, 11, 3) + +#define vmg_mg_magical(S) mg_magical(S) -/* Bug-free mg_magical - see http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2008-01/msg00036.html - but specialized to our needs. */ -STATIC void vmg_sv_magicuvar(pTHX_ SV *sv, const char *uf, I32 len) { -#define vmg_sv_magicuvar(S, U, L) vmg_sv_magicuvar(aTHX_ (S), (U), (L)) - const MAGIC* mg; - sv_magic(sv, NULL, PERL_MAGIC_uvar, uf, len); - /* uvar magic has set and get magic, hence this has set SVs_GMG and SVs_SMG. */ +#else + +STATIC void vmg_mg_magical(SV *sv) { + const MAGIC *mg; + + SvMAGICAL_off(sv); if ((mg = SvMAGIC(sv))) { - SvRMAGICAL_off(sv); do { const MGVTBL* const vtbl = mg->mg_virtual; if (vtbl) { - if (vtbl->svt_clear) { + if (vtbl->svt_get && !(mg->mg_flags & MGf_GSKIP)) + SvGMAGICAL_on(sv); + if (vtbl->svt_set) + SvSMAGICAL_on(sv); + if (vtbl->svt_clear) SvRMAGICAL_on(sv); - break; - } } } while ((mg = mg->mg_moremagic)); + if (!(SvFLAGS(sv) & (SVs_GMG|SVs_SMG))) + SvRMAGICAL_on(sv); } } -#endif /* VMG_UVAR */ +#endif + +/* --- Trampoline ops ------------------------------------------------------ */ + +#define VMG_NEEDS_TRAMPOLINE VMG_PROPAGATE_ERRSV_NEEDS_TRAMPOLINE || VMG_RESET_RMG_NEEDS_TRAMPOLINE + +#if VMG_NEEDS_TRAMPOLINE + +typedef struct { + OP temp; + SVOP target; +} vmg_trampoline; + +STATIC void vmg_trampoline_init(vmg_trampoline *t, OP *(*cb)(pTHX)) { + t->temp.op_type = OP_STUB; + t->temp.op_ppaddr = 0; + t->temp.op_next = (OP *) &t->target; + t->temp.op_flags = 0; + t->temp.op_private = 0; + + t->target.op_type = OP_STUB; + t->target.op_ppaddr = cb; + t->target.op_next = NULL; + t->target.op_flags = 0; + t->target.op_private = 0; + t->target.op_sv = NULL; +} + +STATIC OP *vmg_trampoline_bump(pTHX_ vmg_trampoline *t, SV *sv, OP *o) { +#define vmg_trampoline_bump(T, S, O) vmg_trampoline_bump(aTHX_ (T), (S), (O)) + t->temp = *o; + t->temp.op_next = (OP *) &t->target; + + t->target.op_sv = sv; + t->target.op_next = o->op_next; + + return &t->temp; +} + +#endif /* VMG_NEEDS_TRAMPOLINE */ + +/* --- Safe version of call_sv() ------------------------------------------- */ + +STATIC I32 vmg_call_sv(pTHX_ SV *sv, I32 flags, int (*cleanup)(pTHX_ void *), void *ud) { +#define vmg_call_sv(S, F, C, U) vmg_call_sv(aTHX_ (S), (F), (C), (U)) + I32 ret, cxix; + PERL_CONTEXT saved_cx; + SV *old_err = NULL; + + if (SvTRUE(ERRSV)) { + old_err = ERRSV; + ERRSV = newSV(0); + } + + cxix = (cxstack_ix < cxstack_max) ? (cxstack_ix + 1) : Perl_cxinc(aTHX); + /* The last popped context will be reused by call_sv(), but our callers may + * still need its previous value. Back it up so that it isn't clobbered. */ + saved_cx = cxstack[cxix]; + + ret = call_sv(sv, flags | G_EVAL); + + cxstack[cxix] = saved_cx; + + if (SvTRUE(ERRSV)) { + if (old_err) { + sv_setsv(old_err, ERRSV); + SvREFCNT_dec(ERRSV); + ERRSV = old_err; + } + if (IN_PERL_COMPILETIME) { + if (!PL_in_eval) { + if (PL_errors) + sv_catsv(PL_errors, ERRSV); + else + Perl_warn(aTHX_ "%s", SvPV_nolen(ERRSV)); + SvCUR_set(ERRSV, 0); + } +#if VMG_HAS_PERL(5, 10, 0) || defined(PL_parser) + if (PL_parser) + ++PL_parser->error_count; +#elif defined(PL_error_count) + ++PL_error_count; +#else + ++PL_Ierror_count; +#endif + } else { + if (!cleanup || cleanup(aTHX_ ud)) + croak(NULL); + } + } else { + if (old_err) { + SvREFCNT_dec(ERRSV); + ERRSV = old_err; + } + } + + return ret; +} /* --- Stolen chunk of B --------------------------------------------------- */ @@ -260,9 +374,11 @@ STATIC opclass vmg_opclass(const OP *o) { return ((o->op_private & OPpASSIGN_BACKWARDS) ? OPc_UNOP : OPc_BINOP); if (o->op_type == OP_AELEMFAST) { +#if PERL_VERSION <= 14 if (o->op_flags & OPf_SPECIAL) return OPc_BASEOP; else +#endif #ifdef USE_ITHREADS return OPc_PADOP; #else @@ -325,67 +441,161 @@ STATIC const char vmg_invalid_wiz[] = "Invalid wizard object"; STATIC const char vmg_wrongargnum[] = "Wrong number of arguments"; STATIC const char vmg_argstorefailed[] = "Error while storing arguments"; -/* --- Signatures ---------------------------------------------------------- */ +/* --- Context-safe global data -------------------------------------------- */ -#define SIG_WZO ((U16) (0x3891)) -#define SIG_WIZ ((U16) (0x3892)) +#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION -/* --- MGWIZ structure ----------------------------------------------------- */ +typedef struct { + HV *b__op_stashes[OPc_MAX]; + I32 depth; + MAGIC *freed_tokens; +#if VMG_PROPAGATE_ERRSV_NEEDS_TRAMPOLINE + vmg_trampoline propagate_errsv; +#endif +#if VMG_RESET_RMG_NEEDS_TRAMPOLINE + vmg_trampoline reset_rmg; +#endif +} my_cxt_t; + +START_MY_CXT + +/* --- structure ---------------------------------------------- */ + +#if VMG_THREADSAFE typedef struct { MGVTBL *vtbl; + U32 refcount; +} vmg_vtable; + +STATIC vmg_vtable *vmg_vtable_alloc(pTHX) { +#define vmg_vtable_alloc() vmg_vtable_alloc(aTHX) + vmg_vtable *t; + + t = VOID2(vmg_vtable *, PerlMemShared_malloc(sizeof *t)); + + t->vtbl = VOID2(MGVTBL *, PerlMemShared_malloc(sizeof *t->vtbl)); + t->refcount = 1; + + return t; +} + +#define vmg_vtable_vtbl(T) (T)->vtbl + +STATIC perl_mutex vmg_vtable_refcount_mutex; + +STATIC vmg_vtable *vmg_vtable_dup(pTHX_ vmg_vtable *t) { +#define vmg_vtable_dup(T) vmg_vtable_dup(aTHX_ (T)) + VMG_LOCK(&vmg_vtable_refcount_mutex); + ++t->refcount; + VMG_UNLOCK(&vmg_vtable_refcount_mutex); + + return t; +} + +STATIC void vmg_vtable_free(pTHX_ vmg_vtable *t) { +#define vmg_vtable_free(T) vmg_vtable_free(aTHX_ (T)) + U32 refcount; + + VMG_LOCK(&vmg_vtable_refcount_mutex); + refcount = --t->refcount; + VMG_UNLOCK(&vmg_vtable_refcount_mutex); + + if (!refcount) { + PerlMemShared_free(t->vtbl); + PerlMemShared_free(t); + } +} + +#else /* VMG_THREADSAFE */ + +typedef MGVTBL vmg_vtable; + +STATIC vmg_vtable *vmg_vtable_alloc(pTHX) { +#define vmg_vtable_alloc() vmg_vtable_alloc(aTHX) + vmg_vtable *t; + + Newx(t, 1, vmg_vtable); + + return t; +} + +#define vmg_vtable_vtbl(T) ((MGVTBL *) (T)) + +#define vmg_vtable_free(T) Safefree(T) + +#endif /* !VMG_THREADSAFE */ + +/* --- structure ---------------------------------------------- */ + +typedef struct { + vmg_vtable *vtable; - U8 uvar; U8 opinfo; + U8 uvar; SV *cb_data; SV *cb_get, *cb_set, *cb_len, *cb_clear, *cb_free; -#if MGf_COPY SV *cb_copy; -#endif /* MGf_COPY */ -#if MGf_DUP SV *cb_dup; -#endif /* MGf_DUP */ #if MGf_LOCAL SV *cb_local; #endif /* MGf_LOCAL */ #if VMG_UVAR SV *cb_fetch, *cb_store, *cb_exists, *cb_delete; #endif /* VMG_UVAR */ +} vmg_wizard; -#if VMG_MULTIPLICITY - tTHX owner; -#endif /* VMG_MULTIPLICITY */ -} MGWIZ; +STATIC void vmg_op_info_init(pTHX_ unsigned int opinfo); -STATIC void vmg_mgwiz_free(pTHX_ MGWIZ *w) { -#define vmg_mgwiz_free(W) vmg_mgwiz_free(aTHX_ (W)) +STATIC vmg_wizard *vmg_wizard_alloc(pTHX_ UV opinfo) { +#define vmg_wizard_alloc(O) vmg_wizard_alloc(aTHX_ (O)) + vmg_wizard *w; + + Newx(w, 1, vmg_wizard); + + w->uvar = 0; + w->opinfo = (U8) ((opinfo < 255) ? opinfo : 255); + if (w->opinfo) + vmg_op_info_init(aTHX_ w->opinfo); + + w->vtable = vmg_vtable_alloc(); + + return w; +} + +STATIC void vmg_wizard_free(pTHX_ vmg_wizard *w) { +#define vmg_wizard_free(W) vmg_wizard_free(aTHX_ (W)) if (!w) return; - if (w->cb_data) SvREFCNT_dec(SvRV(w->cb_data)); - if (w->cb_get) SvREFCNT_dec(SvRV(w->cb_get)); - if (w->cb_set) SvREFCNT_dec(SvRV(w->cb_set)); - if (w->cb_len) SvREFCNT_dec(SvRV(w->cb_len)); - if (w->cb_clear) SvREFCNT_dec(SvRV(w->cb_clear)); - if (w->cb_free) SvREFCNT_dec(SvRV(w->cb_free)); -#if MGf_COPY - if (w->cb_copy) SvREFCNT_dec(SvRV(w->cb_copy)); -#endif /* MGf_COPY */ -#if 0 /* MGf_DUP */ - if (w->cb_dup) SvREFCNT_dec(SvRV(w->cb_dup)); -#endif /* MGf_DUP */ + /* During global destruction, any of the callbacks may already have been + * freed, so we can't rely on still being able to access them. */ + if (!PL_dirty) { + SvREFCNT_dec(w->cb_data); + SvREFCNT_dec(w->cb_get); + SvREFCNT_dec(w->cb_set); + SvREFCNT_dec(w->cb_len); + SvREFCNT_dec(w->cb_clear); + SvREFCNT_dec(w->cb_free); + SvREFCNT_dec(w->cb_copy); +#if 0 + SvREFCNT_dec(w->cb_dup); +#endif #if MGf_LOCAL - if (w->cb_local) SvREFCNT_dec(SvRV(w->cb_local)); + SvREFCNT_dec(w->cb_local); #endif /* MGf_LOCAL */ #if VMG_UVAR - if (w->cb_fetch) SvREFCNT_dec(SvRV(w->cb_fetch)); - if (w->cb_store) SvREFCNT_dec(SvRV(w->cb_store)); - if (w->cb_exists) SvREFCNT_dec(SvRV(w->cb_exists)); - if (w->cb_delete) SvREFCNT_dec(SvRV(w->cb_delete)); + SvREFCNT_dec(w->cb_fetch); + SvREFCNT_dec(w->cb_store); + SvREFCNT_dec(w->cb_exists); + SvREFCNT_dec(w->cb_delete); #endif /* VMG_UVAR */ + } - Safefree(w->vtbl); + /* PerlMemShared_free() and Safefree() are still fine during global + * destruction though. */ + vmg_vtable_free(w->vtable); Safefree(w); return; @@ -394,24 +604,19 @@ STATIC void vmg_mgwiz_free(pTHX_ MGWIZ *w) { #if VMG_THREADSAFE #define VMG_CLONE_CB(N) \ - z->cb_ ## N = (w->cb_ ## N) ? newRV_noinc(vmg_clone(SvRV(w->cb_ ## N), \ - w->owner)) \ + z->cb_ ## N = (w->cb_ ## N) ? SvREFCNT_inc(sv_dup(w->cb_ ## N, params)) \ : NULL; -STATIC MGWIZ *vmg_mgwiz_clone(pTHX_ const MGWIZ *w) { -#define vmg_mgwiz_clone(W) vmg_mgwiz_clone(aTHX_ (W)) - MGVTBL *t; - MGWIZ *z; +STATIC const vmg_wizard *vmg_wizard_dup(pTHX_ const vmg_wizard *w, CLONE_PARAMS *params) { +#define vmg_wizard_dup(W, P) vmg_wizard_dup(aTHX_ (W), (P)) + vmg_wizard *z; if (!w) return NULL; - Newx(t, 1, MGVTBL); - Copy(w->vtbl, t, 1, MGVTBL); - - Newx(z, 1, MGWIZ); + Newx(z, 1, vmg_wizard); - z->vtbl = t; + z->vtable = vmg_vtable_dup(w->vtable); z->uvar = w->uvar; z->opinfo = w->opinfo; @@ -421,12 +626,8 @@ STATIC MGWIZ *vmg_mgwiz_clone(pTHX_ const MGWIZ *w) { VMG_CLONE_CB(len); VMG_CLONE_CB(clear); VMG_CLONE_CB(free); -#if MGf_COPY VMG_CLONE_CB(copy); -#endif /* MGf_COPY */ -#if MGf_DUP VMG_CLONE_CB(dup); -#endif /* MGf_DUP */ #if MGf_LOCAL VMG_CLONE_CB(local); #endif /* MGf_LOCAL */ @@ -437,188 +638,125 @@ STATIC MGWIZ *vmg_mgwiz_clone(pTHX_ const MGWIZ *w) { VMG_CLONE_CB(delete); #endif /* VMG_UVAR */ - z->owner = aTHX; - return z; } #endif /* VMG_THREADSAFE */ -/* --- Context-safe global data -------------------------------------------- */ - -#if VMG_THREADSAFE +#define vmg_wizard_id(W) PTR2IV(vmg_vtable_vtbl((W)->vtable)) -#define PTABLE_NAME ptable -#define PTABLE_VAL_FREE(V) vmg_mgwiz_free(V) +/* --- Wizard SV objects --------------------------------------------------- */ -#define pPTBL pTHX -#define pPTBL_ pTHX_ -#define aPTBL aTHX -#define aPTBL_ aTHX_ +STATIC int vmg_wizard_sv_free(pTHX_ SV *sv, MAGIC *mg) { + vmg_wizard_free((vmg_wizard *) mg->mg_ptr); -#include "ptable.h" - -#define ptable_store(T, K, V) ptable_store(aTHX_ (T), (K), (V)) -#define ptable_clear(T) ptable_clear(aTHX_ (T)) -#define ptable_free(T) ptable_free(aTHX_ (T)) - -#endif /* VMG_THREADSAFE */ - -#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION - -typedef struct { -#if VMG_THREADSAFE - ptable *wizards; - tTHX owner; -#endif - HV *b__op_stashes[OPc_MAX]; -} my_cxt_t; - -START_MY_CXT + return 0; +} #if VMG_THREADSAFE -STATIC void vmg_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) { - my_cxt_t *ud = ud_; - MGWIZ *w; +STATIC int vmg_wizard_sv_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *params) { + mg->mg_ptr = (char *) vmg_wizard_dup((const vmg_wizard *) mg->mg_ptr, params); - if (ud->owner == aTHX) - return; - - w = vmg_mgwiz_clone(ent->val); - if (w) - ptable_store(ud->wizards, ent->key, w); + return 0; } -STATIC void vmg_thread_cleanup(pTHX_ void *); - -STATIC void vmg_thread_cleanup(pTHX_ void *ud) { - int *level = ud; - - if (*level) { - --*level; - LEAVE; - SAVEDESTRUCTOR_X(vmg_thread_cleanup, level); - ENTER; - } else { - dMY_CXT; - PerlMemShared_free(level); - ptable_free(MY_CXT.wizards); - } -} #endif /* VMG_THREADSAFE */ -/* --- Wizard objects ------------------------------------------------------ */ - -STATIC int vmg_wizard_free(pTHX_ SV *sv, MAGIC *mg); - -STATIC MGVTBL vmg_wizard_vtbl = { - NULL, /* get */ - NULL, /* set */ - NULL, /* len */ - NULL, /* clear */ - vmg_wizard_free, /* free */ -#if MGf_COPY - NULL, /* copy */ -#endif /* MGf_COPY */ -#if MGf_DUP - NULL, /* dup */ -#endif /* MGf_DUP */ +STATIC MGVTBL vmg_wizard_sv_vtbl = { + NULL, /* get */ + NULL, /* set */ + NULL, /* len */ + NULL, /* clear */ + vmg_wizard_sv_free, /* free */ + NULL, /* copy */ +#if VMG_THREADSAFE + vmg_wizard_sv_dup, /* dup */ +#else + NULL, /* dup */ +#endif #if MGf_LOCAL - NULL, /* local */ + NULL, /* local */ #endif /* MGf_LOCAL */ }; -/* ... Wizard constructor .................................................. */ +STATIC SV *vmg_wizard_sv_new(pTHX_ const vmg_wizard *w) { +#define vmg_wizard_sv_new(W) vmg_wizard_sv_new(aTHX_ (W)) + SV *wiz; -STATIC SV *vmg_wizard_new(pTHX_ const MGWIZ *w) { -#define vmg_wizard_new(W) vmg_wizard_new(aTHX_ (W)) - SV *wiz = newSVuv(PTR2IV(w)); +#if VMG_THREADSAFE + wiz = newSV(0); +#else + wiz = newSViv(PTR2IV(w)); +#endif if (w) { - MAGIC *mg = sv_magicext(wiz, NULL, PERL_MAGIC_ext, &vmg_wizard_vtbl, NULL, 0); - mg->mg_private = SIG_WZO; + MAGIC *mg = sv_magicext(wiz, NULL, PERL_MAGIC_ext, &vmg_wizard_sv_vtbl, + (const char *) w, 0); + mg->mg_private = 0; +#if VMG_THREADSAFE + mg->mg_flags |= MGf_DUP; +#endif } SvREADONLY_on(wiz); return wiz; } -STATIC const SV *vmg_wizard_validate(pTHX_ const SV *wiz) { -#define vmg_wizard_validate(W) vmg_wizard_validate(aTHX_ (W)) - if (SvROK(wiz)) { - wiz = SvRV(wiz); - if (SvIOK(wiz)) - return wiz; - } - - croak(vmg_invalid_wiz); -} - -#define vmg_wizard_id(W) SvIVX((const SV *) (W)) -#define vmg_wizard_main_mgwiz(W) INT2PTR(const MGWIZ *, vmg_wizard_id(W)) +#if VMG_THREADSAFE -/* ... Wizard destructor ................................................... */ +#define vmg_sv_has_wizard_type(S) (SvTYPE(S) >= SVt_PVMG) -STATIC int vmg_wizard_free(pTHX_ SV *sv, MAGIC *mg) { - MGWIZ *w; +STATIC const vmg_wizard *vmg_wizard_from_sv_nocheck(const SV *wiz) { + MAGIC *mg; - if (PL_dirty) /* During global destruction, the context is already freed */ - return 0; + for (mg = SvMAGIC(wiz); mg; mg = mg->mg_moremagic) { + if (mg->mg_type == PERL_MAGIC_ext && mg->mg_virtual == &vmg_wizard_sv_vtbl) + return (const vmg_wizard *) mg->mg_ptr; + } - w = (MGWIZ *) vmg_wizard_main_mgwiz(sv); + return NULL; +} -#if VMG_THREADSAFE - { - dMY_CXT; - ptable_store(MY_CXT.wizards, w, NULL); - } #else /* VMG_THREADSAFE */ - vmg_mgwiz_free(w); -#endif /* !VMG_THREADSAFE */ - return 0; -} +#define vmg_sv_has_wizard_type(S) SvIOK(S) -#if VMG_THREADSAFE +#define vmg_wizard_from_sv_nocheck(W) INT2PTR(const vmg_wizard *, SvIVX(W)) -STATIC const MGWIZ *vmg_wizard_mgwiz(pTHX_ const SV *wiz) { -#define vmg_wizard_mgwiz(W) vmg_wizard_mgwiz(aTHX_ ((const SV *) (W))) - const MGWIZ *w; +#endif /* !VMG_THREADSAFE */ - w = vmg_wizard_main_mgwiz(wiz); - if (w->owner == aTHX) - return w; +#define vmg_wizard_from_sv(W) (vmg_sv_has_wizard_type(W) ? vmg_wizard_from_sv_nocheck(W) : NULL) - { - dMY_CXT; - return ptable_fetch(MY_CXT.wizards, w); - } -} +STATIC const vmg_wizard *vmg_wizard_from_mg(const MAGIC *mg) { + if (mg->mg_type == PERL_MAGIC_ext && mg->mg_len == HEf_SVKEY) { + SV *sv = (SV *) mg->mg_ptr; -#else /* VMG_THREADSAFE */ + if (vmg_sv_has_wizard_type(sv)) + return vmg_wizard_from_sv_nocheck(sv); + } -#define vmg_wizard_mgwiz(W) vmg_wizard_main_mgwiz(W) + return NULL; +} -#endif /* !VMG_THREADSAFE */ +#define vmg_wizard_from_mg_nocheck(M) vmg_wizard_from_sv_nocheck((const SV *) (M)->mg_ptr) /* --- User-level functions implementation --------------------------------- */ -STATIC const MAGIC *vmg_find(const SV *sv, const SV *wiz) { - const MAGIC *mg, *moremagic; - UV wid; +STATIC const MAGIC *vmg_find(const SV *sv, const vmg_wizard *w) { + const MAGIC *mg; + IV wid; if (SvTYPE(sv) < SVt_PVMG) return NULL; - wid = vmg_wizard_id(wiz); - for (mg = SvMAGIC(sv); mg; mg = moremagic) { - moremagic = mg->mg_moremagic; - if (mg->mg_type == PERL_MAGIC_ext && mg->mg_private == SIG_WIZ) { - UV zid = vmg_wizard_id(mg->mg_ptr); - if (zid == wid) - return mg; - } + wid = vmg_wizard_id(w); + + for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) { + const vmg_wizard *z = vmg_wizard_from_mg(mg); + + if (z && vmg_wizard_id(z) == wid) + return mg; } return NULL; @@ -626,10 +764,10 @@ STATIC const MAGIC *vmg_find(const SV *sv, const SV *wiz) { /* ... Construct private data .............................................. */ -STATIC SV *vmg_data_new(pTHX_ SV *ctor, SV *sv, AV *args) { -#define vmg_data_new(C, S, A) vmg_data_new(aTHX_ (C), (S), (A)) +STATIC SV *vmg_data_new(pTHX_ SV *ctor, SV *sv, SV **args, I32 items) { +#define vmg_data_new(C, S, A, I) vmg_data_new(aTHX_ (C), (S), (A), (I)) + I32 i; SV *nsv; - I32 i, alen = (args == NULL) ? 0 : av_len(args); dSP; @@ -637,20 +775,20 @@ STATIC SV *vmg_data_new(pTHX_ SV *ctor, SV *sv, AV *args) { SAVETMPS; PUSHMARK(SP); - EXTEND(SP, alen + 1); + EXTEND(SP, items + 1); PUSHs(sv_2mortal(newRV_inc(sv))); - for (i = 0; i < alen; ++i) - PUSHs(*av_fetch(args, i, 0)); + for (i = 0; i < items; ++i) + PUSHs(args[i]); PUTBACK; - call_sv(ctor, G_SCALAR); + vmg_call_sv(ctor, G_SCALAR, 0, NULL); SPAGAIN; nsv = POPs; #if VMG_HAS_PERL(5, 8, 3) - SvREFCNT_inc(nsv); /* Or it will be destroyed in FREETMPS */ + SvREFCNT_inc_simple_void(nsv); /* Or it will be destroyed in FREETMPS */ #else - nsv = sv_newref(nsv); /* Workaround some bug in SvREFCNT_inc() */ + nsv = sv_newref(nsv); /* Workaround some bug in SvREFCNT_inc() */ #endif PUTBACK; @@ -660,55 +798,108 @@ STATIC SV *vmg_data_new(pTHX_ SV *ctor, SV *sv, AV *args) { return nsv; } -STATIC SV *vmg_data_get(pTHX_ SV *sv, const SV *wiz) { +STATIC SV *vmg_data_get(pTHX_ SV *sv, const vmg_wizard *w) { #define vmg_data_get(S, W) vmg_data_get(aTHX_ (S), (W)) - const MAGIC *mg = vmg_find(sv, wiz); + const MAGIC *mg = vmg_find(sv, w); + return mg ? mg->mg_obj : NULL; -} +} /* ... Magic cast/dispell .................................................. */ #if VMG_UVAR + STATIC I32 vmg_svt_val(pTHX_ IV, SV *); -STATIC void vmg_uvar_del(SV *sv, MAGIC *prevmagic, MAGIC *mg, MAGIC *moremagic) { - if (prevmagic) { +typedef struct { + struct ufuncs new_uf; + struct ufuncs old_uf; +} vmg_uvar_ud; + +#endif /* VMG_UVAR */ + +STATIC void vmg_mg_del(pTHX_ SV *sv, MAGIC *prevmagic, MAGIC *mg, MAGIC *moremagic) { +#define vmg_mg_del(S, P, M, N) vmg_mg_del(aTHX_ (S), (P), (M), (N)) + dMY_CXT; + + if (prevmagic) prevmagic->mg_moremagic = moremagic; - } else { + else SvMAGIC_set(sv, moremagic); + + /* Destroy private data */ +#if VMG_UVAR + if (mg->mg_type == PERL_MAGIC_uvar) { + Safefree(mg->mg_ptr); + } else { +#endif /* VMG_UVAR */ + if (mg->mg_obj != sv) { + SvREFCNT_dec(mg->mg_obj); + mg->mg_obj = NULL; + } + /* Unreference the wizard */ + SvREFCNT_dec((SV *) mg->mg_ptr); + mg->mg_ptr = NULL; +#if VMG_UVAR } - mg->mg_moremagic = NULL; - Safefree(mg->mg_ptr); - Safefree(mg); -} #endif /* VMG_UVAR */ -STATIC UV vmg_cast(pTHX_ SV *sv, const SV *wiz, AV *args) { -#define vmg_cast(S, W, A) vmg_cast(aTHX_ (S), (W), (A)) - MAGIC *mg, *moremagic = NULL; - SV *data; - const MGWIZ *w; - U32 oldgmg; + if (MY_CXT.depth) { + mg->mg_moremagic = MY_CXT.freed_tokens; + MY_CXT.freed_tokens = mg; + } else { + mg->mg_moremagic = NULL; + Safefree(mg); + } +} + +STATIC int vmg_magic_chain_free(pTHX_ MAGIC *mg, MAGIC *skip) { +#define vmg_magic_chain_free(M, S) vmg_magic_chain_free(aTHX_ (M), (S)) + int skipped = 0; + + while (mg) { + MAGIC *moremagic = mg->mg_moremagic; + + if (mg == skip) + ++skipped; + else + Safefree(mg); + + mg = moremagic; + } + + return skipped; +} + +STATIC UV vmg_cast(pTHX_ SV *sv, const vmg_wizard *w, const SV *wiz, SV **args, I32 items) { +#define vmg_cast(S, W, WIZ, A, I) vmg_cast(aTHX_ (S), (W), (WIZ), (A), (I)) + MAGIC *mg; + MGVTBL *t; + SV *data; + U32 oldgmg; - if (vmg_find(sv, wiz)) + if (vmg_find(sv, w)) return 1; - w = vmg_wizard_mgwiz(wiz); oldgmg = SvGMAGICAL(sv); - data = (w->cb_data) ? vmg_data_new(w->cb_data, sv, args) : NULL; - mg = sv_magicext(sv, data, PERL_MAGIC_ext, w->vtbl, (const char *) wiz, HEf_SVKEY); - mg->mg_private = SIG_WIZ; -#if MGf_COPY - if (w->cb_copy) + data = (w->cb_data) ? vmg_data_new(w->cb_data, sv, args, items) : NULL; + + t = vmg_vtable_vtbl(w->vtable); + mg = sv_magicext(sv, data, PERL_MAGIC_ext, t, (const char *) wiz, HEf_SVKEY); + mg->mg_private = 0; + + /* sv_magicext() calls mg_magical and increments data's refcount */ + SvREFCNT_dec(data); + + if (t->svt_copy) mg->mg_flags |= MGf_COPY; -#endif /* MGf_COPY */ -#if 0 /* MGf_DUP */ - if (w->cb_dup) +#if 0 + if (t->svt_dup) mg->mg_flags |= MGf_DUP; -#endif /* MGf_DUP */ +#endif #if MGf_LOCAL - if (w->cb_local) + if (t->svt_local) mg->mg_flags |= MGf_LOCAL; #endif /* MGf_LOCAL */ @@ -726,15 +917,15 @@ STATIC UV vmg_cast(pTHX_ SV *sv, const SV *wiz, AV *args) { #if VMG_UVAR if (w->uvar) { - MAGIC *prevmagic; - struct ufuncs uf[2]; + MAGIC *prevmagic, *moremagic = NULL; + vmg_uvar_ud ud; - uf[0].uf_val = vmg_svt_val; - uf[0].uf_set = NULL; - uf[0].uf_index = 0; - uf[1].uf_val = NULL; - uf[1].uf_set = NULL; - uf[1].uf_index = 0; + ud.new_uf.uf_val = vmg_svt_val; + ud.new_uf.uf_set = NULL; + ud.new_uf.uf_index = 0; + ud.old_uf.uf_val = NULL; + ud.old_uf.uf_set = NULL; + ud.old_uf.uf_index = 0; /* One uvar magic in the chain is enough. */ for (prevmagic = NULL, mg = SvMAGIC(sv); mg; prevmagic = mg, mg = moremagic) { @@ -744,18 +935,19 @@ STATIC UV vmg_cast(pTHX_ SV *sv, const SV *wiz, AV *args) { } if (mg) { /* Found another uvar magic. */ - struct ufuncs *olduf = (struct ufuncs *) mg->mg_ptr; - if (olduf->uf_val == vmg_svt_val) { + struct ufuncs *uf = (struct ufuncs *) mg->mg_ptr; + if (uf->uf_val == vmg_svt_val) { /* It's our uvar magic, nothing to do. oldgmg was true. */ goto done; } else { /* It's another uvar magic, backup it and replace it by ours. */ - uf[1] = *olduf; - vmg_uvar_del(sv, prevmagic, mg, moremagic); + ud.old_uf = *uf; + vmg_mg_del(sv, prevmagic, mg, moremagic); } } - vmg_sv_magicuvar(sv, (const char *) &uf, sizeof(uf)); + sv_magic(sv, NULL, PERL_MAGIC_uvar, (const char *) &ud, sizeof(ud)); + vmg_mg_magical(sv); /* Our hash now carries uvar magic. The uvar/clear shortcoming has to be * handled by our uvar callback. */ } @@ -765,91 +957,87 @@ done: return 1; } -STATIC UV vmg_dispell(pTHX_ SV *sv, const SV *wiz) { +STATIC UV vmg_dispell(pTHX_ SV *sv, const vmg_wizard *w) { #define vmg_dispell(S, W) vmg_dispell(aTHX_ (S), (W)) #if VMG_UVAR U32 uvars = 0; #endif /* VMG_UVAR */ MAGIC *mg, *prevmagic, *moremagic = NULL; - UV wid = vmg_wizard_id(wiz); + IV wid = vmg_wizard_id(w); if (SvTYPE(sv) < SVt_PVMG) return 0; for (prevmagic = NULL, mg = SvMAGIC(sv); mg; prevmagic = mg, mg = moremagic) { + const vmg_wizard *z; + moremagic = mg->mg_moremagic; - if (mg->mg_type == PERL_MAGIC_ext && mg->mg_private == SIG_WIZ) { - const MGWIZ *z = vmg_wizard_mgwiz(mg->mg_ptr); - UV zid = vmg_wizard_id(mg->mg_ptr); - if (zid == wid) { + + z = vmg_wizard_from_mg(mg); + if (z) { + IV zid = vmg_wizard_id(z); + #if VMG_UVAR + if (zid == wid) { /* If the current has no uvar, short-circuit uvar deletion. */ uvars = z->uvar ? (uvars + 1) : 0; -#endif /* VMG_UVAR */ break; -#if VMG_UVAR } else if (z->uvar) { ++uvars; /* We can't break here since we need to find the ext magic to delete. */ -#endif /* VMG_UVAR */ } +#else /* VMG_UVAR */ + if (zid == wid) + break; +#endif /* !VMG_UVAR */ } } if (!mg) return 0; - if (prevmagic) { - prevmagic->mg_moremagic = moremagic; - } else { - SvMAGIC_set(sv, moremagic); - } - mg->mg_moremagic = NULL; - - /* Destroy private data */ - if (mg->mg_obj != sv) - SvREFCNT_dec(mg->mg_obj); - /* Unreference the wizard */ - SvREFCNT_dec((SV *) mg->mg_ptr); - Safefree(mg); + vmg_mg_del(sv, prevmagic, mg, moremagic); #if VMG_UVAR if (uvars == 1 && SvTYPE(sv) >= SVt_PVHV) { /* mg was the first ext magic in the chain that had uvar */ for (mg = moremagic; mg; mg = mg->mg_moremagic) { - if (mg->mg_type == PERL_MAGIC_ext && mg->mg_private == SIG_WIZ) { - const MGWIZ *z = vmg_wizard_mgwiz(mg->mg_ptr); - if (z->uvar) { - ++uvars; - break; - } + const vmg_wizard *z = vmg_wizard_from_mg(mg); + + if (z && z->uvar) { + ++uvars; + break; } } if (uvars == 1) { - struct ufuncs *uf; + vmg_uvar_ud *ud; + for (prevmagic = NULL, mg = SvMAGIC(sv); mg; prevmagic = mg, mg = moremagic){ moremagic = mg->mg_moremagic; if (mg->mg_type == PERL_MAGIC_uvar) break; } - /* assert(mg); */ - uf = (struct ufuncs *) mg->mg_ptr; - /* assert(uf->uf_val == vmg_svt_val); */ - if (uf[1].uf_val || uf[1].uf_set) { + + ud = (vmg_uvar_ud *) mg->mg_ptr; + if (ud->old_uf.uf_val || ud->old_uf.uf_set) { /* Revert the original uvar magic. */ - uf[0] = uf[1]; - Renew(uf, 1, struct ufuncs); + struct ufuncs *uf; + Newx(uf, 1, struct ufuncs); + *uf = ud->old_uf; + Safefree(ud); mg->mg_ptr = (char *) uf; - mg->mg_len = sizeof(struct ufuncs); + mg->mg_len = sizeof(*uf); } else { /* Remove the uvar magic. */ - vmg_uvar_del(sv, prevmagic, mg, moremagic); + vmg_mg_del(sv, prevmagic, mg, moremagic); } } } #endif /* VMG_UVAR */ + vmg_mg_magical(sv); + return 1; } @@ -869,25 +1057,21 @@ STATIC void vmg_op_info_init(pTHX_ unsigned int opinfo) { #define vmg_op_info_init(W) vmg_op_info_init(aTHX_ (W)) switch (opinfo) { case VMG_OP_INFO_NAME: -#if VMG_THREADSAFE - MUTEX_LOCK(&vmg_op_name_init_mutex); -#endif + VMG_LOCK(&vmg_op_name_init_mutex); if (!vmg_op_name_init) { OPCODE t; for (t = 0; t < OP_max; ++t) vmg_op_name_len[t] = strlen(PL_op_name[t]); vmg_op_name_init = 1; } -#if VMG_THREADSAFE - MUTEX_UNLOCK(&vmg_op_name_init_mutex); -#endif + VMG_UNLOCK(&vmg_op_name_init_mutex); break; case VMG_OP_INFO_OBJECT: { dMY_CXT; if (!MY_CXT.b__op_stashes[0]) { - opclass c; + int c; require_pv("B.pm"); - for (c = 0; c < OPc_MAX; ++c) + for (c = OPc_NULL; c < OPc_MAX; ++c) MY_CXT.b__op_stashes[c] = gv_stashpv(vmg_opclassnames[c], 1); } break; @@ -919,25 +1103,82 @@ STATIC SV *vmg_op_info(pTHX_ unsigned int opinfo) { return &PL_sv_undef; } -/* ... svt callbacks ....................................................... */ - -#define VMG_CB_CALL_SET_RET(D) \ - { \ - SV *svr; \ - SPAGAIN; \ - svr = POPs; \ - ret = SvOK(svr) ? SvIV(svr) : (D); \ - PUTBACK; \ - } +/* --- svt callbacks ------------------------------------------------------- */ #define VMG_CB_CALL_ARGS_MASK 15 #define VMG_CB_CALL_ARGS_SHIFT 4 -#define VMG_CB_CALL_OPINFO (VMG_OP_INFO_NAME|VMG_OP_INFO_OBJECT) +#define VMG_CB_CALL_OPINFO (VMG_OP_INFO_NAME|VMG_OP_INFO_OBJECT) /* 1|2 */ +#define VMG_CB_CALL_GUARD 4 + +STATIC int vmg_dispell_guard_oncroak(pTHX_ void *ud) { + dMY_CXT; + + MY_CXT.depth--; + + /* If we're at the upmost magic call and we're about to die, we can just free + * the tokens right now, since we will jump past the problematic part of our + * caller. */ + if (MY_CXT.depth == 0 && MY_CXT.freed_tokens) { + vmg_magic_chain_free(MY_CXT.freed_tokens, NULL); + MY_CXT.freed_tokens = NULL; + } + + return 1; +} + +STATIC int vmg_dispell_guard_free(pTHX_ SV *sv, MAGIC *mg) { + vmg_magic_chain_free((MAGIC *) mg->mg_ptr, NULL); + + return 0; +} + +#if VMG_THREADSAFE + +STATIC int vmg_dispell_guard_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *params) { + /* The freed magic tokens aren't cloned by perl because it cannot reach them + * (they have been detached from their parent SV when they were enqueued). + * Hence there's nothing to purge in the new thread. */ + mg->mg_ptr = NULL; + + return 0; +} + +#endif /* VMG_THREADSAFE */ + +STATIC MGVTBL vmg_dispell_guard_vtbl = { + NULL, /* get */ + NULL, /* set */ + NULL, /* len */ + NULL, /* clear */ + vmg_dispell_guard_free, /* free */ + NULL, /* copy */ +#if VMG_THREADSAFE + vmg_dispell_guard_dup, /* dup */ +#else + NULL, /* dup */ +#endif +#if MGf_LOCAL + NULL, /* local */ +#endif /* MGf_LOCAL */ +}; + +STATIC SV *vmg_dispell_guard_new(pTHX_ MAGIC *root) { +#define vmg_dispell_guard_new(R) vmg_dispell_guard_new(aTHX_ (R)) + SV *guard; + + guard = sv_newmortal(); + sv_magicext(guard, NULL, PERL_MAGIC_ext, &vmg_dispell_guard_vtbl, + (char *) root, 0); + + return guard; +} STATIC int vmg_cb_call(pTHX_ SV *cb, unsigned int flags, SV *sv, ...) { va_list ap; - int ret; + int ret = 0; unsigned int i, args, opinfo; + MAGIC **chain = NULL; + SV *svr; dSP; @@ -961,37 +1202,89 @@ STATIC int vmg_cb_call(pTHX_ SV *cb, unsigned int flags, SV *sv, ...) { XPUSHs(vmg_op_info(opinfo)); PUTBACK; - call_sv(cb, G_SCALAR); + if (flags & VMG_CB_CALL_GUARD) { + dMY_CXT; + MY_CXT.depth++; + vmg_call_sv(cb, G_SCALAR, vmg_dispell_guard_oncroak, NULL); + MY_CXT.depth--; + if (MY_CXT.depth == 0 && MY_CXT.freed_tokens) + chain = &MY_CXT.freed_tokens; + } else { + vmg_call_sv(cb, G_SCALAR, 0, NULL); + } - VMG_CB_CALL_SET_RET(0); + SPAGAIN; + svr = POPs; + if (SvOK(svr)) + ret = (int) SvIV(svr); + PUTBACK; FREETMPS; LEAVE; + if (chain) { + vmg_dispell_guard_new(*chain); + *chain = NULL; + } + return ret; } -#define vmg_cb_call1(I, F, S, A1) \ - vmg_cb_call(aTHX_ (I), (((F) << VMG_CB_CALL_ARGS_SHIFT) | 1), (S), (A1)) -#define vmg_cb_call2(I, F, S, A1, A2) \ - vmg_cb_call(aTHX_ (I), (((F) << VMG_CB_CALL_ARGS_SHIFT) | 2), (S), (A1), (A2)) -#define vmg_cb_call3(I, F, S, A1, A2, A3) \ - vmg_cb_call(aTHX_ (I), (((F) << VMG_CB_CALL_ARGS_SHIFT) | 3), (S), (A1), (A2), (A3)) +#define VMG_CB_FLAGS(OI, A) \ + ((((unsigned int) (OI)) << VMG_CB_CALL_ARGS_SHIFT) | (A)) + +#define vmg_cb_call1(I, OI, S, A1) \ + vmg_cb_call(aTHX_ (I), VMG_CB_FLAGS((OI), 1), (S), (A1)) +#define vmg_cb_call2(I, OI, S, A1, A2) \ + vmg_cb_call(aTHX_ (I), VMG_CB_FLAGS((OI), 2), (S), (A1), (A2)) +#define vmg_cb_call3(I, OI, S, A1, A2, A3) \ + vmg_cb_call(aTHX_ (I), VMG_CB_FLAGS((OI), 3), (S), (A1), (A2), (A3)) + +/* ... Default no-op magic callback ........................................ */ + +STATIC int vmg_svt_default_noop(pTHX_ SV *sv, MAGIC *mg) { + return 0; +} + +/* ... get magic ........................................................... */ STATIC int vmg_svt_get(pTHX_ SV *sv, MAGIC *mg) { - const MGWIZ *w = vmg_wizard_mgwiz(mg->mg_ptr); + const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg); + return vmg_cb_call1(w->cb_get, w->opinfo, sv, mg->mg_obj); } +#define vmg_svt_get_noop vmg_svt_default_noop + +/* ... set magic ........................................................... */ + STATIC int vmg_svt_set(pTHX_ SV *sv, MAGIC *mg) { - const MGWIZ *w = vmg_wizard_mgwiz(mg->mg_ptr); + const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg); + return vmg_cb_call1(w->cb_set, w->opinfo, sv, mg->mg_obj); } +#define vmg_svt_set_noop vmg_svt_default_noop + +/* ... len magic ........................................................... */ + +STATIC U32 vmg_sv_len(pTHX_ SV *sv) { +#define vmg_sv_len(S) vmg_sv_len(aTHX_ (S)) + STRLEN len; +#if VMG_HAS_PERL(5, 9, 3) + const U8 *s = VOID2(const U8 *, VOID2(const void *, SvPV_const(sv, len))); +#else + U8 *s = SvPV(sv, len); +#endif + + return DO_UTF8(sv) ? utf8_length(s, s + len) : len; +} + STATIC U32 vmg_svt_len(pTHX_ SV *sv, MAGIC *mg) { - const MGWIZ *w = vmg_wizard_mgwiz(mg->mg_ptr); + const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg); unsigned int opinfo = w->opinfo; U32 len, ret; + SV *svr; svtype t = SvTYPE(sv); dSP; @@ -1004,12 +1297,7 @@ STATIC U32 vmg_svt_len(pTHX_ SV *sv, MAGIC *mg) { PUSHs(sv_2mortal(newRV_inc(sv))); PUSHs(mg->mg_obj ? mg->mg_obj : &PL_sv_undef); if (t < SVt_PVAV) { - STRLEN l; - U8 *s = (U8 *) SvPV_const(sv, l); - if (DO_UTF8(sv)) - len = utf8_length(s, s + l); - else - len = l; + len = vmg_sv_len(sv); mPUSHu(len); } else if (t == SVt_PVAV) { len = av_len((AV *) sv) + 1; @@ -1022,49 +1310,193 @@ STATIC U32 vmg_svt_len(pTHX_ SV *sv, MAGIC *mg) { XPUSHs(vmg_op_info(opinfo)); PUTBACK; - call_sv(w->cb_len, G_SCALAR); + vmg_call_sv(w->cb_len, G_SCALAR, 0, NULL); - VMG_CB_CALL_SET_RET(len); + SPAGAIN; + svr = POPs; + ret = SvOK(svr) ? (U32) SvUV(svr) : len; + if (t == SVt_PVAV) + --ret; + PUTBACK; FREETMPS; LEAVE; - return t == SVt_PVAV ? ret - 1 : ret; + return ret; } +STATIC U32 vmg_svt_len_noop(pTHX_ SV *sv, MAGIC *mg) { + U32 len = 0; + svtype t = SvTYPE(sv); + + if (t < SVt_PVAV) { + len = vmg_sv_len(sv); + } else if (t == SVt_PVAV) { + len = (U32) av_len((AV *) sv); + } + + return len; +} + +/* ... clear magic ......................................................... */ + STATIC int vmg_svt_clear(pTHX_ SV *sv, MAGIC *mg) { - const MGWIZ *w = vmg_wizard_mgwiz(mg->mg_ptr); - return vmg_cb_call1(w->cb_clear, w->opinfo, sv, mg->mg_obj); + const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg); + unsigned int flags = w->opinfo; + +#if !VMG_HAS_PERL(5, 12, 0) + flags |= VMG_CB_CALL_GUARD; +#endif + + return vmg_cb_call1(w->cb_clear, flags, sv, mg->mg_obj); +} + +#define vmg_svt_clear_noop vmg_svt_default_noop + +/* ... free magic .......................................................... */ + +#if VMG_PROPAGATE_ERRSV_NEEDS_TRAMPOLINE + +STATIC OP *vmg_pp_propagate_errsv(pTHX) { + SVOP *o = cSVOPx(PL_op); + + if (o->op_sv) { + SvREFCNT_dec(ERRSV); + ERRSV = o->op_sv; + o->op_sv = NULL; + } + + return NORMAL; +} + +#endif /* VMG_PROPAGATE_ERRSV_NEEDS_TRAMPOLINE */ + +STATIC int vmg_propagate_errsv_free(pTHX_ SV *sv, MAGIC *mg) { + if (mg->mg_obj) { + ERRSV = mg->mg_obj; + mg->mg_obj = NULL; + mg->mg_flags &= ~MGf_REFCOUNTED; + } + + return 0; +} + +/* perl is already kind enough to handle the cloning of the mg_obj member, + hence we don't need to define a dup magic callback. */ + +STATIC MGVTBL vmg_propagate_errsv_vtbl = { + 0, /* get */ + 0, /* set */ + 0, /* len */ + 0, /* clear */ + vmg_propagate_errsv_free, /* free */ + 0, /* copy */ + 0, /* dup */ +#if MGf_LOCAL + 0, /* local */ +#endif /* MGf_LOCAL */ +}; + +typedef struct { + SV *sv; + int in_eval; + I32 base; +} vmg_svt_free_cleanup_ud; + +STATIC int vmg_svt_free_cleanup(pTHX_ void *ud_) { + vmg_svt_free_cleanup_ud *ud = VOID2(vmg_svt_free_cleanup_ud *, ud_); + + if (ud->in_eval) { + U32 optype = PL_op ? PL_op->op_type : OP_NULL; + + if (optype == OP_LEAVETRY || optype == OP_LEAVEEVAL) { + SV *errsv = newSVsv(ERRSV); + + FREETMPS; + LEAVE_SCOPE(ud->base); + +#if VMG_PROPAGATE_ERRSV_NEEDS_TRAMPOLINE + if (optype == OP_LEAVETRY) { + dMY_CXT; + PL_op = vmg_trampoline_bump(&MY_CXT.propagate_errsv, errsv, PL_op); + } else if (optype == OP_LEAVEEVAL) { + SV *guard = sv_newmortal(); + sv_magicext(guard, errsv, PERL_MAGIC_ext, &vmg_propagate_errsv_vtbl, + NULL, 0); + } +#else /* !VMG_PROPAGATE_ERRSV_NEEDS_TRAMPOLINE */ +# if !VMG_HAS_PERL(5, 8, 9) + { + SV *guard = sv_newmortal(); + sv_magicext(guard, errsv, PERL_MAGIC_ext, &vmg_propagate_errsv_vtbl, + NULL, 0); + } +# else + sv_magicext(ERRSV, errsv, PERL_MAGIC_ext, &vmg_propagate_errsv_vtbl, + NULL, 0); + SvREFCNT_dec(errsv); +# endif +#endif /* VMG_PROPAGATE_ERRSV_NEEDS_TRAMPOLINE */ + + SAVETMPS; + } + + /* Don't propagate */ + return 0; + } else { + SV *sv = ud->sv; + MAGIC *mg; + + /* We are about to croak() while sv is being destroyed. Try to clean up + * things a bit. */ + mg = SvMAGIC(sv); + if (mg) { + vmg_mg_del(sv, NULL, mg, mg->mg_moremagic); + mg_magical(sv); + } + SvREFCNT_dec(sv); + + vmg_dispell_guard_oncroak(aTHX_ NULL); + + /* After that, propagate the error upwards. */ + return 1; + } } STATIC int vmg_svt_free(pTHX_ SV *sv, MAGIC *mg) { - const MGWIZ *w; -#if VMG_HAS_PERL(5, 9, 5) - PERL_CONTEXT saved_cx; - I32 cxix; -#endif - unsigned int had_err, has_err, flags = G_SCALAR | G_EVAL; + vmg_svt_free_cleanup_ud ud; + const vmg_wizard *w; int ret = 0; + SV *svr; dSP; - /* Don't even bother if we are in global destruction - the wizard is prisoner - * of circular references and we are way beyond user realm */ + /* During global destruction, we cannot be sure that the wizard and its free + * callback are still alive. */ if (PL_dirty) return 0; - w = vmg_wizard_mgwiz(mg->mg_ptr); + w = vmg_wizard_from_mg_nocheck(mg); /* So that it survives the temp cleanup below */ - SvREFCNT_inc(sv); + SvREFCNT_inc_simple_void(sv); -#if !VMG_HAS_PERL_MAINT(5, 11, 0, 32686) +#if !(VMG_HAS_PERL_MAINT(5, 11, 0, 32686) || VMG_HAS_PERL(5, 12, 0)) /* The previous magic tokens were freed but the magic chain wasn't updated, so * if you access the sv from the callback the old deleted magics will trigger * and cause memory misreads. Change 32686 solved it that way : */ SvMAGIC_set(sv, mg); #endif + ud.sv = sv; + if (cxstack_ix < cxstack_max) { + ud.in_eval = (CxTYPE(cxstack + cxstack_ix + 1) == CXt_EVAL); + ud.base = ud.in_eval ? PL_scopestack[PL_scopestack_ix] : 0; + } else { + ud.in_eval = 0; + ud.base = 0; + } + ENTER; SAVETMPS; @@ -1076,32 +1508,24 @@ STATIC int vmg_svt_free(pTHX_ SV *sv, MAGIC *mg) { XPUSHs(vmg_op_info(w->opinfo)); PUTBACK; - had_err = SvTRUE(ERRSV); - if (had_err) - flags |= G_KEEPERR; - -#if VMG_HAS_PERL(5, 9, 5) - /* This context should not be used anymore, but since we croak in places the - * core doesn't even dare to, some pointers to it may remain in the upper call - * stack. Make sure call_sv() doesn't clobber it. */ - if (cxstack_ix < cxstack_max) - cxix = cxstack_ix + 1; - else - cxix = Perl_cxinc(aTHX); - saved_cx = cxstack[cxix]; -#endif - - call_sv(w->cb_free, flags); - -#if VMG_HAS_PERL(5, 9, 5) - cxstack[cxix] = saved_cx; -#endif - - has_err = SvTRUE(ERRSV); - if (IN_PERL_COMPILETIME && !had_err && has_err) - ++PL_error_count; + { + dMY_CXT; + MY_CXT.depth++; + vmg_call_sv(w->cb_free, G_SCALAR, vmg_svt_free_cleanup, &ud); + MY_CXT.depth--; + if (MY_CXT.depth == 0 && MY_CXT.freed_tokens) { + /* Free all the tokens in the chain but the current one (if it's present). + * It will be taken care of by our caller, Perl_mg_free(). */ + vmg_magic_chain_free(MY_CXT.freed_tokens, mg); + MY_CXT.freed_tokens = NULL; + } + } - VMG_CB_CALL_SET_RET(0); + SPAGAIN; + svr = POPs; + if (SvOK(svr)) + ret = (int) SvIV(svr); + PUTBACK; FREETMPS; LEAVE; @@ -1115,16 +1539,19 @@ STATIC int vmg_svt_free(pTHX_ SV *sv, MAGIC *mg) { return ret; } -#if MGf_COPY -STATIC int vmg_svt_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *key, -# if VMG_HAS_PERL_MAINT(5, 11, 0, 33256) - I32 keylen -# else - int keylen -# endif - ) { +#define vmg_svt_free_noop vmg_svt_default_noop + +#if VMG_HAS_PERL_MAINT(5, 11, 0, 33256) || VMG_HAS_PERL(5, 12, 0) +# define VMG_SVT_COPY_KEYLEN_TYPE I32 +#else +# define VMG_SVT_COPY_KEYLEN_TYPE int +#endif + +/* ... copy magic .......................................................... */ + +STATIC int vmg_svt_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *key, VMG_SVT_COPY_KEYLEN_TYPE keylen) { + const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg); SV *keysv; - const MGWIZ *w = vmg_wizard_mgwiz(mg->mg_ptr); int ret; if (keylen == HEf_SVKEY) { @@ -1141,46 +1568,70 @@ STATIC int vmg_svt_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *key, return ret; } -#endif /* MGf_COPY */ -#if 0 /* MGf_DUP */ +STATIC int vmg_svt_copy_noop(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *key, VMG_SVT_COPY_KEYLEN_TYPE keylen) { + return 0; +} + +/* ... dup magic ........................................................... */ + +#if 0 STATIC int vmg_svt_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param) { return 0; } -#endif /* MGf_DUP */ +#define vmg_svt_dup_noop vmg_svt_dup +#endif + +/* ... local magic ......................................................... */ #if MGf_LOCAL + STATIC int vmg_svt_local(pTHX_ SV *nsv, MAGIC *mg) { - const MGWIZ *w = vmg_wizard_mgwiz(mg->mg_ptr); + const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg); + return vmg_cb_call1(w->cb_local, w->opinfo, nsv, mg->mg_obj); } + +#define vmg_svt_local_noop vmg_svt_default_noop + #endif /* MGf_LOCAL */ +/* ... uvar magic .......................................................... */ + #if VMG_UVAR -STATIC OP *vmg_pp_resetuvar(pTHX) { - SvRMAGICAL_on(cSVOP_sv); + +STATIC OP *vmg_pp_reset_rmg(pTHX) { + SVOP *o = cSVOPx(PL_op); + + SvRMAGICAL_on(o->op_sv); + o->op_sv = NULL; + return NORMAL; } STATIC I32 vmg_svt_val(pTHX_ IV action, SV *sv) { - struct ufuncs *uf; - MAGIC *mg, *umg; + vmg_uvar_ud *ud; + MAGIC *mg, *umg, *moremagic; SV *key = NULL, *newkey = NULL; int tied = 0; umg = mg_find(sv, PERL_MAGIC_uvar); /* umg can't be NULL or we wouldn't be there. */ key = umg->mg_obj; - uf = (struct ufuncs *) umg->mg_ptr; + ud = (vmg_uvar_ud *) umg->mg_ptr; - if (uf[1].uf_val) - uf[1].uf_val(aTHX_ action, sv); - if (uf[1].uf_set) - uf[1].uf_set(aTHX_ action, sv); + if (ud->old_uf.uf_val) + ud->old_uf.uf_val(aTHX_ action, sv); + if (ud->old_uf.uf_set) + ud->old_uf.uf_set(aTHX_ action, sv); + + for (mg = SvMAGIC(sv); mg; mg = moremagic) { + const vmg_wizard *w; + + /* mg may be freed later by the uvar call, so we need to fetch the next + * token before reaching that fateful point. */ + moremagic = mg->mg_moremagic; - action &= HV_FETCH_ISSTORE | HV_FETCH_ISEXISTS | HV_FETCH_LVALUE | HV_DELETE; - for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) { - const MGWIZ *w; switch (mg->mg_type) { case PERL_MAGIC_ext: break; @@ -1190,8 +1641,11 @@ STATIC I32 vmg_svt_val(pTHX_ IV action, SV *sv) { default: continue; } - if (mg->mg_private != SIG_WIZ) continue; - w = vmg_wizard_mgwiz(mg->mg_ptr); + + w = vmg_wizard_from_mg(mg); + if (!w) + continue; + switch (w->uvar) { case 0: continue; @@ -1199,66 +1653,118 @@ STATIC I32 vmg_svt_val(pTHX_ IV action, SV *sv) { if (!newkey) newkey = key = umg->mg_obj = sv_mortalcopy(umg->mg_obj); } - switch (action) { + + switch (action + & (HV_FETCH_ISSTORE|HV_FETCH_ISEXISTS|HV_FETCH_LVALUE|HV_DELETE)) { case 0: if (w->cb_fetch) - vmg_cb_call2(w->cb_fetch, w->opinfo, sv, mg->mg_obj, key); + vmg_cb_call2(w->cb_fetch, w->opinfo | VMG_CB_CALL_GUARD, sv, + mg->mg_obj, key); break; case HV_FETCH_ISSTORE: case HV_FETCH_LVALUE: case (HV_FETCH_ISSTORE|HV_FETCH_LVALUE): if (w->cb_store) - vmg_cb_call2(w->cb_store, w->opinfo, sv, mg->mg_obj, key); + vmg_cb_call2(w->cb_store, w->opinfo | VMG_CB_CALL_GUARD, sv, + mg->mg_obj, key); break; case HV_FETCH_ISEXISTS: if (w->cb_exists) - vmg_cb_call2(w->cb_exists, w->opinfo, sv, mg->mg_obj, key); + vmg_cb_call2(w->cb_exists, w->opinfo | VMG_CB_CALL_GUARD, sv, + mg->mg_obj, key); break; case HV_DELETE: if (w->cb_delete) - vmg_cb_call2(w->cb_delete, w->opinfo, sv, mg->mg_obj, key); + vmg_cb_call2(w->cb_delete, w->opinfo | VMG_CB_CALL_GUARD, sv, + mg->mg_obj, key); break; } } - if (SvRMAGICAL(sv) && !tied) { + if (SvRMAGICAL(sv) && !tied && !(action & (HV_FETCH_ISSTORE|HV_DELETE))) { /* Temporarily hide the RMAGICAL flag of the hash so it isn't wrongly * mistaken for a tied hash by the rest of hv_common. It will be reset by * the op_ppaddr of a new fake op injected between the current and the next * one. */ - OP *o = PL_op; - if (!o->op_next || o->op_next->op_ppaddr != vmg_pp_resetuvar) { - SVOP *svop; + +#if VMG_RESET_RMG_NEEDS_TRAMPOLINE + + dMY_CXT; + + PL_op = vmg_trampoline_bump(&MY_CXT.reset_rmg, sv, PL_op); + +#else /* !VMG_RESET_RMG_NEEDS_TRAMPOLINE */ + + OP *nop = PL_op->op_next; + SVOP *svop = NULL; + + if (nop && nop->op_ppaddr == vmg_pp_reset_rmg) { + svop = (SVOP *) nop; + } else { NewOp(1101, svop, 1, SVOP); - svop->op_type = OP_STUB; - svop->op_ppaddr = vmg_pp_resetuvar; - svop->op_next = o->op_next; - svop->op_flags = 0; - svop->op_sv = sv; - o->op_next = (OP *) svop; + svop->op_type = OP_STUB; + svop->op_ppaddr = vmg_pp_reset_rmg; + svop->op_next = nop; + svop->op_flags = 0; + svop->op_private = 0; + + PL_op->op_next = (OP *) svop; } + + svop->op_sv = sv; + +#endif /* VMG_RESET_RMG_NEEDS_TRAMPOLINE */ + SvRMAGICAL_off(sv); } return 0; } + #endif /* VMG_UVAR */ /* --- Macros for the XS section ------------------------------------------- */ -#define VMG_SET_CB(S, N) \ - cb = (S); \ - w->cb_ ## N = (SvOK(cb) && SvROK(cb)) ? newRV_inc(SvRV(cb)) : NULL; - -#define VMG_SET_SVT_CB(S, N) \ - cb = (S); \ - if (SvOK(cb) && SvROK(cb)) { \ - t->svt_ ## N = vmg_svt_ ## N; \ - w->cb_ ## N = newRV_inc(SvRV(cb)); \ - } else { \ - t->svt_ ## N = NULL; \ - w->cb_ ## N = NULL; \ - } +#ifdef CvISXSUB +# define VMG_CVOK(C) \ + ((CvISXSUB(C) ? (void *) CvXSUB(C) : (void *) CvROOT(C)) ? 1 : 0) +#else +# define VMG_CVOK(C) (CvROOT(C) || CvXSUB(C)) +#endif + +#define VMG_CBOK(S) ((SvTYPE(S) == SVt_PVCV) ? VMG_CVOK(S) : SvOK(S)) + +#define VMG_SET_CB(S, N) { \ + SV *cb = (S); \ + if (SvOK(cb) && SvROK(cb)) { \ + cb = SvRV(cb); \ + if (VMG_CBOK(cb)) \ + SvREFCNT_inc_simple_void(cb); \ + else \ + cb = NULL; \ + } else { \ + cb = NULL; \ + } \ + w->cb_ ## N = cb; \ +} + +#define VMG_SET_SVT_CB(S, N) { \ + SV *cb = (S); \ + if (SvOK(cb) && SvROK(cb)) { \ + cb = SvRV(cb); \ + if (VMG_CBOK(cb)) { \ + t->svt_ ## N = vmg_svt_ ## N; \ + SvREFCNT_inc_simple_void(cb); \ + } else { \ + t->svt_ ## N = vmg_svt_ ## N ## _noop; \ + cb = NULL; \ + } \ + } else { \ + t->svt_ ## N = NULL; \ + cb = NULL; \ + } \ + w->cb_ ## N = cb; \ +} /* --- XS ------------------------------------------------------------------ */ @@ -1269,14 +1775,26 @@ PROTOTYPES: ENABLE BOOT: { HV *stash; + int c; MY_CXT_INIT; -#if VMG_THREADSAFE - MY_CXT.wizards = ptable_new(); - MY_CXT.owner = aTHX; + for (c = OPc_NULL; c < OPc_MAX; ++c) + MY_CXT.b__op_stashes[c] = NULL; + + MY_CXT.depth = 0; + MY_CXT.freed_tokens = NULL; + + /* XS doesn't like a blank line here */ +#if VMG_PROPAGATE_ERRSV_NEEDS_TRAMPOLINE + vmg_trampoline_init(&MY_CXT.propagate_errsv, vmg_pp_propagate_errsv); #endif - MY_CXT.b__op_stashes[0] = NULL; +#if VMG_RESET_RMG_NEEDS_TRAMPOLINE + vmg_trampoline_init(&MY_CXT.reset_rmg, vmg_pp_reset_rmg); +#endif + + /* XS doesn't like a blank line here */ #if VMG_THREADSAFE + MUTEX_INIT(&vmg_vtable_refcount_mutex); MUTEX_INIT(&vmg_op_name_init_mutex); #endif @@ -1285,6 +1803,10 @@ BOOT: newCONSTSUB(stash, "MGf_DUP", newSVuv(MGf_DUP)); newCONSTSUB(stash, "MGf_LOCAL", newSVuv(MGf_LOCAL)); newCONSTSUB(stash, "VMG_UVAR", newSVuv(VMG_UVAR)); + newCONSTSUB(stash, "VMG_COMPAT_SCALAR_LENGTH_NOLEN", + newSVuv(VMG_COMPAT_SCALAR_LENGTH_NOLEN)); + newCONSTSUB(stash, "VMG_COMPAT_SCALAR_NOLEN", + newSVuv(VMG_COMPAT_SCALAR_NOLEN)); newCONSTSUB(stash, "VMG_COMPAT_ARRAY_PUSH_NOLEN", newSVuv(VMG_COMPAT_ARRAY_PUSH_NOLEN)); newCONSTSUB(stash, "VMG_COMPAT_ARRAY_PUSH_NOLEN_VOID", @@ -1293,8 +1815,9 @@ BOOT: newSVuv(VMG_COMPAT_ARRAY_UNSHIFT_NOLEN_VOID)); newCONSTSUB(stash, "VMG_COMPAT_ARRAY_UNDEF_CLEAR", newSVuv(VMG_COMPAT_ARRAY_UNDEF_CLEAR)); - newCONSTSUB(stash, "VMG_COMPAT_SCALAR_LENGTH_NOLEN", - newSVuv(VMG_COMPAT_SCALAR_LENGTH_NOLEN)); + newCONSTSUB(stash, "VMG_COMPAT_HASH_DELETE_NOUVAR_VOID", + newSVuv(VMG_COMPAT_HASH_DELETE_NOUVAR_VOID)); + newCONSTSUB(stash, "VMG_COMPAT_GLOB_GET", newSVuv(VMG_COMPAT_GLOB_GET)); newCONSTSUB(stash, "VMG_PERL_PATCHLEVEL", newSVuv(VMG_PERL_PATCHLEVEL)); newCONSTSUB(stash, "VMG_THREADSAFE", newSVuv(VMG_THREADSAFE)); newCONSTSUB(stash, "VMG_FORKSAFE", newSVuv(VMG_FORKSAFE)); @@ -1308,39 +1831,26 @@ void CLONE(...) PROTOTYPE: DISABLE PREINIT: - ptable *t; - U32 had_b__op_stash = 0; - opclass c; + U32 had_b__op_stash = 0; + I32 old_depth; + int c; PPCODE: { - my_cxt_t ud; dMY_CXT; - - ud.wizards = t = ptable_new(); - ud.owner = MY_CXT.owner; - ptable_walk(MY_CXT.wizards, vmg_ptable_clone, &ud); - - for (c = 0; c < OPc_MAX; ++c) { + for (c = OPc_NULL; c < OPc_MAX; ++c) { if (MY_CXT.b__op_stashes[c]) had_b__op_stash |= (((U32) 1) << c); } + old_depth = MY_CXT.depth; } { MY_CXT_CLONE; - MY_CXT.wizards = t; - MY_CXT.owner = aTHX; - for (c = 0; c < OPc_MAX; ++c) { + for (c = OPc_NULL; c < OPc_MAX; ++c) { MY_CXT.b__op_stashes[c] = (had_b__op_stash & (((U32) 1) << c)) ? gv_stashpv(vmg_opclassnames[c], 1) : NULL; } - } - { - int *level; - level = PerlMemShared_malloc(sizeof *level); - *level = 1; - LEAVE; - SAVEDESTRUCTOR_X(vmg_thread_cleanup, level); - ENTER; + MY_CXT.depth = old_depth; + MY_CXT.freed_tokens = NULL; } XSRETURN(0); @@ -1349,20 +1859,12 @@ PPCODE: SV *_wizard(...) PROTOTYPE: DISABLE PREINIT: - I32 i = 0; - MGWIZ *w; + vmg_wizard *w; MGVTBL *t; - SV *cb; + SV *op_info, *copy_key; + I32 i = 0; CODE: - dMY_CXT; - - if (items != 7 -#if MGf_COPY - + 1 -#endif /* MGf_COPY */ -#if MGf_DUP - + 1 -#endif /* MGf_DUP */ + if (items != 9 #if MGf_LOCAL + 1 #endif /* MGf_LOCAL */ @@ -1371,28 +1873,22 @@ CODE: #endif /* VMG_UVAR */ ) { croak(vmg_wrongargnum); } - Newx(t, 1, MGVTBL); - Newx(w, 1, MGWIZ); + op_info = ST(i++); + w = vmg_wizard_alloc(SvOK(op_info) ? SvUV(op_info) : 0); + t = vmg_vtable_vtbl(w->vtable); VMG_SET_CB(ST(i++), data); - cb = ST(i++); - w->opinfo = SvOK(cb) ? SvUV(cb) : 0; - if (w->opinfo) - vmg_op_info_init(w->opinfo); + VMG_SET_SVT_CB(ST(i++), get); VMG_SET_SVT_CB(ST(i++), set); VMG_SET_SVT_CB(ST(i++), len); VMG_SET_SVT_CB(ST(i++), clear); VMG_SET_SVT_CB(ST(i++), free); -#if MGf_COPY VMG_SET_SVT_CB(ST(i++), copy); -#endif /* MGf_COPY */ -#if MGf_DUP /* VMG_SET_SVT_CB(ST(i++), dup); */ i++; t->svt_dup = NULL; w->cb_dup = NULL; -#endif /* MGf_DUP */ #if MGf_LOCAL VMG_SET_SVT_CB(ST(i++), local); #endif /* MGf_LOCAL */ @@ -1401,43 +1897,34 @@ CODE: VMG_SET_CB(ST(i++), store); VMG_SET_CB(ST(i++), exists); VMG_SET_CB(ST(i++), delete); - cb = ST(i++); + + copy_key = ST(i++); if (w->cb_fetch || w->cb_store || w->cb_exists || w->cb_delete) - w->uvar = SvTRUE(cb) ? 2 : 1; - else - w->uvar = 0; + w->uvar = SvTRUE(copy_key) ? 2 : 1; #endif /* VMG_UVAR */ -#if VMG_MULTIPLICITY - w->owner = aTHX; -#endif /* VMG_MULTIPLICITY */ - w->vtbl = t; -#if VMG_THREADSAFE - ptable_store(MY_CXT.wizards, w, w); -#endif /* VMG_THREADSAFE */ - RETVAL = newRV_noinc(vmg_wizard_new(w)); + RETVAL = newRV_noinc(vmg_wizard_sv_new(w)); OUTPUT: RETVAL SV *cast(SV *sv, SV *wiz, ...) PROTOTYPE: \[$@%&*]$@ PREINIT: - AV *args = NULL; - SV *ret; + const vmg_wizard *w = NULL; + SV **args = NULL; + I32 i = 0; CODE: if (items > 2) { - I32 i; - args = newAV(); - av_fill(args, items - 2); - for (i = 2; i < items; ++i) { - SV *arg = ST(i); - SvREFCNT_inc(arg); - if (av_store(args, i - 2, arg) == NULL) croak(vmg_argstorefailed); - } + i = items - 2; + args = &ST(2); + } + if (SvROK(wiz)) { + wiz = SvRV_const(wiz); + w = vmg_wizard_from_sv(wiz); } - ret = newSVuv(vmg_cast(SvRV(sv), vmg_wizard_validate(wiz), args)); - SvREFCNT_dec(args); - RETVAL = ret; + if (!w) + croak(vmg_invalid_wiz); + RETVAL = newSVuv(vmg_cast(SvRV(sv), w, wiz, args, i)); OUTPUT: RETVAL @@ -1445,9 +1932,14 @@ void getdata(SV *sv, SV *wiz) PROTOTYPE: \[$@%&*]$ PREINIT: + const vmg_wizard *w = NULL; SV *data; PPCODE: - data = vmg_data_get(SvRV(sv), vmg_wizard_validate(wiz)); + if (SvROK(wiz)) + w = vmg_wizard_from_sv(SvRV_const(wiz)); + if (!w) + croak(vmg_invalid_wiz); + data = vmg_data_get(SvRV(sv), w); if (!data) XSRETURN_EMPTY; ST(0) = data; @@ -1455,7 +1947,13 @@ PPCODE: SV *dispell(SV *sv, SV *wiz) PROTOTYPE: \[$@%&*]$ +PREINIT: + const vmg_wizard *w = NULL; CODE: - RETVAL = newSVuv(vmg_dispell(SvRV(sv), vmg_wizard_validate(wiz))); + if (SvROK(wiz)) + w = vmg_wizard_from_sv(SvRV_const(wiz)); + if (!w) + croak(vmg_invalid_wiz); + RETVAL = newSVuv(vmg_dispell(SvRV(sv), w)); OUTPUT: RETVAL