X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a92d7b716f51a53dea7f59db8524d4add713b910..87abed69d2734abfc0474c30b6f6d04b25a2c8ac:/src/simgrid/host.cpp diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp index 52e1ab79a5..3c9fe63827 100644 --- a/src/simgrid/host.cpp +++ b/src/simgrid/host.cpp @@ -3,53 +3,27 @@ /* 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. */ +#include #include #include "simgrid/host.h" +#include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" #include "xbt/Extendable.hpp" #include "xbt/dict.h" #include "src/kernel/routing/NetPoint.hpp" -#include "src/simix/smx_host_private.h" +#include "src/simix/smx_host_private.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts"); -// FIXME: The following duplicates the content of s4u::Host -namespace simgrid { -namespace s4u { -extern std::map host_list; -} -} - extern "C" { -void sg_host_exit() -{ - /* copy all names to not modify the map while iterating over it. - * - * Plus, the hosts are destroyed in the lexicographic order to ensure - * that the output is reproducible: we don't want to kill them in the - * pointer order as it could be platform-dependent, which would break - * the tests. - */ - std::vector names = std::vector(); - for (auto kv : simgrid::s4u::host_list) - names.push_back(kv.second->name()); - - std::sort(names.begin(), names.end()); - - for (auto name : names) - simgrid::s4u::host_list.at(name)->destroy(); - - // host_list.clear(); This would be sufficient if the dict would contain smart_ptr. It's now useless -} - size_t sg_host_count() { - return simgrid::s4u::host_list.size(); + return simgrid::s4u::Engine::getInstance()->getHostCount(); } /** @brief Returns the host list * @@ -63,12 +37,13 @@ size_t sg_host_count() */ sg_host_t *sg_host_list() { xbt_assert(sg_host_count() > 0, "There is no host!"); + return (sg_host_t*)xbt_dynar_to_array(sg_hosts_as_dynar()); } const char *sg_host_get_name(sg_host_t host) { - return host->cname(); + return host->getCname(); } void* sg_host_extension_get(sg_host_t host, size_t ext) @@ -88,16 +63,18 @@ sg_host_t sg_host_by_name(const char *name) static int hostcmp_voidp(const void* pa, const void* pb) { - return strcmp((*static_cast(pa))->cname(), - (*static_cast(pb))->cname()); + return strcmp((*static_cast(pa))->getCname(), + (*static_cast(pb))->getCname()); } xbt_dynar_t sg_hosts_as_dynar() { xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),nullptr); - for (auto kv : simgrid::s4u::host_list) { - simgrid::s4u::Host* host = kv.second; + std::vector list; + simgrid::s4u::Engine::getInstance()->getHostList(&list); + + for (auto const& host : list) { if (host && host->pimpl_netpoint && host->pimpl_netpoint->isHost()) xbt_dynar_push(res, &host); } @@ -120,14 +97,22 @@ void sg_host_user_destroy(sg_host_t host) { // ========= storage related functions ============ xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){ - return host->pimpl_->getMountedStorageList(); + xbt_assert((host != nullptr), "Invalid parameters"); + xbt_dict_t res = xbt_dict_new_homogeneous(nullptr); + for (auto const& elm : host->getMountedStorages()) { + const char* mount_name = elm.first.c_str(); + sg_storage_t storage = elm.second; + xbt_dict_set(res, mount_name, (void*)storage->getCname(), nullptr); + } + + return res; } xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){ std::vector* storage_vector = new std::vector(); xbt_dynar_t storage_dynar = xbt_dynar_new(sizeof(const char*), nullptr); - host->attachedStorages(storage_vector); - for (auto name : *storage_vector) + host->getAttachedStorages(storage_vector); + for (auto const& name : *storage_vector) xbt_dynar_push(storage_dynar, &name); delete storage_vector; return storage_dynar; @@ -138,7 +123,18 @@ xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){ /** @brief Returns the total speed of a host */ double sg_host_speed(sg_host_t host) { - return host->speed(); + return host->getSpeed(); +} + +/** \ingroup m_host_management + * \brief Return the number of cores. + * + * \param host a host + * \return the number of cores + */ +int sg_host_core_count(sg_host_t host) +{ + return host->getCoreCount(); } double sg_host_get_available_speed(sg_host_t host) @@ -148,30 +144,86 @@ double sg_host_get_available_speed(sg_host_t host) /** @brief Returns the number of power states for a host. * - * See also @ref SURF_plugin_energy. + * See also @ref plugin_energy. */ int sg_host_get_nb_pstates(sg_host_t host) { - return host->pstatesCount(); + return host->getPstatesCount(); } /** @brief Gets the pstate at which that host currently runs. * - * See also @ref SURF_plugin_energy. + * See also @ref plugin_energy. */ int sg_host_get_pstate(sg_host_t host) { - return host->pstate(); + return host->getPstate(); } /** @brief Sets the pstate at which that host should run. * - * See also @ref SURF_plugin_energy. + * See also @ref plugin_energy. */ void sg_host_set_pstate(sg_host_t host,int pstate) { host->setPstate(pstate); } +/** \ingroup m_host_management + * + * \brief Start the host if it is off + * + * See also #sg_host_is_on() and #sg_host_is_off() to test the current state of the host and @ref plugin_energy + * for more info on DVFS. + */ +void sg_host_turn_on(sg_host_t host) +{ + host->turnOn(); +} + +/** \ingroup m_host_management + * + * \brief Stop the host if it is on + * + * See also #MSG_host_is_on() and #MSG_host_is_off() to test the current state of the host and @ref plugin_energy + * for more info on DVFS. + */ +void sg_host_turn_off(sg_host_t host) +{ + host->turnOff(); +} + +/** @ingroup m_host_management + * @brief Determine if a host is up and running. + * + * See also #sg_host_turn_on() and #sg_host_turn_off() to switch the host ON and OFF and @ref plugin_energy for more + * info on DVFS. + * + * @param host host to test + * @return Returns true if the host is up and running, and false if it's currently down + */ +int sg_host_is_on(sg_host_t host) +{ + return host->isOn(); +} + +/** @ingroup m_host_management + * @brief Determine if a host is currently off. + * + * See also #sg_host_turn_on() and #sg_host_turn_off() to switch the host ON and OFF and @ref plugin_energy for more + * info on DVFS. + */ +int sg_host_is_off(sg_host_t host) +{ + return host->isOff(); +} + /** @brief Get the properties of an host */ xbt_dict_t sg_host_get_properties(sg_host_t host) { - return host->properties(); + xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f); + std::map* props = host->getProperties(); + if (props == nullptr) + return nullptr; + for (auto const& elm : *props) { + xbt_dict_set(as_dict, elm.first.c_str(), xbt_strdup(elm.second.c_str()), nullptr); + } + return as_dict; } /** \ingroup m_host_management @@ -183,8 +235,14 @@ xbt_dict_t sg_host_get_properties(sg_host_t host) { */ const char *sg_host_get_property_value(sg_host_t host, const char *name) { - return (const char*) xbt_dict_get_or_null(sg_host_get_properties(host), name); + return host->getProperty(name); } + +void sg_host_set_property_value(sg_host_t host, const char* name, const char* value) +{ + host->setProperty(name, value); +} + /** * \brief Find a route between two hosts * @@ -195,8 +253,8 @@ const char *sg_host_get_property_value(sg_host_t host, const char *name) void sg_host_route(sg_host_t from, sg_host_t to, xbt_dynar_t links) { std::vector vlinks; - from->routeTo(to, &vlinks, nullptr); - for (auto link : vlinks) + from->routeTo(to, vlinks, nullptr); + for (auto const& link : vlinks) xbt_dynar_push(links, &link); } /** @@ -209,7 +267,7 @@ double sg_host_route_latency(sg_host_t from, sg_host_t to) { std::vector vlinks; double res = 0; - from->routeTo(to, &vlinks, &res); + from->routeTo(to, vlinks, &res); return res; } /** @@ -223,8 +281,8 @@ double sg_host_route_bandwidth(sg_host_t from, sg_host_t to) double min_bandwidth = -1.0; std::vector vlinks; - from->routeTo(to, &vlinks, nullptr); - for (auto link : vlinks) { + from->routeTo(to, vlinks, nullptr); + for (auto const& link : vlinks) { double bandwidth = link->bandwidth(); if (bandwidth < min_bandwidth || min_bandwidth < 0.0) min_bandwidth = bandwidth; @@ -235,21 +293,15 @@ double sg_host_route_bandwidth(sg_host_t from, sg_host_t to) /** @brief Displays debugging information about a host */ void sg_host_dump(sg_host_t host) { - xbt_dict_t props; - - XBT_INFO("Displaying host %s", host->cname()); - XBT_INFO(" - speed: %.0f", host->speed()); + XBT_INFO("Displaying host %s", host->getCname()); + XBT_INFO(" - speed: %.0f", host->getSpeed()); XBT_INFO(" - available speed: %.2f", sg_host_get_available_speed(host)); - props = host->properties(); + std::map* props = host->getProperties(); - if (not xbt_dict_is_empty(props)) { + if (not props->empty()) { XBT_INFO(" - properties:"); - xbt_dict_cursor_t cursor = nullptr; - char* key; - char* data; - - xbt_dict_foreach(props,cursor,key,data) { - XBT_INFO(" %s->%s",key,data); + for (auto const& elm : *props) { + XBT_INFO(" %s->%s", elm.first.c_str(), elm.second.c_str()); } } }