X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..fb77c22c9319b16443e3035d885b9b87643a3ed7:/testsuite/xbt/heap_bench.c

diff --git a/testsuite/xbt/heap_bench.c b/testsuite/xbt/heap_bench.c
index ad0871171b..5cca0cb233 100644
--- a/testsuite/xbt/heap_bench.c
+++ b/testsuite/xbt/heap_bench.c
@@ -1,6 +1,6 @@
 /* A few tests for the xbt_heap module                                      */
 
-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2010, 2012, 2013. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -12,11 +12,9 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <time.h>
+#include <xbt/xbt_os_time.h>
 
 #include "xbt/heap.h"
-#include "gras/virtu.h"         /* time manipulation in bench */
-
 #include "xbt/sysdep.h"         /* calloc, printf */
 
 #define MAX_TEST 1000000
@@ -29,7 +27,7 @@ int compare_double(const void *a, const void *b);
 
 void test_heap_validity(int size);
 void test_heap_mean_operation(int size);
-void test_reset_heap(xbt_heap_t heap, int size);
+void test_reset_heap(xbt_heap_t * heap, int size);
 
 
 int compare_double(const void *a, const void *b)
@@ -61,7 +59,7 @@ void test_heap_validity(int size)
   qsort(tab, size, sizeof(double), compare_double);
 
   for (i = 0; i < size; i++) {
-    /*     printf("%lg" " ", xbt_heap_maxkey(heap)); */
+    /*     printf("%g" " ", xbt_heap_maxkey(heap)); */
     if (xbt_heap_maxkey(heap) != tab[i]) {
       fprintf(stderr, "Problem !\n");
       exit(1);
@@ -80,38 +78,38 @@ void test_heap_mean_operation(int size)
   double date = 0;
   int i, j;
 
-  date = gras_os_time() * 1000000;
+  date = xbt_os_time() * 1000000;
   for (i = 0; i < size; i++)
     xbt_heap_push(heap, NULL, (10.0 * rand() / (RAND_MAX + 1.0)));
 
-  date = gras_os_time() * 1000000 - date;
+  date = xbt_os_time() * 1000000 - date;
   printf("Creation time  %d size heap : %g\n", size, date);
 
-  date = gras_os_time() * 1000000;
+  date = xbt_os_time() * 1000000;
   for (j = 0; j < MAX_TEST; j++) {
 
     if (!(j % size) && j)
-      test_reset_heap(heap, size);
+      test_reset_heap(&heap, size);
 
     val = xbt_heap_maxkey(heap);
     xbt_heap_pop(heap);
     xbt_heap_push(heap, NULL, 3.0 * val);
   }
-  date = gras_os_time() * 1000000 - date;
+  date = xbt_os_time() * 1000000 - date;
   printf("Mean access time for a %d size heap : %g\n", size,
          date * 1.0 / (MAX_TEST + 0.0));
 
   xbt_heap_free(heap);
 }
 
-void test_reset_heap(xbt_heap_t heap, int size)
+void test_reset_heap(xbt_heap_t * heap, int size)
 {
   int i;
-  xbt_heap_free(heap);
-  heap = xbt_heap_new(size, NULL);
+  xbt_heap_free(*heap);
+  *heap = xbt_heap_new(size, NULL);
 
   for (i = 0; i < size; i++) {
-    xbt_heap_push(heap, NULL, (10.0 * rand() / (RAND_MAX + 1.0)));
+    xbt_heap_push(*heap, NULL, (10.0 * rand() / (RAND_MAX + 1.0)));
   }
 
 }