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

diff --git a/src/simdag/sd_task.c b/src/simdag/sd_task.c
index c9931c27b9..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);
@@ -124,12 +123,12 @@ void __SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state) {
     break;
   case SD_RUNNING:
     task->state_set = sd_global->running_task_set;
-    task->start_time = surf_workstation_resource->common_public->
+    task->start_time = surf_workstation_model->common_public->
       action_get_start_time(task->surf_action);
     break;
   case SD_DONE:
     task->state_set = sd_global->done_task_set;
-    task->finish_time = surf_workstation_resource->common_public->
+    task->finish_time = surf_workstation_model->common_public->
       action_get_finish_time(task->surf_action);
     task->remains = 0;
     break;
@@ -589,7 +588,7 @@ void SD_task_unschedule(SD_task_t task) {
     __SD_task_destroy_scheduling_data(task);
 
   if (__SD_task_is_running(task)) /* the task should become SD_FAILED */
-    surf_workstation_resource->common_public->action_cancel(task->surf_action);
+    surf_workstation_model->common_public->action_cancel(task->surf_action);
   else
     __SD_task_set_state(task, SD_NOT_SCHEDULED);
   task->remains = task->amount;
@@ -648,11 +647,11 @@ void __SD_task_really_run(SD_task_t task) {
   task->surf_action = NULL;
   if((task->workstation_nb==1) &&
      (task->communication_amount[0]==0.0)) {
-    task->surf_action = surf_workstation_resource->extension_public->
+    task->surf_action = surf_workstation_model->extension_public->
       execute(surf_workstations[0], task->computation_amount[0]);
   } else if((task->workstation_nb==1) &&
 	    (task->computation_amount[0]==0.0)) {
-    task->surf_action = surf_workstation_resource->extension_public->
+    task->surf_action = surf_workstation_model->extension_public->
       communicate(surf_workstations[0], surf_workstations[0],
 		  task->communication_amount[0],task->rate);
   } else if((task->workstation_nb==2) &&
@@ -668,26 +667,36 @@ void __SD_task_really_run(SD_task_t task) {
       }
     }
     if(nb==1) {
-      task->surf_action = surf_workstation_resource->extension_public->
+      task->surf_action = surf_workstation_model->extension_public->
 	communicate(surf_workstations[0], surf_workstations[1],
 		    value, task->rate);
     }
   }
-  if(!task->surf_action) 
-    task->surf_action = surf_workstation_resource->extension_public->
+  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_resource->common_public->action_set_data(task->surf_action, task);
-  task->state_changed = 1;
+  surf_workstation_model->common_public->action_set_data(task->surf_action, task);
 
   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",
@@ -763,7 +772,7 @@ void __SD_task_just_done(SD_task_t task) {
   candidates = xbt_new(SD_task_t, 8);
 
   __SD_task_set_state(task, SD_DONE);
-  surf_workstation_resource->common_public->action_free(task->surf_action);
+  surf_workstation_model->common_public->action_free(task->surf_action);
   task->surf_action = NULL;
 
   DEBUG0("Looking for candidates");
@@ -896,7 +905,7 @@ double SD_task_get_start_time(SD_task_t task) {
   SD_CHECK_INIT_DONE();
   xbt_assert0(task != NULL, "Invalid parameter");
   if(task->surf_action)
-    return surf_workstation_resource->common_public->action_get_start_time(task->surf_action);
+    return surf_workstation_model->common_public->action_get_start_time(task->surf_action);
   else 
     return task->start_time;
 }
@@ -917,7 +926,7 @@ double SD_task_get_finish_time(SD_task_t task) {
   xbt_assert0(task != NULL, "Invalid parameter");
 
   if(task->surf_action) /* should never happen as actions are destroyed right after their completion */
-    return surf_workstation_resource->common_public->action_get_finish_time(task->surf_action);
+    return surf_workstation_model->common_public->action_get_finish_time(task->surf_action);
   else 
     return task->finish_time;
 }
@@ -946,7 +955,7 @@ void SD_task_destroy(SD_task_t task) {
     xbt_free(task->name);
 
   if (task->surf_action != NULL)
-    surf_workstation_resource->common_public->action_free(task->surf_action);
+    surf_workstation_model->common_public->action_free(task->surf_action);
 
   if (task->workstation_list != NULL)
     xbt_free(task->workstation_list);