X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=xs-src%2FMouse.xs;h=831e522b8d60430a78b20b96197e014a53dbc369;hp=19d98c6eba6dd49d6e51c3e39e67a120a4b3a92d;hb=91ee66cbb155fe48f641868aebc1c6215446e2c0;hpb=fcdc12ac0d67969cf79745b062fd706ae56c8b92 diff --git a/xs-src/Mouse.xs b/xs-src/Mouse.xs index 19d98c6..831e522 100644 --- a/xs-src/Mouse.xs +++ b/xs-src/Mouse.xs @@ -49,58 +49,47 @@ 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 */ + static int mouse_class_has_custom_buildargs(pTHX_ HV* const stash) { - XS(XS_Mouse__Object_BUILDARGS); /* prototype */ - GV* const buildargs = gv_fetchmeth_autoload(stash, "BUILDARGS", sizeof("BUILDARGS")-1, 0); 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); + 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; } @@ -123,19 +119,15 @@ mouse_class_update_xc(pTHX_ SV* const metaclass PERL_UNUSED_DECL, HV* const stas flags |= MOUSEf_XC_HAS_BUILDARGS; } - if(predicate_calls(metaclass, "__strict_constructor")){ + if(predicate_calls(metaclass, "strict_constructor")){ flags |= MOUSEf_XC_CONSTRUCTOR_IS_STRICT; } 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(pTHX_ 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_INLINE 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* @@ -236,13 +229,12 @@ mouse_buildargs(pTHX_ SV* metaclass, SV* const klass, I32 ax, I32 items) { else{ I32 i; - args = newHV_mortal(); - if( (items % 2) != 0 ){ if(!metaclass){ metaclass = get_metaclass(klass); } mouse_throw_error(metaclass, NULL, "Odd number of parameters to new()"); } + args = newHV_mortal(); for(i = 0; i < items; i += 2){ (void)hv_store_ent(args, ST(i), newSVsv(ST(i+1)), 0U); } @@ -352,7 +344,8 @@ mouse_class_initialize_object(pTHX_ SV* const meta, SV* const object, HV* const } } /* for each attribute */ - if(MOUSE_xc_flags(xc) & MOUSEf_XC_CONSTRUCTOR_IS_STRICT && used < HvUSEDKEYS(args)){ + if(MOUSE_xc_flags(xc) & MOUSEf_XC_CONSTRUCTOR_IS_STRICT + && used < (I32)HvUSEDKEYS(args)){ mouse_report_unknown_args(aTHX_ meta, attrs, args); } @@ -370,18 +363,16 @@ mouse_class_initialize_object(pTHX_ SV* const meta, SV* const object, HV* const if(MOUSE_xc_flags(xc) & MOUSEf_XC_IS_ANON){ (void)set_slot(object, newSVpvs_flags("__METACLASS__", SVs_TEMP), meta); } - } -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 @@ -445,11 +436,27 @@ mouse_get_modifier_storage(pTHX_ return (AV*)SvRV(storage_ref); } +static +XSPROTO(XS_Mouse_value_holder) { + dVAR; dXSARGS; + SV* const value = (SV*)XSANY.any_ptr; + assert(value); + PERL_UNUSED_VAR(items); + ST(0) = value; + XSRETURN(1); +} + +DECL_BOOT(Mouse__Util); +DECL_BOOT(Mouse__Util__TypeConstraints); +DECL_BOOT(Mouse__Meta__Method__Accessor__XS); +DECL_BOOT(Mouse__Meta__Attribute); + MODULE = Mouse PACKAGE = Mouse PROTOTYPES: DISABLE BOOT: +{ mouse_package = newSVpvs_share("package"); mouse_namespace = newSVpvs_share("namespace"); mouse_methods = newSVpvs_share("methods"); @@ -459,11 +466,11 @@ BOOT: mouse_get_attribute = newSVpvs_share("get_attribute"); mouse_get_attribute_list = newSVpvs_share("get_attribute_list"); - MOUSE_CALL_BOOT(Mouse__Util); - MOUSE_CALL_BOOT(Mouse__Util__TypeConstraints); - MOUSE_CALL_BOOT(Mouse__Meta__Method__Accessor__XS); - MOUSE_CALL_BOOT(Mouse__Meta__Attribute); - + CALL_BOOT(Mouse__Util); + CALL_BOOT(Mouse__Util__TypeConstraints); + CALL_BOOT(Mouse__Meta__Method__Accessor__XS); + CALL_BOOT(Mouse__Meta__Attribute); +} MODULE = Mouse PACKAGE = Mouse::Meta::Module @@ -476,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 @@ -521,34 +524,42 @@ CODE: MODULE = Mouse PACKAGE = Mouse::Meta::Class BOOT: +{ + CV* xsub; + INSTALL_SIMPLE_READER(Class, roles); INSTALL_SIMPLE_PREDICATE_WITH_KEY(Class, is_anon_class, anon_serial_id); INSTALL_SIMPLE_READER(Class, is_immutable); - INSTALL_SIMPLE_READER_WITH_KEY(Class, __strict_constructor, strict_constructor); + + INSTALL_INHERITABLE_CLASS_ACCESSOR(strict_constructor); INSTALL_CLASS_HOLDER(Class, method_metaclass, "Mouse::Meta::Method"); INSTALL_CLASS_HOLDER(Class, attribute_metaclass, "Mouse::Meta::Attribute"); INSTALL_CLASS_HOLDER(Class, constructor_class, "Mouse::Meta::Method::Constructor::XS"); INSTALL_CLASS_HOLDER(Class, destructor_class, "Mouse::Meta::Method::Destructor::XS"); - newCONSTSUB(gv_stashpvs("Mouse::Meta::Method::Constructor::XS", TRUE), "_generate_constructor", - newRV_inc((SV*)get_cvs("Mouse::Object::new", TRUE))); - newCONSTSUB(gv_stashpvs("Mouse::Meta::Method::Destructor::XS", TRUE), "_generate_destructor", - newRV_inc((SV*)get_cvs("Mouse::Object::DESTROY", TRUE))); + xsub = newXS("Mouse::Meta::Method::Constructor::XS::_generate_constructor", + XS_Mouse_value_holder, file); + CvXSUBANY(xsub).any_ptr + = newRV_inc((SV*)get_cvs("Mouse::Object::new", GV_ADD)); + + xsub = newXS("Mouse::Meta::Method::Destructor::XS::_generate_destructor", + XS_Mouse_value_holder, file); + CvXSUBANY(xsub).any_ptr + = newRV_inc((SV*)get_cvs("Mouse::Object::DESTROY", GV_ADD)); +} 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++){ @@ -613,6 +624,19 @@ CODE: mouse_class_initialize_object(aTHX_ meta, object, args, is_cloning); } +void +_invalidate_metaclass_cache(SV* meta) +CODE: +{ + AV* const xc = mouse_get_xc_if_fresh(aTHX_ meta); + if(xc) { + SV* const gen = MOUSE_xc_gen(xc); + sv_setuv(gen, 0U); + } + delete_slot(meta, newSVpvs_flags("_mouse_cache_", SVs_TEMP)); +} + + MODULE = Mouse PACKAGE = Mouse::Meta::Role BOOT: @@ -625,7 +649,7 @@ void add_before_modifier(SV* self, SV* name, SV* modifier) CODE: { - av_push(mouse_get_modifier_storage(aTHX_ self, ix, name), newSVsv(modifier)); + av_push(mouse_get_modifier_storage(aTHX_ self, (enum mouse_modifier_t)ix, name), newSVsv(modifier)); } ALIAS: add_before_method_modifier = MOUSE_M_BEFORE @@ -640,7 +664,7 @@ ALIAS: get_after_method_modifiers = MOUSE_M_AFTER PPCODE: { - AV* const storage = mouse_get_modifier_storage(aTHX_ self, ix, name); + AV* const storage = mouse_get_modifier_storage(aTHX_ self, (enum mouse_modifier_t)ix, name); I32 const len = av_len(storage) + 1; if(GIMME_V == G_ARRAY) { I32 i; @@ -654,6 +678,18 @@ PPCODE: } } +void +add_metaclass_accessor(SV* self, SV* name) +CODE: +{ + SV* const klass = mcall0(self, mouse_name); + const char* fq_name = form("%"SVf"::%"SVf, klass, name); + STRLEN keylen; + const char* const key = SvPV_const(name, keylen); + mouse_simple_accessor_generate(aTHX_ fq_name, key, keylen, + XS_Mouse_inheritable_class_accessor, NULL, 0); +} + MODULE = Mouse PACKAGE = Mouse::Object void @@ -709,17 +745,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 */ @@ -738,7 +774,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 $? */