svn commit: samba r20302 - in branches/SAMBA_4_0/source/torture/nbench: .

[tridge at samba.org]

Author: tridge
Date: 2006-12-21 06:48:42 +0000 (Thu, 21 Dec 2006)
New Revision: 20302

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20302

Log:

added support for 64 bit file offsets in NBENCH

Modified:
   branches/SAMBA_4_0/source/torture/nbench/nbench.c
   branches/SAMBA_4_0/source/torture/nbench/nbio.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/nbench/nbench.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbench/nbench.c	2006-12-21 05:34:26 UTC (rev 20301)
+++ branches/SAMBA_4_0/source/torture/nbench/nbench.c	2006-12-21 06:48:42 UTC (rev 20302)
@@ -34,7 +34,7 @@
 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)

Modified: branches/SAMBA_4_0/source/torture/nbench/nbio.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbench/nbio.c	2006-12-21 05:34:26 UTC (rev 20301)
+++ branches/SAMBA_4_0/source/torture/nbench/nbio.c	2006-12-21 06:48:42 UTC (rev 20302)
@@ -1,3 +1,8 @@
+/*
+  TODO: add splitting of writes for servers with signing
+*/
+
+
 /* 
    Unix SMB/CIFS implementation.
    SMB torture tester
@@ -290,7 +295,7 @@
 	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 @@
 	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_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 @@
 	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;