Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / examples / cpp / mc-bugged1-liveness / s4u-mc-bugged1-liveness.cpp

diff --git a/examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp b/examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp
index d445cbb..ad4d30a 100644 (file)
--- a/examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp
+++ b/examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2012-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. */
@@ -20,13 +20,14 @@
 #include <xbt/dynar.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(bugged1_liveness, "my log messages");
+namespace sg4 = simgrid::s4u;
 
 class Message {
 public:
   enum class Kind { GRANT, REQUEST, RELEASE };
   Kind kind                             = Kind::GRANT;
-  simgrid::s4u::Mailbox* return_mailbox = nullptr;
-  explicit Message(Message::Kind kind, simgrid::s4u::Mailbox* mbox) : kind(kind), return_mailbox(mbox) {}
+  sg4::Mailbox* return_mailbox          = nullptr;
+  explicit Message(Message::Kind kind, sg4::Mailbox* mbox) : kind(kind), return_mailbox(mbox) {}
 };
 
 int r  = 0;
@@ -46,10 +47,10 @@ static void garbage_stack(void)
 
 static void coordinator()
 {
-  int CS_used = 0;
-  std::queue<simgrid::s4u::Mailbox*> requests;
+  bool CS_used = false;
+  std::queue<sg4::Mailbox*> requests;
 
-  simgrid::s4u::Mailbox* mbox = simgrid::s4u::Mailbox::by_name("coordinator");
+  sg4::Mailbox* mbox = sg4::Mailbox::by_name("coordinator");
 
   while (true) {
     auto m = mbox->get_unique<Message>();
@@ -61,23 +62,23 @@ static void coordinator()
         if (m->return_mailbox->get_name() != "1") {
           XBT_INFO("CS idle. Grant immediately");
           m->return_mailbox->put(new Message(Message::Kind::GRANT, mbox), 1000);
-          CS_used = 1;
+          CS_used = true;
         }
       }
     } else {
       if (not requests.empty()) {
         XBT_INFO("CS release. Grant to queued requests (queue size: %zu)", requests.size());
-        simgrid::s4u::Mailbox* req = requests.front();
+        sg4::Mailbox* req = requests.front();
         requests.pop();
         if (req->get_name() != "1") {
           req->put(new Message(Message::Kind::GRANT, mbox), 1000);
         } else {
           requests.push(req);
-          CS_used = 0;
+          CS_used = false;
         }
       } else {
         XBT_INFO("CS release. resource now idle");
-        CS_used = 0;
+        CS_used = false;
       }
     }
   }
@@ -85,13 +86,13 @@ static void coordinator()
 
 static void client(int id)
 {
-  aid_t my_pid = simgrid::s4u::this_actor::get_pid();
+  aid_t my_pid = sg4::this_actor::get_pid();
 
-  simgrid::s4u::Mailbox* my_mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(id));
+  sg4::Mailbox* my_mailbox = sg4::Mailbox::by_name(std::to_string(id));
 
   while (true) {
     XBT_INFO("Ask the request");
-    simgrid::s4u::Mailbox::by_name("coordinator")->put(new Message(Message::Kind::REQUEST, my_mailbox), 1000);
+    sg4::Mailbox::by_name("coordinator")->put(new Message(Message::Kind::REQUEST, my_mailbox), 1000);
 
     if (id == 1) {
       r  = 1;
@@ -100,8 +101,9 @@ static void client(int id)
     }
 
     auto grant = my_mailbox->get_unique<Message>();
+    xbt_assert(grant->kind == Message::Kind::GRANT);
 
-    if ((id == 1) && (grant->kind == Message::Kind::GRANT)) {
+    if (id == 1) {
       cs = 1;
       r  = 0;
       XBT_INFO("Propositions changed : r=0, cs=1");
@@ -109,11 +111,11 @@ static void client(int id)
 
     XBT_INFO("%d got the answer. Sleep a bit and release it", id);
 
-    simgrid::s4u::this_actor::sleep_for(1);
+    sg4::this_actor::sleep_for(1);
 
-    simgrid::s4u::Mailbox::by_name("coordinator")->put(new Message(Message::Kind::RELEASE, my_mailbox), 1000);
+    sg4::Mailbox::by_name("coordinator")->put(new Message(Message::Kind::RELEASE, my_mailbox), 1000);
 
-    simgrid::s4u::this_actor::sleep_for(static_cast<double>(my_pid));
+    sg4::this_actor::sleep_for(static_cast<double>(my_pid));
 
     if (id == 1) {
       cs = 0;
@@ -136,21 +138,21 @@ static void raw_client(int id)
 
 int main(int argc, char* argv[])
 {
-  simgrid::s4u::Engine e(&argc, argv);
+  sg4::Engine e(&argc, argv);
 
   MC_automaton_new_propositional_symbol_pointer("r", &r);
   MC_automaton_new_propositional_symbol_pointer("cs", &cs);
 
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::create("coordinator", simgrid::s4u::Host::by_name("Tremblay"), coordinator)
+  sg4::Actor::create("coordinator", e.host_by_name("Tremblay"), coordinator)
       ->set_kill_time(argc > 3 ? std::stod(argv[3]) : -1.0);
   if (std::stod(argv[2]) == 0) {
-    simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("Boivin"), raw_client, 1);
-    simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("Fafard"), raw_client, 2);
+    sg4::Actor::create("client", e.host_by_name("Boivin"), raw_client, 1);
+    sg4::Actor::create("client", e.host_by_name("Fafard"), raw_client, 2);
   } else { // "Visited" case
-    simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("Boivin"), raw_client, 2);
-    simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("Fafard"), raw_client, 1);
+    sg4::Actor::create("client", e.host_by_name("Boivin"), raw_client, 2);
+    sg4::Actor::create("client", e.host_by_name("Fafard"), raw_client, 1);
   }
   e.run();