svn commit: samba r14883 - in branches/SAMBA_3_0/source/smbd: .
metze at samba.org
metze at samba.org
Mon Apr 3 10:43:35 GMT 2006
Author: metze
Date: 2006-04-03 10:43:34 +0000 (Mon, 03 Apr 2006)
New Revision: 14883
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14883
Log:
add 'smbd:sharedelay' option, so that we can speed up BASE-DENY2 in make test
as done in samba4
metze
Modified:
branches/SAMBA_3_0/source/smbd/open.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/open.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/open.c 2006-04-03 10:43:10 UTC (rev 14882)
+++ branches/SAMBA_3_0/source/smbd/open.c 2006-04-03 10:43:34 UTC (rev 14883)
@@ -1440,7 +1440,14 @@
lp_defer_sharing_violations()) {
struct timeval timeout;
struct deferred_open_record state;
+ int timeout_usecs;
+ /* this is a hack to speed up torture tests
+ in 'make test' */
+ timeout_usecs = lp_parm_int(conn->service,
+ "smbd","sharedelay",
+ SHARING_VIOLATION_USEC_WAIT);
+
/* This is a relative time, added to the absolute
request_time value to get the absolute timeout time.
Note that if this is the second or greater time we enter
@@ -1449,7 +1456,7 @@
time this request mid was processed. This is what allows
the request to eventually time out. */
- timeout = timeval_set(0, SHARING_VIOLATION_USEC_WAIT);
+ timeout = timeval_set(0, timeout_usecs);
/* Nothing actually uses state.delayed_for_oplocks
but it's handy to differentiate in debug messages
More information about the samba-cvs
mailing list