Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / include / simgrid / simdag.h

diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h
index b41becd..2edb7b0 100644 (file)
--- a/include/simgrid/simdag.h
+++ b/include/simgrid/simdag.h
@@ -57,24 +57,6 @@ typedef enum {
   SD_TASK_COMM_PAR_MXN_1D_BLOCK = 4 /**< @brief MxN data redistribution (1D Block distribution) */
 } e_SD_task_kind_t;
 
-
-/************************** Workstation handling ****************************/
-/** @addtogroup SD_host_api
- *
- *  A host is a place where a task can be executed.
- *  A host is represented as a <em>physical resource with computing capabilities</em> and has a <em>name</em>.
- *
- *  The hosts are created from the description file when you call the function SD_create_environment.
- *
- *  @see sg_host_t
- *  @{
- */
-XBT_PUBLIC(SD_link_t *) SD_route_get_list(sg_host_t src, sg_host_t dst);
-XBT_PUBLIC(int) SD_route_get_size(sg_host_t src, sg_host_t dst);
-XBT_PUBLIC(double) SD_route_get_latency(sg_host_t src, sg_host_t dst);
-XBT_PUBLIC(double) SD_route_get_bandwidth(sg_host_t src, sg_host_t dst);
-/** @} */
-
 /************************** Task handling ************************************/
 /** @defgroup SD_task_api Tasks
  *  @brief Functions for managing the tasks
@@ -199,6 +181,8 @@ XBT_PUBLIC(std::set<SD_task_t>*) simulate(double how_long);
 #define SD_workstation_get_property_value sg_host_get_property_value
 #define SD_workstation_get_power sg_host_speed
 #define SD_workstation_get_available_power sg_host_get_available_speed
+#define SD_route_get_latency sg_host_route_latency
+#define SD_route_get_bandwidth sg_host_route_bandwidth
 
 #define SD_workstation_get_mounted_storage_list sg_host_get_mounted_storage_list
 // Lost functions
@@ -207,7 +191,8 @@ XBT_PUBLIC(std::set<SD_task_t>*) simulate(double how_long);
 //SD_workstation_get_current_task
 //SD_route_get_communication_time => SG_route_get_latency() + amount / SD_route_get_bandwidth()
 //SD_workstation_get_computation_time => amount / sg_host_speed()
+//SD_route_get_size
+//SD_route_get_list
 //TRACE_sd_set_task_category
-
 SG_END_DECL()
 #endif