X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/30fdbb39b0686dcf4a0368e7aa4f8f0d3f920caf..4b8be43e2c03939bc780b6112d841d8b839a79bb:/tools/graphicator/graphicator.c

diff --git a/tools/graphicator/graphicator.c b/tools/graphicator/graphicator.c
index 2f1a8878b8..a32e74ce1e 100644
--- a/tools/graphicator/graphicator.c
+++ b/tools/graphicator/graphicator.c
@@ -1,44 +1,24 @@
-/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2008-2015. 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. */
 
-#ifndef _XBT_WIN32
-#include <unistd.h>
-#endif
-
-#include "msg/msg.h"
+#include "simgrid/msg.h"
 #include "xbt/graph.h"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(graphicator,
-                             "Graphicator Logging System");
+XBT_LOG_NEW_DEFAULT_CATEGORY(graphicator, "Graphicator Logging System");
 
 int main(int argc, char **argv)
 {
-#ifdef HAVE_TRACING
-  MSG_global_init(&argc, argv);
+  XBT_LOG_CONNECT(graphicator);
+  MSG_init(&argc, argv);
 
-  if (argc < 3){
-    XBT_INFO("Usage: %s <platform_file.xml> <graphviz_file.dot>", argv[0]);
-    return 1;
-  }
-  char *platformFile = argv[1];
-  char *graphvizFile = argv[2];
+  xbt_assert(argc == 3, "Usage: %s <platform_file.xml> <graphviz_file.dot>", argv[0]);
 
-  MSG_create_environment(platformFile);
+  MSG_create_environment(argv[1]);
+  int status = TRACE_platform_graph_export_graphviz (argv[2]);
 
-  //creating the graph structure
-  xbt_graph_t graph = TRACE_platform_graph();
-  if (graph == NULL){
-    XBT_INFO ("%s expects --cfg=tracing:1", argv[0]);
-  }else{
-    TRACE_platform_graph_export_graphviz (graph, graphvizFile);
-    XBT_INFO ("Output is in file %s", graphvizFile);
-  }
-  MSG_clean();
-#else
-  XBT_INFO ("works only if simgrid has tracing enabled.");
-#endif
+  xbt_assert(status != 0, "%s expects --cfg=tracing:yes --cfg=tracing/platform:yes", argv[0]);
   return 0;
 }