Use Mailbox::get_unique<>(), and save a few delete.

[simgrid.git] / examples / s4u / app-masterworkers / s4u-app-masterworkers-class.cpp

diff --git a/examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp b/examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp
index c320b67..f0e629a 100644 (file)
--- a/examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp
+++ b/examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2020. 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. */
@@ -12,10 +12,10 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_app_masterworker, "Messages specific for this s4u example");
 
 class Master {
-  long tasks_count                 = 0;
-  double compute_cost              = 0;
-  double communicate_cost          = 0;
-  std::vector<simgrid::s4u::MailboxPtr> workers;
+  long tasks_count      = 0;
+  double compute_cost   = 0;
+  long communicate_cost = 0;
+  std::vector<simgrid::s4u::Mailbox*> workers;
 
 public:
   explicit Master(std::vector<std::string> args)
@@ -24,7 +24,7 @@ public:
 
     tasks_count      = std::stol(args[1]);
     compute_cost     = std::stod(args[2]);
-    communicate_cost = std::stod(args[3]);
+    communicate_cost = std::stol(args[3]);
     for (unsigned int i = 4; i < args.size(); i++)
       workers.push_back(simgrid::s4u::Mailbox::by_name(args[i]));
 
@@ -35,7 +35,7 @@ public:
   {
     for (int i = 0; i < tasks_count; i++) { /* For each task to be executed: */
       /* - Select a worker in a round-robin way */
-      simgrid::s4u::MailboxPtr mailbox = workers[i % workers.size()];
+      simgrid::s4u::Mailbox* mailbox = workers[i % workers.size()];
 
       /* - Send the computation amount to the worker */
       if (tasks_count < 10000 || (tasks_count < 100000 && i % 10000 == 0) || i % 100000 == 0)
@@ -46,14 +46,14 @@ public:
     XBT_INFO("All tasks have been dispatched. Request all workers to stop.");
     for (unsigned int i = 0; i < workers.size(); i++) {
       /* The workers stop when receiving a negative compute_cost */
-      simgrid::s4u::MailboxPtr mailbox = workers[i % workers.size()];
+      simgrid::s4u::Mailbox* mailbox = workers[i % workers.size()];
       mailbox->put(new double(-1.0), 0);
     }
   }
 };
 
 class Worker {
-  simgrid::s4u::MailboxPtr mailbox = nullptr;
+  simgrid::s4u::Mailbox* mailbox = nullptr;
 
 public:
   explicit Worker(std::vector<std::string> args)
@@ -67,13 +67,11 @@ public:
   {
     double compute_cost;
     do {
-      double* msg  = static_cast<double*>(mailbox->get());
+      auto msg     = mailbox->get_unique<double>();
       compute_cost = *msg;
-      delete msg;
 
       if (compute_cost > 0) /* If compute_cost is valid, execute a computation of that cost */
         simgrid::s4u::this_actor::execute(compute_cost);
-
     } while (compute_cost > 0); /* Stop when receiving an invalid compute_cost */
 
     XBT_INFO("Exiting now.");