X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/346c06db41ebb088e88351d8381d0c232d2ddbb5..7e952abcd08d3cdfc3a51a774c57139ce6a04712:/teshsuite/simdag/platforms/Evaluate_get_route_time.c

diff --git a/teshsuite/simdag/platforms/Evaluate_get_route_time.c b/teshsuite/simdag/platforms/Evaluate_get_route_time.c
index 6c4fda905a..89a9ba89a0 100644
--- a/teshsuite/simdag/platforms/Evaluate_get_route_time.c
+++ b/teshsuite/simdag/platforms/Evaluate_get_route_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
@@ -9,49 +9,48 @@
 
 #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"
 
 #define BILLION  1000000000L;
-extern routing_platf_t routing_platf;
 
 int main(int argc, char **argv)
 {
-	SD_workstation_t w1, w2;
-	const SD_workstation_t *workstations;
-	int i, j;
-	int list_size;
-	xbt_os_timer_t timer = xbt_os_timer_new();
+  sg_host_t w1, w2;
+  const sg_host_t *workstations;
+  int i, j;
+  int list_size;
+  xbt_os_timer_t timer = xbt_os_timer_new();
 
-	/* initialisation of SD */
-	SD_init(&argc, argv);
+  /* SD initialization */
+  SD_init(&argc, argv);
 
-	/* creation of the environment */
-	SD_create_environment(argv[1]);
+  /* creation of the environment */
+  SD_create_environment(argv[1]);
 
-	workstations = SD_workstation_get_list();
-	list_size = SD_workstation_get_number();
+  workstations = sg_host_list();
+  list_size = sg_host_count();
 
-	/* Random number initialization */
-	srand( (int) (xbt_os_time()*1000) );
+  /* Random number initialization */
+  srand( (int) (xbt_os_time()*1000) );
 
-	do{
-		i = rand()%list_size;
-		j = rand()%list_size;
-	}while(i==j);
+  do{
+    i = rand()%list_size;
+    j = rand()%list_size;
+  }while(i==j);
 
-	w1 = workstations[i];
-	w2 = workstations[j];
-	printf("%d\tand\t%d\t\t",i,j);
+  w1 = workstations[i];
+  w2 = workstations[j];
+  printf("%d\tand\t%d\t\t",i,j);
 
-	xbt_os_timer_start(timer);
-	SD_route_get_list(w1, w2);
-  xbt_os_timer_stop(timer);
+  xbt_os_cputimer_start(timer);
+  SD_route_get_list(w1, w2);
+  xbt_os_cputimer_stop(timer);
 
-	printf("%lf\n", xbt_os_timer_elapsed(timer) );
+  printf("%f\n", xbt_os_timer_elapsed(timer) );
 
-	SD_exit();
+  SD_exit();
 
-	return 0;
+  return 0;
 }