X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..48eb2f1b9262fc74f527816c348ed2aa6efa9f65:/examples/msg/dht-pastry/dht-pastry.c?ds=sidebyside

diff --git a/examples/msg/dht-pastry/dht-pastry.c b/examples/msg/dht-pastry/dht-pastry.c
index ade7a76601..1c029d2aca 100644
--- a/examples/msg/dht-pastry/dht-pastry.c
+++ b/examples/msg/dht-pastry/dht-pastry.c
@@ -1,11 +1,13 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2017. 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. */
 
-#include <math.h>
 #include "simgrid/msg.h"
+#include "xbt/dynar.h"
+#include <math.h>
+
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_pastry, "Messages specific for this msg example");
 
@@ -30,23 +32,25 @@ static int timeout = 50;
 static int max_simulation_time = 1000;
 
 typedef struct s_node {
-  int id;                                 //128bits generated random(2^128 -1)
-  int known_id;
+  unsigned id; // 128bits generated random(2^128 -1)
+  unsigned known_id;
   char mailbox[MAILBOX_NAME_SIZE];        // my mailbox name (string representation of the id)
-  int namespace_set[NAMESPACE_SIZE];
-  int neighborhood_set[NEIGHBORHOOD_SIZE];
-  int routing_table[LEVELS_COUNT][LEVEL_SIZE];
+  unsigned namespace_set[NAMESPACE_SIZE];
+  unsigned neighborhood_set[NEIGHBORHOOD_SIZE];
+  unsigned routing_table[LEVELS_COUNT][LEVEL_SIZE];
   int ready;
   msg_comm_t comm_receive;                // current communication to receive
-  xbt_fifo_t pending_tasks;
-} s_node_t, *node_t;
+  xbt_dynar_t pending_tasks;
+} s_node_t;
+typedef s_node_t* node_t;
 
 typedef struct s_state {
-  int id;
-  int namespace_set[NAMESPACE_SIZE];
-  int neighborhood_set[NEIGHBORHOOD_SIZE];
-  int routing_table[LEVELS_COUNT][LEVEL_SIZE];
-} s_state_t, *state_t;
+  unsigned id;
+  unsigned namespace_set[NAMESPACE_SIZE];
+  unsigned neighborhood_set[NEIGHBORHOOD_SIZE];
+  unsigned routing_table[LEVELS_COUNT][LEVEL_SIZE];
+} s_state_t;
+typedef s_state_t* state_t;
 
 /** Types of tasks exchanged between nodes. */
 typedef enum {
@@ -58,17 +62,17 @@ typedef enum {
 
 typedef struct s_task_data {
   e_task_type_t type;                     // type of task
-  int sender_id;                          // id paramater (used by some types of tasks)
-  //int request_finger;                     // finger parameter (used by some types of tasks)
-  int answer_id;                          // answer (used by some types of tasks)
+  unsigned sender_id;                     // id parameter (used by some types of tasks)
+  // int request_finger;                     // finger parameter (used by some types of tasks)
+  unsigned answer_id;                     // answer (used by some types of tasks)
   char answer_to[MAILBOX_NAME_SIZE];      // mailbox to send an answer to (if any)
   //const char* issuer_host_name;           // used for logging
   int steps;
   state_t state;
-} s_task_data_t, *task_data_t;
+} s_task_data_t;
+typedef s_task_data_t* task_data_t;
 
-static void get_mailbox(int node_id, char* mailbox);
-static int domain(int a, int level);
+static int domain(unsigned int a, unsigned int level);
 static int shl(int a, int b);
 static int closest_in_namespace_set(node_t node, int dest);
 static int routing_next(node_t node, int dest);
@@ -86,7 +90,8 @@ static void get_mailbox(int node_id, char* mailbox)
 
 /** Get the specific level of a node id */
 unsigned int domain_mask = 0;
-static int domain(int a, int level) {
+static int domain(unsigned int a, unsigned int level)
+{
   if (domain_mask == 0)
     domain_mask = pow(2, DOMAIN_SIZE) - 1;
   unsigned int shift = (LEVELS_COUNT-level-1)*DOMAIN_SIZE;
@@ -104,7 +109,6 @@ static int shl(int a, int b) {
 /* Frees the memory used by a task and destroy it */
 static void task_free(void* task)
 {
-  // TODO add a parameter data_free_function to MSG_task_create?
   if(task != NULL){
     s_task_data_t* data = (s_task_data_t*)MSG_task_get_data(task);
     xbt_free(data->state);
@@ -135,19 +139,17 @@ static int closest_in_namespace_set(node_t node, int dest) {
 /* Find the next node to forward a message to */
 static int routing_next(node_t node, int dest) {
   int closest = closest_in_namespace_set(node, dest);
-  int res = -1;
   if (closest!=-1)
     return closest;
 
   int l = shl(node->id, dest);
-  res = node->routing_table[l][domain(dest, l)];
-  if (res!=-1)
+  int res = node->routing_table[l][domain(dest, l)];
+  if (res != -1)
     return res;
 
   //rare case
   int dist = abs(node->id - dest);
-  int i;
-  for (i=l; i<LEVELS_COUNT; i++) {
+  for (int i=l; i<LEVELS_COUNT; i++) {
     for (int j=0; j<LEVEL_SIZE; j++) {
       res = node->routing_table[i][j];
       if (res!=-1 && abs(res - dest)<dist)
@@ -155,13 +157,13 @@ static int routing_next(node_t node, int dest) {
     }
   }
 
-  for (i=0; i<NEIGHBORHOOD_SIZE; i++) {
+  for (int i=0; i<NEIGHBORHOOD_SIZE; i++) {
     res = node->neighborhood_set[i];
     if (res!=-1 && shl(res, dest)>=l && abs(res - dest)<dist)
         return res;
   }
 
-  for (i=0; i<NAMESPACE_SIZE; i++) {
+  for (int i=0; i<NAMESPACE_SIZE; i++) {
     res = node->namespace_set[i];
     if (res!=-1 && shl(res, dest)>=l && abs(res - dest)<dist)
         return res;
@@ -172,35 +174,31 @@ static int routing_next(node_t node, int dest) {
 
 /* Get the corresponding state of a node */
 static state_t node_get_state(node_t node) {
-  int i;
   state_t state = xbt_new0(s_state_t,1);
   state->id = node->id;
-  for (i=0; i<NEIGHBORHOOD_SIZE; i++)
+  for (int i=0; i<NEIGHBORHOOD_SIZE; i++)
     state->neighborhood_set[i] = node->neighborhood_set[i];
 
-  for (i=0; i<LEVELS_COUNT; i++)
+  for (int i=0; i<LEVELS_COUNT; i++)
     for (int j=0; j<LEVEL_SIZE; j++)
       state->routing_table[i][j] = node->routing_table[i][j];
 
-  for (i=0; i<NAMESPACE_SIZE; i++)
+  for (int i=0; i<NAMESPACE_SIZE; i++)
     state->namespace_set[i] = node->namespace_set[i];
 
   return state;
 }
 
-/* Print the node id */
 static void print_node_id(node_t node) {
-  XBT_INFO(" Id: %i '%08x' ", node->id, node->id);
+  XBT_INFO(" Id: %u '%08x' ", node->id, node->id);
 }
 
-/* * Print the node neighborhood set */
 static void print_node_neighborood_set(node_t node) {
   XBT_INFO(" Neighborhood:");
   for (int i=0; i<NEIGHBORHOOD_SIZE; i++)
     XBT_INFO("  %08x", node->neighborhood_set[i]);
 }
 
-/* Print the routing table */
 static void print_node_routing_table(node_t node) {
   XBT_INFO(" Routing table:");
   for (int i=0; i<LEVELS_COUNT; i++){
@@ -208,7 +206,6 @@ static void print_node_routing_table(node_t node) {
       XBT_INFO("  %08x ", node->routing_table[i][j]);
   }
 }
-
 /* Print the node namespace set */
 static void print_node_namespace_set(node_t node) {
   XBT_INFO(" Namespace:");
@@ -233,28 +230,28 @@ static void handle_task(node_t node, msg_task_t task) {
   int j;
   int min;
   int max;
-  int d;
+  unsigned next;
   msg_task_t task_sent;
   task_data_t req_data;
   task_data_t task_data = (task_data_t) MSG_task_get_data(task);
   e_task_type_t type = task_data->type;
   // If the node is not ready keep the task for later
   if (node->ready != 0 && !(type==TASK_JOIN_LAST_REPLY || type==TASK_JOIN_REPLY)) {
-    XBT_DEBUG("Task pending %i", type);
-    xbt_fifo_push(node->pending_tasks, task);
+    XBT_DEBUG("Task pending %u", type);
+    xbt_dynar_push(node->pending_tasks, &task);
     return;
   }
   switch (type) {
     /* Try to join the ring */
-    case TASK_JOIN: {
-      int next = routing_next(node, task_data->answer_id);
-      XBT_DEBUG("Join request from %08x forwarding to %08x", task_data->answer_id, next);      
+    case TASK_JOIN:
+      next = routing_next(node, task_data->answer_id);
+      XBT_DEBUG("Join request from %08x forwarding to %08x", task_data->answer_id, next);
       type = TASK_JOIN_LAST_REPLY;
 
       req_data = xbt_new0(s_task_data_t,1);
       req_data->answer_id = task_data->sender_id;
       req_data->steps = task_data->steps + 1;
-      
+
       // if next different from current node forward the join
       if (next!=node->id) {
         get_mailbox(next, mailbox);
@@ -262,12 +259,12 @@ static void handle_task(node_t node, msg_task_t task) {
         task_data->steps++;
         task_sent = MSG_task_create(NULL, COMP_SIZE, COMM_SIZE, task_data);
         if (MSG_task_send_with_timeout(task_sent, mailbox, timeout)== MSG_TIMEOUT) {
-          XBT_DEBUG("Timeout expired when forwarding join to next %d", next);
+          XBT_DEBUG("Timeout expired when forwarding join to next %u", next);
           task_free(task_sent);
         }
         type = TASK_JOIN_REPLY;
-      } 
-      
+      }
+
       // send back the current node state to the joining node
       req_data->type = type;
       req_data->sender_id = node->id;
@@ -275,15 +272,14 @@ static void handle_task(node_t node, msg_task_t task) {
       req_data->state = node_get_state(node);
       task_sent = MSG_task_create(NULL, COMP_SIZE, COMM_SIZE, req_data);
       if (MSG_task_send_with_timeout(task_sent, task_data->answer_to, timeout)== MSG_TIMEOUT) {
-        XBT_DEBUG("Timeout expired when sending back the current node state to the joining node to %d", node->id);
+        XBT_DEBUG("Timeout expired when sending back the current node state to the joining node to %u", node->id);
         task_free(task_sent);
       }
       break;
-    }
     /* Join reply from all the node touched by the join  */
     case TASK_JOIN_LAST_REPLY:
       // if last node touched reply, copy its namespace set
-      // TODO: it's work only if the two nodes are side to side (is it really the case ?)
+      // TODO: it works only if the two nodes are side to side (is it really the case ?)
       j = (task_data->sender_id < node->id) ? -1 : 0;
       for (i=0; i<NAMESPACE_SIZE/2; i++) {
         node->namespace_set[i] = task_data->state->namespace_set[i-j];
@@ -306,19 +302,21 @@ static void handle_task(node_t node, msg_task_t task) {
       min = (node->id==task_data->answer_id) ? 0 : shl(node->id, task_data->answer_id);
       max = shl(node->id, task_data->sender_id)+1;
       for (i=min;i<max;i++) {
-        d = domain(node->id, i); 
+        int d = domain(node->id, i);
         for (j=0; j<LEVEL_SIZE; j++)
           if (d!=j)
             node->routing_table[i][j] =  task_data->state->routing_table[i][j];
-          }
+      }
 
       node->ready--;
       // if the node is ready, do all the pending tasks and send update to known nodes
       if (node->ready==0) {
-        XBT_DEBUG("Node %i is ready!!!", node->id);
-
-        while(xbt_fifo_size(node->pending_tasks))
-          handle_task(node, xbt_fifo_pop(node->pending_tasks));
+        XBT_DEBUG("Node %u is ready!!!", node->id);
+        while(xbt_dynar_length(node->pending_tasks)){
+          msg_task_t task;
+          xbt_dynar_shift(node->pending_tasks, &task);
+          handle_task(node, task);
+        }
 
         for (i=0; i<NAMESPACE_SIZE; i++) {
           j = node->namespace_set[i];
@@ -344,16 +342,16 @@ static void handle_task(node_t node, msg_task_t task) {
       break;
     /* Received an update of state */
     case TASK_UPDATE:
-      XBT_DEBUG("Task update %i !!!", node->id);
+      XBT_DEBUG("Task update %u !!!", node->id);
 
       /* Update namespace ses */
-      XBT_INFO("Task update from %i !!!", task_data->sender_id);
+      XBT_INFO("Task update from %u !!!", task_data->sender_id);
       XBT_INFO("Node:");
       print_node_id(node);
       print_node_namespace_set(node);
       int curr_namespace_set[NAMESPACE_SIZE];
       int task_namespace_set[NAMESPACE_SIZE+1];
-      
+
       // Copy the current namespace and the task state namespace with state->id in the middle
       i=0;
       for (; i<NAMESPACE_SIZE/2; i++){
@@ -362,7 +360,7 @@ static void handle_task(node_t node, msg_task_t task) {
       }
       task_namespace_set[i] = task_data->state->id;
       for (; i<NAMESPACE_SIZE; i++){
-        curr_namespace_set[i] = node->namespace_set[i];  
+        curr_namespace_set[i] = node->namespace_set[i];
         task_namespace_set[i+1] = task_data->state->namespace_set[i];
       }
 
@@ -402,19 +400,21 @@ static void handle_task(node_t node, msg_task_t task) {
         if (min<0 || max>=NAMESPACE_SIZE) {
          node->namespace_set[i] = curr_namespace_set[j];
          j++;
-        } else if (curr_namespace_set[j] == -1) {
-          node->namespace_set[i] = task_namespace_set[max];
-          max++;
-        } else if (curr_namespace_set[j] == task_namespace_set[max]) {
-          node->namespace_set[i] = curr_namespace_set[j];
-          j++;
-          max++;
-        } else if (curr_namespace_set[j] < task_namespace_set[max]) {
-          node->namespace_set[i] = curr_namespace_set[j];
-          j++;
-        } else {
-          node->namespace_set[i] = task_namespace_set[max];
-          max++;
+        } else if (max >= 0){
+          if (curr_namespace_set[j] == -1) {
+            node->namespace_set[i] = task_namespace_set[max];
+            max++;
+          } else if (curr_namespace_set[j] == task_namespace_set[max]) {
+            node->namespace_set[i] = curr_namespace_set[j];
+            j++;
+            max++;
+          } else if (curr_namespace_set[j] < task_namespace_set[max]) {
+            node->namespace_set[i] = curr_namespace_set[j];
+            j++;
+          } else {
+            node->namespace_set[i] = task_namespace_set[max];
+            max++;
+          }
         }
       }
 
@@ -432,14 +432,6 @@ static void handle_task(node_t node, msg_task_t task) {
   task_free(task);
 }
 
-/** \brief Initializes the current node as the first one of the system.
- *  \param node the current node
- */
-static void create(node_t node){
-  node->ready = 0;
-  XBT_DEBUG("Create a new Pastry ring...");
-}
-
 /* Join the ring */
 static int join(node_t node){
   task_data_t req_data = xbt_new0(s_task_data_t,1);
@@ -455,7 +447,7 @@ static int join(node_t node){
   msg_task_t task_sent = MSG_task_create(NULL, COMP_SIZE, COMM_SIZE, req_data);
   XBT_DEBUG("Trying to join Pastry ring... (with node %s)", mailbox);
   if (MSG_task_send_with_timeout(task_sent, mailbox, timeout)== MSG_TIMEOUT) {
-    XBT_DEBUG("Timeout expired when joining ring with node %d", node->known_id);
+    XBT_DEBUG("Timeout expired when joining ring with node %u", node->known_id);
     task_free(task_sent);
   }
 
@@ -473,38 +465,37 @@ static int join(node_t node){
 static int node(int argc, char *argv[])
 {
   double init_time = MSG_get_clock();
-  msg_task_t task_received = NULL;  
-  int join_success = 0;  
+  msg_task_t task_received = NULL;
+  int join_success = 0;
   double deadline;
   xbt_assert(argc == 3 || argc == 5, "Wrong number of arguments for this node");
   s_node_t node = {0};
   node.id = xbt_str_parse_int(argv[1], "Invalid ID: %s");
   node.known_id = -1;
   node.ready = -1;
-  node.pending_tasks = xbt_fifo_new();
+  node.pending_tasks = xbt_dynar_new(sizeof(msg_task_t), NULL);
   get_mailbox(node.id, node.mailbox);
   XBT_DEBUG("New node with id %s (%08x)", node.mailbox, node.id);
-  
-  int i;
-  for (i=0; i<LEVELS_COUNT; i++){
+
+  for (int i=0; i<LEVELS_COUNT; i++){
     int d = domain(node.id, i);
     for (int j=0; j<LEVEL_SIZE; j++)
       node.routing_table[i][j] = (d==j) ? node.id : -1;
   }
 
-  for (i=0; i<NEIGHBORHOOD_SIZE; i++)
+  for (int i=0; i<NEIGHBORHOOD_SIZE; i++)
     node.neighborhood_set[i] = -1;
 
-  for (i=0; i<NAMESPACE_SIZE; i++)
+  for (int i=0; i<NAMESPACE_SIZE; i++)
     node.namespace_set[i] = -1;
 
   if (argc == 3) { // first ring
     XBT_DEBUG("Hey! Let's create the system.");
     deadline = xbt_str_parse_double(argv[2], "Invalid deadline: %s");
-    create(&node);
+    node.ready = 0;
+    XBT_DEBUG("Create a new Pastry ring...");
     join_success = 1;
-  }
-  else {
+  } else {
     node.known_id = xbt_str_parse_int(argv[2], "Invalid known ID: %s");
     double sleep_time = xbt_str_parse_double(argv[3], "Invalid sleep time: %s");
     deadline = xbt_str_parse_double(argv[4], "Invalid deadline: %s");
@@ -539,8 +530,7 @@ static int node(int argc, char *argv[])
           XBT_DEBUG("Failed to receive a task. Nevermind.");
           MSG_comm_destroy(node.comm_receive);
           node.comm_receive = NULL;
-        }
-        else {
+        } else {
           // the task was successfully received
           MSG_comm_destroy(node.comm_receive);
           node.comm_receive = NULL;
@@ -558,7 +548,7 @@ static int node(int argc, char *argv[])
   }
 
   }
-  xbt_free(node.pending_tasks);
+  xbt_dynar_free(&node.pending_tasks);
   return 1;
 }
 
@@ -566,9 +556,9 @@ static int node(int argc, char *argv[])
 int main(int argc, char *argv[])
 {
   MSG_init(&argc, argv);
-  xbt_assert(argc > 2, 
+  xbt_assert(argc > 2,
        "Usage: %s [-nb_bits=n] [-timeout=t] platform_file deployment_file\n"
-       "\tExample: %s ../msg_platform.xml pastry10.xml\n", 
+       "\tExample: %s ../msg_platform.xml pastry10.xml\n",
        argv[0], argv[0]);
 
   char **options = &argv[1];