X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Types.xs;h=03efb236089942a478ce22e30dc1c43d99bbfcc8;hb=10f2056e8e60beb34bab8d23b0bbd316afc9cb0b;hp=ff9e398f6242d625c40706a095161c8b37cb354e;hpb=158a53a77c240a1fed59318ecacb5bb20eb11f1d;p=perl%2Fmodules%2FLexical-Types.git

diff --git a/Types.xs b/Types.xs
index ff9e398..03efb23 100644
--- a/Types.xs
+++ b/Types.xs
@@ -39,6 +39,14 @@
 # define SvREFCNT_inc_simple_NN SvREFCNT_inc
 #endif
 
+#ifndef ENTER_with_name
+# define ENTER_with_name(N) ENTER
+#endif
+
+#ifndef LEAVE_with_name
+# define LEAVE_with_name(N) LEAVE
+#endif
+
 /* ... Thread safety and multiplicity ...................................... */
 
 #ifndef LT_MULTIPLICITY
@@ -91,7 +99,7 @@
 
 typedef struct {
  SV *code;
- UV  requires;
+ IV  cxreq;
 } lt_hint_t;
 
 #define LT_HINT_STRUCT 1
@@ -185,11 +193,11 @@ STATIC void lt_ptable_hints_clone(pTHX_ ptable_ent *ent, void *ud_) {
 
 #if LT_HINT_STRUCT
 
- h2           = PerlMemShared_malloc(sizeof *h2);
- h2->code     = lt_clone(h1->code, ud->owner);
+ 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;
+ h2->cxreq = h1->cxreq;
 #endif
 
 #else /*   LT_HINT_STRUCT */
@@ -223,6 +231,26 @@ STATIC void lt_thread_cleanup(pTHX_ void *ud) {
 
 /* ... Hint tags ........................................................... */
 
+#if LT_WORKAROUND_REQUIRE_PROPAGATION
+STATIC IV lt_require_tag(pTHX) {
+#define lt_require_tag() lt_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 /* LT_WORKAROUND_REQUIRE_PROPAGATION */
+
 STATIC SV *lt_tag(pTHX_ SV *value) {
 #define lt_tag(V) lt_tag(aTHX_ (V))
  lt_hint_t *h;
@@ -239,28 +267,10 @@ STATIC SV *lt_tag(pTHX_ SV *value) {
 
 #if LT_HINT_STRUCT
  h = PerlMemShared_malloc(sizeof *h);
- h->code = code;
-
-#if LT_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 /* LT_WORKAROUND_REQUIRE_PROPAGATION */
-
+ h->code  = code;
+# if LT_WORKAROUND_REQUIRE_PROPAGATION
+ h->cxreq = lt_require_tag();
+# endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */
 #else  /*  LT_HINT_STRUCT */
  h = code;
 #endif /* !LT_HINT_STRUCT */
@@ -287,24 +297,9 @@ STATIC SV *lt_detag(pTHX_ const SV *hint) {
 #if LT_THREADSAFE
  h = ptable_fetch(MY_CXT.tbl, h);
 #endif /* LT_THREADSAFE */
-
 #if LT_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 (lt_require_tag() != h->cxreq)
+  return NULL;
 #endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */
 
  return LT_HINT_CODE(h);
@@ -355,10 +350,10 @@ typedef struct {
  SV *type_pkg;
  SV *type_meth;
 #endif /* !MULTIPLICITY */
- OP *(*pp_padsv)(pTHX);
+ OP *(*old_pp_padsv)(pTHX);
 } lt_op_info;
 
-STATIC void lt_map_store(pTHX_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*pp_padsv)(pTHX)) {
+STATIC void lt_map_store(pTHX_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*old_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;
 
@@ -411,7 +406,7 @@ STATIC void lt_map_store(pTHX_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type
  oi->type_meth = type_meth;
 #endif /* !MULTIPLICITY */
 
- oi->pp_padsv  = pp_padsv;
+ oi->old_pp_padsv = old_pp_padsv;
 
 #ifdef USE_ITHREADS
  MUTEX_UNLOCK(&lt_op_map_mutex);
@@ -514,7 +509,7 @@ STATIC OP *lt_pp_padsv(pTHX) {
    LEAVE;
   }
 
-  return CALL_FPTR(oi.pp_padsv)(aTHX);
+  return CALL_FPTR(oi.old_pp_padsv)(aTHX);
  }
 
  return CALL_FPTR(PL_ppaddr[OP_PADSV])(aTHX);
@@ -592,6 +587,8 @@ STATIC OP *lt_ck_padany(pTHX_ OP *o) {
    croak(__PACKAGE__ " mangler should return zero, one or two scalars, but got %d", items);
   if (items == 0) {
    SvREFCNT_dec(orig_pkg);
+   FREETMPS;
+   LEAVE;
    goto skip;
   } else {
    SV *rsv;
@@ -648,17 +645,36 @@ STATIC OP *lt_ck_padsv(pTHX_ OP *o) {
 
 STATIC U32 lt_initialized = 0;
 
-/* --- XS ------------------------------------------------------------------ */
+STATIC void lt_teardown(pTHX_ void *root) {
+ dMY_CXT;
 
-MODULE = Lexical::Types      PACKAGE = Lexical::Types
+ if (!lt_initialized)
+  return;
 
-PROTOTYPES: ENABLE
+#if LT_MULTIPLICITY
+ if (aTHX != root)
+  return;
+#endif
 
-BOOT: 
-{                                    
- if (!lt_initialized++) {
-  HV *stash;
+#if LT_THREADSAFE
+ ptable_hints_free(MY_CXT.tbl);
+#endif
+ SvREFCNT_dec(MY_CXT.default_meth);
 
+ PL_check[OP_PADANY] = MEMBER_TO_FPTR(lt_old_ck_padany);
+ lt_old_ck_padany    = 0;
+ PL_check[OP_PADSV]  = MEMBER_TO_FPTR(lt_old_ck_padsv);
+ lt_old_ck_padsv     = 0;
+
+ lt_initialized = 0;
+}
+
+STATIC void lt_setup(pTHX) {
+#define lt_setup() lt_setup(aTHX)
+ if (lt_initialized)
+  return;
+
+ {
   MY_CXT_INIT;
 #if LT_THREADSAFE
   MY_CXT.tbl            = ptable_new();
@@ -667,6 +683,34 @@ BOOT:
   MY_CXT.pp_padsv_saved = 0;
   MY_CXT.default_meth   = newSVpvn("TYPEDSCALAR", 11);
   SvREADONLY_on(MY_CXT.default_meth);
+ }
+
+ lt_old_ck_padany    = PL_check[OP_PADANY];
+ PL_check[OP_PADANY] = MEMBER_TO_FPTR(lt_ck_padany);
+ lt_old_ck_padsv     = PL_check[OP_PADSV];
+ PL_check[OP_PADSV]  = MEMBER_TO_FPTR(lt_ck_padsv);
+
+#if LT_MULTIPLICITY
+ call_atexit(lt_teardown, aTHX);
+#else
+ call_atexit(lt_teardown, NULL);
+#endif
+
+ lt_initialized = 1;
+}
+
+STATIC U32 lt_booted = 0;
+
+/* --- XS ------------------------------------------------------------------ */
+
+MODULE = Lexical::Types      PACKAGE = Lexical::Types
+
+PROTOTYPES: ENABLE
+
+BOOT:
+{
+ if (!lt_booted++) {
+  HV *stash;
 
   lt_op_map = ptable_new();
 #ifdef USE_ITHREADS
@@ -675,14 +719,11 @@ BOOT:
 
   PERL_HASH(lt_hash, __PACKAGE__, __PACKAGE_LEN__);
 
-  lt_old_ck_padany    = PL_check[OP_PADANY];
-  PL_check[OP_PADANY] = MEMBER_TO_FPTR(lt_ck_padany);
-  lt_old_ck_padsv     = PL_check[OP_PADSV];
-  PL_check[OP_PADSV]  = MEMBER_TO_FPTR(lt_ck_padsv);
-
   stash = gv_stashpvn(__PACKAGE__, __PACKAGE_LEN__, 1);
   newCONSTSUB(stash, "LT_THREADSAFE", newSVuv(LT_THREADSAFE));
  }
+
+ lt_setup();
 }
 
 #if LT_THREADSAFE
@@ -694,7 +735,7 @@ PREINIT:
  ptable *t;
  int    *level;
  SV     *cloned_default_meth;
-CODE:
+PPCODE:
  {
   my_cxt_t ud;
   dMY_CXT;
@@ -713,10 +754,11 @@ CODE:
  {
   level = PerlMemShared_malloc(sizeof *level);
   *level = 1;
-  LEAVE;
+  LEAVE_with_name("sub");
   SAVEDESTRUCTOR_X(lt_thread_cleanup, level);
-  ENTER;
+  ENTER_with_name("sub");
  }
+ XSRETURN(0);
 
 #endif