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
be consistent with myself and don't break test
[simgrid.git]
/
examples
/
simdag
/
sd_avail.c
diff --git
a/examples/simdag/sd_avail.c
b/examples/simdag/sd_avail.c
index
94c5809
..
d0ff078
100644
(file)
--- a/
examples/simdag/sd_avail.c
+++ b/
examples/simdag/sd_avail.c
@@
-45,13
+45,13
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(sd_avail,
int main(int argc, char **argv)
{
unsigned int ctr;
int main(int argc, char **argv)
{
unsigned int ctr;
- const
SD_workstation
_t *workstations;
+ const
sg_host
_t *workstations;
SD_task_t t1, c1, t2, c2, t3, c3, t4, task;
xbt_dynar_t changed_tasks;
SD_init(&argc, argv);
SD_create_environment(argv[1]);
SD_task_t t1, c1, t2, c2, t3, c3, t4, task;
xbt_dynar_t changed_tasks;
SD_init(&argc, argv);
SD_create_environment(argv[1]);
- workstations =
SD_workstation_ge
t_list();
+ workstations =
sg_hos
t_list();
t1 = SD_task_create_comp_seq("t1", NULL, 25000000);
c1 = SD_task_create_comm_e2e("c1", NULL, 125000000);
t1 = SD_task_create_comp_seq("t1", NULL, 25000000);
c1 = SD_task_create_comm_e2e("c1", NULL, 125000000);
@@
-90,11
+90,11
@@
int main(int argc, char **argv)
SD_route_get_bandwidth(workstations[0], workstations[1]),
SD_route_get_latency(workstations[0], workstations[1]));
XBT_INFO("Jupiter: speed=%.0f",
SD_route_get_bandwidth(workstations[0], workstations[1]),
SD_route_get_latency(workstations[0], workstations[1]));
XBT_INFO("Jupiter: speed=%.0f",
-
SD_workstation_ge
t_speed(workstations[0])*
-
SD_workstation
_get_available_speed(workstations[0]));
+
sg_hos
t_speed(workstations[0])*
+
sg_host
_get_available_speed(workstations[0]));
XBT_INFO("Tremblay: speed=%.0f",
XBT_INFO("Tremblay: speed=%.0f",
-
SD_workstation_ge
t_speed(workstations[1])*
-
SD_workstation
_get_available_speed(workstations[1]));
+
sg_hos
t_speed(workstations[1])*
+
sg_host
_get_available_speed(workstations[1]));
xbt_dynar_foreach(changed_tasks, ctr, task) {
XBT_INFO("Task '%s' start time: %f, finish time: %f",
SD_task_get_name(task),
xbt_dynar_foreach(changed_tasks, ctr, task) {
XBT_INFO("Task '%s' start time: %f, finish time: %f",
SD_task_get_name(task),