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 all trailling whitespaces
[simgrid.git]
/
examples
/
simdag
/
availability
/
sd_availability.c
diff --git
a/examples/simdag/availability/sd_availability.c
b/examples/simdag/availability/sd_availability.c
index
45f0a16
..
a0b20a0
100644
(file)
--- a/
examples/simdag/availability/sd_availability.c
+++ b/
examples/simdag/availability/sd_availability.c
@@
-41,7
+41,7
@@
int main(int argc, char **argv)
{
SD_init(&argc, argv);
SD_create_environment(argv[1]);
-
const
sg_host_t *hosts = sg_host_list();
+ sg_host_t *hosts = sg_host_list();
SD_task_t t1 = SD_task_create_comp_seq("t1", NULL, 25000000);
SD_task_t c1 = SD_task_create_comm_e2e("c1", NULL, 125000000);
@@
-74,16
+74,16
@@
int main(int argc, char **argv)
SD_task_watch(t3, SD_DONE);
SD_task_watch(c3, SD_DONE);
SD_task_watch(t4, SD_DONE);
-
+ xbt_dynar_t changed_tasks = xbt_dynar_new(sizeof(SD_task_t), NULL);
while (1) {
-
xbt_dynar_t changed_tasks = SD_simulate(-1.0
);
+
SD_simulate_with_update(-1.0, changed_tasks
);
if (xbt_dynar_is_empty(changed_tasks))
break;
- XBT_INFO("link1: bw=%.0f, lat=%f",
SD_route_get
_bandwidth(hosts[0], hosts[1]),
-
SD_route_get
_latency(hosts[0], hosts[1]));
+ XBT_INFO("link1: bw=%.0f, lat=%f",
sg_host_route
_bandwidth(hosts[0], hosts[1]),
+
sg_host_route
_latency(hosts[0], hosts[1]));
XBT_INFO("Jupiter: speed=%.0f", sg_host_speed(hosts[0])* sg_host_get_available_speed(hosts[0]));
XBT_INFO("Tremblay: speed=%.0f", sg_host_speed(hosts[1])* sg_host_get_available_speed(hosts[1]));
-
+
unsigned int ctr;
SD_task_t task;
xbt_dynar_foreach(changed_tasks, ctr, task) {
@@
-92,7
+92,9
@@
int main(int argc, char **argv)
if (SD_task_get_state(task)==SD_DONE)
SD_task_destroy(task);
}
+ xbt_dynar_reset(changed_tasks);
}
- SD_exit();
+ xbt_free(hosts);
+ xbt_dynar_free(&changed_tasks);
return 0;
}