X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Size.xs;h=5b8aba81d5ae2774982d0d56a19c6ba1affae996;hb=3d18ea100b25c1e19400763b0ce5a34aa8083af6;hp=a2e30b1455420a966062a4947b64231374d18647;hpb=0914842a8e0fe4df89aa9a872dc6d2ddd414cd86;p=p5sagit%2FDevel-Size.git

diff --git a/Size.xs b/Size.xs
index a2e30b1..5b8aba8 100644
--- a/Size.xs
+++ b/Size.xs
@@ -1,3 +1,5 @@
+/* -*- mode: C -*- */
+
 #define PERL_NO_GET_CONTEXT
 
 #include "EXTERN.h"
@@ -16,6 +18,11 @@
 #  define SvOOK_offset(sv, len) STMT_START { len = SvIVX(sv); } STMT_END
 #endif
 
+#if PERL_VERSION < 6
+#  define PL_opargs opargs
+#  define PL_op_name op_name
+#endif
+
 #ifdef _MSC_VER 
 /* "structured exception" handling is a Microsoft extension to C and C++.
    It's *not* C++ exception handling - C++ exception handling can't capture
@@ -141,7 +148,7 @@ free_tracking_at(void **tv, int level)
 	/* Nodes */
 	do {
 	    if (tv[i]) {
-		free_tracking_at(tv[i], level);
+		free_tracking_at((void **) tv[i], level);
 		Safefree(tv[i]);
 	    }
 	} while (i--);
@@ -176,7 +183,7 @@ free_state(struct state *st)
 #define SOME_RECURSION 1
 #define TOTAL_SIZE_RECURSION 2
 
-static bool sv_size(pTHX_ struct state *, const SV *const, const int recurse);
+static void sv_size(pTHX_ struct state *, const SV *const, const int recurse);
 
 typedef enum {
     OPc_NULL,   /* 0 */
@@ -191,6 +198,13 @@ typedef enum {
     OPc_PVOP,   /* 9 */
     OPc_LOOP,   /* 10 */
     OPc_COP /* 11 */
+#ifdef OA_CONDOP
+    , OPc_CONDOP /* 12 */
+#endif
+#ifdef OA_GVOP
+    , OPc_GVOP /* 13 */
+#endif
+
 } opclass;
 
 static opclass
@@ -236,9 +250,17 @@ cc_opclass(const OP * const o)
         case OA_SVOP: TAG;
         return OPc_SVOP;
 
+#ifdef OA_PADOP
         case OA_PADOP: TAG;
         return OPc_PADOP;
+#endif
+
+#ifdef OA_GVOP
+        case OA_GVOP: TAG;
+        return OPc_GVOP;
+#endif
 
+#ifdef OA_PVOP_OR_SVOP
         case OA_PVOP_OR_SVOP: TAG;
             /*
              * Character translations (tr///) are usually a PVOP, keeping a 
@@ -249,6 +271,7 @@ cc_opclass(const OP * const o)
              */
         return (o->op_private & (OPpTRANS_TO_UTF|OPpTRANS_FROM_UTF))
             ? OPc_SVOP : OPc_PVOP;
+#endif
 
         case OA_LOOP: TAG;
         return OPc_LOOP;
@@ -298,6 +321,11 @@ cc_opclass(const OP * const o)
             return OPc_BASEOP;
         else
             return OPc_PVOP;
+
+#ifdef OA_CONDOP
+        case OA_CONDOP: TAG;
+	    return OPc_CONDOP;
+#endif
         }
         warn("Devel::Size: Can't determine class of operator %s, assuming BASEOP\n",
          PL_op_name[o->op_type]);
@@ -390,37 +418,45 @@ op_size(pTHX_ const OP * const baseop, struct state *st)
 	    TAG;break;
 	case OPc_UNOP: TAG;
 	    st->total_size += sizeof(struct unop);
-	    op_size(aTHX_ cUNOPx(baseop)->op_first, st);
+	    op_size(aTHX_ ((UNOP *)baseop)->op_first, st);
 	    TAG;break;
 	case OPc_BINOP: TAG;
 	    st->total_size += sizeof(struct binop);
-	    op_size(aTHX_ cBINOPx(baseop)->op_first, st);
-	    op_size(aTHX_ cBINOPx(baseop)->op_last, st);
+	    op_size(aTHX_ ((BINOP *)baseop)->op_first, st);
+	    op_size(aTHX_ ((BINOP *)baseop)->op_last, st);
 	    TAG;break;
 	case OPc_LOGOP: TAG;
 	    st->total_size += sizeof(struct logop);
-	    op_size(aTHX_ cBINOPx(baseop)->op_first, st);
-	    op_size(aTHX_ cLOGOPx(baseop)->op_other, st);
+	    op_size(aTHX_ ((BINOP *)baseop)->op_first, st);
+	    op_size(aTHX_ ((LOGOP *)baseop)->op_other, st);
 	    TAG;break;
+#ifdef OA_CONDOP
+	case OPc_CONDOP: TAG;
+	    st->total_size += sizeof(struct condop);
+	    op_size(aTHX_ ((BINOP *)baseop)->op_first, st);
+	    op_size(aTHX_ ((CONDOP *)baseop)->op_true, st);
+	    op_size(aTHX_ ((CONDOP *)baseop)->op_false, st);
+	    TAG;break;
+#endif
 	case OPc_LISTOP: TAG;
 	    st->total_size += sizeof(struct listop);
-	    op_size(aTHX_ cLISTOPx(baseop)->op_first, st);
-	    op_size(aTHX_ cLISTOPx(baseop)->op_last, st);
+	    op_size(aTHX_ ((LISTOP *)baseop)->op_first, st);
+	    op_size(aTHX_ ((LISTOP *)baseop)->op_last, st);
 	    TAG;break;
 	case OPc_PMOP: TAG;
 	    st->total_size += sizeof(struct pmop);
-	    op_size(aTHX_ cPMOPx(baseop)->op_first, st);
-	    op_size(aTHX_ cPMOPx(baseop)->op_last, st);
+	    op_size(aTHX_ ((PMOP *)baseop)->op_first, st);
+	    op_size(aTHX_ ((PMOP *)baseop)->op_last, st);
 #if PERL_VERSION < 9 || (PERL_VERSION == 9 && PERL_SUBVERSION < 5)
-	    op_size(aTHX_ cPMOPx(baseop)->op_pmreplroot, st);
-	    op_size(aTHX_ cPMOPx(baseop)->op_pmreplstart, st);
+	    op_size(aTHX_ ((PMOP *)baseop)->op_pmreplroot, st);
+	    op_size(aTHX_ ((PMOP *)baseop)->op_pmreplstart, st);
 #endif
 	    /* This is defined away in perl 5.8.x, but it is in there for
 	       5.6.x */
 #ifdef PM_GETRE
-	    regex_size(PM_GETRE(cPMOPx(baseop)), st);
+	    regex_size(PM_GETRE((PMOP *)baseop), st);
 #else
-	    regex_size(cPMOPx(baseop)->op_pmregexp, st);
+	    regex_size(((PMOP *)baseop)->op_pmregexp, st);
 #endif
 	    TAG;break;
 	case OPc_SVOP: TAG;
@@ -428,22 +464,30 @@ op_size(pTHX_ const OP * const baseop, struct state *st)
 	    if (!(baseop->op_type == OP_AELEMFAST
 		  && baseop->op_flags & OPf_SPECIAL)) {
 		/* not an OP_PADAV replacement */
-		sv_size(aTHX_ st, cSVOPx(baseop)->op_sv, SOME_RECURSION);
+		sv_size(aTHX_ st, ((SVOP *)baseop)->op_sv, SOME_RECURSION);
 	    }
 	    TAG;break;
+#ifdef OA_PADOP
       case OPc_PADOP: TAG;
 	  st->total_size += sizeof(struct padop);
 	  TAG;break;
+#endif
+#ifdef OA_GVOP
+      case OPc_GVOP: TAG;
+	  st->total_size += sizeof(struct gvop);
+	  sv_size(aTHX_ st, ((GVOP *)baseop)->op_gv, SOME_RECURSION);
+	  TAG;break;
+#endif
 	case OPc_PVOP: TAG;
-	    check_new_and_strlen(st, cPVOPx(baseop)->op_pv);
+	    check_new_and_strlen(st, ((PVOP *)baseop)->op_pv);
 	    TAG;break;
 	case OPc_LOOP: TAG;
 	    st->total_size += sizeof(struct loop);
-	    op_size(aTHX_ cLOOPx(baseop)->op_first, st);
-	    op_size(aTHX_ cLOOPx(baseop)->op_last, st);
-	    op_size(aTHX_ cLOOPx(baseop)->op_redoop, st);
-	    op_size(aTHX_ cLOOPx(baseop)->op_nextop, st);
-	    op_size(aTHX_ cLOOPx(baseop)->op_lastop, st);
+	    op_size(aTHX_ ((LOOP *)baseop)->op_first, st);
+	    op_size(aTHX_ ((LOOP *)baseop)->op_last, st);
+	    op_size(aTHX_ ((LOOP *)baseop)->op_redoop, st);
+	    op_size(aTHX_ ((LOOP *)baseop)->op_nextop, st);
+	    op_size(aTHX_ ((LOOP *)baseop)->op_lastop, st);
 	    TAG;break;
 	case OPc_COP: TAG;
         {
@@ -481,6 +525,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
@@ -582,19 +649,19 @@ const U8 body_sizes[SVt_LAST] = {
 #endif
 };
 
-static bool
+static void
 sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
 	const int recurse) {
   const SV *thing = orig_thing;
   U32 type;
 
   if(!check_new(st, thing))
-      return FALSE;
+      return;
 
   type = SvTYPE(thing);
   if (type > SVt_LAST) {
       warn("Devel::Size: Unknown variable type: %d encountered\n", type);
-      return TRUE;
+      return;
   }
   st->total_size += sizeof(SV) + body_sizes[type];
 
@@ -656,12 +723,7 @@ 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;
@@ -769,7 +831,7 @@ sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
     TAG;break;
 
   }
-  return TRUE;
+  return;
 }
 
 static struct state *
@@ -789,6 +851,9 @@ new_state(pTHX)
     check_new(st, &PL_sv_undef);
     check_new(st, &PL_sv_no);
     check_new(st, &PL_sv_yes);
+#if PERL_VERSION > 8 || (PERL_VERSION == 8 && PERL_SUBVERSION > 0)
+    check_new(st, &PL_sv_placeholder);
+#endif
     return st;
 }