char pred_mailbox[MAILBOX_NAME_SIZE]; // predecessor's mailbox name
int next_finger_to_fix; // index of the next finger to fix in fix_fingers()
msg_comm_t comm_receive; // current communication to receive
- xbt_dynar_t comms; // current communications being sent
double last_change_date; // last time I changed a finger or my predecessor
} s_node_t, *node_t;
static int normalize(int id);
static int is_in_interval(int id, int start, int end);
static void get_mailbox(int host_id, char* mailbox);
-static void task_data_destroy(task_data_t task_data);
+static void task_free(void* task);
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);
}
/**
- * \brief Frees the memory used by some task data.
- * \param task_data the task data to destroy
+ * \brief Frees the memory used by a task.
+ * \param task the MSG task to destroy
*/
-static void task_data_destroy(task_data_t task_data)
+static void task_free(void* task)
{
- xbt_free(task_data);
+ // TODO add a parameter data_free_function to MSG_task_create?
+ xbt_free(MSG_task_get_data(task));
+ MSG_task_destroy(task);
}
/**
double init_time = MSG_get_clock();
m_task_t task_received = NULL;
- msg_comm_t comm_send = NULL;
int i;
- int index;
int join_success = 0;
double deadline;
double next_stabilize_date = init_time + periodic_stabilize_delay;
node.id = atoi(argv[1]);
get_mailbox(node.id, node.mailbox);
node.next_finger_to_fix = 0;
- node.comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
node.fingers = xbt_new0(s_finger_t, nb_bits);
node.last_change_date = init_time;
}
// see if some communications are finished
+ /*
while ((index = MSG_comm_testany(node.comms)) != -1) {
comm_send = xbt_dynar_get_as(node.comms, index, msg_comm_t);
MSG_error_t status = MSG_comm_get_status(comm_send);
MSG_task_destroy(task);
}
}
+ */
}
// clean unfinished comms sent
}
// stop the simulation
- xbt_dynar_free(&node.comms);
xbt_free(node.fingers);
return 0;
}
static void handle_task(node_t node, m_task_t task) {
DEBUG1("Handling task %p", task);
- msg_comm_t comm = NULL;
char mailbox[MAILBOX_NAME_SIZE];
task_data_t task_data = (task_data_t) MSG_task_get_data(task);
e_task_type_t type = task_data->type;
task_data->issuer_host_name,
task_data->answer_to,
task_data->request_id, task_data->answer_id);
- comm = MSG_task_isend(task, task_data->answer_to);
- xbt_dynar_push(node->comms, &comm);
+ MSG_task_dsend(task, task_data->answer_to, task_free);
}
else {
// otherwise, forward the request to the closest preceding finger in my table
DEBUG2("Forwarding the 'Find Successor' request for id %d to my closest preceding finger %d",
task_data->request_id, closest);
get_mailbox(closest, mailbox);
- comm = MSG_task_isend(task, mailbox);
- xbt_dynar_push(node->comms, &comm);
+ MSG_task_dsend(task, mailbox, task_free);
}
break;
DEBUG3("Sending back a 'Get Predecessor Answer' to %s via mailbox '%s': my predecessor is %d",
task_data->issuer_host_name,
task_data->answer_to, task_data->answer_id);
- comm = MSG_task_isend(task, task_data->answer_to);
- xbt_dynar_push(node->comms, &comm);
+ MSG_task_dsend(task, task_data->answer_to, task_free);
break;
case TASK_NOTIFY:
// someone is telling me that he may be my new predecessor
DEBUG1("Receiving a 'Notify' request from %s", task_data->issuer_host_name);
notify(node, task_data->request_id);
- task_data_destroy(task_data);
- MSG_task_destroy(task);
+ task_free(task);
break;
case TASK_PREDECESSOR_LEAVING:
DEBUG1("Receiving a 'Predecessor Leaving' message from %s", task_data->issuer_host_name);
// modify my predecessor
set_predecessor(node, task_data->request_id);
- task_data_destroy(task_data);
- MSG_task_destroy(task);
+ task_free(task);
/*TODO :
>> notify my new predecessor
>> send a notify_predecessors !!
DEBUG1("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->request_id);
- task_data_destroy(task_data);
- MSG_task_destroy(task);
+ task_free(task);
/* TODO
>> notify my new successor
>> update my table & predecessors table */
case TASK_FIND_SUCCESSOR_ANSWER:
case TASK_GET_PREDECESSOR_ANSWER:
DEBUG2("Ignoring unexpected task of type %d (%p)", type, task);
- task_data_destroy(task_data);
- MSG_task_destroy(task);
+ task_free(task);
break;
}
}
if (res != MSG_OK) {
DEBUG3("Failed to send the 'Find Successor' request (task %p) to %d for id %d",
task_sent, ask_to, id);
- MSG_task_destroy(task_sent);
- task_data_destroy(req_data);
+ task_free(task_sent);
}
else {
stop = 1;
MSG_comm_destroy(node->comm_receive);
node->comm_receive = NULL;
- MSG_task_destroy(task_received);
- task_data_destroy(req_data);
+ task_free(task_received);
}
}
} while (!stop);
if (res != MSG_OK) {
DEBUG2("Failed to send the 'Get Predecessor' request (task %p) to %d",
task_sent, ask_to);
- MSG_task_destroy(task_sent);
- task_data_destroy(req_data);
+ task_free(task_sent);
}
else {
stop = 1;
MSG_comm_destroy(node->comm_receive);
node->comm_receive = NULL;
- MSG_task_destroy(task_received);
- task_data_destroy(req_data);
+ task_free(task_received);
}
}
} while (!stop);
DEBUG2("Sending a 'Notify' request (task %p) to %d", task, notify_id);
char mailbox[MAILBOX_NAME_SIZE];
get_mailbox(notify_id, mailbox);
- msg_comm_t comm = MSG_task_isend(task, mailbox);
- xbt_dynar_push(node->comms, &comm);
+ MSG_task_dsend(task, mailbox, task_free);
}
/**
