Try to ensure test reproducibility.

diff --git a/examples/s4u/dht-chord/s4u-dht-chord-node.cpp b/examples/s4u/dht-chord/s4u-dht-chord-node.cpp
index 992d3a2..8d9640f 100644 (file)
--- a/examples/s4u/dht-chord/s4u-dht-chord-node.cpp
+++ b/examples/s4u/dht-chord/s4u-dht-chord-node.cpp
@@ -134,8 +134,9 @@ void Node::notifyAndQuit()
 void Node::randomLookup()
 {
   int res          = id_;
 void Node::randomLookup()
 {
   int res          = id_;

-  std::uniform_int_distribution<int> dist(0, nb_bits - 1);
-  int random_index = dist(generator);
+  // std::uniform_int_distribution<int> dist(0, nb_bits - 1);
+  // int random_index = dist(generator);
+  int random_index = generator() % nb_bits; // ensure reproducibility across platforms

   int random_id    = fingers_[random_index];
   XBT_DEBUG("Making a lookup request for id %d", random_id);
   if (random_id != id_)
   int random_id    = fingers_[random_index];
   XBT_DEBUG("Making a lookup request for id %d", random_id);
   if (random_id != id_)

diff --git a/examples/s4u/dht-chord/s4u-dht-chord.cpp b/examples/s4u/dht-chord/s4u-dht-chord.cpp
index 33acd5f..b8d20a7 100644 (file)
--- a/examples/s4u/dht-chord/s4u-dht-chord.cpp
+++ b/examples/s4u/dht-chord/s4u-dht-chord.cpp
@@ -11,7 +11,7 @@ int nb_bits  = 24;
 int nb_keys  = 0;
 int timeout  = 50;
 
 int nb_keys  = 0;
 int timeout  = 50;
 

-std::default_random_engine generator;
+std::mt19937 generator;

 
 int main(int argc, char* argv[])
 {
 
 int main(int argc, char* argv[])
 {

diff --git a/examples/s4u/dht-chord/s4u-dht-chord.hpp b/examples/s4u/dht-chord/s4u-dht-chord.hpp
index c279369..81821cf 100644 (file)
--- a/examples/s4u/dht-chord/s4u-dht-chord.hpp
+++ b/examples/s4u/dht-chord/s4u-dht-chord.hpp
@@ -21,7 +21,7 @@ extern int nb_bits;
 extern int nb_keys;
 extern int timeout;
 
 extern int nb_keys;
 extern int timeout;
 

-extern std::default_random_engine generator;
+extern std::mt19937 generator;

 
 /* Types of tasks exchanged between nodes. */
 enum e_message_type_t {
 
 /* Types of tasks exchanged between nodes. */
 enum e_message_type_t {

diff --git a/examples/s4u/dht-chord/s4u-dht-chord.tesh b/examples/s4u/dht-chord/s4u-dht-chord.tesh
index a89aaf6..b1ad038 100644 (file)
--- a/examples/s4u/dht-chord/s4u-dht-chord.tesh
+++ b/examples/s4u/dht-chord/s4u-dht-chord.tesh
@@ -150,67 +150,73 @@ $ ${bindir:=.}/s4u-dht-chord -nb_bits=3 ${platfdir}/cluster_backbone.xml s4u-dht
 > [ 300.15112] (node@node-4.simgrid.org) Predecessor: 42
 > [ 305.14321] (node@node-5.simgrid.org) My new finger #0 is 533744
 > [ 305.16663] (node@node-0.simgrid.org) My new finger #0 is 10874876
 > [ 300.15112] (node@node-4.simgrid.org) Predecessor: 42
 > [ 305.14321] (node@node-5.simgrid.org) My new finger #0 is 533744
 > [ 305.16663] (node@node-0.simgrid.org) My new finger #0 is 10874876

-> [ 310.17434] (node@node-6.simgrid.org) My new finger #1 is 42
-> [ 310.17434] (node@node-6.simgrid.org) My finger table:
-> [ 310.17434] (node@node-6.simgrid.org) Start | Succ
-> [ 310.17434] (node@node-6.simgrid.org)    1  |  42
-> [ 310.17434] (node@node-6.simgrid.org)    2  |  42
-> [ 310.17434] (node@node-6.simgrid.org)    4  | 16728096
-> [ 310.17434] (node@node-6.simgrid.org) Predecessor: -1
-> [ 340.18155] (node@node-5.simgrid.org) My new finger #0 is 16509405
+> [ 315.17424] (node@node-6.simgrid.org) My new finger #1 is 42
+> [ 315.17424] (node@node-6.simgrid.org) My finger table:
+> [ 315.17424] (node@node-6.simgrid.org) Start | Succ
+> [ 315.17424] (node@node-6.simgrid.org)    1  |  42
+> [ 315.17424] (node@node-6.simgrid.org)    2  |  42
+> [ 315.17424] (node@node-6.simgrid.org)    4  | 16728096
+> [ 315.17424] (node@node-6.simgrid.org) Predecessor: -1

 > [ 340.18935] (node@node-4.simgrid.org) Well Guys! I Think it's time for me to leave ;)
 > [ 340.18935] (node@node-4.simgrid.org) Well Guys! I Think it's time for me to leave ;)

-> [ 345.18145] (node@node-5.simgrid.org) My new predecessor is 42
-> [ 345.18145] (node@node-5.simgrid.org) My finger table:
-> [ 345.18145] (node@node-5.simgrid.org) Start | Succ
-> [ 345.18145] (node@node-5.simgrid.org)    5  | 16509405
-> [ 345.18145] (node@node-5.simgrid.org)    6  | 10874876
-> [ 345.18145] (node@node-5.simgrid.org)    0  | 10874876
-> [ 345.18145] (node@node-5.simgrid.org) Predecessor: 42
-> [ 350.17354] (node@node-2.simgrid.org) My new predecessor is 42
-> [ 395.18925] (node@node-0.simgrid.org) My new finger #0 is 533744
-> [ 395.20486] (node@node-0.simgrid.org) My new finger #2 is 533744
-> [ 395.20486] (node@node-0.simgrid.org) My finger table:
-> [ 395.20486] (node@node-0.simgrid.org) Start | Succ
-> [ 395.20486] (node@node-0.simgrid.org)    3  | 533744
-> [ 395.20486] (node@node-0.simgrid.org)    4  | 16509405
-> [ 395.20486] (node@node-0.simgrid.org)    6  | 533744
-> [ 395.20486] (node@node-0.simgrid.org) Predecessor: 533744
-> [ 420.21217] (node@node-2.simgrid.org) Well Guys! I Think it's time for me to leave ;)
-> [ 420.23559] (node@node-0.simgrid.org) My new predecessor is 42
-> [ 425.23549] (node@node-0.simgrid.org) My new finger #0 is 42
-> [ 440.23519] (node@node-0.simgrid.org) My new predecessor is 16728096
-> [ 440.23519] (node@node-0.simgrid.org) My finger table:
-> [ 440.23519] (node@node-0.simgrid.org) Start | Succ
-> [ 440.23519] (node@node-0.simgrid.org)    3  |  42
-> [ 440.23519] (node@node-0.simgrid.org)    4  | 16509405
-> [ 440.23519] (node@node-0.simgrid.org)    6  | 533744
-> [ 440.23519] (node@node-0.simgrid.org) Predecessor: 16728096
-> [ 440.23519] (node@node-0.simgrid.org) My new finger #0 is 16728096
-> [ 470.24239] (node@node-6.simgrid.org) My new predecessor is 42
-> [ 470.24239] (node@node-6.simgrid.org) My finger table:
-> [ 470.24239] (node@node-6.simgrid.org) Start | Succ
-> [ 470.24239] (node@node-6.simgrid.org)    1  |  42
-> [ 470.24239] (node@node-6.simgrid.org)    2  |  42
-> [ 470.24239] (node@node-6.simgrid.org)    4  | 16728096
-> [ 470.24239] (node@node-6.simgrid.org) Predecessor: 42
-> [ 635.37180] (node@node-0.simgrid.org) My new finger #1 is 16728096
-> [ 635.37180] (node@node-0.simgrid.org) My finger table:
-> [ 635.37180] (node@node-0.simgrid.org) Start | Succ
-> [ 635.37180] (node@node-0.simgrid.org)    3  | 16728096
-> [ 635.37180] (node@node-0.simgrid.org)    4  | 16728096
-> [ 635.37180] (node@node-0.simgrid.org)    6  | 533744
-> [ 635.37180] (node@node-0.simgrid.org) Predecessor: 16728096
-> [ 755.43185] (node@node-0.simgrid.org) My new finger #2 is 16728096
-> [ 755.43185] (node@node-0.simgrid.org) My finger table:
-> [ 755.43185] (node@node-0.simgrid.org) Start | Succ
-> [ 755.43185] (node@node-0.simgrid.org)    3  | 16728096
-> [ 755.43185] (node@node-0.simgrid.org)    4  | 16728096
-> [ 755.43185] (node@node-0.simgrid.org)    6  | 16728096
-> [ 755.43185] (node@node-0.simgrid.org) Predecessor: 16728096
-> [ 850.51581] (node@node-5.simgrid.org) Well Guys! I Think it's time for me to leave ;)
-> [ 860.51561] (node@node-6.simgrid.org) Well Guys! I Think it's time for me to leave ;)
-> [ 865.52332] (node@node-0.simgrid.org) My new predecessor is 42
-> [ 870.52322] (node@node-0.simgrid.org) My new finger #0 is 42
-> [ 950.52262] (node@node-0.simgrid.org) My new finger #0 is 16509405
-> [1000.52262] (node@node-0.simgrid.org) Well Guys! I Think it's time for me to leave ;)
-> [1050.52262] (maestro@) Simulated time: 1050.52
+> [ 340.19716] (node@node-5.simgrid.org) My new finger #0 is 16509405
+> [ 345.18925] (node@node-2.simgrid.org) My new predecessor is 42
+> [ 345.19706] (node@node-5.simgrid.org) My new predecessor is 42
+> [ 345.19706] (node@node-5.simgrid.org) My finger table:
+> [ 345.19706] (node@node-5.simgrid.org) Start | Succ
+> [ 345.19706] (node@node-5.simgrid.org)    5  | 16509405
+> [ 345.19706] (node@node-5.simgrid.org)    6  | 10874876
+> [ 345.19706] (node@node-5.simgrid.org)    0  | 10874876
+> [ 345.19706] (node@node-5.simgrid.org) Predecessor: 42
+> [ 350.18135] (node@node-0.simgrid.org) My new finger #0 is 533744
+> [ 350.18915] (node@node-2.simgrid.org) My new predecessor is 10874876
+> [ 350.18915] (node@node-2.simgrid.org) My finger table:
+> [ 350.18915] (node@node-2.simgrid.org) Start | Succ
+> [ 350.18915] (node@node-2.simgrid.org)    1  |  42
+> [ 350.18915] (node@node-2.simgrid.org)    2  |  42
+> [ 350.18915] (node@node-2.simgrid.org)    4  | 533744
+> [ 350.18915] (node@node-2.simgrid.org) Predecessor: 10874876
+> [ 360.19676] (node@node-0.simgrid.org) My new finger #2 is 533744
+> [ 360.19676] (node@node-0.simgrid.org) My finger table:
+> [ 360.19676] (node@node-0.simgrid.org) Start | Succ
+> [ 360.19676] (node@node-0.simgrid.org)    3  | 533744
+> [ 360.19676] (node@node-0.simgrid.org)    4  | 16509405
+> [ 360.19676] (node@node-0.simgrid.org)    6  | 533744
+> [ 360.19676] (node@node-0.simgrid.org) Predecessor: 533744
+> [ 375.22768] (node@node-0.simgrid.org) My new finger #0 is 10874876
+> [ 435.25871] (node@node-2.simgrid.org) Well Guys! I Think it's time for me to leave ;)
+> [ 495.25851] (node@node-5.simgrid.org) My new finger #0 is 42
+> [ 545.29754] (node@node-5.simgrid.org) My new finger #0 is 533744
+> [ 545.29754] (node@node-5.simgrid.org) My new finger #1 is 533744
+> [ 545.29754] (node@node-5.simgrid.org) My finger table:
+> [ 545.29754] (node@node-5.simgrid.org) Start | Succ
+> [ 545.29754] (node@node-5.simgrid.org)    5  | 533744
+> [ 545.29754] (node@node-5.simgrid.org)    6  | 533744
+> [ 545.29754] (node@node-5.simgrid.org)    0  | 10874876
+> [ 545.29754] (node@node-5.simgrid.org) Predecessor: 42
+> [ 615.32055] (node@node-0.simgrid.org) My new finger #1 is 10874876
+> [ 615.32055] (node@node-0.simgrid.org) My finger table:
+> [ 615.32055] (node@node-0.simgrid.org) Start | Succ
+> [ 615.32055] (node@node-0.simgrid.org)    3  | 10874876
+> [ 615.32055] (node@node-0.simgrid.org)    4  | 10874876
+> [ 615.32055] (node@node-0.simgrid.org)    6  | 533744
+> [ 615.32055] (node@node-0.simgrid.org) Predecessor: 533744
+> [ 660.33627] (node@node-6.simgrid.org) My new finger #2 is 533744
+> [ 660.33627] (node@node-6.simgrid.org) My finger table:
+> [ 660.33627] (node@node-6.simgrid.org) Start | Succ
+> [ 660.33627] (node@node-6.simgrid.org)    1  |  42
+> [ 660.33627] (node@node-6.simgrid.org)    2  |  42
+> [ 660.33627] (node@node-6.simgrid.org)    4  | 533744
+> [ 660.33627] (node@node-6.simgrid.org) Predecessor: -1
+> [ 665.32836] (node@node-5.simgrid.org) My new finger #2 is 533744
+> [ 665.32836] (node@node-5.simgrid.org) My finger table:
+> [ 665.32836] (node@node-5.simgrid.org) Start | Succ
+> [ 665.32836] (node@node-5.simgrid.org)    5  | 533744
+> [ 665.32836] (node@node-5.simgrid.org)    6  | 533744
+> [ 665.32836] (node@node-5.simgrid.org)    0  | 533744
+> [ 665.32836] (node@node-5.simgrid.org) Predecessor: 42
+> [ 860.38210] (node@node-6.simgrid.org) Well Guys! I Think it's time for me to leave ;)
+> [ 875.36619] (node@node-5.simgrid.org) Well Guys! I Think it's time for me to leave ;)
+> [ 905.39001] (node@node-0.simgrid.org) My new predecessor is -1
+> [ 955.39001] (node@node-0.simgrid.org) My new finger #0 is 533744
+> [1030.38951] (node@node-0.simgrid.org) Well Guys! I Think it's time for me to leave ;)
+> [1080.38951] (maestro@) Simulated time: 1080.39