some cleanups to the logging channel hierarchy

diff --git a/src/instr/jedule/jedule_sd_binding.cpp b/src/instr/jedule/jedule_sd_binding.cpp
index ea2b223..dfa6701 100644 (file)
--- a/src/instr/jedule/jedule_sd_binding.cpp
+++ b/src/instr/jedule/jedule_sd_binding.cpp
@@ -10,8 +10,7 @@
 
 #if SIMGRID_HAVE_JEDULE
 
-XBT_LOG_NEW_CATEGORY(jedule, "Logging specific to Jedule");
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jed_sd, jedule, "Logging specific to Jedule SD binding");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jed_sd, sd, "Jedule SimDag binding");
 
 jedule_t my_jedule;
 

diff --git a/src/kernel/resource/Action.cpp b/src/kernel/resource/Action.cpp
index 63a7a1a..d94a3af 100644 (file)
--- a/src/kernel/resource/Action.cpp
+++ b/src/kernel/resource/Action.cpp
@@ -9,8 +9,8 @@
 #include "src/surf/surf_interface.hpp"
 #include "surf/surf.hpp"
 
-XBT_LOG_NEW_CATEGORY(kernel, "Logging specific to the internals of SimGrid");
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(resource, kernel, "Logging specific to the resources");
+XBT_LOG_NEW_CATEGORY(kernel, "SimGrid internals");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_resource, kernel, "Resources, modeling the platform performance");
 
 namespace simgrid {
 namespace kernel {

diff --git a/src/kernel/resource/DiskImpl.cpp b/src/kernel/resource/DiskImpl.cpp
index f782122..22245da 100644 (file)
--- a/src/kernel/resource/DiskImpl.cpp
+++ b/src/kernel/resource/DiskImpl.cpp
@@ -9,7 +9,7 @@
 #include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(disk, resource, "Disk resource");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_disk, ker_resource, "Disk resources, fuelling I/O activities");
 
 simgrid::kernel::resource::DiskModel* surf_disk_model = nullptr;
 

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index 7eb2af3..7d4dea9 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -9,7 +9,7 @@
 #include "src/include/surf/surf.hpp"
 #include "src/kernel/activity/ExecImpl.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_vm, ker_resource, "Virtual Machines, containing actors and mobile accross hosts");
 
 simgrid::vm::VMModel* surf_vm_model = nullptr;
 

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index 7b33f5d..ff03d14 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -8,7 +8,7 @@
 
 #include <string>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_host, ker_resource, "Host resources agregate CPU, networking and I/O features");
 
 simgrid::surf::HostModel *surf_host_model = nullptr;
 

diff --git a/src/surf/StorageImpl.cpp b/src/surf/StorageImpl.cpp
index 7b81b28..dcbc1d2 100644 (file)
--- a/src/surf/StorageImpl.cpp
+++ b/src/surf/StorageImpl.cpp
@@ -9,7 +9,7 @@
 #include "src/kernel/lmm/maxmin.hpp"
 #include "surf_private.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_storage, ker_resource, "Deprecated way of expressing I/O related resources");
 
 simgrid::kernel::resource::StorageModel* surf_storage_model = nullptr;
 

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index f5ec2a5..02d4abb 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -10,7 +10,7 @@
 #include "src/surf/surf_interface.hpp"
 #include "surf/surf.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu_cas, cpu, "CPU resource, CAS01 model (used by default)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu_cas, res_cpu, "CPU resource, CAS01 model (used by default)");
 
 /***********
  * Options *

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 0c33ed9..e60ece1 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -8,7 +8,7 @@
 #include "src/surf/surf_interface.hpp"
 #include "surf/surf.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu, resource, "CPU resource");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_cpu, ker_resource, "CPU resource, fueling execution activites");
 
 simgrid::kernel::resource::CpuModel* surf_cpu_model_pm;
 simgrid::kernel::resource::CpuModel* surf_cpu_model_vm;

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index bbb7797..1d0e394 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -14,7 +14,7 @@
 
 constexpr double EPSILON = 0.000000001;
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu_ti, cpu, "CPU resource, Trace Integration model");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu_ti, res_cpu, "CPU resource, Trace Integration model");
 
 namespace simgrid {
 namespace kernel {

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 2f4e91d..e1f1ae6 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -13,7 +13,7 @@
 #ifndef NETWORK_INTERFACE_CPP_
 #define NETWORK_INTERFACE_CPP_
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_network, ker_resource, "Network resources, that fuels communications");
 
 /*********
  * Model *

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 5fee0f2..dba91ed 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -37,7 +37,7 @@
 #include "src/surf/xml/platf_private.hpp"
 #include "surf/surf.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network ns-3 module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_ns3, res_network, "Network model based on ns-3");
 
 /*****************
  * Crude globals *