Remove explicit conversion to std::string when it's not required.

[simgrid.git] / teshsuite / s4u / monkey-masterworkers / monkey-masterworkers.cpp

diff --git a/teshsuite/s4u/monkey-masterworkers/monkey-masterworkers.cpp b/teshsuite/s4u/monkey-masterworkers/monkey-masterworkers.cpp
index d38b58d..9554fc3 100644 (file)
--- a/teshsuite/s4u/monkey-masterworkers/monkey-masterworkers.cpp
+++ b/teshsuite/s4u/monkey-masterworkers/monkey-masterworkers.cpp
@@ -31,7 +31,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example")
 static simgrid::config::Flag<int> cfg_host_count{"host-count", "Host count (master on one, workers on the others)", 3};
 static simgrid::config::Flag<double> cfg_deadline{"deadline", "When to fail the simulation (infinite loop detection)",
                                                   120};
-static simgrid::config::Flag<int> cfg_task_count{"task-count", "Amount of tasks that must be executed to succeed", 2};
+static simgrid::config::Flag<int> cfg_task_count{"task-count", "Amount of tasks that must be executed to succeed", 1};
 
 int todo; // remaining amount of tasks to execute, a global variable
 sg4::Mailbox* mailbox; // as a global to reduce the amount of simcalls during actor reboot
@@ -40,10 +40,12 @@ XBT_ATTRIB_NORETURN static void master()
 {
   double comp_size = 1e6;
   long comm_size   = 1e6;
-  XBT_INFO("Master booting");
-  sg4::Actor::self()->daemonize();
-  sg4::this_actor::on_exit(
-      [](bool forcefully) { XBT_INFO("Master dying %s.", forcefully ? "forcefully" : "peacefully"); });
+  bool rebooting   = sg4::Actor::self()->get_restart_count() > 0;
+
+  XBT_INFO("Master %s", rebooting ? "rebooting" : "booting");
+  if (not rebooting) // Starting for the first time
+    sg4::this_actor::on_exit(
+        [](bool forcefully) { XBT_INFO("Master dying %s.", forcefully ? "forcefully" : "peacefully"); });
 
   while (true) { // This is a daemon
     xbt_assert(sg4::Engine::get_clock() < cfg_deadline,
@@ -66,9 +68,12 @@ XBT_ATTRIB_NORETURN static void master()
 
 static void worker(int id)
 {
-  XBT_INFO("Worker booting");
-  sg4::this_actor::on_exit(
-      [id](bool forcefully) { XBT_INFO("worker %d dying %s.", id, forcefully ? "forcefully" : "peacefully"); });
+  bool rebooting = sg4::Actor::self()->get_restart_count() > 0;
+
+  XBT_INFO("Worker %s", rebooting ? "rebooting" : "booting");
+  if (not rebooting) // Starting for the first time
+    sg4::this_actor::on_exit(
+        [id](bool forcefully) { XBT_INFO("worker %d dying %s.", id, forcefully ? "forcefully" : "peacefully"); });
 
   while (todo > 0) {
     xbt_assert(sg4::Engine::get_clock() < cfg_deadline,
@@ -78,11 +83,7 @@ static void worker(int id)
       auto payload = mailbox->get_unique<double>(10);
       xbt_assert(payload != nullptr, "mailbox->get() failed");
       double comp_size = *payload;
-      if (comp_size < 0) { /* - Exit when -1.0 is received */
-        XBT_INFO("I'm done. See you!");
-        break;
-      }
-      /*  - Otherwise, process the task */
+
       XBT_INFO("Start execution...");
       sg4::this_actor::execute(comp_size);
       XBT_INFO("Execution complete.");
@@ -100,29 +101,22 @@ int main(int argc, char* argv[])
 {
   sg4::Engine e(&argc, argv);
 
-  XBT_INFO("host count: %d ", (int)cfg_host_count);
-
   auto* rootzone = sg4::create_full_zone("root");
-  sg4::Host* main; // First host created, where the master will stay
   std::vector<sg4::Host*> worker_hosts;
 
   xbt_assert(cfg_host_count > 2, "You need at least 2 workers (i.e., 3 hosts) or the master will be auto-killed when "
                                  "the only worker gets killed.");
-  for (int i = 0; i < cfg_host_count; i++) {
-    auto hostname = std::string("lilibeth ") + std::to_string(i);
+  sg4::Host* master_host = rootzone->create_host("lilibeth 0", 1e9); // Host where the master will stay
+  for (int i = 1; i < cfg_host_count; i++) {
+    auto hostname = "lilibeth " + std::to_string(i);
     auto* host    = rootzone->create_host(hostname, 1e9);
-    if (i == 0) {
-      main = host;
-    } else {
-      sg4::LinkInRoute link(rootzone->create_link(hostname, "1MBps")->set_latency("24us")->seal());
-      rootzone->add_route(main->get_netpoint(), host->get_netpoint(), nullptr, nullptr, {link}, true);
-      worker_hosts.push_back(host);
-    }
+    sg4::LinkInRoute link(rootzone->create_link(hostname, "1MBps")->set_latency("24us")->seal());
+    rootzone->add_route(master_host->get_netpoint(), host->get_netpoint(), nullptr, nullptr, {link}, true);
+    worker_hosts.push_back(host);
   }
   rootzone->seal();
-  sg4::Engine::on_platform_created(); // FIXME this should not be necessary
 
-  sg4::Actor::create("master", main, master)->set_auto_restart(true);
+  sg4::Actor::create("master", master_host, master)->daemonize()->set_auto_restart(true);
   int id = 0;
   for (auto* h : worker_hosts) {
     sg4::Actor::create("worker", h, worker, id)->set_auto_restart(true);