# 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
#endif
#if VMG_THREADSAFE
-
-STATIC SV *vmg_clone(pTHX_ SV *sv, tTHX owner) {
-#define vmg_clone(P, O) vmg_clone(aTHX_ (P), (O))
- SV *dupsv;
-
-#if VMG_HAS_PERL(5, 13, 2)
- CLONE_PARAMS *param = Perl_clone_params_new(owner, aTHX);
-
- dupsv = sv_dup(sv, param);
-
- Perl_clone_params_del(param);
+# define VMG_LOCK(M) MUTEX_LOCK(M)
+# define VMG_UNLOCK(M) MUTEX_UNLOCK(M)
#else
- CLONE_PARAMS param;
-
- param.stashes = NULL; /* don't need it unless sv is a PVHV */
- param.flags = 0;
- param.proto_perl = owner;
-
- dupsv = sv_dup(sv, ¶m);
+# define VMG_LOCK(M)
+# define VMG_UNLOCK(M)
#endif
- return SvREFCNT_inc(dupsv);
-}
-
-#endif /* VMG_THREADSAFE */
-
/* --- Compatibility ------------------------------------------------------- */
#ifndef Newx
# 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
#define SIG_WZO ((U16) (0x3891))
#define SIG_WIZ ((U16) (0x3892))
-/* --- MGWIZ structure ----------------------------------------------------- */
+/* --- <vmg_vtable> 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
+
+#if VMG_THREADSAFE
+STATIC perl_mutex vmg_vtable_refcount_mutex;
+#endif
+
+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 */
+
+/* --- MGWIZ structure ----------------------------------------------------- */
+
+typedef struct {
+ vmg_vtable *vtable;
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 */
-
-#if VMG_MULTIPLICITY
- tTHX owner;
-#endif /* VMG_MULTIPLICITY */
} MGWIZ;
+STATIC void vmg_op_info_init(pTHX_ unsigned int opinfo);
+
+STATIC MGWIZ *vmg_mgwiz_alloc(pTHX_ UV opinfo) {
+#define vmg_mgwiz_alloc(O) vmg_mgwiz_alloc(aTHX_ (O))
+ MGWIZ *w;
+ MGVTBL *t;
+
+ Newx(w, 1, MGWIZ);
+
+ 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_mgwiz_free(pTHX_ MGWIZ *w) {
#define vmg_mgwiz_free(W) vmg_mgwiz_free(aTHX_ (W))
if (!w)
return;
- /* We reach this point in dirty state when ptable_free() is called from the
- * atexit cleanup callback, and that the global table still holds a live
- * wizard. This happens before all the SV bodies are freed, so all the wizard
- * callbacks are still alive (as they are referenced by the undead wizard).
- * Hence it is safe to decrement their refcount. Later on, the wizard free
- * callback itself will trigger when the wizard body is reaped, but it will
- * be skipped as it guards against dirty state - which is good since nothing
- * has to be done anymore at that point. */
-
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);
-#if MGf_COPY
SvREFCNT_dec(w->cb_copy);
-#endif /* MGf_COPY */
-#if 0 /* MGf_DUP */
+#if 0
SvREFCNT_dec(w->cb_dup);
-#endif /* MGf_DUP */
+#endif
#if MGf_LOCAL
SvREFCNT_dec(w->cb_local);
#endif /* MGf_LOCAL */
SvREFCNT_dec(w->cb_delete);
#endif /* VMG_UVAR */
- Safefree(w->vtbl);
+ vmg_vtable_free(w->vtable);
Safefree(w);
return;
#if VMG_THREADSAFE
#define VMG_CLONE_CB(N) \
- z->cb_ ## N = (w->cb_ ## N) ? vmg_clone(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;
+STATIC const MGWIZ *vmg_mgwiz_dup(pTHX_ const MGWIZ *w, CLONE_PARAMS *params) {
+#define vmg_mgwiz_dup(W, P) vmg_mgwiz_dup(aTHX_ (W), (P))
MGWIZ *z;
if (!w)
return NULL;
- Newx(t, 1, MGVTBL);
- Copy(w->vtbl, t, 1, MGVTBL);
-
Newx(z, 1, MGWIZ);
- z->vtbl = t;
+ z->vtable = vmg_vtable_dup(w->vtable);
z->uvar = w->uvar;
z->opinfo = w->opinfo;
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 */
VMG_CLONE_CB(delete);
#endif /* VMG_UVAR */
- z->owner = aTHX;
-
return z;
}
/* --- Context-safe global data -------------------------------------------- */
-#if VMG_THREADSAFE
-
-#define PTABLE_NAME ptable
-#define PTABLE_VAL_FREE(V) vmg_mgwiz_free(VOID2(MGWIZ *, (V)))
-
-#define pPTBL pTHX
-#define pPTBL_ pTHX_
-#define aPTBL aTHX
-#define aPTBL_ aTHX_
-
-#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];
+ HV *b__op_stashes[OPc_MAX];
} my_cxt_t;
START_MY_CXT
-#if VMG_THREADSAFE
-
-STATIC void vmg_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) {
- my_cxt_t *ud = VOID2(my_cxt_t *, ud_);
- MGWIZ *w;
-
- if (ud->owner == aTHX)
- return;
-
- w = vmg_mgwiz_clone(VOID2(MGWIZ *, ent->val));
- if (w)
- ptable_store(ud->wizards, ent->key, w);
-}
-
-#endif /* VMG_THREADSAFE */
-
/* --- Wizard objects ------------------------------------------------------ */
STATIC int vmg_wizard_free(pTHX_ SV *sv, MAGIC *mg);
+#if VMG_THREADSAFE
+STATIC int vmg_wizard_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *params);
+#endif
STATIC MGVTBL vmg_wizard_vtbl = {
NULL, /* get */
NULL, /* len */
NULL, /* clear */
vmg_wizard_free, /* free */
-#if MGf_COPY
NULL, /* copy */
-#endif /* MGf_COPY */
-#if MGf_DUP
+#if VMG_THREADSAFE
+ vmg_wizard_dup, /* dup */
+#else
NULL, /* dup */
-#endif /* MGf_DUP */
+#endif
#if MGf_LOCAL
NULL, /* local */
#endif /* MGf_LOCAL */
STATIC SV *vmg_wizard_new(pTHX_ const MGWIZ *w) {
#define vmg_wizard_new(W) vmg_wizard_new(aTHX_ (W))
- SV *wiz = newSVuv(PTR2IV(w));
+ SV *wiz;
+
+#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);
+ MAGIC *mg = sv_magicext(wiz, NULL, PERL_MAGIC_ext, &vmg_wizard_vtbl,
+ (const char *) w, 0);
mg->mg_private = SIG_WZO;
+#if VMG_THREADSAFE
+ mg->mg_flags |= MGf_DUP;
+#endif
}
SvREADONLY_on(wiz);
#define vmg_wizard_validate(W) vmg_wizard_validate(aTHX_ (W))
if (SvROK(wiz)) {
wiz = SvRV_const(wiz);
+#if VMG_THREADSAFE
+ if (SvTYPE(wiz) >= SVt_PVMG && SvMAGIC(wiz))
+#else
if (SvIOK(wiz))
+#endif
return wiz;
}
return NULL;
}
-#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
+
+STATIC const MGWIZ *vmg_wizard_mgwiz(const SV *wiz) {
+ MAGIC *mg;
+
+ for (mg = SvMAGIC(wiz); mg; mg = mg->mg_moremagic) {
+ if (mg->mg_type == PERL_MAGIC_ext && mg->mg_virtual == &vmg_wizard_vtbl)
+ return (const MGWIZ *) mg->mg_ptr;
+ }
+
+ return NULL;
+}
+
+#define vmg_wizard_mgwiz(W) vmg_wizard_mgwiz((const SV *) (W))
+
+#define vmg_wizard_id(W) PTR2IV(vmg_vtable_vtbl(vmg_wizard_mgwiz(W)->vtable))
+
+#else
+
+#define vmg_wizard_id(W) SvIVX((const SV *) (W))
+
+#define vmg_wizard_mgwiz(W) INT2PTR(const MGWIZ *, vmg_wizard_id(W))
+
+#endif
/* ... Wizard destructor ................................................... */
STATIC int vmg_wizard_free(pTHX_ SV *sv, MAGIC *mg) {
- MGWIZ *w;
-
if (PL_dirty) /* During global destruction, the context is already freed */
return 0;
- w = (MGWIZ *) vmg_wizard_main_mgwiz(sv);
-
-#if VMG_THREADSAFE
- {
- dMY_CXT;
- ptable_store(MY_CXT.wizards, w, NULL);
- }
-#else /* VMG_THREADSAFE */
- vmg_mgwiz_free(w);
-#endif /* !VMG_THREADSAFE */
+ vmg_mgwiz_free((MGWIZ *) mg->mg_ptr);
return 0;
}
#if VMG_THREADSAFE
-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;
-
- w = vmg_wizard_main_mgwiz(wiz);
- if (w->owner == aTHX)
- return w;
+STATIC int vmg_wizard_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *params) {
+ mg->mg_ptr = (char *) vmg_mgwiz_dup((const MGWIZ *) mg->mg_ptr, params);
- {
- dMY_CXT;
- return VOID2(const MGWIZ *, ptable_fetch(MY_CXT.wizards, w));
- }
+ return 0;
}
-#else /* VMG_THREADSAFE */
-
-#define vmg_wizard_mgwiz(W) vmg_wizard_main_mgwiz(W)
-
-#endif /* !VMG_THREADSAFE */
+#endif /* VMG_THREADSAFE */
/* --- User-level functions implementation --------------------------------- */
#define vmg_data_get(S, W) vmg_data_get(aTHX_ (S), (W))
const MAGIC *mg = vmg_find(sv, wiz);
return mg ? mg->mg_obj : NULL;
-}
+}
/* ... Magic cast/dispell .................................................. */
data = (w->cb_data) ? vmg_data_new(w->cb_data, sv, args, items) : NULL;
/* sv_magicext() calls mg_magical and increments data's refcount */
- mg = sv_magicext(sv, data, PERL_MAGIC_ext, w->vtbl,
+ mg = sv_magicext(sv, data, PERL_MAGIC_ext, vmg_vtable_vtbl(w->vtable),
(const char *) wiz, HEf_SVKEY);
SvREFCNT_dec(data);
mg->mg_private = SIG_WIZ;
-#if MGf_COPY
if (w->cb_copy)
mg->mg_flags |= MGf_COPY;
-#endif /* MGf_COPY */
-#if 0 /* MGf_DUP */
+#if 0
if (w->cb_dup)
mg->mg_flags |= MGf_DUP;
-#endif /* MGf_DUP */
+#endif
#if MGf_LOCAL
if (w->cb_local)
mg->mg_flags |= MGf_LOCAL;
#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;
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) || VMG_HAS_PERL(5, 12, 0)
I32 keylen
return ret;
}
-#endif /* MGf_COPY */
-#if 0 /* MGf_DUP */
+#if 0
STATIC int vmg_svt_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param) {
return 0;
}
-#endif /* MGf_DUP */
+#endif
#if MGf_LOCAL
STATIC int vmg_svt_local(pTHX_ SV *nsv, MAGIC *mg) {
w->cb_ ## N = NULL; \
}
-#if VMG_THREADSAFE
-
-STATIC void vmg_cleanup(pTHX_ void *ud) {
- dMY_CXT;
-
- ptable_free(MY_CXT.wizards);
- MY_CXT.wizards = NULL;
-}
-
-#endif /* VMG_THREADSAFE */
-
/* --- XS ------------------------------------------------------------------ */
MODULE = Variable::Magic PACKAGE = Variable::Magic
HV *stash;
MY_CXT_INIT;
-#if VMG_THREADSAFE
- MY_CXT.wizards = ptable_new();
- MY_CXT.owner = aTHX;
-#endif
MY_CXT.b__op_stashes[0] = NULL;
#if VMG_THREADSAFE
+ MUTEX_INIT(&vmg_vtable_refcount_mutex);
MUTEX_INIT(&vmg_op_name_init_mutex);
- call_atexit(vmg_cleanup, NULL);
#endif
stash = gv_stashpv(__PACKAGE__, 1);
CLONE(...)
PROTOTYPE: DISABLE
PREINIT:
- ptable *t;
- U32 had_b__op_stash = 0;
- int c;
+ U32 had_b__op_stash = 0;
+ 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 = OPc_NULL; c < OPc_MAX; ++c) {
if (MY_CXT.b__op_stashes[c])
had_b__op_stash |= (((U32) 1) << c);
}
{
MY_CXT_CLONE;
- MY_CXT.wizards = t;
- MY_CXT.owner = aTHX;
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;
PROTOTYPE: DISABLE
PREINIT:
I32 i = 0;
- UV opinfo;
MGWIZ *w;
MGVTBL *t;
- SV *cb;
+ SV *cb, *op_info, *copy_key;
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 */
#endif /* VMG_UVAR */
) { croak(vmg_wrongargnum); }
- Newx(t, 1, MGVTBL);
- Newx(w, 1, MGWIZ);
+ op_info = ST(i++);
+ w = vmg_mgwiz_alloc(SvOK(op_info) ? SvUV(op_info) : 0);
+ t = vmg_vtable_vtbl(w->vtable);
VMG_SET_CB(ST(i++), data);
- cb = ST(i++);
- opinfo = SvOK(cb) ? SvUV(cb) : 0;
- w->opinfo = (U8) ((opinfo < 255) ? opinfo : 255);
- 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 */
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));
OUTPUT: