X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e11ca0b5306e3af1665b162e0ae4a364da8899a1..a8f91f4dae8d61a55a6bc1dba242f2a5c326b536:/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 828b4ca1ec..0994999f34 100644
--- a/teshsuite/simdag/platforms/Evaluate_get_route_time.c
+++ b/teshsuite/simdag/platforms/Evaluate_get_route_time.c
@@ -1,17 +1,17 @@
-/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2008, 2009, 2010, 2011. 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. */
 
-//for i in $(seq 1 100); do teshsuite/simdag/platforms/evaluate_get_route_time ../examples/platforms/One_cluster.xml 1 2> /tmp/null ; done
+//for i in $(seq 1 100); do teshsuite/simdag/platforms/evaluate_get_route_time ../examples/platforms/cluster.xml 1 2> /tmp/null ; done
 
 
 #include <stdio.h>
 #include <stdlib.h>
 #include "simdag/simdag.h"
 #include "surf/surf_private.h"
-#include <time.h>
+#include "xbt/xbt_os_time.h"
 
 #define BILLION  1000000000L;
 extern routing_global_t global_routing;
@@ -22,8 +22,7 @@ int main(int argc, char **argv)
 	const SD_workstation_t *workstations;
 	int i, j;
 	int list_size;
-	struct timespec start, stop;
-	double accum;
+	xbt_os_timer_t timer = xbt_os_timer_new();
 
 	/* initialisation of SD */
 	SD_init(&argc, argv);
@@ -34,12 +33,8 @@ int main(int argc, char **argv)
 	workstations = SD_workstation_get_list();
 	list_size = SD_workstation_get_number();
 
-	unsigned int seed;
-	struct timespec time;
-	clock_gettime( CLOCK_REALTIME, &time);
-	seed = time.tv_nsec;
-
-	srand(seed);
+	/* Random number initialization */
+	srand( (int) (xbt_os_time()*1000) );
 
 	do{
 		i = rand()%list_size;
@@ -50,22 +45,11 @@ int main(int argc, char **argv)
 	w2 = workstations[j];
 	printf("%d\tand\t%d\t\t",i,j);
 
-	if( clock_gettime( CLOCK_REALTIME, &start) == -1 ) {
-	perror( "clock gettime" );
-	return EXIT_FAILURE;
-	}
-
+	xbt_os_timer_start(timer);
 	SD_route_get_list(w1, w2);
+  xbt_os_timer_stop(timer);
 
-	if( clock_gettime( CLOCK_REALTIME, &stop) == -1 ) {
-	perror( "clock gettime" );
-	return EXIT_FAILURE;
-	}
-
-	accum = ( stop.tv_sec - start.tv_sec )
-	   + (double)( stop.tv_nsec - start.tv_nsec )
-		 / (double)BILLION;
-	printf("%lf\n", accum);
+	printf("%lf\n", xbt_os_timer_elapsed(timer) );
 
 	SD_exit();