Define CommImpl::test_any().

diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp
index 5b5582c..9510275 100644 (file)
--- a/src/kernel/activity/CommImpl.cpp
+++ b/src/kernel/activity/CommImpl.cpp
@@ -230,17 +230,8 @@ bool simcall_HANDLER_comm_test(smx_simcall_t, simgrid::kernel::activity::CommImp
 
 int simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comms[], size_t count)
 {
-  if (MC_is_active() || MC_record_replay_is_active()) {
-    int idx = simcall->mc_value_;
-    xbt_assert(idx == -1 || comms[idx]->test());
-    return idx;
-  }
-
-  for (std::size_t i = 0; i != count; ++i) {
-    if (comms[i]->test())
-      return i;
-  }
-  return -1;
+  std::vector<simgrid::kernel::activity::CommImpl*> comms_vec(comms, comms + count);
+  return simgrid::kernel::activity::CommImpl::test_any(simcall->issuer_, comms_vec);
 }
 
 static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall)
@@ -472,6 +463,21 @@ bool CommImpl::test()
   return ActivityImpl::test();
 }
 
+int CommImpl::test_any(actor::ActorImpl* issuer, const std::vector<CommImpl*>& comms)
+{
+  if (MC_is_active() || MC_record_replay_is_active()) {
+    int idx = issuer->simcall_.mc_value_;
+    xbt_assert(idx == -1 || comms[idx]->test());
+    return idx;
+  }
+
+  for (std::size_t i = 0; i < comms.size(); ++i) {
+    if (comms[i]->test())
+      return i;
+  }
+  return -1;
+}
+
 void CommImpl::suspend()
 {
   /* FIXME: shall we suspend also the timeout synchro? */

diff --git a/src/kernel/activity/CommImpl.hpp b/src/kernel/activity/CommImpl.hpp
index f0f8115..75e2193 100644 (file)
--- a/src/kernel/activity/CommImpl.hpp
+++ b/src/kernel/activity/CommImpl.hpp
@@ -51,6 +51,7 @@ public:
   void copy_data();
 
   bool test() override;
+  static int test_any(actor::ActorImpl* issuer, const std::vector<CommImpl*>& comms);
 
   CommImpl* start();
   void suspend() override;