X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/527d6ea1ad739bddb768c4dc654085ddce6fe8bb..a9bad99874f37ee04f867fb119aee4ed58cd900e:/include/simgrid/simdag.h diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h index 144677d571..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 @@ -32,7 +32,7 @@ typedef sg_link_t 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 */ @@ -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,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 */ @@ -195,4 +196,13 @@ XBT_PUBLIC(std::set*) simulate(double how_long); //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