X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/145e627fb31fa35087140eb8d7388af6e889823b..7202794f0297f62f99a8a1b0e07d91c77699b60c:/src/msg/gos.c

diff --git a/src/msg/gos.c b/src/msg/gos.c
index 5951487fb5..58ba381cda 100644
--- a/src/msg/gos.c
+++ b/src/msg/gos.c
@@ -24,6 +24,7 @@ static MSG_error_t __MSG_task_get_with_time_out_from_host(m_task_t * task,
   m_process_t process = MSG_process_self();
   m_task_t t = NULL;
   m_host_t h = NULL;
+  m_task_t task_to_wait_for;
   simdata_task_t t_simdata = NULL;
   simdata_host_t h_simdata = NULL;
   int first_time = 1;
@@ -63,7 +64,6 @@ static MSG_error_t __MSG_task_get_with_time_out_from_host(m_task_t * task,
     if(max_duration>0) {
       if(!first_time) {
 	PAJE_PROCESS_POP_STATE(process);
-	PAJE_COMM_STOP(process,t,channel);
 	MSG_RETURN(MSG_TRANSFER_FAILURE);
       }
     }
@@ -82,8 +82,6 @@ static MSG_error_t __MSG_task_get_with_time_out_from_host(m_task_t * task,
     first_time = 0;
     if(surf_workstation_resource->extension_public->get_state(h_simdata->host) 
        == SURF_CPU_OFF)
-      PAJE_PROCESS_POP_STATE(process);
-      PAJE_COMM_STOP(process,t,channel);
       MSG_RETURN(MSG_HOST_FAILURE);
     /* OK, we should both be ready now. Are you there ? */
   }
@@ -100,7 +98,7 @@ static MSG_error_t __MSG_task_get_with_time_out_from_host(m_task_t * task,
   while(MSG_process_is_suspended(t_simdata->sender)) {
     DEBUG1("Oooups, the sender (%s) has been suspended in the meantime. Let's wait for him", 
 	   t_simdata->sender->name);
-    m_task_t task_to_wait_for = t_simdata->sender->simdata->waiting_task;
+    task_to_wait_for = t_simdata->sender->simdata->waiting_task;
     if(__MSG_process_isBlocked(t_simdata->sender)) {
       DEBUG0("He's blocked. Let's wait for him to go in the suspended state");
       __MSG_process_unblock(t_simdata->sender);