X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/274ff3a104711075a837ddc6e677e713b3348354..d4836dbfe1376399c84e1522fc2c2a0f8e410c5c:/src/s4u/s4u_host.cpp diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp index a1cf532612..38b14b2e10 100644 --- a/src/s4u/s4u_host.cpp +++ b/src/s4u/s4u_host.cpp @@ -9,14 +9,14 @@ #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.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" @@ -33,8 +33,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 +42,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); } @@ -54,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; } @@ -72,24 +70,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 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(){ @@ -123,7 +123,8 @@ bool Host::isOn() { return this->pimpl_cpu->isOn(); } -int Host::pstatesCount() const { +int Host::getPstatesCount() const +{ return this->pimpl_cpu->getNbPStates(); } @@ -134,10 +135,8 @@ int Host::pstatesCount() const { */ void Host::actorList(std::vector* whereto) { - smx_actor_t actor = NULL; - xbt_swag_foreach(actor, this->extension()->process_list) - { - whereto->push_back(actor->ciface()); + for (auto& actor : this->extension()->process_list) { + whereto->push_back(actor.ciface()); } } @@ -153,66 +152,48 @@ void Host::actorList(std::vector* whereto) * 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); 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()); + for (auto const& link : links) + XBT_CDEBUG(surf_route, "Link %s", link->getCname()); } } -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([this] { - 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, key, value] { - this->pimpl_->setProperty(key, value); - }); + +void Host::setProperty(std::string key, std::string 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) { - list->push_back(actor->iface()); + for (auto& actor : this->extension()->process_list) { + list->push_back(actor.iface()); } } @@ -225,12 +206,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(); } @@ -242,33 +225,46 @@ 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 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 this->pimpl_cpu->getLoad(); } } // namespace simgrid