static int name_compare_links(const void *n1, const void *n2)
{
char name1[80], name2[80];
- strcpy(name1, SD_link_get_name(*((SD_link_t *) n1)));
- strcpy(name2, SD_link_get_name(*((SD_link_t *) n2)));
+ strcpy(name1, sg_link_name(*((SD_link_t *) n1)));
+ strcpy(name2, sg_link_name(*((SD_link_t *) n2)));
return strcmp(name1, name2);
}
if (timings) {
XBT_INFO("Parsing time: %fs (%d hosts, %d links)",
- xbt_os_timer_elapsed(parse_time),SD_workstation_get_number(),SD_link_get_number());
+ xbt_os_timer_elapsed(parse_time),SD_workstation_get_count(),
+ sg_link_count());
} else {
printf("<?xml version='1.0'?>\n");
printf("<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid.dtd\">\n");
printf("<AS id=\"AS0\" routing=\"Full\">\n");
// Hosts
- totalHosts = SD_workstation_get_number();
+ totalHosts = SD_workstation_get_count();
hosts = SD_workstation_get_list();
qsort((void *) hosts, totalHosts, sizeof(SD_workstation_t),
name_compare_hosts);
for (i = 0; i < totalHosts; i++) {
printf(" <host id=\"%s\" power=\"%.0f\"",
SD_workstation_get_name(hosts[i]),
- SD_workstation_get_power(hosts[i]));
+ SD_workstation_get_speed(hosts[i]));
props = SD_workstation_get_properties(hosts[i]);
if (SD_workstation_get_cores(hosts[i])>1) {
printf(" core=\"%d\"", SD_workstation_get_cores(hosts[i]));
}
// Links
- totalLinks = SD_link_get_number();
- links = SD_link_get_list();
+ totalLinks = sg_link_count();
+ links = sg_link_list();
qsort((void *) links, totalLinks, sizeof(SD_link_t), name_compare_links);
printf(" <link id=\"");
printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"",
- SD_link_get_name(links[i]),
- SD_link_get_current_bandwidth(links[i]),
- SD_link_get_current_latency(links[i]));
- if (SD_link_is_shared(links[i])) {
+ sg_link_name(links[i]),
+ sg_link_bandwidth(links[i]),
+ sg_link_latency(links[i]));
+ if (sg_link_is_shared(links[i])) {
printf("/>\n");
} else {
printf(" sharing_policy=\"FATPIPE\"/>\n");
sg_host_t host1, host2;
xbt_dict_foreach(host_list, cursor_src, src, host1) // Routes from host
{
- value1 = sg_host_by_name(src)->p_netcard;
+ value1 = sg_host_by_name(src)->pimpl_netcard;
xbt_dict_foreach(host_list, cursor_dst, dst, host2) //to host
{
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
xbt_dynar_t route=NULL;
- value2 = sg_host_by_name(dst)->p_netcard;
+ value2 = sg_host_by_name(dst)->pimpl_netcard;
routing_get_route_and_latency(value1, value2, &route,NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src, dst);
xbt_dynar_t route=NULL;
- value2 = sg_host_by_name(dst)->p_netcard;
+ value2 = sg_host_by_name(dst)->pimpl_netcard;
routing_get_route_and_latency((sg_netcard_t)value1,(sg_netcard_t)value2,&route, NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{