/* module handling */
-/* Copyright (c) 2006-2017. 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 "xbt/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.h"
-
-#include "src/internal_config.h"
+#include <cmath>
#include <cstdio>
#ifdef _WIN32
# include <csignal> /* To silence MSVC on abort() */
xbt_dynar_t xbt_cmdline = NULL; /* all we got in argv */
int xbt_initialized = 0;
-int _sg_do_clean_atexit = 1;
+bool _sg_do_clean_atexit = true;
int xbt_pagesize;
int xbt_pagebits = 0;
/* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library.
* This is crude and rather compiler-specific, unfortunately.
*/
-static void xbt_preinit() _XBT_GNUC_CONSTRUCTOR(200);
+static void xbt_preinit() XBT_ATTRIB_CONSTRUCTOR(200);
static void xbt_postexit();
#ifdef _WIN32
static void xbt_preinit()
{
- unsigned int seed = 2147483647;
#ifdef _WIN32
SYSTEM_INFO si;
GetSystemInfo(&si);
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
xbt_log_preinit();
- xbt_os_thread_mod_preinit();
xbt_dict_preinit();
- srand(seed);
#ifndef _WIN32
- srand48(seed);
+ constexpr unsigned seed = 2147483647;
+ srand48(seed); // FIXME: still worthwhile?
#endif
atexit(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
/** @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) {
/* 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);
}
/** @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);