git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9537
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
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 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);
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)
+ // TODO add a parameter data_free_function to MSG_task_create?
+ xbt_free(MSG_task_get_data(task));
+ MSG_task_destroy(task);
task_data->issuer_host_name,
task_data->answer_to,
task_data->request_id, task_data->answer_id);
task_data->issuer_host_name,
task_data->answer_to,
task_data->request_id, task_data->answer_id);
- MSG_task_dsend(task, task_data->answer_to);
+ MSG_task_dsend(task, task_data->answer_to, task_free);
}
else {
// otherwise, forward the request to the closest preceding finger in my table
}
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);
DEBUG2("Forwarding the 'Find Successor' request for id %d to my closest preceding finger %d",
task_data->request_id, closest);
get_mailbox(closest, mailbox);
- MSG_task_dsend(task, mailbox);
+ MSG_task_dsend(task, mailbox, task_free);
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);
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);
- MSG_task_dsend(task, task_data->answer_to);
+ 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);
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);
break;
case TASK_PREDECESSOR_LEAVING:
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);
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);
/*TODO :
>> notify my new predecessor
>> send a notify_predecessors !!
/*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);
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);
/* TODO
>> notify my new successor
>> update my table & predecessors table */
/* 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);
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);
if (res != MSG_OK) {
DEBUG3("Failed to send the 'Find Successor' request (task %p) to %d for id %d",
task_sent, ask_to, id);
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);
stop = 1;
MSG_comm_destroy(node->comm_receive);
node->comm_receive = NULL;
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);
if (res != MSG_OK) {
DEBUG2("Failed to send the 'Get Predecessor' request (task %p) to %d",
task_sent, ask_to);
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);
stop = 1;
MSG_comm_destroy(node->comm_receive);
node->comm_receive = NULL;
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);
DEBUG2("Sending a 'Notify' request (task %p) to %d", task, notify_id);
char mailbox[MAILBOX_NAME_SIZE];
get_mailbox(notify_id, mailbox);
DEBUG2("Sending a 'Notify' request (task %p) to %d", task, notify_id);
char mailbox[MAILBOX_NAME_SIZE];
get_mailbox(notify_id, mailbox);
- MSG_task_dsend(task, mailbox);
+ MSG_task_dsend(task, mailbox, task_free);
*
* \param task a #m_task_t to send on another location.
* \param alias name of the mailbox to sent the task to
*
* \param task a #m_task_t to send on another location.
* \param alias name of the mailbox to sent the task to
+ * \param cleanup a function to destroy the task if the
+ * communication fails (if NULL, MSG_task_destroy() will
+ * be used by default)
*/
void MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup)
{
*/
void MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup)
{
+ if (cleanup == NULL) {
+ cleanup = (void_f_pvoid_t) MSG_task_destroy;
+ }
+
/* FIXME: these functions are not traceable */
/* Prepare the task to send */
/* FIXME: these functions are not traceable */
/* Prepare the task to send */
SIMIX_comm_destroy_internal_actions(action);
SIMIX_comm_destroy_internal_actions(action);
- if(action->comm.detached)
- ((void_f_pvoid_t)action->comm.src_data)(action->comm.src_buff);
+ if (action->comm.detached && action->state != SIMIX_DONE) {
+ /* the communication has failed and was detached:
+ * we have to free the buffer */
+ ((void_f_pvoid_t) action->comm.src_data)(action->comm.src_buff);
+ }