svn commit: r196905 - user/kmacy/releng_7_2_fcs_1/sys/kern

[Kip Macy]

Author: kmacy
Date: Sun Sep  6 19:45:37 2009
New Revision: 196905
URL: http://svn.freebsd.org/changeset/base/196905

Log:
  make bg sendfile a toggle

Modified:
  user/kmacy/releng_7_2_fcs_1/sys/kern/uipc_syscalls.c

Modified: user/kmacy/releng_7_2_fcs_1/sys/kern/uipc_syscalls.c
==============================================================================
--- user/kmacy/releng_7_2_fcs_1/sys/kern/uipc_syscalls.c	Sun Sep  6 19:33:13 2009	(r196904)
+++ user/kmacy/releng_7_2_fcs_1/sys/kern/uipc_syscalls.c	Sun Sep  6 19:45:37 2009	(r196905)
@@ -106,6 +106,10 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufsp
 SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufsused, CTLFLAG_RD, &nsfbufsused, 0,
     "Number of sendfile(2) sf_bufs in use");
 
+static int bg_sendfile_enable = 1;
+SYSCTL_INT(_kern_ipc, OID_AUTO, bg_sendfile_enable, CTLFLAG_RW,
+    &bg_sendfile_enable, 0, "Enable background sendfile");
+
 /*
  * Convert a user file descriptor to a kernel file entry.  A reference on the
  * file entry is held upon returning.  This is lighter weight than
@@ -1986,7 +1990,8 @@ retry_space:
 		    (space <= 0 ||
 		     space < so->so_snd.sb_lowat)) {
 			if (so->so_state & SS_NBIO) {
-				if ((so->so_snd.sb_flags & SB_SENDING) == 0)
+				if (bg_sendfile_enable &&
+				    (so->so_snd.sb_flags & SB_SENDING) == 0)
 					soissending(so, td, uap, hdr_uio, trl_uio, compat, sbytes);
 				SOCKBUF_UNLOCK(&so->so_snd);
 				error = EAGAIN;