s/gras_process_getpid/gras_os_getpid/

[simgrid.git] / src / xbt / log_default_appender.c

diff --git a/src/xbt/log_default_appender.c b/src/xbt/log_default_appender.c
index 7030bb8..cfe919c 100644 (file)
--- a/src/xbt/log_default_appender.c
+++ b/src/xbt/log_default_appender.c
@@ -11,6 +11,7 @@
 #include "xbt/log.h"
 #include "xbt/error.h"
 #include <stdio.h>
+#include "gras/virtu.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(log_app,log,"default logging handler");
 
@@ -35,13 +36,29 @@ 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 const char* xbt_logappender_verbose_information(void) {
+  static char buffer[256];
+
+  if(strlen(gras_os_myname()))
+    sprintf(buffer,"%s:%s:(%d) %g", gras_os_myname(),
+           xbt_procname(),gras_os_getpid(),gras_os_time());
+  else 
+    buffer[0]=0;
+  
+  return buffer;
+}
+
 static void append_file(xbt_log_appender_t this,
                        xbt_log_event_t ev, 
                        const char *fmt) {
 
   /* TODO: define a format field in struct for timestamp, etc.
      struct DefaultLogAppender* this = (struct DefaultLogAppender*)this0;*/
-    
+
+  char *procname = (char*)xbt_logappender_verbose_information();
+  if (!procname) 
+     procname = (char*)"";
+   
     if ((FILE*)(this->appender_data) == NULL)
       this->appender_data = (void*)stderr;
     
@@ -51,9 +68,9 @@ 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);
+    fprintf(stderr, "[%s] %s:%d: ", procname, ev->fileName, ev->lineNum);
     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");
 }