X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/76fc50df9db37b17288ccf8a6c9d5b2254dba6b2..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/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 18c55ac2ce..b8c3a53035 100644
--- a/src/xbt/xbt_log_layout_format.c
+++ b/src/xbt/xbt_log_layout_format.c
@@ -1,19 +1,24 @@
 /* layout_simple - a dumb log layout                                        */
 
-/* Copyright (c) 2007-2017. The SimGrid Team.                               */
+/* Copyright (c) 2007-2018. 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 "simgrid/host.h"
+#include "simgrid/msg.h" /* MSG_get_clock */
 #include "src/xbt/log_private.h"
-#include "surf/surf.h"
 #include "xbt/sysdep.h"
 #include <stdio.h>
 
-extern const char *xbt_log_priority_names[8];
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
 
-static double format_begin_of_time = -1;
+extern const char *xbt_log_priority_names[8];
 
 #define ERRMSG                                                          \
   "Unknown %%%c sequence in layout format (%s).\n"                      \
@@ -78,89 +83,94 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, xbt_log_event_t ev, co
   for (char* q = l->data ; *q != '\0' ; q++) {
     if (*q == '%') {
       q++;
-    handle_modifier:
-      switch (*q) {
-      case '\0':
-        fprintf(stderr, "Layout format (%s) ending with %%\n", (char *)l->data);
-        xbt_abort();
-        break;
-      case '%':
-        *p = '%';
-        check_overflow(1);
-        break;
-      case 'n':         /* platform-dependant line separator; LOG4J compliant */
-        *p = '\n';
-        check_overflow(1);
-        break;
-      case 'e':                 /* plain space; SimGrid extension */
-        *p = ' ';
-        check_overflow(1);
-        break;
-      case '.':                 /* precision specifier */
-        precision = strtol(q + 1, &q, 10);
-        goto handle_modifier;
-      case '0':
-      case '1':
-      case '2':
-      case '3':
-      case '4':
-      case '5':
-      case '6':
-      case '7':
-      case '8':
-      case '9':                 /* length modifier */
-        length = strtol(q, &q, 10);
-        goto handle_modifier;
-      case 'c':                 /* category name; LOG4J compliant
-                                   should accept a precision postfix to show the hierarchy */
-        show_string(ev->cat->name);
-        break;
-      case 'p':                 /* priority name; LOG4J compliant */
-        show_string(xbt_log_priority_names[ev->priority]);
-        break;
-      case 'h':                 /* host name; SimGrid extension */
-        show_string(sg_host_self_get_name());
-        break;
-      case 't':                 /* thread/process name; LOG4J compliant */
-      case 'P':                 /* process name; SimGrid extension */
-        show_string(xbt_procname());
-        break;
-      case 'i':                 /* process PID name; SimGrid extension */
-        show_int(xbt_getpid());
-        break;
-      case 'F':                 /* file name; LOG4J compliant */
-        show_string(ev->fileName);
-        break;
-      case 'l': {               /* location; LOG4J compliant */
-        int sz;
-        set_sz_from_precision();
-        int len = snprintf(p, sz, "%s:%d", ev->fileName, ev->lineNum);
-        check_overflow(MIN(sz, len));
-        break;
-      }
-      case 'L':                 /* line number; LOG4J compliant */
-        show_int(ev->lineNum);
-        break;
-      case 'M':                /* method (ie, function) name; LOG4J compliant */
-        show_string(ev->functionName);
-        break;
-      case 'd':                 /* date; LOG4J compliant */
-        show_double(surf_get_clock());
-        break;
-      case 'r':                 /* application age; LOG4J compliant */
-        show_double(surf_get_clock() - format_begin_of_time);
-        break;
-      case 'm': {               /* user-provided message; LOG4J compliant */
-        int sz;
-        set_sz_from_precision();
-        int len = vsnprintf(p, sz, msg_fmt, ev->ap);
-        check_overflow(MIN(sz, len));
-        break;
-      }
-      default:
-        fprintf(stderr, ERRMSG, *q, (char *)l->data);
-        xbt_abort();
-      }
+      do {
+        switch (*q) {
+          case '\0':
+            fprintf(stderr, "Layout format (%s) ending with %%\n", (char*)l->data);
+            xbt_abort();
+            break;
+          case '%':
+            *p = '%';
+            check_overflow(1);
+            break;
+          case 'n': /* platform-dependant line separator; LOG4J compliant */
+            *p = '\n';
+            check_overflow(1);
+            break;
+          case 'e': /* plain space; SimGrid extension */
+            *p = ' ';
+            check_overflow(1);
+            break;
+          case '.': /* precision specifier */
+            precision = strtol(q + 1, &q, 10);
+            continue; /* conversion specifier still not found, continue reading */
+          case '0':
+          case '1':
+          case '2':
+          case '3':
+          case '4':
+          case '5':
+          case '6':
+          case '7':
+          case '8':
+          case '9': /* length modifier */
+            length = strtol(q, &q, 10);
+            continue; /* conversion specifier still not found, continue reading */
+          case 'c':   /* category name; LOG4J compliant
+                         should accept a precision postfix to show the hierarchy */
+            show_string(ev->cat->name);
+            break;
+          case 'p': /* priority name; LOG4J compliant */
+            show_string(xbt_log_priority_names[ev->priority]);
+            break;
+          case 'h': /* host name; SimGrid extension */
+            show_string(sg_host_self_get_name());
+            break;
+          case 't': /* thread/process name; LOG4J compliant */
+          case 'P': /* process name; SimGrid extension */
+            show_string(xbt_procname());
+            break;
+          case 'i': /* process PID name; SimGrid extension */
+            show_int(xbt_getpid());
+            break;
+          case 'F': /* file name; LOG4J compliant */
+            show_string(ev->fileName);
+            break;
+          case 'l': { /* location; LOG4J compliant */
+            int sz;
+            set_sz_from_precision();
+            int len = snprintf(p, sz, "%s:%d", ev->fileName, ev->lineNum);
+            check_overflow(MIN(sz, len));
+            break;
+          }
+          case 'L': /* line number; LOG4J compliant */
+            show_int(ev->lineNum);
+            break;
+          case 'M': /* method (ie, function) name; LOG4J compliant */
+            show_string(ev->functionName);
+            break;
+          case 'd': /* date; LOG4J compliant */
+            show_double(MSG_get_clock());
+            break;
+          case 'r': /* application age; LOG4J compliant */
+            show_double(MSG_get_clock());
+            break;
+          case 'm': { /* user-provided message; LOG4J compliant */
+            int sz;
+            set_sz_from_precision();
+            va_list ap;
+            va_copy(ap, ev->ap);
+            int len = vsnprintf(p, sz, msg_fmt, ap);
+            va_end(ap);
+            check_overflow(MIN(sz, len));
+            break;
+          }
+          default:
+            fprintf(stderr, ERRMSG, *q, (char*)l->data);
+            xbt_abort();
+        }
+        break; /* done, continue normally */
+      } while (1);
     } else {
       *p = *q;
       check_overflow(1);
@@ -183,8 +193,5 @@ xbt_log_layout_t xbt_log_layout_format_new(char *arg)
   res->free_           = &xbt_log_layout_format_free;
   res->data = xbt_strdup((char *) arg);
 
-  if (format_begin_of_time < 0)
-    format_begin_of_time = surf_get_clock();
-
   return res;
 }