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
Fix spacing issues in tesh files.
[simgrid.git]
/
testsuite
/
xbt
/
heap_bench.c
diff --git
a/testsuite/xbt/heap_bench.c
b/testsuite/xbt/heap_bench.c
index
cfeff7d
..
5cca0cb
100644
(file)
--- a/
testsuite/xbt/heap_bench.c
+++ b/
testsuite/xbt/heap_bench.c
@@
-1,22
+1,21
@@
-/* $Id$ */
-
/* A few tests for the xbt_heap module */
/* A few tests for the xbt_heap module */
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004-2010, 2012, 2013. 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. */
/* 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
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
#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
#define MAX_TEST 1000000
@@
-28,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)
@@
-48,19
+47,19
@@
int compare_double(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);
- double *tab = xbt_new0(double,size);
+ double *tab = xbt_new0(double,
size);
int i;
for (i = 0; i < size; i++) {
int 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]);
+ tab[i] = (double)
(10.0 * rand() / (RAND_MAX + 1.0));
+ xbt_heap_push(heap, NULL, (double)
tab[i]);
}
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);
@@
-79,45
+78,45
@@
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++) {
for (j = 0; j < MAX_TEST; j++) {
-
- if
(!(j%
size) && j)
- test_reset_heap(
heap,
size);
-
+
+ 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);
}
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,
printf("Mean access time for a %d size heap : %g\n", size,
- date * 1.0 / (MAX_TEST + 0.0));
+
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)
+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++){
- 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)));
}
}
#ifdef __BORLANDC__
#pragma argsused
}
}
#ifdef __BORLANDC__
#pragma argsused
-#endif
+#endif
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{