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
Automatically generated files
[simgrid.git]
/
testsuite
/
xbt
/
graphxml_usage.c
diff --git
a/testsuite/xbt/graphxml_usage.c
b/testsuite/xbt/graphxml_usage.c
index
b7be207
..
e6450c0
100644
(file)
--- a/
testsuite/xbt/graphxml_usage.c
+++ b/
testsuite/xbt/graphxml_usage.c
@@
-6,7
+6,11
@@
/* 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. */
-
+#ifdef __BORLANDC__
+ #pragma hdrstop
+ #endif
+
+#include <stdio.h>
#include "xbt/module.h"
#include "xbt/sysdep.h"
#include "xbt/graph.h"
#include "xbt/module.h"
#include "xbt/sysdep.h"
#include "xbt/graph.h"
@@
-15,12
+19,14
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Logging specific to graphxml test");
XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Logging specific to graphxml test");
+
static void *node_label_and_data(xbt_node_t node, const char *label,
const char *data)
{
char *lbl = xbt_strdup(label);
return lbl;
}
static void *node_label_and_data(xbt_node_t node, const char *label,
const char *data)
{
char *lbl = xbt_strdup(label);
return lbl;
}
+#define free_label free
static const char *node_name(xbt_node_t n)
{
static const char *node_name(xbt_node_t n)
{
@@
-30,8
+36,8
@@
static const char *node_name(xbt_node_t n)
void test(char *graph_file);
void test(char *graph_file)
{
void test(char *graph_file);
void test(char *graph_file)
{
- int test_node_deletion =
1
;
- int test_edge_deletion =
1
;
+ int test_node_deletion =
0
;
+ int test_edge_deletion =
0
;
int test_export_xml = 1;
int test_export_dot = 1;
int test_export_length = 1;
int test_export_xml = 1;
int test_export_dot = 1;
int test_export_length = 1;
@@
-121,7
+127,7
@@
void test(char *graph_file)
while (xbt_dynar_length(nodes))
xbt_graph_free_node(graph,
*((xbt_node_t *) xbt_dynar_get_ptr(nodes, 0)),
while (xbt_dynar_length(nodes))
xbt_graph_free_node(graph,
*((xbt_node_t *) xbt_dynar_get_ptr(nodes, 0)),
- free, NULL);
+ free
_label
, NULL);
INFO2("After Node deletion: %lu nodes, %lu edges",
xbt_dynar_length(nodes), xbt_dynar_length(edges));
}
INFO2("After Node deletion: %lu nodes, %lu edges",
xbt_dynar_length(nodes), xbt_dynar_length(edges));
}
@@
-142,9
+148,13
@@
void test(char *graph_file)
xbt_dynar_length(nodes), xbt_dynar_length(edges));
}
xbt_dynar_length(nodes), xbt_dynar_length(edges));
}
- xbt_graph_free_graph(graph,
NULL
, NULL, NULL);
+ xbt_graph_free_graph(graph,
free_label
, NULL, NULL);
}
}
+#ifdef __BORLANDC__
+#pragma argsused
+#endif
+
int main(int argc, char **argv) {
xbt_init(&argc, argv);
if (argc == 1) {
int main(int argc, char **argv) {
xbt_init(&argc, argv);
if (argc == 1) {