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 cf43661..f0e629a 100644 (file)
--- a/examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp
+++ b/examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp
@@ -12,9 +12,9 @@
 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;
+  long tasks_count      = 0;
+  double compute_cost   = 0;
+  long communicate_cost = 0;
   std::vector<simgrid::s4u::Mailbox*> workers;
 
 public:
@@ -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]));
 
@@ -67,13 +67,11 @@ public:
   {
     double compute_cost;
     do {
-      const 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.");