X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Types.xs;h=a88ced75d9ce2ab1d500de72abbdde2f75d5becf;hb=8c276d026bc081c19cd4ac80face8ae549c53e16;hp=6ead2eb61321356b7f6336749e2def7bd224945b;hpb=ac8fadd02eaa275485af784bc3a70fd2c666906c;p=perl%2Fmodules%2FLexical-Types.git

diff --git a/Types.xs b/Types.xs
index 6ead2eb..a88ced7 100644
--- a/Types.xs
+++ b/Types.xs
@@ -259,15 +259,37 @@ STATIC void lt_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) {
  ptable_hints_store(ud->tbl, ent->key, h2);
 }
 
-#include "reap.h"
-
 STATIC void lt_thread_cleanup(pTHX_ void *ud) {
  dMY_CXT;
 
  ptable_hints_free(MY_CXT.tbl);
  ptable_seen_free(MY_CXT.seen);
+ SvREFCNT_dec(MY_CXT.default_meth);
+}
+
+STATIC int lt_endav_free(pTHX_ SV *sv, MAGIC *mg) {
+ SAVEDESTRUCTOR_X(lt_thread_cleanup, NULL);
+
+ return 0;
 }
 
+STATIC MGVTBL lt_endav_vtbl = {
+ 0,
+ 0,
+ 0,
+ 0,
+ lt_endav_free
+#if MGf_COPY
+ , 0
+#endif
+#if MGf_DUP
+ , 0
+#endif
+#if MGf_LOCAL
+ , 0
+#endif
+};
+
 #endif /* LT_THREADSAFE */
 
 /* ... Hint tags ........................................................... */
@@ -1006,6 +1028,7 @@ PREINIT:
  ptable *t;
  ptable *s;
  SV     *cloned_default_meth;
+ GV     *gv;
 PPCODE:
  {
   {
@@ -1027,7 +1050,23 @@ PPCODE:
   MY_CXT.seen         = s;
   MY_CXT.default_meth = cloned_default_meth;
  }
- reap(3, lt_thread_cleanup, NULL);
+ gv = gv_fetchpv(__PACKAGE__ "::_THREAD_CLEANUP", 0, SVt_PVCV);
+ if (gv) {
+  CV *cv = GvCV(gv);
+  if (!PL_endav)
+   PL_endav = newAV();
+  SvREFCNT_inc(cv);
+  if (!av_store(PL_endav, av_len(PL_endav) + 1, (SV *) cv))
+   SvREFCNT_dec(cv);
+  sv_magicext((SV *) PL_endav, NULL, PERL_MAGIC_ext, &lt_endav_vtbl, NULL, 0);
+ }
+ XSRETURN(0);
+
+void
+_THREAD_CLEANUP(...)
+PROTOTYPE: DISABLE
+PPCODE:
+ lt_thread_cleanup(aTHX_ NULL);
  XSRETURN(0);
 
 #endif