summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-01-30 00:37:12 +0000
committerJeremy Allison <jra@samba.org>2001-01-30 00:37:12 +0000
commit8e18bd58f7706ffa17f826074689a6354c0f15ba (patch)
treedd18da73f114f00fdbccd193f2d4092d2e4c9cc1
parent2506c61ab3bd667d54c5e004cc80ce5e40643b5d (diff)
downloadsamba-8e18bd58f7706ffa17f826074689a6354c0f15ba.tar.gz
samba-8e18bd58f7706ffa17f826074689a6354c0f15ba.tar.bz2
samba-8e18bd58f7706ffa17f826074689a6354c0f15ba.zip
Fix inspited by Alan Romeril. 50% speedup in domain logins with this
change to default break response time of 10ms -> 0ms. Jeremy. (This used to be commit 541c7df16fff03f98c253a46b501574cafb4469f)
-rw-r--r--source3/param/loadparm.c2
-rw-r--r--source3/smbd/oplock.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 359918c675..7130cf0f49 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1248,7 +1248,7 @@ static void init_globals(void)
Globals.bRestrictAnonymous = False;
Globals.map_to_guest = 0; /* By Default, "Never" */
Globals.min_passwd_length = MINPASSWDLENGTH; /* By Default, 5. */
- Globals.oplock_break_wait_time = 10; /* By Default, 10 msecs. */
+ Globals.oplock_break_wait_time = 0; /* By Default, 0 msecs. */
#ifdef WITH_LDAP
/* default values for ldap */
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 366b4d0fec..4f26eaf7f2 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -470,6 +470,9 @@ static void wait_before_sending_break(BOOL local_request)
struct timeval cur_tv;
long wait_left = (long)lp_oplock_break_wait_time();
+ if (wait_left == 0)
+ return;
+
GetTimeOfDay(&cur_tv);
wait_left -= ((cur_tv.tv_sec - smb_last_time.tv_sec)*1000) +