Date: Tue, 11 Nov 2014 19:12:58 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274393 - projects/sendfile/sys/kern Message-ID: <201411111912.sABJCwij058057@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Tue Nov 11 19:12:57 2014 New Revision: 274393 URL: https://svnweb.freebsd.org/changeset/base/274393 Log: Remove sfreadahead sysctl. The amount of readahead can only be specified in syscall arguments. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/uipc_syscalls.c Modified: projects/sendfile/sys/kern/uipc_syscalls.c ============================================================================== --- projects/sendfile/sys/kern/uipc_syscalls.c Tue Nov 11 19:02:30 2014 (r274392) +++ projects/sendfile/sys/kern/uipc_syscalls.c Tue Nov 11 19:12:57 2014 (r274393) @@ -119,16 +119,6 @@ static int filt_sfsync_attach(struct kno static void filt_sfsync_detach(struct knote *kn); static int filt_sfsync(struct knote *kn, long hint); -/* - * sendfile(2)-related variables and associated sysctls - */ -static SYSCTL_NODE(_kern_ipc, OID_AUTO, sendfile, CTLFLAG_RW, 0, - "sendfile(2) tunables"); - -static int sfreadahead = 0; -SYSCTL_INT(_kern_ipc_sendfile, OID_AUTO, readahead, CTLFLAG_RW, - &sfreadahead, 0, "Read this more pages than socket buffer can accept"); - #ifdef SFSYNC_DEBUG static int sf_sync_debug = 0; SYSCTL_INT(_debug, OID_AUTO, sf_sync_debug, CTLFLAG_RW, @@ -3087,10 +3077,8 @@ retry_space: else npages = howmany(space, PAGE_SIZE); - rhpages = SF_READAHEAD(flags) ? - SF_READAHEAD(flags) : sfreadahead; rhpages = min(howmany(obj_size - (off & ~PAGE_MASK) - - (npages * PAGE_SIZE), PAGE_SIZE), rhpages); + (npages * PAGE_SIZE), PAGE_SIZE), SF_READAHEAD(flags)); sfio = malloc(sizeof(struct sf_io) + (rhpages + npages) * sizeof(vm_page_t), M_TEMP, M_WAITOK);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411111912.sABJCwij058057>