X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e2d0f730f1bdbc0b207f6ac26c0b5ff4f0765fa..bbc57f5380f908b965ad6b3e0b47d374b739a526:/src/s4u/s4u_Engine.cpp diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index afdc16fc64..ccdce477ce 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. */ @@ -34,14 +34,13 @@ xbt::signal 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"); TRACE_global_init(); SIMIX_global_init(argc, argv); - pimpl = new kernel::EngineImpl(); s4u::Engine::instance_ = this; } @@ -97,16 +96,7 @@ 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; @@ -136,7 +126,7 @@ void Engine::host_unregister(std::string name) pimpl->hosts_.erase(name); } -/** @brief Find an host from its name. +/** @brief Find a host from its name. * * @throw std::invalid_argument if the searched host does not exist. */ @@ -147,7 +137,7 @@ simgrid::s4u::Host* Engine::host_by_name(std::string name) return pimpl->hosts_.at(name); } -/** @brief Find an host from its name (or nullptr if that host does not exist) */ +/** @brief Find a host from its name (or nullptr if that host does not exist) */ simgrid::s4u::Host* Engine::host_by_name_or_null(std::string name) { auto host = pimpl->hosts_.find(name);