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
Use %zu for type size_t.
[simgrid.git]
/
src
/
xbt
/
xbt_log_layout_format.c
diff --git
a/src/xbt/xbt_log_layout_format.c
b/src/xbt/xbt_log_layout_format.c
index
e4ebf8d
..
9801a74
100644
(file)
--- a/
src/xbt/xbt_log_layout_format.c
+++ b/
src/xbt/xbt_log_layout_format.c
@@
-11,7
+11,7
@@
#include "xbt/sysdep.h"
#include "xbt/strbuff.h"
#include "xbt/log_private.h"
#include "xbt/sysdep.h"
#include "xbt/strbuff.h"
#include "xbt/log_private.h"
-#include "
xbt/synchro.h" /* xbt_thread_self
_name */
+#include "
simgrid/simix.h" /* SIMIX_host_self_get
_name */
#include "surf/surf.h"
#include <stdio.h>
#include "surf/surf.h"
#include <stdio.h>
@@
-126,7
+126,7
@@
static int xbt_log_layout_format_doit(xbt_log_layout_t l,
show_string(xbt_log_priority_names[ev->priority]);
break;
case 'h': /* host name; SimGrid extension */
show_string(xbt_log_priority_names[ev->priority]);
break;
case 'h': /* host name; SimGrid extension */
- show_string(
xbt_os_proc
name());
+ show_string(
SIMIX_host_self_get_
name());
break;
case 't': /* thread name; LOG4J compliant */
show_string(xbt_thread_self_name());
break;
case 't': /* thread name; LOG4J compliant */
show_string(xbt_thread_self_name());
@@
-162,7
+162,6
@@
static int xbt_log_layout_format_doit(xbt_log_layout_t l,
e.used = backtrace((void **) e.bt, XBT_BACKTRACE_SIZE);
e.bt_strings = NULL;
e.msg = NULL;
e.used = backtrace((void **) e.bt, XBT_BACKTRACE_SIZE);
e.bt_strings = NULL;
e.msg = NULL;
- e.remote = 0;
xbt_ex_setup_backtrace(&e);
if (*q == 'B') {
show_string(e.bt_strings[1] + 8);
xbt_ex_setup_backtrace(&e);
if (*q == 'B') {
show_string(e.bt_strings[1] + 8);