#include "portable.h" /* execinfo when available */
#include "xbt/sysdep.h"
#include "xbt/log.h"
-#include "gras/virtu.h"
+#include "gras/virtu.h" /* gras_os_myname (KILLME) */
+#include "xbt/synchro.h" /* xbt_thread_self_name */
#include <stdio.h>
-#include "xbt/ex_interface.h" /* backtraces */
extern const char *xbt_log_priority_names[7];
handle_modifier:
switch (*q) {
case '\0':
- THROW1(arg_error,0,"Layout format (%s) ending with %%",(char*)l->data);
+ fprintf(stderr,"Layout format (%s) ending with %%\n",(char*)l->data);
+ abort();
case '%':
*p++ = '%';
break;
precision = -1;
}
break;
- case 't': /* process name; LOG4J compliant (thread name) */
+ case 't': /* thread name; LOG4J compliant */
+ if (precision == -1)
+ p += sprintf(p, "%s", xbt_thread_self_name());
+ else {
+ p += sprintf(p, "%.*s", precision, xbt_thread_self_name());
+ precision = -1;
+ }
+ break;
+ case 'P': /* process name; SimGrid extension */
if (precision == -1)
p += sprintf(p, "%s", xbt_procname());
else {
break;
case 'i': /* process PID name; SimGrid extension */
if (precision == -1)
- p += sprintf(p, "%ld", gras_os_getpid());
+ p += sprintf(p, "%d", (*xbt_getpid)());
else {
- p += sprintf(p, "%.*ld", precision, gras_os_getpid());
+ p += sprintf(p, "%.*d", precision, (*xbt_getpid)());
precision = -1;
}
break;
e.bt_strings = NULL;
e.msg=NULL;
e.remote=0;
- xbt_ex_setup_backtrace(&e);
+ xbt_backtrace_current(&e);
if (*q=='B') {
if (precision == -1)
p += sprintf(p,"%s",e.bt_strings[2]+8);
break;
default:
- THROW2(arg_error,0,"Unknown %%%c sequence in layout format (%s)",
- *q,(char*)l->data);
+ fprintf(stderr,"Unknown %%%c sequence in layout format (%s)\n",
+ *q,(char*)l->data);
+ abort();
}
q++;
} else {