X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Size.xs;h=c77a39154240a138092221a7db77c3eff3f0a2f8;hb=35b71bcad21c9fb3ab22636b260608c89542e48f;hp=1911d2e69385a23a257bf3f4dc15770226aa47a0;hpb=5f03b77e418d07ecc0a99453ba27df9be95ee32d;p=p5sagit%2FDevel-Size.git diff --git a/Size.xs b/Size.xs index 1911d2e..c77a391 100644 --- a/Size.xs +++ b/Size.xs @@ -303,27 +303,13 @@ cc_opclass(const OP * const o) return OPc_BASEOP; } - -#if !defined(NV) -#define NV double -#endif - /* Figure out how much magic is attached to the SV and return the size */ static void -magic_size(const SV * const thing, struct state *st) { - MAGIC *magic_pointer; - - /* Is there any? */ - if (!SvMAGIC(thing)) { - /* No, bail */ - return; - } - - /* Get the base magic pointer */ - magic_pointer = SvMAGIC(thing); +magic_size(pTHX_ const SV * const thing, struct state *st) { + MAGIC *magic_pointer = SvMAGIC(thing); - /* Have we seen the magic pointer? */ + /* Have we seen the magic pointer? (NULL has always been seen before) */ while (check_new(st, magic_pointer)) { st->total_size += sizeof(MAGIC); @@ -332,6 +318,22 @@ magic_size(const SV * const thing, struct state *st) { if (check_new(st, magic_pointer->mg_virtual)) { st->total_size += sizeof(MGVTBL); } + sv_size(aTHX_ st, magic_pointer->mg_obj, TOTAL_SIZE_RECURSION); + if (magic_pointer->mg_len == HEf_SVKEY) { + sv_size(aTHX_ st, (SV *)magic_pointer->mg_ptr, TOTAL_SIZE_RECURSION); + } +#if defined(PERL_MAGIC_utf8) && defined (PERL_MAGIC_UTF8_CACHESIZE) + else if (magic_pointer->mg_type == PERL_MAGIC_utf8) { + if (check_new(st, magic_pointer->mg_ptr)) { + st->total_size += PERL_MAGIC_UTF8_CACHESIZE * 2 * sizeof(STRLEN); + } + } +#endif + else if (magic_pointer->mg_len > 0) { + if (check_new(st, magic_pointer->mg_ptr)) { + st->total_size += magic_pointer->mg_len; + } + } /* Get the next in the chain */ magic_pointer = magic_pointer->mg_moremagic; @@ -477,113 +479,139 @@ op_size(pTHX_ const OP * const baseop, struct state *st) } } -#if PERL_VERSION > 9 || (PERL_VERSION == 9 && PERL_SUBVERSION > 2) -# define NEW_HEAD_LAYOUT +#if PERL_VERSION < 8 || PERL_SUBVERSION < 9 +# define SVt_LAST 16 +#endif + +#ifdef PURIFY +# define MAYBE_PURIFY(normal, pure) (pure) +# define MAYBE_OFFSET(struct_name, member) 0 +#else +# define MAYBE_PURIFY(normal, pure) (normal) +# define MAYBE_OFFSET(struct_name, member) STRUCT_OFFSET(struct_name, member) +#endif + +const U8 body_sizes[SVt_LAST] = { +#if PERL_VERSION < 9 + 0, /* SVt_NULL */ + MAYBE_PURIFY(sizeof(IV), sizeof(XPVIV)), /* SVt_IV */ + MAYBE_PURIFY(sizeof(NV), sizeof(XPVNV)), /* SVt_NV */ + sizeof(XRV), /* SVt_RV */ + sizeof(XPV), /* SVt_PV */ + sizeof(XPVIV), /* SVt_PVIV */ + sizeof(XPVNV), /* SVt_PVNV */ + sizeof(XPVMG), /* SVt_PVMG */ + sizeof(XPVBM), /* SVt_PVBM */ + sizeof(XPVLV), /* SVt_PVLV */ + sizeof(XPVAV), /* SVt_PVAV */ + sizeof(XPVHV), /* SVt_PVHV */ + sizeof(XPVCV), /* SVt_PVCV */ + sizeof(XPVGV), /* SVt_PVGV */ + sizeof(XPVFM), /* SVt_PVFM */ + sizeof(XPVIO) /* SVt_PVIO */ +#elif PERL_VERSION == 10 && PERL_SUBVERSION == 0 + 0, /* SVt_NULL */ + 0, /* SVt_BIND */ + 0, /* SVt_IV */ + MAYBE_PURIFY(sizeof(NV), sizeof(XPVNV)), /* SVt_NV */ + 0, /* SVt_RV */ + MAYBE_PURIFY(sizeof(xpv_allocated), sizeof(XPV)), /* SVt_PV */ + MAYBE_PURIFY(sizeof(xpviv_allocated), sizeof(XPVIV)),/* SVt_PVIV */ + sizeof(XPVNV), /* SVt_PVNV */ + sizeof(XPVMG), /* SVt_PVMG */ + sizeof(XPVGV), /* SVt_PVGV */ + sizeof(XPVLV), /* SVt_PVLV */ + MAYBE_PURIFY(sizeof(xpvav_allocated), sizeof(XPVAV)),/* SVt_PVAV */ + MAYBE_PURIFY(sizeof(xpvhv_allocated), sizeof(XPVHV)),/* SVt_PVHV */ + MAYBE_PURIFY(sizeof(xpvcv_allocated), sizeof(XPVCV)),/* SVt_PVCV */ + MAYBE_PURIFY(sizeof(xpvfm_allocated), sizeof(XPVFM)),/* SVt_PVFM */ + sizeof(XPVIO), /* SVt_PVIO */ +#elif PERL_VERSION == 10 && PERL_SUBVERSION == 1 + 0, /* SVt_NULL */ + 0, /* SVt_BIND */ + 0, /* SVt_IV */ + MAYBE_PURIFY(sizeof(NV), sizeof(XPVNV)), /* SVt_NV */ + 0, /* SVt_RV */ + sizeof(XPV) - MAYBE_OFFSET(XPV, xpv_cur), /* SVt_PV */ + sizeof(XPVIV) - MAYBE_OFFSET(XPV, xpv_cur), /* SVt_PVIV */ + sizeof(XPVNV), /* SVt_PVNV */ + sizeof(XPVMG), /* SVt_PVMG */ + sizeof(XPVGV), /* SVt_PVGV */ + sizeof(XPVLV), /* SVt_PVLV */ + sizeof(XPVAV) - MAYBE_OFFSET(XPVAV, xav_fill), /* SVt_PVAV */ + sizeof(XPVHV) - MAYBE_OFFSET(XPVHV, xhv_fill), /* SVt_PVHV */ + sizeof(XPVCV) - MAYBE_OFFSET(XPVCV, xpv_cur), /* SVt_PVCV */ + sizeof(XPVFM) - MAYBE_OFFSET(XPVFM, xpv_cur), /* SVt_PVFM */ + sizeof(XPVIO) /* SVt_PVIO */ +#elif PERL_VERSION < 13 + 0, /* SVt_NULL */ + 0, /* SVt_BIND */ + 0, /* SVt_IV */ + MAYBE_PURIFY(sizeof(NV), sizeof(XPVNV)), /* SVt_NV */ + sizeof(XPV) - MAYBE_OFFSET(XPV, xpv_cur), /* SVt_PV */ + sizeof(XPVIV) - MAYBE_OFFSET(XPV, xpv_cur), /* SVt_PVIV */ + sizeof(XPVNV), /* SVt_PVNV */ + sizeof(XPVMG), /* SVt_PVMG */ + sizeof(regexp) - MAYBE_OFFSET(regexp, xpv_cur), /* SVt_REGEXP */ + sizeof(XPVGV), /* SVt_PVGV */ + sizeof(XPVLV), /* SVt_PVLV */ + sizeof(XPVAV) - MAYBE_OFFSET(XPVAV, xav_fill), /* SVt_PVAV */ + sizeof(XPVHV) - MAYBE_OFFSET(XPVHV, xhv_fill), /* SVt_PVHV */ + sizeof(XPVCV) - MAYBE_OFFSET(XPVCV, xpv_cur), /* SVt_PVCV */ + sizeof(XPVFM) - MAYBE_OFFSET(XPVFM, xpv_cur), /* SVt_PVFM */ + sizeof(XPVIO) /* SVt_PVIO */ +#else + 0, /* SVt_NULL */ + 0, /* SVt_BIND */ + 0, /* SVt_IV */ + MAYBE_PURIFY(sizeof(NV), sizeof(XPVNV)), /* SVt_NV */ + sizeof(XPV) - MAYBE_OFFSET(XPV, xpv_cur), /* SVt_PV */ + sizeof(XPVIV) - MAYBE_OFFSET(XPV, xpv_cur), /* SVt_PVIV */ + sizeof(XPVNV) - MAYBE_OFFSET(XPV, xpv_cur), /* SVt_PVNV */ + sizeof(XPVMG), /* SVt_PVMG */ + sizeof(regexp), /* SVt_REGEXP */ + sizeof(XPVGV), /* SVt_PVGV */ + sizeof(XPVLV), /* SVt_PVLV */ + sizeof(XPVAV), /* SVt_PVAV */ + sizeof(XPVHV), /* SVt_PVHV */ + sizeof(XPVCV), /* SVt_PVCV */ + sizeof(XPVFM), /* SVt_PVFM */ + sizeof(XPVIO) /* SVt_PVIO */ #endif +}; static bool sv_size(pTHX_ struct state *const st, const SV * const orig_thing, const int recurse) { const SV *thing = orig_thing; + U32 type; if(!check_new(st, thing)) return FALSE; - st->total_size += sizeof(SV); + type = SvTYPE(thing); + if (type > SVt_LAST) { + warn("Devel::Size: Unknown variable type: %d encountered\n", type); + return TRUE; + } + st->total_size += sizeof(SV) + body_sizes[type]; - switch (SvTYPE(thing)) { - /* Is it undef? */ - case SVt_NULL: TAG; - TAG;break; - /* Just a plain integer. This will be differently sized depending - on whether purify's been compiled in */ - case SVt_IV: TAG; -#ifndef NEW_HEAD_LAYOUT -# ifdef PURIFY - st->total_size += sizeof(sizeof(XPVIV)); -# else - st->total_size += sizeof(IV); -# endif -#endif - if(recurse && SvROK(thing)) - sv_size(aTHX_ st, SvRV_const(thing), recurse); - TAG;break; - /* Is it a float? Like the int, it depends on purify */ - case SVt_NV: TAG; -#ifdef PURIFY - st->total_size += sizeof(sizeof(XPVNV)); -#else - st->total_size += sizeof(NV); -#endif - TAG;break; -#if (PERL_VERSION < 11) + if (type >= SVt_PVMG) { + magic_size(aTHX_ thing, st); + } + + switch (type) { +#if (PERL_VERSION < 11) /* Is it a reference? */ case SVt_RV: TAG; -#ifndef NEW_HEAD_LAYOUT - st->total_size += sizeof(XRV); -#endif - if(recurse && SvROK(thing)) - sv_size(aTHX_ st, SvRV_const(thing), recurse); - TAG;break; -#endif - /* How about a plain string? In which case we need to add in how - much has been allocated */ - case SVt_PV: TAG; - st->total_size += sizeof(XPV); - if(recurse && SvROK(thing)) - sv_size(aTHX_ st, SvRV_const(thing), recurse); - else - st->total_size += SvLEN(thing); - TAG;break; - /* A string with an integer part? */ - case SVt_PVIV: TAG; - st->total_size += sizeof(XPVIV); - if(recurse && SvROK(thing)) - sv_size(aTHX_ st, SvRV_const(thing), recurse); - else - st->total_size += SvLEN(thing); - if(SvOOK(thing)) { - st->total_size += SvIVX(thing); - } - TAG;break; - /* A scalar/string/reference with a float part? */ - case SVt_PVNV: TAG; - st->total_size += sizeof(XPVNV); - if(recurse && SvROK(thing)) - sv_size(aTHX_ st, SvRV_const(thing), recurse); - else - st->total_size += SvLEN(thing); - TAG;break; - case SVt_PVMG: TAG; - st->total_size += sizeof(XPVMG); - if(recurse && SvROK(thing)) - sv_size(aTHX_ st, SvRV_const(thing), recurse); - else - st->total_size += SvLEN(thing); - magic_size(thing, st); - TAG;break; -#if PERL_VERSION <= 8 - case SVt_PVBM: TAG; - st->total_size += sizeof(XPVBM); - if(recurse && SvROK(thing)) - sv_size(aTHX_ st, SvRV_const(thing), recurse); - else - st->total_size += SvLEN(thing); - magic_size(thing, st); - TAG;break; +#else + case SVt_IV: TAG; #endif - case SVt_PVLV: TAG; - st->total_size += sizeof(XPVLV); if(recurse && SvROK(thing)) sv_size(aTHX_ st, SvRV_const(thing), recurse); - else - st->total_size += SvLEN(thing); - magic_size(thing, st); TAG;break; - /* How much space is dedicated to the array? Not counting the - elements in the array, mind, just the array itself */ + case SVt_PVAV: TAG; - st->total_size += sizeof(XPVAV); /* Is there anything in the array? */ if (AvMAX(thing) != -1) { /* an array with 10 slots has AvMax() set to 9 - te 2007-04-22 */ @@ -614,11 +642,8 @@ sv_size(pTHX_ struct state *const st, const SV * const orig_thing, complain about AvARYLEN() passing thing to it. */ sv_size(aTHX_ st, AvARYLEN(thing), recurse); #endif - magic_size(thing, st); TAG;break; case SVt_PVHV: TAG; - /* First the base struct */ - st->total_size += sizeof(XPVHV); /* Now the array of buckets */ st->total_size += (sizeof(HE *) * (HvMAX(thing) + 1)); /* Now walk the bucket chain */ @@ -641,13 +666,20 @@ sv_size(pTHX_ struct state *const st, const SV * const orig_thing, } } } - magic_size(thing, st); TAG;break; - case SVt_PVCV: TAG; - st->total_size += sizeof(XPVCV); - magic_size(thing, st); - st->total_size += ((XPVIO *) SvANY(thing))->xpv_len; + + case SVt_PVFM: TAG; + sv_size(aTHX_ st, (SV *)CvPADLIST(thing), SOME_RECURSION); + sv_size(aTHX_ st, (SV *)CvOUTSIDE(thing), recurse); + + if (st->go_yell && !st->fm_whine) { + carp("Devel::Size: Calculated sizes for FMs are incomplete"); + st->fm_whine = 1; + } + goto freescalar; + + case SVt_PVCV: TAG; sv_size(aTHX_ st, (SV *)CvSTASH(thing), SOME_RECURSION); sv_size(aTHX_ st, (SV *)SvSTASH(thing), SOME_RECURSION); sv_size(aTHX_ st, (SV *)CvGV(thing), SOME_RECURSION); @@ -659,16 +691,46 @@ sv_size(pTHX_ struct state *const st, const SV * const orig_thing, op_size(aTHX_ CvSTART(thing), st); op_size(aTHX_ CvROOT(thing), st); } + goto freescalar; + + case SVt_PVIO: TAG; + /* Some embedded char pointers */ + check_new_and_strlen(st, ((XPVIO *) SvANY(thing))->xio_top_name); + check_new_and_strlen(st, ((XPVIO *) SvANY(thing))->xio_fmt_name); + check_new_and_strlen(st, ((XPVIO *) SvANY(thing))->xio_bottom_name); + /* Throw the GVs on the list to be walked if they're not-null */ + sv_size(aTHX_ st, (SV *)((XPVIO *) SvANY(thing))->xio_top_gv, recurse); + sv_size(aTHX_ st, (SV *)((XPVIO *) SvANY(thing))->xio_bottom_gv, recurse); + sv_size(aTHX_ st, (SV *)((XPVIO *) SvANY(thing))->xio_fmt_gv, recurse); + + /* Only go trotting through the IO structures if they're really + trottable. If USE_PERLIO is defined we can do this. If + not... we can't, so we don't even try */ +#ifdef USE_PERLIO + /* Dig into xio_ifp and xio_ofp here */ + warn("Devel::Size: Can't size up perlio layers yet\n"); +#endif + goto freescalar; + + case SVt_PVLV: TAG; +#if (PERL_VERSION < 9) + goto freescalar; +#endif - TAG;break; case SVt_PVGV: TAG; - magic_size(thing, st); - st->total_size += sizeof(XPVGV); if(isGV_with_GP(thing)) { st->total_size += GvNAMELEN(thing); #ifdef GvFILE - /* Is there a file? */ +# if !defined(USE_ITHREADS) || (PERL_VERSION > 8 || (PERL_VERSION == 8 && PERL_SUBVERSION > 8)) + /* With itreads, before 5.8.9, this can end up pointing to freed memory + if the GV was created in an eval, as GvFILE() points to CopFILE(), + and the relevant COP has been freed on scope cleanup after the eval. + 5.8.9 adds a binary compatible fudge that catches the vast majority + of cases. 5.9.something added a proper fix, by converting the GP to + use a shared hash key (porperly reference counted), instead of a + char * (owned by who knows? possibly no-one now) */ check_new_and_strlen(st, GvFILE(thing)); +# endif #endif /* Is there something hanging off the glob? */ if (check_new(st, GvGP(thing))) { @@ -680,54 +742,54 @@ sv_size(pTHX_ struct state *const st, const SV * const orig_thing, sv_size(aTHX_ st, (SV *)(GvGP(thing)->gp_egv), recurse); sv_size(aTHX_ st, (SV *)(GvGP(thing)->gp_cv), recurse); } +#if (PERL_VERSION >= 9) + TAG; break; +#endif } - TAG;break; - case SVt_PVFM: TAG; - st->total_size += sizeof(XPVFM); - magic_size(thing, st); - st->total_size += ((XPVIO *) SvANY(thing))->xpv_len; - sv_size(aTHX_ st, (SV *)CvPADLIST(thing), SOME_RECURSION); - sv_size(aTHX_ st, (SV *)CvOUTSIDE(thing), recurse); +#if PERL_VERSION <= 8 + case SVt_PVBM: TAG; +#endif + case SVt_PVMG: TAG; + case SVt_PVNV: TAG; + case SVt_PVIV: TAG; + case SVt_PV: TAG; + freescalar: + if(recurse && SvROK(thing)) + sv_size(aTHX_ st, SvRV_const(thing), recurse); + else + st->total_size += SvLEN(thing); - if (st->go_yell && !st->fm_whine) { - carp("Devel::Size: Calculated sizes for FMs are incomplete"); - st->fm_whine = 1; + if(SvOOK(thing)) { + st->total_size += SvIVX(thing); } TAG;break; - case SVt_PVIO: TAG; - st->total_size += sizeof(XPVIO); - magic_size(thing, st); - if (check_new(st, (SvPVX_const(thing)))) { - st->total_size += ((XPVIO *) SvANY(thing))->xpv_cur; - } - /* Some embedded char pointers */ - check_new_and_strlen(st, ((XPVIO *) SvANY(thing))->xio_top_name); - check_new_and_strlen(st, ((XPVIO *) SvANY(thing))->xio_fmt_name); - check_new_and_strlen(st, ((XPVIO *) SvANY(thing))->xio_bottom_name); - /* Throw the GVs on the list to be walked if they're not-null */ - sv_size(aTHX_ st, (SV *)((XPVIO *) SvANY(thing))->xio_top_gv, recurse); - sv_size(aTHX_ st, (SV *)((XPVIO *) SvANY(thing))->xio_bottom_gv, recurse); - sv_size(aTHX_ st, (SV *)((XPVIO *) SvANY(thing))->xio_fmt_gv, recurse); - /* Only go trotting through the IO structures if they're really - trottable. If USE_PERLIO is defined we can do this. If - not... we can't, so we don't even try */ -#ifdef USE_PERLIO - /* Dig into xio_ifp and xio_ofp here */ - warn("Devel::Size: Can't size up perlio layers yet\n"); -#endif - TAG;break; - default: - warn("Devel::Size: Unknown variable type: %d encountered\n", SvTYPE(thing) ); } return TRUE; } +/* Frustratingly, the vtables aren't const in perl.h + gcc is happy enough to have non-const initialisers in a static array. + VC seems not to be. (Is it actually treating the file as C++?) + So do the maximally portable thing, unless we know it's gcc, in which case + we can do the more space efficient version. */ + +#if __GNUC__ +void *vtables[] = { +#include "vtables.inc" + NULL +}; +#endif + static struct state * new_state(pTHX) { SV *warn_flag; struct state *st; +#if __GNUC__ + void **vt_p = vtables; +#endif + Newxz(st, 1, struct state); st->go_yell = TRUE; if (NULL != (warn_flag = perl_get_sv("Devel::Size::warn", FALSE))) { @@ -739,6 +801,12 @@ new_state(pTHX) check_new(st, &PL_sv_undef); check_new(st, &PL_sv_no); check_new(st, &PL_sv_yes); +#if __GNUC__ + while(*vt_p) + check_new(st, *vt_p++); +#else +#include "vtables.inc" +#endif return st; }