add clean-atexit test

diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h
index 5906b04..2a01b47 100644 (file)
--- a/include/simgrid/simdag.h
+++ b/include/simgrid/simdag.h
@@ -161,12 +161,6 @@ XBT_PUBLIC(std::set<SD_task_t>*) 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 ad85c0f..fe90776 100644 (file)
--- 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);