Change dynar parameter for waitany to a raw array (mimic testany).

[simgrid.git] / src / s4u / s4u_Comm.cpp

diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp
index a5e19da..24d6688 100644 (file)
--- a/src/s4u/s4u_Comm.cpp
+++ b/src/s4u/s4u_Comm.cpp
@@ -29,23 +29,14 @@ Comm::~Comm()
   }
 }
 
-int Comm::wait_any_for(std::vector<CommPtr>* comms_in, double timeout)
-{
-  // Map to dynar<Synchro*>:
-  xbt_dynar_t comms = xbt_dynar_new(sizeof(simgrid::kernel::activity::ActivityImpl*), [](void* ptr) {
-    intrusive_ptr_release(*(simgrid::kernel::activity::ActivityImpl**)ptr);
-  });
-  for (auto const& comm : *comms_in) {
-    if (comm->state_ == Activity::State::INITED)
-      comm->start();
-    xbt_assert(comm->state_ == Activity::State::STARTED);
-    simgrid::kernel::activity::ActivityImpl* ptr = comm->pimpl_.get();
-    intrusive_ptr_add_ref(ptr);
-    xbt_dynar_push_as(comms, simgrid::kernel::activity::ActivityImpl*, ptr);
+int Comm::wait_any_for(std::vector<CommPtr>* comms, double timeout)
+{
+  smx_activity_t* array = new smx_activity_t[comms->size()];
+  for (unsigned int i = 0; i < comms->size(); i++) {
+    array[i] = comms->at(i)->pimpl_;
   }
-  // Call the underlying simcall:
-  int idx = simcall_comm_waitany(comms, timeout);
-  xbt_dynar_free(&comms);
+  int idx = simcall_comm_waitany(array, comms->size(), timeout);
+  delete[] array;
   return idx;
 }
 
@@ -201,7 +192,7 @@ Comm* Comm::detach()
 
 Comm* Comm::cancel()
 {
-  simgrid::simix::simcall([this] { dynamic_cast<kernel::activity::CommImpl*>(pimpl_.get())->cancel(); });
+  simgrid::simix::simcall([this] { static_cast<kernel::activity::CommImpl*>(pimpl_.get())->cancel(); });
   state_ = State::CANCELED;
   return this;
 }