diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-01-10 11:16:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:37:24 -0500 |
| commit | f6274959ba381b6b5d025cb0cee78665107a72a6 (patch) | |
| tree | 750d88afc3f88f833162dc7d9ae93d844b61a4e4 /source4/torture/nbench/nbench.c | |
| parent | 1cd4339b9a2786aa26691ca4f02fa93ab0958b88 (diff) | |
| download | samba-f6274959ba381b6b5d025cb0cee78665107a72a6.tar.gz samba-f6274959ba381b6b5d025cb0cee78665107a72a6.tar.bz2 samba-f6274959ba381b6b5d025cb0cee78665107a72a6.zip | |
r20647: add cluster code
(This used to be commit 5870830b99a8d76bda1ff5af3fcf8dda9aba50ec)
Diffstat (limited to 'source4/torture/nbench/nbench.c')
| -rw-r--r-- | source4/torture/nbench/nbench.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c index f671a5b0de..eb67e15fbb 100644 --- a/source4/torture/nbench/nbench.c +++ b/source4/torture/nbench/nbench.c @@ -24,6 +24,7 @@ #include "torture/util.h" #include "torture/torture.h" #include "system/filesys.h" +#include "system/locale.h" #include "pstring.h" #include "torture/nbench/proto.h" @@ -44,7 +45,6 @@ static BOOL run_netbench(struct torture_context *tctx, struct smbcli_state *cli, pstring line; char *cname; FILE *f; - const char **params; BOOL correct = True; if (torture_nprocs == 1) { @@ -64,9 +64,13 @@ static BOOL run_netbench(struct torture_context *tctx, struct smbcli_state *cli, return False; } + again: + nbio_time_reset(); + while (fgets(line, sizeof(line)-1, f)) { NTSTATUS status; + const char **params0, **params; nbench_line_count++; @@ -74,9 +78,16 @@ again: all_string_sub(line,"client1", cname, sizeof(line)); - params = str_list_make_shell(NULL, line, " "); + params = params0 = str_list_make_shell(NULL, line, " "); i = str_list_length(params); + if (i > 0 && isdigit(params[0][0])) { + double targett = strtod(params[0], NULL); + nbio_time_delay(targett); + params++; + i--; + } + if (i < 2 || params[0][0] == '#') continue; if (!strncmp(params[0],"SMB", 3)) { @@ -146,7 +157,7 @@ again: printf("[%d] Unknown operation %s\n", nbench_line_count, params[0]); } - talloc_free(params); + talloc_free(params0); if (nb_tick()) goto done; } |