From 983a8a691054ecec4cdc7d3a932942520f834f43 Mon Sep 17 00:00:00 2001 From: Takishipp Date: Fri, 2 Jun 2017 10:41:53 +0200 Subject: [PATCH 1/1] add clean-atexit test --- include/simgrid/simdag.h | 6 ------ src/simdag/sd_global.cpp | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h index 5906b04476..2a01b473b9 100644 --- a/include/simgrid/simdag.h +++ b/include/simgrid/simdag.h @@ -161,12 +161,6 @@ 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 ad85c0f3f5..fe907760eb 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_check(int *argc, char **argv) +void SD_init(int *argc, char **argv) { xbt_assert(sd_global == nullptr, "SD_init() already called"); @@ -161,6 +161,7 @@ void SD_init_check(int *argc, char **argv) surf_init(argc, argv); xbt_cfg_setdefault_string("host/model", "ptask_L07"); + if(xbt_cfg_get_boolean("clean-atexit")) atexit(SD_exit); if (_sg_cfg_exit_asap) { exit(0); -- 2.20.1