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
Ensure portability to win32 using the gras_os_functions :)
[simgrid.git]
/
testsuite
/
xbt
/
heap_bench.c
diff --git
a/testsuite/xbt/heap_bench.c
b/testsuite/xbt/heap_bench.c
index
84abc4f
..
d65ede6
100644
(file)
--- a/
testsuite/xbt/heap_bench.c
+++ b/
testsuite/xbt/heap_bench.c
@@
-1,4
+1,4
@@
-/*
$Id$
*/
+/*
$Id$
*/
/* A few tests for the xbt_heap module */
/* A few tests for the xbt_heap module */
@@
-7,24
+7,14
@@
/* 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. */
/* 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. */
-
#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);
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);
void test_heap_validity(int size);
void test_heap_mean_operation(int size);
@@
-73,23
+63,23
@@
void test_heap_mean_operation(int size)
{
xbt_heap_t heap = xbt_heap_new(size, NULL);
xbt_heap_float_t val;
{
xbt_heap_t heap = xbt_heap_new(size, NULL);
xbt_heap_float_t val;
-
long
date = 0;
+
double
date = 0;
int i, j;
int i, j;
- date =
u
s_time();
+ date =
gras_o
s_time();
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 =
u
s_time() - date;
- printf("Creation time %d size heap : %
g
\n", size, 0.0 + date);
+ date =
gras_o
s_time() - date;
+ printf("Creation time %d size heap : %
f
\n", size, 0.0 + date);
- date =
u
s_time();
+ date =
gras_o
s_time();
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 =
u
s_time() - date;
- printf("Mean access time for a %d size heap : %
g
\n", size,
+ date =
gras_o
s_time() - date;
+ printf("Mean access time for a %d size heap : %
f
\n", size,
date * 1.0 / (MAX_TEST + 0.0));
xbt_heap_free(heap);
date * 1.0 / (MAX_TEST + 0.0));
xbt_heap_free(heap);