X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6db81e17ddbb49af0f135e8bec12274efab13e3d..95851f0825611446cc2425e9d02710ffa253f944:/src/simix/smx_global.cpp

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index e7e7070ce3..667e50aea7 100644
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -6,10 +6,11 @@
 #include "mc/mc.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
+
+#include "../kernel/activity/IoImpl.hpp"
 #include "simgrid/sg_config.hpp"
 #include "smx_private.hpp"
 #include "src/kernel/activity/SleepImpl.hpp"
-#include "src/kernel/activity/SynchroIo.hpp"
 #include "src/kernel/activity/SynchroRaw.hpp"
 #include "src/mc/mc_record.hpp"
 #include "src/mc/mc_replay.hpp"
@@ -29,6 +30,7 @@
 #endif
 
 #include <boost/heap/fibonacci_heap.hpp>
+#include <csignal>
 
 XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)");
@@ -53,7 +55,7 @@ public:
 
 void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr) = nullptr;
 
-int _sg_do_verbose_exit = 1;
+bool _sg_do_verbose_exit = true;
 static void inthandler(int)
 {
   if ( _sg_do_verbose_exit ) {
@@ -86,7 +88,7 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/)
   } else  if (siginfo->si_signo == SIGSEGV) {
     fprintf(stderr, "Segmentation fault.\n");
 #if HAVE_SMPI
-    if (smpi_enabled() && smpi_privatize_global_variables == SmpiPrivStrategies::None) {
+    if (smpi_enabled() && smpi_privatize_global_variables == SmpiPrivStrategies::NONE) {
 #if HAVE_PRIVATIZATION
       fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatization:yes.\n");
 #else
@@ -95,7 +97,7 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/)
     }
 #endif /* HAVE_SMPI */
   }
-  raise(signum);
+  std::raise(signum);
 }
 
 char sigsegv_stack[SIGSTKSZ];   /* alternate stack for SIGSEGV handler */
@@ -158,6 +160,8 @@ namespace simix {
 
 simgrid::xbt::signal<void()> onDeadlock;
 
+simgrid::config::Flag<double> breakpoint{"simix/breakpoint",
+                                         "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0};
 }
 }
 
@@ -198,26 +202,26 @@ void SIMIX_global_init(int *argc, char **argv)
     simgrid::kernel::actor::create_maestro(maestro_code);
 
     /* Prepare to display some more info when dying on Ctrl-C pressing */
-    signal(SIGINT, inthandler);
+    std::signal(SIGINT, inthandler);
 
 #ifndef _WIN32
     install_segvhandler();
 #endif
     /* register a function to be called by SURF after the environment creation */
     sg_platf_init();
-    simgrid::s4u::onPlatformCreated.connect(SIMIX_post_create_environment);
-    simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
+    simgrid::s4u::on_platform_created.connect(SIMIX_post_create_environment);
+    simgrid::s4u::Host::on_creation.connect([](simgrid::s4u::Host& host) {
       if (host.extension<simgrid::simix::Host>() == nullptr) // another callback to the same signal may have created it
         host.extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
     });
 
-    simgrid::surf::storageCreatedCallbacks.connect([](simgrid::surf::StorageImpl* storage) {
-      sg_storage_t s = simgrid::s4u::Storage::byName(storage->get_cname());
-      xbt_assert(s != nullptr, "Storage not found for name %s", storage->get_cname());
+    simgrid::s4u::Storage::on_creation.connect([](simgrid::s4u::Storage& storage) {
+      sg_storage_t s = simgrid::s4u::Storage::byName(storage.get_cname());
+      xbt_assert(s != nullptr, "Storage not found for name %s", storage.get_cname());
     });
   }
 
-  if (xbt_cfg_get_boolean("clean-atexit"))
+  if (simgrid::config::get_value<bool>("clean-atexit"))
     atexit(SIMIX_clean);
 
   if (_sg_cfg_exit_asap)
@@ -395,6 +399,16 @@ void SIMIX_run()
   do {
     XBT_DEBUG("New Schedule Round; size(queue)=%zu", simix_global->process_to_run.size());
 
+    if (simgrid::simix::breakpoint >= 0.0 && time >= simgrid::simix::breakpoint) {
+      XBT_DEBUG("Breakpoint reached (%g)", simgrid::simix::breakpoint.get());
+      simgrid::simix::breakpoint = -1.0;
+#ifdef SIGTRAP
+      std::raise(SIGTRAP);
+#else
+      std::raise(SIGABRT);
+#endif
+    }
+
     SIMIX_execute_tasks();
 
     while (not simix_global->process_to_run.empty()) {
@@ -524,8 +538,6 @@ void SIMIX_run()
 
   if (not simix_global->process_list.empty()) {
 
-    TRACE_end();
-
     if (simix_global->process_list.size() <= simix_global->daemons.size()) {
       XBT_CRITICAL("Oops! Daemon actors cannot do any blocking activity (communications, synchronization, etc) "
                    "once the simulation is over. Please fix your on_exit() functions.");
@@ -533,10 +545,10 @@ void SIMIX_run()
       XBT_CRITICAL("Oops! Deadlock or code not perfectly clean.");
     }
     SIMIX_display_process_status();
-    simgrid::s4u::onDeadlock();
+    simgrid::s4u::on_deadlock();
     xbt_abort();
   }
-  simgrid::s4u::onSimulationEnd();
+  simgrid::s4u::on_simulation_end();
 }
 
 /**
@@ -643,7 +655,7 @@ void SIMIX_display_process_status()
 
       XBT_INFO("Process %ld (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->pid,
                process->get_cname(), process->host->get_cname(), synchro_description, process->waiting_synchro.get(),
-               process->waiting_synchro->name.c_str(), (int)process->waiting_synchro->state);
+               process->waiting_synchro->name_.c_str(), (int)process->waiting_synchro->state_);
     }
     else {
       XBT_INFO("Process %ld (%s@%s)", process->pid, process->get_cname(), process->host->get_cname());