cosmetics and wrapper

diff --git a/examples/cpp/dag-failure/s4u-dag-failure.cpp b/examples/cpp/dag-failure/s4u-dag-failure.cpp
index 877ee39..992ad5e 100644 (file)
--- a/examples/cpp/dag-failure/s4u-dag-failure.cpp
+++ b/examples/cpp/dag-failure/s4u-dag-failure.cpp
@@ -8,19 +8,21 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(dag_failure, "Logging specific to this example");
 
+namespace sg4 = simgrid::s4u;
+
 int main(int argc, char** argv)
 {
-  simgrid::s4u::Engine e(&argc, argv);
-  simgrid::s4u::Engine::set_config("host/model:ptask_L07");
+  sg4::Engine e(&argc, argv);
+  sg4::Engine::set_config("host/model:ptask_L07");
   e.load_platform(argv[1]);
 
   auto* faulty = e.host_by_name("Faulty Host");
   auto* safe   = e.host_by_name("Safe Host");
-  simgrid::s4u::Exec::on_completion.connect([](simgrid::s4u::Exec const& exec) {
-    if (exec.get_state() == simgrid::s4u::Activity::State::FINISHED)
+  sg4::Exec::on_completion.connect([](sg4::Exec const& exec) {
+    if (exec.get_state() == sg4::Activity::State::FINISHED)
       XBT_INFO("Activity '%s' is complete (start time: %f, finish time: %f)", exec.get_cname(), exec.get_start_time(),
                exec.get_finish_time());
-    if (exec.get_state() == simgrid::s4u::Activity::State::FAILED) {
+    if (exec.get_state() == sg4::Activity::State::FAILED) {
       if (exec.is_parallel())
         XBT_INFO("Activity '%s' has failed. %.f %% remain to be done", exec.get_cname(),
                  100 * exec.get_remaining_ratio());
@@ -31,14 +33,13 @@ int main(int argc, char** argv)
 
   /* creation of a single Exec that will poorly fail when the workstation will stop */
   XBT_INFO("First test: sequential Exec activity");
-  simgrid::s4u::ExecPtr exec =
-      simgrid::s4u::Exec::init()->set_name("Poor task")->set_flops_amount(2e10)->vetoable_start();
+  sg4::ExecPtr exec = sg4::Exec::init()->set_name("Poor task")->set_flops_amount(2e10)->vetoable_start();
 
   XBT_INFO("Schedule Activity '%s' on 'Faulty Host'", exec->get_cname());
   exec->set_host(faulty);
 
   /* Add a child Exec that depends on the Poor task' */
-  simgrid::s4u::ExecPtr child = simgrid::s4u::Exec::init()->set_name("Child")->set_flops_amount(2e10)->set_host(safe);
+  sg4::ExecPtr child = sg4::Exec::init()->set_name("Child")->set_flops_amount(2e10)->set_host(safe);
   exec->add_successor(child);
   child->vetoable_start();
 
@@ -53,13 +54,13 @@ int main(int argc, char** argv)
   e.run();
 
   XBT_INFO("Second test: parallel Exec activity");
-  exec = simgrid::s4u::Exec::init()->set_name("Poor parallel task")->set_flops_amounts({2e10, 2e10})->vetoable_start();
+  exec = sg4::Exec::init()->set_name("Poor parallel task")->set_flops_amounts({2e10, 2e10})->vetoable_start();
 
   XBT_INFO("Schedule Activity '%s' on 'Safe Host' and 'Faulty Host'", exec->get_cname());
   exec->set_hosts({safe, faulty});
 
-  /* Add a child Exec that depends on the Poor task' */
-  child = simgrid::s4u::Exec::init()->set_name("Child")->set_flops_amount(2e10)->set_host(safe);
+  /* Add a child Exec that depends on the Poor parallel task' */
+  child = sg4::Exec::init()->set_name("Child")->set_flops_amount(2e10)->set_host(safe);
   exec->add_successor(child);
   child->vetoable_start();
 
@@ -67,7 +68,7 @@ int main(int argc, char** argv)
   e.run();
 
   XBT_INFO("let's unschedule Activity '%s' and reschedule it only on the 'Safe Host'", exec->get_cname());
-  exec->unset_host();
+  exec->unset_hosts();
   exec->set_flops_amount(4e10)->set_host(safe);
 
   XBT_INFO("Run the simulation again");

diff --git a/include/simgrid/s4u/Exec.hpp b/include/simgrid/s4u/Exec.hpp
index 57fe743..4f3ea0f 100644 (file)
--- a/include/simgrid/s4u/Exec.hpp
+++ b/include/simgrid/s4u/Exec.hpp
@@ -76,6 +76,7 @@ public:
   ExecPtr set_host(Host* host);
   ExecPtr set_hosts(const std::vector<Host*>& hosts);
   ExecPtr unset_host();
+  ExecPtr unset_hosts() { return unset_host(); }
 
   ExecPtr set_flops_amount(double flops_amount);
   ExecPtr set_flops_amounts(const std::vector<double>& flops_amounts);