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

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index f79169b16a..e7e7070ce3 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 "simgrid/sg_config.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.h"
-#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 "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,12 @@
 #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>
+
 XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)");
 
@@ -103,7 +86,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 == SMPI_PRIVATIZE_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
@@ -229,8 +212,8 @@ void SIMIX_global_init(int *argc, char **argv)
     });
 
     simgrid::surf::storageCreatedCallbacks.connect([](simgrid::surf::StorageImpl* storage) {
-      sg_storage_t s = simgrid::s4u::Storage::byName(storage->getCname());
-      xbt_assert(s != nullptr, "Storage not found for name %s", storage->getCname());
+      sg_storage_t s = simgrid::s4u::Storage::byName(storage->get_cname());
+      xbt_assert(s != nullptr, "Storage not found for name %s", storage->get_cname());
     });
   }
 
@@ -496,7 +479,7 @@ void SIMIX_run()
       /* If only daemon processes remain, cancel their actions, mark them to die and reschedule them */
       if (simix_global->process_list.size() == simix_global->daemons.size())
         for (auto const& dmon : simix_global->daemons) {
-          XBT_DEBUG("Kill %s", dmon->getCname());
+          XBT_DEBUG("Kill %s", dmon->get_cname());
           SIMIX_process_kill(dmon, simix_global->maestro_process);
         }
     }
@@ -523,7 +506,7 @@ void SIMIX_run()
 
     /* Autorestart all process */
     for (auto const& host : host_that_restart) {
-      XBT_INFO("Restart processes on host %s", host->getCname());
+      XBT_INFO("Restart processes on host %s", host->get_cname());
       SIMIX_host_autorestart(host);
     }
     host_that_restart.clear();
@@ -543,7 +526,12 @@ void SIMIX_run()
 
     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();
     xbt_abort();
@@ -654,11 +642,11 @@ void SIMIX_display_process_status()
         synchro_description = "I/O";
 
       XBT_INFO("Process %ld (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->pid,
-               process->getCname(), process->host->getCname(), synchro_description, process->waiting_synchro.get(),
+               process->get_cname(), process->host->get_cname(), synchro_description, process->waiting_synchro.get(),
                process->waiting_synchro->name.c_str(), (int)process->waiting_synchro->state);
     }
     else {
-      XBT_INFO("Process %ld (%s@%s)", process->pid, process->getCname(), process->host->getCname());
+      XBT_INFO("Process %ld (%s@%s)", process->pid, process->get_cname(), process->host->get_cname());
     }
   }
 }