# define sv_catpvn_nomg sv_catpvn
#endif
+#ifndef mPUSHu
+# define mPUSHu(U) PUSHs(sv_2mortal(newSVuv(U)))
+#endif
+
#ifndef HvNAME_get
# define HvNAME_get(H) HvNAME(H)
#endif
# define HvNAMELEN_get(H) strlen(HvNAME_get(H))
#endif
-#ifndef SvIS_FREED
-# define SvIS_FREED(sv) ((sv)->sv_flags == SVTYPEMASK)
-#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)
# endif
#endif
+#ifndef I_WORKAROUND_REQUIRE_PROPAGATION
+# define I_WORKAROUND_REQUIRE_PROPAGATION !I_HAS_PERL(5, 10, 1)
+#endif
+
/* ... Thread safety and multiplicity ...................................... */
#ifndef I_MULTIPLICITY
/* --- Helpers ------------------------------------------------------------- */
-/* ... Pointer table ....................................................... */
+/* ... Thread-safe hints ................................................... */
+
+/* If any of those are true, we need to store the hint in a global table. */
+
+#if I_THREADSAFE || I_WORKAROUND_REQUIRE_PROPAGATION
+
+typedef struct {
+ SV *code;
+#if I_WORKAROUND_REQUIRE_PROPAGATION
+ I32 requires;
+#endif
+} indirect_hint_t;
+
+#define PTABLE_NAME ptable_hints
+
+#if I_WORKAROUND_REQUIRE_PROPAGATION
+# define PTABLE_VAL_FREE(V) \
+ { indirect_hint_t *h = (V); SvREFCNT_dec(h->code); PerlMemShared_free(h); }
+#else
+# define PTABLE_VAL_FREE(V) SvREFCNT_dec(V)
+#endif
+
+#define pPTBL pTHX
+#define pPTBL_ pTHX_
+#define aPTBL aTHX
+#define aPTBL_ aTHX_
+
+#include "ptable.h"
+
+#define ptable_hints_store(T, K, V) ptable_hints_store(aTHX_ (T), (K), (V))
+#define ptable_hints_free(T) ptable_hints_free(aTHX_ (T))
+
+#endif /* I_THREADSAFE || I_WORKAROUND_REQUIRE_PROPAGATION */
+
+/* Define the op->str ptable here because we need to be able to clean it during
+ * thread cleanup. */
#define PTABLE_NAME ptable
-#define PTABLE_VAL_FREE(V) if ((V) && !SvIS_FREED((SV *) (V))) SvREFCNT_dec(V)
+#define PTABLE_VAL_FREE(V) SvREFCNT_dec(V)
#define pPTBL pTHX
#define pPTBL_ pTHX_
#include "ptable.h"
#define ptable_store(T, K, V) ptable_store(aTHX_ (T), (K), (V))
+#define ptable_delete(T, K) ptable_delete(aTHX_ (T), (K))
#define ptable_clear(T) ptable_clear(aTHX_ (T))
#define ptable_free(T) ptable_free(aTHX_ (T))
-/* ... Thread-safe hints ................................................... */
-
#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION
-#if I_THREADSAFE
-
-typedef struct {
- ptable *tbl;
- ptable *map;
- tTHX owner;
- const char *linestr;
-} my_cxt_t;
-
-#else
-
typedef struct {
+#if I_THREADSAFE || I_WORKAROUND_REQUIRE_PROPAGATION
+ ptable *tbl; /* It really is a ptable_hints */
+#endif
ptable *map;
const char *linestr;
+#if I_THREADSAFE
+ tTHX owner;
+#endif
} my_cxt_t;
-#endif /* I_THREADSAFE */
-
START_MY_CXT
#if I_THREADSAFE
STATIC void indirect_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) {
- my_cxt_t *ud = ud_;
- SV *val = ent->val;
+ my_cxt_t *ud = ud_;
+ indirect_hint_t *h1 = ent->val;
+ indirect_hint_t *h2 = PerlMemShared_malloc(sizeof *h2);
+
+ *h2 = *h1;
if (ud->owner != aTHX) {
+ SV *val = h1->code;
CLONE_PARAMS param;
AV *stashes = (SvTYPE(val) == SVt_PVHV && HvNAME_get(val)) ? newAV() : NULL;
param.stashes = stashes;
param.flags = 0;
param.proto_perl = ud->owner;
- val = sv_dup(val, ¶m);
+ h2->code = sv_dup(val, ¶m);
if (stashes) {
av_undef(stashes);
SvREFCNT_dec(stashes);
}
}
- ptable_store(ud->tbl, ent->key, val);
- SvREFCNT_inc(val);
+ ptable_hints_store(ud->tbl, ent->key, h2);
+ SvREFCNT_inc(h2->code);
}
STATIC void indirect_thread_cleanup(pTHX_ void *);
STATIC void indirect_thread_cleanup(pTHX_ void *ud) {
int *level = ud;
- SV *id;
if (*level) {
*level = 0;
dMY_CXT;
PerlMemShared_free(level);
ptable_free(MY_CXT.map);
- ptable_free(MY_CXT.tbl);
+ ptable_hints_free(MY_CXT.tbl);
}
}
+#endif /* I_THREADSAFE */
+
+#if I_THREADSAFE || I_WORKAROUND_REQUIRE_PROPAGATION
+
STATIC SV *indirect_tag(pTHX_ SV *value) {
#define indirect_tag(V) indirect_tag(aTHX_ (V))
+ indirect_hint_t *h;
dMY_CXT;
value = SvOK(value) && SvROK(value) ? SvRV(value) : NULL;
+
+ h = PerlMemShared_malloc(sizeof *h);
+ h->code = SvREFCNT_inc(value);
+
+#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
+
/* We only need for the key to be an unique tag for looking up the value later.
* Allocated memory provides convenient unique identifiers, so that's why we
* use the value pointer as the key itself. */
- ptable_store(MY_CXT.tbl, value, value);
- SvREFCNT_inc(value);
+ ptable_hints_store(MY_CXT.tbl, value, h);
return newSVuv(PTR2UV(value));
}
STATIC SV *indirect_detag(pTHX_ const SV *hint) {
#define indirect_detag(H) indirect_detag(aTHX_ (H))
- void *tag;
- SV *value;
+ indirect_hint_t *h;
+ dMY_CXT;
+
+ if (!(hint && SvOK(hint) && SvIOK(hint)))
+ return NULL;
- if (!hint || !SvOK(hint) || !SvIOK(hint))
- croak("Wrong hint");
+ h = ptable_fetch(MY_CXT.tbl, INT2PTR(void *, SvUVX(hint)));
- tag = INT2PTR(void *, SvIVX(hint));
+#if I_WORKAROUND_REQUIRE_PROPAGATION
{
- dMY_CXT;
- value = ptable_fetch(MY_CXT.tbl, tag);
+ 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;
+ }
+ }
}
+#endif
- return value;
+ return h->code;
}
#else
return newSVuv(tag);
}
-#define indirect_detag(H) INT2PTR(SV *, SvUVX(H))
+#define indirect_detag(H) (((H) && SvOK(H)) ? INT2PTR(SV *, SvUVX(H)) : NULL)
-#endif /* I_THREADSAFE */
+#endif /* I_THREADSAFE || I_WORKAROUND_REQUIRE_PROPAGATION */
STATIC U32 indirect_hash = 0;
STATIC SV *indirect_hint(pTHX) {
#define indirect_hint() indirect_hint(aTHX)
- SV *id;
-#if I_HAS_PERL(5, 10, 0)
- id = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash,
- NULL,
- __PACKAGE__, __PACKAGE_LEN__,
- 0,
- indirect_hash);
+ SV *hint, *code;
+#if 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__,
indirect_hash);
if (!val)
return 0;
- id = *val;
+ hint = *val;
#endif
- return (id && SvOK(id)) ? id : NULL;
+ return indirect_detag(hint);
}
/* ... op -> source position ............................................... */
return INT2PTR(const char *, SvUVX(val));
}
+STATIC void indirect_map_delete(pTHX_ const OP *o) {
+#define indirect_map_delete(O) indirect_map_delete(aTHX_ (O))
+ dMY_CXT;
+
+ ptable_delete(MY_CXT.map, o);
+}
+
/* --- Check functions ----------------------------------------------------- */
STATIC const char *indirect_find(pTHX_ SV *sv, const char *s) {
if (indirect_hint()) {
SV *sv = cSVOPo_sv;
- if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV))
+ if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV)) {
indirect_map_store(o, indirect_find(sv, PL_oldbufptr), sv);
+ return o;
+ }
}
+ indirect_map_delete(o);
return o;
}
}
done:
- return CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
+ o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
+
+ indirect_map_delete(o);
+ return o;
}
/* ... ck_padany ........................................................... */
sv = sv_2mortal(newSVpvn("$", 1));
sv_catpvn_nomg(sv, s, t - s + 1);
indirect_map_store(o, s, sv);
+ return o;
}
}
+ indirect_map_delete(o);
return o;
}
}
done:
- return CALL_FPTR(indirect_old_ck_method)(aTHX_ o);
+ o = CALL_FPTR(indirect_old_ck_method)(aTHX_ o);
+
+ indirect_map_delete(o);
+ return o;
}
/* ... ck_entersub ......................................................... */
STATIC OP *(*indirect_old_ck_entersub)(pTHX_ OP *) = 0;
STATIC OP *indirect_ck_entersub(pTHX_ OP *o) {
- SV *hint = indirect_hint();
+ SV *code = indirect_hint();
o = CALL_FPTR(indirect_old_ck_entersub)(aTHX_ o);
- if (hint) {
+ if (code) {
const char *mpos, *opos;
SV *mnamesv, *onamesv;
OP *mop, *oop;
oop = oop->op_sibling;
mop = lop->op_last;
+ if (!oop)
+ goto done;
+
+ switch (oop->op_type) {
+ case OP_CONST:
+ case OP_RV2SV:
+ case OP_PADSV:
+ break;
+ default:
+ goto done;
+ }
+
if (mop->op_type == OP_METHOD)
mop = cUNOPx(mop)->op_first;
else if (mop->op_type != OP_METHOD_NAMED)
goto done;
if (mpos < opos) {
- SV *code = indirect_detag(hint);
+ SV *file;
+ line_t line;
+ dSP;
- if (hint) {
- dSP;
+ ENTER;
+ SAVETMPS;
- ENTER;
- SAVETMPS;
+ onamesv = sv_mortalcopy(onamesv);
+ mnamesv = sv_mortalcopy(mnamesv);
- PUSHMARK(SP);
- EXTEND(SP, 2);
- PUSHs(onamesv);
- PUSHs(mnamesv);
- PUTBACK;
+#ifdef USE_ITHREADS
+ file = sv_2mortal(newSVpv(CopFILE(&PL_compiling), 0));
+#else
+ file = sv_mortalcopy(CopFILESV(&PL_compiling));
+#endif
+ line = CopLINE(&PL_compiling);
- call_sv(code, G_VOID);
+ PUSHMARK(SP);
+ EXTEND(SP, 4);
+ PUSHs(onamesv);
+ PUSHs(mnamesv);
+ PUSHs(file);
+ mPUSHu(line);
+ PUTBACK;
- PUTBACK;
+ call_sv(code, G_VOID);
- FREETMPS;
- LEAVE;
- }
+ PUTBACK;
+
+ FREETMPS;
+ LEAVE;
}
}
MY_CXT_INIT;
MY_CXT.map = ptable_new();
MY_CXT.linestr = NULL;
-#if I_THREADSAFE
+#if I_THREADSAFE || I_WORKAROUND_REQUIRE_PROPAGATION
MY_CXT.tbl = ptable_new();
+#endif
+#if I_THREADSAFE
MY_CXT.owner = aTHX;
#endif
projects / perl / modules / indirect.git / blobdiff