Update to cope with testsuite/Makefile.am modifications.

[simgrid.git] / testsuite / xbt / heap_bench.c

diff --git a/testsuite/xbt/heap_bench.c b/testsuite/xbt/heap_bench.c
index ea737a9..ca64029 100644 (file)
--- a/testsuite/xbt/heap_bench.c
+++ b/testsuite/xbt/heap_bench.c
@@ -6,6 +6,10 @@
 
 /* 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. */
+ 
+ #ifdef __BORLANDC__
+ #pragma hdrstop
+ #endif
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -15,9 +19,16 @@
 
 #define MAX_TEST 1000000
 
+#ifdef __BORLANDC__
+int _XBT_CALL compare_double(const void *a, const void *b);
+#else
 int compare_double(const void *a, const void *b);
+#endif
+
 void test_heap_validity(int size);
 void test_heap_mean_operation(int size);
+void test_reset_heap(xbt_heap_t heap,int size);
+
 
 int compare_double(const void *a, const void *b)
 {
@@ -70,21 +81,41 @@ void test_heap_mean_operation(int size)
   for (i = 0; i < size; i++)
     xbt_heap_push(heap, NULL, (10.0 * rand() / (RAND_MAX + 1.0)));
   date = gras_os_time() * 1000000 - date;
-  printf("Creation time  %d size heap : %lg\n", size, date);
+  printf("Creation time  %d size heap : %g\n", size, date);
 
   date = gras_os_time() * 1000000;
   for (j = 0; j < MAX_TEST; j++) {
+    
+    if(!(j%size) && j)
+      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;
-  printf("Mean access time for a %d size heap : %lg\n", size,
+  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)
+{
+  int i;
+  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)));
+  }
+
+}
+
+#ifdef __BORLANDC__
+#pragma argsused
+#endif 
+
 int main(int argc, char **argv)
 {
   int size;