properly remove the old signals and prevent MC to fire Comm::on_this_completion

[simgrid.git] / examples / cpp / engine-run-partial / s4u-engine-run-partial.cpp

diff --git a/examples/cpp/engine-run-partial/s4u-engine-run-partial.cpp b/examples/cpp/engine-run-partial/s4u-engine-run-partial.cpp
index ab7df147a00ed6958fda1dc26d6056dbed224963..bf0ada983163f82aab223248e36669fc9ee9face 100644 (file)
--- a/examples/cpp/engine-run-partial/s4u-engine-run-partial.cpp
+++ b/examples/cpp/engine-run-partial/s4u-engine-run-partial.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,9 +8,10 @@
 #include "simgrid/s4u.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
+namespace sg4 = simgrid::s4u;
 
 /* This actor simply executes and waits the activity it got as a parameter. */
-static void runner(simgrid::s4u::ExecPtr activity)
+static void runner(sg4::ExecPtr activity)
 {
   activity->start();
   activity->wait();
@@ -18,54 +19,23 @@ static void runner(simgrid::s4u::ExecPtr activity)
   XBT_INFO("Goodbye now!");
 }
 
-/* This actor tests the ongoing execution until its completion, and don't wait before it's terminated. */
-static void monitor()
-{
-  double computation_amount = simgrid::s4u::this_actor::get_host()->get_speed();
-  XBT_INFO("Execute %g flops, should take 1 second.", computation_amount);
-  simgrid::s4u::ExecPtr activity = simgrid::s4u::this_actor::exec_init(computation_amount);
-  activity->start();
-
-  while (not activity->test()) {
-    XBT_INFO("Remaining amount of flops: %g (%.0f%%)", activity->get_remaining(),
-             100 * activity->get_remaining_ratio());
-    simgrid::s4u::this_actor::sleep_for(0.3);
-  }
-
-  XBT_INFO("Goodbye now!");
-}
-
-/* This actor cancels the ongoing execution after a while. */
-static void canceller()
-{
-  double computation_amount = simgrid::s4u::this_actor::get_host()->get_speed();
-
-  XBT_INFO("Execute %g flops, should take 1 second.", computation_amount);
-  simgrid::s4u::ExecPtr activity = simgrid::s4u::this_actor::exec_async(computation_amount);
-  simgrid::s4u::this_actor::sleep_for(0.5);
-  XBT_INFO("I changed my mind, cancel!");
-  activity->cancel();
-
-  XBT_INFO("Goodbye now!");
-}
-
 int main(int argc, char* argv[])
 {
-  simgrid::s4u::Engine e(&argc, argv);
+  sg4::Engine e(&argc, argv);
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Host* fafard = e.host_by_name("Fafard");
+  sg4::Host* fafard = e.host_by_name("Fafard");
 
-  simgrid::s4u::ExecPtr activity = simgrid::s4u::this_actor::exec_init(fafard->get_speed() * 10.)->set_host(fafard);
-  simgrid::s4u::Actor::create("runner", fafard, runner, activity);
+  sg4::ExecPtr activity = sg4::this_actor::exec_init(fafard->get_speed() * 10.)->set_host(fafard);
+  sg4::Actor::create("runner", fafard, runner, activity);
 
   while (activity->get_remaining() > 0) {
     XBT_INFO("Remaining amount of flops: %g (%.0f%%)", activity->get_remaining(),
              100 * activity->get_remaining_ratio());
-    e.run_until(e.get_clock() + 1);
+    e.run_until(sg4::Engine::get_clock() + 1);
   }
 
-  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
+  XBT_INFO("Simulation time %g", sg4::Engine::get_clock());
 
   return 0;
 }