X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f30175cd3c41f95317c796dc4275ae3ba65b6a94..35362c49665ddcaf7e6b9dbe0b40b341d4931112:/src/xbt/log.c

diff --git a/src/xbt/log.c b/src/xbt/log.c
index 6d60a29705..cb2fd79a45 100644
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -287,10 +287,6 @@ manually. A more conventional way is to use the --log command line
 argument. xbt_init() (called by MSG_init(), gras_init() and friends)
 checks and deals properly with such arguments.
 
-The following command line arguments exist, but are deprecated and
-may disappear in the future: --xbt-log, --gras-log, --msg-log and
---surf-log.
-
 \subsection log_use_conf_thres 3.1.1 Threshold configuration
 
 The most common setting is to control which logging event will get
@@ -514,13 +510,6 @@ s_xbt_log_category_t _XBT_LOGV(XBT_LOG_ROOT_CAT) = {
       0                         /* additivity */
 };
 
-XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)");
-XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
-XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
-XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
-XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
-XBT_LOG_NEW_CATEGORY(bindings, "All bindings categories");
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(log, xbt,
                                 "Loggings from the logging mechanism itself");
 
@@ -541,11 +530,13 @@ static void xbt_log_connect_categories(void)
   /* Also permit that they are correctly listed by xbt_log_help_categories() */
 
   /* amok */
+  XBT_LOG_CONNECT(amok);
   XBT_LOG_CONNECT(amok_bw);
   XBT_LOG_CONNECT(amok_bw_sat);
   XBT_LOG_CONNECT(amok_pm);
 
   /* gras */
+  XBT_LOG_CONNECT(gras);
   XBT_LOG_CONNECT(gras_modules);
   XBT_LOG_CONNECT(gras_msg);
   XBT_LOG_CONNECT(gras_msg_read);
@@ -558,9 +549,12 @@ static void xbt_log_connect_categories(void)
   XBT_LOG_CONNECT(gras_virtu_process);
 
   /* xbt */
+  XBT_LOG_CONNECT(xbt);
   XBT_LOG_CONNECT(graphxml_parse);
   XBT_LOG_CONNECT(log);
+#if HAVE_MMAP
   XBT_LOG_CONNECT(mm_diff);
+#endif
   XBT_LOG_CONNECT(module);
   XBT_LOG_CONNECT(peer);
   XBT_LOG_CONNECT(replay);
@@ -585,7 +579,6 @@ static void xbt_log_connect_categories(void)
   XBT_LOG_CONNECT(xbt_graph);
   XBT_LOG_CONNECT(xbt_lib);
   XBT_LOG_CONNECT(xbt_mallocator);
-
   XBT_LOG_CONNECT(xbt_matrix);
   XBT_LOG_CONNECT(xbt_parmap);
   XBT_LOG_CONNECT(xbt_parmap_unit);
@@ -605,6 +598,7 @@ static void xbt_log_connect_categories(void)
 
   /* bindings */
 #ifdef HAVE_LUA
+  XBT_LOG_CONNECT(bindings);
   XBT_LOG_CONNECT(lua);
   XBT_LOG_CONNECT(lua_comm);
   XBT_LOG_CONNECT(lua_host);
@@ -617,6 +611,7 @@ static void xbt_log_connect_categories(void)
 
   /* instr */
 #ifdef HAVE_TRACING
+  XBT_LOG_CONNECT(instr);
   XBT_LOG_CONNECT(instr_paje_trace);
   XBT_LOG_CONNECT(instr_smpi);
   XBT_LOG_CONNECT(instr_surf);
@@ -624,12 +619,14 @@ static void xbt_log_connect_categories(void)
 
   /* jedule */
 #ifdef HAVE_JEDULE
+  XBT_LOG_CONNECT(jedule);
   XBT_LOG_CONNECT(jed_out);
   XBT_LOG_CONNECT(jed_sd);
 #endif
 
   /* mc */
 #ifdef HAVE_MC
+  XBT_LOG_CONNECT(mc);
   XBT_LOG_CONNECT(mc_checkpoint);
   XBT_LOG_CONNECT(mc_dpor);
   XBT_LOG_CONNECT(mc_global);
@@ -640,14 +637,18 @@ static void xbt_log_connect_categories(void)
 #endif
 
   /* msg */
+  XBT_LOG_CONNECT(msg);
   XBT_LOG_CONNECT(msg_action);
   XBT_LOG_CONNECT(msg_gos);
+  XBT_LOG_CONNECT(msg_io);
   XBT_LOG_CONNECT(msg_kernel);
   XBT_LOG_CONNECT(msg_mailbox);
   XBT_LOG_CONNECT(msg_process);
   XBT_LOG_CONNECT(msg_task);
-
+  XBT_LOG_CONNECT(msg_vm);
+   
   /* simdag */
+  XBT_LOG_CONNECT(sd);
   XBT_LOG_CONNECT(sd_daxparse);
 #ifdef HAVE_GRAPHVIZ
   XBT_LOG_CONNECT(sd_dotparse);
@@ -657,6 +658,7 @@ static void xbt_log_connect_categories(void)
   XBT_LOG_CONNECT(sd_workstation);
 
   /* simix */
+  XBT_LOG_CONNECT(simix);
   XBT_LOG_CONNECT(simix_context);
   XBT_LOG_CONNECT(simix_deployment);
   XBT_LOG_CONNECT(simix_environment);
@@ -672,6 +674,7 @@ static void xbt_log_connect_categories(void)
   /* SMPI categories are connected in smpi_global.c */
 
   /* surf */
+  XBT_LOG_CONNECT(surf);
   XBT_LOG_CONNECT(random);
   XBT_LOG_CONNECT(surf_config);
   XBT_LOG_CONNECT(surf_cpu);
@@ -948,7 +951,7 @@ int _xbt_log_cat_init(xbt_log_category_t category,
         cpp = cpp->nextSibling;
       }
 
-      XBT_DEBUG("Childs of %s: %s; nextSibling: %s",
+      XBT_DEBUG("Children of %s: %s; nextSibling: %s",
              category->parent->name, res,
              (category->parent->nextSibling ?
               category->parent->nextSibling->name : "none"));