Merge branch 'vmtrace' again (don't try to undersatand why)

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

diff --git a/src/surf/platf_generator.c b/src/surf/platf_generator.c
index 4c3bdea..63e816e 100644 (file)
--- a/src/surf/platf_generator.c
+++ b/src/surf/platf_generator.c
@@ -64,6 +64,7 @@ void platf_graph_init(unsigned long node_count) {
     node_data->y = 0;
     node_data->degree = 0;
     node_data->kind = ROUTER;
+    node_data->connect_checked = FALSE;
     xbt_graph_new_node(platform_graph, (void*) node_data);
   }
 
@@ -369,30 +370,47 @@ int platf_graph_is_connected(void) {
   xbt_dynar_t connected_nodes = NULL;
   xbt_dynar_t outgoing_edges = NULL;
   xbt_node_t graph_node = NULL;
+  context_node_t node_data = 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);
 
+  //Let's just check if every nodes are connected to something
+  xbt_dynar_foreach(dynar_nodes, i, graph_node) {
+    node_data = xbt_graph_node_get_data(graph_node);
+    if(node_data->degree==0) {
+      return FALSE;
+    }
+  }
+
+  //We still need a real check
   //Initialize the connected node array with the first node
   xbt_dynar_get_cpy(dynar_nodes, 0, &graph_node);
+  node_data = xbt_graph_node_get_data(graph_node);
+  node_data->connect_checked = TRUE;
   xbt_dynar_push(connected_nodes, &graph_node);
   iterator = 0;
   do {
     //Get the next node
     xbt_dynar_get_cpy(connected_nodes, iterator, &graph_node);
+    node_data = xbt_graph_node_get_data(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)) {
+      node_data = xbt_graph_node_get_data(src);
+      if(!node_data->connect_checked) {
         xbt_dynar_push(connected_nodes, &src);
+        node_data->connect_checked = TRUE;
       }
-      if(!xbt_dynar_member(connected_nodes, &dst)) {
+      node_data = xbt_graph_node_get_data(dst);
+      if(!node_data->connect_checked) {
         xbt_dynar_push(connected_nodes, &dst);
+        node_data->connect_checked = TRUE;
       }
     }
   } while(++iterator < xbt_dynar_length(connected_nodes));
@@ -412,22 +430,31 @@ int platf_graph_is_connected(void) {
 void platf_graph_clear_links(void) {
   xbt_dynar_t dynar_nodes = NULL;
   xbt_dynar_t dynar_edges = NULL;
+  xbt_dynar_t dynar_edges_cpy = 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
+  //The graph edge dynar will be modified directly, so we work on a copy of it
   dynar_edges = xbt_graph_get_edges(platform_graph);
+  dynar_edges_cpy = xbt_dynar_new(sizeof(xbt_edge_t), NULL);
   xbt_dynar_foreach(dynar_edges, i, graph_edge) {
+    xbt_dynar_push_as(dynar_edges_cpy, xbt_edge_t, graph_edge);
+  }
+  //Delete edges from the graph
+  xbt_dynar_foreach(dynar_edges_cpy, i, graph_edge) {
     xbt_graph_free_edge(platform_graph, graph_edge, xbt_free);
   }
+  //remove the dynar copy
+  xbt_dynar_free(&dynar_edges_cpy);
 
-  //All the nodes will be of degree 0
+  //All the nodes will be of degree 0, unchecked from connectedness
   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;
+    node_data->connect_checked = FALSE;
   }
 }
 
@@ -604,8 +631,10 @@ void platf_generate(void) {
   surf_parse_init_callbacks();
   routing_register_callbacks();
 
-
-  sg_platf_new_AS_begin("random platform", A_surfxml_AS_routing_Floyd);
+  s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
+  AS.id = "random platform";
+  AS.routing = A_surfxml_AS_routing_Floyd;
+  sg_platf_new_AS_begin(&AS);
 
   //Generate hosts, clusters and routers
   xbt_dynar_foreach(nodes, i, graph_node) {
@@ -634,7 +663,8 @@ void platf_generate(void) {
         sg_platf_new_cluster(cluster_parameters);
         break;
       case ROUTER:
-        router_parameters.id = bprintf("router-%d", ++last_router);
+        node_data->router_id = bprintf("router-%d", ++last_router);
+        router_parameters.id = node_data->router_id;
         sg_platf_new_router(&router_parameters);
     }
   }