X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/559cb98f249c32641d64709f23c3103302ccf4e6..471fea6efe44cedfedf6af1f62aa4eb9bc9c3abd:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 04a4b1c699..702678e5b1 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -20,7 +20,6 @@ #include "surf/surf_routing.h" #include "simgrid/platf_interface.h" #include "simgrid/datatypes.h" -#include "simgrid/plugins.h" #include "simgrid/forward.h" SG_BEGIN_DECL() @@ -198,8 +197,6 @@ typedef enum { XBT_PUBLIC_DATA(routing_platf_t) routing_platf; -XBT_PUBLIC(surf_host_t) surf_host_resource_priv(sg_host_t host); - static inline void *surf_storage_resource_priv(const void *storage){ return (void*)xbt_lib_get_level((xbt_dictelm_t)storage, SURF_STORAGE_LEVEL); } @@ -298,9 +295,6 @@ static inline const char * surf_cpu_name(surf_cpu_t cpu) { return surf_resource_name((surf_cpp_resource_t)cpu); } -/** @brief Get the properties of an host */ -XBT_PUBLIC(xbt_dict_t) sg_host_get_properties(sg_host_t host); - /** @brief Get the available speed of cpu associated to a host */ XBT_PUBLIC(double) surf_host_get_available_speed(sg_host_t host); @@ -427,45 +421,6 @@ XBT_PUBLIC(void) surf_vm_set_bound(sg_host_t resource, double bound); */ XBT_PUBLIC(void) surf_vm_set_affinity(sg_host_t resource, sg_host_t cpu, unsigned long mask); -/** - * @brief Get the host power peak - * @details [long description] - * - * @param host The surf host - * @return The power peak - */ -XBT_PUBLIC(double) surf_host_get_current_power_peak(sg_host_t host); - -/** - * @brief [brief description] - * @details [long description] - * - * @param host [description] - * @param pstate_index [description] - * - * @return [description] - */ -XBT_PUBLIC(double) surf_host_get_power_peak_at(sg_host_t host, int pstate_index); - -XBT_PUBLIC(double) surf_host_get_wattmin_at(sg_host_t resource, int pstate); -XBT_PUBLIC(double) surf_host_get_wattmax_at(sg_host_t resource, int pstate); - -/** - * @brief Get the consumed energy (in joules) of an host - * - * @param host The surf host - * @return The consumed energy - */ -XBT_PUBLIC(double) surf_host_get_consumed_energy(sg_host_t host); - -/** - * @brief Get the list of storages mounted on an host - * - * @param host The surf host - * @return Dictionary of mount point, Storage - */ -XBT_PUBLIC(xbt_dict_t) surf_host_get_mounted_storage_list(sg_host_t host); - /** * @brief Get the list of storages attached to an host * @@ -716,8 +671,6 @@ XBT_PUBLIC(xbt_dict_t) surf_storage_action_get_ls_dict(surf_action_t action); */ XBT_PUBLIC(const char * ) surf_storage_get_host(surf_resource_t resource); -XBT_PUBLIC(surf_host_model_t) surf_host_get_model(sg_host_t host); - /** @} */ /**************************************/