X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/666a812d1b3ee4568f2beb317dfcd08d99055697..7b6fecb801d2d513ebbd7bea94c52322e2cc1df2:/src/s4u/s4u_Engine.cpp diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index dc11db8c8d..ad5327c077 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-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2019. 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. */ @@ -8,6 +8,7 @@ #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" @@ -16,51 +17,56 @@ #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/surf/network_interface.hpp" #include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON +#include + +#include 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 { -xbt::signal on_platform_creation; -xbt::signal on_platform_created; -xbt::signal onSimulationEnd; -xbt::signal onTimeAdvance; -xbt::signal onDeadlock; +xbt::signal Engine::on_platform_creation; +xbt::signal Engine::on_platform_created; +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(int* argc, char** argv) +Engine::Engine(int* argc, char** argv) : pimpl(new kernel::EngineImpl()) { - xbt_assert(s4u::Engine::instance_ == nullptr, - "It is currently forbidden to create more than one instance of s4u::Engine"); + xbt_assert(Engine::instance_ == nullptr, "It is currently forbidden to create more than one instance of s4u::Engine"); TRACE_global_init(); SIMIX_global_init(argc, argv); - pimpl = new kernel::EngineImpl(); - s4u::Engine::instance_ = this; + Engine::instance_ = this; } Engine::~Engine() { delete pimpl; - s4u::Engine::instance_ = nullptr; + Engine::instance_ = nullptr; } /** @brief Retrieve the engine singleton */ Engine* Engine::get_instance() { - if (s4u::Engine::instance_ == nullptr) - return new Engine(0, nullptr); - else - return s4u::Engine::instance_; + if (Engine::instance_ == nullptr) { + auto e = new Engine(0, nullptr); + xbt_assert(Engine::instance_ == e); + } + return Engine::instance_; } void Engine::shutdown() { - delete s4u::Engine::instance_; - s4u::Engine::instance_ = nullptr; + delete Engine::instance_; + Engine::instance_ = nullptr; } double Engine::get_clock() @@ -68,38 +74,60 @@ double Engine::get_clock() return SIMIX_get_clock(); } -void Engine::load_platform(const char* platf) +/** + * Creates a new platform, including hosts, links, and the routing table. + * + * \rst + * See also: :ref:`platform`. + * \endrst + */ +void Engine::load_platform(const std::string& platf) +{ + double start = xbt_os_time(); + parse_platform_file(platf); + + double end = xbt_os_time(); + XBT_DEBUG("PARSE TIME: %g", (end - start)); +} + +/** Registers the main function of an actor that will be launched from the deployment file */ +void Engine::register_function(const std::string& name, int (*code)(int, char**)) { - SIMIX_create_environment(platf); + pimpl->register_function(name, code); } -void Engine::register_function(const char* name, int (*code)(int, char**)) +/** Registers the main function of an actor that will be launched from the deployment file */ +void Engine::register_function(const std::string& name, void (*code)(std::vector)) { - SIMIX_function_register(name, code); + pimpl->register_function(name, code); } +/** 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). + */ void Engine::register_default(int (*code)(int, char**)) { - SIMIX_function_register_default(code); + pimpl->register_default(code); } -void Engine::load_deployment(const char* deploy) + +/** Load a deployment file and launch the actors that it contains + * + * \rst + * See also: :ref:`deploy`. + * \endrst + */ +void Engine::load_deployment(const std::string& deploy) { - SIMIX_launch_application(deploy); + pimpl->load_deployment(deploy); } -/** @brief Returns the amount of hosts in the platform */ + +/** Returns the amount of hosts in the platform */ size_t Engine::get_host_count() { return pimpl->hosts_.size(); } -/** @brief Fills the passed list with all hosts found in the platform - * @deprecated Please prefer Engine::getAllHosts() - */ -void Engine::getHostList(std::vector* list) -{ - for (auto const& kv : pimpl->hosts_) - list->push_back(kv.second); -} -/** @brief Returns the list of all hosts found in the platform */ std::vector Engine::get_all_hosts() { std::vector res; @@ -108,27 +136,74 @@ std::vector Engine::get_all_hosts() return res; } -void Engine::host_register(std::string name, simgrid::s4u::Host* host) +std::vector Engine::get_filtered_hosts(const std::function& filter) +{ + std::vector hosts; + for (auto const& kv : pimpl->hosts_) { + if (filter(kv.second)) + hosts.push_back(kv.second); + } + + return hosts; +} + +void Engine::host_register(const std::string& name, Host* host) { pimpl->hosts_[name] = host; } -void Engine::host_unregister(std::string name) +void Engine::host_unregister(const std::string& name) { pimpl->hosts_.erase(name); } -simgrid::s4u::Host* Engine::host_by_name(std::string 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) { - return pimpl->hosts_.at(name); // Will raise a std::out_of_range if the host does not exist + if (pimpl->hosts_.find(name) == pimpl->hosts_.end()) + throw std::invalid_argument(std::string("Host not found: '") + name + std::string("'")); + return pimpl->hosts_.at(name); } -simgrid::s4u::Host* Engine::host_by_name_or_null(std::string name) +/** @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) { auto host = pimpl->hosts_.find(name); return host == pimpl->hosts_.end() ? nullptr : host->second; } +/** @brief Find a link from its name. + * + * @throw std::invalid_argument if the searched link does not exist. + */ +Link* Engine::link_by_name(const std::string& name) +{ + if (pimpl->links_.find(name) == pimpl->links_.end()) + throw std::invalid_argument(std::string("Link not found: ") + name); + + return pimpl->links_.at(name)->get_iface(); +} + +/** @brief Find an link from its name (or nullptr if that link does not exist) */ +Link* Engine::link_by_name_or_null(const std::string& name) +{ + auto link = pimpl->links_.find(name); + return link == pimpl->links_.end() ? nullptr : link->second->get_iface(); +} + +void Engine::link_register(const std::string& name, Link* link) +{ + pimpl->links_[name] = link->get_impl(); +} + +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() { @@ -140,27 +215,35 @@ std::vector Engine::get_all_storages() { std::vector res; for (auto const& kv : pimpl->storages_) - res.push_back(kv.second); + res.push_back(kv.second->get_iface()); return res; } -simgrid::s4u::Storage* Engine::storage_by_name(std::string name) +/** @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) { - return pimpl->storages_.at(name); // Will raise a std::out_of_range if the host does not exist + 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(); } -simgrid::s4u::Storage* Engine::storage_by_name_or_null(std::string name) +/** @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) { auto storage = pimpl->storages_.find(name); - return storage == pimpl->storages_.end() ? nullptr : storage->second; + return storage == pimpl->storages_.end() ? nullptr : storage->second->get_iface(); } -void Engine::storage_register(std::string name, simgrid::s4u::Storage* storage) +void Engine::storage_register(const std::string& name, Storage* storage) { - pimpl->storages_[name] = storage; + pimpl->storages_[name] = storage->get_impl(); } -void Engine::storage_unregister(std::string name) +void Engine::storage_unregister(const std::string& name) { pimpl->storages_.erase(name); } @@ -168,19 +251,60 @@ void Engine::storage_unregister(std::string name) /** @brief Returns the amount of links in the platform */ size_t Engine::get_link_count() { - return kernel::resource::LinkImpl::linksCount(); + return pimpl->links_.size(); } /** @brief Returns the list of all links found in the platform */ std::vector Engine::get_all_links() { std::vector res; - kernel::resource::LinkImpl::linksList(&res); + for (auto const& kv : pimpl->links_) + res.push_back(kv.second->get_iface()); return res; } +std::vector Engine::get_filtered_links(const std::function& filter) +{ + std::vector filtered_list; + for (auto const& kv : pimpl->links_) { + Link* l = kv.second->get_iface(); + if (filter(l)) + filtered_list.push_back(l); + } + return filtered_list; +} + +size_t Engine::get_actor_count() +{ + return simix_global->process_list.size(); +} + +std::vector Engine::get_all_actors() +{ + std::vector actor_list; + actor_list.push_back(simgrid::s4u::Actor::self()); + for (auto const& kv : simix_global->process_list) { + actor_list.push_back(kv.second->iface()); + } + return actor_list; +} + +std::vector Engine::get_filtered_actors(const std::function& filter) +{ + std::vector actor_list; + for (auto const& kv : simix_global->process_list) { + if (filter(kv.second->iface())) + actor_list.push_back(kv.second->iface()); + } + return actor_list; +} + void Engine::run() { + /* Clean IO before the run */ + fflush(stdout); + fflush(stderr); + if (MC_is_active()) { MC_run(); } else { @@ -188,18 +312,25 @@ void Engine::run() } } -s4u::NetZone* Engine::getNetRoot() +/** @brief Retrieve the root netzone, containing all others */ +s4u::NetZone* Engine::get_netzone_root() { - return pimpl->netzone_root_; + return pimpl->netzone_root_->get_iface(); +} +/** @brief Set the root netzone, containing all others. Once set, it cannot be changed. */ +void Engine::set_netzone_root(s4u::NetZone* netzone) +{ + xbt_assert(pimpl->netzone_root_ == nullptr, "The root NetZone cannot be changed once set"); + pimpl->netzone_root_ = netzone->get_impl(); } -static s4u::NetZone* netzone_by_name_recursive(s4u::NetZone* current, const char* name) +static NetZone* netzone_by_name_recursive(NetZone* current, const std::string& name) { - if (not strcmp(current->get_cname(), name)) + if (current->get_name() == name) return current; - for (auto const& elem : *(current->getChildren())) { - simgrid::s4u::NetZone* tmp = netzone_by_name_recursive(elem, name); + for (auto const& elem : current->get_children()) { + NetZone* tmp = netzone_by_name_recursive(elem, name); if (tmp != nullptr) { return tmp; } @@ -208,43 +339,38 @@ static s4u::NetZone* netzone_by_name_recursive(s4u::NetZone* current, const char } /** @brief Retrieve the NetZone of the given name (or nullptr if not found) */ -NetZone* Engine::getNetzoneByNameOrNull(const char* name) +NetZone* Engine::netzone_by_name_or_null(const std::string& name) { - return netzone_by_name_recursive(getNetRoot(), name); + return netzone_by_name_recursive(get_netzone_root(), name); } /** @brief Retrieve the netpoint of the given name (or nullptr if not found) */ -simgrid::kernel::routing::NetPoint* Engine::getNetpointByNameOrNull(std::string name) +kernel::routing::NetPoint* Engine::netpoint_by_name_or_null(const std::string& name) { auto netp = pimpl->netpoints_.find(name); return netp == pimpl->netpoints_.end() ? nullptr : netp->second; } -/** @brief Fill the provided vector with all existing netpoints */ -void Engine::getNetpointList(std::vector* list) -{ - for (auto const& kv : pimpl->netpoints_) - list->push_back(kv.second); -} -std::vector Engine::get_all_netpoints() +std::vector Engine::get_all_netpoints() { - std::vector res; + std::vector res; for (auto const& kv : pimpl->netpoints_) res.push_back(kv.second); return res; } /** @brief Register a new netpoint to the system */ -void Engine::netpoint_register(simgrid::kernel::routing::NetPoint* point) +void Engine::netpoint_register(kernel::routing::NetPoint* point) { - // simgrid::simix::kernelImmediate([&]{ FIXME: this segfaults in set_thread + // simgrid::kernel::actor::simcall([&]{ FIXME: this segfaults in set_thread pimpl->netpoints_[point->get_name()] = point; // }); } + /** @brief Unregister a given netpoint */ -void Engine::netpoint_unregister(simgrid::kernel::routing::NetPoint* point) +void Engine::netpoint_unregister(kernel::routing::NetPoint* point) { - simgrid::simix::kernelImmediate([this, point] { + kernel::actor::simcall([this, point] { pimpl->netpoints_.erase(point->get_name()); delete point; }); @@ -254,9 +380,44 @@ bool Engine::is_initialized() { return Engine::instance_ != nullptr; } -void Engine::set_config(std::string str) +void Engine::set_config(const std::string& str) { - simgrid::config::set_parse(std::move(str)); + config::set_parse(str); } } // namespace s4u } // namespace simgrid + +/* **************************** Public C interface *************************** */ +void simgrid_init(int* argc, char** argv) +{ + simgrid::s4u::Engine e(argc, argv); +} +void simgrid_load_platform(const char* file) +{ + simgrid::s4u::Engine::get_instance()->load_platform(file); +} + +void simgrid_load_deployment(const char* file) +{ + simgrid::s4u::Engine::get_instance()->load_deployment(file); +} +void simgrid_run() +{ + simgrid::s4u::Engine::get_instance()->run(); +} +void simgrid_register_function(const char* name, int (*code)(int, char**)) +{ + simgrid::s4u::Engine::get_instance()->register_function(name, code); +} +void simgrid_register_default(int (*code)(int, char**)) +{ + simgrid::s4u::Engine::get_instance()->register_default(code); +} +double simgrid_get_clock() +{ + return simgrid::s4u::Engine::get_clock(); +} +int simgrid_get_actor_count() +{ + return simgrid::s4u::Engine::get_instance()->get_actor_count(); +}