From 9b2da2dc71792c9bd255ad27c39cc3a715047d31 Mon Sep 17 00:00:00 2001 From: mquinson Date: Fri, 10 Dec 2004 11:47:34 +0000 Subject: [PATCH 1/1] Ensure portability to win32 using the gras_os_functions :) Beware, gras_os_time resolution is 1sec on win32 (and as good as gettimeofday on modern platforms) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@607 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- testsuite/surf/maxmin_bench.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/testsuite/surf/maxmin_bench.c b/testsuite/surf/maxmin_bench.c index 0e4456ac32..97da9ef926 100644 --- a/testsuite/surf/maxmin_bench.c +++ b/testsuite/surf/maxmin_bench.c @@ -10,20 +10,9 @@ #include #include #include "surf/maxmin.h" -#include - -long 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); -} +#include "gras/virtu.h" /* time manipulation for benchmarking */ +double date; xbt_maxmin_float_t float_random(xbt_maxmin_float_t max); xbt_maxmin_float_t float_random(xbt_maxmin_float_t max) @@ -67,9 +56,9 @@ void test(int nb_cnst, int nb_var, int nb_elem) } } - date = us_time(); + date = gras_os_time(); lmm_solve(Sys); - date = us_time() - date; + date = gras_os_time() - 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 = gras_os_time(); 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 : %f secondes \n", nb_cnst, nb_var, nb_elem, date); return 0; } -- 2.20.1