#define REP_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
+#undef ENTERn
+#if defined(ENTER_with_name) && !REP_HAS_PERL(5, 11, 4)
+# define ENTERn(N) ENTER_with_name(N)
+#else
+# define ENTERn(N) ENTER
+#endif
+
+#undef LEAVEn
+#if defined(LEAVE_with_name) && !REP_HAS_PERL(5, 11, 4)
+# define LEAVEn(N) LEAVE_with_name(N)
+#else
+# define LEAVEn(N) LEAVE
+#endif
+
#ifndef REP_WORKAROUND_REQUIRE_PROPAGATION
# define REP_WORKAROUND_REQUIRE_PROPAGATION !REP_HAS_PERL(5, 10, 1)
#endif
ptable_store(ud->tbl, ent->key, h2);
}
-STATIC void rep_thread_cleanup(pTHX_ void *);
+#include "reap.h"
STATIC void rep_thread_cleanup(pTHX_ void *ud) {
- int *level = ud;
-
- if (*level) {
- *level = 0;
- LEAVE;
- SAVEDESTRUCTOR_X(rep_thread_cleanup, level);
- ENTER;
- } else {
- dMY_CXT;
- PerlMemShared_free(level);
- ptable_free(MY_CXT.tbl);
- }
+ dMY_CXT;
+
+ ptable_free(MY_CXT.tbl);
}
#endif /* REP_THREADSAFE */
#define rep_hint() rep_hint(aTHX)
SV *hint;
+#ifdef cop_hints_fetch_pvn
+ hint = cop_hints_fetch_pvn(PL_curcop,
+ __PACKAGE__, __PACKAGE_LEN__, rep_hash, 0);
+#else
/* We already require 5.9.5 for the regexp engine API. */
hint = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash,
NULL,
__PACKAGE__, __PACKAGE_LEN__,
0,
rep_hash);
+#endif
return rep_detag(hint);
}
* in between */
if (h->exec) {
re->cb_exec = h->exec;
- SvREFCNT_inc_simple_void_NN(h->exec);
+ SvREFCNT_inc_simple_void_NN(h->exec);
}
re->cb_num_capture_buff_FETCH = NULL;
/* --- XS ------------------------------------------------------------------ */
-MODULE = re::engine::Plugin PACKAGE = re::engine::Plugin
+MODULE = re::engine::Plugin PACKAGE = re::engine::Plugin
PROTOTYPES: DISABLE
CLONE(...)
PREINIT:
ptable *t;
- int *level;
-CODE:
+PPCODE:
{
- my_cxt_t ud;
- dMY_CXT;
- ud.tbl = t = ptable_new();
- ud.owner = MY_CXT.owner;
- ptable_walk(MY_CXT.tbl, rep_ptable_clone, &ud);
+ my_cxt_t ud;
+ dMY_CXT;
+ ud.tbl = t = ptable_new();
+ ud.owner = MY_CXT.owner;
+ ptable_walk(MY_CXT.tbl, rep_ptable_clone, &ud);
}
{
- MY_CXT_CLONE;
- MY_CXT.tbl = t;
- MY_CXT.owner = aTHX;
+ MY_CXT_CLONE;
+ MY_CXT.tbl = t;
+ MY_CXT.owner = aTHX;
}
+ reap(3, rep_thread_cleanup, NULL);
+ XSRETURN(0);
-#endif
+#endif /* REP_THREADSAFE */
void
pattern(re::engine::Plugin self, ...)