X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1c426b4c1b38063b0576492d313c6d1f3a69582..88f49b34e91fe95b712d1545ae71a0896f5466c1:/src/s4u/s4u_Engine.cpp diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index 65ef3a1f3b..7dbfdaa67e 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -42,7 +42,7 @@ Engine* Engine::instance_ = nullptr; /* That singleton is awful, but I don't see Engine::Engine(int* argc, char** argv) : pimpl(new kernel::EngineImpl()) { xbt_assert(Engine::instance_ == nullptr, "It is currently forbidden to create more than one instance of s4u::Engine"); - TRACE_global_init(); + instr::init(); SIMIX_global_init(argc, argv); Engine::instance_ = this; @@ -58,7 +58,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_; @@ -82,7 +82,7 @@ double Engine::get_clock() * See also: :ref:`platform`. * \endrst */ -void Engine::load_platform(const std::string& platf) +void Engine::load_platform(const std::string& platf) const { double start = xbt_os_time(); parse_platform_file(platf); @@ -93,7 +93,10 @@ void Engine::load_platform(const std::string& platf) void Engine::register_function(const std::string& name, int (*code)(int, char**)) // deprecated { - register_function(name, [code](std::vector args) { return xbt::wrap_main(code, std::move(args)); }); + kernel::actor::ActorCodeFactory code_factory = [code](std::vector args) { + return xbt::wrap_main(code, std::move(args)); + }; + register_function(name, std::move(code_factory)); } void Engine::register_default(int (*code)(int, char**)) // deprecated { @@ -101,23 +104,28 @@ void Engine::register_default(int (*code)(int, char**)) // deprecated } /** 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)(int, char**)) +void Engine::register_function(const std::string& name, const std::function& code) { - register_function(name, [code](std::vector args) { return xbt::wrap_main(code, std::move(args)); }); + kernel::actor::ActorCodeFactory code_factory = [code](std::vector args) { + return xbt::wrap_main(code, std::move(args)); + }; + register_function(name, std::move(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, void (*code)(std::vector)) +void Engine::register_function(const std::string& name, const std::function)>& code) { - register_function(name, - [code](std::vector args) { return std::bind(std::move(code), std::move(args)); }); + kernel::actor::ActorCodeFactory code_factory = [code](std::vector args) { + return std::bind(std::move(code), std::move(args)); + }; + register_function(name, std::move(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). */ -void Engine::register_default(void (*code)(int, char**)) +void Engine::register_default(const std::function& code) { register_default([code](std::vector args) { return xbt::wrap_main(code, std::move(args)); }); } @@ -137,18 +145,18 @@ void Engine::register_function(const std::string& name, const kernel::actor::Act * See also: :ref:`deploy`. * \endrst */ -void Engine::load_deployment(const std::string& deploy) +void Engine::load_deployment(const std::string& deploy) const { pimpl->load_deployment(deploy); } /** Returns the amount of hosts in the platform */ -size_t Engine::get_host_count() +size_t Engine::get_host_count() const { return pimpl->hosts_.size(); } -std::vector Engine::get_all_hosts() +std::vector Engine::get_all_hosts() const { std::vector res; for (auto const& kv : pimpl->hosts_) @@ -156,7 +164,7 @@ std::vector Engine::get_all_hosts() return res; } -std::vector Engine::get_filtered_hosts(const std::function& filter) +std::vector Engine::get_filtered_hosts(const std::function& filter) const { std::vector hosts; for (auto const& kv : pimpl->hosts_) { @@ -181,7 +189,7 @@ void Engine::host_unregister(const std::string& name) * * @throw std::invalid_argument if the searched host does not exist. */ -Host* Engine::host_by_name(const std::string& name) +Host* Engine::host_by_name(const std::string& name) const { if (pimpl->hosts_.find(name) == pimpl->hosts_.end()) throw std::invalid_argument(std::string("Host not found: '") + name + std::string("'")); @@ -189,7 +197,7 @@ Host* Engine::host_by_name(const 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) +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; @@ -199,7 +207,7 @@ Host* Engine::host_by_name_or_null(const std::string& name) * * @throw std::invalid_argument if the searched link does not exist. */ -Link* Engine::link_by_name(const std::string& name) +Link* Engine::link_by_name(const std::string& name) const { if (pimpl->links_.find(name) == pimpl->links_.end()) throw std::invalid_argument(std::string("Link not found: ") + name); @@ -208,7 +216,7 @@ Link* Engine::link_by_name(const std::string& name) } /** @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) +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(); @@ -225,13 +233,13 @@ void Engine::link_unregister(const std::string& name) } /** @brief Returns the amount of storages in the platform */ -size_t Engine::get_storage_count() +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() +std::vector Engine::get_all_storages() const { std::vector res; for (auto const& kv : pimpl->storages_) @@ -243,7 +251,7 @@ std::vector Engine::get_all_storages() * * @throw std::invalid_argument if the searched storage does not exist. */ -Storage* Engine::storage_by_name(const std::string& name) +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); @@ -252,7 +260,7 @@ Storage* Engine::storage_by_name(const 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) +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(); @@ -269,13 +277,13 @@ void Engine::storage_unregister(const std::string& name) } /** @brief Returns the amount of links in the platform */ -size_t Engine::get_link_count() +size_t Engine::get_link_count() const { return pimpl->links_.size(); } /** @brief Returns the list of all links found in the platform */ -std::vector Engine::get_all_links() +std::vector Engine::get_all_links() const { std::vector res; for (auto const& kv : pimpl->links_) @@ -283,7 +291,7 @@ std::vector Engine::get_all_links() return res; } -std::vector Engine::get_filtered_links(const std::function& filter) +std::vector Engine::get_filtered_links(const std::function& filter) const { std::vector filtered_list; for (auto const& kv : pimpl->links_) { @@ -294,22 +302,21 @@ std::vector Engine::get_filtered_links(const std::function& return filtered_list; } -size_t Engine::get_actor_count() +size_t Engine::get_actor_count() const { return simix_global->process_list.size(); } -std::vector Engine::get_all_actors() +std::vector Engine::get_all_actors() const { 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 Engine::get_filtered_actors(const std::function& filter) const { std::vector actor_list; for (auto const& kv : simix_global->process_list) { @@ -319,7 +326,7 @@ std::vector Engine::get_filtered_actors(const std::functionnetzone_root_->get_iface(); } @@ -359,19 +366,19 @@ static NetZone* netzone_by_name_recursive(NetZone* current, const std::string& n } /** @brief Retrieve the NetZone of the given name (or nullptr if not found) */ -NetZone* Engine::netzone_by_name_or_null(const std::string& name) +NetZone* Engine::netzone_by_name_or_null(const std::string& name) const { return netzone_by_name_recursive(get_netzone_root(), name); } /** @brief Retrieve the netpoint of the given name (or nullptr if not found) */ -kernel::routing::NetPoint* Engine::netpoint_by_name_or_null(const std::string& name) +kernel::routing::NetPoint* Engine::netpoint_by_name_or_null(const std::string& name) const { auto netp = pimpl->netpoints_.find(name); return netp == pimpl->netpoints_.end() ? nullptr : netp->second; } -std::vector Engine::get_all_netpoints() +std::vector Engine::get_all_netpoints() const { std::vector res; for (auto const& kv : pimpl->netpoints_) @@ -402,6 +409,23 @@ void Engine::set_config(const std::string& str) { config::set_parse(str); } +void Engine::set_config(const std::string& name, int value) +{ + config::set_value(name.c_str(), value); +} +void Engine::set_config(const std::string& name, double value) +{ + config::set_value(name.c_str(), value); +} +void Engine::set_config(const std::string& name, bool value) +{ + config::set_value(name.c_str(), value); +} +void Engine::set_config(const std::string& name, const std::string& value) +{ + config::set_value(name.c_str(), value); +} + } // namespace s4u } // namespace simgrid @@ -435,24 +459,8 @@ double simgrid_get_clock() { return simgrid::s4u::Engine::get_clock(); } -int simgrid_get_actor_count() -{ - return simgrid::s4u::Engine::get_instance()->get_actor_count(); -} -void simgrid_get_all_hosts(size_t* host_count, sg_host_t** hosts) +int simgrid_get_actor_count() // XBT_ATTRIB_DEPRECATED_v330 { - simgrid::s4u::Engine* e = simgrid::s4u::Engine::get_instance(); - *host_count = e->get_host_count(); - std::vector list = e->get_all_hosts(); - - auto last = std::remove_if(begin(list), end(list), [](const simgrid::s4u::Host* host) { - return not host || not host->get_netpoint() || not host->get_netpoint()->is_host(); - }); - std::sort(begin(list), last, - [](const simgrid::s4u::Host* a, const simgrid::s4u::Host* b) { return a->get_name() < b->get_name(); }); - - *hosts = static_cast(xbt_malloc(sizeof(sg_host_t) * (*host_count))); - for (size_t i = 0; i < *host_count; i++) - (*hosts)[i] = list[i]; + return simgrid::s4u::Engine::get_instance()->get_actor_count(); }