r6875: added a BENCH-CLDAP test. Speed of the cldap server isn't all that important, but it does

help find memory leaks (and in fact, there was one, fixed in next commit)
(This used to be commit ab19e38c236366f2a93ea1f44911c56519779c9d)

3 files changed, 132 insertions, 1 deletions

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index ca1b09eb05..71f500bba4 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -164,7 +164,8 @@ ADD_OBJ_FILES = \
 ADD_OBJ_FILES = \
 		torture/ldap/common.o \
 		torture/ldap/basic.o \
-		torture/ldap/cldap.o
+		torture/ldap/cldap.o \
+		torture/ldap/cldapbench.o
 REQUIRED_SUBSYSTEMS = \
 		LIBCLI_LDAP LIBCLI_CLDAP
 # End SUBSYSTEM TORTURE_LDAP
diff --git a/source4/torture/ldap/cldapbench.c b/source4/torture/ldap/cldapbench.c
new file mode 100644
index 0000000000..8eaddc78f9
--- /dev/null
+++ b/source4/torture/ldap/cldapbench.c
@@ -0,0 +1,129 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   CLDAP benchmark test
+
+   Copyright (C) Andrew Tridgell 2005
+   
+   This program 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 Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "lib/events/events.h"
+#include "libcli/cldap/cldap.h"
+
+struct bench_state {
+	int pass_count, fail_count;
+};
+
+static void request_handler(struct cldap_request *req)
+{
+	struct cldap_netlogon io;
+	struct bench_state *state = talloc_get_type(req->async.private, struct bench_state);
+	NTSTATUS status;
+	TALLOC_CTX *tmp_ctx = talloc_new(NULL);
+	io.in.version = 6;
+	status = cldap_netlogon_recv(req, tmp_ctx, &io);
+	if (NT_STATUS_IS_OK(status)) {
+		state->pass_count++;
+	} else {
+		state->fail_count++;
+	}
+	talloc_free(tmp_ctx);
+}
+
+/*
+  benchmark cldap calls
+*/
+static BOOL bench_cldap(TALLOC_CTX *mem_ctx, const char *address)
+{
+	struct cldap_socket *cldap = cldap_socket_init(mem_ctx, NULL);
+	int num_sent=0;
+	struct timeval tv = timeval_current();
+	BOOL ret = True;
+	int timelimit = lp_parm_int(-1, "torture", "timelimit", 10);
+	struct cldap_netlogon search;
+	struct bench_state *state;
+
+	state = talloc_zero(mem_ctx, struct bench_state);
+
+	ZERO_STRUCT(search);
+	search.in.dest_address = address;
+	search.in.acct_control = -1;
+	search.in.version = 6;
+
+	printf("Running for %d seconds\n", timelimit);
+	while (timeval_elapsed(&tv) < timelimit) {
+		while (num_sent - (state->pass_count+state->fail_count) < 10) {
+			struct cldap_request *req;
+			req = cldap_netlogon_send(cldap, &search);
+
+			req->async.private = state;
+			req->async.fn = request_handler;
+			num_sent++;
+			if (num_sent % 50 == 0) {
+				printf("%.1f queries per second (%d failures)  \r", 
+				       state->pass_count / timeval_elapsed(&tv),
+				       state->fail_count);
+			}
+		}
+
+		event_loop_once(cldap->event_ctx);
+	}
+
+	while (num_sent != (state->pass_count + state->fail_count)) {
+		event_loop_once(cldap->event_ctx);
+	}
+
+	printf("%.1f queries per second (%d failures)  \n", 
+	       state->pass_count / timeval_elapsed(&tv),
+	       state->fail_count);
+
+	talloc_free(cldap);
+	return ret;
+}
+
+
+/*
+  benchmark how fast a CLDAP server can respond to a series of parallel
+  requests 
+*/
+BOOL torture_bench_cldap(void)
+{
+	const char *address;
+	struct nbt_name name;
+	TALLOC_CTX *mem_ctx = talloc_new(NULL);
+	NTSTATUS status;
+	BOOL ret = True;
+	
+	name.name = lp_parm_string(-1, "torture", "host");
+	name.type = NBT_NAME_SERVER;
+	name.scope = NULL;
+
+	/* do an initial name resolution to find its IP */
+	status = resolve_name(&name, mem_ctx, &address);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("Failed to resolve %s - %s\n",
+		       name.name, nt_errstr(status));
+		talloc_free(mem_ctx);
+		return False;
+	}
+
+	ret &= bench_cldap(mem_ctx, address);
+
+	talloc_free(mem_ctx);
+
+	return ret;
+}
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 7f481af1de..8f49a125c5 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -2213,6 +2213,7 @@ static struct {
 	{"BENCH-NBT",     torture_bench_nbt, 0},
 	{"BENCH-WINS",    torture_bench_wins, 0},
 	{"BENCH-RPC",     torture_bench_rpc, 0},
+	{"BENCH-CLDAP",   torture_bench_cldap, 0},
 
 	/* RAW smb tests */
 	{"RAW-QFSINFO", torture_raw_qfsinfo, 0},