/* 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 "xbt/misc.h"
-#include "simgrid_config.h" /* _XBT_WIN32 */
-#include "internal_config.h" /* MMALLOC_WANT_OVERRIDE_LEGACY */
-#include "portable.h"
+#include "simgrid_config.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/dynar.h"
#include "xbt/module.h" /* this module */
-#include "xbt_modinter.h" /* prototype of other module's init/exit in XBT */
+#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 <stdio.h>
-#ifdef _XBT_WIN32
-#include <signal.h>
+#ifdef _WIN32
+#include <signal.h> /* To silence MSVC on abort() */
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
#endif
-XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
XBT_LOG_NEW_CATEGORY(smpi, "All SMPI categories"); /* lives here even if that's a bit odd to solve linking issues: this is used in xbt_log_file_appender to detect whether SMPI is used (and thus whether we should unbench the writing to disk) */
-
char *xbt_binary_name = NULL; /* Name of the system process containing us (mandatory to retrieve neat backtraces) */
xbt_dynar_t xbt_cmdline = NULL; /* all we got in argv */
static void xbt_preinit(void) _XBT_GNUC_CONSTRUCTOR(200);
static void xbt_postexit(void);
-#ifdef _XBT_WIN32
-# undef _XBT_NEED_INIT_PRAGMA
-#endif
-
-#ifdef _XBT_NEED_INIT_PRAGMA
-#pragma init (xbt_preinit)
-#endif
-
-#ifdef _XBT_WIN32
+#ifdef _WIN32
#include <windows.h>
#ifndef __GNUC__
-/* Dummy prototype to make gcc happy */
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
- LPVOID lpvReserved);
-
-/* Should not be necessary but for some reason,
- * DllMain is called twice at attachment and
- * at detachment.*/
+/* Should not be necessary but for some reason, DllMain is called twice at attachment and at detachment.*/
static int xbt_dll_process_is_attached = 0;
/* see also http://msdn.microsoft.com/en-us/library/ms682583%28VS.85%29.aspx */
/* and http://www.microsoft.com/whdc/driver/kernel/DLL_bestprac.mspx */
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
- LPVOID lpvReserved)
+static BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
if (fdwReason == DLL_PROCESS_ATTACH
&& xbt_dll_process_is_attached == 0) {
static void xbt_preinit(void) {
unsigned int seed = 2147483647;
-#ifndef WIN32
- xbt_pagesize = sysconf(_SC_PAGESIZE);
-#else
+#ifdef _WIN32
SYSTEM_INFO si;
GetSystemInfo(&si);
xbt_pagesize = si.dwPageSize;
+#elif HAVE_SYSCONF
+ xbt_pagesize = sysconf(_SC_PAGESIZE);
+#else
+ #error Cannot get page size.
#endif
xbt_pagebits = 0;
++xbt_pagebits;
}
-#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
- mmalloc_preinit();
-#endif
#ifdef _TWO_DIGIT_EXPONENT
/* Even printf behaves differently on Windows... */
_set_output_format(_TWO_DIGIT_EXPONENT);
static void xbt_postexit(void)
{
if(!_sg_do_clean_atexit) return;
+ xbt_initialized--;
xbt_backtrace_postexit();
xbt_fifo_postexit();
xbt_dict_postexit();
xbt_dynar_free(&xbt_cmdline);
xbt_log_postexit();
free(xbt_binary_name);
-#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
+#if HAVE_MC
mmalloc_postexit();
#endif
}
/** @brief Initialize the xbt mechanisms. */
void xbt_init(int *argc, char **argv)
{
+ xbt_set_terminate();
+
if (xbt_initialized++) {
XBT_DEBUG("XBT was initialized %d times.", xbt_initialized);
return;
xbt_binary_name = xbt_strdup(argv[0]);
xbt_cmdline = xbt_dynar_new(sizeof(char*),NULL);
- int i;
- for (i=0;i<*argc;i++) {
+ for (int i=0;i<*argc;i++)
xbt_dynar_push(xbt_cmdline,&(argv[i]));
- }
xbt_log_init(argc, argv);
}
-/** @brief Finalize the xbt mechanisms.
- * @warning this function is deprecated. Just don't call it, there is nothing more to do to finalize xbt*/
-void xbt_exit()
-{
- XBT_WARN("This function is deprecated, you shouldn't use it");
-}
-
-
/* these two functions belong to xbt/sysdep.h, which have no corresponding .c file */
/** @brief like free, but you can be sure that it is a function */
void xbt_free_f(void *p)
extern void __gcov_flush(void);
__gcov_flush();
#endif
-#ifdef _XBT_WIN32
+#ifdef _WIN32
/* It was said *in silence*. We don't want to see the error message printed
* by the Microsoft's implementation of abort(). */
raise(SIGABRT);
