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
Add a platform with a bypass route. Add the test to cmake.
[simgrid.git]
/
teshsuite
/
simdag
/
platforms
/
flatifier.c
diff --git
a/teshsuite/simdag/platforms/flatifier.c
b/teshsuite/simdag/platforms/flatifier.c
index
7b3e375
..
5695df8
100644
(file)
--- a/
teshsuite/simdag/platforms/flatifier.c
+++ b/
teshsuite/simdag/platforms/flatifier.c
@@
-133,10
+133,11
@@
int main(int argc, char **argv)
{
xbt_lib_foreach(host_lib, cursor_dst, dst, value) //to host
{
- printf(" <route src=\"%s\" dst=\"%s\">\n
"
+ printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
- xbt_dynar_t route = routing_get_route(src,dst);
+ xbt_dynar_t route=NULL;
+ routing_get_route_and_latency(src,dst,&route,NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
@@
-150,10
+151,11
@@
int main(int argc, char **argv)
xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to router
{
if(routing_get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
- printf(" <route src=\"%s\" dst=\"%s\">\n
"
+ printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
- xbt_dynar_t route = routing_get_route(src,dst);
+ xbt_dynar_t route=NULL;
+ routing_get_route_and_latency(src,dst,&route,NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
@@
-173,10
+175,11
@@
int main(int argc, char **argv)
xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to router
{
if(routing_get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
- printf(" <route src=\"%s\" dst=\"%s\">\n
"
+ printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
- xbt_dynar_t route = routing_get_route(src,dst);
+ xbt_dynar_t route=NULL;
+ routing_get_route_and_latency(src,dst,&route,NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
@@
-190,10
+193,10
@@
int main(int argc, char **argv)
}
xbt_lib_foreach(host_lib, cursor_dst, dst, value) //to host
{
- printf(" <route src=\"%s\" dst=\"%s\">\n
"
- ,src
-
,dst)
;
-
xbt_dynar_t route = routing_get_route(src,dst
);
+ printf(" <route src=\"%s\" dst=\"%s\">\n "
+ ,src
, dst);
+
xbt_dynar_t route=NULL
;
+
routing_get_route_and_latency(src,dst,&route, NULL
);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);