merge before pushing, next time

[simgrid.git] / src / xbt / xbt_main.cpp

diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp
index a5731235184d678244ef3e61d0c21426af941959..d60ccb09de174f73a32fa5ce2c1b56daa41c0199 100644 (file)
--- a/src/xbt/xbt_main.cpp
+++ b/src/xbt/xbt_main.cpp
@@ -37,7 +37,11 @@ char *xbt_binary_name = NULL;   /* Name of the system process containing us (man
 xbt_dynar_t xbt_cmdline = NULL; /* all we got in argv */
 
 int xbt_initialized = 0;
-bool _sg_do_clean_atexit = true;
+simgrid::config::Flag<bool> cfg_dbg_clean_atexit{
+    "debug/clean-atexit",
+    {"clean-atexit"},
+    "Whether to cleanup SimGrid at exit. Disable it if your code segfaults after its end.",
+    true};
 
 int xbt_pagesize;
 int xbt_pagebits = 0;
@@ -75,7 +79,6 @@ static BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserv
 
 static void xbt_preinit()
 {
-  unsigned int seed = 2147483647;
 #ifdef _WIN32
   SYSTEM_INFO si;
   GetSystemInfo(&si);
@@ -94,17 +97,12 @@ static void xbt_preinit()
 #endif
   xbt_log_preinit();
   xbt_dict_preinit();
-
-  srand(seed);
-#ifndef _WIN32
-  srand48(seed);
-#endif
   atexit(xbt_postexit);
 }
 
 static void xbt_postexit()
 {
-  if (not _sg_do_clean_atexit)
+  if (not cfg_dbg_clean_atexit)
     return;
   xbt_initialized--;
   xbt_dict_postexit();
@@ -136,13 +134,13 @@ void xbt_init(int *argc, char **argv)
 
 /* these two functions belong to xbt/sysdep.h, which have no corresponding .c file */
 /** @brief like xbt_free, but you can be sure that it is a function  */
-void xbt_free_f(void *p)
+void xbt_free_f(void* p) noexcept(noexcept(::free))
 {
   xbt_free(p);
 }
 
 /** @brief should be given a pointer to pointer, and frees the second one */
-void xbt_free_ref(void *d)
+void xbt_free_ref(void* d) noexcept(noexcept(::free))
 {
   xbt_free(*(void**)d);
 }