Move Tasks from a plugin to s4u

[simgrid.git] / examples / cpp / task-variable-load / s4u-task-variable-load.cpp

diff --git a/examples/cpp/task-variable-load/s4u-task-variable-load.cpp b/examples/cpp/task-variable-load/s4u-task-variable-load.cpp
index 960fb66..b0d3efd 100644 (file)
--- a/examples/cpp/task-variable-load/s4u-task-variable-load.cpp
+++ b/examples/cpp/task-variable-load/s4u-task-variable-load.cpp
@@ -13,50 +13,49 @@
  * With a heavy load there is a burst of comm before the exec task can even finish once.
  */
 
-#include "simgrid/plugins/task.hpp"
 #include "simgrid/s4u.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(task_variable_load, "Messages specific for this s4u example");
+namespace sg4 = simgrid::s4u;
 
-static void variable_load(simgrid::plugins::TaskPtr t)
+static void variable_load(sg4::TaskPtr t)
 {
   XBT_INFO("--- Small load ---");
   for (int i = 0; i < 3; i++) {
     t->enqueue_execs(1);
-    simgrid::s4u::this_actor::sleep_for(100);
+    sg4::this_actor::sleep_for(100);
   }
-  simgrid::s4u::this_actor::sleep_until(1000);
+  sg4::this_actor::sleep_until(1000);
   XBT_INFO("--- Heavy load ---");
   for (int i = 0; i < 3; i++) {
     t->enqueue_execs(1);
-    simgrid::s4u::this_actor::sleep_for(1);
+    sg4::this_actor::sleep_for(1);
   }
 }
 
 int main(int argc, char* argv[])
 {
-  simgrid::s4u::Engine e(&argc, argv);
+  sg4::Engine e(&argc, argv);
   e.load_platform(argv[1]);
-  simgrid::plugins::Task::init();
 
   // Retreive hosts
   auto* tremblay = e.host_by_name("Tremblay");
   auto* jupiter  = e.host_by_name("Jupiter");
 
   // Create tasks
-  auto comm = simgrid::plugins::CommTask::init("comm", 1e7, tremblay, jupiter);
-  auto exec = simgrid::plugins::ExecTask::init("exec", 1e9, jupiter);
+  auto comm = sg4::CommTask::init("comm", 1e7, tremblay, jupiter);
+  auto exec = sg4::ExecTask::init("exec", 1e9, jupiter);
 
   // Create the graph by defining dependencies between tasks
   comm->add_successor(exec);
 
   // Add a function to be called when tasks end for log purpose
-  simgrid::plugins::Task::on_end_cb([](const simgrid::plugins::Task* t) {
+  sg4::Task::on_end_cb([](const sg4::Task* t) {
     XBT_INFO("Task %s finished (%d)", t->get_name().c_str(), t->get_count());
   });
 
   // Create the actor that will inject load during the simulation
-  simgrid::s4u::Actor::create("input", tremblay, variable_load, comm);
+  sg4::Actor::create("input", tremblay, variable_load, comm);
 
   // Start the simulation
   e.run();