X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48882591318b15f36dcca34655bbe67fb3bfe3da..612ee16a751800aa1dd996ee512fa38adcfe001d:/src/simdag/sd_task.cpp

diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp
index 8bbfa7f291..7fd697eafd 100644
--- a/src/simdag/sd_task.cpp
+++ b/src/simdag/sd_task.cpp
@@ -287,9 +287,9 @@ void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state)
 
   if (new_state == SD_DONE || new_state == SD_FAILED){
     sd_global->completed_tasks->insert(task);
-    task->start_time = task->surf_action->getStartTime();
+    task->start_time = task->surf_action->get_start_time();
     if (new_state == SD_DONE){
-      task->finish_time = task->surf_action->getFinishTime();
+      task->finish_time = task->surf_action->get_finish_time();
 #if SIMGRID_HAVE_JEDULE
       jedule_log_sd_event(task);
 #endif
@@ -435,7 +435,7 @@ double SD_task_get_alpha(SD_task_t task)
 double SD_task_get_remaining_amount(SD_task_t task)
 {
   if (task->surf_action)
-    return task->surf_action->getRemains();
+    return task->surf_action->get_remains();
   else
     return (task->state == SD_DONE) ? 0 : task->amount;
 }
@@ -667,7 +667,6 @@ void SD_task_unwatch(SD_task_t task, e_SD_task_state_t state)
  * The estimation is very approximative because the value returned is the time the task would take if it was executed
  * now and if it was the only task.
  *
- * \param task the task to evaluate
  * \param host_count number of hosts on which the task would be executed
  * \param host_list the hosts on which the task would be executed
  * \param flops_amount computation amount for each host(i.e., an array of host_count doubles)
@@ -808,9 +807,9 @@ void SD_task_run(SD_task_t task)
   if(task->bytes_amount)
     std::copy_n(task->bytes_amount, host_nb * host_nb, bytes_amount);
 
-  task->surf_action = surf_host_model->executeParallelTask(host_nb, hosts, flops_amount, bytes_amount, task->rate);
+  task->surf_action = surf_host_model->execute_parallel(host_nb, hosts, flops_amount, bytes_amount, task->rate);
 
-  task->surf_action->setData(task);
+  task->surf_action->set_data(task);
 
   XBT_DEBUG("surf_action = %p", task->surf_action);
 
@@ -830,7 +829,7 @@ void SD_task_run(SD_task_t task)
 double SD_task_get_start_time(SD_task_t task)
 {
   if (task->surf_action)
-    return task->surf_action->getStartTime();
+    return task->surf_action->get_start_time();
   else
     return task->start_time;
 }
@@ -848,7 +847,7 @@ double SD_task_get_start_time(SD_task_t task)
 double SD_task_get_finish_time(SD_task_t task)
 {
   if (task->surf_action)        /* should never happen as actions are destroyed right after their completion */
-    return task->surf_action->getFinishTime();
+    return task->surf_action->get_finish_time();
   else
     return task->finish_time;
 }