Platform generation : REALLY check if the graph is connected

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

diff --git a/src/surf/platf_generator.c b/src/surf/platf_generator.c
index 23f33ef..11d5be7 100644 (file)
--- a/src/surf/platf_generator.c
+++ b/src/surf/platf_generator.c
@@ -4,6 +4,8 @@
 #include "platf_generator_private.h"
 #include "xbt.h"
 #include "xbt/RngStream.h"
+#include "surf/simgrid_dtd.h"
+#include "surf_private.h"
 #include <math.h>
 
 static xbt_graph_t platform_graph = NULL;
@@ -300,6 +302,66 @@ void platf_graph_interconnect_barabasi(void) {
   }
 }
 
+int platf_graph_is_connected(void) {
+  xbt_dynar_t dynar_nodes = NULL;
+  xbt_dynar_t connected_nodes = NULL;
+  xbt_dynar_t outgoing_edges = NULL;
+  xbt_node_t graph_node = NULL;
+  xbt_edge_t outedge = NULL;
+  unsigned long iterator;
+  unsigned int i;
+  dynar_nodes = xbt_graph_get_nodes(platform_graph);
+  connected_nodes = xbt_dynar_new(sizeof(xbt_node_t), NULL);
+
+  //Initialize the connected node array with the first node
+  xbt_dynar_get_cpy(dynar_nodes, 0, &graph_node);
+  xbt_dynar_push(connected_nodes, &graph_node);
+  iterator = 0;
+  do {
+    //Get the next node
+    xbt_dynar_get_cpy(connected_nodes, iterator, &graph_node);
+
+    //add all the linked nodes to the connected node array
+    outgoing_edges = xbt_graph_node_get_outedges(graph_node);
+    xbt_dynar_foreach(outgoing_edges, i, outedge) {
+      xbt_node_t src = xbt_graph_edge_get_source(outedge);
+      xbt_node_t dst = xbt_graph_edge_get_target(outedge);
+      if(!xbt_dynar_member(connected_nodes, &src)) {
+        xbt_dynar_push(connected_nodes, &src);
+      }
+      if(!xbt_dynar_member(connected_nodes, &dst)) {
+        xbt_dynar_push(connected_nodes, &dst);
+      }
+    }
+  } while(++iterator < xbt_dynar_length(connected_nodes));
+
+  // The graph is connected if the connected node array has the same length
+  // as the graph node array
+  return xbt_dynar_length(connected_nodes) == xbt_dynar_length(dynar_nodes);
+}
+
+void platf_graph_clear_links(void) {
+  xbt_dynar_t dynar_nodes = NULL;
+  xbt_dynar_t dynar_edges = NULL;
+  xbt_node_t graph_node = NULL;
+  xbt_edge_t graph_edge = NULL;
+  context_node_t node_data = NULL;
+  unsigned int i;
+
+  //Delete edges from the graph
+  dynar_edges = xbt_graph_get_edges(platform_graph);
+  xbt_dynar_foreach(dynar_edges, i, graph_edge) {
+    xbt_graph_free_edge(platform_graph, graph_edge, xbt_free);
+  }
+
+  //All the nodes will be of degree 0
+  dynar_nodes = xbt_graph_get_nodes(platform_graph);
+  xbt_dynar_foreach(dynar_nodes, i, graph_node) {
+    node_data = xbt_graph_node_get_data(graph_node);
+    node_data->degree = 0;
+  }
+}
+
 void platf_graph_promote_to_host(context_node_t node, sg_platf_host_cbarg_t parameters) {
   node->kind = HOST;
   memcpy(&(node->host_parameters), parameters, sizeof(s_sg_platf_host_cbarg_t));
@@ -362,6 +424,68 @@ void platf_do_label(void) {
   }
 }
 
+void platf_generate(void) {
+
+  xbt_dynar_t nodes = NULL;
+  xbt_node_t graph_node = NULL;
+  context_node_t node_data = NULL;
+  unsigned int i;
+
+  unsigned int last_host = 0;
+  unsigned int last_router = 0;
+  unsigned int last_cluster = 0;
+
+  sg_platf_host_cbarg_t host_parameters;
+  s_sg_platf_router_cbarg_t router_parameters; /* This one is not a pointer! */
+  sg_platf_cluster_cbarg_t cluster_parameters;
+
+  router_parameters.coord = NULL;
+
+  nodes = xbt_graph_get_nodes(platform_graph);
+
+  sg_platf_begin();
+  surf_parse_init_callbacks();
+  routing_register_callbacks();
+
+
+  sg_platf_new_AS_begin("random platform", A_surfxml_AS_routing_Floyd);
+
+  xbt_dynar_foreach(nodes, i, graph_node) {
+    node_data = xbt_graph_node_get_data(graph_node);
+    switch(node_data->kind) {
+      case HOST:
+        host_parameters = &node_data->host_parameters;
+        last_host++;
+        if(host_parameters->id == NULL) {
+          host_parameters->id = bprintf("host-%d", last_host);
+        }
+        sg_platf_new_host(host_parameters);
+        break;
+      case CLUSTER:
+        cluster_parameters = &node_data->cluster_parameters;
+        last_cluster++;
+        if(cluster_parameters->prefix == NULL) {
+          cluster_parameters->prefix = "host-";
+        }
+        if(cluster_parameters->suffix == NULL) {
+          cluster_parameters->suffix = bprintf(".cluster-%d", last_cluster);
+        }
+        if(cluster_parameters->id == NULL) {
+          cluster_parameters->id = bprintf("cluster-%d", last_cluster);
+        }
+        sg_platf_new_cluster(cluster_parameters);
+        break;
+      case ROUTER:
+        router_parameters.id = bprintf("router-%d", ++last_router);
+        sg_platf_new_router(&router_parameters);
+    }
+  }
+
+
+  sg_platf_new_AS_end();
+  sg_platf_end();
+}
+
 /* Functions used to generate interesting random values */
 
 double random_pareto(double min, double max, double K, double P, double ALPHA) {