Enable epoll USE flag by default and increase max_user_watches to SQUID_MAXFD when squid is built with epoll support (#280666).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

6 files changed, 35 insertions, 17 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 1cf42ce24f5d..c22c8e46cb19 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.273 2009/08/14 14:11:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.274 2009/08/16 11:01:46 mrness Exp $
+
+  16 Aug 2009; Alin Năstac <mrness@gentoo.org> files/squid.initd,
+  files/squid.initd-logrotate, squid-2.7.6-r1.ebuild, squid-3.0.18.ebuild,
+  squid-3.1.0.13_beta.ebuild:
+  Enable epoll USE flag by default and increase max_user_watches to
+  SQUID_MAXFD when squid is built with epoll support (#280666).
 
   14 Aug 2009; Raúl Porcel <armin76@gentoo.org> squid-3.0.18.ebuild:
   arm/ia64/sparc stable wrt #279379
diff --git a/net-proxy/squid/files/squid.initd b/net-proxy/squid/files/squid.initd
index 2c6b36f9f21a..be047c53b554 100644
--- a/net-proxy/squid/files/squid.initd
+++ b/net-proxy/squid/files/squid.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.10 2008/11/30 19:20:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.11 2009/08/16 11:01:46 mrness Exp $
 
 opts="${opts} reload rotate"
 
@@ -9,15 +9,21 @@ depend() {
 	need net
 }
 
+upprocval() {
+	[ -f $1 ] || return 0
+	if [ `cat $1` -lt $2 ]; then
+		echo $2 > $1
+	fi
+}
+
 # Try to increase the # of filedescriptors we can open.
 maxfds() {
 	[ -n "$SQUID_MAXFD" ] || return
-	[ -f /proc/sys/fs/file-max ] || return 0
 	[ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192
-	local global_file_max=`cat /proc/sys/fs/file-max`
 	local minimal_file_max=$(($SQUID_MAXFD + 4096))
-	if [ "$global_file_max" -lt $minimal_file_max ]; then
-		echo $minimal_file_max > /proc/sys/fs/file-max
+	upprocval /proc/sys/fs/file-max $minimal_file_max
+	if /usr/sbin/squid -v | grep -q "\--enable-epoll" ; then
+		upprocval /proc/sys/fs/epoll/max_user_watches $minimal_file_max
 	fi
 	ulimit -n $SQUID_MAXFD
 }
diff --git a/net-proxy/squid/files/squid.initd-logrotate b/net-proxy/squid/files/squid.initd-logrotate
index 6c3e719e85f1..3a802bfec348 100644
--- a/net-proxy/squid/files/squid.initd-logrotate
+++ b/net-proxy/squid/files/squid.initd-logrotate
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.8 2008/11/30 19:20:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.9 2009/08/16 11:01:46 mrness Exp $
 
 opts="${opts} reload"
 
@@ -9,15 +9,21 @@ depend() {
 	need net
 }
 
+upprocval() {
+	[ -f $1 ] || return 0
+	if [ `cat $1` -lt $2 ]; then
+		echo $2 > $1
+	fi
+}
+
 # Try to increase the # of filedescriptors we can open.
 maxfds() {
 	[ -n "$SQUID_MAXFD" ] || return
-	[ -f /proc/sys/fs/file-max ] || return 0
 	[ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192
-	local global_file_max=`cat /proc/sys/fs/file-max`
 	local minimal_file_max=$(($SQUID_MAXFD + 4096))
-	if [ "$global_file_max" -lt $minimal_file_max ]; then
-		echo $minimal_file_max > /proc/sys/fs/file-max
+	upprocval /proc/sys/fs/file-max $minimal_file_max
+	if /usr/sbin/squid -v | grep -q "\--enable-epoll" ; then
+		upprocval /proc/sys/fs/epoll/max_user_watches $minimal_file_max
 	fi
 	ulimit -n $SQUID_MAXFD
 }
diff --git a/net-proxy/squid/squid-2.7.6-r1.ebuild b/net-proxy/squid/squid-2.7.6-r1.ebuild
index f5852b009c36..365e4dced1e1 100644
--- a/net-proxy/squid/squid-2.7.6-r1.ebuild
+++ b/net-proxy/squid/squid-2.7.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.6-r1.ebuild,v 1.9 2009/07/23 06:57:45 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.6-r1.ebuild,v 1.10 2009/08/16 11:01:46 mrness Exp $
 
 EAPI="2"
 
@@ -24,7 +24,7 @@ IUSE="caps pam ldap samba sasl kerberos nis ssl snmp selinux logrotate \
 	mysql postgres sqlite \
 	zero-penalty-hit \
 	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux epoll"
+	elibc_uclibc kernel_linux +epoll"
 
 DEPEND="caps? ( >=sys-libs/libcap-2.16 )
 	pam? ( virtual/pam )
diff --git a/net-proxy/squid/squid-3.0.18.ebuild b/net-proxy/squid/squid-3.0.18.ebuild
index 553ab8807bb0..f78bbc813ed2 100644
--- a/net-proxy/squid/squid-3.0.18.ebuild
+++ b/net-proxy/squid/squid-3.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.18.ebuild,v 1.7 2009/08/14 14:11:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.18.ebuild,v 1.8 2009/08/16 11:01:46 mrness Exp $
 
 EAPI="2"
 
@@ -25,7 +25,7 @@ IUSE="caps pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client
 	mysql postgres sqlite \
 	zero-penalty-hit \
 	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux epoll"
+	elibc_uclibc kernel_linux +epoll"
 
 DEPEND="caps? ( >=sys-libs/libcap-2.16 )
 	pam? ( virtual/pam )
diff --git a/net-proxy/squid/squid-3.1.0.13_beta.ebuild b/net-proxy/squid/squid-3.1.0.13_beta.ebuild
index 54340272a226..ce520ae81ce2 100644
--- a/net-proxy/squid/squid-3.1.0.13_beta.ebuild
+++ b/net-proxy/squid/squid-3.1.0.13_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.13_beta.ebuild,v 1.1 2009/08/06 22:52:30 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.13_beta.ebuild,v 1.2 2009/08/16 11:01:46 mrness Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-cl
 	mysql postgres sqlite \
 	zero-penalty-hit \
 	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux epoll"
+	elibc_uclibc kernel_linux +epoll"
 
 COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
 	pam? ( virtual/pam )