X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/79f2c630c9587d494cb154e6d074294c1e23208e..3e99be14456cffb23fdd550aa42230e3b0843740:/src/include/surf/surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index e9ead8a491..d6cd014cff 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);
 }
@@ -250,25 +247,6 @@ XBT_PUBLIC(surf_action_t) surf_model_extract_running_action_set(surf_model_t mod
  */
 XBT_PUBLIC(int) surf_model_running_action_set_size(surf_model_t model);
 
-/**
- * @brief Execute a parallel task
- * @details [long description]
- *
- * @param model The model which handle the parallelisation
- * @param host_nb The number of hosts
- * @param host_list The list of hosts on which the task is executed
- * @param flops_amount The processing amount (in flop) needed to process
- * @param bytes_amount The amount of data (in bytes) needed to transfer
- * @param rate [description]
- * @return The action corresponding to the parallele execution task
- */
-XBT_PUBLIC(surf_action_t) surf_host_model_execute_parallel_task(surf_host_model_t model,
-		                                    int host_nb,
-                                        sg_host_t *host_list,
-                                            double *flops_amount,
-                                            double *bytes_amount,
-                                            double rate);
-
 /** @brief Get the route (dynar of sg_link_t) between two hosts */
 XBT_PUBLIC(xbt_dynar_t) surf_host_model_get_route(
   surf_host_model_t model, sg_host_t src, sg_host_t dst);
@@ -298,32 +276,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(int) surf_resource_is_on(surf_cpp_resource_t resource);
-/** @brief Get the state of a surf resource (cpu, host, network, …) */
-XBT_PUBLIC(int) surf_resource_is_off(surf_cpp_resource_t resource);
-
-/** @brief Set the state of a surf resource (cpu, host, network, …) */
-XBT_PUBLIC(void) surf_resource_turn_on(surf_cpp_resource_t resource);
-/** @brief Set the state of a surf resource (cpu, host, network, …) */
-XBT_PUBLIC(void) surf_resource_turn_off(surf_cpp_resource_t resource);
-static inline void surf_host_turn_on(surf_host_t host) {
-  surf_resource_turn_on((surf_cpp_resource_t)host);
-}
-static inline void surf_host_turn_off(surf_host_t host) {
-  surf_resource_turn_off((surf_cpp_resource_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);
 
-/** @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);
 
@@ -447,56 +402,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);
-
-/**
- * @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
- *
- * @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
  *
@@ -615,13 +520,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
  *
@@ -754,8 +652,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);
-
 /** @} */
 
 /**************************************/