Implement TestAnyTransition

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

diff --git a/src/kernel/actor/SimcallObserver.cpp b/src/kernel/actor/SimcallObserver.cpp
index b230c66..befdd70 100644 (file)
--- a/src/kernel/actor/SimcallObserver.cpp
+++ b/src/kernel/actor/SimcallObserver.cpp
@@ -108,39 +108,31 @@ bool SemAcquireSimcall::is_enabled() const
   return true;
 }
 
-int ActivityTestanySimcall::get_max_consider() const
+ActivityTestanySimcall::ActivityTestanySimcall(ActorImpl* actor, const std::vector<activity::ActivityImpl*>& activities)
+    : ResultingSimcall(actor, -1), activities_(activities)
 {
-  // Only Comms are of interest to MC for now. When all types of activities can be consider, this function can simply
-  // return the size of activities_.
-  int count = 0;
-  for (const auto& act : activities_)
-    if (dynamic_cast<activity::CommImpl*>(act) != nullptr)
-      count++;
-  return count;
+  // list all the activities that are ready
+  for (unsigned i = 0; i < activities_.size(); i++)
+    if (activities_[i]->test(get_issuer()))
+      indexes_.push_back(i);
 }
 
-void ActivityTestanySimcall::prepare(int times_considered)
+int ActivityTestanySimcall::get_max_consider() const
 {
-  next_value_ = times_considered;
+  return indexes_.size() + 1;
 }
 
-/*
-std::string ActivityTestanySimcall::to_string(int times_considered) const
+void ActivityTestanySimcall::prepare(int times_considered)
 {
-  std::string res = SimcallObserver::to_string(times_considered);
-  if (times_considered == -1) {
-    res += "TestAny FALSE(-)";
-  } else {
-    res += "TestAny(" + xbt::string_printf("(%d of %zu)", times_considered + 1, activities_.size());
-  }
-
-  return res;
-}*/
-void ActivityWaitSimcall::serialize(std::stringstream& stream) const
+  if (times_considered < static_cast<int>(indexes_.size()))
+    next_value_ = indexes_.at(times_considered);
+  else
+    next_value_ = -1;
+}
+static void serialize_activity(const activity::ActivityImpl* act, std::stringstream& stream)
 {
-  if (auto* comm = dynamic_cast<activity::CommImpl*>(activity_)) {
-    stream << (short)mc::Transition::Type::COMM_WAIT << ' ';
-    stream << (timeout_ > 0) << ' ' << comm;
+  if (auto* comm = dynamic_cast<activity::CommImpl const*>(act)) {
+    stream << (short)mc::Transition::Type::COMM_TEST << ' ';
     stream << ' ' << (comm->src_actor_ != nullptr ? comm->src_actor_->get_pid() : -1);
     stream << ' ' << (comm->dst_actor_ != nullptr ? comm->dst_actor_->get_pid() : -1);
     stream << ' ' << comm->get_mailbox_id();
@@ -149,10 +141,17 @@ void ActivityWaitSimcall::serialize(std::stringstream& stream) const
     stream << (short)mc::Transition::Type::UNKNOWN;
   }
 }
-void ActivityTestSimcall::serialize(std::stringstream& stream) const
+void ActivityTestanySimcall::serialize(std::stringstream& stream) const
+{
+  stream << (short)mc::Transition::Type::TESTANY << ' ' << activities_.size() << ' ';
+  for (auto const& act : activities_)
+    serialize_activity(act, stream);
+}
+void ActivityWaitSimcall::serialize(std::stringstream& stream) const
 {
   if (auto* comm = dynamic_cast<activity::CommImpl*>(activity_)) {
-    stream << (short)mc::Transition::Type::COMM_TEST << ' ';
+    stream << (short)mc::Transition::Type::COMM_WAIT << ' ';
+    stream << (timeout_ > 0) << ' ' << comm;
     stream << ' ' << (comm->src_actor_ != nullptr ? comm->src_actor_->get_pid() : -1);
     stream << ' ' << (comm->dst_actor_ != nullptr ? comm->dst_actor_->get_pid() : -1);
     stream << ' ' << comm->get_mailbox_id();
@@ -161,6 +160,10 @@ void ActivityTestSimcall::serialize(std::stringstream& stream) const
     stream << (short)mc::Transition::Type::UNKNOWN;
   }
 }
+void ActivityTestSimcall::serialize(std::stringstream& stream) const
+{
+  serialize_activity(activity_, stream);
+}
 
 bool ActivityWaitSimcall::is_enabled() const
 {