- xbt_ex_free(e);
- /* verify if the timeout happened and the communication didn't started yet */
- if (task->simdata->comm == NULL) {
- process->simdata->waiting_task = NULL;
-
- /* remove the task from the mailbox */
- MSG_mailbox_remove(mailbox, task);
-
- if (task->simdata->receiver) {
- task->simdata->receiver->simdata->waiting_task = NULL;
- }
-
- task->simdata->sender = NULL;
-
- SIMIX_mutex_unlock(task->simdata->mutex);
- MSG_RETURN(MSG_TRANSFER_FAILURE);
- }
+ xbt_ex_free(e);
+ /* verify if the timeout happened and the communication didn't started yet */
+ if (t_simdata->comm == NULL) {
+ DEBUG1("Action terminated %s (there was a timeout)", task->name);
+ process->simdata->waiting_action = NULL;
+
+ /* remove the task from the mailbox */
+ MSG_mailbox_remove(mailbox, task);
+
+/* if (t_simdata->receiver && t_simdata->receiver->simdata) { /\* receiver still around *\/ */
+/* t_simdata->receiver->simdata->waiting_task = NULL; */
+/* } */
+
+ SIMIX_mutex_unlock(t_simdata->mutex);
+ MSG_RETURN(MSG_TRANSFER_FAILURE);
+ }