X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/187ba0c05f9fbe51175179b9f637b6554f947468..2d882c1ac3c6eb891f8eb26a84ec2d6890a67730:/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 e4ebf8d8da..9dc242639b 100644 --- a/src/xbt/xbt_log_layout_format.c +++ b/src/xbt/xbt_log_layout_format.c @@ -1,17 +1,18 @@ /* layout_simple - a dumb log layout */ -/* Copyright (c) 2007-2011. The SimGrid Team. +/* Copyright (c) 2007-2013. 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 "portable.h" /* execinfo when available */ +#include "xbt/synchro_core.h" /* xbt_thread_self_name */ #include "xbt/ex_interface.h" #include "xbt/sysdep.h" #include "xbt/strbuff.h" #include "xbt/log_private.h" -#include "xbt/synchro.h" /* xbt_thread_self_name */ +#include "simgrid/simix.h" /* SIMIX_host_self_get_name */ #include "surf/surf.h" #include @@ -126,7 +127,7 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, show_string(xbt_log_priority_names[ev->priority]); break; case 'h': /* host name; SimGrid extension */ - show_string(xbt_os_procname()); + show_string(SIMIX_host_self_get_name()); break; case 't': /* thread name; LOG4J compliant */ show_string(xbt_thread_self_name()); @@ -162,7 +163,6 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, e.used = backtrace((void **) e.bt, XBT_BACKTRACE_SIZE); e.bt_strings = NULL; e.msg = NULL; - e.remote = 0; xbt_ex_setup_backtrace(&e); if (*q == 'B') { show_string(e.bt_strings[1] + 8);