Fix commit f48cc395ebecc84d865ab551a672d2a2358624e5

[simgrid.git] / testsuite / xbt / graphxml_usage.c

diff --git a/testsuite/xbt/graphxml_usage.c b/testsuite/xbt/graphxml_usage.c
index e6450c0..e49db05 100644 (file)
--- a/testsuite/xbt/graphxml_usage.c
+++ b/testsuite/xbt/graphxml_usage.c
@@ -1,16 +1,20 @@
-/*      $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
- 
+#pragma hdrstop
+#endif
+
 #include <stdio.h>
+
+#ifdef _MSC_VER
+#define snprintf  _snprintf
+#endif
+
 #include "xbt/module.h"
 #include "xbt/sysdep.h"
 #include "xbt/graph.h"
@@ -21,11 +25,12 @@ 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)
@@ -44,7 +49,7 @@ void test(char *graph_file)
   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;
@@ -56,12 +61,12 @@ void test(char *graph_file)
   n = xbt_dynar_length(xbt_graph_get_nodes(graph));
 
   if (test_export_xml) {
-    INFO0("---- Testing XML export. Exporting to testgraph.xml ----");
+    XBT_INFO("---- 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 ----");
+    XBT_INFO("---- Testing GraphViz export. Exporting to testgraph.dot ----");
     xbt_graph_export_graphviz(graph, "testgraph.dot", node_name, NULL);
   }
 
@@ -69,14 +74,14 @@ void test(char *graph_file)
     char *buf = NULL;
     double *adj = NULL;
 
-    INFO0("---- Dumping Edge lengths ----");
+    XBT_INFO("---- 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);
+      XBT_INFO("%s", buf);
       buf[0] = '\000';
     }
     free(buf);
@@ -86,17 +91,17 @@ void test(char *graph_file)
   if (test_shortest_paths) {
     char *buf = NULL;
     xbt_node_t *route = NULL;
-  
-    INFO0("---- Testing Shortest Paths ----");
+
+    XBT_INFO("---- 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);
+      XBT_INFO("%s", buf);
       buf[0] = '\000';
     }
     free(buf);
@@ -106,11 +111,11 @@ void test(char *graph_file)
   if (test_topo_sort) {
     xbt_node_t *sorted = NULL;
 
-    INFO0("---- Testing Topological Sort ----");
+    XBT_INFO("---- 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]);
+        XBT_INFO("sorted[%lu] = %s (%p)", i, node_name(sorted[i]), sorted[i]);
       }
     }
     free(sorted);
@@ -118,44 +123,46 @@ void test(char *graph_file)
 
 
   if (test_node_deletion) {
-    INFO0("---- Testing Node Deletion ----");
+    XBT_INFO("---- Testing Node Deletion ----");
     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_INFO("Before Node deletion: %lu nodes, %lu edges",
+          xbt_dynar_length(nodes), xbt_dynar_length(edges));
 
-    while (xbt_dynar_length(nodes))
+    while (!xbt_dynar_is_empty(nodes))
       xbt_graph_free_node(graph,
-                         *((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_node_t *) xbt_dynar_get_ptr(nodes, 0)),
+                          free_label, NULL);
+    XBT_INFO("After Node deletion:  %lu nodes, %lu edges",
+          xbt_dynar_length(nodes), xbt_dynar_length(edges));
   }
 
   if (test_edge_deletion) {
-    INFO0("---- Testing Edge Deletion ----");
+    XBT_INFO("---- Testing Edge Deletion ----");
     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_INFO("Before Edge deletion: %lu nodes, %lu edges",
+          xbt_dynar_length(nodes), xbt_dynar_length(edges));
 
-    while (xbt_dynar_length(edges))
+    while (!xbt_dynar_is_empty(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_INFO("After Edge deletion:  %lu nodes, %lu edges",
+          xbt_dynar_length(nodes), xbt_dynar_length(edges));
   }
 
   xbt_graph_free_graph(graph, free_label, NULL, NULL);
+
 }
 
 #ifdef __BORLANDC__
 #pragma argsused
-#endif 
+#endif
 
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
   xbt_init(&argc, argv);
   if (argc == 1) {
     fprintf(stderr, "Usage : %s graph.xml\n", argv[0]);
@@ -163,6 +170,5 @@ int main(int argc, char **argv) {
     return 1;
   }
   test(argv[1]);
-
   return 0;
 }