X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/242fde5e8077f8193db4df5f262a9672085c8d8a..7e9089a13ddf2e277b8c25877aef808174f9fffa:/src/simgrid/host.cpp diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp index 63655a9a9f..7b650aaee5 100644 --- a/src/simgrid/host.cpp +++ b/src/simgrid/host.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. +/* Copyright (c) 2013-201. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -6,130 +6,157 @@ #include "xbt/dict.h" #include "simgrid/host.h" -#include "surf/surf_routing.h" // SIMIX_HOST_LEVEL and friends FIXME: make private here +#include +#include #include "surf/surf.h" // routing_get_network_element_type FIXME:killme -sg_host_t sg_host_by_name(const char *name){ - return xbt_lib_get_elm_or_null(host_lib, name); +#include "src/simix/smx_private.hpp" +#include "src/surf/host_interface.hpp" + +size_t sg_host_count() +{ + return xbt_dict_length(host_list); } -sg_host_t sg_host_by_name_or_create(const char *name) { - sg_host_t res = xbt_lib_get_elm_or_null(host_lib, name); - if (!res) { - xbt_lib_set(host_lib,name,0,NULL); // Should only create the bucklet with no data added - res = xbt_lib_get_elm_or_null(host_lib, name); - } - return res; +const char *sg_host_get_name(sg_host_t host) +{ + return host->name().c_str(); } -xbt_dynar_t sg_hosts_as_dynar(void) { - xbt_lib_cursor_t cursor; - char *key; - void **data; - xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),NULL); - xbt_lib_foreach(host_lib, cursor, key, data) { - if(routing_get_network_element_type(key) == SURF_NETWORK_ELEMENT_HOST) { - xbt_dictelm_t elm = xbt_dict_cursor_get_elm(cursor); - xbt_dynar_push(res, &elm); - } - } - return res; +void* sg_host_extension_get(sg_host_t host, size_t ext) +{ + return host->extension(ext); } -// ========= Layering madness ============== +size_t sg_host_extension_create(void(*deleter)(void*)) +{ + return simgrid::s4u::Host::extension_create(deleter); +} -int MSG_HOST_LEVEL; -int SD_HOST_LEVEL; -int SIMIX_HOST_LEVEL; -int ROUTING_HOST_LEVEL; -int SURF_CPU_LEVEL; +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) +{ + return simgrid::s4u::Host::by_name_or_create(name); +} -#include "msg/msg_private.h" // MSG_host_priv_free. FIXME: killme -#include "simdag/private.h" // __SD_workstation_destroy. FIXME: killme -#include "simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme -#include "surf/cpu_interface.hpp" -#include "surf/surf_routing.hpp" +xbt_dynar_t sg_hosts_as_dynar(void) +{ + xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),NULL); -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); + 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) + xbt_dynar_push(res, &host); + return res; } +// ========= Layering madness ==============* -void sg_host_init() { // FIXME: only add the needed levels - MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_priv_free); - SD_HOST_LEVEL = xbt_lib_add_level(host_lib,__SD_workstation_destroy); +#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" - SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,SIMIX_host_destroy); - SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_cpu_free); - ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free); +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(__SD_workstation_destroy); + 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); +} +void sg_host_user_set(sg_host_t host, void* userdata) { + host->extension_set(USER_HOST_LEVEL,userdata); +} +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) xbt_lib_get_level(host, 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) { - xbt_lib_set(host_lib,host->key,MSG_HOST_LEVEL,smx_host); -} -void sg_host_msg_destroy(sg_host_t host) { - xbt_lib_unset(host_lib,host->key,MSG_HOST_LEVEL,1); + host->extension_set(MSG_HOST_LEVEL, smx_host); } // ========== SimDag Layer ============== SD_workstation_priv_t sg_host_sd(sg_host_t host) { - return (SD_workstation_priv_t) xbt_lib_get_level(host, SD_HOST_LEVEL); + 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) { - xbt_lib_set(host_lib,host->key,SD_HOST_LEVEL,smx_host); + host->extension_set(SD_HOST_LEVEL, smx_host); } void sg_host_sd_destroy(sg_host_t host) { - xbt_lib_unset(host_lib,host->key,SD_HOST_LEVEL,1); + host->extension_set(SD_HOST_LEVEL, nullptr); } // ========== Simix layer ============= smx_host_priv_t sg_host_simix(sg_host_t host){ - return (smx_host_priv_t) xbt_lib_get_level(host, SIMIX_HOST_LEVEL); + 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) { - xbt_lib_set(host_lib,host->key,SIMIX_HOST_LEVEL,smx_host); + host->extension_set(SIMIX_HOST_LEVEL, smx_host); } void sg_host_simix_destroy(sg_host_t host) { - xbt_lib_unset(host_lib,host->key,SIMIX_HOST_LEVEL,1); + host->extension_set(SIMIX_HOST_LEVEL, nullptr); } -// ========== SURF CPU ============ -surf_cpu_t sg_host_surfcpu(sg_host_t host) { - return (surf_cpu_t) xbt_lib_get_level(host, SURF_CPU_LEVEL); -} -void sg_host_surfcpu_set(sg_host_t host, surf_cpu_t cpu) { - xbt_lib_set(host_lib, host->key, SURF_CPU_LEVEL, cpu); +// =========== user-level functions =============== +// ================================================ + +double sg_host_get_available_speed(sg_host_t host){ + return surf_host_get_available_speed(host); } -void sg_host_surfcpu_destroy(sg_host_t host) { - xbt_lib_unset(host_lib,host->key,SURF_CPU_LEVEL,1); +/** @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(); } -// ========== RoutingEdge ============ -RoutingEdge *sg_host_edge(sg_host_t host) { - return (RoutingEdge*) xbt_lib_get_level(host, ROUTING_HOST_LEVEL); + +/** @brief Returns the number of power states for a host. + * + * See also @ref SURF_plugin_energy. + */ +int sg_host_get_nb_pstates(sg_host_t host) { + return host->pstates_count(); } -void sg_host_edge_set(sg_host_t host, RoutingEdge *edge) { - xbt_lib_set(host_lib, host->key, ROUTING_HOST_LEVEL, edge); + +/** @brief Gets the pstate at which that host currently runs. + * + * See also @ref SURF_plugin_energy. + */ +int sg_host_get_pstate(sg_host_t host) { + return host->pstate(); } -void sg_host_edge_destroy(sg_host_t host, int do_callback) { - xbt_lib_unset(host_lib,host->key,ROUTING_HOST_LEVEL,do_callback); +/** @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->set_pstate(pstate); } - - -/* -host::host() { - // TODO Auto-generated constructor stub - +/** @brief Get the properties of an host */ +xbt_dict_t sg_host_get_properties(sg_host_t host) { + return host->properties(); } -host::~host() { - // TODO Auto-generated destructor stub -}*/ -