Platform generation : add the edge length in its data

It could be useful for labelling, for example...

diff --git a/include/simgrid/platf_generator.h b/include/simgrid/platf_generator.h
index b1ce6c8..0aa6823 100644 (file)
--- a/include/simgrid/platf_generator.h
+++ b/include/simgrid/platf_generator.h
@@ -32,6 +32,7 @@ typedef struct s_context_node_t {
 
 typedef struct s_context_edge_t {
   unsigned long id;
 
 typedef struct s_context_edge_t {
   unsigned long id;

+  double length;

   int labeled;
   s_sg_platf_link_cbarg_t link_parameters;
 } s_context_edge_t, *context_edge_t;
   int labeled;
   s_sg_platf_link_cbarg_t link_parameters;
 } s_context_edge_t, *context_edge_t;

diff --git a/src/surf/platf_generator.c b/src/surf/platf_generator.c
index 0c98a6c..23f33ef 100644 (file)
--- a/src/surf/platf_generator.c
+++ b/src/surf/platf_generator.c
@@ -64,6 +64,7 @@ void platf_node_connect(xbt_node_t node1, xbt_node_t node2) {
   context_edge_t edge_data = NULL;
   edge_data = xbt_new0(s_context_edge_t, 1);
   edge_data->id = ++last_link_id;
   context_edge_t edge_data = NULL;
   edge_data = xbt_new0(s_context_edge_t, 1);
   edge_data->id = ++last_link_id;

+  edge_data->length = platf_node_distance(node1, node2);

   edge_data->labeled = FALSE;
   xbt_graph_new_edge(platform_graph, node1, node2, (void*)edge_data);
 }
   edge_data->labeled = FALSE;
   xbt_graph_new_edge(platform_graph, node1, node2, (void*)edge_data);
 }