A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cosmetics in HostImpl
[simgrid.git]
/
src
/
simdag
/
sd_task.cpp
diff --git
a/src/simdag/sd_task.cpp
b/src/simdag/sd_task.cpp
index
8bbfa7f
..
2cf77b6
100644
(file)
--- 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);
if (new_state == SD_DONE || new_state == SD_FAILED){
sd_global->completed_tasks->insert(task);
- task->start_time = task->surf_action->get
StartT
ime();
+ task->start_time = task->surf_action->get
_start_t
ime();
if (new_state == SD_DONE){
if (new_state == SD_DONE){
- task->finish_time = task->surf_action->get
FinishT
ime();
+ task->finish_time = task->surf_action->get
_finish_t
ime();
#if SIMGRID_HAVE_JEDULE
jedule_log_sd_event(task);
#endif
#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)
double SD_task_get_remaining_amount(SD_task_t task)
{
if (task->surf_action)
- return task->surf_action->get
R
emains();
+ return task->surf_action->get
_r
emains();
else
return (task->state == SD_DONE) ? 0 : task->amount;
}
else
return (task->state == SD_DONE) ? 0 : task->amount;
}
@@
-808,9
+808,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);
if(task->bytes_amount)
std::copy_n(task->bytes_amount, host_nb * host_nb, bytes_amount);
- task->surf_action = surf_host_model->execute
ParallelTask
(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->set
D
ata(task);
+ task->surf_action->set
_d
ata(task);
XBT_DEBUG("surf_action = %p", task->surf_action);
XBT_DEBUG("surf_action = %p", task->surf_action);
@@
-830,7
+830,7
@@
void SD_task_run(SD_task_t task)
double SD_task_get_start_time(SD_task_t task)
{
if (task->surf_action)
double SD_task_get_start_time(SD_task_t task)
{
if (task->surf_action)
- return task->surf_action->get
StartT
ime();
+ return task->surf_action->get
_start_t
ime();
else
return task->start_time;
}
else
return task->start_time;
}
@@
-848,7
+848,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 */
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->get
FinishT
ime();
+ return task->surf_action->get
_finish_t
ime();
else
return task->finish_time;
}
else
return task->finish_time;
}