summaryrefslogtreecommitdiff
path: root/source4/torture/nbench/nbench.c
diff options
context:
space:
mode:
Diffstat (limited to 'source4/torture/nbench/nbench.c')
-rw-r--r--source4/torture/nbench/nbench.c17
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;
}