U8 **leaf_p;
U8 *leaf;
unsigned int i;
- void **tv_p;
+ void **tv_p = (void **) (st->tracking);
-
- if (NULL == p || NULL == st) return FALSE;
- tv_p = (void **) (st->tracking);
+ if (NULL == p) return FALSE;
TRY_TO_CATCH_SEGV {
const char c = *(const char *)p;
}
Safefree(st);
}
-static void thing_size(pTHX_ const SV *const, struct state *);
+static bool sv_size(pTHX_ struct state *, const SV *const, bool recurse);
+
typedef enum {
OPc_NULL, /* 0 */
OPc_BASEOP, /* 1 */
magic_pointer = SvMAGIC(thing);
/* Have we seen the magic pointer? */
- while (magic_pointer && check_new(st, magic_pointer)) {
+ 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)) {
+ if (check_new(st, magic_pointer->mg_virtual)) {
st->total_size += sizeof(MGVTBL);
}
}
static void
+check_new_and_strlen(struct state *st, const char *const p) {
+ if(check_new(st, p))
+ st->total_size += strlen(p);
+}
+
+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 */
}
static void
-op_size(pTHX_ const OP * const baseop, struct state *st) {
- TRY_TO_CATCH_SEGV {
- TAG;
- if (check_new(st, baseop->op_next)) {
- 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);
- if (check_new(st, cUNOPx(baseop)->op_first)) {
- op_size(aTHX_ cUNOPx(baseop)->op_first, st);
- }
- TAG;break;
- case OPc_BINOP: TAG;
- st->total_size += sizeof(struct binop);
- if (check_new(st, cBINOPx(baseop)->op_first)) {
- op_size(aTHX_ cBINOPx(baseop)->op_first, st);
- }
- if (check_new(st, cBINOPx(baseop)->op_last)) {
- op_size(aTHX_ cBINOPx(baseop)->op_last, st);
- }
- TAG;break;
- case OPc_LOGOP: TAG;
- st->total_size += sizeof(struct logop);
- if (check_new(st, cLOGOPx(baseop)->op_first)) {
- op_size(aTHX_ cBINOPx(baseop)->op_first, st);
- }
- if (check_new(st, cLOGOPx(baseop)->op_other)) {
- op_size(aTHX_ cLOGOPx(baseop)->op_other, st);
- }
- TAG;break;
- case OPc_LISTOP: TAG;
- st->total_size += sizeof(struct listop);
- if (check_new(st, cLISTOPx(baseop)->op_first)) {
- op_size(aTHX_ cLISTOPx(baseop)->op_first, st);
- }
- if (check_new(st, cLISTOPx(baseop)->op_last)) {
- op_size(aTHX_ cLISTOPx(baseop)->op_last, st);
- }
- TAG;break;
- case OPc_PMOP: TAG;
- st->total_size += sizeof(struct pmop);
- if (check_new(st, cPMOPx(baseop)->op_first)) {
- op_size(aTHX_ cPMOPx(baseop)->op_first, st);
- }
- if (check_new(st, cPMOPx(baseop)->op_last)) {
- op_size(aTHX_ cPMOPx(baseop)->op_last, st);
- }
+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)) {
- op_size(aTHX_ cPMOPx(baseop)->op_pmreplroot, st);
- }
- if (check_new(st, cPMOPx(baseop)->op_pmreplstart)) {
- op_size(aTHX_ cPMOPx(baseop)->op_pmreplstart, st);
- }
- if (check_new(st, cPMOPx(baseop)->op_pmnext)) {
- 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))))) {
- regex_size(PM_GETRE(cPMOPx(baseop)), st);
- }
+ regex_size(PM_GETRE(cPMOPx(baseop)), st);
#else
- if (check_new(st, cPMOPx(baseop)->op_pmregexp)) {
- regex_size(cPMOPx(baseop)->op_pmregexp, st);
- }
+ regex_size(cPMOPx(baseop)->op_pmregexp, st);
#endif
- TAG;break;
- case OPc_SVOP: TAG;
- st->total_size += sizeof(struct pmop);
- if (check_new(st, cSVOPx(baseop)->op_sv)) {
- thing_size(aTHX_ cSVOPx(baseop)->op_sv, st);
- }
- TAG;break;
+ TAG;break;
+ case OPc_SVOP: TAG;
+ st->total_size += sizeof(struct pmop);
+ sv_size(aTHX_ st, cSVOPx(baseop)->op_sv, TRUE);
+ TAG;break;
case OPc_PADOP: TAG;
st->total_size += sizeof(struct padop);
- TAG;break;
- case OPc_PVOP: TAG;
- if (check_new(st, cPVOPx(baseop)->op_pv)) {
- st->total_size += strlen(cPVOPx(baseop)->op_pv);
- }
- case OPc_LOOP: TAG;
- st->total_size += sizeof(struct loop);
- if (check_new(st, cLOOPx(baseop)->op_first)) {
- op_size(aTHX_ cLOOPx(baseop)->op_first, st);
- }
- if (check_new(st, cLOOPx(baseop)->op_last)) {
- op_size(aTHX_ cLOOPx(baseop)->op_last, st);
- }
- if (check_new(st, cLOOPx(baseop)->op_redoop)) {
- op_size(aTHX_ cLOOPx(baseop)->op_redoop, st);
- }
- if (check_new(st, cLOOPx(baseop)->op_nextop)) {
- op_size(aTHX_ cLOOPx(baseop)->op_nextop, st);
- }
- if (check_new(st, cLOOPx(baseop)->op_lastop)) {
- op_size(aTHX_ cLOOPx(baseop)->op_lastop, st);
- }
-
- TAG;break;
- case OPc_COP: TAG;
+ TAG;break;
+ case OPc_PVOP: TAG;
+ check_new_and_strlen(st, cPVOPx(baseop)->op_pv);
+ 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;
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)) {
- st->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)) {
- st->total_size += strlen(basecop->cop_file);
- }
- if (check_new(st, basecop->cop_stashpv)) {
- st->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)) {
- thing_size(aTHX_ (SV *)basecop->cop_stash, st);
- }
- if (check_new(st, basecop->cop_filegv)) {
- thing_size(aTHX_ (SV *)basecop->cop_filegv, st);
- }
+ sv_size(aTHX_ st, (SV *)basecop->cop_stash, TRUE);
+ sv_size(aTHX_ st, (SV *)basecop->cop_filegv, TRUE);
#endif
}
# define NEW_HEAD_LAYOUT
#endif
-static void
-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 bool recurse) {
const SV *thing = orig_thing;
+ if(!check_new(st, thing))
+ return FALSE;
+
st->total_size += sizeof(SV);
switch (SvTYPE(thing)) {
st->total_size += sizeof(IV);
# endif
#endif
+ if(recurse && SvROK(thing))
+ sv_size(aTHX_ st, SvRV_const(thing), TRUE);
TAG;break;
/* Is it a float? Like the int, it depends on purify */
case SVt_NV: TAG;
#ifndef NEW_HEAD_LAYOUT
st->total_size += sizeof(XRV);
#endif
+ if(recurse && SvROK(thing))
+ sv_size(aTHX_ st, SvRV_const(thing), TRUE);
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(SvROK(thing))
- thing_size(aTHX_ SvRV_const(thing), st);
+ if(recurse && SvROK(thing))
+ sv_size(aTHX_ st, SvRV_const(thing), TRUE);
else
st->total_size += SvLEN(thing);
TAG;break;
/* A string with an integer part? */
case SVt_PVIV: TAG;
st->total_size += sizeof(XPVIV);
- if(SvROK(thing))
- thing_size(aTHX_ SvRV_const(thing), st);
+ if(recurse && SvROK(thing))
+ sv_size(aTHX_ st, SvRV_const(thing), TRUE);
else
st->total_size += SvLEN(thing);
if(SvOOK(thing)) {
/* A scalar/string/reference with a float part? */
case SVt_PVNV: TAG;
st->total_size += sizeof(XPVNV);
- if(SvROK(thing))
- thing_size(aTHX_ SvRV_const(thing), st);
+ if(recurse && SvROK(thing))
+ sv_size(aTHX_ st, SvRV_const(thing), TRUE);
else
st->total_size += SvLEN(thing);
TAG;break;
case SVt_PVMG: TAG;
st->total_size += sizeof(XPVMG);
- if(SvROK(thing))
- thing_size(aTHX_ SvRV_const(thing), st);
+ if(recurse && SvROK(thing))
+ sv_size(aTHX_ st, SvRV_const(thing), TRUE);
else
st->total_size += SvLEN(thing);
magic_size(thing, st);
#if PERL_VERSION <= 8
case SVt_PVBM: TAG;
st->total_size += sizeof(XPVBM);
- if(SvROK(thing))
- thing_size(aTHX_ SvRV_const(thing), st);
+ if(recurse && SvROK(thing))
+ sv_size(aTHX_ st, SvRV_const(thing), TRUE);
else
st->total_size += SvLEN(thing);
magic_size(thing, st);
#endif
case SVt_PVLV: TAG;
st->total_size += sizeof(XPVLV);
- if(SvROK(thing))
- thing_size(aTHX_ SvRV_const(thing), st);
+ if(recurse && SvROK(thing))
+ sv_size(aTHX_ st, SvRV_const(thing), TRUE);
else
st->total_size += SvLEN(thing);
magic_size(thing, st);
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))) {
- thing_size(aTHX_ AvARYLEN(thing), st);
- }
- }
+ sv_size(aTHX_ st, AvARYLEN(thing), TRUE);
#endif
magic_size(thing, st);
TAG;break;
magic_size(thing, st);
st->total_size += ((XPVIO *) SvANY(thing))->xpv_len;
- if (check_new(st, CvSTASH(thing))) {
- thing_size(aTHX_ (SV *)CvSTASH(thing), st);
- }
- if (check_new(st, SvSTASH(thing))) {
- thing_size(aTHX_ (SV *)SvSTASH(thing), st);
- }
- if (check_new(st, CvGV(thing))) {
- thing_size(aTHX_ (SV *)CvGV(thing), st);
- }
- if (check_new(st, CvPADLIST(thing))) {
- thing_size(aTHX_ (SV *)CvPADLIST(thing), st);
- }
- if (check_new(st, CvOUTSIDE(thing))) {
- thing_size(aTHX_ (SV *)CvOUTSIDE(thing), st);
- }
+ sv_size(aTHX_ st, (SV *)CvSTASH(thing), TRUE);
+ sv_size(aTHX_ st, (SV *)SvSTASH(thing), TRUE);
+ sv_size(aTHX_ st, (SV *)CvGV(thing), TRUE);
+ sv_size(aTHX_ st, (SV *)CvPADLIST(thing), TRUE);
+ sv_size(aTHX_ st, (SV *)CvOUTSIDE(thing), TRUE);
if (CvISXSUB(thing)) {
- SV *sv = cv_const_sv((CV *)thing);
- if (sv) {
- thing_size(aTHX_ sv, st);
- }
+ sv_size(aTHX_ st, cv_const_sv((CV *)thing), TRUE);
} else {
- if (check_new(st, CvSTART(thing))) {
- op_size(aTHX_ CvSTART(thing), st);
- }
- if (check_new(st, CvROOT(thing))) {
- op_size(aTHX_ CvROOT(thing), st);
- }
+ op_size(aTHX_ CvSTART(thing), st);
+ op_size(aTHX_ CvROOT(thing), st);
}
TAG;break;
st->total_size += GvNAMELEN(thing);
#ifdef GvFILE
/* Is there a file? */
- if (GvFILE(thing)) {
- if (check_new(st, GvFILE(thing))) {
- st->total_size += strlen(GvFILE(thing));
- }
- }
+ check_new_and_strlen(st, GvFILE(thing));
#endif
/* Is there something hanging off the glob? */
if (GvGP(thing)) {
if (check_new(st, GvGP(thing))) {
- st->total_size += sizeof(GP);
- {
- SV *generic_thing;
- if ((generic_thing = (SV *)(GvGP(thing)->gp_sv))) {
- thing_size(aTHX_ generic_thing, st);
- }
- if ((generic_thing = (SV *)(GvGP(thing)->gp_form))) {
- thing_size(aTHX_ generic_thing, st);
- }
- if ((generic_thing = (SV *)(GvGP(thing)->gp_av))) {
- thing_size(aTHX_ generic_thing, st);
- }
- if ((generic_thing = (SV *)(GvGP(thing)->gp_hv))) {
- thing_size(aTHX_ generic_thing, st);
- }
- if ((generic_thing = (SV *)(GvGP(thing)->gp_egv))) {
- thing_size(aTHX_ generic_thing, st);
- }
- if ((generic_thing = (SV *)(GvGP(thing)->gp_cv))) {
- thing_size(aTHX_ generic_thing, st);
- }
- }
+ st->total_size += sizeof(GP);
+ sv_size(aTHX_ st, (SV *)(GvGP(thing)->gp_sv), TRUE);
+ sv_size(aTHX_ st, (SV *)(GvGP(thing)->gp_form), TRUE);
+ sv_size(aTHX_ st, (SV *)(GvGP(thing)->gp_av), TRUE);
+ sv_size(aTHX_ st, (SV *)(GvGP(thing)->gp_hv), TRUE);
+ sv_size(aTHX_ st, (SV *)(GvGP(thing)->gp_egv), TRUE);
+ sv_size(aTHX_ st, (SV *)(GvGP(thing)->gp_cv), TRUE);
}
}
TAG;break;
st->total_size += sizeof(XPVFM);
magic_size(thing, st);
st->total_size += ((XPVIO *) SvANY(thing))->xpv_len;
- if (check_new(st, CvPADLIST(thing))) {
- thing_size(aTHX_ (SV *)CvPADLIST(thing), st);
- }
- if (check_new(st, CvOUTSIDE(thing))) {
- thing_size(aTHX_ (SV *)CvOUTSIDE(thing), st);
- }
+ sv_size(aTHX_ st, (SV *)CvPADLIST(thing), TRUE);
+ sv_size(aTHX_ st, (SV *)CvOUTSIDE(thing), TRUE);
if (st->go_yell && !st->fm_whine) {
carp("Devel::Size: Calculated sizes for FMs are incomplete");
st->total_size += ((XPVIO *) SvANY(thing))->xpv_cur;
}
/* Some embedded char pointers */
- if (check_new(st, ((XPVIO *) SvANY(thing))->xio_top_name)) {
- st->total_size += strlen(((XPVIO *) SvANY(thing))->xio_top_name);
- }
- if (check_new(st, ((XPVIO *) SvANY(thing))->xio_fmt_name)) {
- st->total_size += strlen(((XPVIO *) SvANY(thing))->xio_fmt_name);
- }
- if (check_new(st, ((XPVIO *) SvANY(thing))->xio_bottom_name)) {
- st->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) {
- thing_size(aTHX_ (SV *)((XPVIO *) SvANY(thing))->xio_top_gv, st);
- }
- if (((XPVIO *) SvANY(thing))->xio_bottom_gv) {
- thing_size(aTHX_ (SV *)((XPVIO *) SvANY(thing))->xio_bottom_gv, st);
- }
- if (((XPVIO *) SvANY(thing))->xio_fmt_gv) {
- thing_size(aTHX_ (SV *)((XPVIO *) SvANY(thing))->xio_fmt_gv, st);
- }
+ sv_size(aTHX_ st, (SV *)((XPVIO *) SvANY(thing))->xio_top_gv, TRUE);
+ sv_size(aTHX_ st, (SV *)((XPVIO *) SvANY(thing))->xio_bottom_gv, TRUE);
+ sv_size(aTHX_ st, (SV *)((XPVIO *) SvANY(thing))->xio_fmt_gv, TRUE);
/* Only go trotting through the IO structures if they're really
trottable. If USE_PERLIO is defined we can do this. If
default:
warn("Devel::Size: Unknown variable type: %d encountered\n", SvTYPE(thing) );
}
+ return TRUE;
}
static struct state *
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);
return st;
}
}
#endif
- thing_size(aTHX_ thing, st);
+ sv_size(aTHX_ st, thing, FALSE);
RETVAL = st->total_size;
free_state(st);
}
while (av_len(pending_array) >= 0) {
thing = av_pop(pending_array);
/* Process it if we've not seen it */
- if (check_new(st, thing)) {
+ if (sv_size(aTHX_ st, thing, TRUE)) {
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;
TAG;break;
default:
TAG;break;
- }
}
-
- thing_size(aTHX_ thing, st);
} else {
/* check_new() returned false: */
#ifdef DEVEL_SIZE_DEBUGGING
projects / p5sagit/Devel-Size.git / blobdiff