Merge branch 'mc' into mc++

[simgrid.git] / tools / graphicator / graphicator.c

diff --git a/tools/graphicator/graphicator.c b/tools/graphicator/graphicator.c
index 72b8fce..5020589 100644 (file)
--- a/tools/graphicator/graphicator.c
+++ b/tools/graphicator/graphicator.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2008-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -16,8 +16,9 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(graphicator,
 
 int main(int argc, char **argv)
 {
+  XBT_LOG_CONNECT(graphicator);
 #ifdef HAVE_TRACING
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
 
   if (argc < 3){
     XBT_INFO("Usage: %s <platform_file.xml> <graphviz_file.dot>", argv[0]);
@@ -28,15 +29,10 @@ int main(int argc, char **argv)
 
   MSG_create_environment(platformFile);
 
-  //creating the graph structure
-  xbt_graph_t graph = TRACE_platform_graph();
-  if (graph == NULL){
-    XBT_INFO ("%s expects --cfg=tracing:1 --cfg=tracing/platform:1", argv[0]);
-  }else{
-    TRACE_platform_graph_export_graphviz (graph, graphvizFile);
-    XBT_INFO ("Output is in file %s", graphvizFile);
+  int status = TRACE_platform_graph_export_graphviz (graphvizFile);
+  if (status == 0){
+    XBT_INFO ("%s expects --cfg=tracing:yes --cfg=tracing/platform:yes", argv[0]);
   }
-  MSG_clean();
 #else
   XBT_INFO ("works only if simgrid was compiled with tracing enabled.");
 #endif