Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / src / simix / smx_global.cpp

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index c03d20bdf325914b43266ff6b2b870f65602d060..3d2ec1d47a24a42c2f4255b228ac61dd70018442 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -17,9 +17,10 @@
 #include "src/mc/mc_record.hpp"
 #include "src/mc/mc_replay.hpp"
 #include "src/simix/smx_private.hpp"
-#include "src/surf/StorageImpl.hpp"
 #include "src/surf/xml/platf.hpp"
 
+#include "simgrid/kernel/resource/Model.hpp"
+
 #if SIMGRID_HAVE_MC
 #include "src/mc/remote/AppSide.hpp"
 #endif
@@ -87,8 +88,6 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/)
   std::raise(signum);
 }
 
-std::array<unsigned char, SIGSTKSZ> sigsegv_stack; /* alternate stack for SIGSEGV handler */
-
 /**
  * Install signal handler for SIGSEGV.  Check that nobody has already installed
  * its own handler.  For example, the Java VM does this.
@@ -136,14 +135,14 @@ namespace simix {
 Timer* Timer::set(double date, xbt::Task<void()>&& callback)
 {
   auto* timer    = new Timer(date, std::move(callback));
-  timer->handle_ = simix_timers.emplace(std::make_pair(date, timer));
+  timer->handle_ = simix_timers().emplace(std::make_pair(date, timer));
   return timer;
 }
 
 /** @brief cancels a timer that was added earlier */
 void Timer::remove()
 {
-  simix_timers.erase(handle_);
+  simix_timers().erase(handle_);
   delete this;
 }
 
@@ -308,7 +307,6 @@ void SIMIX_global_init(int *argc, char **argv)
     atexit(SIMIX_clean);
 }
 
-int smx_cleaned = 0;
 /**
  * @ingroup SIMIX_API
  * @brief Clean the SIMIX simulation
@@ -317,10 +315,11 @@ int smx_cleaned = 0;
  */
 void SIMIX_clean()
 {
+  static bool smx_cleaned = false;
   if (smx_cleaned)
     return; // to avoid double cleaning by java and C
 
-  smx_cleaned = 1;
+  smx_cleaned = true;
   XBT_DEBUG("SIMIX_clean called. Simulation's over.");
   if (not simix_global->actors_to_run.empty() && SIMIX_get_clock() <= 0.0) {
     XBT_CRITICAL("   ");
@@ -348,9 +347,9 @@ void SIMIX_clean()
   /* Exit the SIMIX network module */
   SIMIX_mailbox_exit();
 
-  while (not simgrid::simix::simix_timers.empty()) {
-    delete simgrid::simix::simix_timers.top().second;
-    simgrid::simix::simix_timers.pop();
+  while (not simgrid::simix::simix_timers().empty()) {
+    delete simgrid::simix::simix_timers().top().second;
+    simgrid::simix::simix_timers().pop();
   }
   /* Free the remaining data structures */
   simix_global->actors_to_run.clear();
@@ -394,11 +393,12 @@ double SIMIX_get_clock()
 static bool SIMIX_execute_timers()
 {
   bool result = false;
-  while (not simgrid::simix::simix_timers.empty() && SIMIX_get_clock() >= simgrid::simix::simix_timers.top().first) {
+  while (not simgrid::simix::simix_timers().empty() &&
+         SIMIX_get_clock() >= simgrid::simix::simix_timers().top().first) {
     result = true;
     // FIXME: make the timers being real callbacks (i.e. provide dispatchers that read and expand the args)
-    smx_timer_t timer = simgrid::simix::simix_timers.top().second;
-    simgrid::simix::simix_timers.pop();
+    smx_timer_t timer = simgrid::simix::simix_timers().top().second;
+    simgrid::simix::simix_timers().pop();
     timer->callback();
     delete timer;
   }
@@ -412,7 +412,7 @@ static bool SIMIX_execute_timers()
 void SIMIX_run()
 {
   if (MC_record_replay_is_active()) {
-    simgrid::mc::replay(MC_record_path);
+    simgrid::mc::replay(MC_record_path());
     return;
   }