X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/642bd255bc2ae9195c956807f6061246f6cb0f65..71ea8b52194dae67bc4c34179b8065f8ff8ec2ed:/tools/graphicator/graphicator.c

diff --git a/tools/graphicator/graphicator.c b/tools/graphicator/graphicator.c
index 030f7cdfd2..bffc21a722 100644
--- 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-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -8,54 +8,22 @@
 #include <unistd.h>
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-#include <math.h>
-
-
-#include "simdag/simdag.h"
-#include "xbt/log.h"
-#include "xbt/dict.h"
-#include "xbt/ex.h"
+#include "simgrid/msg.h"
 #include "xbt/graph.h"
-#include "surf/surf.h"
-#include "surf/surf_private.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(graphicator,
                              "Graphicator Logging System");
 
 int main(int argc, char **argv)
 {
-  char *platformFile = NULL;
-  char *graphvizFile = NULL;
-
-  xbt_ex_t e;
-
-  MSG_global_init(&argc, argv);
-
-  if (argc < 3){
-    XBT_INFO("Usage: %s <platform_file.xml> <graphviz_file.dot>", argv[0]);
-    return 1;
-  }
-  platformFile = argv[1];
-  graphvizFile = argv[2];
-
-  TRY {
-    MSG_create_environment(platformFile);
-  } CATCH(e) {
-    xbt_die("Error while loading %s: %s",platformFile,e.msg);
-  }
-
-  //creating the graph structure
-  xbt_graph_t graph = TRACE_platform_graph();
-  if (graph == NULL){
-    XBT_INFO ("%s expects --cfg=tracing:1", argv[0]);
-  }else{
-    xbt_graph_export_graphviz(graph, graphvizFile, &TRACE_node_name, NULL);
-    XBT_INFO ("Output is in file %s", graphvizFile);
-  }
-  MSG_clean();
+  XBT_LOG_CONNECT(graphicator);
+  MSG_init(&argc, argv);
+
+  xbt_assert(argc == 3, "Usage: %s <platform_file.xml> <graphviz_file.dot>", argv[0]);
+
+  MSG_create_environment(argv[1]);
+  int status = TRACE_platform_graph_export_graphviz (argv[2]);
+
+  xbt_assert(status != 0, "%s expects --cfg=tracing:yes --cfg=tracing/platform:yes", argv[0]);
   return 0;
 }