Count the size of the "effective names" of a hash.

This code is somewhat cheeky, making direct structure accesses.

diff --git a/CHANGES b/CHANGES
index 969b9fa..3915c41 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,7 @@ Revision history for Perl extension Devel::Size.
  * Split out HEK size calculation into hek_size(). Add the shared HE overhead.
  * Handle shared hash key scalars correctly.
  * GvNAME() is shared from 5.10 onwards.
- * Count HvNAME(), the HV "aux" struct, and the mro_meta struct.
+ * Count HvNAME(), the HV "aux" struct, the mro_meta struct, and ENAMEs.
 
 0.76 2011-05-11 nicholas
  * Just fix the version number in the line below.

diff --git a/Size.xs b/Size.xs
index 2d0fc53..1f22cb9 100644 (file)
--- a/Size.xs
+++ b/Size.xs
@@ -745,8 +745,24 @@ sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
     if (SvOOK(thing)) {
        /* This direct access is arguably "naughty": */
        struct mro_meta *meta = HvAUX(thing)->xhv_mro_meta;
+#if PERL_VERSION > 13 || PERL_SUBVERSION > 8
+       /* As is this: */
+       I32 count = HvAUX(thing)->xhv_name_count;
+
+       if (count) {
+           HEK **names = HvAUX(thing)->xhv_name_u.xhvnameu_names;
+           if (count < 0)
+               count = -count;
+           while (--count)
+               hek_size(aTHX_ st, names[count], 1);
+       }
+       else
+#endif
+       {
+           hek_size(aTHX_ st, HvNAME_HEK(thing), 1);
+       }
+
        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);