various psychorigid cleanups -- routing_parse_cluster() is now readable

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

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 35e71ac..7ad72d3 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -761,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();
@@ -769,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");
@@ -780,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 *));
@@ -801,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=\"\"");
       }
@@ -884,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 = "";
@@ -927,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(" ");