#include "XSUB.h"
#include "ppport.h"
+#ifndef PERL_COMBI_VERSION
+#define PERL_COMBI_VERSION (PERL_REVISION * 1000000 + PERL_VERSION * 1000 + \
+ PERL_SUBVERSION)
+#endif
+
/* Not yet in ppport.h */
#ifndef CvISXSUB
# define CvISXSUB(cv) (CvXSUB(cv) ? TRUE : FALSE)
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 */
+#if PERL_COMBI_VERSION > 5008008 || (!defined(MULTIPLICITY) && !defined(USE_THREADS))
+ /* 5.8.8 and earlier have an assert() macro that uses Perl_croak, hence
+ needs a my_perl under multiplicity. Similarly, under 5.005 threads
+ Perl_croak needs a thr. In both cases, just skip the assert. */
assert(bits == 16);
#endif
leaf_p = (U8 **)tv_p;
#ifdef OA_GVOP
, OPc_GVOP /* 13 */
#endif
+#ifdef OA_METHOP
+ , OPc_METHOP
+#endif
+#ifdef OA_UNOP_AUX
+ , OPc_UNAUXOP
+#endif
} opclass;
case OA_CONDOP: TAG;
return OPc_CONDOP;
#endif
+
+#ifdef OA_METHOP
+ case OA_METHOP: TAG;
+ return OPc_METHOP;
+#endif
+#ifdef OA_UNOP_AUX
+ case OA_UNOP_AUX: TAG;
+ return OPc_UNAUXOP;
+#endif
}
warn("Devel::Size: Can't determine class of operator %s, assuming BASEOP\n",
PL_op_name[o->op_type]);
#endif
#ifdef USE_ITHREADS
check_new_and_strlen(st, basecop->cop_file);
+#if PERL_VERSION < 17 || (PERL_VERSION == 17 && PERL_SUBVERSION == 0)
+ /* This pointer is owned by the COP, and freed with it. */
check_new_and_strlen(st, basecop->cop_stashpv);
#else
+ /* A per-interpreter pointer for this stash is allocated in
+ PL_stashpad. */
+ if (check_new(st, PL_stashpad + basecop->cop_stashoff))
+ st->total_size += sizeof(PL_stashpad[basecop->cop_stashoff]);
+#endif
+#else
sv_size(aTHX_ st, (SV *)basecop->cop_filegv, SOME_RECURSION);
#endif
}
TAG;break;
+#ifdef OA_METHOP
+ case OPc_METHOP: TAG;
+ st->total_size += sizeof(struct methop);
+ if (baseop->op_type == OP_METHOD)
+ op_size(aTHX_ ((UNOP *)baseop)->op_first, st);
+ else
+ sv_size(aTHX_ st, cMETHOPx_meth(baseop), SOME_RECURSION);
+#if PERL_VERSION*1000+PERL_SUBVERSION >= 21007
+ if (baseop->op_type == OP_METHOD_REDIR || baseop->op_type == OP_METHOD_REDIR_SUPER) {
+ SV *rclass = cMETHOPx_rclass(baseop);
+ if(SvTYPE(rclass) != SVt_PVHV)
+ sv_size(aTHX_ st, rclass, SOME_RECURSION);
+ }
+#endif
+ TAG;break;
+#endif
+#ifdef OA_UNOP_AUX
+ case OPc_UNAUXOP: TAG;
+ st->total_size += sizeof(struct unop_aux) + sizeof(UNOP_AUX_item) * (cUNOP_AUXx(baseop)->op_aux[-1].uv+1);
+ op_size(aTHX_ ((UNOP *)baseop)->op_first, st);
+ if (baseop->op_type == OP_MULTIDEREF) {
+ UNOP_AUX_item *items = cUNOP_AUXx(baseop)->op_aux;
+ UV actions = items->uv;
+ bool last = 0;
+ bool is_hash = 0;
+ while (!last) {
+ switch (actions & MDEREF_ACTION_MASK) {
+ case MDEREF_reload:
+ actions = (++items)->uv;
+ continue;
+ case MDEREF_HV_padhv_helem:
+ case MDEREF_HV_gvhv_helem:
+ case MDEREF_HV_gvsv_vivify_rv2hv_helem:
+ case MDEREF_HV_padsv_vivify_rv2hv_helem:
+ is_hash = 1;
+ case MDEREF_AV_padav_aelem:
+ case MDEREF_AV_gvav_aelem:
+ case MDEREF_AV_gvsv_vivify_rv2av_aelem:
+ case MDEREF_AV_padsv_vivify_rv2av_aelem:
+ ++items;
+ goto do_elem;
+ case MDEREF_HV_pop_rv2hv_helem:
+ case MDEREF_HV_vivify_rv2hv_helem:
+ is_hash = 1;
+ case MDEREF_AV_pop_rv2av_aelem:
+ case MDEREF_AV_vivify_rv2av_aelem:
+ do_elem:
+ switch (actions & MDEREF_INDEX_MASK) {
+ case MDEREF_INDEX_none:
+ last = 1;
+ break;
+ case MDEREF_INDEX_const:
+ ++items;
+ if (is_hash) {
+#ifdef USE_ITHREADS
+ SV *key = PAD_SVl(items->pad_offset);
+#else
+ SV *key = items->sv;
+#endif
+ sv_size(aTHX_ st, key, SOME_RECURSION);
+ }
+ break;
+ case MDEREF_INDEX_padsv:
+ case MDEREF_INDEX_gvsv:
+ ++items;
+ break;
+ }
+ if (actions & MDEREF_FLAG_last)
+ last = 1;
+ is_hash = 0;
+ break;
+ default:
+ last = 1;
+ break;
+ }
+ actions >>= MDEREF_SHIFT;
+ }
+ }
+ TAG;break;
+#endif
default:
TAG;break;
}
#endif
};
-#ifdef PadlistNAMES
+#if PERL_COMBI_VERSION < 5008001
+typedef AV PADLIST;
+#endif
+
static void
padlist_size(pTHX_ struct state *const st, const PADLIST * const padl,
const int recurse) {
+
+#if PERL_VERSION*1000+PERL_SUBVERSION >= 21007
+/* This is, as ever, excessively nosey with the implementation, and hence
+ fragile. */
SSize_t i;
+ const PADNAMELIST *pnl;
+
if (!check_new(st, padl))
return;
- /* This relies on PADNAMELIST and PAD being typedefed to AV. If that
- ever changes, this code will need an update. */
st->total_size += sizeof(PADLIST);
- sv_size(aTHX_ st, (SV*)PadlistNAMES(padl), recurse);
+
+ st->total_size += sizeof(PADNAMELIST);
+ pnl = PadlistNAMES(padl);
+ st->total_size += pnl->xpadnl_max * sizeof(PADNAME *);
+ i = PadnamelistMAX(pnl) + 1;
+ while (--i) {
+ const PADNAME *const pn =
+ PadnamelistARRAY(pnl)[i];
+ if (!pn || pn == &PL_padname_undef || pn == &PL_padname_const)
+ continue;
+ if (!check_new(st, pn))
+ continue;
+ st->total_size += STRUCT_OFFSET(struct padname_with_str, xpadn_str[0])
+ + PadnameLEN(pn) + 1;
+ }
+
i = PadlistMAX(padl) + 1;
st->total_size += sizeof(PAD*) * i;
while (--i)
sv_size(aTHX_ st, (SV*)PadlistARRAY(padl)[i], recurse);
-}
+
+#elif defined PadlistNAMES
+
+ SSize_t i;
+ if (!check_new(st, padl))
+ return;
+ st->total_size += sizeof(PADLIST);
+ sv_size(aTHX_ st, (SV*)PadlistNAMES(padl), TOTAL_SIZE_RECURSION);
+ i = PadlistMAX(padl) + 1;
+ st->total_size += sizeof(PAD*) * i;
+ while (--i)
+ sv_size(aTHX_ st, (SV*)PadlistARRAY(padl)[i], recurse);
+
#else
-static void
-padlist_size(pTHX_ struct state *const st, const AV * const padl,
- const int recurse) {
+
sv_size(aTHX_ st, (SV*)padl, recurse);
-}
+
#endif
+}
static void
sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
}
st->total_size += sizeof(SV) + body_sizes[type];
- if (type >= SVt_PVMG) {
+ if (SvMAGICAL(thing)) {
magic_size(aTHX_ thing, st);
}
case SVt_PVFM: TAG;
- padlist_size(aTHX_ st, CvPADLIST(thing), SOME_RECURSION);
+ if (PERL_VERSION*1000+PERL_SUBVERSION < 21006 || !CvISXSUB(thing))
+ padlist_size(aTHX_ st, CvPADLIST(thing), SOME_RECURSION);
sv_size(aTHX_ st, (SV *)CvOUTSIDE(thing), recurse);
if (st->go_yell && !st->fm_whine) {
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);
- padlist_size(aTHX_ st, CvPADLIST(thing), SOME_RECURSION);
+ if (PERL_VERSION*1000+PERL_SUBVERSION < 21006 || !CvISXSUB(thing))
+ padlist_size(aTHX_ st, CvPADLIST(thing), SOME_RECURSION);
sv_size(aTHX_ st, (SV *)CvOUTSIDE(thing), recurse);
if (CvISXSUB(thing)) {
sv_size(aTHX_ st, cv_const_sv((CV *)thing), recurse);
projects / p5sagit/Devel-Size.git / blobdiff