X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a7b2c32940f3fa8d68a44b4e80c55974bbe4a2c..83759160753ea6ca3fbc362cb618e6940ba3061d:/testsuite/xbt/heap_bench.c

diff --git a/testsuite/xbt/heap_bench.c b/testsuite/xbt/heap_bench.c
index b02a0f04e1..a18402bf46 100644
--- a/testsuite/xbt/heap_bench.c
+++ b/testsuite/xbt/heap_bench.c
@@ -6,19 +6,30 @@
 
 /* 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>
+#include <time.h>
 
 #include "xbt/heap.h"
 #include "gras/virtu.h"		/* time manipulation in bench */
 
 #define MAX_TEST 1000000
-#define MAX_VAL  6.01238343545777E+307
 
+#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)
 {
@@ -37,12 +48,13 @@ int compare_double(const void *a, const void *b)
 void test_heap_validity(int size)
 {
   xbt_heap_t heap = xbt_heap_new(size, NULL);
-  double *tab = calloc(size, sizeof(double));
+  double *tab = (double*)calloc(size,sizeof(double));
+
   int i;
 
   for (i = 0; i < size; i++) {
-    tab[i] = (10.0 * rand() / (RAND_MAX + 1.0));
-    xbt_heap_push(heap, NULL, tab[i]);
+    tab[i] = (double)(10.0 * rand() / (RAND_MAX + 1.0));
+    xbt_heap_push(heap, NULL, (double)tab[i]);
   }
 
   qsort(tab, size, sizeof(double), compare_double);
@@ -70,14 +82,19 @@ void test_heap_mean_operation(int size)
   date = gras_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;
   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, (val > (MAX_VAL/3.0)) ? (10.0 * rand() / (RAND_MAX + 1.0)) :(3.0 * val));
+    xbt_heap_push(heap, NULL, 3.0 * val);
   }
   date = gras_os_time() * 1000000 - date;
   printf("Mean access time for a %d size heap : %g\n", size,
@@ -86,6 +103,22 @@ void test_heap_mean_operation(int size)
   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;