X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a83da0dd5325af5750397b7709bc851317a976ea..b6be4a786958974306e8f7b18eae6f1f77ebd4ee:/src/simgrid/host.cpp diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp index 99aa45eaee..5db33f1c39 100644 --- a/src/simgrid/host.cpp +++ b/src/simgrid/host.cpp @@ -1,24 +1,56 @@ -/* Copyright (c) 2013-2016. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */ /* 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 "xbt/dict.h" +#include +#include + #include "simgrid/host.h" -#include -#include +#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/surf/HostImpl.hpp" -#include "surf/surf.h" // routing_get_network_element_type FIXME:killme - -#include "src/simix/smx_private.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 xbt_dict_length(host_list); + return simgrid::s4u::host_list.size(); } /** @brief Returns the host list * @@ -30,14 +62,14 @@ size_t sg_host_count() * internally). * \see sg_host_count() */ -sg_host_t *sg_host_list(void) { +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->name().c_str(); + return host->cname(); } void* sg_host_extension_get(sg_host_t host, size_t ext) @@ -55,41 +87,27 @@ sg_host_t sg_host_by_name(const char *name) return simgrid::s4u::Host::by_name_or_null(name); } -sg_host_t sg_host_by_name_or_create(const char *name) +static int hostcmp_voidp(const void* pa, const void* pb) { - return simgrid::s4u::Host::by_name_or_create(name); + return strcmp((*static_cast(pa))->cname(), + (*static_cast(pb))->cname()); } -xbt_dynar_t sg_hosts_as_dynar(void) +xbt_dynar_t sg_hosts_as_dynar() { - xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),NULL); - - xbt_dict_cursor_t cursor = nullptr; - const char* name = nullptr; - simgrid::s4u::Host* host = nullptr; - xbt_dict_foreach(host_list, cursor, name, host) - if (host && host->pimpl_netcard && host->pimpl_netcard->getRcType() == SURF_NETWORK_ELEMENT_HOST) - xbt_dynar_push(res, &host); + 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; + if (host && host->pimpl_netpoint && host->pimpl_netpoint->isHost()) + xbt_dynar_push(res, &host); + } + xbt_dynar_sort(res, hostcmp_voidp); return res; } // ========= Layering madness ==============* -#include "src/msg/msg_private.h" // MSG_host_priv_free. FIXME: killme by initializing that level in msg when used -#include "src/simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme by initializing that level in simix when used -#include "src/surf/cpu_interface.hpp" -#include "src/surf/surf_routing.hpp" - -void sg_host_init() -{ - MSG_HOST_LEVEL = simgrid::s4u::Host::extension_create([](void *p) { - __MSG_host_priv_free((msg_host_priv_t) p); - }); - - SIMIX_HOST_LEVEL = simgrid::s4u::Host::extension_create(SIMIX_host_destroy); - USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(NULL); -} - // ========== User data Layer ========== void *sg_host_user(sg_host_t host) { return host->extension(USER_HOST_LEVEL); @@ -101,64 +119,45 @@ void sg_host_user_destroy(sg_host_t host) { host->extension_set(USER_HOST_LEVEL, nullptr); } -// ========== MSG Layer ============== -msg_host_priv_t sg_host_msg(sg_host_t host) { - return (msg_host_priv_t) host->extension(MSG_HOST_LEVEL); -} -void sg_host_msg_set(sg_host_t host, msg_host_priv_t smx_host) { - host->extension_set(MSG_HOST_LEVEL, smx_host); -} - -// ========== Simix layer ============= -smx_host_priv_t sg_host_simix(sg_host_t host){ - return (smx_host_priv_t) host->extension(SIMIX_HOST_LEVEL); -} -void sg_host_simix_set(sg_host_t host, smx_host_priv_t smx_host) { - host->extension_set(SIMIX_HOST_LEVEL, smx_host); -} -void sg_host_simix_destroy(sg_host_t host) { - host->extension_set(SIMIX_HOST_LEVEL, nullptr); -} - // ========= storage related functions ============ xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){ - return host->extension()->getMountedStorageList(); + xbt_assert((host != nullptr), "Invalid parameters"); + xbt_dict_t res = xbt_dict_new_homogeneous(nullptr); + for (auto elm : host->mountedStorages()) { + const char* mount_name = elm.first.c_str(); + sg_storage_t storage = elm.second; + xbt_dict_set(res, mount_name, (void*)storage->name(), nullptr); + } + + return res; } xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){ - return host->extension()->getAttachedStorageList(); + 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) + xbt_dynar_push(storage_dynar, &name); + delete storage_vector; + return storage_dynar; } - // =========== user-level functions =============== // ================================================ - -/** @brief Returns the total speed of a host - */ +/** @brief Returns the total speed of a host */ double sg_host_speed(sg_host_t host) { return host->speed(); } -double sg_host_get_available_speed(sg_host_t host){ - return surf_host_get_available_speed(host); -} -/** @brief Returns the number of cores of a host -*/ -int sg_host_core_count(sg_host_t host) { - return host->core_count(); -} - -/** @brief Returns the state of a host. - * @return 1 if the host is active or 0 if it has crashed. - */ -int sg_host_is_on(sg_host_t host) { - return host->isOn(); +double sg_host_get_available_speed(sg_host_t host) +{ + return host->pimpl_cpu->getAvailableSpeed(); } /** @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(); @@ -166,14 +165,14 @@ int sg_host_get_nb_pstates(sg_host_t host) { /** @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(); } /** @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); @@ -189,30 +188,79 @@ xbt_dict_t sg_host_get_properties(sg_host_t host) { * * \param host a host * \param name a property name - * \return value of a property (or NULL if property not set) + * \return value of a property (or nullptr if property not set) */ 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); } +/** + * \brief Find a route between two hosts + * + * \param from where from + * \param to where to + * \param links [OUT] where to store the list of links (must exist, cannot be nullptr). + */ +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) + xbt_dynar_push(links, &link); +} +/** + * \brief Find the latency of the route between two hosts + * + * \param from where from + * \param to where to + */ +double sg_host_route_latency(sg_host_t from, sg_host_t to) +{ + std::vector vlinks; + double res = 0; + from->routeTo(to, &vlinks, &res); + return res; +} +/** + * \brief Find the bandwitdh of the route between two hosts + * + * \param from where from + * \param to where to + */ +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) { + double bandwidth = link->bandwidth(); + if (bandwidth < min_bandwidth || min_bandwidth < 0.0) + min_bandwidth = bandwidth; + } + return min_bandwidth; +} -/** @brief Displays debugging informations about a host */ +/** @brief Displays debugging information about a host */ void sg_host_dump(sg_host_t host) { xbt_dict_t props; - xbt_dict_cursor_t cursor=NULL; - char *key,*data; - XBT_INFO("Displaying host %s", sg_host_get_name(host)); - XBT_INFO(" - speed: %.0f", sg_host_speed(host)); + XBT_INFO("Displaying host %s", host->cname()); + XBT_INFO(" - speed: %.0f", host->speed()); XBT_INFO(" - available speed: %.2f", sg_host_get_available_speed(host)); - props = sg_host_get_properties(host); + props = host->properties(); - if (!xbt_dict_is_empty(props)){ + if (not xbt_dict_is_empty(props)) { 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); } } } + +} // extern "C"