nobody will launch the logging AFTER the application start

So there is no need to take a timestamp when the loggin is started,
and then substract it from the surf clock.

Plus, calling MSG_get_clock() from xbt_log_layout_simple_new() is not
a good idea since the later is called from xbt_log_preinit(), which
occures before MSG_get_clock() is usable (not all MC stuff is inited
on centos).

diff --git a/src/xbt/xbt_log_layout_format.c b/src/xbt/xbt_log_layout_format.c
index 2be99a6..d0d2bf9 100644 (file)
--- a/src/xbt/xbt_log_layout_format.c
+++ b/src/xbt/xbt_log_layout_format.c
@@ -13,8 +13,6 @@
 
 extern const char *xbt_log_priority_names[8];
 
-static double format_begin_of_time = -1;
-
 #define ERRMSG                                                          \
   "Unknown %%%c sequence in layout format (%s).\n"                      \
   "Known sequences:\n"                                                  \
@@ -148,7 +146,7 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, xbt_log_event_t ev, co
             show_double(MSG_get_clock());
             break;
           case 'r': /* application age; LOG4J compliant */
-            show_double(MSG_get_clock() - format_begin_of_time);
+            show_double(MSG_get_clock());
             break;
           case 'm': { /* user-provided message; LOG4J compliant */
             int sz;
@@ -188,8 +186,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 = MSG_get_clock();
-
   return res;
 }

diff --git a/src/xbt/xbt_log_layout_simple.c b/src/xbt/xbt_log_layout_simple.c
index 2716d98..74374bf 100644 (file)
--- a/src/xbt/xbt_log_layout_simple.c
+++ b/src/xbt/xbt_log_layout_simple.c
@@ -15,8 +15,6 @@
 extern const char *xbt_log_priority_names[8];
 extern int xbt_log_no_loc;
 
-static double simple_begin_of_time = -1;
-
 #define check_overflow(len)                                             \
   if ((rem_size -= (len)) > 0) {                                        \
     p += (len);                                                         \
@@ -45,7 +43,7 @@ static int xbt_log_layout_simple_doit(XBT_ATTRIB_UNUSED xbt_log_layout_t l, xbt_
   }
 
   /* Display the date */
-  len = snprintf(p, rem_size, "%f] ", MSG_get_clock() - simple_begin_of_time);
+  len = snprintf(p, rem_size, "%f] ", MSG_get_clock());
   check_overflow(len);
 
   /* Display file position if not INFO */
@@ -75,8 +73,5 @@ xbt_log_layout_t xbt_log_layout_simple_new(XBT_ATTRIB_UNUSED char* arg)
   xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1);
   res->do_layout       = &xbt_log_layout_simple_doit;
 
-  if (simple_begin_of_time < 0)
-    simple_begin_of_time = MSG_get_clock();
-
   return res;
 }