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;
SD_workstation_get_name(hosts[i]),
SD_workstation_get_power(hosts[i]));
props = SD_workstation_get_properties(hosts[i]);
- if (props && xbt_dict_length(props) > 0) {
+ if (props && !xbt_dict_is_empty(props)) {
printf(">\n");
xbt_dict_foreach(props, cursor, key, data) {
printf(" <prop id=\"%s\" value=\"%s\"/>\n", key, data);
}
// 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, value1) {
+ 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);
}
- xbt_lib_foreach(host_lib, cursor_src, src, value) // Routes from host
+ xbt_lib_foreach(host_lib, cursor_src, src, value1) // 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 "
+ printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
- xbt_dynar_t route = global_routing->get_route(src,dst);
+ xbt_dynar_t 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 *);
}
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, value2) //to router
{
- if(get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
- printf(" <route src=\"%s\" dst=\"%s\">\n "
+ if(routing_get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
+ printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
- xbt_dynar_t route = global_routing->get_route(src,dst);
+ xbt_dynar_t 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 *);
}
}
- xbt_lib_foreach(as_router_lib, cursor_src, src, value) // Routes from router
+ xbt_lib_foreach(as_router_lib, cursor_src, src, value1) // Routes from router
{
- if(get_network_element_type(src) == SURF_NETWORK_ELEMENT_ROUTER){
- xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to 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){
+ xbt_lib_foreach(as_router_lib, cursor_dst, dst, value2) //to router
{
- if(get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
- printf(" <route src=\"%s\" dst=\"%s\">\n "
+ if(routing_get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
+ printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
- xbt_dynar_t route = global_routing->get_route(src,dst);
+ xbt_dynar_t 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 *);
printf("\n </route>\n");
}
}
- xbt_lib_foreach(host_lib, cursor_dst, dst, value) //to host
+ xbt_lib_foreach(host_lib, cursor_dst, dst, value2) //to host
{
- printf(" <route src=\"%s\" dst=\"%s\">\n "
- ,src
- ,dst);
- xbt_dynar_t route = global_routing->get_route(src,dst);
+ printf(" <route src=\"%s\" dst=\"%s\">\n "
+ ,src, dst);
+ xbt_dynar_t 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 *);