/* 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. */
#define XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL /* MSVC don't want it to be declared extern in headers and local here */
-#include "simgrid_config.h"
+#include "simgrid/config.h"
+#include "simgrid/sg_config.hpp"
+#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"
#include "xbt/misc.h"
+#include "xbt/module.h" /* this module */
#include "xbt/sysdep.h"
-#include <cmath>
-
-#include "xbt/module.h" /* this module */
-
-#include "src/xbt_modinter.h" /* prototype of other module's init/exit in XBT */
-#include "simgrid/sg_config.hpp"
-
-#include "src/internal_config.h"
+#include <cmath>
#include <cstdio>
#ifdef _WIN32
# include <csignal> /* To silence MSVC on abort() */
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
xbt_log_preinit();
- xbt_os_thread_mod_preinit();
xbt_dict_preinit();
srand(seed);
return;
xbt_initialized--;
xbt_dict_postexit();
- xbt_os_thread_mod_postexit();
xbt_dynar_free(&xbt_cmdline);
xbt_log_postexit();
#if SIMGRID_HAVE_MC
/** @brief Initialize the xbt mechanisms. */
void xbt_init(int *argc, char **argv)
{
- simgrid::xbt::installExceptionHandler();
+ simgrid::xbt::install_exception_handler();
xbt_initialized++;
if (xbt_initialized > 1) {
/** @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);