#include <stdio.h>
#include "gras/virtu.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(log_app,log,"default logging handler");
-
/**
* The root category's default logging function.
*/
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);
/*
begin_of_time=gras_os_time();
if(strlen(xbt_procname()))
- sprintf(buffer,"%s:%s:(%d) %g", gras_os_myname(),
+ sprintf(buffer,"%s:%s:(%ld) %f", gras_os_myname(),
xbt_procname(),gras_os_getpid(),gras_os_time()-begin_of_time);
else
- buffer[0]=0;
+ sprintf(buffer,"%f", gras_os_time()-begin_of_time);
return buffer;
}
-static void append_file(xbt_log_appender_t this,
+static void append_file(xbt_log_appender_t this_appender,
xbt_log_event_t ev,
const char *fmt) {
if (!procname)
procname = (char*)"";
- if ((FILE*)(this->appender_data) == NULL)
- this->appender_data = (void*)stderr;
+ if ((FILE*)(this_appender->appender_data) == NULL)
+ this_appender->appender_data = (void*)stderr;
xbt_assert0(ev->priority>=0,
"Negative logging priority naturally forbidden");
"Priority %d is greater than the biggest allowed value",
ev->priority);
- fprintf(stderr, "[%s] %s:%d: ", procname, 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] );
vfprintf(stderr, fmt, ev->ap);