X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/905e47989f71d55afccee472799ccabc526ee7cd..7b28e9e1bfe2348d1a820e78d8867ba325dcd03b:/examples/msg/chord/chord.c

diff --git a/examples/msg/chord/chord.c b/examples/msg/chord/chord.c
index 4b6cb50364..7b9bf0eed9 100644
--- a/examples/msg/chord/chord.c
+++ b/examples/msg/chord/chord.c
@@ -20,7 +20,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_chord,
  */
 typedef struct finger {
   int id;
-  const char* mailbox;
+  char* mailbox;
 } s_finger_t, *finger_t;
 
 /**
@@ -28,11 +28,12 @@ typedef struct finger {
  */
 typedef struct node {
   int id;                                 // my id
-  const char* mailbox;
+  char* mailbox;                          // my usual mailbox name
   s_finger_t fingers[NB_BITS];            // finger table (fingers[0] is my successor)
   int pred_id;                            // predecessor id
-  const char* pred_mailbox;
-  xbt_dynar_t comms;                      // current communications to finish
+  char* pred_mailbox;                     // predecessor's mailbox name
+  int next_finger_to_fix;                 // index of the next finger to fix in fix_fingers()
+  xbt_dynar_t comms;                      // current communications pending
 } s_node_t, *node_t;
 
 /**
@@ -44,49 +45,79 @@ typedef struct task_data {
   int answer_id;
   const char* answer_to;
   const char* issuer_host_name; // used for logging
+  int successor_id;				// used when quitting
+  int pred_id;  				// used when quitting
+  // FIXME: remove successor_id and pred_id, request_id is enough
 } s_task_data_t, *task_data_t;
 
+static int powers2[NB_BITS];
+
 // utility functions
+static void chord_initialize(void);
 static int normalize(int id);
 static int is_in_interval(int id, int start, int end);
 static char* get_mailbox(int host_id);
 static void print_finger_table(node_t node);
+static void set_finger(node_t node, int finger_index, int id);
+static void set_predecessor(node_t node, int predecessor_id);
 
 // process functions
 static int node(int argc, char *argv[]);
 
-// initialization
-static void initialize_first_node(node_t node);
-static void initialize_finger_table(node_t data, int known_id);
-static void join(node_t node, int known_id);
-
 // Chord core
+static void create(node_t node);
+static void join(node_t node, int known_id);
+static void leave(node_t node);
 static int find_successor(node_t node, int id);
 static int remote_find_successor(node_t node, int ask_to_id, int id);
+static int remote_get_predecessor(node_t node, int ask_to_id);
+static int closest_preceding_node(node_t node, int id);
+static void stabilize(node_t node);
+static void notify(node_t node, int predecessor_candidate_id);
+static void remote_notify(node_t node, int notify_to, int predecessor_candidate_id);
+static void fix_fingers(node_t node);
+static void check_predecessor(node_t node);
+static void quit_notify(node_t node, int to);
+
+// not implemented yet
+//static void remote_move_keys(node_t node, int take_from_id);
+
+// deprecated
+/*
+static void bootstrap(node_t node, int known_id);
 static int find_predecessor(node_t node, int id);
 static int remote_find_predecessor(node_t node, int ask_to_id, int id);
-static int closest_preceding_finger(node_t node, int id);
 static int remote_closest_preceding_finger(int ask_to_id, int id);
 static void notify_predecessors(node_t node);
-static void remote_move_keys(node_t node, int take_from_id);
+static void initialize_finger_table(node_t data, int known_id);
 static void update_finger_table(node_t node, int candidate_id, int finger_index);
 static void remote_update_finger_table(node_t node, int ask_to_id, int candidate_id, int finger_index);
-static void notify(node_t node, int predecessor_candidate_id);
-static void remote_notify(node_t node, int notify_to, int predecessor_candidate_id);
-static void stabilize(node_t node);
+static void notify_node_joined(node_t node, int new_node_id);
+static void remote_notify_node_joined(node_t node, int notify_id);
+*/
+
+static void chord_initialize(void)
+{
+  // compute the powers of 2 once for all
+  int pow = 1;
+  int i;
+  for (i = 0; i < NB_BITS; i++) {
+    powers2[i] = pow;
+    pow = pow << 1;
+  }
+}
 
 /**
  * \brief Turns an id into an equivalent id in [0, NB_KEYS[
  * \param id an id
  * \return the corresponding normalized id
  */
-static int normalize(int id) {
-
+static int normalize(int id)
+{
   // make sure id >= 0
   while (id < 0) {
     id += NB_KEYS;
   }
-
   // make sure id < NB_KEYS
   id = id % NB_KEYS;
 
@@ -109,8 +140,8 @@ static int normalize(int id) {
  * \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) {
-
+static int is_in_interval(int id, int start, int end)
+{
   id = normalize(id);
   start = normalize(start);
   end = normalize(end);
@@ -133,8 +164,8 @@ static int is_in_interval(int id, int start, int end) {
  * \return the name of its mailbox
  * FIXME: free the memory
  */
-static char* get_mailbox(int node_id) {
-
+static char* get_mailbox(int node_id)
+{
   return bprintf("mailbox%d", node_id);
 }
 
@@ -142,19 +173,50 @@ static char* get_mailbox(int node_id) {
  * \brief Displays the finger table of a node.
  * \param node a node
  */
-static void print_finger_table(node_t node) {
-
+static void print_finger_table(node_t node)
+{
   int i;
   int pow = 1;
   INFO0("My finger table:");
   INFO0("Start | Succ ");
   for (i = 0; i < NB_BITS; i++) {
-    INFO2(" %4d | %4d ", (node->id + pow) % NB_KEYS, node->fingers[i].id);
+    INFO2(" %3d  | %3d ", (node->id + pow) % NB_KEYS, node->fingers[i].id);
     pow = pow << 1;
   }
   INFO1("Predecessor: %d", node->pred_id);
 }
 
+/**
+ * \brief 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
+ */
+static void set_finger(node_t node, int finger_index, int id)
+{
+  node->fingers[finger_index].id = id;
+  xbt_free(node->fingers[finger_index].mailbox);
+  node->fingers[finger_index].mailbox = get_mailbox(id);
+  INFO2("My new finger #%d is %d", finger_index, id);
+}
+
+/**
+ * \brief Sets the predecessor of the current node.
+ * \param node the current node
+ * \param id the id to predecessor, or -1 to unset the predecessor
+ */
+static void set_predecessor(node_t node, int predecessor_id)
+{
+  node->pred_id = predecessor_id;
+  xbt_free(node->pred_mailbox);
+
+  if (predecessor_id != -1) {
+    node->pred_mailbox = get_mailbox(predecessor_id);
+  }
+
+  INFO1("My new predecessor is %d", predecessor_id);
+}
+
 /**
  * \brief Node Function
  * Arguments:
@@ -164,151 +226,352 @@ static void print_finger_table(node_t node) {
  */
 int node(int argc, char *argv[])
 {
-  msg_comm_t comm = NULL;
+  double init_time = MSG_get_clock();
+  m_task_t task = NULL;
+  msg_comm_t comm_send = NULL;
+  msg_comm_t comm_receive = NULL;
+  int i;
+  char* mailbox = NULL;
+  double deadline;
+  double next_stabilize_date = init_time + 10;
+  double next_fix_fingers_date = init_time + 10;
+  double next_check_predecessor_date = init_time + 10;
 
-  xbt_assert0(argc == 2 || argc == 4, "Wrong number of arguments for this node");
+  xbt_assert0(argc == 3 || argc == 5, "Wrong number of arguments for this node");
 
   // initialize my node
   s_node_t node = {0};
   node.id = atoi(argv[1]);
   node.mailbox = get_mailbox(node.id);
+  node.next_finger_to_fix = 0;
   node.comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
 
-  if (argc == 2) { // first ring
-    initialize_first_node(&node);
+  for (i = 0; i < NB_BITS; i++) {
+    set_finger(&node, i, node.id);
+  }
+
+  if (argc == 3) { // first ring
+    deadline = atof(argv[2]);
+    create(&node);
   }
   else {
     int known_id = atoi(argv[2]);
     double sleep_time = atof(argv[3]);
+    deadline = atof(argv[4]);
 
     // sleep before starting
-    INFO1("Let's sleep >>%f", sleep_time);
+    INFO1("Let's sleep during %f", sleep_time);
     MSG_process_sleep(sleep_time);
     INFO0("Hey! Let's join the system.");
 
     join(&node, known_id);
   }
 
-  while (1) {
+  while (MSG_get_clock() < init_time + deadline) {
 
-    unsigned int cursor;
-    comm = NULL;
-    xbt_dynar_foreach(node.comms, cursor, comm) {
-      if (MSG_comm_test(comm)) { // FIXME: try with MSG_comm_testany instead
-        xbt_dynar_cursor_rm(node.comms, &cursor);
-      }
+    // see if some communications are finished
+    int index;
+    while ((index = MSG_comm_testany(node.comms)) != -1) {
+      comm_send = xbt_dynar_get_as(node.comms, index, msg_comm_t);
+      xbt_dynar_remove_at(node.comms, index, &comm_send);
+      MSG_comm_destroy(comm_send);
     }
 
-    m_task_t task = NULL;
-    MSG_error_t res = MSG_task_receive(&task, node.mailbox);
-
-    xbt_assert0(res == MSG_OK, "MSG_task_receive failed");
+    if (comm_receive == NULL) {
+      task = NULL;
+      comm_receive = MSG_task_irecv(&task, node.mailbox);
+    }
 
-    // get data
-    const char* task_name = MSG_task_get_name(task);
-    task_data_t task_data = (task_data_t) MSG_task_get_data(task);
+    if (!MSG_comm_test(comm_receive)) {
 
-    if (!strcmp(task_name, "Find Successor")) {
-      INFO2("Receiving a 'Find Successor' Request from %s for id %d", task_data->issuer_host_name, task_data->request_id);
-      // is my successor the successor?
-      if (is_in_interval(task_data->request_id, node.id + 1, node.fingers[0].id)) {
-	task_data->answer_id = node.fingers[0].id;
-        MSG_task_set_name(task, "Find Successor Answer");
-        INFO3("Sending back a 'Find Successor' Answer to %s: the successor of %d is %d", task_data->issuer_host_name, task_data->request_id, task_data->answer_id);
-        comm = MSG_task_isend(task, task_data->answer_to);
-        xbt_dynar_push(node.comms, &comm);
+      // no task was received: make some periodic calls
+      if (MSG_get_clock() >= next_stabilize_date) {
+        stabilize(&node);
+        next_stabilize_date = MSG_get_clock() + 10;
+      }
+      else if (MSG_get_clock() >= next_fix_fingers_date) {
+        fix_fingers(&node);
+        next_fix_fingers_date = MSG_get_clock() + 10;
+      }
+      else if (MSG_get_clock() >= next_check_predecessor_date) {
+        check_predecessor(&node);
+        next_check_predecessor_date = MSG_get_clock() + 10;
       }
       else {
-	// otherwise, forward the request to the closest preceding finger in my table
-	int closest = closest_preceding_finger(&node, task_data->request_id);
-	INFO2("Forwarding 'Find Successor' request for id %d to my closest preceding finger %d", task_data->request_id, closest);
-	comm = MSG_task_isend(task, get_mailbox(closest));
-        xbt_dynar_push(node.comms, &comm);
+	// nothing to do: sleep for a while
+        MSG_process_sleep(5);
       }
     }
-    /*
-    else if (!strcmp(task_name, "Find Successor Answer")) {
+    else {
+      // a task was received
+
+      MSG_comm_destroy(comm_receive);
+      comm_receive = NULL;
+      const char* task_name = MSG_task_get_name(task);
+      task_data_t task_data = (task_data_t) MSG_task_get_data(task);
+
+      if (!strcmp(task_name, "Find Successor")) {
+        INFO2("Receiving a 'Find Successor' Request from %s for id %d",
+              task_data->issuer_host_name, task_data->request_id);
+	// is my successor the successor?
+	if (is_in_interval(task_data->request_id, node.id + 1, node.fingers[0].id)) {
+	  task_data->answer_id = node.fingers[0].id;
+	  MSG_task_set_name(task, "Find Successor Answer");
+	  INFO3("Sending back a 'Find Successor Answer' to %s: the successor of %d is %d",
+	        task_data->issuer_host_name, task_data->request_id, task_data->answer_id);
+	  comm_send = MSG_task_isend(task, task_data->answer_to);
+	  xbt_dynar_push(node.comms, &comm_send);
+	}
+	else {
+	  // otherwise, forward the request to the closest preceding finger in my table
+	  int closest = closest_preceding_node(&node, task_data->request_id);
+	  INFO2("Forwarding the 'Find Successor' request for id %d to my closest preceding finger %d",
+	        task_data->request_id, closest);
+	  mailbox = get_mailbox(closest);
+	  comm_send = MSG_task_isend(task, mailbox);
+	  xbt_dynar_push(node.comms, &comm_send);
+	  xbt_free(mailbox);
+	}
+      }
 
-    }
-    */
-    else if (!strcmp(task_name, "Find Predecessor")) {
-      INFO2("Receiving a 'Find Predecessor' Request from %s for id %d", task_data->issuer_host_name, task_data->request_id);
-      // am I the predecessor?
-      if (is_in_interval(task_data->request_id, node.id + 1, node.fingers[0].id)) {
-	task_data->answer_id = node.id;
-        MSG_task_set_name(task, "Find Predecessor Answer");
-        INFO3("Sending back a 'Find Predecessor' Answer to %s: the predecessor of %d is %d", task_data->issuer_host_name, task_data->request_id, task_data->answer_id);
-        comm = MSG_task_isend(task, task_data->answer_to);
-        xbt_dynar_push(node.comms, &comm);
+      else if (!strcmp(task_name, "Get Predecessor")) {
+	INFO1("Receiving a 'Get Predecessor' Request from %s", task_data->issuer_host_name);
+	task_data->answer_id = node.pred_id;
+	MSG_task_set_name(task, "Get Predecessor Answer");
+	INFO2("Sending back a 'Get Predecessor Answer' to %s: my predecessor is %d",
+	      task_data->issuer_host_name, task_data->answer_id);
+	comm_send = MSG_task_isend(task, task_data->answer_to);
+	xbt_dynar_push(node.comms, &comm_send);
       }
-      else {
-	// otherwise, forward the request to the closest preceding finger in my table
-	int closest = closest_preceding_finger(&node, task_data->request_id);
-	INFO2("Forwarding 'Find Predecessor' request for id %d to my closest preceding finger %d", task_data->request_id, closest);
-	comm = MSG_task_isend(task, get_mailbox(closest));
-        xbt_dynar_push(node.comms, &comm);
+      /*
+      else if (!strcmp(task_name, "Find Predecessor")) {
+	INFO2("Receiving a 'Find Predecessor' Request from %s for id %d", task_data->issuer_host_name, task_data->request_id);
+	// am I the predecessor?
+	if (is_in_interval(task_data->request_id, node.id + 1, node.fingers[0].id)) {
+	  task_data->answer_id = node.id;
+	  MSG_task_set_name(task, "Find Predecessor Answer");
+	  INFO3("Sending back a 'Find Predecessor' Answer to %s: the predecessor of %d is %d", task_data->issuer_host_name, task_data->request_id, task_data->answer_id);
+	  comm = MSG_task_isend(task, task_data->answer_to);
+	  xbt_dynar_push(node.comms, &comm);
+	}
+	else {
+	  // otherwise, forward the request to the closest preceding finger in my table
+	  int closest = closest_preceding_node(&node, task_data->request_id);
+	  INFO2("Forwarding 'Find Predecessor' request for id %d to my closest preceding finger %d", task_data->request_id, closest);
+	  mailbox = get_mailbox(closest);
+	  comm = MSG_task_isend(task, mailbox);
+	  xbt_dynar_push(node.comms, &comm);
+	  xbt_free(mailbox);
+	}
       }
-    }
-    /*
-    else if (!strcmp(task_name, "Find Predecessor Answer")) {
+      */
 
-    }
-    */
-    else if (!strcmp(task_name, "Update Finger")) {
-      // someone is telling me that he may be my new finger
-      INFO1("Receving an 'Update Finger' from %s", task_data->issuer_host_name);
-      update_finger_table(&node, task_data->request_id, task_data->request_finger);
-    }
-    else if (!strcmp(task_name, "Notify")) {
-      // someone is telling me that he may be my new predecessor
-      INFO1("Receving an 'Notify' from %s", task_data->issuer_host_name);
-      notify(&node, task_data->request_id);
-    }
-    /*
-    else if (!strcmp(task_name, "Fix Fingers"))
-    {
-      int i;
-      for (i = KEY_BITS - 1 ; i >= 0; i--)
-      {
-	data->fingers[i] = find_finger_elem(data,(data->id)+pow(2,i-1));
+      /*
+      else if (!strcmp(task_name, "Notify Node Joined")) {
+	// someone may be my new neighboor
+	INFO1("Receiving a 'Notify Node Joine' request from %s", task_data->issuer_host_name);
+	notify_node_joined(&node, task_data->request_id);
+      }
+      else if (!strcmp(task_name, "Update Finger")) {
+	// someone is telling me that he may be my new finger
+	INFO1("Receiving an 'Update Finger' request from %s", task_data->issuer_host_name);
+	update_finger_table(&node, task_data->request_id, task_data->request_finger);
+      }
+      */
+      else if (!strcmp(task_name, "Notify")) {
+	// someone is telling me that he may be my new predecessor
+	INFO1("Receiving a 'Notify' request from %s", task_data->issuer_host_name);
+	notify(&node, task_data->request_id);
+      }
+      else if (!strcmp(task_name, "Predecessor Leaving")) {
+	// my predecessor is about to quit
+	INFO1("Receiving a 'Predecessor Leaving' message from %s", task_data->issuer_host_name);
+	// modify my predecessor
+	set_predecessor(&node, task_data->pred_id);
+	/*TODO :
+          >> notify my new predecessor
+          >> send a notify_predecessors !!
+	 */
+      }
+      else if (!strcmp(task_name, "Successor Leaving")) {
+	// my successor is about to quit
+	INFO1("Receiving a 'Successor Leaving' message from %s", task_data->issuer_host_name);
+	// modify my successor FIXME : this should be implicit ?
+	set_finger(&node, 0, task_data->successor_id);
+	/* TODO
+          >> notify my new successor
+          >> update my table & predecessors table */
       }
     }
-    */
   }
 
+  // leave the ring and stop the simulation
+  leave(&node);
   xbt_dynar_free(&node.comms);
+  xbt_free(node.mailbox);
+  xbt_free(node.pred_mailbox);
+  for (i = 0; i < NB_BITS - 1; i++) {
+    xbt_free(node.fingers[i].mailbox);
+  }
+  return 0;
 }
 
 /**
  * \brief Initializes the current node as the first one of the system.
  * \param node the current node
  */
-static void initialize_first_node(node_t node)
+static void create(node_t node)
 {
   INFO0("Create a new Chord ring...");
-
-  // I am my own successor and predecessor
-  int i;
-  for (i = 0; i < NB_BITS; i++) {
-    node->fingers[i].id = node->id;
-    node->fingers[i].mailbox = node->mailbox;
-  }
-  node->pred_id = node->id;
-  node->pred_mailbox = node->mailbox;
+  set_predecessor(node, -1); // -1 means that I have no predecessor
   print_finger_table(node);
 }
 
 /**
- * \brief Makes the current node join the system, knowing the id of a node already in the system
+ * \brief Makes the current node join the ring, knowing the id of a node
+ * already in the ring
  * \param node the current node
- * \param known_id id of a node already in the system
+ * \param known_id id of a node already in the ring
  */
 static void join(node_t node, int known_id)
 {
-  initialize_finger_table(node, known_id); // determine my fingers, asking to known_id
-  remote_notify(node, node->fingers[0].id, node->id); // tell my successor that I'm his new predecessor
-  notify_predecessors(node); // tell others that I may have became their finger
-  remote_move_keys(node, node->fingers[0].id); // take some key-value pairs from my sucessor
+  INFO2("Joining the ring with id %d, knowing node %d", node->id, known_id);
+  set_predecessor(node, -1); // no predecessor (yet)
+
+  int successor_id;
+  do {
+    successor_id = remote_find_successor(node, known_id, node->id);
+    INFO0("My 'Find Successor' request has failed, let's try again");
+  } while (successor_id == -1);
+
+  set_finger(node, 0, successor_id);
+  print_finger_table(node);
+}
+
+/**
+ * \brief Notifies the current node that a node has just joined the network.
+ * \param node the current node
+ * \param new_node_id id of the new node in the network
+ */
+/*
+static void notify_node_joined(node_t node, int new_node_id)
+{
+  INFO1("A new node %d has joined the network, let's see if it is a neighboor", new_node_id);
+  if (is_in_interval(new_node_id, node->id + 1, node->fingers[0].id - 1)) {
+    // new_node_id is my new successor
+    set_finger(node, 0, new_node_id);
+    bootstrap(node, new_node_id);
+  }
+
+  if (is_in_interval(new_node_id, node->pred_id + 1, node->id - 1)) {
+    // new_node_id is my new predecessor
+    set_predecessor(node, new_node_id);
+    bootstrap(node, new_node_id);
+  }
+}
+*/
+
+/**
+ * \brief Notifies a remote node that the current node has just joined
+ * the network.
+ * \param node the current node
+ * \param notify_id id of the remote node to notify
+ */
+/*
+static void remote_notify_node_joined(node_t node, int notify_id)
+{
+  task_data_t req_data = xbt_new0(s_task_data_t, 1);
+  req_data->request_id = node->id;
+  req_data->issuer_host_name = MSG_host_get_name(MSG_host_self());
+
+  // send a "Notify" request to notify_id
+  INFO2("Sending a 'Notify' request to %d because I have joined the network with id %d", notify_id, node->id);
+  m_task_t task = MSG_task_create("Notify", 1000, 5000, req_data);
+  char* mailbox = get_mailbox(notify_id);
+  msg_comm_t comm = MSG_task_isend(task, mailbox);
+  xbt_dynar_push(node->comms, &comm);
+  xbt_free(mailbox);
+}
+*/
+
+/**
+* \brief Let the current node send queries to fill in its own finger table.
+* \param node the current node
+* \param ask_to_id id of a node to send queries to
+*/
+/*
+static void bootstrap(node_t node, int ask_to_id)
+{
+  INFO0("Filling my finger table");
+  int i, pred_id, succ_id;
+  int pow = 1;
+
+  for (i = 0; i < NB_BITS; i++)
+  {
+    pred_id = remote_find_successor(node, ask_to_id, pow);
+    do {
+      succ_id = pred_id;
+      pred_id = remote_find_predecessor(node, pred_id, pred_id);
+    } while (pred_id >= pow);
+
+    pow = pow << 1;
+    set_finger(node, i, succ_id);
+  }
+}
+*/
+
+/**
+ * \brief Makes the current node quit the system
+ * \param node the current node
+ */
+static void leave(node_t node)
+{
+  INFO0("Well Guys! I Think it's time for me to quit ;)");
+  quit_notify(node, 1);  // notify to my successor ( >>> 1 );
+  quit_notify(node, -1); // notify my predecessor  ( >>> -1);
+  // TODO ...
+}
+
+/*
+ * \brief Notifies the successor or the predecessor of the current node
+ * of the departure
+ * \param node the current node
+ * \param to 1 to notify the successor, -1 to notify the predecessor
+ * FIXME: notify both nodes with only one call
+ */
+static void quit_notify(node_t node, int to)
+{
+  task_data_t req_data = xbt_new0(s_task_data_t, 1);
+  req_data->request_id = node->id;
+  req_data->successor_id = node->fingers[0].id;
+  req_data->pred_id = node->pred_id;
+  req_data->issuer_host_name = MSG_host_get_name(MSG_host_self());
+  const char *task_name = NULL;
+  const char* to_mailbox = NULL;
+  if (to == 1)    // notify my successor
+  {
+    to_mailbox = node->fingers[0].mailbox;
+    INFO2("Telling my Successor %d about my departure via mailbox %s",
+	  node->fingers[0].id, to_mailbox);
+    task_name = "Predecessor Leaving";
+
+  }
+  else if (to == -1)    // notify my predecessor
+  {
+    if (node->pred_id == -1) {
+      return;
+    }
+
+    to_mailbox = node->pred_mailbox;
+    INFO2("Telling my Predecessor %d about my departure via mailbox %s",
+	  node->pred_id, to_mailbox);
+    task_name = "Predecessor Leaving";
+
+  }
+  m_task_t task = MSG_task_create(task_name, 1000, 5000, req_data);
+  //char* mailbox = get_mailbox(to_mailbox);
+  msg_comm_t comm = MSG_task_isend(task, to_mailbox);
+  xbt_dynar_push(node->comms, &comm);
 }
 
 /*
@@ -316,6 +579,7 @@ static void join(node_t node, int known_id)
  * \param node the current node
  * \param known_id id of a node already in the system
  */
+/*
 static void initialize_finger_table(node_t node, int known_id)
 {
   int my_id = node->id;
@@ -349,11 +613,13 @@ static void initialize_finger_table(node_t node, int known_id)
   INFO0("Finger table initialized!");
   print_finger_table(node);
 }
+*/
 
 /**
  * \brief Notifies some nodes that the current node may have became their finger.
  * \param node the current node, which has just joined the system
  */
+/*
 static void notify_predecessors(node_t node)
 {
   int i, pred_id;
@@ -367,6 +633,7 @@ static void notify_predecessors(node_t node)
     pow = pow << 1; // pow = pow * 2
   }
 }
+*/
 
 /**
  * \brief Tells the current node that a node may have became its new finger.
@@ -374,6 +641,7 @@ static void notify_predecessors(node_t node)
  * \param candidate_id id of the node that may be a new finger of the current node
  * \param finger_index index of the finger to update
  */
+/*
 static void update_finger_table(node_t node, int candidate_id, int finger_index)
 {
   int pow = 1;
@@ -386,9 +654,7 @@ static void update_finger_table(node_t node, int candidate_id, int finger_index)
   if (is_in_interval(candidate_id, node->id, node->fingers[finger_index].id - 1)) {
 //    INFO3("Candidate %d is between %d and %d!", candidate_id, node->id + pow, node->fingers[finger_index].id - 1);
     // candidate_id is my new finger
-    node->fingers[finger_index].id = candidate_id;
-    node->fingers[finger_index].mailbox = get_mailbox(candidate_id);
-    INFO2("My new finger #%d is %d", finger_index, candidate_id);
+    set_finger(node, finger_index, candidate_id);
     print_finger_table(node);
 
     if (node->pred_id != node->id) { // FIXME: is this necessary?
@@ -397,6 +663,7 @@ static void update_finger_table(node_t node, int candidate_id, int finger_index)
     }
   }
 }
+*/
 
 /**
  * \brief Tells a remote node that a node may have became its new finger.
@@ -404,6 +671,7 @@ static void update_finger_table(node_t node, int candidate_id, int finger_index)
  * \param candidate_id id of the node that may be a new finger of the remote node
  * \param finger_index index of the finger to update
  */
+/*
 static void remote_update_finger_table(node_t node, int ask_to_id, int candidate_id, int finger_index)
 {
   task_data_t req_data = xbt_new0(s_task_data_t, 1);
@@ -414,15 +682,18 @@ static void remote_update_finger_table(node_t node, int ask_to_id, int candidate
   // send a "Update Finger" request to ask_to_id
   INFO3("Sending an 'Update Finger' request to %d: his finger #%d may be %d now", ask_to_id, finger_index, candidate_id);
   m_task_t task = MSG_task_create("Update Finger", 1000, 5000, req_data);
-  msg_comm_t comm = MSG_task_isend(task, get_mailbox(ask_to_id));
+  char* mailbox = get_mailbox(ask_to_id);
+  msg_comm_t comm = MSG_task_isend(task, mailbox);
   xbt_dynar_push(node->comms, &comm);
+  xbt_free(mailbox);
 }
+*/
 
 /**
  * \brief Makes the current node find the successor node of an id.
  * \param node the current node
  * \param id the id to find
- * \return the id of the successor node
+ * \return the id of the successor node, or -1 if the request failed
  */
 static int find_successor(node_t node, int id)
 {
@@ -432,7 +703,7 @@ static int find_successor(node_t node, int id)
   }
 
   // otherwise, ask the closest preceding finger in my table
-  int closest = closest_preceding_finger(node, id);
+  int closest = closest_preceding_node(node, id);
   return remote_find_successor(node, closest, id);
 }
 
@@ -441,12 +712,13 @@ static int find_successor(node_t node, int id)
  * \param node the current node
  * \param ask_to the node to ask to
  * \param id the id to find
- * \return the id of the successor node
+ * \return the id of the successor node, or -1 if the request failed
  */
 static int remote_find_successor(node_t node, int ask_to, int id)
 {
+  int successor = -1;
   s_task_data_t req_data;
-  char *mailbox = bprintf("%s Find Successor", node->mailbox);
+  char* mailbox = bprintf("%s Find Successor", node->mailbox);
   req_data.request_id = id;
   req_data.answer_to = mailbox;
   req_data.issuer_host_name = MSG_host_get_name(MSG_host_self());
@@ -454,26 +726,72 @@ static int remote_find_successor(node_t node, int ask_to, int id)
   // send a "Find Successor" request to ask_to_id
   INFO2("Sending a 'Find Successor' request to %d for key %d", ask_to, id);
   m_task_t task = MSG_task_create("Find Successor", 1000, 5000, &req_data);
-  MSG_task_send(task, get_mailbox(ask_to));
+  MSG_error_t res = MSG_task_send_with_timeout(task, get_mailbox(ask_to), 20);
+  if (res == MSG_OK) {
 
-  // receive the answer
-  task = NULL;
-  MSG_task_receive(&task, req_data.answer_to);
-  task_data_t ans_data;
-  ans_data = MSG_task_get_data(task);
-  int successor = ans_data->answer_id;
-  xbt_free(mailbox);
-  INFO2("Received the answer to my Find Successor request: the successor of key %d is %d", id, successor);
+    // receive the answer
+    task = NULL;
+    res = MSG_task_receive_with_timeout(&task, req_data.answer_to, 20);
+
+    if (res == MSG_OK) {
 
+      task_data_t ans_data;
+      ans_data = MSG_task_get_data(task);
+      successor = ans_data->answer_id;
+      INFO2("Received the answer to my 'Find Successor' request: the successor of key %d is %d", id, successor);
+    }
+  }
+
+  xbt_free(mailbox);
   return successor;
 }
 
+/**
+ * \brief Asks another node its predecessor.
+ * \param node the current 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)
+ */
+static int remote_get_predecessor(node_t node, int ask_to)
+{
+  int predecessor_id = -1;
+  s_task_data_t req_data;
+  char* mailbox = bprintf("%s Get Predecessor", node->mailbox);
+  req_data.answer_to = mailbox;
+  req_data.issuer_host_name = MSG_host_get_name(MSG_host_self());
+
+  // send a "Get Predecessor" request to ask_to_id
+  INFO1("Sending a 'Get Predecessor' request to %d", ask_to);
+  m_task_t task = MSG_task_create("Get Predecessor", 1000, 5000, &req_data);
+  MSG_error_t res = MSG_task_send_with_timeout(task, get_mailbox(ask_to), 20);
+
+  if (res == MSG_OK) {
+
+    // receive the answer
+    task = NULL;
+    res = MSG_task_receive_with_timeout(&task, req_data.answer_to, 20);
+
+    if (res == MSG_OK) {
+
+      task_data_t ans_data;
+      ans_data = MSG_task_get_data(task);
+      predecessor_id = ans_data->answer_id;
+      INFO2("Received the answer to my 'Get Predecessor' request: the predecessor of node %d is %d", ask_to, predecessor_id);
+    }
+  }
+
+  xbt_free(mailbox);
+  return predecessor_id;
+}
+
 /**
  * \brief Makes the current node find the predecessor node of an id.
  * \param node the current node
  * \param id the id to find
  * \return the id of the predecessor node
  */
+/*
 static int find_predecessor(node_t node, int id)
 {
   if (node->id == node->fingers[0].id) {
@@ -484,9 +802,10 @@ static int find_predecessor(node_t node, int id)
   if (is_in_interval(id, node->id + 1, node->fingers[0].id)) {
     return node->id;
   }
-  int ask_to = closest_preceding_finger(node, id);
+  int ask_to = closest_preceding_node(node, id);
   return remote_find_predecessor(node, ask_to, id);
 }
+*/
 
 /**
  * \brief Asks another node the predecessor node of an id.
@@ -495,10 +814,11 @@ static int find_predecessor(node_t node, int id)
  * \param id the id to find
  * \return the id of the predecessor node
  */
+/*
 static int remote_find_predecessor(node_t node, int ask_to, int id)
 {
   s_task_data_t req_data;
-  char *mailbox = bprintf("%s Find Predecessor", node->mailbox);
+  char* mailbox = bprintf("%s Find Predecessor", node->mailbox);
   req_data.request_id = id;
   req_data.answer_to = mailbox;
   req_data.issuer_host_name = MSG_host_get_name(MSG_host_self());
@@ -519,6 +839,7 @@ static int remote_find_predecessor(node_t node, int ask_to, int id)
 
   return predecessor;
 }
+*/
 
 /**
  * \brief Returns the closest preceding finger of an id
@@ -527,7 +848,7 @@ static int remote_find_predecessor(node_t node, int ask_to, int id)
  * \param id the id to find
  * \return the closest preceding finger of that id
  */
-int closest_preceding_finger(node_t node, int id)
+int closest_preceding_node(node_t node, int id)
 {
   int i;
   for (i = NB_BITS - 1; i >= 0; i--) {
@@ -543,14 +864,28 @@ int closest_preceding_finger(node_t node, int id)
  * successor of the current node.
  * \param node the current node
  */
-static void stabilize(node_t node) {
+static void stabilize(node_t node)
+{
+  INFO0("Stabilizing node");
+
+  // get the predecessor of my immediate successor
+  int candidate_id;
+  int successor_id = node->fingers[0].id;
+  if (successor_id != node->id) {
+    candidate_id = remote_get_predecessor(node, successor_id);
+  }
+  else {
+    candidate_id = node->pred_id;
+  }
 
-  int x = find_predecessor(node, node->fingers[0].id);
-  if (is_in_interval(x, node->id + 1, node->fingers[0].id)) {
-    node->fingers[0].id = x;
-    node->fingers[0].mailbox = get_mailbox(x);
+  // this node is a candidate to become my new successor
+  if (candidate_id != -1
+      && is_in_interval(candidate_id, node->id + 1, successor_id - 1)) {
+    set_finger(node, 0, candidate_id);
+  }
+  if (successor_id != node->id) {
+    remote_notify(node, successor_id, node->id);
   }
-  remote_notify(node, node->fingers[0].id, node->id);
 }
 
 /**
@@ -560,13 +895,10 @@ static void stabilize(node_t node) {
  */
 static void notify(node_t node, int predecessor_candidate_id) {
 
-  if (node->pred_id == node->id
-    || is_in_interval(predecessor_candidate_id, node->pred_id, node->id)) {
+  if (node->pred_id == -1
+    || is_in_interval(predecessor_candidate_id, node->pred_id + 1, node->id - 1)) {
 
-    node->pred_id = predecessor_candidate_id;
-    node->pred_mailbox = get_mailbox(predecessor_candidate_id);
-
-    INFO1("My new predecessor is %d", predecessor_candidate_id);
+    set_predecessor(node, predecessor_candidate_id);
     print_finger_table(node);
   }
   else {
@@ -589,16 +921,40 @@ static void remote_notify(node_t node, int notify_id, int predecessor_candidate_
   // send a "Notify" request to notify_id
   INFO1("Sending a 'Notify' request to %d", notify_id);
   m_task_t task = MSG_task_create("Notify", 1000, 5000, req_data);
-  msg_comm_t comm = MSG_task_isend(task, get_mailbox(notify_id));
+  char* mailbox = get_mailbox(notify_id);
+  msg_comm_t comm = MSG_task_isend(task, mailbox);
   xbt_dynar_push(node->comms, &comm);
+  xbt_free(mailbox);
 }
 
 /**
- * \brief Asks a node to take some of its keys.
- * \param node the current node, which has just joined the system
- * \param take_from_id id of a node who may have keys to give to the current node
+ * \brief This function is called periodically.
+ * It refreshes the finger table of the current node.
+ * \param node the current node
+ */
+static void fix_fingers(node_t node) {
+
+  INFO0("Fixing fingers");
+  int i = node->next_finger_to_fix;
+  int id = find_successor(node, node->id + powers2[i]);
+  if (id != -1) {
+
+    if (id != node->fingers[i].id) {
+      set_finger(node, i, id);
+      print_finger_table(node);
+    }
+    node->next_finger_to_fix = (i + 1) % NB_BITS;
+  }
+}
+
+/**
+ * \brief This function is called periodically.
+ * It checks whether the predecessor has failed
+ * \param node the current node
  */
-static void remote_move_keys(node_t node, int take_from_id) {
+static void check_predecessor(node_t node)
+{
+  INFO0("Checking whether my predecessor is alive");
   // TODO
 }
 
@@ -613,12 +969,12 @@ int main(int argc, char *argv[])
     exit(1);
   }
 
-  MSG_global_init(&argc, argv);
-
   const char* platform_file = argv[1];
   const char* application_file = argv[2];
 
-  /* MSG_config("workstation/model","KCCFLN05"); */
+  chord_initialize();
+
+  MSG_global_init(&argc, argv);
   MSG_set_channel_number(0);
   MSG_create_environment(platform_file);