X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a7732fdf6a3ad939561c0681fc74b35194c1e154..333c41b2486c95a8ea84588190524d34f91c3524:/src/surf/surf_routing.c

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index f20ed82243..7ad72d3c5e 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -292,7 +292,7 @@ static void routing_parse_E_bypassRoute(void)
  */
 void routing_AS_begin(const char *AS_id, const char *wanted_routing_type)
 {
-  AS_t new_routing;
+  AS_t new_as;
   routing_model_description_t model = NULL;
   int cpt;
 
@@ -311,17 +311,16 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type)
   }
 
   /* make a new routing component */
-  new_routing = (AS_t) (*(model->create)) ();
-  new_routing->routing = model;
-  new_routing->hierarchy = SURF_ROUTING_NULL;
-  new_routing->name = xbt_strdup(AS_id);
-  new_routing->routing_sons = xbt_dict_new();
+  new_as = (AS_t) (*(model->create)) ();
+  new_as->model_desc = model;
+  new_as->hierarchy = SURF_ROUTING_NULL;
+  new_as->name = xbt_strdup(AS_id);
 
   if (current_routing == NULL && global_routing->root == NULL) {
 
     /* it is the first one */
-    new_routing->routing_father = NULL;
-    global_routing->root = new_routing;
+    new_as->routing_father = NULL;
+    global_routing->root = new_as;
 
   } else if (current_routing != NULL && global_routing->root != NULL) {
 
@@ -329,20 +328,20 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type)
                (current_routing->routing_sons, AS_id),
                "The AS \"%s\" already exists", AS_id);
     /* it is a part of the tree */
-    new_routing->routing_father = current_routing;
+    new_as->routing_father = current_routing;
     /* set the father behavior */
     if (current_routing->hierarchy == SURF_ROUTING_NULL)
       current_routing->hierarchy = SURF_ROUTING_RECURSIVE;
     /* add to the sons dictionary */
     xbt_dict_set(current_routing->routing_sons, AS_id,
-                 (void *) new_routing, NULL);
+                 (void *) new_as, NULL);
     /* add to the father element list */
     (*(current_routing->parse_AS)) (current_routing, AS_id);
   } else {
     THROWF(arg_error, 0, "All defined components must be belong to a AS");
   }
   /* set the new current component of the tree */
-  current_routing = new_routing;
+  current_routing = new_as;
 }
 
 /**
@@ -372,8 +371,8 @@ void routing_AS_end()
     xbt_lib_set(as_router_lib, current_routing->name, ROUTING_ASR_LEVEL,
                 (void *) info);
 
-    if (current_routing->routing->end)
-      (*(current_routing->routing->end)) (current_routing);
+    if (current_routing->model_desc->end)
+      (*(current_routing->model_desc->end)) (current_routing);
     current_routing = current_routing->routing_father;
   }
 }
@@ -762,6 +761,11 @@ static void routing_parse_cluster(void)
   s_sg_platf_host_cbarg_t host;
   s_sg_platf_link_cbarg_t link;
 
+  unsigned int iter;
+  int start, end, i;
+  xbt_dynar_t radical_elements;
+  xbt_dynar_t radical_ends;
+
   if (strcmp(struct_cluster->availability_trace, "")
       || strcmp(struct_cluster->state_trace, "")) {
     patterns = xbt_dict_new();
@@ -770,10 +774,6 @@ static void routing_parse_cluster(void)
     xbt_dict_set(patterns, "suffix", xbt_strdup(struct_cluster->suffix), free);
   }
 
-  unsigned int iter;
-  int start, end, i;
-  xbt_dynar_t radical_elements;
-  xbt_dynar_t radical_ends;
 
   XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", struct_cluster->id);
   sg_platf_new_AS_begin(struct_cluster->id, "Cluster");
@@ -781,7 +781,6 @@ static void routing_parse_cluster(void)
   //Make all hosts
   radical_elements = xbt_str_split(struct_cluster->radical, ",");
   xbt_dynar_foreach(radical_elements, iter, groups) {
-    memset(&host, 0, sizeof(host));
 
     radical_ends = xbt_str_split(groups, "-");
     start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
@@ -802,25 +801,25 @@ static void routing_parse_cluster(void)
           bprintf("%s%d%s", struct_cluster->prefix, i, struct_cluster->suffix);
       link_id = bprintf("%s_link_%d", struct_cluster->id, i);
 
-      XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id,
-                struct_cluster->power);
+      XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, struct_cluster->power);
+
+      memset(&host, 0, sizeof(host));
       host.id = host_id;
       if (strcmp(struct_cluster->availability_trace, "")) {
         xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free);
-        char *tmp_availability_file =
-            xbt_str_varsubst(struct_cluster->availability_trace, patterns);
-        XBT_DEBUG("\tavailability_file=\"%s\"", tmp_availability_file);
-        host.power_trace = tmgr_trace_new(tmp_availability_file);
-        xbt_free(tmp_availability_file);
+        char *avail_file = xbt_str_varsubst(struct_cluster->availability_trace, patterns);
+        XBT_DEBUG("\tavailability_file=\"%s\"", avail_file);
+        host.power_trace = tmgr_trace_new(avail_file);
+        xbt_free(avail_file);
       } else {
         XBT_DEBUG("\tavailability_file=\"\"");
       }
+
       if (strcmp(struct_cluster->state_trace, "")) {
-        char *tmp_state_file =
-            xbt_str_varsubst(struct_cluster->state_trace, patterns);
-        XBT_DEBUG("\tstate_file=\"%s\"", tmp_state_file);
-        host.state_trace = tmgr_trace_new(tmp_state_file);
-        xbt_free(tmp_state_file);
+        char *avail_file = xbt_str_varsubst(struct_cluster->state_trace, patterns);
+        XBT_DEBUG("\tstate_file=\"%s\"", avail_file);
+        host.state_trace = tmgr_trace_new(avail_file);
+        xbt_free(avail_file);
       } else {
         XBT_DEBUG("\tstate_file=\"\"");
       }
@@ -885,11 +884,12 @@ static void routing_parse_cluster(void)
   }
   xbt_dynar_free(&radical_elements);
 
-  // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written, and it's very useful to connect clusters together
+  // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written,
+  // and it's very useful to connect clusters together
   XBT_DEBUG(" ");
   XBT_DEBUG("<router id=\"%s\"/>", struct_cluster->router_id);
-  s_sg_platf_router_cbarg_t router;
   char *newid = NULL;
+  s_sg_platf_router_cbarg_t router;
   memset(&router, 0, sizeof(router));
   router.id = struct_cluster->router_id;
   router.coord = "";
@@ -928,32 +928,11 @@ static void routing_parse_cluster(void)
 
     sg_platf_new_link(&link);
 
-    surf_parsing_link_up_down_t info =
-        xbt_new0(s_surf_parsing_link_up_down_t, 1);
-    info->link_up =
-        xbt_lib_get_or_null(link_lib, link_backbone, SURF_LINK_LEVEL);
-    info->link_down = info->link_up;
-    surf_routing_cluster_add_link(struct_cluster->id, info);
+    surf_routing_cluster_add_backbone(current_routing, xbt_lib_get_or_null(link_lib, link_backbone, SURF_LINK_LEVEL));
 
     free(link_backbone);
   }
 
-  XBT_DEBUG(" ");
-
-  char *new_suffix = xbt_strdup("");
-
-  radical_elements = xbt_str_split(struct_cluster->suffix, ".");
-  xbt_dynar_foreach(radical_elements, iter, groups) {
-    if (strcmp(groups, "")) {
-      char *old_suffix = new_suffix;
-      new_suffix = bprintf("%s\\.%s", old_suffix, groups);
-      free(old_suffix);
-    }
-  }
-
-  xbt_dynar_free(&radical_elements);
-  xbt_free(new_suffix);
-
   XBT_DEBUG("</AS>");
   sg_platf_new_AS_end();
   XBT_DEBUG(" ");
@@ -1222,11 +1201,10 @@ static void finalize_rec(AS_t as) {
   char *key;
   AS_t elem;
 
-  xbt_dict_foreach(as->routing_sons, cursor, key, elem)
-  finalize_rec(elem);
+  xbt_dict_foreach(as->routing_sons, cursor, key, elem) {
+    finalize_rec(elem);
+  }
 
-  xbt_dict_free(&as->routing_sons);
-  xbt_free(as->name);
   as->finalize(as);
 }