#endif
#ifndef VMG_MULTIPLICITY
-# if defined(MULTIPLICITY) || defined(PERL_IMPLICIT_CONTEXT)
+# if defined(MULTIPLICITY)
# define VMG_MULTIPLICITY 1
# else
# define VMG_MULTIPLICITY 0
# endif
#endif
+#if VMG_MULTIPLICITY
+# ifndef PERL_IMPLICIT_CONTEXT
+# error MULTIPLICITY builds must set PERL_IMPLICIT_CONTEXT
+# endif
+#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
+# ifndef VMG_THREADSAFE
+# define VMG_THREADSAFE 1
+# endif
# ifndef MY_CXT_CLONE
# define MY_CXT_CLONE \
dMY_CXT_SV; \
sv_setuv(my_cxt_sv, PTR2UV(my_cxtp))
# endif
#else
+# undef VMG_THREADSAFE
# define VMG_THREADSAFE 0
# undef dMY_CXT
# define dMY_CXT dNOOP
# define IN_PERL_COMPILETIME (PL_curcop == &PL_compiling)
#endif
+#ifndef OP_NAME
+# define OP_NAME(O) (PL_op_name[(O)->op_type])
+#endif
+
+#ifndef OP_CLASS
+# define OP_CLASS(O) (PL_opargs[(O)->op_type] & OA_CLASS_MASK)
+#endif
+
+#ifdef DEBUGGING
+# define VMG_ASSERT(C) assert(C)
+#else
+# define VMG_ASSERT(C)
+#endif
+
/* 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)
OPc_COP,
#if VMG_HAS_PERL(5, 21, 5)
OPc_METHOP,
+#endif
+#if VMG_HAS_PERL(5, 21, 7)
+ OPc_UNOP_AUX,
#endif
OPc_MAX
} opclass;
"B::COP",
#if VMG_HAS_PERL(5, 21, 5)
"B::METHOP",
+#endif
+#if VMG_HAS_PERL(5, 21, 7)
+ "B::UNOP_AUX",
#endif
NULL
};
-static opclass vmg_opclass(const OP *o) {
+static opclass vmg_opclass(pTHX_ const OP *o) {
+#define vmg_opclass(O) vmg_opclass(aTHX_ (O))
#if 0
if (!o)
return OPc_NULL;
#endif
- if (o->op_type == 0)
+ if (o->op_type == 0) {
+#if VMG_HAS_PERL(5, 21, 7)
+ if (o->op_targ == OP_NEXTSTATE || o->op_targ == OP_DBSTATE)
+ return OPc_COP;
+#endif
return (o->op_flags & OPf_KIDS) ? OPc_UNOP : OPc_BASEOP;
+ }
if (o->op_type == OP_SASSIGN)
return ((o->op_private & OPpASSIGN_BACKWARDS) ? OPc_UNOP : OPc_BINOP);
return OPc_PADOP;
#endif
- switch (PL_opargs[o->op_type] & OA_CLASS_MASK) {
+ switch (OP_CLASS(o)) {
case OA_BASEOP:
return OPc_BASEOP;
case OA_UNOP:
case OA_PADOP:
return OPc_PADOP;
case OA_PVOP_OR_SVOP:
- return (o->op_private & (OPpTRANS_TO_UTF|OPpTRANS_FROM_UTF)) ? OPc_SVOP : OPc_PVOP;
+ return (
+#if VMG_HAS_PERL(5, 13, 7)
+ (o->op_type != OP_CUSTOM) &&
+#endif
+ (o->op_private & (OPpTRANS_TO_UTF|OPpTRANS_FROM_UTF)))
+#if defined(USE_ITHREADS) && VMG_HAS_PERL(5, 8, 9)
+ ? OPc_PADOP : OPc_PVOP;
+#else
+ ? OPc_SVOP : OPc_PVOP;
+#endif
case OA_LOOP:
return OPc_LOOP;
case OA_COP:
#if VMG_HAS_PERL(5, 21, 5)
case OA_METHOP:
return OPc_METHOP;
+#endif
+#if VMG_HAS_PERL(5, 21, 7)
+ case OA_UNOP_AUX:
+ return OPc_UNOP_AUX;
#endif
}
/* --- Error messages ------------------------------------------------------ */
-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";
+static const char vmg_invalid_wiz[] = "Invalid wizard object";
+static const char vmg_wrongargnum[] = "Wrong number of arguments";
/* --- Context-safe global data -------------------------------------------- */
switch (opinfo) {
case VMG_OP_INFO_NAME: {
- OPCODE t = PL_op->op_type;
- return sv_2mortal(newSVpvn(PL_op_name[t], vmg_op_name_len[t]));
+ const char *name;
+ STRLEN name_len;
+ OPCODE t = PL_op->op_type;
+ name = OP_NAME(PL_op);
+ name_len = (t == OP_CUSTOM) ? strlen(name) : vmg_op_name_len[t];
+ return sv_2mortal(newSVpvn(name, name_len));
}
case VMG_OP_INFO_OBJECT: {
dMY_CXT;
svr = POPs;
if (SvOK(svr))
ret = (int) SvIV(svr);
+ if (SvROK(svr))
+ SvREFCNT_inc(svr);
+ else
+ svr = NULL;
PUTBACK;
FREETMPS;
LEAVE;
+ if (svr && !SvTEMP(svr))
+ sv_2mortal(svr);
+
if (chain) {
vmg_dispell_guard_new(*chain);
*chain = NULL;
#endif /* VMG_UVAR */
-/* --- Global setup/teardown ----------------------------------------------- */
+/* --- Module setup/teardown ----------------------------------------------- */
-static U32 vmg_initialized = 0;
-
-static void vmg_global_teardown_late(pTHX) {
-#define vmg_global_teardown_late() vmg_global_teardown_late(aTHX)
#if VMG_THREADSAFE
+
+static I32 vmg_loaded = 0;
+
+/* We must use preexistent global mutexes or we will never be able to destroy
+ * them. */
+# if VMG_HAS_PERL(5, 9, 3)
+# define VMG_LOADED_LOCK MUTEX_LOCK(&PL_my_ctx_mutex)
+# define VMG_LOADED_UNLOCK MUTEX_UNLOCK(&PL_my_ctx_mutex)
+# else
+# define VMG_LOADED_LOCK OP_REFCNT_LOCK
+# define VMG_LOADED_UNLOCK OP_REFCNT_UNLOCK
+# endif
+
+static void vmg_global_teardown_late_locked(pTHX) {
+#define vmg_global_teardown_late_locked() vmg_global_teardown_late_locked(aTHX)
MUTEX_DESTROY(&vmg_op_name_init_mutex);
MUTEX_DESTROY(&vmg_vtable_refcount_mutex);
-#endif
-
- vmg_initialized = 0;
return;
}
static int vmg_global_teardown_free(pTHX_ SV *sv, MAGIC *mg) {
- vmg_global_teardown_late();
+ VMG_LOADED_LOCK;
+
+ if (vmg_loaded == 0)
+ vmg_global_teardown_late_locked();
+
+ VMG_LOADED_UNLOCK;
return 0;
}
return lvl;
}
-static void vmg_global_teardown(pTHX_ void *root) {
- if (!vmg_initialized)
- return;
+#endif /* VMG_THREADSAFE */
-#if VMG_MULTIPLICITY
- if (aTHX != root)
- return;
-#endif
+static void vmg_teardown(pTHX_ void *param) {
+ dMY_CXT;
- if (vmg_destruct_level() == 0) {
- vmg_global_teardown_late();
+#if VMG_THREADSAFE
+ VMG_LOADED_LOCK;
+
+ if (vmg_loaded == 1) {
+ vmg_loaded = 0;
+ if (vmg_destruct_level() == 0) {
+ vmg_global_teardown_late_locked();
+ } else {
+ if (!PL_strtab)
+ PL_strtab = newHV();
+ vmg_sv_magicext((SV *) PL_strtab, NULL, &vmg_global_teardown_vtbl, NULL, 0);
+ }
} else {
- if (!PL_strtab)
- PL_strtab = newHV();
- vmg_sv_magicext((SV *) PL_strtab, NULL, &vmg_global_teardown_vtbl, NULL, 0);
+ VMG_ASSERT(vmg_loaded > 1);
+ --vmg_loaded;
}
- return;
-}
-
-static void vmg_global_setup(pTHX) {
-#define vmg_global_setup() vmg_global_setup(aTHX)
- if (vmg_initialized)
- return;
-
-#if VMG_THREADSAFE
- MUTEX_INIT(&vmg_vtable_refcount_mutex);
- MUTEX_INIT(&vmg_op_name_init_mutex);
-#endif
-
-#if VMG_MULTIPLICITY
- call_atexit(vmg_global_teardown, aTHX);
-#else
- call_atexit(vmg_global_teardown, NULL);
+ VMG_LOADED_UNLOCK;
#endif
- vmg_initialized = 1;
-
- return;
-}
-
-/* --- Interpreter setup/teardown ------------------------------------------ */
-
-static void vmg_local_teardown(pTHX_ void *param) {
- dMY_CXT;
-
if (MY_CXT.depth == 0 && MY_CXT.freed_tokens) {
vmg_magic_chain_free(MY_CXT.freed_tokens, NULL);
MY_CXT.freed_tokens = NULL;
return;
}
-static void vmg_local_setup(pTHX) {
-#define vmg_local_setup() vmg_local_setup(aTHX)
+static void vmg_setup(pTHX) {
+#define vmg_setup() vmg_setup(aTHX)
HV *stash;
int c;
-
MY_CXT_INIT;
+
+#if VMG_THREADSAFE
+ VMG_LOADED_LOCK;
+
+ if (vmg_loaded == 0) {
+ MUTEX_INIT(&vmg_vtable_refcount_mutex);
+ MUTEX_INIT(&vmg_op_name_init_mutex);
+ vmg_loaded = 1;
+ } else {
+ VMG_ASSERT(vmg_loaded > 0);
+ ++vmg_loaded;
+ }
+
+ VMG_LOADED_UNLOCK;
+#endif
+
for (c = OPc_NULL; c < OPc_MAX; ++c)
MY_CXT.b__op_stashes[c] = NULL;
newCONSTSUB(stash, "VMG_OP_INFO_NAME", newSVuv(VMG_OP_INFO_NAME));
newCONSTSUB(stash, "VMG_OP_INFO_OBJECT", newSVuv(VMG_OP_INFO_OBJECT));
- call_atexit(vmg_local_teardown, NULL);
+ call_atexit(vmg_teardown, NULL);
return;
}
BOOT:
{
- vmg_global_setup();
- vmg_local_setup();
+ vmg_setup();
}
#if VMG_THREADSAFE
}
MY_CXT.depth = old_depth;
MY_CXT.freed_tokens = NULL;
+ VMG_LOADED_LOCK;
+ VMG_ASSERT(vmg_loaded > 0);
+ ++vmg_loaded;
+ VMG_LOADED_UNLOCK;
}
XSRETURN(0);
projects / perl / modules / Variable-Magic.git / blobdiff