/* layout_simple - a dumb log layout */
-/* Copyright (c) 2007-2013. The SimGrid Team.
+/* Copyright (c) 2007-2014. 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 "src/internal_config.h" /* execinfo when available */
#include "xbt/synchro_core.h" /* xbt_thread_self_name */
-#include "xbt/ex_interface.h"
+#include "src/xbt/ex_interface.h"
#include "xbt/sysdep.h"
#include "xbt/strbuff.h"
-#include "xbt/log_private.h"
+#include "src/xbt/log_private.h"
#include "simgrid/simix.h" /* SIMIX_host_self_get_name */
#include "surf/surf.h"
#include <stdio.h>
+#if HAVE_EXECINFO_H
+# include <execinfo.h> /* Function backtrace */
+#endif
+
extern const char *xbt_log_priority_names[8];
static double format_begin_of_time = -1;
show_string(SIMIX_host_self_get_name());
break;
case 't': /* thread name; LOG4J compliant */
- show_string(xbt_thread_self_name());
+ show_string(SIMIX_process_self_get_name());
break;
case 'P': /* process name; SimGrid extension */
show_string(xbt_procname());
break;
case 'b': /* backtrace; called %throwable in LOG4J */
case 'B': /* short backtrace; called %throwable{short} in LOG4J */
-#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
+#if HAVE_EXECINFO_H && HAVE_POPEN && defined(ADDR2LINE)
{
xbt_ex_t e;