Slightly reorganize log categories; remove unused ones.

diff --git a/examples/deprecated/msg/dht-kademlia/task.c b/examples/deprecated/msg/dht-kademlia/task.c
index 126a15d..bcfc228 100644 (file)
--- a/examples/deprecated/msg/dht-kademlia/task.c
+++ b/examples/deprecated/msg/dht-kademlia/task.c
@@ -6,7 +6,6 @@
 
 #include "task.h"
 #include "answer.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_kademlia_task, "Messages specific for this msg example");
 
 /** @brief Creates a new "find node" task
   * @param sender_id the id of the node who sends the task

diff --git a/examples/smpi/ampi_test/ampi_test.cpp b/examples/smpi/ampi_test/ampi_test.cpp
index 9c7650a..05b2efa 100644 (file)
--- a/examples/smpi/ampi_test/ampi_test.cpp
+++ b/examples/smpi/ampi_test/ampi_test.cpp
@@ -7,8 +7,6 @@
 #include "smpi/smpi.h"
 #include "smpi/sampi.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_plugin_load_balancer_example, smpi, "Simple tracing test for SAMPI functions");
-
 int main(int argc, char* argv[])
 {
   MPI_Init(&argc, &argv);

diff --git a/src/bindings/java/jtrace.cpp b/src/bindings/java/jtrace.cpp
index 35d9c7b..d30e299 100644 (file)
--- a/src/bindings/java/jtrace.cpp
+++ b/src/bindings/java/jtrace.cpp
@@ -17,9 +17,6 @@
 #endif
 /* end of eclipse-mandated pimple */
 
-// Define a new category
-XBT_LOG_NEW_DEFAULT_CATEGORY (jtrace, "TRACE for Java(TM)");
-
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostStateDeclare(JNIEnv * env, jclass cls, jstring js)
 {
   const char *s = env->GetStringUTFChars(js, 0);

diff --git a/src/bindings/lua/lua_host.cpp b/src/bindings/lua/lua_host.cpp
index c9e1523..a633422 100644 (file)
--- a/src/bindings/lua/lua_host.cpp
+++ b/src/bindings/lua/lua_host.cpp
@@ -9,8 +9,6 @@
 #include "simgrid/s4u/Host.hpp"
 #include <lauxlib.h>
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(lua_host, "Lua Host module");
-
 constexpr char HOST_MODULE_NAME[] = "simgrid.host";
 constexpr char HOST_FIELDNAME[]   = "__simgrid_host";
 

diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp
index 404887f..2316b7b 100644 (file)
--- a/src/bindings/lua/lua_platf.cpp
+++ b/src/bindings/lua/lua_platf.cpp
@@ -24,7 +24,7 @@
 
 #include <lauxlib.h>
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(lua_platf, "Lua bindings (platform module)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_platf, lua, "Lua bindings (platform module)");
 
 constexpr char PLATF_MODULE_NAME[] = "simgrid.engine";
 constexpr char AS_FIELDNAME[]      = "__simgrid_as";

diff --git a/src/kernel/activity/ConditionVariableImpl.cpp b/src/kernel/activity/ConditionVariableImpl.cpp
index 5efb83c..027ef16 100644 (file)
--- a/src/kernel/activity/ConditionVariableImpl.cpp
+++ b/src/kernel/activity/ConditionVariableImpl.cpp
@@ -8,7 +8,7 @@
 #include "src/kernel/activity/MutexImpl.hpp"
 #include "src/kernel/activity/SynchroRaw.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ConditionVariable, simix_synchro, "Condition variables");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_condition, simix_synchro, "Condition variables");
 
 /********************************* Condition **********************************/
 

diff --git a/src/mc/checker/simgrid_mc.cpp b/src/mc/checker/simgrid_mc.cpp
index 010cbfe..6e91f11 100644 (file)
--- a/src/mc/checker/simgrid_mc.cpp
+++ b/src/mc/checker/simgrid_mc.cpp
@@ -14,8 +14,6 @@
 #include <memory>
 #include <unistd.h>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
-
 static inline
 char** argvdup(int argc, char** argv)
 {

diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp
index d2c13d6..ac87f79 100644 (file)
--- a/src/mc/mc_client_api.cpp
+++ b/src/mc/mc_client_api.cpp
@@ -18,9 +18,6 @@
  *  communicate with the MC (declared in modelchecker.h).
  */
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client_api, mc,
-  "Public API for the model-checked application");
-
 // MC_random() is in mc_base.cpp
 
 void MC_assert(int prop)

diff --git a/src/mc/mc_comm_pattern.cpp b/src/mc/mc_comm_pattern.cpp
index 8e4b405..7700754 100644 (file)
--- a/src/mc/mc_comm_pattern.cpp
+++ b/src/mc/mc_comm_pattern.cpp
@@ -10,9 +10,6 @@
 
 using simgrid::mc::remote;
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_comm_pattern, mc,
-                                "Logging specific to MC communication patterns");
-
 static void MC_patterns_copy(std::vector<simgrid::mc::PatternCommunication*>& dest,
                              std::vector<simgrid::mc::PatternCommunication> const& source)
 {

diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp
index 2ba61a4..e6b4fb4 100644 (file)
--- a/src/mc/mc_config.cpp
+++ b/src/mc/mc_config.cpp
@@ -11,8 +11,6 @@
 
 #include <climits>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_config, mc, "Configuration of the Model Checker");
-
 #if SIMGRID_HAVE_MC
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/mc_memory.cpp b/src/mc/mc_memory.cpp
index 15015f0..ff6bbb2 100644 (file)
--- a/src/mc/mc_memory.cpp
+++ b/src/mc/mc_memory.cpp
@@ -7,15 +7,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "xbt/log.h"
-
 #include "mc/mc.h"
 #include "src/mc/mc_private.hpp"
 #include "src/xbt/mmalloc/mmprivate.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
-                                "Logging specific to MC (memory)");
-
 /* Initialize the model-checker memory subsystem */
 /* It creates the two heap regions: std_heap and mc_heap */
 void MC_memory_init()

diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp
index 535dae9..b811c1d 100644 (file)
--- a/src/mc/mc_state.cpp
+++ b/src/mc/mc_state.cpp
@@ -13,8 +13,6 @@
 
 using simgrid::mc::remote;
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc, "Logging specific to MC (state)");
-
 namespace simgrid {
 namespace mc {
 

diff --git a/src/mc/sosp/PageStore.cpp b/src/mc/sosp/PageStore.cpp
index e99c188..e11d653 100644 (file)
--- a/src/mc/sosp/PageStore.cpp
+++ b/src/mc/sosp/PageStore.cpp
@@ -21,8 +21,6 @@
 #include <cstring> // memcpy, memcmp
 #include <unistd.h>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_page_snapshot, mc, "Logging specific to mc_page_snapshot");
-
 namespace simgrid {
 namespace mc {
 

diff --git a/src/mc/sosp/Region.cpp b/src/mc/sosp/Region.cpp
index 8c27e7c..3208437 100644 (file)
--- a/src/mc/sosp/Region.cpp
+++ b/src/mc/sosp/Region.cpp
@@ -16,8 +16,6 @@
 #define MAP_POPULATE MAP_PREFAULT_READ
 #endif
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_RegionSnaphot, mc, "Logging specific to region snapshots");
-
 namespace simgrid {
 namespace mc {
 

diff --git a/src/msg/msg_comm.cpp b/src/msg/msg_comm.cpp
index c386327..463619d 100644 (file)
--- a/src/msg/msg_comm.cpp
+++ b/src/msg/msg_comm.cpp
@@ -13,8 +13,6 @@
 #include "src/instr/instr_private.hpp"
 #include "src/msg/msg_private.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_comm, msg, "Logging specific to MSG (comm)");
-
 namespace simgrid {
 namespace msg {
 

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index d8e0f77..9608ac7 100644 (file)
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -12,7 +12,6 @@
 #include <xbt/config.hpp>
 
 XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)");
 
 bool MSG_Global_t::debug_multiple_use = false;
 

diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp
index e790079..0997ce7 100644 (file)
--- a/src/msg/msg_process.cpp
+++ b/src/msg/msg_process.cpp
@@ -9,8 +9,6 @@
 #include "src/instr/instr_private.hpp"
 #include "src/simix/smx_private.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)");
-
 std::string instr_pid(simgrid::s4u::Actor const& proc)
 {
   return std::string(proc.get_name()) + "-" + std::to_string(proc.get_pid());

diff --git a/src/plugins/file_system/s4u_FileSystem.cpp b/src/plugins/file_system/s4u_FileSystem.cpp
index 669bf1d..5ab8307 100644 (file)
--- a/src/plugins/file_system/s4u_FileSystem.cpp
+++ b/src/plugins/file_system/s4u_FileSystem.cpp
@@ -17,7 +17,7 @@
 #include <fstream>
 #include <numeric>
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_file, "S4U files");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_file, s4u, "S4U files");
 int sg_storage_max_file_descriptors = 1024;
 
 namespace simgrid {

diff --git a/src/plugins/vm/VmLiveMigration.cpp b/src/plugins/vm/VmLiveMigration.cpp
index 90b5553..a828f8a 100644 (file)
--- a/src/plugins/vm/VmLiveMigration.cpp
+++ b/src/plugins/vm/VmLiveMigration.cpp
@@ -9,7 +9,7 @@
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/plugins/vm/VmHostExt.hpp"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(vm_live_migration, "S4U virtual machines live migration");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(vm_live_migration, s4u, "S4U virtual machines live migration");
 
 namespace simgrid {
 namespace vm {

diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp
index e812231..803eaed 100644 (file)
--- a/src/plugins/vm/s4u_VirtualMachine.cpp
+++ b/src/plugins/vm/s4u_VirtualMachine.cpp
@@ -11,8 +11,7 @@
 #include "src/plugins/vm/VmHostExt.hpp"
 #include "src/surf/cpu_cas01.hpp"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_vm, "S4U virtual machines");
-
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_vm, s4u, "S4U virtual machines");
 
 namespace simgrid {
 namespace s4u {

diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp
index 8099c33..10e2530 100644 (file)
--- a/src/s4u/s4u_Actor.cpp
+++ b/src/s4u/s4u_Actor.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <sstream>
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_actor, s4u, "S4U actors");
 
 namespace simgrid {
 namespace s4u {

diff --git a/src/s4u/s4u_Barrier.cpp b/src/s4u/s4u_Barrier.cpp
index be8bb6e..7289a6c 100644 (file)
--- a/src/s4u/s4u_Barrier.cpp
+++ b/src/s4u/s4u_Barrier.cpp
@@ -12,7 +12,7 @@
 #include "simgrid/simix.h"
 #include "xbt/log.hpp"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_barrier, "S4U barrier");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_barrier, s4u, "S4U barrier");
 
 namespace simgrid {
 namespace s4u {

diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp
index 30ebf50..cca68b0 100644 (file)
--- a/src/s4u/s4u_Io.cpp
+++ b/src/s4u/s4u_Io.cpp
@@ -9,8 +9,6 @@
 #include "src/kernel/activity/IoImpl.hpp"
 #include "xbt/log.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous IOs");
-
 namespace simgrid {
 namespace s4u {
 

diff --git a/src/s4u/s4u_Link.cpp b/src/s4u/s4u_Link.cpp
index bb48a1b..742f062 100644 (file)
--- a/src/s4u/s4u_Link.cpp
+++ b/src/s4u/s4u_Link.cpp
@@ -13,8 +13,6 @@
 #include "src/surf/network_interface.hpp"
 #include "xbt/log.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_link, s4u, "Logging specific to the S4U links");
-
 namespace simgrid {
 namespace s4u {
 

diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp
index f5ee74e..807bf42 100644 (file)
--- a/src/s4u/s4u_Netzone.cpp
+++ b/src/s4u/s4u_Netzone.cpp
@@ -9,8 +9,6 @@
 #include "simgrid/s4u/NetZone.hpp"
 #include "simgrid/zone.h"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_netzone, "S4U Networking Zones");
-
 namespace simgrid {
 namespace s4u {
 

diff --git a/src/smpi/mpi/smpi_group.cpp b/src/smpi/mpi/smpi_group.cpp
index fb70b84..00d32b2 100644 (file)
--- a/src/smpi/mpi/smpi_group.cpp
+++ b/src/smpi/mpi/smpi_group.cpp
@@ -7,9 +7,6 @@
 #include "smpi_group.hpp"
 #include "smpi_comm.hpp"
 #include <string>
-#include <xbt/log.h>
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_group, smpi, "Logging specific to SMPI (group)");
 
 simgrid::smpi::Group mpi_MPI_GROUP_EMPTY;
 MPI_Group MPI_GROUP_EMPTY=&mpi_MPI_GROUP_EMPTY;

diff --git a/src/smpi/plugins/ampi/ampi.cpp b/src/smpi/plugins/ampi/ampi.cpp
index 852bf1c..9888163 100644 (file)
--- a/src/smpi/plugins/ampi/ampi.cpp
+++ b/src/smpi/plugins/ampi/ampi.cpp
@@ -15,8 +15,6 @@
 #include "ampi.hpp"
 #include <smpi/sampi.h>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(plugin_pampi, smpi, "Logging specific to the AMPI functions");
-
 static std::vector<size_t> memory_size(500, 0); // FIXME cheinrich This needs to be dynamic
 static std::map</*address*/ void*, size_t> alloc_table; // Keep track of all allocations
 

diff --git a/src/smpi/plugins/ampi/instr_ampi.cpp b/src/smpi/plugins/ampi/instr_ampi.cpp
index bc1320d..7bd5141 100644 (file)
--- a/src/smpi/plugins/ampi/instr_ampi.cpp
+++ b/src/smpi/plugins/ampi/instr_ampi.cpp
@@ -9,8 +9,6 @@
 #include <src/instr/instr_smpi.hpp>
 #include <src/smpi/include/smpi_actor.hpp>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_sampi, instr, "Tracing (S)AMPI");
-
 static std::map<std::string, std::string> ampi_colors = {{"migrate", "0.2 0.5 0.2"},
   {"iteration", "0.5 0.5 0.5"}
 };

diff --git a/src/xbt/automaton/automaton.c b/src/xbt/automaton/automaton.c
index fd3e111..2a65be1 100644 (file)
--- a/src/xbt/automaton/automaton.c
+++ b/src/xbt/automaton/automaton.c
@@ -7,11 +7,8 @@
 
 #include "xbt/automaton.h"
 #include <stdio.h> /* printf */
-#include <xbt/log.h>
 #include <xbt/sysdep.h>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_automaton, xbt, "Automaton");
-
 struct xbt_automaton_propositional_symbol{
   char* pred;
   /** Callback used to evaluate the value of the symbol */

diff --git a/src/xbt/automaton/automatonparse_promela.c b/src/xbt/automaton/automatonparse_promela.c
index bf93af4..bb18110 100644 (file)
--- a/src/xbt/automaton/automatonparse_promela.c
+++ b/src/xbt/automaton/automatonparse_promela.c
@@ -12,13 +12,10 @@
 #if HAVE_UNISTD_H
 # include <unistd.h>   /* isatty */
 #endif
-#include <xbt/log.h>
 #include <xbt/sysdep.h>
 
 #include "parserPromela.tab.cacc"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_automaton);
-
 static xbt_automaton_t parsed_automaton;
 char* state_id_src;
 

diff --git a/src/xbt/backtrace.cpp b/src/xbt/backtrace.cpp
index 74126b1..17f5e9c 100644 (file)
--- a/src/xbt/backtrace.cpp
+++ b/src/xbt/backtrace.cpp
@@ -6,7 +6,6 @@
 #include "src/internal_config.h"
 
 #include <xbt/backtrace.hpp>
-#include <xbt/log.h>
 #include <xbt/string.hpp>
 #include <xbt/sysdep.h>
 #include <xbt/virtu.h>
@@ -34,8 +33,6 @@
 #include <boost/stacktrace.hpp>
 #endif
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_backtrace, xbt, "Backtrace");
-
 /** @brief show the backtrace of the current point (lovely while debugging) */
 void xbt_backtrace_display_current()
 {

diff --git a/src/xbt/dict_elm.c b/src/xbt/dict_elm.c
index be4d8a0..9c5bc3b 100644 (file)
--- a/src/xbt/dict_elm.c
+++ b/src/xbt/dict_elm.c
@@ -7,8 +7,6 @@
 
 #include "dict_private.h"       /* prototypes of this module */
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_elm, xbt_dict, "Dictionaries internals");
-
 xbt_mallocator_t dict_elm_mallocator = NULL;
 
 xbt_dictelm_t xbt_dictelm_new(const char* key, int key_len, unsigned int hash_code, void* content)

diff --git a/src/xbt/xbt_os_synchro.cpp b/src/xbt/xbt_os_synchro.cpp
index 1992ab4..14bde58 100644 (file)
--- a/src/xbt/xbt_os_synchro.cpp
+++ b/src/xbt/xbt_os_synchro.cpp
@@ -12,8 +12,6 @@
 #include "src/kernel/activity/MutexImpl.hpp"
 #include "xbt/synchro.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync, xbt, "Synchronization mechanism");
-
 /****** mutex related functions ******/
 xbt_mutex_t xbt_mutex_init(void)
 {

diff --git a/teshsuite/smpi/bug-17132/bug-17132.c b/teshsuite/smpi/bug-17132/bug-17132.c
index 090c3ff..673f567 100644 (file)
--- a/teshsuite/smpi/bug-17132/bug-17132.c
+++ b/teshsuite/smpi/bug-17132/bug-17132.c
@@ -6,12 +6,9 @@
 
 /* Bug report: https://gforge.inria.fr/tracker/index.php?func=detail&aid=17132&group_id=12&atid=165 */
 
-#include "xbt/log.h"
 #include <stdio.h>
 #include <mpi.h>
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(MM_mpi, "Messages for this SMPI test");
-
 int main(int argc, char ** argv)
 {
   size_t M = 8*1024;

diff --git a/tools/graphicator/graphicator.c b/tools/graphicator/graphicator.c
index 0cb86c8..7494197 100644 (file)
--- a/tools/graphicator/graphicator.c
+++ b/tools/graphicator/graphicator.c
@@ -7,8 +7,6 @@
 #include "simgrid/msg.h"
 #include "xbt/graph.h"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(graphicator, "Graphicator Logging System");
-
 int main(int argc, char **argv)
 {
   MSG_init(&argc, argv);