X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc1369e2055686dde3d178efb2001dbad8972d54..1738c10ed9593cdd280ec4d911902cd282fb5317:/examples/s4u/dht-chord/s4u-dht-chord.hpp

diff --git a/examples/s4u/dht-chord/s4u-dht-chord.hpp b/examples/s4u/dht-chord/s4u-dht-chord.hpp
index 12b6921640..d303e7fd76 100644
--- a/examples/s4u/dht-chord/s4u-dht-chord.hpp
+++ b/examples/s4u/dht-chord/s4u-dht-chord.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2016-2020. 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. */
@@ -7,7 +7,7 @@
 #define S4U_CHORD_HPP
 #include "simgrid/s4u.hpp"
 #include <string>
-#include <xbt/RngStream.h>
+#include <xbt/random.hpp>
 #include <xbt/str.h>
 
 constexpr double MAX_SIMULATION_TIME              = 1000;
@@ -21,27 +21,8 @@ extern int nb_bits;
 extern int nb_keys;
 extern int timeout;
 
-class HostChord {
-  std::unique_ptr<std::remove_pointer<RngStream>::type, std::function<void(RngStream)>> stream_ = {
-      nullptr, [](RngStream stream) { RngStream_DeleteStream(&stream); }};
-  simgrid::s4u::Host* host = nullptr;
-
-public:
-  static simgrid::xbt::Extension<simgrid::s4u::Host, HostChord> EXTENSION_ID;
-
-  explicit HostChord(simgrid::s4u::Host* ptr) : host(ptr)
-  {
-    std::string descr = std::string("RngSream<") + host->get_cname() + ">";
-    stream_.reset(RngStream_CreateStream(descr.c_str()));
-  }
-  HostChord(const HostChord&) = delete;
-  HostChord& operator=(const HostChord&) = delete;
-
-  RngStream getStream() { return stream_.get(); };
-};
-
 /* Types of tasks exchanged between nodes. */
-enum e_message_type_t {
+enum class MessageType {
   FIND_SUCCESSOR,
   FIND_SUCCESSOR_ANSWER,
   GET_PREDECESSOR,
@@ -55,17 +36,14 @@ enum e_message_type_t {
 
 class ChordMessage {
 public:
-  e_message_type_t type;              // type of message
-  std::string issuer_host_name;       // used for logging
+  MessageType type;                                                                    // type of message
+  std::string issuer_host_name     = simgrid::s4u::this_actor::get_host()->get_name(); // used for logging
   int request_id     = -1;            // id (used by some types of messages)
   int request_finger = 1;             // finger parameter (used by some types of messages)
   int answer_id      = -1;            // answer (used by some types of messages)
   simgrid::s4u::Mailbox* answer_to = nullptr;       // mailbox to send an answer to (if any)
 
-  explicit ChordMessage(e_message_type_t type)
-      : type(type), issuer_host_name(simgrid::s4u::this_actor::get_host()->get_name())
-  {
-  }
+  explicit ChordMessage(MessageType type) : type(type) {}
 
   static void destroy(void* message);
 };
@@ -77,10 +55,10 @@ class Node {
   bool joined        = false;
   int id_;                           // my id
   int pred_id_ = -1;                 // predecessor id
+  simgrid::xbt::random::XbtRandom random; // random number generator for this node
   simgrid::s4u::Mailbox* mailbox_;   // my mailbox
   std::vector<int> fingers_;         // finger table,(fingers[0] is my successor)
   int next_finger_to_fix;            // index of the next finger to fix in fix_fingers()
-  RngStream stream;
 
 public:
   explicit Node(std::vector<std::string> args);
@@ -103,71 +81,11 @@ public:
   int remoteFindSuccessor(int ask_to, int id);
 
   void notify(int predecessor_candidate_id);
-  void remoteNotify(int notify_id, int predecessor_candidate_id);
+  void remoteNotify(int notify_id, int predecessor_candidate_id) const;
   void stabilize();
   void handleMessage(ChordMessage* message);
 
-  void operator()()
-  {
-    simgrid::s4u::this_actor::sleep_for(start_time_);
-    if (known_id_ == -1) {
-      setPredecessor(-1); // -1 means that I have no predecessor
-      printFingerTable();
-      joined = true;
-    } else {
-      join(known_id_);
-    }
-
-    if (not joined)
-      return;
-    void* data                         = nullptr;
-    double now                         = simgrid::s4u::Engine::get_clock();
-    double next_stabilize_date         = start_time_ + PERIODIC_STABILIZE_DELAY;
-    double next_fix_fingers_date       = start_time_ + PERIODIC_FIX_FINGERS_DELAY;
-    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) {
-      if (comm_receive == nullptr)
-        comm_receive = mailbox_->get_async(&data);
-      while ((now < (start_time_ + deadline_)) && now < MAX_SIMULATION_TIME && not comm_receive->test()) {
-        // no task was received: make some periodic calls
-        if (now >= next_stabilize_date) {
-          stabilize();
-          next_stabilize_date = simgrid::s4u::Engine::get_clock() + PERIODIC_STABILIZE_DELAY;
-        } else if (now >= next_fix_fingers_date) {
-          fixFingers();
-          next_fix_fingers_date = simgrid::s4u::Engine::get_clock() + PERIODIC_FIX_FINGERS_DELAY;
-        } else if (now >= next_check_predecessor_date) {
-          checkPredecessor();
-          next_check_predecessor_date = simgrid::s4u::Engine::get_clock() + PERIODIC_CHECK_PREDECESSOR_DELAY;
-        } else if (now >= next_lookup_date) {
-          randomLookup();
-          next_lookup_date = simgrid::s4u::Engine::get_clock() + PERIODIC_LOOKUP_DELAY;
-        } else {
-          // 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();
-    }
-    // leave the ring
-    leave();
-  }
+  void operator()();
 };
 
 #endif