improve dag-comm example

diff --git a/examples/cpp/dag-comm/s4u-dag-comm.cpp b/examples/cpp/dag-comm/s4u-dag-comm.cpp
index 80b8282..b5982ae 100644 (file)
--- a/examples/cpp/dag-comm/s4u-dag-comm.cpp
+++ b/examples/cpp/dag-comm/s4u-dag-comm.cpp
@@ -36,21 +36,22 @@ int main(int argc, char* argv[])
 
   // 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_from(tremblay);
+  child->set_host(jupiter);
+  transfert->set_to(jupiter);
 
   e.run();
 

diff --git a/examples/cpp/dag-comm/s4u-dag-comm.tesh b/examples/cpp/dag-comm/s4u-dag-comm.tesh
index 70ddce3..8c30e6f 100644 (file)
--- a/examples/cpp/dag-comm/s4u-dag-comm.tesh
+++ b/examples/cpp/dag-comm/s4u-dag-comm.tesh
@@ -1,9 +1,13 @@
 #!/usr/bin/env tesh
 
 $ ${bindir:=.}/s4u-dag-comm ${platfdir}/two_hosts.xml --log=s4u_activity.t:verbose "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Activity 'parent' vetoed. Dependencies: solved; Ressources: NOT assigned
+> [  0.000000] (0:maestro@) Activity 'transfert' vetoed. Dependencies: NOT solved; Ressources: NOT assigned
+> [  0.000000] (0:maestro@) Activity 'child' vetoed. Dependencies: NOT solved; Ressources: NOT assigned
 > [  0.000000] (0:maestro@) 'parent' is assigned to a resource and all dependencies are solved. Let's start
-> [  0.000000] (0:maestro@) Activity 'transfert' vetoed. Dependencies: NOT solved; Ressources: assigned
+> [  0.000000] (0:maestro@) Activity 'transfert' vetoed. Dependencies: NOT solved; Ressources: NOT assigned
 > [  0.000000] (0:maestro@) Activity 'child' vetoed. Dependencies: NOT solved; Ressources: assigned
+> [  0.000000] (0:maestro@) Activity 'transfert' vetoed. Dependencies: NOT solved; Ressources: assigned
 > [  1.000000] (0:maestro@) Remove a dependency from 'parent' on 'transfert'
 > [  1.000000] (0:maestro@) 'transfert' is assigned to a resource and all dependencies are solved. Let's start
 > [  1.000000] (0:maestro@) Activity 'parent' is complete (start time: 0.000000, finish time: 1.000000)