* under the terms of the license (GNU LGPL) which comes with this package. */
#include "portable.h" /* execinfo when available */
+#include "xbt/ex_interface.h"
#include "xbt/sysdep.h"
#include "xbt/strbuff.h"
#include "xbt/log_private.h"
-#include "gras/virtu.h" /* gras_os_myname (KILLME) */
-#include "xbt/synchro.h" /* xbt_thread_self_name */
+#include "simgrid/simix.h" /* SIMIX_host_self_get_name */
+#include "surf/surf.h"
#include <stdio.h>
extern const char *xbt_log_priority_names[8];
check_overflow(len); \
} else (void)0
-#define show_string(data) show_it(data, "s")
+#define show_string(data) \
+ if (1) { \
+ const char *show_string_data = (data); \
+ show_it(show_string_data ? show_string_data : "(null)", "s"); \
+ } else (void)0
#define show_int(data) show_it(data, "d")
#define show_double(data) show_it(data, "f")
handle_modifier:
switch (*q) {
case '\0':
- xbt_die("Layout format (%s) ending with %%\n", (char *)l->data);
+ fprintf(stderr, "Layout format (%s) ending with %%\n", (char *)l->data);
+ xbt_abort();
case '%':
*p = '%';
check_overflow(1);
show_string(xbt_log_priority_names[ev->priority]);
break;
case 'h': /* host name; SimGrid extension */
- show_string(gras_os_myname());
+ show_string(SIMIX_host_self_get_name());
break;
case 't': /* thread name; LOG4J compliant */
show_string(xbt_thread_self_name());
e.bt_strings = NULL;
e.msg = NULL;
e.remote = 0;
- xbt_backtrace_current(&e);
+ xbt_ex_setup_backtrace(&e);
if (*q == 'B') {
- show_string(e.bt_strings[2] + 8);
+ show_string(e.bt_strings[1] + 8);
} else {
xbt_strbuff_t buff = xbt_strbuff_new();
int i;
+ xbt_strbuff_append(buff, e.bt_strings[1] + 8);
for (i = 2; i < e.used; i++) {
- xbt_strbuff_append(buff, e.bt_strings[i] + 8);
xbt_strbuff_append(buff, "\n");
+ xbt_strbuff_append(buff, e.bt_strings[i] + 8);
}
show_string(buff->data);
xbt_strbuff_free(buff);
#endif
break;
case 'd': /* date; LOG4J compliant */
- show_double(gras_os_time());
+ show_double(surf_get_clock());
break;
case 'r': /* application age; LOG4J compliant */
- show_double(gras_os_time() - format_begin_of_time);
+ show_double(surf_get_clock() - format_begin_of_time);
break;
case 'm': { /* user-provided message; LOG4J compliant */
int len, sz;
break;
}
default:
- xbt_die(ERRMSG, *q, (char *)l->data);
+ fprintf(stderr, ERRMSG, *q, (char *)l->data);
+ xbt_abort();
}
} else {
*p = *q;
res->data = xbt_strdup((char *) arg);
if (format_begin_of_time < 0)
- format_begin_of_time = gras_os_time();
+ format_begin_of_time = surf_get_clock();
return res;
}