Platform generation : make public structures for node and edge data

diff --git a/include/simgrid/platf_generator.h b/include/simgrid/platf_generator.h
index 4ee6cce..b98a1e0 100644 (file)
--- a/include/simgrid/platf_generator.h
+++ b/include/simgrid/platf_generator.h
@@ -19,8 +19,22 @@ typedef enum {
   CLUSTER
 } e_platf_node_kind;
 
   CLUSTER
 } e_platf_node_kind;
 

-typedef struct s_context_node_t *context_node_t;
-typedef struct s_context_edge_t *context_edge_t;
+typedef struct s_context_node_t {
+  unsigned long id;
+  double x, y;
+  int degree;
+  e_platf_node_kind kind;
+  union {
+    s_sg_platf_host_cbarg_t host_parameters;
+    s_sg_platf_cluster_cbarg_t cluster_parameters;
+  };
+} s_context_node_t, *context_node_t;
+
+typedef struct s_context_edge_t {
+  unsigned long id;
+  int labeled;
+  s_sg_platf_link_cbarg_t link_parameters;
+} s_context_edge_t, *context_edge_t;

 
 typedef void (*platf_promoter_cb_t) (context_node_t);
 typedef void (*platf_labeler_cb_t) (context_edge_t);
 
 typedef void (*platf_promoter_cb_t) (context_node_t);
 typedef void (*platf_labeler_cb_t) (context_edge_t);

diff --git a/src/surf/platf_generator_private.h b/src/surf/platf_generator_private.h
index 3b95d50..12cfdd0 100644 (file)
--- a/src/surf/platf_generator_private.h
+++ b/src/surf/platf_generator_private.h
@@ -4,23 +4,6 @@
 #include "xbt/graph.h"
 #include "simgrid/platf.h"
 
 #include "xbt/graph.h"
 #include "simgrid/platf.h"
 

-typedef struct s_context_node_t {
-  unsigned long id;
-  double x, y;
-  int degree;
-  e_platf_node_kind kind;
-  union {
-    s_sg_platf_host_cbarg_t host_parameters;
-    s_sg_platf_cluster_cbarg_t cluster_parameters;
-  };
-} s_context_node_t;
-
-typedef struct s_context_edge_t {
-  unsigned long id;
-  int labeled;
-  s_sg_platf_link_cbarg_t link_parameters;
-} s_context_edge_t;
-

 void platf_graph_init(unsigned long node_count);
 
 void platf_node_connect(xbt_node_t node1, xbt_node_t node2);
 void platf_graph_init(unsigned long node_count);
 
 void platf_node_connect(xbt_node_t node1, xbt_node_t node2);