X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/09f98aaf70651431716a4f2e068310c215167717..9687670d5440f10286a0dbc5aab95bb4eb9b6138:/teshsuite/simdag/platforms/flatifier.c diff --git a/teshsuite/simdag/platforms/flatifier.c b/teshsuite/simdag/platforms/flatifier.c index d45336af6b..23b2632442 100644 --- a/teshsuite/simdag/platforms/flatifier.c +++ b/teshsuite/simdag/platforms/flatifier.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2008-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -15,10 +15,11 @@ #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" #include "xbt/dict.h" #include "xbt/ex.h" +#include "xbt/xbt_os_time.h" #include "surf/surf.h" #include "surf/surf_private.h" @@ -46,7 +47,7 @@ static int name_compare_links(const void *n1, const void *n2) return strcmp(name1, name2); } -int parse_cmdline(int *timings, int *downgrade, char **platformFile, int argc, char **argv) +static int parse_cmdline(int *timings, int *downgrade, char **platformFile, int argc, char **argv) { int wrong_option = 0; int i; @@ -69,6 +70,19 @@ int parse_cmdline(int *timings, int *downgrade, char **platformFile, int argc, c return wrong_option; } +static void create_environment(xbt_os_timer_t parse_time, const char *platformFile) +{ + xbt_ex_t e; + TRY { + xbt_os_cputimer_start(parse_time); + SD_create_environment(platformFile); + xbt_os_cputimer_stop(parse_time); + } + CATCH(e) { + xbt_die("Error while loading %s: %s", platformFile, e.msg); + } +} + int main(int argc, char **argv) { char *platformFile = NULL; @@ -85,20 +99,24 @@ int main(int argc, char **argv) char *src,*dst,*key,*data; sg_routing_edge_t value1; sg_routing_edge_t value2; - xbt_ex_t e; const SD_workstation_t *hosts; const SD_link_t *links; xbt_os_timer_t parse_time = xbt_os_timer_new(); +#ifdef _XBT_WIN32 + setbuf(stderr, NULL); + setbuf(stdout, NULL); +#else setvbuf(stdout, NULL, _IOLBF, 0); +#endif SD_init(&argc, argv); if (parse_cmdline(&timings, &downgrade, &platformFile, argc, argv) || !platformFile) { xbt_die("Invalid command line arguments: expected [--timings|--downgrade] platformFile"); } - + XBT_DEBUG("%d,%d,%s", timings, downgrade, platformFile); if (downgrade) { @@ -106,14 +124,7 @@ int main(int argc, char **argv) link_ctn = link_ctn_v2; } - TRY { - xbt_os_timer_start(parse_time); - SD_create_environment(platformFile); - xbt_os_timer_stop(parse_time); - } - CATCH(e) { - xbt_die("Error while loading %s: %s",platformFile,e.msg); - } + create_environment(parse_time, platformFile); if (timings) { XBT_INFO("Parsing time: %fs (%d hosts, %d links)", @@ -136,6 +147,9 @@ int main(int argc, char **argv) SD_workstation_get_name(hosts[i]), SD_workstation_get_power(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])); + } if (props && !xbt_dict_is_empty(props)) { printf(">\n"); xbt_dict_foreach(props, cursor, key, data) { @@ -149,8 +163,8 @@ int main(int argc, char **argv) // Routers 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) + if(surf_routing_edge_get_rc_type(xbt_lib_get_or_null(as_router_lib, key, + ROUTING_ASR_LEVEL)) == SURF_NETWORK_ELEMENT_ROUTER) { printf(" \n",key); } @@ -169,7 +183,7 @@ int main(int argc, char **argv) SD_link_get_name(links[i]), SD_link_get_current_bandwidth(links[i]), SD_link_get_current_latency(links[i])); - if (SD_link_get_sharing_policy(links[i]) == SD_LINK_SHARED) { + if (SD_link_is_shared(links[i])) { printf("/>\n"); } else { printf(" sharing_policy=\"FATPIPE\"/>\n"); @@ -179,20 +193,20 @@ int main(int argc, char **argv) xbt_lib_foreach(host_lib, cursor_src, src, value1) // Routes from host { - value1 = xbt_lib_get_or_null(host_lib,src,ROUTING_HOST_LEVEL); + value1 = sg_host_edge(sg_host_by_name(src)); xbt_lib_foreach(host_lib, cursor_dst, dst, value2) //to host { printf(" \n " ,src ,dst); xbt_dynar_t route=NULL; - value2 = xbt_lib_get_or_null(host_lib,dst,ROUTING_HOST_LEVEL); + value2 = sg_host_edge(sg_host_by_name(dst)); routing_get_route_and_latency(value1,value2,&route,NULL); for(i=0;iname); + char *link_name = xbt_strdup(surf_resource_name(link)); printf("<%s id=\"%s\"/>",link_ctn,link_name); free(link_name); } @@ -211,7 +225,7 @@ int main(int argc, char **argv) { void *link = xbt_dynar_get_as(route,i,void *); - char *link_name = xbt_strdup(((surf_resource_t)link)->name); + char *link_name = xbt_strdup(surf_resource_name(link)); printf("<%s id=\"%s\"/>",link_ctn,link_name); free(link_name); } @@ -237,7 +251,7 @@ int main(int argc, char **argv) { void *link = xbt_dynar_get_as(route,i,void *); - char *link_name = xbt_strdup(((surf_resource_t)link)->name); + char *link_name = xbt_strdup(surf_resource_name(link)); printf("<%s id=\"%s\"/>",link_ctn,link_name); free(link_name); } @@ -249,13 +263,13 @@ int main(int argc, char **argv) printf(" \n " ,src, dst); xbt_dynar_t route=NULL; - value2 = xbt_lib_get_or_null(host_lib,dst,ROUTING_HOST_LEVEL); + value2 = sg_host_edge(sg_host_by_name(dst)); routing_get_route_and_latency((sg_routing_edge_t)value1,(sg_routing_edge_t)value2,&route, NULL); for(i=0;iname); + char *link_name = xbt_strdup(surf_resource_name(link)); printf("<%s id=\"%s\"/>",link_ctn,link_name); free(link_name); } @@ -269,6 +283,7 @@ int main(int argc, char **argv) printf("\n"); } SD_exit(); + xbt_os_timer_free(parse_time); return 0; }