X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ff52edfeb1b9c585656a745144fea2be10c90973..d3c605045fe8c525f32393a054425d72edf47b18:/src/simgrid/host.cpp diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp index 61de1034ea..346a1c45b7 100644 --- a/src/simgrid/host.cpp +++ b/src/simgrid/host.cpp @@ -1,26 +1,51 @@ -/* Copyright (c) 2013-201. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2018. 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 -#include "xbt/dict.h" #include "simgrid/host.h" -#include "simgrid/Host.hpp" -#include "surf/surf.h" // routing_get_network_element_type FIXME:killme +#include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Host.hpp" +#include "xbt/Extendable.hpp" +#include "xbt/dict.h" + +#include "simgrid/kernel/routing/NetPoint.hpp" +#include "src/simix/smx_host_private.hpp" +#include "src/surf/HostImpl.hpp" +#include "src/surf/cpu_interface.hpp" -#include "src/simix/smx_private.hpp" +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts"); size_t sg_host_count() { - return xbt_dict_length(host_list); + return simgrid::s4u::Engine::getInstance()->getHostCount(); +} +/** @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!"); + std::vector hosts = simgrid::s4u::Engine::getInstance()->getAllHosts(); + + sg_host_t* res = (sg_host_t*)malloc(sizeof(sg_host_t) * hosts.size()); + memcpy(res, hosts.data(), sizeof(sg_host_t) * hosts.size()); + + return res; } const char *sg_host_get_name(sg_host_t host) { - return host->getName().c_str(); + return host->getCname(); } void* sg_host_extension_get(sg_host_t host, size_t ext) @@ -30,61 +55,36 @@ 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); -} - -sg_host_t sg_host_by_name_or_create(const char *name) -{ - return simgrid::Host::by_name_or_create(name); + return simgrid::s4u::Host::by_name_or_null(name); } -xbt_dynar_t sg_hosts_as_dynar(void) +static int hostcmp_voidp(const void* pa, const void* pb) { - 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; + return strcmp((*static_cast(pa))->getCname(), + (*static_cast(pb))->getCname()); } -// ========= Layering madness ============== - -int MSG_HOST_LEVEL; -int SD_HOST_LEVEL; -int SIMIX_HOST_LEVEL; -int ROUTING_HOST_LEVEL; -int USER_HOST_LEVEL; - -#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() +xbt_dynar_t sg_hosts_as_dynar() { - MSG_HOST_LEVEL = simgrid::Host::extension_create([](void *p) { - __MSG_host_priv_free((msg_host_priv_t) p); - }); + xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),nullptr); - ROUTING_HOST_LEVEL = simgrid::Host::extension_create([](void *p) { - delete static_cast(p); - }); + std::vector list = simgrid::s4u::Engine::getInstance()->getAllHosts(); - 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); + for (auto const& host : list) { + if (host && host->pimpl_netpoint && host->pimpl_netpoint->isHost()) + xbt_dynar_push(res, &host); + } + xbt_dynar_sort(res, hostcmp_voidp); + return res; } +// ========= Layering madness ==============* + // ========== User data Layer ========== void *sg_host_user(sg_host_t host) { return host->extension(USER_HOST_LEVEL); @@ -96,212 +96,243 @@ 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); -} -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); -} +// ========= storage related functions ============ +xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){ + 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); + } -// ========== Simix layer ============= -smx_host_priv_t sg_host_simix(sg_host_t host){ - return (smx_host_priv_t) host->extension(SIMIX_HOST_LEVEL); + return res; } -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); + +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->getAttachedStorages(storage_vector); + for (auto const& name : *storage_vector) + xbt_dynar_push(storage_dynar, &name); + delete storage_vector; + return storage_dynar; } // =========== user-level functions =============== // ================================================ - -double sg_host_get_available_speed(sg_host_t host){ - return surf_host_get_available_speed(host); +/** @brief Returns the total speed of a host */ +double sg_host_speed(sg_host_t host) +{ + return host->getSpeed(); } -/** @brief Returns the state of a host. - * @return 1 if the host is active or 0 if it has crashed. + +/** \brief Return the speed of the processor (in flop/s) at a given pstate. See also @ref plugin_energy. + * + * \param host host to test + * \param pstate_index pstate to test + * \return Returns the processor speed associated with pstate_index */ -int sg_host_is_on(sg_host_t host) { - return host->p_cpu->isOn(); +double sg_host_get_pstate_speed(sg_host_t host, int pstate_index) +{ + return host->getPstateSpeed(pstate_index); } -/** @brief Returns the total energy consumed by the host (in Joules). +/** \ingroup m_host_management + * \brief Return the number of cores. * - * See also @ref SURF_plugin_energy. + * \param host a host + * \return the number of cores */ -double sg_host_get_consumed_energy(sg_host_t host) { - return surf_host_get_consumed_energy(host); +int sg_host_core_count(sg_host_t host) +{ + return host->getCoreCount(); +} + +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->p_cpu->getNbPStates(); + 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->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)); -} - -/** 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(); + return host->getPstate(); } -bool Host::isOff() { - return ! p_cpu->isOn(); -} - - -/** Get the properties assigned to a host */ -xbt_dict_t Host::getProperties() -{ - return simgrid::simix::kernel(std::bind(SIMIX_host_get_properties, this)); +/** @brief Sets the pstate at which that host should run. + * + * See also @ref plugin_energy. + */ +void sg_host_set_pstate(sg_host_t host,int pstate) { + host->setPstate(pstate); } -/** Get the processes attached to the host */ -xbt_swag_t Host::getProcessList() +/** \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) { - return simgrid::simix::kernel(std::bind(SIMIX_host_get_process_list, this)); + host->turnOn(); } -/** Get the peak power of a host */ -double Host::getCurrentPowerPeak() +/** \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) { - return simgrid::simix::kernel( - std::bind(SIMIX_host_get_current_power_peak, this)); + host->turnOff(); } -/** Get one power peak (in flops/s) of a host at a given pstate */ -double Host::getPowerPeakAt(int pstate_index) +/** @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 simgrid::simix::kernel( - std::bind(SIMIX_host_get_power_peak_at, this, pstate_index)); -} - -/** @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(); + return host->isOn(); } -Host* Host::by_name_or_null(const char* name) +/** @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*) xbt_dict_get_or_null(host_list, name); + return host->isOff(); } -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); +/** @brief Get the properties of an host */ +xbt_dict_t sg_host_get_properties(sg_host_t host) { + 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 host; + return as_dict; } -/** Set the pstate at which the host should run */ -void Host::setPstate(int pstate_index) +/** \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) { - simgrid::simix::kernel(std::bind( - &simgrid::surf::Cpu::setPState, p_cpu, pstate_index - )); + return host->getProperty(name); } -/** Get the amount of watt dissipated at the given pstate when the host is idling */ -double Host::getWattMinAt(int pstate) +void sg_host_set_property_value(sg_host_t host, const char* name, const char* value) { - return simgrid::simix::kernel( - std::bind(SIMIX_host_get_wattmin_at, this, pstate)); + host->setProperty(name, value); } -/** Get the amount of watt dissipated at the given pstate when the host burns CPU at 100% */ -double Host::getWattMaxAt(int pstate) +/** + * \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) { - return simgrid::simix::kernel( - std::bind(SIMIX_host_get_wattmax_at, this, pstate)); + std::vector vlinks; + from->routeTo(to, vlinks, nullptr); + for (auto const& link : vlinks) + xbt_dynar_push(links, &link); } - -void Host::getParams(vm_params_t params) +/** + * \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) { - simgrid::simix::kernel(std::bind(SIMIX_host_get_params, this, params)); + std::vector vlinks; + double res = 0; + from->routeTo(to, vlinks, &res); + return res; } - -void Host::setParams(vm_params_t params) +/** + * \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) { - simgrid::simix::kernel(std::bind(SIMIX_host_set_params, this, params)); + double min_bandwidth = -1.0; + + std::vector 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; + } + return min_bandwidth; } -/** - * \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() +/** @brief Displays debugging information about a host */ +void sg_host_dump(sg_host_t host) { - return simgrid::simix::kernel(std::bind( - SIMIX_host_get_mounted_storage_list, this - )); + XBT_INFO("Displaying host %s", host->getCname()); + XBT_INFO(" - speed: %.0f", host->getSpeed()); + XBT_INFO(" - available speed: %.2f", sg_host_get_available_speed(host)); + std::map* props = host->getProperties(); + + if (not props->empty()) { + XBT_INFO(" - properties:"); + for (auto const& elm : *props) { + XBT_INFO(" %s->%s", elm.first.c_str(), elm.second.c_str()); + } + } } -/** - * \ingroup simix_storage_management - * \brief Returns the list of storages attached to an host. - * \return a dict containing all storages attached to the host +/** \brief Return the list of actors attached to an host. + * + * \param host a host + * \param whereto a dynar in which we should push actors living on that host */ -xbt_dynar_t Host::getAttachedStorageList() +void sg_host_get_actor_list(sg_host_t host, xbt_dynar_t whereto) { - return simgrid::simix::kernel(std::bind( - SIMIX_host_get_attached_storage_list, this - )); + for (auto& actor : host->extension()->process_list) { + s4u_Actor* p = actor.ciface(); + xbt_dynar_push(whereto, &p); + } } +sg_host_t sg_host_self() +{ + smx_actor_t process = SIMIX_process_self(); + return (process == nullptr) ? nullptr : process->host; }