Convert 2 examples from Activity::wait_any to ActivitySet

[simgrid.git] / examples / cpp / activityset-testany / s4u-activityset-testany.cpp

diff --git a/examples/cpp/activity-testany/s4u-activity-testany.cpp b/examples/cpp/activityset-testany/s4u-activityset-testany.cpp
similarity index 68%
rename from examples/cpp/activity-testany/s4u-activity-testany.cpp
rename to examples/cpp/activityset-testany/s4u-activityset-testany.cpp
index 55b273f..8128c24 100644 (file)
--- a/examples/cpp/activity-testany/s4u-activity-testany.cpp
+++ b/examples/cpp/activityset-testany/s4u-activityset-testany.cpp
@@ -22,26 +22,25 @@ static void bob()
   auto comm = mbox->get_async(&payload);
   auto io   = disk->read_async(3e8);
 
-  std::vector<sg4::ActivityPtr> pending_activities = {boost::dynamic_pointer_cast<sg4::Activity>(exec),
-                                                      boost::dynamic_pointer_cast<sg4::Activity>(comm),
-                                                      boost::dynamic_pointer_cast<sg4::Activity>(io)};
+  sg4::ActivitySet pending_activities;
+  pending_activities.push(exec);
+  pending_activities.push(comm);
+  pending_activities.push(io);
 
   XBT_INFO("Sleep_for a while");
   sg4::this_actor::sleep_for(1);
 
   XBT_INFO("Test for completed activities");
   while (not pending_activities.empty()) {
-    ssize_t changed_pos = sg4::Activity::test_any(pending_activities);
-    if (changed_pos != -1) {
-      auto* completed_one = pending_activities[changed_pos].get();
-      if (dynamic_cast<sg4::Comm*>(completed_one))
+    auto completed_one = pending_activities.test_any();
+    if (completed_one != nullptr) {
+      if (boost::dynamic_pointer_cast<sg4::Comm>(completed_one))
         XBT_INFO("Completed a Comm");
-      if (dynamic_cast<sg4::Exec*>(completed_one))
+      if (boost::dynamic_pointer_cast<sg4::Exec>(completed_one))
         XBT_INFO("Completed an Exec");
-      if (dynamic_cast<sg4::Io*>(completed_one))
+      if (boost::dynamic_pointer_cast<sg4::Io>(completed_one))
         XBT_INFO("Completed an I/O");
-      pending_activities.erase(pending_activities.begin() + changed_pos);
-    } else { // nothing matches, wait for a little bit
+    } else {
       XBT_INFO("Nothing matches, test again in 0.5s");
       sg4::this_actor::sleep_for(.5);
     }