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
Use a smaller stack for stack-overflow test.
[simgrid.git]
/
testsuite
/
xbt
/
heap_bench.c
diff --git
a/testsuite/xbt/heap_bench.c
b/testsuite/xbt/heap_bench.c
index
ad08711
..
a6d9157
100644
(file)
--- a/
testsuite/xbt/heap_bench.c
+++ b/
testsuite/xbt/heap_bench.c
@@
-1,6
+1,6
@@
/* A few tests for the xbt_heap module */
/* A few tests for the xbt_heap module */
-/* Copyright (c) 2004
, 2005, 2006, 2007, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2004
-2010, 2012-2014
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-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
@@
-29,7
+27,7
@@
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);
-void test_reset_heap(xbt_heap_t heap, int size);
+void test_reset_heap(xbt_heap_t
*
heap, int size);
int compare_double(const void *a, const void *b)
int compare_double(const void *a, const void *b)
@@
-61,7
+59,7
@@
void test_heap_validity(int size)
qsort(tab, size, sizeof(double), compare_double);
for (i = 0; i < size; i++) {
qsort(tab, size, sizeof(double), compare_double);
for (i = 0; i < size; i++) {
- /* printf("%
l
g" " ", xbt_heap_maxkey(heap)); */
+ /* printf("%g" " ", 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);
@@
-80,38
+78,38
@@
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)
- test_reset_heap(heap, size);
+ test_reset_heap(
&
heap, size);
val = xbt_heap_maxkey(heap);
xbt_heap_pop(heap);
xbt_heap_push(heap, NULL, 3.0 * val);
}
val = xbt_heap_maxkey(heap);
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));
xbt_heap_free(heap);
}
printf("Mean access time for a %d size heap : %g\n", size,
date * 1.0 / (MAX_TEST + 0.0));
xbt_heap_free(heap);
}
-void test_reset_heap(xbt_heap_t heap, int size)
+void test_reset_heap(xbt_heap_t
*
heap, int size)
{
int i;
{
int i;
- xbt_heap_free(heap);
- heap = xbt_heap_new(size, NULL);
+ xbt_heap_free(
*
heap);
+
*
heap = xbt_heap_new(size, NULL);
for (i = 0; i < size; i++) {
for (i = 0; i < size; i++) {
- xbt_heap_push(heap, NULL, (10.0 * rand() / (RAND_MAX + 1.0)));
+ xbt_heap_push(
*
heap, NULL, (10.0 * rand() / (RAND_MAX + 1.0)));
}
}
}
}