Add option enable_modele-checking.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7765 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index f72fbf4..43ecd22 100644 (file)
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -60,6 +60,10 @@ if(enable_tracing)
        SET(HAVE_TRACING 1)
 endif(enable_tracing)
 
        SET(HAVE_TRACING 1)
 endif(enable_tracing)
 

+if(enable_model-checking)
+       SET(MMALLOC_WANT_OVERIDE_LEGACY 1)
+endif(enable_model-checking)
+

 if(enable_lua)
        exec_program("lua -v" OUTPUT_VARIABLE LUA_VERSION)
        string(REGEX MATCH "[0-9].[0-9].[0-9]" LUA_VERSION "${LUA_VERSION}")
 if(enable_lua)
        exec_program("lua -v" OUTPUT_VARIABLE LUA_VERSION)
        string(REGEX MATCH "[0-9].[0-9].[0-9]" LUA_VERSION "${LUA_VERSION}")

diff --git a/buildtools/Cmake/src/CMakeOption.txt b/buildtools/Cmake/src/CMakeOption.txt
index 2cd0927..7827bb6 100644 (file)
--- a/buildtools/Cmake/src/CMakeOption.txt
+++ b/buildtools/Cmake/src/CMakeOption.txt
@@ -24,7 +24,11 @@ option(enable_tracing "Tracing MSG (for now) simulations for visualization." off
 option(enable_coverage "Enable coverage." off)
 option(enable_memcheck "Enable memcheck." off)
 option(enable_print_message "Enable print message during config." off)
 option(enable_coverage "Enable coverage." off)
 option(enable_memcheck "Enable memcheck." off)
 option(enable_print_message "Enable print message during config." off)

+option(enable_model-checking "" off)

 
 

+mark_as_advanced(enable_coverage)
+mark_as_advanced(enable_memcheck)
+mark_as_advanced(enable_print_message)

 mark_as_advanced(BIBTEX2HTML_PATH)
 mark_as_advanced(LUA_LIB_PATH_1)                                                                                                                      
 mark_as_advanced(LUA_LIB_PATH_2)
 mark_as_advanced(BIBTEX2HTML_PATH)
 mark_as_advanced(LUA_LIB_PATH_1)                                                                                                                      
 mark_as_advanced(LUA_LIB_PATH_2)

diff --git a/buildtools/Cmake/src/c_gras_config.h.in b/buildtools/Cmake/src/c_gras_config.h.in
index eb89437..ef71eb1 100644 (file)
--- a/buildtools/Cmake/src/c_gras_config.h.in
+++ b/buildtools/Cmake/src/c_gras_config.h.in
@@ -1,6 +1,9 @@
 // <root>/buildtools/Cmake/src/c_gras_config.h.in is user-written.
 // With Cmake it creates <root>/src/gras_config.h
 
 // <root>/buildtools/Cmake/src/c_gras_config.h.in is user-written.
 // With Cmake it creates <root>/src/gras_config.h
 

+/* Set to true if enable_model-checking is true */
+#cmakedefine MMALLOC_WANT_OVERIDE_LEGACY @MMALLOC_WANT_OVERIDE_LEGACY@
+

 /* Define if building universal (internal helper macro) */
 #cmakedefine AC_APPLE_UNIVERSAL_BUILD @AC_APPLE_UNIVERSAL_BUILD@
 
 /* Define if building universal (internal helper macro) */
 #cmakedefine AC_APPLE_UNIVERSAL_BUILD @AC_APPLE_UNIVERSAL_BUILD@
 

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index f360550..d126d18 100644 (file)
--- a/src/xbt/mmalloc/mm_legacy.c
+++ b/src/xbt/mmalloc/mm_legacy.c
@@ -17,7 +17,6 @@ void mmalloc_set_current_heap(void *new_heap) {
   __mmalloc_current_heap=new_heap;
 }
 
   __mmalloc_current_heap=new_heap;
 }
 

-//#define MMALLOC_WANT_OVERIDE_LEGACY /* comment this when stuff goes horribly bad around memory allocation */

 #ifdef MMALLOC_WANT_OVERIDE_LEGACY
 void *malloc(size_t n) {
   void *ret = mmalloc(__mmalloc_current_heap, n);
 #ifdef MMALLOC_WANT_OVERIDE_LEGACY
 void *malloc(size_t n) {
   void *ret = mmalloc(__mmalloc_current_heap, n);