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
a bit of simplification
[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
ea33369
..
d0d2bf9
100644
(file)
--- a/
src/xbt/xbt_log_layout_format.c
+++ b/
src/xbt/xbt_log_layout_format.c
@@
-6,15
+6,13
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid/host.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid/host.h"
+#include "simgrid/msg.h" /* MSG_get_clock */
#include "src/xbt/log_private.h"
#include "src/xbt/log_private.h"
-#include "surf/surf.h"
#include "xbt/sysdep.h"
#include <stdio.h>
extern const char *xbt_log_priority_names[8];
#include "xbt/sysdep.h"
#include <stdio.h>
extern const char *xbt_log_priority_names[8];
-static double format_begin_of_time = -1;
-
#define ERRMSG \
"Unknown %%%c sequence in layout format (%s).\n" \
"Known sequences:\n" \
#define ERRMSG \
"Unknown %%%c sequence in layout format (%s).\n" \
"Known sequences:\n" \
@@
-145,10
+143,10
@@
static int xbt_log_layout_format_doit(xbt_log_layout_t l, xbt_log_event_t ev, co
show_string(ev->functionName);
break;
case 'd': /* date; LOG4J compliant */
show_string(ev->functionName);
break;
case 'd': /* date; LOG4J compliant */
- show_double(
surf
_get_clock());
+ show_double(
MSG
_get_clock());
break;
case 'r': /* application age; LOG4J compliant */
break;
case 'r': /* application age; LOG4J compliant */
- show_double(
surf_get_clock() - format_begin_of_time
);
+ show_double(
MSG_get_clock()
);
break;
case 'm': { /* user-provided message; LOG4J compliant */
int sz;
break;
case 'm': { /* user-provided message; LOG4J compliant */
int sz;
@@
-188,8
+186,5
@@
xbt_log_layout_t xbt_log_layout_format_new(char *arg)
res->free_ = &xbt_log_layout_format_free;
res->data = xbt_strdup((char *) arg);
res->free_ = &xbt_log_layout_format_free;
res->data = xbt_strdup((char *) arg);
- if (format_begin_of_time < 0)
- format_begin_of_time = surf_get_clock();
-
return res;
}
return res;
}