X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d1428a44b2e13f8c22afcb04c3315b6adbe6be85..b60613a2c7267d689bc14020155ea38efc8135f9:/src/simix/smx_global.cpp

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 4f05ede58c..bb06cae843 100644
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -158,14 +158,12 @@ static void kill_process(smx_actor_t process)
 namespace simgrid {
 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};
 }
 }
 
-static std::function<void()> maestro_code;
+static simgrid::simix::ActorCode maestro_code;
 void SIMIX_set_maestro(void (*code)(void*), void* data)
 {
 #ifdef _WIN32
@@ -531,9 +529,6 @@ void SIMIX_run()
     XBT_DEBUG("### time %f, #processes %zu, #to_run %zu", time, simix_global->process_list.size(),
               simix_global->process_to_run.size());
 
-    if (simix_global->process_to_run.empty() && not simix_global->process_list.empty())
-      simgrid::simix::onDeadlock();
-
   } while (time > -1.0 || not simix_global->process_to_run.empty());
 
   if (not simix_global->process_list.empty()) {
@@ -562,7 +557,7 @@ void SIMIX_run()
  */
 smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg)
 {
-  smx_timer_t timer = new s_smx_timer_t(date, simgrid::xbt::makeTask([callback, arg]() { callback(arg); }));
+  smx_timer_t timer = new s_smx_timer_t(date, simgrid::xbt::make_task([callback, arg]() { callback(arg); }));
   timer->handle_    = simix_timers.emplace(std::make_pair(date, timer));
   return timer;
 }