const SD_workstation_t *hosts;
const SD_link_t *links;
+ setvbuf(stdout, NULL, _IOLBF, 0);
+
SD_init(&argc, argv);
platformFile = argv[1];
XBT_DEBUG("%s", platformFile);
TRY {
SD_create_environment(platformFile);
- } CATCH(e) {
+ }
+ CATCH(e) {
xbt_die("Error while loading %s: %s",platformFile,e.msg);
}
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);
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
- xbt_dynar_t route = global_routing->get_route(src,dst);
+ xbt_dynar_t route = routing_get_route(src,dst);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
- char *link_name = bprintf("%s",((surf_resource_t) link)->name);
+ char *link_name = xbt_strdup(((surf_resource_t)link)->name);
printf("<link_ctn id=\"%s\"/>",link_name);
free(link_name);
}
}
xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to router
{
- if(get_network_element_type(dst) == SURF_NETWORK_ELEMENT_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 = global_routing->get_route(src,dst);
+ xbt_dynar_t route = routing_get_route(src,dst);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
- char *link_name = bprintf("%s",((surf_resource_t) link)->name);
+ char *link_name = xbt_strdup(((surf_resource_t)link)->name);
printf("<link_ctn id=\"%s\"/>",link_name);
free(link_name);
}
xbt_lib_foreach(as_router_lib, cursor_src, src, value) // Routes from router
{
- if(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
{
- if(get_network_element_type(dst) == SURF_NETWORK_ELEMENT_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 = global_routing->get_route(src,dst);
+ xbt_dynar_t route = routing_get_route(src,dst);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
- char *link_name = bprintf("%s",((surf_resource_t) link)->name);
+ char *link_name = xbt_strdup(((surf_resource_t)link)->name);
printf("<link_ctn id=\"%s\"/>",link_name);
free(link_name);
}
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
- xbt_dynar_t route = global_routing->get_route(src,dst);
+ xbt_dynar_t route = routing_get_route(src,dst);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
- char *link_name = bprintf("%s",((surf_resource_t) link)->name);
+ char *link_name = xbt_strdup(((surf_resource_t)link)->name);
printf("<link_ctn id=\"%s\"/>",link_name);
free(link_name);
}