fix some newly introduced smells

diff --git a/examples/s4u/dht-chord/node.cpp b/examples/s4u/dht-chord/node.cpp
index d820693..f9ed22a 100644 (file)
--- a/examples/s4u/dht-chord/node.cpp
+++ b/examples/s4u/dht-chord/node.cpp
@@ -58,7 +58,7 @@ Node::Node(std::vector<std::string> args)
 
   if (args.size() == 3) { // first ring
     deadline_   = std::stod(args[2]);
 
   if (args.size() == 3) { // first ring
     deadline_   = std::stod(args[2]);

-    start_time_ = simgrid::s4u::Engine::instance()->getClock();
+    start_time_ = simgrid::s4u::Engine::getClock();

     XBT_DEBUG("Create a new Chord ring...");
   } else {
     known_id_   = std::stoi(args[2]);
     XBT_DEBUG("Create a new Chord ring...");
   } else {
     known_id_   = std::stoi(args[2]);

diff --git a/examples/s4u/dht-chord/s4u_dht-chord.cpp b/examples/s4u/dht-chord/s4u_dht-chord.cpp
index 4105503..6823989 100644 (file)
--- a/examples/s4u/dht-chord/s4u_dht-chord.cpp
+++ b/examples/s4u/dht-chord/s4u_dht-chord.cpp
@@ -34,7 +34,7 @@ static void chord_init()
     host->extension_set(new HostChord(host));
 }
 
     host->extension_set(new HostChord(host));
 }
 

-static void chord_exit(void)
+static void chord_exit()

 {
   delete[] powers2;
 }
 {
   delete[] powers2;
 }

diff --git a/examples/s4u/dht-chord/s4u_dht-chord.hpp b/examples/s4u/dht-chord/s4u_dht-chord.hpp
index 095ea8c..a8c81eb 100644 (file)
--- a/examples/s4u/dht-chord/s4u_dht-chord.hpp
+++ b/examples/s4u/dht-chord/s4u_dht-chord.hpp
@@ -64,7 +64,10 @@ public:
   int answer_id      = -1;            // answer (used by some types of messages)
   simgrid::s4u::MailboxPtr answer_to; // mailbox to send an answer to (if any)
 
   int answer_id      = -1;            // answer (used by some types of messages)
   simgrid::s4u::MailboxPtr answer_to; // mailbox to send an answer to (if any)
 

-  ChordMessage(e_message_type_t type) : type(type) { issuer_host_name = simgrid::s4u::this_actor::host()->name(); }
+  explicit ChordMessage(e_message_type_t type) : type(type)
+  {
+    issuer_host_name = simgrid::s4u::this_actor::host()->name();
+  }

 
   ~ChordMessage() = default;
 };
 
   ~ChordMessage() = default;
 };


@@ -133,28 +136,28 @@ public:
         // no task was received: make some periodic calls
         if (now >= next_stabilize_date) {
           stabilize();
         // no task was received: make some periodic calls
         if (now >= next_stabilize_date) {
           stabilize();

-          next_stabilize_date = simgrid::s4u::Engine::instance()->getClock() + PERIODIC_STABILIZE_DELAY;
+          next_stabilize_date = simgrid::s4u::Engine::getClock() + PERIODIC_STABILIZE_DELAY;

         } else if (now >= next_fix_fingers_date) {
           fixFingers();
         } else if (now >= next_fix_fingers_date) {
           fixFingers();

-          next_fix_fingers_date = simgrid::s4u::Engine::instance()->getClock() + PERIODIC_FIX_FINGERS_DELAY;
+          next_fix_fingers_date = simgrid::s4u::Engine::getClock() + PERIODIC_FIX_FINGERS_DELAY;

         } else if (now >= next_check_predecessor_date) {
           checkPredecessor();
         } else if (now >= next_check_predecessor_date) {
           checkPredecessor();

-          next_check_predecessor_date = simgrid::s4u::Engine::instance()->getClock() + PERIODIC_CHECK_PREDECESSOR_DELAY;
+          next_check_predecessor_date = simgrid::s4u::Engine::getClock() + PERIODIC_CHECK_PREDECESSOR_DELAY;

         } else if (now >= next_lookup_date) {
           randomLookup();
         } else if (now >= next_lookup_date) {
           randomLookup();

-          next_lookup_date = simgrid::s4u::Engine::instance()->getClock() + PERIODIC_LOOKUP_DELAY;
+          next_lookup_date = simgrid::s4u::Engine::getClock() + PERIODIC_LOOKUP_DELAY;

         } else {
           // nothing to do: sleep for a while
           simgrid::s4u::this_actor::sleep_for(SLEEP_DELAY);
         }
         } else {
           // nothing to do: sleep for a while
           simgrid::s4u::this_actor::sleep_for(SLEEP_DELAY);
         }

-        now = simgrid::s4u::Engine::instance()->getClock();
+        now = simgrid::s4u::Engine::getClock();

       }
 
       if (data != nullptr) {
         message = static_cast<ChordMessage*>(data);
         handleMessage(message);
       }
       }
 
       if (data != nullptr) {
         message = static_cast<ChordMessage*>(data);
         handleMessage(message);
       }

-      now = simgrid::s4u::Engine::instance()->getClock();
+      now = simgrid::s4u::Engine::getClock();

     }
     if (data != nullptr) {
       delete static_cast<ChordMessage*>(data);
     }
     if (data != nullptr) {
       delete static_cast<ChordMessage*>(data);