X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/25459e0d62df4c763113f6e525707444fbfc4b7e..c10c571a634491a941c1b39c50020da8d709a940:/teshsuite/s4u/actor-suspend/actor-suspend.cpp

diff --git a/teshsuite/s4u/actor-suspend/actor-suspend.cpp b/teshsuite/s4u/actor-suspend/actor-suspend.cpp
index f87fadba5d..91aad4daa1 100644
--- a/teshsuite/s4u/actor-suspend/actor-suspend.cpp
+++ b/teshsuite/s4u/actor-suspend/actor-suspend.cpp
@@ -1,44 +1,38 @@
-/* Copyright (c) 2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2020-2023. 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. */
 
 // This is the MWE of https://framagit.org/simgrid/simgrid/-/issues/50
-// The problem was occuring when suspending an actor that will be executed later in the same scheduling round
+// The problem was occurring when suspending an actor that will be executed later in the same scheduling round
 
+#include <cstdio>
+#include <cstdlib>
 #include <iostream>
 #include <simgrid/s4u.hpp>
-#include <stdio.h>
-#include <stdlib.h>
 #include <vector>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(mwe, "Minimum Working Example");
 
-simgrid::s4u::ActorPtr receiver;
-
 class Receiver {
-
 public:
-  void operator()()
+  void operator()() const
   {
     XBT_INFO("Starting.");
-    simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name("receiver");
-    void* data                     = (void*)2;
-    data                           = mailbox->get();
-    xbt_die("get() has returned (even though it shouldn't!) with a %s message",
-            (data == nullptr ? "null" : "non-null"));
+    auto* mailbox = simgrid::s4u::Mailbox::by_name("receiver");
+    int data     = *mailbox->get<int>();
+    XBT_INFO("Got %d at the end", data);
   }
 };
 
 class Suspender {
+  const simgrid::s4u::ActorPtr& receiver;
 
 public:
-  void operator()()
-  {
-
-    // If we sleep a bit here, this MWE works because the suspender is not trying to suspend someone executed later in
-    // the same scheduling round simgrid::s4u::this_actor::sleep_for(0.01);
+  explicit Suspender(const simgrid::s4u::ActorPtr& receiver) : receiver(receiver) {}
 
+  void operator()() const
+  {
     XBT_INFO("Suspend the receiver...");
     receiver->suspend();
     XBT_INFO("Resume the receiver...");
@@ -46,22 +40,28 @@ public:
 
     XBT_INFO("Sleeping 10 sec...");
     simgrid::s4u::this_actor::sleep_for(10);
+
+    XBT_INFO("Sending a message to the receiver...");
+    auto* mailbox   = simgrid::s4u::Mailbox::by_name("receiver");
+    static int data = 42;
+    mailbox->put(&data, 4);
+
     XBT_INFO("Done!");
   }
 };
 
 int main(int argc, char** argv)
 {
+  simgrid::s4u::Engine engine(&argc, argv);
 
-  simgrid::s4u::Engine* engine = new simgrid::s4u::Engine(&argc, argv);
-
-  engine->load_platform(argv[1]);
-  simgrid::s4u::Host* host = simgrid::s4u::Host::by_name("Tremblay");
+  engine.load_platform(argv[1]);
+  simgrid::s4u::Host* host = engine.host_by_name("Tremblay");
 
-  auto suspender = simgrid::s4u::Actor::create("Suspender", host, Suspender());
-  receiver       = simgrid::s4u::Actor::create("Receiver", host, Receiver());
+  simgrid::s4u::ActorPtr receiver;
+  simgrid::s4u::Actor::create("Suspender", host, Suspender(receiver));
+  receiver = simgrid::s4u::Actor::create("Receiver", host, Receiver());
 
-  engine->run();
+  engine.run();
 
   return 0;
 }