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
SD_link_get_list -> sd_link_list
[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
245cd48
..
8998c09
100644
(file)
--- a/
teshsuite/simdag/platforms/basic_parsing_test.c
+++ b/
teshsuite/simdag/platforms/basic_parsing_test.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-201
4
. The SimGrid Team.
+/* Copyright (c) 2008-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-6,14
+6,11
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
-#include "surf/surf_private.h"
-
-extern routing_platf_t routing_platf;
+#include "simgrid/simdag.h"
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
- /*
initialisation of SD
*/
+ /*
SD initialization
*/
SD_workstation_t w1, w2;
const SD_workstation_t *workstations;
SD_workstation_t w1, w2;
const SD_workstation_t *workstations;
@@
-35,7
+32,7
@@
int main(int argc, char **argv)
/* creation of the environment */
SD_create_environment(argv[1]);
printf("Workstation number: %d, link number: %d\n",
/* 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
());
+ SD_workstation_get_
count(), sg_link_count
());
if (argc >= 3) {
if (!strcmp(argv[2], "ONE_LINK")) {
if (argc >= 3) {
if (!strcmp(argv[2], "ONE_LINK")) {
@@
-51,17
+48,17
@@
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",
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",
}
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));
}
if (!strcmp(argv[2], "FULL_LINK")) {
workstations = SD_workstation_get_list();
}
if (!strcmp(argv[2], "FULL_LINK")) {
workstations = SD_workstation_get_list();
- list_size = SD_workstation_get_
number
();
+ list_size = SD_workstation_get_
count
();
for (i = 0; i < list_size; i++) {
w1 = workstations[i];
name1 = SD_workstation_get_name(w1);
for (i = 0; i < list_size; i++) {
w1 = workstations[i];
name1 = SD_workstation_get_name(w1);
@@
-74,24
+71,20
@@
int main(int argc, char **argv)
printf(" Route size %d\n", route_size);
for (k = 0; k < route_size; k++) {
printf(" Link %s: latency = %f, bandwidth = %f\n",
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",
}
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));
}
}
}
if (!strcmp(argv[2], "PROP")) {
printf("SG_TEST_mem: %s\n",
SD_workstation_get_property_value(SD_workstation_get_by_name("host1"),
}
}
}
if (!strcmp(argv[2], "PROP")) {
printf("SG_TEST_mem: %s\n",
SD_workstation_get_property_value(SD_workstation_get_by_name("host1"),
- "SG_TEST_mem")
- );
- printf("Author: %s\n", SD_as_router_get_property_value("AS0", "author"));
- printf("AS1: %s\n", SD_as_router_get_property_value("AS1", "name"));
- printf("AS2: %s\n", SD_as_router_get_property_value("AS2", "name"));
+ "SG_TEST_mem"));
}
}
}
}