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
Remove a wrong assert. This condition isn't supposed to be true all the time: I didn...
[simgrid.git]
/
src
/
xbt
/
log.c
diff --git
a/src/xbt/log.c
b/src/xbt/log.c
index
0450eb8
..
ca8af45
100644
(file)
--- a/
src/xbt/log.c
+++ b/
src/xbt/log.c
@@
-339,7
+339,8
@@
Here are the existing format directives:
- %%p: Priority name (LOG4J compliant)
- %%h: Hostname (SimGrid extension)
- %%p: Priority name (LOG4J compliant)
- %%h: Hostname (SimGrid extension)
- - %%t: Process name (LOG4J compliant -- thread name in LOG4J)
+ - %%P: Process name (SimGrid extension)
+ - %%t: Thread "name" (LOG4J compliant -- actually the address of the thread in memory)
- %%i: Process PID (SimGrid extension -- this is a 'i' as in 'i'dea)
- %%F: file name where the log event was raised (LOG4J compliant)
- %%i: Process PID (SimGrid extension -- this is a 'i' as in 'i'dea)
- %%F: file name where the log event was raised (LOG4J compliant)
@@
-480,7
+481,12
@@
const char *xbt_log_priority_names[8] = {
"CRITICAL"
};
"CRITICAL"
};
-XBT_PUBLIC_DATA(s_xbt_log_category_t) _XBT_LOGV(XBT_LOG_ROOT_CAT) = {
+#ifndef _MSC_VER
+XBT_PUBLIC_DATA(s_xbt_log_category_t)
+#else
+s_xbt_log_category_t
+#endif
+_XBT_LOGV(XBT_LOG_ROOT_CAT) = {
0, 0, 0,
"root", xbt_log_priority_uninitialized, 0,
NULL, 0
0, 0, 0,
"root", xbt_log_priority_uninitialized, 0,
NULL, 0
@@
-580,8
+586,8
@@
void _xbt_log_event_log( xbt_log_event_t ev, const char *fmt, ...) {
xbt_log_appender_t appender = cat->appender;
if (appender != NULL) {
xbt_assert1(cat->layout,"No valid layout for the appender of category %s",cat->name);
xbt_log_appender_t appender = cat->appender;
if (appender != NULL) {
xbt_assert1(cat->layout,"No valid layout for the appender of category %s",cat->name);
- c
har *str= cat->layout->do_layout(cat->layout, ev, fmt);
- appender->do_append(appender,
st
r);
+ c
at->layout->do_layout(cat->layout, ev, fmt);
+ appender->do_append(appender,
ev->buffe
r);
}
if (!cat->additivity)
break;
}
if (!cat->additivity)
break;