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' into actor-priority
[simgrid.git]
/
src
/
xbt
/
xbt_log_layout_simple.c
diff --git
a/src/xbt/xbt_log_layout_simple.c
b/src/xbt/xbt_log_layout_simple.c
index
8d77b3e
..
57069fd
100644
(file)
--- a/
src/xbt/xbt_log_layout_simple.c
+++ b/
src/xbt/xbt_log_layout_simple.c
@@
-8,7
+8,7
@@
#include "xbt/sysdep.h"
#include "src/xbt/log_private.h"
#include "xbt/sysdep.h"
#include "src/xbt/log_private.h"
-#include "simgrid/
simix.h" /* SIMIX
_host_self_get_name */
+#include "simgrid/
host.h" /* sg
_host_self_get_name */
#include "surf/surf.h"
#include <stdio.h>
#include "surf/surf.h"
#include <stdio.h>
@@
-23,7
+23,7
@@
static double simple_begin_of_time = -1;
} else \
return 0
} else \
return 0
-static int xbt_log_layout_simple_doit(xbt_log_layout_t
l, xbt_log_event_t ev, const char *
fmt)
+static int xbt_log_layout_simple_doit(xbt_log_layout_t
XBT_ATTRIB_UNUSED l, xbt_log_event_t ev, const char*
fmt)
{
char *p = ev->buffer;
int rem_size = ev->buffer_size;
{
char *p = ev->buffer;
int rem_size = ev->buffer_size;
@@
-36,12
+36,12
@@
static int xbt_log_layout_simple_doit(xbt_log_layout_t l, xbt_log_event_t ev, co
/* Display the proc info if available */
procname = xbt_procname();
if (procname && strcmp(procname,"maestro")) {
/* Display the proc info if available */
procname = xbt_procname();
if (procname && strcmp(procname,"maestro")) {
- len = snprintf(p, rem_size, "%s:%s:(%d) ",
SIMIX
_host_self_get_name(), procname, xbt_getpid());
+ len = snprintf(p, rem_size, "%s:%s:(%d) ",
sg
_host_self_get_name(), procname, xbt_getpid());
check_overflow(len);
}
else if (!procname) {
check_overflow(len);
}
else if (!procname) {
-
len = snprintf(p, rem_size, "%s::(%d) ", SIMIX
_host_self_get_name(), xbt_getpid());
- check_overflow(len);
+
len = snprintf(p, rem_size, "%s::(%d) ", sg
_host_self_get_name(), xbt_getpid());
+
check_overflow(len);
}
/* Display the date */
}
/* Display the date */
@@
-70,7
+70,7
@@
static int xbt_log_layout_simple_doit(xbt_log_layout_t l, xbt_log_event_t ev, co
return 1;
}
return 1;
}
-xbt_log_layout_t xbt_log_layout_simple_new(char
*
arg)
+xbt_log_layout_t xbt_log_layout_simple_new(char
* XBT_ATTRIB_UNUSED
arg)
{
xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1);
res->do_layout = &xbt_log_layout_simple_doit;
{
xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1);
res->do_layout = &xbt_log_layout_simple_doit;