X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b4ac368a8512fa8ec30d04f55c4a3c660e9439b9..d809b28aed8516d8e281c908502638df19e784dd:/src/s4u/s4u_engine.cpp diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp index 7695d85c0b..77c71e577e 100644 --- a/src/s4u/s4u_engine.cpp +++ b/src/s4u/s4u_engine.cpp @@ -1,12 +1,14 @@ /* s4u::Engine Simulation Engine and global functions. */ -/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2018. 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. */ -#include "instr/instr_interface.h" +#include "instr/instr_interface.hpp" #include "mc/mc.h" +#include "simgrid/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/NetZoneImpl.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Mailbox.hpp" @@ -14,10 +16,8 @@ #include "simgrid/s4u/Storage.hpp" #include "simgrid/simix.h" #include "src/kernel/EngineImpl.hpp" -#include "src/kernel/routing/NetPoint.hpp" -#include "src/kernel/routing/NetZoneImpl.hpp" #include "src/surf/network_interface.hpp" -#include "surf/surf.h" // routing_platf. FIXME:KILLME. SOON +#include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON XBT_LOG_NEW_CATEGORY(s4u,"Log channels of the S4U (Simgrid for you) interface"); @@ -26,10 +26,10 @@ namespace s4u { xbt::signal onPlatformCreated; xbt::signal onSimulationEnd; xbt::signal onTimeAdvance; +xbt::signal onDeadlock; Engine *Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */ - Engine::Engine(int *argc, char **argv) { xbt_assert(s4u::Engine::instance_ == nullptr, "It is currently forbidden to create more than one instance of s4u::Engine"); TRACE_global_init(); @@ -48,8 +48,9 @@ Engine::~Engine() Engine* Engine::getInstance() { if (s4u::Engine::instance_ == nullptr) - new Engine(0,nullptr); - return s4u::Engine::instance_; + return new Engine(0, nullptr); + else + return s4u::Engine::instance_; } void Engine::shutdown() { @@ -79,20 +80,104 @@ void Engine::loadDeployment(const char *deploy) { SIMIX_launch_application(deploy); } -// FIXME: The following duplicates the content of s4u::Host -extern std::map host_list; /** @brief Returns the amount of hosts in the platform */ size_t Engine::getHostCount() { - return host_list.size(); + return pimpl->hosts_.size(); } -/** @brief Fills the passed list with all hosts found in the platform */ -void Engine::getHostList(std::vector* list) +/** @brief Fills the passed list with all hosts found in the platform + * @deprecated Please prefer Engine::getAllHosts() + */ +void XBT_ATTRIB_DEPRECATED_v322("Engine::getHostList() is deprecated in favor of Engine::getAllHosts(). Please switch before v3.22") +Engine::getHostList(std::vector* list) { - for (auto const& kv : host_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::getAllHosts() +{ + std::vector res; + for (auto const& kv : pimpl->hosts_) + res.push_back(kv.second); + return res; +} + +void Engine::addHost(std::string name, simgrid::s4u::Host* host) +{ + pimpl->hosts_[name] = host; +} + +void Engine::delHost(std::string name) +{ + pimpl->hosts_.erase(name); +} + +simgrid::s4u::Host* Engine::hostByName(std::string name) +{ + return pimpl->hosts_.at(name); // Will raise a std::out_of_range if the host does not exist +} + +simgrid::s4u::Host* Engine::hostByNameOrNull(std::string name) +{ + auto host = pimpl->hosts_.find(name); + return host == pimpl->hosts_.end() ? nullptr : host->second; +} + +/** @brief Returns the list of all storages found in the platform */ +std::vector Engine::getAllStorages() +{ + std::vector res; + for (auto const& kv : pimpl->storages_) + res.push_back(kv.second); + return res; +} + +simgrid::s4u::Storage* Engine::storageByName(std::string name) +{ + return pimpl->storages_.at(name); // Will raise a std::out_of_range if the host does not exist +} + +simgrid::s4u::Storage* Engine::storageByNameOrNull(std::string name) +{ + auto storage = pimpl->storages_.find(name); + return storage == pimpl->storages_.end() ? nullptr : storage->second; +} + +void Engine::addStorage(std::string name, simgrid::s4u::Storage* storage) +{ + pimpl->storages_[name] = storage; +} + +void Engine::delStorage(std::string name) +{ + pimpl->storages_.erase(name); +} + +/** @brief Returns the amount of links in the platform */ +size_t Engine::getLinkCount() +{ + return kernel::resource::LinkImpl::linksCount(); +} + +/** @brief Fills the passed list with all links found in the platform + * + * @deprecated. Prefer Engine::getAllLinks() */ +void XBT_ATTRIB_DEPRECATED_v322("Engine::getLinkList() is deprecated in favor of Engine::getAllLinks(). Please switch before v3.22") +Engine::getLinkList(std::vector* list) +{ + kernel::resource::LinkImpl::linksList(list); +} + +/** @brief Returns the list of all links found in the platform */ +std::vector Engine::getAllLinks() +{ + std::vector res; + kernel::resource::LinkImpl::linksList(&res); + return res; +} + void Engine::run() { if (MC_is_active()) { MC_run(); @@ -108,7 +193,7 @@ s4u::NetZone* Engine::getNetRoot() static s4u::NetZone* netzoneByNameRecursive(s4u::NetZone* current, const char* name) { - if (not strcmp(current->getCname(), name)) + if (not strcmp(current->get_cname(), name)) return current; for (auto const& elem : *(current->getChildren())) { @@ -143,14 +228,14 @@ void Engine::getNetpointList(std::vector* l void Engine::netpointRegister(simgrid::kernel::routing::NetPoint* point) { // simgrid::simix::kernelImmediate([&]{ FIXME: this segfaults in set_thread - pimpl->netpoints_[point->getName()] = point; + pimpl->netpoints_[point->get_name()] = point; // }); } /** @brief Unregister a given netpoint */ void Engine::netpointUnregister(simgrid::kernel::routing::NetPoint* point) { simgrid::simix::kernelImmediate([this, point] { - pimpl->netpoints_.erase(point->getName()); + pimpl->netpoints_.erase(point->get_name()); delete point; }); }