handle the multideref op, and to a limited extent UNOP_AUX in general.

[p5sagit/Devel-Size.git] / Size.xs

diff --git a/Size.xs b/Size.xs
index f06f85e..840a49d 100644 (file)
--- a/Size.xs
+++ b/Size.xs
@@ -215,6 +215,12 @@ typedef enum {
 #ifdef OA_GVOP
     , OPc_GVOP /* 13 */
 #endif
+#ifdef OA_METHOP
+    , OPc_METHOP
+#endif
+#ifdef OA_UNOP_AUX
+    , OPc_UNAUXOP
+#endif
 
 } opclass;
 
@@ -337,6 +343,15 @@ cc_opclass(const OP * const o)
         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]);
@@ -518,14 +533,98 @@ op_size(pTHX_ const OP * const baseop, struct state *st)
 #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
-         sv_size(aTHX_ st, (SV *)basecop->cop_stash, SOME_RECURSION);
+         /* 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)
+               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);
+           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;
       }
@@ -700,7 +799,7 @@ 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);
   }