if(enable_model-checking AND HAVE_MMALLOC)
SET(HAVE_MC 1)
- SET(MMALLOC_WANT_OVERRIDE_LEGACY 1)
include(FindLibunwind)
include(FindLibdw)
else()
endif()
SET(HAVE_MC 0)
SET(HAVE_MMALLOC 0)
- SET(MMALLOC_WANT_OVERRIDE_LEGACY 0)
endif()
if(enable_smpi)
return heap;
}
-#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
+/* Override the malloc-like functions if MC is activated at compile time */
+#ifdef HAVE_MC
/* ***** Temporary allocator
*
mfree(mdp, p);
UNLOCK(mdp);
}
-#endif /* WANT_MALLOC_OVERRIDE */
+#endif /* HAVE_MC */
#include "xbt/misc.h"
#include "simgrid_config.h"
-#include "src/internal_config.h" /* MMALLOC_WANT_OVERRIDE_LEGACY */
+#include "src/internal_config.h" /* HAVE_MC */
#include "src/portable.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
xbt_dynar_free(&xbt_cmdline);
xbt_log_postexit();
free(xbt_binary_name);
-#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
+#ifdef HAVE_MC
mmalloc_postexit();
#endif
}
endif()
endif()
-if(MMALLOC_WANT_OVERRIDE_LEGACY AND HAVE_GNU_LD)
+if(HAVE_MC AND HAVE_GNU_LD)
SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl")
endif()
#cmakedefine HAVE_GETDTABLESIZE @HAVE_GETDTABLESIZE@ /* getdtablesize: get descriptor table size */
#cmakedefine HAVE_MMALLOC @HAVE_MMALLOC@ /* Did we compile mmalloc in? */
#cmakedefine HAVE_PROCESS_VM_READV @HAVE_PROCESS_VM_READV@ /* process_vm_readv: transfer data between process address spaces */
-#cmakedefine MMALLOC_WANT_OVERRIDE_LEGACY @MMALLOC_WANT_OVERRIDE_LEGACY@ /* Set to true if enable_model-checking is true */
-#cmakedefine HAVE_MC @HAVE_MC@
+#cmakedefine HAVE_MC @HAVE_MC@ /* Set to true if enable_model-checking is true and the dependencies available */
/* SMPI variables */
#cmakedefine HAVE_SMPI @HAVE_SMPI@