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
First step to delete GLOB command from cmake
[simgrid.git]
/
teshsuite
/
simdag
/
platforms
/
flatifier.c
diff --git
a/teshsuite/simdag/platforms/flatifier.c
b/teshsuite/simdag/platforms/flatifier.c
index
5695df8
..
4ec7ebd
100644
(file)
--- a/
teshsuite/simdag/platforms/flatifier.c
+++ b/
teshsuite/simdag/platforms/flatifier.c
@@
-53,7
+53,8
@@
int main(int argc, char **argv)
xbt_lib_cursor_t cursor_src = NULL;
xbt_lib_cursor_t cursor_dst = NULL;
char *src,*dst,*key,*data;
xbt_lib_cursor_t cursor_src = NULL;
xbt_lib_cursor_t cursor_dst = NULL;
char *src,*dst,*key,*data;
- char **value;
+ sg_routing_edge_t value1;
+ sg_routing_edge_t value2;
xbt_ex_t e;
const SD_workstation_t *hosts;
xbt_ex_t e;
const SD_workstation_t *hosts;
@@
-100,8
+101,8
@@
int main(int argc, char **argv)
}
// Routers
}
// Routers
- xbt_lib_foreach(as_router_lib, cursor_src, key, value) {
- if(((
network_element_info
_t)xbt_lib_get_or_null(as_router_lib, key,
+ xbt_lib_foreach(as_router_lib, cursor_src, key, value
1
) {
+ if(((
sg_routing_edge
_t)xbt_lib_get_or_null(as_router_lib, key,
ROUTING_ASR_LEVEL))->rc_type == SURF_NETWORK_ELEMENT_ROUTER)
{
printf(" <router id=\"%s\"/>\n",key);
ROUTING_ASR_LEVEL))->rc_type == SURF_NETWORK_ELEMENT_ROUTER)
{
printf(" <router id=\"%s\"/>\n",key);
@@
-129,15
+130,17
@@
int main(int argc, char **argv)
}
}
- xbt_lib_foreach(host_lib, cursor_src, src, value) // Routes from host
+ xbt_lib_foreach(host_lib, cursor_src, src, value
1
) // Routes from host
{
{
- xbt_lib_foreach(host_lib, cursor_dst, dst, value) //to host
+ value1 = xbt_lib_get_or_null(host_lib,src,ROUTING_HOST_LEVEL);
+ xbt_lib_foreach(host_lib, cursor_dst, dst, value2) //to host
{
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
xbt_dynar_t route=NULL;
{
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
xbt_dynar_t route=NULL;
- routing_get_route_and_latency(src,dst,&route,NULL);
+ value2 = xbt_lib_get_or_null(host_lib,dst,ROUTING_HOST_LEVEL);
+ routing_get_route_and_latency(value1,value2,&route,NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
@@
-148,14
+151,15
@@
int main(int argc, char **argv)
}
printf("\n </route>\n");
}
}
printf("\n </route>\n");
}
- xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to router
+ xbt_lib_foreach(as_router_lib, cursor_dst, dst, value
2
) //to router
{
if(routing_get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
xbt_dynar_t route=NULL;
{
if(routing_get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
xbt_dynar_t route=NULL;
- routing_get_route_and_latency(src,dst,&route,NULL);
+ value2 = xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL);
+ routing_get_route_and_latency((sg_routing_edge_t)value1,(sg_routing_edge_t)value2,&route,NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
@@
-169,17
+173,19
@@
int main(int argc, char **argv)
}
}
}
}
- xbt_lib_foreach(as_router_lib, cursor_src, src, value) // Routes from router
+ xbt_lib_foreach(as_router_lib, cursor_src, src, value
1
) // Routes from router
{
{
+ value1 = xbt_lib_get_or_null(as_router_lib,src,ROUTING_ASR_LEVEL);
if(routing_get_network_element_type(src) == SURF_NETWORK_ELEMENT_ROUTER){
if(routing_get_network_element_type(src) == SURF_NETWORK_ELEMENT_ROUTER){
- xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to router
+ xbt_lib_foreach(as_router_lib, cursor_dst, dst, value
2
) //to router
{
if(routing_get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
xbt_dynar_t route=NULL;
{
if(routing_get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
xbt_dynar_t route=NULL;
- routing_get_route_and_latency(src,dst,&route,NULL);
+ value2 = xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL);
+ routing_get_route_and_latency((sg_routing_edge_t)value1,(sg_routing_edge_t)value2,&route,NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
@@
-191,12
+197,13
@@
int main(int argc, char **argv)
printf("\n </route>\n");
}
}
printf("\n </route>\n");
}
}
- xbt_lib_foreach(host_lib, cursor_dst, dst, value) //to host
+ xbt_lib_foreach(host_lib, cursor_dst, dst, value
2
) //to host
{
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src, dst);
xbt_dynar_t route=NULL;
{
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src, dst);
xbt_dynar_t route=NULL;
- routing_get_route_and_latency(src,dst,&route, NULL);
+ value2 = xbt_lib_get_or_null(host_lib,dst,ROUTING_HOST_LEVEL);
+ routing_get_route_and_latency((sg_routing_edge_t)value1,(sg_routing_edge_t)value2,&route, NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);