X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/322e28c4503ed99d6c36ad9f450a3c0e515b4a8d..0c586d7f087b772253980cafd92796edcbd58c50:/src/kernel/EngineImpl.cpp diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp index bddc871701..3a8229bb7e 100644 --- a/src/kernel/EngineImpl.cpp +++ b/src/kernel/EngineImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2022. The SimGrid Team. All rights reserved. */ /* 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. */ @@ -12,13 +12,13 @@ #include "mc/mc.h" #include "src/kernel/EngineImpl.hpp" +#include "src/kernel/resource/StandardLinkImpl.hpp" #include "src/kernel/resource/profile/Profile.hpp" #include "src/mc/mc_record.hpp" #include "src/mc/mc_replay.hpp" #include "src/smpi/include/smpi_actor.hpp" -#include "src/surf/network_interface.hpp" #include "src/surf/xml/platf.hpp" -#include "xbt/xbt_modinter.h" /* whether initialization was already done */ +#include "xbt/xbt_modinter.h" /* whether initialization was already done */ #include #ifndef _WIN32 @@ -238,7 +238,7 @@ void EngineImpl::initialize(int* argc, char** argv) /* register a function to be called by SURF after the environment creation */ sg_platf_init(); - s4u::Engine::on_platform_created.connect([this]() { this->presolve(); }); + s4u::Engine::on_platform_created_cb([this]() { this->presolve(); }); if (config::get_value("debug/clean-atexit")) atexit(shutdown); @@ -248,7 +248,7 @@ void EngineImpl::context_mod_init() const { xbt_assert(not instance_->has_context_factory()); -#if HAVE_SMPI && (defined(__APPLE__) || defined(__NetBSD__)) +#if HAVE_SMPI && defined(__NetBSD__) smpi_init_options_internal(false); std::string priv = config::get_value("smpi/privatization"); if (context_factory_name == "thread" && (priv == "dlopen" || priv == "yes" || priv == "default" || priv == "1")) { @@ -329,12 +329,16 @@ void EngineImpl::shutdown() instance_->empty_trash(); /* Let's free maestro now */ - instance_->destroy_maestro(); + delete instance_->maestro_; + instance_->maestro_ = nullptr; /* Finish context module and SURF */ instance_->destroy_context_factory(); - timer::kernel_timers().clear(); + while (not timer::kernel_timers().empty()) { + delete timer::kernel_timers().top().second; + timer::kernel_timers().pop(); + } tmgr_finalize(); sg_platf_exit(); @@ -343,6 +347,15 @@ void EngineImpl::shutdown() instance_ = nullptr; } +void EngineImpl::seal_platform() const +{ + /* sealing resources before run: links */ + for (auto const& kv : links_) + kv.second->get_iface()->seal(); + /* seal netzone root, recursively seal children netzones, hosts and disks */ + netzone_root_->seal(); +} + void EngineImpl::load_platform(const std::string& platf) { double start = xbt_os_time(); @@ -412,16 +425,30 @@ void EngineImpl::wake_all_waiting_actors() const XBT_DEBUG("Handling the failed actions (if any)"); while (auto* action = model->extract_failed_action()) { XBT_DEBUG(" Handling Action %p", action); - if (action->get_activity() != nullptr) + if (action->get_activity() != nullptr) { + // If nobody told the interface that the activity has failed, that's because no actor waits on it (maestro + // started it). SimDAG I see you! + if (action->get_activity()->get_actor() == maestro_) + action->get_activity()->get_iface()->complete(s4u::Activity::State::FAILED); + activity::ActivityImplPtr(action->get_activity())->post(); + } } XBT_DEBUG("Handling the terminated actions (if any)"); while (auto* action = model->extract_done_action()) { XBT_DEBUG(" Handling Action %p", action); if (action->get_activity() == nullptr) XBT_DEBUG("probably vcpu's action %p, skip", action); - else + else { + // If nobody told the interface that the activity is finished, that's because no actor waits on it (maestro + // started it). SimDAG I see you! + action->get_activity()->set_finish_time(action->get_finish_time()); + + if (action->get_activity()->get_actor() == maestro_) + action->get_activity()->get_iface()->complete(s4u::Activity::State::FINISHED); + activity::ActivityImplPtr(action->get_activity())->post(); + } } } } @@ -669,15 +696,18 @@ double EngineImpl::solve(double max_date) const return time_delta; } -void EngineImpl::run() +void EngineImpl::run(double max_date) { + seal_platform(); + if (MC_record_replay_is_active()) { mc::replay(MC_record_path()); empty_trash(); return; } - double time = 0; + double elapsed_time = -1; + const std::set* vetoed_activities = s4u::Activity::get_vetoed_activities(); do { XBT_DEBUG("New Schedule Round; size(queue)=%zu", actors_to_run_.size()); @@ -781,13 +811,19 @@ void EngineImpl::run() } } - time = timer::Timer::next(); - if (time > -1.0 || not actor_list_.empty()) { - XBT_DEBUG("Calling solve"); - time = solve(time); - XBT_DEBUG("Moving time ahead : %g", time); + // Compute the max_date of the next solve. + // It's either when a timer occurs, or when user-specified deadline is reached, or -1 if none is given + double next_time = timer::Timer::next(); + if (next_time < 0 && max_date > -1) { + next_time = max_date; + } else if (next_time > -1 && max_date > -1) { // either both <0, or both >0 + next_time = std::min(next_time, max_date); } + XBT_DEBUG("Calling solve(%g) %g", next_time, NOW); + elapsed_time = solve(next_time); + XBT_DEBUG("Moving time ahead. NOW=%g; elapsed: %g", NOW, elapsed_time); + /* Notify all the hosts that have failed */ /* FIXME: iterate through the list of failed host and mark each of them */ /* as failed. On each host, signal all the running actors with host_fail */ @@ -804,9 +840,10 @@ void EngineImpl::run() /* Clean actors to destroy */ empty_trash(); - XBT_DEBUG("### time %f, #actors %zu, #to_run %zu", time, actor_list_.size(), actors_to_run_.size()); + XBT_DEBUG("### elapsed time %f, #actors %zu, #to_run %zu, #vetoed %d", elapsed_time, actor_list_.size(), + actors_to_run_.size(), (vetoed_activities == nullptr ? -1 : static_cast(vetoed_activities->size()))); - if (time < 0. && actors_to_run_.empty() && not actor_list_.empty()) { + if (elapsed_time < 0. && actors_to_run_.empty() && not actor_list_.empty()) { if (actor_list_.size() <= 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."); @@ -820,9 +857,10 @@ void EngineImpl::run() maestro_->kill(kv.second); } } - } while (time > -1.0 || has_actors_to_run()); + } while ((vetoed_activities == nullptr || vetoed_activities->empty()) && + ((elapsed_time > -1.0 && not double_equals(max_date, NOW, 0.00001)) || has_actors_to_run())); - if (not actor_list_.empty()) + if (not actor_list_.empty() && max_date < 0 && not(vetoed_activities == nullptr || vetoed_activities->empty())) THROW_IMPOSSIBLE; simgrid::s4u::Engine::on_simulation_end(); @@ -837,5 +875,5 @@ double EngineImpl::get_clock() void SIMIX_run() // XBT_ATTRIB_DEPRECATED_v332 { - simgrid::kernel::EngineImpl::get_instance()->run(); + simgrid::kernel::EngineImpl::get_instance()->run(-1); }