Merge branch 'master' of https://framagit.org/simgrid/simgrid

[simgrid.git] / examples / cpp / task-io / s4u-task-io.cpp

diff --git a/examples/cpp/task-io/s4u-task-io.cpp b/examples/cpp/task-io/s4u-task-io.cpp
index 6301657..c0f6eb0 100644 (file)
--- a/examples/cpp/task-io/s4u-task-io.cpp
+++ b/examples/cpp/task-io/s4u-task-io.cpp
@@ -3,7 +3,7 @@
 /* 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. */
 
-/* This example demonstrate basic use of the task plugin.
+/* This example demonstrate basic use of tasks.
  *
  * We model the following graph:
  *
@@ -13,27 +13,27 @@
  * comm is a communication task.
  */
 
-#include "simgrid/plugins/task.hpp"
 #include "simgrid/s4u.hpp"
+#include "simgrid/s4u/Task.hpp"
 #include <simgrid/plugins/file_system.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(task_simple, "Messages specific for this task example");
+namespace sg4 = simgrid::s4u;
 
 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();
 
   // Retrieve hosts
   auto* bob  = e.host_by_name("bob");
   auto* carl = e.host_by_name("carl");
 
   // Create tasks
-  auto exec1 = simgrid::plugins::ExecTask::init("exec1", 1e9, bob);
-  auto exec2 = simgrid::plugins::ExecTask::init("exec2", 1e9, carl);
-  auto write = simgrid::plugins::IoTask::init("write", 1e7, bob->get_disks().front(), simgrid::s4u::Io::OpType::WRITE);
-  auto read  = simgrid::plugins::IoTask::init("read", 1e7, carl->get_disks().front(), simgrid::s4u::Io::OpType::READ);
+  auto exec1 = sg4::ExecTask::init("exec1", 1e9, bob);
+  auto exec2 = sg4::ExecTask::init("exec2", 1e9, carl);
+  auto write = sg4::IoTask::init("write", 1e7, bob->get_disks().front(), sg4::Io::OpType::WRITE);
+  auto read  = sg4::IoTask::init("read", 1e7, carl->get_disks().front(), sg4::Io::OpType::READ);
 
   // Create the graph by defining dependencies between tasks
   exec1->add_successor(write);
@@ -41,12 +41,11 @@ int main(int argc, char* argv[])
   read->add_successor(exec2);
 
   // Add a function to be called when tasks end for log purpose
-  simgrid::plugins::Task::on_end_cb([](const simgrid::plugins::Task* t) {
-    XBT_INFO("Task %s finished (%d)", t->get_name().c_str(), t->get_count());
-  });
+  sg4::Task::on_completion_cb(
+      [](const sg4::Task* t) { XBT_INFO("Task %s finished (%d)", t->get_name().c_str(), t->get_count()); });
 
-  // Enqueue two executions for task exec1
-  exec1->enqueue_execs(2);
+  // Enqueue two firings for task exec1
+  exec1->enqueue_firings(2);
 
   // Start the simulation
   e.run();