Declare the main log categories into their respective modules.

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index c93a7fc..816e0f7 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -330,6 +330,10 @@ set(AMOK_SRC
        src/amok/PeerManagement/peermanagement.c
 )
 
+set(BINDINGS_SRC
+       src/bindings/bindings_global.c
+)
+
 set(LUA_SRC
        src/bindings/lua/simgrid_lua.c
        src/bindings/lua/lua_task.c
@@ -513,6 +517,7 @@ set(simgrid_sources
        ${GRAS_COMMON_SRC}
        ${GRAS_SG_SRC}
        ${AMOK_SRC}
+       ${BINDINGS_SRC}
        ${JEDULE_SRC}
        ${RNGSTREAM_SRC}
 )

diff --git a/src/bindings/bindings_global.c b/src/bindings/bindings_global.c
new file mode 100644 (file)
index 0000000..90d0d28
--- /dev/null
+++ b/src/bindings/bindings_global.c
@@ -0,0 +1,8 @@
+/* Copyright (c) 2012 Da 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. */
+
+#include <xbt/log.h>
+
+XBT_LOG_NEW_CATEGORY(bindings, "All bindings categories");

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 6ea9268..9190600 100644 (file)
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -13,7 +13,7 @@
 #include "xbt/fifo.h"
 #include "mc_private.h"
 
-
+XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc,
                                 "Logging specific to MC (global)");
 

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index a8a9bb4..127a8db 100644 (file)
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -12,6 +12,7 @@
 #include "xbt/virtu.h"
 #include "xbt/ex.h"             /* ex_backtrace_display */
 
+XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
                                 "Logging specific to MSG (kernel)");
 

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index c18f9ec..2c3b8d7 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -12,6 +12,7 @@
 #include "xbt/ex.h"             /* ex_backtrace_display */
 #include "mc/mc.h"
 
+XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
                                 "Logging specific to SIMIX (kernel)");
 

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 2ed4e24..49eb817 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -12,6 +12,7 @@
 #include "surf/surf_resource.h"
 #include "xbt/xbt_os_thread.h"
 
+XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
                                 "Logging specific to SURF (kernel)");
 

diff --git a/src/xbt/log.c b/src/xbt/log.c
index d6fa7b3..5df5166 100644 (file)
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -514,13 +514,6 @@ s_xbt_log_category_t _XBT_LOGV(XBT_LOG_ROOT_CAT) = {
       0                         /* additivity */
 };
 
-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(mc, "All MC categories");
-XBT_LOG_NEW_CATEGORY(bindings, "All bindings categories");
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(log, xbt,
                                 "Loggings from the logging mechanism itself");
 

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index 72c629b..8fe1d22 100644 (file)
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -20,6 +20,7 @@
 
 #include "xbt_modinter.h"       /* prototype of other module's init/exit in XBT */
 
+XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
 
 char *xbt_binary_name = NULL;   /* Mandatory to retrieve neat backtraces */