Sonar here too.

* remove global variables
* delete unused copy constructor/assignment operator
* use const reference

diff --git a/teshsuite/s4u/monkey-semaphore/monkey-semaphore.cpp b/teshsuite/s4u/monkey-semaphore/monkey-semaphore.cpp
index 04db14b..3612aad 100644 (file)
--- a/teshsuite/s4u/monkey-semaphore/monkey-semaphore.cpp
+++ b/teshsuite/s4u/monkey-semaphore/monkey-semaphore.cpp
@@ -13,23 +13,24 @@ namespace sg4 = simgrid::s4u;
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(sem_monkey, "Simple test of the semaphore");
 
-int buffer;                                              /* Where the data is exchanged */
-sg4::SemaphorePtr sem_empty = sg4::Semaphore::create(1); /* indicates whether the buffer is empty */
-sg4::SemaphorePtr sem_full  = sg4::Semaphore::create(0); /* indicates whether the buffer is full */
-
 static simgrid::config::Flag<int> cfg_item_count{"item-count", "Amount of items that must be exchanged to succeed", 2};
 static simgrid::config::Flag<double> cfg_deadline{"deadline", "When to fail the simulation (infinite loop detection)",
                                                   120};
 
-int todo; // remaining amount of items to exchange
+struct SharedBuffer {
+  int value;                                               /* Where the data is exchanged */
+  sg4::SemaphorePtr sem_empty = sg4::Semaphore::create(1); /* indicates whether the buffer is empty */
+  sg4::SemaphorePtr sem_full  = sg4::Semaphore::create(0); /* indicates whether the buffer is full */
+};
 
 // A stack to keep track of semaphores.  When destroyed, semaphores remaining on stack are automatically released.
 class SemStack {
   std::vector<sg4::Semaphore*> to_release;
 
 public:
-  void push(sg4::SemaphorePtr& sem) { to_release.push_back(sem.get()); }
-  void pop() { to_release.pop_back(); }
+  SemStack()                = default;
+  SemStack(const SemStack&) = delete;
+  SemStack& operator=(const SemStack&) = delete;
   ~SemStack()
   {
     for (auto* sem : to_release) {
@@ -37,11 +38,14 @@ public:
       XBT_INFO("Released a semaphore on exit. It's now %d", sem->get_capacity());
     }
   }
+  void push(const sg4::SemaphorePtr& sem) { to_release.push_back(sem.get()); }
+  void pop() { to_release.pop_back(); }
 };
 
-static void producer()
+static void producer(SharedBuffer& buf)
 {
   static bool inited = false;
+  static int todo    = cfg_item_count; // remaining amount of items to exchange
   SemStack to_release;
   XBT_INFO("Producer %s", inited ? "rebooting" : "booting");
 
@@ -57,22 +61,23 @@ static void producer()
 
     sg4::this_actor::sleep_for(1); // Give a chance to the monkey to kill this actor at this point
 
-    while (sem_empty->acquire_timeout(10))
+    while (buf.sem_empty->acquire_timeout(10))
       XBT_INFO("Timeouted");
-    to_release.push(sem_empty);
+    to_release.push(buf.sem_empty);
     XBT_INFO("sem_empty acquired");
 
     sg4::this_actor::sleep_for(1); // Give a chance to the monkey to kill this actor at this point
 
     XBT_INFO("Pushing item %d", todo - 1);
-    buffer = todo - 1;
-    sem_full->release();
+    buf.value = todo - 1;
+    buf.sem_full->release();
     to_release.pop();
     XBT_INFO("sem_empty removed from to_release");
     todo--;
   }
 }
-static void consumer()
+
+static void consumer(const SharedBuffer& buf)
 {
   SemStack to_release;
 
@@ -91,15 +96,15 @@ static void consumer()
 
     sg4::this_actor::sleep_for(0.75); // Give a chance to the monkey to kill this actor at this point
 
-    while (sem_full->acquire_timeout(10))
+    while (buf.sem_full->acquire_timeout(10))
       XBT_INFO("Timeouted");
-    to_release.push(sem_full);
+    to_release.push(buf.sem_full);
 
     sg4::this_actor::sleep_for(0.75); // Give a chance to the monkey to kill this actor at this point
 
-    item = buffer;
+    item = buf.value;
     XBT_INFO("Receiving item %d", item);
-    sem_empty->release();
+    buf.sem_empty->release();
     to_release.pop();
   } while (item != 0);
 
@@ -110,15 +115,15 @@ int main(int argc, char** argv)
 {
   sg4::Engine e(&argc, argv);
 
-  todo           = cfg_item_count;
   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);
 
-  sg4::Actor::create("producer", paul, producer)->set_auto_restart();
-  sg4::Actor::create("consumer", carol, consumer)->set_auto_restart();
+  SharedBuffer buffer;
+  sg4::Actor::create("producer", paul, producer, std::ref(buffer))->set_auto_restart();
+  sg4::Actor::create("consumer", carol, consumer, std::cref(buffer))->set_auto_restart();
   e.run();
 
   return 0;