X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a0623831eea46d64e95390771cf0cc5bef67ccb1..8d01bd80335f89f2c28cbd1cc00094b5edd8d2de:/src/s4u/s4u_host.cpp diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp index 82d6d66ca2..78e9b73f01 100644 --- a/src/s4u/s4u_host.cpp +++ b/src/s4u/s4u_host.cpp @@ -1,25 +1,14 @@ -/* 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 -#include -#include - -#include - +#include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Host.hpp" -#include "simgrid/s4u/Storage.hpp" -#include "simgrid/simix.hpp" -#include "src/kernel/routing/NetPoint.hpp" -#include "src/msg/msg_private.hpp" -#include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_private.hpp" +#include "src/simix/smx_host_private.hpp" #include "src/surf/HostImpl.hpp" -#include "src/surf/cpu_interface.hpp" -#include "xbt/log.h" + +#include XBT_LOG_EXTERNAL_CATEGORY(surf_route); @@ -33,8 +22,6 @@ template class Extendable; namespace s4u { -std::map host_list; // FIXME: move it to Engine - simgrid::xbt::signal Host::onCreation; simgrid::xbt::signal Host::onDestruction; simgrid::xbt::signal Host::onStateChange; @@ -44,7 +31,7 @@ Host::Host(const char* name) : name_(name) { xbt_assert(Host::by_name_or_null(name) == nullptr, "Refusing to create a second host named '%s'.", name); - host_list[name_] = this; + Engine::getInstance()->addHost(std::string(name_), this); new simgrid::surf::HostImpl(this); } @@ -72,27 +59,26 @@ void Host::destroy() if (not currentlyDestroying_) { currentlyDestroying_ = true; onDestruction(*this); - host_list.erase(name_); + Engine::getInstance()->delHost(std::string(name_)); delete this; } } Host* Host::by_name(std::string name) { - return host_list.at(name); // Will raise a std::out_of_range if the host does not exist + return Engine::getInstance()->hostByName(name); } Host* Host::by_name(const char* name) { - return host_list.at(std::string(name)); // Will raise a std::out_of_range if the host does not exist + return Engine::getInstance()->hostByName(std::string(name)); } Host* Host::by_name_or_null(const char* name) { - return by_name_or_null(std::string(name)); + return Engine::getInstance()->hostByNameOrNull(std::string(name)); } Host* Host::by_name_or_null(std::string name) { - auto host = host_list.find(name); - return host == host_list.end() ? nullptr : host->second; + return Engine::getInstance()->hostByNameOrNull(name); } Host *Host::current(){ @@ -106,7 +92,7 @@ void Host::turnOn() { if (isOff()) { simgrid::simix::kernelImmediate([this] { this->extension()->turnOn(); - this->pimpl_cpu->turnOn(); + this->pimpl_cpu->turn_on(); onStateChange(*this); }); } @@ -123,7 +109,7 @@ void Host::turnOff() { } bool Host::isOn() { - return this->pimpl_cpu->isOn(); + return this->pimpl_cpu->is_on(); } int Host::getPstatesCount() const @@ -157,21 +143,21 @@ void Host::actorList(std::vector* whereto) */ void Host::routeTo(Host* dest, std::vector& links, double* latency) { - std::vector linkImpls; + std::vector linkImpls; this->routeTo(dest, linkImpls, latency); - for (surf::LinkImpl* const& l : linkImpls) + for (kernel::resource::LinkImpl* const& l : linkImpls) links.push_back(&l->piface_); } /** @brief Just like Host::routeTo, but filling an array of link implementations */ -void Host::routeTo(Host* dest, std::vector& links, double* latency) +void Host::routeTo(Host* dest, std::vector& links, double* latency) { - simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(pimpl_netpoint, dest->pimpl_netpoint, links, latency); + simgrid::kernel::routing::NetZoneImpl::get_global_route(pimpl_netpoint, dest->pimpl_netpoint, links, latency); if (XBT_LOG_ISENABLED(surf_route, xbt_log_priority_debug)) { - XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", getCname(), dest->getCname(), + XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", get_cname(), dest->get_cname(), (latency == nullptr ? -1 : *latency)); for (auto const& link : links) - XBT_CDEBUG(surf_route, "Link %s", link->getCname()); + XBT_CDEBUG(surf_route, "Link %s", link->get_cname()); } } @@ -200,6 +186,13 @@ void Host::getProcesses(std::vector* list) } } +/** @brief Returns how many actors have been launched on this host */ +// FIXME: Specify whether the user should expect only non-daemon actors here! +int Host::get_actor_count() +{ + return this->extension()->process_list.size(); +} + /** @brief Get the peak processor speed (in flops/s), at the specified pstate */ double Host::getPstateSpeed(int pstate_index) { @@ -208,7 +201,7 @@ double Host::getPstateSpeed(int pstate_index) }); } -/** @brief Get the peak processor speed (in flops/s), at the current pstate */ +/** @brief Get the peak processor speed (under full load (=1.0), in flops/s), at the current pstate */ double Host::getSpeed() { return pimpl_cpu->getSpeed(1.0); @@ -238,11 +231,17 @@ int Host::getPstate() * \brief Returns the list of storages attached to an host. * \return a vector containing all storages attached to the host */ +std::vector Host::get_attached_storages() +{ + return simgrid::simix::kernelImmediate([this] { return this->pimpl_->get_attached_storages(); }); +} + void Host::getAttachedStorages(std::vector* storages) { - simgrid::simix::kernelImmediate([this, storages] { - this->pimpl_->getAttachedStorageList(storages); - }); + std::vector local_storages = + simgrid::simix::kernelImmediate([this] { return this->pimpl_->get_attached_storages(); }); + for (auto elm : local_storages) + storages->push_back(elm); } std::unordered_map const& Host::getMountedStorages() @@ -267,7 +266,7 @@ void Host::execute(double flops) double Host::getLoad() { - return this->pimpl_cpu->getLoad(); + return this->pimpl_cpu->get_load(); } } // namespace simgrid