X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b94ef9f53ddfc2ac1f56fee3e5b1962da78cafe9..2e579c30e0553e6527b8f33322d49b5d9d5d7453:/src/s4u/s4u_Engine.cpp diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index 8a083e16a9..8da467da70 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -1,25 +1,23 @@ /* s4u::Engine Simulation Engine and global functions. */ -/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-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. */ +#include +#include +#include + #include "mc/mc.h" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/kernel/routing/NetZoneImpl.hpp" -#include "simgrid/s4u/Disk.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Host.hpp" -#include "simgrid/s4u/Mailbox.hpp" -#include "simgrid/s4u/NetZone.hpp" -#include "simgrid/simix.h" #include "src/instr/instr_private.hpp" #include "src/kernel/EngineImpl.hpp" -#include "src/simix/smx_private.hpp" // For access to simix_global->process_list -#include "src/surf/network_interface.hpp" -#include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON -#include +#include "src/kernel/resource/NetworkModel.hpp" +#include "src/kernel/resource/SplitDuplexLinkImpl.hpp" +#include "src/kernel/resource/StandardLinkImpl.hpp" +#include "src/mc/mc_replay.hpp" +#include "src/surf/HostImpl.hpp" +#include "xbt/config.hpp" #include #include @@ -27,22 +25,27 @@ XBT_LOG_NEW_CATEGORY(s4u, "Log channels of the S4U (Simgrid for you) interface"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_engine, s4u, "Logging specific to S4U (engine)"); -namespace simgrid { -namespace s4u { +static simgrid::kernel::actor::ActorCode maestro_code; + +namespace simgrid::s4u { xbt::signal Engine::on_platform_creation; xbt::signal Engine::on_platform_created; +xbt::signal Engine::on_simulation_start; xbt::signal Engine::on_simulation_end; xbt::signal Engine::on_time_advance; xbt::signal Engine::on_deadlock; -Engine* Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */ +Engine* Engine::instance_ = nullptr; /* This singleton is awful, but I don't see no other solution right now. */ void Engine::initialize(int* argc, char** argv) { xbt_assert(Engine::instance_ == nullptr, "It is currently forbidden to create more than one instance of s4u::Engine"); - instr::init(); - SIMIX_global_init(argc, argv); Engine::instance_ = this; + instr::init(); + pimpl->initialize(argc, argv); + // Either create a new context with maestro or create + // a context object with the current context maestro): + kernel::actor::create_maestro(maestro_code); } Engine::Engine(std::string name) : pimpl(new kernel::EngineImpl()) @@ -59,35 +62,44 @@ Engine::Engine(int* argc, char** argv) : pimpl(new kernel::EngineImpl()) Engine::~Engine() { - delete pimpl; + kernel::EngineImpl::shutdown(); Engine::instance_ = nullptr; } /** @brief Retrieve the engine singleton */ Engine* Engine::get_instance() +{ + int argc = 0; + char* argv = nullptr; + return get_instance(&argc, &argv); +} +Engine* Engine::get_instance(int* argc, char** argv) { if (Engine::instance_ == nullptr) { - auto e = new Engine(nullptr, nullptr); + auto e = new Engine(argc, argv); xbt_assert(Engine::instance_ == e); } return Engine::instance_; } -void Engine::shutdown() +void Engine::shutdown() // XBT_ATTRIB_DEPRECATED_v335 { delete Engine::instance_; - Engine::instance_ = nullptr; } double Engine::get_clock() { - return SIMIX_get_clock(); + if (MC_is_active() || MC_record_replay_is_active()) { + return MC_process_clock_get(kernel::actor::ActorImpl::self()); + } else { + return kernel::EngineImpl::get_clock(); + } } void Engine::add_model(std::shared_ptr model, const std::vector& dependencies) { - simgrid::kernel::actor::simcall([this, &model, &dependencies] { pimpl->add_model(std::move(model), dependencies); }); + kernel::actor::simcall_answered([this, &model, &dependencies] { pimpl->add_model(std::move(model), dependencies); }); } const std::vector& Engine::get_all_models() const @@ -104,23 +116,17 @@ const std::vector& Engine::get_all_models() c */ void Engine::load_platform(const std::string& platf) const { - double start = xbt_os_time(); - parse_platform_file(platf); - - double end = xbt_os_time(); - XBT_DEBUG("PARSE TIME: %g", (end - start)); + pimpl->load_platform(platf); } -void Engine::register_function(const std::string& name, int (*code)(int, char**)) // XBT_ATTRIB_DEPRECATED_v329 -{ - kernel::actor::ActorCodeFactory code_factory = [code](std::vector args) { - return xbt::wrap_main(code, std::move(args)); - }; - register_function(name, code_factory); -} -void Engine::register_default(int (*code)(int, char**)) // XBT_ATTRIB_DEPRECATED_v329 +/** + * @brief Seals the platform, finishing the creation of its resources. + * + * This method is optional. The seal() is done automatically when you call Engine::run. + */ +void Engine::seal_platform() const { - register_default([code](std::vector args) { return xbt::wrap_main(code, std::move(args)); }); + pimpl->seal_platform(); } /** Registers the main function of an actor that will be launched from the deployment file */ @@ -151,12 +157,12 @@ void Engine::register_default(const std::function& code) } void Engine::register_default(const kernel::actor::ActorCodeFactory& code) { - simgrid::kernel::actor::simcall([this, &code]() { pimpl->register_default(code); }); + simgrid::kernel::actor::simcall_answered([this, &code]() { pimpl->register_default(code); }); } void Engine::register_function(const std::string& name, const kernel::actor::ActorCodeFactory& code) { - simgrid::kernel::actor::simcall([this, name, &code]() { pimpl->register_function(name, code); }); + simgrid::kernel::actor::simcall_answered([this, name, &code]() { pimpl->register_function(name, code); }); } /** Load a deployment file and launch the actors that it contains @@ -173,55 +179,49 @@ void Engine::load_deployment(const std::string& deploy) const /** Returns the amount of hosts in the platform */ size_t Engine::get_host_count() const { - return pimpl->hosts_.size(); + return get_all_hosts().size(); } std::vector Engine::get_all_hosts() const { - std::vector res; - for (auto const& kv : pimpl->hosts_) - res.push_back(kv.second); - return res; + return get_filtered_hosts([](const Host*) { return true; }); } std::vector Engine::get_filtered_hosts(const std::function& filter) const { std::vector hosts; - for (auto const& kv : pimpl->hosts_) { - if (filter(kv.second)) - hosts.push_back(kv.second); + if (pimpl->netzone_root_) { + hosts = pimpl->netzone_root_->get_filtered_hosts(filter); } + /* Sort hosts in lexicographical order: keep same behavior when the hosts were saved on Engine + * Some tests do a get_all_hosts() and selects hosts in this order */ + std::sort(hosts.begin(), hosts.end(), [](const auto* h1, const auto* h2) { return h1->get_name() < h2->get_name(); }); return hosts; } -void Engine::host_register(const std::string& name, Host* host) -{ - pimpl->hosts_[name] = host; -} - -void Engine::host_unregister(const std::string& name) -{ - pimpl->hosts_.erase(name); -} - /** @brief Find a host from its name. * * @throw std::invalid_argument if the searched host does not exist. */ Host* Engine::host_by_name(const std::string& name) const { - auto host = pimpl->hosts_.find(name); - if (host == pimpl->hosts_.end()) + auto* host = host_by_name_or_null(name); + if (not host) throw std::invalid_argument(std::string("Host not found: '") + name + std::string("'")); - return host->second; + return host; } /** @brief Find a host from its name (or nullptr if that host does not exist) */ Host* Engine::host_by_name_or_null(const std::string& name) const { - auto host = pimpl->hosts_.find(name); - return host == pimpl->hosts_.end() ? nullptr : host->second; + Host* host = nullptr; + if (pimpl->netzone_root_) { + auto* host_impl = pimpl->netzone_root_->get_host_by_name_or_null(name); + if (host_impl) + host = host_impl->get_iface(); + } + return host; } /** @brief Find a link from its name. @@ -230,65 +230,91 @@ Host* Engine::host_by_name_or_null(const std::string& name) const */ Link* Engine::link_by_name(const std::string& name) const { - auto link = pimpl->links_.find(name); - if (link == pimpl->links_.end()) + auto* link = link_by_name_or_null(name); + if (not link) throw std::invalid_argument(std::string("Link not found: ") + name); - return link->second->get_iface(); + return link; } -/** @brief Find a link from its name (or nullptr if that link does not exist) */ -Link* Engine::link_by_name_or_null(const std::string& name) const +SplitDuplexLink* Engine::split_duplex_link_by_name(const std::string& name) const { - auto link = pimpl->links_.find(name); - return link == pimpl->links_.end() ? nullptr : link->second->get_iface(); + auto* link_impl = pimpl->netzone_root_ ? pimpl->netzone_root_->get_split_duplex_link_by_name_or_null(name) : nullptr; + if (not link_impl) + throw std::invalid_argument(std::string("Link not found: ") + name); + return link_impl->get_iface(); } -void Engine::link_register(const std::string& name, const Link* link) +/** @brief Find a link from its name (or nullptr if that link does not exist) */ +Link* Engine::link_by_name_or_null(const std::string& name) const { - pimpl->links_[name] = link->get_impl(); + Link* link = nullptr; + if (pimpl->netzone_root_) { + /* keep behavior where internal __loopback__ link from network model is given to user */ + if (name == "__loopback__") + return pimpl->netzone_root_->get_network_model()->loopback_->get_iface(); + auto* link_impl = pimpl->netzone_root_->get_link_by_name_or_null(name); + if (link_impl) + link = link_impl->get_iface(); + } + return link; } -void Engine::link_unregister(const std::string& name) +/** @brief Find a mailbox from its name or create one if it does not exist) */ +Mailbox* Engine::mailbox_by_name_or_create(const std::string& name) const { - pimpl->links_.erase(name); + /* two actors may have pushed the same mbox_create simcall at the same time */ + kernel::activity::MailboxImpl* mbox = kernel::actor::simcall_answered([&name, this] { + auto [m, inserted] = pimpl->mailboxes_.try_emplace(name, nullptr); + if (inserted) { + m->second = new kernel::activity::MailboxImpl(name); + XBT_DEBUG("Creating a mailbox at %p with name %s", m->second, name.c_str()); + } + return m->second; + }); + return mbox->get_iface(); } /** @brief Returns the amount of links in the platform */ size_t Engine::get_link_count() const { - return pimpl->links_.size(); + int count = 0; + if (pimpl->netzone_root_) { + count += pimpl->netzone_root_->get_link_count(); + /* keep behavior where internal __loopback__ link from network model is given to user */ + count += pimpl->netzone_root_->get_network_model()->loopback_ ? 1 : 0; + } + return count; } /** @brief Returns the list of all links found in the platform */ std::vector Engine::get_all_links() const { - std::vector res; - for (auto const& kv : pimpl->links_) - res.push_back(kv.second->get_iface()); - return res; + return get_filtered_links([](const Link*) { return true; }); } std::vector Engine::get_filtered_links(const std::function& filter) const { - std::vector filtered_list; - for (auto const& kv : pimpl->links_) { - Link* l = kv.second->get_iface(); - if (filter(l)) - filtered_list.push_back(l); + std::vector res; + if (pimpl->netzone_root_) { + res = pimpl->netzone_root_->get_filtered_links(filter); + /* keep behavior where internal __loopback__ link from network model is given to user */ + if (pimpl->netzone_root_->get_network_model()->loopback_ && + filter(pimpl->netzone_root_->get_network_model()->loopback_->get_iface())) + res.push_back(pimpl->netzone_root_->get_network_model()->loopback_->get_iface()); } - return filtered_list; + return res; } size_t Engine::get_actor_count() const { - return simix_global->process_list.size(); + return pimpl->get_actor_count(); } std::vector Engine::get_all_actors() const { std::vector actor_list; - for (auto const& kv : simix_global->process_list) { - actor_list.push_back(kv.second->get_iface()); + for (auto const& [_, actor] : pimpl->get_actor_list()) { + actor_list.push_back(actor->get_iface()); } return actor_list; } @@ -296,30 +322,33 @@ std::vector Engine::get_all_actors() const std::vector Engine::get_filtered_actors(const std::function& filter) const { std::vector actor_list; - for (auto const& kv : simix_global->process_list) { - if (filter(kv.second->get_iface())) - actor_list.push_back(kv.second->get_iface()); + for (auto const& [_, actor] : pimpl->get_actor_list()) { + if (filter(actor->get_iface())) + actor_list.push_back(actor->get_iface()); } return actor_list; } void Engine::run() const { - /* sealing resources before run: links */ - for (auto* link : get_all_links()) - link->seal(); - /* seal netzone root, recursively seal children netzones, hosts and disks */ - get_netzone_root()->seal(); - + run_until(-1); +} +void Engine::run_until(double max_date) const +{ + if (static bool callback_called = false; not callback_called) { + on_simulation_start(); + callback_called = true; + } /* Clean IO before the run */ fflush(stdout); fflush(stderr); - if (MC_is_active()) { - MC_run(); - } else { - pimpl->run(); - } + pimpl->run(max_date); +} + +void Engine::track_vetoed_activities(std::set* vetoed_activities) const +{ + Activity::set_vetoed_activities(vetoed_activities); } /** @brief Retrieve the root netzone, containing all others */ @@ -375,21 +404,21 @@ kernel::routing::NetPoint* Engine::netpoint_by_name(const std::string& name) con std::vector Engine::get_all_netpoints() const { std::vector res; - for (auto const& kv : pimpl->netpoints_) - res.push_back(kv.second); + for (auto const& [_, netpoint] : pimpl->netpoints_) + res.push_back(netpoint); return res; } /** @brief Register a new netpoint to the system */ void Engine::netpoint_register(kernel::routing::NetPoint* point) { - simgrid::kernel::actor::simcall([this, point] { pimpl->netpoints_[point->get_name()] = point; }); + simgrid::kernel::actor::simcall_answered([this, point] { pimpl->netpoints_[point->get_name()] = point; }); } /** @brief Unregister a given netpoint */ void Engine::netpoint_unregister(kernel::routing::NetPoint* point) { - kernel::actor::simcall([this, point] { + kernel::actor::simcall_answered([this, point] { pimpl->netpoints_.erase(point->get_name()); delete point; }); @@ -420,13 +449,19 @@ void Engine::set_config(const std::string& name, const std::string& value) config::set_value(name.c_str(), value); } -} // namespace s4u -} // namespace simgrid +Engine* Engine::set_default_comm_data_copy_callback( + const std::function& callback) +{ + kernel::activity::CommImpl::set_copy_data_callback(callback); + return this; +} + +} // namespace simgrid::s4u /* **************************** Public C interface *************************** */ void simgrid_init(int* argc, char** argv) { - simgrid::s4u::Engine e(argc, argv); + static simgrid::s4u::Engine e(argc, argv); } void simgrid_load_platform(const char* file) { @@ -441,6 +476,10 @@ void simgrid_run() { simgrid::s4u::Engine::get_instance()->run(); } +void simgrid_run_until(double max_date) +{ + simgrid::s4u::Engine::get_instance()->run_until(max_date); +} void simgrid_register_function(const char* name, void (*code)(int, char**)) { simgrid::s4u::Engine::get_instance()->register_function(name, code); @@ -454,7 +493,11 @@ double simgrid_get_clock() return simgrid::s4u::Engine::get_clock(); } -int simgrid_get_actor_count() // XBT_ATTRIB_DEPRECATED_v330 +void simgrid_set_maestro(void (*code)(void*), void* data) { - return simgrid::s4u::Engine::get_instance()->get_actor_count(); +#ifdef _WIN32 + XBT_WARN("simgrid_set_maestro is believed to not work on windows. Please help us investigating this issue if " + "you need that feature"); +#endif + maestro_code = std::bind(code, data); }