add test() for asynchronous executions

[simgrid.git] / examples / s4u / exec-monitor / s4u-exec-monitor.cpp

diff --git a/examples/s4u/exec-monitor/s4u-exec-monitor.cpp b/examples/s4u/exec-monitor/s4u-exec-monitor.cpp
index fb08720..535f2fb 100644 (file)
--- a/examples/s4u/exec-monitor/s4u-exec-monitor.cpp
+++ b/examples/s4u/exec-monitor/s4u-exec-monitor.cpp
@@ -12,7 +12,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example")
 
 static void monitor(simgrid::s4u::ExecPtr activity)
 {
-  while (activity->getRemains() > 0) { // FIXME: use a test() here once that function is implemented
+  while (not activity->test()) {
     XBT_INFO("activity remaining duration: %g (%.0f%%)", activity->getRemains(), 100 * activity->getRemainingRatio());
     simgrid::s4u::this_actor::sleep_for(5);
   }
@@ -22,16 +22,16 @@ static void monitor(simgrid::s4u::ExecPtr activity)
 static void executor()
 {
   XBT_INFO("Create one monitored task, and wait for it");
-  simgrid::s4u::ExecPtr activity = simgrid::s4u::Actor::self()->exec_async(1e9);
+  simgrid::s4u::ExecPtr activity = simgrid::s4u::this_actor::exec_async(1e9);
   simgrid::s4u::Actor::createActor("monitor 1", simgrid::s4u::Host::by_name("Tremblay"), monitor, activity);
   activity->wait(); // This blocks until the activity is over
   XBT_INFO("The monitored task is over. Let's start 3 of them now.");
   simgrid::s4u::Actor::createActor("monitor 2", simgrid::s4u::Host::by_name("Jupiter"), monitor,
-                                   simgrid::s4u::Actor::self()->exec_async(1e9));
+                                   simgrid::s4u::this_actor::exec_async(1e9));
   simgrid::s4u::Actor::createActor("monitor 3", simgrid::s4u::Host::by_name("Ginette"), monitor,
-                                   simgrid::s4u::Actor::self()->exec_async(1e9));
+                                   simgrid::s4u::this_actor::exec_async(1e9));
   simgrid::s4u::Actor::createActor("monitor 4", simgrid::s4u::Host::by_name("Bourassa"), monitor,
-                                   simgrid::s4u::Actor::self()->exec_async(1e9));
+                                   simgrid::s4u::this_actor::exec_async(1e9));
   XBT_INFO("All activities are started; finish now");
   // Waiting execution activities is not mandatory: they go to completion once started