cleanups in teshsuite/simdag/platforms, don't ask why

[simgrid.git] / teshsuite / simdag / platforms / Evaluate_parse_time.c

diff --git a/teshsuite/simdag/platforms/Evaluate_parse_time.c b/teshsuite/simdag/platforms/Evaluate_parse_time.c
index 42f2f62..e3c46a1 100644 (file)
--- a/teshsuite/simdag/platforms/Evaluate_parse_time.c
+++ b/teshsuite/simdag/platforms/Evaluate_parse_time.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2009, 2010, 2011. 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,35 +8,30 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "simdag/simdag.h"
-#include "surf/surf_private.h"
+#include "simgrid/simdag.h"
+#include "surf/surf.h"
 #include "xbt/xbt_os_time.h"
 
-extern routing_global_t global_routing;
-
 int main(int argc, char **argv)
 {
   xbt_os_timer_t timer = xbt_os_timer_new();
+  SD_init(&argc, argv);
 
-       /* initialization of SD */
-       SD_init(&argc, argv);
-
-       /* creation of the environment, timed */
-       xbt_os_timer_start(timer);
-       SD_create_environment(argv[1]);
-  xbt_os_timer_stop(timer);
+  /* creation of the environment, timed */
+  xbt_os_cputimer_start(timer);
+  SD_create_environment(argv[1]);
+  xbt_os_cputimer_stop(timer);
 
   /* Display the result and exit after cleanup */
-       printf( "%lf\n", xbt_os_timer_elapsed(timer) );
-         printf("Workstation number: %d, link number: %d\n",
-                SD_workstation_get_number(), SD_link_get_number());
-       if(argv[2]){
-               printf("Wait for %ss\n",argv[2]);
-               sleep(atoi(argv[2]));
-       }
-
-       SD_exit();
-
-       free(timer);
-       return 0;
+  printf( "%f\n", xbt_os_timer_elapsed(timer) );
+  printf("Workstation number: %zu, link number: %d\n", sg_host_count(), sg_link_count());
+  if(argv[2]){
+    printf("Wait for %ss\n",argv[2]);
+    sleep(atoi(argv[2]));
+  }
+
+  SD_exit();
+
+  free(timer);
+  return 0;
 }