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
Revert "Make gras compil with Visual C++." This commit is too large/unreadable. It...
[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
06d796f
..
277ea18
100644
(file)
--- a/
src/xbt/xbt_log_layout_simple.c
+++ b/
src/xbt/xbt_log_layout_simple.c
@@
-1,8
+1,7
@@
-/* $Id: xbt_log_layout_simple.c 6309 2009-05-26 15:29:22Z mquinson $ */
-
/* layout_simple - a dumb log layout */
/* layout_simple - a dumb log layout */
-/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved. */
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-16,10
+15,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;
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,
@@
-39,7
+38,7
@@
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);
+ 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,
if (ev->priority != xbt_log_priority_info && xbt_log_no_loc==0)
p +=
snprintf(p, 256 - (p - loc_buff), "%s:%d: ", ev->fileName,
@@
-61,6
+60,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); \
@@
-80,24
+80,22
@@
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();
-
p = ev->buffer;
p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[");
check_overflow;
/* Display the proc info if available */
p = ev->buffer;
p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[");
check_overflow;
/* Display the proc info if available */
- if (strlen(xbt_procname())) {
+ const char *procname=xbt_procname();
+ if (strlen(procname)) {
p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%s:(%d) ",
p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%s:(%d) ",
- gras_os_myname(),
xbt_procname()
, (*xbt_getpid) ());
+ gras_os_myname(),
procname
, (*xbt_getpid) ());
check_overflow;
}
/* Display the date */
p +=
snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%f] ",
check_overflow;
}
/* 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 */
@@
-124,5
+122,9
@@
xbt_log_layout_t xbt_log_layout_simple_new(char *arg)
{
xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1);
res->do_layout = xbt_log_layout_simple_doit;
{
xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1);
res->do_layout = xbt_log_layout_simple_doit;
+
+ if (simple_begin_of_time < 0)
+ simple_begin_of_time = gras_os_time();
+
return res;
}
return res;
}