X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/210da270d0339479db706757d8c836621bb138c9..c139b4e36702f58bd8a75e87cf537959da82dbc9:/src/s4u/s4u_host.cpp diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp index 10eec1db8d..5342c54ae5 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,25 +7,22 @@ #include #include -#include +#include -#include "simgrid/s4u/engine.hpp" -#include "simgrid/s4u/host.hpp" -#include "simgrid/s4u/storage.hpp" +#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.h" +#include "src/msg/msg_private.hpp" #include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" #include "xbt/log.h" XBT_LOG_EXTERNAL_CATEGORY(surf_route); -std::unordered_map host_list; // FIXME: move it to Engine - -int MSG_HOST_LEVEL = -1; int USER_HOST_LEVEL = -1; namespace simgrid { @@ -40,12 +36,13 @@ 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; + Engine::getInstance()->addHost(std::string(name_), this); new simgrid::surf::HostImpl(this); } @@ -55,7 +52,7 @@ Host::~Host() delete pimpl_; if (pimpl_netpoint != nullptr) // not removed yet by a children class - simgrid::s4u::Engine::instance()->netpointUnregister(pimpl_netpoint); + simgrid::s4u::Engine::getInstance()->netpointUnregister(pimpl_netpoint); delete pimpl_cpu; delete mounts; } @@ -70,27 +67,29 @@ Host::~Host() */ void Host::destroy() { - if (!currentlyDestroying_) { + 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 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) { - if (host_list.find(name) == host_list.end()) - return nullptr; - return host_list.at(name); + return Engine::getInstance()->hostByNameOrNull(name); } Host *Host::current(){ @@ -102,9 +101,9 @@ Host *Host::current(){ void Host::turnOn() { if (isOff()) { - simgrid::simix::kernelImmediate([&]{ + simgrid::simix::kernelImmediate([this] { this->extension()->turnOn(); - this->pimpl_cpu->turnOn(); + this->pimpl_cpu->turn_on(); onStateChange(*this); }); } @@ -113,7 +112,7 @@ void Host::turnOn() { void Host::turnOff() { if (isOn()) { smx_actor_t self = SIMIX_process_self(); - simgrid::simix::kernelImmediate([&] { + simgrid::simix::kernelImmediate([this, self] { SIMIX_host_off(this, self); onStateChange(*this); }); @@ -121,13 +120,26 @@ void Host::turnOff() { } bool Host::isOn() { - return this->pimpl_cpu->isOn(); + return this->pimpl_cpu->is_on(); } -int Host::pstatesCount() const { +int Host::getPstatesCount() const +{ return this->pimpl_cpu->getNbPStates(); } +/** + * \brief Return the list of actors attached to an host. + * + * \param whereto a vector in which we should push actors living on that host + */ +void Host::actorList(std::vector* whereto) +{ + for (auto& actor : this->extension()->process_list) { + whereto->push_back(actor.ciface()); + } +} + /** * \brief Find a route toward another host * @@ -140,120 +152,125 @@ int Host::pstatesCount() const { * 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) +void Host::routeTo(Host* dest, std::vector& links, double* latency) { std::vector linkImpls; - this->routeTo(dest, &linkImpls, latency); - for (surf::LinkImpl* l : linkImpls) - links->push_back(&l->piface_); + this->routeTo(dest, linkImpls, latency); + for (surf::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):", cname(), dest->cname(), + XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", get_cname(), dest->get_cname(), (latency == nullptr ? -1 : *latency)); - for (auto link : *links) - XBT_CDEBUG(surf_route, "Link %s", link->getName()); + for (auto const& link : links) + XBT_CDEBUG(surf_route, "Link %s", link->get_cname()); } } -boost::unordered_map const& Host::mountedStorages() { - if (mounts == nullptr) { - mounts = new boost::unordered_map (); - - xbt_dict_t dict = this->mountedStoragesAsDict(); - - xbt_dict_cursor_t cursor; - char *mountname; - char *storagename; - xbt_dict_foreach(dict, cursor, mountname, storagename) { - mounts->insert({mountname, &Storage::byName(storagename)}); - } - xbt_dict_free(&dict); - } - - return *mounts; -} - /** Get the properties assigned to a host */ -xbt_dict_t Host::properties() { - return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getProperties(); }); +std::map* Host::getProperties() +{ + return simgrid::simix::kernelImmediate([this] { return this->pimpl_->getProperties(); }); } /** Retrieve the property value (or nullptr if not set) */ -const char*Host::property(const char*key) { +const char* Host::getProperty(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() +void Host::setProperty(std::string key, std::string value) { - 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::getProcesses(std::vector* list) { - return simgrid::simix::kernelImmediate([&] { - return this->pimpl_cpu->getPstateSpeedCurrent(); - }); + for (auto& 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 */ -double Host::speed() { +/** @brief Get the peak processor speed (in flops/s), at the current pstate */ +double Host::getSpeed() +{ return pimpl_cpu->getSpeed(1.0); } + /** @brief Returns the number of core of the processor. */ -int Host::coreCount() { +int Host::getCoreCount() +{ return pimpl_cpu->coreCount(); } /** @brief Set the pstate at which the host should run */ void Host::setPstate(int pstate_index) { - simgrid::simix::kernelImmediate([&](){ + 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() +int Host::getPstate() { return this->pimpl_cpu->getPState(); } /** * \ingroup simix_storage_management - * \brief Returns the list of storages mounted on an host. - * \return a dict containing all storages mounted on the host + * \brief Returns the list of storages attached to an host. + * \return a vector containing all storages attached to the host */ -xbt_dict_t Host::mountedStoragesAsDict() +std::vector Host::get_attached_storages() { - return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getMountedStorageList(); }); + return simgrid::simix::kernelImmediate([this] { return this->pimpl_->get_attached_storages(); }); } -/** - * \ingroup simix_storage_management - * \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::getAttachedStorages(std::vector* 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() +{ + if (mounts == nullptr) { + mounts = new std::unordered_map(); + for (auto const& m : this->pimpl_->storage_) { + mounts->insert({m.first, &m.second->piface_}); + } + } + return *mounts; +} + +void Host::execute(double flops) +{ + Host* host_list[1] = {this}; + double flops_list[1] = {flops}; + smx_activity_t s = simcall_execution_parallel_start(nullptr /*name*/, 1, host_list, flops_list, + nullptr /*comm_sizes */, -1.0, -1 /*timeout*/); + simcall_execution_wait(s); +} + +double Host::getLoad() { - return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getAttachedStorageList(); }); + return this->pimpl_cpu->get_load(); } } // namespace simgrid