rename Activity::wait(double) to Activity::wait_for(double)

[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 e618a38..f535b31 100644 (file)
--- a/examples/s4u/dht-chord/s4u-dht-chord-node.cpp
+++ b/examples/s4u/dht-chord/s4u-dht-chord-node.cpp
@@ -17,10 +17,10 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(s4u_chord);
  * 24 belongs to [21, 29]
  * 24 does not belong to [29, 21]
  *
- * \param id id to check
- * \param start lower bound
- * \param end upper bound
- * \return a non-zero value if id in in [start, end]
+ * @param id id to check
+ * @param start lower bound
+ * @param end upper bound
+ * @return a non-zero value if id in in [start, end]
  */
 static int is_in_interval(int id, int start, int end)
 {
@@ -80,8 +80,8 @@ Node::~Node()
 }
 /* Makes the current node join the ring, knowing the id of a node already in the ring
  *
- * \param known_id id of a node already in the ring
- * \return true if the join operation succeeded
+ * @param known_id id of a node already in the ring
+ * @return true if the join operation succeeded
  *  */
 
 void Node::join(int known_id)
@@ -157,9 +157,9 @@ void Node::randomLookup()
 
 /* Sets a finger of the current node.
  *
- * \param node the current node
- * \param finger_index index of the finger to set (0 to nb_bits - 1)
- * \param id the id to set for this finger
+ * @param node the current node
+ * @param finger_index index of the finger to set (0 to nb_bits - 1)
+ * @param id the id to set for this finger
  */
 void Node::setFinger(int finger_index, int id)
 {
@@ -170,7 +170,7 @@ void Node::setFinger(int finger_index, int id)
 }
 
 /* Sets the predecessor of the current node.
- * \param id the id to predecessor, or -1 to unset the predecessor
+ * @param id the id to predecessor, or -1 to unset the predecessor
  */
 void Node::setPredecessor(int predecessor_id)
 {
@@ -239,7 +239,7 @@ void Node::checkPredecessor()
   simgrid::s4u::CommPtr comm = return_mailbox->get_async(&data);
 
   try {
-    comm->wait(timeout);
+    comm->wait_for(timeout);
     XBT_DEBUG("Received the answer to my 'Predecessor Alive': my predecessor %d is alive", pred_id_);
     delete static_cast<ChordMessage*>(data);
   } catch (xbt_ex& e) {
@@ -252,8 +252,8 @@ void Node::checkPredecessor()
 
 /* Asks its predecessor to a remote node
  *
- * \param ask_to the node to ask to
- * \return the id of its predecessor node, or -1 if the request failed (or if the node does not know its predecessor)
+ * @param ask_to the node to ask to
+ * @return the id of its predecessor node, or -1 if the request failed (or if the node does not know its predecessor)
  */
 int Node::remoteGetPredecessor(int ask_to)
 {
@@ -284,7 +284,7 @@ int Node::remoteGetPredecessor(int ask_to)
   simgrid::s4u::CommPtr comm = return_mailbox->get_async(&data);
 
   try {
-    comm->wait(timeout);
+    comm->wait_for(timeout);
     ChordMessage* answer = static_cast<ChordMessage*>(data);
     XBT_DEBUG("Received the answer to my 'Get Predecessor' request: the predecessor of node %d is %d", ask_to,
               answer->answer_id);
@@ -302,8 +302,8 @@ int Node::remoteGetPredecessor(int ask_to)
 
 /* Returns the closest preceding finger of an id with respect to the finger table of the current node.
  *
- * \param id the id to find
- * \return the closest preceding finger of that id
+ * @param id the id to find
+ * @return the closest preceding finger of that id
  */
 int Node::closestPrecedingFinger(int id)
 {
@@ -317,8 +317,8 @@ int Node::closestPrecedingFinger(int id)
 
 /* Makes the current node find the successor node of an id.
  *
- * \param id the id to find
- * \return the id of the successor node, or -1 if the request failed
+ * @param id the id to find
+ * @return the id of the successor node, or -1 if the request failed
  */
 int Node::findSuccessor(int id)
 {
@@ -358,7 +358,7 @@ int Node::remoteFindSuccessor(int ask_to, int id)
   simgrid::s4u::CommPtr comm = return_mailbox->get_async(&data);
 
   try {
-    comm->wait(timeout);
+    comm->wait_for(timeout);
     ChordMessage* answer = static_cast<ChordMessage*>(data);
     XBT_DEBUG("Received the answer to my 'Find Successor' request for id %d: the successor of key %d is %d",
               answer->request_id, id_, answer->answer_id);
@@ -419,7 +419,7 @@ void Node::stabilize()
 
 /* This function is called when a node receives a message.
  *
- * \param message the message to handle (don't touch it afterward: it will be destroyed, reused or forwarded)
+ * @param message the message to handle (don't touch it afterward: it will be destroyed, reused or forwarded)
  */
 void Node::handleMessage(ChordMessage* message)
 {