A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dijkstra: kill obscure dead dupplicated code
[simgrid.git]
/
src
/
xbt
/
graph.c
diff --git
a/src/xbt/graph.c
b/src/xbt/graph.c
index
240a974
..
1db1686
100644
(file)
--- a/
src/xbt/graph.c
+++ b/
src/xbt/graph.c
@@
-1,14
+1,11
@@
/* a generic graph library. */
/* 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. */
* 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 "simgrid_config.h" /* getline */
-#include <errno.h>
-#include <stdlib.h>
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/graph.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/graph.h"
@@
-17,8
+14,10
@@
#include "xbt/dict.h"
#include "xbt/heap.h"
#include "xbt/str.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");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_graph, xbt, "Graph");
@@
-140,39
+139,34
@@
void xbt_graph_free_graph(xbt_graph_t g,
void_f_pvoid_t edge_free_function,
void_f_pvoid_t graph_free_function)
{
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->nodes, cursor, node) {
xbt_dynar_free(&(node->out));
xbt_dynar_free(&(node->in));
if (node_free_function)
node_free_function(node->data);
+ free(node);
}
}
-
- xbt_dynar_foreach(g->edges, cursor, edge) {
- if (edge_free_function)
- edge_free_function(edge->data);
- }
-
- xbt_dynar_foreach(g->nodes, cursor, node)
- free(node);
xbt_dynar_free(&(g->nodes));
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);
free(g);
xbt_graph_parse_lex_destroy();
if (graph_free_function)
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)
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)
@@
-210,7
+204,7
@@
void xbt_graph_free_node(xbt_graph_t g, xbt_node_t n,
return;
}
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)
{
void xbt_graph_free_edge(xbt_graph_t g, xbt_edge_t e,
void_f_pvoid_t free_function)
{
@@
-584,8
+578,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);
if (__parse_node_label_and_data)
node->data = __parse_node_label_and_data(node, A_graphxml_node_label,
A_graphxml_node_data);
- 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);
+ 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);
}
xbt_dict_set(parsed_nodes, A_graphxml_node_name, (void *) node, NULL);
}
@@
-633,7
+627,7
@@
xbt_graph_t xbt_graph_read(const char *filename,
ETag_graphxml_edge_fun = __parse_edge;
xbt_graph_parse_open(filename);
ETag_graphxml_edge_fun = __parse_edge;
xbt_graph_parse_open(filename);
-
_XBT_GNUC
_UNUSED int res;
+
XBT_ATTRIB
_UNUSED int res;
res = xbt_graph_parse();
xbt_assert(!res, "Parse error in %s", filename);
xbt_graph_parse_close();
res = xbt_graph_parse();
xbt_assert(!res, "Parse error in %s", filename);
xbt_graph_parse_close();
@@
-730,7
+724,7
@@
void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename,
fprintf(file, "label=\"%s\" ", name);
if ((node_data_print) && ((name = node_data_print(node->data))))
fprintf(file, "data=\"%s\" ", name);
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\" ",
}
xbt_dynar_foreach(g->edges, cursor, edge) {
fprintf(file, " <edge source=\"%p\" target =\"%p\" ",
@@
-741,7
+735,7
@@
void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename,
fprintf(file, "length=\"%g\" ", edge->length);
if ((edge_data_print) && ((name = edge_data_print(edge->data))))
fprintf(file, "data=\"%s\" ", name);
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);
}
fprintf(file, "</graph>\n");
fclose(file);
@@
-761,18
+755,18
@@
xbt_graph_t xbt_graph_load (const char *filename)
//read the number of nodes
size_t size;
char *nnodes_str = 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)
if (read == -1)
- THROWF(system_error, 0, "getline failed to read the number of nodes (errno = %d)", errno);
+ 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;
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)
if (read == -1)
- THROWF(system_error, 0, "getline failed to read all nodes (errno = %d)", errno);
+ 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);
xbt_node_t n;
char *name = xbt_strdup (node_str);
xbt_str_subst (name, '\n', '\0', 0);
@@
-783,18
+777,18
@@
xbt_graph_t xbt_graph_load (const char *filename)
//read the number of edges
char *nedges_str = NULL;
//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)
if (read == -1)
- THROWF(system_error, 0, "getline failed to read the number of edges (errno = %d)", errno);
+ 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];
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)
if (read == -1)
- THROWF(system_error, 0, "getline failed to read all edges (errno = %d)", errno);
+ 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);
sscanf (edge_str, "%s %s %s", edge_id, node_source, node_target);
free (edge_str);
xbt_str_subst (edge_id, '\n', '\0', 0);