X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc1c683c83296d164aef6fa419ec3763f218e423..32bb578d12cf89ae05867b09a57c6933127fd513:/src/xbt/xbt_main.c diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c index e60540b08c..026641b33b 100644 --- a/src/xbt/xbt_main.c +++ b/src/xbt/xbt_main.c @@ -1,14 +1,16 @@ /* 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" #include "xbt/sysdep.h" #include "xbt/log.h" #include "xbt/dynar.h" @@ -16,53 +18,48 @@ #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" -XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)"); +#include "src/internal_config.h" +#include +#ifdef _WIN32 +#include /* To silence MSVC on abort() */ +#endif +#if HAVE_UNISTD_H +# 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) */ - 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 */ 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. */ 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 #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) { @@ -80,9 +77,25 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, static void xbt_preinit(void) { unsigned int seed = 2147483647; +#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 -#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(); @@ -94,13 +107,13 @@ static void xbt_preinit(void) { #ifndef _WIN32 srand48(seed); #endif - atexit(xbt_postexit); } static void xbt_postexit(void) { if(!_sg_do_clean_atexit) return; + xbt_initialized--; xbt_backtrace_postexit(); xbt_fifo_postexit(); xbt_dict_postexit(); @@ -108,7 +121,7 @@ static void xbt_postexit(void) xbt_dynar_free(&xbt_cmdline); xbt_log_postexit(); free(xbt_binary_name); -#ifdef MMALLOC_WANT_OVERRIDE_LEGACY +#if HAVE_MC mmalloc_postexit(); #endif } @@ -116,6 +129,8 @@ static void xbt_postexit(void) /** @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; @@ -123,31 +138,39 @@ void xbt_init(int *argc, char **argv) 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 */ -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 _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(); +}