X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f23b0fb864cb60978c1fcfd48d50f62dd054fe31..928727f1e4e29a54ef43f6a70ae8ce9158c31a90:/src/xbt/xbt_main.cpp

diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp
index 5cb3298475..a573123518 100644
--- a/src/xbt/xbt_main.cpp
+++ b/src/xbt/xbt_main.cpp
@@ -1,6 +1,6 @@
 /* module handling                                                          */
 
-/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -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"
@@ -92,7 +93,6 @@ static void xbt_preinit()
   _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
   xbt_log_preinit();
-  xbt_os_thread_mod_preinit();
   xbt_dict_preinit();
 
   srand(seed);
@@ -108,7 +108,6 @@ static void xbt_postexit()
     return;
   xbt_initialized--;
   xbt_dict_postexit();
-  xbt_os_thread_mod_postexit();
   xbt_dynar_free(&xbt_cmdline);
   xbt_log_postexit();
 #if SIMGRID_HAVE_MC
@@ -151,11 +150,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);