X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d05227640d4f8e5be751a522226c0e7243388d16..18bee871381a6ce670d9da211f43ab9b55fdc350:/src/simgrid/host.cpp diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp index 9e26ad8f8e..0da2044a6f 100644 --- a/src/simgrid/host.cpp +++ b/src/simgrid/host.cpp @@ -4,20 +4,45 @@ /* 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 #include -#include "surf/surf.h" // routing_get_network_element_type FIXME:killme -#include "src/simix/smx_private.hpp" -#include "src/surf/host_interface.hpp" +#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() +{ + /* 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 +} + size_t sg_host_count() { - return xbt_dict_length(host_list); + return host_list.size(); } /** @brief Returns the host list * @@ -29,14 +54,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) @@ -54,46 +79,30 @@ 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_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),nullptr); - xbt_dict_cursor_t cursor = nullptr; - const char* name = nullptr; - simgrid::s4u::Host* host = nullptr; - xbt_dict_foreach(host_list, cursor, name, host) - if(routing_get_network_element_type(name) == SURF_NETWORK_ELEMENT_HOST) + 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 ==============* -#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); - }); - - ROUTING_HOST_LEVEL = simgrid::s4u::Host::extension_create([](void *p) { - delete static_cast(p); - }); - - SD_HOST_LEVEL = simgrid::s4u::Host::extension_create(NULL); - 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); @@ -114,50 +123,32 @@ void sg_host_msg_set(sg_host_t host, msg_host_priv_t 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->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); + return host->extension(); } // ========= storage related functions ============ xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){ - return host->extension()->getMountedStorageList(); + return host->pimpl_->getMountedStorageList(); } xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){ - return host->extension()->getAttachedStorageList(); + return host->pimpl_->getAttachedStorageList(); } // =========== 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->is_on(); +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. @@ -165,7 +156,7 @@ int sg_host_is_on(sg_host_t host) { * See also @ref SURF_plugin_energy. */ int sg_host_get_nb_pstates(sg_host_t host) { - return host->pstates_count(); + return host->pstatesCount(); } /** @brief Gets the pstate at which that host currently runs. @@ -180,7 +171,7 @@ int sg_host_get_pstate(sg_host_t host) { * See also @ref SURF_plugin_energy. */ void sg_host_set_pstate(sg_host_t host,int pstate) { - host->set_pstate(pstate); + host->setPstate(pstate); } /** @brief Get the properties of an host */ @@ -193,24 +184,24 @@ 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 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; + xbt_dict_cursor_t cursor=nullptr; 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)){ XBT_INFO(" - properties:");