X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a3d21ecd742b7936526f2dac34396b564ac17cf7..af0640ca0c4912e2b7d495a7a13233a16b79c54f:/src/kernel/EngineImpl.cpp diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp index 7dcaf9bbb5..04f762e416 100644 --- a/src/kernel/EngineImpl.cpp +++ b/src/kernel/EngineImpl.cpp @@ -10,9 +10,6 @@ #include #include -#define SIMIX_H_NO_DEPRECATED_WARNING // avoid deprecation warning on include (remove with XBT_ATTRIB_DEPRECATED_v332) -#include - #include "mc/mc.h" #include "src/kernel/EngineImpl.hpp" #include "src/kernel/resource/StandardLinkImpl.hpp" @@ -21,6 +18,7 @@ #include "src/mc/mc_replay.hpp" #include "src/smpi/include/smpi_actor.hpp" #include "src/surf/xml/platf.hpp" +#include "xbt/module.h" #include "xbt/xbt_modinter.h" /* whether initialization was already done */ #include @@ -32,19 +30,18 @@ #include "src/mc/remote/AppSide.hpp" #endif -double NOW = 0; - XBT_LOG_NEW_DEFAULT_CATEGORY(ker_engine, "Logging specific to Engine (kernel)"); namespace simgrid { namespace kernel { +double EngineImpl::now_ = 0.0; EngineImpl* EngineImpl::instance_ = nullptr; /* That singleton is awful too. */ config::Flag cfg_breakpoint{"debug/breakpoint", "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0}; config::Flag cfg_verbose_exit{"debug/verbose-exit", "Display the actor status at exit", true}; -constexpr std::initializer_list> context_factories = { +constexpr std::initializer_list> context_factories = { #if HAVE_RAW_CONTEXTS {"raw", &context::raw_factory}, #endif @@ -185,7 +182,15 @@ EngineImpl::~EngineImpl() for (auto const& kv : mailboxes_) delete kv.second; - /* Free the remaining data structures */ + /* Kill all actors (but maestro) */ + maestro_->kill_all(); + run_all_actors(); + empty_trash(); + + delete maestro_; + delete context_factory_; + + /* Free the remaining data structures */ #if SIMGRID_HAVE_MC xbt_dynar_free(&actors_vector_); #endif @@ -250,8 +255,8 @@ void EngineImpl::context_mod_init() const #endif /* select the context factory to use to create the contexts */ - if (context::factory_initializer != nullptr) { // Give Java a chance to hijack the factory mechanism - instance_->set_context_factory(context::factory_initializer()); + if (context::ContextFactory::initializer) { // Give Java a chance to hijack the factory mechanism + instance_->set_context_factory(context::ContextFactory::initializer()); return; } /* use the factory specified by --cfg=contexts/factory:value */ @@ -307,18 +312,6 @@ void EngineImpl::shutdown() xbt_die("Bailing out to avoid that stop-before-start madness. Please fix your code."); } - /* Kill all actors (but maestro) */ - instance_->maestro_->kill_all(); - instance_->run_all_actors(); - instance_->empty_trash(); - - /* Let's free maestro now */ - delete instance_->maestro_; - instance_->maestro_ = nullptr; - - /* Finish context module and SURF */ - instance_->destroy_context_factory(); - while (not timer::kernel_timers().empty()) { delete timer::kernel_timers().top().second; timer::kernel_timers().pop(); @@ -349,7 +342,7 @@ void EngineImpl::seal_platform() const void EngineImpl::load_platform(const std::string& platf) { double start = xbt_os_time(); - if (boost::algorithm::ends_with(platf, ".so") or boost::algorithm::ends_with(platf, ".dylib")) { + if (boost::algorithm::ends_with(platf, ".so") || boost::algorithm::ends_with(platf, ".dylib")) { #ifdef _WIN32 xbt_die("loading platform through shared library isn't supported on windows"); #else @@ -540,7 +533,7 @@ void EngineImpl::presolve() const XBT_DEBUG("Consume all trace events occurring before the starting time."); double next_event_date; while ((next_event_date = profile::future_evt_set.next_date()) != -1.0) { - if (next_event_date > NOW) + if (next_event_date > now_) break; double value = -1.0; @@ -553,7 +546,7 @@ void EngineImpl::presolve() const XBT_DEBUG("Set every models in the right state by updating them to 0."); for (auto const& model : models_) - model->update_actions_state(NOW, 0.0); + model->update_actions_state(now_, 0.0); } double EngineImpl::solve(double max_date) const @@ -563,9 +556,9 @@ double EngineImpl::solve(double max_date) const resource::Resource* resource = nullptr; if (max_date != -1.0) { - xbt_assert(max_date >= NOW, "You asked to simulate up to %f, but that's in the past already", max_date); + xbt_assert(max_date >= now_, "You asked to simulate up to %f, but that's in the past already", max_date); - time_delta = max_date - NOW; + time_delta = max_date - now_; } XBT_DEBUG("Looking for next event in all models"); @@ -573,7 +566,7 @@ double EngineImpl::solve(double max_date) const if (not model->next_occurring_event_is_idempotent()) { continue; } - double next_event = model->next_occurring_event(NOW); + double next_event = model->next_occurring_event(now_); if ((time_delta < 0.0 || next_event < time_delta) && next_event >= 0.0) { time_delta = next_event; } @@ -594,9 +587,9 @@ double EngineImpl::solve(double max_date) const continue; if (next_event_date != -1.0) { - time_delta = std::min(next_event_date - NOW, time_delta); + time_delta = std::min(next_event_date - now_, time_delta); } else { - time_delta = std::max(next_event_date - NOW, time_delta); // Get the positive component + time_delta = std::max(next_event_date - now_, time_delta); // Get the positive component } XBT_DEBUG("Run the NS3 network at most %fs", time_delta); @@ -608,29 +601,29 @@ double EngineImpl::solve(double max_date) const time_delta = model_next_action_end; } - if (next_event_date < 0.0 || (next_event_date > NOW + time_delta)) { + if (next_event_date < 0.0 || (next_event_date > now_ + time_delta)) { // next event may have already occurred or will after the next resource change, then bail out XBT_DEBUG("no next usable TRACE event. Stop searching for it"); break; } - XBT_DEBUG("Updating models (min = %g, NOW = %g, next_event_date = %g)", time_delta, NOW, next_event_date); + 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 (resource->is_used() || (watched_hosts().find(resource->get_cname()) != watched_hosts().end())) { - time_delta = next_event_date - NOW; + time_delta = next_event_date - now_; XBT_DEBUG("This event invalidates the next_occurring_event() computation of models. Next event set to %f", time_delta); } - // FIXME: I'm too lame to update NOW live, so I change it and restore it so that the real update with surf_min + // FIXME: I'm too lame to update now_ live, so I change it and restore it so that the real update with surf_min // will work - double round_start = NOW; - NOW = next_event_date; + double round_start = now_; + now_ = next_event_date; /* update state of the corresponding resource to the new value. Does not touch lmm. It will be modified if needed when updating actions */ XBT_DEBUG("Calling update_resource_state for resource %s", resource->get_cname()); resource->apply_event(event, value); - NOW = round_start; + now_ = round_start; } } @@ -647,11 +640,11 @@ double EngineImpl::solve(double max_date) const XBT_DEBUG("Duration set to %f", time_delta); // Bump the time: jump into the future - NOW = NOW + time_delta; + now_ += time_delta; // Inform the models of the date change for (auto const& model : models_) - model->update_actions_state(NOW, time_delta); + model->update_actions_state(now_, time_delta); s4u::Engine::on_time_advance(time_delta); @@ -685,6 +678,7 @@ void EngineImpl::run(double max_date) if (cfg_breakpoint >= 0.0 && simgrid_get_clock() >= cfg_breakpoint) { XBT_DEBUG("Breakpoint reached (%g)", cfg_breakpoint.get()); + cfg_breakpoint = -1.0; // Let the simulation continue without hiting the breakpoint again and again #ifdef SIGTRAP std::raise(SIGTRAP); #else @@ -726,9 +720,9 @@ void EngineImpl::run(double max_date) next_time = std::min(next_time, max_date); } - XBT_DEBUG("Calling solve(%g) %g", next_time, NOW); + 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); + XBT_DEBUG("Moving time ahead. NOW=%g; elapsed: %g", now_, elapsed_time); // Execute timers until there isn't anything to be done: bool again = false; @@ -748,7 +742,8 @@ void EngineImpl::run(double max_date) 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."); + XBT_CRITICAL("Oops! Deadlock detected, some activities are still around but will never complete. " + "This usually happens when the user code is not perfectly clean."); } display_all_actor_status(); simgrid::s4u::Engine::on_deadlock(); @@ -758,7 +753,7 @@ void EngineImpl::run(double max_date) } } } while ((vetoed_activities == nullptr || vetoed_activities->empty()) && - ((elapsed_time > -1.0 && not double_equals(max_date, NOW, 0.00001)) || has_actors_to_run())); + ((elapsed_time > -1.0 && not double_equals(max_date, now_, 0.00001)) || has_actors_to_run())); if (not actor_list_.empty() && max_date < 0 && not(vetoed_activities == nullptr || vetoed_activities->empty())) THROW_IMPOSSIBLE; @@ -768,12 +763,7 @@ void EngineImpl::run(double max_date) double EngineImpl::get_clock() { - return NOW; + return now_; } } // namespace kernel } // namespace simgrid - -void SIMIX_run() // XBT_ATTRIB_DEPRECATED_v332 -{ - simgrid::kernel::EngineImpl::get_instance()->run(-1); -}