X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/779e0e58a8ec8674bef9f53c0f80ea021a4f5063..3119cbc65eaf6635be81c0c71a4ea832097a7fb5:/src/xbt/graph.c diff --git a/src/xbt/graph.c b/src/xbt/graph.c index 8fdec17743..240a974dc2 100644 --- a/src/xbt/graph.c +++ b/src/xbt/graph.c @@ -6,6 +6,8 @@ /* 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_config.h" /* getline */ +#include #include #include "xbt/sysdep.h" #include "xbt/log.h" @@ -14,6 +16,7 @@ #include "xbt/graphxml_parse.h" #include "xbt/dict.h" #include "xbt/heap.h" +#include "xbt/str.h" @@ -78,6 +81,7 @@ xbt_edge_t xbt_graph_new_edge(xbt_graph_t g, return edge; } +/** @brief Get the edge connecting src and dst */ xbt_edge_t xbt_graph_get_edge(xbt_graph_t g, xbt_node_t src, xbt_node_t dst) { @@ -99,21 +103,25 @@ xbt_edge_t xbt_graph_get_edge(xbt_graph_t g, xbt_node_t src, return NULL; } +/** @brief Get the user data associated to a node */ void *xbt_graph_node_get_data(xbt_node_t node) { return node->data; } +/** @brief Set the user data associated to a node */ void xbt_graph_node_set_data(xbt_node_t node, void *data) { node->data = data; } +/** @brief Get the user data associated to a edge */ void *xbt_graph_edge_get_data(xbt_edge_t edge) { return edge->data; } +/** @brief Set the user data associated to a edge */ void xbt_graph_edge_set_data(xbt_edge_t edge, void *data) { edge->data = data; @@ -141,12 +149,12 @@ void xbt_graph_free_graph(xbt_graph_t g, xbt_dynar_free(&(node->out)); xbt_dynar_free(&(node->in)); if (node_free_function) - (*node_free_function) (node->data); + node_free_function(node->data); } xbt_dynar_foreach(g->edges, cursor, edge) { if (edge_free_function) - (*edge_free_function) (edge->data); + edge_free_function(edge->data); } xbt_dynar_foreach(g->nodes, cursor, node) @@ -157,7 +165,7 @@ void xbt_graph_free_graph(xbt_graph_t g, free(edge); xbt_dynar_free(&(g->edges)); if (graph_free_function) - (*graph_free_function) (g->data); + graph_free_function(g->data); free(g); xbt_graph_parse_lex_destroy(); return; @@ -187,7 +195,7 @@ void xbt_graph_free_node(xbt_graph_t g, xbt_node_t n, } if ((node_free_function) && (n->data)) - (*node_free_function) (n->data); + node_free_function(n->data); cursor = 0; xbt_dynar_foreach(g->nodes, cursor, node) @@ -211,7 +219,7 @@ void xbt_graph_free_edge(xbt_graph_t g, xbt_edge_t e, xbt_edge_t edge = NULL; if ((free_function) && (e->data)) - (*free_function) (e->data); + free_function(e->data); xbt_dynar_foreach(g->edges, cursor, edge) { if (edge == e) { @@ -283,9 +291,10 @@ void xbt_graph_edge_set_length(xbt_edge_t e, double length) } -double xbt_graph_edge_get_length(xbt_edge_t e) +/** @brief Get the length of a edge */ +double xbt_graph_edge_get_length(xbt_edge_t edge) { - return e->length; + return edge->length; } @@ -440,7 +449,7 @@ xbt_edge_t *xbt_graph_spanning_tree_prim(xbt_graph_t g) xbt_heap_t heap = xbt_heap_new(10, NULL); unsigned int cursor; - xbt_assert0(!(g->directed), + xbt_assert(!(g->directed), "Spanning trees do not make sense on directed graphs"); xbt_dynar_foreach(g->nodes, cursor, node) { @@ -528,7 +537,7 @@ void xbt_graph_depth_visit(xbt_graph_t g, xbt_node_t n, if (*((int *) (n->xbtdata)) == ALREADY_EXPLORED) return; else if (*((int *) (n->xbtdata)) == CURRENTLY_EXPLORING) - THROW0(0, 0, "There is a cycle"); + THROWF(0, 0, "There is a cycle"); else { *((int *) (n->xbtdata)) = CURRENTLY_EXPLORING; @@ -558,7 +567,7 @@ static void __parse_graph_begin(void) else parsed_graph = xbt_graph_new_graph(0, NULL); - parsed_nodes = xbt_dict_new(); + parsed_nodes = xbt_dict_new_homogeneous(NULL); } static void __parse_graph_end(void) @@ -575,10 +584,8 @@ static void __parse_node(void) if (__parse_node_label_and_data) node->data = __parse_node_label_and_data(node, A_graphxml_node_label, A_graphxml_node_data); - xbt_graph_parse_get_double(&(node->position_x), - A_graphxml_node_position_x); - xbt_graph_parse_get_double(&(node->position_y), - A_graphxml_node_position_y); + node->position_x = xbt_graph_parse_get_double(A_graphxml_node_position_x); + node->position_y = xbt_graph_parse_get_double(A_graphxml_node_position_y); xbt_dict_set(parsed_nodes, A_graphxml_node_name, (void *) node, NULL); } @@ -596,7 +603,7 @@ static void __parse_edge(void) edge->data = __parse_edge_label_and_data(edge, A_graphxml_edge_label, A_graphxml_edge_data); - xbt_graph_parse_get_double(&(edge->length), A_graphxml_edge_length); + edge->length = xbt_graph_parse_get_double(A_graphxml_edge_length); XBT_DEBUG("", (char *) (edge->src)->data, @@ -626,9 +633,9 @@ xbt_graph_t xbt_graph_read(const char *filename, ETag_graphxml_edge_fun = __parse_edge; xbt_graph_parse_open(filename); - int res; - res = (*xbt_graph_parse) (); - xbt_assert1(!res, "Parse error in %s", filename); + _XBT_GNUC_UNUSED int res; + res = xbt_graph_parse(); + xbt_assert(!res, "Parse error in %s", filename); xbt_graph_parse_close(); graph = parsed_graph; @@ -649,7 +656,7 @@ void xbt_graph_export_graphviz(xbt_graph_t g, const char *filename, const char *name = NULL; file = fopen(filename, "w"); - xbt_assert1(file, "Failed to open %s \n", filename); + xbt_assert(file, "Failed to open %s \n", filename); if (g->directed) fprintf(file, "digraph test {\n"); @@ -663,16 +670,30 @@ void xbt_graph_export_graphviz(xbt_graph_t g, const char *filename, " node [width=.3, height=.3, style=filled, color=skyblue]\n\n"); xbt_dynar_foreach(g->nodes, cursor, node) { - fprintf(file, " \"%p\" ", node); - if ((node_name) && ((name = node_name(node)))) - fprintf(file, "[label=\"%s\"]", name); - fprintf(file, ";\n"); + if (node_name){ + fprintf(file, " \"%s\";\n", node_name(node)); + }else{ + fprintf(file, " \"%p\";\n", node); + } } xbt_dynar_foreach(g->edges, cursor, edge) { - if (g->directed) - fprintf(file, " \"%p\" -> \"%p\"", edge->src, edge->dst); - else - fprintf(file, " \"%p\" -- \"%p\"", edge->src, edge->dst); + const char *c; + const char *c_dir = "->"; + const char *c_ndir = "--"; + if (g->directed){ + c = c_dir; + }else{ + c = c_ndir; + } + const char *src_name, *dst_name; + if (node_name){ + src_name = node_name(edge->src); + dst_name = node_name(edge->dst); + fprintf(file, " \"%s\" %s \"%s\"", src_name, c, dst_name); + }else{ + fprintf(file, " \"%p\" %s \"%p\"", edge->src, c, edge->dst); + } + if ((edge_name) && ((name = edge_name(edge)))) fprintf(file, "[label=\"%s\"]", name); fprintf(file, ";\n"); @@ -695,7 +716,7 @@ void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename, const char *name = NULL; file = fopen(filename, "w"); - xbt_assert1(file, "Failed to open %s \n", filename); + xbt_assert(file, "Failed to open %s \n", filename); fprintf(file, "\n"); fprintf(file, "\n"); @@ -725,3 +746,109 @@ void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename, fprintf(file, "\n"); fclose(file); } + +/** @brief Load a graph from a file (in the SimGrid Graph format) */ +xbt_graph_t xbt_graph_load (const char *filename) +{ + FILE *file = NULL; + ssize_t read; + file = fopen (filename, "r"); + xbt_assert(file, "Failed to open %s \n", filename); + + xbt_dict_t nodes_dict = xbt_dict_new_homogeneous(NULL); + xbt_graph_t ret = xbt_graph_new_graph (0, NULL); + + //read the number of nodes + size_t size; + char *nnodes_str = NULL; + read = getline (&nnodes_str, &size, file); + if (read == -1) + THROWF(system_error, 0, "getline failed to read the number of nodes (errno = %d)", errno); + int i, nnodes = atoi (nnodes_str); + free (nnodes_str); + + //read all nodes + for (i = 0; i < nnodes; i++){ + char *node_str = NULL; + read = getline (&node_str, &size, file); + if (read == -1) + THROWF(system_error, 0, "getline failed to read all nodes (errno = %d)", errno); + xbt_node_t n; + char *name = xbt_strdup (node_str); + xbt_str_subst (name, '\n', '\0', 0); + n = xbt_graph_new_node (ret, name); + xbt_dict_set (nodes_dict, name, n, NULL); + free (node_str); + } + + //read the number of edges + char *nedges_str = NULL; + read = getline (&nedges_str, &size, file); + if (read == -1) + THROWF(system_error, 0, "getline failed to read the number of edges (errno = %d)", errno); + int nedges = atoi (nedges_str); + free (nedges_str); + + //read all edges + for (i = 0; i < nedges; i++){ + char *edge_str = NULL, edge_id[200], node_source[200], node_target[200]; + read = getline (&edge_str, &size, file); + if (read == -1) + THROWF(system_error, 0, "getline failed to read all edges (errno = %d)", errno); + sscanf (edge_str, "%s %s %s", edge_id, node_source, node_target); + free (edge_str); + xbt_str_subst (edge_id, '\n', '\0', 0); + xbt_str_subst (node_source, '\n', '\0', 0); + xbt_str_subst (node_target, '\n', '\0', 0); + + xbt_node_t source = xbt_dict_get (nodes_dict, node_source); + xbt_node_t target = xbt_dict_get (nodes_dict, node_target); + xbt_graph_new_edge (ret, source, target, xbt_strdup(edge_id)); + } + xbt_dict_free (&nodes_dict); + return ret; +} + +/** @brief Save a graph from a file (in the SimGrid Graph format) */ +void xbt_graph_save (xbt_graph_t span, + const char *filename, + const char *(nname) (xbt_node_t), + const char *(ename) (xbt_edge_t)) +{ + FILE *file = NULL; + file = fopen(filename, "w"); + xbt_assert(file, "Failed to open %s \n", filename); + + xbt_dynar_t nodes = xbt_graph_get_nodes (span); + xbt_dynar_t edges = xbt_graph_get_edges (span); + unsigned int cpt; + xbt_node_t node; + fprintf (file, "%lu\n", xbt_dynar_length (nodes)); + xbt_dynar_foreach (nodes, cpt, node) { + if (nname){ + fprintf (file, "%s\n", nname(node)); + }else{ + fprintf (file, "%p\n", node); + } + } + fprintf (file, "%lu\n", xbt_dynar_length (edges)); + xbt_edge_t edge; + xbt_dynar_foreach (edges, cpt, edge) { + xbt_node_t source = xbt_graph_edge_get_source (edge); + xbt_node_t target = xbt_graph_edge_get_target (edge); + if (ename){ + if (nname){ + fprintf (file, "%s %s %s\n", ename(edge), nname(source), nname(target)); + }else{ + fprintf (file, "%s %p %p\n", ename(edge), source, target); + } + }else{ + if (nname){ + fprintf (file, "%p %s %s\n", edge, nname(source), nname(target)); + }else{ + fprintf (file, "%p %p %p\n", edge, source, target); + } + } + } + fclose (file); +}