X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39b6ed28636c4d67a0127d8526bf10dbc212cdc9..346c06db41ebb088e88351d8381d0c232d2ddbb5:/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 3340d38b2b..9b822dd4db 100644
--- 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. 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
@@ -10,53 +10,33 @@
 #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;
+extern routing_platf_t routing_platf;
 
 int main(int argc, char **argv)
 {
-	struct timespec start, stop;
-	double accum;
+  xbt_os_timer_t timer = xbt_os_timer_new();
 
-	/* initialisation of SD */
+	/* initialization of SD */
 	SD_init(&argc, argv);
 
-#if _POSIX_TIMERS > 0
-	if( clock_gettime( CLOCK_REALTIME, &start) == -1 ) {
-	perror( "clock gettime" );
-	return EXIT_FAILURE;
-	}
-#else
-      struct timeval tv;
-      gettimeofday(&tv, NULL);
-      start.tv_sec = tv.tv_sec;
-      start.tv_nsec = tv.tv_usec*1000;
-#endif
-	/* creation of the environment */
+	/* creation of the environment, timed */
+	xbt_os_timer_start(timer);
 	SD_create_environment(argv[1]);
-
-#if _POSIX_TIMERS > 0
-	if( clock_gettime( CLOCK_REALTIME, &stop) == -1 ) {
-	perror( "clock gettime" );
-	return EXIT_FAILURE;
+  xbt_os_timer_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]));
 	}
-#else
-      gettimeofday(&tv, NULL);
-      stop.tv_sec = tv.tv_sec;
-      stop.tv_nsec = tv.tv_usec*1000;
-#endif
-
-	accum = ( stop.tv_sec - start.tv_sec )
-		   + (double)( stop.tv_nsec - start.tv_nsec )
-			 / (double)BILLION;
-
-	printf( "%lf\n", accum );
-
-	sleep(20);
 
 	SD_exit();
 
+	free(timer);
 	return 0;
 }