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
AAAAh. let's try to fix the fix of a fix. Correctly if possible
[simgrid.git]
/
src
/
xbt
/
xbt_log_layout_simple.c
diff --git
a/src/xbt/xbt_log_layout_simple.c
b/src/xbt/xbt_log_layout_simple.c
index
c42e398
..
4165fc7
100644
(file)
--- a/
src/xbt/xbt_log_layout_simple.c
+++ b/
src/xbt/xbt_log_layout_simple.c
@@
-16,9
+16,10
@@
#include <stdio.h>
#include "portable.h"
#include <stdio.h>
#include "portable.h"
-extern const char *xbt_log_priority_names[7];
+extern const char *xbt_log_priority_names[8];
+extern int xbt_log_no_loc;
-static double begin_of_time = -1;
+static double
simple_
begin_of_time = -1;
static void xbt_log_layout_simple_dynamic(xbt_log_layout_t l,
xbt_log_event_t ev,
static void xbt_log_layout_simple_dynamic(xbt_log_layout_t l,
xbt_log_event_t ev,
@@
-38,8
+39,8
@@
static void xbt_log_layout_simple_dynamic(xbt_log_layout_t l,
gras_os_myname(), xbt_procname(), (*xbt_getpid) ());
p +=
snprintf(p, 256 - (p - loc_buff), "%f] ",
gras_os_myname(), xbt_procname(), (*xbt_getpid) ());
p +=
snprintf(p, 256 - (p - loc_buff), "%f] ",
- gras_os_time() - begin_of_time);
- if (ev->priority != xbt_log_priority_info)
+ gras_os_time() -
simple_
begin_of_time);
+ if (ev->priority != xbt_log_priority_info
&& xbt_log_no_loc==0
)
p +=
snprintf(p, 256 - (p - loc_buff), "%s:%d: ", ev->fileName,
ev->lineNum);
p +=
snprintf(p, 256 - (p - loc_buff), "%s:%d: ", ev->fileName,
ev->lineNum);
@@
-60,6
+61,7
@@
static void xbt_log_layout_simple_dynamic(xbt_log_layout_t l,
}
/* only used after the format using: we suppose that the buffer is big enough to display our data */
}
/* only used after the format using: we suppose that the buffer is big enough to display our data */
+#undef check_overflow
#define check_overflow \
if (p-ev->buffer > XBT_LOG_BUFF_SIZE) { /* buffer overflow */ \
xbt_log_layout_simple_dynamic(l,ev,fmt,app); \
#define check_overflow \
if (p-ev->buffer > XBT_LOG_BUFF_SIZE) { /* buffer overflow */ \
xbt_log_layout_simple_dynamic(l,ev,fmt,app); \
@@
-79,8
+81,8
@@
static void xbt_log_layout_simple_doit(xbt_log_layout_t l,
"Priority %d is greater than the biggest allowed value",
ev->priority);
"Priority %d is greater than the biggest allowed value",
ev->priority);
- if (begin_of_time < 0)
- begin_of_time = gras_os_time();
+ if (
simple_
begin_of_time < 0)
+
simple_
begin_of_time = gras_os_time();
p = ev->buffer;
p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[");
p = ev->buffer;
p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[");
@@
-96,11
+98,11
@@
static void xbt_log_layout_simple_doit(xbt_log_layout_t l,
/* Display the date */
p +=
snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%f] ",
/* Display the date */
p +=
snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%f] ",
- gras_os_time() - begin_of_time);
+ gras_os_time() -
simple_
begin_of_time);
check_overflow;
/* Display file position if not INFO */
check_overflow;
/* Display file position if not INFO */
- if (ev->priority != xbt_log_priority_info)
+ if (ev->priority != xbt_log_priority_info
&& !xbt_log_no_loc
)
p +=
snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%d: ",
ev->fileName, ev->lineNum);
p +=
snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%d: ",
ev->fileName, ev->lineNum);