A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
xbt
/
log.c
diff --git
a/src/xbt/log.c
b/src/xbt/log.c
index
28b799c
..
25d3f4e
100644
(file)
--- a/
src/xbt/log.c
+++ b/
src/xbt/log.c
@@
-274,9
+274,6
@@
int main() {
}
\endverbatim
}
\endverbatim
-Another example can be found in the relevant part of the GRAS tutorial:
-\ref GRAS_tut_tour_logs.
-
\section log_user 3. User interface
\section log_use_conf 3.1 Configuration
\section log_user 3. User interface
\section log_use_conf 3.1 Configuration
@@
-287,10
+284,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.
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
\subsection log_use_conf_thres 3.1.1 Threshold configuration
The most common setting is to control which logging event will get
@@
-342,7
+335,7
@@
Here are the existing format directives:
- %%p: Priority name (LOG4J compatible)
- %%h: Hostname (SimGrid extension)
- %%p: Priority name (LOG4J compatible)
- %%h: Hostname (SimGrid extension)
- - %%P: Process name (SimGrid extension)
+ - %%P: Process name (SimGrid extension
-- note that with SMPI this is the integer value of the process rank
)
- %%t: Thread "name" (LOG4J compatible -- actually the address of the thread in memory)
- %%i: Process PID (SimGrid extension -- this is a 'i' as in 'i'dea)
- %%t: Thread "name" (LOG4J compatible -- actually the address of the thread in memory)
- %%i: Process PID (SimGrid extension -- this is a 'i' as in 'i'dea)
@@
-616,7
+609,17
@@
static void xbt_log_connect_categories(void)
/* instr */
#ifdef HAVE_TRACING
XBT_LOG_CONNECT(instr);
/* instr */
#ifdef HAVE_TRACING
XBT_LOG_CONNECT(instr);
+ XBT_LOG_CONNECT(instr_api);
+ XBT_LOG_CONNECT(instr_config);
+ XBT_LOG_CONNECT(instr_msg);
+ XBT_LOG_CONNECT(instr_msg_process);
+ XBT_LOG_CONNECT(instr_paje_containers);
+ XBT_LOG_CONNECT(instr_paje_header);
XBT_LOG_CONNECT(instr_paje_trace);
XBT_LOG_CONNECT(instr_paje_trace);
+ XBT_LOG_CONNECT(instr_paje_types);
+ 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_surf);
#endif
XBT_LOG_CONNECT(instr_smpi);
XBT_LOG_CONNECT(instr_surf);
#endif
@@
-632,6
+635,7
@@
static void xbt_log_connect_categories(void)
#ifdef HAVE_MC
XBT_LOG_CONNECT(mc);
XBT_LOG_CONNECT(mc_checkpoint);
#ifdef HAVE_MC
XBT_LOG_CONNECT(mc);
XBT_LOG_CONNECT(mc_checkpoint);
+ XBT_LOG_CONNECT(mc_compare);
XBT_LOG_CONNECT(mc_dpor);
XBT_LOG_CONNECT(mc_global);
XBT_LOG_CONNECT(mc_liveness);
XBT_LOG_CONNECT(mc_dpor);
XBT_LOG_CONNECT(mc_global);
XBT_LOG_CONNECT(mc_liveness);
@@
-647,9
+651,11
@@
static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(msg_io);
XBT_LOG_CONNECT(msg_kernel);
XBT_LOG_CONNECT(msg_mailbox);
XBT_LOG_CONNECT(msg_io);
XBT_LOG_CONNECT(msg_kernel);
XBT_LOG_CONNECT(msg_mailbox);
+ XBT_LOG_CONNECT(msg_new_API);
XBT_LOG_CONNECT(msg_process);
XBT_LOG_CONNECT(msg_task);
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);
/* simdag */
XBT_LOG_CONNECT(sd);
XBT_LOG_CONNECT(sd_daxparse);
@@
-669,6
+675,7
@@
static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(simix_io);
XBT_LOG_CONNECT(simix_kernel);
XBT_LOG_CONNECT(simix_network);
XBT_LOG_CONNECT(simix_io);
XBT_LOG_CONNECT(simix_kernel);
XBT_LOG_CONNECT(simix_network);
+ XBT_LOG_CONNECT(simix_new_api);
XBT_LOG_CONNECT(simix_process);
XBT_LOG_CONNECT(simix_smurf);
XBT_LOG_CONNECT(simix_synchro);
XBT_LOG_CONNECT(simix_process);
XBT_LOG_CONNECT(simix_smurf);
XBT_LOG_CONNECT(simix_synchro);
@@
-678,6
+685,7
@@
static void xbt_log_connect_categories(void)
/* surf */
XBT_LOG_CONNECT(surf);
/* surf */
XBT_LOG_CONNECT(surf);
+ XBT_LOG_CONNECT(platf_generator);
XBT_LOG_CONNECT(random);
XBT_LOG_CONNECT(surf_config);
XBT_LOG_CONNECT(surf_cpu);
XBT_LOG_CONNECT(random);
XBT_LOG_CONNECT(surf_config);
XBT_LOG_CONNECT(surf_cpu);
@@
-687,11
+695,17
@@
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_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);
#ifdef HAVE_GTNETS
XBT_LOG_CONNECT(surf_network_gtnets);
+ XBT_LOG_CONNECT(surf_network_gtnets_interface);
+ XBT_LOG_CONNECT(surf_network_gtnets_simulator);
+ XBT_LOG_CONNECT(surf_network_gtnets_topology);
#endif
#ifdef HAVE_NS3
XBT_LOG_CONNECT(surf_network_ns3);
#endif
#ifdef HAVE_NS3
XBT_LOG_CONNECT(surf_network_ns3);
+ XBT_LOG_CONNECT(interface_ns3);
+ XBT_LOG_CONNECT(simulator_ns3);
#endif
XBT_LOG_CONNECT(surf_parse);
XBT_LOG_CONNECT(surf_route);
#endif
XBT_LOG_CONNECT(surf_parse);
XBT_LOG_CONNECT(surf_route);
@@
-954,7
+968,7
@@
int _xbt_log_cat_init(xbt_log_category_t category,
cpp = cpp->nextSibling;
}
cpp = cpp->nextSibling;
}
- XBT_DEBUG("Child
s
of %s: %s; nextSibling: %s",
+ XBT_DEBUG("Child
ren
of %s: %s; nextSibling: %s",
category->parent->name, res,
(category->parent->nextSibling ?
category->parent->nextSibling->name : "none"));
category->parent->name, res,
(category->parent->nextSibling ?
category->parent->nextSibling->name : "none"));
@@
-1332,6
+1346,10
@@
static void xbt_log_help(void)
"\n"
" -> %%d: date (UNIX-like epoch)\n"
" -> %%r: application age (time elapsed since the beginning of the application)\n"
"\n"
" -> %%d: date (UNIX-like epoch)\n"
" -> %%r: application age (time elapsed since the beginning of the application)\n"
+"\n"
+" Miscellaneous:\n"
+" --help-log-categories Display the current hierarchy of log categories.\n"
+" --log=no_loc Don't print file names in messages (for tesh tests).\n"
"\n"
);
}
"\n"
);
}