X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Size.xs;h=14be0be10aebb2a363a0dc8538d4dc9e49b8a41a;hb=ec404c2370ba877301e093207215b59f5de80a7a;hp=1246590aa0de86460f2c8bc1eb5c1053f9b0251b;hpb=a4efdff3e1599a67335f3dcf38b8b431ade10019;p=p5sagit%2FDevel-Size.git diff --git a/Size.xs b/Size.xs index 1246590..14be0be 100644 --- a/Size.xs +++ b/Size.xs @@ -9,6 +9,9 @@ #ifndef CvISXSUB # define CvISXSUB(cv) (CvXSUB(cv) ? TRUE : FALSE) #endif +#ifndef SvRV_const +# define SvRV_const(rv) SvRV(rv) +#endif #ifdef _MSC_VER /* "structured exception" handling is a Microsoft extension to C and C++. @@ -43,12 +46,12 @@ without excessive memory needs. The assumption is that your CPU cache works :-) (And that we're not going to bust it) */ -#define ALIGN_BITS ( sizeof(void*) >> 1 ) #define BYTE_BITS 3 #define LEAF_BITS (16 - BYTE_BITS) #define LEAF_MASK 0x1FFF struct state { + UV total_size; bool regex_whine; bool fm_whine; bool dangle_whine; @@ -74,14 +77,13 @@ check_new(struct state *st, const void *const p) { (and hence hot in the cache) but we can still deal with any unaligned pointers. */ const size_t cooked_p - = (raw_p >> ALIGN_BITS) | (raw_p << (bits - BYTE_BITS)); + = (raw_p >> ALIGN_BITS) | (raw_p << (bits - ALIGN_BITS)); const U8 this_bit = 1 << (cooked_p & 0x7); U8 **leaf_p; U8 *leaf; unsigned int i; void **tv_p = (void **) (st->tracking); - assert(st); if (NULL == p) return FALSE; TRY_TO_CATCH_SEGV { const char c = *(const char *)p; @@ -105,7 +107,11 @@ check_new(struct state *st, const void *const p) { bits -= 8; } while (bits > LEAF_BITS + BYTE_BITS); /* bits now 16 always */ +#if !defined(MULTIPLICITY) || PERL_VERSION > 8 || (PERL_VERSION == 8 && PERL_SUBVERSION > 8) + /* 5.8.8 and early have an assert() macro that uses Perl_croak, hence needs + a my_perl under multiplicity */ assert(bits == 16); +#endif leaf_p = (U8 **)tv_p; i = (unsigned int)((cooked_p >> bits) & 0xFF); if (!leaf_p[i]) @@ -153,7 +159,22 @@ free_state(struct state *st) Safefree(st); } -static UV thing_size(pTHX_ const SV *const, struct state *); +/* For now, this is somewhat a compatibility bodge until the plan comes + together for fine grained recursion control. total_size() would recurse into + hash and array members, whereas sv_size() would not. However, sv_size() is + called with CvSTASH() of a CV, which means that if it (also) starts to + recurse fully, then the size of any CV now becomes the size of the entire + symbol table reachable from it, and potentially the entire symbol table, if + any subroutine makes a reference to a global (such as %SIG). The historical + implementation of total_size() didn't report "everything", and changing the + only available size to "everything" doesn't feel at all useful. */ + +#define NO_RECURSION 0 +#define SOME_RECURSION 1 +#define TOTAL_SIZE_RECURSION 2 + +static bool sv_size(pTHX_ struct state *, const SV *const, const int recurse); + typedef enum { OPc_NULL, /* 0 */ OPc_BASEOP, /* 1 */ @@ -289,29 +310,35 @@ cc_opclass(const OP * const o) /* Figure out how much magic is attached to the SV and return the size */ -IV magic_size(const SV * const thing, struct state *st) { - IV total_size = 0; - MAGIC *magic_pointer; - - /* Is there any? */ - if (!SvMAGIC(thing)) { - /* No, bail */ - return 0; - } - - /* Get the base magic pointer */ - magic_pointer = SvMAGIC(thing); +static void +magic_size(pTHX_ const SV * const thing, struct state *st) { + MAGIC *magic_pointer = SvMAGIC(thing); - /* Have we seen the magic pointer? */ - while (magic_pointer && check_new(st, magic_pointer)) { - total_size += sizeof(MAGIC); + /* Have we seen the magic pointer? (NULL has always been seen before) */ + while (check_new(st, magic_pointer)) { + st->total_size += sizeof(MAGIC); TRY_TO_CATCH_SEGV { /* Have we seen the magic vtable? */ - if (magic_pointer->mg_virtual && - check_new(st, magic_pointer->mg_virtual)) { - total_size += sizeof(MGVTBL); + 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; @@ -321,144 +348,111 @@ IV magic_size(const SV * const thing, struct state *st) { warn( "Devel::Size: Encountered bad magic at: %p\n", magic_pointer ); } } - return total_size; } -UV regex_size(const REGEXP * const baseregex, struct state *st) { - UV total_size = 0; +static void +check_new_and_strlen(struct state *st, const char *const p) { + if(check_new(st, p)) + st->total_size += 1 + strlen(p); +} - total_size += sizeof(REGEXP); +static void +regex_size(const REGEXP * const baseregex, struct state *st) { + if(!check_new(st, baseregex)) + return; + st->total_size += sizeof(REGEXP); #if (PERL_VERSION < 11) /* Note the size of the paren offset thing */ - total_size += sizeof(I32) * baseregex->nparens * 2; - total_size += strlen(baseregex->precomp); + st->total_size += sizeof(I32) * baseregex->nparens * 2; + st->total_size += strlen(baseregex->precomp); #else - total_size += sizeof(struct regexp); - total_size += sizeof(I32) * SvANY(baseregex)->nparens * 2; - /*total_size += strlen(SvANY(baseregex)->subbeg);*/ + st->total_size += sizeof(struct regexp); + st->total_size += sizeof(I32) * SvANY(baseregex)->nparens * 2; + /*st->total_size += strlen(SvANY(baseregex)->subbeg);*/ #endif if (st->go_yell && !st->regex_whine) { carp("Devel::Size: Calculated sizes for compiled regexes are incompatible, and probably always will be"); st->regex_whine = 1; } - - return total_size; } -static UV -op_size(pTHX_ const OP * const baseop, struct state *st) { - UV total_size = 0; - TRY_TO_CATCH_SEGV { - TAG; - if (check_new(st, baseop->op_next)) { - total_size += op_size(aTHX_ baseop->op_next, st); - } - TAG; - switch (cc_opclass(baseop)) { - case OPc_BASEOP: TAG; - total_size += sizeof(struct op); - TAG;break; - case OPc_UNOP: TAG; - total_size += sizeof(struct unop); - if (check_new(st, cUNOPx(baseop)->op_first)) { - total_size += op_size(aTHX_ cUNOPx(baseop)->op_first, st); - } - TAG;break; - case OPc_BINOP: TAG; - total_size += sizeof(struct binop); - if (check_new(st, cBINOPx(baseop)->op_first)) { - total_size += op_size(aTHX_ cBINOPx(baseop)->op_first, st); - } - if (check_new(st, cBINOPx(baseop)->op_last)) { - total_size += op_size(aTHX_ cBINOPx(baseop)->op_last, st); - } - TAG;break; - case OPc_LOGOP: TAG; - total_size += sizeof(struct logop); - if (check_new(st, cLOGOPx(baseop)->op_first)) { - total_size += op_size(aTHX_ cBINOPx(baseop)->op_first, st); - } - if (check_new(st, cLOGOPx(baseop)->op_other)) { - total_size += op_size(aTHX_ cLOGOPx(baseop)->op_other, st); - } - TAG;break; - case OPc_LISTOP: TAG; - total_size += sizeof(struct listop); - if (check_new(st, cLISTOPx(baseop)->op_first)) { - total_size += op_size(aTHX_ cLISTOPx(baseop)->op_first, st); - } - if (check_new(st, cLISTOPx(baseop)->op_last)) { - total_size += op_size(aTHX_ cLISTOPx(baseop)->op_last, st); - } - TAG;break; - case OPc_PMOP: TAG; - total_size += sizeof(struct pmop); - if (check_new(st, cPMOPx(baseop)->op_first)) { - total_size += op_size(aTHX_ cPMOPx(baseop)->op_first, st); - } - if (check_new(st, cPMOPx(baseop)->op_last)) { - total_size += op_size(aTHX_ cPMOPx(baseop)->op_last, st); - } +static void +op_size(pTHX_ const OP * const baseop, struct state *st) +{ + TRY_TO_CATCH_SEGV { + TAG; + if(!check_new(st, baseop)) + return; + TAG; + op_size(aTHX_ baseop->op_next, st); + TAG; + switch (cc_opclass(baseop)) { + case OPc_BASEOP: TAG; + st->total_size += sizeof(struct op); + TAG;break; + case OPc_UNOP: TAG; + st->total_size += sizeof(struct unop); + op_size(aTHX_ cUNOPx(baseop)->op_first, st); + TAG;break; + case OPc_BINOP: TAG; + st->total_size += sizeof(struct binop); + op_size(aTHX_ cBINOPx(baseop)->op_first, st); + op_size(aTHX_ cBINOPx(baseop)->op_last, st); + TAG;break; + case OPc_LOGOP: TAG; + st->total_size += sizeof(struct logop); + op_size(aTHX_ cBINOPx(baseop)->op_first, st); + op_size(aTHX_ cLOGOPx(baseop)->op_other, st); + TAG;break; + case OPc_LISTOP: TAG; + st->total_size += sizeof(struct listop); + op_size(aTHX_ cLISTOPx(baseop)->op_first, st); + op_size(aTHX_ cLISTOPx(baseop)->op_last, st); + TAG;break; + case OPc_PMOP: TAG; + st->total_size += sizeof(struct pmop); + op_size(aTHX_ cPMOPx(baseop)->op_first, st); + op_size(aTHX_ cPMOPx(baseop)->op_last, st); #if PERL_VERSION < 9 || (PERL_VERSION == 9 && PERL_SUBVERSION < 5) - if (check_new(st, cPMOPx(baseop)->op_pmreplroot)) { - total_size += op_size(aTHX_ cPMOPx(baseop)->op_pmreplroot, st); - } - if (check_new(st, cPMOPx(baseop)->op_pmreplstart)) { - total_size += op_size(aTHX_ cPMOPx(baseop)->op_pmreplstart, st); - } - if (check_new(st, cPMOPx(baseop)->op_pmnext)) { - total_size += op_size(aTHX_ (OP *)cPMOPx(baseop)->op_pmnext, st); - } + op_size(aTHX_ cPMOPx(baseop)->op_pmreplroot, st); + op_size(aTHX_ cPMOPx(baseop)->op_pmreplstart, st); + op_size(aTHX_ (OP *)cPMOPx(baseop)->op_pmnext, st); #endif - /* This is defined away in perl 5.8.x, but it is in there for - 5.6.x */ + /* This is defined away in perl 5.8.x, but it is in there for + 5.6.x */ #ifdef PM_GETRE - if (check_new(st, PM_GETRE((cPMOPx(baseop))))) { - total_size += regex_size(PM_GETRE(cPMOPx(baseop)), st); - } + regex_size(PM_GETRE(cPMOPx(baseop)), st); #else - if (check_new(st, cPMOPx(baseop)->op_pmregexp)) { - total_size += regex_size(cPMOPx(baseop)->op_pmregexp, st); - } + regex_size(cPMOPx(baseop)->op_pmregexp, st); #endif - TAG;break; - case OPc_SVOP: TAG; - total_size += sizeof(struct pmop); - if (check_new(st, cSVOPx(baseop)->op_sv)) { - total_size += thing_size(aTHX_ cSVOPx(baseop)->op_sv, st); - } - TAG;break; + TAG;break; + case OPc_SVOP: TAG; + st->total_size += sizeof(struct pmop); + if (!(baseop->op_type == OP_AELEMFAST + && baseop->op_flags & OPf_SPECIAL)) { + /* not an OP_PADAV replacement */ + sv_size(aTHX_ st, cSVOPx(baseop)->op_sv, SOME_RECURSION); + } + TAG;break; case OPc_PADOP: TAG; - total_size += sizeof(struct padop); - TAG;break; - case OPc_PVOP: TAG; - if (check_new(st, cPVOPx(baseop)->op_pv)) { - total_size += strlen(cPVOPx(baseop)->op_pv); - } - case OPc_LOOP: TAG; - total_size += sizeof(struct loop); - if (check_new(st, cLOOPx(baseop)->op_first)) { - total_size += op_size(aTHX_ cLOOPx(baseop)->op_first, st); - } - if (check_new(st, cLOOPx(baseop)->op_last)) { - total_size += op_size(aTHX_ cLOOPx(baseop)->op_last, st); - } - if (check_new(st, cLOOPx(baseop)->op_redoop)) { - total_size += op_size(aTHX_ cLOOPx(baseop)->op_redoop, st); - } - if (check_new(st, cLOOPx(baseop)->op_nextop)) { - total_size += op_size(aTHX_ cLOOPx(baseop)->op_nextop, st); - } - if (check_new(st, cLOOPx(baseop)->op_lastop)) { - total_size += op_size(aTHX_ cLOOPx(baseop)->op_lastop, st); - } - - TAG;break; - case OPc_COP: TAG; + st->total_size += sizeof(struct padop); + TAG;break; + case OPc_PVOP: TAG; + check_new_and_strlen(st, cPVOPx(baseop)->op_pv); + TAG;break; + case OPc_LOOP: TAG; + st->total_size += sizeof(struct loop); + op_size(aTHX_ cLOOPx(baseop)->op_first, st); + op_size(aTHX_ cLOOPx(baseop)->op_last, st); + op_size(aTHX_ cLOOPx(baseop)->op_redoop, st); + op_size(aTHX_ cLOOPx(baseop)->op_nextop, st); + op_size(aTHX_ cLOOPx(baseop)->op_lastop, st); + TAG;break; + case OPc_COP: TAG; { COP *basecop; basecop = (COP *)baseop; - total_size += sizeof(struct cop); + st->total_size += sizeof(struct cop); /* Change 33656 by nicholas@mouse-mill on 2008/04/07 11:29:51 Eliminate cop_label from struct cop by storing a label as the first @@ -468,24 +462,14 @@ op_size(pTHX_ const OP * const baseop, struct state *st) { before 5.11 @33656, but later than 5.10, producing slightly too small memory sizes on these Perls. */ #if (PERL_VERSION < 11) - if (check_new(st, basecop->cop_label)) { - total_size += strlen(basecop->cop_label); - } + check_new_and_strlen(st, basecop->cop_label); #endif #ifdef USE_ITHREADS - if (check_new(st, basecop->cop_file)) { - total_size += strlen(basecop->cop_file); - } - if (check_new(st, basecop->cop_stashpv)) { - total_size += strlen(basecop->cop_stashpv); - } + check_new_and_strlen(st, basecop->cop_file); + check_new_and_strlen(st, basecop->cop_stashpv); #else - if (check_new(st, basecop->cop_stash)) { - total_size += thing_size(aTHX_ (SV *)basecop->cop_stash, st); - } - if (check_new(st, basecop->cop_filegv)) { - total_size += thing_size(aTHX_ (SV *)basecop->cop_filegv, st); - } + sv_size(aTHX_ st, (SV *)basecop->cop_stash, SOME_RECURSION); + sv_size(aTHX_ st, (SV *)basecop->cop_filegv, SOME_RECURSION); #endif } @@ -498,17 +482,21 @@ op_size(pTHX_ const OP * const baseop, struct state *st) { if (st->dangle_whine) warn( "Devel::Size: Encountered dangling pointer in opcode at: %p\n", baseop ); } - return total_size; } #if PERL_VERSION > 9 || (PERL_VERSION == 9 && PERL_SUBVERSION > 2) # define NEW_HEAD_LAYOUT #endif -static UV -thing_size(pTHX_ const SV * const orig_thing, struct state *st) { +static bool +sv_size(pTHX_ struct state *const st, const SV * const orig_thing, + const int recurse) { const SV *thing = orig_thing; - UV total_size = sizeof(SV); + + if(!check_new(st, thing)) + return FALSE; + + st->total_size += sizeof(SV); switch (SvTYPE(thing)) { /* Is it undef? */ @@ -519,126 +507,127 @@ thing_size(pTHX_ const SV * const orig_thing, struct state *st) { case SVt_IV: TAG; #ifndef NEW_HEAD_LAYOUT # ifdef PURIFY - total_size += sizeof(sizeof(XPVIV)); + st->total_size += sizeof(sizeof(XPVIV)); # else - total_size += sizeof(IV); + 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 - total_size += sizeof(sizeof(XPVNV)); + st->total_size += sizeof(sizeof(XPVNV)); #else - total_size += sizeof(NV); + st->total_size += sizeof(NV); #endif TAG;break; #if (PERL_VERSION < 11) /* Is it a reference? */ case SVt_RV: TAG; #ifndef NEW_HEAD_LAYOUT - total_size += sizeof(XRV); + 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; - total_size += sizeof(XPV); -#if (PERL_VERSION < 11) - total_size += SvROK(thing) ? thing_size(aTHX_ SvRV(thing), st) : SvLEN(thing); -#else - total_size += SvLEN(thing); -#endif + 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; - total_size += sizeof(XPVIV); -#if (PERL_VERSION < 11) - total_size += SvROK(thing) ? thing_size(aTHX_ SvRV(thing), st) : SvLEN(thing); -#else - total_size += SvLEN(thing); -#endif + 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)) { - total_size += SvIVX(thing); + st->total_size += SvIVX(thing); } TAG;break; /* A scalar/string/reference with a float part? */ case SVt_PVNV: TAG; - total_size += sizeof(XPVNV); -#if (PERL_VERSION < 11) - total_size += SvROK(thing) ? thing_size(aTHX_ SvRV(thing), st) : SvLEN(thing); -#else - total_size += SvLEN(thing); -#endif + 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; - total_size += sizeof(XPVMG); -#if (PERL_VERSION < 11) - total_size += SvROK(thing) ? thing_size(aTHX_ SvRV(thing), st) : SvLEN(thing); -#else - total_size += SvLEN(thing); -#endif - total_size += magic_size(thing, st); + 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(aTHX_ thing, st); TAG;break; #if PERL_VERSION <= 8 case SVt_PVBM: TAG; - total_size += sizeof(XPVBM); -#if (PERL_VERSION < 11) - total_size += SvROK(thing) ? thing_size(aTHX_ SvRV(thing), st) : SvLEN(thing); -#else - total_size += SvLEN(thing); -#endif - total_size += magic_size(thing, st); + 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(aTHX_ thing, st); TAG;break; #endif case SVt_PVLV: TAG; - total_size += sizeof(XPVLV); -#if (PERL_VERSION < 11) - total_size += SvROK(thing) ? thing_size(aTHX_ SvRV(thing), st) : SvLEN(thing); -#else - total_size += SvLEN(thing); -#endif - total_size += magic_size(thing, st); + 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(aTHX_ 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; - total_size += sizeof(XPVAV); + 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 */ - total_size += sizeof(SV *) * (AvMAX(thing) + 1); - dbg_printf(("total_size: %li AvMAX: %li av_len: $i\n", total_size, AvMAX(thing), av_len((AV*)thing))); + st->total_size += sizeof(SV *) * (AvMAX(thing) + 1); + dbg_printf(("total_size: %li AvMAX: %li av_len: $i\n", st->total_size, AvMAX(thing), av_len((AV*)thing))); + + if (recurse >= TOTAL_SIZE_RECURSION) { + SSize_t i = AvFILLp(thing) + 1; + + while (i--) + sv_size(aTHX_ st, AvARRAY(thing)[i], recurse); + } } /* Add in the bits on the other side of the beginning */ dbg_printf(("total_size %li, sizeof(SV *) %li, AvARRAY(thing) %li, AvALLOC(thing)%li , sizeof(ptr) %li \n", - total_size, sizeof(SV*), AvARRAY(thing), AvALLOC(thing), sizeof( thing ))); + st->total_size, sizeof(SV*), AvARRAY(thing), AvALLOC(thing), sizeof( thing ))); /* under Perl 5.8.8 64bit threading, AvARRAY(thing) was a pointer while AvALLOC was 0, resulting in grossly overstated sized for arrays. Technically, this shouldn't happen... */ if (AvALLOC(thing) != 0) { - total_size += (sizeof(SV *) * (AvARRAY(thing) - AvALLOC(thing))); + st->total_size += (sizeof(SV *) * (AvARRAY(thing) - AvALLOC(thing))); } #if (PERL_VERSION < 9) /* Is there something hanging off the arylen element? Post 5.9.something this is stored in magic, so will be found there, and Perl_av_arylen_p() takes a non-const AV*, hence compilers rightly complain about AvARYLEN() passing thing to it. */ - if (AvARYLEN(thing)) { - if (check_new(st, AvARYLEN(thing))) { - total_size += thing_size(aTHX_ AvARYLEN(thing), st); - } - } + sv_size(aTHX_ st, AvARYLEN(thing), recurse); #endif - total_size += magic_size(thing, st); + magic_size(aTHX_ thing, st); TAG;break; case SVt_PVHV: TAG; /* First the base struct */ - total_size += sizeof(XPVHV); + st->total_size += sizeof(XPVHV); /* Now the array of buckets */ - total_size += (sizeof(HE *) * (HvMAX(thing) + 1)); + st->total_size += (sizeof(HE *) * (HvMAX(thing) + 1)); /* Now walk the bucket chain */ if (HvARRAY(thing)) { HE *cur_entry; @@ -646,104 +635,74 @@ thing_size(pTHX_ const SV * const orig_thing, struct state *st) { for (cur_bucket = 0; cur_bucket <= HvMAX(thing); cur_bucket++) { cur_entry = *(HvARRAY(thing) + cur_bucket); while (cur_entry) { - total_size += sizeof(HE); + st->total_size += sizeof(HE); if (cur_entry->hent_hek) { /* Hash keys can be shared. Have we seen this before? */ if (check_new(st, cur_entry->hent_hek)) { - total_size += HEK_BASESIZE + cur_entry->hent_hek->hek_len + 2; + st->total_size += HEK_BASESIZE + cur_entry->hent_hek->hek_len + 2; } } + if (recurse >= TOTAL_SIZE_RECURSION) + sv_size(aTHX_ st, HeVAL(cur_entry), recurse); cur_entry = cur_entry->hent_next; } } } - total_size += magic_size(thing, st); + magic_size(aTHX_ thing, st); TAG;break; case SVt_PVCV: TAG; - total_size += sizeof(XPVCV); - total_size += magic_size(thing, st); - - total_size += ((XPVIO *) SvANY(thing))->xpv_len; - if (check_new(st, CvSTASH(thing))) { - total_size += thing_size(aTHX_ (SV *)CvSTASH(thing), st); - } - if (check_new(st, SvSTASH(thing))) { - total_size += thing_size(aTHX_ (SV *)SvSTASH(thing), st); - } - if (check_new(st, CvGV(thing))) { - total_size += thing_size(aTHX_ (SV *)CvGV(thing), st); - } - if (check_new(st, CvPADLIST(thing))) { - total_size += thing_size(aTHX_ (SV *)CvPADLIST(thing), st); - } - if (check_new(st, CvOUTSIDE(thing))) { - total_size += thing_size(aTHX_ (SV *)CvOUTSIDE(thing), st); - } + st->total_size += sizeof(XPVCV); + magic_size(aTHX_ thing, st); + + st->total_size += ((XPVIO *) SvANY(thing))->xpv_len; + 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); + sv_size(aTHX_ st, (SV *)CvPADLIST(thing), SOME_RECURSION); + sv_size(aTHX_ st, (SV *)CvOUTSIDE(thing), recurse); if (CvISXSUB(thing)) { - SV *sv = cv_const_sv((CV *)thing); - if (sv) { - total_size += thing_size(aTHX_ sv, st); - } + sv_size(aTHX_ st, cv_const_sv((CV *)thing), recurse); } else { - if (check_new(st, CvSTART(thing))) { - total_size += op_size(aTHX_ CvSTART(thing), st); - } - if (check_new(st, CvROOT(thing))) { - total_size += op_size(aTHX_ CvROOT(thing), st); - } + op_size(aTHX_ CvSTART(thing), st); + op_size(aTHX_ CvROOT(thing), st); } TAG;break; case SVt_PVGV: TAG; - total_size += magic_size(thing, st); - total_size += sizeof(XPVGV); - total_size += GvNAMELEN(thing); + magic_size(aTHX_ thing, st); + st->total_size += sizeof(XPVGV); + if(isGV_with_GP(thing)) { + st->total_size += GvNAMELEN(thing); #ifdef GvFILE - /* Is there a file? */ - if (GvFILE(thing)) { - if (check_new(st, GvFILE(thing))) { - total_size += strlen(GvFILE(thing)); - } - } +# 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 (GvGP(thing)) { - if (check_new(st, GvGP(thing))) { - total_size += sizeof(GP); - { - SV *generic_thing; - if ((generic_thing = (SV *)(GvGP(thing)->gp_sv))) { - total_size += thing_size(aTHX_ generic_thing, st); - } - if ((generic_thing = (SV *)(GvGP(thing)->gp_form))) { - total_size += thing_size(aTHX_ generic_thing, st); - } - if ((generic_thing = (SV *)(GvGP(thing)->gp_av))) { - total_size += thing_size(aTHX_ generic_thing, st); - } - if ((generic_thing = (SV *)(GvGP(thing)->gp_hv))) { - total_size += thing_size(aTHX_ generic_thing, st); - } - if ((generic_thing = (SV *)(GvGP(thing)->gp_egv))) { - total_size += thing_size(aTHX_ generic_thing, st); - } - if ((generic_thing = (SV *)(GvGP(thing)->gp_cv))) { - total_size += thing_size(aTHX_ generic_thing, st); - } - } - } + /* Is there something hanging off the glob? */ + if (check_new(st, GvGP(thing))) { + st->total_size += sizeof(GP); + sv_size(aTHX_ st, (SV *)(GvGP(thing)->gp_sv), recurse); + sv_size(aTHX_ st, (SV *)(GvGP(thing)->gp_form), recurse); + sv_size(aTHX_ st, (SV *)(GvGP(thing)->gp_av), recurse); + sv_size(aTHX_ st, (SV *)(GvGP(thing)->gp_hv), recurse); + sv_size(aTHX_ st, (SV *)(GvGP(thing)->gp_egv), recurse); + sv_size(aTHX_ st, (SV *)(GvGP(thing)->gp_cv), recurse); + } } TAG;break; case SVt_PVFM: TAG; - total_size += sizeof(XPVFM); - total_size += magic_size(thing, st); - total_size += ((XPVIO *) SvANY(thing))->xpv_len; - if (check_new(st, CvPADLIST(thing))) { - total_size += thing_size(aTHX_ (SV *)CvPADLIST(thing), st); - } - if (check_new(st, CvOUTSIDE(thing))) { - total_size += thing_size(aTHX_ (SV *)CvOUTSIDE(thing), st); - } + st->total_size += sizeof(XPVFM); + magic_size(aTHX_ 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 (st->go_yell && !st->fm_whine) { carp("Devel::Size: Calculated sizes for FMs are incomplete"); @@ -751,34 +710,19 @@ thing_size(pTHX_ const SV * const orig_thing, struct state *st) { } TAG;break; case SVt_PVIO: TAG; - total_size += sizeof(XPVIO); - total_size += magic_size(thing, st); + st->total_size += sizeof(XPVIO); + magic_size(aTHX_ thing, st); if (check_new(st, (SvPVX_const(thing)))) { - total_size += ((XPVIO *) SvANY(thing))->xpv_cur; + st->total_size += ((XPVIO *) SvANY(thing))->xpv_cur; } /* Some embedded char pointers */ - if (check_new(st, ((XPVIO *) SvANY(thing))->xio_top_name)) { - total_size += strlen(((XPVIO *) SvANY(thing))->xio_top_name); - } - if (check_new(st, ((XPVIO *) SvANY(thing))->xio_fmt_name)) { - total_size += strlen(((XPVIO *) SvANY(thing))->xio_fmt_name); - } - if (check_new(st, ((XPVIO *) SvANY(thing))->xio_bottom_name)) { - total_size += strlen(((XPVIO *) SvANY(thing))->xio_bottom_name); - } + 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 */ - if (((XPVIO *) SvANY(thing))->xio_top_gv) { - total_size += thing_size(aTHX_ (SV *)((XPVIO *) SvANY(thing))->xio_top_gv, - st); - } - if (((XPVIO *) SvANY(thing))->xio_bottom_gv) { - total_size += thing_size(aTHX_ (SV *)((XPVIO *) SvANY(thing))->xio_bottom_gv, - st); - } - if (((XPVIO *) SvANY(thing))->xio_fmt_gv) { - total_size += thing_size(aTHX_ (SV *)((XPVIO *) SvANY(thing))->xio_fmt_gv, - st); - } + 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 @@ -791,14 +735,31 @@ thing_size(pTHX_ const SV * const orig_thing, struct state *st) { default: warn("Devel::Size: Unknown variable type: %d encountered\n", SvTYPE(thing) ); } - return total_size; + 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))) { @@ -807,6 +768,15 @@ new_state(pTHX) if (NULL != (warn_flag = perl_get_sv("Devel::Size::dangle", FALSE))) { st->dangle_whine = SvIV(warn_flag) ? TRUE : FALSE; } + 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; } @@ -814,9 +784,11 @@ MODULE = Devel::Size PACKAGE = Devel::Size PROTOTYPES: DISABLE -IV +UV size(orig_thing) SV *orig_thing +ALIAS: + total_size = TOTAL_SIZE_RECURSION CODE: { SV *thing = orig_thing; @@ -824,156 +796,13 @@ CODE: /* If they passed us a reference then dereference it. This is the only way we can check the sizes of arrays and hashes */ -#if (PERL_VERSION < 11) - if (SvOK(thing) && SvROK(thing)) { - thing = SvRV(thing); - } -#else if (SvROK(thing)) { thing = SvRV(thing); } -#endif - RETVAL = thing_size(aTHX_ thing, st); + sv_size(aTHX_ st, thing, ix); + RETVAL = st->total_size; free_state(st); } OUTPUT: RETVAL - - -IV -total_size(orig_thing) - SV *orig_thing -CODE: -{ - SV *thing = orig_thing; - /* Array with things we still need to do */ - AV *pending_array; - IV size = 0; - struct state *st = new_state(aTHX); - - /* Size starts at zero */ - RETVAL = 0; - - pending_array = newAV(); - - /* We cannot push HV/AV directly, only the RV. So deref it - later (see below for "*** dereference later") and adjust here for - the miscalculation. - This is the only way we can check the sizes of arrays and hashes. */ - if (SvROK(thing)) { - RETVAL -= thing_size(aTHX_ thing, NULL); - } - - /* Put it on the pending array */ - av_push(pending_array, thing); - - /* Now just yank things off the end of the array until it's done */ - while (av_len(pending_array) >= 0) { - thing = av_pop(pending_array); - /* Process it if we've not seen it */ - if (check_new(st, thing)) { - dbg_printf(("# Found type %i at %p\n", SvTYPE(thing), thing)); - /* Is it valid? */ - if (thing) { - /* Yes, it is. So let's check the type */ - switch (SvTYPE(thing)) { - /* fix for bug #24846 (Does not correctly recurse into references in a PVNV-type scalar) */ - case SVt_PVNV: TAG; - if (SvROK(thing)) - { - av_push(pending_array, SvRV(thing)); - } - TAG;break; - - /* this is the "*** dereference later" part - see above */ -#if (PERL_VERSION < 11) - case SVt_RV: TAG; -#else - case SVt_IV: TAG; -#endif - dbg_printf(("# Found RV\n")); - if (SvROK(thing)) { - dbg_printf(("# Found RV\n")); - av_push(pending_array, SvRV(thing)); - } - TAG;break; - - case SVt_PVAV: TAG; - { - AV *tempAV = (AV *)thing; - SV **tempSV; - - dbg_printf(("# Found type AV\n")); - /* Quick alias to cut down on casting */ - - /* Any elements? */ - if (av_len(tempAV) != -1) { - IV index; - /* Run through them all */ - for (index = 0; index <= av_len(tempAV); index++) { - /* Did we get something? */ - if ((tempSV = av_fetch(tempAV, index, 0))) { - /* Was it undef? */ - if (*tempSV != &PL_sv_undef) { - /* Apparently not. Save it for later */ - av_push(pending_array, *tempSV); - } - } - } - } - } - TAG;break; - - case SVt_PVHV: TAG; - dbg_printf(("# Found type HV\n")); - /* Is there anything in here? */ - if (hv_iterinit((HV *)thing)) { - HE *temp_he; - while ((temp_he = hv_iternext((HV *)thing))) { - av_push(pending_array, hv_iterval((HV *)thing, temp_he)); - } - } - TAG;break; - - case SVt_PVGV: TAG; - dbg_printf(("# Found type GV\n")); - /* Run through all the pieces and push the ones with bits */ - if (GvSV(thing)) { - av_push(pending_array, (SV *)GvSV(thing)); - } - if (GvFORM(thing)) { - av_push(pending_array, (SV *)GvFORM(thing)); - } - if (GvAV(thing)) { - av_push(pending_array, (SV *)GvAV(thing)); - } - if (GvHV(thing)) { - av_push(pending_array, (SV *)GvHV(thing)); - } - if (GvCV(thing)) { - av_push(pending_array, (SV *)GvCV(thing)); - } - TAG;break; - default: - TAG;break; - } - } - - size = thing_size(aTHX_ thing, st); - RETVAL += size; - } else { - /* check_new() returned false: */ -#ifdef DEVEL_SIZE_DEBUGGING - if (SvOK(sv)) printf("# Ignore ref copy 0x%x\n", sv); - else printf("# Ignore non-sv 0x%x\n", sv); -#endif - } - } /* end while */ - - free_state(st); - SvREFCNT_dec(pending_array); -} -OUTPUT: - RETVAL -