* thread cleanup. */
typedef struct {
+ char *buf;
STRLEN pos;
STRLEN size;
STRLEN len;
- char *buf;
line_t line;
} indirect_op_info_t;
#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))
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);
}
#define indirect_tag(V) indirect_tag(aTHX_ (V))
indirect_hint_t *h;
SV *code = NULL;
- dMY_CXT;
if (SvROK(value)) {
value = SvRV(value);
#endif /* !I_HINT_STRUCT */
#if I_THREADSAFE
- /* 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 hint as the key itself. */
- ptable_hints_store(MY_CXT.tbl, h, h);
+ {
+ dMY_CXT;
+ /* 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 hint as the key itself. */
+ ptable_hints_store(MY_CXT.tbl, h, h);
+ }
#endif /* I_THREADSAFE */
return newSViv(PTR2IV(h));
STATIC SV *indirect_detag(pTHX_ const SV *hint) {
#define indirect_detag(H) indirect_detag(aTHX_ (H))
indirect_hint_t *h;
+#if I_THREADSAFE || I_WORKAROUND_REQUIRE_PROPAGATION
dMY_CXT;
-
- if (!(hint && SvIOK(hint)))
- return NULL;
+#endif
h = INT2PTR(indirect_hint_t *, SvIVX(hint));
#if 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 *hint;
+ SV *hint = NULL;
if (IN_PERL_RUNTIME)
return NULL;
-#if I_HAS_PERL(5, 9, 5)
+#if I_HAS_PERL(5, 10, 0) || defined(PL_parser)
+ if (!PL_parser)
+ return NULL;
+#endif
+
+#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__,
indirect_hash);
#else
{
- SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__,
- indirect_hash);
- if (!val)
- return 0;
- hint = *val;
+ SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__, 0);
+ if (val)
+ hint = *val;
}
#endif
- return indirect_detag(hint);
+
+ if (hint && SvIOK(hint))
+ return indirect_detag(hint);
+ else {
+ dMY_CXT;
+ return MY_CXT.global_code;
+ }
}
/* ... op -> source position ............................................... */
#define indirect_map_delete(O) indirect_map_delete(aTHX_ (O))
dMY_CXT;
- ptable_store(MY_CXT.map, o, NULL);
+ ptable_delete(MY_CXT.map, o);
}
/* --- Check functions ----------------------------------------------------- */
STATIC int indirect_find(pTHX_ SV *sv, const char *s, STRLEN *pos) {
#define indirect_find(N, S, P) indirect_find(aTHX_ (N), (S), (P))
STRLEN len;
- const char *p = NULL, *r = SvPV_const(sv, len);
+ const char *p, *r = SvPV_const(sv, len);
if (len >= 1 && *r == '$') {
++r;
return 0;
}
- p = strstr(s, r);
- while (p) {
- p += len;
- if (!isALNUM(*p))
+ p = s;
+ while (1) {
+ p = strstr(p, r);
+ if (!p)
+ return 0;
+ if (!isALNUM(p[len]))
break;
- p = strstr(p + 1, r);
+ /* p points to a word that has r as prefix, skip the rest of the word */
+ p += len + 1;
+ while (isALNUM(*p))
+ ++p;
}
- if (!p)
- return 0;
*pos = p - SvPVX_const(PL_linestr);
STATIC OP *(*indirect_old_ck_const)(pTHX_ OP *) = 0;
STATIC OP *indirect_ck_const(pTHX_ OP *o) {
- o = CALL_FPTR(indirect_old_ck_const)(aTHX_ o);
+ o = indirect_old_ck_const(aTHX_ o);
if (indirect_hint()) {
SV *sv = cSVOPo_sv;
goto done;
}
- o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
+ o = indirect_old_ck_rv2sv(aTHX_ o);
indirect_map_store(o, pos, sv, CopLINE(&PL_compiling));
return o;
}
done:
- o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
+ o = indirect_old_ck_rv2sv(aTHX_ o);
indirect_map_delete(o);
return o;
STATIC OP *(*indirect_old_ck_padany)(pTHX_ OP *) = 0;
STATIC OP *indirect_ck_padany(pTHX_ OP *o) {
- o = CALL_FPTR(indirect_old_ck_padany)(aTHX_ o);
+ o = indirect_old_ck_padany(aTHX_ o);
if (indirect_hint()) {
SV *sv;
case OP_SCOPE: old_ck = indirect_old_ck_scope; break;
case OP_LINESEQ: old_ck = indirect_old_ck_lineseq; break;
}
- o = CALL_FPTR(old_ck)(aTHX_ o);
+ o = old_ck(aTHX_ o);
if (indirect_hint()) {
indirect_map_store(o, PL_oldbufptr - SvPVX_const(PL_linestr),
* expression. */
line = oi->line;
- o = CALL_FPTR(indirect_old_ck_method)(aTHX_ o);
+ o = indirect_old_ck_method(aTHX_ o);
/* o may now be a method_named */
indirect_map_store(o, pos, sv, line);
}
done:
- o = CALL_FPTR(indirect_old_ck_method)(aTHX_ o);
+ o = indirect_old_ck_method(aTHX_ o);
indirect_map_delete(o);
return o;
goto done;
line = CopLINE(&PL_compiling);
- o = CALL_FPTR(indirect_old_ck_method_named)(aTHX_ o);
+ o = indirect_old_ck_method_named(aTHX_ o);
indirect_map_store(o, pos, sv, line);
return o;
}
done:
- o = CALL_FPTR(indirect_old_ck_method_named)(aTHX_ o);
+ o = indirect_old_ck_method_named(aTHX_ o);
indirect_map_delete(o);
return o;
/* ... ck_entersub ......................................................... */
-STATIC int indirect_is_indirect(const indirect_op_info_t *moi, const indirect_op_info_t *ooi) {
- if (moi->pos > ooi->pos)
- return 0;
-
- if (moi->pos == ooi->pos)
- return moi->len == ooi->len && !memcmp(moi->buf, ooi->buf, moi->len);
-
- return 1;
-}
-
STATIC OP *(*indirect_old_ck_entersub)(pTHX_ OP *) = 0;
STATIC OP *indirect_ck_entersub(pTHX_ OP *o) {
SV *code = indirect_hint();
- o = CALL_FPTR(indirect_old_ck_entersub)(aTHX_ o);
+ o = indirect_old_ck_entersub(aTHX_ o);
if (code) {
const indirect_op_info_t *moi, *ooi;
if (!ooi)
goto done;
- if (indirect_is_indirect(moi, ooi)) {
+ /* When positions are identical, the method and the object must have the
+ * same name. But it also means that it is an indirect call, as "foo->foo"
+ * results in different positions. */
+ if (moi->pos <= ooi->pos) {
SV *file;
dSP;
STATIC U32 indirect_initialized = 0;
STATIC void indirect_teardown(pTHX_ void *root) {
- dMY_CXT;
-
if (!indirect_initialized)
return;
return;
#endif
- ptable_free(MY_CXT.map);
+ {
+ dMY_CXT;
+ ptable_free(MY_CXT.map);
#if I_THREADSAFE
- ptable_hints_free(MY_CXT.tbl);
+ ptable_hints_free(MY_CXT.tbl);
#endif
+ }
PL_check[OP_CONST] = MEMBER_TO_FPTR(indirect_old_ck_const);
indirect_old_ck_const = 0;
{
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);
projects / perl / modules / indirect.git / blobdiff