Add an emergency debugging facility (cannot use regular one to avoid circular depende...

[simgrid.git] / include / xbt / graph.h

diff --git a/include/xbt/graph.h b/include/xbt/graph.h
index 310d7a2..6093733 100644 (file)
--- a/include/xbt/graph.h
+++ b/include/xbt/graph.h
@@ -26,7 +26,7 @@ double xbt_graph_edge_get_length(xbt_edge_t e);
 double* xbt_graph_get_length_matrix(xbt_graph_t g);
 
 void xbt_graph_free_node(xbt_graph_t g, xbt_node_t n, 
-                          void_f_pvoid_t *free_function);
+                          void_f_pvoid_t *node_free_function , void_f_pvoid_t *edge_free_function);
 void xbt_graph_free_edge(xbt_graph_t g, xbt_edge_t e, 
                           void_f_pvoid_t *free_function);
 void xbt_graph_free_graph(xbt_graph_t g, 
@@ -34,27 +34,40 @@ void xbt_graph_free_graph(xbt_graph_t g,
                          void_f_pvoid_t *edge_free_function,
                          void_f_pvoid_t *graph_free_function);
 
+int __xbt_find_in_dynar(xbt_dynar_t dynar, void *p);
+
 xbt_dynar_t xbt_graph_get_nodes(xbt_graph_t g);
 xbt_dynar_t xbt_graph_get_edges(xbt_graph_t g);
 xbt_node_t xbt_graph_edge_get_source(xbt_edge_t e);
 xbt_node_t xbt_graph_edge_get_target(xbt_edge_t e);
-xbt_graph_t xbt_graph_read(const char *filename);
+xbt_graph_t xbt_graph_read(const char *filename,
+                          void *(node_label_and_data)(xbt_node_t, const char*, const char*),
+                          void *(edge_label_and_data)(xbt_edge_t, const char*, const char*)
+                          );
+ 
+void xbt_graph_export_graphviz(xbt_graph_t g, const char *filename,
+                              const char *(node_name)(xbt_node_t),
+                              const char *(edge_name)(xbt_edge_t));
+void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename,
+                              const char *(node_name)(xbt_node_t),
+                              const char *(edge_name)(xbt_edge_t),
+                              const char *(node_data_print)(void *),
+                              const char *(edge_data_print)(void *));
 
 /* Not implemented yet ! */
-void xbt_export_graphviz(xbt_graph_t g, const char *filename,
-                        const char *(node_name)(xbt_node_t),
-                        const char *(edge_name)(xbt_edge_t)
-                        );
-
-void xbt_graph_export_surfxml(xbt_graph_t g,
-                             const char *filename,
-                             const char *(node_name)(xbt_node_t),
-                             const char *(edge_name)(xbt_edge_t)
-                             );
-
 /* void *xbt_graph_to_array(xbt_graph_t g);  */
 xbt_node_t* xbt_graph_shortest_paths(xbt_graph_t g);
-void xbt_graph_topological_sort(xbt_graph_t g);
+
+
+
+/* transforms the network structure of a directed acyclic graph given as argument  into a linear structure 
+@return an array containing the nodes of the graph sorted in order reverse to the path of exploration 
+if a cycle is detected an exception is raised  
+  */
+
+xbt_node_t* xbt_graph_topo_sort(xbt_graph_t g);
+
+xbt_edge_t* xbt_graph_spanning_tree_prim(xbt_graph_t g);