X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xs-src%2FMouse.xs;h=6a571e658017af446461b458be5251e4951fd28f;hb=bdf225bbcd670b28b2ddd59aaa2fb5ebbd63e4a3;hp=47ef5c9886352559bf5ea40ac88fd91f292d9d1d;hpb=bc97157e163ca3ec82a442141232f2cb2d55b106;p=gitmo%2FMouse.git

diff --git a/xs-src/Mouse.xs b/xs-src/Mouse.xs
index 47ef5c9..6a571e6 100644
--- a/xs-src/Mouse.xs
+++ b/xs-src/Mouse.xs
@@ -49,31 +49,22 @@ enum mouse_modifier_t {
 
 static MGVTBL mouse_xc_vtbl; /* for identity */
 
-static void
-mouse_class_push_attribute_list(pTHX_ SV* const metaclass, AV* const attrall, HV* const seen){
-    dSP;
-    I32 n;
-
-    /* $meta->get_attribute_list */
-    PUSHMARK(SP);
-    XPUSHs(metaclass);
-    PUTBACK;
-
-    n = call_sv(mouse_get_attribute_list, G_ARRAY | G_METHOD);
-    for(NOOP; n > 0; n--){
-        SV* name;
-
-        SPAGAIN;
-        name = POPs;
-        PUTBACK;
-
-        if(hv_exists_ent(seen, name, 0U)){
-            continue;
-        }
-        (void)hv_store_ent(seen, name, &PL_sv_undef, 0U);
+HV*
+mouse_get_namespace(pTHX_ SV* const meta) {
+    SV* const package = get_slot(meta, mouse_package);
+    if(!(package && SvOK(package))){
+        croak("No package name defined for metaclass");
+    }
+    return gv_stashsv(package, GV_ADDMULTI);
+}
 
-        av_push(attrall, newSVsv( mcall1(metaclass, mouse_get_attribute, name) ));
+static AV*
+mouse_calculate_all_attributes(pTHX_ SV* const metaclass) {
+    SV* const avref = mcall0s(metaclass, "_calculate_all_attributes");
+    if(!(SvROK(avref) && SvTYPE(SvRV(avref)) == SVt_PVAV)) {
+        croak("$meta->_calculate_all_attributes did not return an ARRAY reference");
     }
+    return (AV*)SvRV(avref);
 }
 
 XS(XS_Mouse__Object_BUILDARGS); /* prototype */
@@ -85,22 +76,20 @@ mouse_class_has_custom_buildargs(pTHX_ HV* const stash) {
     return buildargs && CvXSUB(GvCV(buildargs)) != XS_Mouse__Object_BUILDARGS;
 }
 
-static void
-mouse_class_update_xc(pTHX_ SV* const metaclass PERL_UNUSED_DECL, HV* const stash, AV* const xc) {
+static AV*
+mouse_class_update_xc(pTHX_ SV* const metaclass PERL_UNUSED_DECL, AV* const xc) {
+    HV* const stash          = MOUSE_xc_stash(xc);
     AV* const linearized_isa = mro_get_linear_isa(stash);
     I32 const len            = AvFILLp(linearized_isa) + 1;
     I32 i;
     U32 flags             = 0x00;
-    AV* const attrall     = newAV();
     AV* const buildall    = newAV();
     AV* const demolishall = newAV();
-    HV* const seen        = newHV(); /* for attributes */
+    AV* attrall;
 
     ENTER;
     SAVETMPS;
 
-    sv_2mortal((SV*)seen);
-
      /* old data will be delete at the end of the perl scope */
     av_delete(xc, MOUSE_XC_DEMOLISHALL, 0x00);
     av_delete(xc, MOUSE_XC_BUILDALL,    0x00);
@@ -111,6 +100,13 @@ mouse_class_update_xc(pTHX_ SV* const metaclass PERL_UNUSED_DECL, HV* const stas
 
     /* update */
 
+    av_store(xc, MOUSE_XC_BUILDALL,    (SV*)buildall);
+    av_store(xc, MOUSE_XC_DEMOLISHALL, (SV*)demolishall);
+
+    attrall = mouse_calculate_all_attributes(aTHX_ metaclass);
+    SvREFCNT_inc_simple_void_NN(attrall);
+    av_store(xc, MOUSE_XC_ATTRALL,     (SV*)attrall);
+
     if(predicate_calls(metaclass, "is_immutable")){
         flags |= MOUSEf_XC_IS_IMMUTABLE;
     }
@@ -128,14 +124,10 @@ mouse_class_update_xc(pTHX_ SV* const metaclass PERL_UNUSED_DECL, HV* const stas
     }
 
     av_store(xc, MOUSE_XC_FLAGS,       newSVuv(flags));
-    av_store(xc, MOUSE_XC_ATTRALL,     (SV*)attrall);
-    av_store(xc, MOUSE_XC_BUILDALL,    (SV*)buildall);
-    av_store(xc, MOUSE_XC_DEMOLISHALL, (SV*)demolishall);
 
     for(i = 0; i < len; i++){
         SV* const klass = MOUSE_av_at(linearized_isa, i);
         HV* const st    = gv_stashsv(klass, TRUE);
-        SV* meta;
         GV* gv;
 
         gv = stash_fetchs(st, "BUILD", FALSE);
@@ -148,27 +140,18 @@ mouse_class_update_xc(pTHX_ SV* const metaclass PERL_UNUSED_DECL, HV* const stas
         if(gv && GvCVu(gv)){
             av_push(demolishall, newRV_inc((SV*)GvCV(gv)));
         }
-
-        /* ATTRIBUTES */
-        meta = get_metaclass(klass);
-        if(!SvOK(meta)){
-            continue; /* skip non-Mouse classes */
-        }
-
-        mouse_class_push_attribute_list(aTHX_ meta, attrall, seen);
     }
 
     FREETMPS;
     LEAVE;
 
     sv_setuv(MOUSE_xc_gen(xc), mro_get_pkg_gen(stash));
+    return xc;
 }
 
 static AV*
-mouse_get_xc(pTHX_ SV* const metaclass) {
+mouse_get_xc_wo_check(pTHX_ SV* const metaclass) {
     AV* xc;
-    SV* gen;
-    HV* stash;
     MAGIC* mg;
 
     if(!IsObject(metaclass)){
@@ -177,21 +160,18 @@ mouse_get_xc(pTHX_ SV* const metaclass) {
 
     mg = mouse_mg_find(aTHX_ SvRV(metaclass), &mouse_xc_vtbl, 0x00);
     if(!mg){
-        SV* const package = get_slot(metaclass, mouse_package);
-        STRLEN len;
-        const char* const pv = SvPV_const(package, len);
-
-        stash = gv_stashpvn(pv, len, TRUE);
+        /* cache stash for performance */
+        HV* const stash = mouse_get_namespace(aTHX_ metaclass);
         xc    = newAV();
 
-        mg = sv_magicext(SvRV(metaclass), (SV*)xc, PERL_MAGIC_ext, &mouse_xc_vtbl, pv, len);
+        mg = sv_magicext(SvRV(metaclass), (SV*)xc, PERL_MAGIC_ext,
+            &mouse_xc_vtbl, NULL, 0);
         SvREFCNT_dec(xc); /* refcnt++ in sv_magicext */
 
         av_extend(xc, MOUSE_XC_last - 1);
 
         av_store(xc, MOUSE_XC_GEN, newSVuv(0U));
         av_store(xc, MOUSE_XC_STASH, (SV*)stash);
-
         SvREFCNT_inc_simple_void_NN(stash);
     }
     else{
@@ -200,20 +180,33 @@ mouse_get_xc(pTHX_ SV* const metaclass) {
         assert(xc);
         assert(SvTYPE(xc) == SVt_PVAV);
     }
+    return xc;
+}
 
-    gen   = MOUSE_xc_gen(xc);
-
-    if(SvUVX(gen) != 0U && MOUSE_xc_flags(xc) & MOUSEf_XC_IS_IMMUTABLE){
-        return xc;
+static int
+mouse_xc_is_fresh(aTHX_ AV* const xc) {
+    HV* const stash = MOUSE_xc_stash(xc);
+    SV* const gen   = MOUSE_xc_gen(xc);
+    if(SvUVX(gen) != 0U && MOUSE_xc_flags(xc) & MOUSEf_XC_IS_IMMUTABLE) {
+        return TRUE;
     }
+    return SvUVX(gen) == mro_get_pkg_gen(stash);
+}
 
-    stash = MOUSE_xc_stash(xc);
-
-    if(SvUVX(gen) != mro_get_pkg_gen(stash)){
-        mouse_class_update_xc(aTHX_ metaclass, stash, xc);
-    }
+static AV*
+mouse_get_xc(pTHX_ SV* const metaclass) {
+    AV* const xc = mouse_get_xc_wo_check(aTHX_ metaclass);
+    return mouse_xc_is_fresh(aTHX_ xc)
+        ? xc
+        : mouse_class_update_xc(aTHX_ metaclass, xc);
+}
 
-    return xc;
+static AV*
+mouse_get_xc_if_fresh(pTHX_ SV* const metaclass) {
+    AV* const xc = mouse_get_xc_wo_check(aTHX_ metaclass);
+    return mouse_xc_is_fresh(aTHX_ xc)
+        ? xc
+        : NULL;
 }
 
 static HV*
@@ -372,16 +365,14 @@ mouse_class_initialize_object(pTHX_ SV* const meta, SV* const object, HV* const
     }
 }
 
-static SV*
+STATIC_INLINE SV*
 mouse_initialize_metaclass(pTHX_ SV* const klass) {
-    SV* meta = get_metaclass(klass);
-
-    if(!SvOK(meta)){
-        meta = mcall1s(newSVpvs_flags("Mouse::Meta::Class", SVs_TEMP),
-            "initialize", klass);
+    SV* const meta = get_metaclass(klass);
+    if(LIKELY(SvOK(meta))){
+        return meta;
     }
-
-    return meta;
+    return mcall1s(newSVpvs_flags("Mouse::Meta::Class", SVs_TEMP),
+            "initialize", klass);
 }
 
 static void
@@ -492,11 +483,7 @@ HV*
 namespace(SV* self)
 CODE:
 {
-    SV* const package = get_slot(self, mouse_package);
-    if(!(package && SvOK(package))){
-        croak("No package name defined");
-    }
-    RETVAL = gv_stashsv(package, GV_ADDMULTI);
+    RETVAL = mouse_get_namespace(aTHX_ self);
 }
 OUTPUT:
     RETVAL
@@ -567,14 +554,12 @@ void
 linearized_isa(SV* self)
 PPCODE:
 {
-    SV* const stash_ref = mcall0(self, mouse_namespace); /* $self->namespace */
-    AV* linearized_isa;
+    /* MOUSE_xc_stash() is not available because the xc system depends on
+       linearized_isa() */
+    HV* const stash          = mouse_get_namespace(aTHX_ self);
+    AV* const linearized_isa = mro_get_linear_isa(stash);
     I32 len;
     I32 i;
-    if(!(SvROK(stash_ref) && SvTYPE(SvRV(stash_ref)) == SVt_PVHV)){
-        croak("namespace() didn't return a HASH reference");
-    }
-    linearized_isa = mro_get_linear_isa((HV*)SvRV(stash_ref));
     len = AvFILLp(linearized_isa) + 1;
     EXTEND(SP, len);
     for(i = 0; i < len; i++){
@@ -747,17 +732,17 @@ ALIAS:
 CODE:
 {
     SV* const meta = get_metaclass(object);
+    AV* xc;
     AV* demolishall;
-    I32 len, i;
+    I32 len;
+    I32 i;
 
     if(!IsObject(object)){
         croak("You must not call %s as a class method",
             ix == 0 ? "DESTROY" : "DEMOLISHALL");
     }
 
-    if(SvOK(meta)){
-        AV* const xc = mouse_get_xc(aTHX_ meta);
-
+    if(SvOK(meta) && (xc = mouse_get_xc_if_fresh(aTHX_ meta))) {
         demolishall = MOUSE_xc_demolishall(xc);
     }
     else { /* The metaclass is already destroyed */
@@ -776,7 +761,7 @@ CODE:
         }
     }
 
-    len      = AvFILLp(demolishall) + 1;
+    len  = AvFILLp(demolishall) + 1;
     if(len > 0){
         SV* const in_global_destruction = boolSV(PL_dirty);
         SAVEI32(PL_statusvalue); /* local $? */