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 void sv_size(pTHX_ struct state *, const SV *const, bool recurse);
+
typedef enum {
OPc_NULL, /* 0 */
OPc_BASEOP, /* 1 */
}
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;
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);
+ 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);
- }
+ 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);
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);
+ sv_size(aTHX_ st, (SV *)basecop->cop_stash, TRUE);
}
if (check_new(st, basecop->cop_filegv)) {
- thing_size(aTHX_ (SV *)basecop->cop_filegv, st);
+ sv_size(aTHX_ st, (SV *)basecop->cop_filegv, TRUE);
}
#endif
#endif
static void
-thing_size(pTHX_ const SV * const orig_thing, struct state *st) {
+sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
+ const bool recurse) {
const SV *thing = orig_thing;
st->total_size += sizeof(SV);
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);
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
st->total_size += ((XPVIO *) SvANY(thing))->xpv_len;
if (check_new(st, CvSTASH(thing))) {
- thing_size(aTHX_ (SV *)CvSTASH(thing), st);
+ sv_size(aTHX_ st, (SV *)CvSTASH(thing), TRUE);
}
if (check_new(st, SvSTASH(thing))) {
- thing_size(aTHX_ (SV *)SvSTASH(thing), st);
+ sv_size(aTHX_ st, (SV *)SvSTASH(thing), TRUE);
}
if (check_new(st, CvGV(thing))) {
- thing_size(aTHX_ (SV *)CvGV(thing), st);
+ sv_size(aTHX_ st, (SV *)CvGV(thing), TRUE);
}
if (check_new(st, CvPADLIST(thing))) {
- thing_size(aTHX_ (SV *)CvPADLIST(thing), st);
+ sv_size(aTHX_ st, (SV *)CvPADLIST(thing), TRUE);
}
if (check_new(st, CvOUTSIDE(thing))) {
- thing_size(aTHX_ (SV *)CvOUTSIDE(thing), st);
+ 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, sv, TRUE);
}
} else {
op_size(aTHX_ CvSTART(thing), st);
st->total_size += GvNAMELEN(thing);
#ifdef GvFILE
/* Is there a file? */
- 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)) {
{
SV *generic_thing;
if ((generic_thing = (SV *)(GvGP(thing)->gp_sv))) {
- thing_size(aTHX_ generic_thing, st);
+ sv_size(aTHX_ st, generic_thing, TRUE);
}
if ((generic_thing = (SV *)(GvGP(thing)->gp_form))) {
- thing_size(aTHX_ generic_thing, st);
+ sv_size(aTHX_ st, generic_thing, TRUE);
}
if ((generic_thing = (SV *)(GvGP(thing)->gp_av))) {
- thing_size(aTHX_ generic_thing, st);
+ sv_size(aTHX_ st, generic_thing, TRUE);
}
if ((generic_thing = (SV *)(GvGP(thing)->gp_hv))) {
- thing_size(aTHX_ generic_thing, st);
+ sv_size(aTHX_ st, generic_thing, TRUE);
}
if ((generic_thing = (SV *)(GvGP(thing)->gp_egv))) {
- thing_size(aTHX_ generic_thing, st);
+ sv_size(aTHX_ st, generic_thing, TRUE);
}
if ((generic_thing = (SV *)(GvGP(thing)->gp_cv))) {
- thing_size(aTHX_ generic_thing, st);
+ sv_size(aTHX_ st, generic_thing, TRUE);
}
}
}
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);
+ sv_size(aTHX_ st, (SV *)CvPADLIST(thing), TRUE);
}
if (check_new(st, CvOUTSIDE(thing))) {
- thing_size(aTHX_ (SV *)CvOUTSIDE(thing), st);
+ sv_size(aTHX_ st, (SV *)CvOUTSIDE(thing), TRUE);
}
if (st->go_yell && !st->fm_whine) {
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);
+ sv_size(aTHX_ st, (SV *)((XPVIO *) SvANY(thing))->xio_top_gv, TRUE);
}
if (((XPVIO *) SvANY(thing))->xio_bottom_gv) {
- thing_size(aTHX_ (SV *)((XPVIO *) SvANY(thing))->xio_bottom_gv, st);
+ sv_size(aTHX_ st, (SV *)((XPVIO *) SvANY(thing))->xio_bottom_gv, TRUE);
}
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_fmt_gv, TRUE);
}
/* Only go trotting through the IO structures if they're really
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);
}
}
}
- thing_size(aTHX_ thing, st);
+ sv_size(aTHX_ st, thing, TRUE);
} else {
/* check_new() returned false: */
#ifdef DEVEL_SIZE_DEBUGGING