X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/771173935e00663e8f6ae0a903e5b38f3d8abf6e..4fb3673da5b0ac154b2f70e40ccd11cf8993da32:/include/simgrid/simdag.h
diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h
index c6cab06997..dbd011ff3d 100644
--- a/include/simgrid/simdag.h
+++ b/include/simgrid/simdag.h
@@ -24,21 +24,6 @@ SG_BEGIN_DECL()
@see SD_workstation_management */
typedef sg_host_t SD_workstation_t;
-/** @brief Workstation access mode
- @ingroup SD_datatypes_management
-
- By default, a workstation resource is shared, i.e. several tasks
- can be executed at the same time on a workstation. The CPU power of
- the workstation is shared between the running tasks on the workstation.
- In sequential mode, only one task can use the workstation, and the other
- tasks wait in a FIFO.
-
- @see SD_workstation_get_access_mode(), SD_workstation_set_access_mode() */
-typedef enum {
- SD_WORKSTATION_SHARED_ACCESS, /**< @brief Several tasks can be executed at the same time */
- SD_WORKSTATION_SEQUENTIAL_ACCESS /**< @brief Only one task can be executed, the others wait in a FIFO. */
-} e_SD_workstation_access_mode_t;
-
/** @brief Link datatype
@ingroup SD_datatypes_management
@@ -67,14 +52,13 @@ typedef struct SD_task *SD_task_t;
@see SD_task_management */
typedef enum {
SD_NOT_SCHEDULED = 0, /**< @brief Initial state (not valid for SD_watch and SD_unwatch). */
- SD_SCHEDULABLE = 0x0001, /**< @brief A task becomes SD_SCHEDULABLE as soon as its dependencies are satisfied */
+ SD_SCHEDULABLE = 0x0001, /**< @brief A task becomes SD_SCHEDULABLE as soon as its dependencies are satisfied */
SD_SCHEDULED = 0x0002, /**< @brief A task becomes SD_SCHEDULED when you call function
SD_task_schedule. SD_simulate will execute it when it becomes SD_RUNNABLE. */
SD_RUNNABLE = 0x0004, /**< @brief A scheduled task becomes runnable is SD_simulate as soon as its dependencies are satisfied. */
- SD_IN_FIFO = 0x0008, /**< @brief A runnable task can have to wait in a workstation fifo if the workstation is sequential */
- SD_RUNNING = 0x0010, /**< @brief An SD_RUNNABLE or SD_IN_FIFO becomes SD_RUNNING when it is launched. */
- SD_DONE = 0x0020, /**< @brief The task is successfully finished. */
- SD_FAILED = 0x0040 /**< @brief A problem occurred during the execution of the task. */
+ SD_RUNNING = 0x0008, /**< @brief An SD_RUNNABLE task becomes SD_RUNNING when it is launched. */
+ SD_DONE = 0x0010, /**< @brief The task is successfully finished. */
+ SD_FAILED = 0x0020 /**< @brief A problem occurred during the execution of the task. */
} e_SD_task_state_t;
/** @brief Task kinds
@@ -98,58 +82,6 @@ typedef enum {
@see SD_storage_management */
typedef xbt_dictelm_t SD_storage_t;
-/************************** Link handling ***********************************/
-/** @defgroup SD_link_management Links
- * @brief Functions for managing the network links
- *
- * This section describes the functions for managing the network links.
- *
- * A link is a network node represented as a name, a current
- * bandwidth and a current latency. The links are created
- * when you call the function SD_create_environment.
- *
- * @see SD_link_t
- * @{
- */
-XBT_PUBLIC(const SD_link_t *) SD_link_get_list(void);
-/** @brief Returns the number of links in the whole platform */
-static inline int SD_link_get_number(void) {
- return sg_link_count();
-}
-
-/** @brief Returns the user data of a link */
-static inline void *SD_link_get_data(SD_link_t link) {
- return sg_link_data(link);
-}
-
-/** @brief Sets the user data of a link
- *
- * The new data can be \c NULL. The old data should have been freed first
- * if it was not \c NULL.
- */
-static inline void SD_link_set_data(SD_link_t link, void *data) {
- sg_link_data_set(link, data);
-}
-/** @brief Returns the name of a link */
-static inline const char *SD_link_get_name(SD_link_t link) {
- return sg_link_name(link);
-}
-/** @brief Returns the current bandwidth of a link (in bytes per second) */
-static inline double SD_link_get_current_bandwidth(SD_link_t link) {
- return sg_link_bandwidth(link);
-}
-/** @brief Returns the current latency of a link (in seconds) */
-static inline double SD_link_get_current_latency(SD_link_t link){
- return sg_link_latency(link);
-}
-/** @brief Returns the sharing policy of this workstation.
- * @return true if the link is shared, and false if it's a fatpipe
- */
-static inline int SD_link_is_shared(SD_link_t link) {
- return sg_link_is_shared(link);
-}
-/** @} */
-
/************************** Workstation handling ****************************/
/** @defgroup SD_workstation_management Workstations
@@ -168,7 +100,7 @@ static inline int SD_link_is_shared(SD_link_t link) {
*/
XBT_PUBLIC(SD_workstation_t) SD_workstation_get_by_name(const char *name);
XBT_PUBLIC(const SD_workstation_t *) SD_workstation_get_list(void);
-XBT_PUBLIC(int) SD_workstation_get_number(void);
+XBT_PUBLIC(int) SD_workstation_get_count(void);
XBT_PUBLIC(void) SD_workstation_set_data(SD_workstation_t workstation,
void *data);
XBT_PUBLIC(void *) SD_workstation_get_data(SD_workstation_t workstation);
@@ -186,28 +118,21 @@ XBT_PUBLIC(const SD_link_t *) SD_route_get_list(SD_workstation_t src,
SD_workstation_t dst);
XBT_PUBLIC(int) SD_route_get_size(SD_workstation_t src,
SD_workstation_t dst);
-XBT_PUBLIC(double) SD_workstation_get_power(SD_workstation_t workstation);
-XBT_PUBLIC(double) SD_workstation_get_available_power(SD_workstation_t
+XBT_PUBLIC(double) SD_workstation_get_speed(SD_workstation_t workstation);
+XBT_PUBLIC(double) SD_workstation_get_available_speed(SD_workstation_t
workstation);
XBT_PUBLIC(int) SD_workstation_get_cores(SD_workstation_t workstation);
-XBT_PUBLIC(e_SD_workstation_access_mode_t)
- SD_workstation_get_access_mode(SD_workstation_t workstation);
-XBT_PUBLIC(void) SD_workstation_set_access_mode(SD_workstation_t
- workstation,
- e_SD_workstation_access_mode_t
- access_mode);
XBT_PUBLIC(double) SD_workstation_get_computation_time(SD_workstation_t workstation,
double flops_amount);
-XBT_PUBLIC(double) SD_route_get_current_latency(SD_workstation_t src,
+XBT_PUBLIC(double) SD_route_get_latency(SD_workstation_t src,
SD_workstation_t dst);
-XBT_PUBLIC(double) SD_route_get_current_bandwidth(SD_workstation_t src,
+XBT_PUBLIC(double) SD_route_get_bandwidth(SD_workstation_t src,
SD_workstation_t dst);
XBT_PUBLIC(double) SD_route_get_communication_time(SD_workstation_t src,
SD_workstation_t dst,
double bytes_amount);
-XBT_PUBLIC(SD_task_t) SD_workstation_get_current_task(SD_workstation_t workstation);
XBT_PUBLIC(xbt_dict_t)
SD_workstation_get_mounted_storage_list(SD_workstation_t workstation);
XBT_PUBLIC(xbt_dynar_t)
@@ -343,7 +268,6 @@ 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_PTG_dotload(const char *filename);
XBT_PUBLIC(xbt_dynar_t) SD_dotload_with_sched(const char *filename);
-XBT_PUBLIC(void) uniq_transfer_task_name(SD_task_t task);
/** @} */