Inline another useless function in MC and a define symbol

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index 06fffc8..5bc5651 100644 (file)
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -9,24 +9,10 @@
 #include <simgrid/forward.h>
 #include <simgrid/modelchecker.h> /* our public interface (and definition of SIMGRID_HAVE_MC) */
 
-/* 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
 
 /********************************* Global *************************************/
 XBT_ATTRIB_NORETURN XBT_PUBLIC void MC_run();
-XBT_PRIVATE void MC_automaton_load(const char *file);
 
 SG_END_DECL
 

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index ee045bc..2c40c20 100644 (file)
--- a/src/mc/api.cpp
+++ b/src/mc/api.cpp
@@ -400,7 +400,10 @@ void Api::s_close() const
 
 void Api::automaton_load(const char* file) const
 {
-  MC_automaton_load(file);
+  if (simgrid::mc::property_automaton == nullptr)
+    simgrid::mc::property_automaton = xbt_automaton_new();
+
+  xbt_automaton_load(simgrid::mc::property_automaton, file);
 }
 
 std::vector<int> Api::automaton_propositional_symbol_evaluate() const

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 481a7fe..423dd14 100644 (file)
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -79,14 +79,6 @@ void MC_run()
   simgrid::mc::AppSide::get()->main_loop();
 }
 
-void MC_automaton_load(const char *file)
-{
-  if (simgrid::mc::property_automaton == nullptr)
-    simgrid::mc::property_automaton = xbt_automaton_new();
-
-  xbt_automaton_load(simgrid::mc::property_automaton, file);
-}
-
 namespace simgrid {
 namespace mc {
 

diff --git a/src/mc/mc_pattern.hpp b/src/mc/mc_pattern.hpp
index c7e4e6e..be02f98 100644 (file)
--- a/src/mc/mc_pattern.hpp
+++ b/src/mc/mc_pattern.hpp
@@ -7,6 +7,7 @@
 #define SIMGRID_MC_PATTERN_H
 
 #include "src/kernel/activity/CommImpl.hpp"
+#include "src/mc/remote/RemotePtr.hpp"
 
 namespace simgrid {
 namespace mc {