Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / surf / surf_routing.c

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index eb7ac33..8e25069 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -319,7 +319,7 @@ static void routing_parse_trace_connect(sg_platf_trace_connect_cbarg_t trace_con
   }
 }
 
-extern int _surf_init_status; /* yay, this is an horrible hack */
+extern int _sg_init_status; /* yay, this is an horrible hack */
 
 /**
  * \brief Make a new routing component to the platform
@@ -344,7 +344,7 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS)
              (as_router_lib, AS->id, ROUTING_ASR_LEVEL),
              "The AS \"%s\" already exists", AS->id);
 
-  _surf_init_status = 2; /* horrible hack: direct access to the global controlling the level of configuration to prevent any further config */
+  _sg_init_status = 2; /* horrible hack: direct access to the global controlling the level of configuration to prevent any further config */
 
   /* search the routing model */
   switch(AS->routing){
@@ -920,10 +920,11 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster)
         bprintf("%s%s_router%s", cluster->prefix, cluster->id,
                 cluster->suffix);
   sg_platf_new_router(&router);
+  ((as_cluster_t)current_routing)->router = xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL);
   free(newid);
 
   //Make the backbone
-  if ((cluster->bb_bw != 0) && (cluster->bb_lat != 0)) {
+  if ((cluster->bb_bw != 0) || (cluster->bb_lat != 0)) {
     char *link_backbone = bprintf("%s_backbone", cluster->id);
     XBT_DEBUG("<link\tid=\"%s\" bw=\"%f\" lat=\"%f\"/>", link_backbone,
               cluster->bb_bw, cluster->bb_lat);
@@ -1019,7 +1020,7 @@ static void routing_parse_Srandom(void)
   char *rd_name = NULL;
   char *rd_value;
   mean = surf_parse_get_double(A_surfxml_random_mean);
-  std = surf_parse_get_double(A_surfxml_random_std_deviation);
+  std = surf_parse_get_double(A_surfxml_random_std___deviation);
   min = surf_parse_get_double(A_surfxml_random_min);
   max = surf_parse_get_double(A_surfxml_random_max);
   seed = surf_parse_get_double(A_surfxml_random_seed);