Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch
In directory
cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/slapd/tools/rsearch
Modified Files:
addthread.c addthread.h infadd.c infadd.h main.c nametable.c
nametable.h rsearch.c rsearch.h sdattable.c sdattable.h
searchthread.c searchthread.h
Log Message:
Resolves: #214533
Summary: configure needs to support --with-fhs (Comment #6)
Changes: Added the following include next to the end of the copyright block.
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
Index: addthread.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/addthread.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- addthread.c 11 Jan 2006 02:00:32 -0000 1.2
+++ addthread.c 10 Nov 2006 23:45:51 -0000 1.3
@@ -36,6 +36,11 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: addthread.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/addthread.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- addthread.h 11 Jan 2006 02:00:32 -0000 1.2
+++ addthread.h 10 Nov 2006 23:45:51 -0000 1.3
@@ -36,6 +36,11 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
#ifndef _ADDTHREAD_H
#define _ADDTHREAD_H
Index: infadd.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/infadd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- infadd.c 11 Jan 2006 02:00:32 -0000 1.2
+++ infadd.c 10 Nov 2006 23:45:51 -0000 1.3
@@ -36,6 +36,11 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
/*
* XP port of dboreham's NT tool "infinite_add"
* robey, june 1998
@@ -338,8 +343,11 @@
ntot);
}
if (!quiet && (numThreads > 1 || !verbose)) {
- fprintf(stdout, "Average rate:%7.2f, total: %u\n",
- (double)total/(double)numThreads, ntotal);
+ double val = 1000.0 * (double)total / (double)sampleInterval;
+ fprintf(stdout, "Rate: %7.2f/thr (%6.2f/sec =%7.4fms/op), "
+ "total: %u (%d thr)\n",
+ (double)total/(double)numThreads, val,
+ (double)1000.0/val, ntotal, numThreads);
}
if (lmtCount && ntotal >= lmtCount) {
if (!quiet) {
Index: infadd.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/infadd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- infadd.h 11 Jan 2006 02:00:32 -0000 1.2
+++ infadd.h 10 Nov 2006 23:45:51 -0000 1.3
@@ -36,6 +36,11 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
#ifndef _INFADD_H
#define _INFADD_H
Index: main.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- main.c 11 Jan 2006 02:00:32 -0000 1.2
+++ main.c 10 Nov 2006 23:45:51 -0000 1.3
@@ -36,6 +36,11 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
/*
* this was just easier to start from scratch. windows is too different
* from nspr.
Index: nametable.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/nametable.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nametable.c 11 Jan 2006 02:00:32 -0000 1.2
+++ nametable.c 10 Nov 2006 23:45:51 -0000 1.3
@@ -36,6 +36,11 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: nametable.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/nametable.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nametable.h 11 Jan 2006 02:00:32 -0000 1.2
+++ nametable.h 10 Nov 2006 23:45:51 -0000 1.3
@@ -36,6 +36,11 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
#ifndef _NAMETABLE_H
#define _NAMETABLE_H
Index: rsearch.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/rsearch.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rsearch.c 11 Jan 2006 02:00:32 -0000 1.2
+++ rsearch.c 10 Nov 2006 23:45:51 -0000 1.3
@@ -36,6 +36,11 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
/*
* XP port of dboreham's NT tool "repeated_search"
* robey, march 1998
Index: rsearch.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/rsearch.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rsearch.h 11 Jan 2006 02:00:32 -0000 1.2
+++ rsearch.h 10 Nov 2006 23:45:51 -0000 1.3
@@ -36,6 +36,11 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
#ifndef _RSEARCH_H
#define _RSEARCH_H
Index: sdattable.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/sdattable.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sdattable.c 11 Jan 2006 02:00:32 -0000 1.2
+++ sdattable.c 10 Nov 2006 23:45:51 -0000 1.3
@@ -36,6 +36,11 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: sdattable.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/sdattable.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sdattable.h 11 Jan 2006 02:00:32 -0000 1.2
+++ sdattable.h 10 Nov 2006 23:45:51 -0000 1.3
@@ -36,6 +36,11 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
#ifndef _SDATTABLE_H
#define _SDATTABLE_H
Index: searchthread.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/searchthread.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- searchthread.c 31 Aug 2006 22:52:13 -0000 1.3
+++ searchthread.c 10 Nov 2006 23:45:51 -0000 1.4
@@ -36,6 +36,11 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: searchthread.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/searchthread.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- searchthread.h 11 Jan 2006 02:00:32 -0000 1.2
+++ searchthread.h 10 Nov 2006 23:45:51 -0000 1.3
@@ -36,6 +36,11 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
#ifndef _SEARCHTHREAD_H
#define _SEARCHTHREAD_H