X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9fdceb6aa2b5c38ac0d7701b1fe38542a63cbc04..e858b2e4c1677fa20cc4cb25b8a4e5e874ef617a:/testsuite/xbt/graphxml_usage.c

diff --git a/testsuite/xbt/graphxml_usage.c b/testsuite/xbt/graphxml_usage.c
index 9e0a3c96ae..a8f82b88eb 100644
--- a/testsuite/xbt/graphxml_usage.c
+++ b/testsuite/xbt/graphxml_usage.c
@@ -1,11 +1,19 @@
-/*      $Id$      */
-
 /* A few basic tests for the graphxml library                               */
 
-/* Copyright (c) 2006 Darina Dimitrova, Arnaud Legrand. All rights reserved.*/
+/* Copyright (c) 2006, 2007, 2008, 2009, 2010. 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. */
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#include <stdio.h>
+
+#ifdef _MSC_VER
+#define snprintf	_snprintf
+#endif
 
 #include "xbt/module.h"
 #include "xbt/sysdep.h"
@@ -15,13 +23,16 @@
 
 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)
+                                 const char *data)
 {
   char *lbl = xbt_strdup(label);
   return lbl;
 }
 
+#define free_label free
+
 static const char *node_name(xbt_node_t n)
 {
   return xbt_graph_node_get_data(n);
@@ -30,32 +41,29 @@ static const char *node_name(xbt_node_t n)
 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_shortest_paths = 1;
   int test_topo_sort = 1;
 
-  int i, j;
+  unsigned long i, j;
   unsigned long n;
 
   xbt_dynar_t edges = NULL;
   xbt_dynar_t nodes = NULL;
-  xbt_node_t *sorted = NULL;
-  xbt_node_t *route = NULL;
 
   xbt_graph_t graph =
       xbt_graph_read(graph_file, &node_label_and_data, NULL);
-  double *adj = NULL;
 
   n = xbt_dynar_length(xbt_graph_get_nodes(graph));
 
   if (test_export_xml) {
     INFO0("---- Testing XML export. Exporting to testgraph.xml ----");
     xbt_graph_export_graphxml(graph, "testgraph.xml", NULL, NULL, NULL,
-			      NULL);
+                              NULL);
   }
   if (test_export_dot) {
     INFO0("---- Testing GraphViz export. Exporting to testgraph.dot ----");
@@ -64,12 +72,14 @@ void test(char *graph_file)
 
   if (test_export_length) {
     char *buf = NULL;
+    double *adj = NULL;
+
     INFO0("---- Dumping Edge lengths ----");
     adj = xbt_graph_get_length_matrix(graph);
-    buf = calloc(n * 20, sizeof(char));
+    buf = xbt_new0(char, n * 20);
     for (i = 0; i < n; i++) {
       for (j = 0; j < n; j++) {
-	sprintf(buf + strlen(buf), "%le\t", adj[i * n + j]);
+        sprintf(buf + strlen(buf), "%le\t", adj[i * n + j]);
       }
       INFO1("%s", buf);
       buf[0] = '\000';
@@ -80,14 +90,16 @@ void test(char *graph_file)
 
   if (test_shortest_paths) {
     char *buf = NULL;
+    xbt_node_t *route = NULL;
+
     INFO0("---- Testing Shortest Paths ----");
     route = xbt_graph_shortest_paths(graph);
-    buf = calloc(n * 40, sizeof(char));
+    buf = xbt_new0(char, n * 40);
     for (i = 0; i < n; i++) {
       for (j = 0; j < n; j++) {
-	if (route[i * n + j])
-	  snprintf(buf+strlen(buf), 40, "%s\t", 
-		   node_name(route[i * n + j]));
+        if (route[i * n + j])
+          snprintf(buf + strlen(buf), 40, "%s\t",
+                   node_name(route[i * n + j]));
       }
       INFO1("%s", buf);
       buf[0] = '\000';
@@ -97,11 +109,13 @@ void test(char *graph_file)
   }
 
   if (test_topo_sort) {
+    xbt_node_t *sorted = NULL;
+
     INFO0("---- Testing Topological Sort ----");
     sorted = xbt_graph_topo_sort(graph);
     for (i = 0; i < n; i++) {
       if (sorted[i]) {
-	INFO3("sorted[%d] = %s (%p)", i, node_name(sorted[i]), sorted[i]);
+        INFO3("sorted[%lu] = %s (%p)", i, node_name(sorted[i]), sorted[i]);
       }
     }
     free(sorted);
@@ -113,14 +127,14 @@ void test(char *graph_file)
     nodes = xbt_graph_get_nodes(graph);
     edges = xbt_graph_get_edges(graph);
     INFO2("Before Node deletion: %lu nodes, %lu edges",
-	  xbt_dynar_length(nodes), xbt_dynar_length(edges));
+          xbt_dynar_length(nodes), xbt_dynar_length(edges));
 
     while (xbt_dynar_length(nodes))
       xbt_graph_free_node(graph,
-			  *((xbt_node_t *) xbt_dynar_get_ptr(nodes, 0)),
-			  NULL, NULL);
+                          *((xbt_node_t *) xbt_dynar_get_ptr(nodes, 0)),
+                          free_label, NULL);
     INFO2("After Node deletion:  %lu nodes, %lu edges",
-	  xbt_dynar_length(nodes), xbt_dynar_length(edges));
+          xbt_dynar_length(nodes), xbt_dynar_length(edges));
   }
 
   if (test_edge_deletion) {
@@ -128,21 +142,26 @@ void test(char *graph_file)
     nodes = xbt_graph_get_nodes(graph);
     edges = xbt_graph_get_edges(graph);
     INFO2("Before Edge deletion: %lu nodes, %lu edges",
-	  xbt_dynar_length(nodes), xbt_dynar_length(edges));
+          xbt_dynar_length(nodes), xbt_dynar_length(edges));
 
     while (xbt_dynar_length(edges))
       xbt_graph_free_edge(graph,
-			  *((xbt_edge_t *) xbt_dynar_get_ptr(edges, 0)),
-			  NULL);
+                          *((xbt_edge_t *) xbt_dynar_get_ptr(edges, 0)),
+                          NULL);
 
     INFO2("After Edge deletion:  %lu nodes, %lu edges",
-	  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);
 }
 
-int main(int argc, char **argv) {
+#ifdef __BORLANDC__
+#pragma argsused
+#endif
+
+int main(int argc, char **argv)
+{
   xbt_init(&argc, argv);
   if (argc == 1) {
     fprintf(stderr, "Usage : %s graph.xml\n", argv[0]);