X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7940e7c1b0f2897a82628c707408ad49debd1d3b..18bee871381a6ce670d9da211f43ab9b55fdc350:/src/simgrid/host.cpp diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp index b3f5bd6962..0da2044a6f 100644 --- a/src/simgrid/host.cpp +++ b/src/simgrid/host.cpp @@ -1,26 +1,67 @@ -/* Copyright (c) 2013-201. 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 #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 -#include "src/simix/smx_private.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 + * + * 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->getName().c_str(); + return host->cname(); } void* sg_host_extension_get(sg_host_t host, size_t ext) @@ -30,61 +71,38 @@ void* sg_host_extension_get(sg_host_t host, size_t ext) size_t sg_host_extension_create(void(*deleter)(void*)) { - return simgrid::Host::extension_create(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_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; -} + xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),nullptr); -// ========= Layering madness ============== + 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; +} -int MSG_HOST_LEVEL; -int SD_HOST_LEVEL; -int SIMIX_HOST_LEVEL; -int ROUTING_HOST_LEVEL; -int USER_HOST_LEVEL; +// ========= Layering madness ==============* -#include "src/msg/msg_private.h" // MSG_host_priv_free. FIXME: killme by initializing that level in msg when used -#include "src/simdag/simdag_private.h" // __SD_workstation_destroy. FIXME: killme by initializing that level in simdag 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::Host::extension_create([](void *p) { - __MSG_host_priv_free((msg_host_priv_t) p); - }); - - ROUTING_HOST_LEVEL = simgrid::Host::extension_create([](void *p) { - delete static_cast(p); - }); - - SD_HOST_LEVEL = simgrid::Host::extension_create(__SD_workstation_destroy); - SIMIX_HOST_LEVEL = simgrid::Host::extension_create(SIMIX_host_destroy); - USER_HOST_LEVEL = simgrid::Host::extension_create(NULL); -} - // ========== User data Layer ========== void *sg_host_user(sg_host_t host) { return host->extension(USER_HOST_LEVEL); @@ -98,55 +116,39 @@ void sg_host_user_destroy(sg_host_t host) { // ========== MSG Layer ============== msg_host_priv_t sg_host_msg(sg_host_t host) { - return (msg_host_priv_t) host->extension(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->extension_set(MSG_HOST_LEVEL, smx_host); } -void sg_host_msg_destroy(sg_host_t host) { - host->extension_set(MSG_HOST_LEVEL, nullptr); -} -// ========== SimDag Layer ============== -SD_workstation_priv_t sg_host_sd(sg_host_t host) { - return (SD_workstation_priv_t) host->extension(SD_HOST_LEVEL); -} -void sg_host_sd_set(sg_host_t host, SD_workstation_priv_t smx_host) { - host->extension_set(SD_HOST_LEVEL, smx_host); -} -void sg_host_sd_destroy(sg_host_t host) { - host->extension_set(SD_HOST_LEVEL, nullptr); -} // ========== 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); + return host->extension(); } -void sg_host_simix_set(sg_host_t host, smx_host_priv_t smx_host) { - host->extension_set(SIMIX_HOST_LEVEL, smx_host); + +// ========= storage related functions ============ +xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){ + return host->pimpl_->getMountedStorageList(); } -void sg_host_simix_destroy(sg_host_t host) { - host->extension_set(SIMIX_HOST_LEVEL, nullptr); + +xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){ + return host->pimpl_->getAttachedStorageList(); } + // =========== user-level functions =============== // ================================================ - -double sg_host_get_available_speed(sg_host_t host){ - return surf_host_get_available_speed(host); -} -/** @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->p_cpu->isOn(); +/** @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. @@ -154,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 host->p_cpu->getNbPStates(); + return host->pstatesCount(); } /** @brief Gets the pstate at which that host currently runs. @@ -162,148 +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 host->p_cpu->getPState(); -} - -namespace simgrid { - -Host::Host(std::string const& id) - : name_(id) -{ -} - -Host::~Host() -{ -} - -/** Start the host if it is off */ -void Host::turnOn() -{ - simgrid::simix::kernel(std::bind(SIMIX_host_on, this)); + return host->pstate(); } - -/** Stop the host if it is on */ -void Host::turnOff() -{ - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_host_off(&SIMIX_process_self()->simcall, this); - simgrid::simix::simcall(SIMCALL_HOST_OFF, this); -} - -bool Host::isOn() { - return p_cpu->isOn(); -} -bool Host::isOff() { - return ! p_cpu->isOn(); +/** @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); } - -/** Get the properties assigned to a host */ -xbt_dict_t Host::getProperties() -{ - return simgrid::simix::kernel(std::bind(SIMIX_host_get_properties, this)); +/** @brief Get the properties of an host */ +xbt_dict_t sg_host_get_properties(sg_host_t host) { + return host->properties(); } -/** Get the processes attached to the host */ -xbt_swag_t Host::getProcessList() -{ - return simgrid::simix::kernel(std::bind(SIMIX_host_get_process_list, this)); -} - -/** Get the peak power of a host */ -double Host::getCurrentPowerPeak() +/** \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 simgrid::simix::kernel( - std::bind(SIMIX_host_get_current_power_peak, this)); + return (const char*) xbt_dict_get_or_null(sg_host_get_properties(host), name); } -/** Get one power peak (in flops/s) of a host at a given pstate */ -double Host::getPowerPeakAt(int pstate_index) +/** @brief Displays debugging information about a host */ +void sg_host_dump(sg_host_t host) { - return simgrid::simix::kernel( - std::bind(SIMIX_host_get_power_peak_at, this, pstate_index)); -} + xbt_dict_t props; + xbt_dict_cursor_t cursor=nullptr; + char *key,*data; -/** @brief Get the speed of the cpu associated to a host */ -double Host::getSpeed() { - return p_cpu->getSpeed(1.0); -} -/** @brief Returns the number of core of the processor. */ -int Host::getCoreAmount() { - return p_cpu->getCore(); -} + 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(); -Host* Host::by_name_or_null(const char* name) -{ - return (Host*) xbt_dict_get_or_null(host_list, name); -} + if (!xbt_dict_is_empty(props)){ + XBT_INFO(" - properties:"); -Host* Host::by_name_or_create(const char* name) -{ - Host* host = by_name_or_null(name); - if (host == nullptr) { - host = new Host(name); - xbt_dict_set(host_list, name, host, NULL); + xbt_dict_foreach(props,cursor,key,data) { + XBT_INFO(" %s->%s",key,data); + } } - return host; -} - -/** Set the pstate at which the host should run */ -void Host::setPstate(int pstate_index) -{ - simgrid::simix::kernel(std::bind( - &simgrid::surf::Cpu::setPState, p_cpu, pstate_index - )); -} - -/** Get the amount of watt dissipated at the given pstate when the host is idling */ -double Host::getWattMinAt(int pstate) -{ - return simgrid::simix::kernel(std::bind( - surf_host_get_wattmin_at, this, pstate - )); -} - -/** Get the amount of watt dissipated at the given pstate when the host burns CPU at 100% */ -double Host::getWattMaxAt(int pstate) -{ - return simgrid::simix::kernel(std::bind( - surf_host_get_wattmax_at, this, pstate - )); -} - -void Host::getParams(vm_params_t params) -{ - simgrid::simix::kernel(std::bind(SIMIX_host_get_params, this, params)); -} - -void Host::setParams(vm_params_t params) -{ - simgrid::simix::kernel(std::bind(SIMIX_host_set_params, this, params)); -} - -/** - * \ingroup simix_storage_management - * \brief Returns the list of storages mounted on an host. - * \return a dict containing all storages mounted on the host - */ -xbt_dict_t Host::getMountedStorageList() -{ - return simgrid::simix::kernel(std::bind( - SIMIX_host_get_mounted_storage_list, this - )); -} - -/** - * \ingroup simix_storage_management - * \brief Returns the list of storages attached to an host. - * \return a dict containing all storages attached to the host - */ -xbt_dynar_t Host::getAttachedStorageList() -{ - return simgrid::simix::kernel(std::bind( - SIMIX_host_get_attached_storage_list, this - )); -} - }