/* 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" \
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;
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;
}