X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96b18f4b65694f66c8aea2d702b6f087fdcf9cb7..5bc3597e1513c7b94497ae0ea819e5fa2e28058a:/src/s4u/s4u_host.cpp diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp index 3181507957..763fe9841c 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,21 +7,22 @@ #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/surf/HostImpl.hpp" -#include "xbt/log.h" +#include "src/kernel/routing/NetPoint.hpp" #include "src/msg/msg_private.h" #include "src/simix/ActorImpl.hpp" #include "src/simix/smx_private.h" +#include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" -#include "simgrid/s4u/host.hpp" -#include "simgrid/s4u/storage.hpp" +#include "xbt/log.h" -xbt_dict_t host_list = nullptr; // FIXME: move it to Engine +XBT_LOG_EXTERNAL_CATEGORY(surf_route); -int MSG_HOST_LEVEL = -1; int USER_HOST_LEVEL = -1; namespace simgrid { @@ -33,39 +33,62 @@ 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; +simgrid::xbt::signal Host::onSpeedChange; Host::Host(const char* name) : name_(name) { - xbt_assert(sg_host_by_name(name) == nullptr, "Refusing to create a second host named '%s'.", name); - xbt_dict_set(host_list, name, this, nullptr); + 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() { +Host::~Host() +{ + xbt_assert(currentlyDestroying_, "Please call h->destroy() instead of manually deleting it."); + + delete pimpl_; + if (pimpl_netpoint != nullptr) // not removed yet by a children class + simgrid::s4u::Engine::getInstance()->netpointUnregister(pimpl_netpoint); delete pimpl_cpu; - delete pimpl_netcard; delete mounts; } -Host *Host::by_name(std::string name) { - Host* host = Host::by_name_or_null(name.c_str()); - // TODO, raise an exception instead? - if (host == nullptr) - xbt_die("No such host: %s", name.c_str()); - return host; +/** @brief Fire the required callbacks and destroy the object + * + * Don't delete directly an Host, call h->destroy() instead. + * + * This is cumbersome but this is the simplest solution to ensure that the + * onDestruction() callback receives a valid object (because of the destructor + * order in a class hierarchy). + */ +void Host::destroy() +{ + if (not currentlyDestroying_) { + currentlyDestroying_ = true; + onDestruction(*this); + host_list.erase(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 } Host* Host::by_name_or_null(const char* name) { - if (host_list == nullptr) - host_list = xbt_dict_new_homogeneous([](void*p) { - simgrid::s4u::Host* host = static_cast(p); - simgrid::s4u::Host::onDestruction(*host); - delete host; - }); - return (Host*) xbt_dict_get_or_null(host_list, name); + return by_name_or_null(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; } Host *Host::current(){ @@ -77,16 +100,21 @@ Host *Host::current(){ void Host::turnOn() { if (isOff()) { - simgrid::simix::kernelImmediate([&]{ + simgrid::simix::kernelImmediate([this] { this->extension()->turnOn(); - 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); + }); } } @@ -94,130 +122,146 @@ bool Host::isOn() { return this->pimpl_cpu->isOn(); } -int Host::pstatesCount() const { +int Host::getPstatesCount() const +{ return this->pimpl_cpu->getNbPStates(); } -boost::unordered_map const& Host::mountedStorages() { - if (mounts == nullptr) { - mounts = new boost::unordered_map (); +/** + * \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) +{ + smx_actor_t actor = NULL; + xbt_swag_foreach(actor, this->extension()->process_list) + { + whereto->push_back(actor->ciface()); + } +} - xbt_dict_t dict = this->mountedStoragesAsDict(); +/** + * \brief Find a route toward another host + * + * \param dest [IN] where to + * \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 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) +{ + std::vector linkImpls; + this->routeTo(dest, &linkImpls, latency); + for (surf::LinkImpl* const& l : linkImpls) + links->push_back(&l->piface_); +} - 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); +/** @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):", getCname(), dest->getCname(), + (latency == nullptr ? -1 : *latency)); + for (auto const& link : *links) + XBT_CDEBUG(surf_route, "Link %s", link->cname()); } - - return *mounts; } /** Get the properties assigned to a host */ -xbt_dict_t Host::properties() { - return simgrid::simix::kernelImmediate([&] { - simgrid::surf::HostImpl* surf_host = this->extension(); - return surf_host->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) { - simgrid::surf::HostImpl* surf_host = this->extension(); - return surf_host->getProperty(key); -} -void Host::setProperty(const char*key, const char *value){ - simgrid::simix::kernelImmediate([&] { - simgrid::surf::HostImpl* surf_host = this->extension(); - surf_host->setProperty(key,value); - }); +const char* Host::getProperty(const char* key) +{ + return this->pimpl_->getProperty(key); } -/** 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(); - }); + 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 */ -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(std::bind( - &simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index - )); -} -/** @brief Retrieve the pstate at which the host is currently running */ -int Host::pstate() -{ - return pimpl_cpu->getPState(); -} - -void Host::parameters(vm_params_t params) -{ - simgrid::simix::kernelImmediate([&]() { - this->extension()->getParams(params); + simgrid::simix::kernelImmediate([this, pstate_index] { + this->pimpl_cpu->setPState(pstate_index); }); } - -void Host::setParameters(vm_params_t params) +/** @brief Retrieve the pstate at which the host is currently running */ +int Host::getPstate() { - simgrid::simix::kernelImmediate([&]() { - this->extension()->setParams(params); - }); + 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() +void Host::getAttachedStorages(std::vector* storages) { - return simgrid::simix::kernelImmediate([&] { - return this->extension()->getMountedStorageList(); + simgrid::simix::kernelImmediate([this, storages] { + this->pimpl_->getAttachedStorageList(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() +std::unordered_map const& Host::getMountedStorages() { - return simgrid::simix::kernelImmediate([&] { - return this->extension()->getAttachedStorageList(); - }); + 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); } } // namespace simgrid