I think I just killed a simcall

[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 9dc2426..1de4e72 100644 (file)
--- a/src/xbt/xbt_log_layout_format.c
+++ b/src/xbt/xbt_log_layout_format.c
@@ -1,21 +1,22 @@
 /* layout_simple - a dumb log layout                                        */
 
-/* Copyright (c) 2007-2013. 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. */
 
-#include "portable.h"           /* execinfo when available */
-#include "xbt/synchro_core.h"   /* xbt_thread_self_name */
-#include "xbt/ex_interface.h"
+#include "src/internal_config.h"       /* execinfo when available */
 #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;
@@ -49,7 +50,8 @@ static double format_begin_of_time = -1;
 
 #define show_it(data, letter)                                           \
   if (1) {                                                              \
-    int len, wd;                                                        \
+    int len;                                                            \
+    int wd;                                                             \
     if (length == -1) {                                                 \
       wd = 0;                                                           \
     } else {                                                            \
@@ -73,17 +75,14 @@ static double format_begin_of_time = -1;
 #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;
   int precision = -1;
   int length = -1;
-  char *q;
 
-  for (q = l->data ; *q != '\0' ; q++) {
+  for (char* q = l->data ; *q != '\0' ; q++) {
     if (*q == '%') {
       q++;
     handle_modifier:
@@ -119,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
-                                   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 */
@@ -130,7 +128,7 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l,
         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());
@@ -142,9 +140,9 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l,
         show_string(ev->fileName);
         break;
       case 'l': {               /* location; LOG4J compliant */
-        int len, sz;
+        int sz;
         set_sz_from_precision();
-        len = snprintf(p, sz, "%s:%d", ev->fileName, ev->lineNum);
+        int len = snprintf(p, sz, "%s:%d", ev->fileName, ev->lineNum);
         check_overflow(MIN(sz, len));
         break;
       }
@@ -156,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 */
-#if defined(HAVE_EXECINFO_H) && defined(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.msg = NULL;
           xbt_ex_setup_backtrace(&e);
           if (*q == 'B') {
             show_string(e.bt_strings[1] + 8);
@@ -177,7 +175,6 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l,
             show_string(buff->data);
             xbt_strbuff_free(buff);
           }
-          xbt_ex_free(e);
         }
 #else
         show_string("(no backtrace on this arch)");
@@ -190,9 +187,9 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l,
         show_double(surf_get_clock() - format_begin_of_time);
         break;
       case 'm': {               /* user-provided message; LOG4J compliant */
-        int len, sz;
+        int sz;
         set_sz_from_precision();
-        len = vsnprintf(p, sz, msg_fmt, ev->ap);
+        int len = vsnprintf(p, sz, msg_fmt, ev->ap);
         check_overflow(MIN(sz, len));
         break;
       }
@@ -218,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);
-  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)