Introduce on_???_cb functions to shield the signals

[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 80b8282b90b34b284b74f61e7426712f63e5e7f0..525fb689ff144486e6c8cea4a4c02ceb41fcabda 100644 (file)
--- a/examples/cpp/dag-comm/s4u-dag-comm.cpp
+++ b/examples/cpp/dag-comm/s4u-dag-comm.cpp
@@ -19,38 +19,39 @@ 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([](simgrid::s4u::Activity& a) {
+  simgrid::s4u::Activity::on_veto_cb([](const 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"));
   });
 
-  simgrid::s4u::Activity::on_completion.connect([](simgrid::s4u::Activity& activity) {
-    auto* exec = dynamic_cast<simgrid::s4u::Exec*>(&activity);
+  simgrid::s4u::Activity::on_completion_cb([](simgrid::s4u::Activity& activity) {
+    const 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);
+    const auto* comm = dynamic_cast<simgrid::s4u::Comm*>(&activity);
     if (comm != nullptr)
       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(tremblay, jupiter);
+  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);
 
   // 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());
-  transfert->set_name("transfert")->set_payload_size(125e6);
-  child->set_name("child")->set_flops_amount(jupiter->get_speed());
-
-  // Schedule and try to start the different activities
-  parent->set_host(tremblay)->vetoable_start();
-  transfert->vetoable_start();
-  child->set_host(jupiter)->vetoable_start();
+  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();
+
+  // Schedule the different activities
+  parent->set_host(tremblay);
+  transfert->set_source(tremblay);
+  child->set_host(jupiter);
+  transfert->set_destination(jupiter);
 
   e.run();