X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Size.xs;h=f1155a2e96043ad65900a6fd2040cb7df2df8f17;hb=9fc9ab867f272405574e69ef14fde78f9d840537;hp=a2980d64ee499b0ca53a4ecad88d509366954364;hpb=ebb2c5b9e5a54f96dc1b0b1543b3bb1dec777b84;p=p5sagit%2FDevel-Size.git diff --git a/Size.xs b/Size.xs index a2980d6..f1155a2 100644 --- a/Size.xs +++ b/Size.xs @@ -2,35 +2,223 @@ #include "perl.h" #include "XSUB.h" + +#ifdef _MSC_VER +# include +# define try __try +# define catch __except +# define EXCEPTION EXCEPTION_EXECUTE_HANDLER +#else +# define EXCEPTION ... +#endif + +#ifdef __GNUC__ +# define __attribute__(x) +#endif + +static int regex_whine; +static int fm_whine; +static int dangle_whine = 0; + +#if 0 && defined(DEBUGGING) +#define dbg_printf(x) printf x +#else +#define dbg_printf(x) +#endif + +#define TAG //printf( "# %s(%d)\n", __FILE__, __LINE__ ) #define carp puts +#define ALIGN_BITS ( sizeof(void*) >> 1 ) +#define BIT_BITS 3 +#define BYTE_BITS 14 +#define SLOT_BITS ( sizeof( void*) * 8 ) - ( ALIGN_BITS + BIT_BITS + BYTE_BITS ) +#define BYTES_PER_SLOT 1 << BYTE_BITS +#define TRACKING_SLOTS 8192 // max. 8192 for 4GB/32-bit machine + +typedef char* TRACKING[ TRACKING_SLOTS ]; + +/* + Checks to see if thing is in the bitstring. + Returns true or false, and + notes thing in the segmented bitstring. + */ +IV check_new( TRACKING *tv, void *p ) { + unsigned long slot = (unsigned long)p >> (SLOT_BITS + BIT_BITS + ALIGN_BITS); + unsigned int byte = ((unsigned long)p >> (ALIGN_BITS + BIT_BITS)) & 0x00003fffU; + unsigned int bit = ((unsigned long)p >> ALIGN_BITS) & 0x00000007U; + unsigned int nop = (unsigned long)p & 0x3U; + + if (NULL == p || NULL == tv) return FALSE; + try { + char c = *(char *)p; + } + catch ( EXCEPTION ) { + if( dangle_whine ) + warn( "Devel::Size: Encountered invalid pointer: %p\n", p ); + return FALSE; + } + dbg_printf(( + "address: %p slot: %p byte: %4x bit: %4x nop:%x\n", + p, slot, byte, bit, nop + )); + TAG; + if( slot >= TRACKING_SLOTS ) { + die( "Devel::Size: Please rebuild D::S with TRACKING_SLOTS > %u\n", slot ); + } + TAG; + if( (*tv)[ slot ] == NULL ) { + Newz( 0xfc0ff, (*tv)[ slot ], BYTES_PER_SLOT, char ); + } + TAG; + if( (*tv)[ slot ][ byte ] & ( 1 << bit ) ) { + return FALSE; + } + TAG; + (*tv)[ slot ][ byte ] |= ( 1 << bit ); + TAG; + return TRUE; +} + +UV thing_size(const SV *const, TRACKING *); +typedef enum { + OPc_NULL, /* 0 */ + OPc_BASEOP, /* 1 */ + OPc_UNOP, /* 2 */ + OPc_BINOP, /* 3 */ + OPc_LOGOP, /* 4 */ + OPc_LISTOP, /* 5 */ + OPc_PMOP, /* 6 */ + OPc_SVOP, /* 7 */ + OPc_PADOP, /* 8 */ + OPc_PVOP, /* 9 */ + OPc_LOOP, /* 10 */ + OPc_COP /* 11 */ +} opclass; + +static opclass +cc_opclass(const OP * const o) +{ + if (!o) + return OPc_NULL; + try { + if (o->op_type == 0) + return (o->op_flags & OPf_KIDS) ? OPc_UNOP : OPc_BASEOP; + + if (o->op_type == OP_SASSIGN) + return ((o->op_private & OPpASSIGN_BACKWARDS) ? OPc_UNOP : OPc_BINOP); + + #ifdef USE_ITHREADS + if (o->op_type == OP_GV || o->op_type == OP_GVSV || o->op_type == OP_AELEMFAST) + return OPc_PADOP; + #endif + + if ((o->op_type == OP_TRANS)) { + return OPc_BASEOP; + } + + switch (PL_opargs[o->op_type] & OA_CLASS_MASK) { + case OA_BASEOP: TAG; + return OPc_BASEOP; + + case OA_UNOP: TAG; + return OPc_UNOP; + + case OA_BINOP: TAG; + return OPc_BINOP; + + case OA_LOGOP: TAG; + return OPc_LOGOP; + + case OA_LISTOP: TAG; + return OPc_LISTOP; + + case OA_PMOP: TAG; + return OPc_PMOP; + + case OA_SVOP: TAG; + return OPc_SVOP; + + case OA_PADOP: TAG; + return OPc_PADOP; + + case OA_PVOP_OR_SVOP: TAG; + /* + * Character translations (tr///) are usually a PVOP, keeping a + * pointer to a table of shorts used to look up translations. + * Under utf8, however, a simple table isn't practical; instead, + * the OP is an SVOP, and the SV is a reference to a swash + * (i.e., an RV pointing to an HV). + */ + return (o->op_private & (OPpTRANS_TO_UTF|OPpTRANS_FROM_UTF)) + ? OPc_SVOP : OPc_PVOP; + + case OA_LOOP: TAG; + return OPc_LOOP; + + case OA_COP: TAG; + return OPc_COP; + + case OA_BASEOP_OR_UNOP: TAG; + /* + * UNI(OP_foo) in toke.c returns token UNI or FUNC1 depending on + * whether parens were seen. perly.y uses OPf_SPECIAL to + * signal whether a BASEOP had empty parens or none. + * Some other UNOPs are created later, though, so the best + * test is OPf_KIDS, which is set in newUNOP. + */ + return (o->op_flags & OPf_KIDS) ? OPc_UNOP : OPc_BASEOP; + + case OA_FILESTATOP: TAG; + /* + * The file stat OPs are created via UNI(OP_foo) in toke.c but use + * the OPf_REF flag to distinguish between OP types instead of the + * usual OPf_SPECIAL flag. As usual, if OPf_KIDS is set, then we + * return OPc_UNOP so that walkoptree can find our children. If + * OPf_KIDS is not set then we check OPf_REF. Without OPf_REF set + * (no argument to the operator) it's an OP; with OPf_REF set it's + * an SVOP (and op_sv is the GV for the filehandle argument). + */ + return ((o->op_flags & OPf_KIDS) ? OPc_UNOP : + #ifdef USE_ITHREADS + (o->op_flags & OPf_REF) ? OPc_PADOP : OPc_BASEOP); + #else + (o->op_flags & OPf_REF) ? OPc_SVOP : OPc_BASEOP); + #endif + case OA_LOOPEXOP: TAG; + /* + * next, last, redo, dump and goto use OPf_SPECIAL to indicate that a + * label was omitted (in which case it's a BASEOP) or else a term was + * seen. In this last case, all except goto are definitely PVOP but + * goto is either a PVOP (with an ordinary constant label), an UNOP + * with OPf_STACKED (with a non-constant non-sub) or an UNOP for + * OP_REFGEN (with goto &sub) in which case OPf_STACKED also seems to + * get set. + */ + if (o->op_flags & OPf_STACKED) + return OPc_UNOP; + else if (o->op_flags & OPf_SPECIAL) + return OPc_BASEOP; + else + return OPc_PVOP; + } + warn("Devel::Size: Can't determine class of operator %s, assuming BASEOP\n", + PL_op_name[o->op_type]); + } + catch( EXCEPTION ) { } + return OPc_BASEOP; +} + + #if !defined(NV) #define NV double #endif static int go_yell = 1; -/* Checks to see if thing is in the hash. Returns true or false, and - notes thing in the hash. - - This code does one Evil Thing. Since we're tracking pointers, we - tell perl that the string key is the address in the pointer. We do this by - passing in the address of the address, along with the size of a - pointer as the length. Perl then uses the four (or eight, on - 64-bit machines) bytes of the address as the string we're using as - the key */ -IV check_new(HV *tracking_hash, void *thing) { - if (hv_exists(tracking_hash, (char *)&thing, sizeof(void *))) { - return FALSE; - } - hv_store(tracking_hash, (char *)&thing, sizeof(void *), &PL_sv_undef, 0); - return TRUE; - -} - /* Figure out how much magic is attached to the SV and return the size */ -IV magic_size(SV *thing, HV *tracking_hash) { +IV magic_size(const SV * const thing, TRACKING *tv) { IV total_size = 0; MAGIC *magic_pointer; @@ -44,102 +232,331 @@ IV magic_size(SV *thing, HV *tracking_hash) { magic_pointer = SvMAGIC(thing); /* Have we seen the magic pointer? */ - while (magic_pointer && check_new(tracking_hash, magic_pointer)) { + while (magic_pointer && check_new(tv, magic_pointer)) { total_size += sizeof(MAGIC); - /* Have we seen the magic vtable? */ - if (magic_pointer->mg_virtual && - check_new(tracking_hash, magic_pointer->mg_virtual)) { - total_size += sizeof(MGVTBL); + try { + /* Have we seen the magic vtable? */ + if (magic_pointer->mg_virtual && + check_new(tv, magic_pointer->mg_virtual)) { + total_size += sizeof(MGVTBL); + } + + /* Get the next in the chain */ // ?try + magic_pointer = magic_pointer->mg_moremagic; } + catch( EXCEPTION ) { + if( dangle_whine ) + warn( "Devel::Size: Encountered bad magic at: %p\n", magic_pointer ); + } + } + return total_size; +} - /* Get the next in the chain */ - magic_pointer = magic_pointer->mg_moremagic; +UV regex_size(const REGEXP * const baseregex, TRACKING *tv) { + UV total_size = 0; + + 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); +#else + total_size += sizeof(struct regexp); + total_size += sizeof(I32) * SvANY(baseregex)->nparens * 2; + /*total_size += strlen(SvANY(baseregex)->subbeg);*/ +#endif + if (go_yell && !regex_whine) { + carp("Devel::Size: Calculated sizes for compiled regexes are incompatible, and probably always will be"); + regex_whine = 1; } return total_size; } +UV op_size(const OP * const baseop, TRACKING *tv) { + UV total_size = 0; + try { + TAG; + if (check_new(tv, baseop->op_next)) { + total_size += op_size(baseop->op_next, tv); + } + 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(tv, cUNOPx(baseop)->op_first)) { + total_size += op_size(cUNOPx(baseop)->op_first, tv); + } + TAG;break; + case OPc_BINOP: TAG; + total_size += sizeof(struct binop); + if (check_new(tv, cBINOPx(baseop)->op_first)) { + total_size += op_size(cBINOPx(baseop)->op_first, tv); + } + if (check_new(tv, cBINOPx(baseop)->op_last)) { + total_size += op_size(cBINOPx(baseop)->op_last, tv); + } + TAG;break; + case OPc_LOGOP: TAG; + total_size += sizeof(struct logop); + if (check_new(tv, cLOGOPx(baseop)->op_first)) { + total_size += op_size(cBINOPx(baseop)->op_first, tv); + } + if (check_new(tv, cLOGOPx(baseop)->op_other)) { + total_size += op_size(cLOGOPx(baseop)->op_other, tv); + } + TAG;break; + case OPc_LISTOP: TAG; + total_size += sizeof(struct listop); + if (check_new(tv, cLISTOPx(baseop)->op_first)) { + total_size += op_size(cLISTOPx(baseop)->op_first, tv); + } + if (check_new(tv, cLISTOPx(baseop)->op_last)) { + total_size += op_size(cLISTOPx(baseop)->op_last, tv); + } + TAG;break; + case OPc_PMOP: TAG; + total_size += sizeof(struct pmop); + if (check_new(tv, cPMOPx(baseop)->op_first)) { + total_size += op_size(cPMOPx(baseop)->op_first, tv); + } + if (check_new(tv, cPMOPx(baseop)->op_last)) { + total_size += op_size(cPMOPx(baseop)->op_last, tv); + } +#if PERL_VERSION < 9 || (PERL_VERSION == 9 && PERL_SUBVERSION < 5) + if (check_new(tv, cPMOPx(baseop)->op_pmreplroot)) { + total_size += op_size(cPMOPx(baseop)->op_pmreplroot, tv); + } + if (check_new(tv, cPMOPx(baseop)->op_pmreplstart)) { + total_size += op_size(cPMOPx(baseop)->op_pmreplstart, tv); + } + if (check_new(tv, cPMOPx(baseop)->op_pmnext)) { + total_size += op_size((OP *)cPMOPx(baseop)->op_pmnext, tv); + } +#endif + /* This is defined away in perl 5.8.x, but it is in there for + 5.6.x */ +#ifdef PM_GETRE + if (check_new(tv, PM_GETRE((cPMOPx(baseop))))) { + total_size += regex_size(PM_GETRE(cPMOPx(baseop)), tv); + } +#else + if (check_new(tv, cPMOPx(baseop)->op_pmregexp)) { + total_size += regex_size(cPMOPx(baseop)->op_pmregexp, tv); + } +#endif + TAG;break; + case OPc_SVOP: TAG; + total_size += sizeof(struct pmop); + if (check_new(tv, cSVOPx(baseop)->op_sv)) { + total_size += thing_size(cSVOPx(baseop)->op_sv, tv); + } + TAG;break; + case OPc_PADOP: TAG; + total_size += sizeof(struct padop); + TAG;break; + case OPc_PVOP: TAG; + if (check_new(tv, cPVOPx(baseop)->op_pv)) { + total_size += strlen(cPVOPx(baseop)->op_pv); + } + case OPc_LOOP: TAG; + total_size += sizeof(struct loop); + if (check_new(tv, cLOOPx(baseop)->op_first)) { + total_size += op_size(cLOOPx(baseop)->op_first, tv); + } + if (check_new(tv, cLOOPx(baseop)->op_last)) { + total_size += op_size(cLOOPx(baseop)->op_last, tv); + } + if (check_new(tv, cLOOPx(baseop)->op_redoop)) { + total_size += op_size(cLOOPx(baseop)->op_redoop, tv); + } + if (check_new(tv, cLOOPx(baseop)->op_nextop)) { + total_size += op_size(cLOOPx(baseop)->op_nextop, tv); + } + if (check_new(tv, cLOOPx(baseop)->op_lastop)) { + total_size += op_size(cLOOPx(baseop)->op_lastop, tv); + } + + TAG;break; + case OPc_COP: TAG; + { + COP *basecop; + basecop = (COP *)baseop; + 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 + entry in the hints hash. Most statements don't have labels, so this + will save memory. Not sure how much. + The check below will be incorrect fail on bleadperls + 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(tv, basecop->cop_label)) { + total_size += strlen(basecop->cop_label); + } +#endif +#ifdef USE_ITHREADS + if (check_new(tv, basecop->cop_file)) { + total_size += strlen(basecop->cop_file); + } + if (check_new(tv, basecop->cop_stashpv)) { + total_size += strlen(basecop->cop_stashpv); + } +#else + if (check_new(tv, basecop->cop_stash)) { + total_size += thing_size((SV *)basecop->cop_stash, tv); + } + if (check_new(tv, basecop->cop_filegv)) { + total_size += thing_size((SV *)basecop->cop_filegv, tv); + } +#endif -UV thing_size(SV *orig_thing, HV *tracking_hash) { - SV *thing = orig_thing; + } + TAG;break; + default: + TAG;break; + } + } + catch( EXCEPTION ) { + if( 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 + +UV thing_size(const SV * const orig_thing, TRACKING *tv) { + const SV *thing = orig_thing; UV total_size = sizeof(SV); - + switch (SvTYPE(thing)) { /* Is it undef? */ - case SVt_NULL: - break; + 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: -#ifdef PURIFY + case SVt_IV: TAG; +#ifndef NEW_HEAD_LAYOUT +# ifdef PURIFY total_size += sizeof(sizeof(XPVIV)); -#else +# else total_size += sizeof(IV); +# endif #endif - break; + TAG;break; /* Is it a float? Like the int, it depends on purify */ - case SVt_NV: + case SVt_NV: TAG; #ifdef PURIFY total_size += sizeof(sizeof(XPVNV)); #else total_size += sizeof(NV); #endif - break; + TAG;break; +#if (PERL_VERSION < 11) /* Is it a reference? */ - case SVt_RV: + case SVt_RV: TAG; +#ifndef NEW_HEAD_LAYOUT total_size += sizeof(XRV); - break; +#endif + TAG;break; +#endif /* How about a plain string? In which case we need to add in how much has been allocated */ - case SVt_PV: + case SVt_PV: TAG; total_size += sizeof(XPV); +#if (PERL_VERSION < 11) + total_size += SvROK(thing) ? thing_size( SvRV(thing), tv) : SvLEN(thing); +#else total_size += SvLEN(thing); - break; +#endif + TAG;break; /* A string with an integer part? */ - case SVt_PVIV: + case SVt_PVIV: TAG; total_size += sizeof(XPVIV); +#if (PERL_VERSION < 11) + total_size += SvROK(thing) ? thing_size( SvRV(thing), tv) : SvLEN(thing); +#else total_size += SvLEN(thing); - break; - /* A string with a float part? */ - case SVt_PVNV: +#endif + if(SvOOK(thing)) { + 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( SvRV(thing), tv) : SvLEN(thing); +#else total_size += SvLEN(thing); - break; - case SVt_PVMG: +#endif + TAG;break; + case SVt_PVMG: TAG; total_size += sizeof(XPVMG); +#if (PERL_VERSION < 11) + total_size += SvROK(thing) ? thing_size( SvRV(thing), tv) : SvLEN(thing); +#else total_size += SvLEN(thing); - total_size += magic_size(thing, tracking_hash); - break; - case SVt_PVBM: +#endif + total_size += magic_size(thing, tv); + TAG;break; +#if PERL_VERSION <= 8 + case SVt_PVBM: TAG; total_size += sizeof(XPVBM); +#if (PERL_VERSION < 11) + total_size += SvROK(thing) ? thing_size( SvRV(thing), tv) : SvLEN(thing); +#else total_size += SvLEN(thing); - total_size += magic_size(thing, tracking_hash); - break; - case SVt_PVLV: +#endif + total_size += magic_size(thing, tv); + TAG;break; +#endif + case SVt_PVLV: TAG; total_size += sizeof(XPVLV); +#if (PERL_VERSION < 11) + total_size += SvROK(thing) ? thing_size( SvRV(thing), tv) : SvLEN(thing); +#else total_size += SvLEN(thing); - total_size += magic_size(thing, tracking_hash); - break; +#endif + total_size += magic_size(thing, tv); + 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: + case SVt_PVAV: TAG; total_size += sizeof(XPVAV); /* Is there anything in the array? */ if (AvMAX(thing) != -1) { - total_size += sizeof(SV *) * AvMAX(thing); + /* 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))); } /* Add in the bits on the other side of the beginning */ - total_size += (sizeof(SV *) * (AvARRAY(thing) - AvALLOC(thing))); + + 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 ))); + + /* 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))); + } /* Is there something hanging off the arylen element? */ if (AvARYLEN(thing)) { - if (check_new(tracking_hash, AvARYLEN(thing))) { - total_size += thing_size(AvARYLEN(thing), tracking_hash); + if (check_new(tv, AvARYLEN(thing))) { + total_size += thing_size(AvARYLEN(thing), tv); } } - total_size += magic_size(thing, tracking_hash); - break; - case SVt_PVHV: + total_size += magic_size(thing, tv); + TAG;break; + case SVt_PVHV: TAG; /* First the base struct */ total_size += sizeof(XPVHV); /* Now the array of buckets */ @@ -147,66 +564,152 @@ UV thing_size(SV *orig_thing, HV *tracking_hash) { /* Now walk the bucket chain */ if (HvARRAY(thing)) { HE *cur_entry; - IV cur_bucket = 0; + UV cur_bucket = 0; for (cur_bucket = 0; cur_bucket <= HvMAX(thing); cur_bucket++) { - cur_entry = *(HvARRAY(thing) + cur_bucket); - while (cur_entry) { - total_size += sizeof(HE); - if (cur_entry->hent_hek) { - /* Hash keys can be shared. Have we seen this before? */ - if (check_new(tracking_hash, cur_entry->hent_hek)) { - total_size += HEK_BASESIZE + cur_entry->hent_hek->hek_len + 2; - } - } - cur_entry = cur_entry->hent_next; - } + cur_entry = *(HvARRAY(thing) + cur_bucket); + while (cur_entry) { + total_size += sizeof(HE); + if (cur_entry->hent_hek) { + /* Hash keys can be shared. Have we seen this before? */ + if (check_new(tv, cur_entry->hent_hek)) { + total_size += HEK_BASESIZE + cur_entry->hent_hek->hek_len + 2; + } + } + cur_entry = cur_entry->hent_next; + } } } - total_size += magic_size(thing, tracking_hash); - break; - case SVt_PVCV: + total_size += magic_size(thing, tv); + TAG;break; + case SVt_PVCV: TAG; total_size += sizeof(XPVCV); - total_size += magic_size(thing, tracking_hash); - if (go_yell) { - carp("CV isn't complete"); + total_size += magic_size(thing, tv); + + total_size += ((XPVIO *) SvANY(thing))->xpv_len; + if (check_new(tv, CvSTASH(thing))) { + total_size += thing_size((SV *)CvSTASH(thing), tv); + } + if (check_new(tv, SvSTASH(thing))) { + total_size += thing_size( (SV *)SvSTASH(thing), tv); } - break; - case SVt_PVGV: - total_size += magic_size(thing, tracking_hash); + if (check_new(tv, CvGV(thing))) { + total_size += thing_size((SV *)CvGV(thing), tv); + } + if (check_new(tv, CvPADLIST(thing))) { + total_size += thing_size((SV *)CvPADLIST(thing), tv); + } + if (check_new(tv, CvOUTSIDE(thing))) { + total_size += thing_size((SV *)CvOUTSIDE(thing), tv); + } + if (check_new(tv, CvSTART(thing))) { + total_size += op_size(CvSTART(thing), tv); + } + if (check_new(tv, CvROOT(thing))) { + total_size += op_size(CvROOT(thing), tv); + } + + TAG;break; + case SVt_PVGV: TAG; + total_size += magic_size(thing, tv); total_size += sizeof(XPVGV); total_size += GvNAMELEN(thing); +#ifdef GvFILE /* Is there a file? */ if (GvFILE(thing)) { - if (check_new(tracking_hash, GvFILE(thing))) { - total_size += strlen(GvFILE(thing)); + if (check_new(tv, GvFILE(thing))) { + total_size += strlen(GvFILE(thing)); } } +#endif /* Is there something hanging off the glob? */ if (GvGP(thing)) { - if (check_new(tracking_hash, GvGP(thing))) { - total_size += sizeof(GP); + if (check_new(tv, GvGP(thing))) { + total_size += sizeof(GP); + { + SV *generic_thing; + if ((generic_thing = (SV *)(GvGP(thing)->gp_sv))) { + total_size += thing_size(generic_thing, tv); + } + if ((generic_thing = (SV *)(GvGP(thing)->gp_form))) { + total_size += thing_size(generic_thing, tv); + } + if ((generic_thing = (SV *)(GvGP(thing)->gp_av))) { + total_size += thing_size(generic_thing, tv); + } + if ((generic_thing = (SV *)(GvGP(thing)->gp_hv))) { + total_size += thing_size(generic_thing, tv); + } + if ((generic_thing = (SV *)(GvGP(thing)->gp_egv))) { + total_size += thing_size(generic_thing, tv); + } + if ((generic_thing = (SV *)(GvGP(thing)->gp_cv))) { + total_size += thing_size(generic_thing, tv); } } - break; - case SVt_PVFM: + } + } + TAG;break; + case SVt_PVFM: TAG; total_size += sizeof(XPVFM); - if (go_yell) { - carp("FM isn't complete"); + total_size += magic_size(thing, tv); + total_size += ((XPVIO *) SvANY(thing))->xpv_len; + if (check_new(tv, CvPADLIST(thing))) { + total_size += thing_size((SV *)CvPADLIST(thing), tv); + } + if (check_new(tv, CvOUTSIDE(thing))) { + total_size += thing_size((SV *)CvOUTSIDE(thing), tv); + } + + if (go_yell && !fm_whine) { + carp("Devel::Size: Calculated sizes for FMs are incomplete"); + fm_whine = 1; } - break; - case SVt_PVIO: + TAG;break; + case SVt_PVIO: TAG; total_size += sizeof(XPVIO); - if (go_yell) { - carp("IO isn't complete"); + total_size += magic_size(thing, tv); + if (check_new(tv, (SvPVX(thing)))) { + total_size += ((XPVIO *) SvANY(thing))->xpv_cur; + } + /* Some embedded char pointers */ + if (check_new(tv, ((XPVIO *) SvANY(thing))->xio_top_name)) { + total_size += strlen(((XPVIO *) SvANY(thing))->xio_top_name); + } + if (check_new(tv, ((XPVIO *) SvANY(thing))->xio_fmt_name)) { + total_size += strlen(((XPVIO *) SvANY(thing))->xio_fmt_name); + } + if (check_new(tv, ((XPVIO *) SvANY(thing))->xio_bottom_name)) { + total_size += strlen(((XPVIO *) SvANY(thing))->xio_bottom_name); } - break; + /* 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((SV *)((XPVIO *) SvANY(thing))->xio_top_gv, + tv); + } + if (((XPVIO *) SvANY(thing))->xio_bottom_gv) { + total_size += thing_size((SV *)((XPVIO *) SvANY(thing))->xio_bottom_gv, + tv); + } + if (((XPVIO *) SvANY(thing))->xio_fmt_gv) { + total_size += thing_size((SV *)((XPVIO *) SvANY(thing))->xio_fmt_gv, + tv); + } + + /* 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: - croak("Unknown variable type"); + warn("Devel::Size: Unknown variable type: %d encountered\n", SvTYPE(thing) ); } return total_size; } -MODULE = Devel::Size PACKAGE = Devel::Size +MODULE = Devel::Size PACKAGE = Devel::Size PROTOTYPES: DISABLE @@ -215,28 +718,46 @@ size(orig_thing) SV *orig_thing CODE: { + int i; SV *thing = orig_thing; /* Hash to track our seen pointers */ - HV *tracking_hash = newHV(); + //HV *tracking_hash = newHV(); SV *warn_flag; + TRACKING *tv; + Newz( 0xfc0ff, tv, 1, TRACKING ); /* Check warning status */ go_yell = 0; + regex_whine = 0; + fm_whine = 0; - if (NULL != (warn_flag = get_sv("Devel::Size::warn", FALSE))) { - go_yell = SvIV(warn_flag); + if (NULL != (warn_flag = perl_get_sv("Devel::Size::warn", FALSE))) { + dangle_whine = go_yell = SvIV(warn_flag); + } + if (NULL != (warn_flag = perl_get_sv("Devel::Size::dangle", FALSE))) { + dangle_whine = SvIV(warn_flag); } - /* 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); } - - RETVAL = thing_size(thing, tracking_hash); +#else + if (SvROK(thing)) { + thing = SvRV(thing); + } +#endif + + RETVAL = thing_size(thing, tv); /* Clean up after ourselves */ - SvREFCNT_dec(tracking_hash); + //SvREFCNT_dec(tracking_hash); + for( i = 0; i < TRACKING_SLOTS; ++i ) { + if( (*tv)[ i ] ) + Safefree( (*tv)[ i ] ); + } + Safefree( tv ); } OUTPUT: RETVAL @@ -247,32 +768,44 @@ total_size(orig_thing) SV *orig_thing CODE: { + int i; SV *thing = orig_thing; /* Hash to track our seen pointers */ - HV *tracking_hash = newHV(); - AV *pending_array = newAV(); + //HV *tracking_hash; + TRACKING *tv; + /* Array with things we still need to do */ + AV *pending_array; IV size = 0; SV *warn_flag; - IV count = 0; - /* Size starts at zero */ RETVAL = 0; /* Check warning status */ go_yell = 0; + regex_whine = 0; + fm_whine = 0; - if (NULL != (warn_flag = get_sv("Devel::Size::warn", FALSE))) { - go_yell = SvIV(warn_flag); + if (NULL != (warn_flag = perl_get_sv("Devel::Size::warn", FALSE))) { + dangle_whine = go_yell = SvIV(warn_flag); } - - - /* If they passed us a reference then dereference it. This is the - only way we can check the sizes of arrays and hashes */ - if (SvOK(thing) && SvROK(thing)) { - thing = SvRV(thing); + if (NULL != (warn_flag = perl_get_sv("Devel::Size::dangle", FALSE))) { + dangle_whine = SvIV(warn_flag); } + /* init these after the go_yell above */ + //tracking_hash = newHV(); + Newz( 0xfc0ff, tv, 1, TRACKING ); + 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(thing, NULL); + } + /* Put it on the pending array */ av_push(pending_array, thing); @@ -280,80 +813,112 @@ CODE: while (av_len(pending_array) >= 0) { thing = av_pop(pending_array); /* Process it if we've not seen it */ - if (check_new(tracking_hash, thing)) { + if (check_new(tv, 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)) { - case SVt_RV: - av_push(pending_array, SvRV(thing)); - break; - - case SVt_PVAV: - { - /* Quick alias to cut down on casting */ - AV *tempAV = (AV *)thing; - SV **tempSV; - - /* 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); - } - } - } - } - } - break; - - case SVt_PVHV: - /* 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)); - } - } - break; - - case SVt_PVGV: - /* 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)); - } - break; - default: - break; - } + /* 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(thing, tracking_hash); + size = thing_size(thing, tv); 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 */ /* Clean up after ourselves */ - SvREFCNT_dec(tracking_hash); + //SvREFCNT_dec(tracking_hash); + for( i = 0; i < TRACKING_SLOTS; ++i ) { + if( (*tv)[ i ] ) + Safefree( (*tv)[ i ] ); + } + Safefree( tv ); SvREFCNT_dec(pending_array); } OUTPUT: