From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Fri, 18 Dec 2020 07:55:33 +0000 (+0100)
Subject: Keep tutorial examples simple; don't use Mailbox::get_unique.
X-Git-Tag: v3.27~588
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/99936772b0d4a9f19a5b2f5522167618299084e3?hp=c4e0f24b75380ba3baadbf31514fb9338834c302

Keep tutorial examples simple; don't use Mailbox::get_unique.
---

diff --git a/docs/source/tuto_s4u/master-workers-lab1.cpp b/docs/source/tuto_s4u/master-workers-lab1.cpp
index 2bf93a2fc9..12fcddae60 100644
--- a/docs/source/tuto_s4u/master-workers-lab1.cpp
+++ b/docs/source/tuto_s4u/master-workers-lab1.cpp
@@ -58,8 +58,9 @@ static void worker(std::vector<std::string> args)
 
   double compute_cost;
   do {
-    auto msg     = mailbox->get_unique<double>();
+    double* msg  = mailbox->get<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);
diff --git a/docs/source/tuto_s4u/master-workers-lab2.cpp b/docs/source/tuto_s4u/master-workers-lab2.cpp
index a87631bb1d..df78adfea3 100644
--- a/docs/source/tuto_s4u/master-workers-lab2.cpp
+++ b/docs/source/tuto_s4u/master-workers-lab2.cpp
@@ -23,8 +23,9 @@ static void worker()
 
   double compute_cost;
   do {
-    auto msg     = mailbox->get_unique<double>();
+    double* msg  = mailbox->get<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);
diff --git a/docs/source/tuto_s4u/master-workers-lab3.cpp b/docs/source/tuto_s4u/master-workers-lab3.cpp
index 5e012ff528..a2f3963a97 100644
--- a/docs/source/tuto_s4u/master-workers-lab3.cpp
+++ b/docs/source/tuto_s4u/master-workers-lab3.cpp
@@ -22,8 +22,9 @@ static void worker()
   simgrid::s4u::Mailbox* mailbox   = simgrid::s4u::Mailbox::by_name(mailbox_name);
 
   while (true) { // Master forcefully kills the workers by the end of the simulation
-    auto msg            = mailbox->get_unique<double>();
+    double* msg         = mailbox->get<double>();
     double compute_cost = *msg;
+    delete msg;
 
     simgrid::s4u::this_actor::execute(compute_cost);
   }
diff --git a/docs/source/tuto_s4u/master-workers-lab4.cpp b/docs/source/tuto_s4u/master-workers-lab4.cpp
index c2c8f4d3b2..7752e31f2e 100644
--- a/docs/source/tuto_s4u/master-workers-lab4.cpp
+++ b/docs/source/tuto_s4u/master-workers-lab4.cpp
@@ -22,8 +22,9 @@ static void worker(std::string category)
   simgrid::s4u::Mailbox* mailbox   = simgrid::s4u::Mailbox::by_name(mailbox_name);
 
   while (true) { // Master forcefully kills the workers by the end of the simulation
-    auto msg            = mailbox->get_unique<double>();
+    double* msg         = mailbox->get<double>();
     double compute_cost = *msg;
+    delete msg;
 
     // simgrid::s4u::this_actor::exec_init(compute_cost)->set_tracing_category(category)->wait();
     /* Long form:*/