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
change mmalloc.h into a public header
[simgrid.git]
/
src
/
xbt
/
log.c
diff --git
a/src/xbt/log.c
b/src/xbt/log.c
index
84e40ef
..
b755110
100644
(file)
--- a/
src/xbt/log.c
+++ b/
src/xbt/log.c
@@
-1,8
+1,7
@@
-/* $Id$ */
-
/* log - a generic logging facility in the spirit of log4j */
/* log - a generic logging facility in the spirit of log4j */
-/* Copyright (c) 2003-2007 Martin Quinson. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 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. */
@@
-25,6
+24,7
@@
#include "xbt/dynar.h"
XBT_PUBLIC_DATA(int) (*xbt_pid) ();
#include "xbt/dynar.h"
XBT_PUBLIC_DATA(int) (*xbt_pid) ();
+int xbt_log_no_loc = 0; /* if set to true (with --log=no_loc), file localization will be omitted (for tesh tests) */
/** \addtogroup XBT_log
*
/** \addtogroup XBT_log
*
@@
-463,7
+463,7
@@
This is on our TODO list for quite a while now, but your help would be
welcome here, too.
welcome here, too.
- *//*' */
+
*//*' */
xbt_log_appender_t xbt_log_default_appender = NULL; /* set in log_init */
xbt_log_appender_t xbt_log_default_appender = NULL; /* set in log_init */
@@
-517,6
+517,7
@@
XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)");
XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
+XBT_LOG_NEW_CATEGORY(bindings, "All bindings categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(log, xbt,
"Loggings from the logging mechanism itself");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(log, xbt,
"Loggings from the logging mechanism itself");
@@
-1050,6
+1051,11
@@
void xbt_log_control_set(const char *control_string)
return;
DEBUG1("Parse log settings '%s'", control_string);
return;
DEBUG1("Parse log settings '%s'", control_string);
+ /* Special handling of no_loc request, which asks for any file localization to be omitted (for tesh runs) */
+ if (!strcmp(control_string,"no_loc")) {
+ xbt_log_no_loc=1;
+ return;
+ }
/* some initialization if this is the first time that this get called */
if (xbt_log_settings == NULL)
xbt_log_settings = xbt_dynar_new(sizeof(xbt_log_setting_t),
/* some initialization if this is the first time that this get called */
if (xbt_log_settings == NULL)
xbt_log_settings = xbt_dynar_new(sizeof(xbt_log_setting_t),