Align the behavior of MC and MC_replay in SMPI, so that replay actually works

[simgrid.git] / src / kernel / actor / Simcall.cpp

diff --git a/src/kernel/actor/Simcall.cpp b/src/kernel/actor/Simcall.cpp
index 4fa6c44..9f35a3b 100644 (file)
--- a/src/kernel/actor/Simcall.cpp
+++ b/src/kernel/actor/Simcall.cpp
@@ -12,9 +12,7 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_simcall, kernel, "transmuting from user request into kernel handlers");
 
-namespace simgrid {
-namespace kernel {
-namespace actor {
+namespace simgrid::kernel::actor {
 
 /** @private
  * @brief (in kernel mode) unpack the simcall and activate the handler
@@ -22,10 +20,11 @@ namespace actor {
  */
 void ActorImpl::simcall_handle(int times_considered)
 {
-  XBT_DEBUG("Handling simcall %p: %s", &simcall_, simcall_.get_cname());
+  XBT_DEBUG("Handling simcall %p: %s(%ld) %s", &simcall_, simcall_.issuer_->get_cname(), simcall_.issuer_->get_pid(),
+            (simcall_.observer_ != nullptr ? simcall_.observer_->to_string().c_str() : simcall_.get_cname()));
   if (simcall_.observer_ != nullptr)
     simcall_.observer_->prepare(times_considered);
-  if (context_->wannadie())
+  if (wannadie())
     return;
 
   xbt_assert(simcall_.call_ != Simcall::Type::NONE, "Asked to do the noop syscall on %s@%s", get_cname(),
@@ -51,6 +50,4 @@ const char* Simcall::get_cname() const
   }
 }
 
-} // namespace actor
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::actor