X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f2dfd25486ba89c4adaa54d774092c0b9756361:/examples/cpp/operation-switch-host/s4u-operation-switch-host.cpp..1b211507e0c2abe5f2b7fbe56988af46d3189b51:/examples/cpp/task-switch-host/s4u-task-switch-host.cpp

diff --git a/examples/cpp/operation-switch-host/s4u-operation-switch-host.cpp b/examples/cpp/task-switch-host/s4u-task-switch-host.cpp
similarity index 58%
rename from examples/cpp/operation-switch-host/s4u-operation-switch-host.cpp
rename to examples/cpp/task-switch-host/s4u-task-switch-host.cpp
index 10b0b4cd31..27038a38fa 100644
--- a/examples/cpp/operation-switch-host/s4u-operation-switch-host.cpp
+++ b/examples/cpp/task-switch-host/s4u-task-switch-host.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 demonstrates how to dynamically modify a graph of operations.
+/* This example demonstrates how to dynamically modify a graph of tasks.
  *
  * Assuming we have two instances of a service placed on different hosts,
  * we want to send data alternatively to thoses instances.
@@ -16,46 +16,46 @@
  * With exec1 and exec2 on different hosts.
  */
 
-#include "simgrid/plugins/operation.hpp"
+#include "simgrid/plugins/task.hpp"
 #include "simgrid/s4u.hpp"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(operation_switch_host, "Messages specific for this operation example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(task_switch_host, "Messages specific for this task example");
 
 int main(int argc, char* argv[])
 {
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform(argv[1]);
-  simgrid::plugins::Operation::init();
+  simgrid::plugins::Task::init();
 
   // Retrieve hosts
   auto* tremblay = e.host_by_name("Tremblay");
   auto* jupiter  = e.host_by_name("Jupiter");
   auto* fafard   = e.host_by_name("Fafard");
 
-  // Create operations
-  auto comm0 = simgrid::plugins::CommOp::init("comm0");
+  // Create tasks
+  auto comm0 = simgrid::plugins::CommTask::init("comm0");
   comm0->set_bytes(1e7);
   comm0->set_source(tremblay);
-  auto exec1 = simgrid::plugins::ExecOp::init("exec1", 1e9, jupiter);
-  auto exec2 = simgrid::plugins::ExecOp::init("exec2", 1e9, fafard);
-  auto comm1 = simgrid::plugins::CommOp::init("comm1", 1e7, jupiter, tremblay);
-  auto comm2 = simgrid::plugins::CommOp::init("comm2", 1e7, fafard, tremblay);
+  auto exec1 = simgrid::plugins::ExecTask::init("exec1", 1e9, jupiter);
+  auto exec2 = simgrid::plugins::ExecTask::init("exec2", 1e9, fafard);
+  auto comm1 = simgrid::plugins::CommTask::init("comm1", 1e7, jupiter, tremblay);
+  auto comm2 = simgrid::plugins::CommTask::init("comm2", 1e7, fafard, tremblay);
 
-  // Create the initial graph by defining dependencies between operations
+  // Create the initial graph by defining dependencies between tasks
   comm0->add_successor(exec2);
   exec1->add_successor(comm1);
   exec2->add_successor(comm2);
 
-  // Add a function to be called when operations end for log purpose
-  simgrid::plugins::Operation::on_end_cb([](const simgrid::plugins::Operation* op) {
-    XBT_INFO("Operation %s finished (%d)", op->get_name().c_str(), op->get_count());
+  // 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());
   });
 
   // Add a function to be called before each executions of comm0
-  // This function modifies the graph of operations by adding or removing
+  // This function modifies the graph of tasks by adding or removing
   // successors to comm0
-  comm0->on_this_start([exec1, exec2, jupiter, fafard](simgrid::plugins::Operation* op) {
-    auto* comm0      = dynamic_cast<simgrid::plugins::CommOp*>(op);
+  comm0->on_this_start([exec1, exec2, jupiter, fafard](simgrid::plugins::Task* t) {
+    auto* comm0      = dynamic_cast<simgrid::plugins::CommTask*>(t);
     static int count = 0;
     if (count % 2 == 0) {
       comm0->set_destination(jupiter);
@@ -69,7 +69,7 @@ int main(int argc, char* argv[])
     count++;
   });
 
-  // Enqueue four executions for operation comm0
+  // Enqueue four executions for task comm0
   comm0->enqueue_execs(4);
 
   // Start the simulation