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 old cruft
[simgrid.git]
/
teshsuite
/
simdag
/
platforms
/
basic_parsing_test.c
diff --git
a/teshsuite/simdag/platforms/basic_parsing_test.c
b/teshsuite/simdag/platforms/basic_parsing_test.c
index
76bd393
..
1d53c0d
100644
(file)
--- a/
teshsuite/simdag/platforms/basic_parsing_test.c
+++ b/
teshsuite/simdag/platforms/basic_parsing_test.c
@@
-12,35
+12,28
@@
int main(int argc, char **argv)
{
/* SD initialization */
-
SD_workstation
_t w1, w2;
-
const SD_workstation
_t *workstations;
-
const
SD_link_t *route;
+
sg_host
_t w1, w2;
+
sg_host
_t *workstations;
+ SD_link_t *route;
const char *name1;
const char *name2;
int route_size, i, j, k;
int list_size;
-#ifdef _XBT_WIN32
- setbuf(stderr, NULL);
- setbuf(stdout, NULL);
-#else
- setvbuf(stdout, NULL, _IOLBF, 0);
-#endif
-
SD_init(&argc, argv);
/* creation of the environment */
SD_create_environment(argv[1]);
- printf("Workstation number: %
d
, link number: %d\n",
-
SD_workstation_get_number(), SD_link_get_number
());
+ printf("Workstation number: %
zu
, link number: %d\n",
+
sg_host_count(), sg_link_count
());
+ workstations = sg_host_list();
if (argc >= 3) {
if (!strcmp(argv[2], "ONE_LINK")) {
- workstations = SD_workstation_get_list();
w1 = workstations[0];
w2 = workstations[1];
- name1 =
SD_workstation
_get_name(w1);
- name2 =
SD_workstation
_get_name(w2);
+ name1 =
sg_host
_get_name(w1);
+ name2 =
sg_host
_get_name(w2);
printf("Route between %s and %s\n", name1, name2);
route = SD_route_get_list(w1, w2);
@@
-48,45
+41,47
@@
int main(int argc, char **argv)
printf("Route size %d\n", route_size);
for (i = 0; i < route_size; i++) {
printf(" Link %s: latency = %f, bandwidth = %f\n",
-
SD_link_get
_name(route[i]),
-
SD_link_get_current
_latency(route[i]),
-
SD_link_get_current
_bandwidth(route[i]));
+
sg_link
_name(route[i]),
+
sg_link
_latency(route[i]),
+
sg_link
_bandwidth(route[i]));
}
printf("Route latency = %f, route bandwidth = %f\n",
- SD_route_get_current_latency(w1, w2),
- SD_route_get_current_bandwidth(w1, w2));
+ SD_route_get_latency(w1, w2),
+ SD_route_get_bandwidth(w1, w2));
+ xbt_free(route);
}
if (!strcmp(argv[2], "FULL_LINK")) {
- workstations = SD_workstation_get_list();
- list_size = SD_workstation_get_number();
+ list_size = sg_host_count();
for (i = 0; i < list_size; i++) {
w1 = workstations[i];
- name1 =
SD_workstation
_get_name(w1);
+ name1 =
sg_host
_get_name(w1);
for (j = 0; j < list_size; j++) {
w2 = workstations[j];
- name2 =
SD_workstation
_get_name(w2);
+ name2 =
sg_host
_get_name(w2);
printf("Route between %s and %s\n", name1, name2);
route = SD_route_get_list(w1, w2);
route_size = SD_route_get_size(w1, w2);
printf(" Route size %d\n", route_size);
for (k = 0; k < route_size; k++) {
printf(" Link %s: latency = %f, bandwidth = %f\n",
-
SD_link_get
_name(route[k]),
-
SD_link_get_current
_latency(route[k]),
-
SD_link_get_current
_bandwidth(route[k]));
+
sg_link
_name(route[k]),
+
sg_link
_latency(route[k]),
+
sg_link
_bandwidth(route[k]));
}
printf(" Route latency = %f, route bandwidth = %f\n",
- SD_route_get_current_latency(w1, w2),
- SD_route_get_current_bandwidth(w1, w2));
+ SD_route_get_latency(w1, w2),
+ SD_route_get_bandwidth(w1, w2));
+ xbt_free(route);
}
}
}
if (!strcmp(argv[2], "PROP")) {
printf("SG_TEST_mem: %s\n",
-
SD_workstation_get_property_value(SD_workstation_ge
t_by_name("host1"),
+
sg_host_get_property_value(sg_hos
t_by_name("host1"),
"SG_TEST_mem"));
}
}
+ xbt_free(workstations);
SD_exit();
return 0;