# define HvNAMELEN_get(H) strlen(HvNAME_get(H))
#endif
-#ifndef SvIS_FREED
-# define SvIS_FREED(sv) ((sv)->sv_flags == SVTYPEMASK)
+#ifndef SvREFCNT_inc_simple_NN
+# define SvREFCNT_inc_simple_NN SvREFCNT_inc
#endif
/* ... Thread safety and multiplicity ...................................... */
/* ... Thread-safe hints ................................................... */
-/* If any of those is true, we need to store the hint in a global table. */
-
-#if LT_THREADSAFE || LT_WORKAROUND_REQUIRE_PROPAGATION
+#if LT_WORKAROUND_REQUIRE_PROPAGATION
typedef struct {
SV *code;
-#if LT_WORKAROUND_REQUIRE_PROPAGATION
UV requires;
-#endif
} lt_hint_t;
+#define LT_HINT_STRUCT 1
+
+#define LT_HINT_CODE(H) ((H)->code)
+
+#define LT_HINT_FREE(H) { \
+ lt_hint_t *h = (H); \
+ SvREFCNT_dec(h->code); \
+ PerlMemShared_free(h); \
+}
+
+#else /* LT_WORKAROUND_REQUIRE_PROPAGATION */
+
+typedef SV lt_hint_t;
+
+#define LT_HINT_STRUCT 0
+
+#define LT_HINT_CODE(H) (H)
+
+#define LT_HINT_FREE(H) SvREFCNT_dec(H);
+
+#endif /* !LT_WORKAROUND_REQUIRE_PROPAGATION */
+
+#if LT_THREADSAFE
+
#define PTABLE_NAME ptable_hints
-#define PTABLE_VAL_FREE(V) { lt_hint_t *h = (V); SvREFCNT_dec(h->code); PerlMemShared_free(h); }
+#define PTABLE_VAL_FREE(V) LT_HINT_FREE(V)
#define pPTBL pTHX
#define pPTBL_ pTHX_
#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 /* LT_THREADSAFE || LT_WORKAROUND_REQUIRE_PROPAGATION */
+#endif /* LT_THREADSAFE */
/* ... Global data ......................................................... */
#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION
typedef struct {
-#if LT_THREADSAFE || LT_WORKAROUND_REQUIRE_PROPAGATION
- ptable *tbl; /* It really is a ptable_hints */
-#endif
#if LT_THREADSAFE
+ ptable *tbl; /* It really is a ptable_hints */
tTHX owner;
#endif
+ SV *default_meth;
OP * (*pp_padsv_saved)(pTHX);
} my_cxt_t;
SvREFCNT_dec(stashes);
}
- return dupsv;
+ return SvREFCNT_inc(dupsv);
}
STATIC void lt_ptable_hints_clone(pTHX_ ptable_ent *ent, void *ud_) {
my_cxt_t *ud = ud_;
lt_hint_t *h1 = ent->val;
- lt_hint_t *h2 = PerlMemShared_malloc(sizeof *h2);
+ lt_hint_t *h2;
- *h2 = *h1;
+ if (ud->owner == aTHX)
+ return;
- if (ud->owner != aTHX)
- h2->code = lt_clone(h1->code, ud->owner);
+#if LT_HINT_STRUCT
- ptable_hints_store(ud->tbl, ent->key, h2);
+ h2 = PerlMemShared_malloc(sizeof *h2);
+ h2->code = lt_clone(h1->code, ud->owner);
SvREFCNT_inc(h2->code);
+#if LT_WORKAROUND_REQUIRE_PROPAGATION
+ h2->requires = h1->requires;
+#endif
+
+#else /* LT_HINT_STRUCT */
+
+ h2 = lt_clone(h1, ud->owner);
+ SvREFCNT_inc(h2);
+
+#endif /* !LT_HINT_STRUCT */
+
+ ptable_hints_store(ud->tbl, ent->key, h2);
}
STATIC void lt_thread_cleanup(pTHX_ void *);
/* ... Hint tags ........................................................... */
-#if LT_THREADSAFE || LT_WORKAROUND_REQUIRE_PROPAGATION
-
STATIC SV *lt_tag(pTHX_ SV *value) {
#define lt_tag(V) lt_tag(aTHX_ (V))
lt_hint_t *h;
+ SV *code = NULL;
dMY_CXT;
- value = SvOK(value) && SvROK(value) ? SvRV(value) : NULL;
+ if (SvROK(value)) {
+ value = SvRV(value);
+ if (SvTYPE(value) >= SVt_PVCV) {
+ code = value;
+ SvREFCNT_inc_simple_NN(code);
+ }
+ }
+#if LT_HINT_STRUCT
h = PerlMemShared_malloc(sizeof *h);
- h->code = SvREFCNT_inc(value);
+ h->code = code;
#if LT_WORKAROUND_REQUIRE_PROPAGATION
{
const PERL_SI *si;
- UV requires = 0;
+ I32 requires = 0;
for (si = PL_curstackinfo; si; si = si->si_prev) {
I32 cxix;
h->requires = requires;
}
-#endif
+#endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */
+
+#else /* LT_HINT_STRUCT */
+ h = code;
+#endif /* !LT_HINT_STRUCT */
+#if LT_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 value pointer as the key itself. */
- ptable_hints_store(MY_CXT.tbl, value, h);
+ * use the hint as the key itself. */
+ ptable_hints_store(MY_CXT.tbl, h, h);
+#endif /* LT_THREADSAFE */
- return newSVuv(PTR2UV(value));
+ return newSViv(PTR2IV(h));
}
STATIC SV *lt_detag(pTHX_ const SV *hint) {
lt_hint_t *h;
dMY_CXT;
- if (!(hint && SvOK(hint) && SvIOK(hint)))
+ if (!(hint && SvIOK(hint)))
return NULL;
- h = ptable_fetch(MY_CXT.tbl, INT2PTR(void *, SvUVX(hint)));
+ h = INT2PTR(lt_hint_t *, SvIVX(hint));
+#if LT_THREADSAFE
+ h = ptable_fetch(MY_CXT.tbl, h);
+#endif /* LT_THREADSAFE */
#if LT_WORKAROUND_REQUIRE_PROPAGATION
{
const PERL_SI *si;
- UV requires = 0;
+ I32 requires = 0;
for (si = PL_curstackinfo; si; si = si->si_prev) {
I32 cxix;
}
}
}
-#endif
-
- return h->code;
-}
-
-#else
-
-STATIC SV *lt_tag(pTHX_ SV *value) {
-#define lt_tag(V) lt_tag(aTHX_ (V))
- UV tag = 0;
-
- if (SvOK(value) && SvROK(value)) {
- value = SvRV(value);
- SvREFCNT_inc(value);
- tag = PTR2UV(value);
- }
+#endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */
- return newSVuv(tag);
+ return LT_HINT_CODE(h);
}
-#define lt_detag(H) (((H) && SvOK(H)) ? INT2PTR(SV *, SvUVX(H)) : NULL)
-
-#endif /* LT_THREADSAFE || LT_WORKAROUND_REQUIRE_PROPAGATION */
-
STATIC U32 lt_hash = 0;
STATIC SV *lt_hint(pTHX) {
#endif
typedef struct {
-#if LT_MULTIPLICITY
+#ifdef MULTIPLICITY
STRLEN buf_size, orig_pkg_len, type_pkg_len, type_meth_len;
char *buf;
-#else /* LT_MULTIPLICITY */
+#else /* MULTIPLICITY */
SV *orig_pkg;
SV *type_pkg;
SV *type_meth;
-#endif /* !LT_MULTIPLICITY */
+#endif /* !MULTIPLICITY */
OP *(*pp_padsv)(pTHX);
} lt_op_info;
-STATIC void lt_map_store(pPTBLMS_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*pp_padsv)(pTHX)) {
-#define lt_map_store(O, OP, TP, TM, PP) lt_map_store(aPTBLMS_ (O), (OP), (TP), (TM), (PP))
+STATIC void lt_map_store(pTHX_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*pp_padsv)(pTHX)) {
+#define lt_map_store(O, OP, TP, TM, PP) lt_map_store(aTHX_ (O), (OP), (TP), (TM), (PP))
lt_op_info *oi;
#ifdef USE_ITHREADS
if (!(oi = ptable_fetch(lt_op_map, o))) {
oi = PerlMemShared_malloc(sizeof *oi);
ptable_map_store(lt_op_map, o, oi);
-#if LT_MULTIPLICITY
+#ifdef MULTIPLICITY
oi->buf = NULL;
oi->buf_size = 0;
-#else /* LT_MULTIPLICITY */
+#else /* MULTIPLICITY */
} else {
SvREFCNT_dec(oi->orig_pkg);
SvREFCNT_dec(oi->type_pkg);
SvREFCNT_dec(oi->type_meth);
-#endif /* !LT_MULTIPLICITY */
+#endif /* !MULTIPLICITY */
}
-#if LT_MULTIPLICITY
+#ifdef MULTIPLICITY
{
STRLEN op_len = SvCUR(orig_pkg);
STRLEN tp_len = SvCUR(type_pkg);
oi->orig_pkg_len = op_len;
oi->type_pkg_len = tp_len;
oi->type_meth_len = tm_len;
+ SvREFCNT_dec(orig_pkg);
+ SvREFCNT_dec(type_pkg);
+ SvREFCNT_dec(type_meth);
}
-#else /* LT_MULTIPLICITY */
+#else /* MULTIPLICITY */
oi->orig_pkg = orig_pkg;
oi->type_pkg = type_pkg;
oi->type_meth = type_meth;
-#endif /* !LT_MULTIPLICITY */
+#endif /* !MULTIPLICITY */
oi->pp_padsv = pp_padsv;
ENTER;
SAVETMPS;
-#if LT_MULTIPLICITY
+#ifdef MULTIPLICITY
{
STRLEN op_len = oi.orig_pkg_len, tp_len = oi.type_pkg_len;
char *buf = oi.buf;
type_meth = sv_2mortal(newSVpvn(buf, oi.type_meth_len));
SvREADONLY_on(type_meth);
}
-#else /* LT_MULTIPLICITY */
+#else /* MULTIPLICITY */
orig_pkg = oi.orig_pkg;
type_pkg = oi.type_pkg;
type_meth = oi.type_meth;
-#endif /* !LT_MULTIPLICITY */
+#endif /* !MULTIPLICITY */
PUSHMARK(SP);
EXTEND(SP, 3);
* pp_padsv, but much less than if we would have set PL_ppaddr[OP_PADSV]
* globally. */
-STATIC SV *lt_default_meth = NULL;
-
STATIC OP *(*lt_old_ck_padany)(pTHX_ OP *) = 0;
STATIC OP *lt_ck_padany(pTHX_ OP *o) {
stash = PL_in_my_stash;
if (stash && (code = lt_hint())) {
SV *orig_pkg = newSVpvn(HvNAME_get(stash), HvNAMELEN_get(stash));
- SV *orig_meth = lt_default_meth;
+ SV *orig_meth = MY_CXT.default_meth;
SV *type_pkg = NULL;
SV *type_meth = NULL;
int items;
HV *stash;
MY_CXT_INIT;
-#if LT_THREADSAFE || LT_WORKAROUND_REQUIRE_PROPAGATION
- MY_CXT.tbl = ptable_new();
-#endif
#if LT_THREADSAFE
+ MY_CXT.tbl = ptable_new();
MY_CXT.owner = aTHX;
#endif
MY_CXT.pp_padsv_saved = 0;
+ MY_CXT.default_meth = newSVpvn("TYPEDSCALAR", 11);
+ SvREADONLY_on(MY_CXT.default_meth);
lt_op_map = ptable_new();
#ifdef USE_ITHREADS
MUTEX_INIT(<_op_map_mutex);
#endif
- lt_default_meth = newSVpvn("TYPEDSCALAR", 11);
- SvREADONLY_on(lt_default_meth);
-
PERL_HASH(lt_hash, __PACKAGE__, __PACKAGE_LEN__);
lt_old_ck_padany = PL_check[OP_PADANY];
PREINIT:
ptable *t;
int *level;
+ SV *cloned_default_meth;
CODE:
{
my_cxt_t ud;
ud.tbl = t = ptable_new();
ud.owner = MY_CXT.owner;
ptable_walk(MY_CXT.tbl, lt_ptable_hints_clone, &ud);
+ cloned_default_meth = lt_clone(MY_CXT.default_meth, MY_CXT.owner);
}
{
MY_CXT_CLONE;
MY_CXT.tbl = t;
MY_CXT.owner = aTHX;
MY_CXT.pp_padsv_saved = 0;
+ MY_CXT.default_meth = cloned_default_meth;
}
{
level = PerlMemShared_malloc(sizeof *level);