rename log category from simix_process to ker_actor

diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp
index b9b3b05..467dbaf 100644 (file)
--- a/src/kernel/activity/ActivityImpl.cpp
+++ b/src/kernel/activity/ActivityImpl.cpp
@@ -14,7 +14,7 @@
 #include <boost/range/algorithm.hpp>
 #include <cmath> // isfinite()
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_actor);
 
 namespace simgrid {
 namespace kernel {

diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index a8f98c8..08c6717 100644 (file)
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -15,7 +15,7 @@
 #include "src/mc/mc_replay.hpp"
 #include "src/surf/HostImpl.hpp"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_actor);
 
 namespace simgrid {
 namespace kernel {

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index 2434802..d0b3e08 100644 (file)
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -10,7 +10,8 @@
 #include "src/kernel/resource/CpuImpl.hpp"
 #include "src/simix/popping_private.hpp"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_actor);
+
 namespace simgrid {
 namespace kernel {
 namespace activity {

diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp
index c66cb74..f293ca0 100644 (file)
--- a/src/kernel/actor/ActorImpl.cpp
+++ b/src/kernel/actor/ActorImpl.cpp
@@ -17,7 +17,7 @@
 #include <typeinfo>
 #include <utility>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_actor, kernel, "Logging specific to Actor's kernel side");
 
 /**
  * @brief Returns the current agent.
@@ -426,7 +426,7 @@ void ActorImpl::simcall_answer()
     xbt_assert(simcall_.call_ != simix::Simcall::NONE);
     simcall_.call_ = simix::Simcall::NONE;
     const auto& actors_to_run = engine->get_actors_to_run();
-    xbt_assert(not XBT_LOG_ISENABLED(simix_process, xbt_log_priority_debug) ||
+    xbt_assert(not XBT_LOG_ISENABLED(ker_actor, xbt_log_priority_debug) ||
                    std::find(begin(actors_to_run), end(actors_to_run), this) == end(actors_to_run),
                "Actor %p should not exist in actors_to_run!", this);
     engine->add_actor_to_run_list_no_check(this);

diff --git a/teshsuite/s4u/host-on-off-actors/host-on-off-actors.tesh b/teshsuite/s4u/host-on-off-actors/host-on-off-actors.tesh
index 2903838..8dee4ed 100644 (file)
--- a/teshsuite/s4u/host-on-off-actors/host-on-off-actors.tesh
+++ b/teshsuite/s4u/host-on-off-actors/host-on-off-actors.tesh
@@ -16,7 +16,7 @@ $ ./host-on-off-actors ${platfdir}/small_platform.xml 1 --log=no_loc
 $ $VALGRIND_NO_LEAK_CHECK ./host-on-off-actors ${platfdir}/small_platform.xml 2 --log=no_loc
 > [Tremblay:test_launcher:(1) 0.000000] [s4u_test/INFO] Test 2:
 > [Tremblay:test_launcher:(1) 0.000000] [s4u_test/INFO]   Turn off Jupiter
-> [0.000000] [simix_process/WARNING] Cannot launch actor 'actor_daemon' on failed host 'Jupiter'
+> [0.000000] [ker_actor/WARNING] Cannot launch actor 'actor_daemon' on failed host 'Jupiter'
 > [Tremblay:test_launcher:(1) 0.000000] [root/CRITICAL] Could not launch a new actor on failed host Jupiter.
 
 $ ./host-on-off-actors ${platfdir}/small_platform.xml 4 --log=no_loc