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
Rename NetCards to NetPoints
[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
372ed4e
..
4dca163
100644
(file)
--- a/
src/xbt/xbt_log_layout_format.c
+++ b/
src/xbt/xbt_log_layout_format.c
@@
-1,14
+1,11
@@
/* layout_simple - a dumb log layout */
/* layout_simple - a dumb log layout */
-/* Copyright (c) 2007-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2016. The SimGrid Team. */
/* 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. */
/* 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 "src/portable.h" /* execinfo when available */
-#include "xbt/synchro_core.h" /* xbt_thread_self_name */
-#include "src/xbt/ex_interface.h"
+#include "src/internal_config.h" /* execinfo when available */
#include "xbt/sysdep.h"
#include "xbt/strbuff.h"
#include "src/xbt/log_private.h"
#include "xbt/sysdep.h"
#include "xbt/strbuff.h"
#include "src/xbt/log_private.h"
@@
-16,7
+13,7
@@
#include "surf/surf.h"
#include <stdio.h>
#include "surf/surf.h"
#include <stdio.h>
-#if
def
HAVE_EXECINFO_H
+#if HAVE_EXECINFO_H
# include <execinfo.h> /* Function backtrace */
#endif
# include <execinfo.h> /* Function backtrace */
#endif
@@
-77,9
+74,7
@@
static double format_begin_of_time = -1;
#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")
-static int xbt_log_layout_format_doit(xbt_log_layout_t l,
- xbt_log_event_t ev,
- const char *msg_fmt)
+static int xbt_log_layout_format_doit(xbt_log_layout_t l, xbt_log_event_t ev, const char *msg_fmt)
{
char *p = ev->buffer;
int rem_size = ev->buffer_size;
{
char *p = ev->buffer;
int rem_size = ev->buffer_size;
@@
-123,8
+118,7
@@
static int xbt_log_layout_format_doit(xbt_log_layout_t l,
length = strtol(q, &q, 10);
goto handle_modifier;
case 'c': /* category name; LOG4J compliant
length = strtol(q, &q, 10);
goto handle_modifier;
case 'c': /* category name; LOG4J compliant
- should accept a precision postfix to show the
- hierarchy */
+ should accept a precision postfix to show the hierarchy */
show_string(ev->cat->name);
break;
case 'p': /* priority name; LOG4J compliant */
show_string(ev->cat->name);
break;
case 'p': /* priority name; LOG4J compliant */
@@
-160,13
+154,13
@@
static int xbt_log_layout_format_doit(xbt_log_layout_t l,
break;
case 'b': /* backtrace; called %throwable in LOG4J */
case 'B': /* short backtrace; called %throwable{short} in LOG4J */
break;
case 'b': /* backtrace; called %throwable in LOG4J */
case 'B': /* short backtrace; called %throwable{short} in LOG4J */
-#if HAVE_EXECINFO_H && HAVE_POPEN && defined(ADDR2LINE)
+// TODO, backtrace
+#if 0 && HAVE_BACKTRACE && HAVE_EXECINFO_H && HAVE_POPEN && defined(ADDR2LINE)
{
{
- xbt_ex_t e;
+ xbt_ex_t e
("")
;
e.used = backtrace((void **) e.bt, XBT_BACKTRACE_SIZE);
e.bt_strings = NULL;
e.used = backtrace((void **) e.bt, XBT_BACKTRACE_SIZE);
e.bt_strings = NULL;
- e.msg = NULL;
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);
@@
-181,7
+175,6
@@
static int xbt_log_layout_format_doit(xbt_log_layout_t l,
show_string(buff->data);
xbt_strbuff_free(buff);
}
show_string(buff->data);
xbt_strbuff_free(buff);
}
- xbt_ex_free(e);
}
#else
show_string("(no backtrace on this arch)");
}
#else
show_string("(no backtrace on this arch)");
@@
-222,8
+215,8
@@
static void xbt_log_layout_format_free(xbt_log_layout_t lay)
xbt_log_layout_t xbt_log_layout_format_new(char *arg)
{
xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1);
xbt_log_layout_t xbt_log_layout_format_new(char *arg)
{
xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1);
- res->do_layout
=
xbt_log_layout_format_doit;
- res->free_
=
xbt_log_layout_format_free;
+ res->do_layout
= &
xbt_log_layout_format_doit;
+ res->free_
= &
xbt_log_layout_format_free;
res->data = xbt_strdup((char *) arg);
if (format_begin_of_time < 0)
res->data = xbt_strdup((char *) arg);
if (format_begin_of_time < 0)