Remove a useless call in MC initialization

That's a very long time that we don't have two heap regions anymore.

diff --git a/MANIFEST.in b/MANIFEST.in
index 49d39f9..598c771 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2275,7 +2275,6 @@ include src/mc/mc_global.cpp
 include src/mc/mc_hash.cpp
 include src/mc/mc_hash.hpp
 include src/mc/mc_ignore.hpp
-include src/mc/mc_memory.cpp
 include src/mc/mc_mmu.hpp
 include src/mc/mc_private.hpp
 include src/mc/mc_record.cpp

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index a7d7917..1f1560a 100644 (file)
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -28,9 +28,6 @@ SG_BEGIN_DECL
 XBT_ATTRIB_NORETURN XBT_PUBLIC void MC_run();
 XBT_PRIVATE void MC_automaton_load(const char *file);
 
-/********************************* Memory *************************************/
-XBT_PUBLIC void MC_memory_init(); /* Initialize the memory subsystem */
-
 SG_END_DECL
 
 #ifdef __cplusplus

diff --git a/src/mc/mc_memory.cpp b/src/mc/mc_memory.cpp
deleted file mode 100644 (file)
index de7d62d..0000000
--- a/src/mc/mc_memory.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright (c) 2008-2020. 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 <sys/stat.h>
-#include <fcntl.h>
-
-#include "mc/mc.h"
-#include "src/mc/mc_private.hpp"
-#include "src/xbt/mmalloc/mmprivate.h"
-
-/* Initialize the model-checker memory subsystem */
-/* It creates the two heap regions: std_heap and mc_heap */
-void MC_memory_init()
-{
-  if (not malloc_use_mmalloc())
-    xbt_die("Model-checking support is not enabled: run with simgrid-mc.");
-}

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 1e2286c..624ee54 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -222,9 +222,6 @@ void surf_init(int *argc, char **argv)
   xbt_init(argc, argv);
 
   sg_config_init(argc, argv);
-
-  if (MC_is_active())
-    MC_memory_init();
 }
 
 void surf_exit()

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index b7bffa5..472a786 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -656,7 +656,6 @@ set(MC_SRC
   src/mc/mc_hash.cpp
   src/mc/mc_ignore.hpp
   src/mc/mc_record.cpp
-  src/mc/mc_memory.cpp
   src/mc/mc_private.hpp
   src/mc/mc_request.hpp
   src/mc/mc_request.cpp