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);
{
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 *);
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 *);
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 *);
}
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 *);