r10199: added a LOCAL-RESOLVE torture test, useful for measuring the overhead of

the async name resolution mechanisms
(This used to be commit b3a9d759bb7c6ca892f9810389292e79d963ca61)

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 16bc37ed09e550522709df7aa1903621d631b52d..75a37a57657f85447b989204a890f8a27339cfc1 100644 (file)
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -146,7 +146,8 @@ ADD_OBJ_FILES = \
                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

diff --git a/source4/torture/local/resolve.c b/source4/torture/local/resolve.c
new file mode 100644 (file)
index 0000000..9087f42
--- /dev/null
+++ b/source4/torture/local/resolve.c
@@ -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;
+}

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 601888a483d84aafef544e25e5a7a73381bc890d..d4129834dadcfe4306338b7f7a9756626e2002e1 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -2324,6 +2324,7 @@ static struct {
        {"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 },