A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
peigne la girafe
[simgrid.git]
/
testsuite
/
xbt
/
heap_bench.c
diff --git
a/testsuite/xbt/heap_bench.c
b/testsuite/xbt/heap_bench.c
index
fe6866e
..
5f3e1c4
100644
(file)
--- a/
testsuite/xbt/heap_bench.c
+++ b/
testsuite/xbt/heap_bench.c
@@
-1,37
+1,30
@@
+/* $Id$ */
+
/* A few tests for the xbt_heap module */
/* A few tests for the xbt_heap module */
-/*
Authors: Arnaud Legrand
*/
+/*
Copyright (c) 2004 Arnaud Legrand. All rights reserved.
*/
/* This program is free software; you can redistribute it and/or modify it
/* 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. */
+
*
under the terms of the license (GNU LGPL) which comes with this package. */
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
-#include <sys/time.h>
+
#include "xbt/heap.h"
#include "xbt/heap.h"
+#include "gras/virtu.h" /* time manipulation in bench */
#define MAX_TEST 1000000
#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);
-}
-
-int compare_xbt_heap_float_t(const void *a, const void *b);
+int compare_double(const void *a, const void *b);
void test_heap_validity(int size);
void test_heap_mean_operation(int size);
void test_heap_validity(int size);
void test_heap_mean_operation(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 1;
@@
-43,7
+36,7
@@
int compare_xbt_heap_float_t(const void *a, const void *b)
void test_heap_validity(int size)
{
xbt_heap_t heap = xbt_heap_new(size, NULL);
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
));
+
double *tab = calloc(size, sizeof(double
));
int i;
for (i = 0; i < size; i++) {
int i;
for (i = 0; i < size; i++) {
@@
-51,10
+44,10
@@
void test_heap_validity(int size)
xbt_heap_push(heap, NULL, tab[i]);
}
xbt_heap_push(heap, NULL, 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++) {
for (i = 0; i < size; i++) {
- /* printf(
XBT_HEAP_FLOAT_T
" ", xbt_heap_maxkey(heap)); */
+ /* printf(
"%lg"
" ", xbt_heap_maxkey(heap)); */
if (xbt_heap_maxkey(heap) != tab[i]) {
fprintf(stderr, "Problem !\n");
exit(1);
if (xbt_heap_maxkey(heap) != tab[i]) {
fprintf(stderr, "Problem !\n");
exit(1);
@@
-69,23
+62,23
@@
void test_heap_validity(int size)
void test_heap_mean_operation(int size)
{
xbt_heap_t heap = xbt_heap_new(size, NULL);
void test_heap_mean_operation(int size)
{
xbt_heap_t heap = xbt_heap_new(size, NULL);
-
xbt_heap_float_t
val;
-
long
date = 0;
+
double
val;
+
double
date = 0;
int i, j;
int i, j;
- date =
us_time()
;
+ date =
gras_os_time() * 1000000
;
for (i = 0; i < size; i++)
xbt_heap_push(heap, NULL, (10.0 * rand() / (RAND_MAX + 1.0)));
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
- date;
+ printf("Creation time %d size heap : %g\n", size, date);
- date =
us_time()
;
+ date =
gras_os_time() * 1000000
;
for (j = 0; j < MAX_TEST; j++) {
val = xbt_heap_maxkey(heap);
xbt_heap_pop(heap);
xbt_heap_push(heap, NULL, 3.0 * val);
}
for (j = 0; j < MAX_TEST; j++) {
val = xbt_heap_maxkey(heap);
xbt_heap_pop(heap);
xbt_heap_push(heap, NULL, 3.0 * val);
}
- date =
us_time()
- date;
+ 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));
printf("Mean access time for a %d size heap : %g\n", size,
date * 1.0 / (MAX_TEST + 0.0));