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

[simgrid.git] / 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 9401b8a..9e671b4 100644 (file)
--- 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,10 +8,11 @@
 #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);
+  sg4::Engine e(&argc, argv);
   sg_storage_file_system_init();
   e.load_platform(argv[1]);
 
@@ -19,43 +20,41 @@ int main(int argc, char* argv[])
   auto jupiter  = e.host_by_name("Jupiter");
 
   // Display the details on vetoed activities
-  simgrid::s4u::Activity::on_veto.connect([](const simgrid::s4u::Activity& a) {
+  sg4::Activity::on_veto_cb([](const sg4::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"));
   });
 
-  simgrid::s4u::Activity::on_completion.connect([](simgrid::s4u::Activity& activity) {
-    const auto* exec = dynamic_cast<simgrid::s4u::Exec*>(&activity);
-    if (exec != nullptr)
+  sg4::Activity::on_completion_cb([](sg4::Activity const& activity) {
+    if (const auto* exec = dynamic_cast<sg4::Exec const*>(&activity))
       XBT_INFO("Activity '%s' is complete (start time: %f, finish time: %f)", exec->get_cname(), exec->get_start_time(),
                exec->get_finish_time());
-    const auto* comm = dynamic_cast<simgrid::s4u::Comm*>(&activity);
-    if (comm != nullptr)
+    if (const auto* comm = dynamic_cast<sg4::Comm const*>(&activity))
       XBT_INFO("Activity '%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_source(tremblay);
+  transfer->set_source(tremblay);
   child->set_host(jupiter);
-  transfert->set_destination(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;
 }