X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/11667312f9c0886b8e7b6ca908266d33d2282b13..d5b29830df70e823202e384a7655e4371193ecd7:/include/simgrid/simdag.h diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h index eaf760a80d..27efe346a0 100644 --- a/include/simgrid/simdag.h +++ b/include/simgrid/simdag.h @@ -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 @@ -121,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 @@ -140,10 +140,18 @@ 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); @@ -181,6 +189,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 @@ -189,7 +199,8 @@ 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() #endif