diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-12-21 06:48:42 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:29:35 -0500 |
| commit | c4274fee711935b758144d7df5f26c593b4e5d14 (patch) | |
| tree | 801c7d7097490bd4639899e5764b22b0a2ccadd6 /source4 | |
| parent | 114265b4d5928109b770041390343a60b6166cbf (diff) | |
| download | samba-c4274fee711935b758144d7df5f26c593b4e5d14.tar.gz samba-c4274fee711935b758144d7df5f26c593b4e5d14.tar.bz2 samba-c4274fee711935b758144d7df5f26c593b4e5d14.zip | |
r20302: added support for 64 bit file offsets in NBENCH
(This used to be commit 9a9f18914139370311a13044bde7948a2a901738)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/torture/nbench/nbench.c | 2 | ||||
| -rw-r--r-- | source4/torture/nbench/nbio.c | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c index e4ba491492..f671a5b0de 100644 --- a/source4/torture/nbench/nbench.c +++ b/source4/torture/nbench/nbench.c @@ -34,7 +34,7 @@ static int warmup; static const char *loadfile; static int read_only; -#define ival(s) strtol(s, NULL, 0) +#define ival(s) strtoll(s, NULL, 0) /* run a test that simulates an approximate netbench client load */ static BOOL run_netbench(struct torture_context *tctx, struct smbcli_state *cli, int client) diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c index 34ca4e8653..cd68085169 100644 --- a/source4/torture/nbench/nbio.c +++ b/source4/torture/nbench/nbio.c @@ -1,3 +1,8 @@ +/* + TODO: add splitting of writes for servers with signing +*/ + + /* Unix SMB/CIFS implementation. SMB torture tester @@ -290,7 +295,7 @@ void nb_createx(const char *fname, DLIST_ADD_END(ftable, f, struct ftable *); } -void nb_writex(int handle, int offset, int size, int ret_size, NTSTATUS status) +void nb_writex(int handle, off_t offset, int size, int ret_size, NTSTATUS status) { union smb_write io; int i; @@ -327,7 +332,7 @@ void nb_writex(int handle, int offset, int size, int ret_size, NTSTATUS status) children[nbio_id].bytes += ret_size; } -void nb_write(int handle, int offset, int size, int ret_size, NTSTATUS status) +void nb_write(int handle, off_t offset, int size, int ret_size, NTSTATUS status) { union smb_write io; int i; @@ -365,7 +370,7 @@ void nb_write(int handle, int offset, int size, int ret_size, NTSTATUS status) } -void nb_lockx(int handle, uint_t offset, int size, NTSTATUS status) +void nb_lockx(int handle, off_t offset, int size, NTSTATUS status) { union smb_lock io; int i; @@ -417,7 +422,7 @@ void nb_unlockx(int handle, uint_t offset, int size, NTSTATUS status) check_status("UnlockX", status, ret); } -void nb_readx(int handle, int offset, int size, int ret_size, NTSTATUS status) +void nb_readx(int handle, off_t offset, int size, int ret_size, NTSTATUS status) { union smb_read io; int i; |