sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r19510: Make smbtorture's `nprocs' parameter a parametric option.

Browse Source 
(This used to be commit f5d6b3ca29)
This commit is contained in:
Jelmer Vernooij 2006-10-30 00:17:16 +00:00 committed by Gerald (Jerry) Carter
parent 72b164d2e9
commit 108de297a7
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/torture/basic/misc.c
View File

@ -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);

4
source4/torture/nbench/nbench.c
View File

@ -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;

2
source4/torture/raw/oplock.c
View File

@ -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;

1
source4/torture/smbtorture.c
View File

@ -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},

1
source4/torture/torture.c
View File

@ -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;

1
source4/torture/torture.h
View File

@ -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;

1
source4/torture/util_smb.c
View File

@ -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;