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
Implement reentrant mutexes in xbt_os_thread
[simgrid.git]
/
src
/
xbt
/
graph.c
diff --git
a/src/xbt/graph.c
b/src/xbt/graph.c
index
e3ce876
..
f103366
100644
(file)
--- a/
src/xbt/graph.c
+++ b/
src/xbt/graph.c
@@
-6,6
+6,7
@@
/* 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. */
/* 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 <stdlib.h>
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include <stdlib.h>
#include "xbt/sysdep.h"
#include "xbt/log.h"
@@
-731,6
+732,7
@@
void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename,
xbt_graph_t xbt_graph_load (const char *filename)
{
FILE *file = NULL;
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);
file = fopen (filename, "r");
xbt_assert(file, "Failed to open %s \n", filename);
@@
-740,14
+742,14
@@
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;
- getline (&nnodes_str, &size, file);
+
read =
getline (&nnodes_str, &size, file);
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;
- getline (&node_str, &size, file);
+
read =
getline (&node_str, &size, file);
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);
@@
-758,14
+760,14
@@
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;
- getline (&nedges_str, &size, file);
+
read =
getline (&nedges_str, &size, file);
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];
- getline (&edge_str, &size, file);
+
read =
getline (&edge_str, &size, file);
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);