X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8f00eb046e0f737d6b022617606cb642e7e3fc22..4bd1f48f0bf1ad1703be680ec2a38d626c6a2668:/src/xbt/xbt_log_layout_simple.c diff --git a/src/xbt/xbt_log_layout_simple.c b/src/xbt/xbt_log_layout_simple.c index c709fca855..b890b1591d 100644 --- a/src/xbt/xbt_log_layout_simple.c +++ b/src/xbt/xbt_log_layout_simple.c @@ -1,19 +1,16 @@ /* layout_simple - a dumb log layout */ -/* Copyright (c) 2007-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-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. */ #include "xbt/sysdep.h" -#include "xbt/strbuff.h" /* For dynamic version when the static one fails */ #include "src/xbt/log_private.h" -#include "simgrid/simix.h" /* SIMIX_host_self_get_name */ +#include "simgrid/host.h" /* sg_host_self_get_name */ #include "surf/surf.h" #include -#include "src/internal_config.h" extern const char *xbt_log_priority_names[8]; extern int xbt_log_no_loc; @@ -39,12 +36,12 @@ static int xbt_log_layout_simple_doit(xbt_log_layout_t l, xbt_log_event_t ev, co /* Display the proc info if available */ procname = xbt_procname(); if (procname && strcmp(procname,"maestro")) { - len = snprintf(p, rem_size, "%s:%s:(%d) ", SIMIX_host_self_get_name(), procname, xbt_getpid()); + len = snprintf(p, rem_size, "%s:%s:(%d) ", sg_host_self_get_name(), procname, xbt_getpid()); check_overflow(len); } else if (!procname) { - len = snprintf(p, rem_size, "%s::(%d) ", SIMIX_host_self_get_name(), xbt_getpid()); - check_overflow(len); + len = snprintf(p, rem_size, "%s::(%d) ", sg_host_self_get_name(), xbt_getpid()); + check_overflow(len); } /* Display the date */