X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9caf173e476622d309cc5653a83d224d05787cc7..22eeafc5748e8cb949138bd8323750d6e171d6b3:/src/simix/smx_global.cpp

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index cdad122f8a..11b654e4d7 100644
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -3,37 +3,20 @@
 /* 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 <boost/heap/fibonacci_heap.hpp>
-#include <functional>
-#include <memory>
-
-#include "src/internal_config.h"
-#include <csignal> /* Signal handling */
-#include <cstdlib>
-
-#include <xbt/functional.hpp>
-#include <xbt/utility.hpp>
-
+#include "mc/mc.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
-
-#include "smx_private.hpp"
-#include "src/surf/surf_interface.hpp"
-#include "src/surf/xml/platf.hpp"
-#include "xbt/ex.h" /* ex_backtrace_display */
-
-#include "mc/mc.h"
 #include "simgrid/sg_config.hpp"
-#include "src/mc/mc_replay.hpp"
-#include "src/surf/StorageImpl.hpp"
-
-#include "src/smpi/include/smpi_process.hpp"
-
-#include "src/kernel/activity/CommImpl.hpp"
-#include "src/kernel/activity/ExecImpl.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"
+#include "src/simix/smx_host_private.hpp"
+#include "src/smpi/include/smpi_process.hpp"
+#include "src/surf/StorageImpl.hpp"
+#include "src/surf/xml/platf.hpp"
 
 #if SIMGRID_HAVE_MC
 #include "src/mc/mc_private.hpp"
@@ -41,12 +24,13 @@
 #include "src/mc/remote/mc_protocol.h"
 #endif
 
-#include "src/mc/mc_record.hpp"
-
 #if HAVE_SMPI
 #include "src/smpi/include/private.hpp"
 #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)");
 
@@ -70,7 +54,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 ) {
@@ -112,7 +96,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 */
@@ -175,6 +159,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};
 }
 }
 
@@ -215,14 +201,14 @@ 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::on_platform_created.connect(SIMIX_post_create_environment);
     simgrid::s4u::Host::onCreation.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());
@@ -234,7 +220,7 @@ void SIMIX_global_init(int *argc, char **argv)
     });
   }
 
-  if (xbt_cfg_get_boolean("clean-atexit"))
+  if (simgrid::config::get_value<bool>("clean-atexit"))
     atexit(SIMIX_clean);
 
   if (_sg_cfg_exit_asap)
@@ -412,6 +398,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()) {
@@ -541,14 +537,17 @@ void SIMIX_run()
 
   if (not simix_global->process_list.empty()) {
 
-    TRACE_end();
-
-    XBT_CRITICAL("Oops ! Deadlock or code not perfectly clean.");
+    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.");
+    } else {
+      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();
 }
 
 /**