X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d75d7500fe0688f5665f4f774ef82c6c65f8415b..cdc5e6b304490c7f11223bea097fea9fd2a2dfee:/src/xbt/xbt_main.c diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c index 61522a6c43..653546adf7 100644 --- a/src/xbt/xbt_main.c +++ b/src/xbt/xbt_main.c @@ -1,13 +1,13 @@ /* module handling */ -/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2006-2012. 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 */ #include "time.h" /* to seed the random generator */ #include "xbt/sysdep.h" @@ -19,48 +19,29 @@ #include "xbt_modinter.h" /* prototype of other module's init/exit in XBT */ +XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling"); -char *xbt_binary_name = NULL; /* Mandatory to retrieve neat backtraces */ +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; -XBT_LOG_EXTERNAL_CATEGORY(graphxml_parse); -XBT_LOG_EXTERNAL_CATEGORY(log); -XBT_LOG_EXTERNAL_CATEGORY(module); -XBT_LOG_EXTERNAL_CATEGORY(peer); -XBT_LOG_EXTERNAL_CATEGORY(strbuff); -XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); -XBT_LOG_EXTERNAL_CATEGORY(xbt_dict); -XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_cursor); -XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_elm); -XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_multi); -XBT_LOG_EXTERNAL_CATEGORY(xbt_dyn); -XBT_LOG_EXTERNAL_CATEGORY(xbt_ex); -XBT_LOG_EXTERNAL_CATEGORY(xbt_fifo); -XBT_LOG_EXTERNAL_CATEGORY(xbt_graph); -XBT_LOG_EXTERNAL_CATEGORY(xbt_matrix); -XBT_LOG_EXTERNAL_CATEGORY(xbt_queue); -XBT_LOG_EXTERNAL_CATEGORY(xbt_set); -XBT_LOG_EXTERNAL_CATEGORY(xbt_sync_os); -XBT_LOG_EXTERNAL_CATEGORY(xbt_parmap); -XBT_LOG_EXTERNAL_CATEGORY(xbt_parmap_unit); -XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt); -XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_cbps); -XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_convert); -XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_create); -XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_exchange); -XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_lexer); -XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_parse); -XBT_LOG_EXTERNAL_CATEGORY(xbt_trp); -XBT_LOG_EXTERNAL_CATEGORY(xbt_trp_meas); - -int _surf_do_model_check = 0; /* this variable is used accros the libraries, and must be declared in XBT so that it's also defined in GRAS (not only in libsimgrid) */ +int _surf_do_model_check = 0; +int _surf_mc_checkpoint=0; +char* _surf_mc_property_file=NULL; +int _surf_mc_timeout=0; +int _surf_mc_max_depth=1000; +int _surf_mc_visited=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; -static void xbt_postexit(void) _XBT_GNUC_DESTRUCTOR; +static void xbt_preinit(void) _XBT_GNUC_CONSTRUCTOR(200); +static void xbt_postexit(void); #ifdef _XBT_WIN32 # undef _XBT_NEED_INIT_PRAGMA @@ -68,7 +49,6 @@ static void xbt_postexit(void) _XBT_GNUC_DESTRUCTOR; #ifdef _XBT_NEED_INIT_PRAGMA #pragma init (xbt_preinit) -#pragma fini (xbt_postexit) #endif #ifdef _XBT_WIN32 @@ -90,13 +70,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { if (fdwReason == DLL_PROCESS_ATTACH - && xbt_dll_process_is_attached == 0) { - xbt_dll_process_is_attached = 1; - xbt_preinit(); + && xbt_dll_process_is_attached == 0) { + xbt_dll_process_is_attached = 1; + xbt_preinit(); } else if (fdwReason == DLL_PROCESS_DETACH - && xbt_dll_process_is_attached == 1) { - xbt_dll_process_is_attached = 0; - xbt_postexit(); + && xbt_dll_process_is_attached == 1) { + xbt_dll_process_is_attached = 0; } return 1; } @@ -106,65 +85,27 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, static void xbt_preinit(void) { -#ifdef MMALLOC_WANT_OVERIDE_LEGACY +#ifdef MMALLOC_WANT_OVERRIDE_LEGACY mmalloc_preinit(); #endif xbt_log_preinit(); - - /* Connect our log channels: that must be done manually under windows */ - XBT_LOG_CONNECT(graphxml_parse, xbt); - XBT_LOG_CONNECT(log, xbt); - XBT_LOG_CONNECT(module, xbt); - XBT_LOG_CONNECT(peer, xbt); - XBT_LOG_CONNECT(strbuff, xbt); - XBT_LOG_CONNECT(xbt_cfg, xbt); - XBT_LOG_CONNECT(xbt_dict, xbt); - XBT_LOG_CONNECT(xbt_dict_cursor, xbt_dict); - XBT_LOG_CONNECT(xbt_dict_elm, xbt_dict); - XBT_LOG_CONNECT(xbt_dict_multi, xbt_dict); - XBT_LOG_CONNECT(xbt_dyn, xbt); - XBT_LOG_CONNECT(xbt_ex, xbt); - XBT_LOG_CONNECT(xbt_fifo, xbt); - XBT_LOG_CONNECT(xbt_graph, xbt); - XBT_LOG_CONNECT(xbt_matrix, xbt); - XBT_LOG_CONNECT(xbt_queue, xbt); - XBT_LOG_CONNECT(xbt_set, xbt); - XBT_LOG_CONNECT(xbt_sync_os, xbt); - XBT_LOG_CONNECT(xbt_parmap,xbt); - XBT_LOG_CONNECT(xbt_parmap_unit,xbt_parmap); - XBT_LOG_CONNECT(xbt_ddt, xbt); - XBT_LOG_CONNECT(xbt_ddt_cbps, xbt_ddt); - XBT_LOG_CONNECT(xbt_ddt_convert, xbt_ddt); - XBT_LOG_CONNECT(xbt_ddt_create, xbt_ddt); - XBT_LOG_CONNECT(xbt_ddt_exchange, xbt_ddt); - XBT_LOG_CONNECT(xbt_ddt_lexer, xbt_ddt_parse); - XBT_LOG_CONNECT(xbt_ddt_parse, xbt_ddt); - XBT_LOG_CONNECT(xbt_trp, xbt); - XBT_LOG_CONNECT(xbt_trp_meas, xbt_trp); - xbt_backtrace_preinit(); xbt_os_thread_mod_preinit(); xbt_fifo_preinit(); xbt_dict_preinit(); - xbt_datadesc_preinit(); - xbt_trp_preinit(); + atexit(xbt_postexit); } static void xbt_postexit(void) { - xbt_trp_postexit(); - xbt_datadesc_postexit(); - xbt_backtrace_postexit(); - xbt_fifo_postexit(); xbt_dict_postexit(); - - xbt_log_postexit(); xbt_os_thread_mod_postexit(); - + xbt_dynar_free(&xbt_cmdline); + xbt_log_postexit(); free(xbt_binary_name); -#ifdef MMALLOC_WANT_OVERIDE_LEGACY +#ifdef MMALLOC_WANT_OVERRIDE_LEGACY mmalloc_postexit(); #endif } @@ -172,20 +113,25 @@ static void xbt_postexit(void) /** @brief Initialize the xbt mechanisms. */ void xbt_init(int *argc, char **argv) { - // FIXME it would be nice to assert that this function is called only once. But each gras process do call it... - xbt_initialized++; - - if (xbt_initialized > 1) + 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++) { + xbt_dynar_push(xbt_cmdline,&(argv[i])); + } + srand((unsigned int) time(NULL)); - XBT_VERB("Initialize XBT"); xbt_log_init(argc, argv); } -/** @brief Finalize the xbt mechanisms. */ +/** @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");