X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c354c48ec90c997cc7213ce96ca97d882934166..06f0d1d110338b3eb607633583183a076f7d2722:/testsuite/surf/maxmin_bench.c

diff --git a/testsuite/surf/maxmin_bench.c b/testsuite/surf/maxmin_bench.c
index 0e4456ac32..84c10334c6 100644
--- a/testsuite/surf/maxmin_bench.c
+++ b/testsuite/surf/maxmin_bench.c
@@ -10,23 +10,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "surf/maxmin.h"
-#include <sys/time.h>
+#include "xbt/sysdep.h"		/* time manipulation for benchmarking */
 
-long date;
+double date;
 
-/* Pour le bench */
-long us_time(void);
-long us_time(void)
-{
-  struct timeval start;
-  gettimeofday(&start, NULL);
-
-  return (start.tv_sec * 1000000 + start.tv_usec);
-}
-
-
-xbt_maxmin_float_t float_random(xbt_maxmin_float_t max);
-xbt_maxmin_float_t float_random(xbt_maxmin_float_t max)
+double float_random(double max);
+double float_random(double max)
 {
   return ((max * rand()) / (RAND_MAX + 1.0));
 }
@@ -67,9 +56,9 @@ void test(int nb_cnst, int nb_var, int nb_elem)
     }
   }
 
-  date = us_time();
+  date = xbt_os_time() * 1000000;
   lmm_solve(Sys);
-  date = us_time() - date;
+  date = xbt_os_time() * 1000000 - date;
 
   lmm_system_free(Sys);
   free(cnst);
@@ -83,10 +72,10 @@ int main(int argc, char **argv)
   int nb_cnst = 2000;
   int nb_var = 2000;
   int nb_elem = 20;
-  date = us_time();
+  date = xbt_os_time() * 1000000;
   test(nb_cnst, nb_var, nb_elem);
   printf("One shot execution time for a total of %d constraints, "
-	 "%d variables with %d active constraint each : %ld microsecondes \n",
+	 "%d variables with %d active constraint each : %lg microsecondes \n",
 	 nb_cnst, nb_var, nb_elem, date);
   return 0;
 }