X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/baa212aa2fc1e0f91b0e9a9536db52f1657331a8..28ad902744a7994dd47701c0e107e3de63a0231e:/src/xbt/log_default_appender.c

diff --git a/src/xbt/log_default_appender.c b/src/xbt/log_default_appender.c
index 7030bb830a..51e4e15edf 100644
--- a/src/xbt/log_default_appender.c
+++ b/src/xbt/log_default_appender.c
@@ -9,10 +9,8 @@
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "xbt/error.h"
 #include <stdio.h>
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(log_app,log,"default logging handler");
+#include "gras/virtu.h"
 
 /**
  * The root category's default logging function.
@@ -20,7 +18,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(log_app,log,"default logging handler");
 
 extern const char *xbt_log_priority_names[7];
 
-static void append_file(xbt_log_appender_t this, xbt_log_event_t ev,
+static void append_file(xbt_log_appender_t this_appender, xbt_log_event_t ev,
 			const char *fmt);
 
 /*
@@ -35,15 +33,35 @@ static s_xbt_log_appender_t xbt_log_appender_file = { append_file, NULL } ;
 
 xbt_log_appender_t xbt_log_default_appender  = &xbt_log_appender_file;
 
-static void append_file(xbt_log_appender_t this,
+static const char* xbt_logappender_verbose_information(void) {
+  static char buffer[256];
+  static double begin_of_time = -1;
+  
+  if (begin_of_time<0) 
+    begin_of_time=gras_os_time();
+
+  if(strlen(xbt_procname()))
+    sprintf(buffer,"%s:%s:(%ld) %f", gras_os_myname(),
+	    xbt_procname(),gras_os_getpid(),gras_os_time()-begin_of_time);
+  else 
+    sprintf(buffer,"%f", gras_os_time()-begin_of_time);
+  
+  return buffer;
+}
+
+static void append_file(xbt_log_appender_t this_appender,
 			xbt_log_event_t ev, 
 			const char *fmt) {
 
   /* TODO: define a format field in struct for timestamp, etc.
      struct DefaultLogAppender* this = (struct DefaultLogAppender*)this0;*/
-    
-    if ((FILE*)(this->appender_data) == NULL)
-      this->appender_data = (void*)stderr;
+
+  char *procname = (char*)xbt_logappender_verbose_information();
+  if (!procname) 
+     procname = (char*)"";
+   
+    if ((FILE*)(this_appender->appender_data) == NULL)
+      this_appender->appender_data = (void*)stderr;
     
     xbt_assert0(ev->priority>=0,
 		 "Negative logging priority naturally forbidden");
@@ -51,9 +69,12 @@ static void append_file(xbt_log_appender_t this,
 		 "Priority %d is greater than the biggest allowed value",
 		 ev->priority);
 
-    fprintf(stderr, "%s:%d: ", ev->fileName, ev->lineNum);
+    if (ev->priority != xbt_log_priority_info)
+     fprintf(stderr, "[%s] %s:%d: ", procname, ev->fileName, ev->lineNum);
+    else
+     fprintf(stderr, "[%s] ", procname);
     fprintf(stderr, "[%s/%s] ", 
-	    ev->cat->name, xbt_log_priority_names[ev->priority]);
+	    ev->cat->name, xbt_log_priority_names[ev->priority] );
     vfprintf(stderr, fmt, ev->ap);
     fprintf(stderr, "\n");
 }