#define SO_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
+#ifndef GvCV_set
+# define GvCV_set(G, C) (GvCV(G) = (C))
+#endif
+
/* ... Thread safety and multiplicity ...................................... */
#ifndef SO_MULTIPLICITY
# define MY_CXT_CLONE NOOP
#endif
+#if defined(OP_CHECK_MUTEX_LOCK) && defined(OP_CHECK_MUTEX_UNLOCK)
+# define SO_CHECK_MUTEX_LOCK OP_CHECK_MUTEX_LOCK
+# define SO_CHECK_MUTEX_UNLOCK OP_CHECK_MUTEX_UNLOCK
+#else
+# define SO_CHECK_MUTEX_LOCK OP_REFCNT_LOCK
+# define SO_CHECK_MUTEX_UNLOCK OP_REFCNT_UNLOCK
+#endif
+
+typedef OP *(*so_ck_t)(pTHX_ OP *);
+
+#ifdef wrap_op_checker
+
+# define so_ck_replace(T, NC, OCP) wrap_op_checker((T), (NC), (OCP))
+
+#else
+
+STATIC void so_ck_replace(pTHX_ OPCODE type, so_ck_t new_ck, so_ck_t *old_ck_p){
+#define so_ck_replace(T, NC, OCP) so_ck_replace(aTHX_ (T), (NC), (OCP))
+ SO_CHECK_MUTEX_LOCK;
+ if (!*old_ck_p) {
+ *old_ck_p = PL_check[type];
+ PL_check[type] = new_ck;
+ }
+ SO_CHECK_MUTEX_UNLOCK;
+}
+
+#endif
+
+STATIC void so_ck_restore(pTHX_ OPCODE type, so_ck_t *old_ck_p) {
+#define so_ck_restore(T, OCP) so_ck_restore(aTHX_ (T), (OCP))
+ SO_CHECK_MUTEX_LOCK;
+ if (*old_ck_p) {
+ PL_check[type] = *old_ck_p;
+ *old_ck_p = 0;
+ }
+ SO_CHECK_MUTEX_UNLOCK;
+}
+
/* --- Global data --------------------------------------------------------- */
#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION
#endif /* SO_THREADSAFE */
-#define PTABLE_NAME ptable
-#define PTABLE_VAL_FREE(V) PerlMemShared_free(V)
-
-#include "ptable.h"
-
-/* PerlMemShared_free() needs the [ap]PTBLMS_? default values */
-#define ptable_store(T, K, V) ptable_store(aPTBLMS_ (T), (K), (V))
-
-STATIC ptable *so_op_name = NULL;
-
-#ifdef USE_ITHREADS
-STATIC perl_mutex so_op_name_mutex;
-#endif
-
-typedef struct {
- STRLEN len;
- char buf;
-} so_op_name_t;
-
/* --- Public API ---------------------------------------------------------- */
#include "sub_op.h"
c->namelen = 0;
c->proto = NULL;
c->protolen = 0;
- c->pp = 0;
- c->check = 0;
+ c->call = 0;
c->ref = 0;
c->ud = NULL;
}
void sub_op_register(pTHX_ const sub_op_config_t *c, U32 flags) {
- SV *key = newSViv(PTR2IV(c->pp));
+ dMY_CXT;
if (!(flags & SUB_OP_REGISTER_STEAL))
c = sub_op_dup(aTHX_ c);
- if (!PL_custom_op_names)
- PL_custom_op_names = newHV();
- (void) hv_store_ent(PL_custom_op_names, key, newSVpv(c->name, c->namelen), 0);
+ (void) hv_store(MY_CXT.map, c->name, c->namelen, newSViv(PTR2IV(c)), 0);
+}
- if (!PL_custom_op_descs)
- PL_custom_op_descs = newHV();
- (void) hv_store_ent(PL_custom_op_descs, key, newSVpv(c->name, c->namelen), 0);
+STATIC const char *so_strndup(pTHX_ const char *s, STRLEN len) {
+#define so_strndup(S, L) so_strndup(aTHX_ (S), (L))
+ const char *d;
- SvREFCNT_dec(key);
+ if (!s)
+ return NULL;
- {
- dMY_CXT;
- (void) hv_store(MY_CXT.map, c->name, c->namelen, newSViv(PTR2IV(c)), 0);
- }
+ d = PerlMemShared_malloc(len + 1);
+ Copy(s, d, len, char);
+ ((char *) d)[len] = '\0';
+
+ return d;
}
sub_op_config_t *sub_op_dup(pTHX_ const sub_op_config_t *orig) {
- STRLEN len;
sub_op_config_t *dupe = PerlMemShared_malloc(sizeof *dupe);
- len = orig->namelen;
- if (orig->name) {
- dupe->name = PerlMemShared_malloc(len + 1);
- Copy(orig->name, dupe->name, len, char);
- ((char *) dupe->name)[len] = '\0';
- } else {
- dupe->name = NULL;
- }
- dupe->namelen = len;
-
- len = orig->protolen;
- if (orig->proto) {
- dupe->proto = PerlMemShared_malloc(len + 1);
- Copy(orig->proto, dupe->proto, len, char);
- ((char *) dupe->proto)[len] = '\0';
- } else {
- dupe->proto = NULL;
- }
- dupe->protolen = len;
+ dupe->name = so_strndup(orig->name, orig->namelen);
+ dupe->namelen = orig->namelen;
- dupe->pp = orig->pp;
- dupe->check = orig->check;
- dupe->ref = orig->ref;
- dupe->ud = orig->ud;
+ dupe->proto = so_strndup(orig->proto, orig->protolen);
+ dupe->protolen = orig->protolen;
+
+ dupe->call = orig->call;
+ dupe->ref = orig->ref;
+ dupe->ud = orig->ud;
return dupe;
}
return;
}
+OP *sub_op_study(const OP *o, OP **last_arg_p, OP **rv2cv_p) {
+ OP *ex_list, *last_arg, *rv2cv, *gvop;
+
+ ex_list = cUNOPo->op_first;
+ /* pushmark when a method call */
+ if (!ex_list || ex_list->op_type != OP_NULL)
+ goto skip;
+
+ rv2cv = cUNOPx(ex_list)->op_first;
+ if (!rv2cv)
+ goto skip;
+
+ while (1) {
+ OP *next = rv2cv->op_sibling;
+ if (!next)
+ break;
+ last_arg = rv2cv;
+ rv2cv = next;
+ }
+
+ if (!(rv2cv->op_flags & OPf_KIDS))
+ goto skip;
+
+ gvop = cUNOPx(rv2cv)->op_first;
+
+ if (gvop && gvop->op_type == OP_GV)
+ goto done;
+
+skip:
+ last_arg = NULL;
+ rv2cv = NULL;
+ gvop = NULL;
+
+done:
+ if (last_arg_p)
+ *last_arg_p = last_arg;
+ if (rv2cv_p)
+ *rv2cv_p = rv2cv;
+
+ return gvop;
+}
+
/* --- Private helpers ----------------------------------------------------- */
STATIC IV so_hint(pTHX) {
return (SvOK(hint) && SvIOK(hint)) ? SvIVX(hint) : 0;
}
-STATIC OP *so_find_gvop(OP *o, OP **last_arg_p, OP **rv2cv_p) {
+STATIC OP *so_find_gvop(const OP *o) {
OP *ex_list, *last_arg, *rv2cv, *gvop;
ex_list = cUNOPo->op_first;
OP *next = rv2cv->op_sibling;
if (!next)
break;
- last_arg = rv2cv;
- rv2cv = next;
+ rv2cv = next;
}
if (!(rv2cv->op_flags & OPf_KIDS))
goto skip;
gvop = cUNOPx(rv2cv)->op_first;
-
if (gvop && gvop->op_type == OP_GV)
- goto done;
+ return gvop;
skip:
- last_arg = NULL;
- rv2cv = NULL;
- gvop = NULL;
-
-done:
- if (last_arg_p)
- *last_arg_p = last_arg;
- if (rv2cv_p)
- *rv2cv_p = rv2cv;
-
- return gvop;
+ return NULL;
}
STATIC OP *(*so_old_ck_entersub)(pTHX_ OP *) = 0;
o = CALL_FPTR(so_old_ck_entersub)(aTHX_ o);
if (so_hint()) {
- OP *ex_list, *last_arg, *rv2cv, *gvop;
+ OP *gvop;
GV *gv;
if (o->op_type != OP_ENTERSUB)
if (o->op_private & OPpENTERSUB_AMPER) /* hopefully \&foo */
goto skip;
- gvop = so_find_gvop(o, &last_arg, &rv2cv);
+ gvop = so_find_gvop(o);
if (!gvop)
goto skip;
if (gv && SvTYPE(gv) >= SVt_PVGV && (cv = GvCV(gv)) == MY_CXT.placeholder) {
SvREFCNT_dec(cv);
- GvCV(gv) = NULL;
+ GvCV_set(gv, NULL);
}
- o->op_type = OP_CUSTOM;
- o->op_ppaddr = c->pp;
-
- if (last_arg)
- last_arg->op_sibling = NULL;
-
- op_free(rv2cv);
-
- if (c->check)
- o = CALL_FPTR(c->check)(aTHX_ o, c->ud);
-
- {
- so_op_name_t *on = PerlMemShared_malloc(sizeof(*on) + len);
- Copy(name, &on->buf, len, char);
- (&on->buf)[len] = '\0';
- on->len = len;
-#ifdef USE_ITHREADS
- MUTEX_LOCK(&so_op_name_mutex);
-#endif /* USE_ITHREADS */
- ptable_store(so_op_name, o, on);
-#ifdef USE_ITHREADS
- MUTEX_UNLOCK(&so_op_name_mutex);
-#endif /* USE_ITHREADS */
- }
+ if (c->call)
+ o = CALL_FPTR(c->call)(aTHX_ o, c->ud);
}
}
if (kid->op_type != OP_RV2CV)
continue;
- gvop = so_find_gvop(kid, NULL, NULL);
+ gvop = so_find_gvop(kid);
if (!gvop)
continue;
if (gv && SvTYPE(gv) >= SVt_PVGV && (cv = GvCV(gv)) == MY_CXT.placeholder) {
SvREFCNT_dec(cv);
- GvCV(gv) = NULL;
+ GvCV_set(gv, NULL);
}
}
}
BOOT:
{
- so_op_name = ptable_new();
-#ifdef USE_ITHREADS
- MUTEX_INIT(&so_op_name_mutex);
-#endif
-
MY_CXT_INIT;
MY_CXT.map = newHV();
MY_CXT.placeholder = NULL;
MY_CXT.owner = aTHX;
#endif /* SO_THREADSAFE */
- so_old_ck_entersub = PL_check[OP_ENTERSUB];
- PL_check[OP_ENTERSUB] = so_ck_entersub;
- so_old_ck_refgen = PL_check[OP_REFGEN];
- PL_check[OP_REFGEN] = so_ck_refgen;
- so_old_ck_gelem = PL_check[OP_GELEM];
- PL_check[OP_GELEM] = so_ck_gelem;
+ so_ck_replace(OP_ENTERSUB, so_ck_entersub, &so_old_ck_entersub);
+ so_ck_replace(OP_REFGEN, so_ck_refgen, &so_old_ck_refgen);
+ so_ck_replace(OP_GELEM, so_ck_gelem, &so_old_ck_gelem);
}
#if SO_THREADSAFE
}
XSRETURN(0);
-void
-_custom_name(SV *op)
-PROTOTYPE: $
-PREINIT:
- OP *o;
- so_op_name_t *on;
-PPCODE:
- if (!SvROK(op))
- XSRETURN_UNDEF;
- o = INT2PTR(OP *, SvIV(SvRV(op)));
- if (!o || o->op_type != OP_CUSTOM)
- XSRETURN_UNDEF;
-#ifdef USE_ITHREADS
- MUTEX_LOCK(&so_op_name_mutex);
-#endif /* USE_ITHREADS */
- on = ptable_fetch(so_op_name, o);
-#ifdef USE_ITHREADS
- MUTEX_UNLOCK(&so_op_name_mutex);
-#endif /* USE_ITHREADS */
- if (!on)
- XSRETURN_UNDEF;
- ST(0) = sv_2mortal(newSVpvn(&on->buf, on->len));
- XSRETURN(1);
-
void
_constant_sub(SV *sv)
PROTOTYPE: $
projects / perl / modules / Sub-Op.git / blobdiff