X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eff13e323664f224576a26b017543955b3044b05..18bee871381a6ce670d9da211f43ab9b55fdc350:/src/simgrid/host.cpp diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp index 1c3cb95a81..0da2044a6f 100644 --- a/src/simgrid/host.cpp +++ b/src/simgrid/host.cpp @@ -1,187 +1,154 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. +/* Copyright (c) 2013-2016. 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 + #include "xbt/dict.h" #include "simgrid/host.h" -#include "simgrid/Host.hpp" -#include "surf/surf.h" // routing_get_network_element_type FIXME:killme +#include +#include -size_t sg_host_count() +#include "src/kernel/routing/NetCard.hpp" +#include "src/surf/HostImpl.hpp" + +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts"); + +extern std::unordered_map + host_list; // FIXME: don't duplicate the content of s4u::Host this way + +void sg_host_exit() { - return xbt_dict_length(host_list); + /* 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 : host_list) + names.push_back(kv.second->name()); + + std::sort(names.begin(), names.end()); + + for (auto name : names) + host_list.at(name)->destroy(); + + // host_list.clear(); This would be sufficient if the dict would contain smart_ptr. It's now useless } -void* sg_host_get_facet(sg_host_t host, size_t facet) +size_t sg_host_count() { - return host->facet(facet); + return host_list.size(); +} +/** @brief Returns the host list + * + * Uses sg_host_count() to know the array size. + * + * \return an array of \ref sg_host_t containing all the hosts in the platform. + * \remark The host order in this array is generally different from the + * creation/declaration order in the XML platform (we use a hash table + * internally). + * \see 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->id().c_str(); + return host->cname(); +} + +void* sg_host_extension_get(sg_host_t host, size_t ext) +{ + return host->extension(ext); } -size_t sg_host_add_level(void(*deleter)(void*)) +size_t sg_host_extension_create(void(*deleter)(void*)) { - return simgrid::Host::add_level(deleter); + return simgrid::s4u::Host::extension_create(deleter); } sg_host_t sg_host_by_name(const char *name) { - return simgrid::Host::by_name_or_null(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::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_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),nullptr); - xbt_dict_cursor_t cursor = nullptr; - const char* name = nullptr; - simgrid::Host* host = nullptr; - xbt_dict_foreach(host_list, cursor, name, host) - if(routing_get_network_element_type(name) == SURF_NETWORK_ELEMENT_HOST) - xbt_dynar_push(res, &host); - return res; + for (auto kv : host_list) { + simgrid::s4u::Host* host = kv.second; + if (host && host->pimpl_netcard && host->pimpl_netcard->isHost()) + xbt_dynar_push(res, &host); + } + xbt_dynar_sort(res, hostcmp_voidp); + return res; } -// ========= Layering madness ============== - -int MSG_HOST_LEVEL; -int SD_HOST_LEVEL; -int SIMIX_HOST_LEVEL; -int ROUTING_HOST_LEVEL; -int SURF_CPU_LEVEL; -int USER_HOST_LEVEL; +// ========= Layering madness ==============* -#include "src/msg/msg_private.h" // MSG_host_priv_free. FIXME: killme -#include "src/simdag/private.h" // __SD_workstation_destroy. FIXME: killme -#include "src/simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme #include "src/surf/cpu_interface.hpp" #include "src/surf/surf_routing.hpp" -static XBT_INLINE void surf_cpu_free(void *r) { - delete static_cast(r); -} -static XBT_INLINE void routing_asr_host_free(void *p) { - delete static_cast(p); -} - -void sg_host_init() -{ - MSG_HOST_LEVEL = simgrid::Host::add_level([](void *p) { - __MSG_host_priv_free((msg_host_priv_t) p); - }); - SD_HOST_LEVEL = simgrid::Host::add_level(__SD_workstation_destroy); - SIMIX_HOST_LEVEL = simgrid::Host::add_level(SIMIX_host_destroy); - SURF_CPU_LEVEL = simgrid::Host::add_level(surf_cpu_free); - ROUTING_HOST_LEVEL = simgrid::Host::add_level(routing_asr_host_free); - USER_HOST_LEVEL = simgrid::Host::add_level(NULL); -} - // ========== User data Layer ========== void *sg_host_user(sg_host_t host) { - return host->facet(USER_HOST_LEVEL); + return host->extension(USER_HOST_LEVEL); } void sg_host_user_set(sg_host_t host, void* userdata) { - host->set_facet(USER_HOST_LEVEL,userdata); + host->extension_set(USER_HOST_LEVEL,userdata); } void sg_host_user_destroy(sg_host_t host) { - host->set_facet(USER_HOST_LEVEL, nullptr); + 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->facet(MSG_HOST_LEVEL); + 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->set_facet(MSG_HOST_LEVEL, smx_host); -} -void sg_host_msg_destroy(sg_host_t host) { - host->set_facet(MSG_HOST_LEVEL, nullptr); -} -// ========== SimDag Layer ============== -SD_workstation_priv_t sg_host_sd(sg_host_t host) { - return (SD_workstation_priv_t) host->facet(SD_HOST_LEVEL); -} -void sg_host_sd_set(sg_host_t host, SD_workstation_priv_t smx_host) { - host->set_facet(SD_HOST_LEVEL, smx_host); -} -void sg_host_sd_destroy(sg_host_t host) { - host->set_facet(SD_HOST_LEVEL, nullptr); + host->extension_set(MSG_HOST_LEVEL, smx_host); } // ========== Simix layer ============= +#include "src/simix/smx_host_private.h" smx_host_priv_t sg_host_simix(sg_host_t host){ - return (smx_host_priv_t) host->facet(SIMIX_HOST_LEVEL); -} -void sg_host_simix_set(sg_host_t host, smx_host_priv_t smx_host) { - host->set_facet(SIMIX_HOST_LEVEL, smx_host); -} -void sg_host_simix_destroy(sg_host_t host) { - host->set_facet(SIMIX_HOST_LEVEL, nullptr); + return host->extension(); } -// ========== SURF CPU ============ -surf_cpu_t sg_host_surfcpu(sg_host_t host) { - return (surf_cpu_t) host->facet(SURF_CPU_LEVEL); -} -void sg_host_surfcpu_set(sg_host_t host, surf_cpu_t cpu) { - host->set_facet(SURF_CPU_LEVEL, cpu); +// ========= storage related functions ============ +xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){ + return host->pimpl_->getMountedStorageList(); } -void sg_host_surfcpu_register(sg_host_t host, surf_cpu_t cpu) -{ - surf_callback_emit(simgrid::surf::cpuCreatedCallbacks, cpu); - surf_callback_emit(simgrid::surf::cpuStateChangedCallbacks, cpu, SURF_RESOURCE_ON, cpu->getState()); - sg_host_surfcpu_set(host, cpu); -} -void sg_host_surfcpu_destroy(sg_host_t host) { - host->set_facet(SURF_CPU_LEVEL, nullptr); -} -// ========== RoutingEdge ============ -surf_RoutingEdge *sg_host_edge(sg_host_t host) { - return (surf_RoutingEdge*) host->facet(ROUTING_HOST_LEVEL); -} -void sg_host_edge_set(sg_host_t host, surf_RoutingEdge *edge) { - host->set_facet(ROUTING_HOST_LEVEL, edge); -} -void sg_host_edge_destroy(sg_host_t host, int do_callback) { - host->set_facet(ROUTING_HOST_LEVEL, nullptr, do_callback); + +xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){ + return host->pimpl_->getAttachedStorageList(); } + // =========== user-level functions =============== // ================================================ -double sg_host_get_speed(sg_host_t host){ - return surf_host_get_speed(host, 1.0); -} - -double sg_host_get_available_speed(sg_host_t host){ - return surf_host_get_available_speed(host); -} -/** @brief Returns the number of core of the processor. */ -int sg_host_get_core(sg_host_t host) { - return surf_host_get_core(host); -} -/** @brief Returns the state of a host. - * @return 1 if the host is active or 0 if it has crashed. - */ -int sg_host_get_state(sg_host_t host) { - return surf_host_get_state(surf_host_resource_priv(host)); +/** @brief Returns the total speed of a host */ +double sg_host_speed(sg_host_t host) +{ + return host->speed(); } -/** @brief Returns the total energy consumed by the host (in Joules). - * - * See also @ref SURF_plugin_energy. - */ -double sg_host_get_consumed_energy(sg_host_t host) { - return surf_host_get_consumed_energy(host); +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. @@ -189,7 +156,7 @@ double sg_host_get_consumed_energy(sg_host_t host) { * See also @ref SURF_plugin_energy. */ int sg_host_get_nb_pstates(sg_host_t host) { - return surf_host_get_nb_pstates(host); + return host->pstatesCount(); } /** @brief Gets the pstate at which that host currently runs. @@ -197,33 +164,50 @@ int sg_host_get_nb_pstates(sg_host_t host) { * See also @ref SURF_plugin_energy. */ int sg_host_get_pstate(sg_host_t host) { - return surf_host_get_pstate(host); + return host->pstate(); } - -namespace simgrid { - -Host::Host(std::string id) - : id_(std::move(id)) -{ +/** @brief Sets the pstate at which that host should run. + * + * See also @ref SURF_plugin_energy. + */ +void sg_host_set_pstate(sg_host_t host,int pstate) { + host->setPstate(pstate); } -Host::~Host() -{ +/** @brief Get the properties of an host */ +xbt_dict_t sg_host_get_properties(sg_host_t host) { + return host->properties(); } -Host* Host::by_name_or_null(const char* name) +/** \ingroup m_host_management + * \brief Returns the value of a given host property + * + * \param host a host + * \param name a property name + * \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 (Host*) xbt_dict_get_or_null(host_list, name); + return (const char*) xbt_dict_get_or_null(sg_host_get_properties(host), name); } -Host* Host::by_name_or_create(const char* name) +/** @brief Displays debugging information about a host */ +void sg_host_dump(sg_host_t host) { - Host* host = by_name_or_null(name); - if (host == nullptr) { - host = new Host(name); - xbt_dict_set(host_list, name, host, NULL); - } - return host; -} + xbt_dict_t props; + xbt_dict_cursor_t cursor=nullptr; + char *key,*data; + 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 = host->properties(); + + if (!xbt_dict_is_empty(props)){ + XBT_INFO(" - properties:"); + + xbt_dict_foreach(props,cursor,key,data) { + XBT_INFO(" %s->%s",key,data); + } + } }