From: Takishipp Date: Fri, 2 Jun 2017 07:54:40 +0000 (+0200) Subject: add checking version sd_init X-Git-Tag: v3.16~162^2~2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9e5f624bd44f7d13022c05dbe50563380b0f5d97?ds=sidebyside add checking version sd_init --- diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h index 25d8009348..5906b04476 100644 --- a/include/simgrid/simdag.h +++ b/include/simgrid/simdag.h @@ -151,6 +151,7 @@ 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); +XBT_PUBLIC(void) SD_init_check(int *argc, char **argv); #ifdef __cplusplus namespace simgrid { namespace sd { @@ -160,6 +161,12 @@ XBT_PUBLIC(std::set*) simulate(double how_long); #endif /** @} */ + +#define SD_init(argc,argv) do{\ + sg_version_check(SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH);\ + SD_init_check(argc,argv);\ +}while(0) + /* Support some backward compatibility */ #define SD_workstation_t sg_host_t diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp index 036b62ead1..ad85c0f3f5 100644 --- a/src/simdag/sd_global.cpp +++ b/src/simdag/sd_global.cpp @@ -152,7 +152,7 @@ const char *__get_state_name(e_SD_task_state_t state){ * \param argv argument list * \see SD_create_environment(), SD_exit() */ -void SD_init(int *argc, char **argv) +void SD_init_check(int *argc, char **argv) { xbt_assert(sd_global == nullptr, "SD_init() already called");