X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/95f6003dd91bcac6493664491e831de740ebffd3..e9f0018b823e34405847177b25a85d3facc30ae1:/src/simgrid/host.cpp diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp index df6a15bf29..8e527800f2 100644 --- a/src/simgrid/host.cpp +++ b/src/simgrid/host.cpp @@ -4,14 +4,14 @@ /* 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 +#include #include "surf/surf.h" // routing_get_network_element_type FIXME:killme #include "src/simix/smx_private.hpp" +#include "src/surf/host_interface.hpp" size_t sg_host_count() { @@ -20,7 +20,7 @@ size_t sg_host_count() const char *sg_host_get_name(sg_host_t host) { - return host->getName().c_str(); + return host->name().c_str(); } void* sg_host_extension_get(sg_host_t host, size_t ext) @@ -30,17 +30,17 @@ 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) { - return simgrid::Host::by_name_or_create(name); + return simgrid::s4u::Host::by_name_or_create(name); } xbt_dynar_t sg_hosts_as_dynar(void) @@ -49,40 +49,33 @@ xbt_dynar_t sg_hosts_as_dynar(void) xbt_dict_cursor_t cursor = nullptr; const char* name = nullptr; - simgrid::Host* host = 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) xbt_dynar_push(res, &host); return res; } -// ========= Layering madness ============== - -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_LEVEL = simgrid::s4u::Host::extension_create([](void *p) { __MSG_host_priv_free((msg_host_priv_t) p); }); - ROUTING_HOST_LEVEL = simgrid::Host::extension_create([](void *p) { + ROUTING_HOST_LEVEL = simgrid::s4u::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); + 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 ========== @@ -103,9 +96,6 @@ msg_host_priv_t sg_host_msg(sg_host_t host) { 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); @@ -137,16 +127,8 @@ double sg_host_get_available_speed(sg_host_t 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 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); +int sg_host_is_on(sg_host_t host) { + return host->is_on(); } /** @brief Returns the number of power states for a host. @@ -154,7 +136,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->pstates_count(); } /** @brief Gets the pstate at which that host currently runs. @@ -162,137 +144,18 @@ 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); -} - -namespace simgrid { - -Host::Host(std::string const& id) - : name_(id) -{ -} - -Host::~Host() -{ -} - -/** Start the host if it is off */ -void Host::on() -{ - simgrid::simix::kernel(std::bind(SIMIX_host_on, this)); -} - -/** Stop the host if it is on */ -void Host::off() -{ - /* 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); -} - -/** Get the properties assigned to a host */ -xbt_dict_t Host::getProperties() -{ - return simgrid::simix::kernel(std::bind(SIMIX_host_get_properties, this)); -} - -/** 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() -{ - return simgrid::simix::kernel( - std::bind(SIMIX_host_get_current_power_peak, this)); -} - -/** Get one power peak (in flops/s) of a host at a given pstate */ -double Host::getPowerPeakAt(int pstate_index) -{ - 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(); -} - -Host* Host::by_name_or_null(const char* name) -{ - return (Host*) xbt_dict_get_or_null(host_list, name); -} - -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); - } - return host; -} - -/** Set the pstate at which the host should run */ -void Host::setPstate(int pstate_index) -{ - simgrid::simix::kernel( - std::bind(SIMIX_host_set_pstate, this, 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(SIMIX_host_get_wattmin_at, this, pstate)); + return host->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(SIMIX_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 +/** @brief Sets the pstate at which that host should run. + * + * See also @ref SURF_plugin_energy. */ -xbt_dict_t Host::getMountedStorageList() -{ - return simgrid::simix::kernel(std::bind( - SIMIX_host_get_mounted_storage_list, this - )); +void sg_host_set_pstate(sg_host_t host,int pstate) { + host->set_pstate(pstate); } -/** - * \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 - )); +/** @brief Get the properties of an host */ +xbt_dict_t sg_host_get_properties(sg_host_t host) { + return host->properties(); } -}