X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eee21ec5f99218189fc98898a09150294cd0fbf4..5b3677b425b9cc6949c1573d59ac772540cbf4b2:/src/surf/surfxml_parse.c?ds=sidebyside diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 2013d9a0b3..9ed3fd5422 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2013. The SimGrid Team. +/* Copyright (c) 2006-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -520,6 +520,20 @@ void ETag_surfxml_cluster(void){ cluster.loopback_bw = surf_parse_get_bandwidth(A_surfxml_cluster_loopback___bw); if(strcmp(A_surfxml_cluster_loopback___lat,"")) cluster.loopback_lat = surf_parse_get_time(A_surfxml_cluster_loopback___lat); + + switch(AX_surfxml_cluster_topology){ + case A_surfxml_cluster_topology_FLAT: + cluster.topology= SURF_CLUSTER_FLAT ; + break; + case A_surfxml_cluster_topology_TORUS: + cluster.topology= SURF_CLUSTER_TORUS ; + break; + default: + surf_parse_error("Invalid cluster topology for cluster %s", + cluster.id); + break; + } + cluster.topo_parameters = A_surfxml_cluster_topo___parameters; cluster.router_id = A_surfxml_cluster_router___id; switch (AX_surfxml_cluster_sharing___policy) {