X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c1ced69678f2c9b86032a7a6460993ca96da265a..f95d001733819381a8b927263af8925c6cb581c4:/include/simgrid/simdag.h
diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h
index b41becda3a..8f64ea326a 100644
--- a/include/simgrid/simdag.h
+++ b/include/simgrid/simdag.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2010, 2012-2016. The SimGrid Team.
+/* Copyright (c) 2006-2010, 2012-2017. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@ SG_BEGIN_DECL()
A link is a network node represented as a name, a bandwidth and a latency.
A route is a list of links between two hosts.
*/
-typedef Link *SD_link_t;
+typedef sg_link_t SD_link_t;
/** @brief Task opaque datatype
@ingroup SD_task_api
@@ -32,7 +32,7 @@ typedef Link *SD_link_t;
Each task has a \ref e_SD_task_state_t "state" indicating whether the task is scheduled, running, done, ...
*/
-typedef struct SD_task *SD_task_t;
+typedef struct s_SD_task_t* SD_task_t;
/** @brief Task states
@ingroup SD_task_api */
@@ -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 physical resource with computing capabilities and has a name.
- *
- * 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
@@ -139,8 +121,8 @@ XBT_PUBLIC(void) SD_task_schedulel(SD_task_t task, int count, ...);
/** @} */
-/** @addtogroup SD_task_dependency_api
- *
+/** @addtogroup SD_task_dependency_api
+ *
* This section describes the functions for managing the dependencies between the tasks.
*
* @see SD_task_api
@@ -158,23 +140,24 @@ XBT_PUBLIC(int) SD_task_dependency_exists(SD_task_t src, SD_task_t dst);
*
* @{
*/
-XBT_PUBLIC(void) SD_init(int *argc, char **argv);
+
+#define SD_init(argc, argv) \
+ do { \
+ sg_version_check(SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, SIMGRID_VERSION_PATCH); \
+ SD_init_nocheck(argc, argv); \
+ } while (0)
+
+XBT_PUBLIC(void) SD_init_nocheck(int *argc, char **argv);
XBT_PUBLIC(void) SD_config(const char *key, const char *value);
XBT_PUBLIC(void) SD_create_environment(const char *platform_file);
-XBT_PUBLIC(xbt_dynar_t) SD_simulate(double how_long);
+XBT_PUBLIC(void) SD_simulate(double how_long);
+XBT_PUBLIC(void) SD_simulate_with_update(double how_long, xbt_dynar_t changed_tasks_dynar);
XBT_PUBLIC(double) SD_get_clock();
XBT_PUBLIC(void) SD_exit();
XBT_PUBLIC(xbt_dynar_t) SD_daxload(const char *filename);
XBT_PUBLIC(xbt_dynar_t) SD_dotload(const char *filename);
XBT_PUBLIC(xbt_dynar_t) SD_dotload_with_sched(const char *filename);
XBT_PUBLIC(xbt_dynar_t) SD_PTG_dotload(const char *filename);
-#ifdef __cplusplus
-namespace simgrid {
-namespace sd {
-XBT_PUBLIC(std::set*) simulate(double how_long);
-}
-}
-#endif
/** @} */
/* Support some backward compatibility */
@@ -199,6 +182,8 @@ XBT_PUBLIC(std::set*) 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 +192,17 @@ XBT_PUBLIC(std::set*) 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()
+
+#ifdef __cplusplus
+namespace simgrid {
+namespace sd {
+XBT_PUBLIC(std::set*) simulate(double how_long);
+}
+}
+#endif
+
#endif