/* ... 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;
SvREFCNT_dec(stashes);
}
- return SvREFCNT_inc(dupsv);
+ return SvREFCNT_inc_simple(dupsv);
}
STATIC void rep_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) {
if (ud->owner == aTHX)
return;
- 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);
- SvREFCNT_inc(h2->exec);
+ h2 = PerlMemShared_malloc(sizeof *h2);
+ h2->comp = rep_clone(h1->comp, ud->owner);
+ SvREFCNT_inc_simple_void(h2->comp);
+ h2->exec = rep_clone(h1->exec, ud->owner);
+ SvREFCNT_inc_simple_void(h2->exec);
#if REP_WORKAROUND_REQUIRE_PROPAGATION
- h2->requires = h1->requires;
+ h2->cxreq = h1->cxreq;
#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 */
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);
}
dSP;
struct regexp * rx;
REGEXP *RX;
- I32 buffers;
+
re__engine__Plugin re;
const rep_hint_t *h;
- /* exp/xend version of the pattern & length */
STRLEN plen;
- char* exp = SvPV((SV*)pattern, plen);
+ char *pbuf;
+
+ SV *obj;
+
+ 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 */
+ pbuf = SvPV((SV*)pattern, plen);
/* Our blessed object */
- SV *obj = newSV(0);
- SvREFCNT_inc(obj);
+ obj = newSV(0);
+ SvREFCNT_inc_simple_void_NN(obj);
Newxz(re, 1, struct replug);
sv_setref_pv(obj, "re::engine::Plugin", (void*)re);
/* Precompiled pattern for pp_regcomp to use */
rx->prelen = plen;
- rx->precomp = savepvn(exp, rx->prelen);
+ rx->precomp = savepvn(pbuf, rx->prelen);
/* Set up qr// stringification to be equivalent to the supplied
* pattern, this should be done via overload eventually.
/* Store the pattern for ->pattern */
re->pattern = (SV*)pattern;
- SvREFCNT_inc(re->pattern);
+ SvREFCNT_inc_simple_void(re->pattern);
+
+ /* 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);
+ }
- /*
- * Call our callback function if one was defined, if not we've
+ 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;
* update the regexp struct with the new info.
*/
- buffers = rx->nparens;
-
- Newxz(rx->offs, buffers + 1, regexp_paren_pair);
+ Newxz(rx->offs, rx->nparens + 1, regexp_paren_pair);
return RX;
}
dSP;
I32 matched;
struct regexp *rx = rxREGEXP(RX);
- const rep_hint_t *h;
GET_SELF_FROM_PPRIVATE(rx->pprivate);
- h = rep_hint();
- if (h && h->exec) {
+ if (self->cb_exec) {
+ SV *ret;
+
/* Store the current str for ->str */
- self->str = (SV*)sv;
- SvREFCNT_inc(self->str);
+ SvREFCNT_dec(self->str);
+ self->str = sv;
+ SvREFCNT_inc_simple_void(self->str);
ENTER;
SAVETMPS;
XPUSHs(sv);
PUTBACK;
- call_sv(h->exec, G_SCALAR);
+ call_sv(self->cb_exec, G_SCALAR);
SPAGAIN;
- SV * ret = POPs;
-
+ ret = POPs;
if (SvTRUE(ret))
matched = 1;
else
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;
items = call_sv(callback, G_SCALAR);
if (items == 1) {
- SPAGAIN;
+ SV *ret;
- SV * ret = POPs;
+ SPAGAIN;
+ ret = POPs;
sv_setsv(sv, ret);
} else {
sv_setsv(sv, &PL_sv_undef);
PUSHMARK(SP);
XPUSHs(rx->pprivate);
XPUSHs(sv_2mortal(newSViv(paren)));
- XPUSHs(SvREFCNT_inc((SV *) value));
+ XPUSHs((SV *) value);
PUTBACK;
call_sv(callback, G_DISCARD);
callback = self->cb_num_capture_buff_LENGTH;
if (callback) {
+ IV ret;
+
ENTER;
SAVETMPS;
SPAGAIN;
- IV ret = POPi;
+ ret = POPi;
PUTBACK;
FREETMPS;
/* --- 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, ...)
PPCODE:
XPUSHs(self->str);
-char*
-mod(re::engine::Plugin self, ...)
+void
+mod(re::engine::Plugin self)
+PREINIT:
+ U32 flags;
+ char mods[5 + 1];
+ int n = 0, i;
PPCODE:
- /* /i */
- if (self->rx->intflags & PMf_FOLD) {
- XPUSHs(sv_2mortal(newSVpvs("i")));
- XPUSHs(&PL_sv_yes);
- }
-
- /* /m */
- if (self->rx->intflags & PMf_MULTILINE) {
- XPUSHs(sv_2mortal(newSVpvs("m")));
- XPUSHs(&PL_sv_yes);
- }
-
- /* /s */
- if (self->rx->intflags & PMf_SINGLELINE) {
- XPUSHs(sv_2mortal(newSVpvs("s")));
- XPUSHs(&PL_sv_yes);
- }
-
- /* /x */
- if (self->rx->intflags & PMf_EXTENDED) {
- XPUSHs(sv_2mortal(newSVpvs("x")));
- XPUSHs(&PL_sv_yes);
- }
-
- /* /p */
- if (self->rx->intflags & RXf_PMf_KEEPCOPY) {
- XPUSHs(sv_2mortal(newSVpvs("p")));
- XPUSHs(&PL_sv_yes);
+ flags = self->rx->intflags;
+ if (flags & PMf_FOLD) /* /i */
+ mods[n++] = 'i';
+ if (flags & PMf_MULTILINE) /* /m */
+ mods[n++] = 'm';
+ if (flags & PMf_SINGLELINE) /* /s */
+ mods[n++] = 's';
+ if (flags & PMf_EXTENDED) /* /x */
+ mods[n++] = 'x';
+ if (flags & RXf_PMf_KEEPCOPY) /* /p */
+ mods[n++] = 'p';
+ mods[n] = '\0';
+ EXTEND(SP, 2 * n);
+ for (i = 0; i < n; ++i) {
+ mPUSHp(mods + i, 1);
+ PUSHs(&PL_sv_yes);
}
+ XSRETURN(2 * n);
void
stash(re::engine::Plugin self, ...)
PPCODE:
if (items > 1) {
+ SvREFCNT_dec(self->stash);
self->stash = ST(1);
- SvREFCNT_inc(self->stash);
+ SvREFCNT_inc_simple_void(self->stash);
XSRETURN_EMPTY;
} else {
XPUSHs(self->stash);
}
}
+void
+_exec(re::engine::Plugin self, ...)
+PPCODE:
+ if (items > 1) {
+ SvREFCNT_dec(self->cb_exec);
+ self->cb_exec = ST(1);
+ SvREFCNT_inc_simple_void(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);
+ SvREFCNT_inc_simple_void(self->cb_num_capture_buff_FETCH);
}
void
_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);
+ SvREFCNT_inc_simple_void(self->cb_num_capture_buff_STORE);
}
void
_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);
+ SvREFCNT_inc_simple_void(self->cb_num_capture_buff_LENGTH);
}
SV *
projects / perl / modules / re-engine-Plugin.git / blobdiff