Silence an experimental warning by getting rid of a lexical $_

[perl/modules/re-engine-Plugin.git] / Plugin.xs

diff --git a/Plugin.xs b/Plugin.xs
index e785d0e7417e42cce04f1acf60ae4872772e8845..b7dd1d38c7fb2c0d88303d496dbdf5116eb25ace 100644 (file)
--- a/Plugin.xs
+++ b/Plugin.xs
@@ -138,14 +138,35 @@ STATIC void rep_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) {
  ptable_store(ud->tbl, ent->key, h2);
 }
 
-#include "reap.h"
-
 STATIC void rep_thread_cleanup(pTHX_ void *ud) {
  dMY_CXT;
 
  ptable_free(MY_CXT.tbl);
 }
 
+STATIC int rep_endav_free(pTHX_ SV *sv, MAGIC *mg) {
+ SAVEDESTRUCTOR_X(rep_thread_cleanup, NULL);
+
+ return 0;
+}
+
+STATIC MGVTBL rep_endav_vtbl = {
+ 0,
+ 0,
+ 0,
+ 0,
+ rep_endav_free
+#if MGf_COPY
+ , 0
+#endif
+#if MGf_DUP
+ , 0
+#endif
+#if MGf_LOCAL
+ , 0
+#endif
+};
+
 #endif /* REP_THREADSAFE */
 
 STATIC SV *rep_validate_callback(SV *code) {
@@ -208,7 +229,6 @@ get_enclosing_cv:
 STATIC SV *rep_tag(pTHX_ SV *comp, SV *exec) {
 #define rep_tag(C, E) rep_tag(aTHX_ (C), (E))
  rep_hint_t *h;
- dMY_CXT;
 
  h              = PerlMemShared_malloc(sizeof *h);
  h->comp        = rep_validate_callback(comp);
@@ -352,9 +372,9 @@ Plugin_comp(pTHX_ SV * const pattern, U32 flags)
      * already set up all the stuff we're going to to need for
      * subsequent exec and other calls */
     if (h->comp) {
-        ENTER;    
+        ENTER;
         SAVETMPS;
-   
+
         PUSHMARK(SP);
         XPUSHs(obj);
         PUTBACK;
@@ -393,14 +413,14 @@ Plugin_exec(pTHX_ REGEXP * const RX, char *stringarg, char *strend,
 
         ENTER;
         SAVETMPS;
-   
+
         PUSHMARK(SP);
         XPUSHs(rx->pprivate);
         XPUSHs(sv);
         PUTBACK;
 
         call_sv(self->cb_exec, G_SCALAR);
- 
+
         SPAGAIN;
 
         ret = POPs;
@@ -472,7 +492,7 @@ Plugin_free(pTHX_ REGEXP * const RX)
     if (callback) {
         ENTER;
         SAVETMPS;
-   
+
         PUSHMARK(SP);
         XPUSHs(rx->pprivate);
         PUTBACK;
@@ -511,14 +531,14 @@ Plugin_numbered_buff_FETCH(pTHX_ REGEXP * const RX, const I32 paren,
     if (callback) {
         ENTER;
         SAVETMPS;
-   
+
         PUSHMARK(SP);
         XPUSHs(rx->pprivate);
         XPUSHs(sv_2mortal(newSViv(paren)));
         PUTBACK;
 
         items = call_sv(callback, G_SCALAR);
-        
+
         if (items == 1) {
             SV *ret;
 
@@ -551,7 +571,7 @@ Plugin_numbered_buff_STORE(pTHX_ REGEXP * const RX, const I32 paren,
     if (callback) {
         ENTER;
         SAVETMPS;
-   
+
         PUSHMARK(SP);
         XPUSHs(rx->pprivate);
         XPUSHs(sv_2mortal(newSViv(paren)));
@@ -582,7 +602,7 @@ Plugin_numbered_buff_LENGTH(pTHX_ REGEXP * const RX, const SV * const sv,
 
         ENTER;
         SAVETMPS;
-   
+
         PUSHMARK(SP);
         XPUSHs(rx->pprivate);
         XPUSHs(sv_2mortal(newSViv(paren)));
@@ -694,6 +714,7 @@ void
 CLONE(...)
 PREINIT:
     ptable *t;
+    GV     *gv;
 PPCODE:
     {
         rep_ptable_clone_ud ud;
@@ -709,7 +730,23 @@ PPCODE:
         MY_CXT.tbl   = t;
         MY_CXT.owner = aTHX;
     }
-    reap(3, rep_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, &rep_endav_vtbl, NULL, 0);
+    }
+    XSRETURN(0);
+
+void
+_THREAD_CLEANUP(...)
+PROTOTYPE: DISABLE
+PPCODE:
+    rep_thread_cleanup(aTHX_ NULL);
     XSRETURN(0);
 
 #endif /* REP_THREADSAFE */