/* 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/fifo.h"
+#include <math.h>
- XBT_LOG_NEW_DEFAULT_CATEGORY(msg_pastry, "Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_pastry, "Messages specific for this msg example");
/* TODO: *
* - handle node departure *
* - handle objects on the network *
- * - handle neighborood in the update */
+ * - handle neighborhood in the update */
#define COMM_SIZE 10
#define COMP_SIZE 0
static int timeout = 50;
static int max_simulation_time = 1000;
-extern long int smx_total_comms;
-
typedef struct s_node {
int id; //128bits generated random(2^128 -1)
int known_id;
} 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);
}
/** Get the specific level of a node id */
-int domain_mask = 0;
-static int domain(int a, int level) {
+unsigned int domain_mask = 0;
+static int domain(unsigned int a, unsigned int level)
+{
if (domain_mask == 0)
domain_mask = pow(2, DOMAIN_SIZE) - 1;
- int shift = (LEVELS_COUNT-level-1)*DOMAIN_SIZE;
+ unsigned int shift = (LEVELS_COUNT-level-1)*DOMAIN_SIZE;
return (a >> shift) & domain_mask;
}
return l;
}
+/* 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);
+ xbt_free(data);
+ MSG_task_destroy(task);
+ }
+}
+
/* Get the closest id to the dest in the node namespace_set */
static int closest_in_namespace_set(node_t node, int dest) {
- int best_dist;
int res = -1;
- if ((node->namespace_set[NAMESPACE_SIZE-1] <= dest) & (dest <= node->namespace_set[0])) {
- best_dist = abs(node->id - dest);
+ if ((node->namespace_set[NAMESPACE_SIZE-1] <= dest) && (dest <= node->namespace_set[0])) {
+ int best_dist = abs(node->id - dest);
res = node->id;
- int i, dist;
- for (i=0; i<NAMESPACE_SIZE; i++) {
+ for (int i=0; i<NAMESPACE_SIZE; i++) {
if (node->namespace_set[i]!=-1) {
- dist = abs(node->namespace_set[i] - dest);
+ int dist = abs(node->namespace_set[i] - dest);
if (dist<best_dist) {
best_dist = dist;
- res = node->namespace_set[i];
+ res = node->namespace_set[i];
}
}
}
//rare case
int dist = abs(node->id - dest);
- int i,j;
+ int i;
for (i=l; i<LEVELS_COUNT; i++) {
- for (j=0; j<LEVEL_SIZE; j++) {
+ for (int j=0; j<LEVEL_SIZE; j++) {
res = node->routing_table[i][j];
if (res!=-1 && abs(res - dest)<dist)
return res;
/* Get the corresponding state of a node */
static state_t node_get_state(node_t node) {
- int i,j;
+ int i;
state_t state = xbt_new0(s_state_t,1);
state->id = node->id;
for (i=0; i<NEIGHBORHOOD_SIZE; i++)
state->neighborhood_set[i] = node->neighborhood_set[i];
for (i=0; i<LEVELS_COUNT; i++)
- for (j=0; j<LEVEL_SIZE; j++)
+ 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++)
/* Print the node id */
static void print_node_id(node_t node) {
- int i;
- printf(" id: %i '%08x' ", node->id, node->id);
- for (i=0;i<LEVELS_COUNT;i++)
- printf(" %x", domain(node->id, i));
- printf("\n");
+ XBT_INFO(" Id: %i '%08x' ", node->id, node->id);
}
/* * Print the node neighborhood set */
static void print_node_neighborood_set(node_t node) {
- int i;
- printf(" Neighborhood:\n");
- for (i=0; i<NEIGHBORHOOD_SIZE; i++)
- printf(" %08x\n", node->neighborhood_set[i]);
+ 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) {
- printf(" routing table:\n");
+ XBT_INFO(" Routing table:");
for (int i=0; i<LEVELS_COUNT; i++){
- printf(" ");
for (int j=0; j<LEVEL_SIZE; j++)
- printf("%08x ", node->routing_table[i][j]);
- printf("\n");
+ XBT_INFO(" %08x ", node->routing_table[i][j]);
}
}
/* Print the node namespace set */
static void print_node_namespace_set(node_t node) {
- printf(" namespace:\n");
+ XBT_INFO(" Namespace:");
for (int i=0; i<NAMESPACE_SIZE; i++)
- printf(" %08x\n", node->namespace_set[i]);
- printf("\n");
+ XBT_INFO(" %08x", node->namespace_set[i]);
}
/* Print the node information */
static void print_node(node_t node) {
- printf("Node:\n");
+ XBT_INFO("Node:");
print_node_id(node);
print_node_neighborood_set(node);
print_node_routing_table(node);
static void handle_task(node_t node, msg_task_t task) {
XBT_DEBUG("Handling task %p", task);
char mailbox[MAILBOX_NAME_SIZE];
- int i, j, min, max, d;
+ int i;
+ int j;
+ int min;
+ int max;
+ int d;
msg_task_t task_sent;
task_data_t req_data;
task_data_t task_data = (task_data_t) MSG_task_get_data(task);
task_data->sender_id = node->id;
task_data->steps++;
task_sent = MSG_task_create(NULL, COMP_SIZE, COMM_SIZE, task_data);
- MSG_task_send_with_timeout(task_sent, mailbox, timeout);
+ if (MSG_task_send_with_timeout(task_sent, mailbox, timeout)== MSG_TIMEOUT) {
+ XBT_DEBUG("Timeout expired when forwarding join to next %d", next);
+ task_free(task_sent);
+ }
type = TASK_JOIN_REPLY;
}
get_mailbox(node->id, req_data->answer_to);
req_data->state = node_get_state(node);
task_sent = MSG_task_create(NULL, COMP_SIZE, COMM_SIZE, req_data);
- MSG_task_send_with_timeout(task_sent, task_data->answer_to, timeout);
+ 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);
+ task_free(task_sent);
+ }
break;
}
/* Join reply from all the node touched by the join */
}
node->namespace_set[NAMESPACE_SIZE/2+j] = task_data->sender_id;
node->ready += task_data->steps + 1;
+ /* no break */
case TASK_JOIN_REPLY:
XBT_DEBUG("Joining Reply");
get_mailbox(node->id, req_data->answer_to);
req_data->state = node_get_state(node);
task_sent = MSG_task_create(NULL, COMP_SIZE, COMM_SIZE, req_data);
- MSG_task_send_with_timeout(task_sent, mailbox, timeout);
+ if (MSG_task_send_with_timeout(task_sent, mailbox, timeout)== MSG_TIMEOUT) {
+ XBT_DEBUG("Timeout expired when sending update to %d", j);
+ task_free(task_sent);
+ }
}
}
}
XBT_DEBUG("Task update %i !!!", node->id);
/* Update namespace ses */
- printf("Task update from %i !!!\n", task_data->sender_id);
+ XBT_INFO("Task update from %i !!!", 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 namedspace
- // and the task state namespace with state->id in the middle
+ // Copy the current namespace and the task state namespace with state->id in the middle
i=0;
for (; i<NAMESPACE_SIZE/2; i++){
curr_namespace_set[i] = node->namespace_set[i];
max = -1;
for (i=0; i<=NAMESPACE_SIZE; i++) {
j = task_namespace_set[i];
- if (i<NAMESPACE_SIZE)
- printf("%08x %08x | ", j, curr_namespace_set[i]);
- if (j != -1 && j < node->id) min = i;
- if (j != -1 && max == -1 && j > node->id) max = i;
+ if (j != -1 && j < node->id)
+ min = i;
+ if (j != -1 && max == -1 && j > node->id)
+ max = i;
}
- printf("\n");
// add lower elements
j = NAMESPACE_SIZE/2-1;
for (i=NAMESPACE_SIZE/2-1; i>=0; i--) {
- printf("i:%i, j:%i, min:%i, currj:%08x, taskmin:%08x\n", i, j, min, curr_namespace_set[j],
- task_namespace_set[min]);
if (min<0) {
node->namespace_set[i] = curr_namespace_set[j];
j--;
} else if (curr_namespace_set[j] == task_namespace_set[min]) {
node->namespace_set[i] = curr_namespace_set[j];
- j--; min--;
+ j--;
+ min--;
} else if (curr_namespace_set[j] > task_namespace_set[min]) {
node->namespace_set[i] = curr_namespace_set[j];
j--;
// add greater elements
j = NAMESPACE_SIZE/2;
for (i=NAMESPACE_SIZE/2; i<NAMESPACE_SIZE; i++) {
- printf("i:%i, j:%i, max:%i, currj:%08x, taskmax:%08x\n", i, j, max, curr_namespace_set[j],
- task_namespace_set[max]);
if (min<0 || max>=NAMESPACE_SIZE) {
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++; max++;
+ j++;
+ max++;
} else if (curr_namespace_set[j] < task_namespace_set[max]) {
node->namespace_set[i] = curr_namespace_set[j];
j++;
max++;
}
}
- print_node_namespace_set(node);
/* Update routing table */
for (i=shl(node->id, task_data->state->id); i<LEVELS_COUNT; i++) {
node->routing_table[i][j] = task_data->state->routing_table[i][j];
}
}
+ break;
+ default:
+ THROW_IMPOSSIBLE;
}
+ task_free(task);
}
/** \brief Initializes the current node as the first one of the system.
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);
- MSG_task_send_with_timeout(task_sent, mailbox, timeout);
+ 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);
+ task_free(task_sent);
+ }
return 1;
}
-
/**
* \brief Node Function
* Arguments:
get_mailbox(node.id, node.mailbox);
XBT_DEBUG("New node with id %s (%08x)", node.mailbox, node.id);
- int i,j,d;
+ int i;
for (i=0; i<LEVELS_COUNT; i++){
- d = domain(node.id, i);
- for (j=0; j<LEVEL_SIZE; j++)
+ int d = domain(node.id, i);
+ for (int j=0; j<LEVEL_SIZE; j++)
node.routing_table[i][j] = (d==j) ? node.id : -1;
}
}
}
- print_node(&node);
+ //Cleanup the receiving communication.
+ if (node.comm_receive != NULL) {
+ if (MSG_comm_test(node.comm_receive) && MSG_comm_get_status(node.comm_receive) == MSG_OK) {
+ task_free(MSG_comm_get_task(node.comm_receive));
+ }
+ MSG_comm_destroy(node.comm_receive);
+ }
+
}
+ xbt_free(node.pending_tasks);
return 1;
}
timeout = xbt_str_parse_int(options[0] + length, "Invalid timeout parameter: %s");
XBT_DEBUG("Set timeout to %d", timeout);
} else {
- xbt_die("Invalid chord option '%s'", options[0]);
+ xbt_die("Invalid pastry option '%s'", options[0]);
}
}
options++;
MSG_launch_application(options[1]);
msg_error_t res = MSG_main();
- XBT_CRITICAL("Messages created: %ld", smx_total_comms);
XBT_INFO("Simulated time: %g", MSG_get_clock());
return res != MSG_OK;
