svn commit: samba r10199 - in branches/SAMBA_4_0/source/torture: . local

tridge at samba.org tridge at samba.org
Tue Sep 13 12:44:34 GMT 2005


Author: tridge
Date: 2005-09-13 12:44:33 +0000 (Tue, 13 Sep 2005)
New Revision: 10199

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10199

Log:

added a LOCAL-RESOLVE torture test, useful for measuring the overhead of
the async name resolution mechanisms

Added:
   branches/SAMBA_4_0/source/torture/local/resolve.c
Modified:
   branches/SAMBA_4_0/source/torture/config.mk
   branches/SAMBA_4_0/source/torture/torture.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/config.mk
===================================================================
--- branches/SAMBA_4_0/source/torture/config.mk	2005-09-13 12:05:20 UTC (rev 10198)
+++ branches/SAMBA_4_0/source/torture/config.mk	2005-09-13 12:44:33 UTC (rev 10199)
@@ -146,7 +146,8 @@
 		torture/local/binding_string.o \
 		torture/local/idtree.o \
 		torture/local/socket.o \
-		torture/local/irpc.o
+		torture/local/irpc.o \
+		torture/local/resolve.o
 REQUIRED_SUBSYSTEMS = \
 		LIBSMB \
 		MESSAGING

Added: branches/SAMBA_4_0/source/torture/local/resolve.c
===================================================================
--- branches/SAMBA_4_0/source/torture/local/resolve.c	2005-09-13 12:05:20 UTC (rev 10198)
+++ branches/SAMBA_4_0/source/torture/local/resolve.c	2005-09-13 12:44:33 UTC (rev 10199)
@@ -0,0 +1,87 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   local test for async resolve code
+
+   Copyright (C) Andrew Tridgell 2004
+   
+   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 "librpc/gen_ndr/nbt.h"
+
+static BOOL test_async_resolve(TALLOC_CTX *mem_ctx)
+{
+	struct nbt_name n;
+	struct event_context *ev = event_context_find(mem_ctx);
+	int timelimit = lp_parm_int(-1, "torture", "timelimit", 10);
+	const char *host = lp_parm_string(-1, "torture", "host");
+	int count = 0;
+	struct timeval tv = timeval_current();
+
+	ZERO_STRUCT(n);
+	n.name = host;
+
+	printf("Testing async resolve of localhost for %d seconds\n", timelimit);
+	while (timeval_elapsed(&tv) < timelimit) {
+		const char *s;
+		struct composite_context *c = resolve_name_host_send(&n, ev);
+		NTSTATUS status = resolve_name_host_recv(c, mem_ctx, &s);
+		if (!NT_STATUS_IS_OK(status)) {
+			printf("async resolve failed - %s\n", nt_errstr(status));
+			return False;
+		}
+		count++;
+	}
+
+	printf("async rate of %.1f resolves/sec\n", count/timeval_elapsed(&tv));
+	return True;
+}
+
+/*
+  test resolution using sync method
+*/
+static BOOL test_sync_resolve(TALLOC_CTX *mem_ctx)
+{
+	int timelimit = lp_parm_int(-1, "torture", "timelimit", 10);
+	struct timeval tv = timeval_current();
+	int count = 0;
+	const char *host = lp_parm_string(-1, "torture", "host");
+
+	printf("Testing sync resolve of localhost for %d seconds\n", timelimit);
+	while (timeval_elapsed(&tv) < timelimit) {
+		sys_inet_ntoa(interpret_addr2(host));
+		count++;
+	}
+	
+	printf("sync rate of %.1f resolves/sec\n", count/timeval_elapsed(&tv));
+	return True;
+}
+
+
+BOOL torture_local_resolve(void) 
+{
+	TALLOC_CTX *mem_ctx = talloc_init("torture_local_irpc");
+	BOOL ret = True;
+
+	ret &= test_sync_resolve(mem_ctx);
+	ret &= test_async_resolve(mem_ctx);
+
+	talloc_free(mem_ctx);
+
+	return ret;
+}

Modified: branches/SAMBA_4_0/source/torture/torture.c
===================================================================
--- branches/SAMBA_4_0/source/torture/torture.c	2005-09-13 12:05:20 UTC (rev 10198)
+++ branches/SAMBA_4_0/source/torture/torture.c	2005-09-13 12:44:33 UTC (rev 10199)
@@ -2324,6 +2324,7 @@
 	{"LOCAL-IDTREE", torture_local_idtree, 0},
 	{"LOCAL-SOCKET", torture_local_socket, 0},
 	{"LOCAL-PAC", torture_pac, 0},
+	{"LOCAL-RESOLVE", torture_local_resolve, 0},
 
 	/* COM (Component Object Model) testers */
 	{"COM-SIMPLE", torture_com_simple, 0 },



More information about the samba-cvs mailing list