Sanitize channels naming.

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

diff --git a/src/msg/global.c b/src/msg/global.c
index 35c31c1..4e587cc 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -448,7 +448,7 @@ MSG_error_t MSG_main(void)
       } 
     }
     if(XBT_LOG_ISENABLED(msg, xbt_log_priority_debug) ||
-       XBT_LOG_ISENABLED(global, xbt_log_priority_debug)) {
+       XBT_LOG_ISENABLED(msg_kernel, xbt_log_priority_debug)) {
       DEBUG0("Aborting!");
       xbt_abort();
     }

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 79ca465..491847e 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -7,7 +7,7 @@
 
 #include "cpu_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu, surf,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf,
                                "Logging specific to the SURF CPU module");
 
 surf_cpu_resource_t surf_cpu_resource = NULL;

diff --git a/src/surf/network.c b/src/surf/network.c
index 23f6467..f8690a8 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -8,7 +8,7 @@
 #include "network_private.h"
 #include "xbt/log.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network, surf,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
                                "Logging specific to the SURF network module");
 
 surf_network_resource_t surf_network_resource = NULL;

diff --git a/src/surf/network_dassf.c b/src/surf/network_dassf.c
index 0667f50..c0a6c07 100644 (file)
--- a/src/surf/network_dassf.c
+++ b/src/surf/network_dassf.c
@@ -7,8 +7,7 @@
 
 #include "network_dassf_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network_dassf, surf,
-                               "Logging specific to the SURF network module");
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 
 /* surf_network_resource_t surf_network_resource = NULL; */
 static xbt_dict_t network_link_set = NULL;

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index f6a709e..056ef5c 100644 (file)
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -9,7 +9,7 @@
 #include "xbt/dict.h"
 #include "workstation_KCCFLN05_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(workstation_KCCFLN05, surf,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
                                "Logging specific to the SURF workstation module (KCCFLN05)");
 
 static int nb_workstation = 0;