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
Correctly sort config entries for --help.
[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
78e5600
..
18c55ac
100644
(file)
--- a/
src/xbt/xbt_log_layout_format.c
+++ b/
src/xbt/xbt_log_layout_format.c
@@
-1,22
+1,16
@@
/* layout_simple - a dumb log layout */
/* layout_simple - a dumb log layout */
-/* Copyright (c) 2007-201
6
. The SimGrid Team. */
+/* Copyright (c) 2007-201
7
. The SimGrid Team. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/internal_config.h" /* execinfo when available */
-#include "xbt/sysdep.h"
-#include "xbt/strbuff.h"
+#include "simgrid/host.h"
#include "src/xbt/log_private.h"
#include "src/xbt/log_private.h"
-#include "simgrid/simix.h" /* SIMIX_host_self_get_name */
#include "surf/surf.h"
#include "surf/surf.h"
+#include "xbt/sysdep.h"
#include <stdio.h>
#include <stdio.h>
-#if HAVE_EXECINFO_H
-# include <execinfo.h> /* Function backtrace */
-#endif
-
extern const char *xbt_log_priority_names[8];
static double format_begin_of_time = -1;
extern const char *xbt_log_priority_names[8];
static double format_begin_of_time = -1;
@@
-28,7
+22,6
@@
static double format_begin_of_time = -1;
" where:\n" \
" source: %%F: file %%L: line %%M: function %%l: location (%%F:%%L)\n" \
" runtime: %%h: hostname %%t: thread %%P: process %%i: PID\n" \
" where:\n" \
" source: %%F: file %%L: line %%M: function %%l: location (%%F:%%L)\n" \
" runtime: %%h: hostname %%t: thread %%P: process %%i: PID\n" \
- " backtrace: %%b: full %%B: short\n" \
" when: %%d: date %%r: app. age\n" \
" other: %%%%: %% %%n: new line %%e: plain space\n"
" when: %%d: date %%r: app. age\n" \
" other: %%%%: %% %%n: new line %%e: plain space\n"
@@
-126,11
+119,9
@@
static int xbt_log_layout_format_doit(xbt_log_layout_t l, xbt_log_event_t ev, co
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(SIMIX_host_self_get_name());
- break;
- case 't': /* thread name; LOG4J compliant */
- show_string(SIMIX_process_self_get_name());
+ show_string(sg_host_self_get_name());
break;
break;
+ case 't': /* thread/process name; LOG4J compliant */
case 'P': /* process name; SimGrid extension */
show_string(xbt_procname());
break;
case 'P': /* process name; SimGrid extension */
show_string(xbt_procname());
break;