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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
simdag
/
sd_task.cpp
diff --git
a/src/simdag/sd_task.cpp
b/src/simdag/sd_task.cpp
index
828ac09
..
9309197
100644
(file)
--- a/
src/simdag/sd_task.cpp
+++ b/
src/simdag/sd_task.cpp
@@
-904,12
+904,13
@@
double SD_task_get_execution_time(SD_task_t task,
if (bytes_amount != NULL)
for (j = 0; j < workstation_nb; j++) {
if (bytes_amount != NULL)
for (j = 0; j < workstation_nb; j++) {
- time +=
- SD_route_get_communication_time(workstation_list[i],
- workstation_list[j],
- bytes_amount[i *
- workstation_nb
- + j]);
+ if (bytes_amount[i * workstation_nb + j] !=0 ) {
+ time += (SD_route_get_latency(workstation_list[i],
+ workstation_list[j]) +
+ bytes_amount[i * workstation_nb + j] /
+ SD_route_get_bandwidth(workstation_list[i],
+ workstation_list[j]));
+ }
}
if (time > max_time) {
}
if (time > max_time) {