X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/768866d55ef9d86790049e605bc2f6c62f59199c..f8e7b4cec7149a685b0a4a58ba56088613124377:/src/kernel/EngineImpl.cpp?ds=sidebyside diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp index 6572a174e4..a5cd1612c5 100644 --- a/src/kernel/EngineImpl.cpp +++ b/src/kernel/EngineImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2023. 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. */ @@ -18,30 +18,27 @@ #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 -#ifndef _WIN32 #include -#endif /* _WIN32 */ #if SIMGRID_HAVE_MC #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 { +namespace simgrid::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 @@ -61,19 +58,18 @@ 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; } static config::Flag context_factory_name("contexts/factory", - (std::string("Possible values: ") + contexts_list()).c_str(), + ("Possible values: " + contexts_list()).c_str(), context_factories.begin()->first); -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel XBT_ATTRIB_NORETURN static void inthandler(int) { @@ -87,7 +83,6 @@ XBT_ATTRIB_NORETURN static void inthandler(int) exit(1); } -#ifndef _WIN32 static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/) { if ((siginfo->si_signo == SIGSEGV && siginfo->si_code == SEGV_ACCERR) || siginfo->si_signo == SIGBUS) { @@ -108,7 +103,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 @@ -158,29 +153,17 @@ static void install_segvhandler() } } -#endif /* _WIN32 */ - -namespace simgrid { -namespace kernel { +namespace simgrid::kernel { EngineImpl::~EngineImpl() { - /* Since hosts_ is a std::map, the hosts are destroyed in the lexicographic order, which ensures that the output is - * reproducible. - */ - while (not hosts_.empty()) - hosts_.begin()->second->destroy(); - /* Also delete the other data */ delete netzone_root_; - for (auto const& kv : netpoints_) - delete kv.second; + for (auto const& [_, netpoint] : netpoints_) + delete netpoint; - while (not links_.empty()) - links_.begin()->second->destroy(); - - for (auto const& kv : mailboxes_) - delete kv.second; + for (auto const& [_, mailbox] : mailboxes_) + delete mailbox; /* Kill all actors (but maestro) */ maestro_->kill_all(); @@ -190,10 +173,6 @@ EngineImpl::~EngineImpl() delete maestro_; delete context_factory_; - /* Free the remaining data structures */ -#if SIMGRID_HAVE_MC - xbt_dynar_free(&actors_vector_); -#endif /* clear models before freeing handle, network models can use external callback defined in the handle */ models_prio_.clear(); } @@ -207,7 +186,7 @@ void EngineImpl::initialize(int* argc, char** argv) // The communication initialization is done ASAP, as we need to get some init parameters from the MC for different // layers. But instance_ needs to be created, as we send the address of some of its fields to the MC that wants to // read them directly. - simgrid::mc::AppSide::initialize(actors_vector_); + simgrid::mc::AppSide::initialize(); #endif if (xbt_initialized == 0) { @@ -220,10 +199,7 @@ void EngineImpl::initialize(int* argc, char** argv) /* Prepare to display some more info when dying on Ctrl-C pressing */ std::signal(SIGINT, inthandler); - -#ifndef _WIN32 install_segvhandler(); -#endif /* register a function to be called by SURF after the environment creation */ sg_platf_init(); @@ -255,14 +231,14 @@ 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 */ - 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; } @@ -284,7 +260,7 @@ void EngineImpl::context_mod_init() const XBT_ERROR(" (boost was disabled at compilation time on this machine -- check configure logs for details. Did you " "install the libboost-context-dev package?)"); #endif - XBT_ERROR(" thread: slow portability layer using pthreads as provided by gcc"); + XBT_ERROR(" thread: slow portability layer using standard threads as provided by libstdc"); xbt_die("Please use a valid factory."); } } @@ -296,7 +272,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"); @@ -332,9 +308,6 @@ void EngineImpl::seal_platform() const return; sealed = true; - /* 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(); } @@ -343,9 +316,6 @@ void EngineImpl::load_platform(const std::string& platf) { double start = xbt_os_time(); 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 void* handle = dlopen(platf.c_str(), RTLD_LAZY); xbt_assert(handle, "Impossible to open platform file: %s", platf.c_str()); platf_handle_ = std::unique_ptr>(handle, dlclose); @@ -354,7 +324,6 @@ void EngineImpl::load_platform(const std::string& platf) const char* dlsym_error = dlerror(); xbt_assert(not dlsym_error, "Error: %s", dlsym_error); callable(*simgrid::s4u::Engine::get_instance()); -#endif /* _WIN32 */ } else { parse_platform_file(platf); } @@ -388,7 +357,7 @@ void EngineImpl::add_model(std::shared_ptr 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()); } @@ -396,11 +365,6 @@ void EngineImpl::add_model(std::shared_ptr model, const std::ve models_prio_[model_name] = std::move(model); } -void EngineImpl::add_split_duplex_link(const std::string& name, std::unique_ptr link) -{ - split_duplex_links_[name] = std::move(link); -} - /** Wake up all actors waiting for a Surf action to finish */ void EngineImpl::handle_ended_actions() const { @@ -453,10 +417,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) @@ -496,9 +457,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 (@): \""); - 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"; @@ -517,13 +476,17 @@ void EngineImpl::display_all_actor_status() const if (boost::dynamic_pointer_cast(actor->waiting_synchro_) != nullptr) synchro_description = "I/O"; - XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %#zx (%s) in state %s to finish", actor->get_pid(), + XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %#zx (%s) in state %s to finish %s", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname(), synchro_description, (xbt_log_no_loc ? (size_t)0xDEADBEEF : (size_t)actor->waiting_synchro_.get()), - actor->waiting_synchro_->get_cname(), actor->waiting_synchro_->get_state_str()); + actor->waiting_synchro_->get_cname(), actor->waiting_synchro_->get_state_str(), + (actor->simcall_.observer_ != nullptr && not xbt_log_no_loc + ? actor->simcall_.observer_->to_string().c_str() + : "")); } else { XBT_INFO("Actor %ld (%s@%s) simcall %s", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname(), - actor->simcall_.get_cname()); + (actor->simcall_.observer_ != nullptr ? actor->simcall_.observer_->to_string().c_str() + : actor->simcall_.get_cname())); } } } @@ -533,7 +496,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; @@ -546,7 +509,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 @@ -556,9 +519,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"); @@ -566,7 +529,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; } @@ -587,9 +550,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); @@ -601,29 +564,31 @@ 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(value<0) + continue; 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; } } @@ -640,11 +605,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); @@ -720,9 +685,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; @@ -742,17 +707,18 @@ 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(); - 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()) && - ((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; @@ -762,7 +728,6 @@ void EngineImpl::run(double max_date) double EngineImpl::get_clock() { - return NOW; + return now_; } -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel