X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22e6546d2c6f14864cc93c4ed1470d8e8c1e2d95..f968cbbb699423fa252994ff42de77f8671ac7eb:/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 ea33369b7a..b8c3a53035 100644
--- a/src/xbt/xbt_log_layout_format.c
+++ b/src/xbt/xbt_log_layout_format.c
@@ -1,19 +1,24 @@
 /* layout_simple - a dumb log layout                                        */
 
-/* Copyright (c) 2007-2017. The SimGrid Team.                               */
+/* Copyright (c) 2007-2018. 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. */
 
 #include "simgrid/host.h"
+#include "simgrid/msg.h" /* MSG_get_clock */
 #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];
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
 
-static double format_begin_of_time = -1;
+extern const char *xbt_log_priority_names[8];
 
 #define ERRMSG                                                          \
   "Unknown %%%c sequence in layout format (%s).\n"                      \
@@ -145,10 +150,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_double(surf_get_clock());
+            show_double(MSG_get_clock());
             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;
@@ -188,8 +193,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);
 
-  if (format_begin_of_time < 0)
-    format_begin_of_time = surf_get_clock();
-
   return res;
 }