#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
/* ... Thread-safe hints ................................................... */
typedef struct {
- SV *comp;
- SV *exec;
+ SV *comp;
+ SV *exec;
#if REP_WORKAROUND_REQUIRE_PROPAGATION
- I32 requires;
+ IV cxreq;
#endif
} rep_hint_t;
if (ud->owner == aTHX)
return;
- h2 = PerlMemShared_malloc(sizeof *h2);
- h2->comp = rep_clone(h1->comp, ud->owner);
+ h2 = PerlMemShared_malloc(sizeof *h2);
+ h2->comp = rep_clone(h1->comp, ud->owner);
SvREFCNT_inc(h2->comp);
- h2->exec = rep_clone(h1->exec, ud->owner);
+ h2->exec = rep_clone(h1->exec, ud->owner);
SvREFCNT_inc(h2->exec);
#if REP_WORKAROUND_REQUIRE_PROPAGATION
- h2->requires = h1->requires;
+ h2->cxreq = h1->cxreq;
#endif
ptable_store(ud->tbl, ent->key, h2);
return SvREFCNT_inc_simple_NN(code);
}
+#if REP_WORKAROUND_REQUIRE_PROPAGATION
+STATIC IV rep_require_tag(pTHX) {
+#define rep_require_tag() rep_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 /* REP_WORKAROUND_REQUIRE_PROPAGATION */
+
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);
- h->exec = rep_validate_callback(exec);
-
+ h->comp = rep_validate_callback(comp);
+ h->exec = rep_validate_callback(exec);
#if REP_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
+ h->cxreq = rep_require_tag();
+#endif /* REP_WORKAROUND_REQUIRE_PROPAGATION */
#if REP_THREADSAFE
/* We only need for the key to be an unique tag for looking up the value later.
#endif /* REP_THREADSAFE */
#if REP_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;
- }
- }
- }
-#endif
+ if (rep_require_tag() != h->cxreq)
+ return NULL;
+#endif /* REP_WORKAROUND_REQUIRE_PROPAGATION */
return h;
}
#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);
}
re__engine__Plugin re;
const rep_hint_t *h;
+ h = rep_hint();
+ if (!h) /* This looks like a pragma leak. Apply the default behaviour */
+ return re_compile(pattern, flags);
+
/* exp/xend version of the pattern & length */
STRLEN plen;
char* exp = SvPV((SV*)pattern, plen);
re->pattern = (SV*)pattern;
SvREFCNT_inc(re->pattern);
- /*
- * Call our callback function if one was defined, if not we've
+ /* If there's an exec callback, store it into the private object so
+ * that it will be the one to be called, even if the engine changes
+ * in between */
+ if (h->exec) {
+ re->cb_exec = h->exec;
+ SvREFCNT_inc_simple_void_NN(h->exec);
+ }
+
+ re->cb_num_capture_buff_FETCH = NULL;
+ re->cb_num_capture_buff_STORE = NULL;
+ re->cb_num_capture_buff_LENGTH = NULL;
+
+ /* Call our callback function if one was defined, if not we've
* already set up all the stuff we're going to to need for
- * subsequent exec and other calls
- */
- h = rep_hint();
- if (h && h->comp) {
+ * subsequent exec and other calls */
+ if (h->comp) {
ENTER;
SAVETMPS;
LEAVE;
}
- /* If there's an exec callback, store it into the private object so
- * that it will be the one to be called, even if the engine changes
- * in between */
- if (h && h->exec) {
- re->cb_exec = h->exec;
- SvREFCNT_inc_simple_void_NN(h->exec);
- }
-
/* If any of the comp-time accessors were called we'll have to
* update the regexp struct with the new info.
*/
void
Plugin_free(pTHX_ REGEXP * const RX)
{
- PERL_UNUSED_ARG(RX);
+ struct regexp *rx = rxREGEXP(RX);
+ GET_SELF_FROM_PPRIVATE(rx->pprivate);
+
+ SvREFCNT_dec(self->pattern);
+ SvREFCNT_dec(self->str);
+
+ SvREFCNT_dec(self->cb_exec);
+
+ SvREFCNT_dec(self->cb_num_capture_buff_FETCH);
+ SvREFCNT_dec(self->cb_num_capture_buff_STORE);
+ SvREFCNT_dec(self->cb_num_capture_buff_LENGTH);
+
+ self->rx = NULL;
+ Safefree(self);
+
/*
dSP;
SV * callback;
- GET_SELF_FROM_PPRIVATE(rx->pprivate);
callback = self->cb_free;
MY_CXT.tbl = t;
MY_CXT.owner = aTHX;
}
+ {
+ level = PerlMemShared_malloc(sizeof *level);
+ *level = 1;
+ LEAVEn("sub");
+ SAVEDESTRUCTOR_X(rep_thread_cleanup, level);
+ ENTERn("sub");
+ }
#endif
}
}
+void
+_exec(re::engine::Plugin self, ...)
+PPCODE:
+ if (items > 1) {
+ SvREFCNT_dec(self->cb_exec);
+ self->cb_exec = ST(1);
+ SvREFCNT_inc(self->cb_exec);
+ }
+
void
_num_capture_buff_FETCH(re::engine::Plugin self, ...)
PPCODE:
if (items > 1) {
+ SvREFCNT_dec(self->cb_num_capture_buff_FETCH);
self->cb_num_capture_buff_FETCH = ST(1);
SvREFCNT_inc(self->cb_num_capture_buff_FETCH);
}
_num_capture_buff_STORE(re::engine::Plugin self, ...)
PPCODE:
if (items > 1) {
+ SvREFCNT_dec(self->cb_num_capture_buff_STORE);
self->cb_num_capture_buff_STORE = ST(1);
SvREFCNT_inc(self->cb_num_capture_buff_STORE);
}
_num_capture_buff_LENGTH(re::engine::Plugin self, ...)
PPCODE:
if (items > 1) {
+ SvREFCNT_dec(self->cb_num_capture_buff_LENGTH);
self->cb_num_capture_buff_LENGTH = ST(1);
SvREFCNT_inc(self->cb_num_capture_buff_LENGTH);
}
projects / perl / modules / re-engine-Plugin.git / blobdiff