Another attempt at fixing the Flag2 job of jenkins

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

diff --git a/teshsuite/s4u/monkey-semaphore/monkey-semaphore.cpp b/teshsuite/s4u/monkey-semaphore/monkey-semaphore.cpp
index 4ac8ad9..6e73575 100644 (file)
--- a/teshsuite/s4u/monkey-semaphore/monkey-semaphore.cpp
+++ b/teshsuite/s4u/monkey-semaphore/monkey-semaphore.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-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. */
@@ -28,15 +28,14 @@ class SemStack {
   std::vector<sg4::Semaphore*> to_release;
 
 public:
-  SemStack()                = default;
-  SemStack(const SemStack&) = delete;
-  SemStack& operator=(const SemStack&) = delete;
-  ~SemStack()
+  void clear()
   {
-    for (auto* sem : to_release) {
+    while (not to_release.empty()) {
+      auto* sem = to_release.back();
       XBT_INFO("Go release a semaphore");
       sem->release();
-      XBT_INFO("Released a semaphore on exit. It's now %d", sem->get_capacity());
+      XBT_INFO("Released a semaphore on reboot. It's now %d", sem->get_capacity());
+      to_release.pop_back();
     }
   }
   void push(const sg4::SemaphorePtr& sem) { to_release.push_back(sem.get()); }
@@ -46,13 +45,14 @@ public:
 static void producer(SharedBuffer& buf)
 {
   static int todo    = cfg_item_count; // remaining amount of items to exchange
-  SemStack to_release;
+  static SemStack to_release;
   bool rebooting = sg4::Actor::self()->get_restart_count() > 0;
 
   XBT_INFO("Producer %s", rebooting ? "rebooting" : "booting");
   if (not rebooting) // Starting for the first time
     sg4::this_actor::on_exit(
         [](bool forcefully) { XBT_INFO("Producer dying %s.", forcefully ? "forcefully" : "peacefully"); });
+  to_release.clear();
 
   while (todo > 0) {
     sg4::this_actor::sleep_for(1); // Give a chance to the monkey to kill this actor at this point
@@ -78,13 +78,14 @@ static void producer(SharedBuffer& buf)
 
 static void consumer(const SharedBuffer& buf)
 {
-  SemStack to_release;
+  static SemStack to_release;
   bool rebooting = sg4::Actor::self()->get_restart_count() > 0;
 
   XBT_INFO("Consumer %s", rebooting ? "rebooting" : "booting");
   if (not rebooting) // Starting for the first time
     sg4::this_actor::on_exit(
         [](bool forcefully) { XBT_INFO("Consumer dying %s.", forcefully ? "forcefully" : "peacefully"); });
+  to_release.clear();
 
   int item;
   do {
@@ -115,8 +116,8 @@ int main(int argc, char** argv)
   auto* rootzone = sg4::create_full_zone("root");
   auto* paul     = rootzone->create_host("Paul", 1e9);
   auto* carol    = rootzone->create_host("Carol", 1e9);
-  sg4::LinkInRoute link(rootzone->create_link("link", "1MBps")->set_latency("24us")->seal());
-  rootzone->add_route(paul->get_netpoint(), carol->get_netpoint(), nullptr, nullptr, {link}, true);
+  auto* link     = rootzone->create_link("link", "1MBps")->set_latency("24us")->seal();
+  rootzone->add_route(paul, carol, {link});
 
   SharedBuffer buffer;
   sg4::Actor::create("producer", paul, producer, std::ref(buffer))->set_auto_restart();