/* a generic graph library. */
-/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2006-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 <stdlib.h>
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/graph.h"
#include "xbt/dict.h"
#include "xbt/heap.h"
#include "xbt/str.h"
+#include "xbt/file.h"
-
+#include <errno.h>
+#include <stdlib.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_graph, xbt, "Graph");
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)
{
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;
void_f_pvoid_t edge_free_function,
void_f_pvoid_t graph_free_function)
{
- unsigned int cursor = 0;
- xbt_node_t node = NULL;
- xbt_edge_t edge = NULL;
+ unsigned int cursor;
+ xbt_node_t node;
+ xbt_edge_t edge;
+ xbt_dynar_foreach(g->edges, cursor, edge) {
+ if (edge_free_function)
+ edge_free_function(edge->data);
+ free(edge);
+ }
+ xbt_dynar_free(&(g->edges));
xbt_dynar_foreach(g->nodes, cursor, node) {
xbt_dynar_free(&(node->out));
xbt_dynar_free(&(node->in));
if (node_free_function)
- (*node_free_function) (node->data);
- }
-
- xbt_dynar_foreach(g->edges, cursor, edge) {
- if (edge_free_function)
- (*edge_free_function) (edge->data);
+ node_free_function(node->data);
+ free(node);
}
-
- xbt_dynar_foreach(g->nodes, cursor, node)
- free(node);
xbt_dynar_free(&(g->nodes));
- xbt_dynar_foreach(g->edges, cursor, edge)
- 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;
}
-/** @brief remove the given node from the given graph */
+/** @brief remove the given node from the given graph */
void xbt_graph_free_node(xbt_graph_t g, xbt_node_t n,
void_f_pvoid_t node_free_function,
void_f_pvoid_t edge_free_function)
}
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)
return;
}
-/** @brief remove the given edge from the given graph */
+/** @brief remove the given edge from the given graph */
void xbt_graph_free_edge(xbt_graph_t g, xbt_edge_t e,
void_f_pvoid_t free_function)
{
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) {
}
-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;
}
}
xbt_dynar_foreach(g->nodes, cursor, node) {
- in_cursor = 0;
D(cursor, cursor) = 0;
xbt_dynar_foreach(node->out, in_cursor, edge) {
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)
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);
}
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("<edge source=\"%s\" target=\"%s\" length=\"%f\"/>",
(char *) (edge->src)->data,
ETag_graphxml_edge_fun = __parse_edge;
xbt_graph_parse_open(filename);
- int res;
- res = (*xbt_graph_parse) ();
+ XBT_ATTRIB_UNUSED int res;
+ res = xbt_graph_parse();
xbt_assert(!res, "Parse error in %s", filename);
xbt_graph_parse_close();
" 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");
fprintf(file, "label=\"%s\" ", name);
if ((node_data_print) && ((name = node_data_print(node->data))))
fprintf(file, "data=\"%s\" ", name);
- fprintf(file, ">\n");
+ fprintf(file, "/>\n");
}
xbt_dynar_foreach(g->edges, cursor, edge) {
fprintf(file, " <edge source=\"%p\" target =\"%p\" ",
fprintf(file, "length=\"%g\" ", edge->length);
if ((edge_data_print) && ((name = edge_data_print(edge->data))))
fprintf(file, "data=\"%s\" ", name);
- fprintf(file, ">\n");
+ fprintf(file, "/>\n");
}
fprintf(file, "</graph>\n");
fclose(file);
file = fopen (filename, "r");
xbt_assert(file, "Failed to open %s \n", filename);
- xbt_dict_t nodes_dict = xbt_dict_new ();
+ 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);
+ read = xbt_getline (&nnodes_str, &size, file);
+ if (read == -1)
+ THROWF(system_error, 0, "xbt_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);
+ read = xbt_getline (&node_str, &size, file);
+ if (read == -1)
+ THROWF(system_error, 0, "xbt_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);
//read the number of edges
char *nedges_str = NULL;
- read = getline (&nedges_str, &size, file);
+ read = xbt_getline (&nedges_str, &size, file);
+ if (read == -1)
+ THROWF(system_error, 0, "xbt_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);
+ read = xbt_getline (&edge_str, &size, file);
+ if (read == -1)
+ THROWF(system_error, 0, "xbt_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_node_t source = xbt_dict_get (nodes_dict, node_source);
xbt_node_t target = xbt_dict_get (nodes_dict, node_target);
- xbt_edge_t e;
- e = xbt_graph_new_edge (ret, source, target, xbt_strdup(edge_id));
+ xbt_graph_new_edge (ret, source, target, xbt_strdup(edge_id));
}
xbt_dict_free (&nodes_dict);
return ret;
xbt_dynar_t edges = xbt_graph_get_edges (span);
unsigned int cpt;
xbt_node_t node;
- fprintf (file, "%ld\n", xbt_dynar_length (nodes));
+ fprintf (file, "%lu\n", xbt_dynar_length (nodes));
xbt_dynar_foreach (nodes, cpt, node) {
if (nname){
fprintf (file, "%s\n", nname(node));
fprintf (file, "%p\n", node);
}
}
- fprintf (file, "%ld\n", xbt_dynar_length (edges));
+ 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);
