A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not display file position at INFO level (reduce the amount of false positive in...
[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
cfe919c
..
51e4e15
100644
(file)
--- a/
src/xbt/log_default_appender.c
+++ b/
src/xbt/log_default_appender.c
@@
-9,19
+9,16
@@
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
-#include "xbt/error.h"
#include <stdio.h>
#include "gras/virtu.h"
#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];
/**
* 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);
/*
const char *fmt);
/*
@@
-38,17
+35,21
@@
xbt_log_appender_t xbt_log_default_appender = &xbt_log_appender_file;
static const char* xbt_logappender_verbose_information(void) {
static char buffer[256];
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(
gras_os_my
name()))
- sprintf(buffer,"%s:%s:(%
d) %g
", gras_os_myname(),
- xbt_procname(),gras_os_getpid(),gras_os_time());
+ if(strlen(
xbt_proc
name()))
+ sprintf(buffer,"%s:%s:(%
ld) %f
", gras_os_myname(),
+ xbt_procname(),gras_os_getpid(),gras_os_time()
-begin_of_time
);
else
else
-
buffer[0]=0
;
+
sprintf(buffer,"%f", gras_os_time()-begin_of_time)
;
return buffer;
}
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) {
xbt_log_event_t ev,
const char *fmt) {
@@
-59,8
+60,8
@@
static void append_file(xbt_log_appender_t this,
if (!procname)
procname = (char*)"";
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");
xbt_assert0(ev->priority>=0,
"Negative logging priority naturally forbidden");
@@
-68,7
+69,10
@@
static void append_file(xbt_log_appender_t this,
"Priority %d is greater than the biggest allowed value",
ev->priority);
"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);
fprintf(stderr, "[%s/%s] ",
ev->cat->name, xbt_log_priority_names[ev->priority] );
vfprintf(stderr, fmt, ev->ap);