summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-10-30 00:17:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:24:42 -0500
commit108de297a7b576b624d5471c116ad6c734c63e14 (patch)
treeea413297bf39a3f0bd135ecc6fb532ba6234c719 /source4
parent72b164d2e94a73d4d1231b7d0b44ed400d2d8470 (diff)
downloadsamba-108de297a7b576b624d5471c116ad6c734c63e14.tar.gz
samba-108de297a7b576b624d5471c116ad6c734c63e14.tar.bz2
samba-108de297a7b576b624d5471c116ad6c734c63e14.zip
r19510: Make smbtorture's `nprocs' parameter a parametric option.
(This used to be commit f5d6b3ca29788d171d53822a26295ae895a5ed8f)
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/basic/misc.c6
-rw-r--r--source4/torture/nbench/nbench.c4
-rw-r--r--source4/torture/raw/oplock.c2
-rw-r--r--source4/torture/smbtorture.c1
-rw-r--r--source4/torture/torture.c1
-rw-r--r--source4/torture/torture.h1
-rw-r--r--source4/torture/util_smb.c1
7 files changed, 8 insertions, 8 deletions
diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index 0059574939..e8e7985f93 100644
--- a/source4/torture/basic/misc.c
+++ b/source4/torture/basic/misc.c
@@ -596,7 +596,8 @@ static NTSTATUS benchrw_mkdir(struct torture_context *tctx,struct smbcli_request
NT_STATUS_NOT_OK_RETURN(req->status);
/* open/create the files */
- torture_comment(tctx, "Open File %d/%d\n",state->nr+1,torture_nprocs);
+ torture_comment(tctx, "Open File %d/%d\n",state->nr+1,
+ lp_parm_int(-1, "torture", "nprocs", 4));
open_parms=talloc_zero(state->mem_ctx, union smb_open);
NT_STATUS_HAVE_NO_MEMORY(open_parms);
open_parms->openx.level = RAW_OPEN_OPENX;
@@ -760,9 +761,10 @@ BOOL run_benchrw(struct torture_context *tctx)
union smb_mkdir parms;
int finished = 0;
BOOL success=True;
+ int torture_nprocs = lp_parm_int(-1, "torture", "nprocs", 4);
torture_comment(tctx, "Start BENCH-READWRITE num_ops=%d num_nprocs=%d\n",
- torture_numops,torture_nprocs);
+ torture_numops, torture_nprocs);
/*init talloc context*/
ev = event_context_init(tctx);
diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c
index a9ff8e5507..2bd42940a0 100644
--- a/source4/torture/nbench/nbench.c
+++ b/source4/torture/nbench/nbench.c
@@ -38,7 +38,7 @@ static const char *loadfile;
/* run a test that simulates an approximate netbench client load */
static BOOL run_netbench(struct torture_context *tctx, struct smbcli_state *cli, int client)
{
- extern int torture_nprocs;
+ int torture_nprocs = lp_parm_int(-1, "torture", "nprocs", 4);
int i;
pstring line;
char *cname;
@@ -171,7 +171,7 @@ done:
BOOL torture_nbench(struct torture_context *torture)
{
BOOL correct = True;
- extern int torture_nprocs;
+ int torture_nprocs = lp_parm_int(-1, "torture", "nprocs", 4);
struct smbcli_state *cli;
const char *p;
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 98744e0ec2..f2e894a6eb 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -767,7 +767,7 @@ BOOL torture_bench_oplock(struct torture_context *torture)
struct smbcli_state **cli;
BOOL ret = True;
TALLOC_CTX *mem_ctx = talloc_new(torture);
- extern int torture_nprocs;
+ int torture_nprocs = lp_parm_int(-1, "torture", "nprocs", 4);
int i, count=0;
int timelimit = torture_setting_int(torture, "timelimit", 10);
union smb_open io;
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index cd640f87d3..38f91454e6 100644
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -448,7 +448,6 @@ const static struct torture_ui_ops quiet_ui_ops = {
{"format", 0, POPT_ARG_STRING, &ui_ops_name, 0, "Output format (one of: simple, subunit, harness)", NULL },
{"smb-ports", 'p', POPT_ARG_STRING, NULL, OPT_SMB_PORTS, "SMB ports", NULL},
{"seed", 0, POPT_ARG_INT, &torture_seed, 0, "seed", NULL},
- {"num-progs", 0, POPT_ARG_INT, &torture_nprocs, 0, "num progs", NULL},
{"num-ops", 0, POPT_ARG_INT, &torture_numops, 0, "num ops", NULL},
{"entries", 0, POPT_ARG_INT, &torture_entries, 0, "entries", NULL},
{"show-all", 0, POPT_ARG_NONE, &torture_showall, 0, "show all", NULL},
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 76c589fcfb..fbf8f8ca1d 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -25,7 +25,6 @@
#include "build.h"
#include "lib/util/dlinklist.h"
-_PUBLIC_ int torture_nprocs=4;
_PUBLIC_ int torture_numops=10;
_PUBLIC_ int torture_entries=1000;
_PUBLIC_ int torture_failures=1;
diff --git a/source4/torture/torture.h b/source4/torture/torture.h
index a88c1c3654..d821268ba2 100644
--- a/source4/torture/torture.h
+++ b/source4/torture/torture.h
@@ -31,7 +31,6 @@ extern struct torture_suite *torture_root;
extern BOOL use_oplocks;
extern BOOL torture_showall;
extern int torture_entries;
-extern int torture_nprocs;
extern int torture_seed;
extern int torture_numops;
extern int torture_failures;
diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c
index 9473ab018b..75fa9648f4 100644
--- a/source4/torture/util_smb.c
+++ b/source4/torture/util_smb.c
@@ -608,6 +608,7 @@ double torture_create_procs(struct torture_context *tctx,
volatile bool *child_status_out;
int synccount;
int tries = 8;
+ int torture_nprocs = lp_parm_int(-1, "torture", "nprocs", 4);
double start_time_limit = 10 + (torture_nprocs * 1.5);
struct timeval tv;