X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4c928237ada5ee2c257f9112099fad47dc713013..c6683b41cf9ecda70c1d4d75d1effc61903a894f:/examples/cpp/dag-comm/s4u-dag-comm.cpp

diff --git a/examples/cpp/dag-comm/s4u-dag-comm.cpp b/examples/cpp/dag-comm/s4u-dag-comm.cpp
index b5982aefc9..77cb31d1de 100644
--- a/examples/cpp/dag-comm/s4u-dag-comm.cpp
+++ b/examples/cpp/dag-comm/s4u-dag-comm.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,54 +8,56 @@
 #include <vector>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
+namespace sg4 = simgrid::s4u;
 
 int main(int argc, char* argv[])
 {
-  simgrid::s4u::Engine e(&argc, argv);
-  sg_storage_file_system_init();
+  sg4::Engine e(&argc, argv);
   e.load_platform(argv[1]);
 
-  auto tremblay = e.host_by_name("Tremblay");
-  auto jupiter  = e.host_by_name("Jupiter");
+  auto* tremblay = e.host_by_name("Tremblay");
+  auto* jupiter  = e.host_by_name("Jupiter");
 
   // Display the details on vetoed activities
-  simgrid::s4u::Activity::on_veto.connect([](simgrid::s4u::Activity& a) {
-    XBT_INFO("Activity '%s' vetoed. Dependencies: %s; Ressources: %s", a.get_cname(),
-             (a.dependencies_solved() ? "solved" : "NOT solved"), (a.is_assigned() ? "assigned" : "NOT assigned"));
+  sg4::Exec::on_veto_cb([](sg4::Exec const& exec) {
+    XBT_INFO("Execution '%s' vetoed. Dependencies: %s; Ressources: %s", exec.get_cname(),
+             (exec.dependencies_solved() ? "solved" : "NOT solved"), (exec.is_assigned() ? "assigned" : "NOT assigned"));
+  });
+  sg4::Comm::on_veto_cb([](sg4::Comm const& comm) {
+    XBT_INFO("Communication '%s' vetoed. Dependencies: %s; Ressources: %s", comm.get_cname(),
+             (comm.dependencies_solved() ? "solved" : "NOT solved"), (comm.is_assigned() ? "assigned" : "NOT assigned"));
   });
 
-  simgrid::s4u::Activity::on_completion.connect([](simgrid::s4u::Activity& activity) {
-    auto* exec = dynamic_cast<simgrid::s4u::Exec*>(&activity);
-    if (exec != nullptr)
-      XBT_INFO("Activity '%s' is complete (start time: %f, finish time: %f)", exec->get_cname(), exec->get_start_time(),
-               exec->get_finish_time());
-    auto* comm = dynamic_cast<simgrid::s4u::Comm*>(&activity);
-    if (comm != nullptr)
-      XBT_INFO("Activity '%s' is complete", comm->get_cname());
+  sg4::Exec::on_completion_cb([](sg4::Exec const& exec) {
+    XBT_INFO("Exec '%s' is complete (start time: %f, finish time: %f)", exec.get_cname(), exec.get_start_time(),
+             exec.get_finish_time());
+  });
+  sg4::Comm::on_completion_cb([](sg4::Comm const& comm) {
+    XBT_INFO("Comm '%s' is complete", comm.get_cname());
   });
 
-  // Create a small DAG: parent->transfert->child
-  simgrid::s4u::ExecPtr parent    = simgrid::s4u::Exec::init();
-  simgrid::s4u::CommPtr transfert = simgrid::s4u::Comm::sendto_init();
-  simgrid::s4u::ExecPtr child     = simgrid::s4u::Exec::init();
-  parent->add_successor(transfert);
-  transfert->add_successor(child);
+  // Create a small DAG: parent->transfer->child
+  sg4::ExecPtr parent   = sg4::Exec::init();
+  sg4::CommPtr transfer = sg4::Comm::sendto_init();
+  sg4::ExecPtr child    = sg4::Exec::init();
+  parent->add_successor(transfer);
+  transfer->add_successor(child);
 
   // Set the parameters (the name is for logging purposes only)
   // + parent and child end after 1 second
-  parent->set_name("parent")->set_flops_amount(tremblay->get_speed())->vetoable_start();
-  transfert->set_name("transfert")->set_payload_size(125e6)->vetoable_start();
-  child->set_name("child")->set_flops_amount(jupiter->get_speed())->vetoable_start();
+  parent->set_name("parent")->set_flops_amount(tremblay->get_speed())->start();
+  transfer->set_name("transfer")->set_payload_size(125e6)->start();
+  child->set_name("child")->set_flops_amount(jupiter->get_speed())->start();
 
   // Schedule the different activities
   parent->set_host(tremblay);
-  transfert->set_from(tremblay);
+  transfer->set_source(tremblay);
   child->set_host(jupiter);
-  transfert->set_to(jupiter);
+  transfer->set_destination(jupiter);
 
   e.run();
 
-  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
+  XBT_INFO("Simulation time %g", sg4::Engine::get_clock());
 
   return 0;
 }