From owner-svn-src-projects@FreeBSD.ORG Tue Nov 11 19:12:58 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5C101A18; Tue, 11 Nov 2014 19:12:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4921CE5F; Tue, 11 Nov 2014 19:12:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sABJCwpU058058; Tue, 11 Nov 2014 19:12:58 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sABJCwij058057; Tue, 11 Nov 2014 19:12:58 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411111912.sABJCwij058057@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 11 Nov 2014 19:12:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274393 - projects/sendfile/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Nov 2014 19:12:58 -0000 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);