From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 14 Dec 2010 08:46:39 +0000 (+0000)
Subject: sanitize the use of logs in unit testing of parmap to fix supernovae
X-Git-Tag: v3.6_beta2~694
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c1fa53426d4f4db5c1fe697d915d30247fd5d09a

sanitize the use of logs in unit testing of parmap to fix supernovae

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9229 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/xbt/parmap.c b/src/xbt/parmap.c
index a11f84e91f..0034d95f13 100644
--- a/src/xbt/parmap.c
+++ b/src/xbt/parmap.c
@@ -6,8 +6,8 @@
 
 #include "parmap_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_parmap, xbt,
-                                "parmap: parallel map");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_parmap, xbt, "parmap: parallel map");
+XBT_LOG_NEW_SUBCATEGORY(xbt_parmap_unit, xbt_parmap, "parmap unit testing");
 
 static void *_xbt_parmap_worker_main(void *parmap);
 
@@ -176,9 +176,8 @@ static void *_xbt_parmap_worker_main(void *arg)
 #include "xbt/ex.h"
 
 XBT_TEST_SUITE("parmap", "Parallel Map");
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_parmap_unit);
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_parmap_unit, xbt,
-                                "unit parmap");
 
 
 xbt_parmap_t parmap;
diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index c1aec523d9..a3530c3b66 100644
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -46,6 +46,8 @@ XBT_LOG_EXTERNAL_CATEGORY(xbt_matrix);
 XBT_LOG_EXTERNAL_CATEGORY(xbt_queue);
 XBT_LOG_EXTERNAL_CATEGORY(xbt_set);
 XBT_LOG_EXTERNAL_CATEGORY(xbt_sync_os);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_parmap);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_parmap_unit);
 
 
 /* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library.
@@ -117,6 +119,8 @@ static void xbt_preinit(void)
   XBT_LOG_CONNECT(xbt_queue, xbt);
   XBT_LOG_CONNECT(xbt_set, xbt);
   XBT_LOG_CONNECT(xbt_sync_os, xbt);
+  XBT_LOG_CONNECT(xbt_parmap,xbt);
+  XBT_LOG_CONNECT(xbt_parmap_unit,xbt_parmap);
 
   xbt_fifo_preinit();
   xbt_dict_preinit();