X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3a1ea70a418f393ca1677074e928c664022295bd..45e426637aefc9860afe15b75812d48898975fe3:/src/s4u/s4u_Engine.cpp diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index 7dbfdaa67e..c140382196 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/surf/network_interface.hpp" #include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON #include @@ -91,14 +89,14 @@ void Engine::load_platform(const std::string& platf) const XBT_DEBUG("PARSE TIME: %g", (end - start)); } -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,16 +107,16 @@ 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 * @@ -191,9 +189,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,13 +208,13 @@ 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 pimpl->links_.at(name)->get_iface(); + 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); @@ -232,50 +231,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 { @@ -311,7 +266,7 @@ 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()); + actor_list.push_back(kv.second->get_iface()); } return actor_list; } @@ -320,8 +275,8 @@ std::vector Engine::get_filtered_actors(const std::function actor_list; for (auto const& kv : simix_global->process_list) { - if (filter(kv.second->iface())) - actor_list.push_back(kv.second->iface()); + if (filter(kv.second->get_iface())) + actor_list.push_back(kv.second->get_iface()); } return actor_list; }