Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Inline another function about the parsing of clusters
[simgrid.git] / src / surf / surf_routing.cpp
index 5e3b5ed..4e5b860 100644 (file)
@@ -7,8 +7,6 @@
 #include "surf_routing.hpp"
 #include "surf_routing_private.hpp"
 #include "surf_routing_cluster.hpp"
-#include "surf_routing_cluster_torus.hpp"
-#include "surf_routing_cluster_fat_tree.hpp"
 
 #include "simgrid/platf_interface.h"    // platform creation API internal interface
 #include "simgrid/sg_config.h"
@@ -647,265 +645,6 @@ void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet)
   xbt_dynar_free(&radical_elements);
 }
 
-void routing_new_cluster(sg_platf_cluster_cbarg_t cluster)
-{
-  using simgrid::surf::AsCluster;
-  using simgrid::surf::AsClusterTorus;
-  using simgrid::surf::AsClusterFatTree;
-
-  char *host_id, *groups, *link_id = NULL;
-  xbt_dict_t patterns = NULL;
-  int rankId=0;
-
-  s_sg_platf_host_cbarg_t host = SG_PLATF_HOST_INITIALIZER;
-  s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
-
-  unsigned int iter;
-  int start, end, i;
-  xbt_dynar_t radical_elements;
-  xbt_dynar_t radical_ends;
-
-  if ((cluster->availability_trace && strcmp(cluster->availability_trace, ""))
-      || (cluster->state_trace && strcmp(cluster->state_trace, ""))) {
-    patterns = xbt_dict_new_homogeneous(xbt_free_f);
-    xbt_dict_set(patterns, "id", xbt_strdup(cluster->id), NULL);
-    xbt_dict_set(patterns, "prefix", xbt_strdup(cluster->prefix), NULL);
-    xbt_dict_set(patterns, "suffix", xbt_strdup(cluster->suffix), NULL);
-  }
-
-  /* parse the topology attribute. If we are not in a flat cluster,
-   * switch to the right mode and initialize the routing with
-   * the parameters in topo_parameters attribute
-   */
-  s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
-  AS.id = cluster->id;
-
-  if(cluster->topology == SURF_CLUSTER_TORUS){
-    XBT_DEBUG("<AS id=\"%s\"\trouting=\"Torus_Cluster\">", cluster->id);
-    AS.routing = A_surfxml_AS_routing_Cluster___torus;
-    sg_platf_new_AS_begin(&AS);
-    ((AsClusterTorus*)current_routing)->parse_specific_arguments(cluster);
-  }
-  else if (cluster->topology == SURF_CLUSTER_FAT_TREE) {
-    XBT_DEBUG("<AS id=\"%s\"\trouting=\"Fat_Tree_Cluster\">", cluster->id);
-    AS.routing = A_surfxml_AS_routing_Cluster___fat___tree;
-    sg_platf_new_AS_begin(&AS);
-    ((AsClusterFatTree*)current_routing)->parse_specific_arguments(cluster);
-  }
-
-  else{
-    XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", cluster->id);
-    AS.routing = A_surfxml_AS_routing_Cluster;
-    sg_platf_new_AS_begin(&AS);
-  }
-
-  if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){
-      ((AsCluster*)current_routing)->p_nb_links_per_node++;
-      ((AsCluster*)current_routing)->p_has_loopback=1;
-  }
-
-  if(cluster->limiter_link!=0){
-      ((AsCluster*)current_routing)->p_nb_links_per_node++;
-      ((AsCluster*)current_routing)->p_has_limiter=1;
-  }
-
-
-
-  current_routing->p_linkUpDownList
-            = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
-
-  //Make all hosts
-  radical_elements = xbt_str_split(cluster->radical, ",");
-  xbt_dynar_foreach(radical_elements, iter, groups) {
-
-    radical_ends = xbt_str_split(groups, "-");
-    start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
-
-    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");
-      break;
-    }
-    for (i = start; i <= end; i++) {
-      host_id =
-          bprintf("%s%d%s", cluster->prefix, i, cluster->suffix);
-      link_id = bprintf("%s_link_%d", cluster->id, i);
-
-      XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, cluster->speed);
-
-      memset(&host, 0, sizeof(host));
-      host.id = host_id;
-      if ((cluster->properties != NULL) && (!xbt_dict_is_empty(cluster->properties))) {
-        xbt_dict_cursor_t cursor=NULL;
-        char *key,*data;
-        host.properties = xbt_dict_new();
-
-        xbt_dict_foreach(cluster->properties,cursor,key,data) {
-          xbt_dict_set(host.properties, key, xbt_strdup(data),free);
-        }
-      }
-      if (cluster->availability_trace && strcmp(cluster->availability_trace, "")) {
-        xbt_dict_set(patterns, "radical", bprintf("%d", i), NULL);
-        char *avail_file = xbt_str_varsubst(cluster->availability_trace, patterns);
-        XBT_DEBUG("\tavailability_file=\"%s\"", avail_file);
-        host.speed_trace = tmgr_trace_new_from_file(avail_file);
-        xbt_free(avail_file);
-      } else {
-        XBT_DEBUG("\tavailability_file=\"\"");
-      }
-
-      if (cluster->state_trace && strcmp(cluster->state_trace, "")) {
-        char *avail_file = xbt_str_varsubst(cluster->state_trace, patterns);
-        XBT_DEBUG("\tstate_file=\"%s\"", avail_file);
-        host.state_trace = tmgr_trace_new_from_file(avail_file);
-        xbt_free(avail_file);
-      } else {
-        XBT_DEBUG("\tstate_file=\"\"");
-      }
-
-      host.speed_peak = xbt_dynar_new(sizeof(double), NULL);
-      xbt_dynar_push(host.speed_peak,&cluster->speed);
-      host.pstate = 0;
-
-      //host.power_peak = cluster->power;
-      host.speed_scale = 1.0;
-      host.core_amount = cluster->core_amount;
-      host.initiallyOn = 1;
-      host.coord = "";
-      sg_platf_new_host(&host);
-      xbt_dynar_free(&host.speed_peak);
-      XBT_DEBUG("</host>");
-
-      XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,
-                cluster->bw, cluster->lat);
-
-
-      s_surf_parsing_link_up_down_t info_lim, info_loop;
-      // All links are saved in a matrix;
-      // every row describes a single node; every node
-      // may have multiple links.
-      // the first column may store a link from x to x if p_has_loopback is set
-      // the second column may store a limiter link if p_has_limiter is set
-      // other columns are to store one or more link for the node
-
-      //add a loopback link
-      if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){
-        char *tmp_link = bprintf("%s_loopback", link_id);
-        XBT_DEBUG("<loopback\tid=\"%s\"\tbw=\"%f\"/>", tmp_link,
-                cluster->limiter_link);
-
-
-        memset(&link, 0, sizeof(link));
-        link.id        = tmp_link;
-        link.bandwidth = cluster->loopback_bw;
-        link.latency   = cluster->loopback_lat;
-        link.initiallyOn = 1;
-        link.policy    = SURF_LINK_FATPIPE;
-        sg_platf_new_link(&link);
-        info_loop.link_up   = Link::byName(tmp_link);
-        info_loop.link_down = info_loop.link_up;
-        free(tmp_link);
-        xbt_dynar_set(current_routing->p_linkUpDownList,
-          rankId*(static_cast<AsCluster*>(current_routing))->p_nb_links_per_node, &info_loop);
-      }
-
-      //add a limiter link (shared link to account for maximal bandwidth of the node)
-      if(cluster->limiter_link!=0){
-        char *tmp_link = bprintf("%s_limiter", link_id);
-        XBT_DEBUG("<limiter\tid=\"%s\"\tbw=\"%f\"/>", tmp_link,
-                cluster->limiter_link);
-
-
-        memset(&link, 0, sizeof(link));
-        link.id = tmp_link;
-        link.bandwidth = cluster->limiter_link;
-        link.latency = 0;
-        link.initiallyOn = 1;
-        link.policy = SURF_LINK_SHARED;
-        sg_platf_new_link(&link);
-        info_lim.link_up = Link::byName(tmp_link);
-        info_lim.link_down = info_lim.link_up;
-        free(tmp_link);
-        auto as_cluster = static_cast<AsCluster*>(current_routing);
-        xbt_dynar_set(current_routing->p_linkUpDownList,
-            rankId*(as_cluster)->p_nb_links_per_node + as_cluster->p_has_loopback ,
-            &info_lim);
-
-      }
-
-
-      //call the cluster function that adds the others links
-      if (cluster->topology == SURF_CLUSTER_FAT_TREE) {
-        ((AsClusterFatTree*) current_routing)->addProcessingNode(i);
-      }
-      else {
-      static_cast<AsCluster*>(current_routing)->create_links_for_node(cluster, i, rankId, rankId*
-          static_cast<AsCluster*>(current_routing)->p_nb_links_per_node
-          + static_cast<AsCluster*>(current_routing)->p_has_loopback
-          + static_cast<AsCluster*>(current_routing)->p_has_limiter );
-      }
-      xbt_free(link_id);
-      xbt_free(host_id);
-      rankId++;
-    }
-
-    xbt_dynar_free(&radical_ends);
-  }
-  xbt_dynar_free(&radical_elements);
-
-  // For fat trees, the links must be created once all nodes have been added
-  if(cluster->topology == SURF_CLUSTER_FAT_TREE) {
-    static_cast<simgrid::surf::AsClusterFatTree*>(current_routing)->create_links();
-  }
-  // 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\"/>", cluster->router_id);
-  char *newid = NULL;
-  s_sg_platf_router_cbarg_t router = SG_PLATF_ROUTER_INITIALIZER;
-  memset(&router, 0, sizeof(router));
-  router.id = cluster->router_id;
-  router.coord = "";
-  if (!router.id || !strcmp(router.id, ""))
-    router.id = newid =
-        bprintf("%s%s_router%s", cluster->prefix, cluster->id,
-                cluster->suffix);
-  sg_platf_new_router(&router);
-  ((AsCluster*)current_routing)->p_router = (simgrid::surf::NetCard*) 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)) {
-    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);
-
-    memset(&link, 0, sizeof(link));
-    link.id        = link_backbone;
-    link.bandwidth = cluster->bb_bw;
-    link.latency   = cluster->bb_lat;
-    link.initiallyOn = 1;
-    link.policy    = cluster->bb_sharing_policy;
-
-    sg_platf_new_link(&link);
-
-    routing_cluster_add_backbone(Link::byName(link_backbone));
-
-    free(link_backbone);
-  }
-
-  XBT_DEBUG("</AS>");
-  sg_platf_new_AS_end();
-  XBT_DEBUG(" ");
-  xbt_dict_free(&patterns); // no op if it were never set
-}
-
 static void routing_parse_postparse(void) {
   xbt_dict_free(&random_value);
 }