X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/045bf104a7636aa01369758fdcd2a5497404910f..f2df13795e01302813a6aef10825ec7e922ce530:/teshsuite/xbt/mmalloc_test.c

diff --git a/teshsuite/xbt/mmalloc_test.c b/teshsuite/xbt/mmalloc_test.c
index 40eab84b98..b9a074c648 100644
--- a/teshsuite/xbt/mmalloc_test.c
+++ b/teshsuite/xbt/mmalloc_test.c
@@ -1,3 +1,9 @@
+/* Copyright (c) 2012-2014. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 #include "xbt/mmalloc.h"
 #include "xbt.h"
 #include <stdio.h>
@@ -21,7 +27,9 @@ int main(int argc, char**argv)
   xbt_init(&argc,argv);
 
   XBT_INFO("Allocating a new heap");
-  heapA = xbt_mheap_new(-1, ((char*)sbrk(0)) + BUFFSIZE);
+  unsigned long mask = ~((unsigned long)xbt_pagesize - 1);
+  void *addr = (void*)(((unsigned long)sbrk(0) + BUFFSIZE) & mask);
+  heapA = xbt_mheap_new(-1, addr);
   if (heapA == NULL) {
     perror("attach 1 failed");
     fprintf(stderr, "bye\n");
@@ -34,13 +42,17 @@ int main(int argc, char**argv)
   for (i = 0; i < TESTSIZE; i++) {
     size = size_of_block(i);
     pointers[i] = mmalloc(heapA, size);
-    XBT_INFO("%d bytes allocated with offset %zu", size, ((char*)pointers[i])-((char*)heapA));
+    XBT_INFO("%d bytes allocated with offset %tx", size, ((char*)pointers[i])-((char*)heapA));
   }
   XBT_INFO("All blocks were correctly allocated. Free every second block");
   for (i = 0; i < TESTSIZE; i+=2) {
-    size = size_of_block(i);
     mfree(heapA,pointers[i]);
   }
+  XBT_INFO("Memset every second block to zero (yeah, they are not currently allocated :)");
+  for (i = 0; i < TESTSIZE; i+=2) {
+    size = size_of_block(i);
+    memset(pointers[i],0, size);
+  }
   XBT_INFO("Re-allocate every second block");
   for (i = 0; i < TESTSIZE; i+=2) {
     size = size_of_block(i);