X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f67e9f5d0e553ae935bd6cad29df46f1565173bf..7c325b8aab369b3db924f9c3bcfbf8a97523745c:/src/xbt/xbt_main.cpp diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp index dc5441573e..5a80ce6412 100644 --- a/src/xbt/xbt_main.cpp +++ b/src/xbt/xbt_main.cpp @@ -12,6 +12,7 @@ #include "src/internal_config.h" #include "src/xbt_modinter.h" /* prototype of other module's init/exit in XBT */ #include "xbt/config.hpp" +#include "xbt/coverage.h" #include "xbt/dynar.h" #include "xbt/log.h" #include "xbt/log.hpp" @@ -74,7 +75,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); @@ -93,11 +93,6 @@ static void xbt_preinit() #endif xbt_log_preinit(); xbt_dict_preinit(); - - srand(seed); -#ifndef _WIN32 - srand48(seed); -#endif atexit(xbt_postexit); } @@ -135,13 +130,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); } @@ -149,11 +144,8 @@ void xbt_free_ref(void *d) /** @brief Kill the program in silence */ void xbt_abort() { -#ifdef COVERAGE /* Call __gcov_flush on abort when compiling with coverage options. */ - extern void __gcov_flush(); - __gcov_flush(); -#endif + coverage_checkpoint(); #ifdef _WIN32 /* We said *in silence*. We don't want to see the error message printed by Microsoft's implementation of abort(). */ raise(SIGABRT);