projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable Bib-1 searches (using numeric use attributes)
[idzebra-moved-to-github.git]
/
isamb
/
benchisamb.c
diff --git
a/isamb/benchisamb.c
b/isamb/benchisamb.c
index
6d5391e
..
9f5ba9a
100644
(file)
--- a/
isamb/benchisamb.c
+++ b/
isamb/benchisamb.c
@@
-1,8
+1,5
@@
-/* $Id: benchisamb.c,v 1.3 2006-12-10 20:59:52 adam Exp $
- Copyright (C) 1995-2006
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-20,6
+17,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <yaz/options.h>
#if HAVE_SYS_TIMES_H
#include <sys/times.h>
#include <yaz/options.h>
#if HAVE_SYS_TIMES_H
#include <sys/times.h>
@@
-32,6
+32,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <string.h>
#include <yaz/log.h>
#include <yaz/xmalloc.h>
#include <string.h>
#include <yaz/log.h>
#include <yaz/xmalloc.h>
+#include <yaz/timing.h>
#include <idzebra/isamb.h>
#include <assert.h>
#include <idzebra/isamb.h>
#include <assert.h>
@@
-131,54
+132,40
@@
void bench_insert(ISAMB isb, int number_of_trees,
ri.step = 1;
ri.insertMode = 1;
ri.sz = sizeof(int) + 1 + extra_size;
ri.step = 1;
ri.insertMode = 1;
ri.sz = sizeof(int) + 1 + extra_size;
-
+
for (round = 0; round < number_of_rounds; round++)
{
for (round = 0; round < number_of_rounds; round++)
{
-#if HAVE_SYS_TIMES_H
-#if HAVE_SYS_TIME_H
- struct tms tms1, tms2;
- struct timeval start_time, end_time;
- double usec;
- times(&tms1);
- gettimeofday(&start_time, 0);
-#endif
-#endif
+ yaz_timing_t t = yaz_timing_create();
+
+ yaz_timing_start(t);
for (i = 0; i<number_of_trees; i++)
{
/* insert a number of entries */
ri.no = 0;
for (i = 0; i<number_of_trees; i++)
{
/* insert a number of entries */
ri.no = 0;
-
+
ri.val = (rand());
ri.val = (rand());
- if (RAND_MAX < 65536)
+ if (RAND_MAX < 65536)
ri.val = ri.val + 65536*rand();
// ri.val = number_of_elements * round;
ri.max = number_of_elements;
ri.val = ri.val + 65536*rand();
// ri.val = number_of_elements * round;
ri.max = number_of_elements;
-
+
isamc_i.clientData = &ri;
isamc_i.read_item = code_read;
isamc_i.clientData = &ri;
isamc_i.read_item = code_read;
-
+
isamb_merge (isb, &isamc_p[i] , &isamc_i);
if (0)
isamb_dump(isb, isamc_p[i], log_pr);
}
isamb_merge (isb, &isamc_p[i] , &isamc_i);
if (0)
isamb_dump(isb, isamc_p[i], log_pr);
}
-#if HAVE_SYS_TIMES_H
-#if HAVE_SYS_TIME_H
- gettimeofday(&end_time, 0);
- times(&tms2);
-
- usec = (end_time.tv_sec - start_time.tv_sec) * 1000000.0 +
- end_time.tv_usec - start_time.tv_usec;
-
+ yaz_timing_stop(t);
printf("%3d %8.6f %5.2f %5.2f\n",
printf("%3d %8.6f %5.2f %5.2f\n",
- round+1,
- usec / 1000000,
- (double) (tms2.tms_utime - tms1.tms_utime)/100,
- (double) (tms2.tms_stime - tms1.tms_stime)/100);
-#endif
-#endif
+ round+1,
+ yaz_timing_get_real(t),
+ yaz_timing_get_user(t),
+ yaz_timing_get_sys(t));
+ yaz_timing_destroy(&t);
}
xfree(isamc_p);
}
}
xfree(isamc_p);
}
@@
-200,6
+187,7
@@
int main(int argc, char **argv)
int number_of_items = 1000;
int number_of_isams = 1000;
int extra_size = 0;
int number_of_items = 1000;
int number_of_isams = 1000;
int extra_size = 0;
+ yaz_timing_t t = 0;
while ((ret = options("z:r:n:i:", argv, argc, &arg)) != -2)
{
while ((ret = options("z:r:n:i:", argv, argc, &arg)) != -2)
{
@@
-225,7
+213,7
@@
int main(int argc, char **argv)
exit_usage();
}
}
exit_usage();
}
}
-
+
/* setup method (attributes) */
method.compare_item = compare_item;
method.log_item = log_item;
/* setup method (attributes) */
method.compare_item = compare_item;
method.log_item = log_item;
@@
-235,6
+223,10
@@
int main(int argc, char **argv)
method.codec.reset = code_reset;
method.codec.stop = code_stop;
method.codec.reset = code_reset;
method.codec.stop = code_stop;
+ t = yaz_timing_create();
+
+ yaz_timing_start(t);
+
/* create block system */
bfs = bfs_create(0, 0);
if (!bfs)
/* create block system */
bfs = bfs_create(0, 0);
if (!bfs)
@@
-254,17
+246,25
@@
int main(int argc, char **argv)
}
bench_insert(isb, number_of_isams, number_of_rounds, number_of_items,
extra_size);
}
bench_insert(isb, number_of_isams, number_of_rounds, number_of_items,
extra_size);
-
+
isamb_close(isb);
/* exit block system */
bfs_destroy(bfs);
isamb_close(isb);
/* exit block system */
bfs_destroy(bfs);
+
+ yaz_timing_stop(t);
+ printf("Total %8.6f %5.2f %5.2f\n",
+ yaz_timing_get_real(t),
+ yaz_timing_get_user(t),
+ yaz_timing_get_sys(t));
+ yaz_timing_destroy(&t);
exit(0);
return 0;
}
/*
* Local variables:
* c-basic-offset: 4
exit(0);
return 0;
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab