Nullify thread local storage entries when they are freed

[perl/modules/Lexical-Types.git] / Types.xs

diff --git a/Types.xs b/Types.xs
index 6ead2eb61321356b7f6336749e2def7bd224945b..752e3f43d27aab4f5b1de8a8c59d1e70ab91f220 100644 (file)
--- a/Types.xs
+++ b/Types.xs
@@ -259,15 +259,40 @@ 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);
+ MY_CXT.tbl          = NULL;
  ptable_seen_free(MY_CXT.seen);
+ MY_CXT.seen         = NULL;
+ SvREFCNT_dec(MY_CXT.default_meth);
+ MY_CXT.default_meth = NULL;
+}
+
+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 ........................................................... */
@@ -912,9 +937,12 @@ STATIC void lt_teardown(pTHX_ void *root) {
   dMY_CXT;
 #if LT_THREADSAFE
   ptable_hints_free(MY_CXT.tbl);
+  MY_CXT.tbl          = NULL;
 #endif
   ptable_seen_free(MY_CXT.seen);
+  MY_CXT.seen         = NULL;
   SvREFCNT_dec(MY_CXT.default_meth);
+  MY_CXT.default_meth = NULL;
  }
 
  lt_ck_restore(OP_PADANY, &lt_old_ck_padany);
@@ -1006,6 +1034,7 @@ PREINIT:
  ptable *t;
  ptable *s;
  SV     *cloned_default_meth;
+ GV     *gv;
 PPCODE:
  {
   {
@@ -1027,7 +1056,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