From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Fri, 21 Mar 2014 14:42:53 +0000 (+0100)
Subject: [mc] Avoid heap collisions by using a bigger gap bewteen the two heaps
X-Git-Tag: v3_11~199^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/232b13fd2102c08d7793560bc02e9c25c3ba2070?ds=sidebyside

[mc] Avoid heap collisions by using a bigger gap bewteen the two heaps
---

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index d7a6973f6c..80f71466b0 100644
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -17,7 +17,22 @@
 #include "xbt/automaton.h"
 #include "xbt/dynar.h"
 
-#define STD_HEAP_SIZE   (50*1024*1024)        /* Maximum size of the system's heap */
+/* Maximum size of the application heap.
+ *
+ * The model-checker heap is placed at this offset from the
+ * beginning of the application heap.
+ *
+ * In the current implementation, if the application uses more
+ * than this for the application heap the application heap will
+ * smash the beginning of the model-checker heap and bad things
+ * will happen.
+ *
+ * For 64 bits systems, we have a lot of virtual memory available
+ * so we wan use a much bigger value in order to avoid bad things
+ * from happening.
+ * */
+
+#define STD_HEAP_SIZE   (sizeof(void*)<=4 ? (100*1024*1024) : (1ll*1024*1024*1024*1024))
 
 SG_BEGIN_DECL()