Fix dead assignments.

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

diff --git a/src/surf/platf_generator.c b/src/surf/platf_generator.c
index 4c3bdea..feaf4ff 100644 (file)
--- a/src/surf/platf_generator.c
+++ b/src/surf/platf_generator.c
@@ -1,4 +1,8 @@
+/* Copyright (c) 2012, 2014. The SimGrid Team.
+ * All rights reserved.                                                     */

 
 

+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */

 
 #include "simgrid/platf_generator.h"
 #include "platf_generator_private.h"
 
 #include "simgrid/platf_generator.h"
 #include "platf_generator_private.h"


@@ -64,6 +68,7 @@ void platf_graph_init(unsigned long node_count) {
     node_data->y = 0;
     node_data->degree = 0;
     node_data->kind = ROUTER;
     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);
   }
 
     xbt_graph_new_node(platform_graph, (void*) node_data);
   }
 


@@ -369,14 +374,26 @@ int platf_graph_is_connected(void) {
   xbt_dynar_t connected_nodes = NULL;
   xbt_dynar_t outgoing_edges = NULL;
   xbt_node_t graph_node = NULL;
   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);
 
   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);
   //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 {
   xbt_dynar_push(connected_nodes, &graph_node);
   iterator = 0;
   do {


@@ -388,11 +405,15 @@ int platf_graph_is_connected(void) {
     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);
     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);
         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);
         xbt_dynar_push(connected_nodes, &dst);

+        node_data->connect_checked = TRUE;

       }
     }
   } while(++iterator < xbt_dynar_length(connected_nodes));
       }
     }
   } while(++iterator < xbt_dynar_length(connected_nodes));


@@ -412,22 +433,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;
 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;
 
   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 = 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_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);
   }
     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;
   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 +634,10 @@ void platf_generate(void) {
   surf_parse_init_callbacks();
   routing_register_callbacks();
 
   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) {
 
   //Generate hosts, clusters and routers
   xbt_dynar_foreach(nodes, i, graph_node) {


@@ -634,8 +666,10 @@ void platf_generate(void) {
         sg_platf_new_cluster(cluster_parameters);
         break;
       case ROUTER:
         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);
         sg_platf_new_router(&router_parameters);

+        break;

     }
   }
 
     }
   }
 


@@ -665,6 +699,7 @@ void platf_generate(void) {
         break;
       case HOST:
         route_parameters.src = src_data->host_parameters.id;
         break;
       case HOST:
         route_parameters.src = src_data->host_parameters.id;

+        break;

     }
     switch(dst_data->kind) {
       case ROUTER:
     }
     switch(dst_data->kind) {
       case ROUTER:


@@ -675,6 +710,7 @@ void platf_generate(void) {
         break;
       case HOST:
         route_parameters.dst = dst_data->host_parameters.id;
         break;
       case HOST:
         route_parameters.dst = dst_data->host_parameters.id;

+        break;

     }
     sg_platf_route_begin(&route_parameters);
     sg_platf_route_add_link(link_parameters->id, &route_parameters);
     }
     sg_platf_route_begin(&route_parameters);
     sg_platf_route_add_link(link_parameters->id, &route_parameters);