X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/073f8bce5afb1febdc3580607be8819b90705280..e1125ee008d92c7f0bbebc9274d7f44829fa58f9:/src/simdag/sd_task.c

diff --git a/src/simdag/sd_task.c b/src/simdag/sd_task.c
index 361f544db2..26a4e3cbc6 100644
--- a/src/simdag/sd_task.c
+++ b/src/simdag/sd_task.c
@@ -44,7 +44,6 @@ SD_task_t SD_task_create(const char *name, void *data, double amount) {
   task->finish_time = -1.0;
   task->surf_action = NULL;
   task->watch_points = 0;
-  task->state_changed = 0;
 
   /* dependencies */
   task->tasks_before = xbt_dynar_new(sizeof(SD_dependency_t), NULL);
@@ -673,21 +672,31 @@ void __SD_task_really_run(SD_task_t task) {
 		    value, task->rate);
     }
   }
-  if(!task->surf_action) 
+  if(!task->surf_action) {
+    double *computation_amount = xbt_new(double, task->workstation_nb);
+    double *communication_amount = xbt_new(double, task->workstation_nb * 
+					   task->workstation_nb);
+
+    memcpy(computation_amount, task->computation_amount, sizeof(double) * 
+	   task->workstation_nb);
+    memcpy(communication_amount, task->communication_amount, 
+	   sizeof(double) * task->workstation_nb * task->workstation_nb);
+
     task->surf_action = surf_workstation_model->extension_public->
       execute_parallel_task(task->workstation_nb,
 			    surf_workstations,
-			    task->computation_amount,
-			    task->communication_amount,
+			    computation_amount,
+			    communication_amount,
 			    task->amount,
 			    task->rate);
+  } else {
+    xbt_free(surf_workstations);
+  }
 
   surf_workstation_model->common_public->action_set_data(task->surf_action, task);
-  task->state_changed = 1;
 
   DEBUG1("surf_action = %p",  task->surf_action);
 
-  xbt_free(surf_workstations);
   __SD_task_destroy_scheduling_data(task); /* now the scheduling data are not useful anymore */
   __SD_task_set_state(task, SD_RUNNING);
   xbt_assert2(__SD_task_is_running(task), "Bad state of task '%s': %d",