X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/665b37c47175d0abd08d1252180d4d37bf9a342a..afd3a47e007a0f91d206cc2e47b69b4b86970fc2:/src/s4u/s4u_host.cpp diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp index d38b8e03f2..29d104a225 100644 --- a/src/s4u/s4u_host.cpp +++ b/src/s4u/s4u_host.cpp @@ -10,17 +10,22 @@ #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_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 { @@ -34,37 +39,58 @@ 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() { +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::instance()->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 (!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) { - return (Host*) xbt_dict_get_or_null(host_list, name); + return by_name_or_null(std::string(name)); } -Host* Host::by_name_or_create(const char* name) +Host* Host::by_name_or_null(std::string name) { - Host* host = by_name_or_null(name); - if (host == nullptr) { - host = new Host(name); - xbt_dict_set(host_list, name, host, nullptr); - } - return host; + if (host_list.find(name) == host_list.end()) + return nullptr; + return host_list.at(name); } Host *Host::current(){ @@ -76,16 +102,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); + }); } } @@ -97,6 +128,37 @@ int Host::pstatesCount() const { return this->pimpl_cpu->getNbPStates(); } +/** + * \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* 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->cname()); + } +} + boost::unordered_map const& Host::mountedStorages() { if (mounts == nullptr) { mounts = new boost::unordered_map (); @@ -117,28 +179,25 @@ boost::unordered_map const& Host::mountedStorages() { /** 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(); + 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); + return this->pimpl_->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); + simgrid::simix::kernelImmediate([this, key, value] { + this->pimpl_->setProperty(key, value); }); } /** Get the processes attached to the host */ xbt_swag_t Host::processes() { - return simgrid::simix::kernelImmediate([&]() { + return simgrid::simix::kernelImmediate([this] { return this->extension()->process_list; }); } @@ -146,7 +205,7 @@ xbt_swag_t Host::processes() /** Get the peak power of a host */ double Host::getPstateSpeedCurrent() { - return simgrid::simix::kernelImmediate([&] { + return simgrid::simix::kernelImmediate([this] { return this->pimpl_cpu->getPstateSpeedCurrent(); }); } @@ -154,7 +213,7 @@ double Host::getPstateSpeedCurrent() /** Get one power peak (in flops/s) of a host at a given 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); }); } @@ -164,35 +223,21 @@ double Host::speed() { return pimpl_cpu->getSpeed(1.0); } /** @brief Returns the number of core of the processor. */ -int Host::coresCount() { - return pimpl_cpu->getCore(); +int Host::coreCount() { + 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 - )); + 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(); -} - -void Host::parameters(vm_params_t params) -{ - simgrid::simix::kernelImmediate([&]() { - this->extension()->getParams(params); - }); -} - -void Host::setParameters(vm_params_t params) -{ - simgrid::simix::kernelImmediate([&]() { - this->extension()->setParams(params); - }); + return this->pimpl_cpu->getPState(); } /** @@ -202,8 +247,8 @@ void Host::setParameters(vm_params_t params) */ xbt_dict_t Host::mountedStoragesAsDict() { - return simgrid::simix::kernelImmediate([&] { - return this->extension()->getMountedStorageList(); + return simgrid::simix::kernelImmediate([this] { + return this->pimpl_->getMountedStorageList(); }); } @@ -214,8 +259,8 @@ xbt_dict_t Host::mountedStoragesAsDict() */ xbt_dynar_t Host::attachedStorages() { - return simgrid::simix::kernelImmediate([&] { - return this->extension()->getAttachedStorageList(); + return simgrid::simix::kernelImmediate([this] { + return this->pimpl_->getAttachedStorageList(); }); }