Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / src / kernel / EngineImpl.cpp

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 3d4b00e..00d0f16 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -32,8 +32,7 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(ker_engine, "Logging specific to Engine (kernel)");
 
-namespace simgrid {
-namespace kernel {
+namespace simgrid::kernel {
 double EngineImpl::now_           = 0.0;
 EngineImpl* EngineImpl::instance_ = nullptr; /* That singleton is awful too. */
 
@@ -61,8 +60,8 @@ static inline std::string contexts_list()
 {
   std::string res;
   std::string sep = "";
-  for (auto const& factory : context_factories) {
-    res += sep + factory.first;
+  for (auto const& [factory_name, _] : context_factories) {
+    res += sep + factory_name;
     sep = ", ";
   }
   return res;
@@ -72,8 +71,7 @@ static config::Flag<std::string> context_factory_name("contexts/factory",
                                                       (std::string("Possible values: ") + contexts_list()).c_str(),
                                                       context_factories.begin()->first);
 
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel
 
 XBT_ATTRIB_NORETURN static void inthandler(int)
 {
@@ -108,7 +106,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_cfg_privatization() == SmpiPrivStrategies::NONE) {
+    if (SMPI_is_inited() && smpi_cfg_privatization() == SmpiPrivStrategies::NONE) {
 #if HAVE_PRIVATIZATION
       fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatization:yes.\n");
 #else
@@ -160,18 +158,17 @@ static void install_segvhandler()
 
 #endif /* _WIN32 */
 
-namespace simgrid {
-namespace kernel {
+namespace simgrid::kernel {
 
 EngineImpl::~EngineImpl()
 {
   /* Also delete the other data */
   delete netzone_root_;
-  for (auto const& kv : netpoints_)
-    delete kv.second;
+  for (auto const& [_, netpoint] : netpoints_)
+    delete netpoint;
 
-  for (auto const& kv : mailboxes_)
-    delete kv.second;
+  for (auto const& [_, mailbox] : mailboxes_)
+    delete mailbox;
 
   /* Kill all actors (but maestro) */
   maestro_->kill_all();
@@ -251,9 +248,9 @@ void EngineImpl::context_mod_init() const
     return;
   }
   /* use the factory specified by --cfg=contexts/factory:value */
-  for (auto const& factory : context_factories)
-    if (context_factory_name == factory.first) {
-      instance_->set_context_factory(factory.second());
+  for (auto const& [factory_name, factory] : context_factories)
+    if (context_factory_name == factory_name) {
+      instance_->set_context_factory(factory());
       break;
     }
 
@@ -287,7 +284,7 @@ void EngineImpl::shutdown()
   XBT_DEBUG("EngineImpl::shutdown() called. Simulation's over.");
 #if HAVE_SMPI
   if (not instance_->actor_list_.empty()) {
-    if (smpi_process()->initialized()) {
+    if (smpi_process() && smpi_process()->initialized()) {
       xbt_die("Process exited without calling MPI_Finalize - Killing simulation");
     } else {
       XBT_WARN("Process called exit when leaving - Skipping cleanups");
@@ -376,7 +373,7 @@ void EngineImpl::add_model(std::shared_ptr<resource::Model> model, const std::ve
   xbt_assert(models_prio_.find(model_name) == models_prio_.end(),
              "Model %s already exists, use model.set_name() to change its name", model_name.c_str());
 
-  for (const auto dep : dependencies) {
+  for (const auto* dep : dependencies) {
     xbt_assert(models_prio_.find(dep->get_name()) != models_prio_.end(),
                "Model %s doesn't exists. Impossible to use it as dependency.", dep->get_name().c_str());
   }
@@ -436,10 +433,7 @@ void EngineImpl::run_all_actors()
 actor::ActorImpl* EngineImpl::get_actor_by_pid(aid_t pid)
 {
   auto item = actor_list_.find(pid);
-  if (item != actor_list_.end())
-    return item->second;
-
-  return nullptr; // Not found
+  return item == actor_list_.end() ? nullptr : item->second;
 }
 
 void EngineImpl::remove_daemon(actor::ActorImpl* actor)
@@ -479,9 +473,7 @@ void EngineImpl::display_all_actor_status() const
   XBT_INFO("%zu actors are still running, waiting for something.", actor_list_.size());
   /*  List the actors and their state */
   XBT_INFO("Legend of the following listing: \"Actor <pid> (<name>@<host>): <status>\"");
-  for (auto const& kv : actor_list_) {
-    const actor::ActorImpl* actor = kv.second;
-
+  for (auto const& [_, actor] : actor_list_) {
     if (actor->waiting_synchro_) {
       const char* synchro_description = "unknown";
 
@@ -593,6 +585,8 @@ double EngineImpl::solve(double max_date) const
     XBT_DEBUG("Updating models (min = %g, NOW = %g, next_event_date = %g)", time_delta, now_, next_event_date);
 
     while (auto* event = profile::future_evt_set.pop_leq(next_event_date, &value, &resource)) {
+      if(value<0)
+             continue;
       if (resource->is_used() || (watched_hosts().find(resource->get_cname()) != watched_hosts().end())) {
         time_delta = next_event_date - now_;
         XBT_DEBUG("This event invalidates the next_occurring_event() computation of models. Next event set to %f",
@@ -730,9 +724,9 @@ void EngineImpl::run(double max_date)
       }
       display_all_actor_status();
       simgrid::s4u::Engine::on_deadlock();
-      for (auto const& kv : actor_list_) {
-        XBT_DEBUG("Kill %s", kv.second->get_cname());
-        maestro_->kill(kv.second);
+      for (auto const& [_, actor] : actor_list_) {
+        XBT_DEBUG("Kill %s", actor->get_cname());
+        maestro_->kill(actor);
       }
     }
   } while ((vetoed_activities == nullptr || vetoed_activities->empty()) &&
@@ -748,5 +742,4 @@ double EngineImpl::get_clock()
 {
   return now_;
 }
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel