2011-05-18 Ivan Maidanski <ivmai@mail.ru>

	* include/private/gcconfig.h (MPROTECT_VDB): Undefine if PROC_VDB.
	* tests/test.c (NUMBER_ROUND_UP): New macro.
	* tests/test.c (check_heap_stats): Round up total expected heap
	size to the nearest 4 MiB bound.
	* tests/test.c (check_heap_stats): Print the current and expected
	heap sizes in case of failure.

diff --git a/ChangeLog b/ChangeLog
index 2bf045674291409159bebc518b9359019ac45b13..88fefdc96a377a2be3a3dc61b9a6a240ffad0dd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-18  Ivan Maidanski  <ivmai@mail.ru>
+
+       * include/private/gcconfig.h (MPROTECT_VDB): Undefine if PROC_VDB.
+       * tests/test.c (NUMBER_ROUND_UP): New macro.
+       * tests/test.c (check_heap_stats): Round up total expected heap
+       size to the nearest 4 MiB bound.
+       * tests/test.c (check_heap_stats): Print the current and expected
+       heap sizes in case of failure.
+
 2011-05-18  Ivan Maidanski  <ivmai@mail.ru>
 
        * checksums.c (GC_check_blocks, GC_check_dirty): Do log printing

diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index 9e277e5b05e3e8ba81655d3fd62924ff17149189..9052d22e4040bcde49a6cb316b3575a63f8bb215 100644 (file)
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -2399,6 +2399,11 @@
   /* #undef GWW_VDB - handled in os_dep.c       */
 #endif
 
+#ifdef PROC_VDB
+  /* Multi-VDB mode is not implemented. */
+# undef MPROTECT_VDB
+#endif
+
 #if !defined(PCR_VDB) && !defined(PROC_VDB) && !defined(MPROTECT_VDB) \
     && !defined(GWW_VDB) && !defined(GC_DISABLE_INCREMENTAL)
 # define DEFAULT_VDB

diff --git a/tests/test.c b/tests/test.c
index 63a105270190ee0e6d44d1136c8a4e3f6e83af21..b844b63c1ccd61b3661d4f131b95d5919e30a04b 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -1236,6 +1236,8 @@ void run_one_test(void)
       GC_log_printf("Finished %p\n", &start_time);
 }
 
+#define NUMBER_ROUND_UP(v, bound) ((((v) + (bound) - 1) / (bound)) * (bound))
+
 void check_heap_stats(void)
 {
     size_t max_heap_sz;
@@ -1271,6 +1273,10 @@ void check_heap_stats(void)
                 max_heap_sz += max_heap_sz * SAVE_CALL_COUNT/4;
 #           endif
 #       endif
+#   endif
+    max_heap_sz *= n_tests;
+#   ifdef USE_MMAP
+      max_heap_sz = NUMBER_ROUND_UP(max_heap_sz, 4 * 1024 * 1024);
 #   endif
     /* Garbage collect repeatedly so that all inaccessible objects      */
     /* can be finalized.                                                */
@@ -1337,8 +1343,11 @@ void check_heap_stats(void)
       GC_printf("Incorrect execution - missed some allocations\n");
       FAIL;
     }
-    if (GC_get_heap_size() + GC_get_unmapped_bytes() > max_heap_sz*n_tests) {
-        GC_printf("Unexpected heap growth - collector may be broken\n");
+    if (GC_get_heap_size() + GC_get_unmapped_bytes() > max_heap_sz) {
+        GC_printf("Unexpected heap growth - collector may be broken"
+                  " (heapsize: %lu, expected: %u)\n",
+            (unsigned long)(GC_get_heap_size() + GC_get_unmapped_bytes()),
+            max_heap_sz);
         FAIL;
     }
 #   ifdef THREADS