rename log category from simix_context to ker_context

diff --git a/examples/c/actor-stacksize/actor-stacksize.tesh b/examples/c/actor-stacksize/actor-stacksize.tesh
index 7cedbaa..10962af 100644 (file)
--- a/examples/c/actor-stacksize/actor-stacksize.tesh
+++ b/examples/c/actor-stacksize/actor-stacksize.tesh
@@ -3,15 +3,15 @@
 ! ignore .*Activating SYSV context factory
 ! ignore .*Using raw contexts. Because the glibc is just not good enough for us.
 
-$ ${bindir:=.}/c-actor-stacksize --log=simix_context.thresh:verbose --log=no_loc ${platfdir}/small_platform.xml
-> [::(0) 0.000000] [simix_context/VERBOSE] Creating a context of stack 8Mb
-> [0.000000] [simix_context/VERBOSE] Creating a context of stack 8Mb
-> [0.000000] [simix_context/VERBOSE] Creating a context of stack 16Mb
-> [0.000000] [simix_context/VERBOSE] Creating a context of stack 16Mb
-> [0.000000] [simix_context/VERBOSE] Creating a context of stack 32Mb
-> [0.000000] [simix_context/VERBOSE] Creating a context of stack 32Mb
-> [0.000000] [simix_context/VERBOSE] Creating a context of stack 64Mb
-> [0.000000] [simix_context/VERBOSE] Creating a context of stack 32Mb
+$ ${bindir:=.}/c-actor-stacksize --log=ker_context.thresh:verbose --log=no_loc ${platfdir}/small_platform.xml
+> [::(0) 0.000000] [ker_context/VERBOSE] Creating a context of stack 8Mb
+> [0.000000] [ker_context/VERBOSE] Creating a context of stack 8Mb
+> [0.000000] [ker_context/VERBOSE] Creating a context of stack 16Mb
+> [0.000000] [ker_context/VERBOSE] Creating a context of stack 16Mb
+> [0.000000] [ker_context/VERBOSE] Creating a context of stack 32Mb
+> [0.000000] [ker_context/VERBOSE] Creating a context of stack 32Mb
+> [0.000000] [ker_context/VERBOSE] Creating a context of stack 64Mb
+> [0.000000] [ker_context/VERBOSE] Creating a context of stack 32Mb
 > [Tremblay:actor:(1) 0.000000] [actor_stacksize/INFO] Hello
 > [Tremblay:actor:(2) 0.000000] [actor_stacksize/INFO] Hello
 > [Tremblay:actor:(3) 0.000000] [actor_stacksize/INFO] Hello

diff --git a/examples/cpp/actor-stacksize/s4u-actor-stacksize.tesh b/examples/cpp/actor-stacksize/s4u-actor-stacksize.tesh
index ed14232..af1ab69 100644 (file)
--- a/examples/cpp/actor-stacksize/s4u-actor-stacksize.tesh
+++ b/examples/cpp/actor-stacksize/s4u-actor-stacksize.tesh
@@ -3,15 +3,15 @@
 ! ignore .*Activating SYSV context factory
 ! ignore .*Using raw contexts. Because the glibc is just not good enough for us.
 
-$ ${bindir:=.}/s4u-actor-stacksize --log=simix_context.thresh:verbose --log=no_loc ${platfdir}/small_platform.xml
-> [::(0) 0.000000] [simix_context/VERBOSE] Creating a context of stack 8Mb
-> [0.000000] [simix_context/VERBOSE] Creating a context of stack 8Mb
-> [0.000000] [simix_context/VERBOSE] Creating a context of stack 16Mb
-> [0.000000] [simix_context/VERBOSE] Creating a context of stack 16Mb
-> [0.000000] [simix_context/VERBOSE] Creating a context of stack 32Mb
-> [0.000000] [simix_context/VERBOSE] Creating a context of stack 32Mb
-> [0.000000] [simix_context/VERBOSE] Creating a context of stack 64Mb
-> [0.000000] [simix_context/VERBOSE] Creating a context of stack 32Mb
+$ ${bindir:=.}/s4u-actor-stacksize --log=ker_context.thresh:verbose --log=no_loc ${platfdir}/small_platform.xml
+> [::(0) 0.000000] [ker_context/VERBOSE] Creating a context of stack 8Mb
+> [0.000000] [ker_context/VERBOSE] Creating a context of stack 8Mb
+> [0.000000] [ker_context/VERBOSE] Creating a context of stack 16Mb
+> [0.000000] [ker_context/VERBOSE] Creating a context of stack 16Mb
+> [0.000000] [ker_context/VERBOSE] Creating a context of stack 32Mb
+> [0.000000] [ker_context/VERBOSE] Creating a context of stack 32Mb
+> [0.000000] [ker_context/VERBOSE] Creating a context of stack 64Mb
+> [0.000000] [ker_context/VERBOSE] Creating a context of stack 32Mb
 > [Tremblay:actor:(1) 0.000000] [s4u_test/INFO] Hello
 > [Tremblay:actor:(2) 0.000000] [s4u_test/INFO] Hello
 > [Tremblay:actor:(3) 0.000000] [s4u_test/INFO] Hello

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index afacbd3..e296e64 100644 (file)
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -12,7 +12,7 @@
 
 #include <vector>
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_context, kernel, "Context switching mechanism");
 
 namespace simgrid {
 namespace kernel {

diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp
index fb94d61..bbfbfd8 100644 (file)
--- a/src/kernel/context/ContextBoost.cpp
+++ b/src/kernel/context/ContextBoost.cpp
@@ -7,7 +7,7 @@
 #include "simgrid/Exception.hpp"
 #include "src/internal_config.h"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_context);
 
 namespace simgrid {
 namespace kernel {

diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp
index 6360dc8..cc829e2 100644 (file)
--- a/src/kernel/context/ContextRaw.cpp
+++ b/src/kernel/context/ContextRaw.cpp
@@ -7,7 +7,7 @@
 #include "mc/mc.h"
 #include "simgrid/Exception.hpp"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_context);
 
 // Raw context routines
 

diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp
index 6938fd6..a88a5bc 100644 (file)
--- a/src/kernel/context/ContextSwapped.cpp
+++ b/src/kernel/context/ContextSwapped.cpp
@@ -38,7 +38,7 @@
 #include <sanitizer/tsan_interface.h>
 #endif
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_context);
 
 // The name of this function is currently hardcoded in MC (as string).
 // Do not change it without fixing those references as well.

diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp
index 2b8c1d1..53c0ba8 100644 (file)
--- a/src/kernel/context/ContextThread.cpp
+++ b/src/kernel/context/ContextThread.cpp
@@ -16,7 +16,7 @@
 #include <typeinfo>
 #include <utility>
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_context);
 
 namespace simgrid {
 namespace kernel {

diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp
index 0d29b5a..6cd15b0 100644 (file)
--- a/src/kernel/context/ContextUnix.cpp
+++ b/src/kernel/context/ContextUnix.cpp
@@ -12,7 +12,7 @@
 
 #include "ContextUnix.hpp"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_context);
 
 /** Up to two integers may be needed to store a pointer on the system we target */
 constexpr int CTX_ADDR_LEN = 2;

diff --git a/src/simgrid/Exception.cpp b/src/simgrid/Exception.cpp
index d250e73..61672a7 100644 (file)
--- a/src/simgrid/Exception.cpp
+++ b/src/simgrid/Exception.cpp
@@ -5,7 +5,7 @@
 
 #include <simgrid/Exception.hpp>
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_actor);
 
 namespace simgrid {
 

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index d3ff3c6..725ce4a 100644 (file)
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -7,8 +7,6 @@
 
 #include "src/kernel/context/Context.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix, "Context switching mechanism");
-
 int SIMIX_context_is_parallel() // XBT_ATTRIB_DEPRECATED_v333
 {
   return simgrid::kernel::context::is_parallel();

diff --git a/teshsuite/kernel/context-defaults/context-defaults.cpp b/teshsuite/kernel/context-defaults/context-defaults.cpp
index ee9d6b1..b7a566c 100644 (file)
--- a/teshsuite/kernel/context-defaults/context-defaults.cpp
+++ b/teshsuite/kernel/context-defaults/context-defaults.cpp
@@ -12,7 +12,7 @@
 int main(int argc, char* argv[])
 {
   xbt_log_control_set("root.fmt:[%c/%p]%e%m%n");
-  xbt_log_control_set("simix_context.threshold:verbose");
+  xbt_log_control_set("ker_context.threshold:verbose");
   XBT_ATTRIB_UNUSED simgrid::s4u::Engine e(&argc, argv);
   return 0;
 }

diff --git a/teshsuite/kernel/context-defaults/factory_boost.tesh b/teshsuite/kernel/context-defaults/factory_boost.tesh
index 8c008c5..1da289f 100644 (file)
--- a/teshsuite/kernel/context-defaults/factory_boost.tesh
+++ b/teshsuite/kernel/context-defaults/factory_boost.tesh
@@ -1,3 +1,3 @@
 $ ${bindir:=.}/context-defaults
-> [simix_context/VERBOSE] Using Boost contexts. Welcome to the 21th century.
-> [simix_context/VERBOSE] Creating a context of stack 8Mb
+> [ker_context/VERBOSE] Using Boost contexts. Welcome to the 21th century.
+> [ker_context/VERBOSE] Creating a context of stack 8Mb

diff --git a/teshsuite/kernel/context-defaults/factory_raw.tesh b/teshsuite/kernel/context-defaults/factory_raw.tesh
index c3facd6..eb9eadf 100644 (file)
--- a/teshsuite/kernel/context-defaults/factory_raw.tesh
+++ b/teshsuite/kernel/context-defaults/factory_raw.tesh
@@ -1,3 +1,3 @@
 $ ${bindir:=.}/context-defaults
-> [simix_context/VERBOSE] Using raw contexts. Because the glibc is just not good enough for us.
-> [simix_context/VERBOSE] Creating a context of stack 8Mb
\ No newline at end of file
+> [ker_context/VERBOSE] Using raw contexts. Because the glibc is just not good enough for us.
+> [ker_context/VERBOSE] Creating a context of stack 8Mb

diff --git a/teshsuite/kernel/context-defaults/factory_thread.tesh b/teshsuite/kernel/context-defaults/factory_thread.tesh
index 8b1d2bc..652eeb9 100644 (file)
--- a/teshsuite/kernel/context-defaults/factory_thread.tesh
+++ b/teshsuite/kernel/context-defaults/factory_thread.tesh
@@ -1,2 +1,2 @@
 $ ${bindir:=.}/context-defaults
-> [simix_context/VERBOSE] Activating thread context factory
+> [ker_context/VERBOSE] Activating thread context factory

diff --git a/teshsuite/kernel/context-defaults/factory_ucontext.tesh b/teshsuite/kernel/context-defaults/factory_ucontext.tesh
index 6efb0de..69b51b7 100644 (file)
--- a/teshsuite/kernel/context-defaults/factory_ucontext.tesh
+++ b/teshsuite/kernel/context-defaults/factory_ucontext.tesh
@@ -1,4 +1,3 @@
 $ ${bindir:=.}/context-defaults
-> [simix_context/VERBOSE] Activating SYSV context factory
-> [simix_context/VERBOSE] Creating a context of stack 8Mb
-
+> [ker_context/VERBOSE] Activating SYSV context factory
+> [ker_context/VERBOSE] Creating a context of stack 8Mb

diff --git a/teshsuite/smpi/privatization/privatization.tesh b/teshsuite/smpi/privatization/privatization.tesh
index 2f1ca5d..81af7c5 100644 (file)
--- a/teshsuite/smpi/privatization/privatization.tesh
+++ b/teshsuite/smpi/privatization/privatization.tesh
@@ -1,4 +1,4 @@
 p Test privatization
 ! timeout 5
-$ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ${platfdir:=.}/small_platform.xml -np 32 ${bindir:=.}/privatization -s -long --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/privatization:${privatization:=1} --log=simix_context.thres:error --log=xbt_memory_map.thres:critical
+$ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ${platfdir:=.}/small_platform.xml -np 32 ${bindir:=.}/privatization -s -long --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/privatization:${privatization:=1} --log=ker_context.thres:error --log=xbt_memory_map.thres:critical
 > [0.000000] [smpi/INFO] You requested to use 32 ranks, but there is only 5 processes in your hostfile...