X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=mro.c;h=8d98fdceebd3c3a68397c5e0f61d088b334936eb;hb=5145b83ccb40455ee1421b25f5971eb7e2a87afc;hp=a541e50317148a9abb07f2150b3ca6e779713aba;hpb=dd69841bebe1fc7f7a6b248576221520a0418d52;p=p5sagit%2Fp5-mst-13.2.git diff --git a/mro.c b/mro.c index a541e50..8d98fdc 100644 --- a/mro.c +++ b/mro.c @@ -34,6 +34,7 @@ Perl_mro_meta_init(pTHX_ HV* stash) Newxz(newmeta, 1, struct mro_meta); HvAUX(stash)->xhv_mro_meta = newmeta; newmeta->cache_gen = 1; + newmeta->pkg_gen = 1; return newmeta; } @@ -97,8 +98,7 @@ Perl_mro_get_linear_isa_dfs(pTHX_ HV *stash, I32 level) stashname = HvNAME_get(stash); if (!stashname) - Perl_croak(aTHX_ - "Can't linearize anonymous symbol table"); + Perl_croak(aTHX_ "Can't linearize anonymous symbol table"); if (level > 100) Perl_croak(aTHX_ "Recursive inheritance detected in package '%s'", @@ -127,7 +127,7 @@ Perl_mro_get_linear_isa_dfs(pTHX_ HV *stash, I32 level) exists check and avoid adding duplicate classnames to the MRO as we go. */ - HV* stored = (HV*)sv_2mortal((SV*)newHV()); + HV* const stored = (HV*)sv_2mortal((SV*)newHV()); SV **svp = AvARRAY(av); I32 items = AvFILLp(av) + 1; @@ -205,8 +205,7 @@ Perl_mro_get_linear_isa_c3(pTHX_ HV* stash, I32 level) stashname = HvNAME_get(stash); stashname_len = HvNAMELEN_get(stash); if (!stashname) - Perl_croak(aTHX_ - "Can't linearize anonymous symbol table"); + Perl_croak(aTHX_ "Can't linearize anonymous symbol table"); if (level > 100) Perl_croak(aTHX_ "Recursive inheritance detected in package '%s'", @@ -221,9 +220,6 @@ Perl_mro_get_linear_isa_c3(pTHX_ HV* stash, I32 level) /* not in cache, make a new one */ - retval = newAV(); - av_push(retval, newSVpvn(stashname, stashname_len)); /* us first */ - gvp = (GV**)hv_fetchs(stash, "ISA", FALSE); isa = (gvp && (gv = *gvp) && isGV_with_GP(gv)) ? GvAV(gv) : NULL; @@ -236,8 +232,8 @@ Perl_mro_get_linear_isa_c3(pTHX_ HV* stash, I32 level) if(isa && AvFILLp(isa) >= 0) { SV** seqs_ptr; I32 seqs_items; - HV* tails = (HV*)sv_2mortal((SV*)newHV()); - AV* seqs = (AV*)sv_2mortal((SV*)newAV()); + HV* const tails = (HV*)sv_2mortal((SV*)newHV()); + AV* const seqs = (AV*)sv_2mortal((SV*)newAV()); I32* heads; /* This builds @seqs, which is an array of arrays. @@ -247,21 +243,22 @@ Perl_mro_get_linear_isa_c3(pTHX_ HV* stash, I32 level) I32 items = AvFILLp(isa) + 1; SV** isa_ptr = AvARRAY(isa); while(items--) { - AV* isa_lin; - SV* isa_item = *isa_ptr++; - HV* isa_item_stash = gv_stashsv(isa_item, 0); + SV* const isa_item = *isa_ptr++; + HV* const isa_item_stash = gv_stashsv(isa_item, 0); if(!isa_item_stash) { /* if no stash, make a temporary fake MRO containing just itself */ - isa_lin = (AV*)sv_2mortal((SV*)newAV()); + AV* const isa_lin = newAV(); av_push(isa_lin, newSVsv(isa_item)); + av_push(seqs, (SV*)isa_lin); } else { - isa_lin = mro_get_linear_isa_c3(isa_item_stash, level + 1); /* recursion */ + /* recursion */ + AV* const isa_lin = mro_get_linear_isa_c3(isa_item_stash, level + 1); + av_push(seqs, SvREFCNT_inc_simple_NN((SV*)isa_lin)); } - av_push(seqs, (SV*)isa_lin); } - av_push(seqs, (SV*)isa); + av_push(seqs, SvREFCNT_inc_simple_NN((SV*)isa)); /* This builds "heads", which as an array of integer array indices, one per seq, which point at the virtual "head" @@ -276,44 +273,47 @@ Perl_mro_get_linear_isa_c3(pTHX_ HV* stash, I32 level) seqs_ptr = AvARRAY(seqs); seqs_items = AvFILLp(seqs) + 1; while(seqs_items--) { - AV* seq = (AV*)*seqs_ptr++; + AV* const seq = (AV*)*seqs_ptr++; I32 seq_items = AvFILLp(seq); if(seq_items > 0) { SV** seq_ptr = AvARRAY(seq) + 1; while(seq_items--) { - SV* seqitem = *seq_ptr++; - HE* he = hv_fetch_ent(tails, seqitem, 0, 0); + SV* const seqitem = *seq_ptr++; + HE* const he = hv_fetch_ent(tails, seqitem, 0, 0); if(!he) { hv_store_ent(tails, seqitem, newSViv(1), 0); } else { - SV* val = HeVAL(he); + SV* const val = HeVAL(he); sv_inc(val); } } } } + /* Initialize retval to build the return value in */ + retval = newAV(); + av_push(retval, newSVpvn(stashname, stashname_len)); /* us first */ + /* This loop won't terminate until we either finish building the MRO, or get an exception. */ while(1) { - SV* seqhead = NULL; SV* cand = NULL; SV* winner = NULL; - SV* val; - HE* tail_entry; - AV* seq; int s; /* "foreach $seq (@seqs)" */ - SV** avptr = AvARRAY(seqs); + SV** const avptr = AvARRAY(seqs); for(s = 0; s <= AvFILLp(seqs); s++) { SV** svp; - seq = (AV*)(avptr[s]); + AV * const seq = (AV*)(avptr[s]); + SV* seqhead; if(!seq) continue; /* skip empty seqs */ svp = av_fetch(seq, heads[s], 0); seqhead = *svp; /* seqhead = head of this seq */ if(!winner) { + HE* tail_entry; + SV* val; /* if we haven't found a winner for this round yet, and this seqhead is not in tails (or the count for it in tails has dropped to zero), then this @@ -336,11 +336,14 @@ Perl_mro_get_linear_isa_c3(pTHX_ HV* stash, I32 level) NULL out any seq which is now empty, and adjust tails for consistency */ - int new_head = ++heads[s]; + const int new_head = ++heads[s]; if(new_head > AvFILLp(seq)) { + SvREFCNT_dec(avptr[s]); avptr[s] = NULL; } else { + HE* tail_entry; + SV* val; /* Because we know this new seqhead used to be a tail, we can assume it is in tails and has a positive value, which we need to dec */ @@ -364,10 +367,6 @@ Perl_mro_get_linear_isa_c3(pTHX_ HV* stash, I32 level) hierarchy is not C3-incompatible */ if(!winner) { /* we have to do some cleanup before we croak */ - SV** svp = AvARRAY(seqs); - items = AvFILLp(seqs) + 1; - while (items--) - *svp++ = NULL; SvREFCNT_dec(retval); Safefree(heads); @@ -377,6 +376,11 @@ Perl_mro_get_linear_isa_c3(pTHX_ HV* stash, I32 level) } } } + else { /* @ISA was undefined or empty */ + /* build a retval containing only ourselves */ + retval = newAV(); + av_push(retval, newSVpvn(stashname, stashname_len)); + } /* we don't want anyone modifying the cache entry but us, and we do so by replacing it completely */ @@ -439,21 +443,21 @@ Perl_mro_isa_changed_in(pTHX_ HV* stash) HE* iter; SV** svp; I32 items; - struct mro_meta* meta; - char* stashname; - STRLEN stashname_len; - bool is_universal = FALSE; + bool is_universal; - stashname = HvNAME_get(stash); - stashname_len = HvNAMELEN_get(stash); + const char * const stashname = HvNAME_get(stash); + const STRLEN stashname_len = HvNAMELEN_get(stash); /* wipe out the cached linearizations for this stash */ - meta = HvMROMETA(stash); + struct mro_meta * const meta = HvMROMETA(stash); SvREFCNT_dec((SV*)meta->mro_linear_dfs); SvREFCNT_dec((SV*)meta->mro_linear_c3); meta->mro_linear_dfs = NULL; meta->mro_linear_c3 = NULL; + /* Inc the package generation, since our @ISA changed */ + meta->pkg_gen++; + /* Wipe the global method cache if this package is UNIVERSAL or one of its parents */ @@ -465,20 +469,20 @@ Perl_mro_isa_changed_in(pTHX_ HV* stash) PL_sub_generation++; is_universal = TRUE; } - - /* Wipe the local method cache otherwise */ - else + else { /* Wipe the local method cache otherwise */ meta->cache_gen++; + is_universal = FALSE; + } /* wipe next::method cache too */ if(meta->mro_nextmethod) hv_clear(meta->mro_nextmethod); - + /* Iterate the isarev (classes that are our children), wiping out their linearization and method caches */ if(isarev) { hv_iterinit(isarev); while((iter = hv_iternext(isarev))) { - SV* revkey = hv_iterkeysv(iter); + SV* const revkey = hv_iterkeysv(iter); HV* revstash = gv_stashsv(revkey, 0); struct mro_meta* revmeta; @@ -507,11 +511,10 @@ Perl_mro_isa_changed_in(pTHX_ HV* stash) items = AvFILLp(linear_mro); while (items--) { - HE* he; SV* const sv = *svp++; HV* mroisarev; - he = hv_fetch_ent(PL_isarev, sv, 0, 0); + HE *he = hv_fetch_ent(PL_isarev, sv, 0, 0); if(!he) { he = hv_store_ent(PL_isarev, sv, (SV*)newHV(), 0); } @@ -528,7 +531,7 @@ Perl_mro_isa_changed_in(pTHX_ HV* stash) hv_iterinit(isarev); while((iter = hv_iternext(isarev))) { I32 revkeylen; - char* revkey = hv_iterkey(iter, &revkeylen); + char* const revkey = hv_iterkey(iter, &revkeylen); hv_store(mroisarev, revkey, revkeylen, &PL_sv_yes, 0); } } @@ -568,17 +571,14 @@ via, C. void Perl_mro_method_changed_in(pTHX_ HV *stash) { - SV** svp; - HV* isarev; - HE* iter; - char* stashname; - STRLEN stashname_len; + const char * const stashname = HvNAME_get(stash); + const STRLEN stashname_len = HvNAMELEN_get(stash); - stashname = HvNAME_get(stash); - stashname_len = HvNAMELEN_get(stash); + SV ** const svp = hv_fetch(PL_isarev, stashname, stashname_len, 0); + HV * const isarev = svp ? (HV*)*svp : NULL; - svp = hv_fetch(PL_isarev, stashname, stashname_len, 0); - isarev = svp ? (HV*)*svp : NULL; + /* Inc the package generation, since a local method changed */ + HvMROMETA(stash)->pkg_gen++; /* If stash is UNIVERSAL, or one of UNIVERSAL's parents, invalidate all method caches globally */ @@ -591,10 +591,12 @@ Perl_mro_method_changed_in(pTHX_ HV *stash) /* else, invalidate the method caches of all child classes, but not itself */ if(isarev) { + HE* iter; + hv_iterinit(isarev); while((iter = hv_iternext(isarev))) { - SV* revkey = hv_iterkeysv(iter); - HV* revstash = gv_stashsv(revkey, 0); + SV* const revkey = hv_iterkeysv(iter); + HV* const revstash = gv_stashsv(revkey, 0); struct mro_meta* mrometa; if(!revstash) continue; @@ -627,26 +629,19 @@ __nextcan(pTHX_ SV* self, I32 throw_nomethod) register const PERL_CONTEXT *ccstack = cxstack; const PERL_SI *top_si = PL_curstackinfo; HV* selfstash; - GV* cvgv; SV *stashname; const char *fq_subname; const char *subname; - STRLEN fq_subname_len; STRLEN stashname_len; STRLEN subname_len; SV* sv; GV** gvp; AV* linear_av; SV** linear_svp; - SV* linear_sv; - HV* curstash; - GV* candidate = NULL; - CV* cand_cv = NULL; const char *hvname; I32 items; struct mro_meta* selfmeta; HV* nmcache; - HE* cache_entry; if(sv_isobject(self)) selfstash = SvSTASH(SvRV(self)); @@ -665,6 +660,9 @@ __nextcan(pTHX_ SV* self, I32 throw_nomethod) much like looking at (caller($i))[3] until you find a real sub that isn't ANON, etc */ for (;;) { + GV* cvgv; + STRLEN fq_subname_len; + /* we may be in a higher stacklevel, so dig down deeper */ while (cxix < 0) { if(top_si->si_type == PERLSI_MAIN) @@ -726,15 +724,16 @@ __nextcan(pTHX_ SV* self, I32 throw_nomethod) if(!(nmcache = selfmeta->mro_nextmethod)) { nmcache = selfmeta->mro_nextmethod = newHV(); } - - /* Use the cached coderef if it exists */ - else if((cache_entry = hv_fetch_ent(nmcache, sv, 0, 0))) { - SV* val = HeVAL(cache_entry); - if(val == &PL_sv_undef) { - if(throw_nomethod) - Perl_croak(aTHX_ "No next::method '%s' found for %s", subname, hvname); - } - return val; + else { /* Use the cached coderef if it exists */ + HE* cache_entry = hv_fetch_ent(nmcache, sv, 0, 0); + if (cache_entry) { + SV* const val = HeVAL(cache_entry); + if(val == &PL_sv_undef) { + if(throw_nomethod) + Perl_croak(aTHX_ "No next::method '%s' found for %s", subname, hvname); + } + return val; + } } /* beyond here is just for cache misses, so perf isn't as critical */ @@ -750,7 +749,7 @@ __nextcan(pTHX_ SV* self, I32 throw_nomethod) /* Walk down our MRO, skipping everything up to the contextually enclosing class */ while (items--) { - linear_sv = *linear_svp++; + SV * const linear_sv = *linear_svp++; assert(linear_sv); if(sv_eq(linear_sv, stashname)) break; @@ -761,7 +760,11 @@ __nextcan(pTHX_ SV* self, I32 throw_nomethod) method */ if(items > 0) { while (items--) { - linear_sv = *linear_svp++; + SV * const linear_sv = *linear_svp++; + HV* curstash; + GV* candidate; + CV* cand_cv; + assert(linear_sv); curstash = gv_stashsv(linear_sv, FALSE); @@ -809,6 +812,7 @@ XS(XS_mro_get_isarev); XS(XS_mro_is_universal); XS(XS_mro_invalidate_method_caches); XS(XS_mro_method_changed_in); +XS(XS_mro_get_pkg_gen); XS(XS_next_can); XS(XS_next_method); XS(XS_maybe_next_method); @@ -826,6 +830,7 @@ Perl_boot_core_mro(pTHX) newXSproto("mro::is_universal", XS_mro_is_universal, file, "$"); newXSproto("mro::invalidate_all_method_caches", XS_mro_invalidate_method_caches, file, ""); newXSproto("mro::method_changed_in", XS_mro_method_changed_in, file, "$"); + newXSproto("mro::get_pkg_gen", XS_mro_get_pkg_gen, file, "$"); newXS("next::can", XS_next_can, file); newXS("next::method", XS_next_method, file); newXS("maybe::next::method", XS_maybe_next_method, file); @@ -845,10 +850,16 @@ XS(XS_mro_get_linear_isa) { classname = ST(0); class_stash = gv_stashsv(classname, 0); - if(!class_stash) Perl_croak(aTHX_ "No such class: '%"SVf"'!", SVfARG(classname)); - if(items > 1) { - char* which = SvPV_nolen(ST(1)); + if(!class_stash) { + /* No stash exists yet, give them just the classname */ + AV* isalin = newAV(); + av_push(isalin, newSVsv(classname)); + ST(0) = sv_2mortal(newRV_noinc((SV*)isalin)); + XSRETURN(1); + } + else if(items > 1) { + const char* const which = SvPV_nolen(ST(1)); if(strEQ(which, "dfs")) RETVAL = mro_get_linear_isa_dfs(class_stash, 0); else if(strEQ(which, "c3")) @@ -912,7 +923,6 @@ XS(XS_mro_get_mro) dXSARGS; SV* classname; HV* class_stash; - struct mro_meta* meta; PERL_UNUSED_ARG(cv); @@ -921,10 +931,8 @@ XS(XS_mro_get_mro) classname = ST(0); class_stash = gv_stashsv(classname, 0); - if(!class_stash) Perl_croak(aTHX_ "No such class: '%"SVf"'!", SVfARG(classname)); - meta = HvMROMETA(class_stash); - if(meta->mro_which == MRO_DFS) + if(!class_stash || HvMROMETA(class_stash)->mro_which == MRO_DFS) ST(0) = sv_2mortal(newSVpvn("dfs", 3)); else ST(0) = sv_2mortal(newSVpvn("c3", 2)); @@ -937,11 +945,11 @@ XS(XS_mro_get_isarev) dVAR; dXSARGS; SV* classname; - HV* class_stash; SV** svp; HV* isarev; - char* stashname; - STRLEN stashname_len; + char* classname_pv; + STRLEN classname_len; + AV* ret_array; PERL_UNUSED_ARG(cv); @@ -950,21 +958,22 @@ XS(XS_mro_get_isarev) classname = ST(0); - class_stash = gv_stashsv(classname, 0); - if(!class_stash) Perl_croak(aTHX_ "No such class: '%"SVf"'!", SVfARG(classname)); - SP -= items; - stashname = HvNAME_get(class_stash); - stashname_len = HvNAMELEN_get(class_stash); - svp = hv_fetch(PL_isarev, stashname, stashname_len, 0); + + classname_pv = SvPV_nolen(classname); + classname_len = strlen(classname_pv); + svp = hv_fetch(PL_isarev, classname_pv, classname_len, 0); isarev = svp ? (HV*)*svp : NULL; + + ret_array = newAV(); if(isarev) { HE* iter; hv_iterinit(isarev); while((iter = hv_iternext(isarev))) - XPUSHs(hv_iterkeysv(iter)); + av_push(ret_array, newSVsv(hv_iterkeysv(iter))); } + XPUSHs(sv_2mortal(newRV_noinc((SV*)ret_array))); PUTBACK; return; @@ -975,10 +984,9 @@ XS(XS_mro_is_universal) dVAR; dXSARGS; SV* classname; - HV* class_stash; HV* isarev; - char* stashname; - STRLEN stashname_len; + char* classname_pv; + STRLEN classname_len; SV** svp; PERL_UNUSED_ARG(cv); @@ -987,16 +995,14 @@ XS(XS_mro_is_universal) Perl_croak(aTHX_ "Usage: mro::is_universal(classname)"); classname = ST(0); - class_stash = gv_stashsv(classname, 0); - if(!class_stash) Perl_croak(aTHX_ "No such class: '%"SVf"'!", SVfARG(classname)); - stashname = HvNAME_get(class_stash); - stashname_len = HvNAMELEN_get(class_stash); + classname_pv = SvPV_nolen(classname); + classname_len = strlen(classname_pv); - svp = hv_fetch(PL_isarev, stashname, stashname_len, 0); + svp = hv_fetch(PL_isarev, classname_pv, classname_len, 0); isarev = svp ? (HV*)*svp : NULL; - if((stashname_len == 9 && strEQ(stashname, "UNIVERSAL")) + if((classname_len == 9 && strEQ(classname_pv, "UNIVERSAL")) || (isarev && hv_exists(isarev, "UNIVERSAL", 9))) XSRETURN_YES; else @@ -1040,12 +1046,38 @@ XS(XS_mro_method_changed_in) XSRETURN_EMPTY; } +XS(XS_mro_get_pkg_gen) +{ + dVAR; + dXSARGS; + SV* classname; + HV* class_stash; + + PERL_UNUSED_ARG(cv); + + if(items != 1) + Perl_croak(aTHX_ "Usage: mro::get_pkg_gen(classname)"); + + classname = ST(0); + + class_stash = gv_stashsv(classname, 0); + + SP -= items; + + XPUSHs(sv_2mortal(newSViv( + class_stash ? HvMROMETA(class_stash)->pkg_gen : 0 + ))); + + PUTBACK; + return; +} + XS(XS_next_can) { dVAR; dXSARGS; - SV* self = ST(0); - SV* methcv = __nextcan(aTHX_ self, 0); + SV* const self = ST(0); + SV* const methcv = __nextcan(aTHX_ self, 0); PERL_UNUSED_ARG(cv); PERL_UNUSED_VAR(items); @@ -1064,8 +1096,8 @@ XS(XS_next_method) { dMARK; dAX; - SV* self = ST(0); - SV* methcv = __nextcan(aTHX_ self, 1); + SV* const self = ST(0); + SV* const methcv = __nextcan(aTHX_ self, 1); PERL_UNUSED_ARG(cv); @@ -1077,8 +1109,8 @@ XS(XS_maybe_next_method) { dMARK; dAX; - SV* self = ST(0); - SV* methcv = __nextcan(aTHX_ self, 0); + SV* const self = ST(0); + SV* const methcv = __nextcan(aTHX_ self, 0); PERL_UNUSED_ARG(cv);