X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b7630a950a6b865fcc195c58e39e6c3cfa550ccb..b402376f49143b6c75515bd28b6610743c1a7dfc:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 6d3265fec3..84b400d1fe 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() @@ -298,25 +297,9 @@ 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 state of a surf resource (cpu, host, network, …) */ -XBT_PUBLIC(e_surf_resource_state_t) surf_resource_get_state(surf_cpp_resource_t resource); - -/** @brief Set the state of a surf resource (cpu, host, network, …) */ -XBT_PUBLIC(void) surf_resource_set_state(surf_cpp_resource_t resource, e_surf_resource_state_t state); -static inline void surf_host_set_state(surf_host_t host, e_surf_resource_state_t state) { - surf_resource_set_state((surf_cpp_resource_t)host, state); -} - /** @brief Get the available speed of cpu associated to a host */ XBT_PUBLIC(double) surf_host_get_available_speed(sg_host_t host); -/** @brief Create a computation action on the given host */ -XBT_PUBLIC(surf_action_t) surf_host_execute(sg_host_t host, double size); - /** @brief Create a sleep action on the given host */ XBT_PUBLIC(surf_action_t) surf_host_sleep(sg_host_t host, double duration); @@ -460,28 +443,6 @@ XBT_PUBLIC(double) surf_host_get_current_power_peak(sg_host_t host); */ XBT_PUBLIC(double) surf_host_get_power_peak_at(sg_host_t host, int pstate_index); -/** - * @brief [brief description] - * @details [long description] - * - * @param host [description] - * @return [description] - */ -XBT_PUBLIC(int) surf_host_get_nb_pstates(sg_host_t host); - -XBT_PUBLIC(void) surf_host_set_pstate(sg_host_t host, int pstate_index); -XBT_PUBLIC(int) surf_host_get_pstate(sg_host_t host); -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 * @@ -608,13 +569,6 @@ XBT_PUBLIC(void*) surf_action_get_data(surf_action_t action); */ XBT_PUBLIC(void) surf_action_set_data(surf_action_t action, void *data); -/** - * @brief Unreference an action - * - * @param action The surf action - */ -XBT_PUBLIC(void) surf_action_unref(surf_action_t action); - /** * @brief Get the start time of an action *