# define HvNAMELEN_get(H) strlen(HvNAME_get(H))
#endif
+#ifndef ENTER_with_name
+# define ENTER_with_name(N) ENTER
+#endif
+
+#ifndef LEAVE_with_name
+# define LEAVE_with_name(N) LEAVE
+#endif
+
#define I_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
#if I_HAS_PERL(5, 10, 0) || defined(PL_parser)
/* ... Thread safety and multiplicity ...................................... */
+/* Safe unless stated otherwise in Makefile.PL */
+#ifndef I_FORKSAFE
+# define I_FORKSAFE 1
+#endif
+
#ifndef I_MULTIPLICITY
# if defined(MULTIPLICITY) || defined(PERL_IMPLICIT_CONTEXT)
# define I_MULTIPLICITY 1
#if I_WORKAROUND_REQUIRE_PROPAGATION
typedef struct {
- SV *code;
- I32 requires;
+ SV *code;
+ IV cxreq;
} indirect_hint_t;
#define I_HINT_STRUCT 1
#if I_HINT_STRUCT
- h2 = PerlMemShared_malloc(sizeof *h2);
- h2->code = indirect_clone(h1->code, ud->owner);
+ h2 = PerlMemShared_malloc(sizeof *h2);
+ h2->code = indirect_clone(h1->code, ud->owner);
SvREFCNT_inc(h2->code);
#if I_WORKAROUND_REQUIRE_PROPAGATION
- h2->requires = h1->requires;
+ h2->cxreq = h1->cxreq;
#endif
#else /* I_HINT_STRUCT */
#endif /* I_THREADSAFE */
+#if I_WORKAROUND_REQUIRE_PROPAGATION
+STATIC IV indirect_require_tag(pTHX) {
+#define indirect_require_tag() indirect_require_tag(aTHX)
+ const PERL_SI *si;
+
+ for (si = PL_curstackinfo; si; si = si->si_prev) {
+ I32 cxix;
+
+ for (cxix = si->si_cxix; cxix >= 0; --cxix) {
+ const PERL_CONTEXT *cx = si->si_cxstack + cxix;
+
+ if (CxTYPE(cx) == CXt_EVAL && cx->blk_eval.old_op_type == OP_REQUIRE)
+ return PTR2IV(cx);
+ }
+ }
+
+ return PTR2IV(NULL);
+}
+#endif /* I_WORKAROUND_REQUIRE_PROPAGATION */
+
STATIC SV *indirect_tag(pTHX_ SV *value) {
#define indirect_tag(V) indirect_tag(aTHX_ (V))
indirect_hint_t *h;
#if I_HINT_STRUCT
h = PerlMemShared_malloc(sizeof *h);
- h->code = code;
-
-#if I_WORKAROUND_REQUIRE_PROPAGATION
- {
- const PERL_SI *si;
- I32 requires = 0;
-
- for (si = PL_curstackinfo; si; si = si->si_prev) {
- I32 cxix;
-
- for (cxix = si->si_cxix; cxix >= 0; --cxix) {
- const PERL_CONTEXT *cx = si->si_cxstack + cxix;
-
- if (CxTYPE(cx) == CXt_EVAL && cx->blk_eval.old_op_type == OP_REQUIRE)
- ++requires;
- }
- }
-
- h->requires = requires;
- }
-#endif /* I_WORKAROUND_REQUIRE_PROPAGATION */
-
+ h->code = code;
+# if I_WORKAROUND_REQUIRE_PROPAGATION
+ h->cxreq = indirect_require_tag();
+# endif /* I_WORKAROUND_REQUIRE_PROPAGATION */
#else /* I_HINT_STRUCT */
h = code;
#endif /* !I_HINT_STRUCT */
#endif /* I_THREADSAFE */
#if I_WORKAROUND_REQUIRE_PROPAGATION
- {
- const PERL_SI *si;
- I32 requires = 0;
-
- for (si = PL_curstackinfo; si; si = si->si_prev) {
- I32 cxix;
-
- for (cxix = si->si_cxix; cxix >= 0; --cxix) {
- const PERL_CONTEXT *cx = si->si_cxstack + cxix;
-
- if (CxTYPE(cx) == CXt_EVAL && cx->blk_eval.old_op_type == OP_REQUIRE
- && ++requires > h->requires)
- return NULL;
- }
- }
- }
+ if (indirect_require_tag() != h->cxreq)
+ return NULL;
#endif /* I_WORKAROUND_REQUIRE_PROPAGATION */
return I_HINT_CODE(h);
STATIC U32 indirect_initialized = 0;
+STATIC void indirect_teardown(pTHX_ void *root) {
+ dMY_CXT;
+
+ if (!indirect_initialized)
+ return;
+
+#if I_MULTIPLICITY
+ if (aTHX != root)
+ return;
+#endif
+
+ ptable_free(MY_CXT.map);
+#if I_THREADSAFE
+ ptable_hints_free(MY_CXT.tbl);
+#endif
+
+ PL_check[OP_CONST] = MEMBER_TO_FPTR(indirect_old_ck_const);
+ indirect_old_ck_const = 0;
+ PL_check[OP_RV2SV] = MEMBER_TO_FPTR(indirect_old_ck_rv2sv);
+ indirect_old_ck_rv2sv = 0;
+ PL_check[OP_PADANY] = MEMBER_TO_FPTR(indirect_old_ck_padany);
+ indirect_old_ck_padany = 0;
+ PL_check[OP_SCOPE] = MEMBER_TO_FPTR(indirect_old_ck_scope);
+ indirect_old_ck_scope = 0;
+ PL_check[OP_LINESEQ] = MEMBER_TO_FPTR(indirect_old_ck_lineseq);
+ indirect_old_ck_lineseq = 0;
+
+ PL_check[OP_METHOD] = MEMBER_TO_FPTR(indirect_old_ck_method);
+ indirect_old_ck_method = 0;
+ PL_check[OP_ENTERSUB] = MEMBER_TO_FPTR(indirect_old_ck_entersub);
+ indirect_old_ck_entersub = 0;
+
+ indirect_initialized = 0;
+}
+
+STATIC void indirect_setup(pTHX) {
+#define indirect_setup() indirect_setup(aTHX)
+ if (indirect_initialized)
+ return;
+
+ MY_CXT_INIT;
+#if I_THREADSAFE
+ MY_CXT.tbl = ptable_new();
+ MY_CXT.owner = aTHX;
+#endif
+ MY_CXT.map = ptable_new();
+ MY_CXT.linestr = NULL;
+
+ indirect_old_ck_const = PL_check[OP_CONST];
+ PL_check[OP_CONST] = MEMBER_TO_FPTR(indirect_ck_const);
+ indirect_old_ck_rv2sv = PL_check[OP_RV2SV];
+ PL_check[OP_RV2SV] = MEMBER_TO_FPTR(indirect_ck_rv2sv);
+ indirect_old_ck_padany = PL_check[OP_PADANY];
+ PL_check[OP_PADANY] = MEMBER_TO_FPTR(indirect_ck_padany);
+ indirect_old_ck_scope = PL_check[OP_SCOPE];
+ PL_check[OP_SCOPE] = MEMBER_TO_FPTR(indirect_ck_scope);
+ indirect_old_ck_lineseq = PL_check[OP_LINESEQ];
+ PL_check[OP_LINESEQ] = MEMBER_TO_FPTR(indirect_ck_scope);
+
+ indirect_old_ck_method = PL_check[OP_METHOD];
+ PL_check[OP_METHOD] = MEMBER_TO_FPTR(indirect_ck_method);
+ indirect_old_ck_entersub = PL_check[OP_ENTERSUB];
+ PL_check[OP_ENTERSUB] = MEMBER_TO_FPTR(indirect_ck_entersub);
+
+#if I_MULTIPLICITY
+ call_atexit(indirect_teardown, aTHX);
+#else
+ call_atexit(indirect_teardown, NULL);
+#endif
+
+ indirect_initialized = 1;
+}
+
+STATIC U32 indirect_booted = 0;
+
/* --- XS ------------------------------------------------------------------ */
MODULE = indirect PACKAGE = indirect
BOOT:
{
- if (!indirect_initialized++) {
+ if (!indirect_booted++) {
HV *stash;
- MY_CXT_INIT;
-#if I_THREADSAFE
- MY_CXT.tbl = ptable_new();
- MY_CXT.owner = aTHX;
-#endif
- MY_CXT.map = ptable_new();
- MY_CXT.linestr = NULL;
-
PERL_HASH(indirect_hash, __PACKAGE__, __PACKAGE_LEN__);
- indirect_old_ck_const = PL_check[OP_CONST];
- PL_check[OP_CONST] = MEMBER_TO_FPTR(indirect_ck_const);
- indirect_old_ck_rv2sv = PL_check[OP_RV2SV];
- PL_check[OP_RV2SV] = MEMBER_TO_FPTR(indirect_ck_rv2sv);
- indirect_old_ck_padany = PL_check[OP_PADANY];
- PL_check[OP_PADANY] = MEMBER_TO_FPTR(indirect_ck_padany);
- indirect_old_ck_scope = PL_check[OP_SCOPE];
- PL_check[OP_SCOPE] = MEMBER_TO_FPTR(indirect_ck_scope);
- indirect_old_ck_lineseq = PL_check[OP_LINESEQ];
- PL_check[OP_LINESEQ] = MEMBER_TO_FPTR(indirect_ck_scope);
-
- indirect_old_ck_method = PL_check[OP_METHOD];
- PL_check[OP_METHOD] = MEMBER_TO_FPTR(indirect_ck_method);
- indirect_old_ck_entersub = PL_check[OP_ENTERSUB];
- PL_check[OP_ENTERSUB] = MEMBER_TO_FPTR(indirect_ck_entersub);
-
stash = gv_stashpvn(__PACKAGE__, __PACKAGE_LEN__, 1);
newCONSTSUB(stash, "I_THREADSAFE", newSVuv(I_THREADSAFE));
+ newCONSTSUB(stash, "I_FORKSAFE", newSVuv(I_FORKSAFE));
}
+
+ indirect_setup();
}
#if I_THREADSAFE
{
level = PerlMemShared_malloc(sizeof *level);
*level = 1;
- LEAVE;
+ LEAVE_with_name("sub");
SAVEDESTRUCTOR_X(indirect_thread_cleanup, level);
- ENTER;
+ ENTER_with_name("sub");
}
#endif
projects / perl / modules / indirect.git / blobdiff