[gc] new uintval_fmt for size_t printf

memsize is unsigned for >2GB, and we need to print it properly. otherwise it will print a negative number >4GB in i386
parrot · Nov 8, 2014 · b20ff2b · b20ff2b
1 parent 08bb58b
commit b20ff2b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/config/auto/format.pm b/config/auto/format.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2003, Parrot Foundation.
+# Copyright (C) 2001-2003,2014, Parrot Foundation.
 
 =head1 NAME
 
@@ -32,7 +32,6 @@ sub runstep {
     my ( $self, $conf ) = @_;
 
     _set_intvalfmt($conf);
-
     _set_floatvalfmt_nvsize($conf);
 
     return 1;
@@ -55,7 +54,10 @@ sub _set_intvalfmt {
     else {
         die qq{Configure.pl:  Can't find a printf-style format specifier for type '$iv'\n};
     }
+    my $uvformat = $ivformat;
+    $uvformat =~ s/d$/u/;
     $conf->data->set( intvalfmt   => $ivformat );
+    $conf->data->set( uintvalfmt   => $uvformat );
 }
 
 sub _set_floatvalfmt_nvsize {

diff --git a/config/gen/config_h/config_h.in b/config/gen/config_h/config_h.in
@@ -149,7 +149,8 @@ typedef void DPOINTER;
 #define PARROT_HAS_ICU @has_icu@
 
 /* Int and float formats. */
-#define INTVAL_FMT "@intvalfmt@"
+#define UINTVAL_FMT  "@uintvalfmt@"
+#define INTVAL_FMT   "@intvalfmt@"
 #define FLOATVAL_FMT "@floatvalfmt@"
 
 #include "parrot/has_header.h"

diff --git a/src/platform/darwin/sysmem.c b/src/platform/darwin/sysmem.c
@@ -78,27 +78,27 @@ Parrot_sysmem_amount(PARROT_INTERP)
 #ifndef NDEBUG
     if (Interp_debug_TEST(interp, PARROT_MEM_STAT_DEBUG_FLAG)) {
         ori_memsize = memsize;
-        fprintf(stderr, "Free Memory: %ld\n", memsize);
+        fprintf(stderr, "Free Memory: "UINTVAL_FMT"\n", memsize);
     }
 #endif
 
 #if defined(PARROT_HAS_HEADER_SYSRESOURCE)
     if (getrlimit(RLIMIT_DATA, &rlim) == 0) {
-        if ((rlim.rlim_max != RLIM_INFINITY) && (rlim.rlim_max <  memsize))
+        if ((rlim.rlim_max != RLIM_INFINITY) && (rlim.rlim_max < memsize))
             memsize = rlim.rlim_max;
-        else if ((rlim.rlim_cur != RLIM_INFINITY) && (rlim.rlim_cur <  memsize))
+        else if ((rlim.rlim_cur != RLIM_INFINITY) && (rlim.rlim_cur < memsize))
             memsize = rlim.rlim_cur;
     }
     if (getrlimit(RLIMIT_RSS, &rlim) == 0) {
-        if ((rlim.rlim_max != RLIM_INFINITY) && (rlim.rlim_max <  memsize))
+        if ((rlim.rlim_max != RLIM_INFINITY) && (rlim.rlim_max < memsize))
             memsize = rlim.rlim_max;
-        else if ((rlim.rlim_cur != RLIM_INFINITY) && (rlim.rlim_cur <  memsize))
+        else if ((rlim.rlim_cur != RLIM_INFINITY) && (rlim.rlim_cur < memsize))
             memsize = rlim.rlim_cur;
     }
 #  ifndef NDEBUG
     if (Interp_debug_TEST(interp, PARROT_MEM_STAT_DEBUG_FLAG)
         && ori_memsize != memsize)
-        fprintf(stderr, "Memory via rlimit restricted to: %ld\n", memsize);
+        fprintf(stderr, "Memory via rlimit restricted to: "UINTVAL_FMT"\n", memsize);
 #  endif
 #endif
 

diff --git a/src/platform/generic/sysmem.c b/src/platform/generic/sysmem.c
@@ -77,6 +77,12 @@ Parrot_sysmem_amount(PARROT_INTERP)
      * doesn't probe for that yet.
      */
     memsize = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE);
+#  ifndef NDEBUG
+    if (Interp_debug_TEST(interp, PARROT_MEM_STAT_DEBUG_FLAG)) {
+        ori_memsize = memsize;
+        fprintf(stderr, "Free Memory: "UINTVAL_FMT"\n", memsize);
+    }
+#  endif
 
 #elif defined(PARROT_HAS_HEADER_SYSSYSCTL) && defined(CTL_HW) && \
     (defined(HW_MEMSIZE) || defined(HW_PHYSMEM))
@@ -115,7 +121,7 @@ Parrot_sysmem_amount(PARROT_INTERP)
 #  ifndef NDEBUG
     if (Interp_debug_TEST(interp, PARROT_MEM_STAT_DEBUG_FLAG)) {
         ori_memsize = memsize;
-        fprintf(stderr, "Free Memory: %ld\n", memsize);
+        fprintf(stderr, "Free Memory: "UINTVAL_FMT"\n", memsize);
     }
 #  endif
 #else
@@ -128,28 +134,28 @@ Parrot_sysmem_amount(PARROT_INTERP)
 #  ifndef NDEBUG
     if (Interp_debug_TEST(interp, PARROT_MEM_STAT_DEBUG_FLAG)) {
         ori_memsize = memsize;
-        fprintf(stderr, "Default Memory: %ld\n", memsize);
+        fprintf(stderr, "Default Memory: "UINTVAL_FMT"\n", memsize);
     }
 #  endif
 #endif
 
 #if defined(PARROT_HAS_HEADER_SYSRESOURCE)
     if (getrlimit(RLIMIT_DATA, &rlim) == 0) {
-        if ((rlim.rlim_max != RLIM_INFINITY) && (rlim.rlim_max <  memsize))
+        if ((rlim.rlim_max != RLIM_INFINITY) && (rlim.rlim_max < memsize))
             memsize = rlim.rlim_max;
-        else if ((rlim.rlim_cur != RLIM_INFINITY) && (rlim.rlim_cur <  memsize))
+        else if ((rlim.rlim_cur != RLIM_INFINITY) && (rlim.rlim_cur < memsize))
             memsize = rlim.rlim_cur;
     }
     if (getrlimit(RLIMIT_AS, &rlim) == 0) {
-        if ((rlim.rlim_max != RLIM_INFINITY) && (rlim.rlim_max <  memsize))
+        if ((rlim.rlim_max != RLIM_INFINITY) && (rlim.rlim_max < memsize))
             memsize = rlim.rlim_max;
-        else if ((rlim.rlim_cur != RLIM_INFINITY) && (rlim.rlim_cur <  memsize))
+        else if ((rlim.rlim_cur != RLIM_INFINITY) && (rlim.rlim_cur < memsize))
             memsize = rlim.rlim_cur;
     }
 #  ifndef NDEBUG
     if (Interp_debug_TEST(interp, PARROT_MEM_STAT_DEBUG_FLAG)
         && ori_memsize != memsize)
-        fprintf(stderr, "Memory via rlimit restricted to: %ld\n", memsize);
+        fprintf(stderr, "Memory via rlimit restricted to: "UINTVAL_FMT"\n", memsize);
 #  endif
 #endif