X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/419864009ef3cbb3e5a7a2d62c68a1f5127f6bc7..a27340a44ca0010cef5e5134627dd7774cc911c3:/src/xbt/xbt_log_layout_simple.cpp diff --git a/src/xbt/xbt_log_layout_simple.cpp b/src/xbt/xbt_log_layout_simple.cpp index 6e4b400d71..7d1c84bfd9 100644 --- a/src/xbt/xbt_log_layout_simple.cpp +++ b/src/xbt/xbt_log_layout_simple.cpp @@ -1,6 +1,6 @@ /* layout_simple - a dumb log layout */ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2020. 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. */ @@ -8,8 +8,8 @@ #include "xbt/sysdep.h" #include "src/xbt/log_private.hpp" -#include "simgrid/host.h" /* sg_host_self_get_name */ -#include "simgrid/msg.h" /* MSG_get_clock */ +#include "simgrid/engine.h" /* simgrid_get_clock */ +#include "simgrid/host.h" /* sg_host_self_get_name */ #include extern const char *xbt_log_priority_names[8]; @@ -23,7 +23,7 @@ extern int xbt_log_no_loc; p += (len); \ } while (0) -static int xbt_log_layout_simple_doit(xbt_log_layout_t, xbt_log_event_t ev, const char* fmt) +static int xbt_log_layout_simple_doit(const s_xbt_log_layout_t*, xbt_log_event_t ev, const char* fmt) { char *p = ev->buffer; int rem_size = ev->buffer_size; @@ -45,7 +45,7 @@ static int xbt_log_layout_simple_doit(xbt_log_layout_t, xbt_log_event_t ev, cons } /* Display the date */ - len = snprintf(p, rem_size, "%f] ", MSG_get_clock()); + len = snprintf(p, rem_size, "%f] ", simgrid_get_clock()); check_overflow(len); /* Display file position if not INFO */