X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d32b47299f43f73b82c5fdbb791a17e19d17e0e0..41c803093e7108f16bfb4cc7e2c41c52104c73c2:/src/xbt/xbt_main.c diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c index 59b050c2a2..e1a234fd83 100644 --- a/src/xbt/xbt_main.c +++ b/src/xbt/xbt_main.c @@ -1,14 +1,17 @@ /* module handling */ -/* Copyright (c) 2006-2012. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2014. 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. */ -#include "xbt/misc.h" -#include "simgrid_config.h" /*HAVE_MMAP _XBT_WIN32 */ -#include "internal_config.h" /* MMALLOC_WANT_OVERRIDE_LEGACY */ +#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 "xbt/sysdep.h" #include "xbt/log.h" #include "xbt/dynar.h" @@ -20,7 +23,11 @@ #include "simgrid/sg_config.h" -XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)"); +#include +#ifdef _XBT_WIN32 +#include +#endif + 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) */ @@ -30,6 +37,10 @@ char *xbt_binary_name = NULL; /* Name of the system process containing us (man xbt_dynar_t xbt_cmdline = NULL; /* all we got in argv */ int xbt_initialized = 0; +int _sg_do_clean_atexit = 1; + +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. @@ -79,9 +90,23 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, static void xbt_preinit(void) { unsigned int seed = 2147483647; +#ifndef WIN32 + xbt_pagesize = sysconf(_SC_PAGESIZE); +#else + SYSTEM_INFO si; + GetSystemInfo(&si); + xbt_pagesize = si.dwPageSize; +#endif -#ifdef MMALLOC_WANT_OVERRIDE_LEGACY - mmalloc_preinit(); + xbt_pagebits = 0; + int x = xbt_pagesize; + while(x >>= 1) { + ++xbt_pagebits; + } + +#ifdef _TWO_DIGIT_EXPONENT + /* Even printf behaves differently on Windows... */ + _set_output_format(_TWO_DIGIT_EXPONENT); #endif xbt_log_preinit(); xbt_backtrace_preinit(); @@ -90,13 +115,16 @@ static void xbt_preinit(void) { xbt_dict_preinit(); srand(seed); +#ifndef _WIN32 srand48(seed); - +#endif + atexit(xbt_postexit); } static void xbt_postexit(void) { - if(!sg_cfg_get_boolean("clean_atexit")) return; + if(!_sg_do_clean_atexit) return; + xbt_initialized--; xbt_backtrace_postexit(); xbt_fifo_postexit(); xbt_dict_postexit(); @@ -137,13 +165,31 @@ void xbt_exit() /* 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 */ -XBT_PUBLIC(void) xbt_free_f(void *p) +void xbt_free_f(void *p) { free(p); } /** @brief should be given a pointer to pointer, and frees the second one */ -XBT_PUBLIC(void) xbt_free_ref(void *d) +void xbt_free_ref(void *d) { free(*(void **) d); } + +/** @brief Kill the program in silence */ +void xbt_abort(void) +{ +#ifdef COVERAGE + /* Call __gcov_flush on abort when compiling with coverage options. */ + extern void __gcov_flush(void); + __gcov_flush(); +#endif +#ifdef _XBT_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); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); +#endif + abort(); +}