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
/
xbt_log_layout_simple.c
diff --git
a/src/xbt/xbt_log_layout_simple.c
b/src/xbt/xbt_log_layout_simple.c
index
6ec8eeb
..
74374bf
100644
(file)
--- a/
src/xbt/xbt_log_layout_simple.c
+++ b/
src/xbt/xbt_log_layout_simple.c
@@
-1,7
+1,6
@@
/* layout_simple - a dumb log layout */
/* layout_simple - a dumb log layout */
-/* Copyright (c) 2007-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
/* 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. */
@@
-9,23
+8,20
@@
#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 "s
urf/surf.h"
+#include "simgrid/
host.h" /* sg
_host_self_get_name */
+#include "s
imgrid/msg.h" /* MSG_get_clock */
#include <stdio.h>
#include <stdio.h>
-#include "src/internal_config.h"
extern const char *xbt_log_priority_names[8];
extern int xbt_log_no_loc;
extern const char *xbt_log_priority_names[8];
extern int xbt_log_no_loc;
-static double simple_begin_of_time = -1;
-
#define check_overflow(len) \
if ((rem_size -= (len)) > 0) { \
p += (len); \
} else \
return 0
#define check_overflow(len) \
if ((rem_size -= (len)) > 0) { \
p += (len); \
} 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_ATTRIB_UNUSED xbt_log_layout_t 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;
@@
-38,16
+34,16
@@
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 */
- len = snprintf(p, rem_size, "%f] ",
surf_get_clock() - simple_begin_of_time
);
+ len = snprintf(p, rem_size, "%f] ",
MSG_get_clock()
);
check_overflow(len);
/* Display file position if not INFO */
check_overflow(len);
/* Display file position if not INFO */
@@
-72,13
+68,10
@@
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(
XBT_ATTRIB_UNUSED char*
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;
- if (simple_begin_of_time < 0)
- simple_begin_of_time = surf_get_clock();
-
return res;
}
return res;
}