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
kill some dead code
[simgrid.git]
/
src
/
simdag
/
sd_task.cpp
diff --git
a/src/simdag/sd_task.cpp
b/src/simdag/sd_task.cpp
index
bf221e9
..
f15f7bc
100644
(file)
--- a/
src/simdag/sd_task.cpp
+++ b/
src/simdag/sd_task.cpp
@@
-116,7
+116,7
@@
SD_task_t SD_task_create(const char *name, void *data, double amount)
return task;
}
return task;
}
-static
XBT_INLINE
SD_task_t SD_task_create_sized(const char *name, void *data, double amount, int ws_count)
+static
inline
SD_task_t SD_task_create_sized(const char *name, void *data, double amount, int ws_count)
{
SD_task_t task = SD_task_create(name, data, amount);
task->bytes_amount = xbt_new0(double, ws_count * ws_count);
{
SD_task_t task = SD_task_create(name, data, amount);
task->bytes_amount = xbt_new0(double, ws_count * ws_count);
@@
-350,7
+350,7
@@
void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state)
xbt_dynar_push(sd_global->completed_task_set,&task);
task->finish_time = task->surf_action->getFinishTime();
task->remains = 0;
xbt_dynar_push(sd_global->completed_task_set,&task);
task->finish_time = task->surf_action->getFinishTime();
task->remains = 0;
-#if
def
HAVE_JEDULE
+#if HAVE_JEDULE
jedule_log_sd_event(task);
#endif
break;
jedule_log_sd_event(task);
#endif
break;
@@
-839,7
+839,7
@@
double SD_task_get_execution_time(SD_task_t task, int workstation_nb, const sg_h
for (int i = 0; i < workstation_nb; i++) {
double time = 0.0;
if (flops_amount != NULL)
for (int i = 0; i < workstation_nb; i++) {
double time = 0.0;
if (flops_amount != NULL)
- time = flops_amount[i] /
sg_host_speed(workstation_list[i]
);
+ time = flops_amount[i] /
workstation_list[i]->speed(
);
if (bytes_amount != NULL)
for (int j = 0; j < workstation_nb; j++) {
if (bytes_amount != NULL)
for (int j = 0; j < workstation_nb; j++) {
@@
-857,7
+857,7
@@
double SD_task_get_execution_time(SD_task_t task, int workstation_nb, const sg_h
return max_time;
}
return max_time;
}
-static
XBT_INLINE
void SD_task_do_schedule(SD_task_t task)
+static
inline
void SD_task_do_schedule(SD_task_t task)
{
if (SD_task_get_state(task) > SD_SCHEDULABLE)
THROWF(arg_error, 0, "Task '%s' has already been scheduled", SD_task_get_name(task));
{
if (SD_task_get_state(task) > SD_SCHEDULABLE)
THROWF(arg_error, 0, "Task '%s' has already been scheduled", SD_task_get_name(task));