ONGOING work on exceptions plus minor cleanups.

[simgrid.git] / src / msg / gos.c

diff --git a/src/msg/gos.c b/src/msg/gos.c
index 2e82c5a..c57e078 100644 (file)
--- a/src/msg/gos.c
+++ b/src/msg/gos.c
@@ -73,7 +73,6 @@ MSG_error_t MSG_task_get_with_time_out(m_task_t * task,
   m_host_t h = NULL;
   simdata_task_t t_simdata = NULL;
   simdata_host_t h_simdata = NULL;
-  int warning = 0;
   int first_time = 1;
   e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM;
   
@@ -335,22 +334,24 @@ MSG_error_t MSG_task_put(m_task_t task,
     state=surf_workstation_resource->common_public->action_get_state(task_simdata->comm);
   }
     
-  MSG_task_destroy(task);
 
   PAJE_PROCESS_POP_STATE(process);  
 
   if(state == SURF_ACTION_DONE) {
     if(surf_workstation_resource->common_public->action_free(task_simdata->comm)) 
       task_simdata->comm = NULL;
+    MSG_task_destroy(task);
     MSG_RETURN(MSG_OK);
   } else if(surf_workstation_resource->extension_public->get_state(local_host->simdata->host) 
            == SURF_CPU_OFF) {
     if(surf_workstation_resource->common_public->action_free(task_simdata->comm)) 
       task_simdata->comm = NULL;
+    MSG_task_destroy(task);
     MSG_RETURN(MSG_HOST_FAILURE);
   } else { 
     if(surf_workstation_resource->common_public->action_free(task_simdata->comm)) 
       task_simdata->comm = NULL;
+    MSG_task_destroy(task);
     MSG_RETURN(MSG_TRANSFER_FAILURE);
   }
 }
@@ -365,9 +366,11 @@ MSG_error_t MSG_task_put_bounded(m_task_t task,
                                 m_host_t dest, m_channel_t channel,
                                 double max_rate)
 {
+  MSG_error_t res = MSG_OK;
   task->simdata->rate=max_rate;
-  return(MSG_task_put(task, dest, channel));
+  res = MSG_task_put(task, dest, channel);
   task->simdata->rate=-1.0;
+  return(res);
 }
 
 /** \ingroup msg_gos_functions
@@ -425,6 +428,7 @@ MSG_error_t __MSG_wait_for_computation(m_process_t process, m_task_t task)
   if(state == SURF_ACTION_DONE) {
     if(surf_workstation_resource->common_public->action_free(simdata->compute)) 
       simdata->compute = NULL;
+    simdata->computation_amount = 0.0;
     MSG_RETURN(MSG_OK);
   } else if(surf_workstation_resource->extension_public->
            get_state(MSG_process_get_host(process)->simdata->host) 
@@ -435,10 +439,28 @@ MSG_error_t __MSG_wait_for_computation(m_process_t process, m_task_t task)
   } else {
     if(surf_workstation_resource->common_public->action_free(simdata->compute)) 
       simdata->compute = NULL;
-    MSG_RETURN(MSG_TRANSFER_FAILURE);
+    MSG_RETURN(MSG_TASK_CANCELLED);
   }
 }
-
+/** \ingroup m_task_management
+ * \brief Creates a new #m_task_t (a parallel one....).
+ *
+ * A constructor for #m_task_t taking six arguments and returning the 
+   corresponding object.
+ * \param name a name for the object. It is for user-level information
+   and can be NULL.
+ * \param host_nb the number of hosts implied in the parallel task.
+ * \param host_list an array of #host_nb m_host_t.
+ * \param computation_amount an array of #host_nb
+   doubles. computation_amount[i] is the total number of operations
+   that have to be performed on host_list[i].
+ * \param communication_amount an array of #host_nb*#host_nb doubles.
+ * \param data a pointer to any data may want to attach to the new
+   object.  It is for user-level information and can be NULL. It can
+   be retrieved with the function \ref MSG_task_get_data.
+ * \see m_task_t
+ * \return The new corresponding object.
+ */
 m_task_t MSG_parallel_task_create(const char *name, 
                                  int host_nb,
                                  const m_host_t *host_list,
@@ -490,7 +512,8 @@ static void __MSG_parallel_task_execute(m_process_t process, m_task_t task)
                        task->simdata->comm_amount,
                        1.0,
                        -1.0);
-  surf_workstation_resource->common_public->action_set_data(simdata->compute,task);
+  if(simdata->compute)
+    surf_workstation_resource->common_public->action_set_data(simdata->compute,task);
 }
 
 MSG_error_t MSG_parallel_task_execute(m_task_t task)
@@ -502,7 +525,10 @@ MSG_error_t MSG_parallel_task_execute(m_task_t task)
   
   __MSG_parallel_task_execute(process, task);
 
-  res = __MSG_wait_for_computation(process,task);
+  if(task->simdata->compute)
+    res = __MSG_wait_for_computation(process,task);
+  else 
+    res = MSG_OK;
 
   return res;  
 }