factorize some code between NS3 cluster creation and other clusters

[simgrid.git] / src / surf / xml / surfxml_sax_cb.cpp

diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp
index f575f71..b6d6075 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -28,7 +28,7 @@ int ETag_surfxml_include_state();
 
 char* surf_parsed_filename = nullptr; // to locate parse error messages
 
-std::vector<char*> parsed_link_list;   /* temporary store of current list link of a route */
+std::vector<simgrid::surf::Link *> parsed_link_list;   /* temporary store of current list link of a route */
 /*
  * Helping functions
  */
@@ -81,6 +81,43 @@ int surf_parse_get_int(const char *string) {
   return res;
 }
 
+/* Turn something like "1-4,6,9-11" into the vector {1,2,3,4,6,9,10,11} */
+static std::vector<int>* explodesRadical(const char* radicals)
+{
+  std::vector<int>* exploded = new std::vector<int>();
+  char* groups;
+  unsigned int iter;
+
+  // Make all hosts
+  xbt_dynar_t radical_elements = xbt_str_split(radicals, ",");
+  xbt_dynar_foreach (radical_elements, iter, groups) {
+
+    xbt_dynar_t radical_ends = xbt_str_split(groups, "-");
+    int start                = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char*));
+    int end                  = 0;
+
+    switch (xbt_dynar_length(radical_ends)) {
+      case 1:
+        end = start;
+        break;
+      case 2:
+        end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char*));
+        break;
+      default:
+        surf_parse_error("Malformed radical: %s", groups);
+        break;
+    }
+
+    for (int i = start; i <= end; i++)
+      exploded->push_back(i);
+
+    xbt_dynar_free(&radical_ends);
+  }
+  xbt_dynar_free(&radical_elements);
+
+  return exploded;
+}
+
 struct unit_scale {
   const char *unit;
   double scale;
@@ -511,7 +548,7 @@ void ETag_surfxml_cluster(){
   cluster.id          = A_surfxml_cluster_id;
   cluster.prefix      = A_surfxml_cluster_prefix;
   cluster.suffix      = A_surfxml_cluster_suffix;
-  cluster.radical     = A_surfxml_cluster_radical;
+  cluster.radicals    = explodesRadical(A_surfxml_cluster_radical);
   cluster.speed       = surf_parse_get_speed(A_surfxml_cluster_speed, "speed of cluster", cluster.id);
   cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core);
   cluster.bw          = surf_parse_get_bandwidth(A_surfxml_cluster_bw, "bw of cluster", cluster.id);
@@ -596,7 +633,7 @@ void STag_surfxml_cabinet(){
   cabinet.speed   = surf_parse_get_speed(A_surfxml_cabinet_speed, "speed of cabinet", cabinet.id);
   cabinet.bw      = surf_parse_get_bandwidth(A_surfxml_cabinet_bw, "bw of cabinet", cabinet.id);
   cabinet.lat     = surf_parse_get_time(A_surfxml_cabinet_lat, "lat of cabinet", cabinet.id);
-  cabinet.radical = A_surfxml_cabinet_radical;
+  cabinet.radicals = explodesRadical(A_surfxml_cabinet_radical);
 
   sg_platf_new_cabinet(&cabinet);
 }
@@ -656,23 +693,29 @@ void ETag_surfxml_link(){
 
 void STag_surfxml_link___ctn(){
 
-  char *link_id;
+  simgrid::surf::Link *link;
+  char *link_name=nullptr;
   switch (A_surfxml_link___ctn_direction) {
   case AU_surfxml_link___ctn_direction:
   case A_surfxml_link___ctn_direction_NONE:
-    link_id = xbt_strdup(A_surfxml_link___ctn_id);
+    link = Link::byName(A_surfxml_link___ctn_id);
     break;
   case A_surfxml_link___ctn_direction_UP:
-    link_id = bprintf("%s_UP", A_surfxml_link___ctn_id);
+    link_name = bprintf("%s_UP", A_surfxml_link___ctn_id);
+    link = Link::byName(link_name);
     break;
   case A_surfxml_link___ctn_direction_DOWN:
-    link_id = bprintf("%s_DOWN", A_surfxml_link___ctn_id);
+    link_name = bprintf("%s_DOWN", A_surfxml_link___ctn_id);
+    link = Link::byName(link_name);
     break;
   }
+  xbt_free(link_name); // no-op if it's already nullptr
 
-  // FIXME we should push the surf link object but it doesn't work because of model rulebased
-  // Rule-based routing doesnt' exist anymore, does it?
-  parsed_link_list.push_back(link_id);
+  surf_parse_assert(link!=nullptr,"No such link: '%s'%s", A_surfxml_link___ctn_id,
+      A_surfxml_link___ctn_direction==A_surfxml_link___ctn_direction_UP?" (upward)":
+          ( A_surfxml_link___ctn_direction==A_surfxml_link___ctn_direction_DOWN?" (downward)":
+              ""));
+  parsed_link_list.push_back(link);
 }
 
 void ETag_surfxml_backbone(){
@@ -737,11 +780,8 @@ void ETag_surfxml_route(){
   route.link_list = new std::vector<Link*>();
   route.symmetrical = (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES);
 
-  for (auto link_name: parsed_link_list) {
-    simgrid::surf::Link *link = Link::byName(link_name);
+  for (auto link: parsed_link_list)
     route.link_list->push_back(link);
-    xbt_free(link_name);
-  }
   parsed_link_list.clear();
 
   sg_platf_new_route(&route);
@@ -760,11 +800,8 @@ void ETag_surfxml_ASroute(){
 
   ASroute.link_list =  new std::vector<Link*>();
 
-  for (auto link_name: parsed_link_list) {
-    simgrid::surf::Link *link = Link::byName(link_name);
+  for (auto link: parsed_link_list)
     ASroute.link_list->push_back(link);
-    xbt_free(link_name);
-  }
   parsed_link_list.clear();
 
   switch (A_surfxml_ASroute_symmetrical) {
@@ -792,11 +829,8 @@ void ETag_surfxml_bypassRoute(){
   route.symmetrical = false;
   route.link_list =  new std::vector<Link*>();
 
-  for (auto link_name: parsed_link_list) {
-    simgrid::surf::Link *link = Link::byName(link_name);
+  for (auto link: parsed_link_list)
     route.link_list->push_back(link);
-    xbt_free(link_name);
-  }
   parsed_link_list.clear();
 
   sg_platf_new_bypassRoute(&route);
@@ -809,11 +843,8 @@ void ETag_surfxml_bypassASroute(){
   ASroute.src         = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_src);
   ASroute.dst         = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_dst);
   ASroute.link_list   = new std::vector<Link*>();
-  for (auto link_name: parsed_link_list) {
-    simgrid::surf::Link *link = Link::byName(link_name);
+  for (auto link: parsed_link_list)
     ASroute.link_list->push_back(link);
-    xbt_free(link_name);
-  }
   parsed_link_list.clear();
 
   ASroute.symmetrical = false;