X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/32f13ca1c7961662a097b1b906f589a851bb3611..15bed974d6d64a1925f914dedcc9b5cbe0e78fec:/testsuite/xbt/heap_bench.c

diff --git a/testsuite/xbt/heap_bench.c b/testsuite/xbt/heap_bench.c
index 4a7449a1a3..417f987e9e 100644
--- a/testsuite/xbt/heap_bench.c
+++ b/testsuite/xbt/heap_bench.c
@@ -1,53 +1,69 @@
+/* A few tests for the xbt_heap module                                      */
+
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* 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 <sys/time.h>
-#include "xbt_heap.h"
+#include <time.h>
+
+#include "xbt/heap.h"
+#include "gras/virtu.h"         /* time manipulation in bench */
+
+#include "xbt/sysdep.h"         /* calloc, printf */
 
 #define MAX_TEST 1000000
 
-/* 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);
-}
+#ifdef __BORLANDC__
+int _XBT_CALL compare_double(const void *a, const void *b);
+#else
+int compare_double(const void *a, const void *b);
+#endif
 
-int compare_xbt_heap_float_t (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);
+
 
-int compare_xbt_heap_float_t (const void *a, const void *b) 
+int compare_double(const void *a, const void *b)
 {
-  xbt_heap_float_t pa, pb;
+  double pa, pb;
 
-  pa=* ((xbt_heap_float_t *)a);
-  pb=* ((xbt_heap_float_t *)b);
+  pa = *((double *) a);
+  pb = *((double *) b);
 
-  if(pa>pb) return 1;
-  if(pa==pb) return 0;
+  if (pa > pb)
+    return 1;
+  if (pa == pb)
+    return 0;
   return -1;
 }
 
 void test_heap_validity(int size)
 {
-  xbt_heap_t heap = xbt_heap_new(size,NULL);
-  xbt_heap_float_t *tab = calloc(size,sizeof(xbt_heap_float_t));
+  xbt_heap_t heap = xbt_heap_new(size, NULL);
+  double *tab = xbt_new0(double, size);
+
   int i;
 
-  for(i=0; i<size; i++) {
-    tab[i] = (10.0*rand()/(RAND_MAX+1.0));
-    xbt_heap_push(heap, NULL, tab[i]);
+  for (i = 0; i < size; i++) {
+    tab[i] = (double) (10.0 * rand() / (RAND_MAX + 1.0));
+    xbt_heap_push(heap, NULL, (double) tab[i]);
   }
 
-  qsort(tab, size, sizeof(xbt_heap_float_t), compare_xbt_heap_float_t);
+  qsort(tab, size, sizeof(double), compare_double);
 
-  for(i=0; i<size; i++) { 
-    /*     printf(XBT_HEAP_FLOAT_T " ", xbt_heap_maxkey(heap)); */
-    if(xbt_heap_maxkey(heap)!= tab[i]) {
-      fprintf(stderr,"Problem !\n");
+  for (i = 0; i < size; i++) {
+    /*     printf("%lg" " ", xbt_heap_maxkey(heap)); */
+    if (xbt_heap_maxkey(heap) != tab[i]) {
+      fprintf(stderr, "Problem !\n");
       exit(1);
     }
     xbt_heap_pop(heap);
@@ -59,33 +75,55 @@ void test_heap_validity(int size)
 
 void test_heap_mean_operation(int size)
 {
-  xbt_heap_t heap = xbt_heap_new(size,NULL);
-  xbt_heap_float_t val;  
-  long date = 0;
+  xbt_heap_t heap = xbt_heap_new(size, NULL);
+  double val;
+  double date = 0;
   int i, j;
 
-  date = us_time();
-  for(i=0; i<size; i++)
-    xbt_heap_push(heap, NULL, (10.0*rand()/(RAND_MAX+1.0)));
-  date = us_time()-date;
-  printf("Creation time  %d size heap : %g\n", size, 0.0+date);
+  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 = us_time();
-  for(j=0; j<MAX_TEST; j++) {
-    val=xbt_heap_maxkey(heap);
+  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);
+    xbt_heap_push(heap, NULL, 3.0 * val);
   }
-  date = us_time()-date;
-  printf("Mean access time for a %d size heap : %g\n", size, date*1.0/(MAX_TEST+0.0));
+  date = gras_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);  
+  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;
-  for(size = 100; size < 10000; size*=10) {
+  for (size = 100; size < 10000; size *= 10) {
     test_heap_validity(size);
     test_heap_mean_operation(size);
   }