#endif
#ifndef I_WORKAROUND_REQUIRE_PROPAGATION
-# define I_WORKAROUND_REQUIRE_PROPAGATION !I_HAS_PERL(5, 12, 0)
+# define I_WORKAROUND_REQUIRE_PROPAGATION !I_HAS_PERL(5, 10, 1)
#endif
/* ... Thread safety and multiplicity ...................................... */
* thread cleanup. */
typedef struct {
+ char *buf;
STRLEN pos;
STRLEN size;
STRLEN len;
- char *buf;
line_t line;
} indirect_op_info_t;
tTHX owner;
#endif
ptable *map;
+ SV *global_code;
} my_cxt_t;
START_MY_CXT
AV *stashes = NULL;
SV *dupsv;
+ if (!sv)
+ return NULL;
+
if (SvTYPE(sv) == SVt_PVHV && HvNAME_get(sv))
stashes = newAV();
h2 = PerlMemShared_malloc(sizeof *h2);
h2->code = indirect_clone(h1->code, ud->owner);
- SvREFCNT_inc(h2->code);
#if I_WORKAROUND_REQUIRE_PROPAGATION
h2->require_tag = PTR2IV(indirect_clone(INT2PTR(SV *, h1->require_tag),
ud->owner));
#else /* I_HINT_STRUCT */
h2 = indirect_clone(h1, ud->owner);
- SvREFCNT_inc(h2);
#endif /* !I_HINT_STRUCT */
STATIC void indirect_thread_cleanup(pTHX_ void *ud) {
dMY_CXT;
+ SvREFCNT_dec(MY_CXT.global_code);
ptable_free(MY_CXT.map);
ptable_hints_free(MY_CXT.tbl);
}
STATIC SV *indirect_detag(pTHX_ const SV *hint) {
#define indirect_detag(H) indirect_detag(aTHX_ (H))
indirect_hint_t *h;
-
- if (!(hint && SvIOK(hint)))
- return NULL;
+#if I_THREADSAFE || I_WORKAROUND_REQUIRE_PROPAGATION
+ dMY_CXT;
+#endif
h = INT2PTR(indirect_hint_t *, SvIVX(hint));
#if I_THREADSAFE
- {
- dMY_CXT;
- h = ptable_fetch(MY_CXT.tbl, h);
- }
+ h = ptable_fetch(MY_CXT.tbl, h);
#endif /* I_THREADSAFE */
#if I_WORKAROUND_REQUIRE_PROPAGATION
if (indirect_require_tag() != h->require_tag)
- return NULL;
+ return MY_CXT.global_code;
#endif /* I_WORKAROUND_REQUIRE_PROPAGATION */
return I_HINT_CODE(h);
STATIC SV *indirect_hint(pTHX) {
#define indirect_hint() indirect_hint(aTHX)
- SV **val;
+ SV *hint = NULL;
if (IN_PERL_RUNTIME)
return NULL;
- val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__, indirect_hash);
- if (!val)
- return NULL;
+#ifdef cop_hints_fetch_pvn
+ hint = cop_hints_fetch_pvn(PL_curcop, __PACKAGE__, __PACKAGE_LEN__,
+ indirect_hash, 0);
+#elif I_HAS_PERL(5, 9, 5)
+ hint = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash,
+ NULL,
+ __PACKAGE__, __PACKAGE_LEN__,
+ 0,
+ indirect_hash);
+#else
+ {
+ SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__, 0);
+ if (val)
+ hint = *val;
+ }
+#endif
- return indirect_detag(*val);
+ if (hint && SvIOK(hint))
+ return indirect_detag(hint);
+ else {
+ dMY_CXT;
+ return MY_CXT.global_code;
+ }
}
/* ... op -> source position ............................................... */
{
MY_CXT_INIT;
#if I_THREADSAFE
- MY_CXT.tbl = ptable_new();
- MY_CXT.owner = aTHX;
+ MY_CXT.tbl = ptable_new();
+ MY_CXT.owner = aTHX;
#endif
- MY_CXT.map = ptable_new();
+ MY_CXT.map = ptable_new();
+ MY_CXT.global_code = NULL;
}
indirect_old_ck_const = PL_check[OP_CONST];
PROTOTYPE: DISABLE
PREINIT:
ptable *t;
+ SV *global_code_dup;
PPCODE:
{
my_cxt_t ud;
ud.tbl = t = ptable_new();
ud.owner = MY_CXT.owner;
ptable_walk(MY_CXT.tbl, indirect_ptable_clone, &ud);
+ global_code_dup = indirect_clone(MY_CXT.global_code, MY_CXT.owner);
}
{
MY_CXT_CLONE;
- MY_CXT.map = ptable_new();
- MY_CXT.tbl = t;
- MY_CXT.owner = aTHX;
+ MY_CXT.map = ptable_new();
+ MY_CXT.tbl = t;
+ MY_CXT.owner = aTHX;
+ MY_CXT.global_code = global_code_dup;
}
reap(3, indirect_thread_cleanup, NULL);
XSRETURN(0);
RETVAL = indirect_tag(value);
OUTPUT:
RETVAL
+
+void
+_global(SV *code)
+PROTOTYPE: $
+PPCODE:
+ if (!SvOK(code))
+ code = NULL;
+ else if (SvROK(code))
+ code = SvRV(code);
+ {
+ dMY_CXT;
+ SvREFCNT_dec(MY_CXT.global_code);
+ MY_CXT.global_code = SvREFCNT_inc(code);
+ }
+ XSRETURN(0);