r5130: added a single NBT name query benchmark. It keeps 10 queries in flight at...

(This used to be commit 2d23c665ffda7619dc9b9c2dbcbc422b0854998c)

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index a31c2c05983e8d0aef7d12b9a1ad6ca9bafb06ac..41268ece5a5387da76d408111216432fdc210993 100644 (file)
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -166,6 +166,16 @@ REQUIRED_SUBSYSTEMS = \
 # End SUBSYSTEM TORTURE_LDAP
 #################################
 
+#################################
+# Start SUBSYSTEM TORTURE_NBT
+[SUBSYSTEM::TORTURE_NBT]
+ADD_OBJ_FILES = \
+               torture/nbt/query.o
+REQUIRED_SUBSYSTEMS = \
+               LIBSMB
+# End SUBSYSTEM TORTURE_NBT
+#################################
+
 #################################
 # Start BINARY smbtorture
 [BINARY::smbtorture]
@@ -182,6 +192,7 @@ REQUIRED_SUBSYSTEMS = \
                TORTURE_LOCAL \
                TORTURE_NBENCH \
                TORTURE_LDAP \
+               TORTURE_NBT \
                CONFIG \
                LIBCMDLINE \
                LIBBASIC

diff --git a/source4/torture/nbt/query.c b/source4/torture/nbt/query.c
new file mode 100644 (file)
index 0000000..6afde67
--- /dev/null
+++ b/source4/torture/nbt/query.c
@@ -0,0 +1,130 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   NBT name query testing
+
+   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 "libcli/nbt/libnbt.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
+
+struct result_struct {
+       int num_pass;
+       int num_fail;
+};
+
+static void increment_handler(struct nbt_name_request *req)
+{
+       struct result_struct *v = talloc_get_type(req->async.private, struct result_struct);
+       if (req->state != NBT_REQUEST_DONE) {
+               v->num_fail++;
+       } else {
+               v->num_pass++;
+       }
+       talloc_free(req);
+}
+
+/*
+  benchmark simple name queries
+*/
+static BOOL bench_namequery(TALLOC_CTX *mem_ctx, struct nbt_name *name, const char *address)
+{
+       struct nbt_name_socket *nbtsock = nbt_name_socket_init(mem_ctx, NULL);
+       int num_sent=0;
+       struct result_struct *result;
+       struct nbt_name_query io;
+       struct timeval tv = timeval_current();
+       BOOL ret = True;
+       int timelimit = lp_parm_int(-1, "torture", "timelimit", 10);
+
+       io.in.name = *name;
+       io.in.dest_addr = address;
+       io.in.broadcast = False;
+       io.in.wins_lookup = False;
+       io.in.timeout = 1;
+
+       result = talloc_zero(mem_ctx, struct result_struct);
+
+       printf("Running for %d seconds\n", timelimit);
+       while (timeval_elapsed(&tv) < timelimit) {
+               while (num_sent - (result->num_pass+result->num_fail) < 10) {
+                       struct nbt_name_request *req;
+                       req = nbt_name_query_send(nbtsock, &io);
+                       if (req == NULL) {
+                               printf("Failed to setup request!\n");
+                               ret = False;
+                               goto failed;
+                       }
+                       req->async.fn = increment_handler;
+                       req->async.private = result;
+                       num_sent++;
+                       if (num_sent % 100 == 0) {
+                               printf("%.1f queries per second (%d failures)  \r", 
+                                      result->num_pass / timeval_elapsed(&tv),
+                                      result->num_fail);
+                       }
+               }
+
+               event_loop_once(nbtsock->event_ctx);
+       }
+
+       while (num_sent != (result->num_pass + result->num_fail)) {
+               event_loop_once(nbtsock->event_ctx);
+       }
+
+       printf("%.1f queries per second (%d failures)  \n", 
+              result->num_pass / timeval_elapsed(&tv),
+              result->num_fail);
+
+failed:
+       talloc_free(nbtsock);
+       return ret;
+}
+
+
+/*
+  benchmark how fast a server can respond to name queries
+*/
+BOOL torture_bench_nbt(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_namequery(mem_ctx, &name, address);
+
+       talloc_free(mem_ctx);
+
+       return ret;
+}

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 2a0e344c0943ec3157e8437f5ee085ba9abdd92e..60f39cdac769ec8414ef60de42a929812f92eeeb 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -2342,6 +2342,7 @@ static struct {
        {"BENCH-HOLDCON",  torture_holdcon, 0},
        {"BENCH-NBENCH",  torture_nbench, 0},
        {"BENCH-TORTURE", NULL, run_torture},
+       {"BENCH-NBT",     torture_bench_nbt, 0},
 
        /* RAW smb tests */
        {"RAW-QFSINFO", torture_raw_qfsinfo, 0},