X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/78829b6122aecea94deca950fe78ab44516f5b08..cc794fff019ab735cdc4150384d465fdbcbe2fd1:/src/xbt/log.c
diff --git a/src/xbt/log.c b/src/xbt/log.c
index 161c1cdcc5..b692dbaa97 100644
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -1,6 +1,6 @@
/* log - a generic logging facility in the spirit of log4j */
-/* Copyright (c) 2004-2011. The SimGrid Team.
+/* Copyright (c) 2004-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
#include "xbt/dynar.h"
#include "xbt/xbt_os_thread.h"
-XBT_PUBLIC_DATA(int) (*xbt_pid) ();
int xbt_log_no_loc = 0; /* if set to true (with --log=no_loc), file localization will be omitted (for tesh tests) */
static xbt_os_rmutex_t log_cat_init_mutex = NULL;
@@ -187,7 +186,7 @@ format. This is usually a good idea.
Here is an example of the most basic type of macro. This is a logging
request with priority warning.
-XBT_CLOG(MyCat, gras_log_priority_warning, "Values are: %d and '%s'", 5,
+XBT_CLOG(MyCat, xbt_log_priority_warning, "Values are: %d and '%s'", 5,
"oops");
A logging request is said to be enabled if its priority is higher than or
@@ -256,7 +255,7 @@ XBT_LOG_NEW_CATEGORY(VSS);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(SA, VSS);
int main() {
- / * Now set the parent's priority. (the string would typcially be a runtime option) * /
+ / * Now set the parent's priority. (the string would typically be a runtime option) * /
xbt_log_control_set("SA.thresh:3");
/ * This request is enabled, because WARNING >= INFO. * /
@@ -281,19 +280,36 @@ int main() {
Although rarely done, it is possible to configure the logs during
program initialization by invoking the xbt_log_control_set() method
manually. A more conventional way is to use the --log command line
-argument. xbt_init() (called by MSG_init(), gras_init() and friends)
+argument. xbt_init() (called by MSG_init() and friends)
checks and deals properly with such arguments.
\subsection log_use_conf_thres 3.1.1 Threshold configuration
The most common setting is to control which logging event will get
displayed by setting a threshold to each category through the
-thres keyword.
+threshold keyword.
-For example, \verbatim --log=root.thres:debug\endverbatim will make
+For example, \verbatim --log=root.threshold:debug\endverbatim will make
SimGrid extremely verbose while \verbatim
--log=root.thres:critical\endverbatim should shut it almost
-completely off. The full list of recognized thresholds is the following:
+completely off.
+
+Note that the threshold keyword can be abbreviated here. For example,
+all the following notations have the same result.
+\verbatim
+--log=root.threshold:debug
+--log=root.threshol:debug
+--log=root.thresho:debug
+--log=root.thresh:debug
+--log=root.thres:debug
+--log=root.thre:debug
+--log=root.thr:debug
+--log=root.th:debug
+--log=root.t:debug
+--log=root.:debug <--- That's obviously really ugly, but it actually works.
+\endverbatim
+
+The full list of recognized thresholds is the following:
- trace: enter and return of some functions
- debug: crufty output
@@ -422,10 +438,10 @@ requires an a single comparison of a static variable to a constant.
There is also compile time constant, \ref XBT_LOG_STATIC_THRESHOLD, which
causes all logging requests with a lower priority to be optimized to 0 cost
-by the compiler. By setting it to gras_log_priority_infinite, all logging
+by the compiler. By setting it to xbt_log_priority_infinite, all logging
requests are statically disabled at compile time and cost nothing. Released executables
might be compiled with (note that it will prevent users to debug their problems)
-\verbatim-DXBT_LOG_STATIC_THRESHOLD=gras_log_priority_infinite\endverbatim
+\verbatim-DXBT_LOG_STATIC_THRESHOLD=xbt_log_priority_infinite\endverbatim
Compiling with the \verbatim-DNLOG\endverbatim option disables all logging
requests at compilation time while the \verbatim-DNDEBUG\endverbatim disables
@@ -548,11 +564,11 @@ static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(xbt_ex);
XBT_LOG_CONNECT(xbt_fifo);
XBT_LOG_CONNECT(xbt_graph);
+ XBT_LOG_CONNECT(xbt_heap);
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);
XBT_LOG_CONNECT(xbt_queue);
XBT_LOG_CONNECT(xbt_set);
XBT_LOG_CONNECT(xbt_sync);
@@ -581,6 +597,7 @@ static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(instr_config);
XBT_LOG_CONNECT(instr_msg);
XBT_LOG_CONNECT(instr_msg_process);
+ XBT_LOG_CONNECT(instr_msg_vm);
XBT_LOG_CONNECT(instr_paje_containers);
XBT_LOG_CONNECT(instr_paje_header);
XBT_LOG_CONNECT(instr_paje_trace);
@@ -588,8 +605,10 @@ static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(instr_paje_values);
XBT_LOG_CONNECT(instr_resource);
XBT_LOG_CONNECT(instr_routing);
- XBT_LOG_CONNECT(instr_smpi);
+ XBT_LOG_CONNECT(instr_sd);
XBT_LOG_CONNECT(instr_surf);
+ XBT_LOG_CONNECT(instr_trace);
+ XBT_LOG_CONNECT(instr_TI_trace);
#endif
/* jedule */
@@ -621,6 +640,7 @@ static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(msg_mailbox);
XBT_LOG_CONNECT(msg_new_API);
XBT_LOG_CONNECT(msg_process);
+ XBT_LOG_CONNECT(msg_synchro);
XBT_LOG_CONNECT(msg_task);
XBT_LOG_CONNECT(msg_vm);
@@ -663,7 +683,6 @@ static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(surf_lagrange_dichotomy);
XBT_LOG_CONNECT(surf_maxmin);
XBT_LOG_CONNECT(surf_network);
- XBT_LOG_CONNECT(surf_new_model);
#ifdef HAVE_GTNETS
XBT_LOG_CONNECT(surf_network_gtnets);
XBT_LOG_CONNECT(surf_network_gtnets_interface);
@@ -683,7 +702,6 @@ static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(surf_route_floyd);
XBT_LOG_CONNECT(surf_route_full);
XBT_LOG_CONNECT(surf_route_none);
- XBT_LOG_CONNECT(surf_route_rulebased);
XBT_LOG_CONNECT(surf_route_vivaldi);
XBT_LOG_CONNECT(surf_storage);
XBT_LOG_CONNECT(surf_trace);
@@ -1065,7 +1083,7 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string)
xbt_assert(*dot == '.' && (*eq == '=' || *eq == ':'),
"Invalid control string '%s'", control_string);
- if (!strncmp(dot + 1, "thresh", (size_t) (eq - dot - 1))) {
+ if (!strncmp(dot + 1, "threshold", (size_t) (eq - dot - 1))) {
int i;
char *neweq = xbt_strdup(eq + 1);
char *p = neweq - 1;
@@ -1083,7 +1101,12 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string)
break;
}
}
- if (i < xbt_log_priority_infinite) {
+
+ if(ithresh = (e_xbt_log_priority_t) i;
} else {
THROWF(arg_error, 0,
@@ -1345,8 +1368,8 @@ static void xbt_log_help_categories_rec(xbt_log_category_t category,
this_prefix = bprintf("%s \\_ ", prefix);
child_prefix = bprintf("%s | ", prefix);
} else {
- this_prefix = bprintf("%s", prefix);
- child_prefix = bprintf("%s", prefix);
+ this_prefix = xbt_strdup(prefix);
+ child_prefix = xbt_strdup(prefix);
}
dynar = xbt_dynar_new(sizeof(xbt_log_category_t), NULL);