diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-01-10 11:50:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:37:26 -0500 |
| commit | 1c211a2e43db46c649a963ec883481cc4321870a (patch) | |
| tree | 8b8a62b0670b3b640dde83b4c7caea5d763f9132 /source4/torture/nbench/nbench.c | |
| parent | c6ccfeb9cb78a95048ce0d91317b5948ae4ca46e (diff) | |
| download | samba-1c211a2e43db46c649a963ec883481cc4321870a.tar.gz samba-1c211a2e43db46c649a963ec883481cc4321870a.tar.bz2 samba-1c211a2e43db46c649a963ec883481cc4321870a.zip | |
r20650: revert a bunch of code I didn't mean to commit yet
(This used to be commit b3e2d4908781781a487eaeb683d22eb967e5597d)
Diffstat (limited to 'source4/torture/nbench/nbench.c')
| -rw-r--r-- | source4/torture/nbench/nbench.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c index eb67e15fbb..f671a5b0de 100644 --- a/source4/torture/nbench/nbench.c +++ b/source4/torture/nbench/nbench.c @@ -24,7 +24,6 @@ #include "torture/util.h" #include "torture/torture.h" #include "system/filesys.h" -#include "system/locale.h" #include "pstring.h" #include "torture/nbench/proto.h" @@ -45,6 +44,7 @@ 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,13 +64,9 @@ 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++; @@ -78,16 +74,9 @@ again: all_string_sub(line,"client1", cname, sizeof(line)); - params = params0 = str_list_make_shell(NULL, line, " "); + params = 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)) { @@ -157,7 +146,7 @@ again: printf("[%d] Unknown operation %s\n", nbench_line_count, params[0]); } - talloc_free(params0); + talloc_free(params); if (nb_tick()) goto done; } |