A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
smpi: fix issue with message IDs. In case of persistent request reused multiple times...
[simgrid.git]
/
examples
/
cpp
/
dht-chord
/
s4u-dht-chord.hpp
diff --git
a/examples/cpp/dht-chord/s4u-dht-chord.hpp
b/examples/cpp/dht-chord/s4u-dht-chord.hpp
index 2f8bce5538bcf74c69bee4b15d994769d7a525fb..ab93cbff06fa1473edd7084c042334603d08436c 100644
(file)
--- a/
examples/cpp/dht-chord/s4u-dht-chord.hpp
+++ b/
examples/cpp/dht-chord/s4u-dht-chord.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2016-202
2
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-202
3
. 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. */
/* 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. */
@@
-18,10
+18,6
@@
constexpr double PERIODIC_CHECK_PREDECESSOR_DELAY = 120;
constexpr double PERIODIC_LOOKUP_DELAY = 10;
constexpr double SLEEP_DELAY = 4.9999;
constexpr double PERIODIC_LOOKUP_DELAY = 10;
constexpr double SLEEP_DELAY = 4.9999;
-extern int nb_bits;
-extern int nb_keys;
-extern int timeout;
-
/* Types of tasks exchanged between nodes. */
enum class MessageType {
FIND_SUCCESSOR,
/* Types of tasks exchanged between nodes. */
enum class MessageType {
FIND_SUCCESSOR,
@@
-50,18
+46,26
@@
public:
};
class Node {
};
class Node {
+ inline static int nb_bits_;
+ inline static int nb_keys_;
+ inline static int timeout_;
+
int known_id_ = -1;
double start_time_ = -1;
double deadline_ = -1;
int known_id_ = -1;
double start_time_ = -1;
double deadline_ = -1;
- bool joined
= false;
+ bool joined
_
= false;
int id_; // my id
int pred_id_ = -1; // predecessor id
int id_; // my id
int pred_id_ = -1; // predecessor id
- simgrid::xbt::random::XbtRandom random; // random number generator for this node
- sg4::Mailbox* mailbox_; // my mailbox
+ simgrid::xbt::random::XbtRandom random
_
; // random number generator for this node
+ sg4::Mailbox* mailbox_;
// my mailbox
std::vector<int> fingers_; // finger table,(fingers[0] is my successor)
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()
+ int next_finger_to_fix_; // index of the next finger to fix in fix_fingers()
+
+ static bool is_in_interval(int id, int start, int end);
public:
public:
+ static void set_parameters(int nb_bits, int nb_keys, int timeout);
+
explicit Node(std::vector<std::string> args);
Node(const Node&) = delete;
Node& operator=(const Node&) = delete;
explicit Node(std::vector<std::string> args);
Node(const Node&) = delete;
Node& operator=(const Node&) = delete;