A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new function: xbt_dynar_sort_strings(), when the content is char*
[simgrid.git]
/
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
d09a2fe
..
b40d634
100644
(file)
--- a/
src/xbt/xbt_log_layout_format.c
+++ b/
src/xbt/xbt_log_layout_format.c
@@
-1,18
+1,19
@@
/* layout_simple - a dumb log layout */
/* layout_simple - a dumb log layout */
-/* Copyright (c) 2007-201
1
. The SimGrid Team.
+/* Copyright (c) 2007-201
4
. 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. */
* 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/ex_interface.h"
+#include "src/portable.h" /* execinfo when available */
+#include "xbt/synchro_core.h" /* xbt_thread_self_name */
+#include "src/xbt/ex_interface.h"
#include "xbt/sysdep.h"
#include "xbt/strbuff.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 "
src/
xbt/log_private.h"
+#include "
simgrid/simix.h" /* SIMIX_host_self_get_name
*/
+#include "
surf/surf.h"
#include <stdio.h>
extern const char *xbt_log_priority_names[8];
#include <stdio.h>
extern const char *xbt_log_priority_names[8];
@@
-64,7
+65,11
@@
static double format_begin_of_time = -1;
check_overflow(len); \
} else (void)0
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")
#define show_int(data) show_it(data, "d")
#define show_double(data) show_it(data, "f")
@@
-84,7
+89,8
@@
static int xbt_log_layout_format_doit(xbt_log_layout_t l,
handle_modifier:
switch (*q) {
case '\0':
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);
case '%':
*p = '%';
check_overflow(1);
@@
-121,10
+127,10
@@
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_log_priority_names[ev->priority]);
break;
case 'h': /* host name; SimGrid extension */
- show_string(
gras_os_my
name());
+ show_string(
SIMIX_host_self_get_
name());
break;
case 't': /* thread name; LOG4J compliant */
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 'P': /* process name; SimGrid extension */
show_string(xbt_procname());
@@
-157,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.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);
xbt_ex_setup_backtrace(&e);
if (*q == 'B') {
show_string(e.bt_strings[1] + 8);
@@
-179,10
+184,10
@@
static int xbt_log_layout_format_doit(xbt_log_layout_t l,
#endif
break;
case 'd': /* date; LOG4J compliant */
#endif
break;
case 'd': /* date; LOG4J compliant */
- show_double(
gras_os_time
());
+ show_double(
surf_get_clock
());
break;
case 'r': /* application age; LOG4J compliant */
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;
case 'm': { /* user-provided message; LOG4J compliant */
int len, sz;
@@
-192,7
+197,8
@@
static int xbt_log_layout_format_doit(xbt_log_layout_t l,
break;
}
default:
break;
}
default:
- xbt_die(ERRMSG, *q, (char *)l->data);
+ fprintf(stderr, ERRMSG, *q, (char *)l->data);
+ xbt_abort();
}
} else {
*p = *q;
}
} else {
*p = *q;
@@
-217,7
+223,7
@@
xbt_log_layout_t xbt_log_layout_format_new(char *arg)
res->data = xbt_strdup((char *) arg);
if (format_begin_of_time < 0)
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;
}
return res;
}