#include "simgrid/datatypes.h"
#include "simgrid/forward.h"
+#ifndef __cplusplus
+#error This is a C++ only file, now
+#endif
+
#ifdef __cplusplus
namespace simgrid {
* 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>
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() - format_begin_of_time);
break;
case 'm': { /* user-provided message; LOG4J compliant */
int sz;
res->data = xbt_strdup((char *) arg);
if (format_begin_of_time < 0)
- format_begin_of_time = surf_get_clock();
+ format_begin_of_time = MSG_get_clock();
return res;
}
#include "src/xbt/log_private.h"
#include "simgrid/host.h" /* sg_host_self_get_name */
-#include "surf/surf.h"
+#include "simgrid/msg.h" /* MSG_get_clock */
#include <stdio.h>
extern const char *xbt_log_priority_names[8];
}
/* 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() - simple_begin_of_time);
check_overflow(len);
/* Display file position if not INFO */
res->do_layout = &xbt_log_layout_simple_doit;
if (simple_begin_of_time < 0)
- simple_begin_of_time = surf_get_clock();
+ simple_begin_of_time = MSG_get_clock();
return res;
}
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2008-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. */
#endif
#include "simgrid/simdag.h"
-#include "surf/surf.h"
#include "xbt/xbt_os_time.h"
int main(int argc, char **argv)