From owner-svn-src-stable@FreeBSD.ORG Sun May 12 00:35:58 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DE2E03A6; Sun, 12 May 2013 00:35:58 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D08E714C; Sun, 12 May 2013 00:35:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C0ZwQO043273; Sun, 12 May 2013 00:35:58 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C0Zw0H043272; Sun, 12 May 2013 00:35:58 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201305120035.r4C0Zw0H043272@svn.freebsd.org> From: Brooks Davis Date: Sun, 12 May 2013 00:35:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250534 - stable/9/cddl/lib/drti X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 00:35:58 -0000 Author: brooks Date: Sun May 12 00:35:57 2013 New Revision: 250534 URL: http://svnweb.freebsd.org/changeset/base/250534 Log: MFC r250337 Work around the implementation of LIBRARIES_ONLY. It causes drti.o to not be installed in /usr/lib32 on systems with compat-32 support. This fix has two parts. First, the build is forced by linking drti.o into a dummy internal library. Second, the object file is installed manually in the LIBRARIES_ONLY case. Modified: stable/9/cddl/lib/drti/Makefile Directory Properties: stable/9/cddl/lib/drti/ (props changed) Modified: stable/9/cddl/lib/drti/Makefile ============================================================================== --- stable/9/cddl/lib/drti/Makefile Sat May 11 23:55:43 2013 (r250533) +++ stable/9/cddl/lib/drti/Makefile Sun May 12 00:35:57 2013 (r250534) @@ -9,6 +9,8 @@ FILESGRP= ${LIBGRP} FILESMODE= ${LIBMODE} FILESDIR= ${LIBDIR}/dtrace CLEANFILES= ${FILES} +LIB= drti-dummy +INTERNALLIB= CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -18,4 +20,10 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ -DPIC ${PICFLAG} +.if make(install) && defined(LIBRARIES_ONLY) +install: + ${INSTALL} -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \ + ${FILES} ${DESTDIR}${FILESDIR} +.endif + .include From owner-svn-src-stable@FreeBSD.ORG Sun May 12 01:37:56 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6C73B772; Sun, 12 May 2013 01:37:56 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5E96B301; Sun, 12 May 2013 01:37:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1buCG065132; Sun, 12 May 2013 01:37:56 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1buw4065131; Sun, 12 May 2013 01:37:56 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305120137.r4C1buw4065131@svn.freebsd.org> From: Eitan Adler Date: Sun, 12 May 2013 01:37:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250541 - stable/9/share/examples/BSD_daemon X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 01:37:56 -0000 Author: eadler Date: Sun May 12 01:37:55 2013 New Revision: 250541 URL: http://svnweb.freebsd.org/changeset/base/250541 Log: MFC r250012: Add an alternate version of beastie to the examples directory. PR: docs/38556 Added: stable/9/share/examples/BSD_daemon/beastie2.eps - copied unchanged from r250012, head/share/examples/BSD_daemon/beastie2.eps Modified: stable/9/share/examples/BSD_daemon/README Directory Properties: stable/9/share/ (props changed) stable/9/share/examples/ (props changed) Modified: stable/9/share/examples/BSD_daemon/README ============================================================================== --- stable/9/share/examples/BSD_daemon/README Sun May 12 01:29:18 2013 (r250540) +++ stable/9/share/examples/BSD_daemon/README Sun May 12 01:37:55 2013 (r250541) @@ -35,6 +35,10 @@ beastie.eps Before committing this, clean out the comment brought over from the .fig file to avoid Dollar-FreeBSD-Dollar junk +beastie2.eps + Written by Rahul Siddharthan beaste2.eps is a + smaller, simpler version of the beastie eps graphic. + eps.patch Add some comments about tweakables in the .eps file and set the linecaps to round to improve visual appearance. Copied: stable/9/share/examples/BSD_daemon/beastie2.eps (from r250012, head/share/examples/BSD_daemon/beastie2.eps) ============================================================================== Binary file (source and/or target). No diff available. From owner-svn-src-stable@FreeBSD.ORG Sun May 12 01:38:02 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8C9AF878; Sun, 12 May 2013 01:38:02 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 69B67303; Sun, 12 May 2013 01:38:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1c2LL065220; Sun, 12 May 2013 01:38:02 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1c2sb065218; Sun, 12 May 2013 01:38:02 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305120138.r4C1c2sb065218@svn.freebsd.org> From: Eitan Adler Date: Sun, 12 May 2013 01:38:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250542 - stable/8/share/examples/BSD_daemon X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 01:38:02 -0000 Author: eadler Date: Sun May 12 01:38:01 2013 New Revision: 250542 URL: http://svnweb.freebsd.org/changeset/base/250542 Log: MFC r250012: Add an alternate version of beastie to the examples directory. PR: docs/38556 Added: stable/8/share/examples/BSD_daemon/beastie2.eps - copied unchanged from r250012, head/share/examples/BSD_daemon/beastie2.eps Modified: stable/8/share/examples/BSD_daemon/README Directory Properties: stable/8/share/ (props changed) stable/8/share/examples/ (props changed) Modified: stable/8/share/examples/BSD_daemon/README ============================================================================== --- stable/8/share/examples/BSD_daemon/README Sun May 12 01:37:55 2013 (r250541) +++ stable/8/share/examples/BSD_daemon/README Sun May 12 01:38:01 2013 (r250542) @@ -35,6 +35,10 @@ beastie.eps Before committing this, clean out the comment brought over from the .fig file to avoid Dollar-FreeBSD-Dollar junk +beastie2.eps + Written by Rahul Siddharthan beaste2.eps is a + smaller, simpler version of the beastie eps graphic. + eps.patch Add some comments about tweakables in the .eps file and set the linecaps to round to improve visual appearance. Copied: stable/8/share/examples/BSD_daemon/beastie2.eps (from r250012, head/share/examples/BSD_daemon/beastie2.eps) ============================================================================== Binary file (source and/or target). No diff available. From owner-svn-src-stable@FreeBSD.ORG Sun May 12 01:53:48 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 6AB50F0D; Sun, 12 May 2013 01:53:48 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5ABE1378; Sun, 12 May 2013 01:53:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1rmaZ071373; Sun, 12 May 2013 01:53:48 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1rmXY071372; Sun, 12 May 2013 01:53:48 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201305120153.r4C1rmXY071372@svn.freebsd.org> From: Peter Wemm Date: Sun, 12 May 2013 01:53:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-other@freebsd.org Subject: svn commit: r250544 - head/sys/amd64/compile head/sys/amd64/conf head/sys/arm/compile head/sys/arm/conf head/sys/i386/compile head/sys/i386/conf head/sys/ia64/compile head/sys/ia64/conf head/sys/mi... X-SVN-Group: stable-other MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 01:53:48 -0000 Author: peter Date: Sun May 12 01:53:47 2013 New Revision: 250544 URL: http://svnweb.freebsd.org/changeset/base/250544 Log: Tidy up some CVS workarounds. Deleted: stable/3/sys/compile/.keep_me stable/4/sys/compile/.keep_me stable/5/crypto/openssh/.cvsignore stable/5/crypto/openssh/openbsd-compat/.cvsignore stable/5/crypto/openssh/scard/.cvsignore stable/5/sys/alpha/compile/.cvsignore stable/5/sys/amd64/compile/.cvsignore stable/5/sys/i386/compile/.cvsignore stable/5/sys/ia64/compile/.cvsignore stable/5/sys/pc98/compile/.cvsignore stable/5/sys/sparc64/compile/.cvsignore stable/5/tools/regression/geom_uzip/.cvsignore Changes in other areas also in this revision: Deleted: head/sys/amd64/compile/.cvsignore head/sys/amd64/conf/.cvsignore head/sys/arm/compile/.cvsignore head/sys/arm/conf/.cvsignore head/sys/i386/compile/.cvsignore head/sys/i386/conf/.cvsignore head/sys/ia64/compile/.cvsignore head/sys/ia64/conf/.cvsignore head/sys/mips/compile/.cvsignore head/sys/mips/conf/.cvsignore head/sys/pc98/compile/.cvsignore head/sys/pc98/conf/.cvsignore head/sys/powerpc/compile/.cvsignore head/sys/powerpc/conf/.cvsignore head/sys/sparc64/compile/.cvsignore head/sys/sparc64/conf/.cvsignore head/tools/regression/geom_uzip/.cvsignore stable/2.0.5/sys/compile/.keep_me stable/2.1/sys/compile/.keep_me stable/2.2/sys/compile/.keep_me stable/6/sys/alpha/compile/.cvsignore stable/6/sys/alpha/conf/.cvsignore stable/6/sys/amd64/compile/.cvsignore stable/6/sys/amd64/conf/.cvsignore stable/6/sys/arm/compile/.cvsignore stable/6/sys/arm/conf/.cvsignore stable/6/sys/i386/compile/.cvsignore stable/6/sys/i386/conf/.cvsignore stable/6/sys/ia64/compile/.cvsignore stable/6/sys/ia64/conf/.cvsignore stable/6/sys/pc98/compile/.cvsignore stable/6/sys/pc98/conf/.cvsignore stable/6/sys/powerpc/compile/.cvsignore stable/6/sys/powerpc/conf/.cvsignore stable/6/sys/sparc64/compile/.cvsignore stable/6/sys/sparc64/conf/.cvsignore stable/6/tools/regression/geom_uzip/.cvsignore stable/7/sys/amd64/compile/.cvsignore stable/7/sys/amd64/conf/.cvsignore stable/7/sys/arm/compile/.cvsignore stable/7/sys/arm/conf/.cvsignore stable/7/sys/i386/compile/.cvsignore stable/7/sys/i386/conf/.cvsignore stable/7/sys/ia64/compile/.cvsignore stable/7/sys/ia64/conf/.cvsignore stable/7/sys/pc98/compile/.cvsignore stable/7/sys/pc98/conf/.cvsignore stable/7/sys/powerpc/compile/.cvsignore stable/7/sys/powerpc/conf/.cvsignore stable/7/sys/sparc64/compile/.cvsignore stable/7/sys/sparc64/conf/.cvsignore stable/7/sys/sun4v/compile/.cvsignore stable/7/sys/sun4v/conf/.cvsignore stable/7/tools/regression/geom_uzip/.cvsignore stable/8/sys/amd64/compile/.cvsignore stable/8/sys/amd64/conf/.cvsignore stable/8/sys/arm/compile/.cvsignore stable/8/sys/arm/conf/.cvsignore stable/8/sys/i386/compile/.cvsignore stable/8/sys/i386/conf/.cvsignore stable/8/sys/ia64/compile/.cvsignore stable/8/sys/ia64/conf/.cvsignore stable/8/sys/mips/compile/.cvsignore stable/8/sys/mips/conf/.cvsignore stable/8/sys/pc98/compile/.cvsignore stable/8/sys/pc98/conf/.cvsignore stable/8/sys/powerpc/compile/.cvsignore stable/8/sys/powerpc/conf/.cvsignore stable/8/sys/sparc64/compile/.cvsignore stable/8/sys/sparc64/conf/.cvsignore stable/8/sys/sun4v/compile/.cvsignore stable/8/sys/sun4v/conf/.cvsignore stable/8/tools/regression/geom_uzip/.cvsignore stable/9/sys/amd64/compile/.cvsignore stable/9/sys/amd64/conf/.cvsignore stable/9/sys/arm/compile/.cvsignore stable/9/sys/arm/conf/.cvsignore stable/9/sys/i386/compile/.cvsignore stable/9/sys/i386/conf/.cvsignore stable/9/sys/ia64/compile/.cvsignore stable/9/sys/ia64/conf/.cvsignore stable/9/sys/mips/compile/.cvsignore stable/9/sys/mips/conf/.cvsignore stable/9/sys/pc98/compile/.cvsignore stable/9/sys/pc98/conf/.cvsignore stable/9/sys/powerpc/compile/.cvsignore stable/9/sys/powerpc/conf/.cvsignore stable/9/sys/sparc64/compile/.cvsignore stable/9/sys/sparc64/conf/.cvsignore stable/9/tools/regression/geom_uzip/.cvsignore From owner-svn-src-stable@FreeBSD.ORG Sun May 12 01:53:48 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id BF5F8F0E; Sun, 12 May 2013 01:53:48 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AFC4C379; Sun, 12 May 2013 01:53:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1rmN5071378; Sun, 12 May 2013 01:53:48 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1rmn6071377; Sun, 12 May 2013 01:53:48 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201305120153.r4C1rmn6071377@svn.freebsd.org> From: Peter Wemm Date: Sun, 12 May 2013 01:53:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org Subject: svn commit: r250544 - head/sys/amd64/compile head/sys/amd64/conf head/sys/arm/compile head/sys/arm/conf head/sys/i386/compile head/sys/i386/conf head/sys/ia64/compile head/sys/ia64/conf head/sys/mi... X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 01:53:48 -0000 Author: peter Date: Sun May 12 01:53:47 2013 New Revision: 250544 URL: http://svnweb.freebsd.org/changeset/base/250544 Log: Tidy up some CVS workarounds. Deleted: stable/6/sys/alpha/compile/.cvsignore stable/6/sys/alpha/conf/.cvsignore stable/6/sys/amd64/compile/.cvsignore stable/6/sys/amd64/conf/.cvsignore stable/6/sys/arm/compile/.cvsignore stable/6/sys/arm/conf/.cvsignore stable/6/sys/i386/compile/.cvsignore stable/6/sys/i386/conf/.cvsignore stable/6/sys/ia64/compile/.cvsignore stable/6/sys/ia64/conf/.cvsignore stable/6/sys/pc98/compile/.cvsignore stable/6/sys/pc98/conf/.cvsignore stable/6/sys/powerpc/compile/.cvsignore stable/6/sys/powerpc/conf/.cvsignore stable/6/sys/sparc64/compile/.cvsignore stable/6/sys/sparc64/conf/.cvsignore stable/6/tools/regression/geom_uzip/.cvsignore Changes in other areas also in this revision: Deleted: head/sys/amd64/compile/.cvsignore head/sys/amd64/conf/.cvsignore head/sys/arm/compile/.cvsignore head/sys/arm/conf/.cvsignore head/sys/i386/compile/.cvsignore head/sys/i386/conf/.cvsignore head/sys/ia64/compile/.cvsignore head/sys/ia64/conf/.cvsignore head/sys/mips/compile/.cvsignore head/sys/mips/conf/.cvsignore head/sys/pc98/compile/.cvsignore head/sys/pc98/conf/.cvsignore head/sys/powerpc/compile/.cvsignore head/sys/powerpc/conf/.cvsignore head/sys/sparc64/compile/.cvsignore head/sys/sparc64/conf/.cvsignore head/tools/regression/geom_uzip/.cvsignore stable/2.0.5/sys/compile/.keep_me stable/2.1/sys/compile/.keep_me stable/2.2/sys/compile/.keep_me stable/3/sys/compile/.keep_me stable/4/sys/compile/.keep_me stable/5/crypto/openssh/.cvsignore stable/5/crypto/openssh/openbsd-compat/.cvsignore stable/5/crypto/openssh/scard/.cvsignore stable/5/sys/alpha/compile/.cvsignore stable/5/sys/amd64/compile/.cvsignore stable/5/sys/i386/compile/.cvsignore stable/5/sys/ia64/compile/.cvsignore stable/5/sys/pc98/compile/.cvsignore stable/5/sys/sparc64/compile/.cvsignore stable/5/tools/regression/geom_uzip/.cvsignore stable/7/sys/amd64/compile/.cvsignore stable/7/sys/amd64/conf/.cvsignore stable/7/sys/arm/compile/.cvsignore stable/7/sys/arm/conf/.cvsignore stable/7/sys/i386/compile/.cvsignore stable/7/sys/i386/conf/.cvsignore stable/7/sys/ia64/compile/.cvsignore stable/7/sys/ia64/conf/.cvsignore stable/7/sys/pc98/compile/.cvsignore stable/7/sys/pc98/conf/.cvsignore stable/7/sys/powerpc/compile/.cvsignore stable/7/sys/powerpc/conf/.cvsignore stable/7/sys/sparc64/compile/.cvsignore stable/7/sys/sparc64/conf/.cvsignore stable/7/sys/sun4v/compile/.cvsignore stable/7/sys/sun4v/conf/.cvsignore stable/7/tools/regression/geom_uzip/.cvsignore stable/8/sys/amd64/compile/.cvsignore stable/8/sys/amd64/conf/.cvsignore stable/8/sys/arm/compile/.cvsignore stable/8/sys/arm/conf/.cvsignore stable/8/sys/i386/compile/.cvsignore stable/8/sys/i386/conf/.cvsignore stable/8/sys/ia64/compile/.cvsignore stable/8/sys/ia64/conf/.cvsignore stable/8/sys/mips/compile/.cvsignore stable/8/sys/mips/conf/.cvsignore stable/8/sys/pc98/compile/.cvsignore stable/8/sys/pc98/conf/.cvsignore stable/8/sys/powerpc/compile/.cvsignore stable/8/sys/powerpc/conf/.cvsignore stable/8/sys/sparc64/compile/.cvsignore stable/8/sys/sparc64/conf/.cvsignore stable/8/sys/sun4v/compile/.cvsignore stable/8/sys/sun4v/conf/.cvsignore stable/8/tools/regression/geom_uzip/.cvsignore stable/9/sys/amd64/compile/.cvsignore stable/9/sys/amd64/conf/.cvsignore stable/9/sys/arm/compile/.cvsignore stable/9/sys/arm/conf/.cvsignore stable/9/sys/i386/compile/.cvsignore stable/9/sys/i386/conf/.cvsignore stable/9/sys/ia64/compile/.cvsignore stable/9/sys/ia64/conf/.cvsignore stable/9/sys/mips/compile/.cvsignore stable/9/sys/mips/conf/.cvsignore stable/9/sys/pc98/compile/.cvsignore stable/9/sys/pc98/conf/.cvsignore stable/9/sys/powerpc/compile/.cvsignore stable/9/sys/powerpc/conf/.cvsignore stable/9/sys/sparc64/compile/.cvsignore stable/9/sys/sparc64/conf/.cvsignore stable/9/tools/regression/geom_uzip/.cvsignore From owner-svn-src-stable@FreeBSD.ORG Sun May 12 01:53:49 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1FB6AF0F; Sun, 12 May 2013 01:53:49 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 100F537A; Sun, 12 May 2013 01:53:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1rmZ9071385; Sun, 12 May 2013 01:53:48 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1rmhU071383; Sun, 12 May 2013 01:53:48 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201305120153.r4C1rmhU071383@svn.freebsd.org> From: Peter Wemm Date: Sun, 12 May 2013 01:53:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r250544 - head/sys/amd64/compile head/sys/amd64/conf head/sys/arm/compile head/sys/arm/conf head/sys/i386/compile head/sys/i386/conf head/sys/ia64/compile head/sys/ia64/conf head/sys/mi... X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 01:53:49 -0000 Author: peter Date: Sun May 12 01:53:47 2013 New Revision: 250544 URL: http://svnweb.freebsd.org/changeset/base/250544 Log: Tidy up some CVS workarounds. Deleted: stable/7/sys/amd64/compile/.cvsignore stable/7/sys/amd64/conf/.cvsignore stable/7/sys/arm/compile/.cvsignore stable/7/sys/arm/conf/.cvsignore stable/7/sys/i386/compile/.cvsignore stable/7/sys/i386/conf/.cvsignore stable/7/sys/ia64/compile/.cvsignore stable/7/sys/ia64/conf/.cvsignore stable/7/sys/pc98/compile/.cvsignore stable/7/sys/pc98/conf/.cvsignore stable/7/sys/powerpc/compile/.cvsignore stable/7/sys/powerpc/conf/.cvsignore stable/7/sys/sparc64/compile/.cvsignore stable/7/sys/sparc64/conf/.cvsignore stable/7/sys/sun4v/compile/.cvsignore stable/7/sys/sun4v/conf/.cvsignore stable/7/tools/regression/geom_uzip/.cvsignore Changes in other areas also in this revision: Deleted: head/sys/amd64/compile/.cvsignore head/sys/amd64/conf/.cvsignore head/sys/arm/compile/.cvsignore head/sys/arm/conf/.cvsignore head/sys/i386/compile/.cvsignore head/sys/i386/conf/.cvsignore head/sys/ia64/compile/.cvsignore head/sys/ia64/conf/.cvsignore head/sys/mips/compile/.cvsignore head/sys/mips/conf/.cvsignore head/sys/pc98/compile/.cvsignore head/sys/pc98/conf/.cvsignore head/sys/powerpc/compile/.cvsignore head/sys/powerpc/conf/.cvsignore head/sys/sparc64/compile/.cvsignore head/sys/sparc64/conf/.cvsignore head/tools/regression/geom_uzip/.cvsignore stable/2.0.5/sys/compile/.keep_me stable/2.1/sys/compile/.keep_me stable/2.2/sys/compile/.keep_me stable/3/sys/compile/.keep_me stable/4/sys/compile/.keep_me stable/5/crypto/openssh/.cvsignore stable/5/crypto/openssh/openbsd-compat/.cvsignore stable/5/crypto/openssh/scard/.cvsignore stable/5/sys/alpha/compile/.cvsignore stable/5/sys/amd64/compile/.cvsignore stable/5/sys/i386/compile/.cvsignore stable/5/sys/ia64/compile/.cvsignore stable/5/sys/pc98/compile/.cvsignore stable/5/sys/sparc64/compile/.cvsignore stable/5/tools/regression/geom_uzip/.cvsignore stable/6/sys/alpha/compile/.cvsignore stable/6/sys/alpha/conf/.cvsignore stable/6/sys/amd64/compile/.cvsignore stable/6/sys/amd64/conf/.cvsignore stable/6/sys/arm/compile/.cvsignore stable/6/sys/arm/conf/.cvsignore stable/6/sys/i386/compile/.cvsignore stable/6/sys/i386/conf/.cvsignore stable/6/sys/ia64/compile/.cvsignore stable/6/sys/ia64/conf/.cvsignore stable/6/sys/pc98/compile/.cvsignore stable/6/sys/pc98/conf/.cvsignore stable/6/sys/powerpc/compile/.cvsignore stable/6/sys/powerpc/conf/.cvsignore stable/6/sys/sparc64/compile/.cvsignore stable/6/sys/sparc64/conf/.cvsignore stable/6/tools/regression/geom_uzip/.cvsignore stable/8/sys/amd64/compile/.cvsignore stable/8/sys/amd64/conf/.cvsignore stable/8/sys/arm/compile/.cvsignore stable/8/sys/arm/conf/.cvsignore stable/8/sys/i386/compile/.cvsignore stable/8/sys/i386/conf/.cvsignore stable/8/sys/ia64/compile/.cvsignore stable/8/sys/ia64/conf/.cvsignore stable/8/sys/mips/compile/.cvsignore stable/8/sys/mips/conf/.cvsignore stable/8/sys/pc98/compile/.cvsignore stable/8/sys/pc98/conf/.cvsignore stable/8/sys/powerpc/compile/.cvsignore stable/8/sys/powerpc/conf/.cvsignore stable/8/sys/sparc64/compile/.cvsignore stable/8/sys/sparc64/conf/.cvsignore stable/8/sys/sun4v/compile/.cvsignore stable/8/sys/sun4v/conf/.cvsignore stable/8/tools/regression/geom_uzip/.cvsignore stable/9/sys/amd64/compile/.cvsignore stable/9/sys/amd64/conf/.cvsignore stable/9/sys/arm/compile/.cvsignore stable/9/sys/arm/conf/.cvsignore stable/9/sys/i386/compile/.cvsignore stable/9/sys/i386/conf/.cvsignore stable/9/sys/ia64/compile/.cvsignore stable/9/sys/ia64/conf/.cvsignore stable/9/sys/mips/compile/.cvsignore stable/9/sys/mips/conf/.cvsignore stable/9/sys/pc98/compile/.cvsignore stable/9/sys/pc98/conf/.cvsignore stable/9/sys/powerpc/compile/.cvsignore stable/9/sys/powerpc/conf/.cvsignore stable/9/sys/sparc64/compile/.cvsignore stable/9/sys/sparc64/conf/.cvsignore stable/9/tools/regression/geom_uzip/.cvsignore From owner-svn-src-stable@FreeBSD.ORG Sun May 12 01:53:49 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 72222F10; Sun, 12 May 2013 01:53:49 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 62A7F37B; Sun, 12 May 2013 01:53:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1rndl071391; Sun, 12 May 2013 01:53:49 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1rnHe071390; Sun, 12 May 2013 01:53:49 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201305120153.r4C1rnHe071390@svn.freebsd.org> From: Peter Wemm Date: Sun, 12 May 2013 01:53:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250544 - head/sys/amd64/compile head/sys/amd64/conf head/sys/arm/compile head/sys/arm/conf head/sys/i386/compile head/sys/i386/conf head/sys/ia64/compile head/sys/ia64/conf head/sys/mi... X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 01:53:49 -0000 Author: peter Date: Sun May 12 01:53:47 2013 New Revision: 250544 URL: http://svnweb.freebsd.org/changeset/base/250544 Log: Tidy up some CVS workarounds. Deleted: stable/8/sys/amd64/compile/.cvsignore stable/8/sys/amd64/conf/.cvsignore stable/8/sys/arm/compile/.cvsignore stable/8/sys/arm/conf/.cvsignore stable/8/sys/i386/compile/.cvsignore stable/8/sys/i386/conf/.cvsignore stable/8/sys/ia64/compile/.cvsignore stable/8/sys/ia64/conf/.cvsignore stable/8/sys/mips/compile/.cvsignore stable/8/sys/mips/conf/.cvsignore stable/8/sys/pc98/compile/.cvsignore stable/8/sys/pc98/conf/.cvsignore stable/8/sys/powerpc/compile/.cvsignore stable/8/sys/powerpc/conf/.cvsignore stable/8/sys/sparc64/compile/.cvsignore stable/8/sys/sparc64/conf/.cvsignore stable/8/sys/sun4v/compile/.cvsignore stable/8/sys/sun4v/conf/.cvsignore stable/8/tools/regression/geom_uzip/.cvsignore Changes in other areas also in this revision: Deleted: head/sys/amd64/compile/.cvsignore head/sys/amd64/conf/.cvsignore head/sys/arm/compile/.cvsignore head/sys/arm/conf/.cvsignore head/sys/i386/compile/.cvsignore head/sys/i386/conf/.cvsignore head/sys/ia64/compile/.cvsignore head/sys/ia64/conf/.cvsignore head/sys/mips/compile/.cvsignore head/sys/mips/conf/.cvsignore head/sys/pc98/compile/.cvsignore head/sys/pc98/conf/.cvsignore head/sys/powerpc/compile/.cvsignore head/sys/powerpc/conf/.cvsignore head/sys/sparc64/compile/.cvsignore head/sys/sparc64/conf/.cvsignore head/tools/regression/geom_uzip/.cvsignore stable/2.0.5/sys/compile/.keep_me stable/2.1/sys/compile/.keep_me stable/2.2/sys/compile/.keep_me stable/3/sys/compile/.keep_me stable/4/sys/compile/.keep_me stable/5/crypto/openssh/.cvsignore stable/5/crypto/openssh/openbsd-compat/.cvsignore stable/5/crypto/openssh/scard/.cvsignore stable/5/sys/alpha/compile/.cvsignore stable/5/sys/amd64/compile/.cvsignore stable/5/sys/i386/compile/.cvsignore stable/5/sys/ia64/compile/.cvsignore stable/5/sys/pc98/compile/.cvsignore stable/5/sys/sparc64/compile/.cvsignore stable/5/tools/regression/geom_uzip/.cvsignore stable/6/sys/alpha/compile/.cvsignore stable/6/sys/alpha/conf/.cvsignore stable/6/sys/amd64/compile/.cvsignore stable/6/sys/amd64/conf/.cvsignore stable/6/sys/arm/compile/.cvsignore stable/6/sys/arm/conf/.cvsignore stable/6/sys/i386/compile/.cvsignore stable/6/sys/i386/conf/.cvsignore stable/6/sys/ia64/compile/.cvsignore stable/6/sys/ia64/conf/.cvsignore stable/6/sys/pc98/compile/.cvsignore stable/6/sys/pc98/conf/.cvsignore stable/6/sys/powerpc/compile/.cvsignore stable/6/sys/powerpc/conf/.cvsignore stable/6/sys/sparc64/compile/.cvsignore stable/6/sys/sparc64/conf/.cvsignore stable/6/tools/regression/geom_uzip/.cvsignore stable/7/sys/amd64/compile/.cvsignore stable/7/sys/amd64/conf/.cvsignore stable/7/sys/arm/compile/.cvsignore stable/7/sys/arm/conf/.cvsignore stable/7/sys/i386/compile/.cvsignore stable/7/sys/i386/conf/.cvsignore stable/7/sys/ia64/compile/.cvsignore stable/7/sys/ia64/conf/.cvsignore stable/7/sys/pc98/compile/.cvsignore stable/7/sys/pc98/conf/.cvsignore stable/7/sys/powerpc/compile/.cvsignore stable/7/sys/powerpc/conf/.cvsignore stable/7/sys/sparc64/compile/.cvsignore stable/7/sys/sparc64/conf/.cvsignore stable/7/sys/sun4v/compile/.cvsignore stable/7/sys/sun4v/conf/.cvsignore stable/7/tools/regression/geom_uzip/.cvsignore stable/9/sys/amd64/compile/.cvsignore stable/9/sys/amd64/conf/.cvsignore stable/9/sys/arm/compile/.cvsignore stable/9/sys/arm/conf/.cvsignore stable/9/sys/i386/compile/.cvsignore stable/9/sys/i386/conf/.cvsignore stable/9/sys/ia64/compile/.cvsignore stable/9/sys/ia64/conf/.cvsignore stable/9/sys/mips/compile/.cvsignore stable/9/sys/mips/conf/.cvsignore stable/9/sys/pc98/compile/.cvsignore stable/9/sys/pc98/conf/.cvsignore stable/9/sys/powerpc/compile/.cvsignore stable/9/sys/powerpc/conf/.cvsignore stable/9/sys/sparc64/compile/.cvsignore stable/9/sys/sparc64/conf/.cvsignore stable/9/tools/regression/geom_uzip/.cvsignore From owner-svn-src-stable@FreeBSD.ORG Sun May 12 01:53:49 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C54E7F11; Sun, 12 May 2013 01:53:49 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B5DC637C; Sun, 12 May 2013 01:53:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1rnYV071398; Sun, 12 May 2013 01:53:49 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1rnqF071397; Sun, 12 May 2013 01:53:49 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201305120153.r4C1rnqF071397@svn.freebsd.org> From: Peter Wemm Date: Sun, 12 May 2013 01:53:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250544 - head/sys/amd64/compile head/sys/amd64/conf head/sys/arm/compile head/sys/arm/conf head/sys/i386/compile head/sys/i386/conf head/sys/ia64/compile head/sys/ia64/conf head/sys/mi... X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 01:53:49 -0000 Author: peter Date: Sun May 12 01:53:47 2013 New Revision: 250544 URL: http://svnweb.freebsd.org/changeset/base/250544 Log: Tidy up some CVS workarounds. Deleted: stable/9/sys/amd64/compile/.cvsignore stable/9/sys/amd64/conf/.cvsignore stable/9/sys/arm/compile/.cvsignore stable/9/sys/arm/conf/.cvsignore stable/9/sys/i386/compile/.cvsignore stable/9/sys/i386/conf/.cvsignore stable/9/sys/ia64/compile/.cvsignore stable/9/sys/ia64/conf/.cvsignore stable/9/sys/mips/compile/.cvsignore stable/9/sys/mips/conf/.cvsignore stable/9/sys/pc98/compile/.cvsignore stable/9/sys/pc98/conf/.cvsignore stable/9/sys/powerpc/compile/.cvsignore stable/9/sys/powerpc/conf/.cvsignore stable/9/sys/sparc64/compile/.cvsignore stable/9/sys/sparc64/conf/.cvsignore stable/9/tools/regression/geom_uzip/.cvsignore Changes in other areas also in this revision: Deleted: head/sys/amd64/compile/.cvsignore head/sys/amd64/conf/.cvsignore head/sys/arm/compile/.cvsignore head/sys/arm/conf/.cvsignore head/sys/i386/compile/.cvsignore head/sys/i386/conf/.cvsignore head/sys/ia64/compile/.cvsignore head/sys/ia64/conf/.cvsignore head/sys/mips/compile/.cvsignore head/sys/mips/conf/.cvsignore head/sys/pc98/compile/.cvsignore head/sys/pc98/conf/.cvsignore head/sys/powerpc/compile/.cvsignore head/sys/powerpc/conf/.cvsignore head/sys/sparc64/compile/.cvsignore head/sys/sparc64/conf/.cvsignore head/tools/regression/geom_uzip/.cvsignore stable/2.0.5/sys/compile/.keep_me stable/2.1/sys/compile/.keep_me stable/2.2/sys/compile/.keep_me stable/3/sys/compile/.keep_me stable/4/sys/compile/.keep_me stable/5/crypto/openssh/.cvsignore stable/5/crypto/openssh/openbsd-compat/.cvsignore stable/5/crypto/openssh/scard/.cvsignore stable/5/sys/alpha/compile/.cvsignore stable/5/sys/amd64/compile/.cvsignore stable/5/sys/i386/compile/.cvsignore stable/5/sys/ia64/compile/.cvsignore stable/5/sys/pc98/compile/.cvsignore stable/5/sys/sparc64/compile/.cvsignore stable/5/tools/regression/geom_uzip/.cvsignore stable/6/sys/alpha/compile/.cvsignore stable/6/sys/alpha/conf/.cvsignore stable/6/sys/amd64/compile/.cvsignore stable/6/sys/amd64/conf/.cvsignore stable/6/sys/arm/compile/.cvsignore stable/6/sys/arm/conf/.cvsignore stable/6/sys/i386/compile/.cvsignore stable/6/sys/i386/conf/.cvsignore stable/6/sys/ia64/compile/.cvsignore stable/6/sys/ia64/conf/.cvsignore stable/6/sys/pc98/compile/.cvsignore stable/6/sys/pc98/conf/.cvsignore stable/6/sys/powerpc/compile/.cvsignore stable/6/sys/powerpc/conf/.cvsignore stable/6/sys/sparc64/compile/.cvsignore stable/6/sys/sparc64/conf/.cvsignore stable/6/tools/regression/geom_uzip/.cvsignore stable/7/sys/amd64/compile/.cvsignore stable/7/sys/amd64/conf/.cvsignore stable/7/sys/arm/compile/.cvsignore stable/7/sys/arm/conf/.cvsignore stable/7/sys/i386/compile/.cvsignore stable/7/sys/i386/conf/.cvsignore stable/7/sys/ia64/compile/.cvsignore stable/7/sys/ia64/conf/.cvsignore stable/7/sys/pc98/compile/.cvsignore stable/7/sys/pc98/conf/.cvsignore stable/7/sys/powerpc/compile/.cvsignore stable/7/sys/powerpc/conf/.cvsignore stable/7/sys/sparc64/compile/.cvsignore stable/7/sys/sparc64/conf/.cvsignore stable/7/sys/sun4v/compile/.cvsignore stable/7/sys/sun4v/conf/.cvsignore stable/7/tools/regression/geom_uzip/.cvsignore stable/8/sys/amd64/compile/.cvsignore stable/8/sys/amd64/conf/.cvsignore stable/8/sys/arm/compile/.cvsignore stable/8/sys/arm/conf/.cvsignore stable/8/sys/i386/compile/.cvsignore stable/8/sys/i386/conf/.cvsignore stable/8/sys/ia64/compile/.cvsignore stable/8/sys/ia64/conf/.cvsignore stable/8/sys/mips/compile/.cvsignore stable/8/sys/mips/conf/.cvsignore stable/8/sys/pc98/compile/.cvsignore stable/8/sys/pc98/conf/.cvsignore stable/8/sys/powerpc/compile/.cvsignore stable/8/sys/powerpc/conf/.cvsignore stable/8/sys/sparc64/compile/.cvsignore stable/8/sys/sparc64/conf/.cvsignore stable/8/sys/sun4v/compile/.cvsignore stable/8/sys/sun4v/conf/.cvsignore stable/8/tools/regression/geom_uzip/.cvsignore From owner-svn-src-stable@FreeBSD.ORG Sun May 12 04:24:25 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B95661BA; Sun, 12 May 2013 04:24:25 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AC81FA0B; Sun, 12 May 2013 04:24:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C4OPYB025251; Sun, 12 May 2013 04:24:25 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C4OPWH025250; Sun, 12 May 2013 04:24:25 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201305120424.r4C4OPWH025250@svn.freebsd.org> From: Konstantin Belousov Date: Sun, 12 May 2013 04:24:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250552 - stable/9/sys/amd64/amd64 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 04:24:25 -0000 Author: kib Date: Sun May 12 04:24:25 2013 New Revision: 250552 URL: http://svnweb.freebsd.org/changeset/base/250552 Log: MFC r250415: Correct the type for the literal used on the left side of the shift up to 63 bit positions. Do not fill the save area and do not set the saved bit in the xstate bit vector for the state which is not marked as enabled in xsave_mask. Modified: stable/9/sys/amd64/amd64/fpu.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/amd64/amd64/fpu.c ============================================================================== --- stable/9/sys/amd64/amd64/fpu.c Sun May 12 04:05:01 2013 (r250551) +++ stable/9/sys/amd64/amd64/fpu.c Sun May 12 04:24:25 2013 (r250552) @@ -687,8 +687,8 @@ fpugetregs(struct thread *td) offsetof(struct xstate_hdr, xstate_bv)); max_ext_n = flsl(xsave_mask); for (i = 0; i < max_ext_n; i++) { - bit = 1 << i; - if ((*xstate_bv & bit) != 0) + bit = 1ULL << i; + if ((xsave_mask & bit) == 0 || (*xstate_bv & bit) != 0) continue; bcopy((char *)fpu_initialstate + xsave_area_desc[i].offset, From owner-svn-src-stable@FreeBSD.ORG Sun May 12 09:42:18 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 903678BF; Sun, 12 May 2013 09:42:18 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 814CA2C2; Sun, 12 May 2013 09:42:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C9gHpr035727; Sun, 12 May 2013 09:42:17 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C9gHHs035726; Sun, 12 May 2013 09:42:17 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201305120942.r4C9gHHs035726@svn.freebsd.org> From: Jaakko Heinonen Date: Sun, 12 May 2013 09:42:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250558 - stable/9/sys/kern X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 09:42:18 -0000 Author: jh Date: Sun May 12 09:42:17 2013 New Revision: 250558 URL: http://svnweb.freebsd.org/changeset/base/250558 Log: MFC r249650: Include PID in the error message which is printed when the maxproc limit is exceeded. Improve formatting of the message while here. PR: kern/60550 Modified: stable/9/sys/kern/kern_fork.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/kern/kern_fork.c ============================================================================== --- stable/9/sys/kern/kern_fork.c Sun May 12 09:33:33 2013 (r250557) +++ stable/9/sys/kern/kern_fork.c Sun May 12 09:42:17 2013 (r250558) @@ -929,8 +929,8 @@ fork1(struct thread *td, int flags, int fail: sx_sunlock(&proctree_lock); if (ppsratecheck(&lastfail, &curfail, 1)) - printf("maxproc limit exceeded by uid %i, please see tuning(7) and login.conf(5).\n", - td->td_ucred->cr_ruid); + printf("maxproc limit exceeded by uid %u (pid %d); see tuning(7) and login.conf(5)\n", + td->td_ucred->cr_ruid, p1->p_pid); sx_xunlock(&allproc_lock); #ifdef MAC mac_proc_destroy(newproc); From owner-svn-src-stable@FreeBSD.ORG Sun May 12 12:09:09 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2254C204; Sun, 12 May 2013 12:09:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1340C8F4; Sun, 12 May 2013 12:09:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CC98js086040; Sun, 12 May 2013 12:09:08 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CC98VT086039; Sun, 12 May 2013 12:09:08 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201305121209.r4CC98VT086039@svn.freebsd.org> From: Hans Petter Selasky Date: Sun, 12 May 2013 12:09:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250559 - stable/9/sys/dev/usb/controller X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 12:09:09 -0000 Author: hselasky Date: Sun May 12 12:09:08 2013 New Revision: 250559 URL: http://svnweb.freebsd.org/changeset/base/250559 Log: MFC r249725: Add new OHCI controller ID. Modified: stable/9/sys/dev/usb/controller/ohci_pci.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/controller/ohci_pci.c ============================================================================== --- stable/9/sys/dev/usb/controller/ohci_pci.c Sun May 12 09:42:17 2013 (r250558) +++ stable/9/sys/dev/usb/controller/ohci_pci.c Sun May 12 12:09:08 2013 (r250559) @@ -134,6 +134,8 @@ ohci_pci_match(device_t self) return "ATI SB400 USB Controller"; case 0x43971002: return ("AMD SB7x0/SB8x0/SB9x0 USB controller"); + case 0x43981002: + return ("AMD SB7x0/SB8x0/SB9x0 USB controller"); case 0x43991002: return ("AMD SB7x0/SB8x0/SB9x0 USB controller"); From owner-svn-src-stable@FreeBSD.ORG Sun May 12 12:13:24 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C3453393; Sun, 12 May 2013 12:13:24 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9BEBD90B; Sun, 12 May 2013 12:13:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CCDOZw088606; Sun, 12 May 2013 12:13:24 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CCDOl1088602; Sun, 12 May 2013 12:13:24 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201305121213.r4CCDOl1088602@svn.freebsd.org> From: Hans Petter Selasky Date: Sun, 12 May 2013 12:13:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250560 - in stable/9/sys/dev/usb: . controller X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 12:13:24 -0000 Author: hselasky Date: Sun May 12 12:13:23 2013 New Revision: 250560 URL: http://svnweb.freebsd.org/changeset/base/250560 Log: MFC r249795: Add convenience wrapper functions to run callbacks in the context of the USB explore thread. Modified: stable/9/sys/dev/usb/controller/usb_controller.c stable/9/sys/dev/usb/usb_process.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/controller/usb_controller.c ============================================================================== --- stable/9/sys/dev/usb/controller/usb_controller.c Sun May 12 12:09:08 2013 (r250559) +++ stable/9/sys/dev/usb/controller/usb_controller.c Sun May 12 12:13:23 2013 (r250560) @@ -877,3 +877,28 @@ usb_bus_mem_free_all(struct usb_bus *bus mtx_destroy(&bus->bus_mtx); } + +/* convenience wrappers */ +void +usb_proc_explore_mwait(struct usb_device *udev, void *pm1, void *pm2) +{ + usb_proc_mwait(&udev->bus->explore_proc, pm1, pm2); +} + +void * +usb_proc_explore_msignal(struct usb_device *udev, void *pm1, void *pm2) +{ + return (usb_proc_msignal(&udev->bus->explore_proc, pm1, pm2)); +} + +void +usb_proc_explore_lock(struct usb_device *udev) +{ + USB_BUS_LOCK(udev->bus); +} + +void +usb_proc_explore_unlock(struct usb_device *udev) +{ + USB_BUS_UNLOCK(udev->bus); +} Modified: stable/9/sys/dev/usb/usb_process.h ============================================================================== --- stable/9/sys/dev/usb/usb_process.h Sun May 12 12:09:08 2013 (r250559) +++ stable/9/sys/dev/usb/usb_process.h Sun May 12 12:13:23 2013 (r250560) @@ -42,6 +42,7 @@ /* structure prototypes */ struct usb_proc_msg; +struct usb_device; /* * The following structure defines the USB process. @@ -79,4 +80,9 @@ void usb_proc_free(struct usb_process *u void *usb_proc_msignal(struct usb_process *up, void *pm0, void *pm1); void usb_proc_rewakeup(struct usb_process *up); +void usb_proc_explore_mwait(struct usb_device *, void *, void *); +void *usb_proc_explore_msignal(struct usb_device *, void *, void *); +void usb_proc_explore_lock(struct usb_device *); +void usb_proc_explore_unlock(struct usb_device *); + #endif /* _USB_PROCESS_H_ */ From owner-svn-src-stable@FreeBSD.ORG Sun May 12 12:20:04 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E223D794; Sun, 12 May 2013 12:20:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B4DCC942; Sun, 12 May 2013 12:20:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CCK4l5089965; Sun, 12 May 2013 12:20:04 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CCK4B6089964; Sun, 12 May 2013 12:20:04 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201305121220.r4CCK4B6089964@svn.freebsd.org> From: Hans Petter Selasky Date: Sun, 12 May 2013 12:20:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250561 - stable/9/sys/dev/sound/usb X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 12:20:05 -0000 Author: hselasky Date: Sun May 12 12:20:04 2013 New Revision: 250561 URL: http://svnweb.freebsd.org/changeset/base/250561 Log: MFC r249796, r249830, r249844 and r249845: USB audio fixes and improvements. - Fix runtime switching of sample rate - Fix feedback endpoint algorithm Modified: stable/9/sys/dev/sound/usb/uaudio.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/sound/usb/uaudio.c ============================================================================== --- stable/9/sys/dev/sound/usb/uaudio.c Sun May 12 12:13:23 2013 (r250560) +++ stable/9/sys/dev/sound/usb/uaudio.c Sun May 12 12:20:04 2013 (r250561) @@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define USB_DEBUG_VAR uaudio_debug #include @@ -176,19 +177,34 @@ struct uaudio_mixer_node { struct uaudio_mixer_node *next; }; +struct uaudio_configure_msg { + struct usb_proc_msg hdr; + struct uaudio_softc *sc; +}; + +#define CHAN_MAX_ALT 20 + +struct uaudio_chan_alt { + union uaudio_asf1d p_asf1d; + union uaudio_sed p_sed; + const usb_endpoint_descriptor_audio_t *p_ed1; + const struct uaudio_format *p_fmt; + const struct usb_config *usb_cfg; + uint32_t sample_rate; /* in Hz */ + uint16_t sample_size; + uint8_t iface_index; + uint8_t iface_alt_index; + uint8_t channels; +}; + struct uaudio_chan { struct pcmchan_caps pcm_cap; /* capabilities */ - + struct uaudio_chan_alt usb_alt[CHAN_MAX_ALT]; struct snd_dbuf *pcm_buf; - const struct usb_config *usb_cfg; struct mtx *pcm_mtx; /* lock protecting this structure */ struct uaudio_softc *priv_sc; struct pcm_channel *pcm_ch; struct usb_xfer *xfer[UAUDIO_NCHANBUFS + 1]; - union uaudio_asf1d p_asf1d; - union uaudio_sed p_sed; - const usb_endpoint_descriptor_audio_t *p_ed1; - const struct uaudio_format *p_fmt; uint8_t *buf; /* pointer to buffer */ uint8_t *start; /* upper layer buffer start */ @@ -196,24 +212,24 @@ struct uaudio_chan { uint8_t *cur; /* current position in upper layer * buffer */ - uint32_t intr_size; /* in bytes */ uint32_t intr_frames; /* in units */ - uint32_t sample_rate; uint32_t frames_per_second; uint32_t sample_rem; uint32_t sample_curr; + uint32_t max_buf; - uint32_t format; uint32_t pcm_format[2]; uint16_t bytes_per_frame[2]; - uint16_t sample_size; - - uint8_t valid; - uint8_t iface_index; - uint8_t iface_alt_index; - uint8_t channels; + uint8_t num_alt; + uint8_t cur_alt; + uint8_t set_alt; + uint8_t operation; +#define CHAN_OP_NONE 0 +#define CHAN_OP_START 1 +#define CHAN_OP_STOP 2 +#define CHAN_OP_DRAIN 3 uint8_t last_sync_time; uint8_t last_sync_state; @@ -309,6 +325,7 @@ struct uaudio_softc { struct uaudio_hid sc_hid; struct uaudio_search_result sc_mixer_clocks; struct uaudio_mixer_node sc_mixer_node; + struct uaudio_configure_msg sc_config_msg[2]; struct mtx *sc_mixer_lock; struct snd_mixer *sc_mixer_dev; @@ -434,6 +451,8 @@ static usb_callback_t umidi_bulk_read_ca static usb_callback_t umidi_bulk_write_callback; static usb_callback_t uaudio_hid_rx_callback; +static usb_proc_callback_t uaudio_configure_msg; + /* ==== USB mixer ==== */ static int uaudio_mixer_sysctl_handler(SYSCTL_HANDLER_ARGS); @@ -856,6 +875,10 @@ uaudio_attach(device_t dev) sc->sc_udev = uaa->device; sc->sc_mixer_iface_index = uaa->info.bIfaceIndex; sc->sc_mixer_iface_no = uaa->info.bIfaceNum; + sc->sc_config_msg[0].hdr.pm_callback = &uaudio_configure_msg; + sc->sc_config_msg[0].sc = sc; + sc->sc_config_msg[1].hdr.pm_callback = &uaudio_configure_msg; + sc->sc_config_msg[1].sc = sc; if (usb_test_quirk(uaa, UQ_AUDIO_SWAP_LR)) sc->sc_uq_audio_swap_lr = 1; @@ -900,22 +923,28 @@ uaudio_attach(device_t dev) DPRINTF("%d mixer controls\n", sc->sc_mixer_count); - if (sc->sc_play_chan.valid) { - device_printf(dev, "Play: %d Hz, %d ch, %s format, " - "2x8ms buffer.\n", - sc->sc_play_chan.sample_rate, - sc->sc_play_chan.channels, - sc->sc_play_chan.p_fmt->description); + if (sc->sc_play_chan.num_alt > 0) { + uint8_t x; + for (x = 0; x != sc->sc_play_chan.num_alt; x++) { + device_printf(dev, "Play: %d Hz, %d ch, %s format, " + "2x8ms buffer.\n", + sc->sc_play_chan.usb_alt[x].sample_rate, + sc->sc_play_chan.usb_alt[x].channels, + sc->sc_play_chan.usb_alt[x].p_fmt->description); + } } else { device_printf(dev, "No playback.\n"); } - if (sc->sc_rec_chan.valid) { - device_printf(dev, "Record: %d Hz, %d ch, %s format, " - "2x8ms buffer.\n", - sc->sc_rec_chan.sample_rate, - sc->sc_rec_chan.channels, - sc->sc_rec_chan.p_fmt->description); + if (sc->sc_rec_chan.num_alt > 0) { + uint8_t x; + for (x = 0; x != sc->sc_rec_chan.num_alt; x++) { + device_printf(dev, "Record: %d Hz, %d ch, %s format, " + "2x8ms buffer.\n", + sc->sc_rec_chan.usb_alt[x].sample_rate, + sc->sc_rec_chan.usb_alt[x].channels, + sc->sc_rec_chan.usb_alt[x].p_fmt->description); + } } else { device_printf(dev, "No recording.\n"); } @@ -950,8 +979,8 @@ uaudio_attach(device_t dev) * Only attach a PCM device if we have a playback, recording * or mixer device present: */ - if (sc->sc_play_chan.valid || - sc->sc_rec_chan.valid || + if (sc->sc_play_chan.num_alt > 0 || + sc->sc_rec_chan.num_alt > 0 || sc->sc_mix_info) { child = device_add_child(dev, "pcm", -1); @@ -1020,18 +1049,18 @@ uaudio_attach_sub(device_t dev, kobj_cla snprintf(status, sizeof(status), "at ? %s", PCM_KLDSTRING(snd_uaudio)); if (pcm_register(dev, sc, - sc->sc_play_chan.valid ? 1 : 0, - sc->sc_rec_chan.valid ? 1 : 0)) { + (sc->sc_play_chan.num_alt > 0) ? 1 : 0, + (sc->sc_rec_chan.num_alt > 0) ? 1 : 0)) { goto detach; } uaudio_pcm_setflags(dev, SD_F_MPSAFE); sc->sc_pcm_registered = 1; - if (sc->sc_play_chan.valid) { + if (sc->sc_play_chan.num_alt > 0) { pcm_addchan(dev, PCMDIR_PLAY, chan_class, sc); } - if (sc->sc_rec_chan.valid) { + if (sc->sc_rec_chan.num_alt > 0) { pcm_addchan(dev, PCMDIR_REC, chan_class, sc); } pcm_setstatus(dev, status); @@ -1078,10 +1107,15 @@ uaudio_detach(device_t dev) * will time out and close opened /dev/dspX.Y device(s), if * any. */ - if (sc->sc_play_chan.valid) - usbd_transfer_unsetup(sc->sc_play_chan.xfer, UAUDIO_NCHANBUFS + 1); - if (sc->sc_rec_chan.valid) - usbd_transfer_unsetup(sc->sc_rec_chan.xfer, UAUDIO_NCHANBUFS + 1); + usb_proc_explore_lock(sc->sc_udev); + sc->sc_play_chan.operation = CHAN_OP_DRAIN; + sc->sc_rec_chan.operation = CHAN_OP_DRAIN; + usb_proc_explore_mwait(sc->sc_udev, + &sc->sc_config_msg[0], &sc->sc_config_msg[1]); + usb_proc_explore_unlock(sc->sc_udev); + + usbd_transfer_unsetup(sc->sc_play_chan.xfer, UAUDIO_NCHANBUFS + 1); + usbd_transfer_unsetup(sc->sc_rec_chan.xfer, UAUDIO_NCHANBUFS + 1); uaudio_hid_detach(sc); @@ -1100,6 +1134,201 @@ uaudio_detach(device_t dev) return (0); } +static uint32_t +uaudio_get_buffer_size(struct uaudio_chan *ch, uint8_t alt) +{ + struct uaudio_chan_alt *chan_alt = &ch->usb_alt[alt]; + /* We use 2 times 8ms of buffer */ + uint32_t buf_size = (((chan_alt->sample_rate * (UAUDIO_NFRAMES / 8)) + + 1000 - 1) / 1000) * chan_alt->sample_size; + return (buf_size); +} + +static void +uaudio_configure_msg_sub(struct uaudio_softc *sc, + struct uaudio_chan *chan, int dir) +{ + struct uaudio_chan_alt *chan_alt; + uint32_t frames; + uint32_t buf_size; + uint16_t fps; + uint8_t set_alt; + uint8_t fps_shift; + uint8_t operation; + usb_error_t err; + + if (chan->num_alt <= 0) + return; + + DPRINTF("\n"); + + usb_proc_explore_lock(sc->sc_udev); + operation = chan->operation; + chan->operation = CHAN_OP_NONE; + usb_proc_explore_unlock(sc->sc_udev); + + mtx_lock(chan->pcm_mtx); + if (chan->cur_alt != chan->set_alt) + set_alt = chan->set_alt; + else + set_alt = CHAN_MAX_ALT; + mtx_unlock(chan->pcm_mtx); + + if (set_alt >= chan->num_alt) + goto done; + + chan_alt = chan->usb_alt + set_alt; + + usbd_transfer_unsetup(chan->xfer, UAUDIO_NCHANBUFS + 1); + + err = usbd_set_alt_interface_index(sc->sc_udev, + chan_alt->iface_index, chan_alt->iface_alt_index); + if (err) { + DPRINTF("setting of alternate index failed: %s!\n", + usbd_errstr(err)); + goto error; + } + + /* + * Only set the sample rate if the channel reports that it + * supports the frequency control. + */ + + if (sc->sc_audio_rev >= UAUDIO_VERSION_30) { + /* FALLTHROUGH */ + } else if (sc->sc_audio_rev >= UAUDIO_VERSION_20) { + unsigned int x; + + for (x = 0; x != 256; x++) { + if (dir == PCMDIR_PLAY) { + if (!(sc->sc_mixer_clocks.bit_output[x / 8] & + (1 << (x % 8)))) { + continue; + } + } else { + if (!(sc->sc_mixer_clocks.bit_input[x / 8] & + (1 << (x % 8)))) { + continue; + } + } + + if (uaudio20_set_speed(sc->sc_udev, + sc->sc_mixer_iface_no, x, chan_alt->sample_rate)) { + /* + * If the endpoint is adaptive setting + * the speed may fail. + */ + DPRINTF("setting of sample rate failed! " + "(continuing anyway)\n"); + } + } + } else if (chan_alt->p_sed.v1->bmAttributes & UA_SED_FREQ_CONTROL) { + if (uaudio_set_speed(sc->sc_udev, + chan_alt->p_ed1->bEndpointAddress, chan_alt->sample_rate)) { + /* + * If the endpoint is adaptive setting the + * speed may fail. + */ + DPRINTF("setting of sample rate failed! " + "(continuing anyway)\n"); + } + } + if (usbd_transfer_setup(sc->sc_udev, &chan_alt->iface_index, chan->xfer, + chan_alt->usb_cfg, UAUDIO_NCHANBUFS + 1, chan, chan->pcm_mtx)) { + DPRINTF("could not allocate USB transfers!\n"); + goto error; + } + + fps = usbd_get_isoc_fps(sc->sc_udev); + + if (fps < 8000) { + /* FULL speed USB */ + frames = 8; + } else { + /* HIGH speed USB */ + frames = UAUDIO_NFRAMES; + } + + fps_shift = usbd_xfer_get_fps_shift(chan->xfer[0]); + + /* down shift number of frames per second, if any */ + fps >>= fps_shift; + frames >>= fps_shift; + + /* bytes per frame should not be zero */ + chan->bytes_per_frame[0] = + ((chan_alt->sample_rate / fps) * chan_alt->sample_size); + chan->bytes_per_frame[1] = + (((chan_alt->sample_rate + fps - 1) / fps) * chan_alt->sample_size); + + /* setup data rate dithering, if any */ + chan->frames_per_second = fps; + chan->sample_rem = chan_alt->sample_rate % fps; + chan->sample_curr = 0; + chan->frames_per_second = fps; + + /* compute required buffer size */ + buf_size = (chan->bytes_per_frame[1] * frames); + + if (buf_size > (chan->end - chan->start)) { + DPRINTF("buffer size is too big\n"); + goto error; + } + + chan->intr_frames = frames; + + DPRINTF("fps=%d sample_rem=%d\n", (int)fps, (int)chan->sample_rem); + + if (chan->intr_frames == 0) { + DPRINTF("frame shift is too high!\n"); + goto error; + } + + mtx_lock(chan->pcm_mtx); + chan->cur_alt = set_alt; + mtx_unlock(chan->pcm_mtx); + +done: +#if (UAUDIO_NCHANBUFS != 2) +#error "please update code" +#endif + switch (operation) { + case CHAN_OP_START: + mtx_lock(chan->pcm_mtx); + usbd_transfer_start(chan->xfer[0]); + usbd_transfer_start(chan->xfer[1]); + mtx_unlock(chan->pcm_mtx); + break; + case CHAN_OP_STOP: + mtx_lock(chan->pcm_mtx); + usbd_transfer_stop(chan->xfer[0]); + usbd_transfer_stop(chan->xfer[1]); + mtx_unlock(chan->pcm_mtx); + break; + default: + break; + } + return; + +error: + usbd_transfer_unsetup(chan->xfer, UAUDIO_NCHANBUFS + 1); + + mtx_lock(chan->pcm_mtx); + chan->cur_alt = CHAN_MAX_ALT; + mtx_unlock(chan->pcm_mtx); +} + +static void +uaudio_configure_msg(struct usb_proc_msg *pm) +{ + struct uaudio_softc *sc = ((struct uaudio_configure_msg *)pm)->sc; + + usb_proc_explore_unlock(sc->sc_udev); + uaudio_configure_msg_sub(sc, &sc->sc_play_chan, PCMDIR_PLAY); + uaudio_configure_msg_sub(sc, &sc->sc_rec_chan, PCMDIR_REC); + usb_proc_explore_lock(sc->sc_udev); +} + /*========================================================================* * AS - Audio Stream - routines *========================================================================*/ @@ -1237,6 +1466,8 @@ uaudio_chan_fill_info_sub(struct uaudio_ struct usb_interface_descriptor *id; const struct uaudio_format *p_fmt = NULL; struct uaudio_chan *chan; + struct uaudio_chan_alt *chan_alt; + uint32_t format; uint16_t curidx = 0xFFFF; uint16_t lastidx = 0xFFFF; uint16_t alt_index = 0; @@ -1414,6 +1645,10 @@ uaudio_chan_fill_info_sub(struct uaudio_ bBitResolution = asf1d.v2->bBitResolution; bSubslotSize = asf1d.v2->bSubslotSize; + /* Map 4-byte aligned 24-bit samples into 32-bit */ + if (bBitResolution == 24 && bSubslotSize == 4) + bBitResolution = 32; + if (bBitResolution != (bSubslotSize * 8)) { DPRINTF("Invalid bSubslotSize\n"); goto next_ep; @@ -1508,14 +1743,19 @@ uaudio_chan_fill_info_sub(struct uaudio_ chan = (ep_dir == UE_DIR_IN) ? &sc->sc_rec_chan : &sc->sc_play_chan; - if (chan->valid != 0 || - usbd_get_iface(udev, curidx) == NULL) { - DPRINTF("Channel already exists or " - "interface is not valid\n"); + if (usbd_get_iface(udev, curidx) == NULL) { + DPRINTF("Interface is not valid\n"); goto next_ep; } + if (chan->num_alt == CHAN_MAX_ALT) { + DPRINTF("Too many alternate settings\n"); + goto next_ep; + } + chan->set_alt = 0; + chan->cur_alt = CHAN_MAX_ALT; + + chan_alt = &chan->usb_alt[chan->num_alt++]; - chan->valid = 1; #ifdef USB_DEBUG uaudio_chan_dump_ep_desc(ed1); #endif @@ -1523,30 +1763,81 @@ uaudio_chan_fill_info_sub(struct uaudio_ "bits = %d, format = %s\n", rate, channels, bit_resolution, p_fmt->description); - chan->sample_rate = rate; - chan->p_asf1d = asf1d; - chan->p_ed1 = ed1; - chan->p_fmt = p_fmt; - chan->p_sed = sed; - chan->iface_index = curidx; - chan->iface_alt_index = alt_index; + chan_alt->sample_rate = rate; + chan_alt->p_asf1d = asf1d; + chan_alt->p_ed1 = ed1; + chan_alt->p_fmt = p_fmt; + chan_alt->p_sed = sed; + chan_alt->iface_index = curidx; + chan_alt->iface_alt_index = alt_index; + + usbd_set_parent_iface(sc->sc_udev, curidx, + sc->sc_mixer_iface_index); if (ep_dir == UE_DIR_IN) - chan->usb_cfg = uaudio_cfg_record; + chan_alt->usb_cfg = uaudio_cfg_record; else - chan->usb_cfg = uaudio_cfg_play; + chan_alt->usb_cfg = uaudio_cfg_play; - chan->sample_size = (UAUDIO_MAX_CHAN(channels) * + chan_alt->sample_size = (UAUDIO_MAX_CHAN(channels) * p_fmt->bPrecision) / 8; - chan->channels = channels; + chan_alt->channels = channels; if (ep_dir == UE_DIR_IN && usbd_get_speed(udev) == USB_SPEED_FULL) { uaudio_record_fix_fs(ed1, - chan->sample_size * (rate / 1000), - chan->sample_size * (rate / 4000)); + chan_alt->sample_size * (rate / 1000), + chan_alt->sample_size * (rate / 4000)); } + /* setup play/record format */ + + format = chan_alt->p_fmt->freebsd_fmt; + + switch (chan_alt->channels) { + case 2: + /* stereo */ + format = SND_FORMAT(format, 2, 0); + break; + case 1: + /* mono */ + format = SND_FORMAT(format, 1, 0); + break; + default: + /* surround and more */ + format = feeder_matrix_default_format( + SND_FORMAT(format, chan_alt->channels, 0)); + break; + } + + /* check if format is not supported */ + if (format == 0) { + DPRINTF("The selected audio format is not supported\n"); + chan->num_alt--; + goto next_ep; + } + if (chan->num_alt > 1) { + /* we only accumulate one format at different sample rates */ + if (chan->pcm_format[0] != format) { + DPRINTF("Multiple formats is not supported\n"); + chan->num_alt--; + goto next_ep; + } + /* ignore if duplicate sample rate entry */ + if (rate == chan->usb_alt[chan->num_alt - 2].sample_rate) { + DPRINTF("Duplicate sample rate detected\n"); + chan->num_alt--; + goto next_ep; + } + } + chan->pcm_cap.fmtlist = chan->pcm_format; + chan->pcm_cap.fmtlist[0] = format; + + if (rate < chan->pcm_cap.minspeed || chan->pcm_cap.minspeed == 0) + chan->pcm_cap.minspeed = rate; + if (rate > chan->pcm_cap.maxspeed || chan->pcm_cap.maxspeed == 0) + chan->pcm_cap.maxspeed = rate; + if (sc->sc_sndstat_valid != 0) { sbuf_printf(&sc->sc_sndstat, "\n\t" "mode %d.%d:(%s) %dch, %dbit, %s, %dHz", @@ -1564,8 +1855,9 @@ uaudio_chan_fill_info_sub(struct uaudio_ /* This structure defines all the supported rates. */ -static const uint32_t uaudio_rate_list[] = { +static const uint32_t uaudio_rate_list[CHAN_MAX_ALT] = { 96000, + 88200, 88000, 80000, 72000, @@ -1630,21 +1922,12 @@ uaudio_chan_fill_info(struct uaudio_soft uaudio_chan_fill_info_sub(sc, udev, rate, x, y); /* try find a matching rate, if any */ - for (z = 0; uaudio_rate_list[z]; z++) { + for (z = 0; uaudio_rate_list[z]; z++) uaudio_chan_fill_info_sub(sc, udev, uaudio_rate_list[z], x, y); - - if (sc->sc_rec_chan.valid && - sc->sc_play_chan.valid) { - goto done; - } - } } } - -done: - if (sc->sc_sndstat_valid) { + if (sc->sc_sndstat_valid) sbuf_finish(&sc->sc_sndstat); - } } static void @@ -1652,6 +1935,7 @@ uaudio_chan_play_sync_callback(struct us { struct uaudio_chan *ch = usbd_xfer_softc(xfer); struct usb_page_cache *pc; + uint64_t sample_rate = ch->usb_alt[ch->cur_alt].sample_rate; uint8_t buf[4]; uint64_t temp; int len; @@ -1698,24 +1982,20 @@ uaudio_chan_play_sync_callback(struct us /* auto adjust */ - while (temp < (ch->sample_rate - (ch->sample_rate / 4))) + while (temp < (sample_rate - (sample_rate / 4))) temp *= 2; - while (temp > (ch->sample_rate + (ch->sample_rate / 2))) + while (temp > (sample_rate + (sample_rate / 2))) temp /= 2; - /* bias */ - - temp += (ch->sample_rate + 1999) / 2000; - /* compare */ DPRINTF("Comparing %d < %d\n", - (int)temp, (int)ch->sample_rate); + (int)temp, (int)sample_rate); - if (temp == ch->sample_rate) + if (temp == sample_rate) ch->last_sync_state = UAUDIO_SYNC_NONE; - else if (temp > ch->sample_rate) + else if (temp > sample_rate) ch->last_sync_state = UAUDIO_SYNC_MORE; else ch->last_sync_state = UAUDIO_SYNC_LESS; @@ -1737,6 +2017,7 @@ uaudio_chan_play_callback(struct usb_xfe { struct uaudio_chan *ch = usbd_xfer_softc(xfer); struct usb_page_cache *pc; + uint32_t sample_size = ch->usb_alt[ch->cur_alt].sample_size; uint32_t mfl; uint32_t total; uint32_t blockcount; @@ -1800,14 +2081,14 @@ tr_transferred: switch (ch->last_sync_state) { case UAUDIO_SYNC_MORE: DPRINTFN(6, "sending one sample more\n"); - if ((frame_len + ch->sample_size) <= mfl) - frame_len += ch->sample_size; + if ((frame_len + sample_size) <= mfl) + frame_len += sample_size; ch->last_sync_state = UAUDIO_SYNC_NONE; break; case UAUDIO_SYNC_LESS: DPRINTFN(6, "sending one sample less\n"); - if (frame_len >= ch->sample_size) - frame_len -= ch->sample_size; + if (frame_len >= sample_size) + frame_len -= sample_size; ch->last_sync_state = UAUDIO_SYNC_NONE; break; default: @@ -1944,187 +2225,43 @@ uaudio_chan_init(struct uaudio_softc *sc struct uaudio_chan *ch = ((dir == PCMDIR_PLAY) ? &sc->sc_play_chan : &sc->sc_rec_chan); uint32_t buf_size; - uint32_t frames; - uint32_t format; - uint16_t fps; - uint8_t endpoint; - uint8_t blocks; - uint8_t iface_index; - uint8_t alt_index; - uint8_t fps_shift; - usb_error_t err; - - fps = usbd_get_isoc_fps(sc->sc_udev); - - if (fps < 8000) { - /* FULL speed USB */ - frames = 8; - } else { - /* HIGH speed USB */ - frames = UAUDIO_NFRAMES; - } - - /* setup play/record format */ - - ch->pcm_cap.fmtlist = ch->pcm_format; - - ch->pcm_format[0] = 0; - ch->pcm_format[1] = 0; - - ch->pcm_cap.minspeed = ch->sample_rate; - ch->pcm_cap.maxspeed = ch->sample_rate; + uint8_t x; - /* setup mutex and PCM channel */ + /* store mutex and PCM channel */ ch->pcm_ch = c; ch->pcm_mtx = c->lock; - format = ch->p_fmt->freebsd_fmt; - - switch (ch->channels) { - case 2: - /* stereo */ - format = SND_FORMAT(format, 2, 0); - break; - case 1: - /* mono */ - format = SND_FORMAT(format, 1, 0); - break; - default: - /* surround and more */ - format = feeder_matrix_default_format( - SND_FORMAT(format, ch->channels, 0)); - break; - } - - ch->pcm_cap.fmtlist[0] = format; - ch->pcm_cap.fmtlist[1] = 0; - - /* check if format is not supported */ - - if (format == 0) { - DPRINTF("The selected audio format is not supported\n"); - goto error; - } - - /* set alternate interface corresponding to the mode */ - - endpoint = ch->p_ed1->bEndpointAddress; - iface_index = ch->iface_index; - alt_index = ch->iface_alt_index; - - DPRINTF("endpoint=0x%02x, speed=%d, iface=%d alt=%d\n", - endpoint, ch->sample_rate, iface_index, alt_index); + /* compute worst case buffer */ - err = usbd_set_alt_interface_index(sc->sc_udev, iface_index, alt_index); - if (err) { - DPRINTF("setting of alternate index failed: %s!\n", - usbd_errstr(err)); - goto error; + buf_size = 0; + for (x = 0; x != ch->num_alt; x++) { + uint32_t temp = uaudio_get_buffer_size(ch, x); + if (temp > buf_size) + buf_size = temp; } - usbd_set_parent_iface(sc->sc_udev, iface_index, - sc->sc_mixer_iface_index); - - /* - * Only set the sample rate if the channel reports that it - * supports the frequency control. - */ - if (sc->sc_audio_rev >= UAUDIO_VERSION_30) { - /* FALLTHROUGH */ - } else if (sc->sc_audio_rev >= UAUDIO_VERSION_20) { - unsigned int x; - - for (x = 0; x != 256; x++) { - if (dir == PCMDIR_PLAY) { - if (!(sc->sc_mixer_clocks.bit_output[x / 8] & - (1 << (x % 8)))) { - continue; - } - } else { - if (!(sc->sc_mixer_clocks.bit_input[x / 8] & - (1 << (x % 8)))) { - continue; - } - } - - if (uaudio20_set_speed(sc->sc_udev, - sc->sc_mixer_iface_no, x, ch->sample_rate)) { - /* - * If the endpoint is adaptive setting - * the speed may fail. - */ - DPRINTF("setting of sample rate failed! " - "(continuing anyway)\n"); - } - } - } else if (ch->p_sed.v1->bmAttributes & UA_SED_FREQ_CONTROL) { - if (uaudio_set_speed(sc->sc_udev, endpoint, ch->sample_rate)) { - /* - * If the endpoint is adaptive setting the - * speed may fail. - */ - DPRINTF("setting of sample rate failed! " - "(continuing anyway)\n"); - } - } - if (usbd_transfer_setup(sc->sc_udev, &iface_index, ch->xfer, - ch->usb_cfg, UAUDIO_NCHANBUFS + 1, ch, ch->pcm_mtx)) { - DPRINTF("could not allocate USB transfers!\n"); - goto error; - } - - fps_shift = usbd_xfer_get_fps_shift(ch->xfer[0]); - - /* down shift number of frames per second, if any */ - fps >>= fps_shift; - frames >>= fps_shift; - - /* bytes per frame should not be zero */ - ch->bytes_per_frame[0] = ((ch->sample_rate / fps) * ch->sample_size); - ch->bytes_per_frame[1] = (((ch->sample_rate + fps - 1) / fps) * ch->sample_size); - - /* setup data rate dithering, if any */ - ch->frames_per_second = fps; - ch->sample_rem = ch->sample_rate % fps; - ch->sample_curr = 0; - ch->frames_per_second = fps; - - /* compute required buffer size */ - buf_size = (ch->bytes_per_frame[1] * frames); - - ch->intr_size = buf_size; - ch->intr_frames = frames; - - DPRINTF("fps=%d sample_rem=%d\n", fps, ch->sample_rem); - - if (ch->intr_frames == 0) { - DPRINTF("frame shift is too high!\n"); - goto error; - } - - /* setup double buffering */ + /* allow double buffering */ buf_size *= 2; - blocks = 2; + + DPRINTF("Worst case buffer is %d bytes\n", (int)buf_size); ch->buf = malloc(buf_size, M_DEVBUF, M_WAITOK | M_ZERO); if (ch->buf == NULL) goto error; if (sndbuf_setup(b, ch->buf, buf_size) != 0) goto error; - if (sndbuf_resize(b, blocks, ch->intr_size)) - goto error; ch->start = ch->buf; ch->end = ch->buf + buf_size; ch->cur = ch->buf; ch->pcm_buf = b; + ch->max_buf = buf_size; if (ch->pcm_mtx == NULL) { DPRINTF("ERROR: PCM channels does not have a mutex!\n"); goto error; } - return (ch); error: @@ -2141,7 +2278,7 @@ uaudio_chan_free(struct uaudio_chan *ch) } usbd_transfer_unsetup(ch->xfer, UAUDIO_NCHANBUFS + 1); - ch->valid = 0; + ch->num_alt = 0; return (0); } @@ -2149,7 +2286,15 @@ uaudio_chan_free(struct uaudio_chan *ch) int uaudio_chan_set_param_blocksize(struct uaudio_chan *ch, uint32_t blocksize) { - return (ch->intr_size); + uint32_t temp = 2 * uaudio_get_buffer_size(ch, ch->set_alt); + + sndbuf_setup(ch->pcm_buf, ch->buf, temp); + + ch->start = ch->buf; + ch->end = ch->buf + temp; + ch->cur = ch->buf; + + return (temp / 2); } int @@ -2162,10 +2307,23 @@ uaudio_chan_set_param_fragments(struct u int uaudio_chan_set_param_speed(struct uaudio_chan *ch, uint32_t speed) { - if (speed != ch->sample_rate) { - DPRINTF("rate conversion required\n"); + uint8_t x; + + for (x = 0; x < ch->num_alt; x++) { + if (ch->usb_alt[x].sample_rate < speed) { + /* sample rate is too low */ + break; + } } - return (ch->sample_rate); + + if (x != 0) + x--; + + ch->set_alt = x; + + DPRINTF("Selecting alt %d\n", (int)x); + + return (ch->usb_alt[x].sample_rate); } int @@ -2228,31 +2386,61 @@ uaudio_chan_getmatrix(struct uaudio_chan int uaudio_chan_set_param_format(struct uaudio_chan *ch, uint32_t format) { - ch->format = format; + DPRINTF("Selecting format 0x%08x\n", (unsigned int)format); return (0); } int uaudio_chan_start(struct uaudio_chan *ch) { - ch->cur = ch->start; + struct uaudio_softc *sc = ch->priv_sc; + int do_start = 0; -#if (UAUDIO_NCHANBUFS != 2) -#error "please update code" -#endif - usbd_transfer_start(ch->xfer[0]); - usbd_transfer_start(ch->xfer[1]); + usb_proc_explore_lock(sc->sc_udev); + if (ch->operation != CHAN_OP_DRAIN) { + if (ch->cur_alt == ch->set_alt && + ch->operation == CHAN_OP_NONE) { + /* save doing the explore task */ + do_start = 1; + } else { + ch->operation = CHAN_OP_START; + (void)usb_proc_explore_msignal(sc->sc_udev, + &sc->sc_config_msg[0], &sc->sc_config_msg[1]); + } + } + usb_proc_explore_unlock(sc->sc_udev); + + if (do_start) { + usbd_transfer_start(ch->xfer[0]); + usbd_transfer_start(ch->xfer[1]); + } return (0); } int uaudio_chan_stop(struct uaudio_chan *ch) { -#if (UAUDIO_NCHANBUFS != 2) -#error "please update code" -#endif - usbd_transfer_stop(ch->xfer[0]); - usbd_transfer_stop(ch->xfer[1]); + struct uaudio_softc *sc = ch->priv_sc; + int do_stop = 0; + + usb_proc_explore_lock(sc->sc_udev); + if (ch->operation != CHAN_OP_DRAIN) { + if (ch->cur_alt == ch->set_alt && + ch->operation == CHAN_OP_NONE) { + /* save doing the explore task */ + do_stop = 1; + } else { + ch->operation = CHAN_OP_STOP; + (void)usb_proc_explore_msignal(sc->sc_udev, + &sc->sc_config_msg[0], &sc->sc_config_msg[1]); + } + } + usb_proc_explore_unlock(sc->sc_udev); + + if (do_stop) { + usbd_transfer_stop(ch->xfer[0]); + usbd_transfer_stop(ch->xfer[1]); + } return (0); } From owner-svn-src-stable@FreeBSD.ORG Sun May 12 12:24:30 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7A01DA2E; Sun, 12 May 2013 12:24:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 524BF974; Sun, 12 May 2013 12:24:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CCOUR5092350; Sun, 12 May 2013 12:24:30 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CCOTS4092346; Sun, 12 May 2013 12:24:29 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201305121224.r4CCOTS4092346@svn.freebsd.org> From: Hans Petter Selasky Date: Sun, 12 May 2013 12:24:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250562 - in stable/8/sys/dev/usb: . controller X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 12:24:30 -0000 Author: hselasky Date: Sun May 12 12:24:29 2013 New Revision: 250562 URL: http://svnweb.freebsd.org/changeset/base/250562 Log: MFC r249795: Add convenience wrapper functions to run callbacks in the context of the USB explore thread. Modified: stable/8/sys/dev/usb/controller/usb_controller.c stable/8/sys/dev/usb/usb_process.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/usb/ (props changed) Modified: stable/8/sys/dev/usb/controller/usb_controller.c ============================================================================== --- stable/8/sys/dev/usb/controller/usb_controller.c Sun May 12 12:20:04 2013 (r250561) +++ stable/8/sys/dev/usb/controller/usb_controller.c Sun May 12 12:24:29 2013 (r250562) @@ -877,3 +877,28 @@ usb_bus_mem_free_all(struct usb_bus *bus mtx_destroy(&bus->bus_mtx); } + +/* convenience wrappers */ +void +usb_proc_explore_mwait(struct usb_device *udev, void *pm1, void *pm2) +{ + usb_proc_mwait(&udev->bus->explore_proc, pm1, pm2); +} + +void * +usb_proc_explore_msignal(struct usb_device *udev, void *pm1, void *pm2) +{ + return (usb_proc_msignal(&udev->bus->explore_proc, pm1, pm2)); +} + +void +usb_proc_explore_lock(struct usb_device *udev) +{ + USB_BUS_LOCK(udev->bus); +} + +void +usb_proc_explore_unlock(struct usb_device *udev) +{ + USB_BUS_UNLOCK(udev->bus); +} Modified: stable/8/sys/dev/usb/usb_process.h ============================================================================== --- stable/8/sys/dev/usb/usb_process.h Sun May 12 12:20:04 2013 (r250561) +++ stable/8/sys/dev/usb/usb_process.h Sun May 12 12:24:29 2013 (r250562) @@ -42,6 +42,7 @@ /* structure prototypes */ struct usb_proc_msg; +struct usb_device; /* * The following structure defines the USB process. @@ -79,4 +80,9 @@ void usb_proc_free(struct usb_process *u void *usb_proc_msignal(struct usb_process *up, void *pm0, void *pm1); void usb_proc_rewakeup(struct usb_process *up); +void usb_proc_explore_mwait(struct usb_device *, void *, void *); +void *usb_proc_explore_msignal(struct usb_device *, void *, void *); +void usb_proc_explore_lock(struct usb_device *); +void usb_proc_explore_unlock(struct usb_device *); + #endif /* _USB_PROCESS_H_ */ From owner-svn-src-stable@FreeBSD.ORG Sun May 12 12:30:42 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 71D3CDA3; Sun, 12 May 2013 12:30:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 625609A0; Sun, 12 May 2013 12:30:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CCUgaO095205; Sun, 12 May 2013 12:30:42 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CCUg6O095204; Sun, 12 May 2013 12:30:42 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201305121230.r4CCUg6O095204@svn.freebsd.org> From: Hans Petter Selasky Date: Sun, 12 May 2013 12:30:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250563 - stable/8/sys/dev/sound/usb X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 12:30:42 -0000 Author: hselasky Date: Sun May 12 12:30:42 2013 New Revision: 250563 URL: http://svnweb.freebsd.org/changeset/base/250563 Log: MFC r249796, r249830, r249844 and r249845: USB audio fixes and improvements. - Fix runtime switching of sample rate - Fix feedback endpoint algorithm Modified: stable/8/sys/dev/sound/usb/uaudio.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/sound/ (props changed) stable/8/sys/dev/sound/usb/ (props changed) Modified: stable/8/sys/dev/sound/usb/uaudio.c ============================================================================== --- stable/8/sys/dev/sound/usb/uaudio.c Sun May 12 12:24:29 2013 (r250562) +++ stable/8/sys/dev/sound/usb/uaudio.c Sun May 12 12:30:42 2013 (r250563) @@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define USB_DEBUG_VAR uaudio_debug #include @@ -176,19 +177,34 @@ struct uaudio_mixer_node { struct uaudio_mixer_node *next; }; +struct uaudio_configure_msg { + struct usb_proc_msg hdr; + struct uaudio_softc *sc; +}; + +#define CHAN_MAX_ALT 20 + +struct uaudio_chan_alt { + union uaudio_asf1d p_asf1d; + union uaudio_sed p_sed; + const usb_endpoint_descriptor_audio_t *p_ed1; + const struct uaudio_format *p_fmt; + const struct usb_config *usb_cfg; + uint32_t sample_rate; /* in Hz */ + uint16_t sample_size; + uint8_t iface_index; + uint8_t iface_alt_index; + uint8_t channels; +}; + struct uaudio_chan { struct pcmchan_caps pcm_cap; /* capabilities */ - + struct uaudio_chan_alt usb_alt[CHAN_MAX_ALT]; struct snd_dbuf *pcm_buf; - const struct usb_config *usb_cfg; struct mtx *pcm_mtx; /* lock protecting this structure */ struct uaudio_softc *priv_sc; struct pcm_channel *pcm_ch; struct usb_xfer *xfer[UAUDIO_NCHANBUFS + 1]; - union uaudio_asf1d p_asf1d; - union uaudio_sed p_sed; - const usb_endpoint_descriptor_audio_t *p_ed1; - const struct uaudio_format *p_fmt; uint8_t *buf; /* pointer to buffer */ uint8_t *start; /* upper layer buffer start */ @@ -196,24 +212,24 @@ struct uaudio_chan { uint8_t *cur; /* current position in upper layer * buffer */ - uint32_t intr_size; /* in bytes */ uint32_t intr_frames; /* in units */ - uint32_t sample_rate; uint32_t frames_per_second; uint32_t sample_rem; uint32_t sample_curr; + uint32_t max_buf; - uint32_t format; uint32_t pcm_format[2]; uint16_t bytes_per_frame[2]; - uint16_t sample_size; - - uint8_t valid; - uint8_t iface_index; - uint8_t iface_alt_index; - uint8_t channels; + uint8_t num_alt; + uint8_t cur_alt; + uint8_t set_alt; + uint8_t operation; +#define CHAN_OP_NONE 0 +#define CHAN_OP_START 1 +#define CHAN_OP_STOP 2 +#define CHAN_OP_DRAIN 3 uint8_t last_sync_time; uint8_t last_sync_state; @@ -309,6 +325,7 @@ struct uaudio_softc { struct uaudio_hid sc_hid; struct uaudio_search_result sc_mixer_clocks; struct uaudio_mixer_node sc_mixer_node; + struct uaudio_configure_msg sc_config_msg[2]; struct mtx *sc_mixer_lock; struct snd_mixer *sc_mixer_dev; @@ -434,6 +451,8 @@ static usb_callback_t umidi_bulk_read_ca static usb_callback_t umidi_bulk_write_callback; static usb_callback_t uaudio_hid_rx_callback; +static usb_proc_callback_t uaudio_configure_msg; + /* ==== USB mixer ==== */ static int uaudio_mixer_sysctl_handler(SYSCTL_HANDLER_ARGS); @@ -856,6 +875,10 @@ uaudio_attach(device_t dev) sc->sc_udev = uaa->device; sc->sc_mixer_iface_index = uaa->info.bIfaceIndex; sc->sc_mixer_iface_no = uaa->info.bIfaceNum; + sc->sc_config_msg[0].hdr.pm_callback = &uaudio_configure_msg; + sc->sc_config_msg[0].sc = sc; + sc->sc_config_msg[1].hdr.pm_callback = &uaudio_configure_msg; + sc->sc_config_msg[1].sc = sc; if (usb_test_quirk(uaa, UQ_AUDIO_SWAP_LR)) sc->sc_uq_audio_swap_lr = 1; @@ -900,22 +923,28 @@ uaudio_attach(device_t dev) DPRINTF("%d mixer controls\n", sc->sc_mixer_count); - if (sc->sc_play_chan.valid) { - device_printf(dev, "Play: %d Hz, %d ch, %s format, " - "2x8ms buffer.\n", - sc->sc_play_chan.sample_rate, - sc->sc_play_chan.channels, - sc->sc_play_chan.p_fmt->description); + if (sc->sc_play_chan.num_alt > 0) { + uint8_t x; + for (x = 0; x != sc->sc_play_chan.num_alt; x++) { + device_printf(dev, "Play: %d Hz, %d ch, %s format, " + "2x8ms buffer.\n", + sc->sc_play_chan.usb_alt[x].sample_rate, + sc->sc_play_chan.usb_alt[x].channels, + sc->sc_play_chan.usb_alt[x].p_fmt->description); + } } else { device_printf(dev, "No playback.\n"); } - if (sc->sc_rec_chan.valid) { - device_printf(dev, "Record: %d Hz, %d ch, %s format, " - "2x8ms buffer.\n", - sc->sc_rec_chan.sample_rate, - sc->sc_rec_chan.channels, - sc->sc_rec_chan.p_fmt->description); + if (sc->sc_rec_chan.num_alt > 0) { + uint8_t x; + for (x = 0; x != sc->sc_rec_chan.num_alt; x++) { + device_printf(dev, "Record: %d Hz, %d ch, %s format, " + "2x8ms buffer.\n", + sc->sc_rec_chan.usb_alt[x].sample_rate, + sc->sc_rec_chan.usb_alt[x].channels, + sc->sc_rec_chan.usb_alt[x].p_fmt->description); + } } else { device_printf(dev, "No recording.\n"); } @@ -950,8 +979,8 @@ uaudio_attach(device_t dev) * Only attach a PCM device if we have a playback, recording * or mixer device present: */ - if (sc->sc_play_chan.valid || - sc->sc_rec_chan.valid || + if (sc->sc_play_chan.num_alt > 0 || + sc->sc_rec_chan.num_alt > 0 || sc->sc_mix_info) { child = device_add_child(dev, "pcm", -1); @@ -1020,18 +1049,18 @@ uaudio_attach_sub(device_t dev, kobj_cla snprintf(status, sizeof(status), "at ? %s", PCM_KLDSTRING(snd_uaudio)); if (pcm_register(dev, sc, - sc->sc_play_chan.valid ? 1 : 0, - sc->sc_rec_chan.valid ? 1 : 0)) { + (sc->sc_play_chan.num_alt > 0) ? 1 : 0, + (sc->sc_rec_chan.num_alt > 0) ? 1 : 0)) { goto detach; } uaudio_pcm_setflags(dev, SD_F_MPSAFE); sc->sc_pcm_registered = 1; - if (sc->sc_play_chan.valid) { + if (sc->sc_play_chan.num_alt > 0) { pcm_addchan(dev, PCMDIR_PLAY, chan_class, sc); } - if (sc->sc_rec_chan.valid) { + if (sc->sc_rec_chan.num_alt > 0) { pcm_addchan(dev, PCMDIR_REC, chan_class, sc); } pcm_setstatus(dev, status); @@ -1078,10 +1107,15 @@ uaudio_detach(device_t dev) * will time out and close opened /dev/dspX.Y device(s), if * any. */ - if (sc->sc_play_chan.valid) - usbd_transfer_unsetup(sc->sc_play_chan.xfer, UAUDIO_NCHANBUFS + 1); - if (sc->sc_rec_chan.valid) - usbd_transfer_unsetup(sc->sc_rec_chan.xfer, UAUDIO_NCHANBUFS + 1); + usb_proc_explore_lock(sc->sc_udev); + sc->sc_play_chan.operation = CHAN_OP_DRAIN; + sc->sc_rec_chan.operation = CHAN_OP_DRAIN; + usb_proc_explore_mwait(sc->sc_udev, + &sc->sc_config_msg[0], &sc->sc_config_msg[1]); + usb_proc_explore_unlock(sc->sc_udev); + + usbd_transfer_unsetup(sc->sc_play_chan.xfer, UAUDIO_NCHANBUFS + 1); + usbd_transfer_unsetup(sc->sc_rec_chan.xfer, UAUDIO_NCHANBUFS + 1); uaudio_hid_detach(sc); @@ -1100,6 +1134,201 @@ uaudio_detach(device_t dev) return (0); } +static uint32_t +uaudio_get_buffer_size(struct uaudio_chan *ch, uint8_t alt) +{ + struct uaudio_chan_alt *chan_alt = &ch->usb_alt[alt]; + /* We use 2 times 8ms of buffer */ + uint32_t buf_size = (((chan_alt->sample_rate * (UAUDIO_NFRAMES / 8)) + + 1000 - 1) / 1000) * chan_alt->sample_size; + return (buf_size); +} + +static void +uaudio_configure_msg_sub(struct uaudio_softc *sc, + struct uaudio_chan *chan, int dir) +{ + struct uaudio_chan_alt *chan_alt; + uint32_t frames; + uint32_t buf_size; + uint16_t fps; + uint8_t set_alt; + uint8_t fps_shift; + uint8_t operation; + usb_error_t err; + + if (chan->num_alt <= 0) + return; + + DPRINTF("\n"); + + usb_proc_explore_lock(sc->sc_udev); + operation = chan->operation; + chan->operation = CHAN_OP_NONE; + usb_proc_explore_unlock(sc->sc_udev); + + mtx_lock(chan->pcm_mtx); + if (chan->cur_alt != chan->set_alt) + set_alt = chan->set_alt; + else + set_alt = CHAN_MAX_ALT; + mtx_unlock(chan->pcm_mtx); + + if (set_alt >= chan->num_alt) + goto done; + + chan_alt = chan->usb_alt + set_alt; + + usbd_transfer_unsetup(chan->xfer, UAUDIO_NCHANBUFS + 1); + + err = usbd_set_alt_interface_index(sc->sc_udev, + chan_alt->iface_index, chan_alt->iface_alt_index); + if (err) { + DPRINTF("setting of alternate index failed: %s!\n", + usbd_errstr(err)); + goto error; + } + + /* + * Only set the sample rate if the channel reports that it + * supports the frequency control. + */ + + if (sc->sc_audio_rev >= UAUDIO_VERSION_30) { + /* FALLTHROUGH */ + } else if (sc->sc_audio_rev >= UAUDIO_VERSION_20) { + unsigned int x; + + for (x = 0; x != 256; x++) { + if (dir == PCMDIR_PLAY) { + if (!(sc->sc_mixer_clocks.bit_output[x / 8] & + (1 << (x % 8)))) { + continue; + } + } else { + if (!(sc->sc_mixer_clocks.bit_input[x / 8] & + (1 << (x % 8)))) { + continue; + } + } + + if (uaudio20_set_speed(sc->sc_udev, + sc->sc_mixer_iface_no, x, chan_alt->sample_rate)) { + /* + * If the endpoint is adaptive setting + * the speed may fail. + */ + DPRINTF("setting of sample rate failed! " + "(continuing anyway)\n"); + } + } + } else if (chan_alt->p_sed.v1->bmAttributes & UA_SED_FREQ_CONTROL) { + if (uaudio_set_speed(sc->sc_udev, + chan_alt->p_ed1->bEndpointAddress, chan_alt->sample_rate)) { + /* + * If the endpoint is adaptive setting the + * speed may fail. + */ + DPRINTF("setting of sample rate failed! " + "(continuing anyway)\n"); + } + } + if (usbd_transfer_setup(sc->sc_udev, &chan_alt->iface_index, chan->xfer, + chan_alt->usb_cfg, UAUDIO_NCHANBUFS + 1, chan, chan->pcm_mtx)) { + DPRINTF("could not allocate USB transfers!\n"); + goto error; + } + + fps = usbd_get_isoc_fps(sc->sc_udev); + + if (fps < 8000) { + /* FULL speed USB */ + frames = 8; + } else { + /* HIGH speed USB */ + frames = UAUDIO_NFRAMES; + } + + fps_shift = usbd_xfer_get_fps_shift(chan->xfer[0]); + + /* down shift number of frames per second, if any */ + fps >>= fps_shift; + frames >>= fps_shift; + + /* bytes per frame should not be zero */ + chan->bytes_per_frame[0] = + ((chan_alt->sample_rate / fps) * chan_alt->sample_size); + chan->bytes_per_frame[1] = + (((chan_alt->sample_rate + fps - 1) / fps) * chan_alt->sample_size); + + /* setup data rate dithering, if any */ + chan->frames_per_second = fps; + chan->sample_rem = chan_alt->sample_rate % fps; + chan->sample_curr = 0; + chan->frames_per_second = fps; + + /* compute required buffer size */ + buf_size = (chan->bytes_per_frame[1] * frames); + + if (buf_size > (chan->end - chan->start)) { + DPRINTF("buffer size is too big\n"); + goto error; + } + + chan->intr_frames = frames; + + DPRINTF("fps=%d sample_rem=%d\n", (int)fps, (int)chan->sample_rem); + + if (chan->intr_frames == 0) { + DPRINTF("frame shift is too high!\n"); + goto error; + } + + mtx_lock(chan->pcm_mtx); + chan->cur_alt = set_alt; + mtx_unlock(chan->pcm_mtx); + +done: +#if (UAUDIO_NCHANBUFS != 2) +#error "please update code" +#endif + switch (operation) { + case CHAN_OP_START: + mtx_lock(chan->pcm_mtx); + usbd_transfer_start(chan->xfer[0]); + usbd_transfer_start(chan->xfer[1]); + mtx_unlock(chan->pcm_mtx); + break; + case CHAN_OP_STOP: + mtx_lock(chan->pcm_mtx); + usbd_transfer_stop(chan->xfer[0]); + usbd_transfer_stop(chan->xfer[1]); + mtx_unlock(chan->pcm_mtx); + break; + default: + break; + } + return; + +error: + usbd_transfer_unsetup(chan->xfer, UAUDIO_NCHANBUFS + 1); + + mtx_lock(chan->pcm_mtx); + chan->cur_alt = CHAN_MAX_ALT; + mtx_unlock(chan->pcm_mtx); +} + +static void +uaudio_configure_msg(struct usb_proc_msg *pm) +{ + struct uaudio_softc *sc = ((struct uaudio_configure_msg *)pm)->sc; + + usb_proc_explore_unlock(sc->sc_udev); + uaudio_configure_msg_sub(sc, &sc->sc_play_chan, PCMDIR_PLAY); + uaudio_configure_msg_sub(sc, &sc->sc_rec_chan, PCMDIR_REC); + usb_proc_explore_lock(sc->sc_udev); +} + /*========================================================================* * AS - Audio Stream - routines *========================================================================*/ @@ -1237,6 +1466,8 @@ uaudio_chan_fill_info_sub(struct uaudio_ struct usb_interface_descriptor *id; const struct uaudio_format *p_fmt = NULL; struct uaudio_chan *chan; + struct uaudio_chan_alt *chan_alt; + uint32_t format; uint16_t curidx = 0xFFFF; uint16_t lastidx = 0xFFFF; uint16_t alt_index = 0; @@ -1414,6 +1645,10 @@ uaudio_chan_fill_info_sub(struct uaudio_ bBitResolution = asf1d.v2->bBitResolution; bSubslotSize = asf1d.v2->bSubslotSize; + /* Map 4-byte aligned 24-bit samples into 32-bit */ + if (bBitResolution == 24 && bSubslotSize == 4) + bBitResolution = 32; + if (bBitResolution != (bSubslotSize * 8)) { DPRINTF("Invalid bSubslotSize\n"); goto next_ep; @@ -1508,14 +1743,19 @@ uaudio_chan_fill_info_sub(struct uaudio_ chan = (ep_dir == UE_DIR_IN) ? &sc->sc_rec_chan : &sc->sc_play_chan; - if (chan->valid != 0 || - usbd_get_iface(udev, curidx) == NULL) { - DPRINTF("Channel already exists or " - "interface is not valid\n"); + if (usbd_get_iface(udev, curidx) == NULL) { + DPRINTF("Interface is not valid\n"); goto next_ep; } + if (chan->num_alt == CHAN_MAX_ALT) { + DPRINTF("Too many alternate settings\n"); + goto next_ep; + } + chan->set_alt = 0; + chan->cur_alt = CHAN_MAX_ALT; + + chan_alt = &chan->usb_alt[chan->num_alt++]; - chan->valid = 1; #ifdef USB_DEBUG uaudio_chan_dump_ep_desc(ed1); #endif @@ -1523,30 +1763,81 @@ uaudio_chan_fill_info_sub(struct uaudio_ "bits = %d, format = %s\n", rate, channels, bit_resolution, p_fmt->description); - chan->sample_rate = rate; - chan->p_asf1d = asf1d; - chan->p_ed1 = ed1; - chan->p_fmt = p_fmt; - chan->p_sed = sed; - chan->iface_index = curidx; - chan->iface_alt_index = alt_index; + chan_alt->sample_rate = rate; + chan_alt->p_asf1d = asf1d; + chan_alt->p_ed1 = ed1; + chan_alt->p_fmt = p_fmt; + chan_alt->p_sed = sed; + chan_alt->iface_index = curidx; + chan_alt->iface_alt_index = alt_index; + + usbd_set_parent_iface(sc->sc_udev, curidx, + sc->sc_mixer_iface_index); if (ep_dir == UE_DIR_IN) - chan->usb_cfg = uaudio_cfg_record; + chan_alt->usb_cfg = uaudio_cfg_record; else - chan->usb_cfg = uaudio_cfg_play; + chan_alt->usb_cfg = uaudio_cfg_play; - chan->sample_size = (UAUDIO_MAX_CHAN(channels) * + chan_alt->sample_size = (UAUDIO_MAX_CHAN(channels) * p_fmt->bPrecision) / 8; - chan->channels = channels; + chan_alt->channels = channels; if (ep_dir == UE_DIR_IN && usbd_get_speed(udev) == USB_SPEED_FULL) { uaudio_record_fix_fs(ed1, - chan->sample_size * (rate / 1000), - chan->sample_size * (rate / 4000)); + chan_alt->sample_size * (rate / 1000), + chan_alt->sample_size * (rate / 4000)); } + /* setup play/record format */ + + format = chan_alt->p_fmt->freebsd_fmt; + + switch (chan_alt->channels) { + case 2: + /* stereo */ + format = SND_FORMAT(format, 2, 0); + break; + case 1: + /* mono */ + format = SND_FORMAT(format, 1, 0); + break; + default: + /* surround and more */ + format = feeder_matrix_default_format( + SND_FORMAT(format, chan_alt->channels, 0)); + break; + } + + /* check if format is not supported */ + if (format == 0) { + DPRINTF("The selected audio format is not supported\n"); + chan->num_alt--; + goto next_ep; + } + if (chan->num_alt > 1) { + /* we only accumulate one format at different sample rates */ + if (chan->pcm_format[0] != format) { + DPRINTF("Multiple formats is not supported\n"); + chan->num_alt--; + goto next_ep; + } + /* ignore if duplicate sample rate entry */ + if (rate == chan->usb_alt[chan->num_alt - 2].sample_rate) { + DPRINTF("Duplicate sample rate detected\n"); + chan->num_alt--; + goto next_ep; + } + } + chan->pcm_cap.fmtlist = chan->pcm_format; + chan->pcm_cap.fmtlist[0] = format; + + if (rate < chan->pcm_cap.minspeed || chan->pcm_cap.minspeed == 0) + chan->pcm_cap.minspeed = rate; + if (rate > chan->pcm_cap.maxspeed || chan->pcm_cap.maxspeed == 0) + chan->pcm_cap.maxspeed = rate; + if (sc->sc_sndstat_valid != 0) { sbuf_printf(&sc->sc_sndstat, "\n\t" "mode %d.%d:(%s) %dch, %dbit, %s, %dHz", @@ -1564,8 +1855,9 @@ uaudio_chan_fill_info_sub(struct uaudio_ /* This structure defines all the supported rates. */ -static const uint32_t uaudio_rate_list[] = { +static const uint32_t uaudio_rate_list[CHAN_MAX_ALT] = { 96000, + 88200, 88000, 80000, 72000, @@ -1630,21 +1922,12 @@ uaudio_chan_fill_info(struct uaudio_soft uaudio_chan_fill_info_sub(sc, udev, rate, x, y); /* try find a matching rate, if any */ - for (z = 0; uaudio_rate_list[z]; z++) { + for (z = 0; uaudio_rate_list[z]; z++) uaudio_chan_fill_info_sub(sc, udev, uaudio_rate_list[z], x, y); - - if (sc->sc_rec_chan.valid && - sc->sc_play_chan.valid) { - goto done; - } - } } } - -done: - if (sc->sc_sndstat_valid) { + if (sc->sc_sndstat_valid) sbuf_finish(&sc->sc_sndstat); - } } static void @@ -1652,6 +1935,7 @@ uaudio_chan_play_sync_callback(struct us { struct uaudio_chan *ch = usbd_xfer_softc(xfer); struct usb_page_cache *pc; + uint64_t sample_rate = ch->usb_alt[ch->cur_alt].sample_rate; uint8_t buf[4]; uint64_t temp; int len; @@ -1698,24 +1982,20 @@ uaudio_chan_play_sync_callback(struct us /* auto adjust */ - while (temp < (ch->sample_rate - (ch->sample_rate / 4))) + while (temp < (sample_rate - (sample_rate / 4))) temp *= 2; - while (temp > (ch->sample_rate + (ch->sample_rate / 2))) + while (temp > (sample_rate + (sample_rate / 2))) temp /= 2; - /* bias */ - - temp += (ch->sample_rate + 1999) / 2000; - /* compare */ DPRINTF("Comparing %d < %d\n", - (int)temp, (int)ch->sample_rate); + (int)temp, (int)sample_rate); - if (temp == ch->sample_rate) + if (temp == sample_rate) ch->last_sync_state = UAUDIO_SYNC_NONE; - else if (temp > ch->sample_rate) + else if (temp > sample_rate) ch->last_sync_state = UAUDIO_SYNC_MORE; else ch->last_sync_state = UAUDIO_SYNC_LESS; @@ -1737,6 +2017,7 @@ uaudio_chan_play_callback(struct usb_xfe { struct uaudio_chan *ch = usbd_xfer_softc(xfer); struct usb_page_cache *pc; + uint32_t sample_size = ch->usb_alt[ch->cur_alt].sample_size; uint32_t mfl; uint32_t total; uint32_t blockcount; @@ -1800,14 +2081,14 @@ tr_transferred: switch (ch->last_sync_state) { case UAUDIO_SYNC_MORE: DPRINTFN(6, "sending one sample more\n"); - if ((frame_len + ch->sample_size) <= mfl) - frame_len += ch->sample_size; + if ((frame_len + sample_size) <= mfl) + frame_len += sample_size; ch->last_sync_state = UAUDIO_SYNC_NONE; break; case UAUDIO_SYNC_LESS: DPRINTFN(6, "sending one sample less\n"); - if (frame_len >= ch->sample_size) - frame_len -= ch->sample_size; + if (frame_len >= sample_size) + frame_len -= sample_size; ch->last_sync_state = UAUDIO_SYNC_NONE; break; default: @@ -1944,187 +2225,43 @@ uaudio_chan_init(struct uaudio_softc *sc struct uaudio_chan *ch = ((dir == PCMDIR_PLAY) ? &sc->sc_play_chan : &sc->sc_rec_chan); uint32_t buf_size; - uint32_t frames; - uint32_t format; - uint16_t fps; - uint8_t endpoint; - uint8_t blocks; - uint8_t iface_index; - uint8_t alt_index; - uint8_t fps_shift; - usb_error_t err; - - fps = usbd_get_isoc_fps(sc->sc_udev); - - if (fps < 8000) { - /* FULL speed USB */ - frames = 8; - } else { - /* HIGH speed USB */ - frames = UAUDIO_NFRAMES; - } - - /* setup play/record format */ - - ch->pcm_cap.fmtlist = ch->pcm_format; - - ch->pcm_format[0] = 0; - ch->pcm_format[1] = 0; - - ch->pcm_cap.minspeed = ch->sample_rate; - ch->pcm_cap.maxspeed = ch->sample_rate; + uint8_t x; - /* setup mutex and PCM channel */ + /* store mutex and PCM channel */ ch->pcm_ch = c; ch->pcm_mtx = c->lock; - format = ch->p_fmt->freebsd_fmt; - - switch (ch->channels) { - case 2: - /* stereo */ - format = SND_FORMAT(format, 2, 0); - break; - case 1: - /* mono */ - format = SND_FORMAT(format, 1, 0); - break; - default: - /* surround and more */ - format = feeder_matrix_default_format( - SND_FORMAT(format, ch->channels, 0)); - break; - } - - ch->pcm_cap.fmtlist[0] = format; - ch->pcm_cap.fmtlist[1] = 0; - - /* check if format is not supported */ - - if (format == 0) { - DPRINTF("The selected audio format is not supported\n"); - goto error; - } - - /* set alternate interface corresponding to the mode */ - - endpoint = ch->p_ed1->bEndpointAddress; - iface_index = ch->iface_index; - alt_index = ch->iface_alt_index; - - DPRINTF("endpoint=0x%02x, speed=%d, iface=%d alt=%d\n", - endpoint, ch->sample_rate, iface_index, alt_index); + /* compute worst case buffer */ - err = usbd_set_alt_interface_index(sc->sc_udev, iface_index, alt_index); - if (err) { - DPRINTF("setting of alternate index failed: %s!\n", - usbd_errstr(err)); - goto error; + buf_size = 0; + for (x = 0; x != ch->num_alt; x++) { + uint32_t temp = uaudio_get_buffer_size(ch, x); + if (temp > buf_size) + buf_size = temp; } - usbd_set_parent_iface(sc->sc_udev, iface_index, - sc->sc_mixer_iface_index); - - /* - * Only set the sample rate if the channel reports that it - * supports the frequency control. - */ - if (sc->sc_audio_rev >= UAUDIO_VERSION_30) { - /* FALLTHROUGH */ - } else if (sc->sc_audio_rev >= UAUDIO_VERSION_20) { - unsigned int x; - - for (x = 0; x != 256; x++) { - if (dir == PCMDIR_PLAY) { - if (!(sc->sc_mixer_clocks.bit_output[x / 8] & - (1 << (x % 8)))) { - continue; - } - } else { - if (!(sc->sc_mixer_clocks.bit_input[x / 8] & - (1 << (x % 8)))) { - continue; - } - } - - if (uaudio20_set_speed(sc->sc_udev, - sc->sc_mixer_iface_no, x, ch->sample_rate)) { - /* - * If the endpoint is adaptive setting - * the speed may fail. - */ - DPRINTF("setting of sample rate failed! " - "(continuing anyway)\n"); - } - } - } else if (ch->p_sed.v1->bmAttributes & UA_SED_FREQ_CONTROL) { - if (uaudio_set_speed(sc->sc_udev, endpoint, ch->sample_rate)) { - /* - * If the endpoint is adaptive setting the - * speed may fail. - */ - DPRINTF("setting of sample rate failed! " - "(continuing anyway)\n"); - } - } - if (usbd_transfer_setup(sc->sc_udev, &iface_index, ch->xfer, - ch->usb_cfg, UAUDIO_NCHANBUFS + 1, ch, ch->pcm_mtx)) { - DPRINTF("could not allocate USB transfers!\n"); - goto error; - } - - fps_shift = usbd_xfer_get_fps_shift(ch->xfer[0]); - - /* down shift number of frames per second, if any */ - fps >>= fps_shift; - frames >>= fps_shift; - - /* bytes per frame should not be zero */ - ch->bytes_per_frame[0] = ((ch->sample_rate / fps) * ch->sample_size); - ch->bytes_per_frame[1] = (((ch->sample_rate + fps - 1) / fps) * ch->sample_size); - - /* setup data rate dithering, if any */ - ch->frames_per_second = fps; - ch->sample_rem = ch->sample_rate % fps; - ch->sample_curr = 0; - ch->frames_per_second = fps; - - /* compute required buffer size */ - buf_size = (ch->bytes_per_frame[1] * frames); - - ch->intr_size = buf_size; - ch->intr_frames = frames; - - DPRINTF("fps=%d sample_rem=%d\n", fps, ch->sample_rem); - - if (ch->intr_frames == 0) { - DPRINTF("frame shift is too high!\n"); - goto error; - } - - /* setup double buffering */ + /* allow double buffering */ buf_size *= 2; - blocks = 2; + + DPRINTF("Worst case buffer is %d bytes\n", (int)buf_size); ch->buf = malloc(buf_size, M_DEVBUF, M_WAITOK | M_ZERO); if (ch->buf == NULL) goto error; if (sndbuf_setup(b, ch->buf, buf_size) != 0) goto error; - if (sndbuf_resize(b, blocks, ch->intr_size)) - goto error; ch->start = ch->buf; ch->end = ch->buf + buf_size; ch->cur = ch->buf; ch->pcm_buf = b; + ch->max_buf = buf_size; if (ch->pcm_mtx == NULL) { DPRINTF("ERROR: PCM channels does not have a mutex!\n"); goto error; } - return (ch); error: @@ -2141,7 +2278,7 @@ uaudio_chan_free(struct uaudio_chan *ch) } usbd_transfer_unsetup(ch->xfer, UAUDIO_NCHANBUFS + 1); - ch->valid = 0; + ch->num_alt = 0; return (0); } @@ -2149,7 +2286,15 @@ uaudio_chan_free(struct uaudio_chan *ch) int uaudio_chan_set_param_blocksize(struct uaudio_chan *ch, uint32_t blocksize) { - return (ch->intr_size); + uint32_t temp = 2 * uaudio_get_buffer_size(ch, ch->set_alt); + + sndbuf_setup(ch->pcm_buf, ch->buf, temp); + + ch->start = ch->buf; + ch->end = ch->buf + temp; + ch->cur = ch->buf; + + return (temp / 2); } int @@ -2162,10 +2307,23 @@ uaudio_chan_set_param_fragments(struct u int uaudio_chan_set_param_speed(struct uaudio_chan *ch, uint32_t speed) { - if (speed != ch->sample_rate) { - DPRINTF("rate conversion required\n"); + uint8_t x; + + for (x = 0; x < ch->num_alt; x++) { + if (ch->usb_alt[x].sample_rate < speed) { + /* sample rate is too low */ + break; + } } - return (ch->sample_rate); + + if (x != 0) + x--; + + ch->set_alt = x; + + DPRINTF("Selecting alt %d\n", (int)x); + + return (ch->usb_alt[x].sample_rate); } int @@ -2228,31 +2386,61 @@ uaudio_chan_getmatrix(struct uaudio_chan int uaudio_chan_set_param_format(struct uaudio_chan *ch, uint32_t format) { - ch->format = format; + DPRINTF("Selecting format 0x%08x\n", (unsigned int)format); return (0); } int uaudio_chan_start(struct uaudio_chan *ch) { - ch->cur = ch->start; + struct uaudio_softc *sc = ch->priv_sc; + int do_start = 0; -#if (UAUDIO_NCHANBUFS != 2) -#error "please update code" -#endif - usbd_transfer_start(ch->xfer[0]); - usbd_transfer_start(ch->xfer[1]); + usb_proc_explore_lock(sc->sc_udev); + if (ch->operation != CHAN_OP_DRAIN) { + if (ch->cur_alt == ch->set_alt && + ch->operation == CHAN_OP_NONE) { + /* save doing the explore task */ + do_start = 1; + } else { + ch->operation = CHAN_OP_START; + (void)usb_proc_explore_msignal(sc->sc_udev, + &sc->sc_config_msg[0], &sc->sc_config_msg[1]); + } + } + usb_proc_explore_unlock(sc->sc_udev); + + if (do_start) { + usbd_transfer_start(ch->xfer[0]); + usbd_transfer_start(ch->xfer[1]); + } return (0); } int uaudio_chan_stop(struct uaudio_chan *ch) { -#if (UAUDIO_NCHANBUFS != 2) -#error "please update code" -#endif - usbd_transfer_stop(ch->xfer[0]); - usbd_transfer_stop(ch->xfer[1]); + struct uaudio_softc *sc = ch->priv_sc; + int do_stop = 0; + + usb_proc_explore_lock(sc->sc_udev); + if (ch->operation != CHAN_OP_DRAIN) { + if (ch->cur_alt == ch->set_alt && + ch->operation == CHAN_OP_NONE) { + /* save doing the explore task */ + do_stop = 1; + } else { + ch->operation = CHAN_OP_STOP; + (void)usb_proc_explore_msignal(sc->sc_udev, + &sc->sc_config_msg[0], &sc->sc_config_msg[1]); + } + } + usb_proc_explore_unlock(sc->sc_udev); + + if (do_stop) { + usbd_transfer_stop(ch->xfer[0]); + usbd_transfer_stop(ch->xfer[1]); + } return (0); } From owner-svn-src-stable@FreeBSD.ORG Sun May 12 16:11:24 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3EB9F15A; Sun, 12 May 2013 16:11:24 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1680717E; Sun, 12 May 2013 16:11:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CGBNI2072891; Sun, 12 May 2013 16:11:23 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CGBNAH072888; Sun, 12 May 2013 16:11:23 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201305121611.r4CGBNAH072888@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 12 May 2013 16:11:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250569 - in stable/9: lib/libc/gen sys/kern X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 16:11:24 -0000 Author: jilles Date: Sun May 12 16:11:23 2013 New Revision: 250569 URL: http://svnweb.freebsd.org/changeset/base/250569 Log: MFC r249566,r249644: EINTR in POSIX sem_*. Document that sem_wait() can fail with [EINTR]. Programs often do not expect an [EINTR] return from sem_wait() and POSIX only allows it if the signal was installed without SA_RESTART. The timeout in sem_timedwait() is absolute so it can be restarted normally. The old POSIX semaphore implementation did this correctly, unlike the new umtx one. Specific to 9-stable: UMTX_ABSTIME does not exist and therefore sem_timedwait() is erroneously not restarted after a SA_RESTART signal handler. It may be desirable to avoid [EINTR] completely, which matches the pthread functions and is explicitly permitted by POSIX. However, the kernel must return [EINTR] at least for signals with SA_RESTART clear, otherwise pthread cancellation will not abort a semaphore wait. In this commit, only restore the 8.x behaviour which is also permitted by POSIX, as far as possible with the ABI in 9-stable. Modified: stable/9/lib/libc/gen/sem_wait.3 stable/9/sys/kern/kern_umtx.c Directory Properties: stable/9/lib/libc/ (props changed) stable/9/sys/ (props changed) Modified: stable/9/lib/libc/gen/sem_wait.3 ============================================================================== --- stable/9/lib/libc/gen/sem_wait.3 Sun May 12 16:07:23 2013 (r250568) +++ stable/9/lib/libc/gen/sem_wait.3 Sun May 12 16:11:23 2013 (r250569) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2000 +.Dd April 16, 2013 .Dt SEM_WAIT 3 .Os .Sh NAME @@ -75,6 +75,14 @@ points to an invalid semaphore. .El .Pp Additionally, +.Fn sem_wait +will fail if: +.Bl -tag -width Er +.Pp +.It Bq Er EINTR +A signal interrupted this function. +.El +Additionally, .Fn sem_trywait will fail if: .Bl -tag -width Er Modified: stable/9/sys/kern/kern_umtx.c ============================================================================== --- stable/9/sys/kern/kern_umtx.c Sun May 12 16:07:23 2013 (r250568) +++ stable/9/sys/kern/kern_umtx.c Sun May 12 16:11:23 2013 (r250569) @@ -2970,7 +2970,8 @@ do_sem_wait(struct thread *td, struct _u error = 0; else { umtxq_remove(uq); - if (error == ERESTART) + /* A relative timeout cannot be restarted. */ + if (error == ERESTART && timeout != NULL) error = EINTR; } umtxq_unlock(&uq->uq_key); From owner-svn-src-stable@FreeBSD.ORG Sun May 12 16:18:00 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E07785F9; Sun, 12 May 2013 16:18:00 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D2DEF1C0; Sun, 12 May 2013 16:18:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CGI0ox074682; Sun, 12 May 2013 16:18:00 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CGI0Dr074681; Sun, 12 May 2013 16:18:00 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201305121618.r4CGI0Dr074681@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 12 May 2013 16:18:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250570 - stable/9/lib/libc/sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 16:18:01 -0000 Author: jilles Date: Sun May 12 16:18:00 2013 New Revision: 250570 URL: http://svnweb.freebsd.org/changeset/base/250570 Log: MFC r249979: intro(2): Fix some errors in ENFILE and EMFILE descriptions. Modified: stable/9/lib/libc/sys/intro.2 Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/sys/ (props changed) Modified: stable/9/lib/libc/sys/intro.2 ============================================================================== --- stable/9/lib/libc/sys/intro.2 Sun May 12 16:11:23 2013 (r250569) +++ stable/9/lib/libc/sys/intro.2 Sun May 12 16:18:00 2013 (r250570) @@ -28,7 +28,7 @@ .\" @(#)intro.2 8.5 (Berkeley) 2/27/95 .\" $FreeBSD$ .\" -.Dd February 27, 1995 +.Dd April 27, 2013 .Dt INTRO 2 .Os .Sh NAME @@ -189,12 +189,13 @@ or a .Xr kill 2 system call). .It Er 23 ENFILE Em "Too many open files in system" . -Maximum number of file descriptors allowable on the system -has been reached and a requests for an open cannot be satisfied +Maximum number of open files allowable on the system +has been reached and requests for an open cannot be satisfied until at least one has been closed. .It Er 24 EMFILE Em "Too many open files" . -(As released, the limit on the number of -open files per process is 64.) +Maximum number of file descriptors allowable in the process +has been reached and requests for an open cannot be satisfied +until at least one has been closed. The .Xr getdtablesize 2 system call will obtain the current limit. From owner-svn-src-stable@FreeBSD.ORG Sun May 12 16:20:27 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id EAE4682A; Sun, 12 May 2013 16:20:27 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DCA791E6; Sun, 12 May 2013 16:20:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CGKRsd075342; Sun, 12 May 2013 16:20:27 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CGKRAN075341; Sun, 12 May 2013 16:20:27 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201305121620.r4CGKRAN075341@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 12 May 2013 16:20:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250571 - stable/9/lib/libc/gen X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 16:20:28 -0000 Author: jilles Date: Sun May 12 16:20:27 2013 New Revision: 250571 URL: http://svnweb.freebsd.org/changeset/base/250571 Log: MFC r249956: sysconf(3): Correct the description of _SC_OPEN_MAX. Modified: stable/9/lib/libc/gen/sysconf.3 Directory Properties: stable/9/lib/libc/ (props changed) Modified: stable/9/lib/libc/gen/sysconf.3 ============================================================================== --- stable/9/lib/libc/gen/sysconf.3 Sun May 12 16:18:00 2013 (r250570) +++ stable/9/lib/libc/gen/sysconf.3 Sun May 12 16:20:27 2013 (r250571) @@ -28,7 +28,7 @@ .\" @(#)sysconf.3 8.3 (Berkeley) 4/19/94 .\" $FreeBSD$ .\" -.Dd February 13, 2011 +.Dd April 26, 2013 .Dt SYSCONF 3 .Os .Sh NAME @@ -82,7 +82,7 @@ The number of processors configured. .It Li _SC_NPROCESSORS_ONLN The number of processors currently online. .It Li _SC_OPEN_MAX -The maximum number of open files per user id. +One more than the maximum value the system may assign to a new file descriptor. .It Li _SC_PAGESIZE The size of a system page in bytes. .It Li _SC_PAGE_SIZE From owner-svn-src-stable@FreeBSD.ORG Sun May 12 16:22:11 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5E7379A0; Sun, 12 May 2013 16:22:11 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 508CA1F3; Sun, 12 May 2013 16:22:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CGMBJY077142; Sun, 12 May 2013 16:22:11 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CGMBkK077141; Sun, 12 May 2013 16:22:11 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201305121622.r4CGMBkK077141@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 12 May 2013 16:22:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250572 - stable/9/lib/libc/sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 16:22:11 -0000 Author: jilles Date: Sun May 12 16:22:10 2013 New Revision: 250572 URL: http://svnweb.freebsd.org/changeset/base/250572 Log: MFC r249859: getdtablesize(2): Describe what this function actually does. getdtablesize() returns the limit on new file descriptors; this says nothing about existing descriptors. Modified: stable/9/lib/libc/sys/getdtablesize.2 Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/sys/ (props changed) Modified: stable/9/lib/libc/sys/getdtablesize.2 ============================================================================== --- stable/9/lib/libc/sys/getdtablesize.2 Sun May 12 16:20:27 2013 (r250571) +++ stable/9/lib/libc/sys/getdtablesize.2 Sun May 12 16:22:10 2013 (r250572) @@ -28,12 +28,12 @@ .\" @(#)getdtablesize.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd June 4, 1993 +.Dd April 24, 2013 .Dt GETDTABLESIZE 2 .Os .Sh NAME .Nm getdtablesize -.Nd get descriptor table size +.Nd get file descriptor limit .Sh LIBRARY .Lb libc .Sh SYNOPSIS @@ -41,18 +41,20 @@ .Ft int .Fn getdtablesize void .Sh DESCRIPTION -Each process has a fixed size descriptor table, -which is guaranteed to have at least 20 slots. -The entries in -the descriptor table are numbered with small integers starting at 0. The .Fn getdtablesize -system call returns the size of this table. +system call returns the maximum number of file descriptors +that the current process may open. +The maximum file descriptor number that the system may assign +is the return value minus one. +Existing file descriptor numbers may be higher +if the limit was lowered after they were opened. .Sh SEE ALSO .Xr close 2 , +.Xr closefrom 2 , .Xr dup 2 , -.Xr open 2 , -.Xr select 2 +.Xr getrlimit 2 , +.Xr sysconf 2 .Sh HISTORY The .Fn getdtablesize From owner-svn-src-stable@FreeBSD.ORG Sun May 12 16:26:20 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 14B2EB3D; Sun, 12 May 2013 16:26:20 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 06EFC20D; Sun, 12 May 2013 16:26:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CGQJbZ077901; Sun, 12 May 2013 16:26:19 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CGQJmJ077900; Sun, 12 May 2013 16:26:19 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201305121626.r4CGQJmJ077900@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 12 May 2013 16:26:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250573 - stable/9/lib/libc/sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 16:26:20 -0000 Author: jilles Date: Sun May 12 16:26:19 2013 New Revision: 250573 URL: http://svnweb.freebsd.org/changeset/base/250573 Log: dup(2): Remove incorrect sentence about getdtablesize(). There are no getdtablesize() bounds on the file descriptor to be duplicated; it only has to be open. If the RLIMIT_NOFILE rlimit was decreased after opening the file descriptor, it may be greater than or equal to getdtablesize() but still valid. Modified: stable/9/lib/libc/sys/dup.2 Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/sys/ (props changed) Modified: stable/9/lib/libc/sys/dup.2 ============================================================================== --- stable/9/lib/libc/sys/dup.2 Sun May 12 16:22:10 2013 (r250572) +++ stable/9/lib/libc/sys/dup.2 Sun May 12 16:26:19 2013 (r250573) @@ -28,7 +28,7 @@ .\" @(#)dup.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd August 14, 2011 +.Dd April 21, 2013 .Dt DUP 2 .Os .Sh NAME @@ -56,9 +56,6 @@ The argument .Fa oldd is a small non-negative integer index in the per-process descriptor table. -The value must be less -than the size of the table, which is returned by -.Xr getdtablesize 2 . The new descriptor returned by the call is the lowest numbered descriptor currently not in use by the process. From owner-svn-src-stable@FreeBSD.ORG Sun May 12 22:01:24 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B795B256; Sun, 12 May 2013 22:01:24 +0000 (UTC) (envelope-from hiren@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9A2981CD; Sun, 12 May 2013 22:01:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CM1O3H096573; Sun, 12 May 2013 22:01:24 GMT (envelope-from hiren@svn.freebsd.org) Received: (from hiren@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CM1M6j096561; Sun, 12 May 2013 22:01:22 GMT (envelope-from hiren@svn.freebsd.org) Message-Id: <201305122201.r4CM1M6j096561@svn.freebsd.org> From: Hiren Panchasara Date: Sun, 12 May 2013 22:01:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250581 - in stable/9/sys: dev/hwpmc kern X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 22:01:24 -0000 Author: hiren Date: Sun May 12 22:01:22 2013 New Revision: 250581 URL: http://svnweb.freebsd.org/changeset/base/250581 Log: MFC: r240475 Remove all the checks on curthread != NULL with the exception of some MD trap checks (eg. printtrap()). Generally this check is not needed anymore, as there is not a legitimate case where curthread != NULL, after pcpu 0 area has been properly initialized. Reviewed by: attilio Approved by: sbruno (mentor) Modified: stable/9/sys/dev/hwpmc/hwpmc_arm.c stable/9/sys/dev/hwpmc/hwpmc_x86.c stable/9/sys/kern/kern_condvar.c stable/9/sys/kern/kern_mutex.c stable/9/sys/kern/kern_rwlock.c stable/9/sys/kern/kern_sx.c stable/9/sys/kern/kern_thread.c stable/9/sys/kern/vfs_subr.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/hwpmc/hwpmc_arm.c ============================================================================== --- stable/9/sys/dev/hwpmc/hwpmc_arm.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/dev/hwpmc/hwpmc_arm.c Sun May 12 22:01:22 2013 (r250581) @@ -75,12 +75,10 @@ pmc_save_kernel_callchain(uintptr_t *cc, KASSERT(TRAPF_USERMODE(tf) == 0,("[arm,%d] not a kernel backtrace", __LINE__)); + td = curthread; pc = PMC_TRAPFRAME_TO_PC(tf); *cc++ = pc; - if ((td = curthread) == NULL) - return (1); - if (maxsamples <= 1) return (1); @@ -126,12 +124,10 @@ pmc_save_user_callchain(uintptr_t *cc, i KASSERT(TRAPF_USERMODE(tf), ("[x86,%d] Not a user trap frame tf=%p", __LINE__, (void *) tf)); + td = curthread; pc = PMC_TRAPFRAME_TO_PC(tf); *cc++ = pc; - if ((td = curthread) == NULL) - return (1); - if (maxsamples <= 1) return (1); Modified: stable/9/sys/dev/hwpmc/hwpmc_x86.c ============================================================================== --- stable/9/sys/dev/hwpmc/hwpmc_x86.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/dev/hwpmc/hwpmc_x86.c Sun May 12 22:01:22 2013 (r250581) @@ -161,6 +161,7 @@ pmc_save_kernel_callchain(uintptr_t *cc, KASSERT(TRAPF_USERMODE(tf) == 0,("[x86,%d] not a kernel backtrace", __LINE__)); + td = curthread; pc = PMC_TRAPFRAME_TO_PC(tf); fp = PMC_TRAPFRAME_TO_FP(tf); sp = PMC_TRAPFRAME_TO_KERNEL_SP(tf); @@ -168,9 +169,6 @@ pmc_save_kernel_callchain(uintptr_t *cc, *cc++ = pc; r = fp + sizeof(uintptr_t); /* points to return address */ - if ((td = curthread) == NULL) - return (1); - if (nframes <= 1) return (1); Modified: stable/9/sys/kern/kern_condvar.c ============================================================================== --- stable/9/sys/kern/kern_condvar.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/kern/kern_condvar.c Sun May 12 22:01:22 2013 (r250581) @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); * Common sanity checks for cv_wait* functions. */ #define CV_ASSERT(cvp, lock, td) do { \ - KASSERT((td) != NULL, ("%s: curthread NULL", __func__)); \ + KASSERT((td) != NULL, ("%s: td NULL", __func__)); \ KASSERT(TD_IS_RUNNING(td), ("%s: not TDS_RUNNING", __func__)); \ KASSERT((cvp) != NULL, ("%s: cvp NULL", __func__)); \ KASSERT((lock) != NULL, ("%s: lock NULL", __func__)); \ Modified: stable/9/sys/kern/kern_mutex.c ============================================================================== --- stable/9/sys/kern/kern_mutex.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/kern/kern_mutex.c Sun May 12 22:01:22 2013 (r250581) @@ -199,7 +199,6 @@ _mtx_lock_flags(struct mtx *m, int opts, if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, ("mtx_lock() of destroyed mutex @ %s:%d", file, line)); KASSERT(LOCK_CLASS(&m->lock_object) == &lock_class_mtx_sleep, @@ -221,7 +220,6 @@ _mtx_unlock_flags(struct mtx *m, int opt if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, ("mtx_unlock() of destroyed mutex @ %s:%d", file, line)); KASSERT(LOCK_CLASS(&m->lock_object) == &lock_class_mtx_sleep, @@ -244,7 +242,6 @@ _mtx_lock_spin_flags(struct mtx *m, int if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, ("mtx_lock_spin() of destroyed mutex @ %s:%d", file, line)); KASSERT(LOCK_CLASS(&m->lock_object) == &lock_class_mtx_spin, @@ -268,7 +265,6 @@ _mtx_unlock_spin_flags(struct mtx *m, in if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, ("mtx_unlock_spin() of destroyed mutex @ %s:%d", file, line)); KASSERT(LOCK_CLASS(&m->lock_object) == &lock_class_mtx_spin, @@ -299,7 +295,6 @@ _mtx_trylock(struct mtx *m, int opts, co if (SCHEDULER_STOPPED()) return (1); - MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, ("mtx_trylock() of destroyed mutex @ %s:%d", file, line)); KASSERT(LOCK_CLASS(&m->lock_object) == &lock_class_mtx_sleep, Modified: stable/9/sys/kern/kern_rwlock.c ============================================================================== --- stable/9/sys/kern/kern_rwlock.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/kern/kern_rwlock.c Sun May 12 22:01:22 2013 (r250581) @@ -237,7 +237,6 @@ _rw_wlock(struct rwlock *rw, const char if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(rw->rw_lock != RW_DESTROYED, ("rw_wlock() of destroyed rwlock @ %s:%d", file, line)); WITNESS_CHECKORDER(&rw->lock_object, LOP_NEWORDER | LOP_EXCLUSIVE, file, @@ -282,7 +281,6 @@ _rw_wunlock(struct rwlock *rw, const cha if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(rw->rw_lock != RW_DESTROYED, ("rw_wunlock() of destroyed rwlock @ %s:%d", file, line)); _rw_assert(rw, RA_WLOCKED, file, line); Modified: stable/9/sys/kern/kern_sx.c ============================================================================== --- stable/9/sys/kern/kern_sx.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/kern/kern_sx.c Sun May 12 22:01:22 2013 (r250581) @@ -246,7 +246,6 @@ _sx_slock(struct sx *sx, int opts, const if (SCHEDULER_STOPPED()) return (0); - MPASS(curthread != NULL); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_slock() of destroyed sx @ %s:%d", file, line)); WITNESS_CHECKORDER(&sx->lock_object, LOP_NEWORDER, file, line, NULL); @@ -293,7 +292,6 @@ _sx_xlock(struct sx *sx, int opts, const if (SCHEDULER_STOPPED()) return (0); - MPASS(curthread != NULL); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_xlock() of destroyed sx @ %s:%d", file, line)); WITNESS_CHECKORDER(&sx->lock_object, LOP_NEWORDER | LOP_EXCLUSIVE, file, @@ -317,7 +315,6 @@ _sx_try_xlock(struct sx *sx, const char if (SCHEDULER_STOPPED()) return (1); - MPASS(curthread != NULL); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_try_xlock() of destroyed sx @ %s:%d", file, line)); @@ -345,7 +342,6 @@ _sx_sunlock(struct sx *sx, const char *f if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_sunlock() of destroyed sx @ %s:%d", file, line)); _sx_assert(sx, SA_SLOCKED, file, line); @@ -362,7 +358,6 @@ _sx_xunlock(struct sx *sx, const char *f if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_xunlock() of destroyed sx @ %s:%d", file, line)); _sx_assert(sx, SA_XLOCKED, file, line); Modified: stable/9/sys/kern/kern_thread.c ============================================================================== --- stable/9/sys/kern/kern_thread.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/kern/kern_thread.c Sun May 12 22:01:22 2013 (r250581) @@ -623,7 +623,6 @@ thread_single(int mode) p = td->td_proc; mtx_assert(&Giant, MA_NOTOWNED); PROC_LOCK_ASSERT(p, MA_OWNED); - KASSERT((td != NULL), ("curthread is NULL")); if ((p->p_flag & P_HADTHREADS) == 0) return (0); Modified: stable/9/sys/kern/vfs_subr.c ============================================================================== --- stable/9/sys/kern/vfs_subr.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/kern/vfs_subr.c Sun May 12 22:01:22 2013 (r250581) @@ -3494,7 +3494,6 @@ vfs_unmountall(void) struct thread *td; int error; - KASSERT(curthread != NULL, ("vfs_unmountall: NULL curthread")); CTR1(KTR_VFS, "%s: unmounting all filesystems", __func__); td = curthread; From owner-svn-src-stable@FreeBSD.ORG Mon May 13 01:20:32 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 46E2B725; Mon, 13 May 2013 01:20:32 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 389649EF; Mon, 13 May 2013 01:20:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4D1KVZm064861; Mon, 13 May 2013 01:20:31 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4D1KVPU064860; Mon, 13 May 2013 01:20:31 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305130120.r4D1KVPU064860@svn.freebsd.org> From: Eitan Adler Date: Mon, 13 May 2013 01:20:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250583 - stable/9/usr.sbin/mergemaster X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2013 01:20:32 -0000 Author: eadler Date: Mon May 13 01:20:31 2013 New Revision: 250583 URL: http://svnweb.freebsd.org/changeset/base/250583 Log: MFC r250463: Permit relative paths with mergemaster -m PR: bin/173929 Modified: stable/9/usr.sbin/mergemaster/mergemaster.sh Directory Properties: stable/9/usr.sbin/mergemaster/ (props changed) Modified: stable/9/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/9/usr.sbin/mergemaster/mergemaster.sh Sun May 12 22:22:12 2013 (r250582) +++ stable/9/usr.sbin/mergemaster/mergemaster.sh Mon May 13 01:20:31 2013 (r250583) @@ -483,6 +483,7 @@ if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a sleep 3 SOURCEDIR=${SOURCEDIR}/.. fi +SOURCEDIR=$(realpath "$SOURCEDIR") # Setup make to use system files from SOURCEDIR MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk" From owner-svn-src-stable@FreeBSD.ORG Mon May 13 01:20:37 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 16DD6726; Mon, 13 May 2013 01:20:37 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 08C699F0; Mon, 13 May 2013 01:20:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4D1KaLx064909; Mon, 13 May 2013 01:20:36 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4D1Kade064908; Mon, 13 May 2013 01:20:36 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305130120.r4D1Kade064908@svn.freebsd.org> From: Eitan Adler Date: Mon, 13 May 2013 01:20:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250584 - stable/8/usr.sbin/mergemaster X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2013 01:20:37 -0000 Author: eadler Date: Mon May 13 01:20:36 2013 New Revision: 250584 URL: http://svnweb.freebsd.org/changeset/base/250584 Log: MFC r250463: Permit relative paths with mergemaster -m PR: bin/173929 Modified: stable/8/usr.sbin/mergemaster/mergemaster.sh Directory Properties: stable/8/usr.sbin/mergemaster/ (props changed) Modified: stable/8/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/8/usr.sbin/mergemaster/mergemaster.sh Mon May 13 01:20:31 2013 (r250583) +++ stable/8/usr.sbin/mergemaster/mergemaster.sh Mon May 13 01:20:36 2013 (r250584) @@ -483,6 +483,7 @@ if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a sleep 3 SOURCEDIR=${SOURCEDIR}/.. fi +SOURCEDIR=$(realpath "$SOURCEDIR") # Setup make to use system files from SOURCEDIR MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk" From owner-svn-src-stable@FreeBSD.ORG Mon May 13 01:26:27 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id EB224A3F; Mon, 13 May 2013 01:26:27 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C2E08A19; Mon, 13 May 2013 01:26:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4D1QRUI067515; Mon, 13 May 2013 01:26:27 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4D1QRqP067507; Mon, 13 May 2013 01:26:27 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305130126.r4D1QRqP067507@svn.freebsd.org> From: Eitan Adler Date: Mon, 13 May 2013 01:26:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250585 - stable/9/sbin/iscontrol X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2013 01:26:28 -0000 Author: eadler Date: Mon May 13 01:26:26 2013 New Revision: 250585 URL: http://svnweb.freebsd.org/changeset/base/250585 Log: MFC r250303: Remove includes for old versions of FreeBSD. Reviewed by: stass Modified: stable/9/sbin/iscontrol/auth_subr.c stable/9/sbin/iscontrol/fsm.c stable/9/sbin/iscontrol/login.c stable/9/sbin/iscontrol/misc.c Directory Properties: stable/9/sbin/iscontrol/ (props changed) Modified: stable/9/sbin/iscontrol/auth_subr.c ============================================================================== --- stable/9/sbin/iscontrol/auth_subr.c Mon May 13 01:20:36 2013 (r250584) +++ stable/9/sbin/iscontrol/auth_subr.c Mon May 13 01:26:26 2013 (r250585) @@ -40,9 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#if __FreeBSD_version < 500000 -#include -#endif #include #include #include Modified: stable/9/sbin/iscontrol/fsm.c ============================================================================== --- stable/9/sbin/iscontrol/fsm.c Mon May 13 01:20:36 2013 (r250584) +++ stable/9/sbin/iscontrol/fsm.c Mon May 13 01:26:26 2013 (r250585) @@ -40,9 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#if __FreeBSD_version < 500000 -#include -#endif #include #include #include Modified: stable/9/sbin/iscontrol/login.c ============================================================================== --- stable/9/sbin/iscontrol/login.c Mon May 13 01:20:36 2013 (r250584) +++ stable/9/sbin/iscontrol/login.c Mon May 13 01:26:26 2013 (r250585) @@ -39,9 +39,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#if __FreeBSD_version < 500000 -#include -#endif #include #include #include Modified: stable/9/sbin/iscontrol/misc.c ============================================================================== --- stable/9/sbin/iscontrol/misc.c Mon May 13 01:20:36 2013 (r250584) +++ stable/9/sbin/iscontrol/misc.c Mon May 13 01:26:26 2013 (r250585) @@ -40,9 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#if __FreeBSD_version < 500000 -#include -#endif #include #include #include From owner-svn-src-stable@FreeBSD.ORG Mon May 13 01:28:00 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 526D4BC6; Mon, 13 May 2013 01:28:00 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 29F88A2B; Mon, 13 May 2013 01:28:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4D1S0Ga067820; Mon, 13 May 2013 01:28:00 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4D1S0B6067819; Mon, 13 May 2013 01:28:00 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305130128.r4D1S0B6067819@svn.freebsd.org> From: Eitan Adler Date: Mon, 13 May 2013 01:28:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250586 - stable/9/bin/rm X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2013 01:28:00 -0000 Author: eadler Date: Mon May 13 01:27:59 2013 New Revision: 250586 URL: http://svnweb.freebsd.org/changeset/base/250586 Log: MFC r249949: Take some improvements from DragonFlyBSD: - add const where appropriate - add static where appropriate - fix a whitespace issues Modified: stable/9/bin/rm/rm.c Directory Properties: stable/9/bin/rm/ (props changed) Modified: stable/9/bin/rm/rm.c ============================================================================== --- stable/9/bin/rm/rm.c Mon May 13 01:26:26 2013 (r250585) +++ stable/9/bin/rm/rm.c Mon May 13 01:27:59 2013 (r250586) @@ -62,15 +62,15 @@ int rflag, Iflag; uid_t uid; volatile sig_atomic_t info; -int check(char *, char *, struct stat *); -int check2(char **); -void checkdot(char **); -void checkslash(char **); -void rm_file(char **); -int rm_overwrite(char *, struct stat *); -void rm_tree(char **); +static int check(const char *, const char *, struct stat *); +static int check2(char **); +static void checkdot(char **); +static void checkslash(char **); +static void rm_file(char **); +static int rm_overwrite(const char *, struct stat *); +static void rm_tree(char **); static void siginfo(int __unused); -void usage(void); +static void usage(void); /* * rm -- @@ -169,7 +169,7 @@ main(int argc, char *argv[]) exit (eval); } -void +static void rm_tree(char **argv) { FTS *fts; @@ -412,7 +412,7 @@ rm_file(char **argv) * have kernel support. */ int -rm_overwrite(char *file, struct stat *sbp) +rm_overwrite(const char *file, struct stat *sbp) { struct stat sb, sb2; struct statfs fsb; @@ -478,8 +478,8 @@ err: eval = 1; } -int -check(char *path, char *name, struct stat *sp) +static int +check(const char *path, const char *name, struct stat *sp) { int ch, first; char modep[15], *flagsp; @@ -490,7 +490,7 @@ check(char *path, char *name, struct sta else { /* * If it's not a symbolic link and it's unwritable and we're - * talking to a terminal, ask. Symbolic links are excluded + * talking to a terminal, ask. Symbolic links are excluded * because their permissions are meaningless. Check stdin_ok * first because we may not have stat'ed the file. */ @@ -523,7 +523,7 @@ check(char *path, char *name, struct sta } #define ISSLASH(a) ((a)[0] == '/' && (a)[1] == '\0') -void +static void checkslash(char **argv) { char **t, **u; @@ -543,7 +543,7 @@ checkslash(char **argv) } } -int +static int check2(char **argv) { struct stat st; @@ -594,7 +594,7 @@ check2(char **argv) } #define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2]))) -void +static void checkdot(char **argv) { char *p, **save, **t; @@ -618,7 +618,7 @@ checkdot(char **argv) } } -void +static void usage(void) { From owner-svn-src-stable@FreeBSD.ORG Mon May 13 01:28:09 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C354DCD9; Mon, 13 May 2013 01:28:09 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9CBA5A2E; Mon, 13 May 2013 01:28:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4D1S9hQ067901; Mon, 13 May 2013 01:28:09 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4D1S9Fw067900; Mon, 13 May 2013 01:28:09 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305130128.r4D1S9Fw067900@svn.freebsd.org> From: Eitan Adler Date: Mon, 13 May 2013 01:28:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250587 - stable/8/bin/rm X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2013 01:28:09 -0000 Author: eadler Date: Mon May 13 01:28:09 2013 New Revision: 250587 URL: http://svnweb.freebsd.org/changeset/base/250587 Log: MFC r249949: Take some improvements from DragonFlyBSD: - add const where appropriate - add static where appropriate - fix a whitespace issues Modified: stable/8/bin/rm/rm.c Directory Properties: stable/8/bin/rm/ (props changed) Modified: stable/8/bin/rm/rm.c ============================================================================== --- stable/8/bin/rm/rm.c Mon May 13 01:27:59 2013 (r250586) +++ stable/8/bin/rm/rm.c Mon May 13 01:28:09 2013 (r250587) @@ -62,15 +62,15 @@ int rflag, Iflag; uid_t uid; volatile sig_atomic_t info; -int check(char *, char *, struct stat *); -int check2(char **); -void checkdot(char **); -void checkslash(char **); -void rm_file(char **); -int rm_overwrite(char *, struct stat *); -void rm_tree(char **); +static int check(const char *, const char *, struct stat *); +static int check2(char **); +static void checkdot(char **); +static void checkslash(char **); +static void rm_file(char **); +static int rm_overwrite(const char *, struct stat *); +static void rm_tree(char **); static void siginfo(int __unused); -void usage(void); +static void usage(void); /* * rm -- @@ -169,7 +169,7 @@ main(int argc, char *argv[]) exit (eval); } -void +static void rm_tree(char **argv) { FTS *fts; @@ -412,7 +412,7 @@ rm_file(char **argv) * kernel support. */ int -rm_overwrite(char *file, struct stat *sbp) +rm_overwrite(const char *file, struct stat *sbp) { struct stat sb, sb2; struct statfs fsb; @@ -478,8 +478,8 @@ err: eval = 1; } -int -check(char *path, char *name, struct stat *sp) +static int +check(const char *path, const char *name, struct stat *sp) { int ch, first; char modep[15], *flagsp; @@ -490,7 +490,7 @@ check(char *path, char *name, struct sta else { /* * If it's not a symbolic link and it's unwritable and we're - * talking to a terminal, ask. Symbolic links are excluded + * talking to a terminal, ask. Symbolic links are excluded * because their permissions are meaningless. Check stdin_ok * first because we may not have stat'ed the file. */ @@ -523,7 +523,7 @@ check(char *path, char *name, struct sta } #define ISSLASH(a) ((a)[0] == '/' && (a)[1] == '\0') -void +static void checkslash(char **argv) { char **t, **u; @@ -543,7 +543,7 @@ checkslash(char **argv) } } -int +static int check2(char **argv) { struct stat st; @@ -594,7 +594,7 @@ check2(char **argv) } #define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2]))) -void +static void checkdot(char **argv) { char *p, **save, **t; @@ -618,7 +618,7 @@ checkdot(char **argv) } } -void +static void usage(void) { From owner-svn-src-stable@FreeBSD.ORG Mon May 13 12:43:04 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 32E93278; Mon, 13 May 2013 12:43:04 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0AA1AF8A; Mon, 13 May 2013 12:43:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DCh3xK010126; Mon, 13 May 2013 12:43:03 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DCh3OJ010125; Mon, 13 May 2013 12:43:03 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201305131243.r4DCh3OJ010125@svn.freebsd.org> From: Luigi Rizzo Date: Mon, 13 May 2013 12:43:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250596 - stable/9/release/picobsd/build X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2013 12:43:04 -0000 Author: luigi Date: Mon May 13 12:43:03 2013 New Revision: 250596 URL: http://svnweb.freebsd.org/changeset/base/250596 Log: MFC: enable parallel build of toolchain/libraries/headers Modified: stable/9/release/picobsd/build/picobsd Modified: stable/9/release/picobsd/build/picobsd ============================================================================== --- stable/9/release/picobsd/build/picobsd Mon May 13 11:32:20 2013 (r250595) +++ stable/9/release/picobsd/build/picobsd Mon May 13 12:43:03 2013 (r250596) @@ -173,17 +173,10 @@ create_includes_and_libraries2() { # opt if [ -d "$1" ] ; then cd $1 ; ${BINMAKE} ${o_par} $2 # specific target, e.g. ld-elf.so else - MAKEOBJDIRPREFIX=${l_objtree} - export MAKEOBJDIRPREFIX - # export WITH_RESCUE=yes # build crunchide - # ${BINMAKE} ${o_par} _+_= $no toolchain _includes _libraries - ( - # eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V BMAKEENV` - eval "export XMAKE=\"`cd ${SRC}; make -f Makefile -V XMAKE`\"" - ${BINMAKE} ${o_par} _+_= $no toolchain - ) + export MAKEOBJDIRPREFIX=${l_objtree} + make ${o_par} $no toolchain + # XXX do we need any of these ? eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V WMAKEENV` - ${BINMAKE} ${o_par} _+_= $no _includes _libraries [ ${o_arch} != `uname -m` ] && \ (cd ${l_objtree}; ln -s . ${o_arch}.${o_arch} || true ) fi @@ -440,7 +433,8 @@ do_kernel() { # OK # export CONFIG export WARNS CWARNFLAGS [ "${o_do_modules}" = "yes" ] && export MODULES="" - ${BINMAKE} ${o_par} KERNCONF=${l_kernconf} \ + # kernel build not parallelizable yet + ${BINMAKE} KERNCONF=${l_kernconf} \ -v -f ${PICO_TREE}/build/Makefile.conf ) || \ fail $? missing_kernel } @@ -971,6 +965,7 @@ set_build_parameters() { if [ ${OSVERSION} -ge 500035 ] ; then export MAKEOBJDIRPREFIX=${l_objtree} export TARGET_ARCH=${o_arch} TARGET=${o_arch} + export WITHOUT_CLANG_IS_CC=1 # XXX why change machine_arch ? #-- export MACHINE_ARCH=`uname -m` MACHINE=`uname -m` # export CWARNFLAGS="-Wextra -Wno-sign-compare -Wno-missing-field-initializers" From owner-svn-src-stable@FreeBSD.ORG Mon May 13 13:57:06 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D7425A78; Mon, 13 May 2013 13:57:06 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C930A76D; Mon, 13 May 2013 13:57:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DDv6Zf035414; Mon, 13 May 2013 13:57:06 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DDv6e3035413; Mon, 13 May 2013 13:57:06 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201305131357.r4DDv6e3035413@svn.freebsd.org> From: Jaakko Heinonen Date: Mon, 13 May 2013 13:57:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250597 - stable/9/usr.bin/calendar X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2013 13:57:06 -0000 Author: jh Date: Mon May 13 13:57:06 2013 New Revision: 250597 URL: http://svnweb.freebsd.org/changeset/base/250597 Log: MFC r249200: Correct the path. PR: 176256 Modified: stable/9/usr.bin/calendar/calendar.1 Directory Properties: stable/9/usr.bin/calendar/ (props changed) Modified: stable/9/usr.bin/calendar/calendar.1 ============================================================================== --- stable/9/usr.bin/calendar/calendar.1 Mon May 13 12:43:03 2013 (r250596) +++ stable/9/usr.bin/calendar/calendar.1 Mon May 13 13:57:06 2013 (r250597) @@ -28,7 +28,7 @@ .\" @(#)calendar.1 8.1 (Berkeley) 6/29/93 .\" $FreeBSD$ .\" -.Dd June 13, 2002 +.Dd April 6, 2013 .Dt CALENDAR 1 .Os .Sh NAME @@ -230,7 +230,7 @@ do not send mail if this file exists. .El .Pp The following default calendar files are provided in -.Pa /usr/share/calendars: +.Pa /usr/share/calendar: .Pp .Bl -tag -width calendar.southafrica -compact .It Pa calendar.all From owner-svn-src-stable@FreeBSD.ORG Mon May 13 14:00:24 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E9BFEC8E; Mon, 13 May 2013 14:00:24 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DBCBA7A1; Mon, 13 May 2013 14:00:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DE0OTX037721; Mon, 13 May 2013 14:00:24 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DE0OWO037720; Mon, 13 May 2013 14:00:24 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201305131400.r4DE0OWO037720@svn.freebsd.org> From: Jaakko Heinonen Date: Mon, 13 May 2013 14:00:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250598 - stable/8/usr.bin/calendar X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2013 14:00:25 -0000 Author: jh Date: Mon May 13 14:00:24 2013 New Revision: 250598 URL: http://svnweb.freebsd.org/changeset/base/250598 Log: MFC r249200: Correct the path. PR: 176256 Modified: stable/8/usr.bin/calendar/calendar.1 Directory Properties: stable/8/usr.bin/calendar/ (props changed) Modified: stable/8/usr.bin/calendar/calendar.1 ============================================================================== --- stable/8/usr.bin/calendar/calendar.1 Mon May 13 13:57:06 2013 (r250597) +++ stable/8/usr.bin/calendar/calendar.1 Mon May 13 14:00:24 2013 (r250598) @@ -28,7 +28,7 @@ .\" @(#)calendar.1 8.1 (Berkeley) 6/29/93 .\" $FreeBSD$ .\" -.Dd June 13, 2002 +.Dd April 6, 2013 .Dt CALENDAR 1 .Os .Sh NAME @@ -222,7 +222,7 @@ do not send mail if this file exists. .El .Pp The following default calendar files are provided in -.Pa /usr/share/calendars: +.Pa /usr/share/calendar: .Pp .Bl -tag -width calendar.southafrica -compact .It Pa calendar.all From owner-svn-src-stable@FreeBSD.ORG Mon May 13 15:18:38 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 120E3C3C; Mon, 13 May 2013 15:18:38 +0000 (UTC) (envelope-from fabient@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E734AEBC; Mon, 13 May 2013 15:18:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DFIbU1065183; Mon, 13 May 2013 15:18:37 GMT (envelope-from fabient@svn.freebsd.org) Received: (from fabient@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DFIaJg065174; Mon, 13 May 2013 15:18:36 GMT (envelope-from fabient@svn.freebsd.org) Message-Id: <201305131518.r4DFIaJg065174@svn.freebsd.org> From: Fabien Thomas Date: Mon, 13 May 2013 15:18:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250600 - in stable/9: lib/libpmc sys/dev/hwpmc sys/kern sys/sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2013 15:18:38 -0000 Author: fabient Date: Mon May 13 15:18:36 2013 New Revision: 250600 URL: http://svnweb.freebsd.org/changeset/base/250600 Log: MFC r247329, r247836: Add support for good old 8192Hz profiling clock to software PMC. Add a generic way to call per event allocate / release function. Modified: stable/9/lib/libpmc/pmc.soft.3 stable/9/sys/dev/hwpmc/hwpmc_soft.c stable/9/sys/kern/kern_clock.c stable/9/sys/kern/kern_clocksource.c stable/9/sys/sys/pmckern.h Directory Properties: stable/9/lib/libpmc/ (props changed) stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/sys/ (props changed) Modified: stable/9/lib/libpmc/pmc.soft.3 ============================================================================== --- stable/9/lib/libpmc/pmc.soft.3 Mon May 13 15:00:36 2013 (r250599) +++ stable/9/lib/libpmc/pmc.soft.3 Mon May 13 15:18:36 2013 (r250600) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 28, 2012 +.Dd February 26, 2013 .Os .Dt PMC.SOFT 3 .Sh NAME @@ -61,6 +61,8 @@ The event specifiers supported by softwa Hard clock ticks. .It Li CLOCK.STAT Stat clock ticks. +.It Li CLOCK.PROF +Profiling clock ticks. .It Li LOCK.FAILED Lock acquisition failed. .It Li PAGE_FAULT.ALL Modified: stable/9/sys/dev/hwpmc/hwpmc_soft.c ============================================================================== --- stable/9/sys/dev/hwpmc/hwpmc_soft.c Mon May 13 15:00:36 2013 (r250599) +++ stable/9/sys/dev/hwpmc/hwpmc_soft.c Mon May 13 15:18:36 2013 (r250600) @@ -124,6 +124,9 @@ soft_allocate_pmc(int cpu, int ri, struc if (ps == NULL) return (EINVAL); pmc_soft_ev_release(ps); + /* Module unload is protected by pmc SX lock. */ + if (ps->ps_alloc != NULL) + ps->ps_alloc(); return (0); } @@ -311,6 +314,8 @@ static int soft_release_pmc(int cpu, int ri, struct pmc *pmc) { struct pmc_hw *phw; + enum pmc_event ev; + struct pmc_soft *ps; (void) pmc; @@ -324,9 +329,16 @@ soft_release_pmc(int cpu, int ri, struct KASSERT(phw->phw_pmc == NULL, ("[soft,%d] PHW pmc %p non-NULL", __LINE__, phw->phw_pmc)); - /* - * Nothing to do. - */ + ev = pmc->pm_event; + + /* Check if event is registered. */ + ps = pmc_soft_ev_acquire(ev); + KASSERT(ps != NULL, + ("[soft,%d] unregistered event %d", __LINE__, ev)); + pmc_soft_ev_release(ps); + /* Module unload is protected by pmc SX lock. */ + if (ps->ps_release != NULL) + ps->ps_release(); return (0); } Modified: stable/9/sys/kern/kern_clock.c ============================================================================== --- stable/9/sys/kern/kern_clock.c Mon May 13 15:00:36 2013 (r250599) +++ stable/9/sys/kern/kern_clock.c Mon May 13 15:18:36 2013 (r250600) @@ -78,6 +78,8 @@ __FBSDID("$FreeBSD$"); #include PMC_SOFT_DEFINE( , , clock, hard); PMC_SOFT_DEFINE( , , clock, stat); +PMC_SOFT_DEFINE_EX( , , clock, prof, \ + cpu_startprofclock, cpu_stopprofclock); #endif #ifdef DEVICE_POLLING @@ -817,6 +819,10 @@ profclock_cnt(int cnt, int usermode, uin } } #endif +#ifdef HWPMC_HOOKS + if (td->td_intr_frame != NULL) + PMC_SOFT_CALL_TF( , , clock, prof, td->td_intr_frame); +#endif } /* Modified: stable/9/sys/kern/kern_clocksource.c ============================================================================== --- stable/9/sys/kern/kern_clocksource.c Mon May 13 15:00:36 2013 (r250599) +++ stable/9/sys/kern/kern_clocksource.c Mon May 13 15:18:36 2013 (r250600) @@ -732,12 +732,15 @@ cpu_startprofclock(void) { ET_LOCK(); - if (periodic) { - configtimer(0); - profiling = 1; - configtimer(1); + if (profiling == 0) { + if (periodic) { + configtimer(0); + profiling = 1; + configtimer(1); + } else + profiling = 1; } else - profiling = 1; + profiling++; ET_UNLOCK(); } @@ -749,12 +752,15 @@ cpu_stopprofclock(void) { ET_LOCK(); - if (periodic) { - configtimer(0); + if (profiling == 1) { + if (periodic) { + configtimer(0); + profiling = 0; + configtimer(1); + } else profiling = 0; - configtimer(1); } else - profiling = 0; + profiling--; ET_UNLOCK(); } Modified: stable/9/sys/sys/pmckern.h ============================================================================== --- stable/9/sys/sys/pmckern.h Mon May 13 15:00:36 2013 (r250599) +++ stable/9/sys/sys/pmckern.h Mon May 13 15:18:36 2013 (r250600) @@ -87,9 +87,9 @@ struct pmckern_soft { * Soft PMC. */ -#define PMC_SOFT_DEFINE(prov, mod, func, name) \ +#define PMC_SOFT_DEFINE_EX(prov, mod, func, name, alloc, release) \ struct pmc_soft pmc_##prov##_##mod##_##func##_##name = \ - { 0, { #prov "_" #mod "_" #func "." #name, 0 } }; \ + { 0, alloc, release, { #prov "_" #mod "_" #func "." #name, 0 } }; \ SYSINIT(pmc_##prov##_##mod##_##func##_##name##_init, SI_SUB_KDTRACE, \ SI_ORDER_SECOND + 1, pmc_soft_ev_register, \ &pmc_##prov##_##mod##_##func##_##name ); \ @@ -97,6 +97,9 @@ struct pmckern_soft { SI_SUB_KDTRACE, SI_ORDER_SECOND + 1, pmc_soft_ev_deregister, \ &pmc_##prov##_##mod##_##func##_##name ) +#define PMC_SOFT_DEFINE(prov, mod, func, name) \ + PMC_SOFT_DEFINE_EX(prov, mod, func, name, NULL, NULL) + #define PMC_SOFT_DECLARE(prov, mod, func, name) \ extern struct pmc_soft pmc_##prov##_##mod##_##func##_##name @@ -147,6 +150,8 @@ do { \ struct pmc_soft { int ps_running; + void (*ps_alloc)(void); + void (*ps_release)(void); struct pmc_dyn_event_descr ps_ev; }; From owner-svn-src-stable@FreeBSD.ORG Mon May 13 19:44:35 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C9B4584E; Mon, 13 May 2013 19:44:35 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BB698686; Mon, 13 May 2013 19:44:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DJiZs3059417; Mon, 13 May 2013 19:44:35 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DJiZ4Q059416; Mon, 13 May 2013 19:44:35 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201305131944.r4DJiZ4Q059416@svn.freebsd.org> From: Jung-uk Kim Date: Mon, 13 May 2013 19:44:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250610 - stable/9/sys/dev/atkbdc X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2013 19:44:35 -0000 Author: jkim Date: Mon May 13 19:44:35 2013 New Revision: 250610 URL: http://svnweb.freebsd.org/changeset/base/250610 Log: MFC: r248479 List TrackPoint device before generic model. Modified: stable/9/sys/dev/atkbdc/psm.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/atkbdc/psm.c ============================================================================== --- stable/9/sys/dev/atkbdc/psm.c Mon May 13 19:03:12 2013 (r250609) +++ stable/9/sys/dev/atkbdc/psm.c Mon May 13 19:44:35 2013 (r250610) @@ -747,8 +747,8 @@ model_name(int model) { MOUSE_MODEL_4D, "4D Mouse" }, { MOUSE_MODEL_4DPLUS, "4D+ Mouse" }, { MOUSE_MODEL_SYNAPTICS, "Synaptics Touchpad" }, - { MOUSE_MODEL_GENERIC, "Generic PS/2 mouse" }, { MOUSE_MODEL_TRACKPOINT, "IBM/Lenovo TrackPoint" }, + { MOUSE_MODEL_GENERIC, "Generic PS/2 mouse" }, { MOUSE_MODEL_UNKNOWN, "Unknown" }, }; int i; From owner-svn-src-stable@FreeBSD.ORG Tue May 14 21:15:37 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 78D1EB74; Tue, 14 May 2013 21:15:37 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5AA4DDA1; Tue, 14 May 2013 21:15:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4ELFadG099309; Tue, 14 May 2013 21:15:36 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4ELFa9c099305; Tue, 14 May 2013 21:15:36 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201305142115.r4ELFa9c099305@svn.freebsd.org> From: Brooks Davis Date: Tue, 14 May 2013 21:15:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250640 - in stable/9: . etc X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 May 2013 21:15:37 -0000 Author: brooks Date: Tue May 14 21:15:36 2013 New Revision: 250640 URL: http://svnweb.freebsd.org/changeset/base/250640 Log: MFC r245825,245890,246097,246127,246315: Introduce a new option -DNO_ROOT that allows install and distribution targets to be run without root privilege. Information about ownership, group, flags, and suid bits are stored in the file specified by METALOG which defaults to ${DESTDIR}/METALOG. This file can be used in conjunction with bsdtar or makefs to generate archives or file system images with correct permissions. Sponsored by: DARPA, AFRL Modified: stable/9/Makefile.inc1 (contents, props changed) stable/9/etc/Makefile Directory Properties: stable/9/etc/ (props changed) Modified: stable/9/Makefile.inc1 ============================================================================== --- stable/9/Makefile.inc1 Tue May 14 20:25:07 2013 (r250639) +++ stable/9/Makefile.inc1 Tue May 14 21:15:36 2013 (r250640) @@ -4,6 +4,8 @@ # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNO_CLEAN do not clean at all +# -DDB_FROM_SRC use the user/group databases in src/etc instead of +# the system database when installing. # -DNO_SHARE do not go into share subdir # -DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ} # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel @@ -11,13 +13,14 @@ # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel # -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel # -DNO_PORTSUPDATE do not update ports in ${MAKE} update +# -DNO_ROOT install without using root privilege # -DNO_DOCUPDATE do not update doc in ${MAKE} update -# -DDB_FROM_SRC use the user/group databases in src/etc instead of -# the system database when installing. # -DNO_CTF do not run the DTrace CTF conversion tools on built objects # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list # LOCAL_MTREE="list of mtree files" to process to allow local directories # to be created before files are installed +# METALOG="path to metadata log" to write permission and ownership +# when NO_ROOT is set. (default: ${DESTDIR}/METALOG) # TARGET="machine" to crossbuild world for a different machine type # TARGET_ARCH= may be required when a TARGET supports multiple endians @@ -174,7 +177,7 @@ OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.$ .endif WORLDTMP= ${OBJTREE}${.CURDIR}/tmp # /usr/games added for fortune which depend on strfile -BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games +BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} @@ -353,8 +356,19 @@ IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP} .endif .if defined(DB_FROM_SRC) -IMAKE_INSTALL= INSTALL="install -N ${.CURDIR}/etc" -IMAKE_MTREE= MTREE_CMD="nmtree -N ${.CURDIR}/etc" +INSTALLFLAGS+= -N ${.CURDIR}/etc +MTREEFLAGS+= -N ${.CURDIR}/etc +.endif +.if defined(NO_ROOT) +METALOG?= ${DESTDIR}/${DISTDIR}/METALOG +IMAKE+= -DNO_ROOT METALOG=${METALOG} +INSTALL_DDIR= ${DESTDIR}/${DISTDIR} +INSTALLFLAGS+= -U -M ${METALOG} -D ${INSTALL_DDIR:S://:/:g:C:/$::} +MTREEFLAGS+= -W +.endif +.if defined(DB_FROM_SRC) || defined(NO_ROOT) +IMAKE_INSTALL= INSTALL="install ${INSTALLFLAGS}" +IMAKE_MTREE= MTREE_CMD="nmtree ${MTREEFLAGS}" .endif # kernel stage @@ -393,7 +407,7 @@ _worldtmp: rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - lib usr legacy/usr + lib usr legacy/bin legacy/usr mkdir -p ${WORLDTMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ @@ -662,7 +676,7 @@ _nmtree_itools= nmtree .endif ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep ${_install-info} \ + date echo egrep find grep id install ${_install-info} \ ln lockf make mkdir mtree ${_nmtree_itools} mv pwd_mkdb \ rm sed sh sysctl test true uname wc ${_zoneinfo} @@ -685,6 +699,8 @@ EXTRA_DISTRIBUTIONS+= games EXTRA_DISTRIBUTIONS+= lib32 .endif +MTREE_MAGIC?= mtree 2.0 + distributeworld installworld: installcheck installcheck_UGID mkdir -p ${INSTALLTMP} progs=$$(for prog in ${ITOOLS}; do \ @@ -707,6 +723,9 @@ distributeworld installworld: installche done); \ cp $$libs $$progs ${INSTALLTMP} cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale +.if defined(NO_ROOT) + echo "#${MTREE_MAGIC}" > ${METALOG} +.endif .if make(distributeworld) .for dist in ${EXTRA_DISTRIBUTIONS} -mkdir ${DESTDIR}/${DISTDIR}/${dist} @@ -716,10 +735,20 @@ distributeworld installworld: installche -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null +.if defined(NO_ROOT) + ${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \ + sed -e 's#^\./#./${dist}/#' >> ${METALOG} + ${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.usr.dist | \ + sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG} + ${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.include.dist | \ + sed -e 's#^\./#./${dist}/usr/include/#' >> ${METALOG} +.endif .endfor -mkdir ${DESTDIR}/${DISTDIR}/base - ${_+_}cd ${.CURDIR}; ${IMAKE} distrib-dirs \ - LOCAL_MTREE=${LOCAL_MTREE} DESTDIR=${DESTDIR}/${DISTDIR}/base + cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ + METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \ + DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \ + LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs .endif ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ ${IMAKEENV} rm -rf ${INSTALLTMP} @@ -727,12 +756,30 @@ distributeworld installworld: installche .for dist in ${EXTRA_DISTRIBUTIONS} find ${DESTDIR}/${DISTDIR}/${dist} -empty -delete .endfor +.if defined(NO_ROOT) +.for dist in base ${EXTRA_DISTRIBUTIONS} + @# For each file that exists in this dist, print the corresponding + @# line from the METALOG. This relies on the fact that + @# a line containing only the filename will sort immediatly before + @# the relevant mtree line. + cd ${DESTDIR}/${DISTDIR}; \ + find ./${dist} | sort -u ${METALOG} - | \ + awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \ + ${DESTDIR}/${DISTDIR}/${dist}.meta +.endfor +.endif .endif packageworld: .for dist in base ${EXTRA_DISTRIBUTIONS} +.if defined(NO_ROOT) + ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ + tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ + @${DESTDIR}/${DISTDIR}/${dist}.meta +.else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz . +.endif .endfor # @@ -769,7 +816,7 @@ redistribute: distrib-dirs distribution: cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ - ${IMAKE_INSTALL} ${IMAKE_MTREE} ${.TARGET} + ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} # # buildkernel and installkernel @@ -1092,6 +1139,10 @@ _nmtree= lib/libnetbsd \ usr.sbin/nmtree .endif +.if ${BOOTSTRAPPING} < 1000027 +_cat= bin/cat +.endif + .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041 _awk= usr.bin/awk .endif @@ -1138,6 +1189,7 @@ bootstrap-tools: ${_ar} \ ${_dtc} \ ${_awk} \ + ${_cat} \ usr.bin/lorder \ usr.bin/makewhatis \ ${_mklocale} \ @@ -1263,7 +1315,12 @@ cross-tools: # hierarchy - ensure that all the needed directories are present # hierarchy: +.if defined(NO_ROOT) + cd ${.CURDIR}/etc; ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} \ + -DNO_ROOT METALOG=${METALOG} distrib-dirs +.else cd ${.CURDIR}/etc; ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs +.endif # # libraries - build all libraries, and install them under ${DESTDIR}. @@ -1651,7 +1708,8 @@ NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOU XDDIR=${XDEV_ARCH}-freebsd XDTP=/usr/${XDDIR} -CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} +CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ + INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ _SHLIBDIRPREFIX=${XDTP} \ TOOLS_PREFIX=${XDTP} Modified: stable/9/etc/Makefile ============================================================================== --- stable/9/etc/Makefile Tue May 14 20:25:07 2013 (r250639) +++ stable/9/etc/Makefile Tue May 14 21:15:36 2013 (r250640) @@ -156,6 +156,9 @@ ETCMAIL=Makefile README mailer.conf acce # Special top level files for FreeBSD FREEBSD=COPYRIGHT +# Sanitize DESTDIR +DESTDIR:= ${DESTDIR:C://*:/:g} + afterinstall: .if ${MK_MAN} != "no" ${_+_}cd ${.CURDIR}/../share/man; ${MAKE} makedb @@ -177,6 +180,10 @@ CAP_MKDB_ENDIAN?= PWD_MKDB_ENDIAN?= .endif +.if defined(NO_ROOT) +METALOG.add?= cat -l >> ${METALOG} +.endif + distribution: .if !defined(DESTDIR) @echo "set DESTDIR before running \"make ${.TARGET}\"" @@ -198,6 +205,14 @@ distribution: .endif pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \ ${DESTDIR}/etc/master.passwd +.if defined(NO_ROOT) + ( \ + echo "./etc/login.conf.db type=file mode=0644 uname=root gname=wheel"; \ + echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \ + echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \ + echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ + ) | ${METALOG.add} +.endif .if ${MK_BLUETOOTH} != "no" ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install .endif @@ -321,6 +336,21 @@ distrib-dirs: ${MTREES:N/*} -f $$m -p $$d; \ ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \ done; true +.if defined(NO_ROOT) + @set ${MTREES}; \ + while test $$# -ge 2; do \ + m=${.CURDIR}/$$1; \ + shift; \ + d=$$1; \ + test "$$d" == "/" && d=""; \ + d=${DISTBASE}$$d; \ + shift; \ + ${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \ + "sed s#^\.#.$$d# | ${METALOG.add}" ; \ + ${MTREE_CMD:N-W} -C -f $$m -K uname,gname | sed s#^\.#.$$d# | \ + ${METALOG.add} ; \ + done; true +.endif ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys cd ${DESTDIR}/usr/share/man; \ for mandir in man*; do \ From owner-svn-src-stable@FreeBSD.ORG Wed May 15 00:58:46 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 182DE551; Wed, 15 May 2013 00:58:46 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 09EF3A9A; Wed, 15 May 2013 00:58:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4F0wjsE076627; Wed, 15 May 2013 00:58:45 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4F0wjcI076626; Wed, 15 May 2013 00:58:45 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201305150058.r4F0wjcI076626@svn.freebsd.org> From: Pyun YongHyeon Date: Wed, 15 May 2013 00:58:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250644 - stable/9/sys/dev/re X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 00:58:46 -0000 Author: yongari Date: Wed May 15 00:58:45 2013 New Revision: 250644 URL: http://svnweb.freebsd.org/changeset/base/250644 Log: MFC r248227: Disable TX IP header checksum offloading on RL_HWREV_8168CP. The controller generates wrong checksummed frame if the IP packet has IP options. Modified: stable/9/sys/dev/re/if_re.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/re/if_re.c ============================================================================== --- stable/9/sys/dev/re/if_re.c Tue May 14 21:39:38 2013 (r250643) +++ stable/9/sys/dev/re/if_re.c Wed May 15 00:58:45 2013 (r250644) @@ -1587,7 +1587,8 @@ re_attach(device_t dev) * packet has IP options so disable TX IP checksum offloading. */ if (sc->rl_hwrev->rl_rev == RL_HWREV_8168C || - sc->rl_hwrev->rl_rev == RL_HWREV_8168C_SPIN2) + sc->rl_hwrev->rl_rev == RL_HWREV_8168C_SPIN2 || + sc->rl_hwrev->rl_rev == RL_HWREV_8168CP) ifp->if_hwassist = CSUM_TCP | CSUM_UDP; else ifp->if_hwassist = CSUM_IP | CSUM_TCP | CSUM_UDP; @@ -3415,7 +3416,8 @@ re_ioctl(struct ifnet *ifp, u_long comma if ((ifp->if_capenable & IFCAP_TXCSUM) != 0) { rev = sc->rl_hwrev->rl_rev; if (rev == RL_HWREV_8168C || - rev == RL_HWREV_8168C_SPIN2) + rev == RL_HWREV_8168C_SPIN2 || + rev == RL_HWREV_8168CP) ifp->if_hwassist |= CSUM_TCP | CSUM_UDP; else ifp->if_hwassist |= RE_CSUM_FEATURES; From owner-svn-src-stable@FreeBSD.ORG Wed May 15 01:00:41 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 10F1C6E3; Wed, 15 May 2013 01:00:41 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 02075AB4; Wed, 15 May 2013 01:00:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4F10eKL078772; Wed, 15 May 2013 01:00:40 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4F10ePQ078771; Wed, 15 May 2013 01:00:40 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201305150100.r4F10ePQ078771@svn.freebsd.org> From: Pyun YongHyeon Date: Wed, 15 May 2013 01:00:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250645 - stable/8/sys/dev/re X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 01:00:41 -0000 Author: yongari Date: Wed May 15 01:00:40 2013 New Revision: 250645 URL: http://svnweb.freebsd.org/changeset/base/250645 Log: MFC r248227: Disable TX IP header checksum offloading on RL_HWREV_8168CP. The controller generates wrong checksummed frame if the IP packet has IP options. Modified: stable/8/sys/dev/re/if_re.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/re/ (props changed) Modified: stable/8/sys/dev/re/if_re.c ============================================================================== --- stable/8/sys/dev/re/if_re.c Wed May 15 00:58:45 2013 (r250644) +++ stable/8/sys/dev/re/if_re.c Wed May 15 01:00:40 2013 (r250645) @@ -1583,7 +1583,8 @@ re_attach(device_t dev) * packet has IP options so disable TX IP checksum offloading. */ if (sc->rl_hwrev->rl_rev == RL_HWREV_8168C || - sc->rl_hwrev->rl_rev == RL_HWREV_8168C_SPIN2) + sc->rl_hwrev->rl_rev == RL_HWREV_8168C_SPIN2 || + sc->rl_hwrev->rl_rev == RL_HWREV_8168CP) ifp->if_hwassist = CSUM_TCP | CSUM_UDP; else ifp->if_hwassist = CSUM_IP | CSUM_TCP | CSUM_UDP; @@ -3374,7 +3375,8 @@ re_ioctl(struct ifnet *ifp, u_long comma if ((ifp->if_capenable & IFCAP_TXCSUM) != 0) { rev = sc->rl_hwrev->rl_rev; if (rev == RL_HWREV_8168C || - rev == RL_HWREV_8168C_SPIN2) + rev == RL_HWREV_8168C_SPIN2 || + rev == RL_HWREV_8168CP) ifp->if_hwassist |= CSUM_TCP | CSUM_UDP; else ifp->if_hwassist |= RE_CSUM_FEATURES; From owner-svn-src-stable@FreeBSD.ORG Wed May 15 01:05:17 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0BA7B89C; Wed, 15 May 2013 01:05:17 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F1979AE7; Wed, 15 May 2013 01:05:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4F15GDm079871; Wed, 15 May 2013 01:05:16 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4F15GvW079869; Wed, 15 May 2013 01:05:16 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201305150105.r4F15GvW079869@svn.freebsd.org> From: Pyun YongHyeon Date: Wed, 15 May 2013 01:05:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250646 - stable/9/sys/dev/sis X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 01:05:17 -0000 Author: yongari Date: Wed May 15 01:05:16 2013 New Revision: 250646 URL: http://svnweb.freebsd.org/changeset/base/250646 Log: MFC r248456: r119712 introduced SIS_TYPE_83816 but it was not actually set in driver such that checking against the type was always false. To detect NS DP83816, driver should have checked silicon revision register for NS controllers. While here, remove SIS_TYPE_83816 to not make the similar mistake again. Modified: stable/9/sys/dev/sis/if_sis.c stable/9/sys/dev/sis/if_sisreg.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/sis/if_sis.c ============================================================================== --- stable/9/sys/dev/sis/if_sis.c Wed May 15 01:00:40 2013 (r250645) +++ stable/9/sys/dev/sis/if_sis.c Wed May 15 01:05:16 2013 (r250646) @@ -625,7 +625,7 @@ sis_miibus_statchg(device_t dev) SIS_CLRBIT(sc, SIS_RX_CFG, SIS_RXCFG_RX_TXPKTS); } - if (sc->sis_type == SIS_TYPE_83816) { + if (sc->sis_type == SIS_TYPE_83815 && sc->sis_srr >= NS_SRR_16A) { /* * MPII03.D: Half Duplex Excessive Collisions. * Also page 49 in 83816 manual @@ -1990,7 +1990,7 @@ sis_initl(struct sis_softc *sc) return; } - if (sc->sis_type == SIS_TYPE_83815 || sc->sis_type == SIS_TYPE_83816) { + if (sc->sis_type == SIS_TYPE_83815) { if (sc->sis_manual_pad != 0) sc->sis_flags |= SIS_FLAG_MANUAL_PAD; else Modified: stable/9/sys/dev/sis/if_sisreg.h ============================================================================== --- stable/9/sys/dev/sis/if_sisreg.h Wed May 15 01:00:40 2013 (r250645) +++ stable/9/sys/dev/sis/if_sisreg.h Wed May 15 01:05:16 2013 (r250646) @@ -439,7 +439,6 @@ struct sis_type { #define SIS_TYPE_900 1 #define SIS_TYPE_7016 2 #define SIS_TYPE_83815 3 -#define SIS_TYPE_83816 4 struct sis_txdesc { struct mbuf *tx_m; From owner-svn-src-stable@FreeBSD.ORG Wed May 15 01:06:25 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 028C5A21; Wed, 15 May 2013 01:06:25 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E898DAF5; Wed, 15 May 2013 01:06:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4F16OqY080162; Wed, 15 May 2013 01:06:24 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4F16OZX080158; Wed, 15 May 2013 01:06:24 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201305150106.r4F16OZX080158@svn.freebsd.org> From: Pyun YongHyeon Date: Wed, 15 May 2013 01:06:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250647 - stable/8/sys/dev/sis X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 01:06:25 -0000 Author: yongari Date: Wed May 15 01:06:24 2013 New Revision: 250647 URL: http://svnweb.freebsd.org/changeset/base/250647 Log: MFC r248456: r119712 introduced SIS_TYPE_83816 but it was not actually set in driver such that checking against the type was always false. To detect NS DP83816, driver should have checked silicon revision register for NS controllers. While here, remove SIS_TYPE_83816 to not make the similar mistake again. Modified: stable/8/sys/dev/sis/if_sis.c stable/8/sys/dev/sis/if_sisreg.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/sis/ (props changed) Modified: stable/8/sys/dev/sis/if_sis.c ============================================================================== --- stable/8/sys/dev/sis/if_sis.c Wed May 15 01:05:16 2013 (r250646) +++ stable/8/sys/dev/sis/if_sis.c Wed May 15 01:06:24 2013 (r250647) @@ -628,7 +628,7 @@ sis_miibus_statchg(device_t dev) SIS_CLRBIT(sc, SIS_RX_CFG, SIS_RXCFG_RX_TXPKTS); } - if (sc->sis_type == SIS_TYPE_83816) { + if (sc->sis_type == SIS_TYPE_83815 && sc->sis_srr >= NS_SRR_16A) { /* * MPII03.D: Half Duplex Excessive Collisions. * Also page 49 in 83816 manual @@ -1993,7 +1993,7 @@ sis_initl(struct sis_softc *sc) return; } - if (sc->sis_type == SIS_TYPE_83815 || sc->sis_type == SIS_TYPE_83816) { + if (sc->sis_type == SIS_TYPE_83815) { if (sc->sis_manual_pad != 0) sc->sis_flags |= SIS_FLAG_MANUAL_PAD; else Modified: stable/8/sys/dev/sis/if_sisreg.h ============================================================================== --- stable/8/sys/dev/sis/if_sisreg.h Wed May 15 01:05:16 2013 (r250646) +++ stable/8/sys/dev/sis/if_sisreg.h Wed May 15 01:06:24 2013 (r250647) @@ -439,7 +439,6 @@ struct sis_type { #define SIS_TYPE_900 1 #define SIS_TYPE_7016 2 #define SIS_TYPE_83815 3 -#define SIS_TYPE_83816 4 struct sis_txdesc { struct mbuf *tx_m; From owner-svn-src-stable@FreeBSD.ORG Wed May 15 01:16:43 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id F0E06C2A; Wed, 15 May 2013 01:16:42 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C903FB3E; Wed, 15 May 2013 01:16:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4F1Ggn3084032; Wed, 15 May 2013 01:16:42 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4F1GgHv084030; Wed, 15 May 2013 01:16:42 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201305150116.r4F1GgHv084030@svn.freebsd.org> From: Pyun YongHyeon Date: Wed, 15 May 2013 01:16:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250648 - stable/9/sys/dev/mii X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 01:16:43 -0000 Author: yongari Date: Wed May 15 01:16:41 2013 New Revision: 250648 URL: http://svnweb.freebsd.org/changeset/base/250648 Log: MFC r248542: For RTL8211B or later PHYs, enable crossover detection and auto-correction. This change makes re(4) establish a link with a system using non-crossover UTP cable. Modified: stable/9/sys/dev/mii/rgephy.c stable/9/sys/dev/mii/rgephyreg.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/mii/rgephy.c ============================================================================== --- stable/9/sys/dev/mii/rgephy.c Wed May 15 01:06:24 2013 (r250647) +++ stable/9/sys/dev/mii/rgephy.c Wed May 15 01:16:41 2013 (r250648) @@ -488,7 +488,7 @@ rgephy_load_dspcode(struct mii_softc *sc static void rgephy_reset(struct mii_softc *sc) { - uint16_t ssr; + uint16_t pcr, ssr; if ((sc->mii_flags & MIIF_PHYPRIV0) == 0 && sc->mii_mpd_rev == 3) { /* RTL8211C(L) */ @@ -499,6 +499,15 @@ rgephy_reset(struct mii_softc *sc) } } + if (sc->mii_mpd_rev >= 2) { + pcr = PHY_READ(sc, RGEPHY_MII_PCR); + if ((pcr & RGEPHY_PCR_MDIX_AUTO) == 0) { + pcr &= ~RGEPHY_PCR_MDI_MASK; + pcr |= RGEPHY_PCR_MDIX_AUTO; + PHY_WRITE(sc, RGEPHY_MII_PCR, pcr); + } + } + mii_phy_reset(sc); DELAY(1000); rgephy_load_dspcode(sc); Modified: stable/9/sys/dev/mii/rgephyreg.h ============================================================================== --- stable/9/sys/dev/mii/rgephyreg.h Wed May 15 01:06:24 2013 (r250647) +++ stable/9/sys/dev/mii/rgephyreg.h Wed May 15 01:16:41 2013 (r250648) @@ -138,6 +138,17 @@ #define RGEPHY_EXTSTS_T_HD_CAP 0x1000 /* 1000base-T HD capable */ /* RTL8211B(L)/RTL8211C(L) */ +#define RGEPHY_MII_PCR 0x10 /* PHY Specific control register */ +#define RGEPHY_PCR_ASSERT_CRS 0x0800 +#define RGEPHY_PCR_FORCE_LINK 0x0400 +#define RGEPHY_PCR_MDI_MASK 0x0060 +#define RGEPHY_PCR_MDIX_AUTO 0x0040 +#define RGEPHY_PCR_MDIX_MANUAL 0x0020 +#define RGEPHY_PCR_MDI_MANUAL 0x0000 +#define RGEPHY_PCR_CLK125_DIS 0x0010 +#define RGEPHY_PCR_JABBER_DIS 0x0001 + +/* RTL8211B(L)/RTL8211C(L) */ #define RGEPHY_MII_SSR 0x11 /* PHY Specific status register */ #define RGEPHY_SSR_S1000 0x8000 /* 1000Mbps */ #define RGEPHY_SSR_S100 0x4000 /* 100Mbps */ From owner-svn-src-stable@FreeBSD.ORG Wed May 15 01:18:00 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 36DC3DB5; Wed, 15 May 2013 01:18:00 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0F4B6B52; Wed, 15 May 2013 01:18:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4F1Hx3M084296; Wed, 15 May 2013 01:17:59 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4F1Hxh1084294; Wed, 15 May 2013 01:17:59 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201305150117.r4F1Hxh1084294@svn.freebsd.org> From: Pyun YongHyeon Date: Wed, 15 May 2013 01:17:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250649 - stable/8/sys/dev/mii X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 01:18:00 -0000 Author: yongari Date: Wed May 15 01:17:59 2013 New Revision: 250649 URL: http://svnweb.freebsd.org/changeset/base/250649 Log: MFC r248542: For RTL8211B or later PHYs, enable crossover detection and auto-correction. This change makes re(4) establish a link with a system using non-crossover UTP cable. Modified: stable/8/sys/dev/mii/rgephy.c stable/8/sys/dev/mii/rgephyreg.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/mii/ (props changed) Modified: stable/8/sys/dev/mii/rgephy.c ============================================================================== --- stable/8/sys/dev/mii/rgephy.c Wed May 15 01:16:41 2013 (r250648) +++ stable/8/sys/dev/mii/rgephy.c Wed May 15 01:17:59 2013 (r250649) @@ -517,7 +517,7 @@ static void rgephy_reset(struct mii_softc *sc) { struct rgephy_softc *rsc; - uint16_t ssr; + uint16_t pcr, ssr; rsc = (struct rgephy_softc *)sc; if ((sc->mii_flags & MIIF_PHYPRIV0) == 0 && rsc->mii_revision == 3) { @@ -529,6 +529,15 @@ rgephy_reset(struct mii_softc *sc) } } + if (rsc->mii_revision >= 2) { + pcr = PHY_READ(sc, RGEPHY_MII_PCR); + if ((pcr & RGEPHY_PCR_MDIX_AUTO) == 0) { + pcr &= ~RGEPHY_PCR_MDI_MASK; + pcr |= RGEPHY_PCR_MDIX_AUTO; + PHY_WRITE(sc, RGEPHY_MII_PCR, pcr); + } + } + mii_phy_reset(sc); DELAY(1000); rgephy_load_dspcode(sc); Modified: stable/8/sys/dev/mii/rgephyreg.h ============================================================================== --- stable/8/sys/dev/mii/rgephyreg.h Wed May 15 01:16:41 2013 (r250648) +++ stable/8/sys/dev/mii/rgephyreg.h Wed May 15 01:17:59 2013 (r250649) @@ -138,6 +138,17 @@ #define RGEPHY_EXTSTS_T_HD_CAP 0x1000 /* 1000base-T HD capable */ /* RTL8211B(L)/RTL8211C(L) */ +#define RGEPHY_MII_PCR 0x10 /* PHY Specific control register */ +#define RGEPHY_PCR_ASSERT_CRS 0x0800 +#define RGEPHY_PCR_FORCE_LINK 0x0400 +#define RGEPHY_PCR_MDI_MASK 0x0060 +#define RGEPHY_PCR_MDIX_AUTO 0x0040 +#define RGEPHY_PCR_MDIX_MANUAL 0x0020 +#define RGEPHY_PCR_MDI_MANUAL 0x0000 +#define RGEPHY_PCR_CLK125_DIS 0x0010 +#define RGEPHY_PCR_JABBER_DIS 0x0001 + +/* RTL8211B(L)/RTL8211C(L) */ #define RGEPHY_MII_SSR 0x11 /* PHY Specific status register */ #define RGEPHY_SSR_S1000 0x8000 /* 1000Mbps */ #define RGEPHY_SSR_S100 0x4000 /* 100Mbps */ From owner-svn-src-stable@FreeBSD.ORG Wed May 15 01:21:40 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E3B07B5; Wed, 15 May 2013 01:21:40 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D5B58B6D; Wed, 15 May 2013 01:21:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4F1Le8l086727; Wed, 15 May 2013 01:21:40 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4F1Le1k086726; Wed, 15 May 2013 01:21:40 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201305150121.r4F1Le1k086726@svn.freebsd.org> From: Pyun YongHyeon Date: Wed, 15 May 2013 01:21:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250650 - stable/9/sys/dev/bge X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 01:21:41 -0000 Author: yongari Date: Wed May 15 01:21:40 2013 New Revision: 250650 URL: http://svnweb.freebsd.org/changeset/base/250650 Log: MFC r248993: Fix a typo. Modified: stable/9/sys/dev/bge/if_bge.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/bge/if_bge.c ============================================================================== --- stable/9/sys/dev/bge/if_bge.c Wed May 15 01:17:59 2013 (r250649) +++ stable/9/sys/dev/bge/if_bge.c Wed May 15 01:21:40 2013 (r250650) @@ -679,7 +679,7 @@ bge_ape_lock_init(struct bge_softc *sc) bit = BGE_APE_LOCK_GRANT_DRIVER0; break; default: - if (sc->bge_func_addr != 0) + if (sc->bge_func_addr == 0) bit = BGE_APE_LOCK_GRANT_DRIVER0; else bit = (1 << sc->bge_func_addr); From owner-svn-src-stable@FreeBSD.ORG Wed May 15 01:22:56 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 69645232; Wed, 15 May 2013 01:22:56 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5BC1DB91; Wed, 15 May 2013 01:22:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4F1MuI6087058; Wed, 15 May 2013 01:22:56 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4F1MuVc087057; Wed, 15 May 2013 01:22:56 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201305150122.r4F1MuVc087057@svn.freebsd.org> From: Pyun YongHyeon Date: Wed, 15 May 2013 01:22:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250651 - stable/8/sys/dev/bge X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 01:22:56 -0000 Author: yongari Date: Wed May 15 01:22:55 2013 New Revision: 250651 URL: http://svnweb.freebsd.org/changeset/base/250651 Log: MFC r248993: Fix a typo. Modified: stable/8/sys/dev/bge/if_bge.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/bge/ (props changed) Modified: stable/8/sys/dev/bge/if_bge.c ============================================================================== --- stable/8/sys/dev/bge/if_bge.c Wed May 15 01:21:40 2013 (r250650) +++ stable/8/sys/dev/bge/if_bge.c Wed May 15 01:22:55 2013 (r250651) @@ -679,7 +679,7 @@ bge_ape_lock_init(struct bge_softc *sc) bit = BGE_APE_LOCK_GRANT_DRIVER0; break; default: - if (sc->bge_func_addr != 0) + if (sc->bge_func_addr == 0) bit = BGE_APE_LOCK_GRANT_DRIVER0; else bit = (1 << sc->bge_func_addr); From owner-svn-src-stable@FreeBSD.ORG Wed May 15 01:37:00 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 704BF7A4; Wed, 15 May 2013 01:37:00 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 467C9CC6; Wed, 15 May 2013 01:37:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4F1b01K091462; Wed, 15 May 2013 01:37:00 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4F1b0md091461; Wed, 15 May 2013 01:37:00 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201305150137.r4F1b0md091461@svn.freebsd.org> From: Rick Macklem Date: Wed, 15 May 2013 01:37:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250652 - stable/9/sys/kgssapi/krb5 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 01:37:00 -0000 Author: rmacklem Date: Wed May 15 01:36:59 2013 New Revision: 250652 URL: http://svnweb.freebsd.org/changeset/base/250652 Log: MFC: r250157 Isilon reported that sec=krb5p NFS mounts had a problem when m_len == 0 for the last mbuf of the list with an encrypted message. This patch replaces the KASSERT() with code that handles this case. Modified: stable/9/sys/kgssapi/krb5/krb5_mech.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/kgssapi/krb5/krb5_mech.c ============================================================================== --- stable/9/sys/kgssapi/krb5/krb5_mech.c Wed May 15 01:22:55 2013 (r250651) +++ stable/9/sys/kgssapi/krb5/krb5_mech.c Wed May 15 01:36:59 2013 (r250652) @@ -1585,6 +1585,8 @@ m_trim(struct mbuf *m, int len) struct mbuf *n; int off; + if (m == NULL) + return; n = m_getptr(m, len, &off); if (n) { n->m_len = off; @@ -1600,7 +1602,7 @@ krb5_unwrap_old(struct krb5_context *kc, uint8_t sgn_alg[2], uint8_t seal_alg[2]) { OM_uint32 res; - struct mbuf *m, *mlast, *hm, *cm; + struct mbuf *m, *mlast, *hm, *cm, *n; uint8_t *p, dir; size_t mlen, tlen, elen, datalen, padlen; size_t cklen; @@ -1702,9 +1704,25 @@ krb5_unwrap_old(struct krb5_context *kc, /* * Check the trailing pad bytes. + * RFC1964 specifies between 1<->8 bytes, each with a binary value + * equal to the number of bytes. */ - KASSERT(mlast->m_len > 0, ("Unexpected empty mbuf")); - padlen = mlast->m_data[mlast->m_len - 1]; + if (mlast->m_len > 0) + padlen = mlast->m_data[mlast->m_len - 1]; + else { + n = m_getptr(m, tlen + datalen - 1, &i); + /* + * When the position is exactly equal to the # of data bytes + * in the mbuf list, m_getptr() will return the last mbuf in + * the list and an off == m_len for that mbuf, so that case + * needs to be checked as well as a NULL return. + */ + if (n == NULL || n->m_len == i) + return (GSS_S_DEFECTIVE_TOKEN); + padlen = n->m_data[i]; + } + if (padlen < 1 || padlen > 8 || padlen > tlen + datalen) + return (GSS_S_DEFECTIVE_TOKEN); m_copydata(m, tlen + datalen - padlen, padlen, buf); for (i = 0; i < padlen; i++) { if (buf[i] != padlen) { From owner-svn-src-stable@FreeBSD.ORG Wed May 15 01:40:16 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C4B4BA0D; Wed, 15 May 2013 01:40:16 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B6DA6CDC; Wed, 15 May 2013 01:40:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4F1eG01093551; Wed, 15 May 2013 01:40:16 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4F1eG9R093550; Wed, 15 May 2013 01:40:16 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201305150140.r4F1eG9R093550@svn.freebsd.org> From: Rick Macklem Date: Wed, 15 May 2013 01:40:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250653 - stable/9/usr.bin/nfsstat X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 01:40:16 -0000 Author: rmacklem Date: Wed May 15 01:40:16 2013 New Revision: 250653 URL: http://svnweb.freebsd.org/changeset/base/250653 Log: MFC: r250158 Document that the NFSv4 server statistics are operation counts and not RPC counts. This is a content change. Modified: stable/9/usr.bin/nfsstat/nfsstat.1 Directory Properties: stable/9/usr.bin/nfsstat/ (props changed) Modified: stable/9/usr.bin/nfsstat/nfsstat.1 ============================================================================== --- stable/9/usr.bin/nfsstat/nfsstat.1 Wed May 15 01:36:59 2013 (r250652) +++ stable/9/usr.bin/nfsstat/nfsstat.1 Wed May 15 01:40:16 2013 (r250653) @@ -28,7 +28,7 @@ .\" From: @(#)nfsstat.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd November 14, 2012 +.Dd May 1, 2013 .Dt NFSSTAT 1 .Os .Sh NAME @@ -48,6 +48,10 @@ The command displays statistics kept about .Tn NFS client and server activity. +For the NFSv4 server, the statistics are for operations within the Compound +RPCs and not the count of RPCs. +If you wish to compare RPC counts between NFSv3 and NFSv4, you must use +statistics in the client(s). .Pp The options are as follows: .Bl -tag -width indent From owner-svn-src-stable@FreeBSD.ORG Wed May 15 01:44:02 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 719F1BB7; Wed, 15 May 2013 01:44:02 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 63CC7D00; Wed, 15 May 2013 01:44:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4F1i2D8094465; Wed, 15 May 2013 01:44:02 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4F1i26K094464; Wed, 15 May 2013 01:44:02 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201305150144.r4F1i26K094464@svn.freebsd.org> From: Rick Macklem Date: Wed, 15 May 2013 01:44:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250654 - stable/9/usr.sbin/nfsd X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 01:44:02 -0000 Author: rmacklem Date: Wed May 15 01:44:01 2013 New Revision: 250654 URL: http://svnweb.freebsd.org/changeset/base/250654 Log: MFC: r250162 Document the fact that an NFSv4 mount against a volume on the same host can result in a hung NFS server and is not recommended. This is a content change. Modified: stable/9/usr.sbin/nfsd/nfsv4.4 Directory Properties: stable/9/usr.sbin/nfsd/ (props changed) Modified: stable/9/usr.sbin/nfsd/nfsv4.4 ============================================================================== --- stable/9/usr.sbin/nfsd/nfsv4.4 Wed May 15 01:40:16 2013 (r250653) +++ stable/9/usr.sbin/nfsd/nfsv4.4 Wed May 15 01:44:01 2013 (r250654) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 23, 2012 +.Dd May 1, 2013 .Dt NFSV4 4 .Os .Sh NAME @@ -289,6 +289,13 @@ and daemons at boot time via the ``nfsuserd_flags'' and ``nfscbd_flags'' .Xr rc.conf 5 variables. +.Pp +NFSv4 mount(s) against exported volume(s) on the same host are not recommended, +since this can result in a hung NFS server. +It occurs when an nfsd thread tries to do an NFSv4 VOP_RECLAIM()/Close RPC +as part of acquiring a new vnode. +If all other nfsd threads are blocked waiting for lock(s) held by this nfsd +thread, then there isn't an nfsd thread to service the Close RPC. .Sh FILES .Bl -tag -width /var/db/nfs-stablerestart.bak -compact .It Pa /var/db/nfs-stablerestart From owner-svn-src-stable@FreeBSD.ORG Wed May 15 04:10:24 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 55AC14BF; Wed, 15 May 2013 04:10:24 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id CCE8F362; Wed, 15 May 2013 04:10:23 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 1AA9471A50B; Wed, 15 May 2013 08:10:22 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 08:10:17 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 13:42:34 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 13:42:34 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 57C4371958D for ; Sun, 12 May 2013 13:42:34 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Tvyt9yvMTPea for ; Sun, 12 May 2013 13:42:26 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id A58217195A9 for ; Sun, 12 May 2013 13:42:26 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 44875542F; Sun, 12 May 2013 09:42:25 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 41DCFA09; Sun, 12 May 2013 09:42:25 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 903678BF; Sun, 12 May 2013 09:42:18 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 814CA2C2; Sun, 12 May 2013 09:42:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C9gHpr035727; Sun, 12 May 2013 09:42:17 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C9gHHs035726; Sun, 12 May 2013 09:42:17 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201305120942.r4C9gHHs035726@svn.freebsd.org> From: Jaakko Heinonen Date: Sun, 12 May 2013 09:42:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250558 - stable/9/sys/kern X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 09:42:34.0223 (UTC) FILETIME=[07A067F0:01CE4EF5] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 04:10:24 -0000 Author: jh Date: Sun May 12 09:42:17 2013 New Revision: 250558 URL: http://svnweb.freebsd.org/changeset/base/250558 Log: MFC r249650: Include PID in the error message which is printed when the maxproc limit is exceeded. Improve formatting of the message while here. PR: kern/60550 Modified: stable/9/sys/kern/kern_fork.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/kern/kern_fork.c ============================================================================== --- stable/9/sys/kern/kern_fork.c Sun May 12 09:33:33 2013 (r250557) +++ stable/9/sys/kern/kern_fork.c Sun May 12 09:42:17 2013 (r250558) @@ -929,8 +929,8 @@ fork1(struct thread *td, int flags, int fail: sx_sunlock(&proctree_lock); if (ppsratecheck(&lastfail, &curfail, 1)) - printf("maxproc limit exceeded by uid %i, please see tuning(7) and login.conf(5).\n", - td->td_ucred->cr_ruid); + printf("maxproc limit exceeded by uid %u (pid %d); see tuning(7) and login.conf(5)\n", + td->td_ucred->cr_ruid, p1->p_pid); sx_xunlock(&allproc_lock); #ifdef MAC mac_proc_destroy(newproc); _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 04:39:10 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 02D82110; Wed, 15 May 2013 04:39:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 79D03692; Wed, 15 May 2013 04:39:08 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id B660F71A501; Wed, 15 May 2013 08:38:07 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 08:27:25 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 16:20:26 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 16:20:26 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id B2171719781 for ; Sun, 12 May 2013 16:20:26 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rq6mYctOnkJ3 for ; Sun, 12 May 2013 16:20:19 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 4899D719729 for ; Sun, 12 May 2013 16:20:18 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 2399E5A08; Sun, 12 May 2013 12:20:17 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id B10F6919; Sun, 12 May 2013 12:20:16 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E223D794; Sun, 12 May 2013 12:20:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B4DCC942; Sun, 12 May 2013 12:20:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CCK4l5089965; Sun, 12 May 2013 12:20:04 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CCK4B6089964; Sun, 12 May 2013 12:20:04 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201305121220.r4CCK4B6089964@svn.freebsd.org> From: Hans Petter Selasky Date: Sun, 12 May 2013 12:20:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250561 - stable/9/sys/dev/sound/usb X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 12:20:26.0487 (UTC) FILETIME=[15893070:01CE4F0B] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 04:39:10 -0000 Author: hselasky Date: Sun May 12 12:20:04 2013 New Revision: 250561 URL: http://svnweb.freebsd.org/changeset/base/250561 Log: MFC r249796, r249830, r249844 and r249845: USB audio fixes and improvements. - Fix runtime switching of sample rate - Fix feedback endpoint algorithm Modified: stable/9/sys/dev/sound/usb/uaudio.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/sound/usb/uaudio.c ============================================================================== --- stable/9/sys/dev/sound/usb/uaudio.c Sun May 12 12:13:23 2013 (r250560) +++ stable/9/sys/dev/sound/usb/uaudio.c Sun May 12 12:20:04 2013 (r250561) @@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define USB_DEBUG_VAR uaudio_debug #include @@ -176,19 +177,34 @@ struct uaudio_mixer_node { struct uaudio_mixer_node *next; }; +struct uaudio_configure_msg { + struct usb_proc_msg hdr; + struct uaudio_softc *sc; +}; + +#define CHAN_MAX_ALT 20 + +struct uaudio_chan_alt { + union uaudio_asf1d p_asf1d; + union uaudio_sed p_sed; + const usb_endpoint_descriptor_audio_t *p_ed1; + const struct uaudio_format *p_fmt; + const struct usb_config *usb_cfg; + uint32_t sample_rate; /* in Hz */ + uint16_t sample_size; + uint8_t iface_index; + uint8_t iface_alt_index; + uint8_t channels; +}; + struct uaudio_chan { struct pcmchan_caps pcm_cap; /* capabilities */ - + struct uaudio_chan_alt usb_alt[CHAN_MAX_ALT]; struct snd_dbuf *pcm_buf; - const struct usb_config *usb_cfg; struct mtx *pcm_mtx; /* lock protecting this structure */ struct uaudio_softc *priv_sc; struct pcm_channel *pcm_ch; struct usb_xfer *xfer[UAUDIO_NCHANBUFS + 1]; - union uaudio_asf1d p_asf1d; - union uaudio_sed p_sed; - const usb_endpoint_descriptor_audio_t *p_ed1; - const struct uaudio_format *p_fmt; uint8_t *buf; /* pointer to buffer */ uint8_t *start; /* upper layer buffer start */ @@ -196,24 +212,24 @@ struct uaudio_chan { uint8_t *cur; /* current position in upper layer * buffer */ - uint32_t intr_size; /* in bytes */ uint32_t intr_frames; /* in units */ - uint32_t sample_rate; uint32_t frames_per_second; uint32_t sample_rem; uint32_t sample_curr; + uint32_t max_buf; - uint32_t format; uint32_t pcm_format[2]; uint16_t bytes_per_frame[2]; - uint16_t sample_size; - - uint8_t valid; - uint8_t iface_index; - uint8_t iface_alt_index; - uint8_t channels; + uint8_t num_alt; + uint8_t cur_alt; + uint8_t set_alt; + uint8_t operation; +#define CHAN_OP_NONE 0 +#define CHAN_OP_START 1 +#define CHAN_OP_STOP 2 +#define CHAN_OP_DRAIN 3 uint8_t last_sync_time; uint8_t last_sync_state; @@ -309,6 +325,7 @@ struct uaudio_softc { struct uaudio_hid sc_hid; struct uaudio_search_result sc_mixer_clocks; struct uaudio_mixer_node sc_mixer_node; + struct uaudio_configure_msg sc_config_msg[2]; struct mtx *sc_mixer_lock; struct snd_mixer *sc_mixer_dev; @@ -434,6 +451,8 @@ static usb_callback_t umidi_bulk_read_ca static usb_callback_t umidi_bulk_write_callback; static usb_callback_t uaudio_hid_rx_callback; +static usb_proc_callback_t uaudio_configure_msg; + /* ==== USB mixer ==== */ static int uaudio_mixer_sysctl_handler(SYSCTL_HANDLER_ARGS); @@ -856,6 +875,10 @@ uaudio_attach(device_t dev) sc->sc_udev = uaa->device; sc->sc_mixer_iface_index = uaa->info.bIfaceIndex; sc->sc_mixer_iface_no = uaa->info.bIfaceNum; + sc->sc_config_msg[0].hdr.pm_callback = &uaudio_configure_msg; + sc->sc_config_msg[0].sc = sc; + sc->sc_config_msg[1].hdr.pm_callback = &uaudio_configure_msg; + sc->sc_config_msg[1].sc = sc; if (usb_test_quirk(uaa, UQ_AUDIO_SWAP_LR)) sc->sc_uq_audio_swap_lr = 1; @@ -900,22 +923,28 @@ uaudio_attach(device_t dev) DPRINTF("%d mixer controls\n", sc->sc_mixer_count); - if (sc->sc_play_chan.valid) { - device_printf(dev, "Play: %d Hz, %d ch, %s format, " - "2x8ms buffer.\n", - sc->sc_play_chan.sample_rate, - sc->sc_play_chan.channels, - sc->sc_play_chan.p_fmt->description); + if (sc->sc_play_chan.num_alt > 0) { + uint8_t x; + for (x = 0; x != sc->sc_play_chan.num_alt; x++) { + device_printf(dev, "Play: %d Hz, %d ch, %s format, " + "2x8ms buffer.\n", + sc->sc_play_chan.usb_alt[x].sample_rate, + sc->sc_play_chan.usb_alt[x].channels, + sc->sc_play_chan.usb_alt[x].p_fmt->description); + } } else { device_printf(dev, "No playback.\n"); } - if (sc->sc_rec_chan.valid) { - device_printf(dev, "Record: %d Hz, %d ch, %s format, " - "2x8ms buffer.\n", - sc->sc_rec_chan.sample_rate, - sc->sc_rec_chan.channels, - sc->sc_rec_chan.p_fmt->description); + if (sc->sc_rec_chan.num_alt > 0) { + uint8_t x; + for (x = 0; x != sc->sc_rec_chan.num_alt; x++) { + device_printf(dev, "Record: %d Hz, %d ch, %s format, " + "2x8ms buffer.\n", + sc->sc_rec_chan.usb_alt[x].sample_rate, + sc->sc_rec_chan.usb_alt[x].channels, + sc->sc_rec_chan.usb_alt[x].p_fmt->description); + } } else { device_printf(dev, "No recording.\n"); } @@ -950,8 +979,8 @@ uaudio_attach(device_t dev) * Only attach a PCM device if we have a playback, recording * or mixer device present: */ - if (sc->sc_play_chan.valid || - sc->sc_rec_chan.valid || + if (sc->sc_play_chan.num_alt > 0 || + sc->sc_rec_chan.num_alt > 0 || sc->sc_mix_info) { child = device_add_child(dev, "pcm", -1); @@ -1020,18 +1049,18 @@ uaudio_attach_sub(device_t dev, kobj_cla snprintf(status, sizeof(status), "at ? %s", PCM_KLDSTRING(snd_uaudio)); if (pcm_register(dev, sc, - sc->sc_play_chan.valid ? 1 : 0, - sc->sc_rec_chan.valid ? 1 : 0)) { + (sc->sc_play_chan.num_alt > 0) ? 1 : 0, + (sc->sc_rec_chan.num_alt > 0) ? 1 : 0)) { goto detach; } uaudio_pcm_setflags(dev, SD_F_MPSAFE); sc->sc_pcm_registered = 1; - if (sc->sc_play_chan.valid) { + if (sc->sc_play_chan.num_alt > 0) { pcm_addchan(dev, PCMDIR_PLAY, chan_class, sc); } - if (sc->sc_rec_chan.valid) { + if (sc->sc_rec_chan.num_alt > 0) { pcm_addchan(dev, PCMDIR_REC, chan_class, sc); } pcm_setstatus(dev, status); @@ -1078,10 +1107,15 @@ uaudio_detach(device_t dev) * will time out and close opened /dev/dspX.Y device(s), if * any. */ - if (sc->sc_play_chan.valid) - usbd_transfer_unsetup(sc->sc_play_chan.xfer, UAUDIO_NCHANBUFS + 1); - if (sc->sc_rec_chan.valid) - usbd_transfer_unsetup(sc->sc_rec_chan.xfer, UAUDIO_NCHANBUFS + 1); + usb_proc_explore_lock(sc->sc_udev); + sc->sc_play_chan.operation = CHAN_OP_DRAIN; + sc->sc_rec_chan.operation = CHAN_OP_DRAIN; + usb_proc_explore_mwait(sc->sc_udev, + &sc->sc_config_msg[0], &sc->sc_config_msg[1]); + usb_proc_explore_unlock(sc->sc_udev); + + usbd_transfer_unsetup(sc->sc_play_chan.xfer, UAUDIO_NCHANBUFS + 1); + usbd_transfer_unsetup(sc->sc_rec_chan.xfer, UAUDIO_NCHANBUFS + 1); uaudio_hid_detach(sc); @@ -1100,6 +1134,201 @@ uaudio_detach(device_t dev) return (0); } +static uint32_t +uaudio_get_buffer_size(struct uaudio_chan *ch, uint8_t alt) +{ + struct uaudio_chan_alt *chan_alt = &ch->usb_alt[alt]; + /* We use 2 times 8ms of buffer */ + uint32_t buf_size = (((chan_alt->sample_rate * (UAUDIO_NFRAMES / 8)) + + 1000 - 1) / 1000) * chan_alt->sample_size; + return (buf_size); +} + +static void +uaudio_configure_msg_sub(struct uaudio_softc *sc, + struct uaudio_chan *chan, int dir) +{ + struct uaudio_chan_alt *chan_alt; + uint32_t frames; + uint32_t buf_size; + uint16_t fps; + uint8_t set_alt; + uint8_t fps_shift; + uint8_t operation; + usb_error_t err; + + if (chan->num_alt <= 0) + return; + + DPRINTF("\n"); + + usb_proc_explore_lock(sc->sc_udev); + operation = chan->operation; + chan->operation = CHAN_OP_NONE; + usb_proc_explore_unlock(sc->sc_udev); + + mtx_lock(chan->pcm_mtx); + if (chan->cur_alt != chan->set_alt) + set_alt = chan->set_alt; + else + set_alt = CHAN_MAX_ALT; + mtx_unlock(chan->pcm_mtx); + + if (set_alt >= chan->num_alt) + goto done; + + chan_alt = chan->usb_alt + set_alt; + + usbd_transfer_unsetup(chan->xfer, UAUDIO_NCHANBUFS + 1); + + err = usbd_set_alt_interface_index(sc->sc_udev, + chan_alt->iface_index, chan_alt->iface_alt_index); + if (err) { + DPRINTF("setting of alternate index failed: %s!\n", + usbd_errstr(err)); + goto error; + } + + /* + * Only set the sample rate if the channel reports that it + * supports the frequency control. + */ + + if (sc->sc_audio_rev >= UAUDIO_VERSION_30) { + /* FALLTHROUGH */ + } else if (sc->sc_audio_rev >= UAUDIO_VERSION_20) { + unsigned int x; + + for (x = 0; x != 256; x++) { + if (dir == PCMDIR_PLAY) { + if (!(sc->sc_mixer_clocks.bit_output[x / 8] & + (1 << (x % 8)))) { + continue; + } + } else { + if (!(sc->sc_mixer_clocks.bit_input[x / 8] & + (1 << (x % 8)))) { + continue; + } + } + + if (uaudio20_set_speed(sc->sc_udev, + sc->sc_mixer_iface_no, x, chan_alt->sample_rate)) { + /* + * If the endpoint is adaptive setting + * the speed may fail. + */ + DPRINTF("setting of sample rate failed! " + "(continuing anyway)\n"); + } + } + } else if (chan_alt->p_sed.v1->bmAttributes & UA_SED_FREQ_CONTROL) { + if (uaudio_set_speed(sc->sc_udev, + chan_alt->p_ed1->bEndpointAddress, chan_alt->sample_rate)) { + /* + * If the endpoint is adaptive setting the + * speed may fail. + */ + DPRINTF("setting of sample rate failed! " + "(continuing anyway)\n"); + } + } + if (usbd_transfer_setup(sc->sc_udev, &chan_alt->iface_index, chan->xfer, + chan_alt->usb_cfg, UAUDIO_NCHANBUFS + 1, chan, chan->pcm_mtx)) { + DPRINTF("could not allocate USB transfers!\n"); + goto error; + } + + fps = usbd_get_isoc_fps(sc->sc_udev); + + if (fps < 8000) { + /* FULL speed USB */ + frames = 8; + } else { + /* HIGH speed USB */ + frames = UAUDIO_NFRAMES; + } + + fps_shift = usbd_xfer_get_fps_shift(chan->xfer[0]); + + /* down shift number of frames per second, if any */ + fps >>= fps_shift; + frames >>= fps_shift; + + /* bytes per frame should not be zero */ + chan->bytes_per_frame[0] = + ((chan_alt->sample_rate / fps) * chan_alt->sample_size); + chan->bytes_per_frame[1] = + (((chan_alt->sample_rate + fps - 1) / fps) * chan_alt->sample_size); + + /* setup data rate dithering, if any */ + chan->frames_per_second = fps; + chan->sample_rem = chan_alt->sample_rate % fps; + chan->sample_curr = 0; + chan->frames_per_second = fps; + + /* compute required buffer size */ + buf_size = (chan->bytes_per_frame[1] * frames); + + if (buf_size > (chan->end - chan->start)) { + DPRINTF("buffer size is too big\n"); + goto error; + } + + chan->intr_frames = frames; + + DPRINTF("fps=%d sample_rem=%d\n", (int)fps, (int)chan->sample_rem); + + if (chan->intr_frames == 0) { + DPRINTF("frame shift is too high!\n"); + goto error; + } + + mtx_lock(chan->pcm_mtx); + chan->cur_alt = set_alt; + mtx_unlock(chan->pcm_mtx); + +done: +#if (UAUDIO_NCHANBUFS != 2) +#error "please update code" +#endif + switch (operation) { + case CHAN_OP_START: + mtx_lock(chan->pcm_mtx); + usbd_transfer_start(chan->xfer[0]); + usbd_transfer_start(chan->xfer[1]); + mtx_unlock(chan->pcm_mtx); + break; + case CHAN_OP_STOP: + mtx_lock(chan->pcm_mtx); + usbd_transfer_stop(chan->xfer[0]); + usbd_transfer_stop(chan->xfer[1]); + mtx_unlock(chan->pcm_mtx); + break; + default: + break; + } + return; + +error: + usbd_transfer_unsetup(chan->xfer, UAUDIO_NCHANBUFS + 1); + + mtx_lock(chan->pcm_mtx); + chan->cur_alt = CHAN_MAX_ALT; + mtx_unlock(chan->pcm_mtx); +} + +static void +uaudio_configure_msg(struct usb_proc_msg *pm) +{ + struct uaudio_softc *sc = ((struct uaudio_configure_msg *)pm)->sc; + + usb_proc_explore_unlock(sc->sc_udev); + uaudio_configure_msg_sub(sc, &sc->sc_play_chan, PCMDIR_PLAY); + uaudio_configure_msg_sub(sc, &sc->sc_rec_chan, PCMDIR_REC); + usb_proc_explore_lock(sc->sc_udev); +} + /*========================================================================* * AS - Audio Stream - routines *========================================================================*/ @@ -1237,6 +1466,8 @@ uaudio_chan_fill_info_sub(struct uaudio_ struct usb_interface_descriptor *id; const struct uaudio_format *p_fmt = NULL; struct uaudio_chan *chan; + struct uaudio_chan_alt *chan_alt; + uint32_t format; uint16_t curidx = 0xFFFF; uint16_t lastidx = 0xFFFF; uint16_t alt_index = 0; @@ -1414,6 +1645,10 @@ uaudio_chan_fill_info_sub(struct uaudio_ bBitResolution = asf1d.v2->bBitResolution; bSubslotSize = asf1d.v2->bSubslotSize; + /* Map 4-byte aligned 24-bit samples into 32-bit */ + if (bBitResolution == 24 && bSubslotSize == 4) + bBitResolution = 32; + if (bBitResolution != (bSubslotSize * 8)) { DPRINTF("Invalid bSubslotSize\n"); goto next_ep; @@ -1508,14 +1743,19 @@ uaudio_chan_fill_info_sub(struct uaudio_ chan = (ep_dir == UE_DIR_IN) ? &sc->sc_rec_chan : &sc->sc_play_chan; - if (chan->valid != 0 || - usbd_get_iface(udev, curidx) == NULL) { - DPRINTF("Channel already exists or " - "interface is not valid\n"); + if (usbd_get_iface(udev, curidx) == NULL) { + DPRINTF("Interface is not valid\n"); goto next_ep; } + if (chan->num_alt == CHAN_MAX_ALT) { + DPRINTF("Too many alternate settings\n"); + goto next_ep; + } + chan->set_alt = 0; + chan->cur_alt = CHAN_MAX_ALT; + + chan_alt = &chan->usb_alt[chan->num_alt++]; - chan->valid = 1; #ifdef USB_DEBUG uaudio_chan_dump_ep_desc(ed1); #endif @@ -1523,30 +1763,81 @@ uaudio_chan_fill_info_sub(struct uaudio_ "bits = %d, format = %s\n", rate, channels, bit_resolution, p_fmt->description); - chan->sample_rate = rate; - chan->p_asf1d = asf1d; - chan->p_ed1 = ed1; - chan->p_fmt = p_fmt; - chan->p_sed = sed; - chan->iface_index = curidx; - chan->iface_alt_index = alt_index; + chan_alt->sample_rate = rate; + chan_alt->p_asf1d = asf1d; + chan_alt->p_ed1 = ed1; + chan_alt->p_fmt = p_fmt; + chan_alt->p_sed = sed; + chan_alt->iface_index = curidx; + chan_alt->iface_alt_index = alt_index; + + usbd_set_parent_iface(sc->sc_udev, curidx, + sc->sc_mixer_iface_index); if (ep_dir == UE_DIR_IN) - chan->usb_cfg = uaudio_cfg_record; + chan_alt->usb_cfg = uaudio_cfg_record; else - chan->usb_cfg = uaudio_cfg_play; + chan_alt->usb_cfg = uaudio_cfg_play; - chan->sample_size = (UAUDIO_MAX_CHAN(channels) * + chan_alt->sample_size = (UAUDIO_MAX_CHAN(channels) * p_fmt->bPrecision) / 8; - chan->channels = channels; + chan_alt->channels = channels; if (ep_dir == UE_DIR_IN && usbd_get_speed(udev) == USB_SPEED_FULL) { uaudio_record_fix_fs(ed1, - chan->sample_size * (rate / 1000), - chan->sample_size * (rate / 4000)); + chan_alt->sample_size * (rate / 1000), + chan_alt->sample_size * (rate / 4000)); } + /* setup play/record format */ + + format = chan_alt->p_fmt->freebsd_fmt; + + switch (chan_alt->channels) { + case 2: + /* stereo */ + format = SND_FORMAT(format, 2, 0); + break; + case 1: + /* mono */ + format = SND_FORMAT(format, 1, 0); + break; + default: + /* surround and more */ + format = feeder_matrix_default_format( + SND_FORMAT(format, chan_alt->channels, 0)); + break; + } + + /* check if format is not supported */ + if (format == 0) { + DPRINTF("The selected audio format is not supported\n"); + chan->num_alt--; + goto next_ep; + } + if (chan->num_alt > 1) { + /* we only accumulate one format at different sample rates */ + if (chan->pcm_format[0] != format) { + DPRINTF("Multiple formats is not supported\n"); + chan->num_alt--; + goto next_ep; + } + /* ignore if duplicate sample rate entry */ + if (rate == chan->usb_alt[chan->num_alt - 2].sample_rate) { + DPRINTF("Duplicate sample rate detected\n"); + chan->num_alt--; + goto next_ep; + } + } + chan->pcm_cap.fmtlist = chan->pcm_format; + chan->pcm_cap.fmtlist[0] = format; + + if (rate < chan->pcm_cap.minspeed || chan->pcm_cap.minspeed == 0) + chan->pcm_cap.minspeed = rate; + if (rate > chan->pcm_cap.maxspeed || chan->pcm_cap.maxspeed == 0) + chan->pcm_cap.maxspeed = rate; + if (sc->sc_sndstat_valid != 0) { sbuf_printf(&sc->sc_sndstat, "\n\t" "mode %d.%d:(%s) %dch, %dbit, %s, %dHz", @@ -1564,8 +1855,9 @@ uaudio_chan_fill_info_sub(struct uaudio_ /* This structure defines all the supported rates. */ -static const uint32_t uaudio_rate_list[] = { +static const uint32_t uaudio_rate_list[CHAN_MAX_ALT] = { 96000, + 88200, 88000, 80000, 72000, @@ -1630,21 +1922,12 @@ uaudio_chan_fill_info(struct uaudio_soft uaudio_chan_fill_info_sub(sc, udev, rate, x, y); /* try find a matching rate, if any */ - for (z = 0; uaudio_rate_list[z]; z++) { + for (z = 0; uaudio_rate_list[z]; z++) uaudio_chan_fill_info_sub(sc, udev, uaudio_rate_list[z], x, y); - - if (sc->sc_rec_chan.valid && - sc->sc_play_chan.valid) { - goto done; - } - } } } - -done: - if (sc->sc_sndstat_valid) { + if (sc->sc_sndstat_valid) sbuf_finish(&sc->sc_sndstat); - } } static void @@ -1652,6 +1935,7 @@ uaudio_chan_play_sync_callback(struct us { struct uaudio_chan *ch = usbd_xfer_softc(xfer); struct usb_page_cache *pc; + uint64_t sample_rate = ch->usb_alt[ch->cur_alt].sample_rate; uint8_t buf[4]; uint64_t temp; int len; @@ -1698,24 +1982,20 @@ uaudio_chan_play_sync_callback(struct us /* auto adjust */ - while (temp < (ch->sample_rate - (ch->sample_rate / 4))) + while (temp < (sample_rate - (sample_rate / 4))) temp *= 2; - while (temp > (ch->sample_rate + (ch->sample_rate / 2))) + while (temp > (sample_rate + (sample_rate / 2))) temp /= 2; - /* bias */ - - temp += (ch->sample_rate + 1999) / 2000; - /* compare */ DPRINTF("Comparing %d < %d\n", - (int)temp, (int)ch->sample_rate); + (int)temp, (int)sample_rate); - if (temp == ch->sample_rate) + if (temp == sample_rate) ch->last_sync_state = UAUDIO_SYNC_NONE; - else if (temp > ch->sample_rate) + else if (temp > sample_rate) ch->last_sync_state = UAUDIO_SYNC_MORE; else ch->last_sync_state = UAUDIO_SYNC_LESS; @@ -1737,6 +2017,7 @@ uaudio_chan_play_callback(struct usb_xfe { struct uaudio_chan *ch = usbd_xfer_softc(xfer); struct usb_page_cache *pc; + uint32_t sample_size = ch->usb_alt[ch->cur_alt].sample_size; uint32_t mfl; uint32_t total; uint32_t blockcount; @@ -1800,14 +2081,14 @@ tr_transferred: switch (ch->last_sync_state) { case UAUDIO_SYNC_MORE: DPRINTFN(6, "sending one sample more\n"); - if ((frame_len + ch->sample_size) <= mfl) - frame_len += ch->sample_size; + if ((frame_len + sample_size) <= mfl) + frame_len += sample_size; ch->last_sync_state = UAUDIO_SYNC_NONE; break; case UAUDIO_SYNC_LESS: DPRINTFN(6, "sending one sample less\n"); - if (frame_len >= ch->sample_size) - frame_len -= ch->sample_size; + if (frame_len >= sample_size) + frame_len -= sample_size; ch->last_sync_state = UAUDIO_SYNC_NONE; break; default: @@ -1944,187 +2225,43 @@ uaudio_chan_init(struct uaudio_softc *sc struct uaudio_chan *ch = ((dir == PCMDIR_PLAY) ? &sc->sc_play_chan : &sc->sc_rec_chan); uint32_t buf_size; - uint32_t frames; - uint32_t format; - uint16_t fps; - uint8_t endpoint; - uint8_t blocks; - uint8_t iface_index; - uint8_t alt_index; - uint8_t fps_shift; - usb_error_t err; - - fps = usbd_get_isoc_fps(sc->sc_udev); - - if (fps < 8000) { - /* FULL speed USB */ - frames = 8; - } else { - /* HIGH speed USB */ - frames = UAUDIO_NFRAMES; - } - - /* setup play/record format */ - - ch->pcm_cap.fmtlist = ch->pcm_format; - - ch->pcm_format[0] = 0; - ch->pcm_format[1] = 0; - - ch->pcm_cap.minspeed = ch->sample_rate; - ch->pcm_cap.maxspeed = ch->sample_rate; + uint8_t x; - /* setup mutex and PCM channel */ + /* store mutex and PCM channel */ ch->pcm_ch = c; ch->pcm_mtx = c->lock; - format = ch->p_fmt->freebsd_fmt; - - switch (ch->channels) { - case 2: - /* stereo */ - format = SND_FORMAT(format, 2, 0); - break; - case 1: - /* mono */ - format = SND_FORMAT(format, 1, 0); - break; - default: - /* surround and more */ - format = feeder_matrix_default_format( - SND_FORMAT(format, ch->channels, 0)); - break; - } - - ch->pcm_cap.fmtlist[0] = format; - ch->pcm_cap.fmtlist[1] = 0; - - /* check if format is not supported */ - - if (format == 0) { - DPRINTF("The selected audio format is not supported\n"); - goto error; - } - - /* set alternate interface corresponding to the mode */ - - endpoint = ch->p_ed1->bEndpointAddress; - iface_index = ch->iface_index; - alt_index = ch->iface_alt_index; - - DPRINTF("endpoint=0x%02x, speed=%d, iface=%d alt=%d\n", - endpoint, ch->sample_rate, iface_index, alt_index); + /* compute worst case buffer */ - err = usbd_set_alt_interface_index(sc->sc_udev, iface_index, alt_index); - if (err) { - DPRINTF("setting of alternate index failed: %s!\n", - usbd_errstr(err)); - goto error; + buf_size = 0; + for (x = 0; x != ch->num_alt; x++) { + uint32_t temp = uaudio_get_buffer_size(ch, x); + if (temp > buf_size) + buf_size = temp; } - usbd_set_parent_iface(sc->sc_udev, iface_index, - sc->sc_mixer_iface_index); - - /* - * Only set the sample rate if the channel reports that it - * supports the frequency control. - */ - if (sc->sc_audio_rev >= UAUDIO_VERSION_30) { - /* FALLTHROUGH */ - } else if (sc->sc_audio_rev >= UAUDIO_VERSION_20) { - unsigned int x; - - for (x = 0; x != 256; x++) { - if (dir == PCMDIR_PLAY) { - if (!(sc->sc_mixer_clocks.bit_output[x / 8] & - (1 << (x % 8)))) { - continue; - } - } else { - if (!(sc->sc_mixer_clocks.bit_input[x / 8] & - (1 << (x % 8)))) { - continue; - } - } - - if (uaudio20_set_speed(sc->sc_udev, - sc->sc_mixer_iface_no, x, ch->sample_rate)) { - /* - * If the endpoint is adaptive setting - * the speed may fail. - */ - DPRINTF("setting of sample rate failed! " - "(continuing anyway)\n"); - } - } - } else if (ch->p_sed.v1->bmAttributes & UA_SED_FREQ_CONTROL) { - if (uaudio_set_speed(sc->sc_udev, endpoint, ch->sample_rate)) { - /* - * If the endpoint is adaptive setting the - * speed may fail. - */ - DPRINTF("setting of sample rate failed! " - "(continuing anyway)\n"); - } - } - if (usbd_transfer_setup(sc->sc_udev, &iface_index, ch->xfer, - ch->usb_cfg, UAUDIO_NCHANBUFS + 1, ch, ch->pcm_mtx)) { - DPRINTF("could not allocate USB transfers!\n"); - goto error; - } - - fps_shift = usbd_xfer_get_fps_shift(ch->xfer[0]); - - /* down shift number of frames per second, if any */ - fps >>= fps_shift; - frames >>= fps_shift; - - /* bytes per frame should not be zero */ - ch->bytes_per_frame[0] = ((ch->sample_rate / fps) * ch->sample_size); - ch->bytes_per_frame[1] = (((ch->sample_rate + fps - 1) / fps) * ch->sample_size); - - /* setup data rate dithering, if any */ - ch->frames_per_second = fps; - ch->sample_rem = ch->sample_rate % fps; - ch->sample_curr = 0; - ch->frames_per_second = fps; - - /* compute required buffer size */ - buf_size = (ch->bytes_per_frame[1] * frames); - - ch->intr_size = buf_size; - ch->intr_frames = frames; - - DPRINTF("fps=%d sample_rem=%d\n", fps, ch->sample_rem); - - if (ch->intr_frames == 0) { - DPRINTF("frame shift is too high!\n"); - goto error; - } - - /* setup double buffering */ + /* allow double buffering */ buf_size *= 2; - blocks = 2; + + DPRINTF("Worst case buffer is %d bytes\n", (int)buf_size); ch->buf = malloc(buf_size, M_DEVBUF, M_WAITOK | M_ZERO); if (ch->buf == NULL) goto error; if (sndbuf_setup(b, ch->buf, buf_size) != 0) goto error; - if (sndbuf_resize(b, blocks, ch->intr_size)) - goto error; ch->start = ch->buf; ch->end = ch->buf + buf_size; ch->cur = ch->buf; ch->pcm_buf = b; + ch->max_buf = buf_size; if (ch->pcm_mtx == NULL) { DPRINTF("ERROR: PCM channels does not have a mutex!\n"); goto error; } - return (ch); error: @@ -2141,7 +2278,7 @@ uaudio_chan_free(struct uaudio_chan *ch) } usbd_transfer_unsetup(ch->xfer, UAUDIO_NCHANBUFS + 1); - ch->valid = 0; + ch->num_alt = 0; return (0); } @@ -2149,7 +2286,15 @@ uaudio_chan_free(struct uaudio_chan *ch) int uaudio_chan_set_param_blocksize(struct uaudio_chan *ch, uint32_t blocksize) { - return (ch->intr_size); + uint32_t temp = 2 * uaudio_get_buffer_size(ch, ch->set_alt); + + sndbuf_setup(ch->pcm_buf, ch->buf, temp); + + ch->start = ch->buf; + ch->end = ch->buf + temp; + ch->cur = ch->buf; + + return (temp / 2); } int @@ -2162,10 +2307,23 @@ uaudio_chan_set_param_fragments(struct u int uaudio_chan_set_param_speed(struct uaudio_chan *ch, uint32_t speed) { - if (speed != ch->sample_rate) { - DPRINTF("rate conversion required\n"); + uint8_t x; + + for (x = 0; x < ch->num_alt; x++) { + if (ch->usb_alt[x].sample_rate < speed) { + /* sample rate is too low */ + break; + } } - return (ch->sample_rate); + + if (x != 0) + x--; + + ch->set_alt = x; + + DPRINTF("Selecting alt %d\n", (int)x); + + return (ch->usb_alt[x].sample_rate); } int @@ -2228,31 +2386,61 @@ uaudio_chan_getmatrix(struct uaudio_chan int uaudio_chan_set_param_format(struct uaudio_chan *ch, uint32_t format) { - ch->format = format; + DPRINTF("Selecting format 0x%08x\n", (unsigned int)format); return (0); } int uaudio_chan_start(struct uaudio_chan *ch) { - ch->cur = ch->start; + struct uaudio_softc *sc = ch->priv_sc; + int do_start = 0; -#if (UAUDIO_NCHANBUFS != 2) -#error "please update code" -#endif - usbd_transfer_start(ch->xfer[0]); - usbd_transfer_start(ch->xfer[1]); + usb_proc_explore_lock(sc->sc_udev); + if (ch->operation != CHAN_OP_DRAIN) { + if (ch->cur_alt == ch->set_alt && + ch->operation == CHAN_OP_NONE) { + /* save doing the explore task */ + do_start = 1; + } else { + ch->operation = CHAN_OP_START; + (void)usb_proc_explore_msignal(sc->sc_udev, + &sc->sc_config_msg[0], &sc->sc_config_msg[1]); + } + } + usb_proc_explore_unlock(sc->sc_udev); + + if (do_start) { + usbd_transfer_start(ch->xfer[0]); + usbd_transfer_start(ch->xfer[1]); + } return (0); } int uaudio_chan_stop(struct uaudio_chan *ch) { -#if (UAUDIO_NCHANBUFS != 2) -#error "please update code" -#endif - usbd_transfer_stop(ch->xfer[0]); - usbd_transfer_stop(ch->xfer[1]); + struct uaudio_softc *sc = ch->priv_sc; + int do_stop = 0; + + usb_proc_explore_lock(sc->sc_udev); + if (ch->operation != CHAN_OP_DRAIN) { + if (ch->cur_alt == ch->set_alt && + ch->operation == CHAN_OP_NONE) { + /* save doing the explore task */ + do_stop = 1; + } else { + ch->operation = CHAN_OP_STOP; + (void)usb_proc_explore_msignal(sc->sc_udev, + &sc->sc_config_msg[0], &sc->sc_config_msg[1]); + } + } + usb_proc_explore_unlock(sc->sc_udev); + + if (do_stop) { + usbd_transfer_stop(ch->xfer[0]); + usbd_transfer_stop(ch->xfer[1]); + } return (0); } _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 04:39:12 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BA71114A; Wed, 15 May 2013 04:39:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 513B46B0; Wed, 15 May 2013 04:39:12 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id D0EE871A7F8; Wed, 15 May 2013 08:38:08 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 08:31:18 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 16:13:47 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 16:13:47 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id B72D17195EA for ; Sun, 12 May 2013 16:13:47 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CUuRJ9LifWbJ for ; Sun, 12 May 2013 16:13:40 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 9BEFB7195E4 for ; Sun, 12 May 2013 16:13:39 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 43D82559E; Sun, 12 May 2013 12:13:37 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 167F04EA; Sun, 12 May 2013 12:13:37 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C3453393; Sun, 12 May 2013 12:13:24 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9BEBD90B; Sun, 12 May 2013 12:13:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CCDOZw088606; Sun, 12 May 2013 12:13:24 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CCDOl1088602; Sun, 12 May 2013 12:13:24 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201305121213.r4CCDOl1088602@svn.freebsd.org> From: Hans Petter Selasky Date: Sun, 12 May 2013 12:13:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250560 - in stable/9/sys/dev/usb: . controller X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 12:13:47.0516 (UTC) FILETIME=[27BB0BC0:01CE4F0A] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 04:39:12 -0000 Author: hselasky Date: Sun May 12 12:13:23 2013 New Revision: 250560 URL: http://svnweb.freebsd.org/changeset/base/250560 Log: MFC r249795: Add convenience wrapper functions to run callbacks in the context of the USB explore thread. Modified: stable/9/sys/dev/usb/controller/usb_controller.c stable/9/sys/dev/usb/usb_process.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/controller/usb_controller.c ============================================================================== --- stable/9/sys/dev/usb/controller/usb_controller.c Sun May 12 12:09:08 2013 (r250559) +++ stable/9/sys/dev/usb/controller/usb_controller.c Sun May 12 12:13:23 2013 (r250560) @@ -877,3 +877,28 @@ usb_bus_mem_free_all(struct usb_bus *bus mtx_destroy(&bus->bus_mtx); } + +/* convenience wrappers */ +void +usb_proc_explore_mwait(struct usb_device *udev, void *pm1, void *pm2) +{ + usb_proc_mwait(&udev->bus->explore_proc, pm1, pm2); +} + +void * +usb_proc_explore_msignal(struct usb_device *udev, void *pm1, void *pm2) +{ + return (usb_proc_msignal(&udev->bus->explore_proc, pm1, pm2)); +} + +void +usb_proc_explore_lock(struct usb_device *udev) +{ + USB_BUS_LOCK(udev->bus); +} + +void +usb_proc_explore_unlock(struct usb_device *udev) +{ + USB_BUS_UNLOCK(udev->bus); +} Modified: stable/9/sys/dev/usb/usb_process.h ============================================================================== --- stable/9/sys/dev/usb/usb_process.h Sun May 12 12:09:08 2013 (r250559) +++ stable/9/sys/dev/usb/usb_process.h Sun May 12 12:13:23 2013 (r250560) @@ -42,6 +42,7 @@ /* structure prototypes */ struct usb_proc_msg; +struct usb_device; /* * The following structure defines the USB process. @@ -79,4 +80,9 @@ void usb_proc_free(struct usb_process *u void *usb_proc_msignal(struct usb_process *up, void *pm0, void *pm1); void usb_proc_rewakeup(struct usb_process *up); +void usb_proc_explore_mwait(struct usb_device *, void *, void *); +void *usb_proc_explore_msignal(struct usb_device *, void *, void *); +void usb_proc_explore_lock(struct usb_device *); +void usb_proc_explore_unlock(struct usb_device *); + #endif /* _USB_PROCESS_H_ */ _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 04:39:12 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D6BC414D; Wed, 15 May 2013 04:39:12 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 5A2826B1; Wed, 15 May 2013 04:39:12 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id D896471A7FC; Wed, 15 May 2013 08:38:08 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 08:31:19 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 05:21:12 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 05:21:12 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 47E40719EC8 for ; Mon, 13 May 2013 05:21:12 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vELIZQvm1Z5N for ; Mon, 13 May 2013 05:20:53 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 2217B719DCE for ; Mon, 13 May 2013 05:20:52 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 32E0F5406; Mon, 13 May 2013 01:20:50 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 6F4E598F; Mon, 13 May 2013 01:20:49 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 46E2B725; Mon, 13 May 2013 01:20:32 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 389649EF; Mon, 13 May 2013 01:20:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4D1KVZm064861; Mon, 13 May 2013 01:20:31 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4D1KVPU064860; Mon, 13 May 2013 01:20:31 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305130120.r4D1KVPU064860@svn.freebsd.org> From: Eitan Adler Date: Mon, 13 May 2013 01:20:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250583 - stable/9/usr.sbin/mergemaster X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 13 May 2013 01:21:12.0280 (UTC) FILETIME=[27CDED80:01CE4F78] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 04:39:12 -0000 Author: eadler Date: Mon May 13 01:20:31 2013 New Revision: 250583 URL: http://svnweb.freebsd.org/changeset/base/250583 Log: MFC r250463: Permit relative paths with mergemaster -m PR: bin/173929 Modified: stable/9/usr.sbin/mergemaster/mergemaster.sh Directory Properties: stable/9/usr.sbin/mergemaster/ (props changed) Modified: stable/9/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/9/usr.sbin/mergemaster/mergemaster.sh Sun May 12 22:22:12 2013 (r250582) +++ stable/9/usr.sbin/mergemaster/mergemaster.sh Mon May 13 01:20:31 2013 (r250583) @@ -483,6 +483,7 @@ if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a sleep 3 SOURCEDIR=${SOURCEDIR}/.. fi +SOURCEDIR=$(realpath "$SOURCEDIR") # Setup make to use system files from SOURCEDIR MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk" _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 04:39:12 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DAB0214E; Wed, 15 May 2013 04:39:12 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 5B1066B2; Wed, 15 May 2013 04:39:12 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 19C6771A81C; Wed, 15 May 2013 08:38:09 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 08:31:37 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 05:21:15 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 05:21:14 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 0E0F4719EA0 for ; Mon, 13 May 2013 05:21:15 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CJxBVoPGsVH1 for ; Mon, 13 May 2013 05:21:08 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 64176719EE0 for ; Mon, 13 May 2013 05:21:08 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 4DDA35474; Mon, 13 May 2013 01:21:05 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 388BA9F0; Mon, 13 May 2013 01:21:05 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 16DD6726; Mon, 13 May 2013 01:20:37 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 08C699F0; Mon, 13 May 2013 01:20:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4D1KaLx064909; Mon, 13 May 2013 01:20:36 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4D1Kade064908; Mon, 13 May 2013 01:20:36 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305130120.r4D1Kade064908@svn.freebsd.org> From: Eitan Adler Date: Mon, 13 May 2013 01:20:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250584 - stable/8/usr.sbin/mergemaster X-SVN-Group: stable-8 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 13 May 2013 01:21:15.0046 (UTC) FILETIME=[2973FC60:01CE4F78] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 04:39:13 -0000 Author: eadler Date: Mon May 13 01:20:36 2013 New Revision: 250584 URL: http://svnweb.freebsd.org/changeset/base/250584 Log: MFC r250463: Permit relative paths with mergemaster -m PR: bin/173929 Modified: stable/8/usr.sbin/mergemaster/mergemaster.sh Directory Properties: stable/8/usr.sbin/mergemaster/ (props changed) Modified: stable/8/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/8/usr.sbin/mergemaster/mergemaster.sh Mon May 13 01:20:31 2013 (r250583) +++ stable/8/usr.sbin/mergemaster/mergemaster.sh Mon May 13 01:20:36 2013 (r250584) @@ -483,6 +483,7 @@ if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a sleep 3 SOURCEDIR=${SOURCEDIR}/.. fi +SOURCEDIR=$(realpath "$SOURCEDIR") # Setup make to use system files from SOURCEDIR MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk" _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 04:39:13 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id F00E7152; Wed, 15 May 2013 04:39:12 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 8BD786B8; Wed, 15 May 2013 04:39:12 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 02F1371A80B; Wed, 15 May 2013 08:38:09 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 08:31:34 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 23:00:40 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 16:43:28 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 72E3871A1EA for ; Mon, 13 May 2013 16:43:28 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fIOOrhI5YPqs for ; Mon, 13 May 2013 16:43:20 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 4B43B71A189 for ; Mon, 13 May 2013 16:43:20 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id CA694238A; Mon, 13 May 2013 12:43:16 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 6C47F3D8; Mon, 13 May 2013 12:43:16 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 32E93278; Mon, 13 May 2013 12:43:04 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0AA1AF8A; Mon, 13 May 2013 12:43:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DCh3xK010126; Mon, 13 May 2013 12:43:03 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DCh3OJ010125; Mon, 13 May 2013 12:43:03 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201305131243.r4DCh3OJ010125@svn.freebsd.org> From: Luigi Rizzo Date: Mon, 13 May 2013 12:43:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250596 - stable/9/release/picobsd/build X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 13 May 2013 12:43:28.0358 (UTC) FILETIME=[779BB860:01CE4FD7] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 04:39:13 -0000 Author: luigi Date: Mon May 13 12:43:03 2013 New Revision: 250596 URL: http://svnweb.freebsd.org/changeset/base/250596 Log: MFC: enable parallel build of toolchain/libraries/headers Modified: stable/9/release/picobsd/build/picobsd Modified: stable/9/release/picobsd/build/picobsd ============================================================================== --- stable/9/release/picobsd/build/picobsd Mon May 13 11:32:20 2013 (r250595) +++ stable/9/release/picobsd/build/picobsd Mon May 13 12:43:03 2013 (r250596) @@ -173,17 +173,10 @@ create_includes_and_libraries2() { # opt if [ -d "$1" ] ; then cd $1 ; ${BINMAKE} ${o_par} $2 # specific target, e.g. ld-elf.so else - MAKEOBJDIRPREFIX=${l_objtree} - export MAKEOBJDIRPREFIX - # export WITH_RESCUE=yes # build crunchide - # ${BINMAKE} ${o_par} _+_= $no toolchain _includes _libraries - ( - # eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V BMAKEENV` - eval "export XMAKE=\"`cd ${SRC}; make -f Makefile -V XMAKE`\"" - ${BINMAKE} ${o_par} _+_= $no toolchain - ) + export MAKEOBJDIRPREFIX=${l_objtree} + make ${o_par} $no toolchain + # XXX do we need any of these ? eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V WMAKEENV` - ${BINMAKE} ${o_par} _+_= $no _includes _libraries [ ${o_arch} != `uname -m` ] && \ (cd ${l_objtree}; ln -s . ${o_arch}.${o_arch} || true ) fi @@ -440,7 +433,8 @@ do_kernel() { # OK # export CONFIG export WARNS CWARNFLAGS [ "${o_do_modules}" = "yes" ] && export MODULES="" - ${BINMAKE} ${o_par} KERNCONF=${l_kernconf} \ + # kernel build not parallelizable yet + ${BINMAKE} KERNCONF=${l_kernconf} \ -v -f ${PICO_TREE}/build/Makefile.conf ) || \ fail $? missing_kernel } @@ -971,6 +965,7 @@ set_build_parameters() { if [ ${OSVERSION} -ge 500035 ] ; then export MAKEOBJDIRPREFIX=${l_objtree} export TARGET_ARCH=${o_arch} TARGET=${o_arch} + export WITHOUT_CLANG_IS_CC=1 # XXX why change machine_arch ? #-- export MACHINE_ARCH=`uname -m` MACHINE=`uname -m` # export CWARNFLAGS="-Wextra -Wno-sign-compare -Wno-missing-field-initializers" _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 04:39:13 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 54B4D163; Wed, 15 May 2013 04:39:13 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 9A4EF6B9; Wed, 15 May 2013 04:39:12 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 2913871A839; Wed, 15 May 2013 08:38:09 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 08:32:16 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 05:28:28 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 05:28:27 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id BD0CC719F6B for ; Mon, 13 May 2013 05:28:27 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xdcWJK2UN1oE for ; Mon, 13 May 2013 05:28:20 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id D6718719F4D for ; Mon, 13 May 2013 05:28:19 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 54642596B; Mon, 13 May 2013 01:28:18 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 33142E32; Mon, 13 May 2013 01:28:18 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 526D4BC6; Mon, 13 May 2013 01:28:00 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 29F88A2B; Mon, 13 May 2013 01:28:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4D1S0Ga067820; Mon, 13 May 2013 01:28:00 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4D1S0B6067819; Mon, 13 May 2013 01:28:00 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305130128.r4D1S0B6067819@svn.freebsd.org> From: Eitan Adler Date: Mon, 13 May 2013 01:28:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250586 - stable/9/bin/rm X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 13 May 2013 01:28:27.0751 (UTC) FILETIME=[2B5D8770:01CE4F79] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 04:39:13 -0000 Author: eadler Date: Mon May 13 01:27:59 2013 New Revision: 250586 URL: http://svnweb.freebsd.org/changeset/base/250586 Log: MFC r249949: Take some improvements from DragonFlyBSD: - add const where appropriate - add static where appropriate - fix a whitespace issues Modified: stable/9/bin/rm/rm.c Directory Properties: stable/9/bin/rm/ (props changed) Modified: stable/9/bin/rm/rm.c ============================================================================== --- stable/9/bin/rm/rm.c Mon May 13 01:26:26 2013 (r250585) +++ stable/9/bin/rm/rm.c Mon May 13 01:27:59 2013 (r250586) @@ -62,15 +62,15 @@ int rflag, Iflag; uid_t uid; volatile sig_atomic_t info; -int check(char *, char *, struct stat *); -int check2(char **); -void checkdot(char **); -void checkslash(char **); -void rm_file(char **); -int rm_overwrite(char *, struct stat *); -void rm_tree(char **); +static int check(const char *, const char *, struct stat *); +static int check2(char **); +static void checkdot(char **); +static void checkslash(char **); +static void rm_file(char **); +static int rm_overwrite(const char *, struct stat *); +static void rm_tree(char **); static void siginfo(int __unused); -void usage(void); +static void usage(void); /* * rm -- @@ -169,7 +169,7 @@ main(int argc, char *argv[]) exit (eval); } -void +static void rm_tree(char **argv) { FTS *fts; @@ -412,7 +412,7 @@ rm_file(char **argv) * have kernel support. */ int -rm_overwrite(char *file, struct stat *sbp) +rm_overwrite(const char *file, struct stat *sbp) { struct stat sb, sb2; struct statfs fsb; @@ -478,8 +478,8 @@ err: eval = 1; } -int -check(char *path, char *name, struct stat *sp) +static int +check(const char *path, const char *name, struct stat *sp) { int ch, first; char modep[15], *flagsp; @@ -490,7 +490,7 @@ check(char *path, char *name, struct sta else { /* * If it's not a symbolic link and it's unwritable and we're - * talking to a terminal, ask. Symbolic links are excluded + * talking to a terminal, ask. Symbolic links are excluded * because their permissions are meaningless. Check stdin_ok * first because we may not have stat'ed the file. */ @@ -523,7 +523,7 @@ check(char *path, char *name, struct sta } #define ISSLASH(a) ((a)[0] == '/' && (a)[1] == '\0') -void +static void checkslash(char **argv) { char **t, **u; @@ -543,7 +543,7 @@ checkslash(char **argv) } } -int +static int check2(char **argv) { struct stat st; @@ -594,7 +594,7 @@ check2(char **argv) } #define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2]))) -void +static void checkdot(char **argv) { char *p, **save, **t; @@ -618,7 +618,7 @@ checkdot(char **argv) } } -void +static void usage(void) { _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 04:39:13 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CC3F517A; Wed, 15 May 2013 04:39:13 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 18B296C1; Wed, 15 May 2013 04:39:13 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 5E97071A856; Wed, 15 May 2013 08:38:09 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 08:34:03 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 05:28:38 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 05:28:37 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id C208C719F22 for ; Mon, 13 May 2013 05:28:37 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i6ZBccpjkuQR for ; Mon, 13 May 2013 05:28:30 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id D0BB8719F6B for ; Mon, 13 May 2013 05:28:29 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id E09B659C0; Mon, 13 May 2013 01:28:28 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id B5DCBE85; Mon, 13 May 2013 01:28:28 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C354DCD9; Mon, 13 May 2013 01:28:09 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9CBA5A2E; Mon, 13 May 2013 01:28:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4D1S9hQ067901; Mon, 13 May 2013 01:28:09 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4D1S9Fw067900; Mon, 13 May 2013 01:28:09 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305130128.r4D1S9Fw067900@svn.freebsd.org> From: Eitan Adler Date: Mon, 13 May 2013 01:28:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250587 - stable/8/bin/rm X-SVN-Group: stable-8 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 13 May 2013 01:28:37.0767 (UTC) FILETIME=[3155D970:01CE4F79] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 04:39:13 -0000 Author: eadler Date: Mon May 13 01:28:09 2013 New Revision: 250587 URL: http://svnweb.freebsd.org/changeset/base/250587 Log: MFC r249949: Take some improvements from DragonFlyBSD: - add const where appropriate - add static where appropriate - fix a whitespace issues Modified: stable/8/bin/rm/rm.c Directory Properties: stable/8/bin/rm/ (props changed) Modified: stable/8/bin/rm/rm.c ============================================================================== --- stable/8/bin/rm/rm.c Mon May 13 01:27:59 2013 (r250586) +++ stable/8/bin/rm/rm.c Mon May 13 01:28:09 2013 (r250587) @@ -62,15 +62,15 @@ int rflag, Iflag; uid_t uid; volatile sig_atomic_t info; -int check(char *, char *, struct stat *); -int check2(char **); -void checkdot(char **); -void checkslash(char **); -void rm_file(char **); -int rm_overwrite(char *, struct stat *); -void rm_tree(char **); +static int check(const char *, const char *, struct stat *); +static int check2(char **); +static void checkdot(char **); +static void checkslash(char **); +static void rm_file(char **); +static int rm_overwrite(const char *, struct stat *); +static void rm_tree(char **); static void siginfo(int __unused); -void usage(void); +static void usage(void); /* * rm -- @@ -169,7 +169,7 @@ main(int argc, char *argv[]) exit (eval); } -void +static void rm_tree(char **argv) { FTS *fts; @@ -412,7 +412,7 @@ rm_file(char **argv) * kernel support. */ int -rm_overwrite(char *file, struct stat *sbp) +rm_overwrite(const char *file, struct stat *sbp) { struct stat sb, sb2; struct statfs fsb; @@ -478,8 +478,8 @@ err: eval = 1; } -int -check(char *path, char *name, struct stat *sp) +static int +check(const char *path, const char *name, struct stat *sp) { int ch, first; char modep[15], *flagsp; @@ -490,7 +490,7 @@ check(char *path, char *name, struct sta else { /* * If it's not a symbolic link and it's unwritable and we're - * talking to a terminal, ask. Symbolic links are excluded + * talking to a terminal, ask. Symbolic links are excluded * because their permissions are meaningless. Check stdin_ok * first because we may not have stat'ed the file. */ @@ -523,7 +523,7 @@ check(char *path, char *name, struct sta } #define ISSLASH(a) ((a)[0] == '/' && (a)[1] == '\0') -void +static void checkslash(char **argv) { char **t, **u; @@ -543,7 +543,7 @@ checkslash(char **argv) } } -int +static int check2(char **argv) { struct stat st; @@ -594,7 +594,7 @@ check2(char **argv) } #define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2]))) -void +static void checkdot(char **argv) { char *p, **save, **t; @@ -618,7 +618,7 @@ checkdot(char **argv) } } -void +static void usage(void) { _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 04:39:13 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D97C317F; Wed, 15 May 2013 04:39:13 +0000 (UTC) (envelope-from fabient@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 2CE1B6C3; Wed, 15 May 2013 04:39:13 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 6DE2471A549; Wed, 15 May 2013 08:38:09 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 08:34:13 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 23:08:05 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 19:19:06 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 1E6AA71A496 for ; Mon, 13 May 2013 19:19:07 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SSCvbwbgKuFj for ; Mon, 13 May 2013 19:19:00 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id B361B71A283 for ; Mon, 13 May 2013 19:18:59 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 3ACC91B90; Mon, 13 May 2013 15:18:57 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id E925FDB1; Mon, 13 May 2013 15:18:56 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 120E3C3C; Mon, 13 May 2013 15:18:38 +0000 (UTC) (envelope-from fabient@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E734AEBC; Mon, 13 May 2013 15:18:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DFIbU1065183; Mon, 13 May 2013 15:18:37 GMT (envelope-from fabient@svn.freebsd.org) Received: (from fabient@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DFIaJg065174; Mon, 13 May 2013 15:18:36 GMT (envelope-from fabient@svn.freebsd.org) Message-Id: <201305131518.r4DFIaJg065174@svn.freebsd.org> From: Fabien Thomas Date: Mon, 13 May 2013 15:18:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250600 - in stable/9: lib/libpmc sys/dev/hwpmc sys/kern sys/sys X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 13 May 2013 15:19:06.0902 (UTC) FILETIME=[35D07360:01CE4FED] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 04:39:14 -0000 Author: fabient Date: Mon May 13 15:18:36 2013 New Revision: 250600 URL: http://svnweb.freebsd.org/changeset/base/250600 Log: MFC r247329, r247836: Add support for good old 8192Hz profiling clock to software PMC. Add a generic way to call per event allocate / release function. Modified: stable/9/lib/libpmc/pmc.soft.3 stable/9/sys/dev/hwpmc/hwpmc_soft.c stable/9/sys/kern/kern_clock.c stable/9/sys/kern/kern_clocksource.c stable/9/sys/sys/pmckern.h Directory Properties: stable/9/lib/libpmc/ (props changed) stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/sys/ (props changed) Modified: stable/9/lib/libpmc/pmc.soft.3 ============================================================================== --- stable/9/lib/libpmc/pmc.soft.3 Mon May 13 15:00:36 2013 (r250599) +++ stable/9/lib/libpmc/pmc.soft.3 Mon May 13 15:18:36 2013 (r250600) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 28, 2012 +.Dd February 26, 2013 .Os .Dt PMC.SOFT 3 .Sh NAME @@ -61,6 +61,8 @@ The event specifiers supported by softwa Hard clock ticks. .It Li CLOCK.STAT Stat clock ticks. +.It Li CLOCK.PROF +Profiling clock ticks. .It Li LOCK.FAILED Lock acquisition failed. .It Li PAGE_FAULT.ALL Modified: stable/9/sys/dev/hwpmc/hwpmc_soft.c ============================================================================== --- stable/9/sys/dev/hwpmc/hwpmc_soft.c Mon May 13 15:00:36 2013 (r250599) +++ stable/9/sys/dev/hwpmc/hwpmc_soft.c Mon May 13 15:18:36 2013 (r250600) @@ -124,6 +124,9 @@ soft_allocate_pmc(int cpu, int ri, struc if (ps == NULL) return (EINVAL); pmc_soft_ev_release(ps); + /* Module unload is protected by pmc SX lock. */ + if (ps->ps_alloc != NULL) + ps->ps_alloc(); return (0); } @@ -311,6 +314,8 @@ static int soft_release_pmc(int cpu, int ri, struct pmc *pmc) { struct pmc_hw *phw; + enum pmc_event ev; + struct pmc_soft *ps; (void) pmc; @@ -324,9 +329,16 @@ soft_release_pmc(int cpu, int ri, struct KASSERT(phw->phw_pmc == NULL, ("[soft,%d] PHW pmc %p non-NULL", __LINE__, phw->phw_pmc)); - /* - * Nothing to do. - */ + ev = pmc->pm_event; + + /* Check if event is registered. */ + ps = pmc_soft_ev_acquire(ev); + KASSERT(ps != NULL, + ("[soft,%d] unregistered event %d", __LINE__, ev)); + pmc_soft_ev_release(ps); + /* Module unload is protected by pmc SX lock. */ + if (ps->ps_release != NULL) + ps->ps_release(); return (0); } Modified: stable/9/sys/kern/kern_clock.c ============================================================================== --- stable/9/sys/kern/kern_clock.c Mon May 13 15:00:36 2013 (r250599) +++ stable/9/sys/kern/kern_clock.c Mon May 13 15:18:36 2013 (r250600) @@ -78,6 +78,8 @@ __FBSDID("$FreeBSD$"); #include PMC_SOFT_DEFINE( , , clock, hard); PMC_SOFT_DEFINE( , , clock, stat); +PMC_SOFT_DEFINE_EX( , , clock, prof, \ + cpu_startprofclock, cpu_stopprofclock); #endif #ifdef DEVICE_POLLING @@ -817,6 +819,10 @@ profclock_cnt(int cnt, int usermode, uin } } #endif +#ifdef HWPMC_HOOKS + if (td->td_intr_frame != NULL) + PMC_SOFT_CALL_TF( , , clock, prof, td->td_intr_frame); +#endif } /* Modified: stable/9/sys/kern/kern_clocksource.c ============================================================================== --- stable/9/sys/kern/kern_clocksource.c Mon May 13 15:00:36 2013 (r250599) +++ stable/9/sys/kern/kern_clocksource.c Mon May 13 15:18:36 2013 (r250600) @@ -732,12 +732,15 @@ cpu_startprofclock(void) { ET_LOCK(); - if (periodic) { - configtimer(0); - profiling = 1; - configtimer(1); + if (profiling == 0) { + if (periodic) { + configtimer(0); + profiling = 1; + configtimer(1); + } else + profiling = 1; } else - profiling = 1; + profiling++; ET_UNLOCK(); } @@ -749,12 +752,15 @@ cpu_stopprofclock(void) { ET_LOCK(); - if (periodic) { - configtimer(0); + if (profiling == 1) { + if (periodic) { + configtimer(0); + profiling = 0; + configtimer(1); + } else profiling = 0; - configtimer(1); } else - profiling = 0; + profiling--; ET_UNLOCK(); } Modified: stable/9/sys/sys/pmckern.h ============================================================================== --- stable/9/sys/sys/pmckern.h Mon May 13 15:00:36 2013 (r250599) +++ stable/9/sys/sys/pmckern.h Mon May 13 15:18:36 2013 (r250600) @@ -87,9 +87,9 @@ struct pmckern_soft { * Soft PMC. */ -#define PMC_SOFT_DEFINE(prov, mod, func, name) \ +#define PMC_SOFT_DEFINE_EX(prov, mod, func, name, alloc, release) \ struct pmc_soft pmc_##prov##_##mod##_##func##_##name = \ - { 0, { #prov "_" #mod "_" #func "." #name, 0 } }; \ + { 0, alloc, release, { #prov "_" #mod "_" #func "." #name, 0 } }; \ SYSINIT(pmc_##prov##_##mod##_##func##_##name##_init, SI_SUB_KDTRACE, \ SI_ORDER_SECOND + 1, pmc_soft_ev_register, \ &pmc_##prov##_##mod##_##func##_##name ); \ @@ -97,6 +97,9 @@ struct pmckern_soft { SI_SUB_KDTRACE, SI_ORDER_SECOND + 1, pmc_soft_ev_deregister, \ &pmc_##prov##_##mod##_##func##_##name ) +#define PMC_SOFT_DEFINE(prov, mod, func, name) \ + PMC_SOFT_DEFINE_EX(prov, mod, func, name, NULL, NULL) + #define PMC_SOFT_DECLARE(prov, mod, func, name) \ extern struct pmc_soft pmc_##prov##_##mod##_##func##_##name @@ -147,6 +150,8 @@ do { \ struct pmc_soft { int ps_running; + void (*ps_alloc)(void); + void (*ps_release)(void); struct pmc_dyn_event_descr ps_ev; }; _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 04:45:50 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id ABCB07CB; Wed, 15 May 2013 04:45:50 +0000 (UTC) (envelope-from hiren@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 29E437BD; Wed, 15 May 2013 04:45:50 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 6C0A971A4C6; Wed, 15 May 2013 08:45:49 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 08:41:01 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 02:01:42 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 02:01:42 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 89D247195FF for ; Mon, 13 May 2013 02:01:42 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2hJiwairgS4Y for ; Mon, 13 May 2013 02:01:34 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id B500171992B for ; Mon, 13 May 2013 02:01:34 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id A261916E3; Sun, 12 May 2013 22:01:32 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id AEAB33A1; Sun, 12 May 2013 22:01:31 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B795B256; Sun, 12 May 2013 22:01:24 +0000 (UTC) (envelope-from hiren@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9A2981CD; Sun, 12 May 2013 22:01:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CM1O3H096573; Sun, 12 May 2013 22:01:24 GMT (envelope-from hiren@svn.freebsd.org) Received: (from hiren@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CM1M6j096561; Sun, 12 May 2013 22:01:22 GMT (envelope-from hiren@svn.freebsd.org) Message-Id: <201305122201.r4CM1M6j096561@svn.freebsd.org> From: Hiren Panchasara Date: Sun, 12 May 2013 22:01:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250581 - in stable/9/sys: dev/hwpmc kern X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 22:01:42.0315 (UTC) FILETIME=[492637B0:01CE4F5C] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 04:45:50 -0000 Author: hiren Date: Sun May 12 22:01:22 2013 New Revision: 250581 URL: http://svnweb.freebsd.org/changeset/base/250581 Log: MFC: r240475 Remove all the checks on curthread != NULL with the exception of some MD trap checks (eg. printtrap()). Generally this check is not needed anymore, as there is not a legitimate case where curthread != NULL, after pcpu 0 area has been properly initialized. Reviewed by: attilio Approved by: sbruno (mentor) Modified: stable/9/sys/dev/hwpmc/hwpmc_arm.c stable/9/sys/dev/hwpmc/hwpmc_x86.c stable/9/sys/kern/kern_condvar.c stable/9/sys/kern/kern_mutex.c stable/9/sys/kern/kern_rwlock.c stable/9/sys/kern/kern_sx.c stable/9/sys/kern/kern_thread.c stable/9/sys/kern/vfs_subr.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/hwpmc/hwpmc_arm.c ============================================================================== --- stable/9/sys/dev/hwpmc/hwpmc_arm.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/dev/hwpmc/hwpmc_arm.c Sun May 12 22:01:22 2013 (r250581) @@ -75,12 +75,10 @@ pmc_save_kernel_callchain(uintptr_t *cc, KASSERT(TRAPF_USERMODE(tf) == 0,("[arm,%d] not a kernel backtrace", __LINE__)); + td = curthread; pc = PMC_TRAPFRAME_TO_PC(tf); *cc++ = pc; - if ((td = curthread) == NULL) - return (1); - if (maxsamples <= 1) return (1); @@ -126,12 +124,10 @@ pmc_save_user_callchain(uintptr_t *cc, i KASSERT(TRAPF_USERMODE(tf), ("[x86,%d] Not a user trap frame tf=%p", __LINE__, (void *) tf)); + td = curthread; pc = PMC_TRAPFRAME_TO_PC(tf); *cc++ = pc; - if ((td = curthread) == NULL) - return (1); - if (maxsamples <= 1) return (1); Modified: stable/9/sys/dev/hwpmc/hwpmc_x86.c ============================================================================== --- stable/9/sys/dev/hwpmc/hwpmc_x86.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/dev/hwpmc/hwpmc_x86.c Sun May 12 22:01:22 2013 (r250581) @@ -161,6 +161,7 @@ pmc_save_kernel_callchain(uintptr_t *cc, KASSERT(TRAPF_USERMODE(tf) == 0,("[x86,%d] not a kernel backtrace", __LINE__)); + td = curthread; pc = PMC_TRAPFRAME_TO_PC(tf); fp = PMC_TRAPFRAME_TO_FP(tf); sp = PMC_TRAPFRAME_TO_KERNEL_SP(tf); @@ -168,9 +169,6 @@ pmc_save_kernel_callchain(uintptr_t *cc, *cc++ = pc; r = fp + sizeof(uintptr_t); /* points to return address */ - if ((td = curthread) == NULL) - return (1); - if (nframes <= 1) return (1); Modified: stable/9/sys/kern/kern_condvar.c ============================================================================== --- stable/9/sys/kern/kern_condvar.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/kern/kern_condvar.c Sun May 12 22:01:22 2013 (r250581) @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); * Common sanity checks for cv_wait* functions. */ #define CV_ASSERT(cvp, lock, td) do { \ - KASSERT((td) != NULL, ("%s: curthread NULL", __func__)); \ + KASSERT((td) != NULL, ("%s: td NULL", __func__)); \ KASSERT(TD_IS_RUNNING(td), ("%s: not TDS_RUNNING", __func__)); \ KASSERT((cvp) != NULL, ("%s: cvp NULL", __func__)); \ KASSERT((lock) != NULL, ("%s: lock NULL", __func__)); \ Modified: stable/9/sys/kern/kern_mutex.c ============================================================================== --- stable/9/sys/kern/kern_mutex.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/kern/kern_mutex.c Sun May 12 22:01:22 2013 (r250581) @@ -199,7 +199,6 @@ _mtx_lock_flags(struct mtx *m, int opts, if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, ("mtx_lock() of destroyed mutex @ %s:%d", file, line)); KASSERT(LOCK_CLASS(&m->lock_object) == &lock_class_mtx_sleep, @@ -221,7 +220,6 @@ _mtx_unlock_flags(struct mtx *m, int opt if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, ("mtx_unlock() of destroyed mutex @ %s:%d", file, line)); KASSERT(LOCK_CLASS(&m->lock_object) == &lock_class_mtx_sleep, @@ -244,7 +242,6 @@ _mtx_lock_spin_flags(struct mtx *m, int if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, ("mtx_lock_spin() of destroyed mutex @ %s:%d", file, line)); KASSERT(LOCK_CLASS(&m->lock_object) == &lock_class_mtx_spin, @@ -268,7 +265,6 @@ _mtx_unlock_spin_flags(struct mtx *m, in if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, ("mtx_unlock_spin() of destroyed mutex @ %s:%d", file, line)); KASSERT(LOCK_CLASS(&m->lock_object) == &lock_class_mtx_spin, @@ -299,7 +295,6 @@ _mtx_trylock(struct mtx *m, int opts, co if (SCHEDULER_STOPPED()) return (1); - MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, ("mtx_trylock() of destroyed mutex @ %s:%d", file, line)); KASSERT(LOCK_CLASS(&m->lock_object) == &lock_class_mtx_sleep, Modified: stable/9/sys/kern/kern_rwlock.c ============================================================================== --- stable/9/sys/kern/kern_rwlock.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/kern/kern_rwlock.c Sun May 12 22:01:22 2013 (r250581) @@ -237,7 +237,6 @@ _rw_wlock(struct rwlock *rw, const char if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(rw->rw_lock != RW_DESTROYED, ("rw_wlock() of destroyed rwlock @ %s:%d", file, line)); WITNESS_CHECKORDER(&rw->lock_object, LOP_NEWORDER | LOP_EXCLUSIVE, file, @@ -282,7 +281,6 @@ _rw_wunlock(struct rwlock *rw, const cha if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(rw->rw_lock != RW_DESTROYED, ("rw_wunlock() of destroyed rwlock @ %s:%d", file, line)); _rw_assert(rw, RA_WLOCKED, file, line); Modified: stable/9/sys/kern/kern_sx.c ============================================================================== --- stable/9/sys/kern/kern_sx.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/kern/kern_sx.c Sun May 12 22:01:22 2013 (r250581) @@ -246,7 +246,6 @@ _sx_slock(struct sx *sx, int opts, const if (SCHEDULER_STOPPED()) return (0); - MPASS(curthread != NULL); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_slock() of destroyed sx @ %s:%d", file, line)); WITNESS_CHECKORDER(&sx->lock_object, LOP_NEWORDER, file, line, NULL); @@ -293,7 +292,6 @@ _sx_xlock(struct sx *sx, int opts, const if (SCHEDULER_STOPPED()) return (0); - MPASS(curthread != NULL); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_xlock() of destroyed sx @ %s:%d", file, line)); WITNESS_CHECKORDER(&sx->lock_object, LOP_NEWORDER | LOP_EXCLUSIVE, file, @@ -317,7 +315,6 @@ _sx_try_xlock(struct sx *sx, const char if (SCHEDULER_STOPPED()) return (1); - MPASS(curthread != NULL); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_try_xlock() of destroyed sx @ %s:%d", file, line)); @@ -345,7 +342,6 @@ _sx_sunlock(struct sx *sx, const char *f if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_sunlock() of destroyed sx @ %s:%d", file, line)); _sx_assert(sx, SA_SLOCKED, file, line); @@ -362,7 +358,6 @@ _sx_xunlock(struct sx *sx, const char *f if (SCHEDULER_STOPPED()) return; - MPASS(curthread != NULL); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_xunlock() of destroyed sx @ %s:%d", file, line)); _sx_assert(sx, SA_XLOCKED, file, line); Modified: stable/9/sys/kern/kern_thread.c ============================================================================== --- stable/9/sys/kern/kern_thread.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/kern/kern_thread.c Sun May 12 22:01:22 2013 (r250581) @@ -623,7 +623,6 @@ thread_single(int mode) p = td->td_proc; mtx_assert(&Giant, MA_NOTOWNED); PROC_LOCK_ASSERT(p, MA_OWNED); - KASSERT((td != NULL), ("curthread is NULL")); if ((p->p_flag & P_HADTHREADS) == 0) return (0); Modified: stable/9/sys/kern/vfs_subr.c ============================================================================== --- stable/9/sys/kern/vfs_subr.c Sun May 12 21:48:08 2013 (r250580) +++ stable/9/sys/kern/vfs_subr.c Sun May 12 22:01:22 2013 (r250581) @@ -3494,7 +3494,6 @@ vfs_unmountall(void) struct thread *td; int error; - KASSERT(curthread != NULL, ("vfs_unmountall: NULL curthread")); CTR1(KTR_VFS, "%s: unmounting all filesystems", __func__); td = curthread; _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 04:48:49 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D170897C; Wed, 15 May 2013 04:48:49 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 6D3FB7F4; Wed, 15 May 2013 04:48:49 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 535E971A545; Wed, 15 May 2013 08:48:47 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 08:42:33 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 20:18:18 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 20:18:18 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 6D01771951B for ; Sun, 12 May 2013 20:18:18 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 905ym314QKqI for ; Sun, 12 May 2013 20:18:10 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 4A426719521 for ; Sun, 12 May 2013 20:18:10 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 2475C59B5; Sun, 12 May 2013 16:18:09 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 22524745; Sun, 12 May 2013 16:18:09 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E07785F9; Sun, 12 May 2013 16:18:00 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D2DEF1C0; Sun, 12 May 2013 16:18:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CGI0ox074682; Sun, 12 May 2013 16:18:00 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CGI0Dr074681; Sun, 12 May 2013 16:18:00 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201305121618.r4CGI0Dr074681@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 12 May 2013 16:18:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250570 - stable/9/lib/libc/sys X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 16:18:18.0418 (UTC) FILETIME=[50450920:01CE4F2C] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 04:48:49 -0000 Author: jilles Date: Sun May 12 16:18:00 2013 New Revision: 250570 URL: http://svnweb.freebsd.org/changeset/base/250570 Log: MFC r249979: intro(2): Fix some errors in ENFILE and EMFILE descriptions. Modified: stable/9/lib/libc/sys/intro.2 Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/sys/ (props changed) Modified: stable/9/lib/libc/sys/intro.2 ============================================================================== --- stable/9/lib/libc/sys/intro.2 Sun May 12 16:11:23 2013 (r250569) +++ stable/9/lib/libc/sys/intro.2 Sun May 12 16:18:00 2013 (r250570) @@ -28,7 +28,7 @@ .\" @(#)intro.2 8.5 (Berkeley) 2/27/95 .\" $FreeBSD$ .\" -.Dd February 27, 1995 +.Dd April 27, 2013 .Dt INTRO 2 .Os .Sh NAME @@ -189,12 +189,13 @@ or a .Xr kill 2 system call). .It Er 23 ENFILE Em "Too many open files in system" . -Maximum number of file descriptors allowable on the system -has been reached and a requests for an open cannot be satisfied +Maximum number of open files allowable on the system +has been reached and requests for an open cannot be satisfied until at least one has been closed. .It Er 24 EMFILE Em "Too many open files" . -(As released, the limit on the number of -open files per process is 64.) +Maximum number of file descriptors allowable in the process +has been reached and requests for an open cannot be satisfied +until at least one has been closed. The .Xr getdtablesize 2 system call will obtain the current limit. _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 04:48:50 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id AE16798D; Wed, 15 May 2013 04:48:50 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 33A167FA; Wed, 15 May 2013 04:48:50 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id E816771A510; Wed, 15 May 2013 08:48:47 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 08:44:19 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 23:44:54 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 23:44:53 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id C81FB71A9EB for ; Mon, 13 May 2013 23:44:53 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hEMMpOXMrlUx for ; Mon, 13 May 2013 23:44:46 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id F1CF371A9F6 for ; Mon, 13 May 2013 23:44:45 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 506FEBD2; Mon, 13 May 2013 19:44:44 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 2EA68996; Mon, 13 May 2013 19:44:42 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C9B4584E; Mon, 13 May 2013 19:44:35 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BB698686; Mon, 13 May 2013 19:44:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DJiZs3059417; Mon, 13 May 2013 19:44:35 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DJiZ4Q059416; Mon, 13 May 2013 19:44:35 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201305131944.r4DJiZ4Q059416@svn.freebsd.org> From: Jung-uk Kim Date: Mon, 13 May 2013 19:44:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250610 - stable/9/sys/dev/atkbdc X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 13 May 2013 19:44:53.0798 (UTC) FILETIME=[56E7AC60:01CE5012] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 04:48:50 -0000 Author: jkim Date: Mon May 13 19:44:35 2013 New Revision: 250610 URL: http://svnweb.freebsd.org/changeset/base/250610 Log: MFC: r248479 List TrackPoint device before generic model. Modified: stable/9/sys/dev/atkbdc/psm.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/atkbdc/psm.c ============================================================================== --- stable/9/sys/dev/atkbdc/psm.c Mon May 13 19:03:12 2013 (r250609) +++ stable/9/sys/dev/atkbdc/psm.c Mon May 13 19:44:35 2013 (r250610) @@ -747,8 +747,8 @@ model_name(int model) { MOUSE_MODEL_4D, "4D Mouse" }, { MOUSE_MODEL_4DPLUS, "4D+ Mouse" }, { MOUSE_MODEL_SYNAPTICS, "Synaptics Touchpad" }, - { MOUSE_MODEL_GENERIC, "Generic PS/2 mouse" }, { MOUSE_MODEL_TRACKPOINT, "IBM/Lenovo TrackPoint" }, + { MOUSE_MODEL_GENERIC, "Generic PS/2 mouse" }, { MOUSE_MODEL_UNKNOWN, "Unknown" }, }; int i; _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 04:48:51 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7C59B9B4; Wed, 15 May 2013 04:48:51 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 15CC480E; Wed, 15 May 2013 04:48:51 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 88EFD71A616; Wed, 15 May 2013 08:48:48 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 08:47:17 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 20:11:41 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 20:11:41 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 431CB7194FD for ; Sun, 12 May 2013 20:11:41 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 23qohb-c4jfZ for ; Sun, 12 May 2013 20:11:34 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 087927194BD for ; Sun, 12 May 2013 20:11:33 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 9ED4C54D0; Sun, 12 May 2013 16:11:31 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 409D02A4; Sun, 12 May 2013 16:11:31 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3EB9F15A; Sun, 12 May 2013 16:11:24 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1680717E; Sun, 12 May 2013 16:11:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CGBNI2072891; Sun, 12 May 2013 16:11:23 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CGBNAH072888; Sun, 12 May 2013 16:11:23 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201305121611.r4CGBNAH072888@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 12 May 2013 16:11:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250569 - in stable/9: lib/libc/gen sys/kern X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 16:11:41.0259 (UTC) FILETIME=[638B61B0:01CE4F2B] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 04:48:51 -0000 Author: jilles Date: Sun May 12 16:11:23 2013 New Revision: 250569 URL: http://svnweb.freebsd.org/changeset/base/250569 Log: MFC r249566,r249644: EINTR in POSIX sem_*. Document that sem_wait() can fail with [EINTR]. Programs often do not expect an [EINTR] return from sem_wait() and POSIX only allows it if the signal was installed without SA_RESTART. The timeout in sem_timedwait() is absolute so it can be restarted normally. The old POSIX semaphore implementation did this correctly, unlike the new umtx one. Specific to 9-stable: UMTX_ABSTIME does not exist and therefore sem_timedwait() is erroneously not restarted after a SA_RESTART signal handler. It may be desirable to avoid [EINTR] completely, which matches the pthread functions and is explicitly permitted by POSIX. However, the kernel must return [EINTR] at least for signals with SA_RESTART clear, otherwise pthread cancellation will not abort a semaphore wait. In this commit, only restore the 8.x behaviour which is also permitted by POSIX, as far as possible with the ABI in 9-stable. Modified: stable/9/lib/libc/gen/sem_wait.3 stable/9/sys/kern/kern_umtx.c Directory Properties: stable/9/lib/libc/ (props changed) stable/9/sys/ (props changed) Modified: stable/9/lib/libc/gen/sem_wait.3 ============================================================================== --- stable/9/lib/libc/gen/sem_wait.3 Sun May 12 16:07:23 2013 (r250568) +++ stable/9/lib/libc/gen/sem_wait.3 Sun May 12 16:11:23 2013 (r250569) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2000 +.Dd April 16, 2013 .Dt SEM_WAIT 3 .Os .Sh NAME @@ -75,6 +75,14 @@ points to an invalid semaphore. .El .Pp Additionally, +.Fn sem_wait +will fail if: +.Bl -tag -width Er +.Pp +.It Bq Er EINTR +A signal interrupted this function. +.El +Additionally, .Fn sem_trywait will fail if: .Bl -tag -width Er Modified: stable/9/sys/kern/kern_umtx.c ============================================================================== --- stable/9/sys/kern/kern_umtx.c Sun May 12 16:07:23 2013 (r250568) +++ stable/9/sys/kern/kern_umtx.c Sun May 12 16:11:23 2013 (r250569) @@ -2970,7 +2970,8 @@ do_sem_wait(struct thread *td, struct _u error = 0; else { umtxq_remove(uq); - if (error == ERESTART) + /* A relative timeout cannot be restarted. */ + if (error == ERESTART && timeout != NULL) error = EINTR; } umtxq_unlock(&uq->uq_key); _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 04:52:30 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B050AA19; Wed, 15 May 2013 04:52:30 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 49D21879; Wed, 15 May 2013 04:52:30 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 9024371A176; Wed, 15 May 2013 08:52:29 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 08:52:29 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 20:26:36 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 20:26:36 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 5A0CB71959E for ; Sun, 12 May 2013 20:26:36 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cB-Ek9927-y4 for ; Sun, 12 May 2013 20:26:28 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 87F887195C6 for ; Sun, 12 May 2013 20:26:28 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 463BB5FDD; Sun, 12 May 2013 16:26:27 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 43C16C8A; Sun, 12 May 2013 16:26:27 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 14B2EB3D; Sun, 12 May 2013 16:26:20 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 06EFC20D; Sun, 12 May 2013 16:26:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CGQJbZ077901; Sun, 12 May 2013 16:26:19 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CGQJmJ077900; Sun, 12 May 2013 16:26:19 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201305121626.r4CGQJmJ077900@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 12 May 2013 16:26:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250573 - stable/9/lib/libc/sys X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 16:26:36.0343 (UTC) FILETIME=[790E5C70:01CE4F2D] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 04:52:30 -0000 Author: jilles Date: Sun May 12 16:26:19 2013 New Revision: 250573 URL: http://svnweb.freebsd.org/changeset/base/250573 Log: dup(2): Remove incorrect sentence about getdtablesize(). There are no getdtablesize() bounds on the file descriptor to be duplicated; it only has to be open. If the RLIMIT_NOFILE rlimit was decreased after opening the file descriptor, it may be greater than or equal to getdtablesize() but still valid. Modified: stable/9/lib/libc/sys/dup.2 Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/sys/ (props changed) Modified: stable/9/lib/libc/sys/dup.2 ============================================================================== --- stable/9/lib/libc/sys/dup.2 Sun May 12 16:22:10 2013 (r250572) +++ stable/9/lib/libc/sys/dup.2 Sun May 12 16:26:19 2013 (r250573) @@ -28,7 +28,7 @@ .\" @(#)dup.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd August 14, 2011 +.Dd April 21, 2013 .Dt DUP 2 .Os .Sh NAME @@ -56,9 +56,6 @@ The argument .Fa oldd is a small non-negative integer index in the per-process descriptor table. -The value must be less -than the size of the table, which is returned by -.Xr getdtablesize 2 . The new descriptor returned by the call is the lowest numbered descriptor currently not in use by the process. _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:02:13 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 69D1AC2D; Wed, 15 May 2013 05:02:13 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id E1ED79D4; Wed, 15 May 2013 05:02:12 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 9E4B271A572; Wed, 15 May 2013 09:02:10 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:01:50 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:56:14 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:00:04 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id B213F71D5F1 for ; Sun, 12 May 2013 08:24:42 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a7J+KIr-hZrF for ; Sun, 12 May 2013 08:24:35 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id D474271D5F0 for ; Sun, 12 May 2013 08:24:34 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 569AA1AB4; Sun, 12 May 2013 04:24:32 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 54308306; Sun, 12 May 2013 04:24:32 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B95661BA; Sun, 12 May 2013 04:24:25 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AC81FA0B; Sun, 12 May 2013 04:24:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C4OPYB025251; Sun, 12 May 2013 04:24:25 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C4OPWH025250; Sun, 12 May 2013 04:24:25 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201305120424.r4C4OPWH025250@svn.freebsd.org> From: Konstantin Belousov Date: Sun, 12 May 2013 04:24:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250552 - stable/9/sys/amd64/amd64 X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 08:00:04.0215 (UTC) FILETIME=[B5EFA870:01CE4EE6] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:02:13 -0000 Author: kib Date: Sun May 12 04:24:25 2013 New Revision: 250552 URL: http://svnweb.freebsd.org/changeset/base/250552 Log: MFC r250415: Correct the type for the literal used on the left side of the shift up to 63 bit positions. Do not fill the save area and do not set the saved bit in the xstate bit vector for the state which is not marked as enabled in xsave_mask. Modified: stable/9/sys/amd64/amd64/fpu.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/amd64/amd64/fpu.c ============================================================================== --- stable/9/sys/amd64/amd64/fpu.c Sun May 12 04:05:01 2013 (r250551) +++ stable/9/sys/amd64/amd64/fpu.c Sun May 12 04:24:25 2013 (r250552) @@ -687,8 +687,8 @@ fpugetregs(struct thread *td) offsetof(struct xstate_hdr, xstate_bv)); max_ext_n = flsl(xsave_mask); for (i = 0; i < max_ext_n; i++) { - bit = 1 << i; - if ((*xstate_bv & bit) != 0) + bit = 1ULL << i; + if ((xsave_mask & bit) == 0 || (*xstate_bv & bit) != 0) continue; bcopy((char *)fpu_initialstate + xsave_area_desc[i].offset, _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:02:14 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 084B4C42; Wed, 15 May 2013 05:02:14 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 6819C9DF; Wed, 15 May 2013 05:02:13 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id A9DFC71A57A; Wed, 15 May 2013 09:02:10 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:02:00 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:56:14 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:00:05 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 0BF4471AD96 for ; Sun, 12 May 2013 01:24:19 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CytpIfJyDkGm for ; Sun, 12 May 2013 01:24:11 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 064F771AD2E for ; Sun, 12 May 2013 01:24:10 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 9959719CE; Sat, 11 May 2013 21:24:09 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 97609508; Sat, 11 May 2013 21:24:09 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B36F23B1; Sat, 11 May 2013 21:23:56 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A4EF1980; Sat, 11 May 2013 21:23:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4BLNu9t074744; Sat, 11 May 2013 21:23:56 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4BLNuQa074743; Sat, 11 May 2013 21:23:56 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201305112123.r4BLNuQa074743@svn.freebsd.org> From: Dimitry Andric Date: Sat, 11 May 2013 21:23:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250529 - stable/9/contrib/llvm/include/llvm/Support X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 08:00:05.0450 (UTC) FILETIME=[B6AC1AA0:01CE4EE6] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:02:14 -0000 Author: dim Date: Sat May 11 21:23:55 2013 New Revision: 250529 URL: http://svnweb.freebsd.org/changeset/base/250529 Log: Pull in r178240 from upstream llvm trunk: Section 24.2.2 of the C++ standard, [iterator.iterators], Table 106 requires that the return type of *r for all iterators r be reference, where reference is defined in [iterator.requirements.general]/p11 as iterator_traits::reference, and X is the type of r. But in CFG.h, the dereference operator of PredIterator and SuccIterator return pointer, not reference. Furthermore the nested type reference is value_type&, which is not the type returned from operator*(). This patch simply makes the iterator::reference type value_type*, which is what the operator*() returns, and then re-lables the return type as reference. From a functionality point of view, the only difference is that the nested reference type is now value_type* instead of value_type&. This enables building clang 3.2 with the newer version of libc++ that was merged in r250514 (and which has stricter iterator requirements for the vector member templates). This is a direct commit to stable/9, since head has a complete import of llvm/clang trunk, and there is no single commit to merge. Modified: stable/9/contrib/llvm/include/llvm/Support/CFG.h Modified: stable/9/contrib/llvm/include/llvm/Support/CFG.h ============================================================================== --- stable/9/contrib/llvm/include/llvm/Support/CFG.h Sat May 11 20:55:14 2013 (r250528) +++ stable/9/contrib/llvm/include/llvm/Support/CFG.h Sat May 11 21:23:55 2013 (r250529) @@ -27,8 +27,9 @@ namespace llvm { template // Predecessor Iterator class PredIterator : public std::iterator { - typedef std::iterator super; + Ptr, ptrdiff_t, Ptr*, Ptr*> { + typedef std::iterator super; typedef PredIterator Self; USE_iterator It; @@ -40,6 +41,7 @@ class PredIterator : public std::iterato public: typedef typename super::pointer pointer; + typedef typename super::reference reference; PredIterator() {} explicit inline PredIterator(Ptr *bb) : It(bb->use_begin()) { @@ -50,7 +52,7 @@ public: inline bool operator==(const Self& x) const { return It == x.It; } inline bool operator!=(const Self& x) const { return !operator==(x); } - inline pointer operator*() const { + inline reference operator*() const { assert(!It.atEnd() && "pred_iterator out of range!"); return cast(*It)->getParent(); } @@ -100,10 +102,11 @@ inline const_pred_iterator pred_end(cons template // Successor Iterator class SuccIterator : public std::iterator { + BB_, ptrdiff_t, BB_*, BB_*> { const Term_ Term; unsigned idx; - typedef std::iterator super; + typedef std::iterator super; typedef SuccIterator Self; inline bool index_is_valid(int idx) { @@ -112,6 +115,7 @@ class SuccIterator : public std::iterato public: typedef typename super::pointer pointer; + typedef typename super::reference reference; // TODO: This can be random access iterator, only operator[] missing. explicit inline SuccIterator(Term_ T) : Term(T), idx(0) {// begin iterator @@ -142,7 +146,7 @@ public: inline bool operator==(const Self& x) const { return idx == x.idx; } inline bool operator!=(const Self& x) const { return !operator==(x); } - inline pointer operator*() const { return Term->getSuccessor(idx); } + inline reference operator*() const { return Term->getSuccessor(idx); } inline pointer operator->() const { return operator*(); } inline Self& operator++() { ++idx; return *this; } // Preincrement _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:03:27 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 182A45CF; Wed, 15 May 2013 05:03:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 90766A3E; Wed, 15 May 2013 05:03:26 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 2FA2D71A5D7; Wed, 15 May 2013 09:03:25 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:03:00 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 16:09:35 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 16:09:34 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id E0D7C7195BB for ; Sun, 12 May 2013 16:09:34 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FQO75SuUiAQW for ; Sun, 12 May 2013 16:09:27 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 1097D7195BD for ; Sun, 12 May 2013 16:09:27 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id C6A4B53E4; Sun, 12 May 2013 12:09:25 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id C4348365; Sun, 12 May 2013 12:09:25 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2254C204; Sun, 12 May 2013 12:09:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1340C8F4; Sun, 12 May 2013 12:09:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CC98js086040; Sun, 12 May 2013 12:09:08 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CC98VT086039; Sun, 12 May 2013 12:09:08 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201305121209.r4CC98VT086039@svn.freebsd.org> From: Hans Petter Selasky Date: Sun, 12 May 2013 12:09:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250559 - stable/9/sys/dev/usb/controller X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 12:09:34.0702 (UTC) FILETIME=[910AB0E0:01CE4F09] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:03:27 -0000 Author: hselasky Date: Sun May 12 12:09:08 2013 New Revision: 250559 URL: http://svnweb.freebsd.org/changeset/base/250559 Log: MFC r249725: Add new OHCI controller ID. Modified: stable/9/sys/dev/usb/controller/ohci_pci.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/controller/ohci_pci.c ============================================================================== --- stable/9/sys/dev/usb/controller/ohci_pci.c Sun May 12 09:42:17 2013 (r250558) +++ stable/9/sys/dev/usb/controller/ohci_pci.c Sun May 12 12:09:08 2013 (r250559) @@ -134,6 +134,8 @@ ohci_pci_match(device_t self) return "ATI SB400 USB Controller"; case 0x43971002: return ("AMD SB7x0/SB8x0/SB9x0 USB controller"); + case 0x43981002: + return ("AMD SB7x0/SB8x0/SB9x0 USB controller"); case 0x43991002: return ("AMD SB7x0/SB8x0/SB9x0 USB controller"); _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:03:27 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 483D65D4; Wed, 15 May 2013 05:03:27 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id D27ABA41; Wed, 15 May 2013 05:03:26 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 3F3A371A5D8; Wed, 15 May 2013 09:03:25 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:03:18 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:56:19 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:02:30 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id B190271CD2C for ; Sun, 12 May 2013 05:38:27 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wHNVE+kgrSf3 for ; Sun, 12 May 2013 05:38:20 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 8DECA71CD1E for ; Sun, 12 May 2013 05:38:19 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id D42146CD4; Sun, 12 May 2013 01:38:18 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id D1812A33; Sun, 12 May 2013 01:38:18 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8C9AF878; Sun, 12 May 2013 01:38:02 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 69B67303; Sun, 12 May 2013 01:38:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1c2LL065220; Sun, 12 May 2013 01:38:02 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1c2sb065218; Sun, 12 May 2013 01:38:02 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305120138.r4C1c2sb065218@svn.freebsd.org> From: Eitan Adler Date: Sun, 12 May 2013 01:38:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250542 - stable/8/share/examples/BSD_daemon X-SVN-Group: stable-8 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 08:02:30.0388 (UTC) FILETIME=[0D0FE340:01CE4EE7] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:03:27 -0000 Author: eadler Date: Sun May 12 01:38:01 2013 New Revision: 250542 URL: http://svnweb.freebsd.org/changeset/base/250542 Log: MFC r250012: Add an alternate version of beastie to the examples directory. PR: docs/38556 Added: stable/8/share/examples/BSD_daemon/beastie2.eps - copied unchanged from r250012, head/share/examples/BSD_daemon/beastie2.eps Modified: stable/8/share/examples/BSD_daemon/README Directory Properties: stable/8/share/ (props changed) stable/8/share/examples/ (props changed) Modified: stable/8/share/examples/BSD_daemon/README ============================================================================== --- stable/8/share/examples/BSD_daemon/README Sun May 12 01:37:55 2013 (r250541) +++ stable/8/share/examples/BSD_daemon/README Sun May 12 01:38:01 2013 (r250542) @@ -35,6 +35,10 @@ beastie.eps Before committing this, clean out the comment brought over from the .fig file to avoid Dollar-FreeBSD-Dollar junk +beastie2.eps + Written by Rahul Siddharthan beaste2.eps is a + smaller, simpler version of the beastie eps graphic. + eps.patch Add some comments about tweakables in the .eps file and set the linecaps to round to improve visual appearance. Copied: stable/8/share/examples/BSD_daemon/beastie2.eps (from r250012, head/share/examples/BSD_daemon/beastie2.eps) ============================================================================== Binary file (source and/or target). No diff available. _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:03:27 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 858605DC; Wed, 15 May 2013 05:03:27 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 234AEA45; Wed, 15 May 2013 05:03:27 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 37FFB71A5AD; Wed, 15 May 2013 09:03:25 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:03:08 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:56:19 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:02:29 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id B8AF571CD28 for ; Sun, 12 May 2013 05:38:19 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6mXosYBESdTL for ; Sun, 12 May 2013 05:38:11 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 5C9E071CD20 for ; Sun, 12 May 2013 05:38:11 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 55C636C82; Sun, 12 May 2013 01:38:10 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 537129D4; Sun, 12 May 2013 01:38:10 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6C73B772; Sun, 12 May 2013 01:37:56 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5E96B301; Sun, 12 May 2013 01:37:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1buCG065132; Sun, 12 May 2013 01:37:56 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1buw4065131; Sun, 12 May 2013 01:37:56 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305120137.r4C1buw4065131@svn.freebsd.org> From: Eitan Adler Date: Sun, 12 May 2013 01:37:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250541 - stable/9/share/examples/BSD_daemon X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 08:02:29.0232 (UTC) FILETIME=[0C5F7F00:01CE4EE7] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:03:27 -0000 Author: eadler Date: Sun May 12 01:37:55 2013 New Revision: 250541 URL: http://svnweb.freebsd.org/changeset/base/250541 Log: MFC r250012: Add an alternate version of beastie to the examples directory. PR: docs/38556 Added: stable/9/share/examples/BSD_daemon/beastie2.eps - copied unchanged from r250012, head/share/examples/BSD_daemon/beastie2.eps Modified: stable/9/share/examples/BSD_daemon/README Directory Properties: stable/9/share/ (props changed) stable/9/share/examples/ (props changed) Modified: stable/9/share/examples/BSD_daemon/README ============================================================================== --- stable/9/share/examples/BSD_daemon/README Sun May 12 01:29:18 2013 (r250540) +++ stable/9/share/examples/BSD_daemon/README Sun May 12 01:37:55 2013 (r250541) @@ -35,6 +35,10 @@ beastie.eps Before committing this, clean out the comment brought over from the .fig file to avoid Dollar-FreeBSD-Dollar junk +beastie2.eps + Written by Rahul Siddharthan beaste2.eps is a + smaller, simpler version of the beastie eps graphic. + eps.patch Add some comments about tweakables in the .eps file and set the linecaps to round to improve visual appearance. Copied: stable/9/share/examples/BSD_daemon/beastie2.eps (from r250012, head/share/examples/BSD_daemon/beastie2.eps) ============================================================================== Binary file (source and/or target). No diff available. _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:04:42 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 64504F17; Wed, 15 May 2013 05:04:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 1DF4CA6D; Wed, 15 May 2013 05:04:41 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 2CD7371A553; Wed, 15 May 2013 09:04:39 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:04:29 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 16:31:08 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 16:31:07 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 07D9F71968D for ; Sun, 12 May 2013 16:31:08 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UYFD9lmMWBWp for ; Sun, 12 May 2013 16:30:59 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 32A877196A4 for ; Sun, 12 May 2013 16:30:59 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id A0C1A1AFB; Sun, 12 May 2013 12:30:57 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 5D218EF9; Sun, 12 May 2013 12:30:57 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 71D3CDA3; Sun, 12 May 2013 12:30:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 625609A0; Sun, 12 May 2013 12:30:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CCUgaO095205; Sun, 12 May 2013 12:30:42 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CCUg6O095204; Sun, 12 May 2013 12:30:42 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201305121230.r4CCUg6O095204@svn.freebsd.org> From: Hans Petter Selasky Date: Sun, 12 May 2013 12:30:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250563 - stable/8/sys/dev/sound/usb X-SVN-Group: stable-8 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 12:31:07.0788 (UTC) FILETIME=[93C7F4C0:01CE4F0C] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:04:42 -0000 Author: hselasky Date: Sun May 12 12:30:42 2013 New Revision: 250563 URL: http://svnweb.freebsd.org/changeset/base/250563 Log: MFC r249796, r249830, r249844 and r249845: USB audio fixes and improvements. - Fix runtime switching of sample rate - Fix feedback endpoint algorithm Modified: stable/8/sys/dev/sound/usb/uaudio.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/sound/ (props changed) stable/8/sys/dev/sound/usb/ (props changed) Modified: stable/8/sys/dev/sound/usb/uaudio.c ============================================================================== --- stable/8/sys/dev/sound/usb/uaudio.c Sun May 12 12:24:29 2013 (r250562) +++ stable/8/sys/dev/sound/usb/uaudio.c Sun May 12 12:30:42 2013 (r250563) @@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define USB_DEBUG_VAR uaudio_debug #include @@ -176,19 +177,34 @@ struct uaudio_mixer_node { struct uaudio_mixer_node *next; }; +struct uaudio_configure_msg { + struct usb_proc_msg hdr; + struct uaudio_softc *sc; +}; + +#define CHAN_MAX_ALT 20 + +struct uaudio_chan_alt { + union uaudio_asf1d p_asf1d; + union uaudio_sed p_sed; + const usb_endpoint_descriptor_audio_t *p_ed1; + const struct uaudio_format *p_fmt; + const struct usb_config *usb_cfg; + uint32_t sample_rate; /* in Hz */ + uint16_t sample_size; + uint8_t iface_index; + uint8_t iface_alt_index; + uint8_t channels; +}; + struct uaudio_chan { struct pcmchan_caps pcm_cap; /* capabilities */ - + struct uaudio_chan_alt usb_alt[CHAN_MAX_ALT]; struct snd_dbuf *pcm_buf; - const struct usb_config *usb_cfg; struct mtx *pcm_mtx; /* lock protecting this structure */ struct uaudio_softc *priv_sc; struct pcm_channel *pcm_ch; struct usb_xfer *xfer[UAUDIO_NCHANBUFS + 1]; - union uaudio_asf1d p_asf1d; - union uaudio_sed p_sed; - const usb_endpoint_descriptor_audio_t *p_ed1; - const struct uaudio_format *p_fmt; uint8_t *buf; /* pointer to buffer */ uint8_t *start; /* upper layer buffer start */ @@ -196,24 +212,24 @@ struct uaudio_chan { uint8_t *cur; /* current position in upper layer * buffer */ - uint32_t intr_size; /* in bytes */ uint32_t intr_frames; /* in units */ - uint32_t sample_rate; uint32_t frames_per_second; uint32_t sample_rem; uint32_t sample_curr; + uint32_t max_buf; - uint32_t format; uint32_t pcm_format[2]; uint16_t bytes_per_frame[2]; - uint16_t sample_size; - - uint8_t valid; - uint8_t iface_index; - uint8_t iface_alt_index; - uint8_t channels; + uint8_t num_alt; + uint8_t cur_alt; + uint8_t set_alt; + uint8_t operation; +#define CHAN_OP_NONE 0 +#define CHAN_OP_START 1 +#define CHAN_OP_STOP 2 +#define CHAN_OP_DRAIN 3 uint8_t last_sync_time; uint8_t last_sync_state; @@ -309,6 +325,7 @@ struct uaudio_softc { struct uaudio_hid sc_hid; struct uaudio_search_result sc_mixer_clocks; struct uaudio_mixer_node sc_mixer_node; + struct uaudio_configure_msg sc_config_msg[2]; struct mtx *sc_mixer_lock; struct snd_mixer *sc_mixer_dev; @@ -434,6 +451,8 @@ static usb_callback_t umidi_bulk_read_ca static usb_callback_t umidi_bulk_write_callback; static usb_callback_t uaudio_hid_rx_callback; +static usb_proc_callback_t uaudio_configure_msg; + /* ==== USB mixer ==== */ static int uaudio_mixer_sysctl_handler(SYSCTL_HANDLER_ARGS); @@ -856,6 +875,10 @@ uaudio_attach(device_t dev) sc->sc_udev = uaa->device; sc->sc_mixer_iface_index = uaa->info.bIfaceIndex; sc->sc_mixer_iface_no = uaa->info.bIfaceNum; + sc->sc_config_msg[0].hdr.pm_callback = &uaudio_configure_msg; + sc->sc_config_msg[0].sc = sc; + sc->sc_config_msg[1].hdr.pm_callback = &uaudio_configure_msg; + sc->sc_config_msg[1].sc = sc; if (usb_test_quirk(uaa, UQ_AUDIO_SWAP_LR)) sc->sc_uq_audio_swap_lr = 1; @@ -900,22 +923,28 @@ uaudio_attach(device_t dev) DPRINTF("%d mixer controls\n", sc->sc_mixer_count); - if (sc->sc_play_chan.valid) { - device_printf(dev, "Play: %d Hz, %d ch, %s format, " - "2x8ms buffer.\n", - sc->sc_play_chan.sample_rate, - sc->sc_play_chan.channels, - sc->sc_play_chan.p_fmt->description); + if (sc->sc_play_chan.num_alt > 0) { + uint8_t x; + for (x = 0; x != sc->sc_play_chan.num_alt; x++) { + device_printf(dev, "Play: %d Hz, %d ch, %s format, " + "2x8ms buffer.\n", + sc->sc_play_chan.usb_alt[x].sample_rate, + sc->sc_play_chan.usb_alt[x].channels, + sc->sc_play_chan.usb_alt[x].p_fmt->description); + } } else { device_printf(dev, "No playback.\n"); } - if (sc->sc_rec_chan.valid) { - device_printf(dev, "Record: %d Hz, %d ch, %s format, " - "2x8ms buffer.\n", - sc->sc_rec_chan.sample_rate, - sc->sc_rec_chan.channels, - sc->sc_rec_chan.p_fmt->description); + if (sc->sc_rec_chan.num_alt > 0) { + uint8_t x; + for (x = 0; x != sc->sc_rec_chan.num_alt; x++) { + device_printf(dev, "Record: %d Hz, %d ch, %s format, " + "2x8ms buffer.\n", + sc->sc_rec_chan.usb_alt[x].sample_rate, + sc->sc_rec_chan.usb_alt[x].channels, + sc->sc_rec_chan.usb_alt[x].p_fmt->description); + } } else { device_printf(dev, "No recording.\n"); } @@ -950,8 +979,8 @@ uaudio_attach(device_t dev) * Only attach a PCM device if we have a playback, recording * or mixer device present: */ - if (sc->sc_play_chan.valid || - sc->sc_rec_chan.valid || + if (sc->sc_play_chan.num_alt > 0 || + sc->sc_rec_chan.num_alt > 0 || sc->sc_mix_info) { child = device_add_child(dev, "pcm", -1); @@ -1020,18 +1049,18 @@ uaudio_attach_sub(device_t dev, kobj_cla snprintf(status, sizeof(status), "at ? %s", PCM_KLDSTRING(snd_uaudio)); if (pcm_register(dev, sc, - sc->sc_play_chan.valid ? 1 : 0, - sc->sc_rec_chan.valid ? 1 : 0)) { + (sc->sc_play_chan.num_alt > 0) ? 1 : 0, + (sc->sc_rec_chan.num_alt > 0) ? 1 : 0)) { goto detach; } uaudio_pcm_setflags(dev, SD_F_MPSAFE); sc->sc_pcm_registered = 1; - if (sc->sc_play_chan.valid) { + if (sc->sc_play_chan.num_alt > 0) { pcm_addchan(dev, PCMDIR_PLAY, chan_class, sc); } - if (sc->sc_rec_chan.valid) { + if (sc->sc_rec_chan.num_alt > 0) { pcm_addchan(dev, PCMDIR_REC, chan_class, sc); } pcm_setstatus(dev, status); @@ -1078,10 +1107,15 @@ uaudio_detach(device_t dev) * will time out and close opened /dev/dspX.Y device(s), if * any. */ - if (sc->sc_play_chan.valid) - usbd_transfer_unsetup(sc->sc_play_chan.xfer, UAUDIO_NCHANBUFS + 1); - if (sc->sc_rec_chan.valid) - usbd_transfer_unsetup(sc->sc_rec_chan.xfer, UAUDIO_NCHANBUFS + 1); + usb_proc_explore_lock(sc->sc_udev); + sc->sc_play_chan.operation = CHAN_OP_DRAIN; + sc->sc_rec_chan.operation = CHAN_OP_DRAIN; + usb_proc_explore_mwait(sc->sc_udev, + &sc->sc_config_msg[0], &sc->sc_config_msg[1]); + usb_proc_explore_unlock(sc->sc_udev); + + usbd_transfer_unsetup(sc->sc_play_chan.xfer, UAUDIO_NCHANBUFS + 1); + usbd_transfer_unsetup(sc->sc_rec_chan.xfer, UAUDIO_NCHANBUFS + 1); uaudio_hid_detach(sc); @@ -1100,6 +1134,201 @@ uaudio_detach(device_t dev) return (0); } +static uint32_t +uaudio_get_buffer_size(struct uaudio_chan *ch, uint8_t alt) +{ + struct uaudio_chan_alt *chan_alt = &ch->usb_alt[alt]; + /* We use 2 times 8ms of buffer */ + uint32_t buf_size = (((chan_alt->sample_rate * (UAUDIO_NFRAMES / 8)) + + 1000 - 1) / 1000) * chan_alt->sample_size; + return (buf_size); +} + +static void +uaudio_configure_msg_sub(struct uaudio_softc *sc, + struct uaudio_chan *chan, int dir) +{ + struct uaudio_chan_alt *chan_alt; + uint32_t frames; + uint32_t buf_size; + uint16_t fps; + uint8_t set_alt; + uint8_t fps_shift; + uint8_t operation; + usb_error_t err; + + if (chan->num_alt <= 0) + return; + + DPRINTF("\n"); + + usb_proc_explore_lock(sc->sc_udev); + operation = chan->operation; + chan->operation = CHAN_OP_NONE; + usb_proc_explore_unlock(sc->sc_udev); + + mtx_lock(chan->pcm_mtx); + if (chan->cur_alt != chan->set_alt) + set_alt = chan->set_alt; + else + set_alt = CHAN_MAX_ALT; + mtx_unlock(chan->pcm_mtx); + + if (set_alt >= chan->num_alt) + goto done; + + chan_alt = chan->usb_alt + set_alt; + + usbd_transfer_unsetup(chan->xfer, UAUDIO_NCHANBUFS + 1); + + err = usbd_set_alt_interface_index(sc->sc_udev, + chan_alt->iface_index, chan_alt->iface_alt_index); + if (err) { + DPRINTF("setting of alternate index failed: %s!\n", + usbd_errstr(err)); + goto error; + } + + /* + * Only set the sample rate if the channel reports that it + * supports the frequency control. + */ + + if (sc->sc_audio_rev >= UAUDIO_VERSION_30) { + /* FALLTHROUGH */ + } else if (sc->sc_audio_rev >= UAUDIO_VERSION_20) { + unsigned int x; + + for (x = 0; x != 256; x++) { + if (dir == PCMDIR_PLAY) { + if (!(sc->sc_mixer_clocks.bit_output[x / 8] & + (1 << (x % 8)))) { + continue; + } + } else { + if (!(sc->sc_mixer_clocks.bit_input[x / 8] & + (1 << (x % 8)))) { + continue; + } + } + + if (uaudio20_set_speed(sc->sc_udev, + sc->sc_mixer_iface_no, x, chan_alt->sample_rate)) { + /* + * If the endpoint is adaptive setting + * the speed may fail. + */ + DPRINTF("setting of sample rate failed! " + "(continuing anyway)\n"); + } + } + } else if (chan_alt->p_sed.v1->bmAttributes & UA_SED_FREQ_CONTROL) { + if (uaudio_set_speed(sc->sc_udev, + chan_alt->p_ed1->bEndpointAddress, chan_alt->sample_rate)) { + /* + * If the endpoint is adaptive setting the + * speed may fail. + */ + DPRINTF("setting of sample rate failed! " + "(continuing anyway)\n"); + } + } + if (usbd_transfer_setup(sc->sc_udev, &chan_alt->iface_index, chan->xfer, + chan_alt->usb_cfg, UAUDIO_NCHANBUFS + 1, chan, chan->pcm_mtx)) { + DPRINTF("could not allocate USB transfers!\n"); + goto error; + } + + fps = usbd_get_isoc_fps(sc->sc_udev); + + if (fps < 8000) { + /* FULL speed USB */ + frames = 8; + } else { + /* HIGH speed USB */ + frames = UAUDIO_NFRAMES; + } + + fps_shift = usbd_xfer_get_fps_shift(chan->xfer[0]); + + /* down shift number of frames per second, if any */ + fps >>= fps_shift; + frames >>= fps_shift; + + /* bytes per frame should not be zero */ + chan->bytes_per_frame[0] = + ((chan_alt->sample_rate / fps) * chan_alt->sample_size); + chan->bytes_per_frame[1] = + (((chan_alt->sample_rate + fps - 1) / fps) * chan_alt->sample_size); + + /* setup data rate dithering, if any */ + chan->frames_per_second = fps; + chan->sample_rem = chan_alt->sample_rate % fps; + chan->sample_curr = 0; + chan->frames_per_second = fps; + + /* compute required buffer size */ + buf_size = (chan->bytes_per_frame[1] * frames); + + if (buf_size > (chan->end - chan->start)) { + DPRINTF("buffer size is too big\n"); + goto error; + } + + chan->intr_frames = frames; + + DPRINTF("fps=%d sample_rem=%d\n", (int)fps, (int)chan->sample_rem); + + if (chan->intr_frames == 0) { + DPRINTF("frame shift is too high!\n"); + goto error; + } + + mtx_lock(chan->pcm_mtx); + chan->cur_alt = set_alt; + mtx_unlock(chan->pcm_mtx); + +done: +#if (UAUDIO_NCHANBUFS != 2) +#error "please update code" +#endif + switch (operation) { + case CHAN_OP_START: + mtx_lock(chan->pcm_mtx); + usbd_transfer_start(chan->xfer[0]); + usbd_transfer_start(chan->xfer[1]); + mtx_unlock(chan->pcm_mtx); + break; + case CHAN_OP_STOP: + mtx_lock(chan->pcm_mtx); + usbd_transfer_stop(chan->xfer[0]); + usbd_transfer_stop(chan->xfer[1]); + mtx_unlock(chan->pcm_mtx); + break; + default: + break; + } + return; + +error: + usbd_transfer_unsetup(chan->xfer, UAUDIO_NCHANBUFS + 1); + + mtx_lock(chan->pcm_mtx); + chan->cur_alt = CHAN_MAX_ALT; + mtx_unlock(chan->pcm_mtx); +} + +static void +uaudio_configure_msg(struct usb_proc_msg *pm) +{ + struct uaudio_softc *sc = ((struct uaudio_configure_msg *)pm)->sc; + + usb_proc_explore_unlock(sc->sc_udev); + uaudio_configure_msg_sub(sc, &sc->sc_play_chan, PCMDIR_PLAY); + uaudio_configure_msg_sub(sc, &sc->sc_rec_chan, PCMDIR_REC); + usb_proc_explore_lock(sc->sc_udev); +} + /*========================================================================* * AS - Audio Stream - routines *========================================================================*/ @@ -1237,6 +1466,8 @@ uaudio_chan_fill_info_sub(struct uaudio_ struct usb_interface_descriptor *id; const struct uaudio_format *p_fmt = NULL; struct uaudio_chan *chan; + struct uaudio_chan_alt *chan_alt; + uint32_t format; uint16_t curidx = 0xFFFF; uint16_t lastidx = 0xFFFF; uint16_t alt_index = 0; @@ -1414,6 +1645,10 @@ uaudio_chan_fill_info_sub(struct uaudio_ bBitResolution = asf1d.v2->bBitResolution; bSubslotSize = asf1d.v2->bSubslotSize; + /* Map 4-byte aligned 24-bit samples into 32-bit */ + if (bBitResolution == 24 && bSubslotSize == 4) + bBitResolution = 32; + if (bBitResolution != (bSubslotSize * 8)) { DPRINTF("Invalid bSubslotSize\n"); goto next_ep; @@ -1508,14 +1743,19 @@ uaudio_chan_fill_info_sub(struct uaudio_ chan = (ep_dir == UE_DIR_IN) ? &sc->sc_rec_chan : &sc->sc_play_chan; - if (chan->valid != 0 || - usbd_get_iface(udev, curidx) == NULL) { - DPRINTF("Channel already exists or " - "interface is not valid\n"); + if (usbd_get_iface(udev, curidx) == NULL) { + DPRINTF("Interface is not valid\n"); goto next_ep; } + if (chan->num_alt == CHAN_MAX_ALT) { + DPRINTF("Too many alternate settings\n"); + goto next_ep; + } + chan->set_alt = 0; + chan->cur_alt = CHAN_MAX_ALT; + + chan_alt = &chan->usb_alt[chan->num_alt++]; - chan->valid = 1; #ifdef USB_DEBUG uaudio_chan_dump_ep_desc(ed1); #endif @@ -1523,30 +1763,81 @@ uaudio_chan_fill_info_sub(struct uaudio_ "bits = %d, format = %s\n", rate, channels, bit_resolution, p_fmt->description); - chan->sample_rate = rate; - chan->p_asf1d = asf1d; - chan->p_ed1 = ed1; - chan->p_fmt = p_fmt; - chan->p_sed = sed; - chan->iface_index = curidx; - chan->iface_alt_index = alt_index; + chan_alt->sample_rate = rate; + chan_alt->p_asf1d = asf1d; + chan_alt->p_ed1 = ed1; + chan_alt->p_fmt = p_fmt; + chan_alt->p_sed = sed; + chan_alt->iface_index = curidx; + chan_alt->iface_alt_index = alt_index; + + usbd_set_parent_iface(sc->sc_udev, curidx, + sc->sc_mixer_iface_index); if (ep_dir == UE_DIR_IN) - chan->usb_cfg = uaudio_cfg_record; + chan_alt->usb_cfg = uaudio_cfg_record; else - chan->usb_cfg = uaudio_cfg_play; + chan_alt->usb_cfg = uaudio_cfg_play; - chan->sample_size = (UAUDIO_MAX_CHAN(channels) * + chan_alt->sample_size = (UAUDIO_MAX_CHAN(channels) * p_fmt->bPrecision) / 8; - chan->channels = channels; + chan_alt->channels = channels; if (ep_dir == UE_DIR_IN && usbd_get_speed(udev) == USB_SPEED_FULL) { uaudio_record_fix_fs(ed1, - chan->sample_size * (rate / 1000), - chan->sample_size * (rate / 4000)); + chan_alt->sample_size * (rate / 1000), + chan_alt->sample_size * (rate / 4000)); } + /* setup play/record format */ + + format = chan_alt->p_fmt->freebsd_fmt; + + switch (chan_alt->channels) { + case 2: + /* stereo */ + format = SND_FORMAT(format, 2, 0); + break; + case 1: + /* mono */ + format = SND_FORMAT(format, 1, 0); + break; + default: + /* surround and more */ + format = feeder_matrix_default_format( + SND_FORMAT(format, chan_alt->channels, 0)); + break; + } + + /* check if format is not supported */ + if (format == 0) { + DPRINTF("The selected audio format is not supported\n"); + chan->num_alt--; + goto next_ep; + } + if (chan->num_alt > 1) { + /* we only accumulate one format at different sample rates */ + if (chan->pcm_format[0] != format) { + DPRINTF("Multiple formats is not supported\n"); + chan->num_alt--; + goto next_ep; + } + /* ignore if duplicate sample rate entry */ + if (rate == chan->usb_alt[chan->num_alt - 2].sample_rate) { + DPRINTF("Duplicate sample rate detected\n"); + chan->num_alt--; + goto next_ep; + } + } + chan->pcm_cap.fmtlist = chan->pcm_format; + chan->pcm_cap.fmtlist[0] = format; + + if (rate < chan->pcm_cap.minspeed || chan->pcm_cap.minspeed == 0) + chan->pcm_cap.minspeed = rate; + if (rate > chan->pcm_cap.maxspeed || chan->pcm_cap.maxspeed == 0) + chan->pcm_cap.maxspeed = rate; + if (sc->sc_sndstat_valid != 0) { sbuf_printf(&sc->sc_sndstat, "\n\t" "mode %d.%d:(%s) %dch, %dbit, %s, %dHz", @@ -1564,8 +1855,9 @@ uaudio_chan_fill_info_sub(struct uaudio_ /* This structure defines all the supported rates. */ -static const uint32_t uaudio_rate_list[] = { +static const uint32_t uaudio_rate_list[CHAN_MAX_ALT] = { 96000, + 88200, 88000, 80000, 72000, @@ -1630,21 +1922,12 @@ uaudio_chan_fill_info(struct uaudio_soft uaudio_chan_fill_info_sub(sc, udev, rate, x, y); /* try find a matching rate, if any */ - for (z = 0; uaudio_rate_list[z]; z++) { + for (z = 0; uaudio_rate_list[z]; z++) uaudio_chan_fill_info_sub(sc, udev, uaudio_rate_list[z], x, y); - - if (sc->sc_rec_chan.valid && - sc->sc_play_chan.valid) { - goto done; - } - } } } - -done: - if (sc->sc_sndstat_valid) { + if (sc->sc_sndstat_valid) sbuf_finish(&sc->sc_sndstat); - } } static void @@ -1652,6 +1935,7 @@ uaudio_chan_play_sync_callback(struct us { struct uaudio_chan *ch = usbd_xfer_softc(xfer); struct usb_page_cache *pc; + uint64_t sample_rate = ch->usb_alt[ch->cur_alt].sample_rate; uint8_t buf[4]; uint64_t temp; int len; @@ -1698,24 +1982,20 @@ uaudio_chan_play_sync_callback(struct us /* auto adjust */ - while (temp < (ch->sample_rate - (ch->sample_rate / 4))) + while (temp < (sample_rate - (sample_rate / 4))) temp *= 2; - while (temp > (ch->sample_rate + (ch->sample_rate / 2))) + while (temp > (sample_rate + (sample_rate / 2))) temp /= 2; - /* bias */ - - temp += (ch->sample_rate + 1999) / 2000; - /* compare */ DPRINTF("Comparing %d < %d\n", - (int)temp, (int)ch->sample_rate); + (int)temp, (int)sample_rate); - if (temp == ch->sample_rate) + if (temp == sample_rate) ch->last_sync_state = UAUDIO_SYNC_NONE; - else if (temp > ch->sample_rate) + else if (temp > sample_rate) ch->last_sync_state = UAUDIO_SYNC_MORE; else ch->last_sync_state = UAUDIO_SYNC_LESS; @@ -1737,6 +2017,7 @@ uaudio_chan_play_callback(struct usb_xfe { struct uaudio_chan *ch = usbd_xfer_softc(xfer); struct usb_page_cache *pc; + uint32_t sample_size = ch->usb_alt[ch->cur_alt].sample_size; uint32_t mfl; uint32_t total; uint32_t blockcount; @@ -1800,14 +2081,14 @@ tr_transferred: switch (ch->last_sync_state) { case UAUDIO_SYNC_MORE: DPRINTFN(6, "sending one sample more\n"); - if ((frame_len + ch->sample_size) <= mfl) - frame_len += ch->sample_size; + if ((frame_len + sample_size) <= mfl) + frame_len += sample_size; ch->last_sync_state = UAUDIO_SYNC_NONE; break; case UAUDIO_SYNC_LESS: DPRINTFN(6, "sending one sample less\n"); - if (frame_len >= ch->sample_size) - frame_len -= ch->sample_size; + if (frame_len >= sample_size) + frame_len -= sample_size; ch->last_sync_state = UAUDIO_SYNC_NONE; break; default: @@ -1944,187 +2225,43 @@ uaudio_chan_init(struct uaudio_softc *sc struct uaudio_chan *ch = ((dir == PCMDIR_PLAY) ? &sc->sc_play_chan : &sc->sc_rec_chan); uint32_t buf_size; - uint32_t frames; - uint32_t format; - uint16_t fps; - uint8_t endpoint; - uint8_t blocks; - uint8_t iface_index; - uint8_t alt_index; - uint8_t fps_shift; - usb_error_t err; - - fps = usbd_get_isoc_fps(sc->sc_udev); - - if (fps < 8000) { - /* FULL speed USB */ - frames = 8; - } else { - /* HIGH speed USB */ - frames = UAUDIO_NFRAMES; - } - - /* setup play/record format */ - - ch->pcm_cap.fmtlist = ch->pcm_format; - - ch->pcm_format[0] = 0; - ch->pcm_format[1] = 0; - - ch->pcm_cap.minspeed = ch->sample_rate; - ch->pcm_cap.maxspeed = ch->sample_rate; + uint8_t x; - /* setup mutex and PCM channel */ + /* store mutex and PCM channel */ ch->pcm_ch = c; ch->pcm_mtx = c->lock; - format = ch->p_fmt->freebsd_fmt; - - switch (ch->channels) { - case 2: - /* stereo */ - format = SND_FORMAT(format, 2, 0); - break; - case 1: - /* mono */ - format = SND_FORMAT(format, 1, 0); - break; - default: - /* surround and more */ - format = feeder_matrix_default_format( - SND_FORMAT(format, ch->channels, 0)); - break; - } - - ch->pcm_cap.fmtlist[0] = format; - ch->pcm_cap.fmtlist[1] = 0; - - /* check if format is not supported */ - - if (format == 0) { - DPRINTF("The selected audio format is not supported\n"); - goto error; - } - - /* set alternate interface corresponding to the mode */ - - endpoint = ch->p_ed1->bEndpointAddress; - iface_index = ch->iface_index; - alt_index = ch->iface_alt_index; - - DPRINTF("endpoint=0x%02x, speed=%d, iface=%d alt=%d\n", - endpoint, ch->sample_rate, iface_index, alt_index); + /* compute worst case buffer */ - err = usbd_set_alt_interface_index(sc->sc_udev, iface_index, alt_index); - if (err) { - DPRINTF("setting of alternate index failed: %s!\n", - usbd_errstr(err)); - goto error; + buf_size = 0; + for (x = 0; x != ch->num_alt; x++) { + uint32_t temp = uaudio_get_buffer_size(ch, x); + if (temp > buf_size) + buf_size = temp; } - usbd_set_parent_iface(sc->sc_udev, iface_index, - sc->sc_mixer_iface_index); - - /* - * Only set the sample rate if the channel reports that it - * supports the frequency control. - */ - if (sc->sc_audio_rev >= UAUDIO_VERSION_30) { - /* FALLTHROUGH */ - } else if (sc->sc_audio_rev >= UAUDIO_VERSION_20) { - unsigned int x; - - for (x = 0; x != 256; x++) { - if (dir == PCMDIR_PLAY) { - if (!(sc->sc_mixer_clocks.bit_output[x / 8] & - (1 << (x % 8)))) { - continue; - } - } else { - if (!(sc->sc_mixer_clocks.bit_input[x / 8] & - (1 << (x % 8)))) { - continue; - } - } - - if (uaudio20_set_speed(sc->sc_udev, - sc->sc_mixer_iface_no, x, ch->sample_rate)) { - /* - * If the endpoint is adaptive setting - * the speed may fail. - */ - DPRINTF("setting of sample rate failed! " - "(continuing anyway)\n"); - } - } - } else if (ch->p_sed.v1->bmAttributes & UA_SED_FREQ_CONTROL) { - if (uaudio_set_speed(sc->sc_udev, endpoint, ch->sample_rate)) { - /* - * If the endpoint is adaptive setting the - * speed may fail. - */ - DPRINTF("setting of sample rate failed! " - "(continuing anyway)\n"); - } - } - if (usbd_transfer_setup(sc->sc_udev, &iface_index, ch->xfer, - ch->usb_cfg, UAUDIO_NCHANBUFS + 1, ch, ch->pcm_mtx)) { - DPRINTF("could not allocate USB transfers!\n"); - goto error; - } - - fps_shift = usbd_xfer_get_fps_shift(ch->xfer[0]); - - /* down shift number of frames per second, if any */ - fps >>= fps_shift; - frames >>= fps_shift; - - /* bytes per frame should not be zero */ - ch->bytes_per_frame[0] = ((ch->sample_rate / fps) * ch->sample_size); - ch->bytes_per_frame[1] = (((ch->sample_rate + fps - 1) / fps) * ch->sample_size); - - /* setup data rate dithering, if any */ - ch->frames_per_second = fps; - ch->sample_rem = ch->sample_rate % fps; - ch->sample_curr = 0; - ch->frames_per_second = fps; - - /* compute required buffer size */ - buf_size = (ch->bytes_per_frame[1] * frames); - - ch->intr_size = buf_size; - ch->intr_frames = frames; - - DPRINTF("fps=%d sample_rem=%d\n", fps, ch->sample_rem); - - if (ch->intr_frames == 0) { - DPRINTF("frame shift is too high!\n"); - goto error; - } - - /* setup double buffering */ + /* allow double buffering */ buf_size *= 2; - blocks = 2; + + DPRINTF("Worst case buffer is %d bytes\n", (int)buf_size); ch->buf = malloc(buf_size, M_DEVBUF, M_WAITOK | M_ZERO); if (ch->buf == NULL) goto error; if (sndbuf_setup(b, ch->buf, buf_size) != 0) goto error; - if (sndbuf_resize(b, blocks, ch->intr_size)) - goto error; ch->start = ch->buf; ch->end = ch->buf + buf_size; ch->cur = ch->buf; ch->pcm_buf = b; + ch->max_buf = buf_size; if (ch->pcm_mtx == NULL) { DPRINTF("ERROR: PCM channels does not have a mutex!\n"); goto error; } - return (ch); error: @@ -2141,7 +2278,7 @@ uaudio_chan_free(struct uaudio_chan *ch) } usbd_transfer_unsetup(ch->xfer, UAUDIO_NCHANBUFS + 1); - ch->valid = 0; + ch->num_alt = 0; return (0); } @@ -2149,7 +2286,15 @@ uaudio_chan_free(struct uaudio_chan *ch) int uaudio_chan_set_param_blocksize(struct uaudio_chan *ch, uint32_t blocksize) { - return (ch->intr_size); + uint32_t temp = 2 * uaudio_get_buffer_size(ch, ch->set_alt); + + sndbuf_setup(ch->pcm_buf, ch->buf, temp); + + ch->start = ch->buf; + ch->end = ch->buf + temp; + ch->cur = ch->buf; + + return (temp / 2); } int @@ -2162,10 +2307,23 @@ uaudio_chan_set_param_fragments(struct u int uaudio_chan_set_param_speed(struct uaudio_chan *ch, uint32_t speed) { - if (speed != ch->sample_rate) { - DPRINTF("rate conversion required\n"); + uint8_t x; + + for (x = 0; x < ch->num_alt; x++) { + if (ch->usb_alt[x].sample_rate < speed) { + /* sample rate is too low */ + break; + } } - return (ch->sample_rate); + + if (x != 0) + x--; + + ch->set_alt = x; + + DPRINTF("Selecting alt %d\n", (int)x); + + return (ch->usb_alt[x].sample_rate); } int @@ -2228,31 +2386,61 @@ uaudio_chan_getmatrix(struct uaudio_chan int uaudio_chan_set_param_format(struct uaudio_chan *ch, uint32_t format) { - ch->format = format; + DPRINTF("Selecting format 0x%08x\n", (unsigned int)format); return (0); } int uaudio_chan_start(struct uaudio_chan *ch) { - ch->cur = ch->start; + struct uaudio_softc *sc = ch->priv_sc; + int do_start = 0; -#if (UAUDIO_NCHANBUFS != 2) -#error "please update code" -#endif - usbd_transfer_start(ch->xfer[0]); - usbd_transfer_start(ch->xfer[1]); + usb_proc_explore_lock(sc->sc_udev); + if (ch->operation != CHAN_OP_DRAIN) { + if (ch->cur_alt == ch->set_alt && + ch->operation == CHAN_OP_NONE) { + /* save doing the explore task */ + do_start = 1; + } else { + ch->operation = CHAN_OP_START; + (void)usb_proc_explore_msignal(sc->sc_udev, + &sc->sc_config_msg[0], &sc->sc_config_msg[1]); + } + } + usb_proc_explore_unlock(sc->sc_udev); + + if (do_start) { + usbd_transfer_start(ch->xfer[0]); + usbd_transfer_start(ch->xfer[1]); + } return (0); } int uaudio_chan_stop(struct uaudio_chan *ch) { -#if (UAUDIO_NCHANBUFS != 2) -#error "please update code" -#endif - usbd_transfer_stop(ch->xfer[0]); - usbd_transfer_stop(ch->xfer[1]); + struct uaudio_softc *sc = ch->priv_sc; + int do_stop = 0; + + usb_proc_explore_lock(sc->sc_udev); + if (ch->operation != CHAN_OP_DRAIN) { + if (ch->cur_alt == ch->set_alt && + ch->operation == CHAN_OP_NONE) { + /* save doing the explore task */ + do_stop = 1; + } else { + ch->operation = CHAN_OP_STOP; + (void)usb_proc_explore_msignal(sc->sc_udev, + &sc->sc_config_msg[0], &sc->sc_config_msg[1]); + } + } + usb_proc_explore_unlock(sc->sc_udev); + + if (do_stop) { + usbd_transfer_stop(ch->xfer[0]); + usbd_transfer_stop(ch->xfer[1]); + } return (0); } _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:25:41 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 07387350; Wed, 15 May 2013 05:25:41 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 498C9C23; Wed, 15 May 2013 05:25:40 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 63F3771A6CA; Wed, 15 May 2013 09:25:09 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:06:17 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:56:31 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:02:50 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id A86EA71CDB9 for ; Sun, 12 May 2013 05:54:36 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NMgABt7nBMyp for ; Sun, 12 May 2013 05:54:29 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id CFA1971CD9F for ; Sun, 12 May 2013 05:54:28 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 117862B42; Sun, 12 May 2013 01:54:28 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 0E53B7EA; Sun, 12 May 2013 01:54:28 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id BF5F8F0E; Sun, 12 May 2013 01:53:48 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AFC4C379; Sun, 12 May 2013 01:53:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1rmN5071378; Sun, 12 May 2013 01:53:48 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1rmn6071377; Sun, 12 May 2013 01:53:48 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201305120153.r4C1rmn6071377@svn.freebsd.org> From: Peter Wemm Date: Sun, 12 May 2013 01:53:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org Subject: svn commit: r250544 - head/sys/amd64/compile head/sys/amd64/conf head/sys/arm/compile head/sys/arm/conf head/sys/i386/compile head/sys/i386/conf head/sys/ia64/compile head/sys/ia64/conf head/sys/mi... X-SVN-Group: stable-6 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 08:02:50.0982 (UTC) FILETIME=[19564860:01CE4EE7] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:25:41 -0000 Author: peter Date: Sun May 12 01:53:47 2013 New Revision: 250544 URL: http://svnweb.freebsd.org/changeset/base/250544 Log: Tidy up some CVS workarounds. Deleted: stable/6/sys/alpha/compile/.cvsignore stable/6/sys/alpha/conf/.cvsignore stable/6/sys/amd64/compile/.cvsignore stable/6/sys/amd64/conf/.cvsignore stable/6/sys/arm/compile/.cvsignore stable/6/sys/arm/conf/.cvsignore stable/6/sys/i386/compile/.cvsignore stable/6/sys/i386/conf/.cvsignore stable/6/sys/ia64/compile/.cvsignore stable/6/sys/ia64/conf/.cvsignore stable/6/sys/pc98/compile/.cvsignore stable/6/sys/pc98/conf/.cvsignore stable/6/sys/powerpc/compile/.cvsignore stable/6/sys/powerpc/conf/.cvsignore stable/6/sys/sparc64/compile/.cvsignore stable/6/sys/sparc64/conf/.cvsignore stable/6/tools/regression/geom_uzip/.cvsignore Changes in other areas also in this revision: Deleted: head/sys/amd64/compile/.cvsignore head/sys/amd64/conf/.cvsignore head/sys/arm/compile/.cvsignore head/sys/arm/conf/.cvsignore head/sys/i386/compile/.cvsignore head/sys/i386/conf/.cvsignore head/sys/ia64/compile/.cvsignore head/sys/ia64/conf/.cvsignore head/sys/mips/compile/.cvsignore head/sys/mips/conf/.cvsignore head/sys/pc98/compile/.cvsignore head/sys/pc98/conf/.cvsignore head/sys/powerpc/compile/.cvsignore head/sys/powerpc/conf/.cvsignore head/sys/sparc64/compile/.cvsignore head/sys/sparc64/conf/.cvsignore head/tools/regression/geom_uzip/.cvsignore stable/2.0.5/sys/compile/.keep_me stable/2.1/sys/compile/.keep_me stable/2.2/sys/compile/.keep_me stable/3/sys/compile/.keep_me stable/4/sys/compile/.keep_me stable/5/crypto/openssh/.cvsignore stable/5/crypto/openssh/openbsd-compat/.cvsignore stable/5/crypto/openssh/scard/.cvsignore stable/5/sys/alpha/compile/.cvsignore stable/5/sys/amd64/compile/.cvsignore stable/5/sys/i386/compile/.cvsignore stable/5/sys/ia64/compile/.cvsignore stable/5/sys/pc98/compile/.cvsignore stable/5/sys/sparc64/compile/.cvsignore stable/5/tools/regression/geom_uzip/.cvsignore stable/7/sys/amd64/compile/.cvsignore stable/7/sys/amd64/conf/.cvsignore stable/7/sys/arm/compile/.cvsignore stable/7/sys/arm/conf/.cvsignore stable/7/sys/i386/compile/.cvsignore stable/7/sys/i386/conf/.cvsignore stable/7/sys/ia64/compile/.cvsignore stable/7/sys/ia64/conf/.cvsignore stable/7/sys/pc98/compile/.cvsignore stable/7/sys/pc98/conf/.cvsignore stable/7/sys/powerpc/compile/.cvsignore stable/7/sys/powerpc/conf/.cvsignore stable/7/sys/sparc64/compile/.cvsignore stable/7/sys/sparc64/conf/.cvsignore stable/7/sys/sun4v/compile/.cvsignore stable/7/sys/sun4v/conf/.cvsignore stable/7/tools/regression/geom_uzip/.cvsignore stable/8/sys/amd64/compile/.cvsignore stable/8/sys/amd64/conf/.cvsignore stable/8/sys/arm/compile/.cvsignore stable/8/sys/arm/conf/.cvsignore stable/8/sys/i386/compile/.cvsignore stable/8/sys/i386/conf/.cvsignore stable/8/sys/ia64/compile/.cvsignore stable/8/sys/ia64/conf/.cvsignore stable/8/sys/mips/compile/.cvsignore stable/8/sys/mips/conf/.cvsignore stable/8/sys/pc98/compile/.cvsignore stable/8/sys/pc98/conf/.cvsignore stable/8/sys/powerpc/compile/.cvsignore stable/8/sys/powerpc/conf/.cvsignore stable/8/sys/sparc64/compile/.cvsignore stable/8/sys/sparc64/conf/.cvsignore stable/8/sys/sun4v/compile/.cvsignore stable/8/sys/sun4v/conf/.cvsignore stable/8/tools/regression/geom_uzip/.cvsignore stable/9/sys/amd64/compile/.cvsignore stable/9/sys/amd64/conf/.cvsignore stable/9/sys/arm/compile/.cvsignore stable/9/sys/arm/conf/.cvsignore stable/9/sys/i386/compile/.cvsignore stable/9/sys/i386/conf/.cvsignore stable/9/sys/ia64/compile/.cvsignore stable/9/sys/ia64/conf/.cvsignore stable/9/sys/mips/compile/.cvsignore stable/9/sys/mips/conf/.cvsignore stable/9/sys/pc98/compile/.cvsignore stable/9/sys/pc98/conf/.cvsignore stable/9/sys/powerpc/compile/.cvsignore stable/9/sys/powerpc/conf/.cvsignore stable/9/sys/sparc64/compile/.cvsignore stable/9/sys/sparc64/conf/.cvsignore stable/9/tools/regression/geom_uzip/.cvsignore _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:25:43 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BCF50467; Wed, 15 May 2013 05:25:43 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 5C9CDC2F; Wed, 15 May 2013 05:25:41 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 7C72571AB60; Wed, 15 May 2013 09:25:09 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:06:40 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:56:33 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:02:54 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 1EB0A71CA52 for ; Sun, 12 May 2013 04:36:24 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a2vyVZAEnUfV for ; Sun, 12 May 2013 04:36:16 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id CF9B971CA4B for ; Sun, 12 May 2013 04:36:13 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 73F7D5DB0; Sun, 12 May 2013 00:36:10 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 713C14F6; Sun, 12 May 2013 00:36:10 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DE2E03A6; Sun, 12 May 2013 00:35:58 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D08E714C; Sun, 12 May 2013 00:35:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C0ZwQO043273; Sun, 12 May 2013 00:35:58 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C0Zw0H043272; Sun, 12 May 2013 00:35:58 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201305120035.r4C0Zw0H043272@svn.freebsd.org> From: Brooks Davis Date: Sun, 12 May 2013 00:35:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250534 - stable/9/cddl/lib/drti X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 08:02:54.0607 (UTC) FILETIME=[1B7F69F0:01CE4EE7] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:25:43 -0000 Author: brooks Date: Sun May 12 00:35:57 2013 New Revision: 250534 URL: http://svnweb.freebsd.org/changeset/base/250534 Log: MFC r250337 Work around the implementation of LIBRARIES_ONLY. It causes drti.o to not be installed in /usr/lib32 on systems with compat-32 support. This fix has two parts. First, the build is forced by linking drti.o into a dummy internal library. Second, the object file is installed manually in the LIBRARIES_ONLY case. Modified: stable/9/cddl/lib/drti/Makefile Directory Properties: stable/9/cddl/lib/drti/ (props changed) Modified: stable/9/cddl/lib/drti/Makefile ============================================================================== --- stable/9/cddl/lib/drti/Makefile Sat May 11 23:55:43 2013 (r250533) +++ stable/9/cddl/lib/drti/Makefile Sun May 12 00:35:57 2013 (r250534) @@ -9,6 +9,8 @@ FILESGRP= ${LIBGRP} FILESMODE= ${LIBMODE} FILESDIR= ${LIBDIR}/dtrace CLEANFILES= ${FILES} +LIB= drti-dummy +INTERNALLIB= CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -18,4 +20,10 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ -DPIC ${PICFLAG} +.if make(install) && defined(LIBRARIES_ONLY) +install: + ${INSTALL} -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \ + ${FILES} ${DESTDIR}${FILESDIR} +.endif + .include _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:25:44 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 77C4F4BC; Wed, 15 May 2013 05:25:44 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 80AACCC5; Wed, 15 May 2013 05:25:43 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id EBB3471ABA3; Wed, 15 May 2013 09:25:09 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:09:55 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:56:44 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:03:18 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 215FF71CDBA for ; Sun, 12 May 2013 05:54:41 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bhiXnLqc-aE0 for ; Sun, 12 May 2013 05:54:34 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 53A2471CDB8 for ; Sun, 12 May 2013 05:54:34 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 91E912B9C; Sun, 12 May 2013 01:54:33 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 8F00983F; Sun, 12 May 2013 01:54:33 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1FB6AF0F; Sun, 12 May 2013 01:53:49 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 100F537A; Sun, 12 May 2013 01:53:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1rmZ9071385; Sun, 12 May 2013 01:53:48 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1rmhU071383; Sun, 12 May 2013 01:53:48 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201305120153.r4C1rmhU071383@svn.freebsd.org> From: Peter Wemm Date: Sun, 12 May 2013 01:53:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r250544 - head/sys/amd64/compile head/sys/amd64/conf head/sys/arm/compile head/sys/arm/conf head/sys/i386/compile head/sys/i386/conf head/sys/ia64/compile head/sys/ia64/conf head/sys/mi... X-SVN-Group: stable-7 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 08:03:18.0732 (UTC) FILETIME=[29E098C0:01CE4EE7] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:25:44 -0000 Author: peter Date: Sun May 12 01:53:47 2013 New Revision: 250544 URL: http://svnweb.freebsd.org/changeset/base/250544 Log: Tidy up some CVS workarounds. Deleted: stable/7/sys/amd64/compile/.cvsignore stable/7/sys/amd64/conf/.cvsignore stable/7/sys/arm/compile/.cvsignore stable/7/sys/arm/conf/.cvsignore stable/7/sys/i386/compile/.cvsignore stable/7/sys/i386/conf/.cvsignore stable/7/sys/ia64/compile/.cvsignore stable/7/sys/ia64/conf/.cvsignore stable/7/sys/pc98/compile/.cvsignore stable/7/sys/pc98/conf/.cvsignore stable/7/sys/powerpc/compile/.cvsignore stable/7/sys/powerpc/conf/.cvsignore stable/7/sys/sparc64/compile/.cvsignore stable/7/sys/sparc64/conf/.cvsignore stable/7/sys/sun4v/compile/.cvsignore stable/7/sys/sun4v/conf/.cvsignore stable/7/tools/regression/geom_uzip/.cvsignore Changes in other areas also in this revision: Deleted: head/sys/amd64/compile/.cvsignore head/sys/amd64/conf/.cvsignore head/sys/arm/compile/.cvsignore head/sys/arm/conf/.cvsignore head/sys/i386/compile/.cvsignore head/sys/i386/conf/.cvsignore head/sys/ia64/compile/.cvsignore head/sys/ia64/conf/.cvsignore head/sys/mips/compile/.cvsignore head/sys/mips/conf/.cvsignore head/sys/pc98/compile/.cvsignore head/sys/pc98/conf/.cvsignore head/sys/powerpc/compile/.cvsignore head/sys/powerpc/conf/.cvsignore head/sys/sparc64/compile/.cvsignore head/sys/sparc64/conf/.cvsignore head/tools/regression/geom_uzip/.cvsignore stable/2.0.5/sys/compile/.keep_me stable/2.1/sys/compile/.keep_me stable/2.2/sys/compile/.keep_me stable/3/sys/compile/.keep_me stable/4/sys/compile/.keep_me stable/5/crypto/openssh/.cvsignore stable/5/crypto/openssh/openbsd-compat/.cvsignore stable/5/crypto/openssh/scard/.cvsignore stable/5/sys/alpha/compile/.cvsignore stable/5/sys/amd64/compile/.cvsignore stable/5/sys/i386/compile/.cvsignore stable/5/sys/ia64/compile/.cvsignore stable/5/sys/pc98/compile/.cvsignore stable/5/sys/sparc64/compile/.cvsignore stable/5/tools/regression/geom_uzip/.cvsignore stable/6/sys/alpha/compile/.cvsignore stable/6/sys/alpha/conf/.cvsignore stable/6/sys/amd64/compile/.cvsignore stable/6/sys/amd64/conf/.cvsignore stable/6/sys/arm/compile/.cvsignore stable/6/sys/arm/conf/.cvsignore stable/6/sys/i386/compile/.cvsignore stable/6/sys/i386/conf/.cvsignore stable/6/sys/ia64/compile/.cvsignore stable/6/sys/ia64/conf/.cvsignore stable/6/sys/pc98/compile/.cvsignore stable/6/sys/pc98/conf/.cvsignore stable/6/sys/powerpc/compile/.cvsignore stable/6/sys/powerpc/conf/.cvsignore stable/6/sys/sparc64/compile/.cvsignore stable/6/sys/sparc64/conf/.cvsignore stable/6/tools/regression/geom_uzip/.cvsignore stable/8/sys/amd64/compile/.cvsignore stable/8/sys/amd64/conf/.cvsignore stable/8/sys/arm/compile/.cvsignore stable/8/sys/arm/conf/.cvsignore stable/8/sys/i386/compile/.cvsignore stable/8/sys/i386/conf/.cvsignore stable/8/sys/ia64/compile/.cvsignore stable/8/sys/ia64/conf/.cvsignore stable/8/sys/mips/compile/.cvsignore stable/8/sys/mips/conf/.cvsignore stable/8/sys/pc98/compile/.cvsignore stable/8/sys/pc98/conf/.cvsignore stable/8/sys/powerpc/compile/.cvsignore stable/8/sys/powerpc/conf/.cvsignore stable/8/sys/sparc64/compile/.cvsignore stable/8/sys/sparc64/conf/.cvsignore stable/8/sys/sun4v/compile/.cvsignore stable/8/sys/sun4v/conf/.cvsignore stable/8/tools/regression/geom_uzip/.cvsignore stable/9/sys/amd64/compile/.cvsignore stable/9/sys/amd64/conf/.cvsignore stable/9/sys/arm/compile/.cvsignore stable/9/sys/arm/conf/.cvsignore stable/9/sys/i386/compile/.cvsignore stable/9/sys/i386/conf/.cvsignore stable/9/sys/ia64/compile/.cvsignore stable/9/sys/ia64/conf/.cvsignore stable/9/sys/mips/compile/.cvsignore stable/9/sys/mips/conf/.cvsignore stable/9/sys/pc98/compile/.cvsignore stable/9/sys/pc98/conf/.cvsignore stable/9/sys/powerpc/compile/.cvsignore stable/9/sys/powerpc/conf/.cvsignore stable/9/sys/sparc64/compile/.cvsignore stable/9/sys/sparc64/conf/.cvsignore stable/9/tools/regression/geom_uzip/.cvsignore _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:25:44 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9CFD54CB; Wed, 15 May 2013 05:25:44 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id DD156CCC; Wed, 15 May 2013 05:25:43 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 13FC271A75E; Wed, 15 May 2013 09:25:10 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:10:43 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:56:46 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:03:22 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id E4FEA71CDAF for ; Sun, 12 May 2013 05:54:10 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OARPeDMcaZgb for ; Sun, 12 May 2013 05:54:03 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 1FF1971CD9F for ; Sun, 12 May 2013 05:54:03 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 4826224D2; Sun, 12 May 2013 01:54:02 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 4571223C; Sun, 12 May 2013 01:54:02 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 6AB50F0D; Sun, 12 May 2013 01:53:48 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5ABE1378; Sun, 12 May 2013 01:53:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1rmaZ071373; Sun, 12 May 2013 01:53:48 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1rmXY071372; Sun, 12 May 2013 01:53:48 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201305120153.r4C1rmXY071372@svn.freebsd.org> From: Peter Wemm Date: Sun, 12 May 2013 01:53:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-other@freebsd.org Subject: svn commit: r250544 - head/sys/amd64/compile head/sys/amd64/conf head/sys/arm/compile head/sys/arm/conf head/sys/i386/compile head/sys/i386/conf head/sys/ia64/compile head/sys/ia64/conf head/sys/mi... X-SVN-Group: stable-other MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 08:03:22.0435 (UTC) FILETIME=[2C15A130:01CE4EE7] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:25:44 -0000 Author: peter Date: Sun May 12 01:53:47 2013 New Revision: 250544 URL: http://svnweb.freebsd.org/changeset/base/250544 Log: Tidy up some CVS workarounds. Deleted: stable/3/sys/compile/.keep_me stable/4/sys/compile/.keep_me stable/5/crypto/openssh/.cvsignore stable/5/crypto/openssh/openbsd-compat/.cvsignore stable/5/crypto/openssh/scard/.cvsignore stable/5/sys/alpha/compile/.cvsignore stable/5/sys/amd64/compile/.cvsignore stable/5/sys/i386/compile/.cvsignore stable/5/sys/ia64/compile/.cvsignore stable/5/sys/pc98/compile/.cvsignore stable/5/sys/sparc64/compile/.cvsignore stable/5/tools/regression/geom_uzip/.cvsignore Changes in other areas also in this revision: Deleted: head/sys/amd64/compile/.cvsignore head/sys/amd64/conf/.cvsignore head/sys/arm/compile/.cvsignore head/sys/arm/conf/.cvsignore head/sys/i386/compile/.cvsignore head/sys/i386/conf/.cvsignore head/sys/ia64/compile/.cvsignore head/sys/ia64/conf/.cvsignore head/sys/mips/compile/.cvsignore head/sys/mips/conf/.cvsignore head/sys/pc98/compile/.cvsignore head/sys/pc98/conf/.cvsignore head/sys/powerpc/compile/.cvsignore head/sys/powerpc/conf/.cvsignore head/sys/sparc64/compile/.cvsignore head/sys/sparc64/conf/.cvsignore head/tools/regression/geom_uzip/.cvsignore stable/2.0.5/sys/compile/.keep_me stable/2.1/sys/compile/.keep_me stable/2.2/sys/compile/.keep_me stable/6/sys/alpha/compile/.cvsignore stable/6/sys/alpha/conf/.cvsignore stable/6/sys/amd64/compile/.cvsignore stable/6/sys/amd64/conf/.cvsignore stable/6/sys/arm/compile/.cvsignore stable/6/sys/arm/conf/.cvsignore stable/6/sys/i386/compile/.cvsignore stable/6/sys/i386/conf/.cvsignore stable/6/sys/ia64/compile/.cvsignore stable/6/sys/ia64/conf/.cvsignore stable/6/sys/pc98/compile/.cvsignore stable/6/sys/pc98/conf/.cvsignore stable/6/sys/powerpc/compile/.cvsignore stable/6/sys/powerpc/conf/.cvsignore stable/6/sys/sparc64/compile/.cvsignore stable/6/sys/sparc64/conf/.cvsignore stable/6/tools/regression/geom_uzip/.cvsignore stable/7/sys/amd64/compile/.cvsignore stable/7/sys/amd64/conf/.cvsignore stable/7/sys/arm/compile/.cvsignore stable/7/sys/arm/conf/.cvsignore stable/7/sys/i386/compile/.cvsignore stable/7/sys/i386/conf/.cvsignore stable/7/sys/ia64/compile/.cvsignore stable/7/sys/ia64/conf/.cvsignore stable/7/sys/pc98/compile/.cvsignore stable/7/sys/pc98/conf/.cvsignore stable/7/sys/powerpc/compile/.cvsignore stable/7/sys/powerpc/conf/.cvsignore stable/7/sys/sparc64/compile/.cvsignore stable/7/sys/sparc64/conf/.cvsignore stable/7/sys/sun4v/compile/.cvsignore stable/7/sys/sun4v/conf/.cvsignore stable/7/tools/regression/geom_uzip/.cvsignore stable/8/sys/amd64/compile/.cvsignore stable/8/sys/amd64/conf/.cvsignore stable/8/sys/arm/compile/.cvsignore stable/8/sys/arm/conf/.cvsignore stable/8/sys/i386/compile/.cvsignore stable/8/sys/i386/conf/.cvsignore stable/8/sys/ia64/compile/.cvsignore stable/8/sys/ia64/conf/.cvsignore stable/8/sys/mips/compile/.cvsignore stable/8/sys/mips/conf/.cvsignore stable/8/sys/pc98/compile/.cvsignore stable/8/sys/pc98/conf/.cvsignore stable/8/sys/powerpc/compile/.cvsignore stable/8/sys/powerpc/conf/.cvsignore stable/8/sys/sparc64/compile/.cvsignore stable/8/sys/sparc64/conf/.cvsignore stable/8/sys/sun4v/compile/.cvsignore stable/8/sys/sun4v/conf/.cvsignore stable/8/tools/regression/geom_uzip/.cvsignore stable/9/sys/amd64/compile/.cvsignore stable/9/sys/amd64/conf/.cvsignore stable/9/sys/arm/compile/.cvsignore stable/9/sys/arm/conf/.cvsignore stable/9/sys/i386/compile/.cvsignore stable/9/sys/i386/conf/.cvsignore stable/9/sys/ia64/compile/.cvsignore stable/9/sys/ia64/conf/.cvsignore stable/9/sys/mips/compile/.cvsignore stable/9/sys/mips/conf/.cvsignore stable/9/sys/pc98/compile/.cvsignore stable/9/sys/pc98/conf/.cvsignore stable/9/sys/powerpc/compile/.cvsignore stable/9/sys/powerpc/conf/.cvsignore stable/9/sys/sparc64/compile/.cvsignore stable/9/sys/sparc64/conf/.cvsignore stable/9/tools/regression/geom_uzip/.cvsignore _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:25:45 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 219054E6; Wed, 15 May 2013 05:25:45 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 51592CD3; Wed, 15 May 2013 05:25:44 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 7CF1771AB61; Wed, 15 May 2013 09:25:09 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:07:10 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:56:35 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:02:58 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 95F1571CD5F for ; Sun, 12 May 2013 05:55:24 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TQHllh+X5HpA for ; Sun, 12 May 2013 05:55:17 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 912B671CD37 for ; Sun, 12 May 2013 05:55:17 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id A56402CA8; Sun, 12 May 2013 01:55:16 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id A2C3A929; Sun, 12 May 2013 01:55:16 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C54E7F11; Sun, 12 May 2013 01:53:49 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B5DC637C; Sun, 12 May 2013 01:53:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1rnYV071398; Sun, 12 May 2013 01:53:49 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1rnqF071397; Sun, 12 May 2013 01:53:49 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201305120153.r4C1rnqF071397@svn.freebsd.org> From: Peter Wemm Date: Sun, 12 May 2013 01:53:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250544 - head/sys/amd64/compile head/sys/amd64/conf head/sys/arm/compile head/sys/arm/conf head/sys/i386/compile head/sys/i386/conf head/sys/ia64/compile head/sys/ia64/conf head/sys/mi... X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 08:02:58.0919 (UTC) FILETIME=[1E115F70:01CE4EE7] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:25:45 -0000 Author: peter Date: Sun May 12 01:53:47 2013 New Revision: 250544 URL: http://svnweb.freebsd.org/changeset/base/250544 Log: Tidy up some CVS workarounds. Deleted: stable/9/sys/amd64/compile/.cvsignore stable/9/sys/amd64/conf/.cvsignore stable/9/sys/arm/compile/.cvsignore stable/9/sys/arm/conf/.cvsignore stable/9/sys/i386/compile/.cvsignore stable/9/sys/i386/conf/.cvsignore stable/9/sys/ia64/compile/.cvsignore stable/9/sys/ia64/conf/.cvsignore stable/9/sys/mips/compile/.cvsignore stable/9/sys/mips/conf/.cvsignore stable/9/sys/pc98/compile/.cvsignore stable/9/sys/pc98/conf/.cvsignore stable/9/sys/powerpc/compile/.cvsignore stable/9/sys/powerpc/conf/.cvsignore stable/9/sys/sparc64/compile/.cvsignore stable/9/sys/sparc64/conf/.cvsignore stable/9/tools/regression/geom_uzip/.cvsignore Changes in other areas also in this revision: Deleted: head/sys/amd64/compile/.cvsignore head/sys/amd64/conf/.cvsignore head/sys/arm/compile/.cvsignore head/sys/arm/conf/.cvsignore head/sys/i386/compile/.cvsignore head/sys/i386/conf/.cvsignore head/sys/ia64/compile/.cvsignore head/sys/ia64/conf/.cvsignore head/sys/mips/compile/.cvsignore head/sys/mips/conf/.cvsignore head/sys/pc98/compile/.cvsignore head/sys/pc98/conf/.cvsignore head/sys/powerpc/compile/.cvsignore head/sys/powerpc/conf/.cvsignore head/sys/sparc64/compile/.cvsignore head/sys/sparc64/conf/.cvsignore head/tools/regression/geom_uzip/.cvsignore stable/2.0.5/sys/compile/.keep_me stable/2.1/sys/compile/.keep_me stable/2.2/sys/compile/.keep_me stable/3/sys/compile/.keep_me stable/4/sys/compile/.keep_me stable/5/crypto/openssh/.cvsignore stable/5/crypto/openssh/openbsd-compat/.cvsignore stable/5/crypto/openssh/scard/.cvsignore stable/5/sys/alpha/compile/.cvsignore stable/5/sys/amd64/compile/.cvsignore stable/5/sys/i386/compile/.cvsignore stable/5/sys/ia64/compile/.cvsignore stable/5/sys/pc98/compile/.cvsignore stable/5/sys/sparc64/compile/.cvsignore stable/5/tools/regression/geom_uzip/.cvsignore stable/6/sys/alpha/compile/.cvsignore stable/6/sys/alpha/conf/.cvsignore stable/6/sys/amd64/compile/.cvsignore stable/6/sys/amd64/conf/.cvsignore stable/6/sys/arm/compile/.cvsignore stable/6/sys/arm/conf/.cvsignore stable/6/sys/i386/compile/.cvsignore stable/6/sys/i386/conf/.cvsignore stable/6/sys/ia64/compile/.cvsignore stable/6/sys/ia64/conf/.cvsignore stable/6/sys/pc98/compile/.cvsignore stable/6/sys/pc98/conf/.cvsignore stable/6/sys/powerpc/compile/.cvsignore stable/6/sys/powerpc/conf/.cvsignore stable/6/sys/sparc64/compile/.cvsignore stable/6/sys/sparc64/conf/.cvsignore stable/6/tools/regression/geom_uzip/.cvsignore stable/7/sys/amd64/compile/.cvsignore stable/7/sys/amd64/conf/.cvsignore stable/7/sys/arm/compile/.cvsignore stable/7/sys/arm/conf/.cvsignore stable/7/sys/i386/compile/.cvsignore stable/7/sys/i386/conf/.cvsignore stable/7/sys/ia64/compile/.cvsignore stable/7/sys/ia64/conf/.cvsignore stable/7/sys/pc98/compile/.cvsignore stable/7/sys/pc98/conf/.cvsignore stable/7/sys/powerpc/compile/.cvsignore stable/7/sys/powerpc/conf/.cvsignore stable/7/sys/sparc64/compile/.cvsignore stable/7/sys/sparc64/conf/.cvsignore stable/7/sys/sun4v/compile/.cvsignore stable/7/sys/sun4v/conf/.cvsignore stable/7/tools/regression/geom_uzip/.cvsignore stable/8/sys/amd64/compile/.cvsignore stable/8/sys/amd64/conf/.cvsignore stable/8/sys/arm/compile/.cvsignore stable/8/sys/arm/conf/.cvsignore stable/8/sys/i386/compile/.cvsignore stable/8/sys/i386/conf/.cvsignore stable/8/sys/ia64/compile/.cvsignore stable/8/sys/ia64/conf/.cvsignore stable/8/sys/mips/compile/.cvsignore stable/8/sys/mips/conf/.cvsignore stable/8/sys/pc98/compile/.cvsignore stable/8/sys/pc98/conf/.cvsignore stable/8/sys/powerpc/compile/.cvsignore stable/8/sys/powerpc/conf/.cvsignore stable/8/sys/sparc64/compile/.cvsignore stable/8/sys/sparc64/conf/.cvsignore stable/8/sys/sun4v/compile/.cvsignore stable/8/sys/sun4v/conf/.cvsignore stable/8/tools/regression/geom_uzip/.cvsignore _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:25:45 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8C37F4F7; Wed, 15 May 2013 05:25:45 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id E8AB6CE0; Wed, 15 May 2013 05:25:44 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 4631871ABB9; Wed, 15 May 2013 09:25:10 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:11:20 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:56:48 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 12:03:26 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id C8F8E71CDBD for ; Sun, 12 May 2013 05:54:57 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t2aFH-YMrC5K for ; Sun, 12 May 2013 05:54:50 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id EFA6B71CDB8 for ; Sun, 12 May 2013 05:54:49 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 379A82C18; Sun, 12 May 2013 01:54:49 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 34EE78A6; Sun, 12 May 2013 01:54:49 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 72222F10; Sun, 12 May 2013 01:53:49 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 62A7F37B; Sun, 12 May 2013 01:53:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C1rndl071391; Sun, 12 May 2013 01:53:49 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C1rnHe071390; Sun, 12 May 2013 01:53:49 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201305120153.r4C1rnHe071390@svn.freebsd.org> From: Peter Wemm Date: Sun, 12 May 2013 01:53:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250544 - head/sys/amd64/compile head/sys/amd64/conf head/sys/arm/compile head/sys/arm/conf head/sys/i386/compile head/sys/i386/conf head/sys/ia64/compile head/sys/ia64/conf head/sys/mi... X-SVN-Group: stable-8 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 08:03:26.0966 (UTC) FILETIME=[2EC90160:01CE4EE7] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:25:45 -0000 Author: peter Date: Sun May 12 01:53:47 2013 New Revision: 250544 URL: http://svnweb.freebsd.org/changeset/base/250544 Log: Tidy up some CVS workarounds. Deleted: stable/8/sys/amd64/compile/.cvsignore stable/8/sys/amd64/conf/.cvsignore stable/8/sys/arm/compile/.cvsignore stable/8/sys/arm/conf/.cvsignore stable/8/sys/i386/compile/.cvsignore stable/8/sys/i386/conf/.cvsignore stable/8/sys/ia64/compile/.cvsignore stable/8/sys/ia64/conf/.cvsignore stable/8/sys/mips/compile/.cvsignore stable/8/sys/mips/conf/.cvsignore stable/8/sys/pc98/compile/.cvsignore stable/8/sys/pc98/conf/.cvsignore stable/8/sys/powerpc/compile/.cvsignore stable/8/sys/powerpc/conf/.cvsignore stable/8/sys/sparc64/compile/.cvsignore stable/8/sys/sparc64/conf/.cvsignore stable/8/sys/sun4v/compile/.cvsignore stable/8/sys/sun4v/conf/.cvsignore stable/8/tools/regression/geom_uzip/.cvsignore Changes in other areas also in this revision: Deleted: head/sys/amd64/compile/.cvsignore head/sys/amd64/conf/.cvsignore head/sys/arm/compile/.cvsignore head/sys/arm/conf/.cvsignore head/sys/i386/compile/.cvsignore head/sys/i386/conf/.cvsignore head/sys/ia64/compile/.cvsignore head/sys/ia64/conf/.cvsignore head/sys/mips/compile/.cvsignore head/sys/mips/conf/.cvsignore head/sys/pc98/compile/.cvsignore head/sys/pc98/conf/.cvsignore head/sys/powerpc/compile/.cvsignore head/sys/powerpc/conf/.cvsignore head/sys/sparc64/compile/.cvsignore head/sys/sparc64/conf/.cvsignore head/tools/regression/geom_uzip/.cvsignore stable/2.0.5/sys/compile/.keep_me stable/2.1/sys/compile/.keep_me stable/2.2/sys/compile/.keep_me stable/3/sys/compile/.keep_me stable/4/sys/compile/.keep_me stable/5/crypto/openssh/.cvsignore stable/5/crypto/openssh/openbsd-compat/.cvsignore stable/5/crypto/openssh/scard/.cvsignore stable/5/sys/alpha/compile/.cvsignore stable/5/sys/amd64/compile/.cvsignore stable/5/sys/i386/compile/.cvsignore stable/5/sys/ia64/compile/.cvsignore stable/5/sys/pc98/compile/.cvsignore stable/5/sys/sparc64/compile/.cvsignore stable/5/tools/regression/geom_uzip/.cvsignore stable/6/sys/alpha/compile/.cvsignore stable/6/sys/alpha/conf/.cvsignore stable/6/sys/amd64/compile/.cvsignore stable/6/sys/amd64/conf/.cvsignore stable/6/sys/arm/compile/.cvsignore stable/6/sys/arm/conf/.cvsignore stable/6/sys/i386/compile/.cvsignore stable/6/sys/i386/conf/.cvsignore stable/6/sys/ia64/compile/.cvsignore stable/6/sys/ia64/conf/.cvsignore stable/6/sys/pc98/compile/.cvsignore stable/6/sys/pc98/conf/.cvsignore stable/6/sys/powerpc/compile/.cvsignore stable/6/sys/powerpc/conf/.cvsignore stable/6/sys/sparc64/compile/.cvsignore stable/6/sys/sparc64/conf/.cvsignore stable/6/tools/regression/geom_uzip/.cvsignore stable/7/sys/amd64/compile/.cvsignore stable/7/sys/amd64/conf/.cvsignore stable/7/sys/arm/compile/.cvsignore stable/7/sys/arm/conf/.cvsignore stable/7/sys/i386/compile/.cvsignore stable/7/sys/i386/conf/.cvsignore stable/7/sys/ia64/compile/.cvsignore stable/7/sys/ia64/conf/.cvsignore stable/7/sys/pc98/compile/.cvsignore stable/7/sys/pc98/conf/.cvsignore stable/7/sys/powerpc/compile/.cvsignore stable/7/sys/powerpc/conf/.cvsignore stable/7/sys/sparc64/compile/.cvsignore stable/7/sys/sparc64/conf/.cvsignore stable/7/sys/sun4v/compile/.cvsignore stable/7/sys/sun4v/conf/.cvsignore stable/7/tools/regression/geom_uzip/.cvsignore stable/9/sys/amd64/compile/.cvsignore stable/9/sys/amd64/conf/.cvsignore stable/9/sys/arm/compile/.cvsignore stable/9/sys/arm/conf/.cvsignore stable/9/sys/i386/compile/.cvsignore stable/9/sys/i386/conf/.cvsignore stable/9/sys/ia64/compile/.cvsignore stable/9/sys/ia64/conf/.cvsignore stable/9/sys/mips/compile/.cvsignore stable/9/sys/mips/conf/.cvsignore stable/9/sys/pc98/compile/.cvsignore stable/9/sys/pc98/conf/.cvsignore stable/9/sys/powerpc/compile/.cvsignore stable/9/sys/powerpc/conf/.cvsignore stable/9/sys/sparc64/compile/.cvsignore stable/9/sys/sparc64/conf/.cvsignore stable/9/tools/regression/geom_uzip/.cvsignore _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:27:51 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D61D878; Wed, 15 May 2013 05:27:51 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 486E0D2E; Wed, 15 May 2013 05:27:51 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 60C0A71A5C7; Wed, 15 May 2013 09:27:50 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:12:38 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 20:20:41 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 20:20:41 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 3DD46719565 for ; Sun, 12 May 2013 20:20:41 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l6IXHrJr7nXk for ; Sun, 12 May 2013 20:20:36 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 0E78071927C for ; Sun, 12 May 2013 20:20:36 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id EE6125C23; Sun, 12 May 2013 16:20:34 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id EC493977; Sun, 12 May 2013 16:20:34 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id EAE4682A; Sun, 12 May 2013 16:20:27 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DCA791E6; Sun, 12 May 2013 16:20:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CGKRsd075342; Sun, 12 May 2013 16:20:27 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CGKRAN075341; Sun, 12 May 2013 16:20:27 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201305121620.r4CGKRAN075341@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 12 May 2013 16:20:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250571 - stable/9/lib/libc/gen X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 16:20:41.0231 (UTC) FILETIME=[A56491F0:01CE4F2C] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:27:51 -0000 Author: jilles Date: Sun May 12 16:20:27 2013 New Revision: 250571 URL: http://svnweb.freebsd.org/changeset/base/250571 Log: MFC r249956: sysconf(3): Correct the description of _SC_OPEN_MAX. Modified: stable/9/lib/libc/gen/sysconf.3 Directory Properties: stable/9/lib/libc/ (props changed) Modified: stable/9/lib/libc/gen/sysconf.3 ============================================================================== --- stable/9/lib/libc/gen/sysconf.3 Sun May 12 16:18:00 2013 (r250570) +++ stable/9/lib/libc/gen/sysconf.3 Sun May 12 16:20:27 2013 (r250571) @@ -28,7 +28,7 @@ .\" @(#)sysconf.3 8.3 (Berkeley) 4/19/94 .\" $FreeBSD$ .\" -.Dd February 13, 2011 +.Dd April 26, 2013 .Dt SYSCONF 3 .Os .Sh NAME @@ -82,7 +82,7 @@ The number of processors configured. .It Li _SC_NPROCESSORS_ONLN The number of processors currently online. .It Li _SC_OPEN_MAX -The maximum number of open files per user id. +One more than the maximum value the system may assign to a new file descriptor. .It Li _SC_PAGESIZE The size of a system page in bytes. .It Li _SC_PAGE_SIZE _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:27:58 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 47F511E7; Wed, 15 May 2013 05:27:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 145E0D4F; Wed, 15 May 2013 05:27:56 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 339ED71A60D; Wed, 15 May 2013 09:27:56 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:18:24 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 16:24:56 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 16:24:55 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id E528971963A for ; Sun, 12 May 2013 16:24:55 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zkInUqCOsw5o for ; Sun, 12 May 2013 16:24:48 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 8DDC571929F for ; Sun, 12 May 2013 16:24:47 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id D6FF01713; Sun, 12 May 2013 12:24:42 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 61114B88; Sun, 12 May 2013 12:24:42 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7A01DA2E; Sun, 12 May 2013 12:24:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 524BF974; Sun, 12 May 2013 12:24:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CCOUR5092350; Sun, 12 May 2013 12:24:30 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CCOTS4092346; Sun, 12 May 2013 12:24:29 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201305121224.r4CCOTS4092346@svn.freebsd.org> From: Hans Petter Selasky Date: Sun, 12 May 2013 12:24:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250562 - in stable/8/sys/dev/usb: . controller X-SVN-Group: stable-8 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 12:24:55.0707 (UTC) FILETIME=[B600E6B0:01CE4F0B] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:27:58 -0000 Author: hselasky Date: Sun May 12 12:24:29 2013 New Revision: 250562 URL: http://svnweb.freebsd.org/changeset/base/250562 Log: MFC r249795: Add convenience wrapper functions to run callbacks in the context of the USB explore thread. Modified: stable/8/sys/dev/usb/controller/usb_controller.c stable/8/sys/dev/usb/usb_process.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/usb/ (props changed) Modified: stable/8/sys/dev/usb/controller/usb_controller.c ============================================================================== --- stable/8/sys/dev/usb/controller/usb_controller.c Sun May 12 12:20:04 2013 (r250561) +++ stable/8/sys/dev/usb/controller/usb_controller.c Sun May 12 12:24:29 2013 (r250562) @@ -877,3 +877,28 @@ usb_bus_mem_free_all(struct usb_bus *bus mtx_destroy(&bus->bus_mtx); } + +/* convenience wrappers */ +void +usb_proc_explore_mwait(struct usb_device *udev, void *pm1, void *pm2) +{ + usb_proc_mwait(&udev->bus->explore_proc, pm1, pm2); +} + +void * +usb_proc_explore_msignal(struct usb_device *udev, void *pm1, void *pm2) +{ + return (usb_proc_msignal(&udev->bus->explore_proc, pm1, pm2)); +} + +void +usb_proc_explore_lock(struct usb_device *udev) +{ + USB_BUS_LOCK(udev->bus); +} + +void +usb_proc_explore_unlock(struct usb_device *udev) +{ + USB_BUS_UNLOCK(udev->bus); +} Modified: stable/8/sys/dev/usb/usb_process.h ============================================================================== --- stable/8/sys/dev/usb/usb_process.h Sun May 12 12:20:04 2013 (r250561) +++ stable/8/sys/dev/usb/usb_process.h Sun May 12 12:24:29 2013 (r250562) @@ -42,6 +42,7 @@ /* structure prototypes */ struct usb_proc_msg; +struct usb_device; /* * The following structure defines the USB process. @@ -79,4 +80,9 @@ void usb_proc_free(struct usb_process *u void *usb_proc_msignal(struct usb_process *up, void *pm0, void *pm1); void usb_proc_rewakeup(struct usb_process *up); +void usb_proc_explore_mwait(struct usb_device *, void *, void *); +void *usb_proc_explore_msignal(struct usb_device *, void *, void *); +void usb_proc_explore_lock(struct usb_device *); +void usb_proc_explore_unlock(struct usb_device *); + #endif /* _USB_PROCESS_H_ */ _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:28:05 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 20C07327; Wed, 15 May 2013 05:28:05 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 3ACB1D60; Wed, 15 May 2013 05:28:02 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 7EDE471A5F1; Wed, 15 May 2013 09:28:01 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:21:26 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 23:04:59 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 18:01:09 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id DDD37719758 for ; Mon, 13 May 2013 18:01:09 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M0evvHomjCAu for ; Mon, 13 May 2013 18:01:02 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 0B15471A147 for ; Mon, 13 May 2013 18:01:02 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id ADC59E65; Mon, 13 May 2013 14:01:00 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id ABAAEE3C; Mon, 13 May 2013 14:01:00 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D7425A78; Mon, 13 May 2013 13:57:06 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C930A76D; Mon, 13 May 2013 13:57:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DDv6Zf035414; Mon, 13 May 2013 13:57:06 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DDv6e3035413; Mon, 13 May 2013 13:57:06 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201305131357.r4DDv6e3035413@svn.freebsd.org> From: Jaakko Heinonen Date: Mon, 13 May 2013 13:57:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250597 - stable/9/usr.bin/calendar X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 13 May 2013 14:01:09.0747 (UTC) FILETIME=[52033C30:01CE4FE2] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:28:05 -0000 Author: jh Date: Mon May 13 13:57:06 2013 New Revision: 250597 URL: http://svnweb.freebsd.org/changeset/base/250597 Log: MFC r249200: Correct the path. PR: 176256 Modified: stable/9/usr.bin/calendar/calendar.1 Directory Properties: stable/9/usr.bin/calendar/ (props changed) Modified: stable/9/usr.bin/calendar/calendar.1 ============================================================================== --- stable/9/usr.bin/calendar/calendar.1 Mon May 13 12:43:03 2013 (r250596) +++ stable/9/usr.bin/calendar/calendar.1 Mon May 13 13:57:06 2013 (r250597) @@ -28,7 +28,7 @@ .\" @(#)calendar.1 8.1 (Berkeley) 6/29/93 .\" $FreeBSD$ .\" -.Dd June 13, 2002 +.Dd April 6, 2013 .Dt CALENDAR 1 .Os .Sh NAME @@ -230,7 +230,7 @@ do not send mail if this file exists. .El .Pp The following default calendar files are provided in -.Pa /usr/share/calendars: +.Pa /usr/share/calendar: .Pp .Bl -tag -width calendar.southafrica -compact .It Pa calendar.all _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:28:07 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6BDC8342; Wed, 15 May 2013 05:28:07 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 7BE8FD6A; Wed, 15 May 2013 05:28:06 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id 3322071A581; Wed, 15 May 2013 09:28:05 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:23:01 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 23:05:04 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 18:02:44 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id 8C9A871A31A for ; Mon, 13 May 2013 18:02:44 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q7vyDZiXTqOK for ; Mon, 13 May 2013 18:02:36 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id AABB171A23D for ; Mon, 13 May 2013 18:02:36 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 84E711043; Mon, 13 May 2013 14:02:31 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id 75D64FE4; Mon, 13 May 2013 14:02:31 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E9BFEC8E; Mon, 13 May 2013 14:00:24 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DBCBA7A1; Mon, 13 May 2013 14:00:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DE0OTX037721; Mon, 13 May 2013 14:00:24 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DE0OWO037720; Mon, 13 May 2013 14:00:24 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201305131400.r4DE0OWO037720@svn.freebsd.org> From: Jaakko Heinonen Date: Mon, 13 May 2013 14:00:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250598 - stable/8/usr.bin/calendar X-SVN-Group: stable-8 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 13 May 2013 14:02:44.0404 (UTC) FILETIME=[8A6EBF40:01CE4FE2] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:28:07 -0000 Author: jh Date: Mon May 13 14:00:24 2013 New Revision: 250598 URL: http://svnweb.freebsd.org/changeset/base/250598 Log: MFC r249200: Correct the path. PR: 176256 Modified: stable/8/usr.bin/calendar/calendar.1 Directory Properties: stable/8/usr.bin/calendar/ (props changed) Modified: stable/8/usr.bin/calendar/calendar.1 ============================================================================== --- stable/8/usr.bin/calendar/calendar.1 Mon May 13 13:57:06 2013 (r250597) +++ stable/8/usr.bin/calendar/calendar.1 Mon May 13 14:00:24 2013 (r250598) @@ -28,7 +28,7 @@ .\" @(#)calendar.1 8.1 (Berkeley) 6/29/93 .\" $FreeBSD$ .\" -.Dd June 13, 2002 +.Dd April 6, 2013 .Dt CALENDAR 1 .Os .Sh NAME @@ -222,7 +222,7 @@ do not send mail if this file exists. .El .Pp The following default calendar files are provided in -.Pa /usr/share/calendars: +.Pa /usr/share/calendar: .Pp .Bl -tag -width calendar.southafrica -compact .It Pa calendar.all _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:35:54 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0D9B11CC; Wed, 15 May 2013 05:35:54 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 53867E4D; Wed, 15 May 2013 05:35:53 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id CCCED71A574; Wed, 15 May 2013 09:35:51 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:35:41 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 20:22:35 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 May 2013 20:22:34 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id DD2217195D0 for ; Sun, 12 May 2013 20:22:34 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vJogKyn38eNM for ; Sun, 12 May 2013 20:22:27 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id BC03071963B for ; Sun, 12 May 2013 20:22:26 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 699C25E02; Sun, 12 May 2013 16:22:24 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id E6DFFAF5; Sun, 12 May 2013 16:22:23 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5E7379A0; Sun, 12 May 2013 16:22:11 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 508CA1F3; Sun, 12 May 2013 16:22:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CGMBJY077142; Sun, 12 May 2013 16:22:11 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CGMBkK077141; Sun, 12 May 2013 16:22:11 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201305121622.r4CGMBkK077141@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 12 May 2013 16:22:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250572 - stable/9/lib/libc/sys X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 12 May 2013 16:22:34.0872 (UTC) FILETIME=[E920CF80:01CE4F2C] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:35:54 -0000 Author: jilles Date: Sun May 12 16:22:10 2013 New Revision: 250572 URL: http://svnweb.freebsd.org/changeset/base/250572 Log: MFC r249859: getdtablesize(2): Describe what this function actually does. getdtablesize() returns the limit on new file descriptors; this says nothing about existing descriptors. Modified: stable/9/lib/libc/sys/getdtablesize.2 Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/sys/ (props changed) Modified: stable/9/lib/libc/sys/getdtablesize.2 ============================================================================== --- stable/9/lib/libc/sys/getdtablesize.2 Sun May 12 16:20:27 2013 (r250571) +++ stable/9/lib/libc/sys/getdtablesize.2 Sun May 12 16:22:10 2013 (r250572) @@ -28,12 +28,12 @@ .\" @(#)getdtablesize.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd June 4, 1993 +.Dd April 24, 2013 .Dt GETDTABLESIZE 2 .Os .Sh NAME .Nm getdtablesize -.Nd get descriptor table size +.Nd get file descriptor limit .Sh LIBRARY .Lb libc .Sh SYNOPSIS @@ -41,18 +41,20 @@ .Ft int .Fn getdtablesize void .Sh DESCRIPTION -Each process has a fixed size descriptor table, -which is guaranteed to have at least 20 slots. -The entries in -the descriptor table are numbered with small integers starting at 0. The .Fn getdtablesize -system call returns the size of this table. +system call returns the maximum number of file descriptors +that the current process may open. +The maximum file descriptor number that the system may assign +is the return value minus one. +Existing file descriptor numbers may be higher +if the limit was lowered after they were opened. .Sh SEE ALSO .Xr close 2 , +.Xr closefrom 2 , .Xr dup 2 , -.Xr open 2 , -.Xr select 2 +.Xr getrlimit 2 , +.Xr sysconf 2 .Sh HISTORY The .Fn getdtablesize _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 05:39:57 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 4D82462F; Wed, 15 May 2013 05:39:57 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mail1.ozon.ru (mx4.ozon.ru [194.186.179.140]) by mx1.freebsd.org (Postfix) with ESMTP id 963A9E91; Wed, 15 May 2013 05:39:56 +0000 (UTC) Received: from intmail03msk.ozon (intmail03msk.ozon [10.18.18.171]) by mail1.ozon.ru (Postfix) with ESMTP id E12AF71A629; Wed, 15 May 2013 09:39:55 +0400 (MSK) Received: from mail pickup service by intmail03msk.ozon with Microsoft SMTPSVC; Wed, 15 May 2013 09:39:06 +0400 Received: from intmail03msk.ozon ([10.18.18.171]) by intmail02msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 05:26:50 +0400 Received: from mail1.ozon.ru ([194.186.179.140]) by intmail03msk.ozon with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 May 2013 05:26:49 +0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ozon.ru (Postfix) with ESMTP id C6640719E5A for ; Mon, 13 May 2013 05:26:49 +0400 (MSK) X-Virus-Scanned: amavisd-new at ozon.ru Received: from mail1.ozon.ru ([127.0.0.1]) by localhost (mx4.ozon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ppex3satfpgj for ; Mon, 13 May 2013 05:26:42 +0400 (MSK) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received-SPF: pass (freebsd.org: 8.8.178.116 is authorized to use 'owner-svn-src-all@freebsd.org' in 'mfrom' identity (mechanism 'ip4:8.8.178.116' matched)) receiver=mx4.ozon.ru; identity=mfrom; envelope-from="owner-svn-src-all@freebsd.org"; helo=mx2.freebsd.org; client-ip=8.8.178.116 Received: from mx2.freebsd.org (mx2.FreeBSD.org [8.8.178.116]) by mail1.ozon.ru (Postfix) with ESMTP id 9EC7F71923B for ; Mon, 13 May 2013 05:26:41 +0400 (MSK) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 4509A5680; Mon, 13 May 2013 01:26:40 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by hub.freebsd.org (Postfix) with ESMTP id CF048B96; Mon, 13 May 2013 01:26:39 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id EB224A3F; Mon, 13 May 2013 01:26:27 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C2E08A19; Mon, 13 May 2013 01:26:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4D1QRUI067515; Mon, 13 May 2013 01:26:27 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4D1QRqP067507; Mon, 13 May 2013 01:26:27 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305130126.r4D1QRqP067507@svn.freebsd.org> From: Eitan Adler Date: Mon, 13 May 2013 01:26:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250585 - stable/9/sbin/iscontrol X-SVN-Group: stable-9 MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-OriginalArrivalTime: 13 May 2013 01:26:49.0782 (UTC) FILETIME=[F0F8A560:01CE4F78] X-BeenThere: svn-src-stable@freebsd.org List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 05:39:57 -0000 Author: eadler Date: Mon May 13 01:26:26 2013 New Revision: 250585 URL: http://svnweb.freebsd.org/changeset/base/250585 Log: MFC r250303: Remove includes for old versions of FreeBSD. Reviewed by: stass Modified: stable/9/sbin/iscontrol/auth_subr.c stable/9/sbin/iscontrol/fsm.c stable/9/sbin/iscontrol/login.c stable/9/sbin/iscontrol/misc.c Directory Properties: stable/9/sbin/iscontrol/ (props changed) Modified: stable/9/sbin/iscontrol/auth_subr.c ============================================================================== --- stable/9/sbin/iscontrol/auth_subr.c Mon May 13 01:20:36 2013 (r250584) +++ stable/9/sbin/iscontrol/auth_subr.c Mon May 13 01:26:26 2013 (r250585) @@ -40,9 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#if __FreeBSD_version < 500000 -#include -#endif #include #include #include Modified: stable/9/sbin/iscontrol/fsm.c ============================================================================== --- stable/9/sbin/iscontrol/fsm.c Mon May 13 01:20:36 2013 (r250584) +++ stable/9/sbin/iscontrol/fsm.c Mon May 13 01:26:26 2013 (r250585) @@ -40,9 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#if __FreeBSD_version < 500000 -#include -#endif #include #include #include Modified: stable/9/sbin/iscontrol/login.c ============================================================================== --- stable/9/sbin/iscontrol/login.c Mon May 13 01:20:36 2013 (r250584) +++ stable/9/sbin/iscontrol/login.c Mon May 13 01:26:26 2013 (r250585) @@ -39,9 +39,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#if __FreeBSD_version < 500000 -#include -#endif #include #include #include Modified: stable/9/sbin/iscontrol/misc.c ============================================================================== --- stable/9/sbin/iscontrol/misc.c Mon May 13 01:20:36 2013 (r250584) +++ stable/9/sbin/iscontrol/misc.c Mon May 13 01:26:26 2013 (r250585) @@ -40,9 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#if __FreeBSD_version < 500000 -#include -#endif #include #include #include _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 19:33:54 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 03707D8E; Wed, 15 May 2013 19:33:54 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EA63474E; Wed, 15 May 2013 19:33:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FJXrWd071323; Wed, 15 May 2013 19:33:53 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FJXrxi071322; Wed, 15 May 2013 19:33:53 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201305151933.r4FJXrxi071322@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 15 May 2013 19:33:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250671 - stable/9/share/man/man9 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 19:33:54 -0000 Author: pluknet Date: Wed May 15 19:33:53 2013 New Revision: 250671 URL: http://svnweb.freebsd.org/changeset/base/250671 Log: MFC r242992: Avoid an ambiguous reference to mtx_lock(9). Modified: stable/9/share/man/man9/mi_switch.9 Directory Properties: stable/9/share/man/man9/ (props changed) Modified: stable/9/share/man/man9/mi_switch.9 ============================================================================== --- stable/9/share/man/man9/mi_switch.9 Wed May 15 19:23:36 2013 (r250670) +++ stable/9/share/man/man9/mi_switch.9 Wed May 15 19:33:53 2013 (r250671) @@ -60,7 +60,7 @@ can be enumerated as follows: .It From within a function such as .Xr cv_wait 9 , -.Xr mtx_lock , +.Xr mtx_lock 9 , or .Xr tsleep 9 when the current thread From owner-svn-src-stable@FreeBSD.ORG Wed May 15 19:38:49 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DF23BF64; Wed, 15 May 2013 19:38:49 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D0CEF791; Wed, 15 May 2013 19:38:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FJcnY2072286; Wed, 15 May 2013 19:38:49 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FJcnKq072285; Wed, 15 May 2013 19:38:49 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201305151938.r4FJcnKq072285@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 15 May 2013 19:38:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250672 - stable/8/share/man/man9 X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 19:38:50 -0000 Author: pluknet Date: Wed May 15 19:38:49 2013 New Revision: 250672 URL: http://svnweb.freebsd.org/changeset/base/250672 Log: MFC r242992: Avoid an ambiguous reference to mtx_lock(9). Modified: stable/8/share/man/man9/mi_switch.9 Directory Properties: stable/8/share/man/man9/ (props changed) Modified: stable/8/share/man/man9/mi_switch.9 ============================================================================== --- stable/8/share/man/man9/mi_switch.9 Wed May 15 19:33:53 2013 (r250671) +++ stable/8/share/man/man9/mi_switch.9 Wed May 15 19:38:49 2013 (r250672) @@ -67,7 +67,7 @@ can be enumerated as follows: .It From within a function such as .Xr cv_wait 9 , -.Xr mtx_lock , +.Xr mtx_lock 9 , or .Xr tsleep 9 when the current thread From owner-svn-src-stable@FreeBSD.ORG Wed May 15 19:52:38 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6CC49664; Wed, 15 May 2013 19:52:38 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5EACC834; Wed, 15 May 2013 19:52:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FJqcMr078272; Wed, 15 May 2013 19:52:38 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FJqcAj078271; Wed, 15 May 2013 19:52:38 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201305151952.r4FJqcAj078271@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 15 May 2013 19:52:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250673 - stable/8/share/man/man9 X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 19:52:38 -0000 Author: pluknet Date: Wed May 15 19:52:37 2013 New Revision: 250673 URL: http://svnweb.freebsd.org/changeset/base/250673 Log: MFC r242995: firmware(9) mdoc cleanup. - Lowercase a cross reference to make. - Sort SEE ALSO cross references. Modified: stable/8/share/man/man9/firmware.9 Directory Properties: stable/8/share/man/man9/ (props changed) Modified: stable/8/share/man/man9/firmware.9 ============================================================================== --- stable/8/share/man/man9/firmware.9 Wed May 15 19:38:49 2013 (r250672) +++ stable/8/share/man/man9/firmware.9 Wed May 15 19:52:37 2013 (r250673) @@ -255,11 +255,11 @@ IxNpeMicrocode.dat Note that generating the firmware modules in this way requires the availability of the following tools: .Xr awk , -.Xr Make , +.Xr make , the compiler and the linker. .Sh SEE ALSO -.Xr module 9 , -.Xr kld 4 +.Xr kld 4 , +.Xr module 9 .Pp .Pa /usr/share/examples/kld/firmware .Sh HISTORY From owner-svn-src-stable@FreeBSD.ORG Wed May 15 19:53:50 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 61DB27DA; Wed, 15 May 2013 19:53:50 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 544AE842; Wed, 15 May 2013 19:53:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FJroYM078521; Wed, 15 May 2013 19:53:50 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FJrojU078520; Wed, 15 May 2013 19:53:50 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201305151953.r4FJrojU078520@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 15 May 2013 19:53:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250674 - stable/9/share/man/man9 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 19:53:50 -0000 Author: pluknet Date: Wed May 15 19:53:49 2013 New Revision: 250674 URL: http://svnweb.freebsd.org/changeset/base/250674 Log: MFC r242995: firmware(9) mdoc cleanup. - Lowercase a cross reference to make. - Sort SEE ALSO cross references. Modified: stable/9/share/man/man9/firmware.9 Directory Properties: stable/9/share/man/man9/ (props changed) Modified: stable/9/share/man/man9/firmware.9 ============================================================================== --- stable/9/share/man/man9/firmware.9 Wed May 15 19:52:37 2013 (r250673) +++ stable/9/share/man/man9/firmware.9 Wed May 15 19:53:49 2013 (r250674) @@ -255,11 +255,11 @@ IxNpeMicrocode.dat Note that generating the firmware modules in this way requires the availability of the following tools: .Xr awk , -.Xr Make , +.Xr make , the compiler and the linker. .Sh SEE ALSO -.Xr module 9 , -.Xr kld 4 +.Xr kld 4 , +.Xr module 9 .Pp .Pa /usr/share/examples/kld/firmware .Sh HISTORY From owner-svn-src-stable@FreeBSD.ORG Wed May 15 19:58:12 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DBE4DA78; Wed, 15 May 2013 19:58:12 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CCB1E878; Wed, 15 May 2013 19:58:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FJwCn0079451; Wed, 15 May 2013 19:58:12 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FJwCh7079450; Wed, 15 May 2013 19:58:12 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201305151958.r4FJwCh7079450@svn.freebsd.org> From: Justin Hibbits Date: Wed, 15 May 2013 19:58:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250675 - stable/9/sys/powerpc/aim X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 19:58:12 -0000 Author: jhibbits Date: Wed May 15 19:58:12 2013 New Revision: 250675 URL: http://svnweb.freebsd.org/changeset/base/250675 Log: MFC r249864,249918 Introduce kernel coredumps to ppc32 AIM. Leeched from the booke code. Modified: stable/9/sys/powerpc/aim/mmu_oea.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/powerpc/aim/mmu_oea.c ============================================================================== --- stable/9/sys/powerpc/aim/mmu_oea.c Wed May 15 19:53:49 2013 (r250674) +++ stable/9/sys/powerpc/aim/mmu_oea.c Wed May 15 19:58:12 2013 (r250675) @@ -171,6 +171,11 @@ struct ofw_map { u_int om_mode; }; +extern unsigned char _etext[]; +extern unsigned char _end[]; + +extern int dumpsys_minidump; + /* * Map of physical memory regions. */ @@ -318,6 +323,9 @@ void moea_kenter(mmu_t, vm_offset_t, vm_ void moea_page_set_memattr(mmu_t mmu, vm_page_t m, vm_memattr_t ma); boolean_t moea_dev_direct_mapped(mmu_t, vm_offset_t, vm_size_t); static void moea_sync_icache(mmu_t, pmap_t, vm_offset_t, vm_size_t); +vm_offset_t moea_dumpsys_map(mmu_t mmu, struct pmap_md *md, vm_size_t ofs, + vm_size_t *sz); +struct pmap_md * moea_scan_md(mmu_t mmu, struct pmap_md *prev); static mmu_method_t moea_methods[] = { MMUMETHOD(mmu_change_wiring, moea_change_wiring), @@ -365,6 +373,8 @@ static mmu_method_t moea_methods[] = { MMUMETHOD(mmu_kenter, moea_kenter), MMUMETHOD(mmu_kenter_attr, moea_kenter_attr), MMUMETHOD(mmu_dev_direct_mapped,moea_dev_direct_mapped), + MMUMETHOD(mmu_scan_md, moea_scan_md), + MMUMETHOD(mmu_dumpsys_map, moea_dumpsys_map), { 0, 0 } }; @@ -2515,3 +2525,101 @@ moea_sync_icache(mmu_t mmu, pmap_t pm, v } PMAP_UNLOCK(pm); } + +vm_offset_t +moea_dumpsys_map(mmu_t mmu, struct pmap_md *md, vm_size_t ofs, + vm_size_t *sz) +{ + if (md->md_vaddr == ~0UL) + return (md->md_paddr + ofs); + else + return (md->md_vaddr + ofs); +} + +struct pmap_md * +moea_scan_md(mmu_t mmu, struct pmap_md *prev) +{ + static struct pmap_md md; + struct pvo_entry *pvo; + vm_offset_t va; + + if (dumpsys_minidump) { + md.md_paddr = ~0UL; /* Minidumps use virtual addresses. */ + if (prev == NULL) { + /* 1st: kernel .data and .bss. */ + md.md_index = 1; + md.md_vaddr = trunc_page((uintptr_t)_etext); + md.md_size = round_page((uintptr_t)_end) - md.md_vaddr; + return (&md); + } + switch (prev->md_index) { + case 1: + /* 2nd: msgbuf and tables (see pmap_bootstrap()). */ + md.md_index = 2; + md.md_vaddr = (vm_offset_t)msgbufp->msg_ptr; + md.md_size = round_page(msgbufp->msg_size); + break; + case 2: + /* 3rd: kernel VM. */ + va = prev->md_vaddr + prev->md_size; + /* Find start of next chunk (from va). */ + while (va < virtual_end) { + /* Don't dump the buffer cache. */ + if (va >= kmi.buffer_sva && + va < kmi.buffer_eva) { + va = kmi.buffer_eva; + continue; + } + pvo = moea_pvo_find_va(kernel_pmap, + va & ~ADDR_POFF, NULL); + if (pvo != NULL && + (pvo->pvo_pte.pte.pte_hi & PTE_VALID)) + break; + va += PAGE_SIZE; + } + if (va < virtual_end) { + md.md_vaddr = va; + va += PAGE_SIZE; + /* Find last page in chunk. */ + while (va < virtual_end) { + /* Don't run into the buffer cache. */ + if (va == kmi.buffer_sva) + break; + pvo = moea_pvo_find_va(kernel_pmap, + va & ~ADDR_POFF, NULL); + if (pvo == NULL || + !(pvo->pvo_pte.pte.pte_hi & PTE_VALID)) + break; + va += PAGE_SIZE; + } + md.md_size = va - md.md_vaddr; + break; + } + md.md_index = 3; + /* FALLTHROUGH */ + default: + return (NULL); + } + } else { /* minidumps */ + mem_regions(&pregions, &pregions_sz, + ®ions, ®ions_sz); + + if (prev == NULL) { + /* first physical chunk. */ + md.md_paddr = pregions[0].mr_start; + md.md_size = pregions[0].mr_size; + md.md_vaddr = ~0UL; + md.md_index = 1; + } else if (md.md_index < pregions_sz) { + md.md_paddr = pregions[md.md_index].mr_start; + md.md_size = pregions[md.md_index].mr_size; + md.md_vaddr = ~0UL; + md.md_index++; + } else { + /* There's no next physical chunk. */ + return (NULL); + } + } + + return (&md); +} From owner-svn-src-stable@FreeBSD.ORG Wed May 15 20:53:54 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2E663342; Wed, 15 May 2013 20:53:54 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 20511A82; Wed, 15 May 2013 20:53:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FKrrIk099581; Wed, 15 May 2013 20:53:53 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FKrrsT099580; Wed, 15 May 2013 20:53:53 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201305152053.r4FKrrsT099580@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Wed, 15 May 2013 20:53:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250676 - stable/9/contrib/gcc X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 20:53:54 -0000 Author: pfg Date: Wed May 15 20:53:53 2013 New Revision: 250676 URL: http://svnweb.freebsd.org/changeset/base/250676 Log: MFC r250550: Update the gcc43 changelog. The issue solved in r250515 actually originated upstream and was fixed in upstream gcc43 branch in 2006/10/24 (under GPLv2). Register it in the appropriate ChangeLog for reference. Modified: stable/9/contrib/gcc/ChangeLog.gcc43 Directory Properties: stable/9/ (props changed) stable/9/contrib/gcc/ (props changed) Modified: stable/9/contrib/gcc/ChangeLog.gcc43 ============================================================================== --- stable/9/contrib/gcc/ChangeLog.gcc43 Wed May 15 19:58:12 2013 (r250675) +++ stable/9/contrib/gcc/ChangeLog.gcc43 Wed May 15 20:53:53 2013 (r250676) @@ -182,6 +182,10 @@ * doc/invoke.texi: Document -mssse3/-mno-ssse3 switches. +2006-10-22 H.J. Lu + + * config/i386/tmmintrin.h: Remove the duplicated content. + 2006-10-21 Richard Guenther (r117932) PR tree-optimization/3511 From owner-svn-src-stable@FreeBSD.ORG Wed May 15 20:59:01 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 36B004FC; Wed, 15 May 2013 20:59:01 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 282DDAAC; Wed, 15 May 2013 20:59:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FKx13r000641; Wed, 15 May 2013 20:59:01 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FKx1o6000640; Wed, 15 May 2013 20:59:01 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201305152059.r4FKx1o6000640@svn.freebsd.org> From: Dimitry Andric Date: Wed, 15 May 2013 20:59:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250677 - in stable: 7/gnu/usr.bin/cc/include 8/gnu/usr.bin/cc/include 9/gnu/usr.bin/cc/include X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 20:59:01 -0000 Author: dim Date: Wed May 15 20:59:00 2013 New Revision: 250677 URL: http://svnweb.freebsd.org/changeset/base/250677 Log: MFC r250393: When gcc 4.2.0 was imported, the 3DNow intrinsics header was not added to the list of intrinsics headers to install, so belatedly (5 years :) add it. Modified: stable/9/gnu/usr.bin/cc/include/Makefile Directory Properties: stable/9/gnu/usr.bin/cc/include/ (props changed) Changes in other areas also in this revision: Modified: stable/7/gnu/usr.bin/cc/include/Makefile stable/8/gnu/usr.bin/cc/include/Makefile Directory Properties: stable/7/gnu/usr.bin/cc/include/ (props changed) stable/8/gnu/usr.bin/cc/include/ (props changed) Modified: stable/9/gnu/usr.bin/cc/include/Makefile ============================================================================== --- stable/9/gnu/usr.bin/cc/include/Makefile Wed May 15 20:53:53 2013 (r250676) +++ stable/9/gnu/usr.bin/cc/include/Makefile Wed May 15 20:59:00 2013 (r250677) @@ -7,7 +7,8 @@ INCSDIR=${INCLUDEDIR}/gcc/${GCCVER} .PATH: ${GCCDIR}/config/${GCC_CPU} .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" -INCS= emmintrin.h mmintrin.h pmmintrin.h tmmintrin.h xmmintrin.h mm_malloc.h +INCS= emmintrin.h mmintrin.h mm3dnow.h pmmintrin.h tmmintrin.h xmmintrin.h \ + mm_malloc.h .elif ${TARGET_ARCH} == "ia64" INCS= ia64intrin.h .elif ${TARGET_ARCH} == "arm" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 20:59:01 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8CB324FD; Wed, 15 May 2013 20:59:01 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7E1A5AAD; Wed, 15 May 2013 20:59:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FKx1CX000653; Wed, 15 May 2013 20:59:01 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FKx1tX000652; Wed, 15 May 2013 20:59:01 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201305152059.r4FKx1tX000652@svn.freebsd.org> From: Dimitry Andric Date: Wed, 15 May 2013 20:59:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250677 - in stable: 7/gnu/usr.bin/cc/include 8/gnu/usr.bin/cc/include 9/gnu/usr.bin/cc/include X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 20:59:01 -0000 Author: dim Date: Wed May 15 20:59:00 2013 New Revision: 250677 URL: http://svnweb.freebsd.org/changeset/base/250677 Log: MFC r250393: When gcc 4.2.0 was imported, the 3DNow intrinsics header was not added to the list of intrinsics headers to install, so belatedly (5 years :) add it. Modified: stable/8/gnu/usr.bin/cc/include/Makefile Directory Properties: stable/8/gnu/usr.bin/cc/include/ (props changed) Changes in other areas also in this revision: Modified: stable/7/gnu/usr.bin/cc/include/Makefile stable/9/gnu/usr.bin/cc/include/Makefile Directory Properties: stable/7/gnu/usr.bin/cc/include/ (props changed) stable/9/gnu/usr.bin/cc/include/ (props changed) Modified: stable/8/gnu/usr.bin/cc/include/Makefile ============================================================================== --- stable/8/gnu/usr.bin/cc/include/Makefile Wed May 15 20:53:53 2013 (r250676) +++ stable/8/gnu/usr.bin/cc/include/Makefile Wed May 15 20:59:00 2013 (r250677) @@ -5,7 +5,8 @@ .PATH: ${GCCDIR}/config/${GCC_CPU} .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" -INCS= emmintrin.h mmintrin.h pmmintrin.h tmmintrin.h xmmintrin.h mm_malloc.h +INCS= emmintrin.h mmintrin.h mm3dnow.h pmmintrin.h tmmintrin.h xmmintrin.h \ + mm_malloc.h .elif ${TARGET_ARCH} == "ia64" INCS= ia64intrin.h .elif ${TARGET_ARCH} == "arm" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 20:59:01 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E39414FE; Wed, 15 May 2013 20:59:01 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D4EA9AAE; Wed, 15 May 2013 20:59:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FKx1Vt000661; Wed, 15 May 2013 20:59:01 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FKx1cv000660; Wed, 15 May 2013 20:59:01 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201305152059.r4FKx1cv000660@svn.freebsd.org> From: Dimitry Andric Date: Wed, 15 May 2013 20:59:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r250677 - in stable: 7/gnu/usr.bin/cc/include 8/gnu/usr.bin/cc/include 9/gnu/usr.bin/cc/include X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 20:59:02 -0000 Author: dim Date: Wed May 15 20:59:00 2013 New Revision: 250677 URL: http://svnweb.freebsd.org/changeset/base/250677 Log: MFC r250393: When gcc 4.2.0 was imported, the 3DNow intrinsics header was not added to the list of intrinsics headers to install, so belatedly (5 years :) add it. Modified: stable/7/gnu/usr.bin/cc/include/Makefile Directory Properties: stable/7/gnu/usr.bin/cc/include/ (props changed) Changes in other areas also in this revision: Modified: stable/8/gnu/usr.bin/cc/include/Makefile stable/9/gnu/usr.bin/cc/include/Makefile Directory Properties: stable/8/gnu/usr.bin/cc/include/ (props changed) stable/9/gnu/usr.bin/cc/include/ (props changed) Modified: stable/7/gnu/usr.bin/cc/include/Makefile ============================================================================== --- stable/7/gnu/usr.bin/cc/include/Makefile Wed May 15 20:53:53 2013 (r250676) +++ stable/7/gnu/usr.bin/cc/include/Makefile Wed May 15 20:59:00 2013 (r250677) @@ -5,7 +5,8 @@ .PATH: ${GCCDIR}/config/${GCC_CPU} .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" -INCS= emmintrin.h mmintrin.h pmmintrin.h tmmintrin.h xmmintrin.h mm_malloc.h +INCS= emmintrin.h mmintrin.h mm3dnow.h pmmintrin.h tmmintrin.h xmmintrin.h \ + mm_malloc.h .elif ${TARGET_ARCH} == "ia64" INCS= ia64intrin.h .elif ${TARGET_ARCH} == "arm" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 21:02:18 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id AEECEA7F; Wed, 15 May 2013 21:02:18 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A09F0AEA; Wed, 15 May 2013 21:02:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FL2IRr003145; Wed, 15 May 2013 21:02:18 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FL2IEL003144; Wed, 15 May 2013 21:02:18 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201305152102.r4FL2IEL003144@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 15 May 2013 21:02:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250678 - stable/9/usr.bin/kdump X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 21:02:18 -0000 Author: pluknet Date: Wed May 15 21:02:18 2013 New Revision: 250678 URL: http://svnweb.freebsd.org/changeset/base/250678 Log: MFC r246711: o Bring in sync decoding the first nfssvc(2) parameter (flags) with the current definitions location. o Respect numbers in NFSSVC_* (e.g. NFSSVC_V4ROOTEXPORT). Modified: stable/9/usr.bin/kdump/mksubr Directory Properties: stable/9/usr.bin/kdump/ (props changed) Modified: stable/9/usr.bin/kdump/mksubr ============================================================================== --- stable/9/usr.bin/kdump/mksubr Wed May 15 20:59:00 2013 (r250677) +++ stable/9/usr.bin/kdump/mksubr Wed May 15 21:02:18 2013 (r250678) @@ -367,7 +367,7 @@ auto_or_type "thrcreateflagsname" "THR_[ auto_or_type "mlockallname" "MCL_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h" auto_or_type "shmatname" "SHM_[A-Z]+[[:space:]]+[0-9]{6}+" "sys/shm.h" auto_or_type "rforkname" "RF[A-Z]+[[:space:]]+\([0-9]+<<[0-9]+\)" "sys/unistd.h" -auto_or_type "nfssvcname" "NFSSVC_[A-Z]+[[:space:]]+0x[0-9]+" "nfsserver/nfs.h" +auto_or_type "nfssvcname" "NFSSVC_[A-Z0-9]+[[:space:]]+0x[0-9]+" "nfs/nfssvc.h" auto_switch_type "whencename" "SEEK_[A-Z]+[[:space:]]+[0-9]+" "sys/unistd.h" auto_switch_type "rlimitname" "RLIMIT_[A-Z]+[[:space:]]+[0-9]+" "sys/resource.h" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 21:05:25 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C6997C24; Wed, 15 May 2013 21:05:25 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B7D36B08; Wed, 15 May 2013 21:05:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FL5PwW003911; Wed, 15 May 2013 21:05:25 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FL5PYw003910; Wed, 15 May 2013 21:05:25 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201305152105.r4FL5PYw003910@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 15 May 2013 21:05:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250679 - stable/8/usr.bin/kdump X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 21:05:25 -0000 Author: pluknet Date: Wed May 15 21:05:25 2013 New Revision: 250679 URL: http://svnweb.freebsd.org/changeset/base/250679 Log: MFC r246711: o Bring in sync decoding the first nfssvc(2) parameter (flags) with the current definitions location. o Respect numbers in NFSSVC_* (e.g. NFSSVC_V4ROOTEXPORT). Modified: stable/8/usr.bin/kdump/mksubr Directory Properties: stable/8/usr.bin/kdump/ (props changed) Modified: stable/8/usr.bin/kdump/mksubr ============================================================================== --- stable/8/usr.bin/kdump/mksubr Wed May 15 21:02:18 2013 (r250678) +++ stable/8/usr.bin/kdump/mksubr Wed May 15 21:05:25 2013 (r250679) @@ -365,7 +365,7 @@ auto_or_type "thrcreateflagsname" "THR_[ auto_or_type "mlockallname" "MCL_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h" auto_or_type "shmatname" "SHM_[A-Z]+[[:space:]]+[0-9]{6}+" "sys/shm.h" auto_or_type "rforkname" "RF[A-Z]+[[:space:]]+\([0-9]+<<[0-9]+\)" "sys/unistd.h" -auto_or_type "nfssvcname" "NFSSVC_[A-Z]+[[:space:]]+0x[0-9]+" "nfsserver/nfs.h" +auto_or_type "nfssvcname" "NFSSVC_[A-Z0-9]+[[:space:]]+0x[0-9]+" "nfs/nfssvc.h" auto_switch_type "whencename" "SEEK_[A-Z]+[[:space:]]+[0-9]+" "sys/unistd.h" auto_switch_type "rlimitname" "RLIMIT_[A-Z]+[[:space:]]+[0-9]+" "sys/resource.h" From owner-svn-src-stable@FreeBSD.ORG Wed May 15 21:16:16 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C5268113; Wed, 15 May 2013 21:16:16 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B7038BD5; Wed, 15 May 2013 21:16:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FLGGLn007875; Wed, 15 May 2013 21:16:16 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FLGGHR007871; Wed, 15 May 2013 21:16:16 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201305152116.r4FLGGHR007871@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 15 May 2013 21:16:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250681 - stable/9/lib/libc/gen X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 21:16:16 -0000 Author: pluknet Date: Wed May 15 21:16:16 2013 New Revision: 250681 URL: http://svnweb.freebsd.org/changeset/base/250681 Log: MFC r248250-248251: - Add the getcontextx prototype to SYNOPSIS. - Link getcontextx(3) to getcontext(3). Modified: stable/9/lib/libc/gen/Makefile.inc stable/9/lib/libc/gen/getcontext.3 Directory Properties: stable/9/lib/libc/ (props changed) Modified: stable/9/lib/libc/gen/Makefile.inc ============================================================================== --- stable/9/lib/libc/gen/Makefile.inc Wed May 15 21:08:51 2013 (r250680) +++ stable/9/lib/libc/gen/Makefile.inc Wed May 15 21:16:16 2013 (r250681) @@ -120,6 +120,7 @@ MLINKS+=getcap.3 cgetcap.3 getcap.3 cget getcap.3 cgetnum.3 getcap.3 cgetset.3 getcap.3 cgetstr.3 \ getcap.3 cgetustr.3 MLINKS+=getcwd.3 getwd.3 +MLINKS+=getcontext.3 getcontextx.3 MLINKS+=getcontext.3 setcontext.3 MLINKS+=getdomainname.3 setdomainname.3 MLINKS+=getfsent.3 endfsent.3 getfsent.3 getfsfile.3 getfsent.3 getfsspec.3 \ Modified: stable/9/lib/libc/gen/getcontext.3 ============================================================================== --- stable/9/lib/libc/gen/getcontext.3 Wed May 15 21:08:51 2013 (r250680) +++ stable/9/lib/libc/gen/getcontext.3 Wed May 15 21:16:16 2013 (r250681) @@ -35,7 +35,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 26, 2011 +.Dd March 13, 2013 .Dt GETCONTEXT 3 .Os .Sh NAME @@ -47,6 +47,8 @@ .In ucontext.h .Ft int .Fn getcontext "ucontext_t *ucp" +.Ft ucontext_t * +.Fn getcontextx "void" .Ft int .Fn setcontext "const ucontext_t *ucp" .Sh DESCRIPTION From owner-svn-src-stable@FreeBSD.ORG Wed May 15 21:19:06 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id F014737A; Wed, 15 May 2013 21:19:05 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E20FCBF0; Wed, 15 May 2013 21:19:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FLJ5fs008486; Wed, 15 May 2013 21:19:05 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FLJ5V8008484; Wed, 15 May 2013 21:19:05 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201305152119.r4FLJ5V8008484@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 15 May 2013 21:19:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250682 - stable/8/lib/libc/gen X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 21:19:06 -0000 Author: pluknet Date: Wed May 15 21:19:05 2013 New Revision: 250682 URL: http://svnweb.freebsd.org/changeset/base/250682 Log: MFC r248250-248251: - Add the getcontextx prototype to SYNOPSIS. - Link getcontextx(3) to getcontext(3). Modified: stable/8/lib/libc/gen/Makefile.inc stable/8/lib/libc/gen/getcontext.3 Directory Properties: stable/8/lib/libc/ (props changed) Modified: stable/8/lib/libc/gen/Makefile.inc ============================================================================== --- stable/8/lib/libc/gen/Makefile.inc Wed May 15 21:16:16 2013 (r250681) +++ stable/8/lib/libc/gen/Makefile.inc Wed May 15 21:19:05 2013 (r250682) @@ -106,6 +106,7 @@ MLINKS+=getcap.3 cgetcap.3 getcap.3 cget getcap.3 cgetnum.3 getcap.3 cgetset.3 getcap.3 cgetstr.3 \ getcap.3 cgetustr.3 MLINKS+=getcwd.3 getwd.3 +MLINKS+=getcontext.3 getcontextx.3 MLINKS+=getcontext.3 setcontext.3 MLINKS+=getdomainname.3 setdomainname.3 MLINKS+=getfsent.3 endfsent.3 getfsent.3 getfsfile.3 getfsent.3 getfsspec.3 \ Modified: stable/8/lib/libc/gen/getcontext.3 ============================================================================== --- stable/8/lib/libc/gen/getcontext.3 Wed May 15 21:16:16 2013 (r250681) +++ stable/8/lib/libc/gen/getcontext.3 Wed May 15 21:19:05 2013 (r250682) @@ -35,7 +35,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 26, 2011 +.Dd March 13, 2013 .Dt GETCONTEXT 3 .Os .Sh NAME @@ -47,6 +47,8 @@ .In ucontext.h .Ft int .Fn getcontext "ucontext_t *ucp" +.Ft ucontext_t * +.Fn getcontextx "void" .Ft int .Fn setcontext "const ucontext_t *ucp" .Sh DESCRIPTION From owner-svn-src-stable@FreeBSD.ORG Wed May 15 21:35:23 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2C55075D; Wed, 15 May 2013 21:35:23 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 01E57D0D; Wed, 15 May 2013 21:35:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FLZMr9014779; Wed, 15 May 2013 21:35:22 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FLZMgu014777; Wed, 15 May 2013 21:35:22 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201305152135.r4FLZMgu014777@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 15 May 2013 21:35:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250683 - stable/9/sys/dev/bktr X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 21:35:23 -0000 Author: pluknet Date: Wed May 15 21:35:22 2013 New Revision: 250683 URL: http://svnweb.freebsd.org/changeset/base/250683 Log: MFC r250088: Pass a format string to kproc_create() [1] and thus fix the build with -DBKTR_NEW_MSP34XX_DRIVER and -Wformat-security. Modified: stable/9/sys/dev/bktr/msp34xx.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/bktr/msp34xx.c ============================================================================== --- stable/9/sys/dev/bktr/msp34xx.c Wed May 15 21:19:05 2013 (r250682) +++ stable/9/sys/dev/bktr/msp34xx.c Wed May 15 21:35:22 2013 (r250683) @@ -134,7 +134,6 @@ struct msp3400c { /* thread */ struct proc *kthread; - char *threaddesc; int active,restart,rmmod; @@ -1147,12 +1146,6 @@ int msp_attach(bktr_ptr_t bktr) msp->bass = 32768; msp->treble = 32768; msp->input = -1; - msp->threaddesc = malloc(15 * sizeof(char), M_DEVBUF, M_NOWAIT); - if (msp->threaddesc == NULL) { - free(msp, M_DEVBUF); - return ENOMEM; - } - snprintf(msp->threaddesc, 14, "%s_msp34xx_thread", bktr->bktr_xname); for (i = 0; i < DFP_COUNT; i++) msp->dfp_regs[i] = -1; @@ -1163,7 +1156,6 @@ int msp_attach(bktr_ptr_t bktr) if (-1 != rev1) rev2 = msp3400c_read(bktr, I2C_MSP3400C_DFP, 0x1f); if ((-1 == rev1) || (0 == rev1 && 0 == rev2)) { - free(msp->threaddesc, M_DEVBUF); free(msp, M_DEVBUF); bktr->msp3400c_info = NULL; printf("%s: msp3400: error while reading chip version\n", bktr_name(bktr)); @@ -1199,10 +1191,9 @@ int msp_attach(bktr_ptr_t bktr) /* startup control thread */ err = kproc_create(msp->simple ? msp3410d_thread : msp3400c_thread, bktr, &msp->kthread, (RFFDG | RFPROC), 0, - msp->threaddesc); + "%s_msp34xx_thread", bktr->bktr_xname); if (err) { printf("%s: Error returned by kproc_create: %d", bktr_name(bktr), err); - free(msp->threaddesc, M_DEVBUF); free(msp, M_DEVBUF); bktr->msp3400c_info = NULL; return ENXIO; From owner-svn-src-stable@FreeBSD.ORG Wed May 15 21:37:09 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 15F8F975; Wed, 15 May 2013 21:37:09 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DABD8D2B; Wed, 15 May 2013 21:37:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FLb8MZ015138; Wed, 15 May 2013 21:37:08 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FLb8U8015137; Wed, 15 May 2013 21:37:08 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201305152137.r4FLb8U8015137@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 15 May 2013 21:37:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250684 - stable/8/sys/dev/bktr X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2013 21:37:09 -0000 Author: pluknet Date: Wed May 15 21:37:08 2013 New Revision: 250684 URL: http://svnweb.freebsd.org/changeset/base/250684 Log: MFC r250088: Pass a format string to kproc_create() [1] and thus fix the build with -DBKTR_NEW_MSP34XX_DRIVER and -Wformat-security. PR: kern/175546 Modified: stable/8/sys/dev/bktr/msp34xx.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/bktr/ (props changed) Modified: stable/8/sys/dev/bktr/msp34xx.c ============================================================================== --- stable/8/sys/dev/bktr/msp34xx.c Wed May 15 21:35:22 2013 (r250683) +++ stable/8/sys/dev/bktr/msp34xx.c Wed May 15 21:37:08 2013 (r250684) @@ -134,7 +134,6 @@ struct msp3400c { /* thread */ struct proc *kthread; - char *threaddesc; int active,restart,rmmod; @@ -1147,12 +1146,6 @@ int msp_attach(bktr_ptr_t bktr) msp->bass = 32768; msp->treble = 32768; msp->input = -1; - msp->threaddesc = malloc(15 * sizeof(char), M_DEVBUF, M_NOWAIT); - if (msp->threaddesc == NULL) { - free(msp, M_DEVBUF); - return ENOMEM; - } - snprintf(msp->threaddesc, 14, "%s_msp34xx_thread", bktr->bktr_xname); for (i = 0; i < DFP_COUNT; i++) msp->dfp_regs[i] = -1; @@ -1163,7 +1156,6 @@ int msp_attach(bktr_ptr_t bktr) if (-1 != rev1) rev2 = msp3400c_read(bktr, I2C_MSP3400C_DFP, 0x1f); if ((-1 == rev1) || (0 == rev1 && 0 == rev2)) { - free(msp->threaddesc, M_DEVBUF); free(msp, M_DEVBUF); bktr->msp3400c_info = NULL; printf("%s: msp3400: error while reading chip version\n", bktr_name(bktr)); @@ -1199,10 +1191,9 @@ int msp_attach(bktr_ptr_t bktr) /* startup control thread */ err = kproc_create(msp->simple ? msp3410d_thread : msp3400c_thread, bktr, &msp->kthread, (RFFDG | RFPROC), 0, - msp->threaddesc); + "%s_msp34xx_thread", bktr->bktr_xname); if (err) { printf("%s: Error returned by kproc_create: %d", bktr_name(bktr), err); - free(msp->threaddesc, M_DEVBUF); free(msp, M_DEVBUF); bktr->msp3400c_info = NULL; return ENXIO; From owner-svn-src-stable@FreeBSD.ORG Thu May 16 00:52:09 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 12B18696; Thu, 16 May 2013 00:52:09 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DFB9660E; Thu, 16 May 2013 00:52:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4G0q805083221; Thu, 16 May 2013 00:52:08 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4G0q8EW083220; Thu, 16 May 2013 00:52:08 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201305160052.r4G0q8EW083220@svn.freebsd.org> From: Rick Macklem Date: Thu, 16 May 2013 00:52:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250689 - stable/9/usr.sbin/gssd X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2013 00:52:09 -0000 Author: rmacklem Date: Thu May 16 00:52:08 2013 New Revision: 250689 URL: http://svnweb.freebsd.org/changeset/base/250689 Log: MFC: r250176 Fix the getpwuid_r() call in the gssd daemon so that it handles the ERANGE error return case. Without this fix, authentication of users for certain system setups could fail unexpectedly. Modified: stable/9/usr.sbin/gssd/gssd.c Directory Properties: stable/9/usr.sbin/gssd/ (props changed) Modified: stable/9/usr.sbin/gssd/gssd.c ============================================================================== --- stable/9/usr.sbin/gssd/gssd.c Thu May 16 00:18:25 2013 (r250688) +++ stable/9/usr.sbin/gssd/gssd.c Thu May 16 00:52:08 2013 (r250689) @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifndef WITHOUT_KERBEROS #include #endif @@ -557,8 +558,11 @@ gssd_pname_to_uid_1_svc(pname_to_uid_arg { gss_name_t name = gssd_find_resource(argp->pname); uid_t uid; - char buf[128]; + char buf[1024], *bufp; struct passwd pwd, *pw; + size_t buflen; + int error; + static size_t buflen_hint = 1024; memset(result, 0, sizeof(*result)); if (name) { @@ -567,7 +571,24 @@ gssd_pname_to_uid_1_svc(pname_to_uid_arg name, argp->mech, &uid); if (result->major_status == GSS_S_COMPLETE) { result->uid = uid; - getpwuid_r(uid, &pwd, buf, sizeof(buf), &pw); + buflen = buflen_hint; + for (;;) { + pw = NULL; + bufp = buf; + if (buflen > sizeof(buf)) + bufp = malloc(buflen); + if (bufp == NULL) + break; + error = getpwuid_r(uid, &pwd, bufp, buflen, + &pw); + if (error != ERANGE) + break; + if (buflen > sizeof(buf)) + free(bufp); + buflen += 1024; + if (buflen > buflen_hint) + buflen_hint = buflen; + } if (pw) { int len = NGRPS; int groups[NGRPS]; @@ -584,6 +605,8 @@ gssd_pname_to_uid_1_svc(pname_to_uid_arg result->gidlist.gidlist_len = 0; result->gidlist.gidlist_val = NULL; } + if (bufp != NULL && buflen > sizeof(buf)) + free(bufp); } } else { result->major_status = GSS_S_BAD_NAME; From owner-svn-src-stable@FreeBSD.ORG Thu May 16 00:56:42 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7CD5E842; Thu, 16 May 2013 00:56:42 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 53861630; Thu, 16 May 2013 00:56:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4G0ugaZ084079; Thu, 16 May 2013 00:56:42 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4G0ugQ8084078; Thu, 16 May 2013 00:56:42 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201305160056.r4G0ugQ8084078@svn.freebsd.org> From: Rick Macklem Date: Thu, 16 May 2013 00:56:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250690 - stable/9/kerberos5/lib/libgssapi_krb5 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2013 00:56:42 -0000 Author: rmacklem Date: Thu May 16 00:56:41 2013 New Revision: 250690 URL: http://svnweb.freebsd.org/changeset/base/250690 Log: MFC: r250177 Fix the getpwnam_r() call in the pname_to_uid() kerberos library function so that it handles the ERANGE error return case. Without this fix, authentication of users for certain system setups could fail unexpectedly. Modified: stable/9/kerberos5/lib/libgssapi_krb5/pname_to_uid.c Directory Properties: stable/9/kerberos5/lib/libgssapi_krb5/ (props changed) Modified: stable/9/kerberos5/lib/libgssapi_krb5/pname_to_uid.c ============================================================================== --- stable/9/kerberos5/lib/libgssapi_krb5/pname_to_uid.c Thu May 16 00:52:08 2013 (r250689) +++ stable/9/kerberos5/lib/libgssapi_krb5/pname_to_uid.c Thu May 16 00:56:41 2013 (r250690) @@ -26,6 +26,7 @@ */ /* $FreeBSD$ */ +#include #include #include "krb5/gsskrb5_locl.h" @@ -37,8 +38,12 @@ _gsskrb5_pname_to_uid(OM_uint32 *minor_s krb5_context context; krb5_const_principal name = (krb5_const_principal) pname; krb5_error_code kret; - char lname[MAXLOGNAME + 1], buf[128]; + char lname[MAXLOGNAME + 1], buf[1024], *bufp; struct passwd pwd, *pw; + size_t buflen; + int error; + OM_uint32 ret; + static size_t buflen_hint = 1024; GSSAPI_KRB5_INIT (&context); @@ -49,11 +54,30 @@ _gsskrb5_pname_to_uid(OM_uint32 *minor_s } *minor_status = 0; - getpwnam_r(lname, &pwd, buf, sizeof(buf), &pw); + buflen = buflen_hint; + for (;;) { + pw = NULL; + bufp = buf; + if (buflen > sizeof(buf)) + bufp = malloc(buflen); + if (bufp == NULL) + break; + error = getpwnam_r(lname, &pwd, bufp, buflen, &pw); + if (error != ERANGE) + break; + if (buflen > sizeof(buf)) + free(bufp); + buflen += 1024; + if (buflen > buflen_hint) + buflen_hint = buflen; + } if (pw) { *uidp = pw->pw_uid; - return (GSS_S_COMPLETE); + ret = GSS_S_COMPLETE; } else { - return (GSS_S_FAILURE); + ret = GSS_S_FAILURE; } + if (bufp != NULL && buflen > sizeof(buf)) + free(bufp); + return (ret); } From owner-svn-src-stable@FreeBSD.ORG Thu May 16 06:19:30 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id AD85F9D2; Thu, 16 May 2013 06:19:30 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9EF21AE; Thu, 16 May 2013 06:19:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4G6JUMJ097657; Thu, 16 May 2013 06:19:30 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4G6JTGe097655; Thu, 16 May 2013 06:19:29 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201305160619.r4G6JTGe097655@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 16 May 2013 06:19:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250694 - stable/9/sys/fs/msdosfs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2013 06:19:30 -0000 Author: kib Date: Thu May 16 06:19:29 2013 New Revision: 250694 URL: http://svnweb.freebsd.org/changeset/base/250694 Log: MFC r250193: Do a sync of the devvp vnode for the mount, which buffers, among other things, contain FAT blocks. This makes fsync(2) for msdosfs more correct by syncing the metadata needed to read the synced data. Modified: stable/9/sys/fs/msdosfs/msdosfs_denode.c stable/9/sys/fs/msdosfs/msdosfs_vnops.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/fs/ (props changed) Modified: stable/9/sys/fs/msdosfs/msdosfs_denode.c ============================================================================== --- stable/9/sys/fs/msdosfs/msdosfs_denode.c Thu May 16 05:16:56 2013 (r250693) +++ stable/9/sys/fs/msdosfs/msdosfs_denode.c Thu May 16 06:19:29 2013 (r250694) @@ -294,16 +294,20 @@ deupdat(dep, waitfor) struct denode *dep; int waitfor; { - int error; + struct direntry dir; + struct timespec ts; struct buf *bp; struct direntry *dirp; - struct timespec ts; + int error; - if (DETOV(dep)->v_mount->mnt_flag & MNT_RDONLY) + if (DETOV(dep)->v_mount->mnt_flag & MNT_RDONLY) { + dep->de_flag &= ~(DE_UPDATE | DE_CREATE | DE_ACCESS | + DE_MODIFIED); return (0); + } getnanotime(&ts); DETIMES(dep, &ts, &ts, &ts); - if ((dep->de_flag & DE_MODIFIED) == 0) + if ((dep->de_flag & DE_MODIFIED) == 0 && waitfor == 0) return (0); dep->de_flag &= ~DE_MODIFIED; if (dep->de_Attributes & ATTR_DIRECTORY) @@ -313,13 +317,23 @@ deupdat(dep, waitfor) error = readde(dep, &bp, &dirp); if (error) return (error); - DE_EXTERNALIZE(dirp, dep); + DE_EXTERNALIZE(&dir, dep); + if (bcmp(dirp, &dir, sizeof(dir)) == 0) { + if (waitfor == 0 || (bp->b_flags & B_DELWRI) == 0) { + brelse(bp); + return (0); + } + } else + *dirp = dir; + if ((DETOV(dep)->v_mount->mnt_flag & MNT_NOCLUSTERW) == 0) + bp->b_flags |= B_CLUSTEROK; if (waitfor) - return (bwrite(bp)); - else { + error = bwrite(bp); + else if (vm_page_count_severe() || buf_dirty_count_severe()) + bawrite(bp); + else bdwrite(bp); - return (0); - } + return (error); } /* Modified: stable/9/sys/fs/msdosfs/msdosfs_vnops.c ============================================================================== --- stable/9/sys/fs/msdosfs/msdosfs_vnops.c Thu May 16 05:16:56 2013 (r250693) +++ stable/9/sys/fs/msdosfs/msdosfs_vnops.c Thu May 16 06:19:29 2013 (r250694) @@ -850,9 +850,6 @@ errexit: /* * Flush the blocks of a file to disk. - * - * This function is worthless for vnodes that represent directories. Maybe we - * could just do a sync if they try an fsync on a directory file. */ static int msdosfs_fsync(ap) @@ -863,9 +860,35 @@ msdosfs_fsync(ap) struct thread *a_td; } */ *ap; { + struct vnode *devvp; + int allerror, error; vop_stdfsync(ap); - return (deupdat(VTODE(ap->a_vp), ap->a_waitfor == MNT_WAIT)); + + /* + * If the syncing request comes from fsync(2), sync the entire + * FAT and any other metadata that happens to be on devvp. We + * need this mainly for the FAT. We write the FAT sloppily, and + * syncing it all now is the best we can easily do to get all + * directory entries associated with the file (not just the file) + * fully synced. The other metadata includes critical metadata + * for all directory entries, but only in the MNT_ASYNC case. We + * will soon sync all metadata in the file's directory entry. + * Non-critical metadata for associated directory entries only + * gets synced accidentally, as in most file systems. + */ + if (ap->a_waitfor == MNT_WAIT) { + devvp = VTODE(ap->a_vp)->de_pmp->pm_devvp; + vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY); + allerror = VOP_FSYNC(devvp, MNT_WAIT, ap->a_td); + VOP_UNLOCK(devvp, 0); + } else + allerror = 0; + + error = deupdat(VTODE(ap->a_vp), ap->a_waitfor == MNT_WAIT); + if (allerror == 0) + allerror = error; + return (allerror); } static int From owner-svn-src-stable@FreeBSD.ORG Thu May 16 10:32:02 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B58E1A35; Thu, 16 May 2013 10:32:02 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A76BDD11; Thu, 16 May 2013 10:32:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4GAW2RR088013; Thu, 16 May 2013 10:32:02 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4GAW2Q8088010; Thu, 16 May 2013 10:32:02 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201305161032.r4GAW2Q8088010@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 16 May 2013 10:32:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250696 - stable/8/sys/fs/msdosfs X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2013 10:32:02 -0000 Author: kib Date: Thu May 16 10:32:01 2013 New Revision: 250696 URL: http://svnweb.freebsd.org/changeset/base/250696 Log: MFC r250193: Do a sync of the devvp vnode for the mount, which buffers, among other things, contain FAT blocks. This makes fsync(2) for msdosfs more correct by syncing the metadata needed to read the synced data. Modified: stable/8/sys/fs/msdosfs/msdosfs_denode.c stable/8/sys/fs/msdosfs/msdosfs_vnops.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/fs/ (props changed) Modified: stable/8/sys/fs/msdosfs/msdosfs_denode.c ============================================================================== --- stable/8/sys/fs/msdosfs/msdosfs_denode.c Thu May 16 09:43:04 2013 (r250695) +++ stable/8/sys/fs/msdosfs/msdosfs_denode.c Thu May 16 10:32:01 2013 (r250696) @@ -294,16 +294,20 @@ deupdat(dep, waitfor) struct denode *dep; int waitfor; { - int error; + struct direntry dir; + struct timespec ts; struct buf *bp; struct direntry *dirp; - struct timespec ts; + int error; - if (DETOV(dep)->v_mount->mnt_flag & MNT_RDONLY) + if (DETOV(dep)->v_mount->mnt_flag & MNT_RDONLY) { + dep->de_flag &= ~(DE_UPDATE | DE_CREATE | DE_ACCESS | + DE_MODIFIED); return (0); + } getnanotime(&ts); DETIMES(dep, &ts, &ts, &ts); - if ((dep->de_flag & DE_MODIFIED) == 0) + if ((dep->de_flag & DE_MODIFIED) == 0 && waitfor == 0) return (0); dep->de_flag &= ~DE_MODIFIED; if (dep->de_Attributes & ATTR_DIRECTORY) @@ -313,13 +317,23 @@ deupdat(dep, waitfor) error = readde(dep, &bp, &dirp); if (error) return (error); - DE_EXTERNALIZE(dirp, dep); + DE_EXTERNALIZE(&dir, dep); + if (bcmp(dirp, &dir, sizeof(dir)) == 0) { + if (waitfor == 0 || (bp->b_flags & B_DELWRI) == 0) { + brelse(bp); + return (0); + } + } else + *dirp = dir; + if ((DETOV(dep)->v_mount->mnt_flag & MNT_NOCLUSTERW) == 0) + bp->b_flags |= B_CLUSTEROK; if (waitfor) - return (bwrite(bp)); - else { + error = bwrite(bp); + else if (vm_page_count_severe() || buf_dirty_count_severe()) + bawrite(bp); + else bdwrite(bp); - return (0); - } + return (error); } /* Modified: stable/8/sys/fs/msdosfs/msdosfs_vnops.c ============================================================================== --- stable/8/sys/fs/msdosfs/msdosfs_vnops.c Thu May 16 09:43:04 2013 (r250695) +++ stable/8/sys/fs/msdosfs/msdosfs_vnops.c Thu May 16 10:32:01 2013 (r250696) @@ -851,9 +851,6 @@ errexit: /* * Flush the blocks of a file to disk. - * - * This function is worthless for vnodes that represent directories. Maybe we - * could just do a sync if they try an fsync on a directory file. */ static int msdosfs_fsync(ap) @@ -864,9 +861,35 @@ msdosfs_fsync(ap) struct thread *a_td; } */ *ap; { + struct vnode *devvp; + int allerror, error; vop_stdfsync(ap); - return (deupdat(VTODE(ap->a_vp), ap->a_waitfor == MNT_WAIT)); + + /* + * If the syncing request comes from fsync(2), sync the entire + * FAT and any other metadata that happens to be on devvp. We + * need this mainly for the FAT. We write the FAT sloppily, and + * syncing it all now is the best we can easily do to get all + * directory entries associated with the file (not just the file) + * fully synced. The other metadata includes critical metadata + * for all directory entries, but only in the MNT_ASYNC case. We + * will soon sync all metadata in the file's directory entry. + * Non-critical metadata for associated directory entries only + * gets synced accidentally, as in most file systems. + */ + if (ap->a_waitfor == MNT_WAIT) { + devvp = VTODE(ap->a_vp)->de_pmp->pm_devvp; + vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY); + allerror = VOP_FSYNC(devvp, MNT_WAIT, ap->a_td); + VOP_UNLOCK(devvp, 0); + } else + allerror = 0; + + error = deupdat(VTODE(ap->a_vp), ap->a_waitfor == MNT_WAIT); + if (allerror == 0) + allerror = error; + return (allerror); } static int From owner-svn-src-stable@FreeBSD.ORG Thu May 16 20:27:30 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D271159F; Thu, 16 May 2013 20:27:30 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C3F29F01; Thu, 16 May 2013 20:27:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4GKRUEY099682; Thu, 16 May 2013 20:27:30 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4GKRUEx099681; Thu, 16 May 2013 20:27:30 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305162027.r4GKRUEx099681@svn.freebsd.org> From: Eitan Adler Date: Thu, 16 May 2013 20:27:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250711 - stable/8/share/syscons/fonts X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2013 20:27:30 -0000 Author: eadler Date: Thu May 16 20:27:30 2013 New Revision: 250711 URL: http://svnweb.freebsd.org/changeset/base/250711 Log: MFC r250553: Add the letter 'x' to the font iso05-8x16.fnt PR: 169797 Modified: stable/8/share/syscons/fonts/iso04-wide-8x16.fnt Directory Properties: stable/8/share/ (props changed) stable/8/share/syscons/ (props changed) Modified: stable/8/share/syscons/fonts/iso04-wide-8x16.fnt ============================================================================== --- stable/8/share/syscons/fonts/iso04-wide-8x16.fnt Thu May 16 20:07:08 2013 (r250710) +++ stable/8/share/syscons/fonts/iso04-wide-8x16.fnt Thu May 16 20:27:30 2013 (r250711) @@ -42,7 +42,7 @@ MS'@``.!@8&!F9FQX;&9FY@`````X&!@8&!@8&!@ MP\/#``````````#<9F9F9F9F9@``````````?,;&QL;&QGP``````````-YC M8V-C8V-^8/````````![QL;&QL;&?@8/````````WG-C8&!@8/`````````` M`'S&P'` Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DF6025A0; Thu, 16 May 2013 20:27:30 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D0A74F02; Thu, 16 May 2013 20:27:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4GKRUcP099684; Thu, 16 May 2013 20:27:30 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4GKRUwG099683; Thu, 16 May 2013 20:27:30 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305162027.r4GKRUwG099683@svn.freebsd.org> From: Eitan Adler Date: Thu, 16 May 2013 20:27:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250712 - stable/9/share/syscons/fonts X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2013 20:27:31 -0000 Author: eadler Date: Thu May 16 20:27:30 2013 New Revision: 250712 URL: http://svnweb.freebsd.org/changeset/base/250712 Log: MFC r250553: Add the letter 'x' to the font iso05-8x16.fnt PR: 169797 Modified: stable/9/share/syscons/fonts/iso04-wide-8x16.fnt Directory Properties: stable/9/share/ (props changed) stable/9/share/syscons/ (props changed) Modified: stable/9/share/syscons/fonts/iso04-wide-8x16.fnt ============================================================================== --- stable/9/share/syscons/fonts/iso04-wide-8x16.fnt Thu May 16 20:27:30 2013 (r250711) +++ stable/9/share/syscons/fonts/iso04-wide-8x16.fnt Thu May 16 20:27:30 2013 (r250712) @@ -42,7 +42,7 @@ MS'@``.!@8&!F9FQX;&9FY@`````X&!@8&!@8&!@ MP\/#``````````#<9F9F9F9F9@``````````?,;&QL;&QGP``````````-YC M8V-C8V-^8/````````![QL;&QL;&?@8/````````WG-C8&!@8/`````````` M`'S&P'` Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7F54DAF3; Thu, 16 May 2013 20:32:10 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 71571F40; Thu, 16 May 2013 20:32:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4GKWAcQ002436; Thu, 16 May 2013 20:32:10 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4GKWAsx002435; Thu, 16 May 2013 20:32:10 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305162032.r4GKWAsx002435@svn.freebsd.org> From: Eitan Adler Date: Thu, 16 May 2013 20:32:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250713 - stable/9/share/syscons/fonts X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2013 20:32:10 -0000 Author: eadler Date: Thu May 16 20:32:09 2013 New Revision: 250713 URL: http://svnweb.freebsd.org/changeset/base/250713 Log: MFC r250459: Add the letter 'q' to the font iso05-8x16.fnt PR: 72585 PR: 169797 Modified: stable/9/share/syscons/fonts/iso05-8x16.fnt Directory Properties: stable/9/share/ (props changed) stable/9/share/syscons/ (props changed) Modified: stable/9/share/syscons/fonts/iso05-8x16.fnt ============================================================================== --- stable/9/share/syscons/fonts/iso05-8x16.fnt Thu May 16 20:27:30 2013 (r250712) +++ stable/9/share/syscons/fonts/iso05-8x16.fnt Thu May 16 20:32:09 2013 (r250713) @@ -40,7 +40,7 @@ M`'S&_L#`QGP````````X;&1@\&!@8&#P``````` M`.!@8&QV9F9F9N8````````8&``X&!@8&!@\````````!@8`#@8&!@8&!F9F M/````.!@8&9L>'AL9N8````````X&!@8&!@8&!@\````````````[/[6UM;6 MQ@```````````-QF9F9F9F8```````````!\QL;&QL9\````````````W&9F -M9F9F?&!@\`````````````````````````````#<=F9@8&#P```````````` +M9F9F?&!@\````````';,S,S,S'P,#!X```````#<=F9@8&#P```````````` M?,9@.`S&?````````!`P,/PP,#`P-AP```````````#,S,S,S,QV```````` M````9F9F9F8\&````````````,;&UM;6_FP```````````#&;#@X.&S&```` M````````QL;&QL;&?@8,^````````/[,&#!@QOX````````.&!@8 Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0B530C61; Thu, 16 May 2013 20:32:29 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F16C8F44; Thu, 16 May 2013 20:32:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4GKWSFZ002613; Thu, 16 May 2013 20:32:28 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4GKWScQ002612; Thu, 16 May 2013 20:32:28 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305162032.r4GKWScQ002612@svn.freebsd.org> From: Eitan Adler Date: Thu, 16 May 2013 20:32:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250714 - stable/8/share/syscons/fonts X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2013 20:32:29 -0000 Author: eadler Date: Thu May 16 20:32:28 2013 New Revision: 250714 URL: http://svnweb.freebsd.org/changeset/base/250714 Log: MFC r250459: Add the letter 'q' to the font iso05-8x16.fnt PR: 72585 PR: 169797 Modified: stable/8/share/syscons/fonts/iso05-8x16.fnt Directory Properties: stable/8/share/ (props changed) stable/8/share/syscons/ (props changed) Modified: stable/8/share/syscons/fonts/iso05-8x16.fnt ============================================================================== --- stable/8/share/syscons/fonts/iso05-8x16.fnt Thu May 16 20:32:09 2013 (r250713) +++ stable/8/share/syscons/fonts/iso05-8x16.fnt Thu May 16 20:32:28 2013 (r250714) @@ -40,7 +40,7 @@ M`'S&_L#`QGP````````X;&1@\&!@8&#P``````` M`.!@8&QV9F9F9N8````````8&``X&!@8&!@\````````!@8`#@8&!@8&!F9F M/````.!@8&9L>'AL9N8````````X&!@8&!@8&!@\````````````[/[6UM;6 MQ@```````````-QF9F9F9F8```````````!\QL;&QL9\````````````W&9F -M9F9F?&!@\`````````````````````````````#<=F9@8&#P```````````` +M9F9F?&!@\````````';,S,S,S'P,#!X```````#<=F9@8&#P```````````` M?,9@.`S&?````````!`P,/PP,#`P-AP```````````#,S,S,S,QV```````` M````9F9F9F8\&````````````,;&UM;6_FP```````````#&;#@X.&S&```` M````````QL;&QL;&?@8,^````````/[,&#!@QOX````````.&!@8 Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C355CED3; Thu, 16 May 2013 20:34:21 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B5074F5E; Thu, 16 May 2013 20:34:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4GKYLJW003075; Thu, 16 May 2013 20:34:21 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4GKYLXC003073; Thu, 16 May 2013 20:34:21 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201305162034.r4GKYLXC003073@svn.freebsd.org> From: Jilles Tjoelker Date: Thu, 16 May 2013 20:34:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250715 - stable/9/lib/libc/gen X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2013 20:34:21 -0000 Author: jilles Date: Thu May 16 20:34:21 2013 New Revision: 250715 URL: http://svnweb.freebsd.org/changeset/base/250715 Log: MFC r250412: posix_spawn_file_actions_addopen(3): Correct error for bad file descriptor. As per POSIX.1-2008, posix_spawn_file_actions_add* return [EBADF] if a file descriptor is negative, not [EINVAL]. The bug was only in the manual page; the code is correct. Modified: stable/9/lib/libc/gen/posix_spawn_file_actions_addopen.3 Directory Properties: stable/9/lib/libc/ (props changed) Modified: stable/9/lib/libc/gen/posix_spawn_file_actions_addopen.3 ============================================================================== --- stable/9/lib/libc/gen/posix_spawn_file_actions_addopen.3 Thu May 16 20:32:28 2013 (r250714) +++ stable/9/lib/libc/gen/posix_spawn_file_actions_addopen.3 Thu May 16 20:34:21 2013 (r250715) @@ -34,7 +34,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 24, 2008 +.Dd May 9, 2013 .Dt POSIX_SPAWN_FILE_ACTIONS_ADDOPEN 3 .Os .Sh NAME @@ -145,7 +145,7 @@ otherwise, an error number is returned t These functions fail if: .Bl -tag -width Er -.It Bq Er EINVAL +.It Bq Er EBADF The value specified by .Fa fildes or From owner-svn-src-stable@FreeBSD.ORG Thu May 16 20:35:54 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1B68FFF; Thu, 16 May 2013 20:35:54 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0DBB9F7A; Thu, 16 May 2013 20:35:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4GKZrU8003391; Thu, 16 May 2013 20:35:53 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4GKZrJv003390; Thu, 16 May 2013 20:35:53 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201305162035.r4GKZrJv003390@svn.freebsd.org> From: Jilles Tjoelker Date: Thu, 16 May 2013 20:35:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250716 - stable/9/lib/libc/gen X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2013 20:35:54 -0000 Author: jilles Date: Thu May 16 20:35:53 2013 New Revision: 250716 URL: http://svnweb.freebsd.org/changeset/base/250716 Log: MFC 250421: posix_spawn_file_actions_adddup2(3): Document difference with dup2(). The ability to clear a file descriptor's close-on-exec flag via posix_spawn_file_actions_adddup2() is in fact proposed in Austin Group issue #411. Modified: stable/9/lib/libc/gen/posix_spawn_file_actions_addopen.3 Directory Properties: stable/9/lib/libc/ (props changed) Modified: stable/9/lib/libc/gen/posix_spawn_file_actions_addopen.3 ============================================================================== --- stable/9/lib/libc/gen/posix_spawn_file_actions_addopen.3 Thu May 16 20:34:21 2013 (r250715) +++ stable/9/lib/libc/gen/posix_spawn_file_actions_addopen.3 Thu May 16 20:35:53 2013 (r250716) @@ -123,7 +123,19 @@ to be duplicated as dup2(fildes, newfildes) .Ed .Pp -had been called) when a new process is spawned using this file actions object. +had been called) when a new process is spawned using this file actions object, +except that the +.Dv FD_CLOEXEC +flag for +.Fa newfildes +is cleared even if +.Fa fildes +is equal to +.Fa newfildes . +The difference from +.Fn dup2 +is useful for passing a particular file descriptor +to a particular child process. .Pp The .Fn posix_spawn_file_actions_addclose @@ -169,7 +181,16 @@ The and .Fn posix_spawn_file_actions_addclose functions conform to -.St -p1003.1-2001 . +.St -p1003.1-2001 , +with the exception of the behavior of +.Fn posix_spawn_file_actions_adddup2 +if +.Fa fildes +is equal to +.Fa newfildes +(clearing +.Dv FD_CLOEXEC ) . +A future update of the Standard is expected to require this behavior, .Sh HISTORY The .Fn posix_spawn_file_actions_addopen , From owner-svn-src-stable@FreeBSD.ORG Fri May 17 00:14:36 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E80EE58E; Fri, 17 May 2013 00:14:36 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DA147861; Fri, 17 May 2013 00:14:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4H0Ea8S080510; Fri, 17 May 2013 00:14:36 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4H0EaxZ080509; Fri, 17 May 2013 00:14:36 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305170014.r4H0EaxZ080509@svn.freebsd.org> From: Eitan Adler Date: Fri, 17 May 2013 00:14:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250727 - stable/9/usr.sbin/wpa/wpa_supplicant X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 00:14:37 -0000 Author: eadler Date: Fri May 17 00:14:36 2013 New Revision: 250727 URL: http://svnweb.freebsd.org/changeset/base/250727 Log: MFC r250528: Teach wpa_supplicant to properly compute wireless signal strength. PR: bin/170631 Modified: stable/9/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c Directory Properties: stable/9/usr.sbin/wpa/ (props changed) stable/9/usr.sbin/wpa/wpa_supplicant/ (props changed) Modified: stable/9/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c ============================================================================== --- stable/9/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c Thu May 16 23:30:11 2013 (r250726) +++ stable/9/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c Fri May 17 00:14:36 2013 (r250727) @@ -693,6 +693,11 @@ wpa_driver_bsd_add_scan_entry(struct wpa result->caps = sr->isr_capinfo; result->qual = sr->isr_rssi; result->noise = sr->isr_noise; + /* + * the rssi value reported by the kernel is in 0.5dB steps relative to + * the reported noise floor. see ieee80211_node.h for details. + */ + result->level = sr->isr_rssi / 2 + sr->isr_noise; pos = (u8 *)(result + 1); From owner-svn-src-stable@FreeBSD.ORG Fri May 17 00:40:47 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 15E33A87; Fri, 17 May 2013 00:40:47 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 07E63922; Fri, 17 May 2013 00:40:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4H0ektn090035; Fri, 17 May 2013 00:40:46 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4H0ek9A090034; Fri, 17 May 2013 00:40:46 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305170040.r4H0ek9A090034@svn.freebsd.org> From: Eitan Adler Date: Fri, 17 May 2013 00:40:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250729 - stable/9/usr.sbin/vidcontrol X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 00:40:47 -0000 Author: eadler Date: Fri May 17 00:40:46 2013 New Revision: 250729 URL: http://svnweb.freebsd.org/changeset/base/250729 Log: MFC r250509: The M_VESA_MODE_MAX is latest valid mode - not the first invalid. Permit its use in vidcontrol -i PR: bin/119483 Modified: stable/9/usr.sbin/vidcontrol/vidcontrol.c Directory Properties: stable/9/usr.sbin/vidcontrol/ (props changed) Modified: stable/9/usr.sbin/vidcontrol/vidcontrol.c ============================================================================== --- stable/9/usr.sbin/vidcontrol/vidcontrol.c Fri May 17 00:26:56 2013 (r250728) +++ stable/9/usr.sbin/vidcontrol/vidcontrol.c Fri May 17 00:40:46 2013 (r250729) @@ -961,7 +961,7 @@ show_mode_info(void) printf("---------------------------------------" "---------------------------------------\n"); - for (mode = 0; mode < M_VESA_MODE_MAX; ++mode) { + for (mode = 0; mode <= M_VESA_MODE_MAX; ++mode) { _info.vi_mode = mode; if (ioctl(0, CONS_MODEINFO, &_info)) continue; From owner-svn-src-stable@FreeBSD.ORG Fri May 17 00:40:49 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 6B5AEA88; Fri, 17 May 2013 00:40:49 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5E3A0923; Fri, 17 May 2013 00:40:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4H0enkr090072; Fri, 17 May 2013 00:40:49 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4H0enqK090071; Fri, 17 May 2013 00:40:49 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201305170040.r4H0enqK090071@svn.freebsd.org> From: Eitan Adler Date: Fri, 17 May 2013 00:40:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250730 - stable/8/usr.sbin/vidcontrol X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 00:40:49 -0000 Author: eadler Date: Fri May 17 00:40:48 2013 New Revision: 250730 URL: http://svnweb.freebsd.org/changeset/base/250730 Log: MFC r250509: The M_VESA_MODE_MAX is latest valid mode - not the first invalid. Permit its use in vidcontrol -i PR: bin/119483 Modified: stable/8/usr.sbin/vidcontrol/vidcontrol.c Modified: stable/8/usr.sbin/vidcontrol/vidcontrol.c ============================================================================== --- stable/8/usr.sbin/vidcontrol/vidcontrol.c Fri May 17 00:40:46 2013 (r250729) +++ stable/8/usr.sbin/vidcontrol/vidcontrol.c Fri May 17 00:40:48 2013 (r250730) @@ -961,7 +961,7 @@ show_mode_info(void) printf("---------------------------------------" "---------------------------------------\n"); - for (mode = 0; mode < M_VESA_MODE_MAX; ++mode) { + for (mode = 0; mode <= M_VESA_MODE_MAX; ++mode) { _info.vi_mode = mode; if (ioctl(0, CONS_MODEINFO, &_info)) continue; From owner-svn-src-stable@FreeBSD.ORG Fri May 17 02:03:33 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id 775A2FCA; Fri, 17 May 2013 02:03:33 +0000 (UTC) Date: Fri, 17 May 2013 02:03:33 +0000 From: Alexey Dokuchaev To: Eitan Adler Subject: Re: svn commit: r250727 - stable/9/usr.sbin/wpa/wpa_supplicant Message-ID: <20130517020333.GA7012@FreeBSD.org> References: <201305170014.r4H0EaxZ080509@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201305170014.r4H0EaxZ080509@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 02:03:33 -0000 On Fri, May 17, 2013 at 12:14:36AM +0000, Eitan Adler wrote: > New Revision: 250727 > URL: http://svnweb.freebsd.org/changeset/base/250727 > > Log: > MFC r250528: > Teach wpa_supplicant to properly compute wireless signal strength. If this applicable to stable/8? If yes, can it be MFC'ed? ./danfe From owner-svn-src-stable@FreeBSD.ORG Fri May 17 03:55:04 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7D41049A; Fri, 17 May 2013 03:55:04 +0000 (UTC) (envelope-from grog@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 601B02CC; Fri, 17 May 2013 03:55:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4H3t42G058788; Fri, 17 May 2013 03:55:04 GMT (envelope-from grog@svn.freebsd.org) Received: (from grog@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4H3t4rX058785; Fri, 17 May 2013 03:55:04 GMT (envelope-from grog@svn.freebsd.org) Message-Id: <201305170355.r4H3t4rX058785@svn.freebsd.org> From: Greg Lehey Date: Fri, 17 May 2013 03:55:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250733 - stable/9/bin/df X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 03:55:04 -0000 Author: grog Date: Fri May 17 03:55:03 2013 New Revision: 250733 URL: http://svnweb.freebsd.org/changeset/base/250733 Log: MFC revisions 243049,243129,244134,245871,245912,249698,249924 Modified: stable/9/bin/df/df.1 stable/9/bin/df/df.c Directory Properties: stable/9/bin/df/ (props changed) Modified: stable/9/bin/df/df.1 ============================================================================== --- stable/9/bin/df/df.1 Fri May 17 03:52:20 2013 (r250732) +++ stable/9/bin/df/df.1 Fri May 17 03:55:03 2013 (r250733) @@ -29,7 +29,7 @@ .\" @(#)df.1 8.3 (Berkeley) 5/8/95 .\" $FreeBSD$ .\" -.Dd March 3, 2012 +.Dd January 24, 2013 .Dt DF 1 .Os .Sh NAME @@ -39,6 +39,7 @@ .Nm .Op Fl b | g | H | h | k | m | P .Op Fl acilnT +.Op Fl \&, .Op Fl t Ar type .Op Ar file | filesystem ... .Sh DESCRIPTION @@ -50,7 +51,8 @@ displays statistics about the amount of or on the file system of which .Ar file is a part. -Values are displayed in 512-byte per block counts. +By default block counts are displayed with an assumed block size of +512 bytes. If neither a file or a file system operand is specified, statistics for all mounted file systems are displayed (subject to the @@ -65,48 +67,54 @@ Show all mount points, including those t flag. This is implied for file systems specified on the command line. .It Fl b -Use 512-byte blocks rather than the default. -Note that -this overrides the +Explicitly use 512 byte blocks, overriding any .Ev BLOCKSIZE specification from the environment. +This is the same as the +.Fl P +option. +The +.Fl k +option overrides this option. .It Fl c Display a grand total. .It Fl g -Use 1073741824-byte (1-Gbyte) blocks rather than the default. -Note that -this overrides the +Use 1073741824 byte (1 Gibibyte) blocks rather than the default. +This overrides any .Ev BLOCKSIZE specification from the environment. .It Fl H .Dq Human-readable output. -Use unit suffixes: Byte, Kilobyte, Megabyte, -Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to four or fewer using base 10 for sizes. +Use unit suffixes: Byte, Kibibyte, Mebibyte, Gibibyte, Tebibyte and +Pebibyte (based on powers of 1024) in order to reduce the number of +digits to four or fewer. .It Fl h .Dq Human-readable output. Use unit suffixes: Byte, Kilobyte, Megabyte, -Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to four or fewer using base 2 for sizes. -Inodes statistics, if enabled with -.Fl i , -are always printed in base 10. +Gigabyte, Terabyte and Petabyte (based on powers of 1000) in order to +reduce the number of +digits to four or fewer. .It Fl i -Include statistics on the number of free inodes. +Include statistics on the number of free and used inodes. +In conjunction with the +.Fl h +or +.Fl H +options, the number of inodes is scaled by powers of 1000. .It Fl k -Use 1024-byte (1-Kbyte) blocks rather than the default. -Note that -this overrides the +Use 1024 byte (1 Kibibyte) blocks rather than the default. +This overrides the +.Fl P +option and any .Ev BLOCKSIZE specification from the environment. .It Fl l Only display information about locally-mounted file systems. .It Fl m -Use 1048576-byte (1-Mbyte) blocks rather than the default. -Note that -this overrides the +Use 1048576 byte (1 Mebibyte) blocks rather than the default. +This overrides any .Ev BLOCKSIZE specification from the environment. .It Fl n @@ -119,10 +127,15 @@ When this option is specified, will not request new statistics from the file systems, but will respond with the possibly stale statistics that were previously obtained. .It Fl P -Use POSIX compliant output of 512-byte blocks rather than the default. -Note that this overrides the +Explicitly use 512 byte blocks, overriding any .Ev BLOCKSIZE specification from the environment. +This is the same as the +.Fl b +option. +The +.Fl k +option overrides this option. .It Fl t Only print out statistics for file systems of the specified types. More than one type may be specified in a comma separated list. @@ -148,13 +161,29 @@ command can be used to find out the type that are available on the system. .It Fl T Include file system type. +.It Fl , +(Comma) Print sizes grouped and separated by thousands using the +non-monetary separator returned by +.Xr localeconv 3 , +typically a comma or period. +If no locale is set, or the locale does not have a non-monetary separator, this +option has no effect. .El .Sh ENVIRONMENT .Bl -tag -width BLOCKSIZE .It Ev BLOCKSIZE -If the environment variable -.Ev BLOCKSIZE -is set, the block counts will be displayed in units of that size block. +Specifies the units in which to report block counts. +This uses +.Xr getbsize 3 , +which allows units of bytes or numbers scaled with the letters +.Em k +(for multiples of 1024 bytes), +.Em m +(for multiples of 1048576 bytes) or +.Em g +(for gibibytes). +The allowed range is 512 bytes to 1 GB. +If the value is outside, it will be set to the appropriate limit. .El .Sh SEE ALSO .Xr lsvfs 1 , @@ -164,10 +193,23 @@ is set, the block counts will be display .Xr fstatfs 2 , .Xr getfsstat 2 , .Xr statfs 2 , +.Xr getbsize 3 , .Xr getmntinfo 3 , +.Xr localeconv 3 , .Xr fstab 5 , .Xr mount 8 , -.Xr quot 8 +.Xr quot 8 . +.Sh STANDARDS +With the exception of most options, +the +.Nm +utility conforms to +.St -p1003.1-2004 , +which defines only the +.Fl k , P +and +.Fl t +options. .Sh HISTORY A .Nm @@ -180,3 +222,13 @@ flag is ignored if a file or file system Also, if a mount point is not accessible by the user, it is possible that the file system information could be stale. +.Pp +The +.Fl b +and +.Fl P +options are identical. +The former comes from the BSD tradition, and the latter is required +for +.St -p1003.1-2004 +conformity. Modified: stable/9/bin/df/df.c ============================================================================== --- stable/9/bin/df/df.c Fri May 17 03:52:20 2013 (r250732) +++ stable/9/bin/df/df.c Fri May 17 03:55:03 2013 (r250733) @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -95,6 +96,7 @@ imax(int a, int b) } static int aflag = 0, cflag, hflag, iflag, kflag, lflag = 0, nflag, Tflag; +static int thousands; static struct ufs_args mdev; int @@ -111,12 +113,13 @@ main(int argc, char *argv[]) int ch, rv; fstype = "ufs"; - + (void)setlocale(LC_ALL, ""); + memset(&maxwidths, 0, sizeof(maxwidths)); memset(&totalbuf, 0, sizeof(totalbuf)); totalbuf.f_bsize = DEV_BSIZE; strlcpy(totalbuf.f_mntfromname, "total", MNAMELEN); vfslist = NULL; - while ((ch = getopt(argc, argv, "abcgHhiklmnPt:T")) != -1) + while ((ch = getopt(argc, argv, "abcgHhiklmnPt:T,")) != -1) switch (ch) { case 'a': aflag = 1; @@ -180,6 +183,9 @@ main(int argc, char *argv[]) case 'T': Tflag = 1; break; + case ',': + thousands = 1; + break; case '?': default: usage(); @@ -195,7 +201,7 @@ main(int argc, char *argv[]) } else { /* just the filesystems specified on the command line */ mntbuf = malloc(argc * sizeof(*mntbuf)); - if (mntbuf == 0) + if (mntbuf == NULL) err(1, "malloc()"); mntsize = 0; /* continued in for loop below */ @@ -204,13 +210,13 @@ main(int argc, char *argv[]) /* iterate through specified filesystems */ for (; *argv; argv++) { if (stat(*argv, &stbuf) < 0) { - if ((mntpt = getmntpt(*argv)) == 0) { + if ((mntpt = getmntpt(*argv)) == NULL) { warn("%s", *argv); rv = 1; continue; } } else if (S_ISCHR(stbuf.st_mode)) { - if ((mntpt = getmntpt(*argv)) == 0) { + if ((mntpt = getmntpt(*argv)) == NULL) { mdev.fspec = *argv; mntpath = strdup("/tmp/df.XXXXXX"); if (mntpath == NULL) { @@ -277,7 +283,7 @@ main(int argc, char *argv[]) mntbuf[mntsize++] = statfsbuf; } - bzero(&maxwidths, sizeof(maxwidths)); + memset(&maxwidths, 0, sizeof(maxwidths)); for (i = 0; i < mntsize; i++) { if (aflag || (mntbuf[i].f_flags & MNT_IGNORE) == 0) { update_maxwidths(&maxwidths, &mntbuf[i]); @@ -304,7 +310,7 @@ getmntpt(const char *name) if (!strcmp(mntbuf[i].f_mntfromname, name)) return (mntbuf[i].f_mntonname); } - return (0); + return (NULL); } /* @@ -388,16 +394,11 @@ prthumanvalinode(int64_t bytes) /* * Convert statfs returned file system size into BLOCKSIZE units. - * Attempts to avoid overflow for large file systems. */ static intmax_t fsbtoblk(int64_t num, uint64_t fsbs, u_long bs) { - - if (fsbs != 0 && fsbs < bs) - return (num / (intmax_t)(bs / fsbs)); - else - return (num * (intmax_t)(fsbs / bs)); + return (num * (intmax_t) fsbs / (int64_t) bs); } /* @@ -410,10 +411,18 @@ prtstat(struct statfs *sfsp, struct maxw static int headerlen, timesthrough = 0; static const char *header; int64_t used, availblks, inodes; + const char *format; if (++timesthrough == 1) { mwp->mntfrom = imax(mwp->mntfrom, (int)strlen("Filesystem")); mwp->fstype = imax(mwp->fstype, (int)strlen("Type")); + if (thousands) { /* make space for commas */ + mwp->total += (mwp->total - 1) / 3; + mwp->used += (mwp->used - 1) / 3; + mwp->avail += (mwp->avail - 1) / 3; + mwp->iused += (mwp->iused - 1) / 3; + mwp->ifree += (mwp->ifree - 1) / 3; + } if (hflag) { header = " Size"; mwp->total = mwp->used = mwp->avail = @@ -428,7 +437,7 @@ prtstat(struct statfs *sfsp, struct maxw (void)printf("%-*s", mwp->mntfrom, "Filesystem"); if (Tflag) (void)printf(" %-*s", mwp->fstype, "Type"); - (void)printf(" %-*s %*s %*s Capacity", mwp->total, header, + (void)printf(" %*s %*s %*s Capacity", mwp->total, header, mwp->used, "Used", mwp->avail, "Avail"); if (iflag) { mwp->iused = imax(hflag ? 0 : mwp->iused, @@ -440,6 +449,12 @@ prtstat(struct statfs *sfsp, struct maxw } (void)printf(" Mounted on\n"); } + /* Check for 0 block size. Can this happen? */ + if (sfsp->f_bsize == 0) { + warnx ("File system %s does not have a block size, assuming 512.", + sfsp->f_mntonname); + sfsp->f_bsize = 512; + } (void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname); if (Tflag) (void)printf(" %-*s", mwp->fstype, sfsp->f_fstypename); @@ -448,7 +463,11 @@ prtstat(struct statfs *sfsp, struct maxw if (hflag) { prthuman(sfsp, used); } else { - (void)printf(" %*jd %*jd %*jd", + if (thousands) + format = " %*j'd %*j'd %*j'd"; + else + format = " %*jd %*jd %*jd"; + (void)printf(format, mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), @@ -465,7 +484,11 @@ prtstat(struct statfs *sfsp, struct maxw prthumanvalinode(used); prthumanvalinode(sfsp->f_ffree); } else { - (void)printf(" %*jd %*jd", mwp->iused, (intmax_t)used, + if (thousands) + format = " %*j'd %*j'd"; + else + format = " %*jd %*jd"; + (void)printf(format, mwp->iused, (intmax_t)used, mwp->ifree, (intmax_t)sfsp->f_ffree); } (void)printf(" %4.0f%% ", inodes == 0 ? 100.0 : @@ -542,7 +565,8 @@ usage(void) { (void)fprintf(stderr, -"usage: df [-b | -g | -H | -h | -k | -m | -P] [-acilnT] [-t type] [file | filesystem ...]\n"); +"usage: df [-b | -g | -H | -h | -k | -m | -P] [-acilnT] [-t type] [-,]\n" +" [file | filesystem ...]\n"); exit(EX_USAGE); } From owner-svn-src-stable@FreeBSD.ORG Fri May 17 04:09:05 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5E33C7FD; Fri, 17 May 2013 04:09:05 +0000 (UTC) (envelope-from hiren@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4DE32364; Fri, 17 May 2013 04:09:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4H495E0063276; Fri, 17 May 2013 04:09:05 GMT (envelope-from hiren@svn.freebsd.org) Received: (from hiren@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4H495sj063275; Fri, 17 May 2013 04:09:05 GMT (envelope-from hiren@svn.freebsd.org) Message-Id: <201305170409.r4H495sj063275@svn.freebsd.org> From: Hiren Panchasara Date: Fri, 17 May 2013 04:09:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250734 - stable/9/sys/x86/cpufreq X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 04:09:05 -0000 Author: hiren Date: Fri May 17 04:09:04 2013 New Revision: 250734 URL: http://svnweb.freebsd.org/changeset/base/250734 Log: MFC: r250487 Adding a detach method to p4tcc driver. PR: 118739 Submitted by: Dan Lukes (earlier version) Reviewed by: jhb Approved by: sbruno (mentor) Modified: stable/9/sys/x86/cpufreq/p4tcc.c Directory Properties: stable/9/ (props changed) stable/9/sys/ (props changed) Modified: stable/9/sys/x86/cpufreq/p4tcc.c ============================================================================== --- stable/9/sys/x86/cpufreq/p4tcc.c Fri May 17 03:55:03 2013 (r250733) +++ stable/9/sys/x86/cpufreq/p4tcc.c Fri May 17 04:09:04 2013 (r250734) @@ -73,6 +73,7 @@ static int p4tcc_features(driver_t *driv static void p4tcc_identify(driver_t *driver, device_t parent); static int p4tcc_probe(device_t dev); static int p4tcc_attach(device_t dev); +static int p4tcc_detach(device_t dev); static int p4tcc_settings(device_t dev, struct cf_setting *sets, int *count); static int p4tcc_set(device_t dev, const struct cf_setting *set); @@ -84,6 +85,7 @@ static device_method_t p4tcc_methods[] = DEVMETHOD(device_identify, p4tcc_identify), DEVMETHOD(device_probe, p4tcc_probe), DEVMETHOD(device_attach, p4tcc_attach), + DEVMETHOD(device_detach, p4tcc_detach), /* cpufreq interface */ DEVMETHOD(cpufreq_drv_set, p4tcc_set), @@ -213,6 +215,24 @@ p4tcc_attach(device_t dev) } static int +p4tcc_detach(device_t dev) +{ + struct cf_setting set; + int error; + + error = cpufreq_unregister(dev); + if (error) + return (error); + + /* + * Before we finish detach, switch to Automatic mode. + */ + set.freq = 10000; + p4tcc_set(dev, &set); + return(0); +} + +static int p4tcc_settings(device_t dev, struct cf_setting *sets, int *count) { struct p4tcc_softc *sc; From owner-svn-src-stable@FreeBSD.ORG Fri May 17 05:45:10 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id 13DA94C0; Fri, 17 May 2013 05:45:10 +0000 (UTC) Date: Fri, 17 May 2013 05:45:10 +0000 From: Alexey Dokuchaev To: Hiren Panchasara Subject: Re: svn commit: r250734 - stable/9/sys/x86/cpufreq Message-ID: <20130517054509.GA52849@FreeBSD.org> References: <201305170409.r4H495sj063275@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201305170409.r4H495sj063275@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 05:45:10 -0000 On Fri, May 17, 2013 at 04:09:05AM +0000, Hiren Panchasara wrote: > New Revision: 250734 > URL: http://svnweb.freebsd.org/changeset/base/250734 > > Log: > MFC: r250487 > > Adding a detach method to p4tcc driver. Would it also benefit stable/8? If yes, could it be MFC'ed? ./danfe From owner-svn-src-stable@FreeBSD.ORG Fri May 17 17:16:30 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 05109D23; Fri, 17 May 2013 17:16:30 +0000 (UTC) (envelope-from hiren@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EBCA0BFD; Fri, 17 May 2013 17:16:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HHGT3E039570; Fri, 17 May 2013 17:16:29 GMT (envelope-from hiren@svn.freebsd.org) Received: (from hiren@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HHGTci039569; Fri, 17 May 2013 17:16:29 GMT (envelope-from hiren@svn.freebsd.org) Message-Id: <201305171716.r4HHGTci039569@svn.freebsd.org> From: Hiren Panchasara Date: Fri, 17 May 2013 17:16:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250743 - stable/8/sys/x86/cpufreq X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 17:16:30 -0000 Author: hiren Date: Fri May 17 17:16:29 2013 New Revision: 250743 URL: http://svnweb.freebsd.org/changeset/base/250743 Log: MFC: r250487 Adding a detach method to p4tcc driver. PR: 118739 Submitted by: Dan Lukes (earlier version) Reviewed by: jhb Approved by: sbruno (mentor) Modified: stable/8/sys/x86/cpufreq/p4tcc.c Directory Properties: stable/8/ (props changed) stable/8/sys/ (props changed) stable/8/sys/x86/ (props changed) Modified: stable/8/sys/x86/cpufreq/p4tcc.c ============================================================================== --- stable/8/sys/x86/cpufreq/p4tcc.c Fri May 17 15:20:45 2013 (r250742) +++ stable/8/sys/x86/cpufreq/p4tcc.c Fri May 17 17:16:29 2013 (r250743) @@ -73,6 +73,7 @@ static int p4tcc_features(driver_t *driv static void p4tcc_identify(driver_t *driver, device_t parent); static int p4tcc_probe(device_t dev); static int p4tcc_attach(device_t dev); +static int p4tcc_detach(device_t dev); static int p4tcc_settings(device_t dev, struct cf_setting *sets, int *count); static int p4tcc_set(device_t dev, const struct cf_setting *set); @@ -84,6 +85,7 @@ static device_method_t p4tcc_methods[] = DEVMETHOD(device_identify, p4tcc_identify), DEVMETHOD(device_probe, p4tcc_probe), DEVMETHOD(device_attach, p4tcc_attach), + DEVMETHOD(device_detach, p4tcc_detach), /* cpufreq interface */ DEVMETHOD(cpufreq_drv_set, p4tcc_set), @@ -213,6 +215,24 @@ p4tcc_attach(device_t dev) } static int +p4tcc_detach(device_t dev) +{ + struct cf_setting set; + int error; + + error = cpufreq_unregister(dev); + if (error) + return (error); + + /* + * Before we finish detach, switch to Automatic mode. + */ + set.freq = 10000; + p4tcc_set(dev, &set); + return(0); +} + +static int p4tcc_settings(device_t dev, struct cf_setting *sets, int *count) { struct p4tcc_softc *sc; From owner-svn-src-stable@FreeBSD.ORG Fri May 17 17:19:26 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 91C06EB4; Fri, 17 May 2013 17:19:26 +0000 (UTC) (envelope-from hiren.panchasara@gmail.com) Received: from mail-ea0-x22d.google.com (mail-ea0-x22d.google.com [IPv6:2a00:1450:4013:c01::22d]) by mx1.freebsd.org (Postfix) with ESMTP id 7A132C1F; Fri, 17 May 2013 17:19:25 +0000 (UTC) Received: by mail-ea0-f173.google.com with SMTP id n15so2598293ead.18 for ; Fri, 17 May 2013 10:19:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=Q83HzlgMuYNWMBfJ1FLKoxxJSsXEhn9AEjT+YfB5CNs=; b=wGQkIXfVyalflKGeih52ZB2uxyZf245GGEzaobhMnxEzl5c0rDHkvSsTFn0jRCOI43 NaF15Uz57OYciWGrvuDHCYMvIC5m8SNm4ixaBhQaX1zHlP32r//MLiAJXXYUe11cCKdw IvBI36r1NILT87swSInEniydoByWfkHBO+VWW4YDxe1gu47HqcxzEpDXVaLh4DO6gDuT PP4ei+2i5LbdRe2Q8CVNSErN/f34EI4ZRtGhn0L+wPQ7+MO/Pt4AXPoF1tICVdZ1Biam yMg/9kH6JctoUZsxl94TgTfPrFYB5HcVqqppIwpebz6bgfoD0Fg9es1IhA5JUKokeUK5 MFuQ== MIME-Version: 1.0 X-Received: by 10.15.94.131 with SMTP id bb3mr80198102eeb.20.1368811164542; Fri, 17 May 2013 10:19:24 -0700 (PDT) Sender: hiren.panchasara@gmail.com Received: by 10.14.130.66 with HTTP; Fri, 17 May 2013 10:19:24 -0700 (PDT) In-Reply-To: <20130517054509.GA52849@FreeBSD.org> References: <201305170409.r4H495sj063275@svn.freebsd.org> <20130517054509.GA52849@FreeBSD.org> Date: Fri, 17 May 2013 10:19:24 -0700 X-Google-Sender-Auth: NTJUwOJjhfk0CFUO8MMe-ahlYm4 Message-ID: Subject: Re: svn commit: r250734 - stable/9/sys/x86/cpufreq From: hiren panchasara To: Alexey Dokuchaev Content-Type: text/plain; charset=UTF-8 Cc: svn-src-stable@freebsd.org, svn-src-all , src-committers , svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 17:19:26 -0000 On Thu, May 16, 2013 at 10:45 PM, Alexey Dokuchaev wrote: > On Fri, May 17, 2013 at 04:09:05AM +0000, Hiren Panchasara wrote: >> New Revision: 250734 >> URL: http://svnweb.freebsd.org/changeset/base/250734 >> >> Log: >> MFC: r250487 >> >> Adding a detach method to p4tcc driver. > > Would it also benefit stable/8? If yes, could it be MFC'ed? Committed: r250743 Cheers, Hiren > > ./danfe From owner-svn-src-stable@FreeBSD.ORG Fri May 17 17:45:01 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 258685F8; Fri, 17 May 2013 17:45:01 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 15F8ED63; Fri, 17 May 2013 17:45:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HHj0pG049623; Fri, 17 May 2013 17:45:00 GMT (envelope-from zec@svn.freebsd.org) Received: (from zec@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HHj040049622; Fri, 17 May 2013 17:45:00 GMT (envelope-from zec@svn.freebsd.org) Message-Id: <201305171745.r4HHj040049622@svn.freebsd.org> From: Marko Zec Date: Fri, 17 May 2013 17:45:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250744 - stable/9/sys/netinet X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 17:45:01 -0000 Author: zec Date: Fri May 17 17:45:00 2013 New Revision: 250744 URL: http://svnweb.freebsd.org/changeset/base/250744 Log: MFC 233601: Permit tcpdrop in VNET jails. Modified: stable/9/sys/netinet/tcp_subr.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/netinet/tcp_subr.c ============================================================================== --- stable/9/sys/netinet/tcp_subr.c Fri May 17 17:16:29 2013 (r250743) +++ stable/9/sys/netinet/tcp_subr.c Fri May 17 17:45:00 2013 (r250744) @@ -2192,7 +2192,7 @@ sysctl_drop(SYSCTL_HANDLER_ARGS) return (error); } -SYSCTL_PROC(_net_inet_tcp, TCPCTL_DROP, drop, +SYSCTL_VNET_PROC(_net_inet_tcp, TCPCTL_DROP, drop, CTLTYPE_STRUCT|CTLFLAG_WR|CTLFLAG_SKIP, NULL, 0, sysctl_drop, "", "Drop TCP connection"); From owner-svn-src-stable@FreeBSD.ORG Fri May 17 18:23:36 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id 07326145; Fri, 17 May 2013 18:23:36 +0000 (UTC) Date: Fri, 17 May 2013 18:23:36 +0000 From: Alexey Dokuchaev To: hiren panchasara Subject: Re: svn commit: r250734 - stable/9/sys/x86/cpufreq Message-ID: <20130517182335.GA19683@FreeBSD.org> References: <201305170409.r4H495sj063275@svn.freebsd.org> <20130517054509.GA52849@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-stable@freebsd.org, svn-src-all , src-committers , svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 18:23:36 -0000 On Fri, May 17, 2013 at 10:19:24AM -0700, hiren panchasara wrote: > On Thu, May 16, 2013 at 10:45 PM, Alexey Dokuchaev wrote: > > On Fri, May 17, 2013 at 04:09:05AM +0000, Hiren Panchasara wrote: > >> New Revision: 250734 > >> URL: http://svnweb.freebsd.org/changeset/base/250734 > >> > >> Log: > >> MFC: r250487 > >> > >> Adding a detach method to p4tcc driver. > > > > Would it also benefit stable/8? If yes, could it be MFC'ed? > > Committed: r250743 Seen it, thanks! ./danfe From owner-svn-src-stable@FreeBSD.ORG Fri May 17 20:12:57 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7CDA7208; Fri, 17 May 2013 20:12:57 +0000 (UTC) (envelope-from trociny@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5EDB4350; Fri, 17 May 2013 20:12:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HKCv76004530; Fri, 17 May 2013 20:12:57 GMT (envelope-from trociny@svn.freebsd.org) Received: (from trociny@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HKCv9D004528; Fri, 17 May 2013 20:12:57 GMT (envelope-from trociny@svn.freebsd.org) Message-Id: <201305172012.r4HKCv9D004528@svn.freebsd.org> From: Mikolaj Golub Date: Fri, 17 May 2013 20:12:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250752 - in stable/9/sys: kern sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 20:12:57 -0000 Author: trociny Date: Fri May 17 20:12:56 2013 New Revision: 250752 URL: http://svnweb.freebsd.org/changeset/base/250752 Log: MFC r249558, r250145: r249558: Add a new set of notes to a process core dump to store procstat data. The notes format is a header of sizeof(int), which stores the size of the corresponding data structure to provide some versioning, and data in the format as it is returned by a related sysctl call. The userland tools (procstat(1)) will be taught to extract this data, providing additional info for postmortem analysis. PR: kern/173723 Suggested by: jhb Discussed with: jhb, kib Reviewed by: jhb (initial version), kib r250145: Introduce a constant, ELF_NOTE_ROUNDSIZE, which evidently declares our intention to use 4-byte padding for elf notes. Modified: stable/9/sys/kern/imgact_elf.c stable/9/sys/sys/elf_common.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/sys/ (props changed) Modified: stable/9/sys/kern/imgact_elf.c ============================================================================== --- stable/9/sys/kern/imgact_elf.c Fri May 17 20:03:55 2013 (r250751) +++ stable/9/sys/kern/imgact_elf.c Fri May 17 20:12:56 2013 (r250752) @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -66,6 +67,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include @@ -80,6 +82,7 @@ __FBSDID("$FreeBSD$"); #include #include +#define ELF_NOTE_ROUNDSIZE 4 #define OLD_EI_BRAND 8 static int __elfN(check_header)(const Elf_Ehdr *hdr); @@ -160,7 +163,7 @@ __elfN(freebsd_trans_osrel)(const Elf_No uintptr_t p; p = (uintptr_t)(note + 1); - p += roundup2(note->n_namesz, sizeof(Elf32_Addr)); + p += roundup2(note->n_namesz, ELF_NOTE_ROUNDSIZE); *osrel = *(const int32_t *)(p); return (TRUE); @@ -185,7 +188,7 @@ kfreebsd_trans_osrel(const Elf_Note *not uintptr_t p; p = (uintptr_t)(note + 1); - p += roundup2(note->n_namesz, sizeof(Elf32_Addr)); + p += roundup2(note->n_namesz, ELF_NOTE_ROUNDSIZE); desc = (const Elf32_Word *)p; if (desc[0] != GNU_KFREEBSD_ABI_DESC) @@ -1064,12 +1067,22 @@ static void __elfN(puthdr)(struct thread static void __elfN(putnote)(struct note_info *, struct sbuf *); static size_t register_note(struct note_info_list *, int, outfunc_t, void *); static int sbuf_drain_core_output(void *, const char *, int); +static int sbuf_drain_count(void *arg, const char *data, int len); static void __elfN(note_fpregset)(void *, struct sbuf *, size_t *); static void __elfN(note_prpsinfo)(void *, struct sbuf *, size_t *); static void __elfN(note_prstatus)(void *, struct sbuf *, size_t *); static void __elfN(note_threadmd)(void *, struct sbuf *, size_t *); static void __elfN(note_thrmisc)(void *, struct sbuf *, size_t *); +static void __elfN(note_procstat_auxv)(void *, struct sbuf *, size_t *); +static void __elfN(note_procstat_proc)(void *, struct sbuf *, size_t *); +static void __elfN(note_procstat_psstrings)(void *, struct sbuf *, size_t *); +static void note_procstat_files(void *, struct sbuf *, size_t *); +static void note_procstat_groups(void *, struct sbuf *, size_t *); +static void note_procstat_osrel(void *, struct sbuf *, size_t *); +static void note_procstat_rlimit(void *, struct sbuf *, size_t *); +static void note_procstat_umask(void *, struct sbuf *, size_t *); +static void note_procstat_vmmap(void *, struct sbuf *, size_t *); #ifdef COMPRESS_USER_CORES extern int compress_user_cores; @@ -1115,9 +1128,21 @@ static int sbuf_drain_core_output(void *arg, const char *data, int len) { struct sbuf_drain_core_params *p; - int error; + int error, locked; p = (struct sbuf_drain_core_params *)arg; + + /* + * Some kern_proc out routines that print to this sbuf may + * call us with the process lock held. Draining with the + * non-sleepable lock held is unsafe. The lock is needed for + * those routines when dumping a live process. In our case we + * can safely release the lock before draining and acquire + * again after. + */ + locked = PROC_LOCKED(p->td->td_proc); + if (locked) + PROC_UNLOCK(p->td->td_proc); #ifdef COMPRESS_USER_CORES if (p->gzfile != Z_NULL) error = compress_core(p->gzfile, NULL, __DECONST(char *, data), @@ -1128,12 +1153,27 @@ sbuf_drain_core_output(void *arg, const __DECONST(void *, data), len, p->offset, UIO_SYSSPACE, IO_UNIT | IO_DIRECT, p->active_cred, p->file_cred, NULL, p->td); + if (locked) + PROC_LOCK(p->td->td_proc); if (error != 0) return (-error); p->offset += len; return (len); } +/* + * Drain into a counter. + */ +static int +sbuf_drain_count(void *arg, const char *data __unused, int len) +{ + size_t *sizep; + + sizep = (size_t *)arg; + *sizep += len; + return (len); +} + int __elfN(coredump)(struct thread *td, struct vnode *vp, off_t limit, int flags) { @@ -1438,6 +1478,25 @@ __elfN(prepare_notes)(struct thread *td, thr = TAILQ_NEXT(thr, td_plist); } + size += register_note(list, NT_PROCSTAT_PROC, + __elfN(note_procstat_proc), p); + size += register_note(list, NT_PROCSTAT_FILES, + note_procstat_files, p); + size += register_note(list, NT_PROCSTAT_VMMAP, + note_procstat_vmmap, p); + size += register_note(list, NT_PROCSTAT_GROUPS, + note_procstat_groups, p); + size += register_note(list, NT_PROCSTAT_UMASK, + note_procstat_umask, p); + size += register_note(list, NT_PROCSTAT_RLIMIT, + note_procstat_rlimit, p); + size += register_note(list, NT_PROCSTAT_OSREL, + note_procstat_osrel, p); + size += register_note(list, NT_PROCSTAT_PSSTRINGS, + __elfN(note_procstat_psstrings), p); + size += register_note(list, NT_PROCSTAT_AUXV, + __elfN(note_procstat_auxv), p); + *sizep = size; } @@ -1491,7 +1550,7 @@ __elfN(puthdr)(struct thread *td, void * phdr->p_filesz = notesz; phdr->p_memsz = 0; phdr->p_flags = PF_R; - phdr->p_align = sizeof(Elf32_Size); + phdr->p_align = ELF_NOTE_ROUNDSIZE; phdr++; /* All the writable segments from the program. */ @@ -1519,8 +1578,8 @@ register_note(struct note_info_list *lis return (size); notesize = sizeof(Elf_Note) + /* note header */ - roundup2(8, sizeof(Elf32_Size)) + /* note name ("FreeBSD") */ - roundup2(size, sizeof(Elf32_Size)); /* note description */ + roundup2(8, ELF_NOTE_ROUNDSIZE) + /* note name ("FreeBSD") */ + roundup2(size, ELF_NOTE_ROUNDSIZE); /* note description */ return (notesize); } @@ -1543,12 +1602,12 @@ __elfN(putnote)(struct note_info *ninfo, sbuf_bcat(sb, ¬e, sizeof(note)); sbuf_start_section(sb, &old_len); sbuf_bcat(sb, "FreeBSD", note.n_namesz); - sbuf_end_section(sb, old_len, sizeof(Elf32_Size), 0); + sbuf_end_section(sb, old_len, ELF_NOTE_ROUNDSIZE, 0); if (note.n_descsz == 0) return; sbuf_start_section(sb, &old_len); ninfo->outfunc(ninfo->outarg, sb, &ninfo->outsize); - sbuf_end_section(sb, old_len, sizeof(Elf32_Size), 0); + sbuf_end_section(sb, old_len, ELF_NOTE_ROUNDSIZE, 0); } /* @@ -1564,6 +1623,9 @@ typedef struct fpreg32 elf_prfpregset_t; typedef struct fpreg32 elf_fpregset_t; typedef struct reg32 elf_gregset_t; typedef struct thrmisc32 elf_thrmisc_t; +#define ELF_KERN_PROC_MASK KERN_PROC_MASK32 +typedef struct kinfo_proc32 elf_kinfo_proc_t; +typedef uint32_t elf_ps_strings_t; #else typedef prstatus_t elf_prstatus_t; typedef prpsinfo_t elf_prpsinfo_t; @@ -1571,6 +1633,9 @@ typedef prfpregset_t elf_prfpregset_t; typedef prfpregset_t elf_fpregset_t; typedef gregset_t elf_gregset_t; typedef thrmisc_t elf_thrmisc_t; +#define ELF_KERN_PROC_MASK 0 +typedef struct kinfo_proc elf_kinfo_proc_t; +typedef vm_offset_t elf_ps_strings_t; #endif static void @@ -1688,6 +1753,221 @@ __elfN(note_threadmd)(void *arg, struct *sizep = size; } +#ifdef KINFO_PROC_SIZE +CTASSERT(sizeof(struct kinfo_proc) == KINFO_PROC_SIZE); +#endif + +static void +__elfN(note_procstat_proc)(void *arg, struct sbuf *sb, size_t *sizep) +{ + struct proc *p; + size_t size; + int structsize; + + p = (struct proc *)arg; + size = sizeof(structsize) + p->p_numthreads * + sizeof(elf_kinfo_proc_t); + + if (sb != NULL) { + KASSERT(*sizep == size, ("invalid size")); + structsize = sizeof(elf_kinfo_proc_t); + sbuf_bcat(sb, &structsize, sizeof(structsize)); + PROC_LOCK(p); + kern_proc_out(p, sb, ELF_KERN_PROC_MASK); + } + *sizep = size; +} + +#ifdef KINFO_FILE_SIZE +CTASSERT(sizeof(struct kinfo_file) == KINFO_FILE_SIZE); +#endif + +static void +note_procstat_files(void *arg, struct sbuf *sb, size_t *sizep) +{ + struct proc *p; + size_t size; + int structsize; + + p = (struct proc *)arg; + if (sb == NULL) { + size = 0; + sb = sbuf_new(NULL, NULL, 128, SBUF_FIXEDLEN); + sbuf_set_drain(sb, sbuf_drain_count, &size); + sbuf_bcat(sb, &structsize, sizeof(structsize)); + PROC_LOCK(p); + kern_proc_filedesc_out(p, sb, -1); + sbuf_finish(sb); + sbuf_delete(sb); + *sizep = size; + } else { + structsize = sizeof(struct kinfo_file); + sbuf_bcat(sb, &structsize, sizeof(structsize)); + PROC_LOCK(p); + kern_proc_filedesc_out(p, sb, -1); + } +} + +#ifdef KINFO_VMENTRY_SIZE +CTASSERT(sizeof(struct kinfo_vmentry) == KINFO_VMENTRY_SIZE); +#endif + +static void +note_procstat_vmmap(void *arg, struct sbuf *sb, size_t *sizep) +{ + struct proc *p; + size_t size; + int structsize; + + p = (struct proc *)arg; + if (sb == NULL) { + size = 0; + sb = sbuf_new(NULL, NULL, 128, SBUF_FIXEDLEN); + sbuf_set_drain(sb, sbuf_drain_count, &size); + sbuf_bcat(sb, &structsize, sizeof(structsize)); + PROC_LOCK(p); + kern_proc_vmmap_out(p, sb); + sbuf_finish(sb); + sbuf_delete(sb); + *sizep = size; + } else { + structsize = sizeof(struct kinfo_vmentry); + sbuf_bcat(sb, &structsize, sizeof(structsize)); + PROC_LOCK(p); + kern_proc_vmmap_out(p, sb); + } +} + +static void +note_procstat_groups(void *arg, struct sbuf *sb, size_t *sizep) +{ + struct proc *p; + size_t size; + int structsize; + + p = (struct proc *)arg; + size = sizeof(structsize) + p->p_ucred->cr_ngroups * sizeof(gid_t); + if (sb != NULL) { + KASSERT(*sizep == size, ("invalid size")); + structsize = sizeof(gid_t); + sbuf_bcat(sb, &structsize, sizeof(structsize)); + sbuf_bcat(sb, p->p_ucred->cr_groups, p->p_ucred->cr_ngroups * + sizeof(gid_t)); + } + *sizep = size; +} + +static void +note_procstat_umask(void *arg, struct sbuf *sb, size_t *sizep) +{ + struct proc *p; + size_t size; + int structsize; + + p = (struct proc *)arg; + size = sizeof(structsize) + sizeof(p->p_fd->fd_cmask); + if (sb != NULL) { + KASSERT(*sizep == size, ("invalid size")); + structsize = sizeof(p->p_fd->fd_cmask); + sbuf_bcat(sb, &structsize, sizeof(structsize)); + sbuf_bcat(sb, &p->p_fd->fd_cmask, sizeof(p->p_fd->fd_cmask)); + } + *sizep = size; +} + +static void +note_procstat_rlimit(void *arg, struct sbuf *sb, size_t *sizep) +{ + struct proc *p; + struct rlimit rlim[RLIM_NLIMITS]; + size_t size; + int structsize, i; + + p = (struct proc *)arg; + size = sizeof(structsize) + sizeof(rlim); + if (sb != NULL) { + KASSERT(*sizep == size, ("invalid size")); + structsize = sizeof(rlim); + sbuf_bcat(sb, &structsize, sizeof(structsize)); + PROC_LOCK(p); + for (i = 0; i < RLIM_NLIMITS; i++) + lim_rlimit(p, i, &rlim[i]); + PROC_UNLOCK(p); + sbuf_bcat(sb, rlim, sizeof(rlim)); + } + *sizep = size; +} + +static void +note_procstat_osrel(void *arg, struct sbuf *sb, size_t *sizep) +{ + struct proc *p; + size_t size; + int structsize; + + p = (struct proc *)arg; + size = sizeof(structsize) + sizeof(p->p_osrel); + if (sb != NULL) { + KASSERT(*sizep == size, ("invalid size")); + structsize = sizeof(p->p_osrel); + sbuf_bcat(sb, &structsize, sizeof(structsize)); + sbuf_bcat(sb, &p->p_osrel, sizeof(p->p_osrel)); + } + *sizep = size; +} + +static void +__elfN(note_procstat_psstrings)(void *arg, struct sbuf *sb, size_t *sizep) +{ + struct proc *p; + elf_ps_strings_t ps_strings; + size_t size; + int structsize; + + p = (struct proc *)arg; + size = sizeof(structsize) + sizeof(ps_strings); + if (sb != NULL) { + KASSERT(*sizep == size, ("invalid size")); + structsize = sizeof(ps_strings); +#if defined(COMPAT_FREEBSD32) && __ELF_WORD_SIZE == 32 + ps_strings = PTROUT(p->p_sysent->sv_psstrings); +#else + ps_strings = p->p_sysent->sv_psstrings; +#endif + sbuf_bcat(sb, &structsize, sizeof(structsize)); + sbuf_bcat(sb, &ps_strings, sizeof(ps_strings)); + } + *sizep = size; +} + +static void +__elfN(note_procstat_auxv)(void *arg, struct sbuf *sb, size_t *sizep) +{ + struct proc *p; + size_t size; + int structsize; + + p = (struct proc *)arg; + if (sb == NULL) { + size = 0; + sb = sbuf_new(NULL, NULL, 128, SBUF_FIXEDLEN); + sbuf_set_drain(sb, sbuf_drain_count, &size); + sbuf_bcat(sb, &structsize, sizeof(structsize)); + PHOLD(p); + proc_getauxv(curthread, p, sb); + PRELE(p); + sbuf_finish(sb); + sbuf_delete(sb); + *sizep = size; + } else { + structsize = sizeof(Elf_Auxinfo); + sbuf_bcat(sb, &structsize, sizeof(structsize)); + PHOLD(p); + proc_getauxv(curthread, p, sb); + PRELE(p); + } +} + static boolean_t __elfN(parse_notes)(struct image_params *imgp, Elf_Brandnote *checknote, int32_t *osrel, const Elf_Phdr *pnote) @@ -1728,8 +2008,8 @@ __elfN(parse_notes)(struct image_params nextnote: note = (const Elf_Note *)((const char *)(note + 1) + - roundup2(note->n_namesz, sizeof(Elf32_Addr)) + - roundup2(note->n_descsz, sizeof(Elf32_Addr))); + roundup2(note->n_namesz, ELF_NOTE_ROUNDSIZE) + + roundup2(note->n_descsz, ELF_NOTE_ROUNDSIZE)); } return (FALSE); Modified: stable/9/sys/sys/elf_common.h ============================================================================== --- stable/9/sys/sys/elf_common.h Fri May 17 20:03:55 2013 (r250751) +++ stable/9/sys/sys/elf_common.h Fri May 17 20:12:56 2013 (r250752) @@ -485,6 +485,15 @@ typedef struct { #define NT_FPREGSET 2 /* Floating point registers. */ #define NT_PRPSINFO 3 /* Process state info. */ #define NT_THRMISC 7 /* Thread miscellaneous info. */ +#define NT_PROCSTAT_PROC 8 /* Procstat proc data. */ +#define NT_PROCSTAT_FILES 9 /* Procstat files data. */ +#define NT_PROCSTAT_VMMAP 10 /* Procstat vmmap data. */ +#define NT_PROCSTAT_GROUPS 11 /* Procstat groups data. */ +#define NT_PROCSTAT_UMASK 12 /* Procstat umask data. */ +#define NT_PROCSTAT_RLIMIT 13 /* Procstat rlimit data. */ +#define NT_PROCSTAT_OSREL 14 /* Procstat osreldate data. */ +#define NT_PROCSTAT_PSSTRINGS 15 /* Procstat ps_strings data. */ +#define NT_PROCSTAT_AUXV 16 /* Procstat auxv data. */ /* Symbol Binding - ELFNN_ST_BIND - st_info */ #define STB_LOCAL 0 /* Local symbol */ From owner-svn-src-stable@FreeBSD.ORG Fri May 17 22:25:24 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 204D9B9D for ; Fri, 17 May 2013 22:25:24 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-pb0-x231.google.com (mail-pb0-x231.google.com [IPv6:2607:f8b0:400e:c01::231]) by mx1.freebsd.org (Postfix) with ESMTP id EDEFE169 for ; Fri, 17 May 2013 22:25:23 +0000 (UTC) Received: by mail-pb0-f49.google.com with SMTP id rp8so2446137pbb.36 for ; Fri, 17 May 2013 15:25:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=x-received:mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type; bh=E2iqXVFacyT5Bn/YNbkRU9GX5LZc1EloFnQH+ivn/9g=; b=OT6P1YyuWyeHrRVC0z3vX7W74SlfaQUEvqIU1VkubBn52A0VNVmfftQPm3h8S9BO34 tYHCp19uOf38gvMr8nm4sNPWwZlh7mX8Jks5BS6dBkmHnFGzX0ROcStedsPTXKG5OyAx KmK46A/o+b3SO/owp0yTSCPN6J3ktTbBJ/7oE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :x-gm-message-state; bh=E2iqXVFacyT5Bn/YNbkRU9GX5LZc1EloFnQH+ivn/9g=; b=I/vO1eo6Avpz12dCQq986FAUmhICrPiuwDjQBpzOxFeUwegJvb09a9VB+JVtn6jbXi i4/KI3sVciMUj0fLNh3i7XIqG8X//rTk7B08Sxowx5dnpeLa+G43nXcuF5ahXYQArtkf 7TMoRJDGjksxTreXcHqVeqmJiIa8AvkEHCcd9Cirki6u7/1gxkUUDTy+e95FnkaUG3sD +6xN50OQD8Xn27fmoU28Wc9bqTUb1N2z2fi35eBBnrt+2NbECpJQh2KRjc9cJZtHqb5+ 3WpzBJ/pxicU096PosnzvDh6XjnIrWX/D2vcRAixFEymoM3iNCGKO4Tn9MzWDkWQJsvu O3Hg== X-Received: by 10.68.115.167 with SMTP id jp7mr49568203pbb.145.1368829523765; Fri, 17 May 2013 15:25:23 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.70.12.97 with HTTP; Fri, 17 May 2013 15:24:53 -0700 (PDT) In-Reply-To: <20130517020333.GA7012@FreeBSD.org> References: <201305170014.r4H0EaxZ080509@svn.freebsd.org> <20130517020333.GA7012@FreeBSD.org> From: Eitan Adler Date: Fri, 17 May 2013 18:24:53 -0400 X-Google-Sender-Auth: OsNIXFJLXyD7aWTw6gVBXN_-Fpk Message-ID: Subject: Re: svn commit: r250727 - stable/9/usr.sbin/wpa/wpa_supplicant To: Alexey Dokuchaev Content-Type: text/plain; charset=UTF-8 X-Gm-Message-State: ALoCoQlbwnCM98CtoBlG9BYJ21pEdkF3o51ZW4ny3cqK5s/92Ww9nIdais7hGbxE6G+15o16aXjZ Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 22:25:24 -0000 On 16 May 2013 22:03, Alexey Dokuchaev wrote: > On Fri, May 17, 2013 at 12:14:36AM +0000, Eitan Adler wrote: >> New Revision: 250727 >> URL: http://svnweb.freebsd.org/changeset/base/250727 >> >> Log: >> MFC r250528: >> Teach wpa_supplicant to properly compute wireless signal strength. > > If this applicable to stable/8? If yes, can it be MFC'ed? The idea in theory applies, but I think some other patch (a wpa_supplicant upgrade?) was not MFCed yet. I need to backport this patch before it can be MFCed to 8. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-svn-src-stable@FreeBSD.ORG Sat May 18 05:31:18 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E38C530A; Sat, 18 May 2013 05:31:18 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D31FF166; Sat, 18 May 2013 05:31:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4I5VIkI000272; Sat, 18 May 2013 05:31:18 GMT (envelope-from melifaro@svn.freebsd.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4I5VHZL000266; Sat, 18 May 2013 05:31:17 GMT (envelope-from melifaro@svn.freebsd.org) Message-Id: <201305180531.r4I5VHZL000266@svn.freebsd.org> From: "Alexander V. Chernikov" Date: Sat, 18 May 2013 05:31:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250760 - stable/9/sys/netpfil/ipfw X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 May 2013 05:31:19 -0000 Author: melifaro Date: Sat May 18 05:31:17 2013 New Revision: 250760 URL: http://svnweb.freebsd.org/changeset/base/250760 Log: Merge r244633, r250246. Use unified IP_FW_ARG_TABLEARG() macro for most tablearg checks. Log real value instead of IP_FW_TABLEARG (65535) in ipfw_log(). Use unified method for accessing / updating cached rule pointers. Modified: stable/9/sys/netpfil/ipfw/ip_fw2.c stable/9/sys/netpfil/ipfw/ip_fw_dynamic.c stable/9/sys/netpfil/ipfw/ip_fw_log.c stable/9/sys/netpfil/ipfw/ip_fw_private.h Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- stable/9/sys/netpfil/ipfw/ip_fw2.c Sat May 18 04:49:00 2013 (r250759) +++ stable/9/sys/netpfil/ipfw/ip_fw2.c Sat May 18 05:31:17 2013 (r250760) @@ -782,6 +782,38 @@ set_match(struct ip_fw_args *args, int s } /* + * Helper function to enable cached rule lookups using + * x_next and next_rule fields in ipfw rule. + */ +static int +jump_fast(struct ip_fw_chain *chain, struct ip_fw *f, int num, + int tablearg, int jump_backwards) +{ + int f_pos; + + /* If possible use cached f_pos (in f->next_rule), + * whose version is written in f->next_rule + * (horrible hacks to avoid changing the ABI). + */ + if (num != IP_FW_TABLEARG && (uintptr_t)f->x_next == chain->id) + f_pos = (uintptr_t)f->next_rule; + else { + int i = IP_FW_ARG_TABLEARG(num); + /* make sure we do not jump backward */ + if (jump_backwards == 0 && i <= f->rulenum) + i = f->rulenum + 1; + f_pos = ipfw_find_rule(chain, i, 0); + /* update the cache */ + if (num != IP_FW_TABLEARG) { + f->next_rule = (void *)(uintptr_t)f_pos; + f->x_next = (void *)(uintptr_t)chain->id; + } + } + + return (f_pos); +} + +/* * The main check routine for the firewall. * * All arguments are in args so we can modify them and return them @@ -1842,8 +1874,7 @@ do { \ case O_TAG: { struct m_tag *mtag; - uint32_t tag = (cmd->arg1 == IP_FW_TABLEARG) ? - tablearg : cmd->arg1; + uint32_t tag = IP_FW_ARG_TABLEARG(cmd->arg1); /* Packet is already tagged with this tag? */ mtag = m_tag_locate(m, MTAG_IPFW, tag, NULL); @@ -1922,8 +1953,7 @@ do { \ case O_TAGGED: { struct m_tag *mtag; - uint32_t tag = (cmd->arg1 == IP_FW_TABLEARG) ? - tablearg : cmd->arg1; + uint32_t tag = IP_FW_ARG_TABLEARG(cmd->arg1); if (cmdlen == 1) { match = m_tag_locate(m, MTAG_IPFW, @@ -2062,8 +2092,7 @@ do { \ case O_PIPE: case O_QUEUE: set_match(args, f_pos, chain); - args->rule.info = (cmd->arg1 == IP_FW_TABLEARG) ? - tablearg : cmd->arg1; + args->rule.info = IP_FW_ARG_TABLEARG(cmd->arg1); if (cmd->opcode == O_PIPE) args->rule.info |= IPFW_IS_PIPE; if (V_fw_one_pass) @@ -2083,8 +2112,7 @@ do { \ retval = (cmd->opcode == O_DIVERT) ? IP_FW_DIVERT : IP_FW_TEE; set_match(args, f_pos, chain); - args->rule.info = (cmd->arg1 == IP_FW_TABLEARG) ? - tablearg : cmd->arg1; + args->rule.info = IP_FW_ARG_TABLEARG(cmd->arg1); break; case O_COUNT: @@ -2098,28 +2126,7 @@ do { \ f->pcnt++; /* update stats */ f->bcnt += pktlen; f->timestamp = time_uptime; - /* If possible use cached f_pos (in f->next_rule), - * whose version is written in f->next_rule - * (horrible hacks to avoid changing the ABI). - */ - if (cmd->arg1 != IP_FW_TABLEARG && - (uintptr_t)f->x_next == chain->id) { - f_pos = (uintptr_t)f->next_rule; - } else { - int i = (cmd->arg1 == IP_FW_TABLEARG) ? - tablearg : cmd->arg1; - /* make sure we do not jump backward */ - if (i <= f->rulenum) - i = f->rulenum + 1; - f_pos = ipfw_find_rule(chain, i, 0); - /* update the cache */ - if (cmd->arg1 != IP_FW_TABLEARG) { - f->next_rule = - (void *)(uintptr_t)f_pos; - f->x_next = - (void *)(uintptr_t)chain->id; - } - } + f_pos = jump_fast(chain, f, cmd->arg1, tablearg, 0); /* * Skip disabled rules, and re-enter * the inner loop with the correct @@ -2210,26 +2217,8 @@ do { \ if (IS_CALL) { stack[mtag->m_tag_id] = f->rulenum; mtag->m_tag_id++; - if (cmd->arg1 != IP_FW_TABLEARG && - (uintptr_t)f->x_next == chain->id) { - f_pos = (uintptr_t)f->next_rule; - } else { - jmpto = (cmd->arg1 == - IP_FW_TABLEARG) ? tablearg: - cmd->arg1; - f_pos = ipfw_find_rule(chain, - jmpto, 0); - /* update the cache */ - if (cmd->arg1 != - IP_FW_TABLEARG) { - f->next_rule = - (void *)(uintptr_t) - f_pos; - f->x_next = - (void *)(uintptr_t) - chain->id; - } - } + f_pos = jump_fast(chain, f, cmd->arg1, + tablearg, 1); } else { /* `return' action */ mtag->m_tag_id--; jmpto = stack[mtag->m_tag_id] + 1; @@ -2336,8 +2325,7 @@ do { \ case O_NETGRAPH: case O_NGTEE: set_match(args, f_pos, chain); - args->rule.info = (cmd->arg1 == IP_FW_TABLEARG) ? - tablearg : cmd->arg1; + args->rule.info = IP_FW_ARG_TABLEARG(cmd->arg1); if (V_fw_one_pass) args->rule.info |= IPFW_ONEPASS; retval = (cmd->opcode == O_NETGRAPH) ? @@ -2352,8 +2340,7 @@ do { \ f->pcnt++; /* update stats */ f->bcnt += pktlen; f->timestamp = time_uptime; - fib = (cmd->arg1 == IP_FW_TABLEARG) ? tablearg: - cmd->arg1; + fib = IP_FW_ARG_TABLEARG(cmd->arg1); if (fib >= rt_numfibs) fib = 0; M_SETFIB(m, fib); @@ -2379,8 +2366,7 @@ do { \ } t = ((ipfw_insn_nat *)cmd)->nat; if (t == NULL) { - nat_id = (cmd->arg1 == IP_FW_TABLEARG) ? - tablearg : cmd->arg1; + nat_id = IP_FW_ARG_TABLEARG(cmd->arg1); t = (*lookup_nat_ptr)(&chain->nat, nat_id); if (t == NULL) { Modified: stable/9/sys/netpfil/ipfw/ip_fw_dynamic.c ============================================================================== --- stable/9/sys/netpfil/ipfw/ip_fw_dynamic.c Sat May 18 04:49:00 2013 (r250759) +++ stable/9/sys/netpfil/ipfw/ip_fw_dynamic.c Sat May 18 05:31:17 2013 (r250760) @@ -696,8 +696,7 @@ ipfw_install_state(struct ip_fw *rule, i uint16_t limit_mask = cmd->limit_mask; int pindex; - conn_limit = (cmd->conn_limit == IP_FW_TABLEARG) ? - tablearg : cmd->conn_limit; + conn_limit = IP_FW_ARG_TABLEARG(cmd->conn_limit); DEB( if (cmd->conn_limit == IP_FW_TABLEARG) Modified: stable/9/sys/netpfil/ipfw/ip_fw_log.c ============================================================================== --- stable/9/sys/netpfil/ipfw/ip_fw_log.c Sat May 18 04:49:00 2013 (r250759) +++ stable/9/sys/netpfil/ipfw/ip_fw_log.c Sat May 18 05:31:17 2013 (r250760) @@ -255,19 +255,19 @@ ipfw_log(struct ip_fw *f, u_int hlen, st break; case O_SETFIB: snprintf(SNPARGS(action2, 0), "SetFib %d", - cmd->arg1); + IP_FW_ARG_TABLEARG(cmd->arg1)); break; case O_SKIPTO: snprintf(SNPARGS(action2, 0), "SkipTo %d", - cmd->arg1); + IP_FW_ARG_TABLEARG(cmd->arg1)); break; case O_PIPE: snprintf(SNPARGS(action2, 0), "Pipe %d", - cmd->arg1); + IP_FW_ARG_TABLEARG(cmd->arg1)); break; case O_QUEUE: snprintf(SNPARGS(action2, 0), "Queue %d", - cmd->arg1); + IP_FW_ARG_TABLEARG(cmd->arg1)); break; case O_FORWARD_IP: { ipfw_insn_sa *sa = (ipfw_insn_sa *)cmd; Modified: stable/9/sys/netpfil/ipfw/ip_fw_private.h ============================================================================== --- stable/9/sys/netpfil/ipfw/ip_fw_private.h Sat May 18 04:49:00 2013 (r250759) +++ stable/9/sys/netpfil/ipfw/ip_fw_private.h Sat May 18 05:31:17 2013 (r250760) @@ -236,6 +236,8 @@ struct ip_fw_chain { struct sockopt; /* used by tcp_var.h */ + +#define IP_FW_ARG_TABLEARG(a) ((a) == IP_FW_TABLEARG) ? tablearg : (a) /* * The lock is heavily used by ip_fw2.c (the main file) and ip_fw_nat.c * so the variable and the macros must be here. From owner-svn-src-stable@FreeBSD.ORG Sat May 18 05:41:01 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0C360563; Sat, 18 May 2013 05:41:01 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E28A51A1; Sat, 18 May 2013 05:41:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4I5f0tn003668; Sat, 18 May 2013 05:41:00 GMT (envelope-from melifaro@svn.freebsd.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4I5f0Aa003646; Sat, 18 May 2013 05:41:00 GMT (envelope-from melifaro@svn.freebsd.org) Message-Id: <201305180541.r4I5f0Aa003646@svn.freebsd.org> From: "Alexander V. Chernikov" Date: Sat, 18 May 2013 05:41:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250761 - stable/9/sys/netpfil/ipfw X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 May 2013 05:41:01 -0000 Author: melifaro Date: Sat May 18 05:40:59 2013 New Revision: 250761 URL: http://svnweb.freebsd.org/changeset/base/250761 Log: MFC r243711. Use common macros for working with rule/dynamic counters. This is done as preparation to introduce per-cpu ipfw counters. Modified: stable/9/sys/netpfil/ipfw/ip_fw2.c stable/9/sys/netpfil/ipfw/ip_fw_dynamic.c stable/9/sys/netpfil/ipfw/ip_fw_private.h stable/9/sys/netpfil/ipfw/ip_fw_sockopt.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- stable/9/sys/netpfil/ipfw/ip_fw2.c Sat May 18 05:31:17 2013 (r250760) +++ stable/9/sys/netpfil/ipfw/ip_fw2.c Sat May 18 05:40:59 2013 (r250761) @@ -2056,8 +2056,7 @@ do { \ * the parent rule by setting * f, cmd, l and clearing cmdlen. */ - q->pcnt++; - q->bcnt += pktlen; + IPFW_INC_DYN_COUNTER(q, pktlen); /* XXX we would like to have f_pos * readily accessible in the dynamic * rule, instead of having to @@ -2116,16 +2115,12 @@ do { \ break; case O_COUNT: - f->pcnt++; /* update stats */ - f->bcnt += pktlen; - f->timestamp = time_uptime; + IPFW_INC_RULE_COUNTER(f, pktlen); l = 0; /* exit inner loop */ break; case O_SKIPTO: - f->pcnt++; /* update stats */ - f->bcnt += pktlen; - f->timestamp = time_uptime; + IPFW_INC_RULE_COUNTER(f, pktlen); f_pos = jump_fast(chain, f, cmd->arg1, tablearg, 0); /* * Skip disabled rules, and re-enter @@ -2201,9 +2196,7 @@ do { \ break; } - f->pcnt++; /* update stats */ - f->bcnt += pktlen; - f->timestamp = time_uptime; + IPFW_INC_RULE_COUNTER(f, pktlen); stack = (uint16_t *)(mtag + 1); /* @@ -2337,9 +2330,7 @@ do { \ case O_SETFIB: { uint32_t fib; - f->pcnt++; /* update stats */ - f->bcnt += pktlen; - f->timestamp = time_uptime; + IPFW_INC_RULE_COUNTER(f, pktlen); fib = IP_FW_ARG_TABLEARG(cmd->arg1); if (fib >= rt_numfibs) fib = 0; @@ -2387,8 +2378,7 @@ do { \ case O_REASS: { int ip_off; - f->pcnt++; - f->bcnt += pktlen; + IPFW_INC_RULE_COUNTER(f, pktlen); l = 0; /* in any case exit inner loop */ ip_off = ntohs(ip->ip_off); @@ -2457,9 +2447,7 @@ do { \ if (done) { struct ip_fw *rule = chain->map[f_pos]; /* Update statistics */ - rule->pcnt++; - rule->bcnt += pktlen; - rule->timestamp = time_uptime; + IPFW_INC_RULE_COUNTER(rule, pktlen); } else { retval = IP_FW_DENY; printf("ipfw: ouch!, skip past end of rules, denying packet\n"); Modified: stable/9/sys/netpfil/ipfw/ip_fw_dynamic.c ============================================================================== --- stable/9/sys/netpfil/ipfw/ip_fw_dynamic.c Sat May 18 05:31:17 2013 (r250760) +++ stable/9/sys/netpfil/ipfw/ip_fw_dynamic.c Sat May 18 05:40:59 2013 (r250761) @@ -594,7 +594,7 @@ add_dyn_rule(struct ipfw_flow_id *id, in r->expire = time_uptime + V_dyn_syn_lifetime; r->rule = rule; r->dyn_type = dyn_type; - r->pcnt = r->bcnt = 0; + IPFW_ZERO_DYN_COUNTER(r); r->count = 0; r->bucket = i; Modified: stable/9/sys/netpfil/ipfw/ip_fw_private.h ============================================================================== --- stable/9/sys/netpfil/ipfw/ip_fw_private.h Sat May 18 05:31:17 2013 (r250760) +++ stable/9/sys/netpfil/ipfw/ip_fw_private.h Sat May 18 05:40:59 2013 (r250761) @@ -236,6 +236,28 @@ struct ip_fw_chain { struct sockopt; /* used by tcp_var.h */ +/* Macro for working with various counters */ +#define IPFW_INC_RULE_COUNTER(_cntr, _bytes) do { \ + (_cntr)->pcnt++; \ + (_cntr)->bcnt += _bytes; \ + (_cntr)->timestamp = time_uptime; \ + } while (0) + +#define IPFW_INC_DYN_COUNTER(_cntr, _bytes) do { \ + (_cntr)->pcnt++; \ + (_cntr)->bcnt += _bytes; \ + } while (0) + +#define IPFW_ZERO_RULE_COUNTER(_cntr) do { \ + (_cntr)->pcnt = 0; \ + (_cntr)->bcnt = 0; \ + (_cntr)->timestamp = 0; \ + } while (0) + +#define IPFW_ZERO_DYN_COUNTER(_cntr) do { \ + (_cntr)->pcnt = 0; \ + (_cntr)->bcnt = 0; \ + } while (0) #define IP_FW_ARG_TABLEARG(a) ((a) == IP_FW_TABLEARG) ? tablearg : (a) /* Modified: stable/9/sys/netpfil/ipfw/ip_fw_sockopt.c ============================================================================== --- stable/9/sys/netpfil/ipfw/ip_fw_sockopt.c Sat May 18 05:31:17 2013 (r250760) +++ stable/9/sys/netpfil/ipfw/ip_fw_sockopt.c Sat May 18 05:40:59 2013 (r250761) @@ -177,9 +177,7 @@ ipfw_add_rule(struct ip_fw_chain *chain, /* clear fields not settable from userland */ rule->x_next = NULL; rule->next_rule = NULL; - rule->pcnt = 0; - rule->bcnt = 0; - rule->timestamp = 0; + IPFW_ZERO_RULE_COUNTER(rule); if (V_autoinc_step < 1) V_autoinc_step = 1; @@ -442,10 +440,8 @@ clear_counters(struct ip_fw *rule, int l { ipfw_insn_log *l = (ipfw_insn_log *)ACTION_PTR(rule); - if (log_only == 0) { - rule->bcnt = rule->pcnt = 0; - rule->timestamp = 0; - } + if (log_only == 0) + IPFW_ZERO_RULE_COUNTER(rule); if (l->o.opcode == O_LOG) l->log_left = l->max_log; } From owner-svn-src-stable@FreeBSD.ORG Sat May 18 05:48:48 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 35F49709; Sat, 18 May 2013 05:48:48 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 24E041C1; Sat, 18 May 2013 05:48:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4I5mmdg005114; Sat, 18 May 2013 05:48:48 GMT (envelope-from melifaro@svn.freebsd.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4I5mkqN005104; Sat, 18 May 2013 05:48:46 GMT (envelope-from melifaro@svn.freebsd.org) Message-Id: <201305180548.r4I5mkqN005104@svn.freebsd.org> From: "Alexander V. Chernikov" Date: Sat, 18 May 2013 05:48:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250762 - in stable/9: sbin/ipfw sys/netinet sys/netpfil/ipfw X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 May 2013 05:48:48 -0000 Author: melifaro Date: Sat May 18 05:48:46 2013 New Revision: 250762 URL: http://svnweb.freebsd.org/changeset/base/250762 Log: MFC r248552, r248971 Add ipfw support for setting/matching DiffServ codepoints (DSCP). Setting DSCP support is done via O_SETDSCP which works for both IPv4 and IPv6 packets. Fast checksum recalculation (RFC 1624) is done for IPv4. Dscp can be specified by name (AFXY, CSX, BE, EF), by value (0..63) or via tablearg. Matching DSCP is done via another opcode (O_DSCP) which accepts several classes at once (af11,af22,be). Classes are stored in bitmask (2 u32 words). Many people made their variants of this patch, the ones I'm aware of are (in alphabetic order): Dmitrii Tejblum Marcelo Araujo Roman Bogorodskiy (novel) Sergey Matveichuk (sem) Sergey Ryabin PR: kern/102471, kern/121122 Fix ipfw rule validation partially broken by r248552. Modified: stable/9/sbin/ipfw/ipfw.8 stable/9/sbin/ipfw/ipfw2.c stable/9/sbin/ipfw/ipfw2.h stable/9/sys/netinet/ip_fw.h stable/9/sys/netpfil/ipfw/ip_fw2.c stable/9/sys/netpfil/ipfw/ip_fw_log.c stable/9/sys/netpfil/ipfw/ip_fw_sockopt.c Directory Properties: stable/9/sbin/ (props changed) stable/9/sbin/ipfw/ (props changed) stable/9/sys/ (props changed) Modified: stable/9/sbin/ipfw/ipfw.8 ============================================================================== --- stable/9/sbin/ipfw/ipfw.8 Sat May 18 05:40:59 2013 (r250761) +++ stable/9/sbin/ipfw/ipfw.8 Sat May 18 05:48:46 2013 (r250762) @@ -948,6 +948,61 @@ Processing continues at the next rule. It is possible to use the .Cm tablearg keyword with a setfib. If tablearg value is not within compiled FIB range packet fib is set to 0. +.It Cm setdscp Ar DSCP | number | tablearg +Set specified DiffServ codepoint for an IPv4/IPv6 packet. +Processing continues at the next rule. +Supported values are: +.Pp +.Cm CS0 +.Pq Dv 000000 , +.Cm CS1 +.Pq Dv 001000 , +.Cm CS2 +.Pq Dv 010000 , +.Cm CS3 +.Pq Dv 011000 , +.Cm CS4 +.Pq Dv 100000 , +.Cm CS5 +.Pq Dv 101000 , +.Cm CS6 +.Pq Dv 110000 , +.Cm CS7 +.Pq Dv 111000 , +.Cm AF11 +.Pq Dv 001010 , +.Cm AF12 +.Pq Dv 001100 , +.Cm AF13 +.Pq Dv 001110 , +.Cm AF21 +.Pq Dv 010010 , +.Cm AF22 +.Pq Dv 010100 , +.Cm AF23 +.Pq Dv 010110 , +.Cm AF31 +.Pq Dv 011010 , +.Cm AF32 +.Pq Dv 011100 , +.Cm AF33 +.Pq Dv 011110 , +.Cm AF41 +.Pq Dv 100010 , +.Cm AF42 +.Pq Dv 100100 , +.Cm AF43 +.Pq Dv 100110 , +.Cm EF +.Pq Dv 101110 , +.Cm BE +.Pq Dv 000000 . +Additionally, DSCP value can be specified by number (0..64). +It is also possible to use the +.Cm tablearg +keyword with setdscp. +If the tablearg value is not within the 0..64 range, lower 6 bits of supplied +value are used. .It Cm reass Queue and reassemble ip fragments. If the packet is not fragmented, counters are updated and processing continues with the next rule. @@ -1436,6 +1491,17 @@ The supported IP types of service are: The absence of a particular type may be denoted with a .Ql \&! . +.It Cm dscp spec Ns Op , Ns Ar spec +Matches IPv4/IPv6 packets whose +.Cm DS +field value is contained in +.Ar spec +mask. +Multiple values can be specified via +the comma separated list. +Value can be one of keywords used in +.Cm setdscp +action or exact number. .It Cm ipttl Ar ttl-list Matches IPv4 packets whose time to live is included in .Ar ttl-list , @@ -2944,6 +3010,23 @@ configured on but coming in on .Li fxp1 would be dropped. +.Pp +The +.Cm setdscp +option could be used to (re)mark user traffic, +by adding the following to the appropriate place in ruleset: +.Pp +.Dl "ipfw add setdscp be ip from any to any dscp af11,af21" +.Pp +This rule drops all incoming packets that appear to be coming from another +directly connected system but on the wrong interface. +For example, a packet with a source address of +.Li 192.168.0.0/24 , +configured on +.Li fxp0 , +but coming in on +.Li fxp1 +would be dropped. .Ss DYNAMIC RULES In order to protect a site from flood attacks involving fake TCP packets, it is safer to use dynamic rules: Modified: stable/9/sbin/ipfw/ipfw2.c ============================================================================== --- stable/9/sbin/ipfw/ipfw2.c Sat May 18 05:40:59 2013 (r250761) +++ stable/9/sbin/ipfw/ipfw2.c Sat May 18 05:48:46 2013 (r250762) @@ -167,6 +167,32 @@ static struct _s_x f_iptos[] = { { NULL, 0 } }; +static struct _s_x f_ipdscp[] = { + { "af11", IPTOS_DSCP_AF11 >> 2 }, /* 001010 */ + { "af12", IPTOS_DSCP_AF12 >> 2 }, /* 001100 */ + { "af13", IPTOS_DSCP_AF13 >> 2 }, /* 001110 */ + { "af21", IPTOS_DSCP_AF21 >> 2 }, /* 010010 */ + { "af22", IPTOS_DSCP_AF22 >> 2 }, /* 010100 */ + { "af23", IPTOS_DSCP_AF23 >> 2 }, /* 010110 */ + { "af31", IPTOS_DSCP_AF31 >> 2 }, /* 011010 */ + { "af32", IPTOS_DSCP_AF32 >> 2 }, /* 011100 */ + { "af33", IPTOS_DSCP_AF33 >> 2 }, /* 011110 */ + { "af41", IPTOS_DSCP_AF41 >> 2 }, /* 100010 */ + { "af42", IPTOS_DSCP_AF42 >> 2 }, /* 100100 */ + { "af43", IPTOS_DSCP_AF43 >> 2 }, /* 100110 */ + { "be", IPTOS_DSCP_CS0 >> 2 }, /* 000000 */ + { "ef", IPTOS_DSCP_EF >> 2 }, /* 101110 */ + { "cs0", IPTOS_DSCP_CS0 >> 2 }, /* 000000 */ + { "cs1", IPTOS_DSCP_CS1 >> 2 }, /* 001000 */ + { "cs2", IPTOS_DSCP_CS2 >> 2 }, /* 010000 */ + { "cs3", IPTOS_DSCP_CS3 >> 2 }, /* 011000 */ + { "cs4", IPTOS_DSCP_CS4 >> 2 }, /* 100000 */ + { "cs5", IPTOS_DSCP_CS5 >> 2 }, /* 101000 */ + { "cs6", IPTOS_DSCP_CS6 >> 2 }, /* 110000 */ + { "cs7", IPTOS_DSCP_CS7 >> 2 }, /* 100000 */ + { NULL, 0 } +}; + static struct _s_x limit_masks[] = { {"all", DYN_SRC_ADDR|DYN_SRC_PORT|DYN_DST_ADDR|DYN_DST_PORT}, {"src-addr", DYN_SRC_ADDR}, @@ -237,6 +263,7 @@ static struct _s_x rule_actions[] = { { "nat", TOK_NAT }, { "reass", TOK_REASS }, { "setfib", TOK_SETFIB }, + { "setdscp", TOK_SETDSCP }, { "call", TOK_CALL }, { "return", TOK_RETURN }, { NULL, 0 } /* terminator */ @@ -714,6 +741,51 @@ fill_newports(ipfw_insn_u16 *cmd, char * return (i); } +/* + * Fill the body of the command with the list of DiffServ codepoints. + */ +static void +fill_dscp(ipfw_insn *cmd, char *av, int cblen) +{ + uint32_t *low, *high; + char *s = av, *a; + int code; + + cmd->opcode = O_DSCP; + cmd->len |= F_INSN_SIZE(ipfw_insn_u32) + 1; + + CHECK_CMDLEN; + + low = (uint32_t *)(cmd + 1); + high = low + 1; + + *low = 0; + *high = 0; + + while (s != NULL) { + a = strchr(s, ','); + + if (a != NULL) + *a++ = '\0'; + + if (isalpha(*s)) { + if ((code = match_token(f_ipdscp, s)) == -1) + errx(EX_DATAERR, "Unknown DSCP code"); + } else { + code = strtoul(s, NULL, 10); + if (code < 0 || code > 63) + errx(EX_DATAERR, "Invalid DSCP value"); + } + + if (code > 32) + *high |= 1 << (code - 32); + else + *low |= 1 << code; + + s = a; + } +} + static struct _s_x icmpcodes[] = { { "net", ICMP_UNREACH_NET }, { "host", ICMP_UNREACH_HOST }, @@ -972,6 +1044,32 @@ print_icmptypes(ipfw_insn_u32 *cmd) } } +static void +print_dscp(ipfw_insn_u32 *cmd) +{ + int i, c; + uint32_t *v; + char sep= ' '; + const char *code; + + printf(" dscp"); + i = 0; + c = 0; + v = cmd->d; + while (i < 64) { + if (*v & (1 << i)) { + if ((code = match_value(f_ipdscp, i)) != NULL) + printf("%c%s", sep, code); + else + printf("%c%d", sep, i); + sep = ','; + } + + if ((++i % 32) == 0) + v++; + } +} + /* * show_ipfw() prints the body of an ipfw rule. * Because the standard rule has at least proto src_ip dst_ip, we use @@ -1204,6 +1302,17 @@ show_ipfw(struct ip_fw *rule, int pcwidt PRINT_UINT_ARG("setfib ", cmd->arg1); break; + case O_SETDSCP: + { + const char *code; + + if ((code = match_value(f_ipdscp, cmd->arg1)) != NULL) + printf("setdscp %s", code); + else + PRINT_UINT_ARG("setdscp ", cmd->arg1); + } + break; + case O_REASS: printf("reass"); break; @@ -1499,6 +1608,10 @@ show_ipfw(struct ip_fw *rule, int pcwidt printf(" ipprecedence %u", (cmd->arg1) >> 5 ); break; + case O_DSCP: + print_dscp((ipfw_insn_u32 *)cmd); + break; + case O_IPLEN: if (F_LEN(cmd) == 1) printf(" iplen %u", cmd->arg1 ); @@ -3035,6 +3148,24 @@ chkarg: break; } + case TOK_SETDSCP: + { + int code; + + action->opcode = O_SETDSCP; + NEED1("missing DSCP code"); + if (_substrcmp(*av, "tablearg") == 0) { + action->arg1 = IP_FW_TABLEARG; + } else if (isalpha(*av[0])) { + if ((code = match_token(f_ipdscp, *av)) == -1) + errx(EX_DATAERR, "Unknown DSCP code"); + action->arg1 = code; + } else + action->arg1 = strtoul(*av, NULL, 10); + av++; + break; + } + case TOK_REASS: action->opcode = O_REASS; break; @@ -3447,6 +3578,12 @@ read_options: av++; break; + case TOK_DSCP: + NEED1("missing DSCP code"); + fill_dscp(cmd, *av, cblen); + av++; + break; + case TOK_IPOPTS: NEED1("missing argument for ipoptions"); fill_flags(cmd, O_IPOPT, f_ipopts, *av); Modified: stable/9/sbin/ipfw/ipfw2.h ============================================================================== --- stable/9/sbin/ipfw/ipfw2.h Sat May 18 05:40:59 2013 (r250761) +++ stable/9/sbin/ipfw/ipfw2.h Sat May 18 05:48:46 2013 (r250762) @@ -203,6 +203,7 @@ enum tokens { TOK_SETFIB, TOK_LOOKUP, TOK_SOCKARG, + TOK_SETDSCP, }; /* * the following macro returns an error message if we run out of Modified: stable/9/sys/netinet/ip_fw.h ============================================================================== --- stable/9/sys/netinet/ip_fw.h Sat May 18 05:40:59 2013 (r250761) +++ stable/9/sys/netinet/ip_fw.h Sat May 18 05:48:46 2013 (r250762) @@ -218,6 +218,9 @@ enum ipfw_opcodes { /* arguments (4 byt O_FORWARD_IP6, /* fwd sockaddr_in6 */ + O_DSCP, /* 2 u32 = DSCP mask */ + O_SETDSCP, /* arg1=DSCP value */ + O_LAST_OPCODE /* not an opcode! */ }; Modified: stable/9/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- stable/9/sys/netpfil/ipfw/ip_fw2.c Sat May 18 05:40:59 2013 (r250761) +++ stable/9/sys/netpfil/ipfw/ip_fw2.c Sat May 18 05:48:46 2013 (r250762) @@ -1658,6 +1658,32 @@ do { \ flags_match(cmd, ip->ip_tos)); break; + case O_DSCP: + { + uint32_t *p; + uint16_t x; + + p = ((ipfw_insn_u32 *)cmd)->d; + + if (is_ipv4) + x = ip->ip_tos >> 2; + else if (is_ipv6) { + uint8_t *v; + v = &((struct ip6_hdr *)ip)->ip6_vfc; + x = (*v & 0x0F) << 2; + v++; + x |= *v >> 6; + } else + break; + + /* DSCP bitmask is stored as low_u32 high_u32 */ + if (x > 32) + match = *(p + 1) & (1 << (x - 32)); + else + match = *p & (1 << x); + } + break; + case O_TCPDATALEN: if (proto == IPPROTO_TCP && offset == 0) { struct tcphdr *tcp; @@ -2340,6 +2366,32 @@ do { \ break; } + case O_SETDSCP: { + uint16_t code; + + code = IP_FW_ARG_TABLEARG(cmd->arg1) & 0x3F; + l = 0; /* exit inner loop */ + if (is_ipv4) { + uint16_t a; + + a = ip->ip_tos; + ip->ip_tos = (code << 2) | (ip->ip_tos & 0x03); + a += ntohs(ip->ip_sum) - ip->ip_tos; + ip->ip_sum = htons(a); + } else if (is_ipv6) { + uint8_t *v; + + v = &((struct ip6_hdr *)ip)->ip6_vfc; + *v = (*v & 0xF0) | (code >> 2); + v++; + *v = (*v & 0x3F) | ((code & 0x03) << 6); + } else + break; + + IPFW_INC_RULE_COUNTER(f, pktlen); + break; + } + case O_NAT: if (!IPFW_NAT_LOADED) { retval = IP_FW_DENY; Modified: stable/9/sys/netpfil/ipfw/ip_fw_log.c ============================================================================== --- stable/9/sys/netpfil/ipfw/ip_fw_log.c Sat May 18 05:40:59 2013 (r250761) +++ stable/9/sys/netpfil/ipfw/ip_fw_log.c Sat May 18 05:48:46 2013 (r250762) @@ -209,10 +209,8 @@ ipfw_log(struct ip_fw *f, u_int hlen, st altq->qid); cmd += F_LEN(cmd); } - if (cmd->opcode == O_PROB) - cmd += F_LEN(cmd); - - if (cmd->opcode == O_TAG) + if (cmd->opcode == O_PROB || cmd->opcode == O_TAG || + cmd->opcode == O_SETDSCP) cmd += F_LEN(cmd); action = action2; Modified: stable/9/sys/netpfil/ipfw/ip_fw_sockopt.c ============================================================================== --- stable/9/sys/netpfil/ipfw/ip_fw_sockopt.c Sat May 18 05:40:59 2013 (r250761) +++ stable/9/sys/netpfil/ipfw/ip_fw_sockopt.c Sat May 18 05:48:46 2013 (r250762) @@ -681,6 +681,11 @@ check_ipfw_struct(struct ip_fw *rule, in goto bad_size; break; + case O_DSCP: + if (cmdlen != F_INSN_SIZE(ipfw_insn_u32) + 1) + goto bad_size; + break; + case O_MAC_TYPE: case O_IP_SRCPORT: case O_IP_DSTPORT: /* XXX artificial limit, 30 port pairs */ @@ -741,6 +746,7 @@ check_ipfw_struct(struct ip_fw *rule, in case O_ACCEPT: case O_DENY: case O_REJECT: + case O_SETDSCP: #ifdef INET6 case O_UNREACH6: #endif From owner-svn-src-stable@FreeBSD.ORG Sat May 18 13:19:32 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 782D8CAF; Sat, 18 May 2013 13:19:32 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6A50F115; Sat, 18 May 2013 13:19:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4IDJWpE062068; Sat, 18 May 2013 13:19:32 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4IDJWZC062066; Sat, 18 May 2013 13:19:32 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201305181319.r4IDJWZC062066@svn.freebsd.org> From: Alexander Motin Date: Sat, 18 May 2013 13:19:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250772 - stable/9/sys/x86/x86 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 May 2013 13:19:32 -0000 Author: mav Date: Sat May 18 13:19:31 2013 New Revision: 250772 URL: http://svnweb.freebsd.org/changeset/base/250772 Log: MFC r249625: Introduce kern.timecounter.smp_tsc_adjust tunable (disabled by default) and respective functionality, allowing to synchronize TSC on APs to match BSP's during boot. It may be unsafe in general case due to theoretical chance of later drift if CPUs are using different clock rate or source, but it allows to use TSC in some cases when difference caused by some initialization bug, while TSCs are known to increment synchronously. Modified: stable/9/sys/x86/x86/tsc.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/x86/x86/tsc.c ============================================================================== --- stable/9/sys/x86/x86/tsc.c Sat May 18 13:15:19 2013 (r250771) +++ stable/9/sys/x86/x86/tsc.c Sat May 18 13:19:31 2013 (r250772) @@ -65,6 +65,11 @@ static int smp_tsc; SYSCTL_INT(_kern_timecounter, OID_AUTO, smp_tsc, CTLFLAG_RDTUN, &smp_tsc, 0, "Indicates whether the TSC is safe to use in SMP mode"); TUNABLE_INT("kern.timecounter.smp_tsc", &smp_tsc); + +int smp_tsc_adjust = 0; +SYSCTL_INT(_kern_timecounter, OID_AUTO, smp_tsc_adjust, CTLFLAG_RDTUN, + &smp_tsc_adjust, 0, "Try to adjust TSC on APs to match BSP"); +TUNABLE_INT("kern.timecounter.smp_tsc_adjust", &smp_tsc_adjust); #endif static int tsc_shift = 1; @@ -403,25 +408,77 @@ comp_smp_tsc(void *arg) } } +static void +adj_smp_tsc(void *arg) +{ + uint64_t *tsc; + int64_t d, min, max; + u_int cpu = PCPU_GET(cpuid); + u_int first, i, size; + + first = CPU_FIRST(); + if (cpu == first) + return; + min = INT64_MIN; + max = INT64_MAX; + size = (mp_maxid + 1) * 3; + for (i = 0, tsc = arg; i < N; i++, tsc += size) { + d = tsc[first * 3] - tsc[cpu * 3 + 1]; + if (d > min) + min = d; + d = tsc[first * 3 + 1] - tsc[cpu * 3 + 2]; + if (d > min) + min = d; + d = tsc[first * 3 + 1] - tsc[cpu * 3]; + if (d < max) + max = d; + d = tsc[first * 3 + 2] - tsc[cpu * 3 + 1]; + if (d < max) + max = d; + } + if (min > max) + return; + d = min / 2 + max / 2; + __asm __volatile ( + "movl $0x10, %%ecx\n\t" + "rdmsr\n\t" + "addl %%edi, %%eax\n\t" + "adcl %%esi, %%edx\n\t" + "wrmsr\n" + : /* No output */ + : "D" ((uint32_t)d), "S" ((uint32_t)(d >> 32)) + : "ax", "cx", "dx", "cc" + ); +} + static int test_tsc(void) { uint32_t *data, *tsc; - u_int i, size; + u_int i, size, adj; if ((!smp_tsc && !tsc_is_invariant) || vm_guest) return (-100); size = (mp_maxid + 1) * 3; data = malloc(sizeof(*data) * size * N, M_TEMP, M_WAITOK); + adj = 0; +retry: for (i = 0, tsc = data; i < N; i++, tsc += size) smp_rendezvous(tsc_read_0, tsc_read_1, tsc_read_2, tsc); smp_tsc = 1; /* XXX */ smp_rendezvous(smp_no_rendevous_barrier, comp_smp_tsc, smp_no_rendevous_barrier, data); + if (!smp_tsc && adj < smp_tsc_adjust) { + adj++; + smp_rendezvous(smp_no_rendevous_barrier, adj_smp_tsc, + smp_no_rendevous_barrier, data); + goto retry; + } free(data, M_TEMP); if (bootverbose) - printf("SMP: %sed TSC synchronization test\n", - smp_tsc ? "pass" : "fail"); + printf("SMP: %sed TSC synchronization test%s\n", + smp_tsc ? "pass" : "fail", + adj > 0 ? " after adjustment" : ""); if (smp_tsc && tsc_is_invariant) { switch (cpu_vendor_id) { case CPU_VENDOR_AMD: From owner-svn-src-stable@FreeBSD.ORG Sat May 18 19:06:17 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2A480911; Sat, 18 May 2013 19:06:17 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1A3DEEB5; Sat, 18 May 2013 19:06:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4IJ6GDa082804; Sat, 18 May 2013 19:06:16 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4IJ6F3U082798; Sat, 18 May 2013 19:06:15 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <201305181906.r4IJ6F3U082798@svn.freebsd.org> From: Dmitry Chagin Date: Sat, 18 May 2013 19:06:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250785 - in stable/9/sys/amd64: amd64 ia32 include linux32 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 May 2013 19:06:17 -0000 Author: dchagin Date: Sat May 18 19:06:15 2013 New Revision: 250785 URL: http://svnweb.freebsd.org/changeset/base/250785 Log: MFC r250423: Retire write-only PCB_GS32BIT pcb flag on amd64. Modified: stable/9/sys/amd64/amd64/genassym.c stable/9/sys/amd64/amd64/machdep.c stable/9/sys/amd64/ia32/ia32_signal.c stable/9/sys/amd64/include/pcb.h stable/9/sys/amd64/linux32/linux32_machdep.c stable/9/sys/amd64/linux32/linux32_sysvec.c Directory Properties: stable/9/ (props changed) stable/9/sys/ (props changed) Modified: stable/9/sys/amd64/amd64/genassym.c ============================================================================== --- stable/9/sys/amd64/amd64/genassym.c Sat May 18 18:28:19 2013 (r250784) +++ stable/9/sys/amd64/amd64/genassym.c Sat May 18 19:06:15 2013 (r250785) @@ -160,7 +160,6 @@ ASSYM(PCB_USERFPU, sizeof(struct pcb)); ASSYM(PCB_SIZE, sizeof(struct pcb)); ASSYM(PCB_FULL_IRET, PCB_FULL_IRET); ASSYM(PCB_DBREGS, PCB_DBREGS); -ASSYM(PCB_GS32BIT, PCB_GS32BIT); ASSYM(PCB_32BIT, PCB_32BIT); ASSYM(COMMON_TSS_RSP0, offsetof(struct amd64tss, tss_rsp0)); Modified: stable/9/sys/amd64/amd64/machdep.c ============================================================================== --- stable/9/sys/amd64/amd64/machdep.c Sat May 18 18:28:19 2013 (r250784) +++ stable/9/sys/amd64/amd64/machdep.c Sat May 18 19:06:15 2013 (r250785) @@ -938,7 +938,7 @@ exec_setregs(struct thread *td, struct i pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; - clear_pcb_flags(pcb, PCB_32BIT | PCB_GS32BIT); + clear_pcb_flags(pcb, PCB_32BIT); pcb->pcb_initial_fpucw = __INITIAL_FPUCW__; set_pcb_flags(pcb, PCB_FULL_IRET); Modified: stable/9/sys/amd64/ia32/ia32_signal.c ============================================================================== --- stable/9/sys/amd64/ia32/ia32_signal.c Sat May 18 18:28:19 2013 (r250784) +++ stable/9/sys/amd64/ia32/ia32_signal.c Sat May 18 19:06:15 2013 (r250785) @@ -1001,6 +1001,5 @@ ia32_setregs(struct thread *td, struct i /* Return via doreti so that we can change to a different %cs */ set_pcb_flags(pcb, PCB_32BIT | PCB_FULL_IRET); - clear_pcb_flags(pcb, PCB_GS32BIT); td->td_retval[1] = 0; } Modified: stable/9/sys/amd64/include/pcb.h ============================================================================== --- stable/9/sys/amd64/include/pcb.h Sat May 18 18:28:19 2013 (r250784) +++ stable/9/sys/amd64/include/pcb.h Sat May 18 19:06:15 2013 (r250785) @@ -77,7 +77,6 @@ struct pcb { #define PCB_KERNFPU 0x04 /* kernel uses fpu */ #define PCB_FPUINITDONE 0x08 /* fpu state is initialized */ #define PCB_USERFPUINITDONE 0x10 /* fpu user state is initialized */ -#define PCB_GS32BIT 0x20 /* linux gs switch */ #define PCB_32BIT 0x40 /* process has 32 bit context (segs etc) */ uint16_t pcb_initial_fpucw; Modified: stable/9/sys/amd64/linux32/linux32_machdep.c ============================================================================== --- stable/9/sys/amd64/linux32/linux32_machdep.c Sat May 18 18:28:19 2013 (r250784) +++ stable/9/sys/amd64/linux32/linux32_machdep.c Sat May 18 19:06:15 2013 (r250785) @@ -447,7 +447,7 @@ linux_set_cloned_tls(struct thread *td, pcb->pcb_gsbase = (register_t)info.base_addr; /* XXXKIB pcb->pcb_gs32sd = sd; */ td->td_frame->tf_gs = GSEL(GUGS32_SEL, SEL_UPL); - set_pcb_flags(pcb, PCB_GS32BIT | PCB_32BIT); + set_pcb_flags(pcb, PCB_32BIT); } return (error); @@ -1026,7 +1026,7 @@ linux_set_thread_area(struct thread *td, pcb = td->td_pcb; pcb->pcb_gsbase = (register_t)info.base_addr; - set_pcb_flags(pcb, PCB_32BIT | PCB_GS32BIT); + set_pcb_flags(pcb, PCB_32BIT); update_gdt_gsbase(td, info.base_addr); return (0); Modified: stable/9/sys/amd64/linux32/linux32_sysvec.c ============================================================================== --- stable/9/sys/amd64/linux32/linux32_sysvec.c Sat May 18 18:28:19 2013 (r250784) +++ stable/9/sys/amd64/linux32/linux32_sysvec.c Sat May 18 19:06:15 2013 (r250785) @@ -867,7 +867,6 @@ exec_linux_setregs(struct thread *td, st /* Do full restore on return so that we can change to a different %cs */ set_pcb_flags(pcb, PCB_32BIT | PCB_FULL_IRET); - clear_pcb_flags(pcb, PCB_GS32BIT); td->td_retval[1] = 0; } From owner-svn-src-stable@FreeBSD.ORG Sat May 18 19:21:34 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 059A5DE3; Sat, 18 May 2013 19:21:34 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EB8FDF31; Sat, 18 May 2013 19:21:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4IJLXru089074; Sat, 18 May 2013 19:21:33 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4IJLXMi089073; Sat, 18 May 2013 19:21:33 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201305181921.r4IJLXMi089073@svn.freebsd.org> From: Bryan Drewery Date: Sat, 18 May 2013 19:21:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250787 - stable/9/usr.sbin/pkg_install/version X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 May 2013 19:21:34 -0000 Author: bdrewery (ports committer) Date: Sat May 18 19:21:33 2013 New Revision: 250787 URL: http://svnweb.freebsd.org/changeset/base/250787 Log: Direct commit to update ports INDEX location. PR: bin/164561 Approved by: bapt Modified: stable/9/usr.sbin/pkg_install/version/pkg_version.1 Modified: stable/9/usr.sbin/pkg_install/version/pkg_version.1 ============================================================================== --- stable/9/usr.sbin/pkg_install/version/pkg_version.1 Sat May 18 19:18:03 2013 (r250786) +++ stable/9/usr.sbin/pkg_install/version/pkg_version.1 Sat May 18 19:21:33 2013 (r250787) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 30, 2008 +.Dd May 18, 2013 .Dt PKG_VERSION 1 .Os .Sh NAME @@ -72,7 +72,7 @@ cannot be located, .Nm will search for the package in the ports collection index file (typically -.Pa /usr/ports/INDEX-8 ) . +.Pa /usr/ports/INDEX-9 ) . Any matching version number(s) there will be used to determine whether the installed package is up-to-date or requires updating. .Pp @@ -205,12 +205,12 @@ can be used here. If no .Ar index file is specified on the command line, -.Pa /usr/ports/INDEX-8 +.Pa /usr/ports/INDEX-9 is used. .El .Sh FILES -.Bl -tag -width /usr/ports/INDEX-8 -compact -.It Pa /usr/ports/INDEX-8 +.Bl -tag -width /usr/ports/INDEX-9 -compact +.It Pa /usr/ports/INDEX-9 Default index file. .El .Sh EXAMPLES @@ -224,7 +224,7 @@ index file: The command below generates a report against the version numbers in the on-line ports collection: .Pp -.Dl % pkg_version http://www.FreeBSD.org/ports/INDEX-8 +.Dl % pkg_version http://www.FreeBSD.org/ports/INDEX-9 .Pp The following command compares two package version strings: .Pp