X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d1a8a4e291642999663c8cff03158c1041ff4916..9a02e3654bd28c13ac053247383566f54fa4498a:/src/s4u/s4u_host.cpp diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp index 55402984d9..523aee6482 100644 --- a/src/s4u/s4u_host.cpp +++ b/src/s4u/s4u_host.cpp @@ -11,19 +11,19 @@ #include #include "simgrid/simix.hpp" -#include "src/surf/HostImplem.hpp" +#include "src/surf/HostImpl.hpp" #include "xbt/log.h" #include "src/msg/msg_private.h" -#include "src/simix/smx_process_private.h" -#include "src/simix/smx_private.hpp" +#include "src/simix/ActorImpl.hpp" +#include "src/simix/smx_private.h" #include "src/surf/cpu_interface.hpp" #include "simgrid/s4u/host.hpp" #include "simgrid/s4u/storage.hpp" -int MSG_HOST_LEVEL; -int SIMIX_HOST_LEVEL; -int ROUTING_HOST_LEVEL; -int USER_HOST_LEVEL; +std::unordered_map host_list; // FIXME: move it to Engine + +int MSG_HOST_LEVEL = -1; +int USER_HOST_LEVEL = -1; namespace simgrid { @@ -40,47 +40,73 @@ simgrid::xbt::signal Host::onStateChange; Host::Host(const char* name) : name_(name) { + xbt_assert(sg_host_by_name(name) == nullptr, "Refusing to create a second host named '%s'.", name); + host_list[name_] = this; } -Host::~Host() { +Host::~Host() +{ + xbt_assert(currentlyDestroying_, "Please call h->destroy() instead of manually deleting it."); + + delete pimpl_; 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, NULL); - } - return host; + if (host_list.find(name) == host_list.end()) + return nullptr; + return host_list.at(name); } Host *Host::current(){ - smx_process_t smx_proc = SIMIX_process_self(); - if (smx_proc == NULL) + smx_actor_t smx_proc = SIMIX_process_self(); + if (smx_proc == nullptr) xbt_die("Cannot call Host::current() from the maestro context"); - return SIMIX_process_get_host(smx_proc); + return smx_proc->host; } void Host::turnOn() { - simgrid::simix::kernel(std::bind(SIMIX_host_on, this)); + if (isOff()) { + simgrid::simix::kernelImmediate([&]{ + this->extension()->turnOn(); + this->pimpl_cpu->turnOn(); + }); + } } void Host::turnOff() { - simgrid::simix::kernel(std::bind(SIMIX_host_off, this, SIMIX_process_self())); + if (isOn()) { + simgrid::simix::kernelImmediate(std::bind(SIMIX_host_off, this, SIMIX_process_self())); + } } bool Host::isOn() { @@ -92,7 +118,7 @@ int Host::pstatesCount() const { } boost::unordered_map const& Host::mountedStorages() { - if (mounts == NULL) { + if (mounts == nullptr) { mounts = new boost::unordered_map (); xbt_dict_t dict = this->mountedStoragesAsDict(); @@ -111,33 +137,38 @@ boost::unordered_map const& Host::mountedStorages() { /** Get the properties assigned to a host */ xbt_dict_t Host::properties() { - return simgrid::simix::kernel([&] { - simgrid::surf::HostImplem* surf_host = this->extension(); - return surf_host->getProperties(); - }); + return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getProperties(); }); +} + +/** Retrieve the property value (or nullptr if not set) */ +const char*Host::property(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() { - return simgrid::simix::kernel([&]() { - return ((smx_host_priv_t)this->extension(SIMIX_HOST_LEVEL))->process_list; + return simgrid::simix::kernelImmediate([&]() { + return this->extension()->process_list; }); } /** Get the peak power of a host */ -double Host::currentPowerPeak() +double Host::getPstateSpeedCurrent() { - return simgrid::simix::kernel([&] { - return this->pimpl_cpu->getCurrentPowerPeak(); + return simgrid::simix::kernelImmediate([&] { + return this->pimpl_cpu->getPstateSpeedCurrent(); }); } /** Get one power peak (in flops/s) of a host at a given pstate */ -double Host::powerPeakAt(int pstate_index) +double Host::getPstateSpeed(int pstate_index) { - return simgrid::simix::kernel([&] { - return this->pimpl_cpu->getPowerPeakAt(pstate_index); + return simgrid::simix::kernelImmediate([&] { + return this->pimpl_cpu->getPstateSpeed(pstate_index); }); } @@ -146,14 +177,14 @@ double Host::speed() { return pimpl_cpu->getSpeed(1.0); } /** @brief Returns the number of core of the processor. */ -int Host::core_count() { - 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::kernel(std::bind( + simgrid::simix::kernelImmediate(std::bind( &simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index )); } @@ -163,20 +194,6 @@ int Host::pstate() return pimpl_cpu->getPState(); } -void Host::parameters(vm_params_t params) -{ - simgrid::simix::kernel([&]() { - this->extension()->getParams(params); - }); -} - -void Host::setParameters(vm_params_t params) -{ - simgrid::simix::kernel([&]() { - this->extension()->setParams(params); - }); -} - /** * \ingroup simix_storage_management * \brief Returns the list of storages mounted on an host. @@ -184,9 +201,7 @@ void Host::setParameters(vm_params_t params) */ xbt_dict_t Host::mountedStoragesAsDict() { - return simgrid::simix::kernel([&] { - return this->extension()->getMountedStorageList(); - }); + return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getMountedStorageList(); }); } /** @@ -196,9 +211,7 @@ xbt_dict_t Host::mountedStoragesAsDict() */ xbt_dynar_t Host::attachedStorages() { - return simgrid::simix::kernel([&] { - return this->extension()->getAttachedStorageList(); - }); + return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getAttachedStorageList(); }); } } // namespace simgrid