X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3f756b051175054c62c4741fdab2a6b934828262..32bccc3c65aa626cdce6bec5c29f808638c8efe5:/src/kernel/actor/CommObserver.cpp

diff --git a/src/kernel/actor/CommObserver.cpp b/src/kernel/actor/CommObserver.cpp
index 6975bc33e1..2c0d55d172 100644
--- a/src/kernel/actor/CommObserver.cpp
+++ b/src/kernel/actor/CommObserver.cpp
@@ -16,8 +16,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(obs_comm, mc_observer, "Logging specific to the
 
 namespace simgrid::kernel::actor {
 
-ActivityTestanySimcall::ActivityTestanySimcall(ActorImpl* actor, const std::vector<activity::ActivityImpl*>& activities)
-    : ResultingSimcall(actor, -1), activities_(activities)
+ActivityTestanySimcall::ActivityTestanySimcall(ActorImpl* actor, const std::vector<activity::ActivityImpl*>& activities,
+                                               std::string fun_call)
+    : ResultingSimcall(actor, -1), activities_(activities), fun_call_(fun_call)
 {
   indexes_.clear();
   // list all the activities that are ready
@@ -49,6 +50,7 @@ static void serialize_activity_test(const activity::ActivityImpl* act, std::stri
     stream << ' ' << (uintptr_t)comm->src_buff_ << ' ' << (uintptr_t)comm->dst_buff_ << ' ' << comm->src_buff_size_;
   } else {
     stream << (short)mc::Transition::Type::UNKNOWN;
+    XBT_CRITICAL("Unknown transition in a test any. Bad things may happen");
   }
 }
 static std::string to_string_activity_test(const activity::ActivityImpl* act)
@@ -72,6 +74,7 @@ void ActivityTestanySimcall::serialize(std::stringstream& stream) const
     serialize_activity_test(act, stream);
     stream << ' ';
   }
+  stream << fun_call_;
 }
 std::string ActivityTestanySimcall::to_string() const
 {
@@ -85,6 +88,7 @@ std::string ActivityTestanySimcall::to_string() const
 void ActivityTestSimcall::serialize(std::stringstream& stream) const
 {
   serialize_activity_test(activity_, stream);
+  stream << ' ' << fun_call_;
 }
 std::string ActivityTestSimcall::to_string() const
 {
@@ -123,6 +127,7 @@ static std::string to_string_activity_wait(const activity::ActivityImpl* act)
 void ActivityWaitSimcall::serialize(std::stringstream& stream) const
 {
   serialize_activity_wait(activity_, timeout_ > 0, stream);
+  stream << ' ' << fun_call_;
 }
 void ActivityWaitanySimcall::serialize(std::stringstream& stream) const
 {
@@ -131,6 +136,7 @@ void ActivityWaitanySimcall::serialize(std::stringstream& stream) const
     serialize_activity_wait(act, timeout_ > 0, stream);
     stream << ' ';
   }
+  stream << fun_call_;
 }
 std::string ActivityWaitSimcall::to_string() const
 {
@@ -145,8 +151,8 @@ std::string ActivityWaitanySimcall::to_string() const
   return buffer.str();
 }
 ActivityWaitanySimcall::ActivityWaitanySimcall(ActorImpl* actor, const std::vector<activity::ActivityImpl*>& activities,
-                                               double timeout)
-    : ResultingSimcall(actor, -1), activities_(activities), timeout_(timeout)
+                                               double timeout, std::string fun_call)
+    : ResultingSimcall(actor, -1), activities_(activities), timeout_(timeout), fun_call_(fun_call)
 {
   // list all the activities that are ready
   indexes_.clear();
@@ -203,6 +209,7 @@ void CommIsendSimcall::serialize(std::stringstream& stream) const
          << src_buff_size_ << ' ' << tag_;
   XBT_DEBUG("SendObserver comm:%p mbox:%u buff:%p size:%zu tag:%d", comm_, mbox_->get_id(), src_buff_, src_buff_size_,
             tag_);
+  stream << ' ' << fun_call_;
 }
 std::string CommIsendSimcall::to_string() const
 {
@@ -217,6 +224,7 @@ void CommIrecvSimcall::serialize(std::stringstream& stream) const
   stream << (short)mc::Transition::Type::COMM_ASYNC_RECV << ' ';
   stream << (comm_ ? comm_->get_id() : 0) << ' ' << mbox_->get_id() << ' ' << (uintptr_t)dst_buff_ << ' ' << tag_;
   XBT_DEBUG("RecvObserver comm:%p mbox:%u buff:%p tag:%d", comm_, mbox_->get_id(), dst_buff_, tag_);
+  stream << ' ' << fun_call_;
 }
 std::string CommIrecvSimcall::to_string() const
 {