X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/76624269efc746ac7b9d89855ea9d26deff5ecee..7341151507abf1d7931e8ca2df777541b5f6bfe2:/src/simix/smx_global.cpp

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 9f09cc2b38..9d33439151 100644
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -155,7 +155,7 @@ double SIMIX_timer_next()
   return xbt_heap_size(simix_timers) > 0 ? xbt_heap_maxkey(simix_timers) : -1.0;
 }
 
-static void kill_process(smx_process_t process)
+static void kill_process(smx_actor_t process)
 {
   SIMIX_process_kill(process, nullptr);
 }
@@ -165,6 +165,8 @@ static std::function<void()> maestro_code;
 namespace simgrid {
 namespace simix {
 
+simgrid::xbt::signal<void(void)> onDeadlock;
+
 XBT_PUBLIC(void) set_maestro(std::function<void()> code)
 {
   maestro_code = std::move(code);
@@ -197,8 +199,8 @@ void SIMIX_global_init(int *argc, char **argv)
     simix_global = std::unique_ptr<simgrid::simix::Global>(new simgrid::simix::Global());
 
     simgrid::simix::ActorImpl proc;
-    simix_global->process_to_run = xbt_dynar_new(sizeof(smx_process_t), nullptr);
-    simix_global->process_that_ran = xbt_dynar_new(sizeof(smx_process_t), nullptr);
+    simix_global->process_to_run = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
+    simix_global->process_that_ran = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
     simix_global->process_list = xbt_swag_new(xbt_swag_offset(proc, process_hookup));
     simix_global->process_to_destroy = xbt_swag_new(xbt_swag_offset(proc, destroy_hookup));
     simix_global->maestro_process = nullptr;
@@ -334,7 +336,7 @@ double SIMIX_get_clock()
 
 static int process_syscall_color(void *p)
 {
-  switch ((*(smx_process_t *)p)->simcall.call) {
+  switch ((*(smx_actor_t *)p)->simcall.call) {
   case SIMCALL_NONE:
   case SIMCALL_PROCESS_KILL:
     return 2;
@@ -348,15 +350,13 @@ static int process_syscall_color(void *p)
 /** Wake up all processes waiting for a Surf action to finish */
 static void SIMIX_wake_processes()
 {
-  unsigned int iter;
-  surf_model_t model;
   surf_action_t action;
 
-  xbt_dynar_foreach(all_existing_models, iter, model) {
+  for(auto model : *all_existing_models) {
     XBT_DEBUG("Handling the processes whose action failed (if any)");
     while ((action = surf_model_extract_failed_action_set(model))) {
       XBT_DEBUG("   Handling Action %p",action);
-      SIMIX_simcall_exit((smx_synchro_t) action->getData());
+      SIMIX_simcall_exit((smx_activity_t) action->getData());
     }
     XBT_DEBUG("Handling the processes whose action terminated normally (if any)");
     while ((action = surf_model_extract_done_action_set(model))) {
@@ -364,7 +364,7 @@ static void SIMIX_wake_processes()
       if (action->getData() == nullptr)
         XBT_DEBUG("probably vcpu's action %p, skip", action);
       else
-        SIMIX_simcall_exit((smx_synchro_t) action->getData());
+        SIMIX_simcall_exit((smx_activity_t) action->getData());
     }
   }
 }
@@ -427,7 +427,7 @@ void SIMIX_run()
   }
 
   double time = 0;
-  smx_process_t process;
+  smx_actor_t process;
 
   do {
     XBT_DEBUG("New Schedule Round; size(queue)=%lu", xbt_dynar_length(simix_global->process_to_run));
@@ -533,24 +533,26 @@ void SIMIX_run()
     } while (again);
 
     /* Autorestart all process */
-    char *hostname = nullptr;
-    unsigned int iter;
-    xbt_dynar_foreach(host_that_restart,iter,hostname) {
-      XBT_INFO("Restart processes on host: %s",hostname);
-      SIMIX_host_autorestart(sg_host_by_name(hostname));
+    for (auto host: host_that_restart) {
+      XBT_INFO("Restart processes on host: %s", sg_host_get_name(host));
+      SIMIX_host_autorestart(host);
     }
-    xbt_dynar_reset(host_that_restart);
+    host_that_restart.clear();
 
     /* Clean processes to destroy */
     SIMIX_process_empty_trash();
 
     XBT_DEBUG("### time %f, empty %d", time, xbt_dynar_is_empty(simix_global->process_to_run));
 
+    if (xbt_dynar_is_empty(simix_global->process_to_run) &&
+        xbt_swag_size(simix_global->process_list) != 0)
+    simgrid::simix::onDeadlock();
+
   } while (time > -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run));
 
   if (xbt_swag_size(simix_global->process_list) != 0) {
 
-  TRACE_end();
+    TRACE_end();
 
     XBT_CRITICAL("Oops ! Deadlock or code not perfectly clean.");
     SIMIX_display_process_status();
@@ -636,7 +638,7 @@ void SIMIX_display_process_status()
     return;
   }
 
-  smx_process_t process = nullptr;
+  smx_actor_t process = nullptr;
   int nbprocess = xbt_swag_size(simix_global->process_list);
 
   XBT_INFO("%d processes are still running, waiting for something.", nbprocess);