X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/50112236f62426d55750da4901ab88456a272e7f..a4eb5efea24b01bda48fb4dc7c7600de78b4578b:/src/s4u/s4u_host.cpp diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp index e3c363563c..a1520f952b 100644 --- a/src/s4u/s4u_host.cpp +++ b/src/s4u/s4u_host.cpp @@ -9,9 +9,9 @@ #include -#include "simgrid/s4u/engine.hpp" -#include "simgrid/s4u/host.hpp" -#include "simgrid/s4u/storage.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" @@ -23,8 +23,6 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_route); -std::map host_list; // FIXME: move it to Engine - int USER_HOST_LEVEL = -1; namespace simgrid { @@ -35,6 +33,8 @@ 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; @@ -54,7 +54,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; } @@ -69,7 +69,7 @@ Host::~Host() */ void Host::destroy() { - if (!currentlyDestroying_) { + if (not currentlyDestroying_) { currentlyDestroying_ = true; onDestruction(*this); host_list.erase(name_); @@ -123,10 +123,25 @@ bool Host::isOn() { return this->pimpl_cpu->isOn(); } -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) +{ + smx_actor_t actor = NULL; + xbt_swag_foreach(actor, this->extension()->process_list) + { + whereto->push_back(actor->ciface()); + } +} + /** * \brief Find a route toward another host * @@ -146,55 +161,40 @@ void Host::routeTo(Host* dest, std::vector* links, double* 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(), + XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", getCname(), dest->getCname(), (latency == nullptr ? -1 : *latency)); for (auto link : *links) XBT_CDEBUG(surf_route, "Link %s", link->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() { +xbt_dict_t 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, key, value] { - this->pimpl_->setProperty(key, value); - }); + +void Host::setProperty(const char* key, const char* value) +{ + simgrid::simix::kernelImmediate([this, key, value] { this->pimpl_->setProperty(key, value); }); } /** Get the processes attached to the host */ -void Host::processes(std::vector* list) +void Host::getProcesses(std::vector* list) { smx_actor_t actor = NULL; xbt_swag_foreach(actor, this->extension()->process_list) { @@ -211,12 +211,14 @@ double Host::getPstateSpeed(int pstate_index) } /** @brief Get the peak processor speed (in flops/s), at the current pstate */ -double Host::speed() { +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(); } @@ -228,33 +230,32 @@ void Host::setPstate(int 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() +void Host::getAttachedStorages(std::vector* storages) { - return simgrid::simix::kernelImmediate([this] { - return this->pimpl_->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 - */ -void Host::attachedStorages(std::vector* storages) +std::unordered_map const& Host::getMountedStorages() { - simgrid::simix::kernelImmediate([this, storages] { - this->pimpl_->getAttachedStorageList(storages); - }); + if (mounts == nullptr) { + mounts = new std::unordered_map(); + for (auto m : this->pimpl_->storage_) { + mounts->insert({m.first, &m.second->piface_}); + } + } + return *mounts; } } // namespace simgrid