X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/efa3d5379cb7bfc5d64c839af8b6d036d86460c1..19e1048a7009c4144b0f361ad85fb9dff44761ea:/src/s4u/s4u_Engine.cpp diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index c072730782..47b512e668 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -1,6 +1,6 @@ /* s4u::Engine Simulation Engine and global functions. */ -/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2021. 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. */ @@ -13,12 +13,10 @@ #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Mailbox.hpp" #include "simgrid/s4u/NetZone.hpp" -#include "simgrid/s4u/Storage.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/StorageImpl.hpp" +#include "src/mc/mc_replay.hpp" #include "src/surf/network_interface.hpp" #include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON #include @@ -39,13 +37,24 @@ 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(int* argc, char** argv) : pimpl(new kernel::EngineImpl()) +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"); + Engine::instance_ = this; instr::init(); SIMIX_global_init(argc, argv); +} - Engine::instance_ = this; +Engine::Engine(std::string name) : pimpl(new kernel::EngineImpl()) +{ + int argc = 1; + char* argv = &name[0]; + initialize(&argc, &argv); +} + +Engine::Engine(int* argc, char** argv) : pimpl(new kernel::EngineImpl()) +{ + initialize(argc, argv); } Engine::~Engine() @@ -58,7 +67,7 @@ Engine::~Engine() Engine* Engine::get_instance() { if (Engine::instance_ == nullptr) { - auto e = new Engine(0, nullptr); + auto e = new Engine(nullptr, nullptr); xbt_assert(Engine::instance_ == e); } return Engine::instance_; @@ -72,33 +81,44 @@ void Engine::shutdown() double Engine::get_clock() { - return SIMIX_get_clock(); + if (MC_is_active() || MC_record_replay_is_active()) { + return MC_process_clock_get(SIMIX_process_self()); + } else { + return surf_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); }); +} + +const std::vector& Engine::get_all_models() const +{ + return pimpl->get_all_models(); } /** * Creates a new platform, including hosts, links, and the routing table. * - * \rst + * @beginrst * See also: :ref:`platform`. - * \endrst + * @endrst */ 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**)) // deprecated +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, std::move(code_factory)); + register_function(name, code_factory); } -void Engine::register_default(int (*code)(int, char**)) // deprecated +void Engine::register_default(int (*code)(int, char**)) // XBT_ATTRIB_DEPRECATED_v329 { register_default([code](std::vector args) { return xbt::wrap_main(code, std::move(args)); }); } @@ -109,21 +129,21 @@ void Engine::register_function(const std::string& name, const std::function args) { return xbt::wrap_main(code, std::move(args)); }; - register_function(name, std::move(code_factory)); + register_function(name, code_factory); } /** Registers the main function of an actor that will be launched from the deployment file */ void Engine::register_function(const std::string& name, const std::function)>& code) { - kernel::actor::ActorCodeFactory code_factory = [code](std::vector args) { + kernel::actor::ActorCodeFactory code_factory = [code{code}](std::vector args) mutable { return std::bind(std::move(code), std::move(args)); }; - register_function(name, std::move(code_factory)); + register_function(name, code_factory); } /** Registers a function as the default main function of actors * * It will be used as fallback when the function requested from the deployment file was not registered. - * It is used for trace-based simulations (see examples/s4u/replay-comms and similar). + * It is used for trace-based simulations (see examples/cpp/replay-comms and similar). */ void Engine::register_default(const std::function& code) { @@ -141,11 +161,11 @@ void Engine::register_function(const std::string& name, const kernel::actor::Act /** Load a deployment file and launch the actors that it contains * - * \rst + * @beginrst * See also: :ref:`deploy`. - * \endrst + * @endrst */ -void Engine::load_deployment(const std::string& deploy) +void Engine::load_deployment(const std::string& deploy) const { pimpl->load_deployment(deploy); } @@ -191,9 +211,10 @@ void Engine::host_unregister(const std::string& name) */ Host* Engine::host_by_name(const std::string& name) const { - if (pimpl->hosts_.find(name) == pimpl->hosts_.end()) + auto host = pimpl->hosts_.find(name); + if (host == pimpl->hosts_.end()) throw std::invalid_argument(std::string("Host not found: '") + name + std::string("'")); - return pimpl->hosts_.at(name); + return host->second; } /** @brief Find a host from its name (or nullptr if that host does not exist) */ @@ -209,19 +230,42 @@ Host* Engine::host_by_name_or_null(const std::string& name) const */ Link* Engine::link_by_name(const std::string& name) const { - if (pimpl->links_.find(name) == pimpl->links_.end()) + auto link = pimpl->links_.find(name); + if (link == pimpl->links_.end()) throw std::invalid_argument(std::string("Link not found: ") + name); + return link->second->get_iface(); +} - return pimpl->links_.at(name)->get_iface(); +SplitDuplexLink* Engine::split_duplex_link_by_name(const std::string& name) const +{ + auto link = pimpl->split_duplex_links_.find(name); + if (link == pimpl->split_duplex_links_.end()) + throw std::invalid_argument(std::string("Link not found: ") + name); + return link->second->get_iface(); } -/** @brief Find an link from its name (or nullptr if that link does not exist) */ +/** @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 { auto link = pimpl->links_.find(name); return link == pimpl->links_.end() ? nullptr : link->second->get_iface(); } +/** @brief Find a mailox from its name or create one if it does not exist) */ +Mailbox* Engine::mailbox_by_name_or_create(const std::string& name) const +{ + /* two actors may have pushed the same mbox_create simcall at the same time */ + kernel::activity::MailboxImpl* mbox = kernel::actor::simcall([&name, this] { + auto m = pimpl->mailboxes_.emplace(name, nullptr); + if (m.second) { + m.first->second = new kernel::activity::MailboxImpl(name); + XBT_DEBUG("Creating a mailbox at %p with name %s", m.first->second, name.c_str()); + } + return m.first->second; + }); + return mbox->get_iface(); +} + void Engine::link_register(const std::string& name, const Link* link) { pimpl->links_[name] = link->get_impl(); @@ -232,50 +276,6 @@ void Engine::link_unregister(const std::string& name) pimpl->links_.erase(name); } -/** @brief Returns the amount of storages in the platform */ -size_t Engine::get_storage_count() const -{ - return pimpl->storages_.size(); -} - -/** @brief Returns the list of all storages found in the platform */ -std::vector Engine::get_all_storages() const -{ - std::vector res; - for (auto const& kv : pimpl->storages_) - res.push_back(kv.second->get_iface()); - return res; -} - -/** @brief Find a storage from its name. - * - * @throw std::invalid_argument if the searched storage does not exist. - */ -Storage* Engine::storage_by_name(const std::string& name) const -{ - if (pimpl->storages_.find(name) == pimpl->storages_.end()) - throw std::invalid_argument(std::string("Storage not found: ") + name); - - return pimpl->storages_.at(name)->get_iface(); -} - -/** @brief Find a storage from its name (or nullptr if that storage does not exist) */ -Storage* Engine::storage_by_name_or_null(const std::string& name) const -{ - auto storage = pimpl->storages_.find(name); - return storage == pimpl->storages_.end() ? nullptr : storage->second->get_iface(); -} - -void Engine::storage_register(const std::string& name, const Storage* storage) -{ - pimpl->storages_[name] = storage->get_impl(); -} - -void Engine::storage_unregister(const std::string& name) -{ - pimpl->storages_.erase(name); -} - /** @brief Returns the amount of links in the platform */ size_t Engine::get_link_count() const { @@ -304,14 +304,14 @@ std::vector Engine::get_filtered_links(const std::function& 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->iface()); + for (auto const& kv : pimpl->get_actor_list()) { + actor_list.push_back(kv.second->get_iface()); } return actor_list; } @@ -319,15 +319,21 @@ 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->iface())) - actor_list.push_back(kv.second->iface()); + for (auto const& kv : pimpl->get_actor_list()) { + if (filter(kv.second->get_iface())) + actor_list.push_back(kv.second->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(); + /* Clean IO before the run */ fflush(stdout); fflush(stderr); @@ -335,14 +341,16 @@ void Engine::run() const if (MC_is_active()) { MC_run(); } else { - SIMIX_run(); + pimpl->run(); } } /** @brief Retrieve the root netzone, containing all others */ s4u::NetZone* Engine::get_netzone_root() const { - return pimpl->netzone_root_->get_iface(); + if (pimpl->netzone_root_) + return pimpl->netzone_root_->get_iface(); + return nullptr; } /** @brief Set the root netzone, containing all others. Once set, it cannot be changed. */ void Engine::set_netzone_root(const s4u::NetZone* netzone) @@ -378,6 +386,15 @@ kernel::routing::NetPoint* Engine::netpoint_by_name_or_null(const std::string& n return netp == pimpl->netpoints_.end() ? nullptr : netp->second; } +kernel::routing::NetPoint* Engine::netpoint_by_name(const std::string& name) const +{ + auto netp = netpoint_by_name_or_null(name); + if (netp == nullptr) { + throw std::invalid_argument(std::string("Netpoint not found: %s") + name); + } + return netp; +} + std::vector Engine::get_all_netpoints() const { std::vector res;