X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Size.xs;h=2d0fc53b76f3c3c67a8bf627a26a81bd93dad6ab;hb=78037efb12f431d87eb4f21faead41323add6ef9;hp=9dd4f0df1eb7bc1cb7410ee2d3180998aed55138;hpb=fd495cc6d914df3af995a850cc8dd2561d4331b5;p=p5sagit%2FDevel-Size.git

diff --git a/Size.xs b/Size.xs
index 9dd4f0d..2d0fc53 100644
--- a/Size.xs
+++ b/Size.xs
@@ -17,6 +17,17 @@
 #ifndef SvOOK_offset
 #  define SvOOK_offset(sv, len) STMT_START { len = SvIVX(sv); } STMT_END
 #endif
+#ifndef SvIsCOW
+#  define SvIsCOW(sv)           ((SvFLAGS(sv) & (SVf_FAKE | SVf_READONLY)) == \
+                                    (SVf_FAKE | SVf_READONLY))
+#endif
+#ifndef SvIsCOW_shared_hash
+#  define SvIsCOW_shared_hash(sv)   (SvIsCOW(sv) && SvLEN(sv) == 0)
+#endif
+#ifndef SvSHARED_HEK_FROM_PV
+#  define SvSHARED_HEK_FROM_PV(pvx) \
+        ((struct hek*)(pvx - STRUCT_OFFSET(struct hek, hek_key)))
+#endif
 
 #if PERL_VERSION < 6
 #  define PL_opargs opargs
@@ -525,6 +536,29 @@ op_size(pTHX_ const OP * const baseop, struct state *st)
   }
 }
 
+static void
+hek_size(pTHX_ struct state *st, HEK *hek, U32 shared)
+{
+    /* Hash keys can be shared. Have we seen this before? */
+    if (!check_new(st, hek))
+	return;
+    st->total_size += HEK_BASESIZE + hek->hek_len
+#if PERL_VERSION < 8
+	+ 1 /* No hash key flags prior to 5.8.0  */
+#else
+	+ 2
+#endif
+	;
+    if (shared) {
+#if PERL_VERSION < 10
+	st->total_size += sizeof(struct he);
+#else
+	st->total_size += STRUCT_OFFSET(struct shared_he, shared_he_hek);
+#endif
+    }
+}
+
+
 #if PERL_VERSION < 8 || PERL_SUBVERSION < 9
 #  define SVt_LAST 16
 #endif
@@ -700,18 +734,37 @@ sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
         cur_entry = *(HvARRAY(thing) + cur_bucket);
         while (cur_entry) {
           st->total_size += sizeof(HE);
-          if (cur_entry->hent_hek) {
-            /* Hash keys can be shared. Have we seen this before? */
-            if (check_new(st, cur_entry->hent_hek)) {
-              st->total_size += HEK_BASESIZE + cur_entry->hent_hek->hek_len + 2;
-            }
-          }
+	  hek_size(aTHX_ st, cur_entry->hent_hek, HvSHAREKEYS(thing));
 	  if (recurse >= TOTAL_SIZE_RECURSION)
 	      sv_size(aTHX_ st, HeVAL(cur_entry), recurse);
           cur_entry = cur_entry->hent_next;
         }
       }
     }
+#ifdef HvAUX
+    if (SvOOK(thing)) {
+	/* This direct access is arguably "naughty": */
+	struct mro_meta *meta = HvAUX(thing)->xhv_mro_meta;
+	st->total_size += sizeof(struct xpvhv_aux);
+	hek_size(aTHX_ st, HvNAME_HEK(thing), 1);
+	if (meta) {
+	    st->total_size += sizeof(struct mro_meta);
+	    sv_size(aTHX_ st, (SV *)meta->mro_nextmethod, TOTAL_SIZE_RECURSION);
+#if PERL_VERSION > 10 || (PERL_VERSION == 10 && PERL_SUBVERSION > 0)
+	    sv_size(aTHX_ st, (SV *)meta->isa, TOTAL_SIZE_RECURSION);
+#endif
+#if PERL_VERSION > 10
+	    sv_size(aTHX_ st, (SV *)meta->mro_linear_all, TOTAL_SIZE_RECURSION);
+	    sv_size(aTHX_ st, meta->mro_linear_current, TOTAL_SIZE_RECURSION);
+#else
+	    sv_size(aTHX_ st, (SV *)meta->mro_linear_dfs, TOTAL_SIZE_RECURSION);
+	    sv_size(aTHX_ st, (SV *)meta->mro_linear_c3, TOTAL_SIZE_RECURSION);
+#endif
+	}
+    }
+#else
+    check_new_and_strlen(st, HvNAME_get(thing));
+#endif
     TAG;break;
 
 
@@ -765,8 +818,14 @@ sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
 
   case SVt_PVGV: TAG;
     if(isGV_with_GP(thing)) {
+#ifdef GvNAME_HEK
+	hek_size(aTHX_ st, GvNAME_HEK(thing), 1);
+#else	
 	st->total_size += GvNAMELEN(thing);
-#ifdef GvFILE
+#endif
+#ifdef GvFILE_HEK
+	hek_size(aTHX_ st, GvFILE_HEK(thing), 1);
+#elif defined(GvFILE)
 #  if !defined(USE_ITHREADS) || (PERL_VERSION > 8 || (PERL_VERSION == 8 && PERL_SUBVERSION > 8))
 	/* With itreads, before 5.8.9, this can end up pointing to freed memory
 	   if the GV was created in an eval, as GvFILE() points to CopFILE(),
@@ -802,6 +861,8 @@ sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
   freescalar:
     if(recurse && SvROK(thing))
 	sv_size(aTHX_ st, SvRV_const(thing), recurse);
+    else if (SvIsCOW_shared_hash(thing))
+	hek_size(aTHX_ st, SvSHARED_HEK_FROM_PV(SvPVX(thing)), 1);
     else
 	st->total_size += SvLEN(thing);