X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc227ec698a0dcac6be3bd125dedd6dff346d1dd..e7d52b71aae78b9db6aab2f8628fe6906167282e:/src/xbt/xbt_main.c

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index af6d6a140f..030dd348c4 100644
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -20,18 +20,24 @@
 
 #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");
 
+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;   /* Mandatory to retrieve neat backtraces */
 int xbt_initialized = 0;
 
-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;
 
 /* 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) _XBT_GNUC_DESTRUCTOR(200);
 
 #ifdef _XBT_WIN32
 # undef _XBT_NEED_INIT_PRAGMA
@@ -61,12 +67,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_dll_process_is_attached == 1) {
+    xbt_dll_process_is_attached = 0;
       xbt_postexit();
   }
   return 1;
@@ -82,45 +88,6 @@ static void xbt_preinit(void)
 #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);
-#ifdef XBT_USE_DEPRECATED
-  XBT_LOG_CONNECT(xbt_dict_multi, xbt_dict);
-#endif
-
-  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_parse, xbt_ddt);
-  XBT_LOG_CONNECT(xbt_ddt_lexer, xbt_ddt_parse);
-
-  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_parmap, xbt);
-  XBT_LOG_CONNECT(xbt_parmap_unit, xbt_parmap);
-
-  XBT_LOG_CONNECT(xbt_queue, xbt);
-  XBT_LOG_CONNECT(xbt_set, xbt);
-  XBT_LOG_CONNECT(xbt_sync_os, xbt);
-
-  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();