X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/12db8a46fc2350fc54dc04b12fc5580239ef23c4..40616078da72e823931c1fb884949054699ec39d:/src/s4u/s4u_host.cpp diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp index 72c3dfcb37..e3c363563c 100644 --- a/src/s4u/s4u_host.cpp +++ b/src/s4u/s4u_host.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2006-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2006-2017. 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. */ @@ -8,13 +7,13 @@ #include #include -#include +#include #include "simgrid/s4u/engine.hpp" #include "simgrid/s4u/host.hpp" #include "simgrid/s4u/storage.hpp" #include "simgrid/simix.hpp" -#include "src/kernel/routing/NetCard.hpp" +#include "src/kernel/routing/NetPoint.hpp" #include "src/msg/msg_private.h" #include "src/simix/ActorImpl.hpp" #include "src/simix/smx_private.h" @@ -24,9 +23,8 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_route); -std::unordered_map host_list; // FIXME: move it to Engine +std::map host_list; // FIXME: move it to Engine -int MSG_HOST_LEVEL = -1; int USER_HOST_LEVEL = -1; namespace simgrid { @@ -40,12 +38,14 @@ namespace s4u { simgrid::xbt::signal Host::onCreation; simgrid::xbt::signal Host::onDestruction; simgrid::xbt::signal Host::onStateChange; +simgrid::xbt::signal Host::onSpeedChange; 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; + new simgrid::surf::HostImpl(this); } Host::~Host() @@ -53,8 +53,8 @@ Host::~Host() xbt_assert(currentlyDestroying_, "Please call h->destroy() instead of manually deleting it."); delete pimpl_; - if (pimpl_netcard != nullptr) // not removed yet by a children class - simgrid::s4u::Engine::instance()->netcardUnregister(pimpl_netcard); + if (pimpl_netpoint != nullptr) // not removed yet by a children class + simgrid::s4u::Engine::instance()->netpointUnregister(pimpl_netpoint); delete pimpl_cpu; delete mounts; } @@ -101,16 +101,21 @@ Host *Host::current(){ void Host::turnOn() { if (isOff()) { - simgrid::simix::kernelImmediate([&]{ + simgrid::simix::kernelImmediate([this] { this->extension()->turnOn(); this->pimpl_cpu->turnOn(); + onStateChange(*this); }); } } void Host::turnOff() { if (isOn()) { - simgrid::simix::kernelImmediate(std::bind(SIMIX_host_off, this, SIMIX_process_self())); + smx_actor_t self = SIMIX_process_self(); + simgrid::simix::kernelImmediate([this, self] { + SIMIX_host_off(this, self); + onStateChange(*this); + }); } } @@ -126,22 +131,30 @@ int Host::pstatesCount() const { * \brief Find a route toward another host * * \param dest [IN] where to - * \param route [OUT] where to store the list of links (must exist, cannot be nullptr). + * \param links [OUT] where to store the list of links (must exist, cannot be nullptr). * \param latency [OUT] where to store the latency experienced on the path (or nullptr if not interested) * It is the caller responsibility to initialize latency to 0 (we add to provided route) - * \pre route!=nullptr + * \pre links!=nullptr * * walk through the routing components tree and find a route between hosts * by calling each "get_route" function in each routing component. */ void Host::routeTo(Host* dest, std::vector* links, double* latency) { - simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(pimpl_netcard, dest->pimpl_netcard, links, latency); + std::vector linkImpls; + this->routeTo(dest, &linkImpls, latency); + for (surf::LinkImpl* 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) +{ + simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(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):", cname(), dest->cname(), (latency == nullptr ? -1 : *latency)); for (auto link : *links) - XBT_CDEBUG(surf_route, "Link %s", link->getName()); + XBT_CDEBUG(surf_route, "Link %s", link->cname()); } } @@ -165,7 +178,9 @@ boost::unordered_map const& Host::mountedStorages() { /** Get the properties assigned to a host */ xbt_dict_t Host::properties() { - return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getProperties(); }); + return simgrid::simix::kernelImmediate([this] { + return this->pimpl_->getProperties(); + }); } /** Retrieve the property value (or nullptr if not set) */ @@ -173,37 +188,33 @@ const char*Host::property(const char*key) { return this->pimpl_->getProperty(key); } void Host::setProperty(const char*key, const char *value){ - simgrid::simix::kernelImmediate([&] { this->pimpl_->setProperty(key, value); }); -} - -/** Get the processes attached to the host */ -xbt_swag_t Host::processes() -{ - return simgrid::simix::kernelImmediate([&]() { - return this->extension()->process_list; + simgrid::simix::kernelImmediate([this, key, value] { + this->pimpl_->setProperty(key, value); }); } -/** Get the peak power of a host */ -double Host::getPstateSpeedCurrent() +/** Get the processes attached to the host */ +void Host::processes(std::vector* list) { - return simgrid::simix::kernelImmediate([&] { - return this->pimpl_cpu->getPstateSpeedCurrent(); - }); + smx_actor_t actor = NULL; + xbt_swag_foreach(actor, this->extension()->process_list) { + list->push_back(actor->iface()); + } } -/** Get one power peak (in flops/s) of a host at a given pstate */ +/** @brief Get the peak processor speed (in flops/s), at the specified pstate */ double Host::getPstateSpeed(int pstate_index) { - return simgrid::simix::kernelImmediate([&] { + return simgrid::simix::kernelImmediate([this, pstate_index] { return this->pimpl_cpu->getPstateSpeed(pstate_index); }); } -/** @brief Get the speed of the cpu associated to a host */ +/** @brief Get the peak processor speed (in flops/s), at the current pstate */ double Host::speed() { return pimpl_cpu->getSpeed(1.0); } + /** @brief Returns the number of core of the processor. */ int Host::coreCount() { return pimpl_cpu->coreCount(); @@ -212,14 +223,14 @@ int Host::coreCount() { /** @brief Set the pstate at which the host should run */ void Host::setPstate(int pstate_index) { - simgrid::simix::kernelImmediate(std::bind( - &simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index - )); + simgrid::simix::kernelImmediate([this, pstate_index] { + this->pimpl_cpu->setPState(pstate_index); + }); } /** @brief Retrieve the pstate at which the host is currently running */ int Host::pstate() { - return pimpl_cpu->getPState(); + return this->pimpl_cpu->getPState(); } /** @@ -229,7 +240,9 @@ int Host::pstate() */ xbt_dict_t Host::mountedStoragesAsDict() { - return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getMountedStorageList(); }); + return simgrid::simix::kernelImmediate([this] { + return this->pimpl_->getMountedStorageList(); + }); } /** @@ -237,9 +250,11 @@ xbt_dict_t Host::mountedStoragesAsDict() * \brief Returns the list of storages attached to an host. * \return a dict containing all storages attached to the host */ -xbt_dynar_t Host::attachedStorages() +void Host::attachedStorages(std::vector* storages) { - return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getAttachedStorageList(); }); + simgrid::simix::kernelImmediate([this, storages] { + this->pimpl_->getAttachedStorageList(storages); + }); } } // namespace simgrid