doc: fix formating and functions signatures

[simgrid.git] / examples / s4u / dht-chord / s4u-dht-chord-node.cpp

diff --git a/examples/s4u/dht-chord/s4u-dht-chord-node.cpp b/examples/s4u/dht-chord/s4u-dht-chord-node.cpp
index 1b9f3bdcf8693a1a70c883cee433bcaedb1b692e..fbfdec60f3f9d1089e41cfd0d7aca59f6c3758b6 100644 (file)
--- a/examples/s4u/dht-chord/s4u-dht-chord-node.cpp
+++ b/examples/s4u/dht-chord/s4u-dht-chord-node.cpp
@@ -52,6 +52,8 @@ Node::Node(std::vector<std::string> args)
 
   // initialize my node
   id_                = std::stoi(args[1]);
+  XBT_DEBUG("Initialize node with id: %d", id_);
+  random.set_seed(id_);
   mailbox_           = simgrid::s4u::Mailbox::by_name(std::to_string(id_));
   next_finger_to_fix = 0;
   fingers_.resize(nb_bits, id_);
@@ -134,7 +136,7 @@ void Node::notifyAndQuit()
 void Node::randomLookup()
 {
   int res          = id_;
-  int random_index = simgrid::xbt::random::uniform_int(0, nb_bits - 1);
+  int random_index = random.uniform_int(0, nb_bits - 1);
   int random_id    = fingers_[random_index];
   XBT_DEBUG("Making a lookup request for id %d", random_id);
   if (random_id != id_)
@@ -362,7 +364,7 @@ void Node::notify(int predecessor_candidate_id)
 }
 
 /* Notifies a remote node that its predecessor may have changed. */
-void Node::remoteNotify(int notify_id, int predecessor_candidate_id)
+void Node::remoteNotify(int notify_id, int predecessor_candidate_id) const
 {
   ChordMessage* message = new ChordMessage(NOTIFY);
   message->request_id   = predecessor_candidate_id;
@@ -495,10 +497,25 @@ void Node::operator()()
   double next_check_predecessor_date = start_time_ + PERIODIC_CHECK_PREDECESSOR_DELAY;
   double next_lookup_date            = start_time_ + PERIODIC_LOOKUP_DELAY;
   simgrid::s4u::CommPtr comm_receive = nullptr;
-  while ((now < (start_time_ + deadline_)) && now < MAX_SIMULATION_TIME) {
+  while (now < std::min(start_time_ + deadline_, MAX_SIMULATION_TIME)) {
     if (comm_receive == nullptr)
       comm_receive = mailbox_->get_async(&data);
-    while ((now < (start_time_ + deadline_)) && now < MAX_SIMULATION_TIME && not comm_receive->test()) {
+    bool comm_completed = true;
+    try {
+      if (not comm_receive->test())
+        comm_completed = false;
+    } catch (const simgrid::TimeoutException&) {
+      XBT_DEBUG("Caught a timeout, go ahead.");
+    }
+
+    if (comm_completed) {
+      if (data != nullptr) {
+        ChordMessage* message = static_cast<ChordMessage*>(data);
+        handleMessage(message);
+        data = nullptr;
+      }
+      comm_receive = nullptr;
+    } else {
       // no task was received: make some periodic calls
       if (now >= next_stabilize_date) {
         stabilize();
@@ -516,22 +533,19 @@ void Node::operator()()
         // nothing to do: sleep for a while
         simgrid::s4u::this_actor::sleep_for(SLEEP_DELAY);
       }
-      now = simgrid::s4u::Engine::get_clock();
     }
 
-    if (data != nullptr) {
-      ChordMessage* message = static_cast<ChordMessage*>(data);
-      handleMessage(message);
-      comm_receive = nullptr;
-      data         = nullptr;
-    }
     now = simgrid::s4u::Engine::get_clock();
   }
   if (comm_receive != nullptr) {
-    if (comm_receive->test())
-      delete static_cast<ChordMessage*>(data);
-    else
-      comm_receive->cancel();
+    try {
+      if (comm_receive->test())
+        delete static_cast<ChordMessage*>(data);
+      else
+        comm_receive->cancel();
+    } catch (const simgrid::TimeoutException&) {
+      XBT_DEBUG("Caught a timeout for last message, nevermind.");
+    }
   }
   // leave the ring
   leave();