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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
testsuite
/
xbt
/
heap_bench.c
diff --git
a/testsuite/xbt/heap_bench.c
b/testsuite/xbt/heap_bench.c
index
417f987
..
b873e1b
100644
(file)
--- a/
testsuite/xbt/heap_bench.c
+++ b/
testsuite/xbt/heap_bench.c
@@
-12,11
+12,9
@@
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
-#include <time.h>
+#include <
xbt/xbt_os_
time.h>
#include "xbt/heap.h"
#include "xbt/heap.h"
-#include "gras/virtu.h" /* time manipulation in bench */
-
#include "xbt/sysdep.h" /* calloc, printf */
#define MAX_TEST 1000000
#include "xbt/sysdep.h" /* calloc, printf */
#define MAX_TEST 1000000
@@
-80,14
+78,14
@@
void test_heap_mean_operation(int size)
double date = 0;
int i, j;
double date = 0;
int i, j;
- date =
gras
_os_time() * 1000000;
+ date =
xbt
_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 =
gras
_os_time() * 1000000 - date;
+ date =
xbt
_os_time() * 1000000 - date;
printf("Creation time %d size heap : %g\n", size, date);
printf("Creation time %d size heap : %g\n", size, date);
- date =
gras
_os_time() * 1000000;
+ date =
xbt
_os_time() * 1000000;
for (j = 0; j < MAX_TEST; j++) {
if (!(j % size) && j)
for (j = 0; j < MAX_TEST; j++) {
if (!(j % size) && j)
@@
-97,7
+95,7
@@
void test_heap_mean_operation(int size)
xbt_heap_pop(heap);
xbt_heap_push(heap, NULL, 3.0 * val);
}
xbt_heap_pop(heap);
xbt_heap_push(heap, NULL, 3.0 * val);
}
- date =
gras
_os_time() * 1000000 - date;
+ date =
xbt
_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));