From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 00:19:19 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 610B51065698; Sun, 20 Feb 2011 00:19:19 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) by mx1.freebsd.org (Postfix) with ESMTP id 2210F8FC18; Sun, 20 Feb 2011 00:19:19 +0000 (UTC) Received: from troutmask.apl.washington.edu (localhost.apl.washington.edu [127.0.0.1]) by troutmask.apl.washington.edu (8.14.4/8.14.4) with ESMTP id p1K0JESf051034; Sat, 19 Feb 2011 16:19:14 -0800 (PST) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.4/8.14.4/Submit) id p1K0JE59051033; Sat, 19 Feb 2011 16:19:14 -0800 (PST) (envelope-from sgk) Date: Sat, 19 Feb 2011 16:19:14 -0800 From: Steve Kargl To: Doug Barton Message-ID: <20110220001914.GA51022@troutmask.apl.washington.edu> References: <201102131818.p1DIIuLL046962@svn.freebsd.org> <201102192007.32979.bruce@cran.org.uk> <4D6051D0.8050704@dougbarton.us> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4D6051D0.8050704@dougbarton.us> User-Agent: Mutt/1.4.2.3i Cc: "Carlos A. M. dos Santos" , Bruce Cran , svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r218650 - head/games/fortune/datfiles X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 00:19:19 -0000 On Sat, Feb 19, 2011 at 03:27:12PM -0800, Doug Barton wrote: > On 02/19/2011 15:12, Carlos A. M. dos Santos wrote: > >On Sat, Feb 19, 2011 at 6:07 PM, Bruce Cran wrote: > >>On Saturday 19 February 2011 17:25:32 Carlos A. M. dos Santos wrote: > >> > >>>Did anybody complain about this? If not, would you mid either revert > >>>this commit or just go ahead and move all "potentially" offensive > >>>jokes to fortunes-o? Anything from Grouch Marx or Mark Twain will > >>>probably qualify. > >> > >>I'm happy to revert the checkin if you think the fortune should be in the > >>main > >>file, since it appears the PR submitter was complaining just as much about > >>being unprofessional as offensive. Would you like me to go ahead and > >>revert > >>the move? > > > >I suggest you to revert the commit > > Serious overkill, particularly since: > 1. The commit has already been MFC'ed, and So, 'svn revert' does not work on branches? -- Steve From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 00:59:40 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 531A7106566C; Sun, 20 Feb 2011 00:59:40 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 406A68FC12; Sun, 20 Feb 2011 00:59:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1K0xefI014360; Sun, 20 Feb 2011 00:59:40 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1K0xeQx014358; Sun, 20 Feb 2011 00:59:40 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201102200059.p1K0xeQx014358@svn.freebsd.org> From: Doug Barton Date: Sun, 20 Feb 2011 00:59:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218865 - head/etc/namedb X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 00:59:40 -0000 Author: dougb Date: Sun Feb 20 00:59:39 2011 New Revision: 218865 URL: http://svn.freebsd.org/changeset/base/218865 Log: Add a note about AXFR of important zones being available from ICANN Modified: head/etc/namedb/named.conf Modified: head/etc/namedb/named.conf ============================================================================== --- head/etc/namedb/named.conf Sat Feb 19 22:53:50 2011 (r218864) +++ head/etc/namedb/named.conf Sun Feb 20 00:59:39 2011 (r218865) @@ -91,6 +91,11 @@ zone "." { type hint; file "/etc/namedb/ To use this mechanism, uncomment the entries below, and comment the hint zone above. + + As documented at http://dns.icann.org/services/axfr/ these zones: + "." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and ROOT-SERVERS.NET + are availble for AXFR from these servers on IPv4 and IPv6: + xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org */ /* zone "." { From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 01:02:03 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B276E1065672; Sun, 20 Feb 2011 01:02:03 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: from EXHUB015-3.exch015.msoutlookonline.net (exhub015-3.exch015.msoutlookonline.net [207.5.72.95]) by mx1.freebsd.org (Postfix) with ESMTP id 99EE38FC15; Sun, 20 Feb 2011 01:02:03 +0000 (UTC) Received: from [192.168.1.2] (173.66.131.189) by smtpx15.msoutlookonline.net (207.5.72.103) with Microsoft SMTP Server (TLS) id 8.2.254.0; Sat, 19 Feb 2011 16:52:02 -0800 Message-ID: <4D6065B4.7040709@p6m7g8.com> Date: Sat, 19 Feb 2011 19:52:04 -0500 From: "Philip M. Gollucci" Organization: P6M7G8 Inc. User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.13) Gecko/20101207 Lightning/1.0b2 Thunderbird/3.1.7 MIME-Version: 1.0 To: Doug Barton References: <201102162123.p1GLN9f9084297@svn.freebsd.org> In-Reply-To: <201102162123.p1GLN9f9084297@svn.freebsd.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218753 - head/etc/namedb X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 01:02:03 -0000 On 2/16/2011 4:23 PM, Doug Barton wrote: > Author: dougb > Date: Wed Feb 16 21:23:09 2011 > New Revision: 218753 > URL: http://svn.freebsd.org/changeset/base/218753 > > Log: > Remove in-addr.arpa from the list of zones it is possible to slave locally This is b/c of the recent change to fix the list of root servers that serve this right ? > > Modified: > head/etc/namedb/named.conf > > Modified: head/etc/namedb/named.conf > ============================================================================== > --- head/etc/namedb/named.conf Wed Feb 16 21:21:23 2011 (r218752) > +++ head/etc/namedb/named.conf Wed Feb 16 21:23:09 2011 (r218753) > @@ -109,14 +109,6 @@ zone "arpa" { > }; > notify no; > }; > -zone "in-addr.arpa" { > - type slave; > - file "/etc/namedb/slave/in-addr.arpa.slave"; > - masters { > - 192.5.5.241; // F.ROOT-SERVERS.NET. > - }; > - notify no; > -}; > */ > > /* Serving the following zones locally will prevent any queries > _______________________________________________ > 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" -- ------------------------------------------------------------------------ 1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354 VP Apache Infrastructure; Member, Apache Software Foundation Committer, FreeBSD Foundation Consultant, P6M7G8 Inc. Sr. System Admin, Ridecharge Inc. Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching. From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 01:35:43 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAB601065670 for ; Sun, 20 Feb 2011 01:35:43 +0000 (UTC) (envelope-from dougb@dougbarton.us) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id 596688FC13 for ; Sun, 20 Feb 2011 01:35:43 +0000 (UTC) Received: (qmail 21766 invoked by uid 399); 20 Feb 2011 01:35:40 -0000 Received: from router.ka9q.net (HELO doug-optiplex.ka9q.net) (dougb@dougbarton.us@75.60.237.91) by mail2.fluidhosting.com with ESMTPAM; 20 Feb 2011 01:35:40 -0000 X-Originating-IP: 75.60.237.91 X-Sender: dougb@dougbarton.us Message-ID: <4D606FEB.6070806@dougbarton.us> Date: Sat, 19 Feb 2011 17:35:39 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.13) Gecko/20110129 Thunderbird/3.1.7 MIME-Version: 1.0 To: "Philip M. Gollucci" References: <201102162123.p1GLN9f9084297@svn.freebsd.org> <4D6065B4.7040709@p6m7g8.com> In-Reply-To: <4D6065B4.7040709@p6m7g8.com> X-Enigmail-Version: 1.1.2 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218753 - head/etc/namedb X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 01:35:43 -0000 On 02/19/2011 16:52, Philip M. Gollucci wrote: > On 2/16/2011 4:23 PM, Doug Barton wrote: >> Author: dougb >> Date: Wed Feb 16 21:23:09 2011 >> New Revision: 218753 >> URL: http://svn.freebsd.org/changeset/base/218753 >> >> Log: >> Remove in-addr.arpa from the list of zones it is possible to slave locally > This is b/c of the recent change to fix the list of root servers that > serve this right ? Not precisely. in-addr.arpa has moved to its own set of servers operated jointly by the RIRs and ICANN. At some point in the near future this zone will no longer be available directly from the root servers at all. hth, Doug -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 05:29:00 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E3E5106566C; Sun, 20 Feb 2011 05:29:00 +0000 (UTC) (envelope-from murray@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5D8CE8FC0C; Sun, 20 Feb 2011 05:29:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1K5T0mU021304; Sun, 20 Feb 2011 05:29:00 GMT (envelope-from murray@svn.freebsd.org) Received: (from murray@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1K5T0jh021301; Sun, 20 Feb 2011 05:29:00 GMT (envelope-from murray@svn.freebsd.org) Message-Id: <201102200529.p1K5T0jh021301@svn.freebsd.org> From: Murray Stokely Date: Sun, 20 Feb 2011 05:29:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218877 - in head/lib/msun: . man X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 05:29:00 -0000 Author: murray (doc committer) Date: Sun Feb 20 05:29:00 2011 New Revision: 218877 URL: http://svn.freebsd.org/changeset/base/218877 Log: Add complex(3) manual page documenting our partial support for C99 complex arithmetic in libm. Reviewed by: David Schultz MFC after: 2 weeks Added: head/lib/msun/man/complex.3 (contents, props changed) Modified: head/lib/msun/Makefile Modified: head/lib/msun/Makefile ============================================================================== --- head/lib/msun/Makefile Sun Feb 20 03:35:59 2011 (r218876) +++ head/lib/msun/Makefile Sun Feb 20 05:29:00 2011 (r218877) @@ -131,7 +131,8 @@ MAN= acos.3 acosh.3 asin.3 asinh.3 atan. fma.3 fmax.3 fmod.3 hypot.3 ieee.3 ieee_test.3 ilogb.3 j0.3 \ lgamma.3 log.3 lrint.3 lround.3 math.3 nan.3 \ nextafter.3 remainder.3 rint.3 \ - round.3 scalbn.3 signbit.3 sin.3 sinh.3 sqrt.3 tan.3 tanh.3 trunc.3 + round.3 scalbn.3 signbit.3 sin.3 sinh.3 sqrt.3 tan.3 tanh.3 trunc.3 \ + complex.3 MLINKS+=acos.3 acosf.3 acos.3 acosl.3 MLINKS+=acosh.3 acoshf.3 Added: head/lib/msun/man/complex.3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/msun/man/complex.3 Sun Feb 20 05:29:00 2011 (r218877) @@ -0,0 +1,128 @@ +.\" Copyright (c) 2011 Murray Stokely +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd February 19, 2011 +.Dt COMPLEX 3 +.Os +.Sh NAME +.Nm complex +.Nd "complex arithmetic" +.Sh LIBRARY +.Lb libm +.Sh SYNOPSIS +.In complex.h +.Sh DESCRIPTION +These functions support complex arithmetic in the C math library. +.Sh "LIST OF FUNCTIONS" +Each of the following +.Vt "double complex" +functions has a +.Vt "float complex" +counterpart with an +.Ql f +appended to the name and a +.Vt "long double complex" +counterpart with an +.Ql l +appended. +As an example, the +.Vt "float complex" +and +.Vt "long double complex" +counterparts of +.Ft double +.Fn cabs "double complex z" +are +.Ft float +.Fn cabsf "float complex z" +and +.Ft "long double" +.Fn cabsl "long double complex z" , +respectively. +.de Cl +.Bl -column "csqrt" "complex absolute value (i.e. norm, modulus, magnitude)" +.Em "Name Description" +.. +.\" Section 7.3.5 - 7.3.7 of ISO C99 standard unimplemented, see BUGS +.\" Section 7.3.8 of ISO C99 standard +.Ss Absolute-value Functions +.Cl +cabs complex absolute value (i.e. norm, modulus, magnitude) +csqrt complex square root +.El +.\" Section 7.3.9 of ISO C99 standard +.Ss Manipulation Functions +.Cl +carg compute the argument (i.e. phase angle) +cimag compute the imaginary part +conj compute the complex conjugate +cproj compute projection onto Riemann sphere +creal compute the real part +.El +.Sh SEE ALSO +.Xr math 3 , +.Xr fenv 3 , +.Xr ieee 3 , +.Xr tgmath 3 +.Rs +.%T "ISO/IEC 9899:TC3" +.%U http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf +.Re +.Sh STANDARDS +The +.In complex.h +functions described here conform to +.St -isoC-99 . +.Sh BUGS +The trigonmetric functions +.Fn cacos , +.Fn casin , +.Fn catan , +.Fn ccos , +.Fn csin , +and +.Fn ctan +are not implemented. +.Pp +The hyperbolic functions +.Fn cacosh , +.Fn casinh , +.Fn catanh , +.Fn ccosh , +.Fn csinh , +and +.Fn ctanh +are not implemented. +.Pp +The exponential and logarithmic functions +.Fn cexp , +and +.Fn clog +are not implemented. +.Pp +The power functions +.Fn cpow +are not implemented. From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 07:58:31 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EAB6106564A; Sun, 20 Feb 2011 07:58:31 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F2AC88FC08; Sun, 20 Feb 2011 07:58:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1K7wUdV024413; Sun, 20 Feb 2011 07:58:30 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1K7wUJI024411; Sun, 20 Feb 2011 07:58:30 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <201102200758.p1K7wUJI024411@svn.freebsd.org> From: Dmitry Chagin Date: Sun, 20 Feb 2011 07:58:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218879 - head/sys/compat/linux X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 07:58:31 -0000 Author: dchagin Date: Sun Feb 20 07:58:30 2011 New Revision: 218879 URL: http://svn.freebsd.org/changeset/base/218879 Log: Do not clobber %rdx. Before calling vfork() syscall the linux user-space stores the current PID in the %rdx and restore it when the parent process will leave the kernel. Modified: head/sys/compat/linux/linux_fork.c Modified: head/sys/compat/linux/linux_fork.c ============================================================================== --- head/sys/compat/linux/linux_fork.c Sun Feb 20 07:46:35 2011 (r218878) +++ head/sys/compat/linux/linux_fork.c Sun Feb 20 07:58:30 2011 (r218879) @@ -104,7 +104,6 @@ linux_vfork(struct thread *td, struct li return (error); td->td_retval[0] = p2->p_pid; - td->td_retval[1] = 0; error = linux_proc_init(td, td->td_retval[0], 0); if (error) From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 09:14:02 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAB48106564A; Sun, 20 Feb 2011 09:14:02 +0000 (UTC) (envelope-from bruce@cran.org.uk) Received: from muon.cran.org.uk (unknown [IPv6:2a01:348:0:15:5d59:5c40:0:1]) by mx1.freebsd.org (Postfix) with ESMTP id 548088FC08; Sun, 20 Feb 2011 09:14:02 +0000 (UTC) Received: from muon.cran.org.uk (localhost [127.0.0.1]) by muon.cran.org.uk (Postfix) with ESMTP id 7FC28E8189; Sun, 20 Feb 2011 09:13:59 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=cran.org.uk; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=mail; bh=4riZsHjeX7cm Zc3qq+WyIq67iXo=; b=vUvmUMy580XQAvCZogahbvfDlr4clByzRJsuSgJzerMM Ehs5a8mN+zJ3nyAXmhHj2z25/LuGrQpKctwf51+O8cvFzDqOGnyYuTAm5kj0Y/TH w2sGbu2YYHxOwtMRaSXI93jkn/9szmfy20uAQjdYGWfX+yhuwdlzRdpBJelY4/E= DomainKey-Signature: a=rsa-sha1; c=nofws; d=cran.org.uk; h=date:from:to :cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; q=dns; s=mail; b=mbHrUh FvS1qSG+lRpMey1HySxMM9qD6AfSCmUEQVWl3HkOZ522LGAE07n3oAA62d8f9QKI PXYi8e6BYgdXPwJhW2FElvusFmBJyaQEkzR9iPWiFkC+Omo8i7d9mL4YTKnywmdL +V0vQdoh+BBIdj8SSz9JUK06FOtwWrvTyCbac= Received: from unknown (client-86-31-177-138.oxfd.adsl.virginmedia.com [86.31.177.138]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by muon.cran.org.uk (Postfix) with ESMTPSA id 03392E76A0; Sun, 20 Feb 2011 09:13:58 +0000 (GMT) Date: Sun, 20 Feb 2011 09:13:56 +0000 From: Bruce Cran To: Steve Kargl Message-ID: <20110220091356.0000686d@unknown> In-Reply-To: <20110220001914.GA51022@troutmask.apl.washington.edu> References: <201102131818.p1DIIuLL046962@svn.freebsd.org> <201102192007.32979.bruce@cran.org.uk> <4D6051D0.8050704@dougbarton.us> <20110220001914.GA51022@troutmask.apl.washington.edu> X-Mailer: Claws Mail 3.7.8cvs9 (GTK+ 2.16.6; i586-pc-mingw32msvc) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: "Carlos A. M. dos Santos" , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Doug Barton Subject: Re: svn commit: r218650 - head/games/fortune/datfiles X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 09:14:02 -0000 On Sat, 19 Feb 2011 16:19:14 -0800 Steve Kargl wrote: > So, 'svn revert' does not work on branches? It only works for uncommitted changes - "svn merge" does work though. -- Bruce Cran From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 09:52:29 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E71E8106566B; Sun, 20 Feb 2011 09:52:29 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D5B7F8FC0A; Sun, 20 Feb 2011 09:52:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1K9qTVJ027075; Sun, 20 Feb 2011 09:52:29 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1K9qTms027072; Sun, 20 Feb 2011 09:52:29 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201102200952.p1K9qTms027072@svn.freebsd.org> From: Konstantin Belousov Date: Sun, 20 Feb 2011 09:52:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218881 - in head: include share/man/man3 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 09:52:30 -0000 Author: kib Date: Sun Feb 20 09:52:29 2011 New Revision: 218881 URL: http://svn.freebsd.org/changeset/base/218881 Log: Add restrict keyword to pthread_sigmask prototype and manpage. MFC after: 1 week Modified: head/include/signal.h head/share/man/man3/pthread_sigmask.3 Modified: head/include/signal.h ============================================================================== --- head/include/signal.h Sun Feb 20 09:17:59 2011 (r218880) +++ head/include/signal.h Sun Feb 20 09:52:29 2011 (r218881) @@ -69,7 +69,8 @@ int raise(int); #if __POSIX_VISIBLE || __XSI_VISIBLE int kill(__pid_t, int); int pthread_kill(__pthread_t, int); -int pthread_sigmask(int, const __sigset_t *, __sigset_t *); +int pthread_sigmask(int, const __sigset_t * __restrict, + __sigset_t * __restrict); int sigaction(int, const struct sigaction * __restrict, struct sigaction * __restrict); int sigaddset(sigset_t *, int); Modified: head/share/man/man3/pthread_sigmask.3 ============================================================================== --- head/share/man/man3/pthread_sigmask.3 Sun Feb 20 09:17:59 2011 (r218880) +++ head/share/man/man3/pthread_sigmask.3 Sun Feb 20 09:52:29 2011 (r218881) @@ -26,7 +26,7 @@ .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd April 27, 2000 +.Dd February 19, 2011 .Dt PTHREAD_SIGMASK 3 .Os .Sh NAME @@ -38,7 +38,8 @@ .In pthread.h .In signal.h .Ft int -.Fn pthread_sigmask "int how" "const sigset_t *set" "sigset_t *oset" +.Fn pthread_sigmask "int how" "const sigset_t * restrict set" \ + "sigset_t * restrict oset" .Sh DESCRIPTION The .Fn pthread_sigmask From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 14:18:59 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A57C1065673; Sun, 20 Feb 2011 14:18:59 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CCC468FC18; Sun, 20 Feb 2011 14:18:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1KEIw0x034895; Sun, 20 Feb 2011 14:18:58 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1KEIwPe034890; Sun, 20 Feb 2011 14:18:58 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201102201418.p1KEIwPe034890@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 20 Feb 2011 14:18:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218889 - in head/tools/regression/bin/sh: builtins parser X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 14:18:59 -0000 Author: jilles Date: Sun Feb 20 14:18:58 2011 New Revision: 218889 URL: http://svn.freebsd.org/changeset/base/218889 Log: sh: Split off some special behaviour into separate tests. This allows some other shells to pass the tests for basic behaviour. Added: head/tools/regression/bin/sh/builtins/trap8.0 (contents, props changed) head/tools/regression/bin/sh/parser/for2.0 (contents, props changed) Modified: head/tools/regression/bin/sh/builtins/trap3.0 head/tools/regression/bin/sh/parser/for1.0 Modified: head/tools/regression/bin/sh/builtins/trap3.0 ============================================================================== --- head/tools/regression/bin/sh/builtins/trap3.0 Sun Feb 20 13:07:10 2011 (r218888) +++ head/tools/regression/bin/sh/builtins/trap3.0 Sun Feb 20 14:18:58 2011 (r218889) @@ -8,5 +8,4 @@ trap - 99999 && exit 3 trap true 99999 && exit 3 } 2>/dev/null -test -n "$(trap true garbage TERM 2>/dev/null || trap)" || exit 3 exit 0 Added: head/tools/regression/bin/sh/builtins/trap8.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/bin/sh/builtins/trap8.0 Sun Feb 20 14:18:58 2011 (r218889) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +# I am not sure if POSIX requires the shell to continue processing +# further trap names in the same trap command after an invalid one. + +test -n "$(trap true garbage TERM 2>/dev/null || trap)" || exit 3 +exit 0 Modified: head/tools/regression/bin/sh/parser/for1.0 ============================================================================== --- head/tools/regression/bin/sh/parser/for1.0 Sun Feb 20 13:07:10 2011 (r218888) +++ head/tools/regression/bin/sh/parser/for1.0 Sun Feb 20 14:18:58 2011 (r218889) @@ -13,7 +13,7 @@ for s1 in "$nl" " "; do done done set -- $list -for s2 in "$nl" " " ";" ";$nl"; do # s2=";" and ";$nl" are extensions to POSIX +for s2 in "$nl" " "; do for s3 in "$nl" " "; do r='' eval "for i${s2}do${s3}r=\"\$r \$i\"; done" Added: head/tools/regression/bin/sh/parser/for2.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/bin/sh/parser/for2.0 Sun Feb 20 14:18:58 2011 (r218889) @@ -0,0 +1,15 @@ +# $FreeBSD$ + +# Common extensions to the 'for' syntax. + +nl=' +' +list=' a b c' +set -- $list +for s2 in ";" ";$nl"; do + for s3 in "$nl" " "; do + r='' + eval "for i${s2}do${s3}r=\"\$r \$i\"; done" + [ "$r" = "$list" ] || exit 1 + done +done From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 16:16:43 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A5691065679; Sun, 20 Feb 2011 16:16:43 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2A1828FC14; Sun, 20 Feb 2011 16:16:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1KGGh6m037772; Sun, 20 Feb 2011 16:16:43 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1KGGh89037770; Sun, 20 Feb 2011 16:16:43 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201102201616.p1KGGh89037770@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 20 Feb 2011 16:16:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218890 - head/libexec/rtld-elf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 16:16:43 -0000 Author: nwhitehorn Date: Sun Feb 20 16:16:42 2011 New Revision: 218890 URL: http://svn.freebsd.org/changeset/base/218890 Log: Remove a hack made obsolete by the binutils 2.17 merge. Modified: head/libexec/rtld-elf/Symbol.map Modified: head/libexec/rtld-elf/Symbol.map ============================================================================== --- head/libexec/rtld-elf/Symbol.map Sun Feb 20 14:18:58 2011 (r218889) +++ head/libexec/rtld-elf/Symbol.map Sun Feb 20 16:16:42 2011 (r218890) @@ -15,9 +15,6 @@ FBSD_1.0 { dlinfo; dl_iterate_phdr; r_debug_state; -#ifdef __powerpc64__ - .r_debug_state; -#endif __tls_get_addr; }; From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 16:49:37 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 56619106566B; Sun, 20 Feb 2011 16:49:37 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: from EXHUB015-4.exch015.msoutlookonline.net (exhub015-4.exch015.msoutlookonline.net [207.5.72.96]) by mx1.freebsd.org (Postfix) with ESMTP id 3FBD48FC08; Sun, 20 Feb 2011 16:49:37 +0000 (UTC) Received: from [192.168.1.2] (173.66.131.189) by smtpx15.msoutlookonline.net (207.5.72.103) with Microsoft SMTP Server (TLS) id 8.2.254.0; Sun, 20 Feb 2011 08:49:37 -0800 Message-ID: <4D61461E.3000406@p6m7g8.com> Date: Sun, 20 Feb 2011 11:49:34 -0500 From: "Philip M. Gollucci" Organization: P6M7G8 Inc. User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.13) Gecko/20101207 Lightning/1.0b2 Thunderbird/3.1.7 MIME-Version: 1.0 To: Doug Barton References: <201102162123.p1GLN9f9084297@svn.freebsd.org> <4D6065B4.7040709@p6m7g8.com> <4D606FEB.6070806@dougbarton.us> In-Reply-To: <4D606FEB.6070806@dougbarton.us> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218753 - head/etc/namedb X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 16:49:37 -0000 On 2/19/2011 8:35 PM, Doug Barton wrote: > On 02/19/2011 16:52, Philip M. Gollucci wrote: >> On 2/16/2011 4:23 PM, Doug Barton wrote: >>> Author: dougb >>> Date: Wed Feb 16 21:23:09 2011 >>> New Revision: 218753 >>> URL: http://svn.freebsd.org/changeset/base/218753 >>> >>> Log: >>> Remove in-addr.arpa from the list of zones it is possible to slave >>> locally >> This is b/c of the recent change to fix the list of root servers that >> serve this right ? > > Not precisely. in-addr.arpa has moved to its own set of servers operated > jointly by the RIRs and ICANN. At some point in the near future this > zone will no longer be available directly from the root servers at all. We said the same thing, just I said it badly. -- ------------------------------------------------------------------------ 1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354 VP Apache Infrastructure; Member, Apache Software Foundation Committer, FreeBSD Foundation Consultant, P6M7G8 Inc. Sr. System Admin, Ridecharge Inc. Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching. From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 17:28:58 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D1D21065670; Sun, 20 Feb 2011 17:28:58 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8C16E8FC16; Sun, 20 Feb 2011 17:28:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1KHSwhn039357; Sun, 20 Feb 2011 17:28:58 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1KHSwRa039355; Sun, 20 Feb 2011 17:28:58 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201102201728.p1KHSwRa039355@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 20 Feb 2011 17:28:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218891 - head/tools/regression/bin/sh/parser X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 17:28:58 -0000 Author: jilles Date: Sun Feb 20 17:28:58 2011 New Revision: 218891 URL: http://svn.freebsd.org/changeset/base/218891 Log: sh: Add some tests for omitting whitespace whereever possible. Added: head/tools/regression/bin/sh/parser/no-space1.0 (contents, props changed) head/tools/regression/bin/sh/parser/no-space2.0 (contents, props changed) Added: head/tools/regression/bin/sh/parser/no-space1.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/bin/sh/parser/no-space1.0 Sun Feb 20 17:28:58 2011 (r218891) @@ -0,0 +1,18 @@ +# $FreeBSD$ + +# These are ugly but are required to work. + +set -e + +while(false)do(:)done +if(false)then(:)fi +if(false)then(:)else(:)fi +(:&&:)||: +until(:)do(:)done +case x in(x);;*)exit 1;(:)esac +case x in(x);;*)exit 1;;esac +for i do(:)done +{(:)} +f(){(:)} +:|: +(:)|(:) Added: head/tools/regression/bin/sh/parser/no-space2.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/bin/sh/parser/no-space2.0 Sun Feb 20 17:28:58 2011 (r218891) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +# This conflicts with ksh extended patterns but occurs in the wild. + +set -e + +!(false) From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 17:54:49 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0A1B106566B; Sun, 20 Feb 2011 17:54:49 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9F5A48FC12; Sun, 20 Feb 2011 17:54:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1KHsnfN039912; Sun, 20 Feb 2011 17:54:49 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1KHsnaW039910; Sun, 20 Feb 2011 17:54:49 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201102201754.p1KHsnaW039910@svn.freebsd.org> From: Warner Losh Date: Sun, 20 Feb 2011 17:54:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218892 - head/usr.sbin/wpa/wpa_supplicant X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 17:54:49 -0000 Author: imp Date: Sun Feb 20 17:54:49 2011 New Revision: 218892 URL: http://svn.freebsd.org/changeset/base/218892 Log: Add notes about ASCII/Hex WEP keys Modified: head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 Modified: head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 ============================================================================== --- head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 Sun Feb 20 17:28:58 2011 (r218891) +++ head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 Sun Feb 20 17:54:49 2011 (r218892) @@ -424,6 +424,16 @@ Enable/disable EAP workarounds for vario with misbehaving authentication servers. By default these workarounds are enabled. Strict EAP conformance can be configured by setting this to 0. +.It Va wep_tx_keyidx +which key to use for transmission of packets. +.It Va wep_keyN key +An +.Tn ASCII +string enclosed in quotation marks to encode the WEP key. +Without quotes this is a hex string of the actual key. +WEP is considered insecure and should be avoided. +The exact translation from an ASCII key to a hex key varies. +Use hex keys where possible. .El .Sh CERTIFICATES Some EAP authentication methods require use of certificates. @@ -540,7 +550,10 @@ network={ scan_ssid=1 key_mgmt=NONE wep_tx_keyidx=0 + # hex keys denoted without quotes wep_key0=42FEEDDEAFBABEDEAFBEEFAA55 + # ASCII keys denoted with quotes. + wep_key1="FreeBSDr0cks!" } .Ed .Sh SEE ALSO From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 19:33:49 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DFC9106564A; Sun, 20 Feb 2011 19:33:49 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3574C8FC08; Sun, 20 Feb 2011 19:33:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1KJXnm6042266; Sun, 20 Feb 2011 19:33:49 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1KJXm1N042245; Sun, 20 Feb 2011 19:33:48 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201102201933.p1KJXm1N042245@svn.freebsd.org> From: Dimitry Andric Date: Sun, 20 Feb 2011 19:33:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218893 - in head: . contrib/llvm/include/llvm contrib/llvm/include/llvm-c contrib/llvm/include/llvm-c/Transforms contrib/llvm/include/llvm/ADT contrib/llvm/include/llvm/Analysis contri... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 19:33:49 -0000 Author: dim Date: Sun Feb 20 19:33:47 2011 New Revision: 218893 URL: http://svn.freebsd.org/changeset/base/218893 Log: Upgrade our copy of llvm/clang to r126079, from upstream's trunk. This contains many improvements, primarily better C++ support, an integrated assembler for x86 and support for -pg. Added: head/contrib/llvm/include/llvm-c/Initialization.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm-c/Initialization.h head/contrib/llvm/include/llvm/ADT/ArrayRef.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/ADT/ArrayRef.h head/contrib/llvm/include/llvm/ADT/InMemoryStruct.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/ADT/InMemoryStruct.h head/contrib/llvm/include/llvm/ADT/IntEqClasses.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/ADT/IntEqClasses.h head/contrib/llvm/include/llvm/ADT/IntervalMap.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/ADT/IntervalMap.h head/contrib/llvm/include/llvm/Analysis/DIBuilder.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Analysis/DIBuilder.h head/contrib/llvm/include/llvm/Analysis/DominanceFrontier.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Analysis/DominanceFrontier.h head/contrib/llvm/include/llvm/Analysis/PathNumbering.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Analysis/PathNumbering.h head/contrib/llvm/include/llvm/Analysis/PathProfileInfo.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Analysis/PathProfileInfo.h head/contrib/llvm/include/llvm/Analysis/RegionPass.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Analysis/RegionPass.h head/contrib/llvm/include/llvm/CodeGen/EdgeBundles.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/CodeGen/EdgeBundles.h head/contrib/llvm/include/llvm/CodeGen/MachineLoopRanges.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/CodeGen/MachineLoopRanges.h head/contrib/llvm/include/llvm/CodeGen/PBQP/ - copied from r218888, vendor/llvm/dist/include/llvm/CodeGen/PBQP/ head/contrib/llvm/include/llvm/CodeGen/RegAllocPBQP.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/CodeGen/RegAllocPBQP.h head/contrib/llvm/include/llvm/CodeGen/ScoreboardHazardRecognizer.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/CodeGen/ScoreboardHazardRecognizer.h head/contrib/llvm/include/llvm/ExecutionEngine/MCJIT.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/ExecutionEngine/MCJIT.h head/contrib/llvm/include/llvm/InitializePasses.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/InitializePasses.h head/contrib/llvm/include/llvm/MC/MCELFObjectWriter.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/MC/MCELFObjectWriter.h head/contrib/llvm/include/llvm/MC/MCFixupKindInfo.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/MC/MCFixupKindInfo.h head/contrib/llvm/include/llvm/MC/MCMachObjectWriter.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/MC/MCMachObjectWriter.h head/contrib/llvm/include/llvm/Object/ - copied from r218888, vendor/llvm/dist/include/llvm/Object/ head/contrib/llvm/include/llvm/Support/AIXDataTypesFix.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/AIXDataTypesFix.h head/contrib/llvm/include/llvm/Support/Atomic.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Atomic.h head/contrib/llvm/include/llvm/Support/DataTypes.h.in - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/DataTypes.h.in head/contrib/llvm/include/llvm/Support/Disassembler.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Disassembler.h head/contrib/llvm/include/llvm/Support/DynamicLibrary.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/DynamicLibrary.h head/contrib/llvm/include/llvm/Support/Endian.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Endian.h head/contrib/llvm/include/llvm/Support/Errno.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Errno.h head/contrib/llvm/include/llvm/Support/FEnv.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/FEnv.h head/contrib/llvm/include/llvm/Support/FileSystem.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/FileSystem.h head/contrib/llvm/include/llvm/Support/Host.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Host.h head/contrib/llvm/include/llvm/Support/IncludeFile.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/IncludeFile.h head/contrib/llvm/include/llvm/Support/Memory.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Memory.h head/contrib/llvm/include/llvm/Support/Mutex.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Mutex.h head/contrib/llvm/include/llvm/Support/Path.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Path.h head/contrib/llvm/include/llvm/Support/PathV1.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/PathV1.h head/contrib/llvm/include/llvm/Support/PathV2.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/PathV2.h head/contrib/llvm/include/llvm/Support/Process.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Process.h head/contrib/llvm/include/llvm/Support/Program.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Program.h head/contrib/llvm/include/llvm/Support/RWMutex.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/RWMutex.h head/contrib/llvm/include/llvm/Support/Signals.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Signals.h head/contrib/llvm/include/llvm/Support/Solaris.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Solaris.h head/contrib/llvm/include/llvm/Support/SwapByteOrder.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/SwapByteOrder.h head/contrib/llvm/include/llvm/Support/ThreadLocal.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/ThreadLocal.h head/contrib/llvm/include/llvm/Support/Threading.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Threading.h head/contrib/llvm/include/llvm/Support/TimeValue.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/TimeValue.h head/contrib/llvm/include/llvm/Support/ToolOutputFile.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/ToolOutputFile.h head/contrib/llvm/include/llvm/Support/Valgrind.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Valgrind.h head/contrib/llvm/include/llvm/Support/system_error.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/system_error.h head/contrib/llvm/include/llvm/Target/TargetAsmInfo.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Target/TargetAsmInfo.h head/contrib/llvm/include/llvm/Target/TargetFrameLowering.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Target/TargetFrameLowering.h head/contrib/llvm/include/llvm/Target/TargetLibraryInfo.h - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Target/TargetLibraryInfo.h head/contrib/llvm/lib/Analysis/DIBuilder.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/DIBuilder.cpp head/contrib/llvm/lib/Analysis/DominanceFrontier.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/DominanceFrontier.cpp head/contrib/llvm/lib/Analysis/IPA/IPA.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/IPA/IPA.cpp head/contrib/llvm/lib/Analysis/MemDepPrinter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/MemDepPrinter.cpp head/contrib/llvm/lib/Analysis/NoAliasAnalysis.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/NoAliasAnalysis.cpp head/contrib/llvm/lib/Analysis/PathNumbering.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/PathNumbering.cpp head/contrib/llvm/lib/Analysis/PathProfileInfo.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/PathProfileInfo.cpp head/contrib/llvm/lib/Analysis/PathProfileVerifier.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/PathProfileVerifier.cpp head/contrib/llvm/lib/Analysis/RegionPass.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/RegionPass.cpp head/contrib/llvm/lib/CodeGen/AllocationOrder.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/AllocationOrder.cpp head/contrib/llvm/lib/CodeGen/AllocationOrder.h - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/AllocationOrder.h head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfTableException.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfTableException.cpp head/contrib/llvm/lib/CodeGen/CodeGen.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/CodeGen.cpp head/contrib/llvm/lib/CodeGen/EdgeBundles.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/EdgeBundles.cpp head/contrib/llvm/lib/CodeGen/ExpandISelPseudos.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/ExpandISelPseudos.cpp head/contrib/llvm/lib/CodeGen/LiveDebugVariables.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/LiveDebugVariables.cpp head/contrib/llvm/lib/CodeGen/LiveDebugVariables.h - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/LiveDebugVariables.h head/contrib/llvm/lib/CodeGen/LiveIntervalUnion.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/LiveIntervalUnion.cpp head/contrib/llvm/lib/CodeGen/LiveIntervalUnion.h - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/LiveIntervalUnion.h head/contrib/llvm/lib/CodeGen/LiveRangeEdit.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/LiveRangeEdit.cpp head/contrib/llvm/lib/CodeGen/LiveRangeEdit.h - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/LiveRangeEdit.h head/contrib/llvm/lib/CodeGen/MachineLoopRanges.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/MachineLoopRanges.cpp head/contrib/llvm/lib/CodeGen/PHIEliminationUtils.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/PHIEliminationUtils.cpp head/contrib/llvm/lib/CodeGen/PHIEliminationUtils.h - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/PHIEliminationUtils.h head/contrib/llvm/lib/CodeGen/RegAllocBase.h - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/RegAllocBase.h head/contrib/llvm/lib/CodeGen/RegAllocBasic.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/RegAllocBasic.cpp head/contrib/llvm/lib/CodeGen/RegAllocGreedy.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/RegAllocGreedy.cpp head/contrib/llvm/lib/CodeGen/ScoreboardHazardRecognizer.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/ScoreboardHazardRecognizer.cpp head/contrib/llvm/lib/CodeGen/SpillPlacement.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/SpillPlacement.cpp head/contrib/llvm/lib/CodeGen/SpillPlacement.h - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/SpillPlacement.h head/contrib/llvm/lib/ExecutionEngine/MCJIT/ - copied from r218888, vendor/llvm/dist/lib/ExecutionEngine/MCJIT/ head/contrib/llvm/lib/MC/MCELFObjectTargetWriter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/MC/MCELFObjectTargetWriter.cpp head/contrib/llvm/lib/MC/MCMachObjectTargetWriter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/MC/MCMachObjectTargetWriter.cpp head/contrib/llvm/lib/MC/MCParser/COFFAsmParser.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/MC/MCParser/COFFAsmParser.cpp head/contrib/llvm/lib/MC/MCPureStreamer.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/MC/MCPureStreamer.cpp head/contrib/llvm/lib/Object/ - copied from r218888, vendor/llvm/dist/lib/Object/ head/contrib/llvm/lib/Support/Atomic.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Atomic.cpp head/contrib/llvm/lib/Support/Disassembler.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Disassembler.cpp head/contrib/llvm/lib/Support/DynamicLibrary.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/DynamicLibrary.cpp head/contrib/llvm/lib/Support/Errno.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Errno.cpp head/contrib/llvm/lib/Support/Host.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Host.cpp head/contrib/llvm/lib/Support/IncludeFile.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/IncludeFile.cpp head/contrib/llvm/lib/Support/IntEqClasses.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/IntEqClasses.cpp head/contrib/llvm/lib/Support/IntervalMap.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/IntervalMap.cpp head/contrib/llvm/lib/Support/Memory.cpp - copied, changed from r218888, vendor/llvm/dist/lib/Support/Memory.cpp head/contrib/llvm/lib/Support/Mutex.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Mutex.cpp head/contrib/llvm/lib/Support/Path.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Path.cpp head/contrib/llvm/lib/Support/PathV2.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/PathV2.cpp head/contrib/llvm/lib/Support/Process.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Process.cpp head/contrib/llvm/lib/Support/Program.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Program.cpp head/contrib/llvm/lib/Support/RWMutex.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/RWMutex.cpp head/contrib/llvm/lib/Support/SearchForAddressOfSpecialSymbol.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/SearchForAddressOfSpecialSymbol.cpp head/contrib/llvm/lib/Support/Signals.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Signals.cpp head/contrib/llvm/lib/Support/ThreadLocal.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/ThreadLocal.cpp head/contrib/llvm/lib/Support/Threading.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Threading.cpp head/contrib/llvm/lib/Support/TimeValue.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/TimeValue.cpp head/contrib/llvm/lib/Support/ToolOutputFile.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/ToolOutputFile.cpp head/contrib/llvm/lib/Support/Unix/ - copied from r218888, vendor/llvm/dist/lib/Support/Unix/ head/contrib/llvm/lib/Support/Valgrind.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Valgrind.cpp head/contrib/llvm/lib/Support/Windows/ - copied from r218888, vendor/llvm/dist/lib/Support/Windows/ head/contrib/llvm/lib/Support/system_error.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Support/system_error.cpp head/contrib/llvm/lib/Target/ARM/ARMAsmBackend.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMAsmBackend.cpp head/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMAsmPrinter.h head/contrib/llvm/lib/Target/ARM/ARMBaseInfo.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMBaseInfo.h head/contrib/llvm/lib/Target/ARM/ARMCallingConv.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMCallingConv.h head/contrib/llvm/lib/Target/ARM/ARMELFWriterInfo.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMELFWriterInfo.cpp head/contrib/llvm/lib/Target/ARM/ARMELFWriterInfo.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMELFWriterInfo.h head/contrib/llvm/lib/Target/ARM/ARMFixupKinds.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMFixupKinds.h head/contrib/llvm/lib/Target/ARM/ARMFrameLowering.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMFrameLowering.cpp head/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMFrameLowering.h head/contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMHazardRecognizer.cpp head/contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMHazardRecognizer.h head/contrib/llvm/lib/Target/ARM/ARMMCCodeEmitter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMMCCodeEmitter.cpp head/contrib/llvm/lib/Target/ARM/ARMMCExpr.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMMCExpr.cpp head/contrib/llvm/lib/Target/ARM/ARMMCExpr.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMMCExpr.h head/contrib/llvm/lib/Target/ARM/InstPrinter/ - copied from r218888, vendor/llvm/dist/lib/Target/ARM/InstPrinter/ head/contrib/llvm/lib/Target/ARM/MLxExpansionPass.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/MLxExpansionPass.cpp head/contrib/llvm/lib/Target/ARM/Thumb1FrameLowering.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/Thumb1FrameLowering.cpp head/contrib/llvm/lib/Target/ARM/Thumb1FrameLowering.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/Thumb1FrameLowering.h head/contrib/llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Alpha/AlphaAsmPrinter.cpp head/contrib/llvm/lib/Target/Alpha/AlphaFrameLowering.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Alpha/AlphaFrameLowering.cpp head/contrib/llvm/lib/Target/Alpha/AlphaFrameLowering.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Alpha/AlphaFrameLowering.h head/contrib/llvm/lib/Target/Blackfin/BlackfinAsmPrinter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Blackfin/BlackfinAsmPrinter.cpp head/contrib/llvm/lib/Target/Blackfin/BlackfinFrameLowering.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Blackfin/BlackfinFrameLowering.cpp head/contrib/llvm/lib/Target/Blackfin/BlackfinFrameLowering.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Blackfin/BlackfinFrameLowering.h head/contrib/llvm/lib/Target/CellSPU/SPUAsmPrinter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/CellSPU/SPUAsmPrinter.cpp head/contrib/llvm/lib/Target/CellSPU/SPUFrameLowering.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/CellSPU/SPUFrameLowering.cpp head/contrib/llvm/lib/Target/CellSPU/SPUFrameLowering.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/CellSPU/SPUFrameLowering.h head/contrib/llvm/lib/Target/CellSPU/SPUNopFiller.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/CellSPU/SPUNopFiller.cpp head/contrib/llvm/lib/Target/MBlaze/AsmParser/ - copied from r218888, vendor/llvm/dist/lib/Target/MBlaze/AsmParser/ head/contrib/llvm/lib/Target/MBlaze/Disassembler/ - copied from r218888, vendor/llvm/dist/lib/Target/MBlaze/Disassembler/ head/contrib/llvm/lib/Target/MBlaze/InstPrinter/ - copied from r218888, vendor/llvm/dist/lib/Target/MBlaze/InstPrinter/ head/contrib/llvm/lib/Target/MBlaze/MBlazeAsmBackend.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeAsmBackend.cpp head/contrib/llvm/lib/Target/MBlaze/MBlazeAsmPrinter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeAsmPrinter.cpp head/contrib/llvm/lib/Target/MBlaze/MBlazeELFWriterInfo.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeELFWriterInfo.cpp head/contrib/llvm/lib/Target/MBlaze/MBlazeELFWriterInfo.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeELFWriterInfo.h head/contrib/llvm/lib/Target/MBlaze/MBlazeFrameLowering.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeFrameLowering.cpp head/contrib/llvm/lib/Target/MBlaze/MBlazeFrameLowering.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeFrameLowering.h head/contrib/llvm/lib/Target/MBlaze/MBlazeMCCodeEmitter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeMCCodeEmitter.cpp head/contrib/llvm/lib/Target/MBlaze/MBlazeMCInstLower.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeMCInstLower.cpp head/contrib/llvm/lib/Target/MBlaze/MBlazeMCInstLower.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeMCInstLower.h head/contrib/llvm/lib/Target/MBlaze/MBlazeRelocations.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeRelocations.h head/contrib/llvm/lib/Target/MSP430/InstPrinter/ - copied from r218888, vendor/llvm/dist/lib/Target/MSP430/InstPrinter/ head/contrib/llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MSP430/MSP430AsmPrinter.cpp head/contrib/llvm/lib/Target/MSP430/MSP430FrameLowering.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MSP430/MSP430FrameLowering.cpp head/contrib/llvm/lib/Target/MSP430/MSP430FrameLowering.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MSP430/MSP430FrameLowering.h head/contrib/llvm/lib/Target/MSP430/MSP430MCInstLower.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MSP430/MSP430MCInstLower.cpp head/contrib/llvm/lib/Target/MSP430/MSP430MCInstLower.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MSP430/MSP430MCInstLower.h head/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Mips/MipsAsmPrinter.cpp head/contrib/llvm/lib/Target/Mips/MipsFrameLowering.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Mips/MipsFrameLowering.cpp head/contrib/llvm/lib/Target/Mips/MipsFrameLowering.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Mips/MipsFrameLowering.h head/contrib/llvm/lib/Target/PTX/ - copied from r218888, vendor/llvm/dist/lib/Target/PTX/ head/contrib/llvm/lib/Target/PowerPC/InstPrinter/ - copied from r218888, vendor/llvm/dist/lib/Target/PowerPC/InstPrinter/ head/contrib/llvm/lib/Target/PowerPC/PPCAsmBackend.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/PowerPC/PPCAsmBackend.cpp head/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/PowerPC/PPCAsmPrinter.cpp head/contrib/llvm/lib/Target/PowerPC/PPCFixupKinds.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/PowerPC/PPCFixupKinds.h head/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/PowerPC/PPCFrameLowering.cpp head/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/PowerPC/PPCFrameLowering.h head/contrib/llvm/lib/Target/PowerPC/PPCMCCodeEmitter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/PowerPC/PPCMCCodeEmitter.cpp head/contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/PowerPC/PPCMCInstLower.cpp head/contrib/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Sparc/SparcAsmPrinter.cpp head/contrib/llvm/lib/Target/Sparc/SparcFrameLowering.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Sparc/SparcFrameLowering.cpp head/contrib/llvm/lib/Target/Sparc/SparcFrameLowering.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Sparc/SparcFrameLowering.h head/contrib/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/SystemZ/SystemZAsmPrinter.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZFrameLowering.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/SystemZ/SystemZFrameLowering.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZFrameLowering.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/SystemZ/SystemZFrameLowering.h head/contrib/llvm/lib/Target/TargetAsmInfo.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/TargetAsmInfo.cpp head/contrib/llvm/lib/Target/TargetFrameLowering.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/TargetFrameLowering.cpp head/contrib/llvm/lib/Target/TargetLibraryInfo.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/TargetLibraryInfo.cpp head/contrib/llvm/lib/Target/X86/InstPrinter/ - copied from r218888, vendor/llvm/dist/lib/Target/X86/InstPrinter/ head/contrib/llvm/lib/Target/X86/Utils/ - copied from r218888, vendor/llvm/dist/lib/Target/X86/Utils/ head/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86FrameLowering.cpp head/contrib/llvm/lib/Target/X86/X86FrameLowering.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86FrameLowering.h head/contrib/llvm/lib/Target/X86/X86Instr3DNow.td - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86Instr3DNow.td head/contrib/llvm/lib/Target/X86/X86InstrArithmetic.td - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrArithmetic.td head/contrib/llvm/lib/Target/X86/X86InstrCMovSetCC.td - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrCMovSetCC.td head/contrib/llvm/lib/Target/X86/X86InstrCompiler.td - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrCompiler.td head/contrib/llvm/lib/Target/X86/X86InstrControl.td - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrControl.td head/contrib/llvm/lib/Target/X86/X86InstrExtension.td - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrExtension.td head/contrib/llvm/lib/Target/X86/X86InstrShiftRotate.td - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrShiftRotate.td head/contrib/llvm/lib/Target/X86/X86InstrSystem.td - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrSystem.td head/contrib/llvm/lib/Target/X86/X86InstrVMX.td - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrVMX.td head/contrib/llvm/lib/Target/X86/X86MachObjectWriter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86MachObjectWriter.cpp head/contrib/llvm/lib/Target/XCore/XCoreAsmPrinter.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/XCore/XCoreAsmPrinter.cpp head/contrib/llvm/lib/Target/XCore/XCoreFrameLowering.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Target/XCore/XCoreFrameLowering.cpp head/contrib/llvm/lib/Target/XCore/XCoreFrameLowering.h - copied unchanged from r218888, vendor/llvm/dist/lib/Target/XCore/XCoreFrameLowering.h head/contrib/llvm/lib/Transforms/Instrumentation/Instrumentation.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Transforms/Instrumentation/Instrumentation.cpp head/contrib/llvm/lib/Transforms/Instrumentation/PathProfiling.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Transforms/Instrumentation/PathProfiling.cpp head/contrib/llvm/lib/Transforms/Scalar/EarlyCSE.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Transforms/Scalar/EarlyCSE.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopIdiomRecognize.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Transforms/Scalar/LoopIdiomRecognize.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopInstSimplify.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Transforms/Scalar/LoopInstSimplify.cpp head/contrib/llvm/lib/Transforms/Utils/SimplifyInstructions.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Transforms/Utils/SimplifyInstructions.cpp head/contrib/llvm/lib/Transforms/Utils/Utils.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/Transforms/Utils/Utils.cpp head/contrib/llvm/lib/VMCore/User.cpp - copied unchanged from r218888, vendor/llvm/dist/lib/VMCore/User.cpp head/contrib/llvm/tools/clang/include/clang/AST/ASTMutationListener.h - copied unchanged from r218888, vendor/clang/dist/include/clang/AST/ASTMutationListener.h head/contrib/llvm/tools/clang/include/clang/AST/EvaluatedExprVisitor.h - copied unchanged from r218888, vendor/clang/dist/include/clang/AST/EvaluatedExprVisitor.h head/contrib/llvm/tools/clang/include/clang/AST/Mangle.h - copied unchanged from r218888, vendor/clang/dist/include/clang/AST/Mangle.h head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/UninitializedValuesV2.h - copied unchanged from r218888, vendor/clang/dist/include/clang/Analysis/Analyses/UninitializedValuesV2.h head/contrib/llvm/tools/clang/include/clang/Analysis/DomainSpecific/ - copied from r218888, vendor/clang/dist/include/clang/Analysis/DomainSpecific/ head/contrib/llvm/tools/clang/include/clang/Basic/ABI.h - copied unchanged from r218888, vendor/clang/dist/include/clang/Basic/ABI.h head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticIDs.h - copied unchanged from r218888, vendor/clang/dist/include/clang/Basic/DiagnosticIDs.h head/contrib/llvm/tools/clang/include/clang/Basic/FileSystemOptions.h - copied unchanged from r218888, vendor/clang/dist/include/clang/Basic/FileSystemOptions.h head/contrib/llvm/tools/clang/include/clang/Basic/FileSystemStatCache.h - copied unchanged from r218888, vendor/clang/dist/include/clang/Basic/FileSystemStatCache.h head/contrib/llvm/tools/clang/include/clang/Basic/OpenCLExtensions.def - copied unchanged from r218888, vendor/clang/dist/include/clang/Basic/OpenCLExtensions.def head/contrib/llvm/tools/clang/include/clang/Basic/Visibility.h - copied unchanged from r218888, vendor/clang/dist/include/clang/Basic/Visibility.h head/contrib/llvm/tools/clang/include/clang/Config/ - copied from r218888, vendor/clang/dist/include/clang/Config/ head/contrib/llvm/tools/clang/include/clang/Frontend/MultiplexConsumer.h - copied unchanged from r218888, vendor/clang/dist/include/clang/Frontend/MultiplexConsumer.h head/contrib/llvm/tools/clang/include/clang/Serialization/ASTSerializationListener.h - copied unchanged from r218888, vendor/clang/dist/include/clang/Serialization/ASTSerializationListener.h head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/ - copied from r218888, vendor/clang/dist/include/clang/StaticAnalyzer/ head/contrib/llvm/tools/clang/lib/AST/DumpXML.cpp - copied unchanged from r218888, vendor/clang/dist/lib/AST/DumpXML.cpp head/contrib/llvm/tools/clang/lib/AST/ItaniumMangle.cpp - copied unchanged from r218888, vendor/clang/dist/lib/AST/ItaniumMangle.cpp head/contrib/llvm/tools/clang/lib/AST/Mangle.cpp - copied unchanged from r218888, vendor/clang/dist/lib/AST/Mangle.cpp head/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp - copied unchanged from r218888, vendor/clang/dist/lib/AST/MicrosoftMangle.cpp head/contrib/llvm/tools/clang/lib/Analysis/CocoaConventions.cpp - copied unchanged from r218888, vendor/clang/dist/lib/Analysis/CocoaConventions.cpp head/contrib/llvm/tools/clang/lib/Analysis/UninitializedValuesV2.cpp - copied unchanged from r218888, vendor/clang/dist/lib/Analysis/UninitializedValuesV2.cpp head/contrib/llvm/tools/clang/lib/Basic/DiagnosticIDs.cpp - copied unchanged from r218888, vendor/clang/dist/lib/Basic/DiagnosticIDs.cpp head/contrib/llvm/tools/clang/lib/Basic/FileSystemStatCache.cpp - copied unchanged from r218888, vendor/clang/dist/lib/Basic/FileSystemStatCache.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.cpp - copied unchanged from r218888, vendor/clang/dist/lib/CodeGen/CGCXXABI.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGCleanup.cpp - copied unchanged from r218888, vendor/clang/dist/lib/CodeGen/CGCleanup.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGCleanup.h - copied unchanged from r218888, vendor/clang/dist/lib/CodeGen/CGCleanup.h head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.cpp - copied unchanged from r218888, vendor/clang/dist/lib/CodeGen/CodeGenTBAA.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.h - copied unchanged from r218888, vendor/clang/dist/lib/CodeGen/CodeGenTBAA.h head/contrib/llvm/tools/clang/lib/Frontend/HeaderIncludeGen.cpp - copied unchanged from r218888, vendor/clang/dist/lib/Frontend/HeaderIncludeGen.cpp head/contrib/llvm/tools/clang/lib/Frontend/MultiplexConsumer.cpp - copied unchanged from r218888, vendor/clang/dist/lib/Frontend/MultiplexConsumer.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateVariadic.cpp - copied unchanged from r218888, vendor/clang/dist/lib/Sema/SemaTemplateVariadic.cpp head/contrib/llvm/tools/clang/lib/Sema/TypeLocBuilder.h - copied unchanged from r218888, vendor/clang/dist/lib/Sema/TypeLocBuilder.h head/contrib/llvm/tools/clang/lib/StaticAnalyzer/ - copied from r218888, vendor/clang/dist/lib/StaticAnalyzer/ head/contrib/llvm/utils/TableGen/ClangSACheckersEmitter.cpp - copied unchanged from r218888, vendor/llvm/dist/utils/TableGen/ClangSACheckersEmitter.cpp head/contrib/llvm/utils/TableGen/ClangSACheckersEmitter.h - copied unchanged from r218888, vendor/llvm/dist/utils/TableGen/ClangSACheckersEmitter.h head/contrib/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp - copied unchanged from r218888, vendor/llvm/dist/utils/TableGen/FixedLenDecoderEmitter.cpp head/contrib/llvm/utils/TableGen/FixedLenDecoderEmitter.h - copied unchanged from r218888, vendor/llvm/dist/utils/TableGen/FixedLenDecoderEmitter.h head/contrib/llvm/utils/TableGen/StringMatcher.cpp - copied unchanged from r218888, vendor/llvm/dist/utils/TableGen/StringMatcher.cpp head/contrib/llvm/utils/TableGen/StringMatcher.h - copied unchanged from r218888, vendor/llvm/dist/utils/TableGen/StringMatcher.h head/lib/clang/include/ARMGenDecoderTables.inc (contents, props changed) head/lib/clang/include/ARMGenEDInfo.inc (contents, props changed) head/lib/clang/include/ARMGenMCCodeEmitter.inc (contents, props changed) head/lib/clang/include/Checkers.inc (contents, props changed) head/lib/clang/include/PPCGenMCCodeEmitter.inc (contents, props changed) head/lib/clang/include/clang/Lex/ head/lib/clang/include/clang/Lex/AttrSpellings.inc (contents, props changed) head/lib/clang/include/llvm/Support/ head/lib/clang/include/llvm/Support/DataTypes.h (contents, props changed) head/lib/clang/libclangstaticanalyzercheckers/ head/lib/clang/libclangstaticanalyzercheckers/Makefile (contents, props changed) head/lib/clang/libclangstaticanalyzercore/ head/lib/clang/libclangstaticanalyzercore/Makefile (contents, props changed) head/lib/clang/libclangstaticanalyzerfrontend/ head/lib/clang/libclangstaticanalyzerfrontend/Makefile (contents, props changed) head/lib/clang/libllvmarmdisassembler/ head/lib/clang/libllvmarmdisassembler/Makefile (contents, props changed) head/lib/clang/libllvmarminstprinter/ head/lib/clang/libllvmarminstprinter/Makefile (contents, props changed) head/lib/clang/libllvmpowerpcinstprinter/ head/lib/clang/libllvmpowerpcinstprinter/Makefile (contents, props changed) head/lib/clang/libllvmx86instprinter/ head/lib/clang/libllvmx86instprinter/Makefile (contents, props changed) head/lib/clang/libllvmx86utils/ head/lib/clang/libllvmx86utils/Makefile (contents, props changed) Deleted: head/contrib/llvm/include/llvm/Analysis/PointerTracking.h head/contrib/llvm/include/llvm/CodeGen/PostRAHazardRecognizer.h head/contrib/llvm/include/llvm/MC/ELFObjectWriter.h head/contrib/llvm/include/llvm/MC/MachObjectWriter.h head/contrib/llvm/include/llvm/Support/DynamicLinker.h head/contrib/llvm/include/llvm/Support/StableBasicBlockNumbering.h head/contrib/llvm/include/llvm/System/ head/contrib/llvm/include/llvm/Target/TargetFrameInfo.h head/contrib/llvm/include/llvm/Transforms/RSProfiling.h head/contrib/llvm/lib/Analysis/PointerTracking.cpp head/contrib/llvm/lib/CodeGen/PBQP/ head/contrib/llvm/lib/CodeGen/PHIElimination.h head/contrib/llvm/lib/CodeGen/PostRAHazardRecognizer.cpp head/contrib/llvm/lib/System/ head/contrib/llvm/lib/Target/ARM/ARMFrameInfo.h head/contrib/llvm/lib/Target/ARM/ARMMCInstLower.h head/contrib/llvm/lib/Target/ARM/AsmPrinter/ head/contrib/llvm/lib/Target/ARM/NEONPreAllocPass.cpp head/contrib/llvm/lib/Target/ARM/Thumb2HazardRecognizer.cpp head/contrib/llvm/lib/Target/ARM/Thumb2HazardRecognizer.h head/contrib/llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp head/contrib/llvm/lib/Target/Alpha/AlphaJITInfo.cpp head/contrib/llvm/lib/Target/Alpha/AlphaJITInfo.h head/contrib/llvm/lib/Target/Alpha/AsmPrinter/ head/contrib/llvm/lib/Target/Blackfin/AsmPrinter/ head/contrib/llvm/lib/Target/CellSPU/AsmPrinter/ head/contrib/llvm/lib/Target/CellSPU/SPUFrameInfo.cpp head/contrib/llvm/lib/Target/CellSPU/SPUFrameInfo.h head/contrib/llvm/lib/Target/MBlaze/AsmPrinter/ head/contrib/llvm/lib/Target/MSP430/AsmPrinter/ head/contrib/llvm/lib/Target/Mips/AsmPrinter/ head/contrib/llvm/lib/Target/PIC16/ head/contrib/llvm/lib/Target/PowerPC/AsmPrinter/ head/contrib/llvm/lib/Target/PowerPC/PPCFrameInfo.h head/contrib/llvm/lib/Target/Sparc/AsmPrinter/ head/contrib/llvm/lib/Target/SystemZ/AsmPrinter/ head/contrib/llvm/lib/Target/TargetFrameInfo.cpp head/contrib/llvm/lib/Target/X86/AsmPrinter/ head/contrib/llvm/lib/Target/X86/X86Instr64bit.td head/contrib/llvm/lib/Target/X86/X86ShuffleDecode.h head/contrib/llvm/lib/Target/XCore/AsmPrinter/ head/contrib/llvm/lib/Target/XCore/XCoreFrameInfo.cpp head/contrib/llvm/lib/Target/XCore/XCoreFrameInfo.h head/contrib/llvm/lib/Transforms/IPO/PartialSpecialization.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopIndexSplit.cpp head/contrib/llvm/tools/clang/include/clang/AST/FullExpr.h head/contrib/llvm/tools/clang/include/clang/AST/TypeLocBuilder.h head/contrib/llvm/tools/clang/include/clang/Checker/ head/contrib/llvm/tools/clang/lib/AST/FullExpr.cpp head/contrib/llvm/tools/clang/lib/Checker/ head/contrib/llvm/tools/clang/lib/CodeGen/CGCXX.h head/contrib/llvm/tools/clang/lib/CodeGen/Mangle.cpp head/contrib/llvm/tools/clang/lib/CodeGen/Mangle.h head/lib/clang/include/llvm/ADT/ head/lib/clang/include/llvm/System/ head/lib/clang/libclangchecker/ head/lib/clang/libllvmarmasmprinter/ head/lib/clang/libllvmmipsasmprinter/ head/lib/clang/libllvmpowerpcasmprinter/ head/lib/clang/libllvmsystem/ head/lib/clang/libllvmx86asmprinter/ Modified: head/Makefile.inc1 head/ObsoleteFiles.inc head/contrib/llvm/include/llvm-c/Core.h head/contrib/llvm/include/llvm-c/EnhancedDisassembly.h head/contrib/llvm/include/llvm-c/LinkTimeOptimizer.h head/contrib/llvm/include/llvm-c/Transforms/Scalar.h head/contrib/llvm/include/llvm-c/lto.h head/contrib/llvm/include/llvm/ADT/APFloat.h head/contrib/llvm/include/llvm/ADT/APInt.h head/contrib/llvm/include/llvm/ADT/APSInt.h head/contrib/llvm/include/llvm/ADT/BitVector.h head/contrib/llvm/include/llvm/ADT/DenseMap.h head/contrib/llvm/include/llvm/ADT/DenseMapInfo.h head/contrib/llvm/include/llvm/ADT/DenseSet.h head/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h head/contrib/llvm/include/llvm/ADT/FoldingSet.h head/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h head/contrib/llvm/include/llvm/ADT/ImmutableList.h head/contrib/llvm/include/llvm/ADT/ImmutableMap.h head/contrib/llvm/include/llvm/ADT/ImmutableSet.h head/contrib/llvm/include/llvm/ADT/IndexedMap.h head/contrib/llvm/include/llvm/ADT/Optional.h head/contrib/llvm/include/llvm/ADT/PointerIntPair.h head/contrib/llvm/include/llvm/ADT/PointerUnion.h head/contrib/llvm/include/llvm/ADT/PostOrderIterator.h head/contrib/llvm/include/llvm/ADT/SCCIterator.h head/contrib/llvm/include/llvm/ADT/ScopedHashTable.h head/contrib/llvm/include/llvm/ADT/SetVector.h head/contrib/llvm/include/llvm/ADT/SmallBitVector.h head/contrib/llvm/include/llvm/ADT/SmallPtrSet.h head/contrib/llvm/include/llvm/ADT/SmallString.h head/contrib/llvm/include/llvm/ADT/SmallVector.h head/contrib/llvm/include/llvm/ADT/SparseBitVector.h head/contrib/llvm/include/llvm/ADT/Statistic.h head/contrib/llvm/include/llvm/ADT/StringExtras.h head/contrib/llvm/include/llvm/ADT/StringMap.h head/contrib/llvm/include/llvm/ADT/StringRef.h head/contrib/llvm/include/llvm/ADT/Triple.h head/contrib/llvm/include/llvm/ADT/Twine.h head/contrib/llvm/include/llvm/ADT/ValueMap.h head/contrib/llvm/include/llvm/ADT/ilist.h head/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h head/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h head/contrib/llvm/include/llvm/Analysis/CallGraph.h head/contrib/llvm/include/llvm/Analysis/CodeMetrics.h head/contrib/llvm/include/llvm/Analysis/ConstantFolding.h head/contrib/llvm/include/llvm/Analysis/DOTGraphTraitsPass.h head/contrib/llvm/include/llvm/Analysis/DebugInfo.h head/contrib/llvm/include/llvm/Analysis/DominatorInternals.h head/contrib/llvm/include/llvm/Analysis/Dominators.h head/contrib/llvm/include/llvm/Analysis/FindUsedTypes.h head/contrib/llvm/include/llvm/Analysis/InlineCost.h head/contrib/llvm/include/llvm/Analysis/InstructionSimplify.h head/contrib/llvm/include/llvm/Analysis/IntervalPartition.h head/contrib/llvm/include/llvm/Analysis/LazyValueInfo.h head/contrib/llvm/include/llvm/Analysis/LibCallAliasAnalysis.h head/contrib/llvm/include/llvm/Analysis/LibCallSemantics.h head/contrib/llvm/include/llvm/Analysis/LoopDependenceAnalysis.h head/contrib/llvm/include/llvm/Analysis/LoopInfo.h head/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h head/contrib/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h head/contrib/llvm/include/llvm/Analysis/Passes.h head/contrib/llvm/include/llvm/Analysis/PostDominators.h head/contrib/llvm/include/llvm/Analysis/ProfileInfoTypes.h head/contrib/llvm/include/llvm/Analysis/RegionInfo.h head/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h head/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h head/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h head/contrib/llvm/include/llvm/Analysis/ValueTracking.h head/contrib/llvm/include/llvm/Attributes.h head/contrib/llvm/include/llvm/BasicBlock.h head/contrib/llvm/include/llvm/Bitcode/Archive.h head/contrib/llvm/include/llvm/Bitcode/BitCodes.h head/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h head/contrib/llvm/include/llvm/Bitcode/ReaderWriter.h head/contrib/llvm/include/llvm/CallingConv.h head/contrib/llvm/include/llvm/CodeGen/Analysis.h head/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h head/contrib/llvm/include/llvm/CodeGen/BinaryObject.h head/contrib/llvm/include/llvm/CodeGen/CalcSpillWeights.h head/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h head/contrib/llvm/include/llvm/CodeGen/FastISel.h head/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h head/contrib/llvm/include/llvm/CodeGen/GCMetadata.h head/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h head/contrib/llvm/include/llvm/CodeGen/IntrinsicLowering.h head/contrib/llvm/include/llvm/CodeGen/JITCodeEmitter.h head/contrib/llvm/include/llvm/CodeGen/LatencyPriorityQueue.h head/contrib/llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h head/contrib/llvm/include/llvm/CodeGen/LiveInterval.h head/contrib/llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h head/contrib/llvm/include/llvm/CodeGen/LiveStackAnalysis.h head/contrib/llvm/include/llvm/CodeGen/LiveVariables.h head/contrib/llvm/include/llvm/CodeGen/MachORelocation.h head/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h head/contrib/llvm/include/llvm/CodeGen/MachineCodeEmitter.h head/contrib/llvm/include/llvm/CodeGen/MachineCodeInfo.h head/contrib/llvm/include/llvm/CodeGen/MachineDominators.h head/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h head/contrib/llvm/include/llvm/CodeGen/MachineFunction.h head/contrib/llvm/include/llvm/CodeGen/MachineFunctionAnalysis.h head/contrib/llvm/include/llvm/CodeGen/MachineInstr.h head/contrib/llvm/include/llvm/CodeGen/MachineInstrBuilder.h head/contrib/llvm/include/llvm/CodeGen/MachineLocation.h head/contrib/llvm/include/llvm/CodeGen/MachineLoopInfo.h head/contrib/llvm/include/llvm/CodeGen/MachineMemOperand.h head/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h head/contrib/llvm/include/llvm/CodeGen/MachineOperand.h head/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h head/contrib/llvm/include/llvm/CodeGen/MachineRelocation.h head/contrib/llvm/include/llvm/CodeGen/Passes.h head/contrib/llvm/include/llvm/CodeGen/ProcessImplicitDefs.h head/contrib/llvm/include/llvm/CodeGen/RegisterCoalescer.h head/contrib/llvm/include/llvm/CodeGen/ScheduleDAG.h head/contrib/llvm/include/llvm/CodeGen/ScheduleHazardRecognizer.h head/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h head/contrib/llvm/include/llvm/CodeGen/SelectionDAGISel.h head/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h head/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h head/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h head/contrib/llvm/include/llvm/CodeGen/ValueTypes.h head/contrib/llvm/include/llvm/CodeGen/ValueTypes.td head/contrib/llvm/include/llvm/CompilerDriver/CompilationGraph.h head/contrib/llvm/include/llvm/CompilerDriver/Tool.h head/contrib/llvm/include/llvm/Constant.h head/contrib/llvm/include/llvm/Constants.h head/contrib/llvm/include/llvm/DerivedTypes.h head/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h head/contrib/llvm/include/llvm/ExecutionEngine/GenericValue.h head/contrib/llvm/include/llvm/ExecutionEngine/JITEventListener.h head/contrib/llvm/include/llvm/ExecutionEngine/JITMemoryManager.h head/contrib/llvm/include/llvm/Function.h head/contrib/llvm/include/llvm/GlobalAlias.h head/contrib/llvm/include/llvm/GlobalValue.h head/contrib/llvm/include/llvm/GlobalVariable.h head/contrib/llvm/include/llvm/InlineAsm.h head/contrib/llvm/include/llvm/InstrTypes.h head/contrib/llvm/include/llvm/Instruction.h head/contrib/llvm/include/llvm/Instructions.h head/contrib/llvm/include/llvm/IntrinsicInst.h head/contrib/llvm/include/llvm/Intrinsics.td head/contrib/llvm/include/llvm/IntrinsicsARM.td head/contrib/llvm/include/llvm/IntrinsicsX86.td head/contrib/llvm/include/llvm/IntrinsicsXCore.td head/contrib/llvm/include/llvm/LLVMContext.h head/contrib/llvm/include/llvm/LinkAllPasses.h head/contrib/llvm/include/llvm/LinkAllVMCore.h head/contrib/llvm/include/llvm/MC/EDInstInfo.h head/contrib/llvm/include/llvm/MC/MCAsmInfo.h head/contrib/llvm/include/llvm/MC/MCAsmLayout.h head/contrib/llvm/include/llvm/MC/MCAssembler.h head/contrib/llvm/include/llvm/MC/MCCodeEmitter.h head/contrib/llvm/include/llvm/MC/MCContext.h head/contrib/llvm/include/llvm/MC/MCDirectives.h head/contrib/llvm/include/llvm/MC/MCDisassembler.h head/contrib/llvm/include/llvm/MC/MCDwarf.h head/contrib/llvm/include/llvm/MC/MCELFSymbolFlags.h head/contrib/llvm/include/llvm/MC/MCExpr.h head/contrib/llvm/include/llvm/MC/MCFixup.h head/contrib/llvm/include/llvm/MC/MCInst.h head/contrib/llvm/include/llvm/MC/MCInstPrinter.h head/contrib/llvm/include/llvm/MC/MCMachOSymbolFlags.h head/contrib/llvm/include/llvm/MC/MCObjectStreamer.h head/contrib/llvm/include/llvm/MC/MCObjectWriter.h head/contrib/llvm/include/llvm/MC/MCParser/AsmLexer.h head/contrib/llvm/include/llvm/MC/MCParser/MCAsmLexer.h head/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h head/contrib/llvm/include/llvm/MC/MCParser/MCParsedAsmOperand.h head/contrib/llvm/include/llvm/MC/MCSection.h head/contrib/llvm/include/llvm/MC/MCSectionCOFF.h head/contrib/llvm/include/llvm/MC/MCSectionELF.h head/contrib/llvm/include/llvm/MC/MCSectionMachO.h head/contrib/llvm/include/llvm/MC/MCStreamer.h head/contrib/llvm/include/llvm/MC/MCSymbol.h head/contrib/llvm/include/llvm/MC/MCValue.h head/contrib/llvm/include/llvm/Metadata.h head/contrib/llvm/include/llvm/Module.h head/contrib/llvm/include/llvm/OperandTraits.h head/contrib/llvm/include/llvm/Operator.h head/contrib/llvm/include/llvm/Pass.h head/contrib/llvm/include/llvm/PassManagers.h head/contrib/llvm/include/llvm/PassRegistry.h head/contrib/llvm/include/llvm/PassSupport.h head/contrib/llvm/include/llvm/Support/AlignOf.h head/contrib/llvm/include/llvm/Support/Allocator.h head/contrib/llvm/include/llvm/Support/COFF.h head/contrib/llvm/include/llvm/Support/CallSite.h head/contrib/llvm/include/llvm/Support/Casting.h head/contrib/llvm/include/llvm/Support/Compiler.h head/contrib/llvm/include/llvm/Support/ConstantFolder.h head/contrib/llvm/include/llvm/Support/ConstantRange.h head/contrib/llvm/include/llvm/Support/CrashRecoveryContext.h head/contrib/llvm/include/llvm/Support/Dwarf.h head/contrib/llvm/include/llvm/Support/ELF.h head/contrib/llvm/include/llvm/Support/ErrorHandling.h head/contrib/llvm/include/llvm/Support/FileUtilities.h head/contrib/llvm/include/llvm/Support/GraphWriter.h head/contrib/llvm/include/llvm/Support/IRBuilder.h head/contrib/llvm/include/llvm/Support/IRReader.h head/contrib/llvm/include/llvm/Support/MachO.h head/contrib/llvm/include/llvm/Support/ManagedStatic.h head/contrib/llvm/include/llvm/Support/MathExtras.h head/contrib/llvm/include/llvm/Support/MemoryBuffer.h head/contrib/llvm/include/llvm/Support/MemoryObject.h head/contrib/llvm/include/llvm/Support/MutexGuard.h head/contrib/llvm/include/llvm/Support/NoFolder.h head/contrib/llvm/include/llvm/Support/PatternMatch.h head/contrib/llvm/include/llvm/Support/PointerLikeTypeTraits.h head/contrib/llvm/include/llvm/Support/SourceMgr.h head/contrib/llvm/include/llvm/Support/StandardPasses.h head/contrib/llvm/include/llvm/Support/SystemUtils.h head/contrib/llvm/include/llvm/Support/TargetFolder.h head/contrib/llvm/include/llvm/Support/Timer.h head/contrib/llvm/include/llvm/Support/TypeBuilder.h head/contrib/llvm/include/llvm/Support/raw_ostream.h head/contrib/llvm/include/llvm/Target/Mangler.h head/contrib/llvm/include/llvm/Target/SubtargetFeature.h head/contrib/llvm/include/llvm/Target/Target.td head/contrib/llvm/include/llvm/Target/TargetAsmBackend.h head/contrib/llvm/include/llvm/Target/TargetAsmParser.h head/contrib/llvm/include/llvm/Target/TargetCallingConv.h head/contrib/llvm/include/llvm/Target/TargetData.h head/contrib/llvm/include/llvm/Target/TargetELFWriterInfo.h head/contrib/llvm/include/llvm/Target/TargetInstrDesc.h head/contrib/llvm/include/llvm/Target/TargetInstrInfo.h head/contrib/llvm/include/llvm/Target/TargetInstrItineraries.h head/contrib/llvm/include/llvm/Target/TargetJITInfo.h head/contrib/llvm/include/llvm/Target/TargetLowering.h head/contrib/llvm/include/llvm/Target/TargetLoweringObjectFile.h head/contrib/llvm/include/llvm/Target/TargetMachine.h head/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h head/contrib/llvm/include/llvm/Target/TargetRegistry.h head/contrib/llvm/include/llvm/Target/TargetSchedule.td head/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td head/contrib/llvm/include/llvm/Target/TargetSelectionDAGInfo.h head/contrib/llvm/include/llvm/Transforms/IPO.h head/contrib/llvm/include/llvm/Transforms/Instrumentation.h head/contrib/llvm/include/llvm/Transforms/Scalar.h head/contrib/llvm/include/llvm/Transforms/Utils/AddrModeMatcher.h head/contrib/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h head/contrib/llvm/include/llvm/Transforms/Utils/BuildLibCalls.h head/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h head/contrib/llvm/include/llvm/Transforms/Utils/Local.h head/contrib/llvm/include/llvm/Transforms/Utils/PromoteMemToReg.h head/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdater.h head/contrib/llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h head/contrib/llvm/include/llvm/Transforms/Utils/ValueMapper.h head/contrib/llvm/include/llvm/Type.h head/contrib/llvm/include/llvm/TypeSymbolTable.h head/contrib/llvm/include/llvm/Use.h head/contrib/llvm/include/llvm/User.h head/contrib/llvm/include/llvm/Value.h head/contrib/llvm/include/llvm/ValueSymbolTable.h head/contrib/llvm/lib/Analysis/AliasAnalysis.cpp head/contrib/llvm/lib/Analysis/AliasAnalysisCounter.cpp head/contrib/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp head/contrib/llvm/lib/Analysis/AliasDebugger.cpp head/contrib/llvm/lib/Analysis/AliasSetTracker.cpp head/contrib/llvm/lib/Analysis/Analysis.cpp head/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp head/contrib/llvm/lib/Analysis/CFGPrinter.cpp head/contrib/llvm/lib/Analysis/CaptureTracking.cpp head/contrib/llvm/lib/Analysis/ConstantFolding.cpp head/contrib/llvm/lib/Analysis/DbgInfoPrinter.cpp head/contrib/llvm/lib/Analysis/DebugInfo.cpp head/contrib/llvm/lib/Analysis/DomPrinter.cpp head/contrib/llvm/lib/Analysis/IPA/CallGraph.cpp head/contrib/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp head/contrib/llvm/lib/Analysis/IPA/FindUsedTypes.cpp head/contrib/llvm/lib/Analysis/IPA/GlobalsModRef.cpp head/contrib/llvm/lib/Analysis/IVUsers.cpp head/contrib/llvm/lib/Analysis/InlineCost.cpp head/contrib/llvm/lib/Analysis/InstCount.cpp head/contrib/llvm/lib/Analysis/InstructionSimplify.cpp head/contrib/llvm/lib/Analysis/IntervalPartition.cpp head/contrib/llvm/lib/Analysis/LazyValueInfo.cpp head/contrib/llvm/lib/Analysis/LibCallAliasAnalysis.cpp head/contrib/llvm/lib/Analysis/Lint.cpp head/contrib/llvm/lib/Analysis/LiveValues.cpp head/contrib/llvm/lib/Analysis/Loads.cpp head/contrib/llvm/lib/Analysis/LoopDependenceAnalysis.cpp head/contrib/llvm/lib/Analysis/LoopInfo.cpp head/contrib/llvm/lib/Analysis/LoopPass.cpp head/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp head/contrib/llvm/lib/Analysis/ModuleDebugInfoPrinter.cpp head/contrib/llvm/lib/Analysis/PHITransAddr.cpp head/contrib/llvm/lib/Analysis/PostDominators.cpp head/contrib/llvm/lib/Analysis/ProfileEstimatorPass.cpp head/contrib/llvm/lib/Analysis/ProfileInfo.cpp head/contrib/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp head/contrib/llvm/lib/Analysis/ProfileVerifierPass.cpp head/contrib/llvm/lib/Analysis/RegionInfo.cpp head/contrib/llvm/lib/Analysis/RegionPrinter.cpp head/contrib/llvm/lib/Analysis/ScalarEvolution.cpp head/contrib/llvm/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp head/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp head/contrib/llvm/lib/Analysis/TypeBasedAliasAnalysis.cpp head/contrib/llvm/lib/Analysis/ValueTracking.cpp head/contrib/llvm/lib/Archive/Archive.cpp head/contrib/llvm/lib/Archive/ArchiveInternals.h head/contrib/llvm/lib/Archive/ArchiveWriter.cpp head/contrib/llvm/lib/AsmParser/LLLexer.cpp head/contrib/llvm/lib/AsmParser/LLLexer.h head/contrib/llvm/lib/AsmParser/LLParser.cpp head/contrib/llvm/lib/AsmParser/LLParser.h head/contrib/llvm/lib/AsmParser/LLToken.h head/contrib/llvm/lib/AsmParser/Parser.cpp head/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp head/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h head/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp head/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp head/contrib/llvm/lib/CodeGen/Analysis.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.h head/contrib/llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp head/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp head/contrib/llvm/lib/CodeGen/CallingConvLower.cpp head/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp head/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.h head/contrib/llvm/lib/CodeGen/DeadMachineInstructionElim.cpp head/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp head/contrib/llvm/lib/CodeGen/ELF.h head/contrib/llvm/lib/CodeGen/ELFWriter.cpp head/contrib/llvm/lib/CodeGen/GCMetadata.cpp head/contrib/llvm/lib/CodeGen/GCStrategy.cpp head/contrib/llvm/lib/CodeGen/IfConversion.cpp head/contrib/llvm/lib/CodeGen/InlineSpiller.cpp head/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp head/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp head/contrib/llvm/lib/CodeGen/LatencyPriorityQueue.cpp head/contrib/llvm/lib/CodeGen/LiveInterval.cpp head/contrib/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp head/contrib/llvm/lib/CodeGen/LiveStackAnalysis.cpp head/contrib/llvm/lib/CodeGen/LiveVariables.cpp head/contrib/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp head/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp head/contrib/llvm/lib/CodeGen/MachineCSE.cpp head/contrib/llvm/lib/CodeGen/MachineDominators.cpp head/contrib/llvm/lib/CodeGen/MachineFunction.cpp head/contrib/llvm/lib/CodeGen/MachineFunctionAnalysis.cpp head/contrib/llvm/lib/CodeGen/MachineInstr.cpp head/contrib/llvm/lib/CodeGen/MachineLICM.cpp head/contrib/llvm/lib/CodeGen/MachineLoopInfo.cpp head/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp head/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp head/contrib/llvm/lib/CodeGen/MachineSink.cpp head/contrib/llvm/lib/CodeGen/MachineVerifier.cpp head/contrib/llvm/lib/CodeGen/OptimizePHIs.cpp head/contrib/llvm/lib/CodeGen/PHIElimination.cpp head/contrib/llvm/lib/CodeGen/PeepholeOptimizer.cpp head/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp head/contrib/llvm/lib/CodeGen/PreAllocSplitting.cpp head/contrib/llvm/lib/CodeGen/ProcessImplicitDefs.cpp head/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp head/contrib/llvm/lib/CodeGen/PrologEpilogInserter.h head/contrib/llvm/lib/CodeGen/PseudoSourceValue.cpp head/contrib/llvm/lib/CodeGen/RegAllocFast.cpp head/contrib/llvm/lib/CodeGen/RegAllocLinearScan.cpp head/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp head/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp head/contrib/llvm/lib/CodeGen/RenderMachineFunction.cpp head/contrib/llvm/lib/CodeGen/RenderMachineFunction.h head/contrib/llvm/lib/CodeGen/ScheduleDAG.cpp head/contrib/llvm/lib/CodeGen/ScheduleDAGEmit.cpp head/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp head/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.h head/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp head/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp head/contrib/llvm/lib/CodeGen/ShrinkWrapping.cpp head/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp head/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.h head/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp head/contrib/llvm/lib/CodeGen/SlotIndexes.cpp head/contrib/llvm/lib/CodeGen/Spiller.cpp head/contrib/llvm/lib/CodeGen/Spiller.h head/contrib/llvm/lib/CodeGen/SplitKit.cpp head/contrib/llvm/lib/CodeGen/SplitKit.h head/contrib/llvm/lib/CodeGen/Splitter.cpp head/contrib/llvm/lib/CodeGen/Splitter.h head/contrib/llvm/lib/CodeGen/StackProtector.cpp head/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp head/contrib/llvm/lib/CodeGen/StrongPHIElimination.cpp head/contrib/llvm/lib/CodeGen/TailDuplication.cpp head/contrib/llvm/lib/CodeGen/TargetInstrInfoImpl.cpp head/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp head/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp head/contrib/llvm/lib/CodeGen/UnreachableBlockElim.cpp head/contrib/llvm/lib/CodeGen/VirtRegMap.cpp head/contrib/llvm/lib/CodeGen/VirtRegMap.h head/contrib/llvm/lib/CodeGen/VirtRegRewriter.cpp head/contrib/llvm/lib/CompilerDriver/Action.cpp head/contrib/llvm/lib/CompilerDriver/CompilationGraph.cpp head/contrib/llvm/lib/CompilerDriver/Main.cpp head/contrib/llvm/lib/CompilerDriver/Tool.cpp head/contrib/llvm/lib/ExecutionEngine/ExecutionEngine.cpp head/contrib/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp head/contrib/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp head/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h head/contrib/llvm/lib/ExecutionEngine/JIT/Intercept.cpp head/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp head/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp head/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.h head/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp head/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.h head/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp head/contrib/llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp head/contrib/llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp head/contrib/llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp head/contrib/llvm/lib/Linker/LinkItems.cpp head/contrib/llvm/lib/Linker/LinkModules.cpp head/contrib/llvm/lib/Linker/Linker.cpp head/contrib/llvm/lib/MC/ELFObjectWriter.cpp head/contrib/llvm/lib/MC/MCAsmInfo.cpp head/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp head/contrib/llvm/lib/MC/MCAsmStreamer.cpp head/contrib/llvm/lib/MC/MCAssembler.cpp head/contrib/llvm/lib/MC/MCCodeEmitter.cpp head/contrib/llvm/lib/MC/MCContext.cpp head/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp head/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.h head/contrib/llvm/lib/MC/MCDisassembler/EDInst.cpp head/contrib/llvm/lib/MC/MCDisassembler/EDInst.h head/contrib/llvm/lib/MC/MCDisassembler/EDOperand.cpp head/contrib/llvm/lib/MC/MCDisassembler/EDOperand.h head/contrib/llvm/lib/MC/MCDisassembler/EDToken.h head/contrib/llvm/lib/MC/MCDwarf.cpp head/contrib/llvm/lib/MC/MCELFStreamer.cpp head/contrib/llvm/lib/MC/MCExpr.cpp head/contrib/llvm/lib/MC/MCLoggingStreamer.cpp head/contrib/llvm/lib/MC/MCMachOStreamer.cpp head/contrib/llvm/lib/MC/MCNullStreamer.cpp head/contrib/llvm/lib/MC/MCObjectStreamer.cpp head/contrib/llvm/lib/MC/MCObjectWriter.cpp head/contrib/llvm/lib/MC/MCParser/AsmLexer.cpp head/contrib/llvm/lib/MC/MCParser/AsmParser.cpp head/contrib/llvm/lib/MC/MCParser/DarwinAsmParser.cpp head/contrib/llvm/lib/MC/MCParser/ELFAsmParser.cpp head/contrib/llvm/lib/MC/MCSectionCOFF.cpp head/contrib/llvm/lib/MC/MCSectionELF.cpp head/contrib/llvm/lib/MC/MCSectionMachO.cpp head/contrib/llvm/lib/MC/MCStreamer.cpp head/contrib/llvm/lib/MC/MCSymbol.cpp head/contrib/llvm/lib/MC/MachObjectWriter.cpp head/contrib/llvm/lib/MC/TargetAsmBackend.cpp head/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp head/contrib/llvm/lib/MC/WinCOFFStreamer.cpp head/contrib/llvm/lib/Support/APFloat.cpp head/contrib/llvm/lib/Support/APInt.cpp head/contrib/llvm/lib/Support/Allocator.cpp head/contrib/llvm/lib/Support/CommandLine.cpp head/contrib/llvm/lib/Support/ConstantRange.cpp head/contrib/llvm/lib/Support/CrashRecoveryContext.cpp head/contrib/llvm/lib/Support/Debug.cpp head/contrib/llvm/lib/Support/Dwarf.cpp head/contrib/llvm/lib/Support/ErrorHandling.cpp head/contrib/llvm/lib/Support/FileUtilities.cpp head/contrib/llvm/lib/Support/FoldingSet.cpp head/contrib/llvm/lib/Support/FormattedStream.cpp head/contrib/llvm/lib/Support/GraphWriter.cpp head/contrib/llvm/lib/Support/ManagedStatic.cpp head/contrib/llvm/lib/Support/MemoryBuffer.cpp head/contrib/llvm/lib/Support/PluginLoader.cpp head/contrib/llvm/lib/Support/PrettyStackTrace.cpp head/contrib/llvm/lib/Support/SourceMgr.cpp head/contrib/llvm/lib/Support/Statistic.cpp head/contrib/llvm/lib/Support/StringMap.cpp head/contrib/llvm/lib/Support/StringRef.cpp head/contrib/llvm/lib/Support/SystemUtils.cpp head/contrib/llvm/lib/Support/TargetRegistry.cpp head/contrib/llvm/lib/Support/Timer.cpp head/contrib/llvm/lib/Support/Triple.cpp head/contrib/llvm/lib/Support/Twine.cpp head/contrib/llvm/lib/Support/raw_ostream.cpp head/contrib/llvm/lib/Support/regexec.c head/contrib/llvm/lib/Target/ARM/ARM.h head/contrib/llvm/lib/Target/ARM/ARM.td head/contrib/llvm/lib/Target/ARM/ARMAddressingModes.h head/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.cpp head/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp head/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.h head/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp head/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.h head/contrib/llvm/lib/Target/ARM/ARMBuildAttrs.h head/contrib/llvm/lib/Target/ARM/ARMCallingConv.td head/contrib/llvm/lib/Target/ARM/ARMCodeEmitter.cpp head/contrib/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp head/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.cpp head/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.h head/contrib/llvm/lib/Target/ARM/ARMExpandPseudoInsts.cpp head/contrib/llvm/lib/Target/ARM/ARMFastISel.cpp head/contrib/llvm/lib/Target/ARM/ARMGlobalMerge.cpp head/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp head/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp head/contrib/llvm/lib/Target/ARM/ARMISelLowering.h head/contrib/llvm/lib/Target/ARM/ARMInstrFormats.td head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.cpp head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.h head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td head/contrib/llvm/lib/Target/ARM/ARMInstrNEON.td head/contrib/llvm/lib/Target/ARM/ARMInstrThumb.td head/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td head/contrib/llvm/lib/Target/ARM/ARMInstrVFP.td head/contrib/llvm/lib/Target/ARM/ARMJITInfo.cpp head/contrib/llvm/lib/Target/ARM/ARMJITInfo.h head/contrib/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp head/contrib/llvm/lib/Target/ARM/ARMMCInstLower.cpp head/contrib/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h head/contrib/llvm/lib/Target/ARM/ARMPerfectShuffle.h head/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.cpp head/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.td head/contrib/llvm/lib/Target/ARM/ARMSchedule.td head/contrib/llvm/lib/Target/ARM/ARMScheduleA8.td head/contrib/llvm/lib/Target/ARM/ARMScheduleA9.td head/contrib/llvm/lib/Target/ARM/ARMScheduleV6.td head/contrib/llvm/lib/Target/ARM/ARMSelectionDAGInfo.cpp head/contrib/llvm/lib/Target/ARM/ARMSelectionDAGInfo.h head/contrib/llvm/lib/Target/ARM/ARMSubtarget.cpp head/contrib/llvm/lib/Target/ARM/ARMSubtarget.h head/contrib/llvm/lib/Target/ARM/ARMTargetMachine.cpp head/contrib/llvm/lib/Target/ARM/ARMTargetMachine.h head/contrib/llvm/lib/Target/ARM/ARMTargetObjectFile.cpp head/contrib/llvm/lib/Target/ARM/ARMTargetObjectFile.h head/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmLexer.cpp head/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp head/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp head/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp head/contrib/llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h head/contrib/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp head/contrib/llvm/lib/Target/ARM/Thumb1InstrInfo.h head/contrib/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp head/contrib/llvm/lib/Target/ARM/Thumb1RegisterInfo.h head/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp head/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.h head/contrib/llvm/lib/Target/ARM/Thumb2RegisterInfo.cpp head/contrib/llvm/lib/Target/ARM/Thumb2SizeReduction.cpp head/contrib/llvm/lib/Target/Alpha/Alpha.h head/contrib/llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp head/contrib/llvm/lib/Target/Alpha/AlphaISelLowering.cpp head/contrib/llvm/lib/Target/Alpha/AlphaISelLowering.h head/contrib/llvm/lib/Target/Alpha/AlphaInstrInfo.td head/contrib/llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp head/contrib/llvm/lib/Target/Alpha/AlphaRegisterInfo.h head/contrib/llvm/lib/Target/Alpha/AlphaSchedule.td head/contrib/llvm/lib/Target/Alpha/AlphaTargetMachine.cpp head/contrib/llvm/lib/Target/Alpha/AlphaTargetMachine.h head/contrib/llvm/lib/Target/Blackfin/BlackfinISelDAGToDAG.cpp head/contrib/llvm/lib/Target/Blackfin/BlackfinISelLowering.cpp head/contrib/llvm/lib/Target/Blackfin/BlackfinISelLowering.h head/contrib/llvm/lib/Target/Blackfin/BlackfinInstrInfo.td head/contrib/llvm/lib/Target/Blackfin/BlackfinRegisterInfo.cpp head/contrib/llvm/lib/Target/Blackfin/BlackfinRegisterInfo.h head/contrib/llvm/lib/Target/Blackfin/BlackfinRegisterInfo.td head/contrib/llvm/lib/Target/Blackfin/BlackfinTargetMachine.cpp head/contrib/llvm/lib/Target/Blackfin/BlackfinTargetMachine.h head/contrib/llvm/lib/Target/CBackend/CBackend.cpp head/contrib/llvm/lib/Target/CellSPU/SPU.h head/contrib/llvm/lib/Target/CellSPU/SPU64InstrInfo.td head/contrib/llvm/lib/Target/CellSPU/SPUHazardRecognizers.cpp head/contrib/llvm/lib/Target/CellSPU/SPUHazardRecognizers.h head/contrib/llvm/lib/Target/CellSPU/SPUISelDAGToDAG.cpp head/contrib/llvm/lib/Target/CellSPU/SPUISelLowering.cpp head/contrib/llvm/lib/Target/CellSPU/SPUISelLowering.h head/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.cpp head/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.h head/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.td head/contrib/llvm/lib/Target/CellSPU/SPUMCAsmInfo.cpp head/contrib/llvm/lib/Target/CellSPU/SPUNodes.td head/contrib/llvm/lib/Target/CellSPU/SPUOperands.td head/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.cpp head/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.h head/contrib/llvm/lib/Target/CellSPU/SPUSchedule.td head/contrib/llvm/lib/Target/CellSPU/SPUSubtarget.cpp head/contrib/llvm/lib/Target/CellSPU/SPUSubtarget.h head/contrib/llvm/lib/Target/CellSPU/SPUTargetMachine.cpp head/contrib/llvm/lib/Target/CellSPU/SPUTargetMachine.h head/contrib/llvm/lib/Target/CppBackend/CPPBackend.cpp head/contrib/llvm/lib/Target/MBlaze/MBlaze.h head/contrib/llvm/lib/Target/MBlaze/MBlaze.td head/contrib/llvm/lib/Target/MBlaze/MBlazeCallingConv.td head/contrib/llvm/lib/Target/MBlaze/MBlazeDelaySlotFiller.cpp head/contrib/llvm/lib/Target/MBlaze/MBlazeISelDAGToDAG.cpp head/contrib/llvm/lib/Target/MBlaze/MBlazeISelLowering.cpp head/contrib/llvm/lib/Target/MBlaze/MBlazeISelLowering.h head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrFPU.td head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrFSL.td head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrFormats.td head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.cpp head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.h head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.td head/contrib/llvm/lib/Target/MBlaze/MBlazeIntrinsicInfo.cpp head/contrib/llvm/lib/Target/MBlaze/MBlazeIntrinsics.td head/contrib/llvm/lib/Target/MBlaze/MBlazeMCAsmInfo.cpp head/contrib/llvm/lib/Target/MBlaze/MBlazeMCAsmInfo.h head/contrib/llvm/lib/Target/MBlaze/MBlazeMachineFunction.h head/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.cpp head/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.h head/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.td head/contrib/llvm/lib/Target/MBlaze/MBlazeSchedule.td head/contrib/llvm/lib/Target/MBlaze/MBlazeTargetMachine.cpp head/contrib/llvm/lib/Target/MBlaze/MBlazeTargetMachine.h head/contrib/llvm/lib/Target/MBlaze/MBlazeTargetObjectFile.cpp head/contrib/llvm/lib/Target/MBlaze/MBlazeTargetObjectFile.h head/contrib/llvm/lib/Target/MSP430/MSP430.td head/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp head/contrib/llvm/lib/Target/MSP430/MSP430ISelLowering.cpp head/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.cpp head/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.h head/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.td head/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.cpp head/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.h head/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.td head/contrib/llvm/lib/Target/MSP430/MSP430TargetMachine.cpp head/contrib/llvm/lib/Target/MSP430/MSP430TargetMachine.h head/contrib/llvm/lib/Target/Mangler.cpp head/contrib/llvm/lib/Target/Mips/Mips.td head/contrib/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp head/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp head/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp head/contrib/llvm/lib/Target/Mips/MipsISelLowering.h head/contrib/llvm/lib/Target/Mips/MipsInstrFPU.td head/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td head/contrib/llvm/lib/Target/Mips/MipsMachineFunction.h head/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.cpp head/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.h head/contrib/llvm/lib/Target/Mips/MipsSchedule.td head/contrib/llvm/lib/Target/Mips/MipsSubtarget.h head/contrib/llvm/lib/Target/Mips/MipsTargetMachine.cpp head/contrib/llvm/lib/Target/Mips/MipsTargetMachine.h head/contrib/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp head/contrib/llvm/lib/Target/PowerPC/PPC.h head/contrib/llvm/lib/Target/PowerPC/PPC.td head/contrib/llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp head/contrib/llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp head/contrib/llvm/lib/Target/PowerPC/PPCHazardRecognizers.h head/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp head/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp head/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h head/contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td head/contrib/llvm/lib/Target/PowerPC/PPCInstrFormats.td head/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp head/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.h head/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td head/contrib/llvm/lib/Target/PowerPC/PPCJITInfo.cpp head/contrib/llvm/lib/Target/PowerPC/PPCMCAsmInfo.cpp head/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp head/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.h head/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.td head/contrib/llvm/lib/Target/PowerPC/PPCScheduleG3.td head/contrib/llvm/lib/Target/PowerPC/PPCScheduleG4.td head/contrib/llvm/lib/Target/PowerPC/PPCScheduleG4Plus.td head/contrib/llvm/lib/Target/PowerPC/PPCScheduleG5.td head/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.cpp head/contrib/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp head/contrib/llvm/lib/Target/PowerPC/PPCTargetMachine.h head/contrib/llvm/lib/Target/Sparc/DelaySlotFiller.cpp head/contrib/llvm/lib/Target/Sparc/SparcCallingConv.td head/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp head/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp head/contrib/llvm/lib/Target/Sparc/SparcISelLowering.h head/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.cpp head/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.h head/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td head/contrib/llvm/lib/Target/Sparc/SparcMachineFunctionInfo.h head/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.cpp head/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.h head/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.td head/contrib/llvm/lib/Target/Sparc/SparcTargetMachine.cpp head/contrib/llvm/lib/Target/Sparc/SparcTargetMachine.h head/contrib/llvm/lib/Target/SubtargetFeature.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZInstrBuilder.h head/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.h head/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.td head/contrib/llvm/lib/Target/SystemZ/SystemZMCAsmInfo.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZOperands.td head/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.h head/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.td head/contrib/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp head/contrib/llvm/lib/Target/SystemZ/SystemZTargetMachine.h head/contrib/llvm/lib/Target/Target.cpp head/contrib/llvm/lib/Target/TargetData.cpp head/contrib/llvm/lib/Target/TargetELFWriterInfo.cpp head/contrib/llvm/lib/Target/TargetInstrInfo.cpp head/contrib/llvm/lib/Target/TargetLoweringObjectFile.cpp head/contrib/llvm/lib/Target/TargetMachine.cpp head/contrib/llvm/lib/Target/TargetRegisterInfo.cpp head/contrib/llvm/lib/Target/X86/AsmParser/X86AsmLexer.cpp head/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp head/contrib/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp head/contrib/llvm/lib/Target/X86/Disassembler/X86Disassembler.h head/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c head/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h head/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h head/contrib/llvm/lib/Target/X86/X86.h head/contrib/llvm/lib/Target/X86/X86.td head/contrib/llvm/lib/Target/X86/X86AsmBackend.cpp head/contrib/llvm/lib/Target/X86/X86AsmPrinter.cpp head/contrib/llvm/lib/Target/X86/X86AsmPrinter.h head/contrib/llvm/lib/Target/X86/X86CallingConv.td head/contrib/llvm/lib/Target/X86/X86CodeEmitter.cpp head/contrib/llvm/lib/Target/X86/X86ELFWriterInfo.cpp head/contrib/llvm/lib/Target/X86/X86ELFWriterInfo.h head/contrib/llvm/lib/Target/X86/X86FastISel.cpp head/contrib/llvm/lib/Target/X86/X86FixupKinds.h head/contrib/llvm/lib/Target/X86/X86FloatingPoint.cpp head/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp head/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp head/contrib/llvm/lib/Target/X86/X86ISelLowering.h head/contrib/llvm/lib/Target/X86/X86InstrBuilder.h head/contrib/llvm/lib/Target/X86/X86InstrFPStack.td head/contrib/llvm/lib/Target/X86/X86InstrFormats.td head/contrib/llvm/lib/Target/X86/X86InstrFragmentsSIMD.td head/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp head/contrib/llvm/lib/Target/X86/X86InstrInfo.h head/contrib/llvm/lib/Target/X86/X86InstrInfo.td head/contrib/llvm/lib/Target/X86/X86InstrMMX.td head/contrib/llvm/lib/Target/X86/X86InstrSSE.td head/contrib/llvm/lib/Target/X86/X86JITInfo.cpp head/contrib/llvm/lib/Target/X86/X86MCAsmInfo.cpp head/contrib/llvm/lib/Target/X86/X86MCCodeEmitter.cpp head/contrib/llvm/lib/Target/X86/X86MCInstLower.cpp head/contrib/llvm/lib/Target/X86/X86MCInstLower.h head/contrib/llvm/lib/Target/X86/X86RegisterInfo.cpp head/contrib/llvm/lib/Target/X86/X86RegisterInfo.h head/contrib/llvm/lib/Target/X86/X86RegisterInfo.td head/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.cpp head/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.h head/contrib/llvm/lib/Target/X86/X86Subtarget.cpp head/contrib/llvm/lib/Target/X86/X86Subtarget.h head/contrib/llvm/lib/Target/X86/X86TargetMachine.cpp head/contrib/llvm/lib/Target/X86/X86TargetMachine.h head/contrib/llvm/lib/Target/XCore/XCoreCallingConv.td head/contrib/llvm/lib/Target/XCore/XCoreISelDAGToDAG.cpp head/contrib/llvm/lib/Target/XCore/XCoreISelLowering.cpp head/contrib/llvm/lib/Target/XCore/XCoreISelLowering.h head/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.cpp head/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.h head/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.td head/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.cpp head/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.h head/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.td head/contrib/llvm/lib/Target/XCore/XCoreTargetMachine.cpp head/contrib/llvm/lib/Target/XCore/XCoreTargetMachine.h head/contrib/llvm/lib/Target/XCore/XCoreTargetObjectFile.cpp head/contrib/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp head/contrib/llvm/lib/Transforms/IPO/ConstantMerge.cpp head/contrib/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp head/contrib/llvm/lib/Transforms/IPO/DeadTypeElimination.cpp head/contrib/llvm/lib/Transforms/IPO/ExtractGV.cpp head/contrib/llvm/lib/Transforms/IPO/FunctionAttrs.cpp head/contrib/llvm/lib/Transforms/IPO/GlobalDCE.cpp head/contrib/llvm/lib/Transforms/IPO/GlobalOpt.cpp head/contrib/llvm/lib/Transforms/IPO/IPConstantPropagation.cpp head/contrib/llvm/lib/Transforms/IPO/IPO.cpp head/contrib/llvm/lib/Transforms/IPO/InlineAlways.cpp head/contrib/llvm/lib/Transforms/IPO/InlineSimple.cpp head/contrib/llvm/lib/Transforms/IPO/Inliner.cpp head/contrib/llvm/lib/Transforms/IPO/Internalize.cpp head/contrib/llvm/lib/Transforms/IPO/LoopExtractor.cpp head/contrib/llvm/lib/Transforms/IPO/LowerSetJmp.cpp head/contrib/llvm/lib/Transforms/IPO/MergeFunctions.cpp head/contrib/llvm/lib/Transforms/IPO/PartialInlining.cpp head/contrib/llvm/lib/Transforms/IPO/PruneEH.cpp head/contrib/llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp head/contrib/llvm/lib/Transforms/IPO/StripSymbols.cpp head/contrib/llvm/lib/Transforms/IPO/StructRetPromotion.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombine.h head/contrib/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineShifts.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp head/contrib/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp head/contrib/llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp head/contrib/llvm/lib/Transforms/Instrumentation/OptimalEdgeProfiling.cpp head/contrib/llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp head/contrib/llvm/lib/Transforms/Instrumentation/ProfilingUtils.h head/contrib/llvm/lib/Transforms/Scalar/ADCE.cpp head/contrib/llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp head/contrib/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp head/contrib/llvm/lib/Transforms/Scalar/ConstantProp.cpp head/contrib/llvm/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp head/contrib/llvm/lib/Transforms/Scalar/DCE.cpp head/contrib/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp head/contrib/llvm/lib/Transforms/Scalar/GEPSplitter.cpp head/contrib/llvm/lib/Transforms/Scalar/GVN.cpp head/contrib/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp head/contrib/llvm/lib/Transforms/Scalar/JumpThreading.cpp head/contrib/llvm/lib/Transforms/Scalar/LICM.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopDeletion.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopRotation.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp head/contrib/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp head/contrib/llvm/lib/Transforms/Scalar/LowerAtomic.cpp head/contrib/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp head/contrib/llvm/lib/Transforms/Scalar/Reassociate.cpp head/contrib/llvm/lib/Transforms/Scalar/Reg2Mem.cpp head/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp head/contrib/llvm/lib/Transforms/Scalar/Scalar.cpp head/contrib/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp head/contrib/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp head/contrib/llvm/lib/Transforms/Scalar/SimplifyHalfPowrLibCalls.cpp head/contrib/llvm/lib/Transforms/Scalar/SimplifyLibCalls.cpp head/contrib/llvm/lib/Transforms/Scalar/Sink.cpp head/contrib/llvm/lib/Transforms/Scalar/TailDuplication.cpp head/contrib/llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp head/contrib/llvm/lib/Transforms/Utils/AddrModeMatcher.cpp head/contrib/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp head/contrib/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp head/contrib/llvm/lib/Transforms/Utils/BuildLibCalls.cpp head/contrib/llvm/lib/Transforms/Utils/CloneFunction.cpp head/contrib/llvm/lib/Transforms/Utils/CloneLoop.cpp head/contrib/llvm/lib/Transforms/Utils/CloneModule.cpp head/contrib/llvm/lib/Transforms/Utils/CodeExtractor.cpp head/contrib/llvm/lib/Transforms/Utils/DemoteRegToStack.cpp head/contrib/llvm/lib/Transforms/Utils/InlineFunction.cpp head/contrib/llvm/lib/Transforms/Utils/InstructionNamer.cpp head/contrib/llvm/lib/Transforms/Utils/LCSSA.cpp head/contrib/llvm/lib/Transforms/Utils/Local.cpp head/contrib/llvm/lib/Transforms/Utils/LoopSimplify.cpp head/contrib/llvm/lib/Transforms/Utils/LoopUnroll.cpp head/contrib/llvm/lib/Transforms/Utils/LowerInvoke.cpp head/contrib/llvm/lib/Transforms/Utils/LowerSwitch.cpp head/contrib/llvm/lib/Transforms/Utils/Mem2Reg.cpp head/contrib/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp head/contrib/llvm/lib/Transforms/Utils/SSAUpdater.cpp head/contrib/llvm/lib/Transforms/Utils/SimplifyCFG.cpp head/contrib/llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp head/contrib/llvm/lib/Transforms/Utils/ValueMapper.cpp head/contrib/llvm/lib/VMCore/AsmWriter.cpp head/contrib/llvm/lib/VMCore/Attributes.cpp head/contrib/llvm/lib/VMCore/AutoUpgrade.cpp head/contrib/llvm/lib/VMCore/BasicBlock.cpp head/contrib/llvm/lib/VMCore/ConstantFold.cpp head/contrib/llvm/lib/VMCore/ConstantFold.h head/contrib/llvm/lib/VMCore/Constants.cpp head/contrib/llvm/lib/VMCore/ConstantsContext.h head/contrib/llvm/lib/VMCore/Core.cpp head/contrib/llvm/lib/VMCore/Dominators.cpp head/contrib/llvm/lib/VMCore/Function.cpp head/contrib/llvm/lib/VMCore/Globals.cpp head/contrib/llvm/lib/VMCore/IRBuilder.cpp head/contrib/llvm/lib/VMCore/InlineAsm.cpp head/contrib/llvm/lib/VMCore/Instruction.cpp head/contrib/llvm/lib/VMCore/Instructions.cpp head/contrib/llvm/lib/VMCore/LLVMContext.cpp head/contrib/llvm/lib/VMCore/LLVMContextImpl.cpp head/contrib/llvm/lib/VMCore/LLVMContextImpl.h head/contrib/llvm/lib/VMCore/LeakDetector.cpp head/contrib/llvm/lib/VMCore/Metadata.cpp head/contrib/llvm/lib/VMCore/Module.cpp head/contrib/llvm/lib/VMCore/Pass.cpp head/contrib/llvm/lib/VMCore/PassManager.cpp head/contrib/llvm/lib/VMCore/PassRegistry.cpp head/contrib/llvm/lib/VMCore/PrintModulePass.cpp head/contrib/llvm/lib/VMCore/Type.cpp head/contrib/llvm/lib/VMCore/TypesContext.h head/contrib/llvm/lib/VMCore/Use.cpp head/contrib/llvm/lib/VMCore/Value.cpp head/contrib/llvm/lib/VMCore/ValueTypes.cpp head/contrib/llvm/lib/VMCore/Verifier.cpp head/contrib/llvm/tools/clang/include/clang-c/Index.h head/contrib/llvm/tools/clang/include/clang/AST/ASTConsumer.h head/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h head/contrib/llvm/tools/clang/include/clang/AST/ASTDiagnostic.h head/contrib/llvm/tools/clang/include/clang/AST/ASTImporter.h head/contrib/llvm/tools/clang/include/clang/AST/Attr.h head/contrib/llvm/tools/clang/include/clang/AST/CXXInheritance.h head/contrib/llvm/tools/clang/include/clang/AST/CanonicalType.h head/contrib/llvm/tools/clang/include/clang/AST/CharUnits.h head/contrib/llvm/tools/clang/include/clang/AST/Decl.h head/contrib/llvm/tools/clang/include/clang/AST/DeclBase.h head/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h head/contrib/llvm/tools/clang/include/clang/AST/DeclFriend.h head/contrib/llvm/tools/clang/include/clang/AST/DeclGroup.h head/contrib/llvm/tools/clang/include/clang/AST/DeclObjC.h head/contrib/llvm/tools/clang/include/clang/AST/DeclTemplate.h head/contrib/llvm/tools/clang/include/clang/AST/DeclarationName.h head/contrib/llvm/tools/clang/include/clang/AST/Expr.h head/contrib/llvm/tools/clang/include/clang/AST/ExprCXX.h head/contrib/llvm/tools/clang/include/clang/AST/ExprObjC.h head/contrib/llvm/tools/clang/include/clang/AST/ExternalASTSource.h head/contrib/llvm/tools/clang/include/clang/AST/NestedNameSpecifier.h head/contrib/llvm/tools/clang/include/clang/AST/OperationKinds.h head/contrib/llvm/tools/clang/include/clang/AST/ParentMap.h head/contrib/llvm/tools/clang/include/clang/AST/PrettyPrinter.h head/contrib/llvm/tools/clang/include/clang/AST/RecordLayout.h head/contrib/llvm/tools/clang/include/clang/AST/RecursiveASTVisitor.h head/contrib/llvm/tools/clang/include/clang/AST/Redeclarable.h head/contrib/llvm/tools/clang/include/clang/AST/Stmt.h head/contrib/llvm/tools/clang/include/clang/AST/StmtCXX.h head/contrib/llvm/tools/clang/include/clang/AST/StmtIterator.h head/contrib/llvm/tools/clang/include/clang/AST/StmtObjC.h head/contrib/llvm/tools/clang/include/clang/AST/TemplateBase.h head/contrib/llvm/tools/clang/include/clang/AST/TemplateName.h head/contrib/llvm/tools/clang/include/clang/AST/Type.h head/contrib/llvm/tools/clang/include/clang/AST/TypeLoc.h head/contrib/llvm/tools/clang/include/clang/AST/TypeNodes.def head/contrib/llvm/tools/clang/include/clang/AST/TypeVisitor.h head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/FormatString.h head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/LiveVariables.h head/contrib/llvm/tools/clang/include/clang/Analysis/AnalysisContext.h head/contrib/llvm/tools/clang/include/clang/Analysis/AnalysisDiagnostic.h head/contrib/llvm/tools/clang/include/clang/Analysis/CFG.h head/contrib/llvm/tools/clang/include/clang/Analysis/FlowSensitive/DataflowSolver.h head/contrib/llvm/tools/clang/include/clang/Analysis/ProgramPoint.h head/contrib/llvm/tools/clang/include/clang/Analysis/Support/BumpVector.h head/contrib/llvm/tools/clang/include/clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h head/contrib/llvm/tools/clang/include/clang/Analysis/Visitors/CFGRecStmtVisitor.h head/contrib/llvm/tools/clang/include/clang/Analysis/Visitors/CFGStmtVisitor.h head/contrib/llvm/tools/clang/include/clang/Basic/Attr.td head/contrib/llvm/tools/clang/include/clang/Basic/AttrKinds.h head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.h head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsPPC.def head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsX86.def head/contrib/llvm/tools/clang/include/clang/Basic/DeclNodes.td head/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.h head/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticASTKinds.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticCommonKinds.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticDriverKinds.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticLexKinds.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticParseKinds.td head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td head/contrib/llvm/tools/clang/include/clang/Basic/FileManager.h head/contrib/llvm/tools/clang/include/clang/Basic/IdentifierTable.h head/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.h head/contrib/llvm/tools/clang/include/clang/Basic/OnDiskHashTable.h head/contrib/llvm/tools/clang/include/clang/Basic/PartialDiagnostic.h head/contrib/llvm/tools/clang/include/clang/Basic/SourceLocation.h head/contrib/llvm/tools/clang/include/clang/Basic/SourceManager.h head/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h head/contrib/llvm/tools/clang/include/clang/Basic/StmtNodes.td head/contrib/llvm/tools/clang/include/clang/Basic/TargetInfo.h head/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.def head/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.h head/contrib/llvm/tools/clang/include/clang/Basic/TypeTraits.h head/contrib/llvm/tools/clang/include/clang/Basic/Version.h head/contrib/llvm/tools/clang/include/clang/Basic/arm_neon.td head/contrib/llvm/tools/clang/include/clang/CodeGen/CodeGenAction.h head/contrib/llvm/tools/clang/include/clang/Driver/ArgList.h head/contrib/llvm/tools/clang/include/clang/Driver/CC1AsOptions.td head/contrib/llvm/tools/clang/include/clang/Driver/CC1Options.td head/contrib/llvm/tools/clang/include/clang/Driver/Driver.h head/contrib/llvm/tools/clang/include/clang/Driver/DriverDiagnostic.h head/contrib/llvm/tools/clang/include/clang/Driver/HostInfo.h head/contrib/llvm/tools/clang/include/clang/Driver/OptTable.h head/contrib/llvm/tools/clang/include/clang/Driver/Options.td head/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h head/contrib/llvm/tools/clang/include/clang/Driver/Types.def head/contrib/llvm/tools/clang/include/clang/Frontend/ASTConsumers.h head/contrib/llvm/tools/clang/include/clang/Frontend/ASTUnit.h head/contrib/llvm/tools/clang/include/clang/Frontend/Analyses.def head/contrib/llvm/tools/clang/include/clang/Frontend/AnalyzerOptions.h head/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h head/contrib/llvm/tools/clang/include/clang/Frontend/CommandLineSourceLoc.h head/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInstance.h head/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInvocation.h head/contrib/llvm/tools/clang/include/clang/Frontend/DeclXML.def head/contrib/llvm/tools/clang/include/clang/Frontend/DependencyOutputOptions.h head/contrib/llvm/tools/clang/include/clang/Frontend/DiagnosticOptions.h head/contrib/llvm/tools/clang/include/clang/Frontend/FrontendAction.h head/contrib/llvm/tools/clang/include/clang/Frontend/FrontendActions.h head/contrib/llvm/tools/clang/include/clang/Frontend/FrontendDiagnostic.h head/contrib/llvm/tools/clang/include/clang/Frontend/FrontendOptions.h head/contrib/llvm/tools/clang/include/clang/Frontend/HeaderSearchOptions.h head/contrib/llvm/tools/clang/include/clang/Frontend/LangStandards.def head/contrib/llvm/tools/clang/include/clang/Frontend/PreprocessorOptions.h head/contrib/llvm/tools/clang/include/clang/Frontend/PreprocessorOutputOptions.h head/contrib/llvm/tools/clang/include/clang/Frontend/StmtXML.def head/contrib/llvm/tools/clang/include/clang/Frontend/TypeXML.def head/contrib/llvm/tools/clang/include/clang/Frontend/Utils.h head/contrib/llvm/tools/clang/include/clang/Frontend/VerifyDiagnosticsClient.h head/contrib/llvm/tools/clang/include/clang/Lex/ExternalPreprocessorSource.h head/contrib/llvm/tools/clang/include/clang/Lex/HeaderMap.h head/contrib/llvm/tools/clang/include/clang/Lex/HeaderSearch.h head/contrib/llvm/tools/clang/include/clang/Lex/LexDiagnostic.h head/contrib/llvm/tools/clang/include/clang/Lex/Lexer.h head/contrib/llvm/tools/clang/include/clang/Lex/LiteralSupport.h head/contrib/llvm/tools/clang/include/clang/Lex/MacroInfo.h head/contrib/llvm/tools/clang/include/clang/Lex/PPCallbacks.h head/contrib/llvm/tools/clang/include/clang/Lex/PTHManager.h head/contrib/llvm/tools/clang/include/clang/Lex/Pragma.h head/contrib/llvm/tools/clang/include/clang/Lex/PreprocessingRecord.h head/contrib/llvm/tools/clang/include/clang/Lex/Preprocessor.h head/contrib/llvm/tools/clang/include/clang/Lex/PreprocessorLexer.h head/contrib/llvm/tools/clang/include/clang/Lex/Token.h head/contrib/llvm/tools/clang/include/clang/Parse/ParseDiagnostic.h head/contrib/llvm/tools/clang/include/clang/Parse/Parser.h head/contrib/llvm/tools/clang/include/clang/Rewrite/ASTConsumers.h head/contrib/llvm/tools/clang/include/clang/Rewrite/FixItRewriter.h head/contrib/llvm/tools/clang/include/clang/Sema/AttributeList.h head/contrib/llvm/tools/clang/include/clang/Sema/CodeCompleteConsumer.h head/contrib/llvm/tools/clang/include/clang/Sema/DeclSpec.h head/contrib/llvm/tools/clang/include/clang/Sema/DelayedDiagnostic.h head/contrib/llvm/tools/clang/include/clang/Sema/ExternalSemaSource.h head/contrib/llvm/tools/clang/include/clang/Sema/Initialization.h head/contrib/llvm/tools/clang/include/clang/Sema/Lookup.h head/contrib/llvm/tools/clang/include/clang/Sema/Overload.h head/contrib/llvm/tools/clang/include/clang/Sema/Ownership.h head/contrib/llvm/tools/clang/include/clang/Sema/ParsedTemplate.h head/contrib/llvm/tools/clang/include/clang/Sema/Scope.h head/contrib/llvm/tools/clang/include/clang/Sema/ScopeInfo.h head/contrib/llvm/tools/clang/include/clang/Sema/Sema.h head/contrib/llvm/tools/clang/include/clang/Sema/SemaDiagnostic.h head/contrib/llvm/tools/clang/include/clang/Sema/Template.h head/contrib/llvm/tools/clang/include/clang/Sema/TemplateDeduction.h head/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h head/contrib/llvm/tools/clang/include/clang/Serialization/ASTDeserializationListener.h head/contrib/llvm/tools/clang/include/clang/Serialization/ASTReader.h head/contrib/llvm/tools/clang/include/clang/Serialization/ASTWriter.h head/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp head/contrib/llvm/tools/clang/lib/AST/ASTDiagnostic.cpp head/contrib/llvm/tools/clang/lib/AST/ASTImporter.cpp head/contrib/llvm/tools/clang/lib/AST/CXXABI.h head/contrib/llvm/tools/clang/lib/AST/CXXInheritance.cpp head/contrib/llvm/tools/clang/lib/AST/Decl.cpp head/contrib/llvm/tools/clang/lib/AST/DeclBase.cpp head/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp head/contrib/llvm/tools/clang/lib/AST/DeclObjC.cpp head/contrib/llvm/tools/clang/lib/AST/DeclPrinter.cpp head/contrib/llvm/tools/clang/lib/AST/DeclTemplate.cpp head/contrib/llvm/tools/clang/lib/AST/DeclarationName.cpp head/contrib/llvm/tools/clang/lib/AST/Expr.cpp head/contrib/llvm/tools/clang/lib/AST/ExprCXX.cpp head/contrib/llvm/tools/clang/lib/AST/ExprClassification.cpp head/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp head/contrib/llvm/tools/clang/lib/AST/InheritViz.cpp head/contrib/llvm/tools/clang/lib/AST/ItaniumCXXABI.cpp head/contrib/llvm/tools/clang/lib/AST/MicrosoftCXXABI.cpp head/contrib/llvm/tools/clang/lib/AST/NestedNameSpecifier.cpp head/contrib/llvm/tools/clang/lib/AST/ParentMap.cpp head/contrib/llvm/tools/clang/lib/AST/RecordLayout.cpp head/contrib/llvm/tools/clang/lib/AST/RecordLayoutBuilder.cpp head/contrib/llvm/tools/clang/lib/AST/Stmt.cpp head/contrib/llvm/tools/clang/lib/AST/StmtDumper.cpp head/contrib/llvm/tools/clang/lib/AST/StmtIterator.cpp head/contrib/llvm/tools/clang/lib/AST/StmtPrinter.cpp head/contrib/llvm/tools/clang/lib/AST/StmtProfile.cpp head/contrib/llvm/tools/clang/lib/AST/TemplateBase.cpp head/contrib/llvm/tools/clang/lib/AST/TemplateName.cpp head/contrib/llvm/tools/clang/lib/AST/Type.cpp head/contrib/llvm/tools/clang/lib/AST/TypeLoc.cpp head/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp head/contrib/llvm/tools/clang/lib/Analysis/AnalysisContext.cpp head/contrib/llvm/tools/clang/lib/Analysis/CFG.cpp head/contrib/llvm/tools/clang/lib/Analysis/CFGStmtMap.cpp head/contrib/llvm/tools/clang/lib/Analysis/FormatString.cpp head/contrib/llvm/tools/clang/lib/Analysis/LiveVariables.cpp head/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp head/contrib/llvm/tools/clang/lib/Analysis/PseudoConstantAnalysis.cpp head/contrib/llvm/tools/clang/lib/Analysis/ReachableCode.cpp head/contrib/llvm/tools/clang/lib/Analysis/UninitializedValues.cpp head/contrib/llvm/tools/clang/lib/Basic/Builtins.cpp head/contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp head/contrib/llvm/tools/clang/lib/Basic/FileManager.cpp head/contrib/llvm/tools/clang/lib/Basic/IdentifierTable.cpp head/contrib/llvm/tools/clang/lib/Basic/SourceLocation.cpp head/contrib/llvm/tools/clang/lib/Basic/SourceManager.cpp head/contrib/llvm/tools/clang/lib/Basic/TargetInfo.cpp head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp head/contrib/llvm/tools/clang/lib/Basic/Version.cpp head/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h head/contrib/llvm/tools/clang/lib/CodeGen/BackendUtil.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.h head/contrib/llvm/tools/clang/lib/CodeGen/CGBuiltin.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGCXX.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.h head/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGClass.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.h head/contrib/llvm/tools/clang/lib/CodeGen/CGDecl.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGDeclCXX.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGException.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGException.h head/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGExprCXX.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGExprComplex.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGExprConstant.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGExprScalar.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGObjC.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCGNU.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCMac.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCRuntime.h head/contrib/llvm/tools/clang/lib/CodeGen/CGRTTI.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGRecordLayout.h head/contrib/llvm/tools/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGStmt.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGTemporaries.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGVTT.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.h head/contrib/llvm/tools/clang/lib/CodeGen/CGValue.h head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenAction.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.h head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.h head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.h head/contrib/llvm/tools/clang/lib/CodeGen/GlobalDecl.h head/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp head/contrib/llvm/tools/clang/lib/CodeGen/MicrosoftCXXABI.cpp head/contrib/llvm/tools/clang/lib/CodeGen/ModuleBuilder.cpp head/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp head/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.h head/contrib/llvm/tools/clang/lib/Driver/Action.cpp head/contrib/llvm/tools/clang/lib/Driver/Arg.cpp head/contrib/llvm/tools/clang/lib/Driver/ArgList.cpp head/contrib/llvm/tools/clang/lib/Driver/Compilation.cpp head/contrib/llvm/tools/clang/lib/Driver/Driver.cpp head/contrib/llvm/tools/clang/lib/Driver/DriverOptions.cpp head/contrib/llvm/tools/clang/lib/Driver/HostInfo.cpp head/contrib/llvm/tools/clang/lib/Driver/Job.cpp head/contrib/llvm/tools/clang/lib/Driver/OptTable.cpp head/contrib/llvm/tools/clang/lib/Driver/Option.cpp head/contrib/llvm/tools/clang/lib/Driver/Phases.cpp head/contrib/llvm/tools/clang/lib/Driver/Tool.cpp head/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp head/contrib/llvm/tools/clang/lib/Driver/Tools.h head/contrib/llvm/tools/clang/lib/Driver/Types.cpp head/contrib/llvm/tools/clang/lib/Frontend/ASTConsumers.cpp head/contrib/llvm/tools/clang/lib/Frontend/ASTMerge.cpp head/contrib/llvm/tools/clang/lib/Frontend/ASTUnit.cpp head/contrib/llvm/tools/clang/lib/Frontend/CacheTokens.cpp head/contrib/llvm/tools/clang/lib/Frontend/CompilerInstance.cpp head/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp head/contrib/llvm/tools/clang/lib/Frontend/DeclXML.cpp head/contrib/llvm/tools/clang/lib/Frontend/DependencyFile.cpp head/contrib/llvm/tools/clang/lib/Frontend/DocumentXML.cpp head/contrib/llvm/tools/clang/lib/Frontend/FrontendAction.cpp head/contrib/llvm/tools/clang/lib/Frontend/FrontendActions.cpp head/contrib/llvm/tools/clang/lib/Frontend/FrontendOptions.cpp head/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp head/contrib/llvm/tools/clang/lib/Frontend/InitPreprocessor.cpp head/contrib/llvm/tools/clang/lib/Frontend/PrintPreprocessedOutput.cpp head/contrib/llvm/tools/clang/lib/Frontend/StmtXML.cpp head/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticBuffer.cpp head/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticPrinter.cpp head/contrib/llvm/tools/clang/lib/Frontend/TypeXML.cpp head/contrib/llvm/tools/clang/lib/Frontend/VerifyDiagnosticsClient.cpp head/contrib/llvm/tools/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp head/contrib/llvm/tools/clang/lib/Headers/altivec.h head/contrib/llvm/tools/clang/lib/Headers/emmintrin.h head/contrib/llvm/tools/clang/lib/Headers/limits.h head/contrib/llvm/tools/clang/lib/Headers/mm_malloc.h head/contrib/llvm/tools/clang/lib/Headers/mmintrin.h head/contrib/llvm/tools/clang/lib/Headers/stdbool.h head/contrib/llvm/tools/clang/lib/Headers/stddef.h head/contrib/llvm/tools/clang/lib/Headers/xmmintrin.h head/contrib/llvm/tools/clang/lib/Index/ASTVisitor.h head/contrib/llvm/tools/clang/lib/Index/CallGraph.cpp head/contrib/llvm/tools/clang/lib/Lex/HeaderMap.cpp head/contrib/llvm/tools/clang/lib/Lex/HeaderSearch.cpp head/contrib/llvm/tools/clang/lib/Lex/Lexer.cpp head/contrib/llvm/tools/clang/lib/Lex/LiteralSupport.cpp head/contrib/llvm/tools/clang/lib/Lex/MacroInfo.cpp head/contrib/llvm/tools/clang/lib/Lex/PPDirectives.cpp head/contrib/llvm/tools/clang/lib/Lex/PPExpressions.cpp head/contrib/llvm/tools/clang/lib/Lex/PPLexerChange.cpp head/contrib/llvm/tools/clang/lib/Lex/PPMacroExpansion.cpp head/contrib/llvm/tools/clang/lib/Lex/PTHLexer.cpp head/contrib/llvm/tools/clang/lib/Lex/Pragma.cpp head/contrib/llvm/tools/clang/lib/Lex/PreprocessingRecord.cpp head/contrib/llvm/tools/clang/lib/Lex/Preprocessor.cpp head/contrib/llvm/tools/clang/lib/Lex/TokenConcatenation.cpp head/contrib/llvm/tools/clang/lib/Lex/TokenLexer.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseAST.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseCXXInlineMethods.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseDecl.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseExpr.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseExprCXX.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseInit.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseObjc.cpp head/contrib/llvm/tools/clang/lib/Parse/ParsePragma.cpp head/contrib/llvm/tools/clang/lib/Parse/ParsePragma.h head/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseTemplate.cpp head/contrib/llvm/tools/clang/lib/Parse/ParseTentative.cpp head/contrib/llvm/tools/clang/lib/Parse/Parser.cpp head/contrib/llvm/tools/clang/lib/Parse/RAIIObjectsForParser.h head/contrib/llvm/tools/clang/lib/Rewrite/FixItRewriter.cpp head/contrib/llvm/tools/clang/lib/Rewrite/FrontendActions.cpp head/contrib/llvm/tools/clang/lib/Rewrite/HTMLRewrite.cpp head/contrib/llvm/tools/clang/lib/Rewrite/RewriteMacros.cpp head/contrib/llvm/tools/clang/lib/Rewrite/RewriteObjC.cpp head/contrib/llvm/tools/clang/lib/Rewrite/RewriteRope.cpp head/contrib/llvm/tools/clang/lib/Rewrite/TokenRewriter.cpp head/contrib/llvm/tools/clang/lib/Sema/AnalysisBasedWarnings.cpp head/contrib/llvm/tools/clang/lib/Sema/AttributeList.cpp head/contrib/llvm/tools/clang/lib/Sema/CodeCompleteConsumer.cpp head/contrib/llvm/tools/clang/lib/Sema/DeclSpec.cpp head/contrib/llvm/tools/clang/lib/Sema/JumpDiagnostics.cpp head/contrib/llvm/tools/clang/lib/Sema/Sema.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaAccess.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaAttr.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaCXXCast.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaCXXScopeSpec.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaCodeComplete.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaDeclObjC.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaExceptionSpec.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaExprObjC.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaLookup.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaObjCProperty.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaOverload.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaStmt.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateDeduction.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiate.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp head/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp head/contrib/llvm/tools/clang/lib/Sema/TargetAttributesSema.cpp head/contrib/llvm/tools/clang/lib/Sema/TreeTransform.h head/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.cpp head/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.h head/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp head/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp head/contrib/llvm/tools/clang/lib/Serialization/ASTReaderStmt.cpp head/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp head/contrib/llvm/tools/clang/lib/Serialization/ASTWriterDecl.cpp head/contrib/llvm/tools/clang/lib/Serialization/ASTWriterStmt.cpp head/contrib/llvm/tools/clang/lib/Serialization/GeneratePCH.cpp head/contrib/llvm/tools/clang/tools/driver/cc1_main.cpp head/contrib/llvm/tools/clang/tools/driver/cc1as_main.cpp head/contrib/llvm/tools/clang/tools/driver/driver.cpp head/contrib/llvm/utils/TableGen/ARMDecoderEmitter.cpp head/contrib/llvm/utils/TableGen/ARMDecoderEmitter.h head/contrib/llvm/utils/TableGen/AsmMatcherEmitter.cpp head/contrib/llvm/utils/TableGen/AsmWriterEmitter.cpp head/contrib/llvm/utils/TableGen/AsmWriterInst.cpp head/contrib/llvm/utils/TableGen/AsmWriterInst.h head/contrib/llvm/utils/TableGen/CallingConvEmitter.cpp head/contrib/llvm/utils/TableGen/ClangASTNodesEmitter.h head/contrib/llvm/utils/TableGen/ClangAttrEmitter.cpp head/contrib/llvm/utils/TableGen/ClangAttrEmitter.h head/contrib/llvm/utils/TableGen/ClangDiagnosticsEmitter.cpp head/contrib/llvm/utils/TableGen/CodeEmitterGen.cpp head/contrib/llvm/utils/TableGen/CodeEmitterGen.h head/contrib/llvm/utils/TableGen/CodeGenDAGPatterns.cpp head/contrib/llvm/utils/TableGen/CodeGenDAGPatterns.h head/contrib/llvm/utils/TableGen/CodeGenInstruction.cpp head/contrib/llvm/utils/TableGen/CodeGenInstruction.h head/contrib/llvm/utils/TableGen/CodeGenRegisters.h head/contrib/llvm/utils/TableGen/CodeGenTarget.cpp head/contrib/llvm/utils/TableGen/CodeGenTarget.h head/contrib/llvm/utils/TableGen/DAGISelMatcher.cpp head/contrib/llvm/utils/TableGen/DAGISelMatcher.h head/contrib/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp head/contrib/llvm/utils/TableGen/DAGISelMatcherGen.cpp head/contrib/llvm/utils/TableGen/DAGISelMatcherOpt.cpp head/contrib/llvm/utils/TableGen/DisassemblerEmitter.cpp head/contrib/llvm/utils/TableGen/EDEmitter.cpp head/contrib/llvm/utils/TableGen/FastISelEmitter.cpp head/contrib/llvm/utils/TableGen/InstrEnumEmitter.cpp head/contrib/llvm/utils/TableGen/InstrInfoEmitter.cpp head/contrib/llvm/utils/TableGen/IntrinsicEmitter.cpp head/contrib/llvm/utils/TableGen/LLVMCConfigurationEmitter.cpp head/contrib/llvm/utils/TableGen/LLVMCConfigurationEmitter.h head/contrib/llvm/utils/TableGen/NeonEmitter.cpp head/contrib/llvm/utils/TableGen/NeonEmitter.h head/contrib/llvm/utils/TableGen/Record.cpp head/contrib/llvm/utils/TableGen/Record.h head/contrib/llvm/utils/TableGen/RegisterInfoEmitter.cpp head/contrib/llvm/utils/TableGen/SubtargetEmitter.cpp head/contrib/llvm/utils/TableGen/SubtargetEmitter.h head/contrib/llvm/utils/TableGen/TGLexer.cpp head/contrib/llvm/utils/TableGen/TGLexer.h head/contrib/llvm/utils/TableGen/TGParser.cpp head/contrib/llvm/utils/TableGen/TGParser.h head/contrib/llvm/utils/TableGen/TableGen.cpp head/contrib/llvm/utils/TableGen/X86DisassemblerTables.cpp head/contrib/llvm/utils/TableGen/X86ModRMFilters.h head/contrib/llvm/utils/TableGen/X86RecognizableInstr.cpp head/contrib/llvm/utils/TableGen/X86RecognizableInstr.h head/etc/mtree/BSD.include.dist head/lib/clang/Makefile head/lib/clang/clang.build.mk head/lib/clang/include/Makefile head/lib/clang/include/clang/Basic/Version.inc head/lib/clang/include/llvm/Config/AsmPrinters.def head/lib/clang/include/llvm/Config/Disassemblers.def head/lib/clang/include/llvm/Config/Targets.def head/lib/clang/include/llvm/Config/config.h head/lib/clang/include/llvm/Config/llvm-config.h head/lib/clang/libclanganalysis/Makefile head/lib/clang/libclangast/Makefile head/lib/clang/libclangbasic/Makefile head/lib/clang/libclangcodegen/Makefile head/lib/clang/libclangfrontend/Makefile head/lib/clang/libclanglex/Makefile head/lib/clang/libclangsema/Makefile head/lib/clang/libllvmanalysis/Makefile head/lib/clang/libllvmarmcodegen/Makefile head/lib/clang/libllvmasmprinter/Makefile head/lib/clang/libllvmcodegen/Makefile head/lib/clang/libllvmcore/Makefile head/lib/clang/libllvmipo/Makefile head/lib/clang/libllvmmc/Makefile head/lib/clang/libllvmmcparser/Makefile head/lib/clang/libllvmmipscodegen/Makefile head/lib/clang/libllvmpowerpccodegen/Makefile head/lib/clang/libllvmscalaropts/Makefile head/lib/clang/libllvmsupport/Makefile head/lib/clang/libllvmtarget/Makefile head/lib/clang/libllvmx86codegen/Makefile head/lib/libz/Makefile head/sys/boot/i386/boot0/Makefile head/sys/boot/i386/btx/btx/Makefile head/sys/boot/i386/btx/btxldr/Makefile head/sys/boot/i386/gptboot/Makefile head/sys/boot/i386/gptzfsboot/Makefile head/sys/boot/i386/libi386/Makefile head/sys/boot/i386/pxeldr/Makefile head/sys/boot/i386/zfsboot/Makefile head/sys/boot/pc98/btx/btx/Makefile head/sys/boot/pc98/btx/btxldr/Makefile head/sys/conf/Makefile.amd64 head/sys/conf/Makefile.i386 head/sys/modules/bios/smapi/Makefile head/sys/modules/linux/Makefile head/usr.bin/clang/clang/Makefile head/usr.bin/clang/tblgen/Makefile Directory Properties: head/contrib/llvm/ (props changed) head/contrib/llvm/tools/clang/ (props changed) Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Feb 20 17:54:49 2011 (r218892) +++ head/Makefile.inc1 Sun Feb 20 19:33:47 2011 (r218893) @@ -974,7 +974,6 @@ _crunchgen= usr.sbin/crunch/crunchgen # with different per-architecture default values. Always build tblgen. _clang_tblgen= \ lib/clang/libllvmsupport \ - lib/clang/libllvmsystem \ usr.bin/clang/tblgen .if ${MK_CDDL} != "no" Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sun Feb 20 17:54:49 2011 (r218892) +++ head/ObsoleteFiles.inc Sun Feb 20 19:33:47 2011 (r218893) @@ -38,6 +38,14 @@ # xargs -n1 | sort | uniq -d; # done +# 20110220: new clang import which bumps version from 2.8 to 2.9 +OLD_FILES+=usr/include/clang/2.8/emmintrin.h +OLD_FILES+=usr/include/clang/2.8/mm_malloc.h +OLD_FILES+=usr/include/clang/2.8/mmintrin.h +OLD_FILES+=usr/include/clang/2.8/pmmintrin.h +OLD_FILES+=usr/include/clang/2.8/tmmintrin.h +OLD_FILES+=usr/include/clang/2.8/xmmintrin.h +OLD_DIRS+=usr/include/clang/2.8 # 20110119: Remove SYSCTL_*X* sysctl additions. OLD_FILES+=usr/share/man/man9/SYSCTL_XINT.9.gz \ usr/share/man/man9/SYSCTL_XLONG.9.gz Modified: head/contrib/llvm/include/llvm-c/Core.h ============================================================================== --- head/contrib/llvm/include/llvm-c/Core.h Sun Feb 20 17:54:49 2011 (r218892) +++ head/contrib/llvm/include/llvm-c/Core.h Sun Feb 20 19:33:47 2011 (r218893) @@ -33,13 +33,14 @@ #ifndef LLVM_C_CORE_H #define LLVM_C_CORE_H -#include "llvm/System/DataTypes.h" +#include "llvm/Support/DataTypes.h" #ifdef __cplusplus /* Need these includes to support the LLVM 'cast' template for the C++ 'wrap' and 'unwrap' conversion functions. */ #include "llvm/Module.h" +#include "llvm/PassRegistry.h" #include "llvm/Support/IRBuilder.h" extern "C" { @@ -92,6 +93,9 @@ typedef struct LLVMOpaqueMemoryBuffer *L /** See the llvm::PassManagerBase class. */ typedef struct LLVMOpaquePassManager *LLVMPassManagerRef; +/** See the llvm::PassRegistry class. */ +typedef struct LLVMOpaquePassRegistry *LLVMPassRegistryRef; + /** Used to get the users and usees of a Value. See the llvm::Use class. */ typedef struct LLVMOpaqueUse *LLVMUseRef; @@ -204,7 +208,8 @@ typedef enum { LLVMPointerTypeKind, /**< Pointers */ LLVMOpaqueTypeKind, /**< Opaque: type with unknown structure */ LLVMVectorTypeKind, /**< SIMD 'packed' format, or other vector type */ - LLVMMetadataTypeKind /**< Metadata */ + LLVMMetadataTypeKind, /**< Metadata */ + LLVMX86_MMXTypeKind /**< X86 MMX */ } LLVMTypeKind; typedef enum { @@ -317,6 +322,7 @@ void LLVMSetTarget(LLVMModuleRef M, cons LLVMBool LLVMAddTypeName(LLVMModuleRef M, const char *Name, LLVMTypeRef Ty); void LLVMDeleteTypeName(LLVMModuleRef M, const char *Name); LLVMTypeRef LLVMGetTypeByName(LLVMModuleRef M, const char *Name); +const char *LLVMGetTypeName(LLVMModuleRef M, LLVMTypeRef Ty); /** See Module::dump. */ void LLVMDumpModule(LLVMModuleRef M); @@ -324,6 +330,9 @@ void LLVMDumpModule(LLVMModuleRef M); /** See Module::setModuleInlineAsm. */ void LLVMSetModuleInlineAsm(LLVMModuleRef M, const char *Asm); +/** See Module::getContext. */ +LLVMContextRef LLVMGetModuleContext(LLVMModuleRef M); + /*===-- Types -------------------------------------------------------------===*/ /* LLVM types conform to the following hierarchy: @@ -408,10 +417,12 @@ unsigned LLVMGetVectorSize(LLVMTypeRef V LLVMTypeRef LLVMVoidTypeInContext(LLVMContextRef C); LLVMTypeRef LLVMLabelTypeInContext(LLVMContextRef C); LLVMTypeRef LLVMOpaqueTypeInContext(LLVMContextRef C); +LLVMTypeRef LLVMX86MMXTypeInContext(LLVMContextRef C); LLVMTypeRef LLVMVoidType(void); LLVMTypeRef LLVMLabelType(void); LLVMTypeRef LLVMOpaqueType(void); +LLVMTypeRef LLVMX86MMXType(void); /* Operations on type handles */ LLVMTypeHandleRef LLVMCreateTypeHandle(LLVMTypeRef PotentiallyAbstractTy); @@ -540,6 +551,9 @@ LLVMValueRef LLVMMDNode(LLVMValueRef *Va /* Operations on scalar constants */ LLVMValueRef LLVMConstInt(LLVMTypeRef IntTy, unsigned long long N, LLVMBool SignExtend); +LLVMValueRef LLVMConstIntOfArbitraryPrecision(LLVMTypeRef IntTy, + unsigned NumWords, + const uint64_t Words[]); LLVMValueRef LLVMConstIntOfString(LLVMTypeRef IntTy, const char *Text, uint8_t Radix); LLVMValueRef LLVMConstIntOfStringAndSize(LLVMTypeRef IntTy, const char *Text, @@ -1013,6 +1027,11 @@ LLVMBool LLVMCreateMemoryBufferWithSTDIN char **OutMessage); void LLVMDisposeMemoryBuffer(LLVMMemoryBufferRef MemBuf); +/*===-- Pass Registry -----------------------------------------------------===*/ + +/** Return the global pass registry, for use with initialization functions. + See llvm::PassRegistry::getPassRegistry. */ +LLVMPassRegistryRef LLVMGetGlobalPassRegistry(void); /*===-- Pass Managers -----------------------------------------------------===*/ @@ -1101,6 +1120,7 @@ namespace llvm { DEFINE_SIMPLE_CONVERSION_FUNCTIONS(LLVMContext, LLVMContextRef ) DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Use, LLVMUseRef ) DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassManagerBase, LLVMPassManagerRef ) + DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassRegistry, LLVMPassRegistryRef ) /* LLVMModuleProviderRef exists for historical reasons, but now just holds a * Module. */ Modified: head/contrib/llvm/include/llvm-c/EnhancedDisassembly.h ============================================================================== --- head/contrib/llvm/include/llvm-c/EnhancedDisassembly.h Sun Feb 20 17:54:49 2011 (r218892) +++ head/contrib/llvm/include/llvm-c/EnhancedDisassembly.h Sun Feb 20 19:33:47 2011 (r218893) @@ -19,7 +19,7 @@ #ifndef LLVM_C_ENHANCEDDISASSEMBLY_H #define LLVM_C_ENHANCEDDISASSEMBLY_H -#include "llvm/System/DataTypes.h" +#include "llvm/Support/DataTypes.h" #ifdef __cplusplus extern "C" { Copied: head/contrib/llvm/include/llvm-c/Initialization.h (from r218888, vendor/llvm/dist/include/llvm-c/Initialization.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/llvm/include/llvm-c/Initialization.h Sun Feb 20 19:33:47 2011 (r218893, copy of r218888, vendor/llvm/dist/include/llvm-c/Initialization.h) @@ -0,0 +1,40 @@ +/*===-- llvm-c/Initialization.h - Initialization C Interface ------*- C -*-===*\ +|* *| +|* The LLVM Compiler Infrastructure *| +|* *| +|* This file is distributed under the University of Illinois Open Source *| +|* License. See LICENSE.TXT for details. *| +|* *| +|*===----------------------------------------------------------------------===*| +|* *| +|* This header declares the C interface to LLVM initialization routines, *| +|* which must be called before you can use the functionality provided by *| +|* the corresponding LLVM library. *| +|* *| +\*===----------------------------------------------------------------------===*/ + +#ifndef LLVM_C_INITIALIZEPASSES_H +#define LLVM_C_INITIALIZEPASSES_H + +#include "llvm-c/Core.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void LLVMInitializeCore(LLVMPassRegistryRef R); +void LLVMInitializeTransformUtils(LLVMPassRegistryRef R); +void LLVMInitializeScalarOpts(LLVMPassRegistryRef R); +void LLVMInitializeInstCombine(LLVMPassRegistryRef R); +void LLVMInitializeIPO(LLVMPassRegistryRef R); +void LLVMInitializeInstrumentation(LLVMPassRegistryRef R); +void LLVMInitializeAnalysis(LLVMPassRegistryRef R); +void LLVMInitializeIPA(LLVMPassRegistryRef R); +void LLVMInitializeCodeGen(LLVMPassRegistryRef R); +void LLVMInitializeTarget(LLVMPassRegistryRef R); + +#ifdef __cplusplus +} +#endif + +#endif Modified: head/contrib/llvm/include/llvm-c/LinkTimeOptimizer.h ============================================================================== --- head/contrib/llvm/include/llvm-c/LinkTimeOptimizer.h Sun Feb 20 17:54:49 2011 (r218892) +++ head/contrib/llvm/include/llvm-c/LinkTimeOptimizer.h Sun Feb 20 19:33:47 2011 (r218893) @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // // This header provides a C API to use the LLVM link time optimization -// library. This is inteded to be used by linkers which are C-only in +// library. This is intended to be used by linkers which are C-only in // their implementation for performing LTO. // //===----------------------------------------------------------------------===// Modified: head/contrib/llvm/include/llvm-c/Transforms/Scalar.h ============================================================================== --- head/contrib/llvm/include/llvm-c/Transforms/Scalar.h Sun Feb 20 17:54:49 2011 (r218892) +++ head/contrib/llvm/include/llvm-c/Transforms/Scalar.h Sun Feb 20 19:33:47 2011 (r218893) @@ -52,9 +52,6 @@ void LLVMAddLICMPass(LLVMPassManagerRef /** See llvm::createLoopDeletionPass function. */ void LLVMAddLoopDeletionPass(LLVMPassManagerRef PM); -/** See llvm::createLoopIndexSplitPass function. */ -void LLVMAddLoopIndexSplitPass(LLVMPassManagerRef PM); - /** See llvm::createLoopRotatePass function. */ void LLVMAddLoopRotatePass(LLVMPassManagerRef PM); Modified: head/contrib/llvm/include/llvm-c/lto.h ============================================================================== --- head/contrib/llvm/include/llvm-c/lto.h Sun Feb 20 17:54:49 2011 (r218892) +++ head/contrib/llvm/include/llvm-c/lto.h Sun Feb 20 19:33:47 2011 (r218893) @@ -18,27 +18,28 @@ #include #include -#include "llvm/System/DataTypes.h" +#include -#define LTO_API_VERSION 3 +#define LTO_API_VERSION 4 typedef enum { - LTO_SYMBOL_ALIGNMENT_MASK = 0x0000001F, /* log2 of alignment */ - LTO_SYMBOL_PERMISSIONS_MASK = 0x000000E0, - LTO_SYMBOL_PERMISSIONS_CODE = 0x000000A0, - LTO_SYMBOL_PERMISSIONS_DATA = 0x000000C0, - LTO_SYMBOL_PERMISSIONS_RODATA = 0x00000080, - LTO_SYMBOL_DEFINITION_MASK = 0x00000700, - LTO_SYMBOL_DEFINITION_REGULAR = 0x00000100, - LTO_SYMBOL_DEFINITION_TENTATIVE = 0x00000200, - LTO_SYMBOL_DEFINITION_WEAK = 0x00000300, - LTO_SYMBOL_DEFINITION_UNDEFINED = 0x00000400, - LTO_SYMBOL_DEFINITION_WEAKUNDEF = 0x00000500, - LTO_SYMBOL_SCOPE_MASK = 0x00003800, - LTO_SYMBOL_SCOPE_INTERNAL = 0x00000800, - LTO_SYMBOL_SCOPE_HIDDEN = 0x00001000, - LTO_SYMBOL_SCOPE_PROTECTED = 0x00002000, - LTO_SYMBOL_SCOPE_DEFAULT = 0x00001800 + LTO_SYMBOL_ALIGNMENT_MASK = 0x0000001F, /* log2 of alignment */ + LTO_SYMBOL_PERMISSIONS_MASK = 0x000000E0, + LTO_SYMBOL_PERMISSIONS_CODE = 0x000000A0, + LTO_SYMBOL_PERMISSIONS_DATA = 0x000000C0, + LTO_SYMBOL_PERMISSIONS_RODATA = 0x00000080, + LTO_SYMBOL_DEFINITION_MASK = 0x00000700, + LTO_SYMBOL_DEFINITION_REGULAR = 0x00000100, + LTO_SYMBOL_DEFINITION_TENTATIVE = 0x00000200, + LTO_SYMBOL_DEFINITION_WEAK = 0x00000300, + LTO_SYMBOL_DEFINITION_UNDEFINED = 0x00000400, + LTO_SYMBOL_DEFINITION_WEAKUNDEF = 0x00000500, + LTO_SYMBOL_SCOPE_MASK = 0x00003800, + LTO_SYMBOL_SCOPE_INTERNAL = 0x00000800, + LTO_SYMBOL_SCOPE_HIDDEN = 0x00001000, + LTO_SYMBOL_SCOPE_PROTECTED = 0x00002000, + LTO_SYMBOL_SCOPE_DEFAULT = 0x00001800, + LTO_SYMBOL_SCOPE_DEFAULT_CAN_BE_HIDDEN = 0x00002800 } lto_symbol_attributes; typedef enum { @@ -121,6 +122,13 @@ lto_module_create(const char* path); extern lto_module_t lto_module_create_from_memory(const void* mem, size_t length); +/** + * Loads an object file from disk. The seek point of fd is not preserved. + * Returns NULL on error (check lto_get_error_message() for details). + */ +extern lto_module_t +lto_module_create_from_fd(int fd, const char *path, off_t size); + /** * Frees all memory internally allocated by the module. @@ -146,7 +154,7 @@ lto_module_set_target_triple(lto_module_ /** * Returns the number of symbols in the object module. */ -extern uint32_t +extern unsigned int lto_module_get_num_symbols(lto_module_t mod); @@ -154,14 +162,14 @@ lto_module_get_num_symbols(lto_module_t * Returns the name of the ith symbol in the object module. */ extern const char* -lto_module_get_symbol_name(lto_module_t mod, uint32_t index); +lto_module_get_symbol_name(lto_module_t mod, unsigned int index); /** * Returns the attributes of the ith symbol in the object module. */ extern lto_symbol_attributes -lto_module_get_symbol_attribute(lto_module_t mod, uint32_t index); +lto_module_get_symbol_attribute(lto_module_t mod, unsigned int index); /** Modified: head/contrib/llvm/include/llvm/ADT/APFloat.h ============================================================================== --- head/contrib/llvm/include/llvm/ADT/APFloat.h Sun Feb 20 17:54:49 2011 (r218892) +++ head/contrib/llvm/include/llvm/ADT/APFloat.h Sun Feb 20 19:33:47 2011 (r218893) @@ -246,6 +246,13 @@ namespace llvm { static APFloat getSmallestNormalized(const fltSemantics &Sem, bool Negative = false); + /// getAllOnesValue - Returns a float which is bitcasted from + /// an all one value int. + /// + /// \param BitWidth - Select float type + /// \param isIEEE - If 128 bit number, select between PPC and IEEE + static APFloat getAllOnesValue(unsigned BitWidth, bool isIEEE = false); + /// Profile - Used to insert APFloat objects, or objects that contain /// APFloat objects, into FoldingSets. void Profile(FoldingSetNodeID& NID) const; Modified: head/contrib/llvm/include/llvm/ADT/APInt.h ============================================================================== --- head/contrib/llvm/include/llvm/ADT/APInt.h Sun Feb 20 17:54:49 2011 (r218892) +++ head/contrib/llvm/include/llvm/ADT/APInt.h Sun Feb 20 19:33:47 2011 (r218893) @@ -275,12 +275,6 @@ public: /// objects, into FoldingSets. void Profile(FoldingSetNodeID& id) const; - /// @brief Used by the Bitcode serializer to emit APInts to Bitcode. - void Emit(Serializer& S) const; - - /// @brief Used by the Bitcode deserializer to deserialize APInts. - void Read(Deserializer& D); - /// @} /// @name Value Tests /// @{ @@ -302,7 +296,7 @@ public: /// @returns true if this APInt is positive. /// @brief Determine if this APInt Value is positive. bool isStrictlyPositive() const { - return isNonNegative() && (*this) != 0; + return isNonNegative() && !!*this; } /// This checks to see if the value has all bits of the APInt are set or not. @@ -330,15 +324,14 @@ public: /// value for the APInt's bit width. /// @brief Determine if this is the smallest unsigned value. bool isMinValue() const { - return countPopulation() == 0; + return !*this; } /// This checks to see if the value of this APInt is the minimum signed /// value for the APInt's bit width. /// @brief Determine if this is the smallest signed value. bool isMinSignedValue() const { - return BitWidth == 1 ? VAL == 1 : - isNegative() && countPopulation() == 1; + return BitWidth == 1 ? VAL == 1 : isNegative() && isPowerOf2(); } /// @brief Check if this APInt has an N-bits unsigned integer value. @@ -348,10 +341,8 @@ public: return true; if (isSingleWord()) - return VAL == (VAL & (~0ULL >> (64 - N))); - APInt Tmp(N, getNumWords(), pVal); - Tmp.zext(getBitWidth()); - return Tmp == (*this); + return isUIntN(N, VAL); + return APInt(N, getNumWords(), pVal).zext(getBitWidth()) == (*this); } /// @brief Check if this APInt has an N-bits signed integer value. @@ -361,7 +352,11 @@ public: } /// @returns true if the argument APInt value is a power of two > 0. - bool isPowerOf2() const; + bool isPowerOf2() const { + if (isSingleWord()) + return isPowerOf2_64(VAL); + return countPopulationSlowCase() == 1; + } /// isSignBit - Return true if this is the value returned by getSignBit. bool isSignBit() const { return isMinSignedValue(); } @@ -369,7 +364,7 @@ public: /// This converts the APInt to a boolean value as a test against zero. /// @brief Boolean conversion function. bool getBoolValue() const { - return *this != 0; + return !!*this; } /// getLimitedValue - If this value is smaller than the specified limit, @@ -385,12 +380,14 @@ public: /// @{ /// @brief Gets maximum unsigned value of APInt for specific bit width. static APInt getMaxValue(unsigned numBits) { - return APInt(numBits, 0).set(); + return getAllOnesValue(numBits); } /// @brief Gets maximum signed value of APInt for a specific bit width. static APInt getSignedMaxValue(unsigned numBits) { - return APInt(numBits, 0).set().clear(numBits - 1); + APInt API = getAllOnesValue(numBits); + API.clearBit(numBits - 1); + return API; } /// @brief Gets minimum unsigned value of APInt for a specific bit width. @@ -400,7 +397,9 @@ public: /// @brief Gets minimum signed value of APInt for a specific bit width. static APInt getSignedMinValue(unsigned numBits) { - return APInt(numBits, 0).set(numBits - 1); + APInt API(numBits, 0); + API.setBit(numBits - 1); + return API; } /// getSignBit - This is just a wrapper function of getSignedMinValue(), and @@ -413,7 +412,7 @@ public: /// @returns the all-ones value for an APInt of the specified bit-width. /// @brief Get the all-ones value. static APInt getAllOnesValue(unsigned numBits) { - return APInt(numBits, 0).set(); + return APInt(numBits, -1ULL, true); } /// @returns the '0' value for an APInt of the specified bit-width. @@ -432,6 +431,13 @@ public: /// @returns the low "numBits" bits of this APInt. APInt getLoBits(unsigned numBits) const; + /// getOneBitSet - Return an APInt with exactly one bit set in the result. + static APInt getOneBitSet(unsigned numBits, unsigned BitNo) { + APInt Res(numBits, 0); + Res.setBit(BitNo); + return Res; + } + /// Constructs an APInt value that has a contiguous range of bits set. The /// bits from loBit (inclusive) to hiBit (exclusive) will be set. All other /// bits will be zero. For example, with parameters(32, 0, 16) you would get @@ -530,7 +536,7 @@ public: /// @brief Unary bitwise complement operator. APInt operator~() const { APInt Result(*this); - Result.flip(); + Result.flipAllBits(); return Result; } @@ -741,11 +747,11 @@ public: /// RHS are treated as unsigned quantities for purposes of this division. /// @returns a new APInt value containing the division result /// @brief Unsigned division operation. - APInt udiv(const APInt& RHS) const; + APInt udiv(const APInt &RHS) const; /// Signed divide this APInt by APInt RHS. /// @brief Signed division function for APInt. - APInt sdiv(const APInt& RHS) const { + APInt sdiv(const APInt &RHS) const { if (isNegative()) if (RHS.isNegative()) return (-(*this)).udiv(-RHS); @@ -763,11 +769,11 @@ public: /// which is *this. /// @returns a new APInt value containing the remainder result /// @brief Unsigned remainder operation. - APInt urem(const APInt& RHS) const; + APInt urem(const APInt &RHS) const; /// Signed remainder operation on APInt. /// @brief Function for signed remainder operation. - APInt srem(const APInt& RHS) const { + APInt srem(const APInt &RHS) const { if (isNegative()) if (RHS.isNegative()) return -((-(*this)).urem(-RHS)); @@ -788,8 +794,7 @@ public: APInt &Quotient, APInt &Remainder); static void sdivrem(const APInt &LHS, const APInt &RHS, - APInt &Quotient, APInt &Remainder) - { + APInt &Quotient, APInt &Remainder) { if (LHS.isNegative()) { if (RHS.isNegative()) APInt::udivrem(-LHS, -RHS, Quotient, Remainder); @@ -804,6 +809,16 @@ public: APInt::udivrem(LHS, RHS, Quotient, Remainder); } } + + + // Operations that return overflow indicators. + APInt sadd_ov(const APInt &RHS, bool &Overflow) const; + APInt uadd_ov(const APInt &RHS, bool &Overflow) const; + APInt ssub_ov(const APInt &RHS, bool &Overflow) const; + APInt usub_ov(const APInt &RHS, bool &Overflow) const; + APInt sdiv_ov(const APInt &RHS, bool &Overflow) const; + APInt smul_ov(const APInt &RHS, bool &Overflow) const; + APInt sshl_ov(unsigned Amt, bool &Overflow) const; /// @returns the bit value at bitPosition /// @brief Array-indexing support. @@ -868,7 +883,7 @@ public: /// the validity of the less-than relationship. /// @returns true if *this < RHS when both are considered unsigned. /// @brief Unsigned less than comparison - bool ult(const APInt& RHS) const; + bool ult(const APInt &RHS) const; /// Regards both *this as an unsigned quantity and compares it with RHS for /// the validity of the less-than relationship. @@ -988,6 +1003,9 @@ public: return sge(APInt(getBitWidth(), RHS)); } + + + /// This operation tests if there are any pairs of corresponding bits /// between this APInt and RHS that are both set. bool intersects(const APInt &RHS) const { @@ -1000,80 +1018,78 @@ public: /// Truncate the APInt to a specified width. It is an error to specify a width /// that is greater than or equal to the current width. /// @brief Truncate to new width. - APInt &trunc(unsigned width); + APInt trunc(unsigned width) const; /// This operation sign extends the APInt to a new width. If the high order /// bit is set, the fill on the left will be done with 1 bits, otherwise zero. /// It is an error to specify a width that is less than or equal to the /// current width. /// @brief Sign extend to a new width. - APInt &sext(unsigned width); + APInt sext(unsigned width) const; /// This operation zero extends the APInt to a new width. The high order bits /// are filled with 0 bits. It is an error to specify a width that is less /// than or equal to the current width. /// @brief Zero extend to a new width. - APInt &zext(unsigned width); + APInt zext(unsigned width) const; /// Make this APInt have the bit width given by \p width. The value is sign /// extended, truncated, or left alone to make it that width. /// @brief Sign extend or truncate to width - APInt &sextOrTrunc(unsigned width); + APInt sextOrTrunc(unsigned width) const; /// Make this APInt have the bit width given by \p width. The value is zero /// extended, truncated, or left alone to make it that width. /// @brief Zero extend or truncate to width - APInt &zextOrTrunc(unsigned width); + APInt zextOrTrunc(unsigned width) const; /// @} /// @name Bit Manipulation Operators /// @{ /// @brief Set every bit to 1. - APInt& set() { - if (isSingleWord()) { + void setAllBits() { + if (isSingleWord()) VAL = -1ULL; - return clearUnusedBits(); + else { + // Set all the bits in all the words. + for (unsigned i = 0; i < getNumWords(); ++i) + pVal[i] = -1ULL; } - - // Set all the bits in all the words. - for (unsigned i = 0; i < getNumWords(); ++i) - pVal[i] = -1ULL; // Clear the unused ones - return clearUnusedBits(); + clearUnusedBits(); } /// Set the given bit to 1 whose position is given as "bitPosition". /// @brief Set a given bit to 1. - APInt& set(unsigned bitPosition); + void setBit(unsigned bitPosition); /// @brief Set every bit to 0. - APInt& clear() { + void clearAllBits() { if (isSingleWord()) VAL = 0; else memset(pVal, 0, getNumWords() * APINT_WORD_SIZE); - return *this; } /// Set the given bit to 0 whose position is given as "bitPosition". /// @brief Set a given bit to 0. - APInt& clear(unsigned bitPosition); + void clearBit(unsigned bitPosition); /// @brief Toggle every bit to its opposite value. - APInt& flip() { - if (isSingleWord()) { + void flipAllBits() { + if (isSingleWord()) VAL ^= -1ULL; - return clearUnusedBits(); + else { + for (unsigned i = 0; i < getNumWords(); ++i) + pVal[i] ^= -1ULL; } - for (unsigned i = 0; i < getNumWords(); ++i) - pVal[i] ^= -1ULL; - return clearUnusedBits(); + clearUnusedBits(); } /// Toggle a given bit to its opposite value whose position is given /// as "bitPosition". /// @brief Toggles a given bit to its opposite value. - APInt& flip(unsigned bitPosition); + void flipBit(unsigned bitPosition); /// @} /// @name Value Characterization Functions @@ -1281,37 +1297,27 @@ public: } /// The conversion does not do a translation from double to integer, it just - /// re-interprets the bits of the double. Note that it is valid to do this on - /// any bit width but bits from V may get truncated. + /// re-interprets the bits of the double. /// @brief Converts a double to APInt bits. - APInt& doubleToBits(double V) { + static APInt doubleToBits(double V) { union { uint64_t I; double D; } T; T.D = V; - if (isSingleWord()) - VAL = T.I; - else - pVal[0] = T.I; - return clearUnusedBits(); + return APInt(sizeof T * CHAR_BIT, T.I); } /// The conversion does not do a translation from float to integer, it just - /// re-interprets the bits of the float. Note that it is valid to do this on - /// any bit width but bits from V may get truncated. + /// re-interprets the bits of the float. /// @brief Converts a float to APInt bits. - APInt& floatToBits(float V) { + static APInt floatToBits(float V) { union { unsigned I; float F; } T; T.F = V; - if (isSingleWord()) - VAL = T.I; - else - pVal[0] = T.I; - return clearUnusedBits(); + return APInt(sizeof T * CHAR_BIT, T.I); } /// @} Modified: head/contrib/llvm/include/llvm/ADT/APSInt.h ============================================================================== --- head/contrib/llvm/include/llvm/ADT/APSInt.h Sun Feb 20 17:54:49 2011 (r218892) +++ head/contrib/llvm/include/llvm/ADT/APSInt.h Sun Feb 20 19:33:47 2011 (r218893) @@ -68,20 +68,22 @@ public: } using APInt::toString; - APSInt& extend(uint32_t width) { + APSInt trunc(uint32_t width) const { + return APSInt(APInt::trunc(width), IsUnsigned); + } + + APSInt extend(uint32_t width) const { if (IsUnsigned) - zext(width); + return APSInt(zext(width), IsUnsigned); else - sext(width); - return *this; + return APSInt(sext(width), IsUnsigned); } - APSInt& extOrTrunc(uint32_t width) { + APSInt extOrTrunc(uint32_t width) const { if (IsUnsigned) - zextOrTrunc(width); + return APSInt(zextOrTrunc(width), IsUnsigned); else - sextOrTrunc(width); - return *this; + return APSInt(sextOrTrunc(width), IsUnsigned); } const APSInt &operator%=(const APSInt &RHS) { Copied: head/contrib/llvm/include/llvm/ADT/ArrayRef.h (from r218888, vendor/llvm/dist/include/llvm/ADT/ArrayRef.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/llvm/include/llvm/ADT/ArrayRef.h Sun Feb 20 19:33:47 2011 (r218893, copy of r218888, vendor/llvm/dist/include/llvm/ADT/ArrayRef.h) @@ -0,0 +1,121 @@ +//===--- ArrayRef.h - Array Reference Wrapper -------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_ADT_ARRAYREF_H +#define LLVM_ADT_ARRAYREF_H + +#include "llvm/ADT/SmallVector.h" +#include + +namespace llvm { + class APInt; + + /// ArrayRef - Represent a constant reference to an array (0 or more elements + /// consecutively in memory), i.e. a start pointer and a length. It allows + /// various APIs to take consecutive elements easily and conveniently. + /// + /// This class does not own the underlying data, it is expected to be used in + /// situations where the data resides in some other buffer, whose lifetime + /// extends past that of the StringRef. For this reason, it is not in general + /// safe to store a ArrayRef. + /// + /// This is intended to be trivially copyable, so it should be passed by + /// value. + template + class ArrayRef { + public: + typedef const T *iterator; + typedef const T *const_iterator; + typedef size_t size_type; + + private: + /// The start of the array, in an external buffer. + const T *Data; + + /// The number of elements. + size_t Length; + + public: + /// @name Constructors + /// @{ + + /// Construct an empty ArrayRef. + /*implicit*/ ArrayRef() : Data(0), Length(0) {} + + /// Construct an ArrayRef from a single element. + /*implicit*/ ArrayRef(const T &OneElt) + : Data(&OneElt), Length(1) {} + + /// Construct an ArrayRef from a pointer and length. + /*implicit*/ ArrayRef(const T *data, size_t length) + : Data(data), Length(length) {} + + /// Construct an ArrayRef from a SmallVector. + /*implicit*/ ArrayRef(const SmallVectorImpl &Vec) + : Data(Vec.data()), Length(Vec.size()) {} + + /// Construct an ArrayRef from a std::vector. + /*implicit*/ ArrayRef(const std::vector &Vec) + : Data(Vec.empty() ? (T*)0 : &Vec[0]), Length(Vec.size()) {} + + // TODO: C arrays. + + /// @} + /// @name Simple Operations + /// @{ + + iterator begin() const { return Data; } + iterator end() const { return Data + Length; } + + /// empty - Check if the array is empty. + bool empty() const { return Length == 0; } + + /// size - Get the array size. + size_t size() const { return Length; } + + /// front - Get the first element. + const T &front() const { + assert(!empty()); + return Data[0]; + } + + /// back - Get the last element. + const T &back() const { + assert(!empty()); + return Data[Length-1]; + } + + /// @} + /// @name Operator Overloads + /// @{ + + const T &operator[](size_t Index) const { + assert(Index < Length && "Invalid index!"); + return Data[Index]; + } + + /// @} + /// @name Expensive Operations + /// @{ + + std::vector vec() const { + return std::vector(Data, Data+Length); + } + + /// @} + }; + + // ArrayRefs can be treated like a POD type. + template struct isPodLike; + template struct isPodLike > { + static const bool value = true; + }; +} + +#endif Modified: head/contrib/llvm/include/llvm/ADT/BitVector.h ============================================================================== --- head/contrib/llvm/include/llvm/ADT/BitVector.h Sun Feb 20 17:54:49 2011 (r218892) +++ head/contrib/llvm/include/llvm/ADT/BitVector.h Sun Feb 20 19:33:47 2011 (r218893) @@ -18,6 +18,7 @@ #include #include #include +#include #include namespace llvm { @@ -77,7 +78,7 @@ public: /// bits are initialized to the specified value. explicit BitVector(unsigned s, bool t = false) : Size(s) { Capacity = NumBitWords(s); - Bits = new BitWord[Capacity]; + Bits = (BitWord *)std::malloc(Capacity * sizeof(BitWord)); init_words(Bits, Capacity, t); if (t) clear_unused_bits(); @@ -92,12 +93,12 @@ public: } Capacity = NumBitWords(RHS.size()); - Bits = new BitWord[Capacity]; - std::copy(RHS.Bits, &RHS.Bits[Capacity], Bits); + Bits = (BitWord *)std::malloc(Capacity * sizeof(BitWord)); + std::memcpy(Bits, RHS.Bits, Capacity * sizeof(BitWord)); } ~BitVector() { - delete[] Bits; + std::free(Bits); } /// empty - Tests whether there are no bits in this bitvector. @@ -127,6 +128,12 @@ public: return false; } + /// all - Returns true if all bits are set. + bool all() const { + // TODO: Optimize this. + return count() == size(); + } + /// none - Returns true if none of the bits are set. bool none() const { return !any(); @@ -335,18 +342,18 @@ public: unsigned RHSWords = NumBitWords(Size); if (Size <= Capacity * BITWORD_SIZE) { if (Size) - std::copy(RHS.Bits, &RHS.Bits[RHSWords], Bits); + std::memcpy(Bits, RHS.Bits, RHSWords * sizeof(BitWord)); clear_unused_bits(); return *this; } // Grow the bitvector to have enough elements. Capacity = RHSWords; - BitWord *NewBits = new BitWord[Capacity]; - std::copy(RHS.Bits, &RHS.Bits[RHSWords], NewBits); + BitWord *NewBits = (BitWord *)std::malloc(Capacity * sizeof(BitWord)); + std::memcpy(NewBits, RHS.Bits, Capacity * sizeof(BitWord)); // Destroy the old bits. - delete[] Bits; + std::free(Bits); Bits = NewBits; return *this; @@ -384,17 +391,8 @@ private: } void grow(unsigned NewSize) { - unsigned OldCapacity = Capacity; - Capacity = NumBitWords(NewSize); - BitWord *NewBits = new BitWord[Capacity]; - - // Copy the old bits over. - if (OldCapacity != 0) - std::copy(Bits, &Bits[OldCapacity], NewBits); - - // Destroy the old bits. - delete[] Bits; - Bits = NewBits; + Capacity = std::max(NumBitWords(NewSize), Capacity * 2); + Bits = (BitWord *)std::realloc(Bits, Capacity * sizeof(BitWord)); clear_unused_bits(); } Modified: head/contrib/llvm/include/llvm/ADT/DenseMap.h ============================================================================== --- head/contrib/llvm/include/llvm/ADT/DenseMap.h Sun Feb 20 17:54:49 2011 (r218892) +++ head/contrib/llvm/include/llvm/ADT/DenseMap.h Sun Feb 20 19:33:47 2011 (r218893) @@ -18,6 +18,7 @@ #include "llvm/Support/PointerLikeTypeTraits.h" #include "llvm/Support/type_traits.h" #include "llvm/ADT/DenseMapInfo.h" +#include #include #include #include @@ -385,7 +386,7 @@ private: // Insert the key/value into the new table. BucketT *DestBucket; bool FoundVal = LookupBucketFor(B->first, DestBucket); - FoundVal = FoundVal; // silence warning. + (void)FoundVal; // silence warning. assert(!FoundVal && "Key already in new map?"); DestBucket->first = B->first; new (&DestBucket->second) ValueT(B->second); Modified: head/contrib/llvm/include/llvm/ADT/DenseMapInfo.h ============================================================================== --- head/contrib/llvm/include/llvm/ADT/DenseMapInfo.h Sun Feb 20 17:54:49 2011 (r218892) +++ head/contrib/llvm/include/llvm/ADT/DenseMapInfo.h Sun Feb 20 19:33:47 2011 (r218893) @@ -102,6 +102,20 @@ template<> struct DenseMapInfo { } }; +// Provide DenseMapInfo for longs. +template<> struct DenseMapInfo { + static inline long getEmptyKey() { + return (1UL << (sizeof(long) * 8 - 1)) - 1L; + } + static inline long getTombstoneKey() { return getEmptyKey() - 1L; } + static unsigned getHashValue(const long& Val) { + return (unsigned)(Val * 37L); + } + static bool isEqual(const long& LHS, const long& RHS) { + return LHS == RHS; + } +}; + // Provide DenseMapInfo for long longs. template<> struct DenseMapInfo { static inline long long getEmptyKey() { return 0x7fffffffffffffffLL; } Modified: head/contrib/llvm/include/llvm/ADT/DenseSet.h ============================================================================== --- head/contrib/llvm/include/llvm/ADT/DenseSet.h Sun Feb 20 17:54:49 2011 (r218892) +++ head/contrib/llvm/include/llvm/ADT/DenseSet.h Sun Feb 20 19:33:47 2011 (r218893) @@ -33,6 +33,9 @@ public: bool empty() const { return TheMap.empty(); } unsigned size() const { return TheMap.size(); } + /// Grow the denseset so that it has at least Size buckets. Does not shrink + void resize(size_t Size) { TheMap.resize(Size); } + void clear() { TheMap.clear(); } Modified: head/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h ============================================================================== --- head/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h Sun Feb 20 17:54:49 2011 (r218892) +++ head/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h Sun Feb 20 19:33:47 2011 (r218893) @@ -15,7 +15,7 @@ #ifndef LLVM_ADT_EQUIVALENCECLASSES_H #define LLVM_ADT_EQUIVALENCECLASSES_H -#include "llvm/System/DataTypes.h" +#include "llvm/Support/DataTypes.h" #include #include Modified: head/contrib/llvm/include/llvm/ADT/FoldingSet.h ============================================================================== --- head/contrib/llvm/include/llvm/ADT/FoldingSet.h Sun Feb 20 17:54:49 2011 (r218892) +++ head/contrib/llvm/include/llvm/ADT/FoldingSet.h Sun Feb 20 19:33:47 2011 (r218893) @@ -16,7 +16,7 @@ #ifndef LLVM_ADT_FOLDINGSET_H #define LLVM_ADT_FOLDINGSET_H -#include "llvm/System/DataTypes.h" +#include "llvm/Support/DataTypes.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" Modified: head/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h ============================================================================== --- head/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h Sun Feb 20 17:54:49 2011 (r218892) +++ head/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h Sun Feb 20 19:33:47 2011 (r218893) @@ -94,7 +94,7 @@ public: : ImutAVLFactory(Alloc) {} TreeTy *Add(TreeTy *T, value_type_ref V) { - T = Add_internal(V,T); + T = add_internal(V,T); this->MarkImmutable(T); return T; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 20:18:28 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EDD091065679 for ; Sun, 20 Feb 2011 20:18:28 +0000 (UTC) (envelope-from dougb@dougbarton.us) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id 1AFF88FC13 for ; Sun, 20 Feb 2011 20:18:27 +0000 (UTC) Received: (qmail 14006 invoked by uid 399); 20 Feb 2011 20:18:27 -0000 Received: from router.ka9q.net (HELO ?192.168.2.9?) (dougb@dougbarton.us@75.60.237.91) by mail2.fluidhosting.com with ESMTPAM; 20 Feb 2011 20:18:27 -0000 X-Originating-IP: 75.60.237.91 X-Sender: dougb@dougbarton.us Message-ID: <4D617713.1010705@dougbarton.us> Date: Sun, 20 Feb 2011 12:18:27 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.13) Gecko/20101207 Thunderbird/3.1.7 MIME-Version: 1.0 To: "Philip M. Gollucci" References: <201102162123.p1GLN9f9084297@svn.freebsd.org> <4D6065B4.7040709@p6m7g8.com> <4D606FEB.6070806@dougbarton.us> <4D61461E.3000406@p6m7g8.com> In-Reply-To: <4D61461E.3000406@p6m7g8.com> X-Enigmail-Version: 1.1.1 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218753 - head/etc/namedb X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 20:18:29 -0000 On 2/20/2011 8:49 AM, Philip M. Gollucci wrote: > On 2/19/2011 8:35 PM, Doug Barton wrote: >> On 02/19/2011 16:52, Philip M. Gollucci wrote: >>> On 2/16/2011 4:23 PM, Doug Barton wrote: >>>> Author: dougb >>>> Date: Wed Feb 16 21:23:09 2011 >>>> New Revision: 218753 >>>> URL: http://svn.freebsd.org/changeset/base/218753 >>>> >>>> Log: >>>> Remove in-addr.arpa from the list of zones it is possible to slave >>>> locally >>> This is b/c of the recent change to fix the list of root servers that >>> serve this right ? >> >> Not precisely. in-addr.arpa has moved to its own set of servers operated >> jointly by the RIRs and ICANN. At some point in the near future this >> zone will no longer be available directly from the root servers at all. > > We said the same thing, just I said it badly. Sorry to be pedantic, but it's for a (hopefully) good reason. People often refer to any servers high up in the tree as "the root servers for ..." There is actually only one set of root servers, the ones that serve the actual root zone. For hysterical raisins these servers also served ARPA, and IN-ADDR.ARPA. A little bit better job was done with IP6.ARPA to start with so it was the first to move from one set of servers managed by the RIRs and ICANN to a different set that are similarly named in order to take advantage of name compression in the DNS packet. IN-ADDR.ARPA is the next to move both for compression purposes, and to get the zone off the roots. So, not to pick on you here, my purpose is simply to clarify that they did not change "the list of root servers," they actually changed the delegation of IN-ADDR.ARPA to its own set of name servers. I should probably add that while it's technically possible, it's highly unlikely that ARPA itself will move off the roots. The zone is very small, and very static; and that is incredibly unlikely to change any time in the near future. The IN-ADDR and IP6.ARPA zones on the other hand are both larger, and more dynamic (although IN-ADDR is going to be changing less and less as time goes on). hth, Doug -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 21:32:18 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E39041065679; Sun, 20 Feb 2011 21:32:18 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from vlakno.cz (lev.vlakno.cz [77.93.215.190]) by mx1.freebsd.org (Postfix) with ESMTP id 36BB38FC12; Sun, 20 Feb 2011 21:32:14 +0000 (UTC) Received: from lev.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 2C49A9CB0DE; Sun, 20 Feb 2011 22:32:13 +0100 (CET) X-Virus-Scanned: amavisd-new at vlakno.cz Received: from vlakno.cz ([127.0.0.1]) by lev.vlakno.cz (lev.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z3ExIvCwCkaH; Sun, 20 Feb 2011 22:31:47 +0100 (CET) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id DF8A79CB4FF; Sun, 20 Feb 2011 22:31:47 +0100 (CET) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.14.4/8.14.4/Submit) id p1KLVlYN022714; Sun, 20 Feb 2011 22:31:47 +0100 (CET) (envelope-from rdivacky) Date: Sun, 20 Feb 2011 22:31:47 +0100 From: Roman Divacky To: Dimitry Andric Message-ID: <20110220213147.GA22080@freebsd.org> References: <201102201933.p1KJXm1N042245@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201102201933.p1KJXm1N042245@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r218893 - in head: . contrib/llvm/include/llvm contrib/llvm/include/llvm-c contrib/llvm/include/llvm-c/Transforms contrib/llvm/include/llvm/ADT contrib/llvm/include/llvm/Analysis contri... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 21:32:19 -0000 with this update gnu as is no longer used when compiling stuff on i386 and amd64. if you encounter problems try to add "-no-integrated-as" to the command line and if that fixes the problem please report that to me or dim@. the integrated assembler is considered production ready and generally supports everything gnu as does, there are a few exceptions though. most notably, .code16 support. There are a few files in freebsd that cant be compiled with the integrated assembler because of this but everything else should just work. enjoy using it :) On Sun, Feb 20, 2011 at 07:33:48PM +0000, Dimitry Andric wrote: > Author: dim > Date: Sun Feb 20 19:33:47 2011 > New Revision: 218893 > URL: http://svn.freebsd.org/changeset/base/218893 > > Log: > Upgrade our copy of llvm/clang to r126079, from upstream's trunk. > > This contains many improvements, primarily better C++ support, an > integrated assembler for x86 and support for -pg. > > Added: > head/contrib/llvm/include/llvm-c/Initialization.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm-c/Initialization.h > head/contrib/llvm/include/llvm/ADT/ArrayRef.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/ADT/ArrayRef.h > head/contrib/llvm/include/llvm/ADT/InMemoryStruct.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/ADT/InMemoryStruct.h > head/contrib/llvm/include/llvm/ADT/IntEqClasses.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/ADT/IntEqClasses.h > head/contrib/llvm/include/llvm/ADT/IntervalMap.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/ADT/IntervalMap.h > head/contrib/llvm/include/llvm/Analysis/DIBuilder.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Analysis/DIBuilder.h > head/contrib/llvm/include/llvm/Analysis/DominanceFrontier.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Analysis/DominanceFrontier.h > head/contrib/llvm/include/llvm/Analysis/PathNumbering.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Analysis/PathNumbering.h > head/contrib/llvm/include/llvm/Analysis/PathProfileInfo.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Analysis/PathProfileInfo.h > head/contrib/llvm/include/llvm/Analysis/RegionPass.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Analysis/RegionPass.h > head/contrib/llvm/include/llvm/CodeGen/EdgeBundles.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/CodeGen/EdgeBundles.h > head/contrib/llvm/include/llvm/CodeGen/MachineLoopRanges.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/CodeGen/MachineLoopRanges.h > head/contrib/llvm/include/llvm/CodeGen/PBQP/ > - copied from r218888, vendor/llvm/dist/include/llvm/CodeGen/PBQP/ > head/contrib/llvm/include/llvm/CodeGen/RegAllocPBQP.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/CodeGen/RegAllocPBQP.h > head/contrib/llvm/include/llvm/CodeGen/ScoreboardHazardRecognizer.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/CodeGen/ScoreboardHazardRecognizer.h > head/contrib/llvm/include/llvm/ExecutionEngine/MCJIT.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/ExecutionEngine/MCJIT.h > head/contrib/llvm/include/llvm/InitializePasses.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/InitializePasses.h > head/contrib/llvm/include/llvm/MC/MCELFObjectWriter.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/MC/MCELFObjectWriter.h > head/contrib/llvm/include/llvm/MC/MCFixupKindInfo.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/MC/MCFixupKindInfo.h > head/contrib/llvm/include/llvm/MC/MCMachObjectWriter.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/MC/MCMachObjectWriter.h > head/contrib/llvm/include/llvm/Object/ > - copied from r218888, vendor/llvm/dist/include/llvm/Object/ > head/contrib/llvm/include/llvm/Support/AIXDataTypesFix.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/AIXDataTypesFix.h > head/contrib/llvm/include/llvm/Support/Atomic.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Atomic.h > head/contrib/llvm/include/llvm/Support/DataTypes.h.in > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/DataTypes.h.in > head/contrib/llvm/include/llvm/Support/Disassembler.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Disassembler.h > head/contrib/llvm/include/llvm/Support/DynamicLibrary.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/DynamicLibrary.h > head/contrib/llvm/include/llvm/Support/Endian.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Endian.h > head/contrib/llvm/include/llvm/Support/Errno.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Errno.h > head/contrib/llvm/include/llvm/Support/FEnv.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/FEnv.h > head/contrib/llvm/include/llvm/Support/FileSystem.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/FileSystem.h > head/contrib/llvm/include/llvm/Support/Host.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Host.h > head/contrib/llvm/include/llvm/Support/IncludeFile.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/IncludeFile.h > head/contrib/llvm/include/llvm/Support/Memory.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Memory.h > head/contrib/llvm/include/llvm/Support/Mutex.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Mutex.h > head/contrib/llvm/include/llvm/Support/Path.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Path.h > head/contrib/llvm/include/llvm/Support/PathV1.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/PathV1.h > head/contrib/llvm/include/llvm/Support/PathV2.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/PathV2.h > head/contrib/llvm/include/llvm/Support/Process.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Process.h > head/contrib/llvm/include/llvm/Support/Program.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Program.h > head/contrib/llvm/include/llvm/Support/RWMutex.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/RWMutex.h > head/contrib/llvm/include/llvm/Support/Signals.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Signals.h > head/contrib/llvm/include/llvm/Support/Solaris.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Solaris.h > head/contrib/llvm/include/llvm/Support/SwapByteOrder.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/SwapByteOrder.h > head/contrib/llvm/include/llvm/Support/ThreadLocal.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/ThreadLocal.h > head/contrib/llvm/include/llvm/Support/Threading.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Threading.h > head/contrib/llvm/include/llvm/Support/TimeValue.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/TimeValue.h > head/contrib/llvm/include/llvm/Support/ToolOutputFile.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/ToolOutputFile.h > head/contrib/llvm/include/llvm/Support/Valgrind.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/Valgrind.h > head/contrib/llvm/include/llvm/Support/system_error.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Support/system_error.h > head/contrib/llvm/include/llvm/Target/TargetAsmInfo.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Target/TargetAsmInfo.h > head/contrib/llvm/include/llvm/Target/TargetFrameLowering.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Target/TargetFrameLowering.h > head/contrib/llvm/include/llvm/Target/TargetLibraryInfo.h > - copied unchanged from r218888, vendor/llvm/dist/include/llvm/Target/TargetLibraryInfo.h > head/contrib/llvm/lib/Analysis/DIBuilder.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/DIBuilder.cpp > head/contrib/llvm/lib/Analysis/DominanceFrontier.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/DominanceFrontier.cpp > head/contrib/llvm/lib/Analysis/IPA/IPA.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/IPA/IPA.cpp > head/contrib/llvm/lib/Analysis/MemDepPrinter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/MemDepPrinter.cpp > head/contrib/llvm/lib/Analysis/NoAliasAnalysis.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/NoAliasAnalysis.cpp > head/contrib/llvm/lib/Analysis/PathNumbering.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/PathNumbering.cpp > head/contrib/llvm/lib/Analysis/PathProfileInfo.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/PathProfileInfo.cpp > head/contrib/llvm/lib/Analysis/PathProfileVerifier.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/PathProfileVerifier.cpp > head/contrib/llvm/lib/Analysis/RegionPass.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Analysis/RegionPass.cpp > head/contrib/llvm/lib/CodeGen/AllocationOrder.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/AllocationOrder.cpp > head/contrib/llvm/lib/CodeGen/AllocationOrder.h > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/AllocationOrder.h > head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp > head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfTableException.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/AsmPrinter/DwarfTableException.cpp > head/contrib/llvm/lib/CodeGen/CodeGen.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/CodeGen.cpp > head/contrib/llvm/lib/CodeGen/EdgeBundles.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/EdgeBundles.cpp > head/contrib/llvm/lib/CodeGen/ExpandISelPseudos.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/ExpandISelPseudos.cpp > head/contrib/llvm/lib/CodeGen/LiveDebugVariables.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/LiveDebugVariables.cpp > head/contrib/llvm/lib/CodeGen/LiveDebugVariables.h > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/LiveDebugVariables.h > head/contrib/llvm/lib/CodeGen/LiveIntervalUnion.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/LiveIntervalUnion.cpp > head/contrib/llvm/lib/CodeGen/LiveIntervalUnion.h > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/LiveIntervalUnion.h > head/contrib/llvm/lib/CodeGen/LiveRangeEdit.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/LiveRangeEdit.cpp > head/contrib/llvm/lib/CodeGen/LiveRangeEdit.h > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/LiveRangeEdit.h > head/contrib/llvm/lib/CodeGen/MachineLoopRanges.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/MachineLoopRanges.cpp > head/contrib/llvm/lib/CodeGen/PHIEliminationUtils.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/PHIEliminationUtils.cpp > head/contrib/llvm/lib/CodeGen/PHIEliminationUtils.h > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/PHIEliminationUtils.h > head/contrib/llvm/lib/CodeGen/RegAllocBase.h > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/RegAllocBase.h > head/contrib/llvm/lib/CodeGen/RegAllocBasic.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/RegAllocBasic.cpp > head/contrib/llvm/lib/CodeGen/RegAllocGreedy.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/RegAllocGreedy.cpp > head/contrib/llvm/lib/CodeGen/ScoreboardHazardRecognizer.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/ScoreboardHazardRecognizer.cpp > head/contrib/llvm/lib/CodeGen/SpillPlacement.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/SpillPlacement.cpp > head/contrib/llvm/lib/CodeGen/SpillPlacement.h > - copied unchanged from r218888, vendor/llvm/dist/lib/CodeGen/SpillPlacement.h > head/contrib/llvm/lib/ExecutionEngine/MCJIT/ > - copied from r218888, vendor/llvm/dist/lib/ExecutionEngine/MCJIT/ > head/contrib/llvm/lib/MC/MCELFObjectTargetWriter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/MC/MCELFObjectTargetWriter.cpp > head/contrib/llvm/lib/MC/MCMachObjectTargetWriter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/MC/MCMachObjectTargetWriter.cpp > head/contrib/llvm/lib/MC/MCParser/COFFAsmParser.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/MC/MCParser/COFFAsmParser.cpp > head/contrib/llvm/lib/MC/MCPureStreamer.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/MC/MCPureStreamer.cpp > head/contrib/llvm/lib/Object/ > - copied from r218888, vendor/llvm/dist/lib/Object/ > head/contrib/llvm/lib/Support/Atomic.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Atomic.cpp > head/contrib/llvm/lib/Support/Disassembler.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Disassembler.cpp > head/contrib/llvm/lib/Support/DynamicLibrary.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/DynamicLibrary.cpp > head/contrib/llvm/lib/Support/Errno.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Errno.cpp > head/contrib/llvm/lib/Support/Host.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Host.cpp > head/contrib/llvm/lib/Support/IncludeFile.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/IncludeFile.cpp > head/contrib/llvm/lib/Support/IntEqClasses.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/IntEqClasses.cpp > head/contrib/llvm/lib/Support/IntervalMap.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/IntervalMap.cpp > head/contrib/llvm/lib/Support/Memory.cpp > - copied, changed from r218888, vendor/llvm/dist/lib/Support/Memory.cpp > head/contrib/llvm/lib/Support/Mutex.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Mutex.cpp > head/contrib/llvm/lib/Support/Path.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Path.cpp > head/contrib/llvm/lib/Support/PathV2.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/PathV2.cpp > head/contrib/llvm/lib/Support/Process.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Process.cpp > head/contrib/llvm/lib/Support/Program.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Program.cpp > head/contrib/llvm/lib/Support/RWMutex.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/RWMutex.cpp > head/contrib/llvm/lib/Support/SearchForAddressOfSpecialSymbol.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/SearchForAddressOfSpecialSymbol.cpp > head/contrib/llvm/lib/Support/Signals.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Signals.cpp > head/contrib/llvm/lib/Support/ThreadLocal.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/ThreadLocal.cpp > head/contrib/llvm/lib/Support/Threading.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Threading.cpp > head/contrib/llvm/lib/Support/TimeValue.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/TimeValue.cpp > head/contrib/llvm/lib/Support/ToolOutputFile.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/ToolOutputFile.cpp > head/contrib/llvm/lib/Support/Unix/ > - copied from r218888, vendor/llvm/dist/lib/Support/Unix/ > head/contrib/llvm/lib/Support/Valgrind.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/Valgrind.cpp > head/contrib/llvm/lib/Support/Windows/ > - copied from r218888, vendor/llvm/dist/lib/Support/Windows/ > head/contrib/llvm/lib/Support/system_error.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Support/system_error.cpp > head/contrib/llvm/lib/Target/ARM/ARMAsmBackend.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMAsmBackend.cpp > head/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMAsmPrinter.h > head/contrib/llvm/lib/Target/ARM/ARMBaseInfo.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMBaseInfo.h > head/contrib/llvm/lib/Target/ARM/ARMCallingConv.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMCallingConv.h > head/contrib/llvm/lib/Target/ARM/ARMELFWriterInfo.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMELFWriterInfo.cpp > head/contrib/llvm/lib/Target/ARM/ARMELFWriterInfo.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMELFWriterInfo.h > head/contrib/llvm/lib/Target/ARM/ARMFixupKinds.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMFixupKinds.h > head/contrib/llvm/lib/Target/ARM/ARMFrameLowering.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMFrameLowering.cpp > head/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMFrameLowering.h > head/contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMHazardRecognizer.cpp > head/contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMHazardRecognizer.h > head/contrib/llvm/lib/Target/ARM/ARMMCCodeEmitter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMMCCodeEmitter.cpp > head/contrib/llvm/lib/Target/ARM/ARMMCExpr.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMMCExpr.cpp > head/contrib/llvm/lib/Target/ARM/ARMMCExpr.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/ARMMCExpr.h > head/contrib/llvm/lib/Target/ARM/InstPrinter/ > - copied from r218888, vendor/llvm/dist/lib/Target/ARM/InstPrinter/ > head/contrib/llvm/lib/Target/ARM/MLxExpansionPass.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/MLxExpansionPass.cpp > head/contrib/llvm/lib/Target/ARM/Thumb1FrameLowering.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/Thumb1FrameLowering.cpp > head/contrib/llvm/lib/Target/ARM/Thumb1FrameLowering.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/ARM/Thumb1FrameLowering.h > head/contrib/llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Alpha/AlphaAsmPrinter.cpp > head/contrib/llvm/lib/Target/Alpha/AlphaFrameLowering.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Alpha/AlphaFrameLowering.cpp > head/contrib/llvm/lib/Target/Alpha/AlphaFrameLowering.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Alpha/AlphaFrameLowering.h > head/contrib/llvm/lib/Target/Blackfin/BlackfinAsmPrinter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Blackfin/BlackfinAsmPrinter.cpp > head/contrib/llvm/lib/Target/Blackfin/BlackfinFrameLowering.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Blackfin/BlackfinFrameLowering.cpp > head/contrib/llvm/lib/Target/Blackfin/BlackfinFrameLowering.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Blackfin/BlackfinFrameLowering.h > head/contrib/llvm/lib/Target/CellSPU/SPUAsmPrinter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/CellSPU/SPUAsmPrinter.cpp > head/contrib/llvm/lib/Target/CellSPU/SPUFrameLowering.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/CellSPU/SPUFrameLowering.cpp > head/contrib/llvm/lib/Target/CellSPU/SPUFrameLowering.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/CellSPU/SPUFrameLowering.h > head/contrib/llvm/lib/Target/CellSPU/SPUNopFiller.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/CellSPU/SPUNopFiller.cpp > head/contrib/llvm/lib/Target/MBlaze/AsmParser/ > - copied from r218888, vendor/llvm/dist/lib/Target/MBlaze/AsmParser/ > head/contrib/llvm/lib/Target/MBlaze/Disassembler/ > - copied from r218888, vendor/llvm/dist/lib/Target/MBlaze/Disassembler/ > head/contrib/llvm/lib/Target/MBlaze/InstPrinter/ > - copied from r218888, vendor/llvm/dist/lib/Target/MBlaze/InstPrinter/ > head/contrib/llvm/lib/Target/MBlaze/MBlazeAsmBackend.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeAsmBackend.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlazeAsmPrinter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeAsmPrinter.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlazeELFWriterInfo.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeELFWriterInfo.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlazeELFWriterInfo.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeELFWriterInfo.h > head/contrib/llvm/lib/Target/MBlaze/MBlazeFrameLowering.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeFrameLowering.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlazeFrameLowering.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeFrameLowering.h > head/contrib/llvm/lib/Target/MBlaze/MBlazeMCCodeEmitter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeMCCodeEmitter.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlazeMCInstLower.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeMCInstLower.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlazeMCInstLower.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeMCInstLower.h > head/contrib/llvm/lib/Target/MBlaze/MBlazeRelocations.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MBlaze/MBlazeRelocations.h > head/contrib/llvm/lib/Target/MSP430/InstPrinter/ > - copied from r218888, vendor/llvm/dist/lib/Target/MSP430/InstPrinter/ > head/contrib/llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MSP430/MSP430AsmPrinter.cpp > head/contrib/llvm/lib/Target/MSP430/MSP430FrameLowering.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MSP430/MSP430FrameLowering.cpp > head/contrib/llvm/lib/Target/MSP430/MSP430FrameLowering.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MSP430/MSP430FrameLowering.h > head/contrib/llvm/lib/Target/MSP430/MSP430MCInstLower.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MSP430/MSP430MCInstLower.cpp > head/contrib/llvm/lib/Target/MSP430/MSP430MCInstLower.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/MSP430/MSP430MCInstLower.h > head/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Mips/MipsAsmPrinter.cpp > head/contrib/llvm/lib/Target/Mips/MipsFrameLowering.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Mips/MipsFrameLowering.cpp > head/contrib/llvm/lib/Target/Mips/MipsFrameLowering.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Mips/MipsFrameLowering.h > head/contrib/llvm/lib/Target/PTX/ > - copied from r218888, vendor/llvm/dist/lib/Target/PTX/ > head/contrib/llvm/lib/Target/PowerPC/InstPrinter/ > - copied from r218888, vendor/llvm/dist/lib/Target/PowerPC/InstPrinter/ > head/contrib/llvm/lib/Target/PowerPC/PPCAsmBackend.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/PowerPC/PPCAsmBackend.cpp > head/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/PowerPC/PPCAsmPrinter.cpp > head/contrib/llvm/lib/Target/PowerPC/PPCFixupKinds.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/PowerPC/PPCFixupKinds.h > head/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/PowerPC/PPCFrameLowering.cpp > head/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/PowerPC/PPCFrameLowering.h > head/contrib/llvm/lib/Target/PowerPC/PPCMCCodeEmitter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/PowerPC/PPCMCCodeEmitter.cpp > head/contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/PowerPC/PPCMCInstLower.cpp > head/contrib/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Sparc/SparcAsmPrinter.cpp > head/contrib/llvm/lib/Target/Sparc/SparcFrameLowering.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Sparc/SparcFrameLowering.cpp > head/contrib/llvm/lib/Target/Sparc/SparcFrameLowering.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/Sparc/SparcFrameLowering.h > head/contrib/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/SystemZ/SystemZAsmPrinter.cpp > head/contrib/llvm/lib/Target/SystemZ/SystemZFrameLowering.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/SystemZ/SystemZFrameLowering.cpp > head/contrib/llvm/lib/Target/SystemZ/SystemZFrameLowering.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/SystemZ/SystemZFrameLowering.h > head/contrib/llvm/lib/Target/TargetAsmInfo.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/TargetAsmInfo.cpp > head/contrib/llvm/lib/Target/TargetFrameLowering.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/TargetFrameLowering.cpp > head/contrib/llvm/lib/Target/TargetLibraryInfo.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/TargetLibraryInfo.cpp > head/contrib/llvm/lib/Target/X86/InstPrinter/ > - copied from r218888, vendor/llvm/dist/lib/Target/X86/InstPrinter/ > head/contrib/llvm/lib/Target/X86/Utils/ > - copied from r218888, vendor/llvm/dist/lib/Target/X86/Utils/ > head/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86FrameLowering.cpp > head/contrib/llvm/lib/Target/X86/X86FrameLowering.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86FrameLowering.h > head/contrib/llvm/lib/Target/X86/X86Instr3DNow.td > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86Instr3DNow.td > head/contrib/llvm/lib/Target/X86/X86InstrArithmetic.td > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrArithmetic.td > head/contrib/llvm/lib/Target/X86/X86InstrCMovSetCC.td > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrCMovSetCC.td > head/contrib/llvm/lib/Target/X86/X86InstrCompiler.td > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrCompiler.td > head/contrib/llvm/lib/Target/X86/X86InstrControl.td > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrControl.td > head/contrib/llvm/lib/Target/X86/X86InstrExtension.td > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrExtension.td > head/contrib/llvm/lib/Target/X86/X86InstrShiftRotate.td > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrShiftRotate.td > head/contrib/llvm/lib/Target/X86/X86InstrSystem.td > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrSystem.td > head/contrib/llvm/lib/Target/X86/X86InstrVMX.td > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86InstrVMX.td > head/contrib/llvm/lib/Target/X86/X86MachObjectWriter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/X86/X86MachObjectWriter.cpp > head/contrib/llvm/lib/Target/XCore/XCoreAsmPrinter.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/XCore/XCoreAsmPrinter.cpp > head/contrib/llvm/lib/Target/XCore/XCoreFrameLowering.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/XCore/XCoreFrameLowering.cpp > head/contrib/llvm/lib/Target/XCore/XCoreFrameLowering.h > - copied unchanged from r218888, vendor/llvm/dist/lib/Target/XCore/XCoreFrameLowering.h > head/contrib/llvm/lib/Transforms/Instrumentation/Instrumentation.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Transforms/Instrumentation/Instrumentation.cpp > head/contrib/llvm/lib/Transforms/Instrumentation/PathProfiling.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Transforms/Instrumentation/PathProfiling.cpp > head/contrib/llvm/lib/Transforms/Scalar/EarlyCSE.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Transforms/Scalar/EarlyCSE.cpp > head/contrib/llvm/lib/Transforms/Scalar/LoopIdiomRecognize.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Transforms/Scalar/LoopIdiomRecognize.cpp > head/contrib/llvm/lib/Transforms/Scalar/LoopInstSimplify.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Transforms/Scalar/LoopInstSimplify.cpp > head/contrib/llvm/lib/Transforms/Utils/SimplifyInstructions.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Transforms/Utils/SimplifyInstructions.cpp > head/contrib/llvm/lib/Transforms/Utils/Utils.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/Transforms/Utils/Utils.cpp > head/contrib/llvm/lib/VMCore/User.cpp > - copied unchanged from r218888, vendor/llvm/dist/lib/VMCore/User.cpp > head/contrib/llvm/tools/clang/include/clang/AST/ASTMutationListener.h > - copied unchanged from r218888, vendor/clang/dist/include/clang/AST/ASTMutationListener.h > head/contrib/llvm/tools/clang/include/clang/AST/EvaluatedExprVisitor.h > - copied unchanged from r218888, vendor/clang/dist/include/clang/AST/EvaluatedExprVisitor.h > head/contrib/llvm/tools/clang/include/clang/AST/Mangle.h > - copied unchanged from r218888, vendor/clang/dist/include/clang/AST/Mangle.h > head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/UninitializedValuesV2.h > - copied unchanged from r218888, vendor/clang/dist/include/clang/Analysis/Analyses/UninitializedValuesV2.h > head/contrib/llvm/tools/clang/include/clang/Analysis/DomainSpecific/ > - copied from r218888, vendor/clang/dist/include/clang/Analysis/DomainSpecific/ > head/contrib/llvm/tools/clang/include/clang/Basic/ABI.h > - copied unchanged from r218888, vendor/clang/dist/include/clang/Basic/ABI.h > head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticIDs.h > - copied unchanged from r218888, vendor/clang/dist/include/clang/Basic/DiagnosticIDs.h > head/contrib/llvm/tools/clang/include/clang/Basic/FileSystemOptions.h > - copied unchanged from r218888, vendor/clang/dist/include/clang/Basic/FileSystemOptions.h > head/contrib/llvm/tools/clang/include/clang/Basic/FileSystemStatCache.h > - copied unchanged from r218888, vendor/clang/dist/include/clang/Basic/FileSystemStatCache.h > head/contrib/llvm/tools/clang/include/clang/Basic/OpenCLExtensions.def > - copied unchanged from r218888, vendor/clang/dist/include/clang/Basic/OpenCLExtensions.def > head/contrib/llvm/tools/clang/include/clang/Basic/Visibility.h > - copied unchanged from r218888, vendor/clang/dist/include/clang/Basic/Visibility.h > head/contrib/llvm/tools/clang/include/clang/Config/ > - copied from r218888, vendor/clang/dist/include/clang/Config/ > head/contrib/llvm/tools/clang/include/clang/Frontend/MultiplexConsumer.h > - copied unchanged from r218888, vendor/clang/dist/include/clang/Frontend/MultiplexConsumer.h > head/contrib/llvm/tools/clang/include/clang/Serialization/ASTSerializationListener.h > - copied unchanged from r218888, vendor/clang/dist/include/clang/Serialization/ASTSerializationListener.h > head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/ > - copied from r218888, vendor/clang/dist/include/clang/StaticAnalyzer/ > head/contrib/llvm/tools/clang/lib/AST/DumpXML.cpp > - copied unchanged from r218888, vendor/clang/dist/lib/AST/DumpXML.cpp > head/contrib/llvm/tools/clang/lib/AST/ItaniumMangle.cpp > - copied unchanged from r218888, vendor/clang/dist/lib/AST/ItaniumMangle.cpp > head/contrib/llvm/tools/clang/lib/AST/Mangle.cpp > - copied unchanged from r218888, vendor/clang/dist/lib/AST/Mangle.cpp > head/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp > - copied unchanged from r218888, vendor/clang/dist/lib/AST/MicrosoftMangle.cpp > head/contrib/llvm/tools/clang/lib/Analysis/CocoaConventions.cpp > - copied unchanged from r218888, vendor/clang/dist/lib/Analysis/CocoaConventions.cpp > head/contrib/llvm/tools/clang/lib/Analysis/UninitializedValuesV2.cpp > - copied unchanged from r218888, vendor/clang/dist/lib/Analysis/UninitializedValuesV2.cpp > head/contrib/llvm/tools/clang/lib/Basic/DiagnosticIDs.cpp > - copied unchanged from r218888, vendor/clang/dist/lib/Basic/DiagnosticIDs.cpp > head/contrib/llvm/tools/clang/lib/Basic/FileSystemStatCache.cpp > - copied unchanged from r218888, vendor/clang/dist/lib/Basic/FileSystemStatCache.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.cpp > - copied unchanged from r218888, vendor/clang/dist/lib/CodeGen/CGCXXABI.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGCleanup.cpp > - copied unchanged from r218888, vendor/clang/dist/lib/CodeGen/CGCleanup.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGCleanup.h > - copied unchanged from r218888, vendor/clang/dist/lib/CodeGen/CGCleanup.h > head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.cpp > - copied unchanged from r218888, vendor/clang/dist/lib/CodeGen/CodeGenTBAA.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.h > - copied unchanged from r218888, vendor/clang/dist/lib/CodeGen/CodeGenTBAA.h > head/contrib/llvm/tools/clang/lib/Frontend/HeaderIncludeGen.cpp > - copied unchanged from r218888, vendor/clang/dist/lib/Frontend/HeaderIncludeGen.cpp > head/contrib/llvm/tools/clang/lib/Frontend/MultiplexConsumer.cpp > - copied unchanged from r218888, vendor/clang/dist/lib/Frontend/MultiplexConsumer.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateVariadic.cpp > - copied unchanged from r218888, vendor/clang/dist/lib/Sema/SemaTemplateVariadic.cpp > head/contrib/llvm/tools/clang/lib/Sema/TypeLocBuilder.h > - copied unchanged from r218888, vendor/clang/dist/lib/Sema/TypeLocBuilder.h > head/contrib/llvm/tools/clang/lib/StaticAnalyzer/ > - copied from r218888, vendor/clang/dist/lib/StaticAnalyzer/ > head/contrib/llvm/utils/TableGen/ClangSACheckersEmitter.cpp > - copied unchanged from r218888, vendor/llvm/dist/utils/TableGen/ClangSACheckersEmitter.cpp > head/contrib/llvm/utils/TableGen/ClangSACheckersEmitter.h > - copied unchanged from r218888, vendor/llvm/dist/utils/TableGen/ClangSACheckersEmitter.h > head/contrib/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp > - copied unchanged from r218888, vendor/llvm/dist/utils/TableGen/FixedLenDecoderEmitter.cpp > head/contrib/llvm/utils/TableGen/FixedLenDecoderEmitter.h > - copied unchanged from r218888, vendor/llvm/dist/utils/TableGen/FixedLenDecoderEmitter.h > head/contrib/llvm/utils/TableGen/StringMatcher.cpp > - copied unchanged from r218888, vendor/llvm/dist/utils/TableGen/StringMatcher.cpp > head/contrib/llvm/utils/TableGen/StringMatcher.h > - copied unchanged from r218888, vendor/llvm/dist/utils/TableGen/StringMatcher.h > head/lib/clang/include/ARMGenDecoderTables.inc (contents, props changed) > head/lib/clang/include/ARMGenEDInfo.inc (contents, props changed) > head/lib/clang/include/ARMGenMCCodeEmitter.inc (contents, props changed) > head/lib/clang/include/Checkers.inc (contents, props changed) > head/lib/clang/include/PPCGenMCCodeEmitter.inc (contents, props changed) > head/lib/clang/include/clang/Lex/ > head/lib/clang/include/clang/Lex/AttrSpellings.inc (contents, props changed) > head/lib/clang/include/llvm/Support/ > head/lib/clang/include/llvm/Support/DataTypes.h (contents, props changed) > head/lib/clang/libclangstaticanalyzercheckers/ > head/lib/clang/libclangstaticanalyzercheckers/Makefile (contents, props changed) > head/lib/clang/libclangstaticanalyzercore/ > head/lib/clang/libclangstaticanalyzercore/Makefile (contents, props changed) > head/lib/clang/libclangstaticanalyzerfrontend/ > head/lib/clang/libclangstaticanalyzerfrontend/Makefile (contents, props changed) > head/lib/clang/libllvmarmdisassembler/ > head/lib/clang/libllvmarmdisassembler/Makefile (contents, props changed) > head/lib/clang/libllvmarminstprinter/ > head/lib/clang/libllvmarminstprinter/Makefile (contents, props changed) > head/lib/clang/libllvmpowerpcinstprinter/ > head/lib/clang/libllvmpowerpcinstprinter/Makefile (contents, props changed) > head/lib/clang/libllvmx86instprinter/ > head/lib/clang/libllvmx86instprinter/Makefile (contents, props changed) > head/lib/clang/libllvmx86utils/ > head/lib/clang/libllvmx86utils/Makefile (contents, props changed) > Deleted: > head/contrib/llvm/include/llvm/Analysis/PointerTracking.h > head/contrib/llvm/include/llvm/CodeGen/PostRAHazardRecognizer.h > head/contrib/llvm/include/llvm/MC/ELFObjectWriter.h > head/contrib/llvm/include/llvm/MC/MachObjectWriter.h > head/contrib/llvm/include/llvm/Support/DynamicLinker.h > head/contrib/llvm/include/llvm/Support/StableBasicBlockNumbering.h > head/contrib/llvm/include/llvm/System/ > head/contrib/llvm/include/llvm/Target/TargetFrameInfo.h > head/contrib/llvm/include/llvm/Transforms/RSProfiling.h > head/contrib/llvm/lib/Analysis/PointerTracking.cpp > head/contrib/llvm/lib/CodeGen/PBQP/ > head/contrib/llvm/lib/CodeGen/PHIElimination.h > head/contrib/llvm/lib/CodeGen/PostRAHazardRecognizer.cpp > head/contrib/llvm/lib/System/ > head/contrib/llvm/lib/Target/ARM/ARMFrameInfo.h > head/contrib/llvm/lib/Target/ARM/ARMMCInstLower.h > head/contrib/llvm/lib/Target/ARM/AsmPrinter/ > head/contrib/llvm/lib/Target/ARM/NEONPreAllocPass.cpp > head/contrib/llvm/lib/Target/ARM/Thumb2HazardRecognizer.cpp > head/contrib/llvm/lib/Target/ARM/Thumb2HazardRecognizer.h > head/contrib/llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp > head/contrib/llvm/lib/Target/Alpha/AlphaJITInfo.cpp > head/contrib/llvm/lib/Target/Alpha/AlphaJITInfo.h > head/contrib/llvm/lib/Target/Alpha/AsmPrinter/ > head/contrib/llvm/lib/Target/Blackfin/AsmPrinter/ > head/contrib/llvm/lib/Target/CellSPU/AsmPrinter/ > head/contrib/llvm/lib/Target/CellSPU/SPUFrameInfo.cpp > head/contrib/llvm/lib/Target/CellSPU/SPUFrameInfo.h > head/contrib/llvm/lib/Target/MBlaze/AsmPrinter/ > head/contrib/llvm/lib/Target/MSP430/AsmPrinter/ > head/contrib/llvm/lib/Target/Mips/AsmPrinter/ > head/contrib/llvm/lib/Target/PIC16/ > head/contrib/llvm/lib/Target/PowerPC/AsmPrinter/ > head/contrib/llvm/lib/Target/PowerPC/PPCFrameInfo.h > head/contrib/llvm/lib/Target/Sparc/AsmPrinter/ > head/contrib/llvm/lib/Target/SystemZ/AsmPrinter/ > head/contrib/llvm/lib/Target/TargetFrameInfo.cpp > head/contrib/llvm/lib/Target/X86/AsmPrinter/ > head/contrib/llvm/lib/Target/X86/X86Instr64bit.td > head/contrib/llvm/lib/Target/X86/X86ShuffleDecode.h > head/contrib/llvm/lib/Target/XCore/AsmPrinter/ > head/contrib/llvm/lib/Target/XCore/XCoreFrameInfo.cpp > head/contrib/llvm/lib/Target/XCore/XCoreFrameInfo.h > head/contrib/llvm/lib/Transforms/IPO/PartialSpecialization.cpp > head/contrib/llvm/lib/Transforms/Scalar/LoopIndexSplit.cpp > head/contrib/llvm/tools/clang/include/clang/AST/FullExpr.h > head/contrib/llvm/tools/clang/include/clang/AST/TypeLocBuilder.h > head/contrib/llvm/tools/clang/include/clang/Checker/ > head/contrib/llvm/tools/clang/lib/AST/FullExpr.cpp > head/contrib/llvm/tools/clang/lib/Checker/ > head/contrib/llvm/tools/clang/lib/CodeGen/CGCXX.h > head/contrib/llvm/tools/clang/lib/CodeGen/Mangle.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/Mangle.h > head/lib/clang/include/llvm/ADT/ > head/lib/clang/include/llvm/System/ > head/lib/clang/libclangchecker/ > head/lib/clang/libllvmarmasmprinter/ > head/lib/clang/libllvmmipsasmprinter/ > head/lib/clang/libllvmpowerpcasmprinter/ > head/lib/clang/libllvmsystem/ > head/lib/clang/libllvmx86asmprinter/ > Modified: > head/Makefile.inc1 > head/ObsoleteFiles.inc > head/contrib/llvm/include/llvm-c/Core.h > head/contrib/llvm/include/llvm-c/EnhancedDisassembly.h > head/contrib/llvm/include/llvm-c/LinkTimeOptimizer.h > head/contrib/llvm/include/llvm-c/Transforms/Scalar.h > head/contrib/llvm/include/llvm-c/lto.h > head/contrib/llvm/include/llvm/ADT/APFloat.h > head/contrib/llvm/include/llvm/ADT/APInt.h > head/contrib/llvm/include/llvm/ADT/APSInt.h > head/contrib/llvm/include/llvm/ADT/BitVector.h > head/contrib/llvm/include/llvm/ADT/DenseMap.h > head/contrib/llvm/include/llvm/ADT/DenseMapInfo.h > head/contrib/llvm/include/llvm/ADT/DenseSet.h > head/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h > head/contrib/llvm/include/llvm/ADT/FoldingSet.h > head/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h > head/contrib/llvm/include/llvm/ADT/ImmutableList.h > head/contrib/llvm/include/llvm/ADT/ImmutableMap.h > head/contrib/llvm/include/llvm/ADT/ImmutableSet.h > head/contrib/llvm/include/llvm/ADT/IndexedMap.h > head/contrib/llvm/include/llvm/ADT/Optional.h > head/contrib/llvm/include/llvm/ADT/PointerIntPair.h > head/contrib/llvm/include/llvm/ADT/PointerUnion.h > head/contrib/llvm/include/llvm/ADT/PostOrderIterator.h > head/contrib/llvm/include/llvm/ADT/SCCIterator.h > head/contrib/llvm/include/llvm/ADT/ScopedHashTable.h > head/contrib/llvm/include/llvm/ADT/SetVector.h > head/contrib/llvm/include/llvm/ADT/SmallBitVector.h > head/contrib/llvm/include/llvm/ADT/SmallPtrSet.h > head/contrib/llvm/include/llvm/ADT/SmallString.h > head/contrib/llvm/include/llvm/ADT/SmallVector.h > head/contrib/llvm/include/llvm/ADT/SparseBitVector.h > head/contrib/llvm/include/llvm/ADT/Statistic.h > head/contrib/llvm/include/llvm/ADT/StringExtras.h > head/contrib/llvm/include/llvm/ADT/StringMap.h > head/contrib/llvm/include/llvm/ADT/StringRef.h > head/contrib/llvm/include/llvm/ADT/Triple.h > head/contrib/llvm/include/llvm/ADT/Twine.h > head/contrib/llvm/include/llvm/ADT/ValueMap.h > head/contrib/llvm/include/llvm/ADT/ilist.h > head/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h > head/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h > head/contrib/llvm/include/llvm/Analysis/CallGraph.h > head/contrib/llvm/include/llvm/Analysis/CodeMetrics.h > head/contrib/llvm/include/llvm/Analysis/ConstantFolding.h > head/contrib/llvm/include/llvm/Analysis/DOTGraphTraitsPass.h > head/contrib/llvm/include/llvm/Analysis/DebugInfo.h > head/contrib/llvm/include/llvm/Analysis/DominatorInternals.h > head/contrib/llvm/include/llvm/Analysis/Dominators.h > head/contrib/llvm/include/llvm/Analysis/FindUsedTypes.h > head/contrib/llvm/include/llvm/Analysis/InlineCost.h > head/contrib/llvm/include/llvm/Analysis/InstructionSimplify.h > head/contrib/llvm/include/llvm/Analysis/IntervalPartition.h > head/contrib/llvm/include/llvm/Analysis/LazyValueInfo.h > head/contrib/llvm/include/llvm/Analysis/LibCallAliasAnalysis.h > head/contrib/llvm/include/llvm/Analysis/LibCallSemantics.h > head/contrib/llvm/include/llvm/Analysis/LoopDependenceAnalysis.h > head/contrib/llvm/include/llvm/Analysis/LoopInfo.h > head/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h > head/contrib/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h > head/contrib/llvm/include/llvm/Analysis/Passes.h > head/contrib/llvm/include/llvm/Analysis/PostDominators.h > head/contrib/llvm/include/llvm/Analysis/ProfileInfoTypes.h > head/contrib/llvm/include/llvm/Analysis/RegionInfo.h > head/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h > head/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h > head/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h > head/contrib/llvm/include/llvm/Analysis/ValueTracking.h > head/contrib/llvm/include/llvm/Attributes.h > head/contrib/llvm/include/llvm/BasicBlock.h > head/contrib/llvm/include/llvm/Bitcode/Archive.h > head/contrib/llvm/include/llvm/Bitcode/BitCodes.h > head/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h > head/contrib/llvm/include/llvm/Bitcode/ReaderWriter.h > head/contrib/llvm/include/llvm/CallingConv.h > head/contrib/llvm/include/llvm/CodeGen/Analysis.h > head/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h > head/contrib/llvm/include/llvm/CodeGen/BinaryObject.h > head/contrib/llvm/include/llvm/CodeGen/CalcSpillWeights.h > head/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h > head/contrib/llvm/include/llvm/CodeGen/FastISel.h > head/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h > head/contrib/llvm/include/llvm/CodeGen/GCMetadata.h > head/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h > head/contrib/llvm/include/llvm/CodeGen/IntrinsicLowering.h > head/contrib/llvm/include/llvm/CodeGen/JITCodeEmitter.h > head/contrib/llvm/include/llvm/CodeGen/LatencyPriorityQueue.h > head/contrib/llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h > head/contrib/llvm/include/llvm/CodeGen/LiveInterval.h > head/contrib/llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h > head/contrib/llvm/include/llvm/CodeGen/LiveStackAnalysis.h > head/contrib/llvm/include/llvm/CodeGen/LiveVariables.h > head/contrib/llvm/include/llvm/CodeGen/MachORelocation.h > head/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h > head/contrib/llvm/include/llvm/CodeGen/MachineCodeEmitter.h > head/contrib/llvm/include/llvm/CodeGen/MachineCodeInfo.h > head/contrib/llvm/include/llvm/CodeGen/MachineDominators.h > head/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h > head/contrib/llvm/include/llvm/CodeGen/MachineFunction.h > head/contrib/llvm/include/llvm/CodeGen/MachineFunctionAnalysis.h > head/contrib/llvm/include/llvm/CodeGen/MachineInstr.h > head/contrib/llvm/include/llvm/CodeGen/MachineInstrBuilder.h > head/contrib/llvm/include/llvm/CodeGen/MachineLocation.h > head/contrib/llvm/include/llvm/CodeGen/MachineLoopInfo.h > head/contrib/llvm/include/llvm/CodeGen/MachineMemOperand.h > head/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h > head/contrib/llvm/include/llvm/CodeGen/MachineOperand.h > head/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h > head/contrib/llvm/include/llvm/CodeGen/MachineRelocation.h > head/contrib/llvm/include/llvm/CodeGen/Passes.h > head/contrib/llvm/include/llvm/CodeGen/ProcessImplicitDefs.h > head/contrib/llvm/include/llvm/CodeGen/RegisterCoalescer.h > head/contrib/llvm/include/llvm/CodeGen/ScheduleDAG.h > head/contrib/llvm/include/llvm/CodeGen/ScheduleHazardRecognizer.h > head/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h > head/contrib/llvm/include/llvm/CodeGen/SelectionDAGISel.h > head/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h > head/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h > head/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h > head/contrib/llvm/include/llvm/CodeGen/ValueTypes.h > head/contrib/llvm/include/llvm/CodeGen/ValueTypes.td > head/contrib/llvm/include/llvm/CompilerDriver/CompilationGraph.h > head/contrib/llvm/include/llvm/CompilerDriver/Tool.h > head/contrib/llvm/include/llvm/Constant.h > head/contrib/llvm/include/llvm/Constants.h > head/contrib/llvm/include/llvm/DerivedTypes.h > head/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h > head/contrib/llvm/include/llvm/ExecutionEngine/GenericValue.h > head/contrib/llvm/include/llvm/ExecutionEngine/JITEventListener.h > head/contrib/llvm/include/llvm/ExecutionEngine/JITMemoryManager.h > head/contrib/llvm/include/llvm/Function.h > head/contrib/llvm/include/llvm/GlobalAlias.h > head/contrib/llvm/include/llvm/GlobalValue.h > head/contrib/llvm/include/llvm/GlobalVariable.h > head/contrib/llvm/include/llvm/InlineAsm.h > head/contrib/llvm/include/llvm/InstrTypes.h > head/contrib/llvm/include/llvm/Instruction.h > head/contrib/llvm/include/llvm/Instructions.h > head/contrib/llvm/include/llvm/IntrinsicInst.h > head/contrib/llvm/include/llvm/Intrinsics.td > head/contrib/llvm/include/llvm/IntrinsicsARM.td > head/contrib/llvm/include/llvm/IntrinsicsX86.td > head/contrib/llvm/include/llvm/IntrinsicsXCore.td > head/contrib/llvm/include/llvm/LLVMContext.h > head/contrib/llvm/include/llvm/LinkAllPasses.h > head/contrib/llvm/include/llvm/LinkAllVMCore.h > head/contrib/llvm/include/llvm/MC/EDInstInfo.h > head/contrib/llvm/include/llvm/MC/MCAsmInfo.h > head/contrib/llvm/include/llvm/MC/MCAsmLayout.h > head/contrib/llvm/include/llvm/MC/MCAssembler.h > head/contrib/llvm/include/llvm/MC/MCCodeEmitter.h > head/contrib/llvm/include/llvm/MC/MCContext.h > head/contrib/llvm/include/llvm/MC/MCDirectives.h > head/contrib/llvm/include/llvm/MC/MCDisassembler.h > head/contrib/llvm/include/llvm/MC/MCDwarf.h > head/contrib/llvm/include/llvm/MC/MCELFSymbolFlags.h > head/contrib/llvm/include/llvm/MC/MCExpr.h > head/contrib/llvm/include/llvm/MC/MCFixup.h > head/contrib/llvm/include/llvm/MC/MCInst.h > head/contrib/llvm/include/llvm/MC/MCInstPrinter.h > head/contrib/llvm/include/llvm/MC/MCMachOSymbolFlags.h > head/contrib/llvm/include/llvm/MC/MCObjectStreamer.h > head/contrib/llvm/include/llvm/MC/MCObjectWriter.h > head/contrib/llvm/include/llvm/MC/MCParser/AsmLexer.h > head/contrib/llvm/include/llvm/MC/MCParser/MCAsmLexer.h > head/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h > head/contrib/llvm/include/llvm/MC/MCParser/MCParsedAsmOperand.h > head/contrib/llvm/include/llvm/MC/MCSection.h > head/contrib/llvm/include/llvm/MC/MCSectionCOFF.h > head/contrib/llvm/include/llvm/MC/MCSectionELF.h > head/contrib/llvm/include/llvm/MC/MCSectionMachO.h > head/contrib/llvm/include/llvm/MC/MCStreamer.h > head/contrib/llvm/include/llvm/MC/MCSymbol.h > head/contrib/llvm/include/llvm/MC/MCValue.h > head/contrib/llvm/include/llvm/Metadata.h > head/contrib/llvm/include/llvm/Module.h > head/contrib/llvm/include/llvm/OperandTraits.h > head/contrib/llvm/include/llvm/Operator.h > head/contrib/llvm/include/llvm/Pass.h > head/contrib/llvm/include/llvm/PassManagers.h > head/contrib/llvm/include/llvm/PassRegistry.h > head/contrib/llvm/include/llvm/PassSupport.h > head/contrib/llvm/include/llvm/Support/AlignOf.h > head/contrib/llvm/include/llvm/Support/Allocator.h > head/contrib/llvm/include/llvm/Support/COFF.h > head/contrib/llvm/include/llvm/Support/CallSite.h > head/contrib/llvm/include/llvm/Support/Casting.h > head/contrib/llvm/include/llvm/Support/Compiler.h > head/contrib/llvm/include/llvm/Support/ConstantFolder.h > head/contrib/llvm/include/llvm/Support/ConstantRange.h > head/contrib/llvm/include/llvm/Support/CrashRecoveryContext.h > head/contrib/llvm/include/llvm/Support/Dwarf.h > head/contrib/llvm/include/llvm/Support/ELF.h > head/contrib/llvm/include/llvm/Support/ErrorHandling.h > head/contrib/llvm/include/llvm/Support/FileUtilities.h > head/contrib/llvm/include/llvm/Support/GraphWriter.h > head/contrib/llvm/include/llvm/Support/IRBuilder.h > head/contrib/llvm/include/llvm/Support/IRReader.h > head/contrib/llvm/include/llvm/Support/MachO.h > head/contrib/llvm/include/llvm/Support/ManagedStatic.h > head/contrib/llvm/include/llvm/Support/MathExtras.h > head/contrib/llvm/include/llvm/Support/MemoryBuffer.h > head/contrib/llvm/include/llvm/Support/MemoryObject.h > head/contrib/llvm/include/llvm/Support/MutexGuard.h > head/contrib/llvm/include/llvm/Support/NoFolder.h > head/contrib/llvm/include/llvm/Support/PatternMatch.h > head/contrib/llvm/include/llvm/Support/PointerLikeTypeTraits.h > head/contrib/llvm/include/llvm/Support/SourceMgr.h > head/contrib/llvm/include/llvm/Support/StandardPasses.h > head/contrib/llvm/include/llvm/Support/SystemUtils.h > head/contrib/llvm/include/llvm/Support/TargetFolder.h > head/contrib/llvm/include/llvm/Support/Timer.h > head/contrib/llvm/include/llvm/Support/TypeBuilder.h > head/contrib/llvm/include/llvm/Support/raw_ostream.h > head/contrib/llvm/include/llvm/Target/Mangler.h > head/contrib/llvm/include/llvm/Target/SubtargetFeature.h > head/contrib/llvm/include/llvm/Target/Target.td > head/contrib/llvm/include/llvm/Target/TargetAsmBackend.h > head/contrib/llvm/include/llvm/Target/TargetAsmParser.h > head/contrib/llvm/include/llvm/Target/TargetCallingConv.h > head/contrib/llvm/include/llvm/Target/TargetData.h > head/contrib/llvm/include/llvm/Target/TargetELFWriterInfo.h > head/contrib/llvm/include/llvm/Target/TargetInstrDesc.h > head/contrib/llvm/include/llvm/Target/TargetInstrInfo.h > head/contrib/llvm/include/llvm/Target/TargetInstrItineraries.h > head/contrib/llvm/include/llvm/Target/TargetJITInfo.h > head/contrib/llvm/include/llvm/Target/TargetLowering.h > head/contrib/llvm/include/llvm/Target/TargetLoweringObjectFile.h > head/contrib/llvm/include/llvm/Target/TargetMachine.h > head/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h > head/contrib/llvm/include/llvm/Target/TargetRegistry.h > head/contrib/llvm/include/llvm/Target/TargetSchedule.td > head/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td > head/contrib/llvm/include/llvm/Target/TargetSelectionDAGInfo.h > head/contrib/llvm/include/llvm/Transforms/IPO.h > head/contrib/llvm/include/llvm/Transforms/Instrumentation.h > head/contrib/llvm/include/llvm/Transforms/Scalar.h > head/contrib/llvm/include/llvm/Transforms/Utils/AddrModeMatcher.h > head/contrib/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h > head/contrib/llvm/include/llvm/Transforms/Utils/BuildLibCalls.h > head/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h > head/contrib/llvm/include/llvm/Transforms/Utils/Local.h > head/contrib/llvm/include/llvm/Transforms/Utils/PromoteMemToReg.h > head/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdater.h > head/contrib/llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h > head/contrib/llvm/include/llvm/Transforms/Utils/ValueMapper.h > head/contrib/llvm/include/llvm/Type.h > head/contrib/llvm/include/llvm/TypeSymbolTable.h > head/contrib/llvm/include/llvm/Use.h > head/contrib/llvm/include/llvm/User.h > head/contrib/llvm/include/llvm/Value.h > head/contrib/llvm/include/llvm/ValueSymbolTable.h > head/contrib/llvm/lib/Analysis/AliasAnalysis.cpp > head/contrib/llvm/lib/Analysis/AliasAnalysisCounter.cpp > head/contrib/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp > head/contrib/llvm/lib/Analysis/AliasDebugger.cpp > head/contrib/llvm/lib/Analysis/AliasSetTracker.cpp > head/contrib/llvm/lib/Analysis/Analysis.cpp > head/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp > head/contrib/llvm/lib/Analysis/CFGPrinter.cpp > head/contrib/llvm/lib/Analysis/CaptureTracking.cpp > head/contrib/llvm/lib/Analysis/ConstantFolding.cpp > head/contrib/llvm/lib/Analysis/DbgInfoPrinter.cpp > head/contrib/llvm/lib/Analysis/DebugInfo.cpp > head/contrib/llvm/lib/Analysis/DomPrinter.cpp > head/contrib/llvm/lib/Analysis/IPA/CallGraph.cpp > head/contrib/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp > head/contrib/llvm/lib/Analysis/IPA/FindUsedTypes.cpp > head/contrib/llvm/lib/Analysis/IPA/GlobalsModRef.cpp > head/contrib/llvm/lib/Analysis/IVUsers.cpp > head/contrib/llvm/lib/Analysis/InlineCost.cpp > head/contrib/llvm/lib/Analysis/InstCount.cpp > head/contrib/llvm/lib/Analysis/InstructionSimplify.cpp > head/contrib/llvm/lib/Analysis/IntervalPartition.cpp > head/contrib/llvm/lib/Analysis/LazyValueInfo.cpp > head/contrib/llvm/lib/Analysis/LibCallAliasAnalysis.cpp > head/contrib/llvm/lib/Analysis/Lint.cpp > head/contrib/llvm/lib/Analysis/LiveValues.cpp > head/contrib/llvm/lib/Analysis/Loads.cpp > head/contrib/llvm/lib/Analysis/LoopDependenceAnalysis.cpp > head/contrib/llvm/lib/Analysis/LoopInfo.cpp > head/contrib/llvm/lib/Analysis/LoopPass.cpp > head/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp > head/contrib/llvm/lib/Analysis/ModuleDebugInfoPrinter.cpp > head/contrib/llvm/lib/Analysis/PHITransAddr.cpp > head/contrib/llvm/lib/Analysis/PostDominators.cpp > head/contrib/llvm/lib/Analysis/ProfileEstimatorPass.cpp > head/contrib/llvm/lib/Analysis/ProfileInfo.cpp > head/contrib/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp > head/contrib/llvm/lib/Analysis/ProfileVerifierPass.cpp > head/contrib/llvm/lib/Analysis/RegionInfo.cpp > head/contrib/llvm/lib/Analysis/RegionPrinter.cpp > head/contrib/llvm/lib/Analysis/ScalarEvolution.cpp > head/contrib/llvm/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp > head/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp > head/contrib/llvm/lib/Analysis/TypeBasedAliasAnalysis.cpp > head/contrib/llvm/lib/Analysis/ValueTracking.cpp > head/contrib/llvm/lib/Archive/Archive.cpp > head/contrib/llvm/lib/Archive/ArchiveInternals.h > head/contrib/llvm/lib/Archive/ArchiveWriter.cpp > head/contrib/llvm/lib/AsmParser/LLLexer.cpp > head/contrib/llvm/lib/AsmParser/LLLexer.h > head/contrib/llvm/lib/AsmParser/LLParser.cpp > head/contrib/llvm/lib/AsmParser/LLParser.h > head/contrib/llvm/lib/AsmParser/LLToken.h > head/contrib/llvm/lib/AsmParser/Parser.cpp > head/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp > head/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h > head/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp > head/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp > head/contrib/llvm/lib/CodeGen/Analysis.cpp > head/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp > head/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp > head/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp > head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp > head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h > head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp > head/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.h > head/contrib/llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp > head/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp > head/contrib/llvm/lib/CodeGen/CallingConvLower.cpp > head/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp > head/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.h > head/contrib/llvm/lib/CodeGen/DeadMachineInstructionElim.cpp > head/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp > head/contrib/llvm/lib/CodeGen/ELF.h > head/contrib/llvm/lib/CodeGen/ELFWriter.cpp > head/contrib/llvm/lib/CodeGen/GCMetadata.cpp > head/contrib/llvm/lib/CodeGen/GCStrategy.cpp > head/contrib/llvm/lib/CodeGen/IfConversion.cpp > head/contrib/llvm/lib/CodeGen/InlineSpiller.cpp > head/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp > head/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp > head/contrib/llvm/lib/CodeGen/LatencyPriorityQueue.cpp > head/contrib/llvm/lib/CodeGen/LiveInterval.cpp > head/contrib/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp > head/contrib/llvm/lib/CodeGen/LiveStackAnalysis.cpp > head/contrib/llvm/lib/CodeGen/LiveVariables.cpp > head/contrib/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp > head/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp > head/contrib/llvm/lib/CodeGen/MachineCSE.cpp > head/contrib/llvm/lib/CodeGen/MachineDominators.cpp > head/contrib/llvm/lib/CodeGen/MachineFunction.cpp > head/contrib/llvm/lib/CodeGen/MachineFunctionAnalysis.cpp > head/contrib/llvm/lib/CodeGen/MachineInstr.cpp > head/contrib/llvm/lib/CodeGen/MachineLICM.cpp > head/contrib/llvm/lib/CodeGen/MachineLoopInfo.cpp > head/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp > head/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp > head/contrib/llvm/lib/CodeGen/MachineSink.cpp > head/contrib/llvm/lib/CodeGen/MachineVerifier.cpp > head/contrib/llvm/lib/CodeGen/OptimizePHIs.cpp > head/contrib/llvm/lib/CodeGen/PHIElimination.cpp > head/contrib/llvm/lib/CodeGen/PeepholeOptimizer.cpp > head/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp > head/contrib/llvm/lib/CodeGen/PreAllocSplitting.cpp > head/contrib/llvm/lib/CodeGen/ProcessImplicitDefs.cpp > head/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp > head/contrib/llvm/lib/CodeGen/PrologEpilogInserter.h > head/contrib/llvm/lib/CodeGen/PseudoSourceValue.cpp > head/contrib/llvm/lib/CodeGen/RegAllocFast.cpp > head/contrib/llvm/lib/CodeGen/RegAllocLinearScan.cpp > head/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp > head/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp > head/contrib/llvm/lib/CodeGen/RenderMachineFunction.cpp > head/contrib/llvm/lib/CodeGen/RenderMachineFunction.h > head/contrib/llvm/lib/CodeGen/ScheduleDAG.cpp > head/contrib/llvm/lib/CodeGen/ScheduleDAGEmit.cpp > head/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp > head/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.h > head/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h > head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h > head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h > head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h > head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp > head/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp > head/contrib/llvm/lib/CodeGen/ShrinkWrapping.cpp > head/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp > head/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.h > head/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp > head/contrib/llvm/lib/CodeGen/SlotIndexes.cpp > head/contrib/llvm/lib/CodeGen/Spiller.cpp > head/contrib/llvm/lib/CodeGen/Spiller.h > head/contrib/llvm/lib/CodeGen/SplitKit.cpp > head/contrib/llvm/lib/CodeGen/SplitKit.h > head/contrib/llvm/lib/CodeGen/Splitter.cpp > head/contrib/llvm/lib/CodeGen/Splitter.h > head/contrib/llvm/lib/CodeGen/StackProtector.cpp > head/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp > head/contrib/llvm/lib/CodeGen/StrongPHIElimination.cpp > head/contrib/llvm/lib/CodeGen/TailDuplication.cpp > head/contrib/llvm/lib/CodeGen/TargetInstrInfoImpl.cpp > head/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp > head/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp > head/contrib/llvm/lib/CodeGen/UnreachableBlockElim.cpp > head/contrib/llvm/lib/CodeGen/VirtRegMap.cpp > head/contrib/llvm/lib/CodeGen/VirtRegMap.h > head/contrib/llvm/lib/CodeGen/VirtRegRewriter.cpp > head/contrib/llvm/lib/CompilerDriver/Action.cpp > head/contrib/llvm/lib/CompilerDriver/CompilationGraph.cpp > head/contrib/llvm/lib/CompilerDriver/Main.cpp > head/contrib/llvm/lib/CompilerDriver/Tool.cpp > head/contrib/llvm/lib/ExecutionEngine/ExecutionEngine.cpp > head/contrib/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp > head/contrib/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp > head/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h > head/contrib/llvm/lib/ExecutionEngine/JIT/Intercept.cpp > head/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp > head/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp > head/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.h > head/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp > head/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.h > head/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp > head/contrib/llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp > head/contrib/llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp > head/contrib/llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp > head/contrib/llvm/lib/Linker/LinkItems.cpp > head/contrib/llvm/lib/Linker/LinkModules.cpp > head/contrib/llvm/lib/Linker/Linker.cpp > head/contrib/llvm/lib/MC/ELFObjectWriter.cpp > head/contrib/llvm/lib/MC/MCAsmInfo.cpp > head/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp > head/contrib/llvm/lib/MC/MCAsmStreamer.cpp > head/contrib/llvm/lib/MC/MCAssembler.cpp > head/contrib/llvm/lib/MC/MCCodeEmitter.cpp > head/contrib/llvm/lib/MC/MCContext.cpp > head/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp > head/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.h > head/contrib/llvm/lib/MC/MCDisassembler/EDInst.cpp > head/contrib/llvm/lib/MC/MCDisassembler/EDInst.h > head/contrib/llvm/lib/MC/MCDisassembler/EDOperand.cpp > head/contrib/llvm/lib/MC/MCDisassembler/EDOperand.h > head/contrib/llvm/lib/MC/MCDisassembler/EDToken.h > head/contrib/llvm/lib/MC/MCDwarf.cpp > head/contrib/llvm/lib/MC/MCELFStreamer.cpp > head/contrib/llvm/lib/MC/MCExpr.cpp > head/contrib/llvm/lib/MC/MCLoggingStreamer.cpp > head/contrib/llvm/lib/MC/MCMachOStreamer.cpp > head/contrib/llvm/lib/MC/MCNullStreamer.cpp > head/contrib/llvm/lib/MC/MCObjectStreamer.cpp > head/contrib/llvm/lib/MC/MCObjectWriter.cpp > head/contrib/llvm/lib/MC/MCParser/AsmLexer.cpp > head/contrib/llvm/lib/MC/MCParser/AsmParser.cpp > head/contrib/llvm/lib/MC/MCParser/DarwinAsmParser.cpp > head/contrib/llvm/lib/MC/MCParser/ELFAsmParser.cpp > head/contrib/llvm/lib/MC/MCSectionCOFF.cpp > head/contrib/llvm/lib/MC/MCSectionELF.cpp > head/contrib/llvm/lib/MC/MCSectionMachO.cpp > head/contrib/llvm/lib/MC/MCStreamer.cpp > head/contrib/llvm/lib/MC/MCSymbol.cpp > head/contrib/llvm/lib/MC/MachObjectWriter.cpp > head/contrib/llvm/lib/MC/TargetAsmBackend.cpp > head/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp > head/contrib/llvm/lib/MC/WinCOFFStreamer.cpp > head/contrib/llvm/lib/Support/APFloat.cpp > head/contrib/llvm/lib/Support/APInt.cpp > head/contrib/llvm/lib/Support/Allocator.cpp > head/contrib/llvm/lib/Support/CommandLine.cpp > head/contrib/llvm/lib/Support/ConstantRange.cpp > head/contrib/llvm/lib/Support/CrashRecoveryContext.cpp > head/contrib/llvm/lib/Support/Debug.cpp > head/contrib/llvm/lib/Support/Dwarf.cpp > head/contrib/llvm/lib/Support/ErrorHandling.cpp > head/contrib/llvm/lib/Support/FileUtilities.cpp > head/contrib/llvm/lib/Support/FoldingSet.cpp > head/contrib/llvm/lib/Support/FormattedStream.cpp > head/contrib/llvm/lib/Support/GraphWriter.cpp > head/contrib/llvm/lib/Support/ManagedStatic.cpp > head/contrib/llvm/lib/Support/MemoryBuffer.cpp > head/contrib/llvm/lib/Support/PluginLoader.cpp > head/contrib/llvm/lib/Support/PrettyStackTrace.cpp > head/contrib/llvm/lib/Support/SourceMgr.cpp > head/contrib/llvm/lib/Support/Statistic.cpp > head/contrib/llvm/lib/Support/StringMap.cpp > head/contrib/llvm/lib/Support/StringRef.cpp > head/contrib/llvm/lib/Support/SystemUtils.cpp > head/contrib/llvm/lib/Support/TargetRegistry.cpp > head/contrib/llvm/lib/Support/Timer.cpp > head/contrib/llvm/lib/Support/Triple.cpp > head/contrib/llvm/lib/Support/Twine.cpp > head/contrib/llvm/lib/Support/raw_ostream.cpp > head/contrib/llvm/lib/Support/regexec.c > head/contrib/llvm/lib/Target/ARM/ARM.h > head/contrib/llvm/lib/Target/ARM/ARM.td > head/contrib/llvm/lib/Target/ARM/ARMAddressingModes.h > head/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.cpp > head/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp > head/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.h > head/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp > head/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.h > head/contrib/llvm/lib/Target/ARM/ARMBuildAttrs.h > head/contrib/llvm/lib/Target/ARM/ARMCallingConv.td > head/contrib/llvm/lib/Target/ARM/ARMCodeEmitter.cpp > head/contrib/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp > head/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.cpp > head/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.h > head/contrib/llvm/lib/Target/ARM/ARMExpandPseudoInsts.cpp > head/contrib/llvm/lib/Target/ARM/ARMFastISel.cpp > head/contrib/llvm/lib/Target/ARM/ARMGlobalMerge.cpp > head/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp > head/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp > head/contrib/llvm/lib/Target/ARM/ARMISelLowering.h > head/contrib/llvm/lib/Target/ARM/ARMInstrFormats.td > head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.cpp > head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.h > head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td > head/contrib/llvm/lib/Target/ARM/ARMInstrNEON.td > head/contrib/llvm/lib/Target/ARM/ARMInstrThumb.td > head/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td > head/contrib/llvm/lib/Target/ARM/ARMInstrVFP.td > head/contrib/llvm/lib/Target/ARM/ARMJITInfo.cpp > head/contrib/llvm/lib/Target/ARM/ARMJITInfo.h > head/contrib/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp > head/contrib/llvm/lib/Target/ARM/ARMMCInstLower.cpp > head/contrib/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h > head/contrib/llvm/lib/Target/ARM/ARMPerfectShuffle.h > head/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.cpp > head/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.td > head/contrib/llvm/lib/Target/ARM/ARMSchedule.td > head/contrib/llvm/lib/Target/ARM/ARMScheduleA8.td > head/contrib/llvm/lib/Target/ARM/ARMScheduleA9.td > head/contrib/llvm/lib/Target/ARM/ARMScheduleV6.td > head/contrib/llvm/lib/Target/ARM/ARMSelectionDAGInfo.cpp > head/contrib/llvm/lib/Target/ARM/ARMSelectionDAGInfo.h > head/contrib/llvm/lib/Target/ARM/ARMSubtarget.cpp > head/contrib/llvm/lib/Target/ARM/ARMSubtarget.h > head/contrib/llvm/lib/Target/ARM/ARMTargetMachine.cpp > head/contrib/llvm/lib/Target/ARM/ARMTargetMachine.h > head/contrib/llvm/lib/Target/ARM/ARMTargetObjectFile.cpp > head/contrib/llvm/lib/Target/ARM/ARMTargetObjectFile.h > head/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmLexer.cpp > head/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp > head/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp > head/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp > head/contrib/llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h > head/contrib/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp > head/contrib/llvm/lib/Target/ARM/Thumb1InstrInfo.h > head/contrib/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp > head/contrib/llvm/lib/Target/ARM/Thumb1RegisterInfo.h > head/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp > head/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.h > head/contrib/llvm/lib/Target/ARM/Thumb2RegisterInfo.cpp > head/contrib/llvm/lib/Target/ARM/Thumb2SizeReduction.cpp > head/contrib/llvm/lib/Target/Alpha/Alpha.h > head/contrib/llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp > head/contrib/llvm/lib/Target/Alpha/AlphaISelLowering.cpp > head/contrib/llvm/lib/Target/Alpha/AlphaISelLowering.h > head/contrib/llvm/lib/Target/Alpha/AlphaInstrInfo.td > head/contrib/llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp > head/contrib/llvm/lib/Target/Alpha/AlphaRegisterInfo.h > head/contrib/llvm/lib/Target/Alpha/AlphaSchedule.td > head/contrib/llvm/lib/Target/Alpha/AlphaTargetMachine.cpp > head/contrib/llvm/lib/Target/Alpha/AlphaTargetMachine.h > head/contrib/llvm/lib/Target/Blackfin/BlackfinISelDAGToDAG.cpp > head/contrib/llvm/lib/Target/Blackfin/BlackfinISelLowering.cpp > head/contrib/llvm/lib/Target/Blackfin/BlackfinISelLowering.h > head/contrib/llvm/lib/Target/Blackfin/BlackfinInstrInfo.td > head/contrib/llvm/lib/Target/Blackfin/BlackfinRegisterInfo.cpp > head/contrib/llvm/lib/Target/Blackfin/BlackfinRegisterInfo.h > head/contrib/llvm/lib/Target/Blackfin/BlackfinRegisterInfo.td > head/contrib/llvm/lib/Target/Blackfin/BlackfinTargetMachine.cpp > head/contrib/llvm/lib/Target/Blackfin/BlackfinTargetMachine.h > head/contrib/llvm/lib/Target/CBackend/CBackend.cpp > head/contrib/llvm/lib/Target/CellSPU/SPU.h > head/contrib/llvm/lib/Target/CellSPU/SPU64InstrInfo.td > head/contrib/llvm/lib/Target/CellSPU/SPUHazardRecognizers.cpp > head/contrib/llvm/lib/Target/CellSPU/SPUHazardRecognizers.h > head/contrib/llvm/lib/Target/CellSPU/SPUISelDAGToDAG.cpp > head/contrib/llvm/lib/Target/CellSPU/SPUISelLowering.cpp > head/contrib/llvm/lib/Target/CellSPU/SPUISelLowering.h > head/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.cpp > head/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.h > head/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.td > head/contrib/llvm/lib/Target/CellSPU/SPUMCAsmInfo.cpp > head/contrib/llvm/lib/Target/CellSPU/SPUNodes.td > head/contrib/llvm/lib/Target/CellSPU/SPUOperands.td > head/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.cpp > head/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.h > head/contrib/llvm/lib/Target/CellSPU/SPUSchedule.td > head/contrib/llvm/lib/Target/CellSPU/SPUSubtarget.cpp > head/contrib/llvm/lib/Target/CellSPU/SPUSubtarget.h > head/contrib/llvm/lib/Target/CellSPU/SPUTargetMachine.cpp > head/contrib/llvm/lib/Target/CellSPU/SPUTargetMachine.h > head/contrib/llvm/lib/Target/CppBackend/CPPBackend.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlaze.h > head/contrib/llvm/lib/Target/MBlaze/MBlaze.td > head/contrib/llvm/lib/Target/MBlaze/MBlazeCallingConv.td > head/contrib/llvm/lib/Target/MBlaze/MBlazeDelaySlotFiller.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlazeISelDAGToDAG.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlazeISelLowering.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlazeISelLowering.h > head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrFPU.td > head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrFSL.td > head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrFormats.td > head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.h > head/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.td > head/contrib/llvm/lib/Target/MBlaze/MBlazeIntrinsicInfo.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlazeIntrinsics.td > head/contrib/llvm/lib/Target/MBlaze/MBlazeMCAsmInfo.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlazeMCAsmInfo.h > head/contrib/llvm/lib/Target/MBlaze/MBlazeMachineFunction.h > head/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.h > head/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.td > head/contrib/llvm/lib/Target/MBlaze/MBlazeSchedule.td > head/contrib/llvm/lib/Target/MBlaze/MBlazeTargetMachine.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlazeTargetMachine.h > head/contrib/llvm/lib/Target/MBlaze/MBlazeTargetObjectFile.cpp > head/contrib/llvm/lib/Target/MBlaze/MBlazeTargetObjectFile.h > head/contrib/llvm/lib/Target/MSP430/MSP430.td > head/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp > head/contrib/llvm/lib/Target/MSP430/MSP430ISelLowering.cpp > head/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.cpp > head/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.h > head/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.td > head/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.cpp > head/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.h > head/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.td > head/contrib/llvm/lib/Target/MSP430/MSP430TargetMachine.cpp > head/contrib/llvm/lib/Target/MSP430/MSP430TargetMachine.h > head/contrib/llvm/lib/Target/Mangler.cpp > head/contrib/llvm/lib/Target/Mips/Mips.td > head/contrib/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp > head/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp > head/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp > head/contrib/llvm/lib/Target/Mips/MipsISelLowering.h > head/contrib/llvm/lib/Target/Mips/MipsInstrFPU.td > head/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td > head/contrib/llvm/lib/Target/Mips/MipsMachineFunction.h > head/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.cpp > head/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.h > head/contrib/llvm/lib/Target/Mips/MipsSchedule.td > head/contrib/llvm/lib/Target/Mips/MipsSubtarget.h > head/contrib/llvm/lib/Target/Mips/MipsTargetMachine.cpp > head/contrib/llvm/lib/Target/Mips/MipsTargetMachine.h > head/contrib/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp > head/contrib/llvm/lib/Target/PowerPC/PPC.h > head/contrib/llvm/lib/Target/PowerPC/PPC.td > head/contrib/llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp > head/contrib/llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp > head/contrib/llvm/lib/Target/PowerPC/PPCHazardRecognizers.h > head/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp > head/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp > head/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h > head/contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td > head/contrib/llvm/lib/Target/PowerPC/PPCInstrFormats.td > head/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp > head/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.h > head/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td > head/contrib/llvm/lib/Target/PowerPC/PPCJITInfo.cpp > head/contrib/llvm/lib/Target/PowerPC/PPCMCAsmInfo.cpp > head/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp > head/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.h > head/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.td > head/contrib/llvm/lib/Target/PowerPC/PPCScheduleG3.td > head/contrib/llvm/lib/Target/PowerPC/PPCScheduleG4.td > head/contrib/llvm/lib/Target/PowerPC/PPCScheduleG4Plus.td > head/contrib/llvm/lib/Target/PowerPC/PPCScheduleG5.td > head/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.cpp > head/contrib/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp > head/contrib/llvm/lib/Target/PowerPC/PPCTargetMachine.h > head/contrib/llvm/lib/Target/Sparc/DelaySlotFiller.cpp > head/contrib/llvm/lib/Target/Sparc/SparcCallingConv.td > head/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp > head/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp > head/contrib/llvm/lib/Target/Sparc/SparcISelLowering.h > head/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.cpp > head/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.h > head/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td > head/contrib/llvm/lib/Target/Sparc/SparcMachineFunctionInfo.h > head/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.cpp > head/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.h > head/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.td > head/contrib/llvm/lib/Target/Sparc/SparcTargetMachine.cpp > head/contrib/llvm/lib/Target/Sparc/SparcTargetMachine.h > head/contrib/llvm/lib/Target/SubtargetFeature.cpp > head/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp > head/contrib/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp > head/contrib/llvm/lib/Target/SystemZ/SystemZInstrBuilder.h > head/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp > head/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.h > head/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.td > head/contrib/llvm/lib/Target/SystemZ/SystemZMCAsmInfo.cpp > head/contrib/llvm/lib/Target/SystemZ/SystemZOperands.td > head/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.cpp > head/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.h > head/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.td > head/contrib/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp > head/contrib/llvm/lib/Target/SystemZ/SystemZTargetMachine.h > head/contrib/llvm/lib/Target/Target.cpp > head/contrib/llvm/lib/Target/TargetData.cpp > head/contrib/llvm/lib/Target/TargetELFWriterInfo.cpp > head/contrib/llvm/lib/Target/TargetInstrInfo.cpp > head/contrib/llvm/lib/Target/TargetLoweringObjectFile.cpp > head/contrib/llvm/lib/Target/TargetMachine.cpp > head/contrib/llvm/lib/Target/TargetRegisterInfo.cpp > head/contrib/llvm/lib/Target/X86/AsmParser/X86AsmLexer.cpp > head/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp > head/contrib/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp > head/contrib/llvm/lib/Target/X86/Disassembler/X86Disassembler.h > head/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c > head/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h > head/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h > head/contrib/llvm/lib/Target/X86/X86.h > head/contrib/llvm/lib/Target/X86/X86.td > head/contrib/llvm/lib/Target/X86/X86AsmBackend.cpp > head/contrib/llvm/lib/Target/X86/X86AsmPrinter.cpp > head/contrib/llvm/lib/Target/X86/X86AsmPrinter.h > head/contrib/llvm/lib/Target/X86/X86CallingConv.td > head/contrib/llvm/lib/Target/X86/X86CodeEmitter.cpp > head/contrib/llvm/lib/Target/X86/X86ELFWriterInfo.cpp > head/contrib/llvm/lib/Target/X86/X86ELFWriterInfo.h > head/contrib/llvm/lib/Target/X86/X86FastISel.cpp > head/contrib/llvm/lib/Target/X86/X86FixupKinds.h > head/contrib/llvm/lib/Target/X86/X86FloatingPoint.cpp > head/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp > head/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp > head/contrib/llvm/lib/Target/X86/X86ISelLowering.h > head/contrib/llvm/lib/Target/X86/X86InstrBuilder.h > head/contrib/llvm/lib/Target/X86/X86InstrFPStack.td > head/contrib/llvm/lib/Target/X86/X86InstrFormats.td > head/contrib/llvm/lib/Target/X86/X86InstrFragmentsSIMD.td > head/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp > head/contrib/llvm/lib/Target/X86/X86InstrInfo.h > head/contrib/llvm/lib/Target/X86/X86InstrInfo.td > head/contrib/llvm/lib/Target/X86/X86InstrMMX.td > head/contrib/llvm/lib/Target/X86/X86InstrSSE.td > head/contrib/llvm/lib/Target/X86/X86JITInfo.cpp > head/contrib/llvm/lib/Target/X86/X86MCAsmInfo.cpp > head/contrib/llvm/lib/Target/X86/X86MCCodeEmitter.cpp > head/contrib/llvm/lib/Target/X86/X86MCInstLower.cpp > head/contrib/llvm/lib/Target/X86/X86MCInstLower.h > head/contrib/llvm/lib/Target/X86/X86RegisterInfo.cpp > head/contrib/llvm/lib/Target/X86/X86RegisterInfo.h > head/contrib/llvm/lib/Target/X86/X86RegisterInfo.td > head/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.cpp > head/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.h > head/contrib/llvm/lib/Target/X86/X86Subtarget.cpp > head/contrib/llvm/lib/Target/X86/X86Subtarget.h > head/contrib/llvm/lib/Target/X86/X86TargetMachine.cpp > head/contrib/llvm/lib/Target/X86/X86TargetMachine.h > head/contrib/llvm/lib/Target/XCore/XCoreCallingConv.td > head/contrib/llvm/lib/Target/XCore/XCoreISelDAGToDAG.cpp > head/contrib/llvm/lib/Target/XCore/XCoreISelLowering.cpp > head/contrib/llvm/lib/Target/XCore/XCoreISelLowering.h > head/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.cpp > head/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.h > head/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.td > head/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.cpp > head/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.h > head/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.td > head/contrib/llvm/lib/Target/XCore/XCoreTargetMachine.cpp > head/contrib/llvm/lib/Target/XCore/XCoreTargetMachine.h > head/contrib/llvm/lib/Target/XCore/XCoreTargetObjectFile.cpp > head/contrib/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp > head/contrib/llvm/lib/Transforms/IPO/ConstantMerge.cpp > head/contrib/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp > head/contrib/llvm/lib/Transforms/IPO/DeadTypeElimination.cpp > head/contrib/llvm/lib/Transforms/IPO/ExtractGV.cpp > head/contrib/llvm/lib/Transforms/IPO/FunctionAttrs.cpp > head/contrib/llvm/lib/Transforms/IPO/GlobalDCE.cpp > head/contrib/llvm/lib/Transforms/IPO/GlobalOpt.cpp > head/contrib/llvm/lib/Transforms/IPO/IPConstantPropagation.cpp > head/contrib/llvm/lib/Transforms/IPO/IPO.cpp > head/contrib/llvm/lib/Transforms/IPO/InlineAlways.cpp > head/contrib/llvm/lib/Transforms/IPO/InlineSimple.cpp > head/contrib/llvm/lib/Transforms/IPO/Inliner.cpp > head/contrib/llvm/lib/Transforms/IPO/Internalize.cpp > head/contrib/llvm/lib/Transforms/IPO/LoopExtractor.cpp > head/contrib/llvm/lib/Transforms/IPO/LowerSetJmp.cpp > head/contrib/llvm/lib/Transforms/IPO/MergeFunctions.cpp > head/contrib/llvm/lib/Transforms/IPO/PartialInlining.cpp > head/contrib/llvm/lib/Transforms/IPO/PruneEH.cpp > head/contrib/llvm/lib/Transforms/IPO/StripDeadPrototypes.cpp > head/contrib/llvm/lib/Transforms/IPO/StripSymbols.cpp > head/contrib/llvm/lib/Transforms/IPO/StructRetPromotion.cpp > head/contrib/llvm/lib/Transforms/InstCombine/InstCombine.h > head/contrib/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp > head/contrib/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp > head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp > head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp > head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp > head/contrib/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp > head/contrib/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp > head/contrib/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp > head/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp > head/contrib/llvm/lib/Transforms/InstCombine/InstCombineShifts.cpp > head/contrib/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp > head/contrib/llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp > head/contrib/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp > head/contrib/llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp > head/contrib/llvm/lib/Transforms/Instrumentation/OptimalEdgeProfiling.cpp > head/contrib/llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp > head/contrib/llvm/lib/Transforms/Instrumentation/ProfilingUtils.h > head/contrib/llvm/lib/Transforms/Scalar/ADCE.cpp > head/contrib/llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp > head/contrib/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp > head/contrib/llvm/lib/Transforms/Scalar/ConstantProp.cpp > head/contrib/llvm/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp > head/contrib/llvm/lib/Transforms/Scalar/DCE.cpp > head/contrib/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp > head/contrib/llvm/lib/Transforms/Scalar/GEPSplitter.cpp > head/contrib/llvm/lib/Transforms/Scalar/GVN.cpp > head/contrib/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp > head/contrib/llvm/lib/Transforms/Scalar/JumpThreading.cpp > head/contrib/llvm/lib/Transforms/Scalar/LICM.cpp > head/contrib/llvm/lib/Transforms/Scalar/LoopDeletion.cpp > head/contrib/llvm/lib/Transforms/Scalar/LoopRotation.cpp > head/contrib/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp > head/contrib/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp > head/contrib/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp > head/contrib/llvm/lib/Transforms/Scalar/LowerAtomic.cpp > head/contrib/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp > head/contrib/llvm/lib/Transforms/Scalar/Reassociate.cpp > head/contrib/llvm/lib/Transforms/Scalar/Reg2Mem.cpp > head/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp > head/contrib/llvm/lib/Transforms/Scalar/Scalar.cpp > head/contrib/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp > head/contrib/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp > head/contrib/llvm/lib/Transforms/Scalar/SimplifyHalfPowrLibCalls.cpp > head/contrib/llvm/lib/Transforms/Scalar/SimplifyLibCalls.cpp > head/contrib/llvm/lib/Transforms/Scalar/Sink.cpp > head/contrib/llvm/lib/Transforms/Scalar/TailDuplication.cpp > head/contrib/llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp > head/contrib/llvm/lib/Transforms/Utils/AddrModeMatcher.cpp > head/contrib/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp > head/contrib/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp > head/contrib/llvm/lib/Transforms/Utils/BuildLibCalls.cpp > head/contrib/llvm/lib/Transforms/Utils/CloneFunction.cpp > head/contrib/llvm/lib/Transforms/Utils/CloneLoop.cpp > head/contrib/llvm/lib/Transforms/Utils/CloneModule.cpp > head/contrib/llvm/lib/Transforms/Utils/CodeExtractor.cpp > head/contrib/llvm/lib/Transforms/Utils/DemoteRegToStack.cpp > head/contrib/llvm/lib/Transforms/Utils/InlineFunction.cpp > head/contrib/llvm/lib/Transforms/Utils/InstructionNamer.cpp > head/contrib/llvm/lib/Transforms/Utils/LCSSA.cpp > head/contrib/llvm/lib/Transforms/Utils/Local.cpp > head/contrib/llvm/lib/Transforms/Utils/LoopSimplify.cpp > head/contrib/llvm/lib/Transforms/Utils/LoopUnroll.cpp > head/contrib/llvm/lib/Transforms/Utils/LowerInvoke.cpp > head/contrib/llvm/lib/Transforms/Utils/LowerSwitch.cpp > head/contrib/llvm/lib/Transforms/Utils/Mem2Reg.cpp > head/contrib/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp > head/contrib/llvm/lib/Transforms/Utils/SSAUpdater.cpp > head/contrib/llvm/lib/Transforms/Utils/SimplifyCFG.cpp > head/contrib/llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp > head/contrib/llvm/lib/Transforms/Utils/ValueMapper.cpp > head/contrib/llvm/lib/VMCore/AsmWriter.cpp > head/contrib/llvm/lib/VMCore/Attributes.cpp > head/contrib/llvm/lib/VMCore/AutoUpgrade.cpp > head/contrib/llvm/lib/VMCore/BasicBlock.cpp > head/contrib/llvm/lib/VMCore/ConstantFold.cpp > head/contrib/llvm/lib/VMCore/ConstantFold.h > head/contrib/llvm/lib/VMCore/Constants.cpp > head/contrib/llvm/lib/VMCore/ConstantsContext.h > head/contrib/llvm/lib/VMCore/Core.cpp > head/contrib/llvm/lib/VMCore/Dominators.cpp > head/contrib/llvm/lib/VMCore/Function.cpp > head/contrib/llvm/lib/VMCore/Globals.cpp > head/contrib/llvm/lib/VMCore/IRBuilder.cpp > head/contrib/llvm/lib/VMCore/InlineAsm.cpp > head/contrib/llvm/lib/VMCore/Instruction.cpp > head/contrib/llvm/lib/VMCore/Instructions.cpp > head/contrib/llvm/lib/VMCore/LLVMContext.cpp > head/contrib/llvm/lib/VMCore/LLVMContextImpl.cpp > head/contrib/llvm/lib/VMCore/LLVMContextImpl.h > head/contrib/llvm/lib/VMCore/LeakDetector.cpp > head/contrib/llvm/lib/VMCore/Metadata.cpp > head/contrib/llvm/lib/VMCore/Module.cpp > head/contrib/llvm/lib/VMCore/Pass.cpp > head/contrib/llvm/lib/VMCore/PassManager.cpp > head/contrib/llvm/lib/VMCore/PassRegistry.cpp > head/contrib/llvm/lib/VMCore/PrintModulePass.cpp > head/contrib/llvm/lib/VMCore/Type.cpp > head/contrib/llvm/lib/VMCore/TypesContext.h > head/contrib/llvm/lib/VMCore/Use.cpp > head/contrib/llvm/lib/VMCore/Value.cpp > head/contrib/llvm/lib/VMCore/ValueTypes.cpp > head/contrib/llvm/lib/VMCore/Verifier.cpp > head/contrib/llvm/tools/clang/include/clang-c/Index.h > head/contrib/llvm/tools/clang/include/clang/AST/ASTConsumer.h > head/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h > head/contrib/llvm/tools/clang/include/clang/AST/ASTDiagnostic.h > head/contrib/llvm/tools/clang/include/clang/AST/ASTImporter.h > head/contrib/llvm/tools/clang/include/clang/AST/Attr.h > head/contrib/llvm/tools/clang/include/clang/AST/CXXInheritance.h > head/contrib/llvm/tools/clang/include/clang/AST/CanonicalType.h > head/contrib/llvm/tools/clang/include/clang/AST/CharUnits.h > head/contrib/llvm/tools/clang/include/clang/AST/Decl.h > head/contrib/llvm/tools/clang/include/clang/AST/DeclBase.h > head/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h > head/contrib/llvm/tools/clang/include/clang/AST/DeclFriend.h > head/contrib/llvm/tools/clang/include/clang/AST/DeclGroup.h > head/contrib/llvm/tools/clang/include/clang/AST/DeclObjC.h > head/contrib/llvm/tools/clang/include/clang/AST/DeclTemplate.h > head/contrib/llvm/tools/clang/include/clang/AST/DeclarationName.h > head/contrib/llvm/tools/clang/include/clang/AST/Expr.h > head/contrib/llvm/tools/clang/include/clang/AST/ExprCXX.h > head/contrib/llvm/tools/clang/include/clang/AST/ExprObjC.h > head/contrib/llvm/tools/clang/include/clang/AST/ExternalASTSource.h > head/contrib/llvm/tools/clang/include/clang/AST/NestedNameSpecifier.h > head/contrib/llvm/tools/clang/include/clang/AST/OperationKinds.h > head/contrib/llvm/tools/clang/include/clang/AST/ParentMap.h > head/contrib/llvm/tools/clang/include/clang/AST/PrettyPrinter.h > head/contrib/llvm/tools/clang/include/clang/AST/RecordLayout.h > head/contrib/llvm/tools/clang/include/clang/AST/RecursiveASTVisitor.h > head/contrib/llvm/tools/clang/include/clang/AST/Redeclarable.h > head/contrib/llvm/tools/clang/include/clang/AST/Stmt.h > head/contrib/llvm/tools/clang/include/clang/AST/StmtCXX.h > head/contrib/llvm/tools/clang/include/clang/AST/StmtIterator.h > head/contrib/llvm/tools/clang/include/clang/AST/StmtObjC.h > head/contrib/llvm/tools/clang/include/clang/AST/TemplateBase.h > head/contrib/llvm/tools/clang/include/clang/AST/TemplateName.h > head/contrib/llvm/tools/clang/include/clang/AST/Type.h > head/contrib/llvm/tools/clang/include/clang/AST/TypeLoc.h > head/contrib/llvm/tools/clang/include/clang/AST/TypeNodes.def > head/contrib/llvm/tools/clang/include/clang/AST/TypeVisitor.h > head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/FormatString.h > head/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/LiveVariables.h > head/contrib/llvm/tools/clang/include/clang/Analysis/AnalysisContext.h > head/contrib/llvm/tools/clang/include/clang/Analysis/AnalysisDiagnostic.h > head/contrib/llvm/tools/clang/include/clang/Analysis/CFG.h > head/contrib/llvm/tools/clang/include/clang/Analysis/FlowSensitive/DataflowSolver.h > head/contrib/llvm/tools/clang/include/clang/Analysis/ProgramPoint.h > head/contrib/llvm/tools/clang/include/clang/Analysis/Support/BumpVector.h > head/contrib/llvm/tools/clang/include/clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h > head/contrib/llvm/tools/clang/include/clang/Analysis/Visitors/CFGRecStmtVisitor.h > head/contrib/llvm/tools/clang/include/clang/Analysis/Visitors/CFGStmtVisitor.h > head/contrib/llvm/tools/clang/include/clang/Basic/Attr.td > head/contrib/llvm/tools/clang/include/clang/Basic/AttrKinds.h > head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def > head/contrib/llvm/tools/clang/include/clang/Basic/Builtins.h > head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsPPC.def > head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsX86.def > head/contrib/llvm/tools/clang/include/clang/Basic/DeclNodes.td > head/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.h > head/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.td > head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticASTKinds.td > head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticCommonKinds.td > head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticDriverKinds.td > head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.td > head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td > head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticLexKinds.td > head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticParseKinds.td > head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td > head/contrib/llvm/tools/clang/include/clang/Basic/FileManager.h > head/contrib/llvm/tools/clang/include/clang/Basic/IdentifierTable.h > head/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.h > head/contrib/llvm/tools/clang/include/clang/Basic/OnDiskHashTable.h > head/contrib/llvm/tools/clang/include/clang/Basic/PartialDiagnostic.h > head/contrib/llvm/tools/clang/include/clang/Basic/SourceLocation.h > head/contrib/llvm/tools/clang/include/clang/Basic/SourceManager.h > head/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h > head/contrib/llvm/tools/clang/include/clang/Basic/StmtNodes.td > head/contrib/llvm/tools/clang/include/clang/Basic/TargetInfo.h > head/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.def > head/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.h > head/contrib/llvm/tools/clang/include/clang/Basic/TypeTraits.h > head/contrib/llvm/tools/clang/include/clang/Basic/Version.h > head/contrib/llvm/tools/clang/include/clang/Basic/arm_neon.td > head/contrib/llvm/tools/clang/include/clang/CodeGen/CodeGenAction.h > head/contrib/llvm/tools/clang/include/clang/Driver/ArgList.h > head/contrib/llvm/tools/clang/include/clang/Driver/CC1AsOptions.td > head/contrib/llvm/tools/clang/include/clang/Driver/CC1Options.td > head/contrib/llvm/tools/clang/include/clang/Driver/Driver.h > head/contrib/llvm/tools/clang/include/clang/Driver/DriverDiagnostic.h > head/contrib/llvm/tools/clang/include/clang/Driver/HostInfo.h > head/contrib/llvm/tools/clang/include/clang/Driver/OptTable.h > head/contrib/llvm/tools/clang/include/clang/Driver/Options.td > head/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h > head/contrib/llvm/tools/clang/include/clang/Driver/Types.def > head/contrib/llvm/tools/clang/include/clang/Frontend/ASTConsumers.h > head/contrib/llvm/tools/clang/include/clang/Frontend/ASTUnit.h > head/contrib/llvm/tools/clang/include/clang/Frontend/Analyses.def > head/contrib/llvm/tools/clang/include/clang/Frontend/AnalyzerOptions.h > head/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h > head/contrib/llvm/tools/clang/include/clang/Frontend/CommandLineSourceLoc.h > head/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInstance.h > head/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInvocation.h > head/contrib/llvm/tools/clang/include/clang/Frontend/DeclXML.def > head/contrib/llvm/tools/clang/include/clang/Frontend/DependencyOutputOptions.h > head/contrib/llvm/tools/clang/include/clang/Frontend/DiagnosticOptions.h > head/contrib/llvm/tools/clang/include/clang/Frontend/FrontendAction.h > head/contrib/llvm/tools/clang/include/clang/Frontend/FrontendActions.h > head/contrib/llvm/tools/clang/include/clang/Frontend/FrontendDiagnostic.h > head/contrib/llvm/tools/clang/include/clang/Frontend/FrontendOptions.h > head/contrib/llvm/tools/clang/include/clang/Frontend/HeaderSearchOptions.h > head/contrib/llvm/tools/clang/include/clang/Frontend/LangStandards.def > head/contrib/llvm/tools/clang/include/clang/Frontend/PreprocessorOptions.h > head/contrib/llvm/tools/clang/include/clang/Frontend/PreprocessorOutputOptions.h > head/contrib/llvm/tools/clang/include/clang/Frontend/StmtXML.def > head/contrib/llvm/tools/clang/include/clang/Frontend/TypeXML.def > head/contrib/llvm/tools/clang/include/clang/Frontend/Utils.h > head/contrib/llvm/tools/clang/include/clang/Frontend/VerifyDiagnosticsClient.h > head/contrib/llvm/tools/clang/include/clang/Lex/ExternalPreprocessorSource.h > head/contrib/llvm/tools/clang/include/clang/Lex/HeaderMap.h > head/contrib/llvm/tools/clang/include/clang/Lex/HeaderSearch.h > head/contrib/llvm/tools/clang/include/clang/Lex/LexDiagnostic.h > head/contrib/llvm/tools/clang/include/clang/Lex/Lexer.h > head/contrib/llvm/tools/clang/include/clang/Lex/LiteralSupport.h > head/contrib/llvm/tools/clang/include/clang/Lex/MacroInfo.h > head/contrib/llvm/tools/clang/include/clang/Lex/PPCallbacks.h > head/contrib/llvm/tools/clang/include/clang/Lex/PTHManager.h > head/contrib/llvm/tools/clang/include/clang/Lex/Pragma.h > head/contrib/llvm/tools/clang/include/clang/Lex/PreprocessingRecord.h > head/contrib/llvm/tools/clang/include/clang/Lex/Preprocessor.h > head/contrib/llvm/tools/clang/include/clang/Lex/PreprocessorLexer.h > head/contrib/llvm/tools/clang/include/clang/Lex/Token.h > head/contrib/llvm/tools/clang/include/clang/Parse/ParseDiagnostic.h > head/contrib/llvm/tools/clang/include/clang/Parse/Parser.h > head/contrib/llvm/tools/clang/include/clang/Rewrite/ASTConsumers.h > head/contrib/llvm/tools/clang/include/clang/Rewrite/FixItRewriter.h > head/contrib/llvm/tools/clang/include/clang/Sema/AttributeList.h > head/contrib/llvm/tools/clang/include/clang/Sema/CodeCompleteConsumer.h > head/contrib/llvm/tools/clang/include/clang/Sema/DeclSpec.h > head/contrib/llvm/tools/clang/include/clang/Sema/DelayedDiagnostic.h > head/contrib/llvm/tools/clang/include/clang/Sema/ExternalSemaSource.h > head/contrib/llvm/tools/clang/include/clang/Sema/Initialization.h > head/contrib/llvm/tools/clang/include/clang/Sema/Lookup.h > head/contrib/llvm/tools/clang/include/clang/Sema/Overload.h > head/contrib/llvm/tools/clang/include/clang/Sema/Ownership.h > head/contrib/llvm/tools/clang/include/clang/Sema/ParsedTemplate.h > head/contrib/llvm/tools/clang/include/clang/Sema/Scope.h > head/contrib/llvm/tools/clang/include/clang/Sema/ScopeInfo.h > head/contrib/llvm/tools/clang/include/clang/Sema/Sema.h > head/contrib/llvm/tools/clang/include/clang/Sema/SemaDiagnostic.h > head/contrib/llvm/tools/clang/include/clang/Sema/Template.h > head/contrib/llvm/tools/clang/include/clang/Sema/TemplateDeduction.h > head/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h > head/contrib/llvm/tools/clang/include/clang/Serialization/ASTDeserializationListener.h > head/contrib/llvm/tools/clang/include/clang/Serialization/ASTReader.h > head/contrib/llvm/tools/clang/include/clang/Serialization/ASTWriter.h > head/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp > head/contrib/llvm/tools/clang/lib/AST/ASTDiagnostic.cpp > head/contrib/llvm/tools/clang/lib/AST/ASTImporter.cpp > head/contrib/llvm/tools/clang/lib/AST/CXXABI.h > head/contrib/llvm/tools/clang/lib/AST/CXXInheritance.cpp > head/contrib/llvm/tools/clang/lib/AST/Decl.cpp > head/contrib/llvm/tools/clang/lib/AST/DeclBase.cpp > head/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp > head/contrib/llvm/tools/clang/lib/AST/DeclObjC.cpp > head/contrib/llvm/tools/clang/lib/AST/DeclPrinter.cpp > head/contrib/llvm/tools/clang/lib/AST/DeclTemplate.cpp > head/contrib/llvm/tools/clang/lib/AST/DeclarationName.cpp > head/contrib/llvm/tools/clang/lib/AST/Expr.cpp > head/contrib/llvm/tools/clang/lib/AST/ExprCXX.cpp > head/contrib/llvm/tools/clang/lib/AST/ExprClassification.cpp > head/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp > head/contrib/llvm/tools/clang/lib/AST/InheritViz.cpp > head/contrib/llvm/tools/clang/lib/AST/ItaniumCXXABI.cpp > head/contrib/llvm/tools/clang/lib/AST/MicrosoftCXXABI.cpp > head/contrib/llvm/tools/clang/lib/AST/NestedNameSpecifier.cpp > head/contrib/llvm/tools/clang/lib/AST/ParentMap.cpp > head/contrib/llvm/tools/clang/lib/AST/RecordLayout.cpp > head/contrib/llvm/tools/clang/lib/AST/RecordLayoutBuilder.cpp > head/contrib/llvm/tools/clang/lib/AST/Stmt.cpp > head/contrib/llvm/tools/clang/lib/AST/StmtDumper.cpp > head/contrib/llvm/tools/clang/lib/AST/StmtIterator.cpp > head/contrib/llvm/tools/clang/lib/AST/StmtPrinter.cpp > head/contrib/llvm/tools/clang/lib/AST/StmtProfile.cpp > head/contrib/llvm/tools/clang/lib/AST/TemplateBase.cpp > head/contrib/llvm/tools/clang/lib/AST/TemplateName.cpp > head/contrib/llvm/tools/clang/lib/AST/Type.cpp > head/contrib/llvm/tools/clang/lib/AST/TypeLoc.cpp > head/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp > head/contrib/llvm/tools/clang/lib/Analysis/AnalysisContext.cpp > head/contrib/llvm/tools/clang/lib/Analysis/CFG.cpp > head/contrib/llvm/tools/clang/lib/Analysis/CFGStmtMap.cpp > head/contrib/llvm/tools/clang/lib/Analysis/FormatString.cpp > head/contrib/llvm/tools/clang/lib/Analysis/LiveVariables.cpp > head/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp > head/contrib/llvm/tools/clang/lib/Analysis/PseudoConstantAnalysis.cpp > head/contrib/llvm/tools/clang/lib/Analysis/ReachableCode.cpp > head/contrib/llvm/tools/clang/lib/Analysis/UninitializedValues.cpp > head/contrib/llvm/tools/clang/lib/Basic/Builtins.cpp > head/contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp > head/contrib/llvm/tools/clang/lib/Basic/FileManager.cpp > head/contrib/llvm/tools/clang/lib/Basic/IdentifierTable.cpp > head/contrib/llvm/tools/clang/lib/Basic/SourceLocation.cpp > head/contrib/llvm/tools/clang/lib/Basic/SourceManager.cpp > head/contrib/llvm/tools/clang/lib/Basic/TargetInfo.cpp > head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp > head/contrib/llvm/tools/clang/lib/Basic/Version.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h > head/contrib/llvm/tools/clang/lib/CodeGen/BackendUtil.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.h > head/contrib/llvm/tools/clang/lib/CodeGen/CGBuiltin.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGCXX.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.h > head/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGClass.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.h > head/contrib/llvm/tools/clang/lib/CodeGen/CGDecl.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGDeclCXX.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGException.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGException.h > head/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGExprCXX.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGExprComplex.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGExprConstant.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGExprScalar.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGObjC.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCGNU.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCMac.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGObjCRuntime.h > head/contrib/llvm/tools/clang/lib/CodeGen/CGRTTI.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGRecordLayout.h > head/contrib/llvm/tools/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGStmt.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGTemporaries.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGVTT.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.h > head/contrib/llvm/tools/clang/lib/CodeGen/CGValue.h > head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenAction.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.h > head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.h > head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.h > head/contrib/llvm/tools/clang/lib/CodeGen/GlobalDecl.h > head/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/MicrosoftCXXABI.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/ModuleBuilder.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp > head/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.h > head/contrib/llvm/tools/clang/lib/Driver/Action.cpp > head/contrib/llvm/tools/clang/lib/Driver/Arg.cpp > head/contrib/llvm/tools/clang/lib/Driver/ArgList.cpp > head/contrib/llvm/tools/clang/lib/Driver/Compilation.cpp > head/contrib/llvm/tools/clang/lib/Driver/Driver.cpp > head/contrib/llvm/tools/clang/lib/Driver/DriverOptions.cpp > head/contrib/llvm/tools/clang/lib/Driver/HostInfo.cpp > head/contrib/llvm/tools/clang/lib/Driver/Job.cpp > head/contrib/llvm/tools/clang/lib/Driver/OptTable.cpp > head/contrib/llvm/tools/clang/lib/Driver/Option.cpp > head/contrib/llvm/tools/clang/lib/Driver/Phases.cpp > head/contrib/llvm/tools/clang/lib/Driver/Tool.cpp > head/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp > head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp > head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h > head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp > head/contrib/llvm/tools/clang/lib/Driver/Tools.h > head/contrib/llvm/tools/clang/lib/Driver/Types.cpp > head/contrib/llvm/tools/clang/lib/Frontend/ASTConsumers.cpp > head/contrib/llvm/tools/clang/lib/Frontend/ASTMerge.cpp > head/contrib/llvm/tools/clang/lib/Frontend/ASTUnit.cpp > head/contrib/llvm/tools/clang/lib/Frontend/CacheTokens.cpp > head/contrib/llvm/tools/clang/lib/Frontend/CompilerInstance.cpp > head/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp > head/contrib/llvm/tools/clang/lib/Frontend/DeclXML.cpp > head/contrib/llvm/tools/clang/lib/Frontend/DependencyFile.cpp > head/contrib/llvm/tools/clang/lib/Frontend/DocumentXML.cpp > head/contrib/llvm/tools/clang/lib/Frontend/FrontendAction.cpp > head/contrib/llvm/tools/clang/lib/Frontend/FrontendActions.cpp > head/contrib/llvm/tools/clang/lib/Frontend/FrontendOptions.cpp > head/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp > head/contrib/llvm/tools/clang/lib/Frontend/InitPreprocessor.cpp > head/contrib/llvm/tools/clang/lib/Frontend/PrintPreprocessedOutput.cpp > head/contrib/llvm/tools/clang/lib/Frontend/StmtXML.cpp > head/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticBuffer.cpp > head/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticPrinter.cpp > head/contrib/llvm/tools/clang/lib/Frontend/TypeXML.cpp > head/contrib/llvm/tools/clang/lib/Frontend/VerifyDiagnosticsClient.cpp > head/contrib/llvm/tools/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp > head/contrib/llvm/tools/clang/lib/Headers/altivec.h > head/contrib/llvm/tools/clang/lib/Headers/emmintrin.h > head/contrib/llvm/tools/clang/lib/Headers/limits.h > head/contrib/llvm/tools/clang/lib/Headers/mm_malloc.h > head/contrib/llvm/tools/clang/lib/Headers/mmintrin.h > head/contrib/llvm/tools/clang/lib/Headers/stdbool.h > head/contrib/llvm/tools/clang/lib/Headers/stddef.h > head/contrib/llvm/tools/clang/lib/Headers/xmmintrin.h > head/contrib/llvm/tools/clang/lib/Index/ASTVisitor.h > head/contrib/llvm/tools/clang/lib/Index/CallGraph.cpp > head/contrib/llvm/tools/clang/lib/Lex/HeaderMap.cpp > head/contrib/llvm/tools/clang/lib/Lex/HeaderSearch.cpp > head/contrib/llvm/tools/clang/lib/Lex/Lexer.cpp > head/contrib/llvm/tools/clang/lib/Lex/LiteralSupport.cpp > head/contrib/llvm/tools/clang/lib/Lex/MacroInfo.cpp > head/contrib/llvm/tools/clang/lib/Lex/PPDirectives.cpp > head/contrib/llvm/tools/clang/lib/Lex/PPExpressions.cpp > head/contrib/llvm/tools/clang/lib/Lex/PPLexerChange.cpp > head/contrib/llvm/tools/clang/lib/Lex/PPMacroExpansion.cpp > head/contrib/llvm/tools/clang/lib/Lex/PTHLexer.cpp > head/contrib/llvm/tools/clang/lib/Lex/Pragma.cpp > head/contrib/llvm/tools/clang/lib/Lex/PreprocessingRecord.cpp > head/contrib/llvm/tools/clang/lib/Lex/Preprocessor.cpp > head/contrib/llvm/tools/clang/lib/Lex/TokenConcatenation.cpp > head/contrib/llvm/tools/clang/lib/Lex/TokenLexer.cpp > head/contrib/llvm/tools/clang/lib/Parse/ParseAST.cpp > head/contrib/llvm/tools/clang/lib/Parse/ParseCXXInlineMethods.cpp > head/contrib/llvm/tools/clang/lib/Parse/ParseDecl.cpp > head/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp > head/contrib/llvm/tools/clang/lib/Parse/ParseExpr.cpp > head/contrib/llvm/tools/clang/lib/Parse/ParseExprCXX.cpp > head/contrib/llvm/tools/clang/lib/Parse/ParseInit.cpp > head/contrib/llvm/tools/clang/lib/Parse/ParseObjc.cpp > head/contrib/llvm/tools/clang/lib/Parse/ParsePragma.cpp > head/contrib/llvm/tools/clang/lib/Parse/ParsePragma.h > head/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp > head/contrib/llvm/tools/clang/lib/Parse/ParseTemplate.cpp > head/contrib/llvm/tools/clang/lib/Parse/ParseTentative.cpp > head/contrib/llvm/tools/clang/lib/Parse/Parser.cpp > head/contrib/llvm/tools/clang/lib/Parse/RAIIObjectsForParser.h > head/contrib/llvm/tools/clang/lib/Rewrite/FixItRewriter.cpp > head/contrib/llvm/tools/clang/lib/Rewrite/FrontendActions.cpp > head/contrib/llvm/tools/clang/lib/Rewrite/HTMLRewrite.cpp > head/contrib/llvm/tools/clang/lib/Rewrite/RewriteMacros.cpp > head/contrib/llvm/tools/clang/lib/Rewrite/RewriteObjC.cpp > head/contrib/llvm/tools/clang/lib/Rewrite/RewriteRope.cpp > head/contrib/llvm/tools/clang/lib/Rewrite/TokenRewriter.cpp > head/contrib/llvm/tools/clang/lib/Sema/AnalysisBasedWarnings.cpp > head/contrib/llvm/tools/clang/lib/Sema/AttributeList.cpp > head/contrib/llvm/tools/clang/lib/Sema/CodeCompleteConsumer.cpp > head/contrib/llvm/tools/clang/lib/Sema/DeclSpec.cpp > head/contrib/llvm/tools/clang/lib/Sema/JumpDiagnostics.cpp > head/contrib/llvm/tools/clang/lib/Sema/Sema.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaAccess.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaAttr.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaCXXCast.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaCXXScopeSpec.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaCodeComplete.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaDeclObjC.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaExceptionSpec.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaExprObjC.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaLookup.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaObjCProperty.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaOverload.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaStmt.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateDeduction.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiate.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp > head/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp > head/contrib/llvm/tools/clang/lib/Sema/TargetAttributesSema.cpp > head/contrib/llvm/tools/clang/lib/Sema/TreeTransform.h > head/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.cpp > head/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.h > head/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp > head/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp > head/contrib/llvm/tools/clang/lib/Serialization/ASTReaderStmt.cpp > head/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp > head/contrib/llvm/tools/clang/lib/Serialization/ASTWriterDecl.cpp > head/contrib/llvm/tools/clang/lib/Serialization/ASTWriterStmt.cpp > head/contrib/llvm/tools/clang/lib/Serialization/GeneratePCH.cpp > head/contrib/llvm/tools/clang/tools/driver/cc1_main.cpp > head/contrib/llvm/tools/clang/tools/driver/cc1as_main.cpp > head/contrib/llvm/tools/clang/tools/driver/driver.cpp > head/contrib/llvm/utils/TableGen/ARMDecoderEmitter.cpp > head/contrib/llvm/utils/TableGen/ARMDecoderEmitter.h > head/contrib/llvm/utils/TableGen/AsmMatcherEmitter.cpp > head/contrib/llvm/utils/TableGen/AsmWriterEmitter.cpp > head/contrib/llvm/utils/TableGen/AsmWriterInst.cpp > head/contrib/llvm/utils/TableGen/AsmWriterInst.h > head/contrib/llvm/utils/TableGen/CallingConvEmitter.cpp > head/contrib/llvm/utils/TableGen/ClangASTNodesEmitter.h > head/contrib/llvm/utils/TableGen/ClangAttrEmitter.cpp > head/contrib/llvm/utils/TableGen/ClangAttrEmitter.h > head/contrib/llvm/utils/TableGen/ClangDiagnosticsEmitter.cpp > head/contrib/llvm/utils/TableGen/CodeEmitterGen.cpp > head/contrib/llvm/utils/TableGen/CodeEmitterGen.h > head/contrib/llvm/utils/TableGen/CodeGenDAGPatterns.cpp > head/contrib/llvm/utils/TableGen/CodeGenDAGPatterns.h > head/contrib/llvm/utils/TableGen/CodeGenInstruction.cpp > head/contrib/llvm/utils/TableGen/CodeGenInstruction.h > head/contrib/llvm/utils/TableGen/CodeGenRegisters.h > head/contrib/llvm/utils/TableGen/CodeGenTarget.cpp > head/contrib/llvm/utils/TableGen/CodeGenTarget.h > head/contrib/llvm/utils/TableGen/DAGISelMatcher.cpp > head/contrib/llvm/utils/TableGen/DAGISelMatcher.h > head/contrib/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp > head/contrib/llvm/utils/TableGen/DAGISelMatcherGen.cpp > head/contrib/llvm/utils/TableGen/DAGISelMatcherOpt.cpp > head/contrib/llvm/utils/TableGen/DisassemblerEmitter.cpp > head/contrib/llvm/utils/TableGen/EDEmitter.cpp > head/contrib/llvm/utils/TableGen/FastISelEmitter.cpp > head/contrib/llvm/utils/TableGen/InstrEnumEmitter.cpp > head/contrib/llvm/utils/TableGen/InstrInfoEmitter.cpp > head/contrib/llvm/utils/TableGen/IntrinsicEmitter.cpp > head/contrib/llvm/utils/TableGen/LLVMCConfigurationEmitter.cpp > head/contrib/llvm/utils/TableGen/LLVMCConfigurationEmitter.h > head/contrib/llvm/utils/TableGen/NeonEmitter.cpp > head/contrib/llvm/utils/TableGen/NeonEmitter.h > head/contrib/llvm/utils/TableGen/Record.cpp > head/contrib/llvm/utils/TableGen/Record.h > head/contrib/llvm/utils/TableGen/RegisterInfoEmitter.cpp > head/contrib/llvm/utils/TableGen/SubtargetEmitter.cpp > head/contrib/llvm/utils/TableGen/SubtargetEmitter.h > head/contrib/llvm/utils/TableGen/TGLexer.cpp > head/contrib/llvm/utils/TableGen/TGLexer.h > head/contrib/llvm/utils/TableGen/TGParser.cpp > head/contrib/llvm/utils/TableGen/TGParser.h > head/contrib/llvm/utils/TableGen/TableGen.cpp > head/contrib/llvm/utils/TableGen/X86DisassemblerTables.cpp > head/contrib/llvm/utils/TableGen/X86ModRMFilters.h > head/contrib/llvm/utils/TableGen/X86RecognizableInstr.cpp > head/contrib/llvm/utils/TableGen/X86RecognizableInstr.h > head/etc/mtree/BSD.include.dist > head/lib/clang/Makefile > head/lib/clang/clang.build.mk > head/lib/clang/include/Makefile > head/lib/clang/include/clang/Basic/Version.inc > head/lib/clang/include/llvm/Config/AsmPrinters.def > head/lib/clang/include/llvm/Config/Disassemblers.def > head/lib/clang/include/llvm/Config/Targets.def > head/lib/clang/include/llvm/Config/config.h > head/lib/clang/include/llvm/Config/llvm-config.h > head/lib/clang/libclanganalysis/Makefile > head/lib/clang/libclangast/Makefile > head/lib/clang/libclangbasic/Makefile > head/lib/clang/libclangcodegen/Makefile > head/lib/clang/libclangfrontend/Makefile > head/lib/clang/libclanglex/Makefile > head/lib/clang/libclangsema/Makefile > head/lib/clang/libllvmanalysis/Makefile > head/lib/clang/libllvmarmcodegen/Makefile > head/lib/clang/libllvmasmprinter/Makefile > head/lib/clang/libllvmcodegen/Makefile > head/lib/clang/libllvmcore/Makefile > head/lib/clang/libllvmipo/Makefile > head/lib/clang/libllvmmc/Makefile > head/lib/clang/libllvmmcparser/Makefile > head/lib/clang/libllvmmipscodegen/Makefile > head/lib/clang/libllvmpowerpccodegen/Makefile > head/lib/clang/libllvmscalaropts/Makefile > head/lib/clang/libllvmsupport/Makefile > head/lib/clang/libllvmtarget/Makefile > head/lib/clang/libllvmx86codegen/Makefile > head/lib/libz/Makefile > head/sys/boot/i386/boot0/Makefile > head/sys/boot/i386/btx/btx/Makefile > head/sys/boot/i386/btx/btxldr/Makefile > head/sys/boot/i386/gptboot/Makefile > head/sys/boot/i386/gptzfsboot/Makefile > head/sys/boot/i386/libi386/Makefile > head/sys/boot/i386/pxeldr/Makefile > head/sys/boot/i386/zfsboot/Makefile > head/sys/boot/pc98/btx/btx/Makefile > head/sys/boot/pc98/btx/btxldr/Makefile > head/sys/conf/Makefile.amd64 > head/sys/conf/Makefile.i386 > head/sys/modules/bios/smapi/Makefile > head/sys/modules/linux/Makefile > head/usr.bin/clang/clang/Makefile > head/usr.bin/clang/tblgen/Makefile > Directory Properties: > head/contrib/llvm/ (props changed) > head/contrib/llvm/tools/clang/ (props changed) > > Modified: head/Makefile.inc1 > ============================================================================== > --- head/Makefile.inc1 Sun Feb 20 17:54:49 2011 (r218892) > +++ head/Makefile.inc1 Sun Feb 20 19:33:47 2011 (r218893) > @@ -974,7 +974,6 @@ _crunchgen= usr.sbin/crunch/crunchgen > # with different per-architecture default values. Always build tblgen. > _clang_tblgen= \ > lib/clang/libllvmsupport \ > - lib/clang/libllvmsystem \ > usr.bin/clang/tblgen > > .if ${MK_CDDL} != "no" > > Modified: head/ObsoleteFiles.inc > ============================================================================== > --- head/ObsoleteFiles.inc Sun Feb 20 17:54:49 2011 (r218892) > +++ head/ObsoleteFiles.inc Sun Feb 20 19:33:47 2011 (r218893) > @@ -38,6 +38,14 @@ > # xargs -n1 | sort | uniq -d; > # done > > +# 20110220: new clang import which bumps version from 2.8 to 2.9 > +OLD_FILES+=usr/include/clang/2.8/emmintrin.h > +OLD_FILES+=usr/include/clang/2.8/mm_malloc.h > +OLD_FILES+=usr/include/clang/2.8/mmintrin.h > +OLD_FILES+=usr/include/clang/2.8/pmmintrin.h > +OLD_FILES+=usr/include/clang/2.8/tmmintrin.h > +OLD_FILES+=usr/include/clang/2.8/xmmintrin.h > +OLD_DIRS+=usr/include/clang/2.8 > # 20110119: Remove SYSCTL_*X* sysctl additions. > OLD_FILES+=usr/share/man/man9/SYSCTL_XINT.9.gz \ > usr/share/man/man9/SYSCTL_XLONG.9.gz > > Modified: head/contrib/llvm/include/llvm-c/Core.h > ============================================================================== > --- head/contrib/llvm/include/llvm-c/Core.h Sun Feb 20 17:54:49 2011 (r218892) > +++ head/contrib/llvm/include/llvm-c/Core.h Sun Feb 20 19:33:47 2011 (r218893) > @@ -33,13 +33,14 @@ > #ifndef LLVM_C_CORE_H > #define LLVM_C_CORE_H > > -#include "llvm/System/DataTypes.h" > +#include "llvm/Support/DataTypes.h" > > #ifdef __cplusplus > > /* Need these includes to support the LLVM 'cast' template for the C++ 'wrap' > and 'unwrap' conversion functions. */ > #include "llvm/Module.h" > +#include "llvm/PassRegistry.h" > #include "llvm/Support/IRBuilder.h" > > extern "C" { > @@ -92,6 +93,9 @@ typedef struct LLVMOpaqueMemoryBuffer *L > /** See the llvm::PassManagerBase class. */ > typedef struct LLVMOpaquePassManager *LLVMPassManagerRef; > > +/** See the llvm::PassRegistry class. */ > +typedef struct LLVMOpaquePassRegistry *LLVMPassRegistryRef; > + > /** Used to get the users and usees of a Value. See the llvm::Use class. */ > typedef struct LLVMOpaqueUse *LLVMUseRef; > > @@ -204,7 +208,8 @@ typedef enum { > LLVMPointerTypeKind, /**< Pointers */ > LLVMOpaqueTypeKind, /**< Opaque: type with unknown structure */ > LLVMVectorTypeKind, /**< SIMD 'packed' format, or other vector type */ > - LLVMMetadataTypeKind /**< Metadata */ > + LLVMMetadataTypeKind, /**< Metadata */ > + LLVMX86_MMXTypeKind /**< X86 MMX */ > } LLVMTypeKind; > > typedef enum { > @@ -317,6 +322,7 @@ void LLVMSetTarget(LLVMModuleRef M, cons > LLVMBool LLVMAddTypeName(LLVMModuleRef M, const char *Name, LLVMTypeRef Ty); > void LLVMDeleteTypeName(LLVMModuleRef M, const char *Name); > LLVMTypeRef LLVMGetTypeByName(LLVMModuleRef M, const char *Name); > +const char *LLVMGetTypeName(LLVMModuleRef M, LLVMTypeRef Ty); > > /** See Module::dump. */ > void LLVMDumpModule(LLVMModuleRef M); > @@ -324,6 +330,9 @@ void LLVMDumpModule(LLVMModuleRef M); > /** See Module::setModuleInlineAsm. */ > void LLVMSetModuleInlineAsm(LLVMModuleRef M, const char *Asm); > > +/** See Module::getContext. */ > +LLVMContextRef LLVMGetModuleContext(LLVMModuleRef M); > + > /*===-- Types -------------------------------------------------------------===*/ > > /* LLVM types conform to the following hierarchy: > @@ -408,10 +417,12 @@ unsigned LLVMGetVectorSize(LLVMTypeRef V > LLVMTypeRef LLVMVoidTypeInContext(LLVMContextRef C); > LLVMTypeRef LLVMLabelTypeInContext(LLVMContextRef C); > LLVMTypeRef LLVMOpaqueTypeInContext(LLVMContextRef C); > +LLVMTypeRef LLVMX86MMXTypeInContext(LLVMContextRef C); > > LLVMTypeRef LLVMVoidType(void); > LLVMTypeRef LLVMLabelType(void); > LLVMTypeRef LLVMOpaqueType(void); > +LLVMTypeRef LLVMX86MMXType(void); > > /* Operations on type handles */ > LLVMTypeHandleRef LLVMCreateTypeHandle(LLVMTypeRef PotentiallyAbstractTy); > @@ -540,6 +551,9 @@ LLVMValueRef LLVMMDNode(LLVMValueRef *Va > /* Operations on scalar constants */ > LLVMValueRef LLVMConstInt(LLVMTypeRef IntTy, unsigned long long N, > LLVMBool SignExtend); > +LLVMValueRef LLVMConstIntOfArbitraryPrecision(LLVMTypeRef IntTy, > + unsigned NumWords, > + const uint64_t Words[]); > LLVMValueRef LLVMConstIntOfString(LLVMTypeRef IntTy, const char *Text, > uint8_t Radix); > LLVMValueRef LLVMConstIntOfStringAndSize(LLVMTypeRef IntTy, const char *Text, > @@ -1013,6 +1027,11 @@ LLVMBool LLVMCreateMemoryBufferWithSTDIN > char **OutMessage); > void LLVMDisposeMemoryBuffer(LLVMMemoryBufferRef MemBuf); > > +/*===-- Pass Registry -----------------------------------------------------===*/ > + > +/** Return the global pass registry, for use with initialization functions. > + See llvm::PassRegistry::getPassRegistry. */ > +LLVMPassRegistryRef LLVMGetGlobalPassRegistry(void); > > /*===-- Pass Managers -----------------------------------------------------===*/ > > @@ -1101,6 +1120,7 @@ namespace llvm { > DEFINE_SIMPLE_CONVERSION_FUNCTIONS(LLVMContext, LLVMContextRef ) > DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Use, LLVMUseRef ) > DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassManagerBase, LLVMPassManagerRef ) > + DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassRegistry, LLVMPassRegistryRef ) > /* LLVMModuleProviderRef exists for historical reasons, but now just holds a > * Module. > */ > > Modified: head/contrib/llvm/include/llvm-c/EnhancedDisassembly.h > ============================================================================== > --- head/contrib/llvm/include/llvm-c/EnhancedDisassembly.h Sun Feb 20 17:54:49 2011 (r218892) > +++ head/contrib/llvm/include/llvm-c/EnhancedDisassembly.h Sun Feb 20 19:33:47 2011 (r218893) > @@ -19,7 +19,7 @@ > #ifndef LLVM_C_ENHANCEDDISASSEMBLY_H > #define LLVM_C_ENHANCEDDISASSEMBLY_H > > -#include "llvm/System/DataTypes.h" > +#include "llvm/Support/DataTypes.h" > > #ifdef __cplusplus > extern "C" { > > Copied: head/contrib/llvm/include/llvm-c/Initialization.h (from r218888, vendor/llvm/dist/include/llvm-c/Initialization.h) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/contrib/llvm/include/llvm-c/Initialization.h Sun Feb 20 19:33:47 2011 (r218893, copy of r218888, vendor/llvm/dist/include/llvm-c/Initialization.h) > @@ -0,0 +1,40 @@ > +/*===-- llvm-c/Initialization.h - Initialization C Interface ------*- C -*-===*\ > +|* *| > +|* The LLVM Compiler Infrastructure *| > +|* *| > +|* This file is distributed under the University of Illinois Open Source *| > +|* License. See LICENSE.TXT for details. *| > +|* *| > +|*===----------------------------------------------------------------------===*| > +|* *| > +|* This header declares the C interface to LLVM initialization routines, *| > +|* which must be called before you can use the functionality provided by *| > +|* the corresponding LLVM library. *| > +|* *| > +\*===----------------------------------------------------------------------===*/ > + > +#ifndef LLVM_C_INITIALIZEPASSES_H > +#define LLVM_C_INITIALIZEPASSES_H > + > +#include "llvm-c/Core.h" > + > +#ifdef __cplusplus > +extern "C" { > +#endif > + > +void LLVMInitializeCore(LLVMPassRegistryRef R); > +void LLVMInitializeTransformUtils(LLVMPassRegistryRef R); > +void LLVMInitializeScalarOpts(LLVMPassRegistryRef R); > +void LLVMInitializeInstCombine(LLVMPassRegistryRef R); > +void LLVMInitializeIPO(LLVMPassRegistryRef R); > +void LLVMInitializeInstrumentation(LLVMPassRegistryRef R); > +void LLVMInitializeAnalysis(LLVMPassRegistryRef R); > +void LLVMInitializeIPA(LLVMPassRegistryRef R); > +void LLVMInitializeCodeGen(LLVMPassRegistryRef R); > +void LLVMInitializeTarget(LLVMPassRegistryRef R); > + > +#ifdef __cplusplus > +} > +#endif > + > +#endif > > Modified: head/contrib/llvm/include/llvm-c/LinkTimeOptimizer.h > ============================================================================== > --- head/contrib/llvm/include/llvm-c/LinkTimeOptimizer.h Sun Feb 20 17:54:49 2011 (r218892) > +++ head/contrib/llvm/include/llvm-c/LinkTimeOptimizer.h Sun Feb 20 19:33:47 2011 (r218893) > @@ -8,7 +8,7 @@ > //===----------------------------------------------------------------------===// > // > // This header provides a C API to use the LLVM link time optimization > -// library. This is inteded to be used by linkers which are C-only in > +// library. This is intended to be used by linkers which are C-only in > // their implementation for performing LTO. > // > //===----------------------------------------------------------------------===// > > Modified: head/contrib/llvm/include/llvm-c/Transforms/Scalar.h > ============================================================================== > --- head/contrib/llvm/include/llvm-c/Transforms/Scalar.h Sun Feb 20 17:54:49 2011 (r218892) > +++ head/contrib/llvm/include/llvm-c/Transforms/Scalar.h Sun Feb 20 19:33:47 2011 (r218893) > @@ -52,9 +52,6 @@ void LLVMAddLICMPass(LLVMPassManagerRef > /** See llvm::createLoopDeletionPass function. */ > void LLVMAddLoopDeletionPass(LLVMPassManagerRef PM); > > -/** See llvm::createLoopIndexSplitPass function. */ > -void LLVMAddLoopIndexSplitPass(LLVMPassManagerRef PM); > - > /** See llvm::createLoopRotatePass function. */ > void LLVMAddLoopRotatePass(LLVMPassManagerRef PM); > > > Modified: head/contrib/llvm/include/llvm-c/lto.h > ============================================================================== > --- head/contrib/llvm/include/llvm-c/lto.h Sun Feb 20 17:54:49 2011 (r218892) > +++ head/contrib/llvm/include/llvm-c/lto.h Sun Feb 20 19:33:47 2011 (r218893) > @@ -18,27 +18,28 @@ > > #include > #include > -#include "llvm/System/DataTypes.h" > +#include > > -#define LTO_API_VERSION 3 > +#define LTO_API_VERSION 4 > > typedef enum { > - LTO_SYMBOL_ALIGNMENT_MASK = 0x0000001F, /* log2 of alignment */ > - LTO_SYMBOL_PERMISSIONS_MASK = 0x000000E0, > - LTO_SYMBOL_PERMISSIONS_CODE = 0x000000A0, > - LTO_SYMBOL_PERMISSIONS_DATA = 0x000000C0, > - LTO_SYMBOL_PERMISSIONS_RODATA = 0x00000080, > - LTO_SYMBOL_DEFINITION_MASK = 0x00000700, > - LTO_SYMBOL_DEFINITION_REGULAR = 0x00000100, > - LTO_SYMBOL_DEFINITION_TENTATIVE = 0x00000200, > - LTO_SYMBOL_DEFINITION_WEAK = 0x00000300, > - LTO_SYMBOL_DEFINITION_UNDEFINED = 0x00000400, > - LTO_SYMBOL_DEFINITION_WEAKUNDEF = 0x00000500, > - LTO_SYMBOL_SCOPE_MASK = 0x00003800, > - LTO_SYMBOL_SCOPE_INTERNAL = 0x00000800, > - LTO_SYMBOL_SCOPE_HIDDEN = 0x00001000, > - LTO_SYMBOL_SCOPE_PROTECTED = 0x00002000, > - LTO_SYMBOL_SCOPE_DEFAULT = 0x00001800 > + LTO_SYMBOL_ALIGNMENT_MASK = 0x0000001F, /* log2 of alignment */ > + LTO_SYMBOL_PERMISSIONS_MASK = 0x000000E0, > + LTO_SYMBOL_PERMISSIONS_CODE = 0x000000A0, > + LTO_SYMBOL_PERMISSIONS_DATA = 0x000000C0, > + LTO_SYMBOL_PERMISSIONS_RODATA = 0x00000080, > + LTO_SYMBOL_DEFINITION_MASK = 0x00000700, > + LTO_SYMBOL_DEFINITION_REGULAR = 0x00000100, > + LTO_SYMBOL_DEFINITION_TENTATIVE = 0x00000200, > + LTO_SYMBOL_DEFINITION_WEAK = 0x00000300, > + LTO_SYMBOL_DEFINITION_UNDEFINED = 0x00000400, > + LTO_SYMBOL_DEFINITION_WEAKUNDEF = 0x00000500, > + LTO_SYMBOL_SCOPE_MASK = 0x00003800, > + LTO_SYMBOL_SCOPE_INTERNAL = 0x00000800, > + LTO_SYMBOL_SCOPE_HIDDEN = 0x00001000, > + LTO_SYMBOL_SCOPE_PROTECTED = 0x00002000, > + LTO_SYMBOL_SCOPE_DEFAULT = 0x00001800, > + LTO_SYMBOL_SCOPE_DEFAULT_CAN_BE_HIDDEN = 0x00002800 > } lto_symbol_attributes; > > typedef enum { > @@ -121,6 +122,13 @@ lto_module_create(const char* path); > extern lto_module_t > lto_module_create_from_memory(const void* mem, size_t length); > > +/** > + * Loads an object file from disk. The seek point of fd is not preserved. > + * Returns NULL on error (check lto_get_error_message() for details). > + */ > +extern lto_module_t > +lto_module_create_from_fd(int fd, const char *path, off_t size); > + > > /** > * Frees all memory internally allocated by the module. > @@ -146,7 +154,7 @@ lto_module_set_target_triple(lto_module_ > /** > * Returns the number of symbols in the object module. > */ > -extern uint32_t > +extern unsigned int > lto_module_get_num_symbols(lto_module_t mod); > > > @@ -154,14 +162,14 @@ lto_module_get_num_symbols(lto_module_t > * Returns the name of the ith symbol in the object module. > */ > extern const char* > -lto_module_get_symbol_name(lto_module_t mod, uint32_t index); > +lto_module_get_symbol_name(lto_module_t mod, unsigned int index); > > > /** > * Returns the attributes of the ith symbol in the object module. > */ > extern lto_symbol_attributes > -lto_module_get_symbol_attribute(lto_module_t mod, uint32_t index); > +lto_module_get_symbol_attribute(lto_module_t mod, unsigned int index); > > > /** > > Modified: head/contrib/llvm/include/llvm/ADT/APFloat.h > ============================================================================== > --- head/contrib/llvm/include/llvm/ADT/APFloat.h Sun Feb 20 17:54:49 2011 (r218892) > +++ head/contrib/llvm/include/llvm/ADT/APFloat.h Sun Feb 20 19:33:47 2011 (r218893) > @@ -246,6 +246,13 @@ namespace llvm { > static APFloat getSmallestNormalized(const fltSemantics &Sem, > bool Negative = false); > > + /// getAllOnesValue - Returns a float which is bitcasted from > + /// an all one value int. > + /// > + /// \param BitWidth - Select float type > + /// \param isIEEE - If 128 bit number, select between PPC and IEEE > + static APFloat getAllOnesValue(unsigned BitWidth, bool isIEEE = false); > + > /// Profile - Used to insert APFloat objects, or objects that contain > /// APFloat objects, into FoldingSets. > void Profile(FoldingSetNodeID& NID) const; > > Modified: head/contrib/llvm/include/llvm/ADT/APInt.h > ============================================================================== > --- head/contrib/llvm/include/llvm/ADT/APInt.h Sun Feb 20 17:54:49 2011 (r218892) > +++ head/contrib/llvm/include/llvm/ADT/APInt.h Sun Feb 20 19:33:47 2011 (r218893) > @@ -275,12 +275,6 @@ public: > /// objects, into FoldingSets. > void Profile(FoldingSetNodeID& id) const; > > - /// @brief Used by the Bitcode serializer to emit APInts to Bitcode. > - void Emit(Serializer& S) const; > - > - /// @brief Used by the Bitcode deserializer to deserialize APInts. > - void Read(Deserializer& D); > - > /// @} > /// @name Value Tests > /// @{ > @@ -302,7 +296,7 @@ public: > /// @returns true if this APInt is positive. > /// @brief Determine if this APInt Value is positive. > bool isStrictlyPositive() const { > - return isNonNegative() && (*this) != 0; > + return isNonNegative() && !!*this; > } > > /// This checks to see if the value has all bits of the APInt are set or not. > @@ -330,15 +324,14 @@ public: > /// value for the APInt's bit width. > /// @brief Determine if this is the smallest unsigned value. > bool isMinValue() const { > - return countPopulation() == 0; > + return !*this; > } > > /// This checks to see if the value of this APInt is the minimum signed > /// value for the APInt's bit width. > /// @brief Determine if this is the smallest signed value. > bool isMinSignedValue() const { > - return BitWidth == 1 ? VAL == 1 : > - isNegative() && countPopulation() == 1; > + return BitWidth == 1 ? VAL == 1 : isNegative() && isPowerOf2(); > } > > /// @brief Check if this APInt has an N-bits unsigned integer value. > @@ -348,10 +341,8 @@ public: > return true; > > if (isSingleWord()) > - return VAL == (VAL & (~0ULL >> (64 - N))); > - APInt Tmp(N, getNumWords(), pVal); > - Tmp.zext(getBitWidth()); > - return Tmp == (*this); > + return isUIntN(N, VAL); > + return APInt(N, getNumWords(), pVal).zext(getBitWidth()) == (*this); > } > > /// @brief Check if this APInt has an N-bits signed integer value. > @@ -361,7 +352,11 @@ public: > } > > /// @returns true if the argument APInt value is a power of two > 0. > - bool isPowerOf2() const; > + bool isPowerOf2() const { > + if (isSingleWord()) > + return isPowerOf2_64(VAL); > + return countPopulationSlowCase() == 1; > + } > > /// isSignBit - Return true if this is the value returned by getSignBit. > bool isSignBit() const { return isMinSignedValue(); } > @@ -369,7 +364,7 @@ public: > /// This converts the APInt to a boolean value as a test against zero. > /// @brief Boolean conversion function. > bool getBoolValue() const { > - return *this != 0; > + return !!*this; > } > > /// getLimitedValue - If this value is smaller than the specified limit, > @@ -385,12 +380,14 @@ public: > /// @{ > /// @brief Gets maximum unsigned value of APInt for specific bit width. > static APInt getMaxValue(unsigned numBits) { > - return APInt(numBits, 0).set(); > + return getAllOnesValue(numBits); > } > > /// @brief Gets maximum signed value of APInt for a specific bit width. > static APInt getSignedMaxValue(unsigned numBits) { > - return APInt(numBits, 0).set().clear(numBits - 1); > + APInt API = getAllOnesValue(numBits); > + API.clearBit(numBits - 1); > + return API; > } > > /// @brief Gets minimum unsigned value of APInt for a specific bit width. > @@ -400,7 +397,9 @@ public: > > /// @brief Gets minimum signed value of APInt for a specific bit width. > static APInt getSignedMinValue(unsigned numBits) { > - return APInt(numBits, 0).set(numBits - 1); > + APInt API(numBits, 0); > + API.setBit(numBits - 1); > + return API; > } > > /// getSignBit - This is just a wrapper function of getSignedMinValue(), and > @@ -413,7 +412,7 @@ public: > /// @returns the all-ones value for an APInt of the specified bit-width. > /// @brief Get the all-ones value. > static APInt getAllOnesValue(unsigned numBits) { > - return APInt(numBits, 0).set(); > + return APInt(numBits, -1ULL, true); > } > > /// @returns the '0' value for an APInt of the specified bit-width. > @@ -432,6 +431,13 @@ public: > /// @returns the low "numBits" bits of this APInt. > APInt getLoBits(unsigned numBits) const; > > + /// getOneBitSet - Return an APInt with exactly one bit set in the result. > + static APInt getOneBitSet(unsigned numBits, unsigned BitNo) { > + APInt Res(numBits, 0); > + Res.setBit(BitNo); > + return Res; > + } > + > /// Constructs an APInt value that has a contiguous range of bits set. The > /// bits from loBit (inclusive) to hiBit (exclusive) will be set. All other > /// bits will be zero. For example, with parameters(32, 0, 16) you would get > @@ -530,7 +536,7 @@ public: > /// @brief Unary bitwise complement operator. > APInt operator~() const { > APInt Result(*this); > - Result.flip(); > + Result.flipAllBits(); > return Result; > } > > @@ -741,11 +747,11 @@ public: > /// RHS are treated as unsigned quantities for purposes of this division. > /// @returns a new APInt value containing the division result > /// @brief Unsigned division operation. > - APInt udiv(const APInt& RHS) const; > + APInt udiv(const APInt &RHS) const; > > /// Signed divide this APInt by APInt RHS. > /// @brief Signed division function for APInt. > - APInt sdiv(const APInt& RHS) const { > + APInt sdiv(const APInt &RHS) const { > if (isNegative()) > if (RHS.isNegative()) > return (-(*this)).udiv(-RHS); > @@ -763,11 +769,11 @@ public: > /// which is *this. > /// @returns a new APInt value containing the remainder result > /// @brief Unsigned remainder operation. > - APInt urem(const APInt& RHS) const; > + APInt urem(const APInt &RHS) const; > > /// Signed remainder operation on APInt. > /// @brief Function for signed remainder operation. > - APInt srem(const APInt& RHS) const { > + APInt srem(const APInt &RHS) const { > if (isNegative()) > if (RHS.isNegative()) > return -((-(*this)).urem(-RHS)); > @@ -788,8 +794,7 @@ public: > APInt &Quotient, APInt &Remainder); > > static void sdivrem(const APInt &LHS, const APInt &RHS, > - APInt &Quotient, APInt &Remainder) > - { > + APInt &Quotient, APInt &Remainder) { > if (LHS.isNegative()) { > if (RHS.isNegative()) > APInt::udivrem(-LHS, -RHS, Quotient, Remainder); > @@ -804,6 +809,16 @@ public: > APInt::udivrem(LHS, RHS, Quotient, Remainder); > } > } > + > + > + // Operations that return overflow indicators. > + APInt sadd_ov(const APInt &RHS, bool &Overflow) const; > + APInt uadd_ov(const APInt &RHS, bool &Overflow) const; > + APInt ssub_ov(const APInt &RHS, bool &Overflow) const; > + APInt usub_ov(const APInt &RHS, bool &Overflow) const; > + APInt sdiv_ov(const APInt &RHS, bool &Overflow) const; > + APInt smul_ov(const APInt &RHS, bool &Overflow) const; > + APInt sshl_ov(unsigned Amt, bool &Overflow) const; > > /// @returns the bit value at bitPosition > /// @brief Array-indexing support. > @@ -868,7 +883,7 @@ public: > /// the validity of the less-than relationship. > /// @returns true if *this < RHS when both are considered unsigned. > /// @brief Unsigned less than comparison > - bool ult(const APInt& RHS) const; > + bool ult(const APInt &RHS) const; > > /// Regards both *this as an unsigned quantity and compares it with RHS for > /// the validity of the less-than relationship. > @@ -988,6 +1003,9 @@ public: > return sge(APInt(getBitWidth(), RHS)); > } > > + > + > + > /// This operation tests if there are any pairs of corresponding bits > /// between this APInt and RHS that are both set. > bool intersects(const APInt &RHS) const { > @@ -1000,80 +1018,78 @@ public: > /// Truncate the APInt to a specified width. It is an error to specify a width > /// that is greater than or equal to the current width. > /// @brief Truncate to new width. > - APInt &trunc(unsigned width); > + APInt trunc(unsigned width) const; > > /// This operation sign extends the APInt to a new width. If the high order > /// bit is set, the fill on the left will be done with 1 bits, otherwise zero. > /// It is an error to specify a width that is less than or equal to the > /// current width. > /// @brief Sign extend to a new width. > - APInt &sext(unsigned width); > + APInt sext(unsigned width) const; > > /// This operation zero extends the APInt to a new width. The high order bits > /// are filled with 0 bits. It is an error to specify a width that is less > /// than or equal to the current width. > /// @brief Zero extend to a new width. > - APInt &zext(unsigned width); > + APInt zext(unsigned width) const; > > /// Make this APInt have the bit width given by \p width. The value is sign > /// extended, truncated, or left alone to make it that width. > /// @brief Sign extend or truncate to width > - APInt &sextOrTrunc(unsigned width); > + APInt sextOrTrunc(unsigned width) const; > > /// Make this APInt have the bit width given by \p width. The value is zero > /// extended, truncated, or left alone to make it that width. > /// @brief Zero extend or truncate to width > - APInt &zextOrTrunc(unsigned width); > + APInt zextOrTrunc(unsigned width) const; > > /// @} > /// @name Bit Manipulation Operators > /// @{ > /// @brief Set every bit to 1. > - APInt& set() { > - if (isSingleWord()) { > + void setAllBits() { > + if (isSingleWord()) > VAL = -1ULL; > - return clearUnusedBits(); > + else { > + // Set all the bits in all the words. > + for (unsigned i = 0; i < getNumWords(); ++i) > + pVal[i] = -1ULL; > } > - > - // Set all the bits in all the words. > - for (unsigned i = 0; i < getNumWords(); ++i) > - pVal[i] = -1ULL; > // Clear the unused ones > - return clearUnusedBits(); > + clearUnusedBits(); > } > > /// Set the given bit to 1 whose position is given as "bitPosition". > /// @brief Set a given bit to 1. > - APInt& set(unsigned bitPosition); > + void setBit(unsigned bitPosition); > > /// @brief Set every bit to 0. > - APInt& clear() { > + void clearAllBits() { > if (isSingleWord()) > VAL = 0; > else > memset(pVal, 0, getNumWords() * APINT_WORD_SIZE); > - return *this; > } > > /// Set the given bit to 0 whose position is given as "bitPosition". > /// @brief Set a given bit to 0. > - APInt& clear(unsigned bitPosition); > + void clearBit(unsigned bitPosition); > > /// @brief Toggle every bit to its opposite value. > - APInt& flip() { > - if (isSingleWord()) { > + void flipAllBits() { > + if (isSingleWord()) > VAL ^= -1ULL; > - return clearUnusedBits(); > + else { > + for (unsigned i = 0; i < getNumWords(); ++i) > + pVal[i] ^= -1ULL; > } > - for (unsigned i = 0; i < getNumWords(); ++i) > - pVal[i] ^= -1ULL; > - return clearUnusedBits(); > + clearUnusedBits(); > } > > /// Toggle a given bit to its opposite value whose position is given > /// as "bitPosition". > /// @brief Toggles a given bit to its opposite value. > - APInt& flip(unsigned bitPosition); > + void flipBit(unsigned bitPosition); > > /// @} > /// @name Value Characterization Functions > @@ -1281,37 +1297,27 @@ public: > } > > /// The conversion does not do a translation from double to integer, it just > - /// re-interprets the bits of the double. Note that it is valid to do this on > - /// any bit width but bits from V may get truncated. > + /// re-interprets the bits of the double. > /// @brief Converts a double to APInt bits. > - APInt& doubleToBits(double V) { > + static APInt doubleToBits(double V) { > union { > uint64_t I; > double D; > } T; > T.D = V; > - if (isSingleWord()) > - VAL = T.I; > - else > - pVal[0] = T.I; > - return clearUnusedBits(); > + return APInt(sizeof T * CHAR_BIT, T.I); > } > > /// The conversion does not do a translation from float to integer, it just > - /// re-interprets the bits of the float. Note that it is valid to do this on > - /// any bit width but bits from V may get truncated. > + /// re-interprets the bits of the float. > /// @brief Converts a float to APInt bits. > - APInt& floatToBits(float V) { > + static APInt floatToBits(float V) { > union { > unsigned I; > float F; > } T; > T.F = V; > - if (isSingleWord()) > - VAL = T.I; > - else > - pVal[0] = T.I; > - return clearUnusedBits(); > + return APInt(sizeof T * CHAR_BIT, T.I); > } > > /// @} > > Modified: head/contrib/llvm/include/llvm/ADT/APSInt.h > ============================================================================== > --- head/contrib/llvm/include/llvm/ADT/APSInt.h Sun Feb 20 17:54:49 2011 (r218892) > +++ head/contrib/llvm/include/llvm/ADT/APSInt.h Sun Feb 20 19:33:47 2011 (r218893) > @@ -68,20 +68,22 @@ public: > } > using APInt::toString; > > - APSInt& extend(uint32_t width) { > + APSInt trunc(uint32_t width) const { > + return APSInt(APInt::trunc(width), IsUnsigned); > + } > + > + APSInt extend(uint32_t width) const { > if (IsUnsigned) > - zext(width); > + return APSInt(zext(width), IsUnsigned); > else > - sext(width); > - return *this; > + return APSInt(sext(width), IsUnsigned); > } > > - APSInt& extOrTrunc(uint32_t width) { > + APSInt extOrTrunc(uint32_t width) const { > if (IsUnsigned) > - zextOrTrunc(width); > + return APSInt(zextOrTrunc(width), IsUnsigned); > else > - sextOrTrunc(width); > - return *this; > + return APSInt(sextOrTrunc(width), IsUnsigned); > } > > const APSInt &operator%=(const APSInt &RHS) { > > Copied: head/contrib/llvm/include/llvm/ADT/ArrayRef.h (from r218888, vendor/llvm/dist/include/llvm/ADT/ArrayRef.h) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/contrib/llvm/include/llvm/ADT/ArrayRef.h Sun Feb 20 19:33:47 2011 (r218893, copy of r218888, vendor/llvm/dist/include/llvm/ADT/ArrayRef.h) > @@ -0,0 +1,121 @@ > +//===--- ArrayRef.h - Array Reference Wrapper -------------------*- C++ -*-===// > +// > +// The LLVM Compiler Infrastructure > +// > +// This file is distributed under the University of Illinois Open Source > +// License. See LICENSE.TXT for details. > +// > +//===----------------------------------------------------------------------===// > + > +#ifndef LLVM_ADT_ARRAYREF_H > +#define LLVM_ADT_ARRAYREF_H > + > +#include "llvm/ADT/SmallVector.h" > +#include > + > +namespace llvm { > + class APInt; > + > + /// ArrayRef - Represent a constant reference to an array (0 or more elements > + /// consecutively in memory), i.e. a start pointer and a length. It allows > + /// various APIs to take consecutive elements easily and conveniently. > + /// > + /// This class does not own the underlying data, it is expected to be used in > + /// situations where the data resides in some other buffer, whose lifetime > + /// extends past that of the StringRef. For this reason, it is not in general > + /// safe to store a ArrayRef. > + /// > + /// This is intended to be trivially copyable, so it should be passed by > + /// value. > + template > + class ArrayRef { > + public: > + typedef const T *iterator; > + typedef const T *const_iterator; > + typedef size_t size_type; > + > + private: > + /// The start of the array, in an external buffer. > + const T *Data; > + > + /// The number of elements. > + size_t Length; > + > + public: > + /// @name Constructors > + /// @{ > + > + /// Construct an empty ArrayRef. > + /*implicit*/ ArrayRef() : Data(0), Length(0) {} > + > + /// Construct an ArrayRef from a single element. > + /*implicit*/ ArrayRef(const T &OneElt) > + : Data(&OneElt), Length(1) {} > + > + /// Construct an ArrayRef from a pointer and length. > + /*implicit*/ ArrayRef(const T *data, size_t length) > + : Data(data), Length(length) {} > + > + /// Construct an ArrayRef from a SmallVector. > + /*implicit*/ ArrayRef(const SmallVectorImpl &Vec) > + : Data(Vec.data()), Length(Vec.size()) {} > + > + /// Construct an ArrayRef from a std::vector. > + /*implicit*/ ArrayRef(const std::vector &Vec) > + : Data(Vec.empty() ? (T*)0 : &Vec[0]), Length(Vec.size()) {} > + > + // TODO: C arrays. > + > + /// @} > + /// @name Simple Operations > + /// @{ > + > + iterator begin() const { return Data; } > + iterator end() const { return Data + Length; } > + > + /// empty - Check if the array is empty. > + bool empty() const { return Length == 0; } > + > + /// size - Get the array size. > + size_t size() const { return Length; } > + > + /// front - Get the first element. > + const T &front() const { > + assert(!empty()); > + return Data[0]; > + } > + > + /// back - Get the last element. > + const T &back() const { > + assert(!empty()); > + return Data[Length-1]; > + } > + > + /// @} > + /// @name Operator Overloads > + /// @{ > + > + const T &operator[](size_t Index) const { > + assert(Index < Length && "Invalid index!"); > + return Data[Index]; > + } > + > + /// @} > + /// @name Expensive Operations > + /// @{ > + > + std::vector vec() const { > + return std::vector(Data, Data+Length); > + } > + > + /// @} > + }; > + > + // ArrayRefs can be treated like a POD type. > + template struct isPodLike; > + template struct isPodLike > { > + static const bool value = true; > + }; > +} > + > +#endif > > Modified: head/contrib/llvm/include/llvm/ADT/BitVector.h > ============================================================================== > --- head/contrib/llvm/include/llvm/ADT/BitVector.h Sun Feb 20 17:54:49 2011 (r218892) > +++ head/contrib/llvm/include/llvm/ADT/BitVector.h Sun Feb 20 19:33:47 2011 (r218893) > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > #include > > namespace llvm { > @@ -77,7 +78,7 @@ public: > /// bits are initialized to the specified value. > explicit BitVector(unsigned s, bool t = false) : Size(s) { > Capacity = NumBitWords(s); > - Bits = new BitWord[Capacity]; > + Bits = (BitWord *)std::malloc(Capacity * sizeof(BitWord)); > init_words(Bits, Capacity, t); > if (t) > clear_unused_bits(); > @@ -92,12 +93,12 @@ public: > } > > Capacity = NumBitWords(RHS.size()); > - Bits = new BitWord[Capacity]; > - std::copy(RHS.Bits, &RHS.Bits[Capacity], Bits); > + Bits = (BitWord *)std::malloc(Capacity * sizeof(BitWord)); > + std::memcpy(Bits, RHS.Bits, Capacity * sizeof(BitWord)); > } > > ~BitVector() { > - delete[] Bits; > + std::free(Bits); > } > > /// empty - Tests whether there are no bits in this bitvector. > @@ -127,6 +128,12 @@ public: > return false; > } > > + /// all - Returns true if all bits are set. > + bool all() const { > + // TODO: Optimize this. > + return count() == size(); > + } > + > /// none - Returns true if none of the bits are set. > bool none() const { > return !any(); > @@ -335,18 +342,18 @@ public: > unsigned RHSWords = NumBitWords(Size); > if (Size <= Capacity * BITWORD_SIZE) { > if (Size) > - std::copy(RHS.Bits, &RHS.Bits[RHSWords], Bits); > + std::memcpy(Bits, RHS.Bits, RHSWords * sizeof(BitWord)); > clear_unused_bits(); > return *this; > } > > // Grow the bitvector to have enough elements. > Capacity = RHSWords; > - BitWord *NewBits = new BitWord[Capacity]; > - std::copy(RHS.Bits, &RHS.Bits[RHSWords], NewBits); > + BitWord *NewBits = (BitWord *)std::malloc(Capacity * sizeof(BitWord)); > + std::memcpy(NewBits, RHS.Bits, Capacity * sizeof(BitWord)); > > // Destroy the old bits. > - delete[] Bits; > + std::free(Bits); > Bits = NewBits; > > return *this; > @@ -384,17 +391,8 @@ private: > } > > void grow(unsigned NewSize) { > - unsigned OldCapacity = Capacity; > - Capacity = NumBitWords(NewSize); > - BitWord *NewBits = new BitWord[Capacity]; > - > - // Copy the old bits over. > - if (OldCapacity != 0) > - std::copy(Bits, &Bits[OldCapacity], NewBits); > - > - // Destroy the old bits. > - delete[] Bits; > - Bits = NewBits; > + Capacity = std::max(NumBitWords(NewSize), Capacity * 2); > + Bits = (BitWord *)std::realloc(Bits, Capacity * sizeof(BitWord)); > > clear_unused_bits(); > } > > Modified: head/contrib/llvm/include/llvm/ADT/DenseMap.h > ============================================================================== > --- head/contrib/llvm/include/llvm/ADT/DenseMap.h Sun Feb 20 17:54:49 2011 (r218892) > +++ head/contrib/llvm/include/llvm/ADT/DenseMap.h Sun Feb 20 19:33:47 2011 (r218893) > @@ -18,6 +18,7 @@ > #include "llvm/Support/PointerLikeTypeTraits.h" > #include "llvm/Support/type_traits.h" > #include "llvm/ADT/DenseMapInfo.h" > +#include > #include > #include > #include > @@ -385,7 +386,7 @@ private: > // Insert the key/value into the new table. > BucketT *DestBucket; > bool FoundVal = LookupBucketFor(B->first, DestBucket); > - FoundVal = FoundVal; // silence warning. > + (void)FoundVal; // silence warning. > assert(!FoundVal && "Key already in new map?"); > DestBucket->first = B->first; > new (&DestBucket->second) ValueT(B->second); > > Modified: head/contrib/llvm/include/llvm/ADT/DenseMapInfo.h > ============================================================================== > --- head/contrib/llvm/include/llvm/ADT/DenseMapInfo.h Sun Feb 20 17:54:49 2011 (r218892) > +++ head/contrib/llvm/include/llvm/ADT/DenseMapInfo.h Sun Feb 20 19:33:47 2011 (r218893) > @@ -102,6 +102,20 @@ template<> struct DenseMapInfo { > } > }; > > +// Provide DenseMapInfo for longs. > +template<> struct DenseMapInfo { > + static inline long getEmptyKey() { > + return (1UL << (sizeof(long) * 8 - 1)) - 1L; > + } > + static inline long getTombstoneKey() { return getEmptyKey() - 1L; } > + static unsigned getHashValue(const long& Val) { > + return (unsigned)(Val * 37L); > + } > + static bool isEqual(const long& LHS, const long& RHS) { > + return LHS == RHS; > + } > +}; > + > // Provide DenseMapInfo for long longs. > template<> struct DenseMapInfo { > static inline long long getEmptyKey() { return 0x7fffffffffffffffLL; } > > Modified: head/contrib/llvm/include/llvm/ADT/DenseSet.h > ============================================================================== > --- head/contrib/llvm/include/llvm/ADT/DenseSet.h Sun Feb 20 17:54:49 2011 (r218892) > +++ head/contrib/llvm/include/llvm/ADT/DenseSet.h Sun Feb 20 19:33:47 2011 (r218893) > @@ -33,6 +33,9 @@ public: > bool empty() const { return TheMap.empty(); } > unsigned size() const { return TheMap.size(); } > > + /// Grow the denseset so that it has at least Size buckets. Does not shrink > + void resize(size_t Size) { TheMap.resize(Size); } > + > void clear() { > TheMap.clear(); > } > > Modified: head/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h > ============================================================================== > --- head/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h Sun Feb 20 17:54:49 2011 (r218892) > +++ head/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h Sun Feb 20 19:33:47 2011 (r218893) > @@ -15,7 +15,7 @@ > #ifndef LLVM_ADT_EQUIVALENCECLASSES_H > #define LLVM_ADT_EQUIVALENCECLASSES_H > > -#include "llvm/System/DataTypes.h" > +#include "llvm/Support/DataTypes.h" > #include > #include > > > Modified: head/contrib/llvm/include/llvm/ADT/FoldingSet.h > ============================================================================== > --- head/contrib/llvm/include/llvm/ADT/FoldingSet.h Sun Feb 20 17:54:49 2011 (r218892) > +++ head/contrib/llvm/include/llvm/ADT/FoldingSet.h Sun Feb 20 19:33:47 2011 (r218893) > @@ -16,7 +16,7 @@ > #ifndef LLVM_ADT_FOLDINGSET_H > #define LLVM_ADT_FOLDINGSET_H > > -#include "llvm/System/DataTypes.h" > +#include "llvm/Support/DataTypes.h" > #include "llvm/ADT/SmallVector.h" > #include "llvm/ADT/StringRef.h" > > > Modified: head/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h > ============================================================================== > --- head/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h Sun Feb 20 17:54:49 2011 (r218892) > +++ head/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h Sun Feb 20 19:33:47 2011 (r218893) > @@ -94,7 +94,7 @@ public: > : ImutAVLFactory(Alloc) {} > > TreeTy *Add(TreeTy *T, value_type_ref V) { > - T = Add_internal(V,T); > + T = add_internal(V,T); > this->MarkImmutable(T); > return T; > > *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 21:58:08 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3DD24106564A; Sun, 20 Feb 2011 21:58:08 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2B4F18FC13; Sun, 20 Feb 2011 21:58:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1KLw88M046155; Sun, 20 Feb 2011 21:58:08 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1KLw8qC046153; Sun, 20 Feb 2011 21:58:08 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201102202158.p1KLw8qC046153@svn.freebsd.org> From: Dimitry Andric Date: Sun, 20 Feb 2011 21:58:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218894 - head/sys/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 21:58:08 -0000 Author: dim Date: Sun Feb 20 21:58:07 2011 New Revision: 218894 URL: http://svn.freebsd.org/changeset/base/218894 Log: Clang now supports profiling, so remove the part that says it doesn't from sys/conf/kern.pre.mk. Modified: head/sys/conf/kern.pre.mk Modified: head/sys/conf/kern.pre.mk ============================================================================== --- head/sys/conf/kern.pre.mk Sun Feb 20 19:33:47 2011 (r218893) +++ head/sys/conf/kern.pre.mk Sun Feb 20 21:58:07 2011 (r218894) @@ -109,8 +109,8 @@ WERROR?= -Werror ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 -.if ${CC:T:Micc} == "icc" || ${CC:T:Mclang} == "clang" -.error "Profiling doesn't work with icc or clang yet" +.if ${CC:T:Micc} == "icc" +.error "Profiling doesn't work with icc" .endif CFLAGS+= -DGPROF -falign-functions=16 .if ${PROFLEVEL} >= 2 From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 22:01:45 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 596E81065670; Sun, 20 Feb 2011 22:01:45 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) by mx1.freebsd.org (Postfix) with ESMTP id 365D78FC0C; Sun, 20 Feb 2011 22:01:45 +0000 (UTC) Received: from troutmask.apl.washington.edu (localhost.apl.washington.edu [127.0.0.1]) by troutmask.apl.washington.edu (8.14.4/8.14.4) with ESMTP id p1KM1i35056070; Sun, 20 Feb 2011 14:01:44 -0800 (PST) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.4/8.14.4/Submit) id p1KM1iLE056069; Sun, 20 Feb 2011 14:01:44 -0800 (PST) (envelope-from sgk) Date: Sun, 20 Feb 2011 14:01:44 -0800 From: Steve Kargl To: Dimitry Andric Message-ID: <20110220220144.GA56015@troutmask.apl.washington.edu> References: <201102182054.p1IKsDMx071986@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201102182054.p1IKsDMx071986@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218822 - in head: . contrib/binutils contrib/binutils/bfd contrib/binutils/bfd/doc contrib/binutils/bfd/po contrib/binutils/binutils contrib/binutils/binutils/doc contrib/binutils/binu... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 22:01:45 -0000 On Fri, Feb 18, 2011 at 08:54:13PM +0000, Dimitry Andric wrote: > Author: dim > Date: Fri Feb 18 20:54:12 2011 > New Revision: 218822 > URL: http://svn.freebsd.org/changeset/base/218822 > > Log: > Merge binutils 2.17.50 to head. This brings a number of improvements to > x86 CPU support, better support for powerpc64, some new directives, and > many other things. Bump __FreeBSD_version, and add a note to UPDATING. > > Thanks to the many people that have helped to test this. This commit appears to be causing laptop:kargl[205] ~/work/bin/gfortran -o z a.f /usr/bin/ld: error in /usr/home/kargl/work/lib/gcc/i386-unknown-freebsd9.0/4.6.0/crtend.o(.eh_frame); no .eh_frame_hdr table will be created. and laptop:kargl[208] ~/work/bin/gcc -o z h.c /usr/bin/ld: error in /usr/home/kargl/work/lib/gcc/i386-unknown-freebsd9.0/4.6.0/crtend.o(.eh_frame); no .eh_frame_hdr table will be created. Note an executable is created and it appears to work. laptop:kargl[213] ./z Hello world Unfortunately, one can no longer run the GCC testsuite because the testsuite is not expecting the /usr/bin/ld message. So, is there an patch that needs to been sent upstream to GCC to fix crtend.o? Or. can you fix /usr/bin/ld to not emit this seemingly harmless message? -- steve From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 22:09:45 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0D8F106564A; Sun, 20 Feb 2011 22:09:45 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 556128FC15; Sun, 20 Feb 2011 22:09:44 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id p1KM9evc075306 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 21 Feb 2011 00:09:40 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id p1KM9eZg038067; Mon, 21 Feb 2011 00:09:40 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id p1KM9eFT038066; Mon, 21 Feb 2011 00:09:40 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 21 Feb 2011 00:09:40 +0200 From: Kostik Belousov To: Steve Kargl Message-ID: <20110220220940.GP78089@deviant.kiev.zoral.com.ua> References: <201102182054.p1IKsDMx071986@svn.freebsd.org> <20110220220144.GA56015@troutmask.apl.washington.edu> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ou44OetjGUPv8osT" Content-Disposition: inline In-Reply-To: <20110220220144.GA56015@troutmask.apl.washington.edu> User-Agent: Mutt/1.4.2.3i X-Spam-Status: No, score=-3.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Dimitry Andric Subject: Re: svn commit: r218822 - in head: . contrib/binutils contrib/binutils/bfd contrib/binutils/bfd/doc contrib/binutils/bfd/po contrib/binutils/binutils contrib/binutils/binutils/doc contrib/binutils/binu... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 22:09:45 -0000 --ou44OetjGUPv8osT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Feb 20, 2011 at 02:01:44PM -0800, Steve Kargl wrote: > On Fri, Feb 18, 2011 at 08:54:13PM +0000, Dimitry Andric wrote: > > Author: dim > > Date: Fri Feb 18 20:54:12 2011 > > New Revision: 218822 > > URL: http://svn.freebsd.org/changeset/base/218822 > >=20 > > Log: > > Merge binutils 2.17.50 to head. This brings a number of improvements= to > > x86 CPU support, better support for powerpc64, some new directives, a= nd > > many other things. Bump __FreeBSD_version, and add a note to UPDATIN= G. > > =20 > > Thanks to the many people that have helped to test this. >=20 > This commit appears to be causing=20 >=20 > laptop:kargl[205] ~/work/bin/gfortran -o z a.f > /usr/bin/ld: error in /usr/home/kargl/work/lib/gcc/i386-unknown-freebsd9.= 0/4.6.0/crtend.o(.eh_frame); no .eh_frame_hdr table will be created. >=20 > and >=20 > laptop:kargl[208] ~/work/bin/gcc -o z h.c > /usr/bin/ld: error in /usr/home/kargl/work/lib/gcc/i386-unknown-freebsd9.= 0/4.6.0/crtend.o(.eh_frame); no .eh_frame_hdr table will be created. >=20 > Note an executable is created and it appears to work. >=20 > laptop:kargl[213] ./z > Hello world >=20 > Unfortunately, one can no longer run the GCC testsuite because > the testsuite is not expecting the /usr/bin/ld message. >=20 > So, is there an patch that needs to been sent upstream to GCC > to fix crtend.o? Or. can you fix /usr/bin/ld to not emit this > seemingly harmless message? I suspect this is the same issue as was fixed by r209294 in FreeBSD svn repo. Most likely, similar approach would help gcc. --ou44OetjGUPv8osT Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEARECAAYFAk1hkSQACgkQC3+MBN1Mb4jc/wCg46xRQPtDPFbFWD9++FCR09vR PDYAn37qPATtrrhz8H19WAEiYctMz6wb =3dTP -----END PGP SIGNATURE----- --ou44OetjGUPv8osT-- From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 22:20:00 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FEB6106566B; Sun, 20 Feb 2011 22:20:00 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) by mx1.freebsd.org (Postfix) with ESMTP id 369848FC0C; Sun, 20 Feb 2011 22:20:00 +0000 (UTC) Received: from troutmask.apl.washington.edu (localhost.apl.washington.edu [127.0.0.1]) by troutmask.apl.washington.edu (8.14.4/8.14.4) with ESMTP id p1KMJxeD056150; Sun, 20 Feb 2011 14:19:59 -0800 (PST) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.4/8.14.4/Submit) id p1KMJx55056149; Sun, 20 Feb 2011 14:19:59 -0800 (PST) (envelope-from sgk) Date: Sun, 20 Feb 2011 14:19:59 -0800 From: Steve Kargl To: Kostik Belousov Message-ID: <20110220221959.GA56100@troutmask.apl.washington.edu> References: <201102182054.p1IKsDMx071986@svn.freebsd.org> <20110220220144.GA56015@troutmask.apl.washington.edu> <20110220220940.GP78089@deviant.kiev.zoral.com.ua> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110220220940.GP78089@deviant.kiev.zoral.com.ua> User-Agent: Mutt/1.4.2.3i Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Dimitry Andric Subject: Re: svn commit: r218822 - in head: . contrib/binutils contrib/binutils/bfd contrib/binutils/bfd/doc contrib/binutils/bfd/po contrib/binutils/binutils contrib/binutils/binutils/doc contrib/binutils/binu... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 22:20:00 -0000 On Mon, Feb 21, 2011 at 12:09:40AM +0200, Kostik Belousov wrote: > On Sun, Feb 20, 2011 at 02:01:44PM -0800, Steve Kargl wrote: > > On Fri, Feb 18, 2011 at 08:54:13PM +0000, Dimitry Andric wrote: > > > Author: dim > > > Date: Fri Feb 18 20:54:12 2011 > > > New Revision: 218822 > > > URL: http://svn.freebsd.org/changeset/base/218822 > > > > > > Log: > > > Merge binutils 2.17.50 to head. This brings a number of improvements to > > > x86 CPU support, better support for powerpc64, some new directives, and > > > many other things. Bump __FreeBSD_version, and add a note to UPDATING. > > > > > > Thanks to the many people that have helped to test this. > > > > This commit appears to be causing > > > > laptop:kargl[205] ~/work/bin/gfortran -o z a.f > > /usr/bin/ld: error in /usr/home/kargl/work/lib/gcc/i386-unknown-freebsd9.0/4.6.0/crtend.o(.eh_frame); no .eh_frame_hdr table will be created. > > > > > > Unfortunately, one can no longer run the GCC testsuite because > > the testsuite is not expecting the /usr/bin/ld message. > > > > So, is there an patch that needs to been sent upstream to GCC > > to fix crtend.o? Or. can you fix /usr/bin/ld to not emit this > > seemingly harmless message? > I suspect this is the same issue as was fixed by r209294 in FreeBSD > svn repo. Most likely, similar approach would help gcc. Thanks for the pointer to r209294. I'll see if I can fix gcc and submit a patch. -- Steve From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 22:25:24 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 065A4106564A; Sun, 20 Feb 2011 22:25:24 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E6DDB8FC1E; Sun, 20 Feb 2011 22:25:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1KMPNjN046907; Sun, 20 Feb 2011 22:25:23 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1KMPNQG046903; Sun, 20 Feb 2011 22:25:23 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201102202225.p1KMPNQG046903@svn.freebsd.org> From: Martin Matuska Date: Sun, 20 Feb 2011 22:25:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218895 - in head/contrib/gcc: config/i386 doc X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 22:25:24 -0000 Author: mm Date: Sun Feb 20 22:25:23 2011 New Revision: 218895 URL: http://svn.freebsd.org/changeset/base/218895 Log: Backport svn r124339 from gcc 4.3 and add opteron-sse3, athlon64-sse3 and k8-sse3 cpu-types for -march=/-mtune= gcc options. These new cpu-types include the SSE3 instruction set that is supported by all newer AMD Athlon 64 and Opteron processors. All three cpu-types are supported by clang and all gcc versions starting with 4.3 SVN rev 124339 (at that time GPLv2 licensed). PR: gnu/154906 Discussed with: kib, kan, dim Obtained from: gcc 4.3 (r124339, GPLv2 licensed) MFC after: 2 weeks Modified: head/contrib/gcc/config/i386/i386.c head/contrib/gcc/doc/gcc.1 head/contrib/gcc/doc/invoke.texi Modified: head/contrib/gcc/config/i386/i386.c ============================================================================== --- head/contrib/gcc/config/i386/i386.c Sun Feb 20 21:58:07 2011 (r218894) +++ head/contrib/gcc/config/i386/i386.c Sun Feb 20 22:25:23 2011 (r218895) @@ -1523,10 +1523,19 @@ override_options (void) | PTA_SSE | PTA_SSE2 }, {"k8", PROCESSOR_K8, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW | PTA_64BIT | PTA_3DNOW_A | PTA_SSE | PTA_SSE2}, + {"k8-sse3", PROCESSOR_K8, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW | PTA_64BIT + | PTA_3DNOW_A | PTA_SSE | PTA_SSE2 + | PTA_SSE3 }, {"opteron", PROCESSOR_K8, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW | PTA_64BIT | PTA_3DNOW_A | PTA_SSE | PTA_SSE2}, + {"opteron-sse3", PROCESSOR_K8, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW | PTA_64BIT + | PTA_3DNOW_A | PTA_SSE | PTA_SSE2 + | PTA_SSE3 }, {"athlon64", PROCESSOR_K8, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW | PTA_64BIT | PTA_3DNOW_A | PTA_SSE | PTA_SSE2}, + {"athlon64-sse3", PROCESSOR_K8, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW | PTA_64BIT + | PTA_3DNOW_A | PTA_SSE | PTA_SSE2 + | PTA_SSE3 }, {"athlon-fx", PROCESSOR_K8, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW | PTA_64BIT | PTA_3DNOW_A | PTA_SSE | PTA_SSE2}, {"generic32", PROCESSOR_GENERIC32, 0 /* flags are only used for -march switch. */ }, Modified: head/contrib/gcc/doc/gcc.1 ============================================================================== --- head/contrib/gcc/doc/gcc.1 Sun Feb 20 21:58:07 2011 (r218894) +++ head/contrib/gcc/doc/gcc.1 Sun Feb 20 22:25:23 2011 (r218895) @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "GCC 1" -.TH GCC 1 "2007-07-19" "gcc-4.2.1" "GNU" +.TH GCC 1 "2011-02-20" "gcc-4.2.1" "GNU" .SH "NAME" gcc \- GNU project C and C++ compiler .SH "SYNOPSIS" @@ -8751,6 +8751,9 @@ instruction set support. .IX Item "k8, opteron, athlon64, athlon-fx" \&\s-1AMD\s0 K8 core based CPUs with x86\-64 instruction set support. (This supersets \&\s-1MMX\s0, \s-1SSE\s0, \s-1SSE2\s0, 3dNOW!, enhanced 3dNOW! and 64\-bit instruction set extensions.) +.IP "\fIk8-sse3, opteron-sse3, athlon64-sse3\fR" 4 +.IX Item "k8-sse3, opteron-sse3, athlon64-sse3" +Improved versions of k8, opteron and athlon64 with \s-1SSE3\s0 instruction set support. .IP "\fIwinchip\-c6\fR" 4 .IX Item "winchip-c6" \&\s-1IDT\s0 Winchip C6 \s-1CPU\s0, dealt in same way as i486 with additional \s-1MMX\s0 instruction Modified: head/contrib/gcc/doc/invoke.texi ============================================================================== --- head/contrib/gcc/doc/invoke.texi Sun Feb 20 21:58:07 2011 (r218894) +++ head/contrib/gcc/doc/invoke.texi Sun Feb 20 22:25:23 2011 (r218895) @@ -9382,6 +9382,8 @@ instruction set support. @item k8, opteron, athlon64, athlon-fx AMD K8 core based CPUs with x86-64 instruction set support. (This supersets MMX, SSE, SSE2, 3dNOW!, enhanced 3dNOW! and 64-bit instruction set extensions.) +@item k8-sse3, opteron-sse3, athlon64-sse3 +Improved versions of k8, opteron and athlon64 with SSE3 instruction set support. @item winchip-c6 IDT Winchip C6 CPU, dealt in same way as i486 with additional MMX instruction set support. From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 22:32:21 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2C45106566B; Sun, 20 Feb 2011 22:32:21 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7588F8FC13; Sun, 20 Feb 2011 22:32:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1KMWL4x047091; Sun, 20 Feb 2011 22:32:21 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1KMWLKo047088; Sun, 20 Feb 2011 22:32:21 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201102202232.p1KMWLKo047088@svn.freebsd.org> From: Martin Matuska Date: Sun, 20 Feb 2011 22:32:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218896 - in head/share: examples/etc mk X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 22:32:21 -0000 Author: mm Date: Sun Feb 20 22:32:21 2011 New Revision: 218896 URL: http://svn.freebsd.org/changeset/base/218896 Log: Add opteron-sse3, athlon64-sse3 and k8-sse3 cpu types to bsd.cpu.mk. - add "sse3" to MACHINE_CPU for the new cpu types - for i386, default to CPUTYPE=prescott for the new cpu types PR: gnu/154906 Discussed with: kib, kan, dim MFC after: 2 weeks Modified: head/share/examples/etc/make.conf head/share/mk/bsd.cpu.mk Modified: head/share/examples/etc/make.conf ============================================================================== --- head/share/examples/etc/make.conf Sun Feb 20 22:25:23 2011 (r218895) +++ head/share/examples/etc/make.conf Sun Feb 20 22:32:21 2011 (r218896) @@ -30,8 +30,9 @@ # NO_CPU_CFLAGS variable below. # Currently the following CPU types are recognized: # Intel x86 architecture: -# (AMD CPUs) opteron athlon64 athlon-mp athlon-xp athlon-4 -# athlon-tbird athlon k8 k6-3 k6-2 k6 k5 +# (AMD CPUs) opteron-sse3 opteron athlon64-sse3 athlon64 athlon-mp +# athlon-xp athlon-4 athlon-tbird athlon k8-sse3 k8 +# k6-3 k6-2 k6 k5 # (Intel CPUs) core2 core nocona pentium4m pentium4 prescott # pentium3m pentium3 pentium-m pentium2 # pentiumpro pentium-mmx pentium i486 i386 Modified: head/share/mk/bsd.cpu.mk ============================================================================== --- head/share/mk/bsd.cpu.mk Sun Feb 20 22:25:23 2011 (r218895) +++ head/share/mk/bsd.cpu.mk Sun Feb 20 22:32:21 2011 (r218896) @@ -49,6 +49,9 @@ CPUTYPE = pentiumpro CPUTYPE = pentium-mmx . elif ${CPUTYPE} == "i586" CPUTYPE = pentium +. elif ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" || \ + ${CPUTYPE} == "k8-sse3" +CPUTYPE = prescott . elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \ ${CPUTYPE} == "k8" CPUTYPE = athlon-mp @@ -158,7 +161,9 @@ _CPUCFLAGS = -mcpu=ultrasparc3 # presence of a CPU feature. . if ${MACHINE_CPUARCH} == "i386" -. if ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" +. if ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" +MACHINE_CPU = athlon-xp athlon k7 3dnow sse3 sse2 sse mmx k6 k5 i586 i486 i386 +. elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" MACHINE_CPU = athlon-xp athlon k7 3dnow sse2 sse mmx k6 k5 i586 i486 i386 . elif ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \ ${CPUTYPE} == "athlon-4" @@ -197,7 +202,9 @@ MACHINE_CPU = i486 i386 MACHINE_CPU = i386 . endif . elif ${MACHINE_CPUARCH} == "amd64" -. if ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8" +. if ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" || ${CPUTYPE} == "k8-sse3" +MACHINE_CPU = k8 3dnow sse3 +. elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8" MACHINE_CPU = k8 3dnow . elif ${CPUTYPE} == "nocona" MACHINE_CPU = sse3 From owner-svn-src-head@FreeBSD.ORG Sun Feb 20 23:32:29 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1233) id 62F431065670; Sun, 20 Feb 2011 23:32:29 +0000 (UTC) Date: Sun, 20 Feb 2011 23:32:29 +0000 From: Alexander Best To: Martin Matuska Message-ID: <20110220233229.GA23063@freebsd.org> References: <201102202232.p1KMWLKo047088@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="3V7upXqbjpZ4EhLz" Content-Disposition: inline In-Reply-To: <201102202232.p1KMWLKo047088@svn.freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218896 - in head/share: examples/etc mk X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 23:32:29 -0000 --3V7upXqbjpZ4EhLz Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sun Feb 20 11, Martin Matuska wrote: > Author: mm > Date: Sun Feb 20 22:32:21 2011 > New Revision: 218896 > URL: http://svn.freebsd.org/changeset/base/218896 > > Log: > Add opteron-sse3, athlon64-sse3 and k8-sse3 cpu types to bsd.cpu.mk. > - add "sse3" to MACHINE_CPU for the new cpu types > - for i386, default to CPUTYPE=prescott for the new cpu types any thoughts regarding these clang specific changes? i think it will be nice to pass newer CPUTYPEs to clang, yet this will break gnu/lib/libobjc and sys/boot/{i386,pc98}/boot2, which always get built with gcc. cheers. alex > > PR: gnu/154906 > Discussed with: kib, kan, dim > MFC after: 2 weeks > > Modified: > head/share/examples/etc/make.conf > head/share/mk/bsd.cpu.mk > > Modified: head/share/examples/etc/make.conf > ============================================================================== > --- head/share/examples/etc/make.conf Sun Feb 20 22:25:23 2011 (r218895) > +++ head/share/examples/etc/make.conf Sun Feb 20 22:32:21 2011 (r218896) > @@ -30,8 +30,9 @@ > # NO_CPU_CFLAGS variable below. > # Currently the following CPU types are recognized: > # Intel x86 architecture: > -# (AMD CPUs) opteron athlon64 athlon-mp athlon-xp athlon-4 > -# athlon-tbird athlon k8 k6-3 k6-2 k6 k5 > +# (AMD CPUs) opteron-sse3 opteron athlon64-sse3 athlon64 athlon-mp > +# athlon-xp athlon-4 athlon-tbird athlon k8-sse3 k8 > +# k6-3 k6-2 k6 k5 > # (Intel CPUs) core2 core nocona pentium4m pentium4 prescott > # pentium3m pentium3 pentium-m pentium2 > # pentiumpro pentium-mmx pentium i486 i386 > > Modified: head/share/mk/bsd.cpu.mk > ============================================================================== > --- head/share/mk/bsd.cpu.mk Sun Feb 20 22:25:23 2011 (r218895) > +++ head/share/mk/bsd.cpu.mk Sun Feb 20 22:32:21 2011 (r218896) > @@ -49,6 +49,9 @@ CPUTYPE = pentiumpro > CPUTYPE = pentium-mmx > . elif ${CPUTYPE} == "i586" > CPUTYPE = pentium > +. elif ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" || \ > + ${CPUTYPE} == "k8-sse3" > +CPUTYPE = prescott > . elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \ > ${CPUTYPE} == "k8" > CPUTYPE = athlon-mp > @@ -158,7 +161,9 @@ _CPUCFLAGS = -mcpu=ultrasparc3 > # presence of a CPU feature. > > . if ${MACHINE_CPUARCH} == "i386" > -. if ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" > +. if ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" > +MACHINE_CPU = athlon-xp athlon k7 3dnow sse3 sse2 sse mmx k6 k5 i586 i486 i386 > +. elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" > MACHINE_CPU = athlon-xp athlon k7 3dnow sse2 sse mmx k6 k5 i586 i486 i386 > . elif ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \ > ${CPUTYPE} == "athlon-4" > @@ -197,7 +202,9 @@ MACHINE_CPU = i486 i386 > MACHINE_CPU = i386 > . endif > . elif ${MACHINE_CPUARCH} == "amd64" > -. if ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8" > +. if ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" || ${CPUTYPE} == "k8-sse3" > +MACHINE_CPU = k8 3dnow sse3 > +. elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8" > MACHINE_CPU = k8 3dnow > . elif ${CPUTYPE} == "nocona" > MACHINE_CPU = sse3 -- a13x --3V7upXqbjpZ4EhLz Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="mk.diff" Index: share/mk/sys.mk =================================================================== --- share/mk/sys.mk (revision 218896) +++ share/mk/sys.mk (working copy) @@ -355,6 +355,13 @@ .include "${__MAKE_CONF}" .endif +.if !defined(_WITHOUT_SRCCONF) +SRCCONF?=/etc/src.conf +.if exists(${SRCCONF}) +.include "${SRCCONF}" +.endif +.endif + .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) SHELL= ${__MAKE_SHELL} .SHELL: path=${__MAKE_SHELL} Index: share/mk/bsd.cpu.mk =================================================================== --- share/mk/bsd.cpu.mk (revision 218896) +++ share/mk/bsd.cpu.mk (working copy) @@ -33,10 +33,14 @@ CPUTYPE = prescott . elif ${CPUTYPE} == "p4" CPUTYPE = pentium4 +. elif ${CPUTYPE} == "p4m" && ${CC:T:Mclang} == "clang" +CPUTYPE = pentium4 . elif ${CPUTYPE} == "p4m" CPUTYPE = pentium4m . elif ${CPUTYPE} == "p3" CPUTYPE = pentium3 +. elif ${CPUTYPE} == "p3m" && ${CC:T:Mclang} == "clang" +CPUTYPE = pentium3 . elif ${CPUTYPE} == "p3m" CPUTYPE = pentium3m . elif ${CPUTYPE} == "p-m" @@ -59,8 +63,10 @@ CPUTYPE = athlon . endif . elif ${MACHINE_CPUARCH} == "amd64" -. if ${CPUTYPE} == "prescott" || ${CPUTYPE} == "core2" +. if ${CPUTYPE} == "prescott" CPUTYPE = nocona +. elif ${CPUTYPE} == "core2" && ${CC:T:Mclang} != "clang" +CPUTYPE = nocona . endif . elif ${MACHINE_ARCH} == "sparc64" . if ${CPUTYPE} == "us" @@ -206,7 +212,7 @@ MACHINE_CPU = k8 3dnow sse3 . elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8" MACHINE_CPU = k8 3dnow -. elif ${CPUTYPE} == "nocona" +. elif ${CPUTYPE} == "nocona" || ${CPUTYPE} == "core2" MACHINE_CPU = sse3 . endif MACHINE_CPU += amd64 sse2 sse mmx --3V7upXqbjpZ4EhLz-- From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 03:52:52 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 763F5106564A; Mon, 21 Feb 2011 03:52:52 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4AAA28FC12; Mon, 21 Feb 2011 03:52:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1L3qqNi054940; Mon, 21 Feb 2011 03:52:52 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L3qq9F054938; Mon, 21 Feb 2011 03:52:52 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201102210352.p1L3qq9F054938@svn.freebsd.org> From: Adrian Chadd Date: Mon, 21 Feb 2011 03:52:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218907 - head/sys/dev/ath X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 03:52:52 -0000 Author: adrian Date: Mon Feb 21 03:52:51 2011 New Revision: 218907 URL: http://svn.freebsd.org/changeset/base/218907 Log: Implement setting the short preamble bit if it's needed for the current node. Short preamble rates are only for legacy rates; MCS rate codes don't have a short preamble code like this. Modified: head/sys/dev/ath/if_ath_tx_ht.c Modified: head/sys/dev/ath/if_ath_tx_ht.c ============================================================================== --- head/sys/dev/ath/if_ath_tx_ht.c Mon Feb 21 01:20:56 2011 (r218906) +++ head/sys/dev/ath/if_ath_tx_ht.c Mon Feb 21 03:52:51 2011 (r218907) @@ -103,7 +103,6 @@ ath_rateseries_setup(struct ath_softc *s HAL_BOOL shortPreamble = AH_FALSE; const HAL_RATE_TABLE *rt = sc->sc_currates; int i; - uint8_t txrate; if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE)) @@ -111,7 +110,6 @@ ath_rateseries_setup(struct ath_softc *s memset(series, 0, sizeof(HAL_11N_RATE_SERIES) * 4); for (i = 0; i < 4; i++) { - txrate = rt->info[rix[i]].rateCode; series[i].Tries = try[i]; series[i].ChSel = sc->sc_txchainmask; if (ic->ic_protmode == IEEE80211_PROT_RTSCTS || @@ -128,14 +126,16 @@ ath_rateseries_setup(struct ath_softc *s if (ni->ni_htcap & IEEE80211_HTCAP_SHORTGI40) series[i].RateFlags |= HAL_RATESERIES_HALFGI; - /* XXX should this check the short preamble value should be set for legacy rates? -adrian */ - series[i].Rate = txrate; + series[i].Rate = rt->info[rix[i]].rateCode; + /* the short preamble field is only applicable for non-MCS rates */ + if (shortPreamble && ! (series[i].Rate & IEEE80211_RATE_MCS)) + series[i].Rate |= rt->info[rix[i]].shortPreamble; /* PktDuration doesn't include slot, ACK, RTS, etc timing - it's just the packet duration */ - if (txrate & IEEE80211_RATE_MCS) { + if (series[i].Rate & IEEE80211_RATE_MCS) { series[i].PktDuration = ath_computedur_ht(pktlen - , txrate + , series[i].Rate , ic->ic_txstream , (ni->ni_htcap & IEEE80211_HTCAP_CHWIDTH40) , series[i].RateFlags & HAL_RATESERIES_HALFGI); From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 04:13:37 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 917381065672; Mon, 21 Feb 2011 04:13:37 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) by mx1.freebsd.org (Postfix) with ESMTP id 6CD308FC0A; Mon, 21 Feb 2011 04:13:37 +0000 (UTC) Received: from troutmask.apl.washington.edu (localhost.apl.washington.edu [127.0.0.1]) by troutmask.apl.washington.edu (8.14.4/8.14.4) with ESMTP id p1L4DawE057589; Sun, 20 Feb 2011 20:13:36 -0800 (PST) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.4/8.14.4/Submit) id p1L4Danb057588; Sun, 20 Feb 2011 20:13:36 -0800 (PST) (envelope-from sgk) Date: Sun, 20 Feb 2011 20:13:36 -0800 From: Steve Kargl To: Kostik Belousov Message-ID: <20110221041336.GA57571@troutmask.apl.washington.edu> References: <201102182054.p1IKsDMx071986@svn.freebsd.org> <20110220220144.GA56015@troutmask.apl.washington.edu> <20110220220940.GP78089@deviant.kiev.zoral.com.ua> <20110220221959.GA56100@troutmask.apl.washington.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110220221959.GA56100@troutmask.apl.washington.edu> User-Agent: Mutt/1.4.2.3i Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Dimitry Andric Subject: Re: svn commit: r218822 - in head: . contrib/binutils contrib/binutils/bfd contrib/binutils/bfd/doc contrib/binutils/bfd/po contrib/binutils/binutils contrib/binutils/binutils/doc contrib/binutils/binu... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 04:13:37 -0000 On Sun, Feb 20, 2011 at 02:19:59PM -0800, Steve Kargl wrote: > On Mon, Feb 21, 2011 at 12:09:40AM +0200, Kostik Belousov wrote: > > On Sun, Feb 20, 2011 at 02:01:44PM -0800, Steve Kargl wrote: > > > > > > laptop:kargl[205] ~/work/bin/gfortran -o z a.f > > > /usr/bin/ld: error in /usr/home/kargl/work/lib/gcc/i386-unknown-freebsd9.0/4.6.0/crtend.o(.eh_frame); no .eh_frame_hdr table will be created. > > > > > > > > > Unfortunately, one can no longer run the GCC testsuite because > > > the testsuite is not expecting the /usr/bin/ld message. > > > > > > So, is there an patch that needs to been sent upstream to GCC > > > to fix crtend.o? Or. can you fix /usr/bin/ld to not emit this > > > seemingly harmless message? > > I suspect this is the same issue as was fixed by r209294 in FreeBSD > > svn repo. Most likely, similar approach would help gcc. > > Thanks for the pointer to r209294. I'll see if I can fix > gcc and submit a patch. > I have a patch that I'll submit to GCC. -- Steve From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 05:10:34 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C837910656D3; Mon, 21 Feb 2011 05:10:34 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B5A178FC34; Mon, 21 Feb 2011 05:10:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1L5AYs2057590; Mon, 21 Feb 2011 05:10:34 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L5AYXA057588; Mon, 21 Feb 2011 05:10:34 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201102210510.p1L5AYXA057588@svn.freebsd.org> From: Adrian Chadd Date: Mon, 21 Feb 2011 05:10:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218908 - head/sys/dev/ath/ath_hal/ar5416 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 05:10:35 -0000 Author: adrian Date: Mon Feb 21 05:10:34 2011 New Revision: 218908 URL: http://svn.freebsd.org/changeset/base/218908 Log: Modify the AR5416 11na rate table to use 24mb OFDM 11a for control traffic, rather than MCS 0. Using MCS0 for protecting 11a rates seems a bit silly. Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c Mon Feb 21 03:52:51 2011 (r218907) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c Mon Feb 21 05:10:34 2011 (r218908) @@ -77,25 +77,25 @@ static HAL_RATE_TABLE ar5416_11na_table /* 12 Mb */ { AH_TRUE, OFDM, 12000, 0x0a, 0x00, (0x80|24), 2 }, /* 18 Mb */ { AH_TRUE, OFDM, 18000, 0x0e, 0x00, 36, 2 }, /* 24 Mb */ { AH_TRUE, OFDM, 24000, 0x09, 0x00, (0x80|48), 4 }, -/* 36 Mb */ { AH_TRUE, OFDM, 36000, 0x0d, 0x00, 72, 8 }, -/* 48 Mb */ { AH_TRUE, OFDM, 48000, 0x08, 0x00, 96, 8 }, -/* 54 Mb */ { AH_TRUE, OFDM, 54000, 0x0c, 0x00, 108, 8 }, -/* 6.5 Mb */ { AH_TRUE, HT, 6500, 0x80, 0x00, 0, 8 }, -/* 13 Mb */ { AH_TRUE, HT, 13000, 0x81, 0x00, 1, 8 }, -/*19.5 Mb */ { AH_TRUE, HT, 19500, 0x82, 0x00, 2, 8 }, -/* 26 Mb */ { AH_TRUE, HT, 26000, 0x83, 0x00, 3, 8 }, -/* 39 Mb */ { AH_TRUE, HT, 39000, 0x84, 0x00, 4, 8 }, -/* 52 Mb */ { AH_TRUE, HT, 52000, 0x85, 0x00, 5, 8 }, -/*58.5 Mb */ { AH_TRUE, HT, 58500, 0x86, 0x00, 6, 8 }, -/* 65 Mb */ { AH_TRUE, HT, 65000, 0x87, 0x00, 7, 8 }, -/* 13 Mb */ { AH_TRUE, HT, 13000, 0x88, 0x00, 8, 8 }, -/* 26 Mb */ { AH_TRUE, HT, 26000, 0x89, 0x00, 9, 8 }, -/* 39 Mb */ { AH_TRUE, HT, 39000, 0x8a, 0x00, 10, 8 }, -/* 52 Mb */ { AH_TRUE, HT, 52000, 0x8b, 0x00, 11, 8 }, -/* 78 Mb */ { AH_TRUE, HT, 78000, 0x8c, 0x00, 12, 8 }, -/* 104 Mb */ { AH_TRUE, HT, 104000, 0x8d, 0x00, 13, 8 }, -/* 117 Mb */ { AH_TRUE, HT, 117000, 0x8e, 0x00, 14, 8 }, -/* 130 Mb */ { AH_TRUE, HT, 130000, 0x8f, 0x00, 15, 8 }, +/* 36 Mb */ { AH_TRUE, OFDM, 36000, 0x0d, 0x00, 72, 4 }, +/* 48 Mb */ { AH_TRUE, OFDM, 48000, 0x08, 0x00, 96, 4 }, +/* 54 Mb */ { AH_TRUE, OFDM, 54000, 0x0c, 0x00, 108, 4 }, +/* 6.5 Mb */ { AH_TRUE, HT, 6500, 0x80, 0x00, 0, 4 }, +/* 13 Mb */ { AH_TRUE, HT, 13000, 0x81, 0x00, 1, 4 }, +/*19.5 Mb */ { AH_TRUE, HT, 19500, 0x82, 0x00, 2, 4 }, +/* 26 Mb */ { AH_TRUE, HT, 26000, 0x83, 0x00, 3, 4 }, +/* 39 Mb */ { AH_TRUE, HT, 39000, 0x84, 0x00, 4, 4 }, +/* 52 Mb */ { AH_TRUE, HT, 52000, 0x85, 0x00, 5, 4 }, +/*58.5 Mb */ { AH_TRUE, HT, 58500, 0x86, 0x00, 6, 4 }, +/* 65 Mb */ { AH_TRUE, HT, 65000, 0x87, 0x00, 7, 4 }, +/* 13 Mb */ { AH_TRUE, HT, 13000, 0x88, 0x00, 8, 4 }, +/* 26 Mb */ { AH_TRUE, HT, 26000, 0x89, 0x00, 9, 4 }, +/* 39 Mb */ { AH_TRUE, HT, 39000, 0x8a, 0x00, 10, 4 }, +/* 52 Mb */ { AH_TRUE, HT, 52000, 0x8b, 0x00, 11, 4 }, +/* 78 Mb */ { AH_TRUE, HT, 78000, 0x8c, 0x00, 12, 4 }, +/* 104 Mb */ { AH_TRUE, HT, 104000, 0x8d, 0x00, 13, 4 }, +/* 117 Mb */ { AH_TRUE, HT, 117000, 0x8e, 0x00, 14, 4 }, +/* 130 Mb */ { AH_TRUE, HT, 130000, 0x8f, 0x00, 15, 4 }, }, }; From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 08:58:39 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35EF5106564A; Mon, 21 Feb 2011 08:58:39 +0000 (UTC) (envelope-from vanhu@zeninc.net) Received: from smtp.zeninc.net (smtp.zeninc.net [80.67.176.25]) by mx1.freebsd.org (Postfix) with ESMTP id A4F108FC0A; Mon, 21 Feb 2011 08:58:38 +0000 (UTC) Received: from astro.zen.inc (astro.zen.inc [192.168.1.239]) by smtp.zeninc.net (smtpd) with ESMTP id 13CB22798BC; Mon, 21 Feb 2011 09:40:26 +0100 (CET) Received: by astro.zen.inc (Postfix, from userid 1000) id 00A7217059; Mon, 21 Feb 2011 09:40:25 +0100 (CET) Date: Mon, 21 Feb 2011 09:40:25 +0100 From: VANHULLEBUS Yvan To: Pawel Jakub Dawidek Message-ID: <20110221084025.GA14934@zeninc.net> References: <201102180940.p1I9eD29050530@svn.freebsd.org> <20110219073412.GC2016@garage.freebsd.pl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110219073412.GC2016@garage.freebsd.pl> User-Agent: All mail clients suck. This one just sucks less. Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218794 - in head: . sys/netipsec X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 08:58:39 -0000 Hi. On Sat, Feb 19, 2011 at 08:34:12AM +0100, Pawel Jakub Dawidek wrote: > On Fri, Feb 18, 2011 at 09:40:13AM +0000, VANHULLEBUS Yvan wrote: > > Author: vanhu > > Date: Fri Feb 18 09:40:13 2011 > > New Revision: 218794 > > URL: http://svn.freebsd.org/changeset/base/218794 > > > > Log: > > Fixed IPsec's HMAC_SHA256-512 support to be RFC4868 compliant. > > This will break interoperability with all older versions of > > FreeBSD for those algorithms. > > > > Reviewed by: bz, gnn > > Obtained from: NETASQ > > MFC after: 1w > > First of all, I can't see such a change being merged to stable, where > going from 8.2 to 8.3 will break IPsec tunnels. No. It will break IPsec tunnels *which use HMAC_SHA2 for hash in phase2*. In the real world, we are still at the level where we're trying to make people understand that using an hash algorithm in phase2 is important. I just don't know if some people use actually HMAC_SHA2 for phase2, those who does really care about security and do really want HMAC_SHA2 will upgrade both peers, the others (including people that do know that HMAC_SHA1 is *not* as weak as SHA1 starts to be) will just have to switch back to HMAC_SHA1 until peer does support RFC4868. > Second of all I really think that an UPDATING entry is not enough. > We should at least provide sysctl to change it back I sent a mail on freebsd-net@ at the beginning of january, to ask some feedback from users, and got NO response at all. So I considered implementing such a sysctl would be just time waste. And it is also a quite bad solution, as it does not solves situations where you want to do IPsec using HMAC_SHA2 with two peers, one which is RFC4868 compliant, and the other which uses the old round-96 bits draft for it's implementation.... > and if we can detect > this based on packet size, Afaik, you can't. Well, of course, you can still try both RFC4868 and round96 bits hashs, and consider that the packet is valid if one of the checks is good.... Feel free to send me your benchmarks results if you do such an implementation... But what will you do if you have to send the first packet in the tunnel ? > it would be best to log a warning that the > other side is using old implementation and it (the other side) should be > either upgraded or this sysctl should be changed locally to enable old > behaviour. As said upper, afaik, you just can't detect such things without wasting LOTS of CPU cycles.... > I'm happy to remove such sysctl after one full major release, > so we won't support tunnels between FreeBSD 8 and FreeBSD 10, but we > should IMHO definitely support tunnels between both 8-9 and 9-10. The only thing you may do is to include again the old code and put some #ifdef RFC4868_SUPPORT / #else / #endif in kernel code, or set up a global sysctl (which will be quite intrusive for such a small patchset) so people will be able to decide if they want their whole IPsec stack to be RFC4868 or draft-round96 compliant.... But once again, this will NOT solve issues with multiple peers, and once again, the "simple" solution when you can't upgrade both peers is to switch back to HMAC_SHA1, which is actually really strong enough, and which is NOT affected by this patch. Yvan. From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 09:01:36 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E437106566B; Mon, 21 Feb 2011 09:01:36 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 282F88FC2B; Mon, 21 Feb 2011 09:01:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1L91avu063259; Mon, 21 Feb 2011 09:01:36 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L91YoI063173; Mon, 21 Feb 2011 09:01:34 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102210901.p1L91YoI063173@svn.freebsd.org> From: Bruce Cran Date: Mon, 21 Feb 2011 09:01:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218909 - in head: bin/df bin/sh lib/libc/arm/gen lib/libc/ia64/gen lib/libc/mips/gen lib/libc/powerpc/gen lib/libc/powerpc64/gen lib/libpkg lib/libstand lib/msun/src sys/amd64/amd64 sy... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 09:01:36 -0000 Author: brucec Date: Mon Feb 21 09:01:34 2011 New Revision: 218909 URL: http://svn.freebsd.org/changeset/base/218909 Log: Fix typos - remove duplicate "the". PR: bin/154928 Submitted by: Eitan Adler MFC after: 3 days Modified: head/bin/df/df.c head/bin/sh/expand.c head/lib/libc/arm/gen/modf.c head/lib/libc/ia64/gen/modf.c head/lib/libc/mips/gen/modf.c head/lib/libc/powerpc/gen/modf.c head/lib/libc/powerpc64/gen/modf.c head/lib/libpkg/version.c head/lib/libstand/environment.c head/lib/msun/src/s_cbrt.c head/sys/amd64/amd64/trap.c head/sys/arm/xscale/i80321/iq80321.c head/sys/boot/ficl/words.c head/sys/cam/cam_xpt.c head/sys/cam/scsi/scsi_sa.c head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c head/sys/cddl/dev/dtrace/i386/dtrace_subr.c head/sys/compat/ndis/subr_ntoskrnl.c head/sys/dev/advansys/adwcam.c head/sys/dev/aic7xxx/aic79xx_osm.h head/sys/dev/aic7xxx/aic7xxx_osm.h head/sys/dev/asr/i2omsg.h head/sys/dev/bktr/bktr_card.c head/sys/dev/ctau/ctau.c head/sys/dev/ctau/ctddk.h head/sys/dev/cxgb/cxgb_main.c head/sys/dev/drm/mach64_dma.c head/sys/dev/drm/r300_reg.h head/sys/dev/e1000/e1000_82575.c head/sys/dev/e1000/e1000_ich8lan.c head/sys/dev/ep/if_epreg.h head/sys/dev/fdc/fdc.c head/sys/dev/ixgb/ixgb_ee.c head/sys/dev/malo/if_malohal.h head/sys/dev/mwl/mwlhal.h head/sys/dev/nxge/xgehal/xgehal-device.c head/sys/dev/nxge/xgehal/xgehal-ring-fp.c head/sys/dev/random/randomdev_soft.c head/sys/dev/sound/pci/es137x.c head/sys/dev/sym/sym_fw1.h head/sys/dev/sym/sym_fw2.h head/sys/dev/uart/uart_dev_ns8250.c head/sys/dev/usb/usb_process.c head/sys/dev/vx/if_vxreg.h head/sys/dev/wpi/if_wpi.c head/sys/fs/fdescfs/fdesc_vnops.c head/sys/fs/msdosfs/msdosfs_vnops.c head/sys/geom/geom_vfs.c head/sys/geom/part/g_part_ebr.c head/sys/geom/sched/gs_scheduler.h head/sys/gnu/fs/xfs/xfs_dir_leaf.c head/sys/gnu/fs/xfs/xfs_itable.c head/sys/i386/i386/trap.c head/sys/kern/subr_unit.c head/sys/kern/subr_witness.c head/sys/kern/uipc_mbuf.c head/sys/mips/mips/pmap.c head/sys/mips/rmi/fmn.c head/sys/mips/sibyte/sb_zbpci.c head/sys/net/if_media.c head/sys/net/route.c head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c head/sys/netgraph/ng_source.c head/sys/netinet/if_ether.c head/sys/netinet/ip_input.c head/sys/netinet/ipfw/ip_fw_private.h head/sys/netinet/libalias/alias_sctp.c head/sys/netinet/tcp_offload.h head/sys/netinet/tcp_subr.c head/sys/netinet/tcp_syncache.c head/sys/netinet/tcp_timewait.c head/sys/netinet6/in6.h head/sys/pc98/cbus/fdc.c head/sys/sparc64/include/iommureg.h head/sys/sparc64/pci/sbbc.c head/sys/sparc64/sparc64/trap.c head/sys/sys/aac_ioctl.h head/usr.bin/lex/misc.c head/usr.bin/m4/gnum4.c head/usr.bin/make/lst.c head/usr.bin/rpcinfo/rpcinfo.c head/usr.bin/xinstall/xinstall.c head/usr.sbin/moused/moused.c head/usr.sbin/rpcbind/util.c head/usr.sbin/sysinstall/install.c Modified: head/bin/df/df.c ============================================================================== --- head/bin/df/df.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/bin/df/df.c Mon Feb 21 09:01:34 2011 (r218909) @@ -125,7 +125,7 @@ main(int argc, char *argv[]) /* FALLTHROUGH */ case 'P': /* - * POSIX specifically discusses the the behavior of + * POSIX specifically discusses the behavior of * both -k and -P. It states that the blocksize should * be set to 1024. Thus, if this occurs, simply break * rather than clobbering the old blocksize. Modified: head/bin/sh/expand.c ============================================================================== --- head/bin/sh/expand.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/bin/sh/expand.c Mon Feb 21 09:01:34 2011 (r218909) @@ -959,7 +959,7 @@ numvar: /* - * Record the the fact that we have to scan this region of the + * Record the fact that we have to scan this region of the * string for IFS characters. */ Modified: head/lib/libc/arm/gen/modf.c ============================================================================== --- head/lib/libc/arm/gen/modf.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/lib/libc/arm/gen/modf.c Mon Feb 21 09:01:34 2011 (r218909) @@ -86,7 +86,7 @@ modf(val, iptr) * If you look at the math involved for a few seconds, it's * plain to see that the integral part is the input, with the * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, - * the the fractional part is the part with the rest of the + * the fractional part is the part with the rest of the * bits zeroed. Just zeroing the high bits to get the * fractional part would yield a fraction in need of * normalization. Therefore, we take the easy way out, and Modified: head/lib/libc/ia64/gen/modf.c ============================================================================== --- head/lib/libc/ia64/gen/modf.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/lib/libc/ia64/gen/modf.c Mon Feb 21 09:01:34 2011 (r218909) @@ -85,7 +85,7 @@ modf(val, iptr) * If you look at the math involved for a few seconds, it's * plain to see that the integral part is the input, with the * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, - * the the fractional part is the part with the rest of the + * the fractional part is the part with the rest of the * bits zeroed. Just zeroing the high bits to get the * fractional part would yield a fraction in need of * normalization. Therefore, we take the easy way out, and Modified: head/lib/libc/mips/gen/modf.c ============================================================================== --- head/lib/libc/mips/gen/modf.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/lib/libc/mips/gen/modf.c Mon Feb 21 09:01:34 2011 (r218909) @@ -86,7 +86,7 @@ modf(val, iptr) * If you look at the math involved for a few seconds, it's * plain to see that the integral part is the input, with the * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, - * the the fractional part is the part with the rest of the + * the fractional part is the part with the rest of the * bits zeroed. Just zeroing the high bits to get the * fractional part would yield a fraction in need of * normalization. Therefore, we take the easy way out, and Modified: head/lib/libc/powerpc/gen/modf.c ============================================================================== --- head/lib/libc/powerpc/gen/modf.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/lib/libc/powerpc/gen/modf.c Mon Feb 21 09:01:34 2011 (r218909) @@ -86,7 +86,7 @@ modf(val, iptr) * If you look at the math involved for a few seconds, it's * plain to see that the integral part is the input, with the * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, - * the the fractional part is the part with the rest of the + * the fractional part is the part with the rest of the * bits zeroed. Just zeroing the high bits to get the * fractional part would yield a fraction in need of * normalization. Therefore, we take the easy way out, and Modified: head/lib/libc/powerpc64/gen/modf.c ============================================================================== --- head/lib/libc/powerpc64/gen/modf.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/lib/libc/powerpc64/gen/modf.c Mon Feb 21 09:01:34 2011 (r218909) @@ -86,7 +86,7 @@ modf(val, iptr) * If you look at the math involved for a few seconds, it's * plain to see that the integral part is the input, with the * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, - * the the fractional part is the part with the rest of the + * the fractional part is the part with the rest of the * bits zeroed. Just zeroing the high bits to get the * fractional part would yield a fraction in need of * normalization. Therefore, we take the easy way out, and Modified: head/lib/libpkg/version.c ============================================================================== --- head/lib/libpkg/version.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/lib/libpkg/version.c Mon Feb 21 09:01:34 2011 (r218909) @@ -76,7 +76,7 @@ split_version(const char *pkgname, const if (pkgname == NULL) errx(2, "%s: Passed NULL pkgname.", __func__); - /* Look for the last '-' the the pkgname */ + /* Look for the last '-' the pkgname */ ch = strrchr(pkgname, '-'); /* Cheat if we are just passed a version, not a valid package name */ versionstr = ch ? ch + 1 : pkgname; Modified: head/lib/libstand/environment.c ============================================================================== --- head/lib/libstand/environment.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/lib/libstand/environment.c Mon Feb 21 09:01:34 2011 (r218909) @@ -59,7 +59,7 @@ env_getenv(const char *name) * Some notes: * * If the EV_VOLATILE flag is set, a copy of the variable is made. - * If EV_DYNAMIC is set, the the variable has been allocated with + * If EV_DYNAMIC is set, the variable has been allocated with * malloc and ownership transferred to the environment. * If (value) is NULL, the variable is set but has no value. */ Modified: head/lib/msun/src/s_cbrt.c ============================================================================== --- head/lib/msun/src/s_cbrt.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/lib/msun/src/s_cbrt.c Mon Feb 21 09:01:34 2011 (r218909) @@ -94,7 +94,7 @@ cbrt(double x) * 2 23-bit ulps larger). With rounding towards zero, the error bound * would be ~5/6 instead of ~4/6. With a maximum error of 2 23-bit ulps * in the rounded t, the infinite-precision error in the Newton - * approximation barely affects third digit in the the final error + * approximation barely affects third digit in the final error * 0.667; the error in the rounded t can be up to about 3 23-bit ulps * before the final error is larger than 0.667 ulps. */ Modified: head/sys/amd64/amd64/trap.c ============================================================================== --- head/sys/amd64/amd64/trap.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/amd64/amd64/trap.c Mon Feb 21 09:01:34 2011 (r218909) @@ -235,7 +235,7 @@ trap(struct trapframe *frame) * A trap can occur while DTrace executes a probe. Before * executing the probe, DTrace blocks re-scheduling and sets * a flag in it's per-cpu flags to indicate that it doesn't - * want to fault. On returning from the the probe, the no-fault + * want to fault. On returning from the probe, the no-fault * flag is cleared and finally re-scheduling is enabled. * * If the DTrace kernel module has registered a trap handler, Modified: head/sys/arm/xscale/i80321/iq80321.c ============================================================================== --- head/sys/arm/xscale/i80321/iq80321.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/arm/xscale/i80321/iq80321.c Mon Feb 21 09:01:34 2011 (r218909) @@ -139,7 +139,7 @@ iq80321_attach(device_t dev) device_get_name(dev)); /* - * We have mapped the the PCI I/O windows in the early + * We have mapped the PCI I/O windows in the early * bootstrap phase. */ sc->sc_iow_vaddr = IQ80321_IOW_VBASE; Modified: head/sys/boot/ficl/words.c ============================================================================== --- head/sys/boot/ficl/words.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/boot/ficl/words.c Mon Feb 21 09:01:34 2011 (r218909) @@ -1293,7 +1293,7 @@ static void ifCoIm(FICL_VM *pVM) ** compiles an "else"... ** 1) Compile a branch and a patch address; the address gets patched ** by "endif" to point past the "else" code. -** 2) Pop the the "if" patch address +** 2) Pop the "if" patch address ** 3) Patch the "if" branch to point to the current compile address. ** 4) Push the "else" patch address. ("endif" patches this to jump past ** the "else" code. Modified: head/sys/cam/cam_xpt.c ============================================================================== --- head/sys/cam/cam_xpt.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/cam/cam_xpt.c Mon Feb 21 09:01:34 2011 (r218909) @@ -317,7 +317,7 @@ xpt_schedule_dev_allocq(struct cam_eb *b CAMQ_GET_PRIO(&dev->drvq))) == 0)) { /* * The priority of a device waiting for CCB resources - * is that of the the highest priority peripheral driver + * is that of the highest priority peripheral driver * enqueued. */ retval = xpt_schedule_dev(&bus->sim->devq->alloc_queue, @@ -340,7 +340,7 @@ xpt_schedule_dev_sendq(struct cam_eb *bu (cam_ccbq_frozen_top(&dev->ccbq) == 0)) { /* * The priority of a device waiting for controller - * resources is that of the the highest priority CCB + * resources is that of the highest priority CCB * enqueued. */ retval = Modified: head/sys/cam/scsi/scsi_sa.c ============================================================================== --- head/sys/cam/scsi/scsi_sa.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/cam/scsi/scsi_sa.c Mon Feb 21 09:01:34 2011 (r218909) @@ -2654,7 +2654,7 @@ retry: struct scsi_dev_conf_page *cp = &ntcs->dconf; /* * We don't really know whether this device supports - * Data Compression if the the algorithm field is + * Data Compression if the algorithm field is * zero. Just say we do. */ *comp_supported = TRUE; Modified: head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c ============================================================================== --- head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Mon Feb 21 09:01:34 2011 (r218909) @@ -487,7 +487,7 @@ dtrace_trap(struct trapframe *frame, u_i * A trap can occur while DTrace executes a probe. Before * executing the probe, DTrace blocks re-scheduling and sets * a flag in it's per-cpu flags to indicate that it doesn't - * want to fault. On returning from the the probe, the no-fault + * want to fault. On returning from the probe, the no-fault * flag is cleared and finally re-scheduling is enabled. * * Check if DTrace has enabled 'no-fault' mode: Modified: head/sys/cddl/dev/dtrace/i386/dtrace_subr.c ============================================================================== --- head/sys/cddl/dev/dtrace/i386/dtrace_subr.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/cddl/dev/dtrace/i386/dtrace_subr.c Mon Feb 21 09:01:34 2011 (r218909) @@ -487,7 +487,7 @@ dtrace_trap(struct trapframe *frame, u_i * A trap can occur while DTrace executes a probe. Before * executing the probe, DTrace blocks re-scheduling and sets * a flag in it's per-cpu flags to indicate that it doesn't - * want to fault. On returning from the the probe, the no-fault + * want to fault. On returning from the probe, the no-fault * flag is cleared and finally re-scheduling is enabled. * * Check if DTrace has enabled 'no-fault' mode: Modified: head/sys/compat/ndis/subr_ntoskrnl.c ============================================================================== --- head/sys/compat/ndis/subr_ntoskrnl.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/compat/ndis/subr_ntoskrnl.c Mon Feb 21 09:01:34 2011 (r218909) @@ -3355,7 +3355,7 @@ KeSetEvent(nt_kevent *kevent, uint32_t i * setting the state to signalled since we're supposed * to automatically clear synchronization events anyway). * - * If it's a notification event, or the the first + * If it's a notification event, or the first * waiter is doing a WAITTYPE_ALL wait, go through * the full wait satisfaction process. */ Modified: head/sys/dev/advansys/adwcam.c ============================================================================== --- head/sys/dev/advansys/adwcam.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/advansys/adwcam.c Mon Feb 21 09:01:34 2011 (r218909) @@ -1,5 +1,5 @@ /*- - * CAM SCSI interface for the the Advanced Systems Inc. + * CAM SCSI interface for the Advanced Systems Inc. * Second Generation SCSI controllers. * * Product specific probe and attach routines can be found in: Modified: head/sys/dev/aic7xxx/aic79xx_osm.h ============================================================================== --- head/sys/dev/aic7xxx/aic79xx_osm.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/aic7xxx/aic79xx_osm.h Mon Feb 21 09:01:34 2011 (r218909) @@ -103,7 +103,7 @@ * The number of dma segments supported. The sequencer can handle any number * of physically contiguous S/G entrys. To reduce the driver's memory * consumption, we limit the number supported to be sufficient to handle - * the largest mapping supported by the the legacy kernel MAXPHYS setting of + * the largest mapping supported by the legacy kernel MAXPHYS setting of * 128K. This can be increased once some testing is done. Assuming the * transfer is as fragmented as possible and unaligned, this turns out to * be the number of paged sized transfers in MAXPHYS plus an extra element Modified: head/sys/dev/aic7xxx/aic7xxx_osm.h ============================================================================== --- head/sys/dev/aic7xxx/aic7xxx_osm.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/aic7xxx/aic7xxx_osm.h Mon Feb 21 09:01:34 2011 (r218909) @@ -115,7 +115,7 @@ extern devclass_t ahc_devclass; * The number of dma segments supported. The sequencer can handle any number * of physically contiguous S/G entrys. To reduce the driver's memory * consumption, we limit the number supported to be sufficient to handle - * the largest mapping supported by the the legacy kernel MAXPHYS setting of + * the largest mapping supported by the legacy kernel MAXPHYS setting of * 128K. This can be increased once some testing is done. Assuming the * be the number of paged sized transfers in MAXPHYS plus an extra element * to handle any unaligned residual. The sequencer fetches SG elements Modified: head/sys/dev/asr/i2omsg.h ============================================================================== --- head/sys/dev/asr/i2omsg.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/asr/i2omsg.h Mon Feb 21 09:01:34 2011 (r218909) @@ -183,7 +183,7 @@ PRAGMA_PACK_PUSH #define I2O_VERSION_OFFSET_SGL_TRL_OFFSET_MASK 0xF0 /* Defines for the Message Flags Field. */ -/* Please Note the the FAIL bit is only set in the Transport Fail Message. */ +/* Please Note the FAIL bit is only set in the Transport Fail Message. */ #define I2O_MESSAGE_FLAGS_STATIC 0x01 #define I2O_MESSAGE_FLAGS_64BIT_CONTEXT 0x02 #define I2O_MESSAGE_FLAGS_MULTIPLE 0x10 Modified: head/sys/dev/bktr/bktr_card.c ============================================================================== --- head/sys/dev/bktr/bktr_card.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/bktr/bktr_card.c Mon Feb 21 09:01:34 2011 (r218909) @@ -570,7 +570,7 @@ static int locate_eeprom_address( bktr_p * * However some makes of card (eg Hauppauge) come with a configuration eeprom * which tells us the make of the card. Most eeproms also tell us the - * tuner type and other features of the the cards. + * tuner type and other features of the cards. * * The current probe code works as follows * A) If the card uses a Bt878/879: Modified: head/sys/dev/ctau/ctau.c ============================================================================== --- head/sys/dev/ctau/ctau.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/ctau/ctau.c Mon Feb 21 09:01:34 2011 (r218909) @@ -1734,7 +1734,7 @@ ct_board_opt_t ct_board_opt_dflt = { 0, /* board control register 2 */ { /* DMA priority control register */ PCR_PRIO_ROTATE, - 0, /* all channels share the the bus hold */ + 0, /* all channels share the bus hold */ 0, /* hold the bus until all transfers done */ }, CFG_A, /* E1/G.703 config: two independent channels */ Modified: head/sys/dev/ctau/ctddk.h ============================================================================== --- head/sys/dev/ctau/ctddk.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/ctau/ctddk.h Mon Feb 21 09:01:34 2011 (r218909) @@ -206,7 +206,7 @@ typedef struct { typedef struct { unsigned prio : 3; /* priority of channels */ unsigned noshare : 1; /* 1 - chan holds the bus until end of data */ - /* 0 - all channels share the the bus hold */ + /* 0 - all channels share the bus hold */ unsigned release : 1; /* 1 - release the bus between transfers */ /* 0 - hold the bus until all transfers done */ } ct_pcr_t; Modified: head/sys/dev/cxgb/cxgb_main.c ============================================================================== --- head/sys/dev/cxgb/cxgb_main.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/cxgb/cxgb_main.c Mon Feb 21 09:01:34 2011 (r218909) @@ -1908,7 +1908,7 @@ cxgb_uninit_synchronized(struct port_inf /* * Clear this port's bit from the open device map, and then drain all * the tasks that can access/manipulate this port's port_info or ifp. - * We disable this port's interrupts here and so the the slow/ext + * We disable this port's interrupts here and so the slow/ext * interrupt tasks won't be enqueued. The tick task will continue to * be enqueued every second but the runs after this drain will not see * this port in the open device map. @@ -2858,7 +2858,7 @@ cxgb_extension_ioctl(struct cdev *dev, u u64 buf[32]; /* - * Use these to avoid modifying len/addr in the the return + * Use these to avoid modifying len/addr in the return * struct */ uint32_t len = t->len, addr = t->addr; Modified: head/sys/dev/drm/mach64_dma.c ============================================================================== --- head/sys/dev/drm/mach64_dma.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/drm/mach64_dma.c Mon Feb 21 09:01:34 2011 (r218909) @@ -173,7 +173,7 @@ static int mach64_ring_idle(drm_mach64_p } /** - * Reset the the ring buffer descriptors. + * Reset the ring buffer descriptors. * * \sa mach64_do_engine_reset() */ Modified: head/sys/dev/drm/r300_reg.h ============================================================================== --- head/sys/dev/drm/r300_reg.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/drm/r300_reg.h Mon Feb 21 09:01:34 2011 (r218909) @@ -353,7 +353,7 @@ __FBSDID("$FreeBSD$"); # define R300_PVS_CNTL_1_PROGRAM_START_SHIFT 0 # define R300_PVS_CNTL_1_POS_END_SHIFT 10 # define R300_PVS_CNTL_1_PROGRAM_END_SHIFT 20 -/* Addresses are relative the the vertex program parameters area. */ +/* Addresses are relative the vertex program parameters area. */ #define R300_VAP_PVS_CNTL_2 0x22D4 # define R300_PVS_CNTL_2_PARAM_OFFSET_SHIFT 0 # define R300_PVS_CNTL_2_PARAM_COUNT_SHIFT 16 Modified: head/sys/dev/e1000/e1000_82575.c ============================================================================== --- head/sys/dev/e1000/e1000_82575.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/e1000/e1000_82575.c Mon Feb 21 09:01:34 2011 (r218909) @@ -1986,7 +1986,7 @@ out: * e1000_reset_mdicnfg_82580 - Reset MDICNFG destination and com_mdio bits * @hw: pointer to the HW structure * - * This resets the the MDICNFG.Destination and MDICNFG.Com_MDIO bits based on + * This resets the MDICNFG.Destination and MDICNFG.Com_MDIO bits based on * the values found in the EEPROM. This addresses an issue in which these * bits are not restored from EEPROM after reset. **/ Modified: head/sys/dev/e1000/e1000_ich8lan.c ============================================================================== --- head/sys/dev/e1000/e1000_ich8lan.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/e1000/e1000_ich8lan.c Mon Feb 21 09:01:34 2011 (r218909) @@ -3218,7 +3218,7 @@ out: * @hw: pointer to the HW structure * * ICH8 use the PCI Express bus, but does not contain a PCI Express Capability - * register, so the the bus width is hard coded. + * register, so the bus width is hard coded. **/ static s32 e1000_get_bus_info_ich8lan(struct e1000_hw *hw) { Modified: head/sys/dev/ep/if_epreg.h ============================================================================== --- head/sys/dev/ep/if_epreg.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/ep/if_epreg.h Mon Feb 21 09:01:34 2011 (r218909) @@ -113,7 +113,7 @@ /************************************************************************** * * * These are the registers for the 3Com 3c509 and their bit patterns when * - * applicable. They have been taken out the the "EtherLink III Parallel * + * applicable. They have been taken out the "EtherLink III Parallel * * Tasking EISA and ISA Technical Reference" "Beta Draft 10/30/92" manual * * from 3com. * * * Modified: head/sys/dev/fdc/fdc.c ============================================================================== --- head/sys/dev/fdc/fdc.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/fdc/fdc.c Mon Feb 21 09:01:34 2011 (r218909) @@ -1261,7 +1261,7 @@ fdmisccmd(struct fd_data *fd, u_int cmd, /* * Set up a bio request for fdstrategy(). bio_offset is faked - * so that fdstrategy() will seek to the the requested + * so that fdstrategy() will seek to the requested * cylinder, and use the desired head. */ bp->bio_cmd = cmd; Modified: head/sys/dev/ixgb/ixgb_ee.c ============================================================================== --- head/sys/dev/ixgb/ixgb_ee.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/ixgb/ixgb_ee.c Mon Feb 21 09:01:34 2011 (r218909) @@ -325,7 +325,7 @@ ixgb_wait_eeprom_command(struct ixgb_hw * hw - Struct containing variables accessed by shared code * * Reads the first 64 16 bit words of the EEPROM and sums the values read. - * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is + * If the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is * valid. * * Returns: Modified: head/sys/dev/malo/if_malohal.h ============================================================================== --- head/sys/dev/malo/if_malohal.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/malo/if_malohal.h Mon Feb 21 09:01:34 2011 (r218909) @@ -133,7 +133,7 @@ struct malo_hal_hwstats { /* * Set Antenna Configuration (legacy operation). * - * The RX antenna can be selected using the the bitmask + * The RX antenna can be selected using the bitmask * ant (bit 0 = antenna 1, bit 1 = antenna 2, etc.) * (diversity?XXX) */ Modified: head/sys/dev/mwl/mwlhal.h ============================================================================== --- head/sys/dev/mwl/mwlhal.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/mwl/mwlhal.h Mon Feb 21 09:01:34 2011 (r218909) @@ -291,7 +291,7 @@ int mwl_hal_setradio(struct mwl_hal *mh, /* * Set Antenna Configuration (legacy operation). * - * The RX antenna can be selected using the the bitmask + * The RX antenna can be selected using the bitmask * ant (bit 0 = antenna 1, bit 1 = antenna 2, etc.) * (diversity?XXX) */ Modified: head/sys/dev/nxge/xgehal/xgehal-device.c ============================================================================== --- head/sys/dev/nxge/xgehal/xgehal-device.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/nxge/xgehal/xgehal-device.c Mon Feb 21 09:01:34 2011 (r218909) @@ -4418,7 +4418,7 @@ xge_hal_device_status(xge_hal_device_t * #ifndef XGE_HAL_HERC_EMULATION /* * Andrew: in PCI 33 mode, the P_PLL is not used, and therefore, - * the the P_PLL_LOCK bit in the adapter_status register will + * the P_PLL_LOCK bit in the adapter_status register will * not be asserted. */ if (!(tmp64 & XGE_HAL_ADAPTER_STATUS_P_PLL_LOCK) && Modified: head/sys/dev/nxge/xgehal/xgehal-ring-fp.c ============================================================================== --- head/sys/dev/nxge/xgehal/xgehal-ring-fp.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/nxge/xgehal/xgehal-ring-fp.c Mon Feb 21 09:01:34 2011 (r218909) @@ -801,7 +801,7 @@ xge_hal_ring_dtr_free(xge_hal_channel_h * xge_hal_ring_is_next_dtr_completed - Check if the next dtr is completed * @channelh: Channel handle. * - * Checks if the the _next_ completed descriptor is in host memory + * Checks if the _next_ completed descriptor is in host memory * * Returns: XGE_HAL_OK - success. * XGE_HAL_INF_NO_MORE_COMPLETED_DESCRIPTORS - No completed descriptors Modified: head/sys/dev/random/randomdev_soft.c ============================================================================== --- head/sys/dev/random/randomdev_soft.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/random/randomdev_soft.c Mon Feb 21 09:01:34 2011 (r218909) @@ -347,7 +347,7 @@ random_yarrow_write(void *buf, int count /* * Break the input up into HARVESTSIZE chunks. The writer has too - * much control here, so "estimate" the the entropy as zero. + * much control here, so "estimate" the entropy as zero. */ for (i = 0; i < count; i += HARVESTSIZE) { chunk = HARVESTSIZE; Modified: head/sys/dev/sound/pci/es137x.c ============================================================================== --- head/sys/dev/sound/pci/es137x.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/sound/pci/es137x.c Mon Feb 21 09:01:34 2011 (r218909) @@ -584,7 +584,7 @@ eschan1370_setspeed(kobj_t obj, void *da /* * DAC1 does not support continuous rate settings. * Pick the nearest and use it since FEEDER_RATE will - * do the the proper conversion for us. + * do the proper conversion for us. */ es->ctrl &= ~CTRL_WTSRSEL; if (speed < 8268) { Modified: head/sys/dev/sym/sym_fw1.h ============================================================================== --- head/sys/dev/sym/sym_fw1.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/sym/sym_fw1.h Mon Feb 21 09:01:34 2011 (r218909) @@ -262,7 +262,7 @@ static const struct SYM_FWA_SCR SYM_FWA_ * The below GETJOB_BEGIN to GETJOB_END section of SCRIPTS * is a critical path. If it is partially executed, it then * may happen that the job address is not yet in the DSA - * and the the next queue position points to the next JOB. + * and the next queue position points to the next JOB. */ }/*-------------------------< GETJOB_BEGIN >---------------------*/,{ /* Modified: head/sys/dev/sym/sym_fw2.h ============================================================================== --- head/sys/dev/sym/sym_fw2.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/sym/sym_fw2.h Mon Feb 21 09:01:34 2011 (r218909) @@ -252,7 +252,7 @@ static const struct SYM_FWA_SCR SYM_FWA_ * The below GETJOB_BEGIN to GETJOB_END section of SCRIPTS * is a critical path. If it is partially executed, it then * may happen that the job address is not yet in the DSA - * and the the next queue position points to the next JOB. + * and the next queue position points to the next JOB. */ SCR_LOAD_ABS (dsa, 4), PADDR_B (startpos), Modified: head/sys/dev/uart/uart_dev_ns8250.c ============================================================================== --- head/sys/dev/uart/uart_dev_ns8250.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/uart/uart_dev_ns8250.c Mon Feb 21 09:01:34 2011 (r218909) @@ -693,7 +693,7 @@ ns8250_bus_probe(struct uart_softc *sc) /* * We should have a sufficiently clean "pipe" to determine the * size of the FIFOs. We send as much characters as is reasonable - * and wait for the the overflow bit in the LSR register to be + * and wait for the overflow bit in the LSR register to be * asserted, counting the characters as we send them. Based on * that count we know the FIFO size. */ Modified: head/sys/dev/usb/usb_process.c ============================================================================== --- head/sys/dev/usb/usb_process.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/usb/usb_process.c Mon Feb 21 09:01:34 2011 (r218909) @@ -462,7 +462,7 @@ usb_proc_drain(struct usb_process *up) /*------------------------------------------------------------------------* * usb_proc_rewakeup * - * This function is called to re-wakeup the the given USB + * This function is called to re-wakeup the given USB * process. This usually happens after that the USB system has been in * polling mode, like during a panic. This function must be called * having "up->up_mtx" locked. Modified: head/sys/dev/vx/if_vxreg.h ============================================================================== --- head/sys/dev/vx/if_vxreg.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/vx/if_vxreg.h Mon Feb 21 09:01:34 2011 (r218909) @@ -112,7 +112,7 @@ /************************************************************************** * These are the registers for the 3Com 3c509 and their bit patterns when * - * applicable. They have been taken out the the "EtherLink III Parallel * + * applicable. They have been taken out the "EtherLink III Parallel * * Tasking EISA and ISA Technical Reference" "Beta Draft 10/30/92" manual * * from 3com. * **************************************************************************/ Modified: head/sys/dev/wpi/if_wpi.c ============================================================================== --- head/sys/dev/wpi/if_wpi.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/dev/wpi/if_wpi.c Mon Feb 21 09:01:34 2011 (r218909) @@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$"); * state and told to load boot firmware. The boot firmware loads an init and a * main binary firmware image into SRAM on the card via DMA. * Once the firmware is loaded, the driver/hw then - * communicate by way of circular dma rings via the the SRAM to the firmware. + * communicate by way of circular dma rings via the SRAM to the firmware. * * There is 6 memory rings. 1 command ring, 1 rx data ring & 4 tx data rings. * The 4 tx data rings allow for prioritization QoS. Modified: head/sys/fs/fdescfs/fdesc_vnops.c ============================================================================== --- head/sys/fs/fdescfs/fdesc_vnops.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/fs/fdescfs/fdesc_vnops.c Mon Feb 21 09:01:34 2011 (r218909) @@ -368,7 +368,7 @@ fdesc_open(ap) return (0); /* - * XXX Kludge: set td->td_proc->p_dupfd to contain the value of the the file + * XXX Kludge: set td->td_proc->p_dupfd to contain the value of the file * descriptor being sought for duplication. The error return ensures * that the vnode for this device will be released by vn_open. Open * will detect this special error and take the actions in dupfdopen. Modified: head/sys/fs/msdosfs/msdosfs_vnops.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_vnops.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/fs/msdosfs/msdosfs_vnops.c Mon Feb 21 09:01:34 2011 (r218909) @@ -1530,7 +1530,7 @@ msdosfs_readdir(ap) /* * msdosfs_readdir() won't operate properly on regular files since - * it does i/o only with the the filesystem vnode, and hence can + * it does i/o only with the filesystem vnode, and hence can * retrieve the wrong block from the buffer cache for a plain file. * So, fail attempts to readdir() on a plain file. */ Modified: head/sys/geom/geom_vfs.c ============================================================================== --- head/sys/geom/geom_vfs.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/geom/geom_vfs.c Mon Feb 21 09:01:34 2011 (r218909) @@ -109,7 +109,7 @@ g_vfs_strategy(struct bufobj *bo, struct /* G_VALID_CONSUMER(cp); We likely lack topology lock */ /* - * If the the provider has orphaned us, just return EXIO. + * If the provider has orphaned us, just return EXIO. */ if (cp->provider == NULL) { bp->b_error = ENXIO; Modified: head/sys/geom/part/g_part_ebr.c ============================================================================== --- head/sys/geom/part/g_part_ebr.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/geom/part/g_part_ebr.c Mon Feb 21 09:01:34 2011 (r218909) @@ -591,7 +591,7 @@ g_part_ebr_write(struct g_part_table *ba while (baseentry != NULL && baseentry->gpe_deleted) baseentry = LIST_NEXT(baseentry, gpe_entry); - /* Wipe-out the the first EBR when there are no slices. */ + /* Wipe-out the first EBR when there are no slices. */ if (baseentry == NULL) { error = g_write_data(cp, 0, buf, pp->sectorsize); goto out; Modified: head/sys/geom/sched/gs_scheduler.h ============================================================================== --- head/sys/geom/sched/gs_scheduler.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/geom/sched/gs_scheduler.h Mon Feb 21 09:01:34 2011 (r218909) @@ -144,7 +144,7 @@ struct g_sched_class { /* * Manipulate the classifier's data. g_sched_get_class() gets a reference - * to the the class corresponding to bp in gp, allocating and initializing + * to the class corresponding to bp in gp, allocating and initializing * it if necessary. g_sched_put_class() releases the reference. * The returned value points to the private data for the class. */ Modified: head/sys/gnu/fs/xfs/xfs_dir_leaf.c ============================================================================== --- head/sys/gnu/fs/xfs/xfs_dir_leaf.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/gnu/fs/xfs/xfs_dir_leaf.c Mon Feb 21 09:01:34 2011 (r218909) @@ -2153,7 +2153,7 @@ xfs_dir_leaf_getdents_int( } /* - * Format a dirent64 structure and copy it out the the user's buffer. + * Format a dirent64 structure and copy it out the user's buffer. */ int xfs_dir_put_dirent64_direct(xfs_dir_put_args_t *pa) @@ -2185,7 +2185,7 @@ xfs_dir_put_dirent64_direct(xfs_dir_put_ } /* - * Format a dirent64 structure and copy it out the the user's buffer. + * Format a dirent64 structure and copy it out the user's buffer. */ int xfs_dir_put_dirent64_uio(xfs_dir_put_args_t *pa) Modified: head/sys/gnu/fs/xfs/xfs_itable.c ============================================================================== --- head/sys/gnu/fs/xfs/xfs_itable.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/gnu/fs/xfs/xfs_itable.c Mon Feb 21 09:01:34 2011 (r218909) @@ -777,7 +777,7 @@ xfs_inumbers( xfs_buf_relse(agbp); agbp = NULL; /* - * Move up the the last inode in the current + * Move up the last inode in the current * chunk. The lookup_ge will always get * us the first inode in the next chunk. */ Modified: head/sys/i386/i386/trap.c ============================================================================== --- head/sys/i386/i386/trap.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/i386/i386/trap.c Mon Feb 21 09:01:34 2011 (r218909) @@ -255,7 +255,7 @@ trap(struct trapframe *frame) * A trap can occur while DTrace executes a probe. Before * executing the probe, DTrace blocks re-scheduling and sets * a flag in it's per-cpu flags to indicate that it doesn't - * want to fault. On returning from the the probe, the no-fault + * want to fault. On returning from the probe, the no-fault * flag is cleared and finally re-scheduling is enabled. * * If the DTrace kernel module has registered a trap handler, Modified: head/sys/kern/subr_unit.c ============================================================================== --- head/sys/kern/subr_unit.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/kern/subr_unit.c Mon Feb 21 09:01:34 2011 (r218909) @@ -41,7 +41,7 @@ * * If a mutex is not provided when the unit number space is created, a * default global mutex is used. The advantage to passing a mutex in, is - * that the the alloc_unrl() function can be called with the mutex already + * that the alloc_unrl() function can be called with the mutex already * held (it will not be released by alloc_unrl()). * * The allocation function alloc_unr{l}() never sleeps (but it may block on @@ -52,7 +52,7 @@ * * A userland test program is included. * - * Memory usage is a very complex function of the the exact allocation + * Memory usage is a very complex function of the exact allocation * pattern, but always very compact: * * For the very typical case where a single unbroken run of unit * numbers are allocated 44 bytes are used on i386. Modified: head/sys/kern/subr_witness.c ============================================================================== --- head/sys/kern/subr_witness.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/kern/subr_witness.c Mon Feb 21 09:01:34 2011 (r218909) @@ -1175,7 +1175,7 @@ witness_checkorder(struct lock_object *l mtx_assert(&w_mtx, MA_OWNED); /* - * If we know that the the lock we are acquiring comes after + * If we know that the lock we are acquiring comes after * the lock we most recently acquired in the lock order tree, * then there is no need for any further checks. */ Modified: head/sys/kern/uipc_mbuf.c ============================================================================== --- head/sys/kern/uipc_mbuf.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/kern/uipc_mbuf.c Mon Feb 21 09:01:34 2011 (r218909) @@ -280,7 +280,7 @@ mb_free_ext(struct mbuf *m) } /* - * Attach the the cluster from *m to *n, set up m_ext in *n + * Attach the cluster from *m to *n, set up m_ext in *n * and bump the refcount of the cluster. */ static void Modified: head/sys/mips/mips/pmap.c ============================================================================== --- head/sys/mips/mips/pmap.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/mips/mips/pmap.c Mon Feb 21 09:01:34 2011 (r218909) @@ -2018,7 +2018,7 @@ validate: pmap_update_page(pmap, va, newpte); /* - * Sync I & D caches for executable pages. Do this only if the the + * Sync I & D caches for executable pages. Do this only if the * target pmap belongs to the current process. Otherwise, an * unresolvable TLB miss may occur. */ @@ -2152,7 +2152,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_ else { *pte |= PTE_RO; /* - * Sync I & D caches. Do this only if the the target pmap + * Sync I & D caches. Do this only if the target pmap * belongs to the current process. Otherwise, an * unresolvable TLB miss may occur. */ if (pmap == &curproc->p_vmspace->vm_pmap) { Modified: head/sys/mips/rmi/fmn.c ============================================================================== --- head/sys/mips/rmi/fmn.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/mips/rmi/fmn.c Mon Feb 21 09:01:34 2011 (r218909) @@ -99,7 +99,7 @@ static int msgring_maxthreads = 3; TUNABLE_INT("hw.fmn.maxthreads", &msgring_maxthreads); /* - * The device drivers can register a handler for the the messages sent + * The device drivers can register a handler for the messages sent * from a station (corresponding to the device). */ struct tx_stn_handler { @@ -148,7 +148,7 @@ xlr_msgring_cpu_init(void) * For sending FMN messages, we need credits on the destination * bucket. Program the credits this core has on the 128 possible * destination buckets. - * We cannot use a loop here, because the the first argument has + * We cannot use a loop here, because the first argument has * to be a constant integer value. */ MSGRNG_CC_INIT_CPU_DEST(0, cc_config->counters); Modified: head/sys/mips/sibyte/sb_zbpci.c ============================================================================== --- head/sys/mips/sibyte/sb_zbpci.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/mips/sibyte/sb_zbpci.c Mon Feb 21 09:01:34 2011 (r218909) @@ -110,7 +110,7 @@ zbpci_attach(device_t dev) panic("%s: port_rman", __func__); /* - * Reserve the the physical memory that is used to read/write to the + * Reserve the physical memory that is used to read/write to the * pci config space but don't activate it. We are using a page worth * of KVA as a window over this region. */ Modified: head/sys/net/if_media.c ============================================================================== --- head/sys/net/if_media.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/net/if_media.c Mon Feb 21 09:01:34 2011 (r218909) @@ -235,7 +235,7 @@ ifmedia_ioctl(ifp, ifr, ifm, cmd) /* * If no change, we're done. * XXX Automedia may invole software intervention. - * Keep going in case the the connected media changed. + * Keep going in case the connected media changed. * Similarly, if best match changed (kernel debugger?). */ if ((IFM_SUBTYPE(newmedia) != IFM_AUTO) && Modified: head/sys/net/route.c ============================================================================== --- head/sys/net/route.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/net/route.c Mon Feb 21 09:01:34 2011 (r218909) @@ -539,7 +539,7 @@ rtredirect_fib(struct sockaddr *dst, goto done; /* * Create a new entry if we just got back a wildcard entry - * or the the lookup failed. This is necessary for hosts + * or the lookup failed. This is necessary for hosts * which use routing redirects generated by smart gateways * to dynamically build the routing tables. */ Modified: head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c ============================================================================== --- head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Mon Feb 21 09:01:34 2011 (r218909) @@ -560,7 +560,7 @@ ng_btsocket_rfcomm_connect(struct socket soclose(l2so); /* we don't need new L2CAP socket */ /* - * Check if we already have the same DLCI the the same session + * Check if we already have the same DLCI the same session */ mtx_lock(&s->session_mtx); Modified: head/sys/netgraph/ng_source.c ============================================================================== --- head/sys/netgraph/ng_source.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/netgraph/ng_source.c Mon Feb 21 09:01:34 2011 (r218909) @@ -604,7 +604,7 @@ ng_source_disconnect(hook_p hook) } /* - * Set sc->output_ifp to point to the the struct ifnet of the interface + * Set sc->output_ifp to point to the struct ifnet of the interface * reached via our output hook. */ static int Modified: head/sys/netinet/if_ether.c ============================================================================== --- head/sys/netinet/if_ether.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/netinet/if_ether.c Mon Feb 21 09:01:34 2011 (r218909) @@ -810,7 +810,7 @@ reply: /* * Also check that the node which sent the ARP packet - * is on the the interface we expect it to be on. This + * is on the interface we expect it to be on. This * avoids ARP chaos if an interface is connected to the * wrong network. */ Modified: head/sys/netinet/ip_input.c ============================================================================== --- head/sys/netinet/ip_input.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/netinet/ip_input.c Mon Feb 21 09:01:34 2011 (r218909) @@ -1031,7 +1031,7 @@ found: * segment. If it provides all of our data, drop us, otherwise * stick new segment in the proper place. * - * If some of the data is dropped from the the preceding + * If some of the data is dropped from the preceding * segment, then it's checksum is invalidated. */ if (p) { Modified: head/sys/netinet/ipfw/ip_fw_private.h ============================================================================== --- head/sys/netinet/ipfw/ip_fw_private.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/netinet/ipfw/ip_fw_private.h Mon Feb 21 09:01:34 2011 (r218909) @@ -90,7 +90,7 @@ struct ip_fw_args { /* * On return, it points to the matching rule. * On entry, rule.slot > 0 means the info is valid and - * contains the the starting rule for an ipfw search. + * contains the starting rule for an ipfw search. * If chain_id == chain->id && slot >0 then jump to that slot. * Otherwise, we locate the first rule >= rulenum:rule_id */ Modified: head/sys/netinet/libalias/alias_sctp.c ============================================================================== --- head/sys/netinet/libalias/alias_sctp.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/netinet/libalias/alias_sctp.c Mon Feb 21 09:01:34 2011 (r218909) @@ -1929,7 +1929,7 @@ UP_process(struct libalias *la, int dire * @brief Process SCTP message while association is in the process of closing * * This function waits for a SHUT-COMP to close the association. Depending on - * the the setting of sysctl_holddown_timer it may not remove the association + * the setting of sysctl_holddown_timer it may not remove the association * immediately, but leave it up until SN_X_T(la). Only SHUT-COMP, SHUT-ACK, and * ABORT packets are permitted in this state. All other packets are dropped. * Modified: head/sys/netinet/tcp_offload.h ============================================================================== --- head/sys/netinet/tcp_offload.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/netinet/tcp_offload.h Mon Feb 21 09:01:34 2011 (r218909) @@ -56,7 +56,7 @@ * * It is assumed that individuals deploying TOE will want connections * to be offloaded without software changes so all connections on an - * interface providing TOE are offloaded unless the the SO_NO_OFFLOAD + * interface providing TOE are offloaded unless the SO_NO_OFFLOAD * flag is set on the socket. * * Modified: head/sys/netinet/tcp_subr.c ============================================================================== --- head/sys/netinet/tcp_subr.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/netinet/tcp_subr.c Mon Feb 21 09:01:34 2011 (r218909) @@ -1383,7 +1383,7 @@ tcp_ctlinput(int cmd, struct sockaddr *s mtu = V_tcp_minmss + sizeof(struct tcpiphdr); /* - * Only cache the the MTU if it + * Only cache the MTU if it * is smaller than the interface * or route MTU. tcp_mtudisc() * will do right thing by itself. Modified: head/sys/netinet/tcp_syncache.c ============================================================================== --- head/sys/netinet/tcp_syncache.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/netinet/tcp_syncache.c Mon Feb 21 09:01:34 2011 (r218909) @@ -524,7 +524,7 @@ syncache_chkrst(struct in_conninfo *inc, * used, or we are under memory pressure, a valid RST * may not find a syncache entry. In that case we're * done and no SYN|ACK retransmissions will happen. - * Otherwise the the RST was misdirected or spoofed. + * Otherwise the RST was misdirected or spoofed. */ if (sc == NULL) { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) Modified: head/sys/netinet/tcp_timewait.c ============================================================================== --- head/sys/netinet/tcp_timewait.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/netinet/tcp_timewait.c Mon Feb 21 09:01:34 2011 (r218909) @@ -397,7 +397,7 @@ tcp_twcheck(struct inpcb *inp, struct tc } /* - * Drop the the segment if it does not contain an ACK. + * Drop the segment if it does not contain an ACK. */ if ((thflags & TH_ACK) == 0) goto drop; Modified: head/sys/netinet6/in6.h ============================================================================== --- head/sys/netinet6/in6.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/netinet6/in6.h Mon Feb 21 09:01:34 2011 (r218909) @@ -78,7 +78,7 @@ /* * IPv6 port allocation rules should mirror the IPv4 rules and are controlled - * by the the net.inet.ip.portrange sysctl tree. The following defines exist + * by the net.inet.ip.portrange sysctl tree. The following defines exist * for compatibility with userland applications that need them. */ #if __BSD_VISIBLE Modified: head/sys/pc98/cbus/fdc.c ============================================================================== --- head/sys/pc98/cbus/fdc.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/pc98/cbus/fdc.c Mon Feb 21 09:01:34 2011 (r218909) @@ -2378,7 +2378,7 @@ fdmisccmd(struct cdev *dev, u_int cmd, v /* * Set up a bio request for fdstrategy(). bio_offset is faked - * so that fdstrategy() will seek to the the requested + * so that fdstrategy() will seek to the requested * cylinder, and use the desired head. */ bp->bio_cmd = cmd; Modified: head/sys/sparc64/include/iommureg.h ============================================================================== --- head/sys/sparc64/include/iommureg.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/sparc64/include/iommureg.h Mon Feb 21 09:01:34 2011 (r218909) @@ -194,7 +194,7 @@ * Unfortunately, sabres on UltraSPARC IIi and IIe processors does not use * this scheme to determine the IOVA base address. Instead, bits 31-29 are * used to check against the Target Address Space register in the IIi and - * the the IOMMU is used if they hit. God knows what goes on in the IIe. + * the IOMMU is used if they hit. God knows what goes on in the IIe. * */ Modified: head/sys/sparc64/pci/sbbc.c ============================================================================== --- head/sys/sparc64/pci/sbbc.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/sparc64/pci/sbbc.c Mon Feb 21 09:01:34 2011 (r218909) @@ -335,7 +335,7 @@ sbbc_pci_attach(device_t dev) rid = SBBC_PCI_BAR; /* * Note that we don't activate the resource so it's not mapped twice - * but only once by the the firmware. + * but only once by the firmware. */ sc->sc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, 0); if (sc->sc_res == NULL) { Modified: head/sys/sparc64/sparc64/trap.c ============================================================================== --- head/sys/sparc64/sparc64/trap.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/sparc64/sparc64/trap.c Mon Feb 21 09:01:34 2011 (r218909) @@ -433,7 +433,7 @@ trap_cecc(void) cache_flush(); /* Ensure the caches are still turned on (should be). */ cache_enable(PCPU_GET(impl)); - /* Clear the the error from the AFSR. */ + /* Clear the error from the AFSR. */ stxa_sync(0, ASI_AFSR, ldxa(0, ASI_AFSR)); corrected_ecc++; printf("corrected ECC error\n"); Modified: head/sys/sys/aac_ioctl.h ============================================================================== --- head/sys/sys/aac_ioctl.h Mon Feb 21 05:10:34 2011 (r218908) +++ head/sys/sys/aac_ioctl.h Mon Feb 21 09:01:34 2011 (r218909) @@ -117,7 +117,7 @@ union aac_statrequest { /* Do the native version of the ioctls. Since the BSD encoding scheme * conflicts with the 'standard' AAC encoding scheme, the resulting numbers * will be different. The '8' comes from the fact that the previous scheme - * used 12 bits for the number, with the the 12th bit being the only set + * used 12 bits for the number, with the 12th bit being the only set * bit above bit 8. Thus the value of 8, with the lower 8 bits holding the * command number. 9 is used for the odd overflow case. */ Modified: head/usr.bin/lex/misc.c ============================================================================== --- head/usr.bin/lex/misc.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/usr.bin/lex/misc.c Mon Feb 21 09:01:34 2011 (r218909) @@ -707,7 +707,7 @@ const char str[]; } -/* readable_form - return the the human-readable form of a character +/* readable_form - return the human-readable form of a character * * The returned string is in static storage. */ Modified: head/usr.bin/m4/gnum4.c ============================================================================== --- head/usr.bin/m4/gnum4.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/usr.bin/m4/gnum4.c Mon Feb 21 09:01:34 2011 (r218909) @@ -54,7 +54,7 @@ int mimic_gnu = 0; /* * Support for include path search - * First search in the the current directory. + * First search in the current directory. * If not found, and the path is not absolute, include path kicks in. * First, -I options, in the order found on the command line. * Then M4PATH env variable Modified: head/usr.bin/make/lst.c ============================================================================== --- head/usr.bin/make/lst.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/usr.bin/make/lst.c Mon Feb 21 09:01:34 2011 (r218909) @@ -98,7 +98,7 @@ Lst_Append(Lst *list, LstNode *ln, void * LST_CONCLINK if should just be relinked * * Side Effects: - * New elements are created and appended the the first list. + * New elements are created and appended the first list. */ void Lst_Concat(Lst *list1, Lst *list2, int flags) Modified: head/usr.bin/rpcinfo/rpcinfo.c ============================================================================== --- head/usr.bin/rpcinfo/rpcinfo.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/usr.bin/rpcinfo/rpcinfo.c Mon Feb 21 09:01:34 2011 (r218909) @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); /* * rpcinfo: ping a particular rpc program - * or dump the the registered programs on the remote machine. + * or dump the registered programs on the remote machine. */ /* Modified: head/usr.bin/xinstall/xinstall.c ============================================================================== --- head/usr.bin/xinstall/xinstall.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/usr.bin/xinstall/xinstall.c Mon Feb 21 09:01:34 2011 (r218909) @@ -492,7 +492,7 @@ install(const char *from_name, const cha * flags, except for the dump flag. * NFS does not support flags. Ignore EOPNOTSUPP flags if we're just * trying to turn off UF_NODUMP. If we're trying to set real flags, - * then warn if the the fs doesn't support it, otherwise fail. + * then warn if the fs doesn't support it, otherwise fail. */ if (!devnull && (flags & SETFLAGS || (from_sb.st_flags & ~UF_NODUMP) != to_sb.st_flags) && Modified: head/usr.sbin/moused/moused.c ============================================================================== --- head/usr.sbin/moused/moused.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/usr.sbin/moused/moused.c Mon Feb 21 09:01:34 2011 (r218909) @@ -931,7 +931,7 @@ main(int argc, char *argv[]) /* * We cannot continue because of error. Exit if the * program has not become a daemon. Otherwise, block - * until the the user corrects the problem and issues SIGHUP. + * until the user corrects the problem and issues SIGHUP. */ if (!background) exit(1); Modified: head/usr.sbin/rpcbind/util.c ============================================================================== --- head/usr.sbin/rpcbind/util.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/usr.sbin/rpcbind/util.c Mon Feb 21 09:01:34 2011 (r218909) @@ -237,7 +237,7 @@ addrmerge(struct netbuf *caller, char *s found: /* - * Construct the new address using the the address from + * Construct the new address using the address from * `bestif', and the port number from `serv_uaddr'. */ serv_nbp = uaddr2taddr(nconf, serv_uaddr); Modified: head/usr.sbin/sysinstall/install.c ============================================================================== --- head/usr.sbin/sysinstall/install.c Mon Feb 21 05:10:34 2011 (r218908) +++ head/usr.sbin/sysinstall/install.c Mon Feb 21 09:01:34 2011 (r218909) @@ -953,7 +953,7 @@ installFixupBase(dialogMenuItem *self) vsystem("mtree -deU -f /etc/mtree/BSD.usr.dist -p /usr"); #ifdef __ia64__ - /* Move /boot to the the EFI partition and make /boot a link to it. */ + /* Move /boot to the EFI partition and make /boot a link to it. */ efi_mntpt = (EfiChunk != NULL) ? ((PartInfo *)EfiChunk->private_data)->mountpoint : NULL; if (efi_mntpt != NULL) { vsystem("if [ ! -L /boot ]; then mv /boot %s; fi", efi_mntpt); From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 09:22:11 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 056B2106566B; Mon, 21 Feb 2011 09:22:11 +0000 (UTC) (envelope-from pawel@dawidek.net) Received: from mail.garage.freebsd.pl (60.wheelsystems.com [83.12.187.60]) by mx1.freebsd.org (Postfix) with ESMTP id 7D9958FC17; Mon, 21 Feb 2011 09:22:09 +0000 (UTC) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 7B26845684; Mon, 21 Feb 2011 10:22:07 +0100 (CET) Received: from localhost (58.wheelsystems.com [83.12.187.58]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 1655F45EEF; Mon, 21 Feb 2011 10:22:02 +0100 (CET) Date: Mon, 21 Feb 2011 10:21:43 +0100 From: Pawel Jakub Dawidek To: VANHULLEBUS Yvan Message-ID: <20110221092143.GA1766@garage.freebsd.pl> References: <201102180940.p1I9eD29050530@svn.freebsd.org> <20110219073412.GC2016@garage.freebsd.pl> <20110221084025.GA14934@zeninc.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3MwIy2ne0vdjdPXF" Content-Disposition: inline In-Reply-To: <20110221084025.GA14934@zeninc.net> User-Agent: Mutt/1.4.2.3i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 9.0-CURRENT amd64 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-3.9 required=4.5 tests=ALL_TRUSTED,BAYES_00, RCVD_IN_SORBS_DUL autolearn=ham version=3.0.4 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218794 - in head: . sys/netipsec X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 09:22:11 -0000 --3MwIy2ne0vdjdPXF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Feb 21, 2011 at 09:40:25AM +0100, VANHULLEBUS Yvan wrote: > > Second of all I really think that an UPDATING entry is not enough. > > We should at least provide sysctl to change it back >=20 > I sent a mail on freebsd-net@ at the beginning of january, to ask some > feedback from users, and got NO response at all. > So I considered implementing such a sysctl would be just time waste. > And it is also a quite bad solution, as it does not solves situations > where you want to do IPsec using HMAC_SHA2 with two peers, one which > is RFC4868 compliant, and the other which uses the old round-96 bits > draft for it's implementation.... You can't talk to two such peers with sysctl or without anyway. I assume that if someone already has tunnels configured and they work, they work, because the other end uses 96 bits hashes. Once he upgrades there is no way to get old behaviour back quickly. You are changing on-the-wire protocol in the middle of stable branch. Am I alone in thinking that this is bad idea? I'm not saying using larger hash is wrong. Quite the opposite. I actually implemented this for a customer, but never got around merging it to FreeBSD, because of the on-the-wire protocol change. Imagine a situation where someone does upgrade from 8.2 to 8.3 one of his IPsec machines. Tunnels stop to work. How can he tell what went wrong? We don't even log hash mismatches, we only bump some counter. This is not user-friendly. Situations like that make people angry and make them want to use FreeBSD a little bit less. > Feel free to send me your benchmarks results if you do such an > implementation... I'm sorry, but is really lame way to deal with criticism. > > it would be best to log a warning that the > > other side is using old implementation and it (the other side) should be > > either upgraded or this sysctl should be changed locally to enable old > > behaviour. >=20 > As said upper, afaik, you just can't detect such things without > wasting LOTS of CPU cycles.... Well, checking two hashes isn't really so time consuming. The hash is only truncated, so if you calculate a larger one you also have smaller one to compare. Even better, in common case the larger one will simply match and you have no additional overhead whatsoever. Having said that, I don't think this is the right solution. We want larger hash to be more secure and falling back to smaller hash defeats this goal and there is also the problem when we are initiator. Hmm, although on hash mismatch we could try comparing smaller hash and if it matches discard the packet, but log a warning that the other end is using unsupported, 96 bits hash. > > I'm happy to remove such sysctl after one full major release, > > so we won't support tunnels between FreeBSD 8 and FreeBSD 10, but we > > should IMHO definitely support tunnels between both 8-9 and 9-10. >=20 > The only thing you may do is to include again the old code and put > some #ifdef RFC4868_SUPPORT / #else / #endif in kernel code, or set up > a global sysctl (which will be quite intrusive for such a small > patchset) so people will be able to decide if they want their whole > IPsec stack to be RFC4868 or draft-round96 compliant.... Small patchset in what sense? In terms of diff size, yes, but because you change on-the-wire protocol I think the impact is not small at all. > But once again, this will NOT solve issues with multiple peers, and > once again, the "simple" solution when you can't upgrade both peers is > to switch back to HMAC_SHA1, which is actually really strong enough, > and which is NOT affected by this patch. The "multiple peers issue" is no a valid argument, as I said, because we can't handle those anyway in any case. I'm happy that we tell users to switch to HMAC/SHA1, but we currently don't do that. No warning is logged, for example. All in all, I don't really feel convinced. If nobody supports my concerns, I'll let go sysctl addition, but I'd still strongly recommend not to MFC this change to stable/8. --=20 Pawel Jakub Dawidek http://www.wheelsystems.com pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --3MwIy2ne0vdjdPXF Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAk1iLqcACgkQForvXbEpPzSbhQCgiVSd5DnMhjByrVMuh4cAYAfK VkQAnjk5E8n05GduiKG8Ij7xO4tmPzkd =65VV -----END PGP SIGNATURE----- --3MwIy2ne0vdjdPXF-- From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 09:56:08 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4F4C106566B; Mon, 21 Feb 2011 09:56:08 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D393F8FC0A; Mon, 21 Feb 2011 09:56:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1L9u8et064565; Mon, 21 Feb 2011 09:56:08 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L9u8Qp064563; Mon, 21 Feb 2011 09:56:08 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102210956.p1L9u8Qp064563@svn.freebsd.org> From: Bruce Cran Date: Mon, 21 Feb 2011 09:56:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218910 - head/usr.sbin/fdformat X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 09:56:09 -0000 Author: brucec Date: Mon Feb 21 09:56:08 2011 New Revision: 218910 URL: http://svn.freebsd.org/changeset/base/218910 Log: The FD_FORM ioctl used to ignore errors from the floppy controller; now when it encounters an error it returns an error from the ioctl. Ignore any errors when using the FD_FORM ioctl. PR: kern/103862 MFC after: 3 days Modified: head/usr.sbin/fdformat/fdformat.c Modified: head/usr.sbin/fdformat/fdformat.c ============================================================================== --- head/usr.sbin/fdformat/fdformat.c Mon Feb 21 09:01:34 2011 (r218909) +++ head/usr.sbin/fdformat/fdformat.c Mon Feb 21 09:56:08 2011 (r218910) @@ -75,8 +75,7 @@ format_track(int fd, int cyl, int secs, f.fd_formb_secno(i) = il[i+1]; f.fd_formb_secsize(i) = secsize; } - if(ioctl(fd, FD_FORM, (caddr_t)&f) < 0) - err(EX_OSERR, "ioctl(FD_FORM)"); + (void)ioctl(fd, FD_FORM, (caddr_t)&f); } static int From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 10:35:07 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A195C1065674; Mon, 21 Feb 2011 10:35:07 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.cksoft.de (mail.cksoft.de [IPv6:2001:4068:10::3]) by mx1.freebsd.org (Postfix) with ESMTP id 46A9C8FC13; Mon, 21 Feb 2011 10:35:07 +0000 (UTC) Received: from localhost (amavis.fra.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id A480D41C7A6; Mon, 21 Feb 2011 11:35:06 +0100 (CET) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([192.168.74.103]) by localhost (amavis.fra.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id xxD9WA2w8VfQ; Mon, 21 Feb 2011 11:35:05 +0100 (CET) Received: by mail.cksoft.de (Postfix, from userid 66) id BF4DB41C7B7; Mon, 21 Feb 2011 11:35:05 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id 54B694448F3; Mon, 21 Feb 2011 10:30:26 +0000 (UTC) Date: Mon, 21 Feb 2011 10:30:26 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: Pawel Jakub Dawidek In-Reply-To: <20110221092143.GA1766@garage.freebsd.pl> Message-ID: <20110221100635.F13400@maildrop.int.zabbadoz.net> References: <201102180940.p1I9eD29050530@svn.freebsd.org> <20110219073412.GC2016@garage.freebsd.pl> <20110221084025.GA14934@zeninc.net> <20110221092143.GA1766@garage.freebsd.pl> X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@freebsd.org, VANHULLEBUS Yvan , src-committers@freebsd.org, svn-src-all@freebsd.org Subject: Re: svn commit: r218794 - in head: . sys/netipsec X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 10:35:07 -0000 On Mon, 21 Feb 2011, Pawel Jakub Dawidek wrote: Hi, > On Mon, Feb 21, 2011 at 09:40:25AM +0100, VANHULLEBUS Yvan wrote: >>> Second of all I really think that an UPDATING entry is not enough. >>> We should at least provide sysctl to change it back >> >> I sent a mail on freebsd-net@ at the beginning of january, to ask some >> feedback from users, and got NO response at all. >> So I considered implementing such a sysctl would be just time waste. >> And it is also a quite bad solution, as it does not solves situations >> where you want to do IPsec using HMAC_SHA2 with two peers, one which >> is RFC4868 compliant, and the other which uses the old round-96 bits >> draft for it's implementation.... > > You can't talk to two such peers with sysctl or without anyway. I assume > that if someone already has tunnels configured and they work, they work, > because the other end uses 96 bits hashes. Once he upgrades there is no > way to get old behaviour back quickly. > > You are changing on-the-wire protocol in the middle of stable branch. Am > I alone in thinking that this is bad idea? > > I'm not saying using larger hash is wrong. Quite the opposite. > I actually implemented this for a customer, but never got around merging > it to FreeBSD, because of the on-the-wire protocol change. > > Imagine a situation where someone does upgrade from 8.2 to 8.3 one of > his IPsec machines. Tunnels stop to work. How can he tell what went > wrong? We don't even log hash mismatches, we only bump some counter. > This is not user-friendly. Situations like that make people angry and > make them want to use FreeBSD a little bit less. So let me hijack this one. I am not sure about merging it either but frankly it doesn't matter much if you go from 8.2->8.3 with your custom kernels (you have to build them anyway as IPSEC is not in GENERIC) and the UPDATING note is in place so you have the heads up, or eventually going from 7.x or 8.x to 9.x and hit the same problem. The fact that we still need to do it now rather than doing years ago is the real problem and we have lots of similar issues in other areas where we have excellent state of the art draft code but not final or updated RFC updates and we'll see these kinds of situations a lot more in the future also for GENERIC features. That said doing the full hash and if it fails checking the truncated is what I consider (by design) bad magic in security and as Yvan had pointed out doesn't help if you are the initiator but only if you are the responder (not even thinking about possible security implications yet). I think the counter is actually the right thing rather than spitting log() messages per packet on the console for those kinds of things. netstat -s is un underutilized debugging tool unfortunately. Educating users is what needs to be done (in addition to fixing more counters). The longer we are going to stay on the earlier version though the more likely we will run into interop problems with other stacks no matter what. Having been through this pros and cons before during the review I convinced myself that we'll eventually have to bite the bullet -- so rather now than later. That said if you can come up with a clean solution that will work in all cases I am happy to hear that. Adding a single global sysctl or compile time option to avoid POLA problems for the MFC is probably the thing I could be talked into with clear mentioning in NOTES/man page that it'll be gone from 9. That said a sysctl is probably the most user friendly given that they can update all kernels and then switch the sysctls with all peers, flush and be done w/o reboot or anything. /bz -- Bjoern A. Zeeb You have to have visions! Stop bit received. Insert coin for new address family. From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 10:41:25 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1614D106566B; Mon, 21 Feb 2011 10:41:25 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from out1.smtp.messagingengine.com (out1.smtp.messagingengine.com [66.111.4.25]) by mx1.freebsd.org (Postfix) with ESMTP id D68B48FC0C; Mon, 21 Feb 2011 10:41:24 +0000 (UTC) Received: from compute1.internal (compute1.nyi.mail.srv.osa [10.202.2.41]) by gateway1.messagingengine.com (Postfix) with ESMTP id 751E920571; Mon, 21 Feb 2011 05:23:40 -0500 (EST) Received: from frontend1.messagingengine.com ([10.202.2.160]) by compute1.internal (MEProxy); Mon, 21 Feb 2011 05:23:40 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=messagingengine.com; h=date:from:to:cc:subject:message-id:in-reply-to:references:mime-version:content-type:content-transfer-encoding; s=smtpout; bh=TtNdt/Dd62XR9QF+NvR7j3Cmz7U=; b=I90hbogNg7scsqlCqd6pPjVyQbjkeCyCjtOCCWXjlOiSqmbkmeVfZdznxhbdUSNT7cnlryNCBS3JEqtzGXjJdxLeQF1IUYqttfTPx8LGexy5gl06pUtaPAH9ZEs2VTlKqwQOyk28GssUrpkKjeiBJ0+AHfZjNdYbMSiE3hbDaZ8= X-Sasl-enc: ODKB0UUk3miP15zwka7z/vbejQbzs0QKRAAha8qO/Yfk 1298283819 Received: from localhost (110.249.69.111.dynamic.snap.net.nz [111.69.249.110]) by mail.messagingengine.com (Postfix) with ESMTPA id DCCEC406046; Mon, 21 Feb 2011 05:23:38 -0500 (EST) Date: Mon, 21 Feb 2011 23:23:57 +1300 From: Andrew Turner To: Olivier Houchard Message-ID: <20110221232357.2ae44d4b@fubar.geek.nz> In-Reply-To: <201102132002.p1DK2kRg051314@svn.freebsd.org> References: <201102132002.p1DK2kRg051314@svn.freebsd.org> X-Mailer: Claws Mail 3.7.8 (GTK+ 2.22.1; i386-portbld-freebsd8.0) X-Pirate: Arrrr Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218666 - in head/sys/arm: at91 econa sa11x0 xscale/i80321 xscale/ixp425 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 10:41:25 -0000 On Sun, 13 Feb 2011 20:02:46 +0000 (UTC) Olivier Houchard wrote: > Modified: head/sys/arm/at91/at91_machdep.c > ============================================================================== > --- head/sys/arm/at91/at91_machdep.c Sun Feb 13 19:46:55 > 2011 (r218665) +++ head/sys/arm/at91/at91_machdep.c Sun > Feb 13 20:02:46 2011 (r218666) @@ -234,7 +234,7 @@ > at91_ramsize(void) bw = (cr & AT91SAM9G20_SDRAMC_CR_DBW_16) ? 1 : 2; > } > > - return (1 << (cols + rows + banks + bw)); > + return ((1 << (cols + rows + banks + bw)); > } > > void * > @@ -302,6 +302,8 @@ initarm(void *arg, void *arg2) > valloc_pages(kernelstack, KSTACK_PAGES); > valloc_pages(msgbufpv, round_page(msgbufsize) / PAGE_SIZE); > > + /* Do basic tuning, hz etc */ > + init_param1(); This appears to be wrong. As msgbufsize is set in init_param1 it is used before being set in the at91 initarm function. Andrew From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 11:02:00 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB65D106566C; Mon, 21 Feb 2011 11:02:00 +0000 (UTC) (envelope-from vanhu@zeninc.net) Received: from smtp.zeninc.net (smtp.zeninc.net [80.67.176.25]) by mx1.freebsd.org (Postfix) with ESMTP id DA3958FC17; Mon, 21 Feb 2011 11:01:59 +0000 (UTC) Received: from astro.zen.inc (astro.zen.inc [192.168.1.239]) by smtp.zeninc.net (smtpd) with ESMTP id 24C0F2798BC; Mon, 21 Feb 2011 12:01:57 +0100 (CET) Received: by astro.zen.inc (Postfix, from userid 1000) id 16A7E17059; Mon, 21 Feb 2011 12:01:57 +0100 (CET) Date: Mon, 21 Feb 2011 12:01:56 +0100 From: VANHULLEBUS Yvan To: Pawel Jakub Dawidek Message-ID: <20110221110156.GA15358@zeninc.net> References: <201102180940.p1I9eD29050530@svn.freebsd.org> <20110219073412.GC2016@garage.freebsd.pl> <20110221084025.GA14934@zeninc.net> <20110221092143.GA1766@garage.freebsd.pl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110221092143.GA1766@garage.freebsd.pl> User-Agent: All mail clients suck. This one just sucks less. Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218794 - in head: . sys/netipsec X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 11:02:00 -0000 On Mon, Feb 21, 2011 at 10:21:43AM +0100, Pawel Jakub Dawidek wrote: > On Mon, Feb 21, 2011 at 09:40:25AM +0100, VANHULLEBUS Yvan wrote: [RFC4868 and MFC] > You can't talk to two such peers with sysctl or without anyway. I assume > that if someone already has tunnels configured and they work, they work, > because the other end uses 96 bits hashes. Once he upgrades there is no > way to get old behaviour back quickly. > > You are changing on-the-wire protocol in the middle of stable branch. Am > I alone in thinking that this is bad idea? That's a good question. Of other people also think it's a bad idea, I can just forget the MFC. But the same problem will happen when we'll release 9.0. Of course, this is easier to explain, as this will be a new branch. > I'm not saying using larger hash is wrong. Quite the opposite. > I actually implemented this for a customer, but never got around merging > it to FreeBSD, because of the on-the-wire protocol change. Well... I'm not "changing the protocol".... I.... just fixed a bug to be RFC compliant..... Yes, for people who may actually use HMAC_SHA2, the result will be the same: broken tunnels. > Imagine a situation where someone does upgrade from 8.2 to 8.3 one of > his IPsec machines. Tunnels stop to work. How can he tell what went > wrong? We don't even log hash mismatches, we only bump some counter. > This is not user-friendly. Situations like that make people angry and > make them want to use FreeBSD a little bit less. The same issue actually does exist: imagine a situation where someone tries to set up an IPsec tunnel (still using HMAC_SHA2) between a FreeBSD (any stable version) and .... a MacOSX, a recent OpenBSD, a recent Linux, or some commercial appliance which provides RFC compliant HMAC_SHA2 support. It won't work, FreeBSD won't log anything but packet rejected due to bad hashes (peer will probably do the same). Afaik, OpenBSD and Linux just switched from round-96 bits draft to RFC4868, without any way to go back to round-96 bits, and it seems there have been no major issues with that. I guess this is because quite no one actually uses HMAC_SHA2 for IPsec phase2. > > Feel free to send me your benchmarks results if you do such an > > implementation... > > I'm sorry, but is really lame way to deal with criticism. Between other people at my work and other FreeBSD people in private discussions, this must be the 6th time I'm having such discussions, so having to do it once again a monday morning made me a bit upset. But of course, you couldn't know that, sorry for the sarcastic reply. > > > it would be best to log a warning that the > > > other side is using old implementation and it (the other side) should be > > > either upgraded or this sysctl should be changed locally to enable old > > > behaviour. > > > > As said upper, afaik, you just can't detect such things without > > wasting LOTS of CPU cycles.... > > Well, checking two hashes isn't really so time consuming. Actually, simply switching from NO_AUTH to HMAC_SHA1 makes loosing between 10 and 20% perfs in our benchs (we loose less on products with hardware SHA1). Of course, this is the whole authentication process, but I strongly guess hash computation is an important part of that job. > The hash is > only truncated, so if you calculate a larger one you also have smaller > one to compare. Yes, if you code looks like that: hash=SHAx_compute(data); truncate_hash(hash, size); memcmp(hash, orighash); IPsec stack is implemented using callbacks to crypto framework, hashes sizes and rounds are sent as parameters to crypto framework functions, which may also be used elsewhere, I'm really not sure we can easilly implement the dual check you're talking about. > Even better, in common case the larger one will simply > match and you have no additional overhead whatsoever. Having said that, > I don't think this is the right solution. We want larger hash to be more > secure and falling back to smaller hash defeats this goal and there is > also the problem when we are initiator. > Hmm, although on hash mismatch we could try comparing smaller hash and > if it matches discard the packet, but log a warning that the other end > is using unsupported, 96 bits hash. Doing that on the first ever IPsec packet sounds good. But doing that on any received packets sounds like wasting lots of CPU cycles, as we don't know how much packets broken peer will send (and how much packets a man in the middle may send, which will eats twice as CPU for hash check as usual). So we would have to keep some flag to remind that this peer is broken, which would require a change in a kernel structure.... between 8.2 and 8.3 ? [....] > > The only thing you may do is to include again the old code and put > > some #ifdef RFC4868_SUPPORT / #else / #endif in kernel code, or set up > > a global sysctl (which will be quite intrusive for such a small > > patchset) so people will be able to decide if they want their whole > > IPsec stack to be RFC4868 or draft-round96 compliant.... > > Small patchset in what sense? In terms of diff size, yes, but because > you change on-the-wire protocol I think the impact is not small at all. Of course, I was talking in terms of diff size. > > But once again, this will NOT solve issues with multiple peers, and > > once again, the "simple" solution when you can't upgrade both peers is > > to switch back to HMAC_SHA1, which is actually really strong enough, > > and which is NOT affected by this patch. > > The "multiple peers issue" is no a valid argument, as I said, because we > can't handle those anyway in any case. I'm happy that we tell users to > switch to HMAC/SHA1, but we currently don't do that. No warning is > logged, for example. Telling that in UPDATING is the best way I found..... well, in fact, the only way I found.... > All in all, I don't really feel convinced. If nobody supports my > concerns, I'll let go sysctl addition, but I'd still strongly recommend > not to MFC this change to stable/8. If the MFC seems to be a problem, I can just forgot that and just keep the fixed code in HEAD, but the question will be there again when we'll release 9.0, and that day, we may have more people using HMAC_SHA2 because they've been told that "SHA1 is not secure anymore" (even if we're takling here about HMAC_SHA1, for packets which have a validity of a few seconds....). Yvan. From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 11:21:05 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9BBC106566C; Mon, 21 Feb 2011 11:21:05 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-qw0-f54.google.com (mail-qw0-f54.google.com [209.85.216.54]) by mx1.freebsd.org (Postfix) with ESMTP id E572F8FC14; Mon, 21 Feb 2011 11:21:04 +0000 (UTC) Received: by qwj9 with SMTP id 9so4742572qwj.13 for ; Mon, 21 Feb 2011 03:21:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=QduX0D+CJ98+yFcMObTO8QgDb8CP+zMZ/lFj4hAAV44=; b=c12xDcyqPk9EpB30JeRQKK4I7tX008MZEVp5OObIfP3qZOLpCOl7GQssivyo+AVrhn g6o+deBfh7hWT0DxnnX+gSwfI9Kvhw5OCum2FVwZosywdyeQIW43B2sFyr3y3Wm9MIUu l+rNKHO77f7qb72HSpf4mN7EEvKUZbcNIigiI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; b=uOS2YMmh8+ZqZj7OO6Nb8Y3wqhu/eqNUcQUXtk4ssr7gK6Rat1DPdnkwQ9gS5ondL8 oNzPOyI4/toMJEq7rUT/G4nsRs+bwPuNIWJTLVNUCa/+KyisrpVWP6+WhWnz4BOxaSRV UqJUD6BrLX9aZG2XqdH/2nrqDHlXuebGq7gzs= MIME-Version: 1.0 Received: by 10.224.6.80 with SMTP id 16mr960078qay.286.1298287263963; Mon, 21 Feb 2011 03:21:03 -0800 (PST) Sender: pluknet@gmail.com Received: by 10.229.215.15 with HTTP; Mon, 21 Feb 2011 03:21:03 -0800 (PST) In-Reply-To: <20110221232357.2ae44d4b@fubar.geek.nz> References: <201102132002.p1DK2kRg051314@svn.freebsd.org> <20110221232357.2ae44d4b@fubar.geek.nz> Date: Mon, 21 Feb 2011 14:21:03 +0300 X-Google-Sender-Auth: kmB6QortDBqNd3blN7vTXHcoyTE Message-ID: From: Sergey Kandaurov To: Andrew Turner Content-Type: multipart/mixed; boundary=0015175cb4442f5a2d049cc90f1e Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Olivier Houchard Subject: Re: svn commit: r218666 - in head/sys/arm: at91 econa sa11x0 xscale/i80321 xscale/ixp425 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 11:21:05 -0000 --0015175cb4442f5a2d049cc90f1e Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 21 February 2011 13:23, Andrew Turner wrote: > On Sun, 13 Feb 2011 20:02:46 +0000 (UTC) > Olivier Houchard wrote: >> Modified: head/sys/arm/at91/at91_machdep.c >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/sys/arm/at91/at91_machdep.c =A0Sun Feb 13 19:46:55 >> 2011 =A0(r218665) +++ head/sys/arm/at91/at91_machdep.c =A0Sun >> Feb 13 20:02:46 2011 =A0(r218666) @@ -234,7 +234,7 @@ >> at91_ramsize(void) bw =3D (cr & AT91SAM9G20_SDRAMC_CR_DBW_16) ? 1 : 2; >> =A0 =A0 =A0 } >> >> - =A0 =A0 return (1 << (cols + rows + banks + bw)); >> + =A0 =A0 return ((1 << (cols + rows + banks + bw)); >> =A0} >> >> =A0void * >> @@ -302,6 +302,8 @@ initarm(void *arg, void *arg2) >> =A0 =A0 =A0 valloc_pages(kernelstack, KSTACK_PAGES); >> =A0 =A0 =A0 valloc_pages(msgbufpv, round_page(msgbufsize) / PAGE_SIZE); >> >> + =A0 =A0 /* Do basic tuning, hz etc */ >> + =A0 =A0 init_param1(); > This appears to be wrong. As msgbufsize is set in init_param1 it is > used before being set in the at91 initarm function. > > Andrew > Oh, this should work (see also in attach). init_param1() moved under PCPU_SET(curthread, &thread0). Index: sys/arm/xscale/i8134x/crb_machdep.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sys/arm/xscale/i8134x/crb_machdep.c (revision 218911) +++ sys/arm/xscale/i8134x/crb_machdep.c (working copy) @@ -196,6 +196,9 @@ pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); + /* Do basic tuning, hz etc */ + init_param1(); + freemempos =3D 0x00200000; /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ @@ -389,8 +392,6 @@ phys_avail[i++] =3D 0; phys_avail[i] =3D 0; - /* Do basic tuning, hz etc */ - init_param1(); init_param2(physmem); kdb_init(); return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - Index: sys/arm/xscale/pxa/pxa_machdep.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sys/arm/xscale/pxa/pxa_machdep.c (revision 218911) +++ sys/arm/xscale/pxa/pxa_machdep.c (working copy) @@ -182,6 +182,9 @@ pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); + /* Do basic tuning, hz etc */ + init_param1(); + freemempos =3D 0xa0200000; /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ @@ -424,8 +427,6 @@ phys_avail[0] =3D round_page(virtual_avail - KERNBASE + phys_avail[= 0]); #endif - /* Do basic tuning, hz etc */ - init_param1(); init_param2(physmem); kdb_init(); return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - Index: sys/arm/s3c2xx0/s3c24x0_machdep.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sys/arm/s3c2xx0/s3c24x0_machdep.c (revision 218911) +++ sys/arm/s3c2xx0/s3c24x0_machdep.c (working copy) @@ -257,6 +257,9 @@ pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); + /* Do basic tuning, hz etc */ + init_param1(); + #define KERNEL_TEXT_BASE (KERNBASE) freemempos =3D (lastaddr + PAGE_MASK) & ~PAGE_MASK; /* Define a macro to simplify memory allocation */ @@ -438,8 +441,6 @@ phys_avail[2] =3D 0; phys_avail[3] =3D 0; - /* Do basic tuning, hz etc */ - init_param1(); init_param2(physmem); kdb_init(); Index: sys/arm/at91/at91_machdep.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sys/arm/at91/at91_machdep.c (revision 218911) +++ sys/arm/at91/at91_machdep.c (working copy) @@ -256,6 +256,9 @@ pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); + /* Do basic tuning, hz etc */ + init_param1(); + freemempos =3D (lastaddr + PAGE_MASK) & ~PAGE_MASK; /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ @@ -302,8 +305,6 @@ valloc_pages(kernelstack, KSTACK_PAGES); valloc_pages(msgbufpv, round_page(msgbufsize) / PAGE_SIZE); - /* Do basic tuning, hz etc */ - init_param1(); /* * Now we start construction of the L1 page table * We start by mapping the L2 page tables into the L1. --=20 wbr, pluknet --0015175cb4442f5a2d049cc90f1e Content-Type: application/octet-stream; name="arm_msgbufsize_cleanup.diff" Content-Disposition: attachment; filename="arm_msgbufsize_cleanup.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gkfamtux0 SW5kZXg6IHN5cy9hcm0veHNjYWxlL2k4MTM0eC9jcmJfbWFjaGRlcC5jCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IHN5cy9hcm0veHNjYWxlL2k4MTM0eC9jcmJfbWFjaGRlcC5jCShyZXZpc2lvbiAyMTg5MTEpCisr KyBzeXMvYXJtL3hzY2FsZS9pODEzNHgvY3JiX21hY2hkZXAuYwkod29ya2luZyBjb3B5KQpAQCAt MTk2LDYgKzE5Niw5IEBACiAJcGNwdV9pbml0KHBjcHVwLCAwLCBzaXplb2Yoc3RydWN0IHBjcHUp KTsKIAlQQ1BVX1NFVChjdXJ0aHJlYWQsICZ0aHJlYWQwKTsKIAorCS8qIERvIGJhc2ljIHR1bmlu ZywgaHogZXRjICovCisJaW5pdF9wYXJhbTEoKTsKKwogCWZyZWVtZW1wb3MgPSAweDAwMjAwMDAw OwogCS8qIERlZmluZSBhIG1hY3JvIHRvIHNpbXBsaWZ5IG1lbW9yeSBhbGxvY2F0aW9uICovCiAj ZGVmaW5lCXZhbGxvY19wYWdlcyh2YXIsIG5wKQkJCVwKQEAgLTM4OSw4ICszOTIsNiBAQAogCXBo eXNfYXZhaWxbaSsrXSA9IDA7CiAJcGh5c19hdmFpbFtpXSA9IDA7CiAJCi0JLyogRG8gYmFzaWMg dHVuaW5nLCBoeiBldGMgKi8KLQlpbml0X3BhcmFtMSgpOwogCWluaXRfcGFyYW0yKHBoeXNtZW0p OwogCWtkYl9pbml0KCk7CiAJcmV0dXJuICgodm9pZCAqKShrZXJuZWxzdGFjay5wdl92YSArIFVT UEFDRV9TVkNfU1RBQ0tfVE9QIC0KSW5kZXg6IHN5cy9hcm0veHNjYWxlL3B4YS9weGFfbWFjaGRl cC5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIHN5cy9hcm0veHNjYWxlL3B4YS9weGFfbWFjaGRlcC5jCShyZXZp c2lvbiAyMTg5MTEpCisrKyBzeXMvYXJtL3hzY2FsZS9weGEvcHhhX21hY2hkZXAuYwkod29ya2lu ZyBjb3B5KQpAQCAtMTgyLDYgKzE4Miw5IEBACiAJcGNwdV9pbml0KHBjcHVwLCAwLCBzaXplb2Yo c3RydWN0IHBjcHUpKTsKIAlQQ1BVX1NFVChjdXJ0aHJlYWQsICZ0aHJlYWQwKTsKIAorCS8qIERv IGJhc2ljIHR1bmluZywgaHogZXRjICovCisJaW5pdF9wYXJhbTEoKTsKKwogCWZyZWVtZW1wb3Mg PSAweGEwMjAwMDAwOwogCS8qIERlZmluZSBhIG1hY3JvIHRvIHNpbXBsaWZ5IG1lbW9yeSBhbGxv Y2F0aW9uICovCiAjZGVmaW5lCXZhbGxvY19wYWdlcyh2YXIsIG5wKQkJCVwKQEAgLTQyNCw4ICs0 MjcsNiBAQAogCXBoeXNfYXZhaWxbMF0gPSByb3VuZF9wYWdlKHZpcnR1YWxfYXZhaWwgLSBLRVJO QkFTRSArIHBoeXNfYXZhaWxbMF0pOwogI2VuZGlmCiAKLQkvKiBEbyBiYXNpYyB0dW5pbmcsIGh6 IGV0YyAqLwotCWluaXRfcGFyYW0xKCk7CiAJaW5pdF9wYXJhbTIocGh5c21lbSk7CiAJa2RiX2lu aXQoKTsKIAlyZXR1cm4gKCh2b2lkICopKGtlcm5lbHN0YWNrLnB2X3ZhICsgVVNQQUNFX1NWQ19T VEFDS19UT1AgLQpJbmRleDogc3lzL2FybS9zM2MyeHgwL3MzYzI0eDBfbWFjaGRlcC5jCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIHN5cy9hcm0vczNjMnh4MC9zM2MyNHgwX21hY2hkZXAuYwkocmV2aXNpb24gMjE4 OTExKQorKysgc3lzL2FybS9zM2MyeHgwL3MzYzI0eDBfbWFjaGRlcC5jCSh3b3JraW5nIGNvcHkp CkBAIC0yNTcsNiArMjU3LDkgQEAKIAlwY3B1X2luaXQocGNwdXAsIDAsIHNpemVvZihzdHJ1Y3Qg cGNwdSkpOwogCVBDUFVfU0VUKGN1cnRocmVhZCwgJnRocmVhZDApOwogCisJLyogRG8gYmFzaWMg dHVuaW5nLCBoeiBldGMgKi8KKwlpbml0X3BhcmFtMSgpOworCiAjZGVmaW5lIEtFUk5FTF9URVhU X0JBU0UgKEtFUk5CQVNFKQogCWZyZWVtZW1wb3MgPSAobGFzdGFkZHIgKyBQQUdFX01BU0spICYg flBBR0VfTUFTSzsKIAkvKiBEZWZpbmUgYSBtYWNybyB0byBzaW1wbGlmeSBtZW1vcnkgYWxsb2Nh dGlvbiAqLwpAQCAtNDM4LDggKzQ0MSw2IEBACiAJcGh5c19hdmFpbFsyXSA9IDA7CiAJcGh5c19h dmFpbFszXSA9IDA7CiAKLQkvKiBEbyBiYXNpYyB0dW5pbmcsIGh6IGV0YyAqLwotCWluaXRfcGFy YW0xKCk7CiAJaW5pdF9wYXJhbTIocGh5c21lbSk7CiAJa2RiX2luaXQoKTsKIApJbmRleDogc3lz L2FybS9hdDkxL2F0OTFfbWFjaGRlcC5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHN5cy9hcm0vYXQ5MS9hdDkx X21hY2hkZXAuYwkocmV2aXNpb24gMjE4OTExKQorKysgc3lzL2FybS9hdDkxL2F0OTFfbWFjaGRl cC5jCSh3b3JraW5nIGNvcHkpCkBAIC0yNTYsNiArMjU2LDkgQEAKIAlwY3B1X2luaXQocGNwdXAs IDAsIHNpemVvZihzdHJ1Y3QgcGNwdSkpOwogCVBDUFVfU0VUKGN1cnRocmVhZCwgJnRocmVhZDAp OwogCisJLyogRG8gYmFzaWMgdHVuaW5nLCBoeiBldGMgKi8KKwlpbml0X3BhcmFtMSgpOworCiAJ ZnJlZW1lbXBvcyA9IChsYXN0YWRkciArIFBBR0VfTUFTSykgJiB+UEFHRV9NQVNLOwogCS8qIERl ZmluZSBhIG1hY3JvIHRvIHNpbXBsaWZ5IG1lbW9yeSBhbGxvY2F0aW9uICovCiAjZGVmaW5lIHZh bGxvY19wYWdlcyh2YXIsIG5wKSAgICAgICAgICAgICAgICAgICBcCkBAIC0zMDIsOCArMzA1LDYg QEAKIAl2YWxsb2NfcGFnZXMoa2VybmVsc3RhY2ssIEtTVEFDS19QQUdFUyk7CiAJdmFsbG9jX3Bh Z2VzKG1zZ2J1ZnB2LCByb3VuZF9wYWdlKG1zZ2J1ZnNpemUpIC8gUEFHRV9TSVpFKTsKIAotCS8q IERvIGJhc2ljIHR1bmluZywgaHogZXRjICovCi0JaW5pdF9wYXJhbTEoKTsKIAkvKgogCSAqIE5v dyB3ZSBzdGFydCBjb25zdHJ1Y3Rpb24gb2YgdGhlIEwxIHBhZ2UgdGFibGUKIAkgKiBXZSBzdGFy dCBieSBtYXBwaW5nIHRoZSBMMiBwYWdlIHRhYmxlcyBpbnRvIHRoZSBMMS4K --0015175cb4442f5a2d049cc90f1e-- From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 11:56:12 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 04283106566B; Mon, 21 Feb 2011 11:56:12 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E492A8FC08; Mon, 21 Feb 2011 11:56:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LBuB0d069557; Mon, 21 Feb 2011 11:56:11 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LBuBUa069545; Mon, 21 Feb 2011 11:56:11 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201102211156.p1LBuBUa069545@svn.freebsd.org> From: Lawrence Stewart Date: Mon, 21 Feb 2011 11:56:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218912 - in head/share/man: man4 man9 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 11:56:12 -0000 Author: lstewart Date: Mon Feb 21 11:56:11 2011 New Revision: 218912 URL: http://svn.freebsd.org/changeset/base/218912 Log: Final commit to round out the "Five New TCP Congestion Control Algorithms for FreeBSD" FreeBSD Foundation funded project. - Add new man pages for the modular congestion control, Khelp and Hhook frameworks (cc.4, cc.9, khelp.9 and hhook.9). - Add new man pages for each available congestion control algorithm (cc_chd.4, cc_cubic.4, cc_hd.4, cc_htcp.4, cc_newreno.4 and cc_vegas.4). - Add a new man page for the Enhanced Round Trip Time (ERTT) Khelp module (h_ertt.4). - Update the TCP (tcp.4) man page to mention the TCP_CONGESTION socket option, cross reference to cc.4 and remove references to the retired "net.inet.tcp.newreno" sysctl MIB variable. In collaboration with: David Hayes and Grenville Armitage Sponsored by: FreeBSD Foundation MFC after: 3 months Added: head/share/man/man4/cc.4 (contents, props changed) head/share/man/man4/cc_chd.4 (contents, props changed) head/share/man/man4/cc_cubic.4 (contents, props changed) head/share/man/man4/cc_hd.4 (contents, props changed) head/share/man/man4/cc_htcp.4 (contents, props changed) head/share/man/man4/cc_newreno.4 (contents, props changed) head/share/man/man4/cc_vegas.4 (contents, props changed) head/share/man/man4/h_ertt.4 (contents, props changed) head/share/man/man9/cc.9 (contents, props changed) head/share/man/man9/hhook.9 (contents, props changed) head/share/man/man9/khelp.9 (contents, props changed) Modified: head/share/man/man4/Makefile head/share/man/man4/tcp.4 head/share/man/man9/Makefile Modified: head/share/man/man4/Makefile ============================================================================== --- head/share/man/man4/Makefile Mon Feb 21 10:08:47 2011 (r218911) +++ head/share/man/man4/Makefile Mon Feb 21 11:56:11 2011 (r218912) @@ -69,6 +69,13 @@ MAN= aac.4 \ cardbus.4 \ carp.4 \ cas.4 \ + cc.4 \ + cc_chd.4 \ + cc_cubic.4 \ + cc_hd.4 \ + cc_htcp.4 \ + cc_newreno.4 \ + cc_vegas.4 \ ccd.4 \ cd.4 \ cdce.4 \ @@ -131,6 +138,7 @@ MAN= aac.4 \ gif.4 \ gpib.4 \ gre.4 \ + h_ertt.4 \ harp.4 \ hatm.4 \ hfa.4 \ Added: head/share/man/man4/cc.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/cc.4 Mon Feb 21 11:56:11 2011 (r218912) @@ -0,0 +1,118 @@ +.\" +.\" Copyright (c) 2010-2011 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" This documentation was written at the Centre for Advanced Internet +.\" Architectures, Swinburne University, Melbourne, Australia by David Hayes and +.\" Lawrence Stewart under sponsorship from the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +.\" ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd February 15, 2011 +.Dt cc 4 +.Os +.Sh NAME +.Nm cc +.Nd Modular congestion control +.Sh DESCRIPTION +The modular congestion control framework allows the TCP implementation to +dynamically change the congestion control algorithm used by new and existing +connections. +Algorithms are identified by a unique +.Xr ascii 7 +name. +Algorithm modules can be compiled into the kernel or loaded as kernel modules +using the +.Xr kld 4 +facility. +.Pp +The default algorithm is NewReno, and all connections use the default unless +explicitly overridden using the TCP_CONGESTION socket option (see +.Xr tcp 4 +for details). +The default can be changed using a +.Xr sysctl 3 +MIB variable detailed in the +.Sx MIB Variables +section below. +.Sh MIB Variables +The framework exposes the following variables in the +.Va net.inet.tcp.cc +branch of the +.Xr sysctl 3 +MIB: +.Bl -tag -width ".Va available" +.It Va available +Read-only list of currently available congestion control algorithms by name. +.El +.Bl -tag -width ".Va algorithm" +.It Va algorithm +Returns the current default congestion control algorithm when read, and changes +the default when set. +When attempting to change the default algorithm, this variable should be set to +one of the names listed by the +.Va net.inet.tcp.cc.available +MIB variable. +.El +.Sh SEE ALSO +.Xr cc_chd 4 , +.Xr cc_cubic 4 , +.Xr cc_hd 4 , +.Xr cc_htcp 4 , +.Xr cc_newreno 4 , +.Xr cc_vegas 4 , +.Xr tcp 4 , +.Xr cc 9 +.Sh ACKNOWLEDGEMENTS +Development and testing of this software were made possible in part by grants +from the FreeBSD Foundation and Cisco University Research Program Fund at +Community Foundation Silicon Valley. +.Sh HISTORY +The +.Nm +modular congestion control framework first appeared in +.Fx 9.0 . +.Pp +The framework was first released in 2007 by James Healy and Lawrence Stewart +whilst working on the NewTCP research project at Swinburne University's Centre +for Advanced Internet Architectures, Melbourne, Australia, which was made +possible in part by a grant from the Cisco University Research Program Fund at +Community Foundation Silicon Valley. +More details are available at: +.Pp +http://caia.swin.edu.au/urp/newtcp/ +.Sh AUTHORS +.An -nosplit +The +.Nm +facility was written by +.An Lawrence Stewart Aq lstewart@FreeBSD.org , +.An James Healy Aq jimmy@deefa.com +and +.An David Hayes Aq david.hayes@ieee.org . +.Pp +This manual page was written by +.An David Hayes Aq david.hayes@ieee.org +and +.An Lawrence Stewart Aq lstewart@FreeBSD.org . Added: head/share/man/man4/cc_chd.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/cc_chd.4 Mon Feb 21 11:56:11 2011 (r218912) @@ -0,0 +1,127 @@ +.\" +.\" Copyright (c) 2010-2011 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" This documentation was written at the Centre for Advanced Internet +.\" Architectures, Swinburne University, Melbourne, Australia by David Hayes +.\" under sponsorship from the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +.\" ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd February 15, 2011 +.Dt CC_CHD 4 +.Os +.Sh NAME +.Nm cc_chd +.Nd CHD Congestion Control Algorithm +.Sh DESCRIPTION +CHD enhances the HD algorithm implemented in +.Xr cc_hd 4 . +It provides tolerance to non-congestion related packet loss and improvements to +coexistence with traditional loss-based TCP flows, especially when the +bottleneck link is lightly multiplexed. +.Pp +Like HD, the algorithm aims to keep network queuing delays below a particular +threshold (queue_threshold) and decides to reduce the congestion window (cwnd) +probabilistically based on its estimate of the network queuing delay. +.Pp +It differs from HD in three key aspects: +.Bl -bullet +.It +The probability of cwnd reduction due to congestion is calculated once per round +trip time instead of each time an acknowledgement is received as done by +.Xr cc_hd 4 . +.It +Packet losses that occur while the queuing delay is less than queue_threshold +do not cause cwnd to be reduced. +.It +CHD uses a shadow window to help regain lost transmission opportunities when +competing with loss-based TCP flows. +.Sh MIB Variables +The algorithm exposes the following tunable variables in the +.Va net.inet.tcp.cc.chd +branch of the +.Xr sysctl 3 +MIB: +.Bl -tag -width ".Va queue_threshold" +.It Va queue_threshold +Queueing congestion threshold (qth) in ticks. +Default is 20. +.It Va pmax +Per RTT maximum backoff probability as a percentage. +Default is 50. +.It Va qmin +Minimum queuing delay threshold (qmin) in ticks. +Default is 5. +.It Va loss_fair +If 1, cwnd is adjusted using the shadow window when a congestion +related loss is detected. +Default is 1. +.It Va use_max +If 1, the maximum RTT seen within the measurement period is used as the basic +delay measurement for the algorithm, otherwise a sampled RTT measurement +is used. +Default is 1. +.El +.Sh SEE ALSO +.Xr cc 4 , +.Xr cc_cubic 4 , +.Xr cc_hd 4 , +.Xr cc_htcp 4 , +.Xr cc_newreno 4 , +.Xr cc_vegas 4 , +.Xr h_ertt 4 , +.Xr tcp 4 , +.Xr cc 9 , +.Xr khelp 9 +.Rs +.%A "D. A. Hayes" +.%A "G. Armitage" +.%T "Improved coexistence and loss tolerance for delay based TCP congestion control" +.%J "in 35th Annual IEEE Conference on Local Computer Networks" +.%D "October 2010" +.%P "24-31" +.Re +.Sh ACKNOWLEDGEMENTS +Development and testing of this software were made possible in part by grants +from the FreeBSD Foundation and Cisco University Research Program Fund at +Community Foundation Silicon Valley. +.Sh HISTORY +The +.Nm +congestion control module first appeared in +.Fx 9.0 . +.Pp +The module was first released in 2010 by David Hayes whilst working on the +NewTCP research project at Swinburne University's Centre for Advanced Internet +Architectures, Melbourne, Australia. +More details are available at: +.Pp +http://caia.swin.edu.au/urp/newtcp/ +.Sh AUTHORS +.An -nosplit +The +.Nm +congestion control module and this manual page were written by +.An David Hayes Aq david.hayes@ieee.org . Added: head/share/man/man4/cc_cubic.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/cc_cubic.4 Mon Feb 21 11:56:11 2011 (r218912) @@ -0,0 +1,114 @@ +.\" +.\" Copyright (c) 2009 Lawrence Stewart +.\" Copyright (c) 2010-2011 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" Portions of this documentation were written at the Centre for Advanced +.\" Internet Architectures, Swinburne University, Melbourne, Australia by +.\" David Hayes under sponsorship from the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +.\" ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd February 15, 2011 +.Dt CC_CUBIC 4 +.Os +.Sh NAME +.Nm cc_cubic +.Nd CUBIC Congestion Control Algorithm +.Sh DESCRIPTION +The CUBIC congestion control algorithm was designed to provide increased +throughput in fast and long-distance networks. +It attempts to maintain fairness when competing with legacy NewReno TCP in lower +speed scenarios where NewReno is able to operate adequately. +.Pp +The congestion window is increased as a function of the time elapsed since the +last congestion event. +During regular operation, the window increase function follows a cubic function, +with the inflection point set to be the congestion window value reached at the +last congestion event. +CUBIC also calculates an estimate of the congestion window that NewReno would +have achieved at a given time after a congestion event. +When updating the congestion window, the algorithm will choose the larger of the +calculated CUBIC and estimated NewReno windows. +.Pp +CUBIC also backs off less on congestion by changing the multiplicative decrease +factor from 1/2 (used by standard NewReno TCP) to 4/5. +.Pp +The implementation was done in a clean-room fashion, and is based on the +Internet Draft and paper referenced in the +.Sx SEE ALSO +section below. +.Sh MIB Variables +There are currently no tunable MIB variables. +.Sh SEE ALSO +.Xr cc 4 , +.Xr cc_chd 4 , +.Xr cc_hd 4 , +.Xr cc_htcp 4 , +.Xr cc_newreno 4 , +.Xr cc_vegas 4 , +.Xr tcp 4 , +.Xr cc 9 +.Rs +.%A "Sangtae Ha" +.%A "Injong Rhee" +.%A "Lisong Xu" +.%T "CUBIC for Fast Long-Distance Networks" +.%U "http://tools.ietf.org/id/draft-rhee-tcpm-cubic-02.txt" +.Re +.Rs +.%A "Sangtae Ha" +.%A "Injong Rhee" +.%A "Lisong Xu" +.%T "CUBIC: a new TCP-friendly high-speed TCP variant" +.%J "SIGOPS Oper. Syst. Rev." +.%V "42" +.%N "5" +.%D "July 2008" +.%P "64-74" +.Re +.Sh ACKNOWLEDGEMENTS +Development and testing of this software were made possible in part by grants +from the FreeBSD Foundation and Cisco University Research Program Fund at +Community Foundation Silicon Valley. +.Sh HISTORY +The +.Nm +congestion control module first appeared in +.Fx 9.0 . +.Pp +The module was first released in 2009 by Lawrence Stewart whilst studying at +Swinburne University's Centre for Advanced Internet Architectures, Melbourne, +Australia. +More details are available at: +.Pp +http://caia.swin.edu.au/urp/newtcp/ +.Sh AUTHORS +.An -nosplit +The +.Nm +congestion control module and this manual page were written by +.An Lawrence Stewart Aq lstewart@FreeBSD.org +and +.An David Hayes Aq david.hayes@ieee.org . Added: head/share/man/man4/cc_hd.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/cc_hd.4 Mon Feb 21 11:56:11 2011 (r218912) @@ -0,0 +1,120 @@ +.\" +.\" Copyright (c) 2010-2011 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" This documentation was written at the Centre for Advanced Internet +.\" Architectures, Swinburne University, Melbourne, Australia by David Hayes +.\" under sponsorship from the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +.\" ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd February 15, 2011 +.Dt CC_HD 4 +.Os +.Sh NAME +.Nm cc_hd +.Nd HD Congestion Control Algorithm +.Sh DESCRIPTION +The HD congestion control algorithm is an implementation of the Hamilton +Institute's delay-based congestion control which aims to keep network queuing +delays below a particular threshold (queue_threshold). +.Pp +HD probabilistically reduces the congestion window (cwnd) based on its estimate +of the network queuing delay. +The probability of reducing cwnd is zero at hd_qmin or less, rising to a maximum +at queue_threshold, and then back to zero at the maximum queuing delay. +.Pp +Loss-based congestion control algorithms such as NewReno probe for network +capacity by filling queues until there is a packet loss. +HD competes with loss-based congestion control algorithms by allowing its +probability of reducing cwnd to drop from a maximum at queue_threshold to be +zero at the maximum queuing delay. +This has been shown to work well when the bottleneck link is highly multiplexed. +.Sh MIB Variables +The algorithm exposes the following tunable variables in the +.Va net.inet.tcp.cc.hd +branch of the +.Xr sysctl 3 +MIB: +.Bl -tag -width ".Va queue_threshold" +.It Va queue_threshold +Queueing congestion threshold (qth) in ticks. +Default is 20. +.It Va pmax +Per packet maximum backoff probability as a percentage. +Default is 5. +.It Va qmin +Minimum queuing delay threshold (qmin) in ticks. +Default is 5. +.El +.Sh SEE ALSO +.Xr cc 4 , +.Xr cc_chd 4 , +.Xr cc_cubic 4 , +.Xr cc_htcp 4 , +.Xr cc_newreno 4 , +.Xr cc_vegas 4 , +.Xr h_ertt 4 , +.Xr tcp 4 , +.Xr cc 9 , +.Xr khelp 9 +.Rs +.%A "L. Budzisz" +.%A "R. Stanojevic" +.%A "R. Shorten" +.%A "F. Baker" +.%T "A strategy for fair coexistence of loss and delay-based congestion control algorithms" +.%J "IEEE Commun. Lett." +.%D "Jul 2009" +.%V "13" +.%N "7" +.%P "555-557" +.Re +.Sh ACKNOWLEDGEMENTS +Development and testing of this software were made possible in part by grants +from the FreeBSD Foundation and Cisco University Research Program Fund at +Community Foundation Silicon Valley. +.Sh FUTURE WORK +The Hamilton Institute have recently made some improvements to the algorithm +implemented by this module and have called it Coexistent-TCP (C-TCP). +The improvments should be evaluated and potentially incorporated into this +module. +.Sh HISTORY +The +.Nm +congestion control module first appeared in +.Fx 9.0 . +.Pp +The module was first released in 2010 by David Hayes whilst working on the +NewTCP research project at Swinburne University's Centre for Advanced Internet +Architectures, Melbourne, Australia. +More details are available at: +.Pp +http://caia.swin.edu.au/urp/newtcp/ +.Sh AUTHORS +.An -nosplit +The +.Nm +congestion control module and this manual page were written by +.An David Hayes Aq david.hayes@ieee.org . Added: head/share/man/man4/cc_htcp.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/cc_htcp.4 Mon Feb 21 11:56:11 2011 (r218912) @@ -0,0 +1,136 @@ +.\" +.\" Copyright (c) 2008 Lawrence Stewart +.\" Copyright (c) 2010-2011 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" Portions of this documentation were written at the Centre for Advanced +.\" Internet Architectures, Swinburne University, Melbourne, Australia by +.\" David Hayes under sponsorship from the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +.\" ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd February 15, 2011 +.Dt CC_HTCP 4 +.Os +.Sh NAME +.Nm cc_htcp +.Nd H-TCP Congestion Control Algorithm +.Sh DESCRIPTION +The H-TCP congestion control algorithm was designed to provide increased +throughput in fast and long-distance networks. +It attempts to maintain fairness when competing with legacy NewReno TCP in lower +speed scenarios where NewReno is able to operate adequately. +.Pp +The congestion window is increased as a function of the time elapsed since the +last congestion event. +The window increase algorithm operates like NewReno for the first second after a +congestion event, and then switches to a high-speed mode based on a quadratic +increase function. +.Pp +The implementation was done in a clean-room fashion, and is based on the +Internet Draft and other documents referenced in the +.Sx SEE ALSO +section below. +.Sh MIB Variables +The algorithm exposes the following tunable variables in the +.Va net.inet.tcp.cc.htcp +branch of the +.Xr sysctl 3 +MIB: +.Bl -tag -width ".Va adaptive_backoff" +.It Va adaptive_backoff +Controls use of the adaptive backoff algorithm, which is designed to keep +network queues non-empty during congestion recovery episodes. +Default is 0 (disabled). +.It Va rtt_scaling +Controls use of the RTT scaling algorithm, which is designed to make congestion +window increase during congestion avoidance mode invariant with respect to RTT. +Default is 0 (disabled). +.El +.Sh SEE ALSO +.Xr cc 4 , +.Xr cc_chd 4 , +.Xr cc_cubic 4 , +.Xr cc_hd 4 , +.Xr cc_newreno 4 , +.Xr cc_vegas 4 , +.Xr tcp 4 , +.Xr cc 9 +.Rs +.%A "D. Leith" +.%A "R. Shorten" +.%T "H-TCP: TCP Congestion Control for High Bandwidth-Delay Product Paths" +.%U "http://tools.ietf.org/id/draft-leith-tcp-htcp-06.txt" +.Re +.Rs +.%A "D. Leith" +.%A "R. Shorten" +.%A "T. Yee" +.%T "H-TCP: A framework for congestion control in high-speed and long-distance networks" +.%B "Proc. PFLDnet" +.%D "2005" +.Re +.Rs +.%A "G. Armitage" +.%A "L. Stewart" +.%A "M. Welzl" +.%A "J. Healy" +.%T "An independent H-TCP implementation under FreeBSD 7.0: description and observed behaviour" +.%J "SIGCOMM Comput. Commun. Rev." +.%V "38" +.%N "3" +.%D "July 2008" +.%P "27-38" +.Re +.Sh ACKNOWLEDGEMENTS +Development and testing of this software were made possible in part by grants +from the FreeBSD Foundation and Cisco University Research Program Fund at +Community Foundation Silicon Valley. +.Sh HISTORY +The +.Nm +congestion control module first appeared in +.Fx 9.0 . +.Pp +The module was first released in 2007 by James Healy and Lawrence Stewart whilst +working on the NewTCP research project at Swinburne University's Centre for +Advanced Internet Architectures, Melbourne, Australia, which was made possible +in part by a grant from the Cisco University Research Program Fund at Community +Foundation Silicon Valley. +More details are available at: +.Pp +http://caia.swin.edu.au/urp/newtcp/ +.Sh AUTHORS +.An -nosplit +The +.Nm +congestion control module was written by +.An James Healy Aq jimmy@deefa.com +and +.An Lawrence Stewart Aq lstewart@FreeBSD.org . +.Pp +This manual page was written by +.An Lawrence Stewart Aq lstewart@FreeBSD.org +and +.An David Hayes Aq david.hayes@ieee.org . Added: head/share/man/man4/cc_newreno.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/cc_newreno.4 Mon Feb 21 11:56:11 2011 (r218912) @@ -0,0 +1,82 @@ +.\" +.\" Copyright (c) 2009 Lawrence Stewart +.\" Copyright (c) 2011 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" Portions of this documentation were written at the Centre for Advanced +.\" Internet Architectures, Swinburne University, Melbourne, Australia by +.\" Lawrence Stewart under sponsorship from the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +.\" ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd February 15, 2011 +.Dt CC_NEWRENO 4 +.Os +.Sh NAME +.Nm cc_newreno +.Nd NewReno Congestion Control Algorithm +.Sh DESCRIPTION +The NewReno congestion control algorithm is the default for TCP. +Details about the algorithm can be found in RFC5681. +.Sh MIB Variables +There are currently no tunable MIB variables. +.Sh SEE ALSO +.Xr cc 4 , +.Xr cc_chd 4 , +.Xr cc_cubic 4 , +.Xr cc_hd 4 , +.Xr cc_htcp 4 , +.Xr cc_vegas 4 , +.Xr tcp 4 , +.Xr cc 9 +.Sh ACKNOWLEDGEMENTS +Development and testing of this software were made possible in part by grants +from the FreeBSD Foundation and Cisco University Research Program Fund at +Community Foundation Silicon Valley. +.Sh HISTORY +The +.Nm +congestion control algorithm first appeared in its modular form in +.Fx 9.0 . +.Pp +The module was first released in 2007 by James Healy and Lawrence Stewart whilst +working on the NewTCP research project at Swinburne University's Centre for +Advanced Internet Architectures, Melbourne, Australia, which was made possible +in part by a grant from the Cisco University Research Program Fund at Community +Foundation Silicon Valley. +More details are available at: +.Pp +http://caia.swin.edu.au/urp/newtcp/ +.Sh AUTHORS +.An -nosplit +The +.Nm +congestion control module was written by +.An James Healy Aq jimmy@deefa.com , +.An Lawrence Stewart Aq lstewart@FreeBSD.org +and +.An David Hayes Aq david.hayes@ieee.org . +.Pp +This manual page was written by +.An Lawrence Stewart Aq lstewart@FreeBSD.org . Added: head/share/man/man4/cc_vegas.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/cc_vegas.4 Mon Feb 21 11:56:11 2011 (r218912) @@ -0,0 +1,138 @@ +.\" +.\" Copyright (c) 2010-2011 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" This documentation was written at the Centre for Advanced Internet +.\" Architectures, Swinburne University, Melbourne, Australia by David Hayes +.\" under sponsorship from the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +.\" ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd February 15, 2011 +.Dt CC_VEGAS 4 +.Os +.Sh NAME +.Nm cc_vegas +.Nd Vegas Congestion Control Algorithm +.Sh DESCRIPTION +The Vegas congestion control algorithm uses what the authors term the actual and +expected transmission rates to determine whether there is congestion along the +network path i.e. +.Pp +.Bl -item -offset indent +.It +actual rate = (total data sent in a RTT) / RTT +.It +expected rate = cwnd / RTTmin +.It +diff = expected - actual +.El +.Pp +where RTT is the measured instantaneous round trip time and RTTmin is the +smallest round trip time observed during the connection. +.Pp +The algorithm aims to keep diff between two parameters alpha and beta, such +that: +.Pp +.Bl -item -offset indent +.It +alpha < diff < beta +.El +.Pp +If diff > beta, congestion is inferred and cwnd is decremented by one packet (or +the maximum TCP segment size). +If diff < alpha, then cwnd is incremented by one packet. +Alpha and beta govern the amount of buffering along the path. +.Pp +The implementation was done in a clean-room fashion, and is based on the +paper referenced in the +.Sx SEE ALSO +section below. +.Sh IMPLEMENTATION NOTES +The time from the transmission of a marked packet until the receipt of an +acknowledgement for that packet is measured once per RTT. +This implementation does not implement Brakmo's and Peterson's original +duplicate ACK policy since clock ticks in today's machines are not as coarse as +they were (i.e. 500ms) when Vegas was originally designed. +Note that modern TCP recovery processes such as fast retransmit and SACK are +enabled by default in the TCP stack. +.Sh MIB Variables +The algorithm exposes the following tunable variables in the +.Va net.inet.tcp.cc.vegas +branch of the +.Xr sysctl 3 +MIB: +.Bl -tag -width ".Va alpha" +.It Va alpha +Query or set the Vegas alpha parameter as a number of buffers on the path. +When setting alpha, the value must satisfy: 0 < alpha < beta. +Default is 1. +.It Va beta +Query or set the Vegas beta parameter as a number of buffers on the path. +When setting beta, the value must satisfy: 0 < alpha < beta. +Default is 3. +.El +.Sh SEE ALSO +.Xr cc 4 , +.Xr cc_chd 4 , +.Xr cc_cubic 4 , +.Xr cc_hd 4 , +.Xr cc_htcp 4 , +.Xr cc_newreno 4 , +.Xr h_ertt 4 , +.Xr tcp 4 , +.Xr cc 9 , +.Xr khelp 9 +.Rs +.%A "L. S. Brakmo" +.%A "L. L. Peterson" +.%T "TCP Vegas: end to end congestion avoidance on a global internet" +.%J "IEEE J. Sel. Areas Commun." +.%D "October 1995" +.%V "13" +.%N "8" +.%P "1465-1480" +.Re +.Sh ACKNOWLEDGEMENTS +Development and testing of this software were made possible in part by grants +from the FreeBSD Foundation and Cisco University Research Program Fund at +Community Foundation Silicon Valley. +.Sh HISTORY +The +.Nm +congestion control module first appeared in +.Fx 9.0 . +.Pp +The module was first released in 2010 by David Hayes whilst working on the +NewTCP research project at Swinburne University's Centre for Advanced Internet +Architectures, Melbourne, Australia. +More details are available at: +.Pp +http://caia.swin.edu.au/urp/newtcp/ +.Sh AUTHORS +.An -nosplit +The +.Nm +congestion control module and this manual page were written by +.An David Hayes Aq david.hayes@ieee.org . Added: head/share/man/man4/h_ertt.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/h_ertt.4 Mon Feb 21 11:56:11 2011 (r218912) @@ -0,0 +1,143 @@ +.\" +.\" Copyright (c) 2010-2011 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" This documentation was written at the Centre for Advanced Internet +.\" Architectures, Swinburne University, Melbourne, Australia by David Hayes +.\" under sponsorship from the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +.\" ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd February 15, 2011 +.Dt h_ertt 9 +.Os +.Sh NAME +.Nm h_ertt +.Nd Enhanced Round Trip Time Khelp module +.Sh SYNOPSIS +.In netinet/khelp/h_ertt.h +.Sh DESCRIPTION +The +.Nm +Khelp module works within the +.Xr khelp 9 +framework to provide TCP with a per-connection, low noise estimate of the +instantaneous RTT. +The implementation attempts to be robust in the face of delayed +acknowledgements, TCP Segmentation Offload (TSO), receivers who manipulate TCP +timestamps and lack of the TCP timestamp option altogether. +.Pp +TCP receivers using delayed acknowledgements either acknowledge every second packet +(reflecting the time stamp of the first) or use a timeout to trigger the +acknowledgement if no second packet arrives. +If the heuristic used by +.Nm +determines that the receiver is using delayed acknowledgements, it measures the +RTT using the second packet (the one that triggers the acknowledgement). +It does not measure the RTT if the acknowledgement is for the +first packet, since it cannot be accurately determined. +.Pp +When TSO is in use, +.Nm +will momentarily disable TSO whilst marking a packet to use for a new +measurement. +The process has negligible impact on the connection. +.Pp +.Nm +associates the following struct with each connection's TCP control block: +.Bd -literal +struct ertt { + TAILQ_HEAD(txseginfo_head, txseginfo) txsegi_q; /* Private. */ + long bytes_tx_in_rtt; /* Private. */ + long bytes_tx_in_marked_rtt; + unsigned long marked_snd_cwnd; + int rtt; + int maxrtt; + int minrtt; + int dlyack_rx; /* Private. */ + int timestamp_errors; /* Private. */ + int markedpkt_rtt; /* Private. */ + uint32_t flags; +}; +.Ed +.Pp +The fields marked as private should not be manipulated by any code outside of +the +.Nm +implementation. +The non-private fields provide the following data: +.Bl -tag -width ".Va bytes_tx_in_marked_rtt" -offset indent +.It Va bytes_tx_in_marked_rtt +The number of bytes transmitted in the +.Va markedpkt_rtt . +.It Va marked_snd_cwnd +The value of cwnd for the marked rtt measurement. +.It Va rtt +The most recent RTT measurement. +.It Va maxrtt +The longest RTT measurement that has been taken. +.It Va minrtt +The shortest RTT measurement that has been taken. +.It Va flags +The ERTT_NEW_MEASUREMENT flag will be set by the implementation when a new +measurement is available. +It is the responsibility of +.Nm +consumers to unset the flag if they wish to use it as a notification method for +new measurements. +.El +.Sh SEE ALSO +.Xr cc 4 , +.Xr cc_chd 4 , +.Xr cc_hd 4 , +.Xr cc_vegas 4 , +.Xr hhook 9 , +.Xr khelp 9 +.Sh ACKNOWLEDGEMENTS *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 13:11:06 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0653A1065672; Mon, 21 Feb 2011 13:11:06 +0000 (UTC) (envelope-from cognet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CE52E8FC1B; Mon, 21 Feb 2011 13:11:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LDB5Hq071371; Mon, 21 Feb 2011 13:11:05 GMT (envelope-from cognet@svn.freebsd.org) Received: (from cognet@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LDB5KY071367; Mon, 21 Feb 2011 13:11:05 GMT (envelope-from cognet@svn.freebsd.org) Message-Id: <201102211311.p1LDB5KY071367@svn.freebsd.org> From: Olivier Houchard Date: Mon, 21 Feb 2011 13:11:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218913 - in head/sys/arm: at91 s3c2xx0 xscale/pxa X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 13:11:06 -0000 Author: cognet Date: Mon Feb 21 13:11:05 2011 New Revision: 218913 URL: http://svn.freebsd.org/changeset/base/218913 Log: Get myself a brain, move the call to init_param1() before the first use in at91_machdep.c, and do it for the files I forgot the first time Reported by: andrew Submitted by: pluknet Modified: head/sys/arm/at91/at91_machdep.c head/sys/arm/s3c2xx0/s3c24x0_machdep.c head/sys/arm/xscale/pxa/pxa_machdep.c Modified: head/sys/arm/at91/at91_machdep.c ============================================================================== --- head/sys/arm/at91/at91_machdep.c Mon Feb 21 11:56:11 2011 (r218912) +++ head/sys/arm/at91/at91_machdep.c Mon Feb 21 13:11:05 2011 (r218913) @@ -256,6 +256,9 @@ initarm(void *arg, void *arg2) pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); + /* Do basic tuning, hz etc */ + init_param1(); + freemempos = (lastaddr + PAGE_MASK) & ~PAGE_MASK; /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ @@ -302,8 +305,6 @@ initarm(void *arg, void *arg2) valloc_pages(kernelstack, KSTACK_PAGES); valloc_pages(msgbufpv, round_page(msgbufsize) / PAGE_SIZE); - /* Do basic tuning, hz etc */ - init_param1(); /* * Now we start construction of the L1 page table * We start by mapping the L2 page tables into the L1. Modified: head/sys/arm/s3c2xx0/s3c24x0_machdep.c ============================================================================== --- head/sys/arm/s3c2xx0/s3c24x0_machdep.c Mon Feb 21 11:56:11 2011 (r218912) +++ head/sys/arm/s3c2xx0/s3c24x0_machdep.c Mon Feb 21 13:11:05 2011 (r218913) @@ -257,6 +257,9 @@ initarm(void *arg, void *arg2) pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); + /* Do basic tuning, hz etc */ + init_param1(); + #define KERNEL_TEXT_BASE (KERNBASE) freemempos = (lastaddr + PAGE_MASK) & ~PAGE_MASK; /* Define a macro to simplify memory allocation */ @@ -438,8 +441,6 @@ initarm(void *arg, void *arg2) phys_avail[2] = 0; phys_avail[3] = 0; - /* Do basic tuning, hz etc */ - init_param1(); init_param2(physmem); kdb_init(); Modified: head/sys/arm/xscale/pxa/pxa_machdep.c ============================================================================== --- head/sys/arm/xscale/pxa/pxa_machdep.c Mon Feb 21 11:56:11 2011 (r218912) +++ head/sys/arm/xscale/pxa/pxa_machdep.c Mon Feb 21 13:11:05 2011 (r218913) @@ -182,6 +182,9 @@ initarm(void *arg, void *arg2) pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); + /* Do basic tuning, hz etc */ + init_param1(); + freemempos = 0xa0200000; /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ @@ -424,8 +427,6 @@ initarm(void *arg, void *arg2) phys_avail[0] = round_page(virtual_avail - KERNBASE + phys_avail[0]); #endif - /* Do basic tuning, hz etc */ - init_param1(); init_param2(physmem); kdb_init(); return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 13:22:29 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86517106566C; Mon, 21 Feb 2011 13:22:29 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 74F318FC18; Mon, 21 Feb 2011 13:22:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LDMT2T071673; Mon, 21 Feb 2011 13:22:29 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LDMTC0071670; Mon, 21 Feb 2011 13:22:29 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201102211322.p1LDMTC0071670@svn.freebsd.org> From: Lawrence Stewart Date: Mon, 21 Feb 2011 13:22:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218914 - in head: etc/mtree share/examples X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 13:22:29 -0000 Author: lstewart Date: Mon Feb 21 13:22:29 2011 New Revision: 218914 URL: http://svn.freebsd.org/changeset/base/218914 Log: Actually install the example Khelp module committed in r218545. Sponsored by: FreeBSD Foundation MFC after: 4 weeks X-MFC with: r218545 Modified: head/etc/mtree/BSD.usr.dist head/share/examples/Makefile Modified: head/etc/mtree/BSD.usr.dist ============================================================================== --- head/etc/mtree/BSD.usr.dist Mon Feb 21 13:11:05 2011 (r218913) +++ head/etc/mtree/BSD.usr.dist Mon Feb 21 13:22:29 2011 (r218914) @@ -244,6 +244,8 @@ fwimage .. .. + khelp + .. syscall module .. Modified: head/share/examples/Makefile ============================================================================== --- head/share/examples/Makefile Mon Feb 21 13:11:05 2011 (r218913) +++ head/share/examples/Makefile Mon Feb 21 13:22:29 2011 (r218914) @@ -100,6 +100,9 @@ XFILES= BSD_daemon/FreeBSD.pfa \ kld/firmware/fwconsumer/fw_consumer.c \ kld/firmware/fwimage/Makefile \ kld/firmware/fwimage/firmware.img \ + kld/khelp/Makefile \ + kld/khelp/README \ + kld/khelp/h_example.c \ kld/syscall/Makefile \ kld/syscall/module/Makefile \ kld/syscall/module/syscall.c \ From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 14:23:16 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5FD8E106566B; Mon, 21 Feb 2011 14:23:16 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from smtp.timeweb.ru (smtp.timeweb.ru [92.53.116.15]) by mx1.freebsd.org (Postfix) with ESMTP id 193408FC16; Mon, 21 Feb 2011 14:23:15 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.71) (envelope-from ) id 1PrWLg-0005UY-DO; Mon, 21 Feb 2011 17:02:48 +0300 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id ACD22B84D; Mon, 21 Feb 2011 17:02:47 +0300 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 996DFB823; Mon, 21 Feb 2011 17:02:47 +0300 (MSK) Date: Mon, 21 Feb 2011 17:02:47 +0300 From: Dmitry Marakasov To: Martin Matuska Message-ID: <20110221140247.GA67440@hades.panopticon> References: <201102202232.p1KMWLKo047088@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <201102202232.p1KMWLKo047088@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218896 - in head/share: examples/etc mk X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 14:23:16 -0000 * Martin Matuska (mm@FreeBSD.org) wrote: > Log: > Add opteron-sse3, athlon64-sse3 and k8-sse3 cpu types to bsd.cpu.mk. > - add "sse3" to MACHINE_CPU for the new cpu types > - for i386, default to CPUTYPE=prescott for the new cpu types Any chance for a same thing for intel CPUs? prescott-sse3? -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 14:28:32 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 410DC1065673; Mon, 21 Feb 2011 14:28:32 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2E9F38FC08; Mon, 21 Feb 2011 14:28:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LESWjw073220; Mon, 21 Feb 2011 14:28:32 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LESWui073217; Mon, 21 Feb 2011 14:28:32 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201102211428.p1LESWui073217@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 21 Feb 2011 14:28:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218915 - in head/usr.sbin/bsdinstall: distextract distfetch X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 14:28:32 -0000 Author: nwhitehorn Date: Mon Feb 21 14:28:31 2011 New Revision: 218915 URL: http://svn.freebsd.org/changeset/base/218915 Log: Add some error checking on the return values of chdir() and calloc(). The first might actually happen, so it displays the error message in a prettier way. Found by: Coverity Prevent(tm) CID: 9121, 9122, 9123, 9124 Modified: head/usr.sbin/bsdinstall/distextract/distextract.c head/usr.sbin/bsdinstall/distfetch/distfetch.c Modified: head/usr.sbin/bsdinstall/distextract/distextract.c ============================================================================== --- head/usr.sbin/bsdinstall/distextract/distextract.c Mon Feb 21 13:22:29 2011 (r218914) +++ head/usr.sbin/bsdinstall/distextract/distextract.c Mon Feb 21 14:28:31 2011 (r218915) @@ -46,12 +46,31 @@ main(void) ndists++; /* Last one */ dists = calloc(ndists, sizeof(const char *)); + if (dists == NULL) { + fprintf(stderr, "Out of memory!\n"); + return (1); + } + for (i = 0; i < ndists; i++) dists[i] = strsep(&diststring, " \t"); - chdir(getenv("BSDINSTALL_CHROOT")); + init_dialog(stdin, stdout); + dialog_vars.backtitle = __DECONST(char *, "FreeBSD Installer"); + dlg_put_backtitle(); + + if (chdir(getenv("BSDINSTALL_CHROOT")) != 0) { + char error[512]; + sprintf(error, "Could could change to directory %s: %s\n", + getenv("BSDINSTALL_DISTDIR"), strerror(errno)); + dialog_msgbox("Error", error, 0, 0, TRUE); + end_dialog(); + return (1); + } + retval = extract_files(ndists, dists); + end_dialog(); + free(diststring); free(dists); @@ -84,9 +103,6 @@ extract_files(int nfiles, const char **f items[i*2 + 1] = "Pending"; } - init_dialog(stdin, stdout); - dialog_vars.backtitle = __DECONST(char *, "FreeBSD Installer"); - dlg_put_backtitle(); dialog_msgbox("", "Checking distribution archives.\nPlease wait...", 0, 0, FALSE); @@ -105,7 +121,7 @@ extract_files(int nfiles, const char **f items[i*2 + 1] = "Failed"; dialog_msgbox("Extract Error", errormsg, 0, 0, TRUE); - goto exit; + return (err); } archive_files[i] = 0; while (archive_read_next_header(archive, &entry) == ARCHIVE_OK) @@ -162,15 +178,11 @@ extract_files(int nfiles, const char **f items[i*2 + 1] = "Failed"; dialog_msgbox("Extract Error", errormsg, 0, 0, TRUE); - goto exit; + return (err); } archive_read_free(archive); } - err = 0; -exit: - end_dialog(); - - return (err); + return (0); } Modified: head/usr.sbin/bsdinstall/distfetch/distfetch.c ============================================================================== --- head/usr.sbin/bsdinstall/distfetch/distfetch.c Mon Feb 21 13:22:29 2011 (r218914) +++ head/usr.sbin/bsdinstall/distfetch/distfetch.c Mon Feb 21 14:28:31 2011 (r218915) @@ -46,15 +46,34 @@ main(void) ndists++; /* Last one */ urls = calloc(ndists, sizeof(const char *)); + if (urls == NULL) { + fprintf(stderr, "Out of memory!\n"); + return (1); + } + + init_dialog(stdin, stdout); + dialog_vars.backtitle = __DECONST(char *, "FreeBSD Installer"); + dlg_put_backtitle(); + for (i = 0; i < ndists; i++) { urls[i] = malloc(PATH_MAX); sprintf(urls[i], "%s/%s", getenv("BSDINSTALL_DISTSITE"), strsep(&diststring, " \t")); } - chdir(getenv("BSDINSTALL_DISTDIR")); + if (chdir(getenv("BSDINSTALL_DISTDIR")) != 0) { + char error[512]; + sprintf(error, "Could could change to directory %s: %s\n", + getenv("BSDINSTALL_DISTDIR"), strerror(errno)); + dialog_msgbox("Error", error, 0, 0, TRUE); + end_dialog(); + return (1); + } + nfetched = fetch_files(ndists, urls); + end_dialog(); + free(diststring); for (i = 0; i < ndists; i++) free(urls[i]); @@ -81,6 +100,11 @@ fetch_files(int nfiles, char **urls) /* Make the transfer list for dialog */ items = calloc(sizeof(char *), nfiles * 2); + if (items == NULL) { + fprintf(stderr, "Out of memory!\n"); + return (-1); + } + for (i = 0; i < nfiles; i++) { items[i*2] = strrchr(urls[i], '/'); if (items[i*2] != NULL) @@ -90,10 +114,6 @@ fetch_files(int nfiles, char **urls) items[i*2 + 1] = "Pending"; } - init_dialog(stdin, stdout); - dialog_vars.backtitle = __DECONST(char *, "FreeBSD Installer"); - dlg_put_backtitle(); - dialog_msgbox("", "Connecting to server.\nPlease wait...", 0, 0, FALSE); /* Try to stat all the files */ @@ -180,8 +200,8 @@ fetch_files(int nfiles, char **urls) fclose(fetch_out); fclose(file_out); } - end_dialog(); free(items); return (nsuccess); } + From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 15:49:59 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD03F106566B; Mon, 21 Feb 2011 15:49:59 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A16F38FC0A; Mon, 21 Feb 2011 15:49:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LFnxPe075014; Mon, 21 Feb 2011 15:49:59 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LFnx0H075012; Mon, 21 Feb 2011 15:49:59 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201102211549.p1LFnx0H075012@svn.freebsd.org> From: Adrian Chadd Date: Mon, 21 Feb 2011 15:49:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218916 - head/sys/net80211 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 15:49:59 -0000 Author: adrian Date: Mon Feb 21 15:49:59 2011 New Revision: 218916 URL: http://svn.freebsd.org/changeset/base/218916 Log: Default to the lowest negotiated rate for mgmt/multicast traffic in 11n mode The current code transmits management and multicast frames at MCS 0. What it should do is check whether the negotiated basic set is zero (and the MCS set is not) before making this decision. For now, simply default to the lowest negotiated rate, rather than MCS 0. This fixes the behaviour with at least the DLINK DIR-825, which ACKs but silently ignores block-ack (BA) response frames. Modified: head/sys/net80211/ieee80211_proto.c Modified: head/sys/net80211/ieee80211_proto.c ============================================================================== --- head/sys/net80211/ieee80211_proto.c Mon Feb 21 14:28:31 2011 (r218915) +++ head/sys/net80211/ieee80211_proto.c Mon Feb 21 15:49:59 2011 (r218916) @@ -207,6 +207,21 @@ ieee80211_proto_vattach(struct ieee80211 const struct ieee80211_rateset *rs = &ic->ic_sup_rates[i]; vap->iv_txparms[i].ucastrate = IEEE80211_FIXED_RATE_NONE; + + /* + * Setting the management rate to MCS 0 assumes that the + * BSS Basic rate set is empty and the BSS Basic MCS set + * is not. + * + * Since we're not checking this, default to the lowest + * defined rate for this mode. + * + * At least one 11n AP (DLINK DIR-825) is reported to drop + * some MCS management traffic (eg BA response frames.) + * + * See also: 9.6.0 of the 802.11n-2009 specification. + */ +#ifdef NOTYET if (i == IEEE80211_MODE_11NA || i == IEEE80211_MODE_11NG) { vap->iv_txparms[i].mgmtrate = 0 | IEEE80211_RATE_MCS; vap->iv_txparms[i].mcastrate = 0 | IEEE80211_RATE_MCS; @@ -216,6 +231,9 @@ ieee80211_proto_vattach(struct ieee80211 vap->iv_txparms[i].mcastrate = rs->rs_rates[0] & IEEE80211_RATE_VAL; } +#endif + vap->iv_txparms[i].mgmtrate = rs->rs_rates[0] & IEEE80211_RATE_VAL; + vap->iv_txparms[i].mcastrate = rs->rs_rates[0] & IEEE80211_RATE_VAL; vap->iv_txparms[i].maxretry = IEEE80211_TXMAX_DEFAULT; } vap->iv_roaming = IEEE80211_ROAMING_AUTO; From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 16:03:40 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43D2A106564A; Mon, 21 Feb 2011 16:03:40 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 328D88FC1E; Mon, 21 Feb 2011 16:03:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LG3e3S075361; Mon, 21 Feb 2011 16:03:40 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LG3erJ075359; Mon, 21 Feb 2011 16:03:40 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201102211603.p1LG3erJ075359@svn.freebsd.org> From: Sergey Kandaurov Date: Mon, 21 Feb 2011 16:03:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218917 - head/bin/kenv X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 16:03:40 -0000 Author: pluknet Date: Mon Feb 21 16:03:39 2011 New Revision: 218917 URL: http://svn.freebsd.org/changeset/base/218917 Log: mdoc(7) markup. Approved by: avg (mentor), kib (mentor) MFC after: 3 days Modified: head/bin/kenv/kenv.1 Modified: head/bin/kenv/kenv.1 ============================================================================== --- head/bin/kenv/kenv.1 Mon Feb 21 15:49:59 2011 (r218916) +++ head/bin/kenv/kenv.1 Mon Feb 21 16:03:39 2011 (r218917) @@ -69,7 +69,7 @@ option is set, warnings normally printed perform the requested operation will be suppressed. .Pp Variables can be added to the kernel environment using the -.Xr /boot/loader.conf +.Pa /boot/loader.conf file, or also statically compiled into the kernel using the statement .Pp .Dl Ic env Ar filename From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 16:21:43 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA985106564A; Mon, 21 Feb 2011 16:21:43 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9EAE68FC1C; Mon, 21 Feb 2011 16:21:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LGLhql075880; Mon, 21 Feb 2011 16:21:43 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LGLhsF075878; Mon, 21 Feb 2011 16:21:43 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102211621.p1LGLhsF075878@svn.freebsd.org> From: Bruce Cran Date: Mon, 21 Feb 2011 16:21:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218918 - head/sys/crypto/sha2 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 16:21:43 -0000 Author: brucec Date: Mon Feb 21 16:21:43 2011 New Revision: 218918 URL: http://svn.freebsd.org/changeset/base/218918 Log: Make private functions static. PR: kern/43611 Submitted by: Matt Emmerton Reviewed by: kib MFC after: 3 days Modified: head/sys/crypto/sha2/sha2.c Modified: head/sys/crypto/sha2/sha2.c ============================================================================== --- head/sys/crypto/sha2/sha2.c Mon Feb 21 16:03:39 2011 (r218917) +++ head/sys/crypto/sha2/sha2.c Mon Feb 21 16:21:43 2011 (r218918) @@ -206,9 +206,9 @@ typedef u_int64_t sha2_word64; /* Exactl * library -- they are intended for private internal visibility/use * only. */ -void SHA512_Last(SHA512_CTX*); -void SHA256_Transform(SHA256_CTX*, const sha2_word32*); -void SHA512_Transform(SHA512_CTX*, const sha2_word64*); +static void SHA512_Last(SHA512_CTX*); +static void SHA256_Transform(SHA256_CTX*, const sha2_word32*); +static void SHA512_Transform(SHA512_CTX*, const sha2_word64*); /*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/ @@ -366,7 +366,7 @@ void SHA256_Init(SHA256_CTX* context) { (h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \ j++ -void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { +static void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { sha2_word32 a, b, c, d, e, f, g, h, s0, s1; sha2_word32 T1, *W256; int j; @@ -424,7 +424,7 @@ void SHA256_Transform(SHA256_CTX* contex #else /* SHA2_UNROLL_TRANSFORM */ -void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { +static void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { sha2_word32 a, b, c, d, e, f, g, h, s0, s1; sha2_word32 T1, T2, *W256; int j; @@ -693,7 +693,7 @@ void SHA512_Init(SHA512_CTX* context) { (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \ j++ -void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { +static void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { sha2_word64 a, b, c, d, e, f, g, h, s0, s1; sha2_word64 T1, *W512 = (sha2_word64*)context->buffer; int j; @@ -748,7 +748,7 @@ void SHA512_Transform(SHA512_CTX* contex #else /* SHA2_UNROLL_TRANSFORM */ -void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { +static void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { sha2_word64 a, b, c, d, e, f, g, h, s0, s1; sha2_word64 T1 = 0, T2 = 0, *W512 = (sha2_word64*)context->buffer; int j; @@ -874,7 +874,7 @@ void SHA512_Update(SHA512_CTX* context, usedspace = freespace = 0; } -void SHA512_Last(SHA512_CTX* context) { +static void SHA512_Last(SHA512_CTX* context) { unsigned int usedspace; usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH; From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 16:47:13 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6349B10656AA; Mon, 21 Feb 2011 16:47:13 +0000 (UTC) (envelope-from trhodes@FreeBSD.org) Received: from hapkido.dreamhost.com (hapkido.dreamhost.com [66.33.216.122]) by mx1.freebsd.org (Postfix) with ESMTP id 3F1728FC20; Mon, 21 Feb 2011 16:47:13 +0000 (UTC) Received: from homiemail-a31.g.dreamhost.com (caiajhbdcbhh.dreamhost.com [208.97.132.177]) by hapkido.dreamhost.com (Postfix) with ESMTP id 1A1081780E7; Mon, 21 Feb 2011 08:14:45 -0800 (PST) Received: from homiemail-a31.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a31.g.dreamhost.com (Postfix) with ESMTP id DCC5C202022; Mon, 21 Feb 2011 08:14:44 -0800 (PST) Received: from fbsdlab.fbsdsecure.org (c-98-231-183-112.hsd1.va.comcast.net [98.231.183.112]) (Authenticated sender: trhodes@fbsdsecure.org) by homiemail-a31.g.dreamhost.com (Postfix) with ESMTPA id 7C33C20203C; Mon, 21 Feb 2011 08:14:43 -0800 (PST) Date: Mon, 21 Feb 2011 11:14:48 -0500 From: Tom Rhodes To: Doug Barton Message-Id: <20110221111448.575858b0.trhodes@FreeBSD.org> In-Reply-To: <4D6051D0.8050704@dougbarton.us> References: <201102131818.p1DIIuLL046962@svn.freebsd.org> <201102192007.32979.bruce@cran.org.uk> <4D6051D0.8050704@dougbarton.us> X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i386-portbld-freebsd8.1) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: unixmania@gmail.com, bruce@cran.org.uk, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r218650 - head/games/fortune/datfiles X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 16:47:13 -0000 On Sat, 19 Feb 2011 15:27:12 -0800 Doug Barton wrote: > On 02/19/2011 15:12, Carlos A. M. dos Santos wrote: > > On Sat, Feb 19, 2011 at 6:07 PM, Bruce Cran wrote: > >> On Saturday 19 February 2011 17:25:32 Carlos A. M. dos Santos wrote: > >> > >>> Did anybody complain about this? If not, would you mid either revert > >>> this commit or just go ahead and move all "potentially" offensive > >>> jokes to fortunes-o? Anything from Grouch Marx or Mark Twain will > >>> probably qualify. > >> > >> I'm happy to revert the checkin if you think the fortune should be in the main > >> file, since it appears the PR submitter was complaining just as much about > >> being unprofessional as offensive. Would you like me to go ahead and revert > >> the move? > > > > I suggest you to revert the commit > > Serious overkill, particularly since: > 1. The commit has already been MFC'ed, and > 2. The fortune in question actually _is_ potentially offensive > ... $ man fortune ... WARNING: Integrating fortune and your email will cause wide spread whining, crying, or panic which may or may not result in a lecture about how someone else is morally superior to yourself. By integrating this program into your email client, you are accepting the risk of not being pc-enough for your peers (ones that you would probably never have a beer with). -- Tom Rhodes From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 18:58:58 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83FF1106564A; Mon, 21 Feb 2011 18:58:58 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 727888FC0C; Mon, 21 Feb 2011 18:58:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LIww1x080007; Mon, 21 Feb 2011 18:58:58 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LIwwJI080005; Mon, 21 Feb 2011 18:58:58 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201102211858.p1LIwwJI080005@svn.freebsd.org> From: Adrian Chadd Date: Mon, 21 Feb 2011 18:58:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218923 - head/sys/dev/ath/ath_hal X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 18:58:58 -0000 Author: adrian Date: Mon Feb 21 18:58:58 2011 New Revision: 218923 URL: http://svn.freebsd.org/changeset/base/218923 Log: Add a vocal warning to ath_hal_computetxtime() function is used for non-11n rates. It's used to calculate: * the initial per-rate entries for short/long preamble ACK durations; * packet durations for TDMA slot decisions; * RTS/CTS protection durations; * updating the duration field in the 802.11 frame header This way invalid durations will generate a warning, prompting for it to be fixed. Modified: head/sys/dev/ath/ath_hal/ah.c Modified: head/sys/dev/ath/ath_hal/ah.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah.c Mon Feb 21 18:11:56 2011 (r218922) +++ head/sys/dev/ath/ath_hal/ah.c Mon Feb 21 18:58:58 2011 (r218923) @@ -318,6 +318,11 @@ ath_hal_computetxtime(struct ath_hal *ah uint32_t bitsPerSymbol, numBits, numSymbols, phyTime, txTime; uint32_t kbps; + /* Warn if this function is called for 11n rates; it should not be! */ + if (IS_HT_RATE(rates->info[rateix].rateCode)) + ath_hal_printf(ah, "%s: MCS rate? (index %d; hwrate 0x%x)\n", + __func__, rateix, rates->info[rateix].rateCode); + kbps = rates->info[rateix].rateKbps; /* * index can be invalid duting dynamic Turbo transitions. From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 19:14:14 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3E3F1065672 for ; Mon, 21 Feb 2011 19:14:14 +0000 (UTC) (envelope-from dougb@dougbarton.us) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id 795328FC1B for ; Mon, 21 Feb 2011 19:14:14 +0000 (UTC) Received: (qmail 29216 invoked by uid 399); 21 Feb 2011 19:14:10 -0000 Received: from router.ka9q.net (HELO doug-optiplex.ka9q.net) (dougb@dougbarton.us@75.60.237.91) by mail2.fluidhosting.com with ESMTPAM; 21 Feb 2011 19:14:10 -0000 X-Originating-IP: 75.60.237.91 X-Sender: dougb@dougbarton.us Message-ID: <4D62B980.2090606@dougbarton.us> Date: Mon, 21 Feb 2011 11:14:08 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.13) Gecko/20110129 Thunderbird/3.1.7 MIME-Version: 1.0 To: VANHULLEBUS Yvan References: <201102180940.p1I9eD29050530@svn.freebsd.org> <20110219073412.GC2016@garage.freebsd.pl> <20110221084025.GA14934@zeninc.net> <20110221092143.GA1766@garage.freebsd.pl> <20110221110156.GA15358@zeninc.net> In-Reply-To: <20110221110156.GA15358@zeninc.net> X-Enigmail-Version: 1.1.2 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Pawel Jakub Dawidek Subject: Re: svn commit: r218794 - in head: . sys/netipsec X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 19:14:14 -0000 On 02/21/2011 03:01, VANHULLEBUS Yvan wrote: > On Mon, Feb 21, 2011 at 10:21:43AM +0100, Pawel Jakub Dawidek wrote: >> > On Mon, Feb 21, 2011 at 09:40:25AM +0100, VANHULLEBUS Yvan wrote: > [RFC4868 and MFC] >> > You can't talk to two such peers with sysctl or without anyway. I assume >> > that if someone already has tunnels configured and they work, they work, >> > because the other end uses 96 bits hashes. Once he upgrades there is no >> > way to get old behaviour back quickly. >> > >> > You are changing on-the-wire protocol in the middle of stable branch. Am >> > I alone in thinking that this is bad idea? > That's a good question. > Of other people also think it's a bad idea, I can just forget the MFC. > But the same problem will happen when we'll release 9.0. > Of course, this is easier to explain, as this will be a new branch. IMO RFC compliance trumps -stable here. Admittedly some small percentage of users will be inconvenienced, and that is unfortunate. However all users who start using this technology from here forward should get the full RFC compliant version. As Bjoern pointed out, we'll see more of this, not less because oddly enough RFC publication (like many other external factors) do not revolve around our release schedules. :) hth, Doug -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 19:19:05 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93641106564A; Mon, 21 Feb 2011 19:19:05 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8212F8FC12; Mon, 21 Feb 2011 19:19:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LJJ5Hb080474; Mon, 21 Feb 2011 19:19:05 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LJJ53h080471; Mon, 21 Feb 2011 19:19:05 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201102211919.p1LJJ53h080471@svn.freebsd.org> From: Adrian Chadd Date: Mon, 21 Feb 2011 19:19:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218924 - head/sys/dev/ath X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 19:19:05 -0000 Author: adrian Date: Mon Feb 21 19:19:05 2011 New Revision: 218924 URL: http://svn.freebsd.org/changeset/base/218924 Log: Add a new counter which tracks frames TX'ed with HT protection. Modified: head/sys/dev/ath/if_ath.c head/sys/dev/ath/if_athioctl.h Modified: head/sys/dev/ath/if_ath.c ============================================================================== --- head/sys/dev/ath/if_ath.c Mon Feb 21 18:58:58 2011 (r218923) +++ head/sys/dev/ath/if_ath.c Mon Feb 21 19:19:05 2011 (r218924) @@ -6604,6 +6604,8 @@ ath_sysctl_stats_attach(struct ath_softc SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_post_crc_err", CTLFLAG_RD, &sc->sc_stats.ast_rx_post_crc_err, 0, ""); SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_decrypt_busy_err", CTLFLAG_RD, &sc->sc_stats.ast_rx_decrypt_busy_err, 0, ""); SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_hi_rx_chain", CTLFLAG_RD, &sc->sc_stats.ast_rx_hi_rx_chain, 0, ""); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_htprotect", CTLFLAG_RD, + &sc->sc_stats.ast_tx_htprotect, 0, "HT tx frames with protection"); /* Attach the RX phy error array */ ath_sysctl_stats_attach_rxphyerr(sc, child); Modified: head/sys/dev/ath/if_athioctl.h ============================================================================== --- head/sys/dev/ath/if_athioctl.h Mon Feb 21 18:58:58 2011 (r218923) +++ head/sys/dev/ath/if_athioctl.h Mon Feb 21 19:19:05 2011 (r218924) @@ -127,7 +127,8 @@ struct ath_stats { u_int32_t ast_rx_post_crc_err; u_int32_t ast_rx_decrypt_busy_err; u_int32_t ast_rx_hi_rx_chain; - u_int32_t ast_pad[4]; + u_int32_t ast_tx_htprotect; /* HT tx frames with protection */ + u_int32_t ast_pad[3]; }; #define SIOCGATHSTATS _IOWR('i', 137, struct ifreq) From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 19:22:46 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75A86106564A; Mon, 21 Feb 2011 19:22:46 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 30B348FC0A; Mon, 21 Feb 2011 19:22:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LJMkg0080600; Mon, 21 Feb 2011 19:22:46 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LJMk3B080598; Mon, 21 Feb 2011 19:22:46 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201102211922.p1LJMk3B080598@svn.freebsd.org> From: Adrian Chadd Date: Mon, 21 Feb 2011 19:22:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218925 - head/sys/dev/ath X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 19:22:46 -0000 Author: adrian Date: Mon Feb 21 19:22:45 2011 New Revision: 218925 URL: http://svn.freebsd.org/changeset/base/218925 Log: Fix formatting of new stat sysctls; add descriptions Modified: head/sys/dev/ath/if_ath.c Modified: head/sys/dev/ath/if_ath.c ============================================================================== --- head/sys/dev/ath/if_ath.c Mon Feb 21 19:19:05 2011 (r218924) +++ head/sys/dev/ath/if_ath.c Mon Feb 21 19:22:45 2011 (r218925) @@ -6598,12 +6598,18 @@ ath_sysctl_stats_attach(struct ath_softc SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_agg", CTLFLAG_RD, &sc->sc_stats.ast_rx_agg, 0, "number of aggregate frames received"); - SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_halfgi", CTLFLAG_RD, &sc->sc_stats.ast_rx_halfgi, 0, ""); - SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_2040", CTLFLAG_RD, &sc->sc_stats.ast_rx_2040, 0, ""); - SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_pre_crc_err", CTLFLAG_RD, &sc->sc_stats.ast_rx_pre_crc_err, 0, ""); - SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_post_crc_err", CTLFLAG_RD, &sc->sc_stats.ast_rx_post_crc_err, 0, ""); - SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_decrypt_busy_err", CTLFLAG_RD, &sc->sc_stats.ast_rx_decrypt_busy_err, 0, ""); - SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_hi_rx_chain", CTLFLAG_RD, &sc->sc_stats.ast_rx_hi_rx_chain, 0, ""); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_halfgi", CTLFLAG_RD, + &sc->sc_stats.ast_rx_halfgi, 0, "number of frames received with half-GI"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_2040", CTLFLAG_RD, + &sc->sc_stats.ast_rx_2040, 0, "number of HT/40 frames received"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_pre_crc_err", CTLFLAG_RD, + &sc->sc_stats.ast_rx_pre_crc_err, 0, "number of delimeter-CRC errors detected"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_post_crc_err", CTLFLAG_RD, + &sc->sc_stats.ast_rx_post_crc_err, 0, "number of post-delimiter CRC errors detected"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_decrypt_busy_err", CTLFLAG_RD, + &sc->sc_stats.ast_rx_decrypt_busy_err, 0, "number of frames received w/ busy decrypt engine"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_hi_rx_chain", CTLFLAG_RD, + &sc->sc_stats.ast_rx_hi_rx_chain, 0, ""); SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_htprotect", CTLFLAG_RD, &sc->sc_stats.ast_tx_htprotect, 0, "HT tx frames with protection"); From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 19:46:02 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B92281065679; Mon, 21 Feb 2011 19:46:02 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A7CD08FC1C; Mon, 21 Feb 2011 19:46:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LJk2Dm081225; Mon, 21 Feb 2011 19:46:02 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LJk2a4081223; Mon, 21 Feb 2011 19:46:02 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201102211946.p1LJk2a4081223@svn.freebsd.org> From: Dimitry Andric Date: Mon, 21 Feb 2011 19:46:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218926 - head/sys/boot/i386/boot2 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 19:46:02 -0000 Author: dim Date: Mon Feb 21 19:46:02 2011 New Revision: 218926 URL: http://svn.freebsd.org/changeset/base/218926 Log: In sys/boot/i386/boot2/boot2.c, change the type of the 'opts' variable from uint16_t back to uint32_t. The actual option bitmasks (RB_* and RBX_*) assume at least a 32 bit variable. Submitted by: rdivacky Modified: head/sys/boot/i386/boot2/boot2.c Modified: head/sys/boot/i386/boot2/boot2.c ============================================================================== --- head/sys/boot/i386/boot2/boot2.c Mon Feb 21 19:22:45 2011 (r218925) +++ head/sys/boot/i386/boot2/boot2.c Mon Feb 21 19:46:02 2011 (r218926) @@ -132,7 +132,7 @@ static struct dsk { } dsk; static char cmd[512], cmddup[512]; static char kname[1024]; -static uint16_t opts; +static uint32_t opts; static int comspeed = SIOSPD; static struct bootinfo bootinfo; static uint8_t ioctrl = IO_KEYBOARD; From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 19:59:44 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F865106566B; Mon, 21 Feb 2011 19:59:44 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F0D818FC0A; Mon, 21 Feb 2011 19:59:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LJxhHN081577; Mon, 21 Feb 2011 19:59:43 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LJxhVr081568; Mon, 21 Feb 2011 19:59:43 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201102211959.p1LJxhVr081568@svn.freebsd.org> From: Bernhard Schmidt Date: Mon, 21 Feb 2011 19:59:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218927 - head/sys/net80211 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 19:59:44 -0000 Author: bschmidt Date: Mon Feb 21 19:59:43 2011 New Revision: 218927 URL: http://svn.freebsd.org/changeset/base/218927 Log: Add a new mgmt subtype "ACTION NO ACK" defined in 802.11n-2009, while here clean up parts of the *_recv_mgmt() functions. - make sure appropriate counters are bumped and debug messages are printed - order the unhandled subtypes by value and add a few missing ones - fix some whitespace nits - remove duplicate code in adhoc_recv_mgmt() - remove a useless comment, probably left in while c&p Modified: head/sys/net80211/ieee80211.h head/sys/net80211/ieee80211_adhoc.c head/sys/net80211/ieee80211_hostap.c head/sys/net80211/ieee80211_input.c head/sys/net80211/ieee80211_mesh.c head/sys/net80211/ieee80211_proto.c head/sys/net80211/ieee80211_sta.c head/sys/net80211/ieee80211_wds.c Modified: head/sys/net80211/ieee80211.h ============================================================================== --- head/sys/net80211/ieee80211.h Mon Feb 21 19:46:02 2011 (r218926) +++ head/sys/net80211/ieee80211.h Mon Feb 21 19:59:43 2011 (r218927) @@ -131,6 +131,7 @@ struct ieee80211_qosframe_addr4 { #define IEEE80211_FC0_SUBTYPE_AUTH 0xb0 #define IEEE80211_FC0_SUBTYPE_DEAUTH 0xc0 #define IEEE80211_FC0_SUBTYPE_ACTION 0xd0 +#define IEEE80211_FC0_SUBTYPE_ACTION_NOACK 0xe0 /* for TYPE_CTL */ #define IEEE80211_FC0_SUBTYPE_BAR 0x80 #define IEEE80211_FC0_SUBTYPE_BA 0x90 Modified: head/sys/net80211/ieee80211_adhoc.c ============================================================================== --- head/sys/net80211/ieee80211_adhoc.c Mon Feb 21 19:46:02 2011 (r218926) +++ head/sys/net80211/ieee80211_adhoc.c Mon Feb 21 19:59:43 2011 (r218927) @@ -823,80 +823,35 @@ adhoc_recv_mgmt(struct ieee80211_node *n is11bclient(rates, xrates) ? IEEE80211_SEND_LEGACY_11B : 0); break; - case IEEE80211_FC0_SUBTYPE_ACTION: { - const struct ieee80211_action *ia; - - if (vap->iv_state != IEEE80211_S_RUN) { + case IEEE80211_FC0_SUBTYPE_ACTION: + case IEEE80211_FC0_SUBTYPE_ACTION_NOACK: + if (vap->iv_state == IEEE80211_S_RUN) { + if (ieee80211_parse_action(ni, m0) == 0) + (void)ic->ic_recv_action(ni, wh, frm, efrm); + } else { IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, wh, NULL, "wrong state %s", ieee80211_state_name[vap->iv_state]); vap->iv_stats.is_rx_mgtdiscard++; - return; } - /* - * action frame format: - * [1] category - * [1] action - * [tlv] parameters - */ - IEEE80211_VERIFY_LENGTH(efrm - frm, - sizeof(struct ieee80211_action), return); - ia = (const struct ieee80211_action *) frm; - - vap->iv_stats.is_rx_action++; - IEEE80211_NODE_STAT(ni, rx_action); - - /* verify frame payloads but defer processing */ - /* XXX maybe push this to method */ - switch (ia->ia_category) { - case IEEE80211_ACTION_CAT_BA: - switch (ia->ia_action) { - case IEEE80211_ACTION_BA_ADDBA_REQUEST: - IEEE80211_VERIFY_LENGTH(efrm - frm, - sizeof(struct ieee80211_action_ba_addbarequest), - return); - break; - case IEEE80211_ACTION_BA_ADDBA_RESPONSE: - IEEE80211_VERIFY_LENGTH(efrm - frm, - sizeof(struct ieee80211_action_ba_addbaresponse), - return); - break; - case IEEE80211_ACTION_BA_DELBA: - IEEE80211_VERIFY_LENGTH(efrm - frm, - sizeof(struct ieee80211_action_ba_delba), - return); - break; - } - break; - case IEEE80211_ACTION_CAT_HT: - switch (ia->ia_action) { - case IEEE80211_ACTION_HT_TXCHWIDTH: - IEEE80211_VERIFY_LENGTH(efrm - frm, - sizeof(struct ieee80211_action_ht_txchwidth), - return); - break; - } - break; - } - ic->ic_recv_action(ni, wh, frm, efrm); break; - } - case IEEE80211_FC0_SUBTYPE_AUTH: case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: - case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: case IEEE80211_FC0_SUBTYPE_ASSOC_RESP: + case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: - case IEEE80211_FC0_SUBTYPE_DEAUTH: + case IEEE80211_FC0_SUBTYPE_ATIM: case IEEE80211_FC0_SUBTYPE_DISASSOC: + case IEEE80211_FC0_SUBTYPE_AUTH: + case IEEE80211_FC0_SUBTYPE_DEAUTH: IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, - wh, NULL, "%s", "not handled"); + wh, NULL, "%s", "not handled"); vap->iv_stats.is_rx_mgtdiscard++; - return; + break; default: IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, - wh, "mgt", "subtype 0x%x not handled", subtype); + wh, "mgt", "subtype 0x%x not handled", subtype); vap->iv_stats.is_rx_badsubtype++; break; } @@ -910,6 +865,7 @@ ahdemo_recv_mgmt(struct ieee80211_node * { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; + struct ieee80211_frame *wh; /* * Process management frames when scanning; useful for doing @@ -917,8 +873,33 @@ ahdemo_recv_mgmt(struct ieee80211_node * */ if (ic->ic_flags & IEEE80211_F_SCAN) adhoc_recv_mgmt(ni, m0, subtype, rssi, nf); - else - vap->iv_stats.is_rx_mgtdiscard++; + else { + wh = mtod(m0, struct ieee80211_frame *); + switch (subtype) { + case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: + case IEEE80211_FC0_SUBTYPE_ASSOC_RESP: + case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: + case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: + case IEEE80211_FC0_SUBTYPE_PROBE_REQ: + case IEEE80211_FC0_SUBTYPE_PROBE_RESP: + case IEEE80211_FC0_SUBTYPE_BEACON: + case IEEE80211_FC0_SUBTYPE_ATIM: + case IEEE80211_FC0_SUBTYPE_DISASSOC: + case IEEE80211_FC0_SUBTYPE_AUTH: + case IEEE80211_FC0_SUBTYPE_DEAUTH: + case IEEE80211_FC0_SUBTYPE_ACTION: + case IEEE80211_FC0_SUBTYPE_ACTION_NOACK: + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "not handled"); + vap->iv_stats.is_rx_mgtdiscard++; + break; + default: + IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, + wh, "mgt", "subtype 0x%x not handled", subtype); + vap->iv_stats.is_rx_badsubtype++; + break; + } + } } static void Modified: head/sys/net80211/ieee80211_hostap.c ============================================================================== --- head/sys/net80211/ieee80211_hostap.c Mon Feb 21 19:46:02 2011 (r218926) +++ head/sys/net80211/ieee80211_hostap.c Mon Feb 21 19:59:43 2011 (r218927) @@ -2194,18 +2194,29 @@ hostap_recv_mgmt(struct ieee80211_node * } case IEEE80211_FC0_SUBTYPE_ACTION: + case IEEE80211_FC0_SUBTYPE_ACTION_NOACK: if (vap->iv_state == IEEE80211_S_RUN) { if (ieee80211_parse_action(ni, m0) == 0) - ic->ic_recv_action(ni, wh, frm, efrm); - } else + (void)ic->ic_recv_action(ni, wh, frm, efrm); + } else { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "wrong state %s", + ieee80211_state_name[vap->iv_state]); vap->iv_stats.is_rx_mgtdiscard++; + } break; case IEEE80211_FC0_SUBTYPE_ASSOC_RESP: case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: + case IEEE80211_FC0_SUBTYPE_ATIM: + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "not handled"); + vap->iv_stats.is_rx_mgtdiscard++; + break; + default: IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, - wh, "mgt", "subtype 0x%x not handled", subtype); + wh, "mgt", "subtype 0x%x not handled", subtype); vap->iv_stats.is_rx_badsubtype++; break; } Modified: head/sys/net80211/ieee80211_input.c ============================================================================== --- head/sys/net80211/ieee80211_input.c Mon Feb 21 19:46:02 2011 (r218926) +++ head/sys/net80211/ieee80211_input.c Mon Feb 21 19:59:43 2011 (r218927) @@ -677,7 +677,6 @@ ieee80211_parse_action(struct ieee80211_ IEEE80211_NODE_STAT(ni, rx_action); /* verify frame payloads but defer processing */ - /* XXX maybe push this to method */ switch (ia->ia_category) { case IEEE80211_ACTION_CAT_BA: switch (ia->ia_action) { Modified: head/sys/net80211/ieee80211_mesh.c ============================================================================== --- head/sys/net80211/ieee80211_mesh.c Mon Feb 21 19:46:02 2011 (r218926) +++ head/sys/net80211/ieee80211_mesh.c Mon Feb 21 19:59:43 2011 (r218927) @@ -1489,11 +1489,9 @@ mesh_recv_mgmt(struct ieee80211_node *ni ieee80211_send_proberesp(vap, wh->i_addr2, 0); break; } + case IEEE80211_FC0_SUBTYPE_ACTION: - if (vap->iv_state != IEEE80211_S_RUN) { - vap->iv_stats.is_rx_mgtdiscard++; - break; - } + case IEEE80211_FC0_SUBTYPE_ACTION_NOACK: /* * We received an action for an unknown neighbor. * XXX: wait for it to beacon or create ieee80211_node? @@ -1506,6 +1504,7 @@ mesh_recv_mgmt(struct ieee80211_node *ni } /* * Discard if not for us. + * XXX: if from us too? */ if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr1) && !IEEE80211_IS_MULTICAST(wh->i_addr1)) { @@ -1514,21 +1513,30 @@ mesh_recv_mgmt(struct ieee80211_node *ni vap->iv_stats.is_rx_mgtdiscard++; break; } - /* XXX parse_action is a bit useless now */ - if (ieee80211_parse_action(ni, m0) == 0) - ic->ic_recv_action(ni, wh, frm, efrm); + if (vap->iv_state == IEEE80211_S_RUN) { + if (ieee80211_parse_action(ni, m0) == 0) + (void)ic->ic_recv_action(ni, wh, frm, efrm); + } else { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "wrong state %s", + ieee80211_state_name[vap->iv_state]); + vap->iv_stats.is_rx_mgtdiscard++; + } break; - case IEEE80211_FC0_SUBTYPE_AUTH: + case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: - case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: case IEEE80211_FC0_SUBTYPE_ASSOC_RESP: + case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: - case IEEE80211_FC0_SUBTYPE_DEAUTH: + case IEEE80211_FC0_SUBTYPE_ATIM: case IEEE80211_FC0_SUBTYPE_DISASSOC: + case IEEE80211_FC0_SUBTYPE_AUTH: + case IEEE80211_FC0_SUBTYPE_DEAUTH: IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, wh, NULL, "%s", "not handled"); vap->iv_stats.is_rx_mgtdiscard++; - return; + break; + default: IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, wh, "mgt", "subtype 0x%x not handled", subtype); Modified: head/sys/net80211/ieee80211_proto.c ============================================================================== --- head/sys/net80211/ieee80211_proto.c Mon Feb 21 19:46:02 2011 (r218926) +++ head/sys/net80211/ieee80211_proto.c Mon Feb 21 19:59:43 2011 (r218927) @@ -64,7 +64,7 @@ const char *ieee80211_mgt_subtype_name[] "assoc_req", "assoc_resp", "reassoc_req", "reassoc_resp", "probe_req", "probe_resp", "reserved#6", "reserved#7", "beacon", "atim", "disassoc", "auth", - "deauth", "action", "reserved#14", "reserved#15" + "deauth", "action", "action_noack", "reserved#15" }; const char *ieee80211_ctl_subtype_name[] = { "reserved#0", "reserved#1", "reserved#2", "reserved#3", Modified: head/sys/net80211/ieee80211_sta.c ============================================================================== --- head/sys/net80211/ieee80211_sta.c Mon Feb 21 19:46:02 2011 (r218926) +++ head/sys/net80211/ieee80211_sta.c Mon Feb 21 19:59:43 2011 (r218927) @@ -1718,21 +1718,30 @@ sta_recv_mgmt(struct ieee80211_node *ni, } case IEEE80211_FC0_SUBTYPE_ACTION: + case IEEE80211_FC0_SUBTYPE_ACTION_NOACK: if (vap->iv_state == IEEE80211_S_RUN) { if (ieee80211_parse_action(ni, m0) == 0) - ic->ic_recv_action(ni, wh, frm, efrm); - } else + (void)ic->ic_recv_action(ni, wh, frm, efrm); + } else { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "wrong state %s", + ieee80211_state_name[vap->iv_state]); vap->iv_stats.is_rx_mgtdiscard++; + } break; - case IEEE80211_FC0_SUBTYPE_PROBE_REQ: case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: + case IEEE80211_FC0_SUBTYPE_PROBE_REQ: + case IEEE80211_FC0_SUBTYPE_ATIM: + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "not handled"); vap->iv_stats.is_rx_mgtdiscard++; - return; + break; + default: IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, - wh, "mgt", "subtype 0x%x not handled", subtype); + wh, "mgt", "subtype 0x%x not handled", subtype); vap->iv_stats.is_rx_badsubtype++; break; } Modified: head/sys/net80211/ieee80211_wds.c ============================================================================== --- head/sys/net80211/ieee80211_wds.c Mon Feb 21 19:46:02 2011 (r218926) +++ head/sys/net80211/ieee80211_wds.c Mon Feb 21 19:59:43 2011 (r218927) @@ -756,31 +756,46 @@ wds_recv_mgmt(struct ieee80211_node *ni, frm = (u_int8_t *)&wh[1]; efrm = mtod(m0, u_int8_t *) + m0->m_len; switch (subtype) { - case IEEE80211_FC0_SUBTYPE_DEAUTH: - case IEEE80211_FC0_SUBTYPE_PROBE_RESP: - case IEEE80211_FC0_SUBTYPE_BEACON: - case IEEE80211_FC0_SUBTYPE_PROBE_REQ: - case IEEE80211_FC0_SUBTYPE_AUTH: + case IEEE80211_FC0_SUBTYPE_ACTION: + case IEEE80211_FC0_SUBTYPE_ACTION_NOACK: + if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { + IEEE80211_DISCARD(vap, IEEE80211_MSG_MESH, + wh, NULL, "%s", "not directed to us"); + vap->iv_stats.is_rx_mgtdiscard++; + break; + } else + ni->ni_inact = ni->ni_inact_reload; + + if (vap->iv_state == IEEE80211_S_RUN) { + if (ieee80211_parse_action(ni, m0) == 0) + (void)ic->ic_recv_action(ni, wh, frm, efrm); + } else { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "wrong state %s", + ieee80211_state_name[vap->iv_state]); + vap->iv_stats.is_rx_mgtdiscard++; + } + break; + case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: - case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: case IEEE80211_FC0_SUBTYPE_ASSOC_RESP: + case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: + case IEEE80211_FC0_SUBTYPE_PROBE_REQ: + case IEEE80211_FC0_SUBTYPE_PROBE_RESP: + case IEEE80211_FC0_SUBTYPE_BEACON: + case IEEE80211_FC0_SUBTYPE_ATIM: case IEEE80211_FC0_SUBTYPE_DISASSOC: + case IEEE80211_FC0_SUBTYPE_AUTH: + case IEEE80211_FC0_SUBTYPE_DEAUTH: + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "not handled"); vap->iv_stats.is_rx_mgtdiscard++; break; - case IEEE80211_FC0_SUBTYPE_ACTION: - if (vap->iv_state != IEEE80211_S_RUN || - IEEE80211_IS_MULTICAST(wh->i_addr1)) { - vap->iv_stats.is_rx_mgtdiscard++; - break; - } - ni->ni_inact = ni->ni_inact_reload; - if (ieee80211_parse_action(ni, m0) == 0) - ic->ic_recv_action(ni, wh, frm, efrm); - break; + default: IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, - wh, "mgt", "subtype 0x%x not handled", subtype); + wh, "mgt", "subtype 0x%x not handled", subtype); vap->iv_stats.is_rx_badsubtype++; break; } From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 20:02:03 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B49D106564A; Mon, 21 Feb 2011 20:02:03 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2991D8FC12; Mon, 21 Feb 2011 20:02:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LK235F081762; Mon, 21 Feb 2011 20:02:03 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LK23UH081760; Mon, 21 Feb 2011 20:02:03 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201102212002.p1LK23UH081760@svn.freebsd.org> From: Bernhard Schmidt Date: Mon, 21 Feb 2011 20:02:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218928 - head/sys/net80211 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 20:02:03 -0000 Author: bschmidt Date: Mon Feb 21 20:02:02 2011 New Revision: 218928 URL: http://svn.freebsd.org/changeset/base/218928 Log: It is IEEE80211_SUPPORT_XXX not IEEE80211_XXX_SUPPORT. Modified: head/sys/net80211/ieee80211_output.c Modified: head/sys/net80211/ieee80211_output.c ============================================================================== --- head/sys/net80211/ieee80211_output.c Mon Feb 21 19:59:43 2011 (r218927) +++ head/sys/net80211/ieee80211_output.c Mon Feb 21 20:02:02 2011 (r218928) @@ -2922,13 +2922,13 @@ ieee80211_beacon_update(struct ieee80211 bo->bo_tim_trailer += adjust; bo->bo_erp += adjust; bo->bo_htinfo += adjust; -#ifdef IEEE80211_SUPERG_SUPPORT +#ifdef IEEE80211_SUPPORT_SUPERG bo->bo_ath += adjust; #endif -#ifdef IEEE80211_TDMA_SUPPORT +#ifdef IEEE80211_SUPPORT_TDMA bo->bo_tdma += adjust; #endif -#ifdef IEEE80211_MESH_SUPPORT +#ifdef IEEE80211_SUPPORT_MESH bo->bo_meshconf += adjust; #endif bo->bo_appie += adjust; @@ -2976,13 +2976,13 @@ ieee80211_beacon_update(struct ieee80211 bo->bo_erp += sizeof(*csa); bo->bo_htinfo += sizeof(*csa); bo->bo_wme += sizeof(*csa); -#ifdef IEEE80211_SUPERG_SUPPORT +#ifdef IEEE80211_SUPPORT_SUPERG bo->bo_ath += sizeof(*csa); #endif -#ifdef IEEE80211_TDMA_SUPPORT +#ifdef IEEE80211_SUPPORT_TDMA bo->bo_tdma += sizeof(*csa); #endif -#ifdef IEEE80211_MESH_SUPPORT +#ifdef IEEE80211_SUPPORT_MESH bo->bo_meshconf += sizeof(*csa); #endif bo->bo_appie += sizeof(*csa); From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 20:08:47 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5145110656A9; Mon, 21 Feb 2011 20:08:47 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from vlakno.cz (lev.vlakno.cz [77.93.215.190]) by mx1.freebsd.org (Postfix) with ESMTP id 0B0C08FC1F; Mon, 21 Feb 2011 20:08:46 +0000 (UTC) Received: from lev.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 0262F9CB0C5; Mon, 21 Feb 2011 21:08:45 +0100 (CET) X-Virus-Scanned: amavisd-new at vlakno.cz Received: from vlakno.cz ([127.0.0.1]) by lev.vlakno.cz (lev.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PRDRv7sVX-hc; Mon, 21 Feb 2011 21:08:32 +0100 (CET) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id C5DE19CB472; Mon, 21 Feb 2011 21:08:32 +0100 (CET) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.14.4/8.14.4/Submit) id p1LK8WIP023911; Mon, 21 Feb 2011 21:08:32 +0100 (CET) (envelope-from rdivacky) Date: Mon, 21 Feb 2011 21:08:32 +0100 From: Roman Divacky To: Dimitry Andric Message-ID: <20110221200832.GA23843@freebsd.org> References: <201102211946.p1LJk2a4081223@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201102211946.p1LJk2a4081223@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r218926 - head/sys/boot/i386/boot2 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 20:08:47 -0000 On Mon, Feb 21, 2011 at 07:46:02PM +0000, Dimitry Andric wrote: > Author: dim > Date: Mon Feb 21 19:46:02 2011 > New Revision: 218926 > URL: http://svn.freebsd.org/changeset/base/218926 > > Log: > In sys/boot/i386/boot2/boot2.c, change the type of the 'opts' variable > from uint16_t back to uint32_t. The actual option bitmasks (RB_* and > RBX_*) assume at least a 32 bit variable. > > Submitted by: rdivacky actually, pointy hat to me :( From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 20:12:20 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C56F31065672; Mon, 21 Feb 2011 20:12:20 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-ww0-f50.google.com (mail-ww0-f50.google.com [74.125.82.50]) by mx1.freebsd.org (Postfix) with ESMTP id 058038FC1B; Mon, 21 Feb 2011 20:12:19 +0000 (UTC) Received: by wwf26 with SMTP id 26so6309438wwf.31 for ; Mon, 21 Feb 2011 12:12:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=UYtV5cOKQLk+nl65H9OVLNZD/OS84+YZa5QcMd2cpYY=; b=VkG9UwIssiafSmIyHubT3wO0ezPWNMkjoz9i+wyP3NZ3UC0SD/EIj5pwswX6zG9P5f n3y3r7CkOuxGBDs6sYe6avUrw7FNMN7ulwSrVzj6ykPoSIxPQV4k3Rw0b8c3gPrb5/1Z NHCNKLvPDrPkgg5VsZeDH5DXutiLHk2HOJjI0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=SX5N6yXQu+roaALLpLuRzmvf320BOpJcX8fORi9/hOEBs11TEthMdNAt/WHBewKyUg VUvIPuSW/h/C8rpuVTfWr89OAq9BWU4iWrm1TdzTU5X5Zb/sqLmnHWdAazw0qnLi54cH 6K0k9pRhXbn1Xrhr1IX0QAW8B4Ty8kW3sUgS8= MIME-Version: 1.0 Received: by 10.216.51.130 with SMTP id b2mr1602704wec.42.1298319138660; Mon, 21 Feb 2011 12:12:18 -0800 (PST) Sender: yanegomi@gmail.com Received: by 10.216.71.200 with HTTP; Mon, 21 Feb 2011 12:12:18 -0800 (PST) In-Reply-To: <20110221111448.575858b0.trhodes@FreeBSD.org> References: <201102131818.p1DIIuLL046962@svn.freebsd.org> <201102192007.32979.bruce@cran.org.uk> <4D6051D0.8050704@dougbarton.us> <20110221111448.575858b0.trhodes@FreeBSD.org> Date: Mon, 21 Feb 2011 12:12:18 -0800 X-Google-Sender-Auth: Omj-x3XKF0tAbWv47rbCfGKco40 Message-ID: From: Garrett Cooper To: Tom Rhodes Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: unixmania@gmail.com, bruce@cran.org.uk, src-committers@freebsd.org, svn-src-all@freebsd.org, Doug Barton , svn-src-head@freebsd.org Subject: Re: svn commit: r218650 - head/games/fortune/datfiles X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 20:12:20 -0000 On Mon, Feb 21, 2011 at 8:14 AM, Tom Rhodes wrote: > On Sat, 19 Feb 2011 15:27:12 -0800 > Doug Barton wrote: > >> On 02/19/2011 15:12, Carlos A. M. dos Santos wrote: >> > On Sat, Feb 19, 2011 at 6:07 PM, Bruce Cran =A0wrot= e: >> >> On Saturday 19 February 2011 17:25:32 Carlos A. M. dos Santos wrote: >> >> >> >>> Did anybody complain about this? If not, would you mid either revert >> >>> this commit or just go ahead and move all "potentially" offensive >> >>> jokes to fortunes-o? Anything from Grouch Marx or Mark Twain will >> >>> probably qualify. >> >> >> >> I'm happy to revert the checkin if you think the fortune should be in= the main >> >> file, since it appears the PR submitter was complaining just as much = about >> >> being unprofessional as offensive. =A0Would you like me to go ahead a= nd revert >> >> the move? >> > >> > I suggest you to revert the commit >> >> Serious overkill, particularly since: >> 1. The commit has already been MFC'ed, and >> 2. The fortune in question actually _is_ potentially offensive >> > > ... > $ man fortune > ... > WARNING: Integrating fortune and your email will cause wide > spread whining, crying, or panic which may or may not result > in a lecture about how someone else is morally superior to > yourself. =A0By integrating this program into your email client, > you are accepting the risk of not being pc-enough for your > peers (ones that you would probably never have a beer with). "Depending on how lucky you are, your fortune may rub people the wrong way"= :). Cheers, -Garrett "Never rub another man's rhubarb!"- The Joker From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 20:15:25 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4101D1065674; Mon, 21 Feb 2011 20:15:25 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id E315F8FC08; Mon, 21 Feb 2011 20:15:23 +0000 (UTC) Received: by wyb32 with SMTP id 32so2189395wyb.13 for ; Mon, 21 Feb 2011 12:15:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=WFkgB+g4A7xwhg9WAiGuGyJubPwf+2xe0hWcZ7nqF9c=; b=IEDDvrS+SZshUu/30XtRk255362ajSYogyExlH5IWR+XaQ5qXBGvCZt4D3vmiw90jI 2C4otSesnp68+0PdKvr3r6n8+UaqD5Kk1wgNg5zlIjxV+/P0OHghWjJ7OGSr0mGeL9dA qccFB4t+ZKVXpltHIr6+L6Vv9aoX4GJa3fRdA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=qphPaZoS3DDjPcIwqk3MeIHe6gZTgLiG49WYAY0TmEcayvs9XDVPx98Inv9axATKnx 9sRBmm/9GHjOIDgRb/6sJzclFmup7mF35UlYgwjtxJeiCsKpjSTjGnIE/Flbl7L+MkjU +QdBuSHcL2IYtt/eutdI+rcbZ3piZCqfznFMo= MIME-Version: 1.0 Received: by 10.216.3.3 with SMTP id 3mr2566998weg.57.1298319323099; Mon, 21 Feb 2011 12:15:23 -0800 (PST) Received: by 10.216.71.200 with HTTP; Mon, 21 Feb 2011 12:15:22 -0800 (PST) In-Reply-To: <4D62B980.2090606@dougbarton.us> References: <201102180940.p1I9eD29050530@svn.freebsd.org> <20110219073412.GC2016@garage.freebsd.pl> <20110221084025.GA14934@zeninc.net> <20110221092143.GA1766@garage.freebsd.pl> <20110221110156.GA15358@zeninc.net> <4D62B980.2090606@dougbarton.us> Date: Mon, 21 Feb 2011 12:15:22 -0800 Message-ID: From: Garrett Cooper To: Doug Barton Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, VANHULLEBUS Yvan , src-committers@freebsd.org, Pawel Jakub Dawidek , svn-src-all@freebsd.org Subject: Re: svn commit: r218794 - in head: . sys/netipsec X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 20:15:25 -0000 On Mon, Feb 21, 2011 at 11:14 AM, Doug Barton wrote: > On 02/21/2011 03:01, VANHULLEBUS Yvan wrote: >> >> On Mon, Feb 21, 2011 at 10:21:43AM +0100, Pawel Jakub Dawidek wrote: >>> >>> > =A0On Mon, Feb 21, 2011 at 09:40:25AM +0100, VANHULLEBUS Yvan wrote: >> >> [RFC4868 and MFC] >>> >>> > =A0You can't talk to two such peers with sysctl or without anyway. I >>> > assume >>> > =A0that if someone already has tunnels configured and they work, they >>> > work, >>> > =A0because the other end uses 96 bits hashes. Once he upgrades there = is >>> > no >>> > =A0way to get old behaviour back quickly. >>> > >>> > =A0You are changing on-the-wire protocol in the middle of stable bran= ch. >>> > Am >>> > =A0I alone in thinking that this is bad idea? >> >> That's a good question. >> Of other people also think it's a bad idea, I can just forget the MFC. >> But the same problem will happen when we'll release 9.0. >> Of course, this is easier to explain, as this will be a new branch. > > IMO RFC compliance trumps -stable here. Admittedly some small percentage = of > users will be inconvenienced, and that is unfortunate. However all users = who > start using this technology from here forward should get the full RFC > compliant version. > > As Bjoern pointed out, we'll see more of this, not less because oddly eno= ugh > RFC publication (like many other external factors) do not revolve around = our > release schedules. :) Or maybe the statement: "Conformance and stability with the rest of the conforming machines trumps incorrectness and stability within just older versions of FreeBSD"? Is the right way to say things? Personally I think Yvan's doing the right thing as a bug's a bug, but that's just me. *shrugs* -Garrett From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 21:13:18 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80256106566B; Mon, 21 Feb 2011 21:13:18 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 53DF58FC1B; Mon, 21 Feb 2011 21:13:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LLDIoo083585; Mon, 21 Feb 2011 21:13:18 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LLDICL083583; Mon, 21 Feb 2011 21:13:18 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201102212113.p1LLDICL083583@svn.freebsd.org> From: Marius Strobl Date: Mon, 21 Feb 2011 21:13:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218930 - head/sys/sparc64/pci X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 21:13:18 -0000 Author: marius Date: Mon Feb 21 21:13:18 2011 New Revision: 218930 URL: http://svn.freebsd.org/changeset/base/218930 Log: Resurrect ofw_pci_if.m from r178578. Added: head/sys/sparc64/pci/ofw_pci_if.m - copied unchanged from r178578, head/sys/sparc64/pci/ofw_pci_if.m Copied: head/sys/sparc64/pci/ofw_pci_if.m (from r178578, head/sys/sparc64/pci/ofw_pci_if.m) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/sparc64/pci/ofw_pci_if.m Mon Feb 21 21:13:18 2011 (r218930, copy of r178578, head/sys/sparc64/pci/ofw_pci_if.m) @@ -0,0 +1,53 @@ +#- +# Copyright (c) 2001, 2003 by Thomas Moestl +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# $FreeBSD$ + +#include + +#include + +#include + +INTERFACE ofw_pci; + +CODE { + static ofw_pci_intr_pending_t ofw_pci_default_intr_pending; + + static int + ofw_pci_default_intr_pending(device_t dev, ofw_pci_intr_t intr) + { + + if (device_get_parent(dev) != NULL) + return (OFW_PCI_INTR_PENDING(device_get_parent(dev), + intr)); + return (0); + } +}; + +# Return whether an interrupt request is pending for the INO intr. +METHOD int intr_pending { + device_t dev; + ofw_pci_intr_t intr; +} DEFAULT ofw_pci_default_intr_pending; From owner-svn-src-head@FreeBSD.ORG Mon Feb 21 23:51:25 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1233) id 1C0301065670; Mon, 21 Feb 2011 23:51:25 +0000 (UTC) Date: Mon, 21 Feb 2011 23:51:25 +0000 From: Alexander Best To: Bruce Cran Message-ID: <20110221235125.GA98118@freebsd.org> References: <201102210901.p1L91YoI063173@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201102210901.p1L91YoI063173@svn.freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218909 - in head: bin/df bin/sh lib/libc/arm/gen lib/libc/ia64/gen lib/libc/mips/gen lib/libc/powerpc/gen lib/libc/powerpc64/gen lib/libpkg lib/libstand lib/msun/src sys/amd64/amd64 sy... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 23:51:25 -0000 On Mon Feb 21 11, Bruce Cran wrote: > Author: brucec > Date: Mon Feb 21 09:01:34 2011 > New Revision: 218909 > URL: http://svn.freebsd.org/changeset/base/218909 > > Log: > Fix typos - remove duplicate "the". nice! ...also i just found these: otaku% find ./ -name "*.[0-9]" -exec grep " and and " {} + ./secure/lib/libssl/man/ssl.3:containing the prototypes for the data structures and and functions: ./usr.sbin/ntp/doc/ntp.conf.5:by increasing address values and and then by increasing mask values. otaku% find ./ -name "*.[0-9]" -exec grep " for for " {} + ./lib/libelf/elf_cntl.3:internally, this function is a no-op for for ELF objects opened in otaku% find ./ -name "*.[0-9]" -exec grep " then then " {} + ./secure/lib/libcrypto/man/BIO_s_fd.3:If the close flag is set then then \fIclose()\fR is called on the underlying cheers. alex > > PR: bin/154928 > Submitted by: Eitan Adler > MFC after: 3 days > > Modified: > head/bin/df/df.c > head/bin/sh/expand.c > head/lib/libc/arm/gen/modf.c > head/lib/libc/ia64/gen/modf.c > head/lib/libc/mips/gen/modf.c > head/lib/libc/powerpc/gen/modf.c > head/lib/libc/powerpc64/gen/modf.c > head/lib/libpkg/version.c > head/lib/libstand/environment.c > head/lib/msun/src/s_cbrt.c > head/sys/amd64/amd64/trap.c > head/sys/arm/xscale/i80321/iq80321.c > head/sys/boot/ficl/words.c > head/sys/cam/cam_xpt.c > head/sys/cam/scsi/scsi_sa.c > head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c > head/sys/cddl/dev/dtrace/i386/dtrace_subr.c > head/sys/compat/ndis/subr_ntoskrnl.c > head/sys/dev/advansys/adwcam.c > head/sys/dev/aic7xxx/aic79xx_osm.h > head/sys/dev/aic7xxx/aic7xxx_osm.h > head/sys/dev/asr/i2omsg.h > head/sys/dev/bktr/bktr_card.c > head/sys/dev/ctau/ctau.c > head/sys/dev/ctau/ctddk.h > head/sys/dev/cxgb/cxgb_main.c > head/sys/dev/drm/mach64_dma.c > head/sys/dev/drm/r300_reg.h > head/sys/dev/e1000/e1000_82575.c > head/sys/dev/e1000/e1000_ich8lan.c > head/sys/dev/ep/if_epreg.h > head/sys/dev/fdc/fdc.c > head/sys/dev/ixgb/ixgb_ee.c > head/sys/dev/malo/if_malohal.h > head/sys/dev/mwl/mwlhal.h > head/sys/dev/nxge/xgehal/xgehal-device.c > head/sys/dev/nxge/xgehal/xgehal-ring-fp.c > head/sys/dev/random/randomdev_soft.c > head/sys/dev/sound/pci/es137x.c > head/sys/dev/sym/sym_fw1.h > head/sys/dev/sym/sym_fw2.h > head/sys/dev/uart/uart_dev_ns8250.c > head/sys/dev/usb/usb_process.c > head/sys/dev/vx/if_vxreg.h > head/sys/dev/wpi/if_wpi.c > head/sys/fs/fdescfs/fdesc_vnops.c > head/sys/fs/msdosfs/msdosfs_vnops.c > head/sys/geom/geom_vfs.c > head/sys/geom/part/g_part_ebr.c > head/sys/geom/sched/gs_scheduler.h > head/sys/gnu/fs/xfs/xfs_dir_leaf.c > head/sys/gnu/fs/xfs/xfs_itable.c > head/sys/i386/i386/trap.c > head/sys/kern/subr_unit.c > head/sys/kern/subr_witness.c > head/sys/kern/uipc_mbuf.c > head/sys/mips/mips/pmap.c > head/sys/mips/rmi/fmn.c > head/sys/mips/sibyte/sb_zbpci.c > head/sys/net/if_media.c > head/sys/net/route.c > head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c > head/sys/netgraph/ng_source.c > head/sys/netinet/if_ether.c > head/sys/netinet/ip_input.c > head/sys/netinet/ipfw/ip_fw_private.h > head/sys/netinet/libalias/alias_sctp.c > head/sys/netinet/tcp_offload.h > head/sys/netinet/tcp_subr.c > head/sys/netinet/tcp_syncache.c > head/sys/netinet/tcp_timewait.c > head/sys/netinet6/in6.h > head/sys/pc98/cbus/fdc.c > head/sys/sparc64/include/iommureg.h > head/sys/sparc64/pci/sbbc.c > head/sys/sparc64/sparc64/trap.c > head/sys/sys/aac_ioctl.h > head/usr.bin/lex/misc.c > head/usr.bin/m4/gnum4.c > head/usr.bin/make/lst.c > head/usr.bin/rpcinfo/rpcinfo.c > head/usr.bin/xinstall/xinstall.c > head/usr.sbin/moused/moused.c > head/usr.sbin/rpcbind/util.c > head/usr.sbin/sysinstall/install.c > > Modified: head/bin/df/df.c > ============================================================================== > --- head/bin/df/df.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/bin/df/df.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -125,7 +125,7 @@ main(int argc, char *argv[]) > /* FALLTHROUGH */ > case 'P': > /* > - * POSIX specifically discusses the the behavior of > + * POSIX specifically discusses the behavior of > * both -k and -P. It states that the blocksize should > * be set to 1024. Thus, if this occurs, simply break > * rather than clobbering the old blocksize. > > Modified: head/bin/sh/expand.c > ============================================================================== > --- head/bin/sh/expand.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/bin/sh/expand.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -959,7 +959,7 @@ numvar: > > > /* > - * Record the the fact that we have to scan this region of the > + * Record the fact that we have to scan this region of the > * string for IFS characters. > */ > > > Modified: head/lib/libc/arm/gen/modf.c > ============================================================================== > --- head/lib/libc/arm/gen/modf.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/lib/libc/arm/gen/modf.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -86,7 +86,7 @@ modf(val, iptr) > * If you look at the math involved for a few seconds, it's > * plain to see that the integral part is the input, with the > * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, > - * the the fractional part is the part with the rest of the > + * the fractional part is the part with the rest of the > * bits zeroed. Just zeroing the high bits to get the > * fractional part would yield a fraction in need of > * normalization. Therefore, we take the easy way out, and > > Modified: head/lib/libc/ia64/gen/modf.c > ============================================================================== > --- head/lib/libc/ia64/gen/modf.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/lib/libc/ia64/gen/modf.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -85,7 +85,7 @@ modf(val, iptr) > * If you look at the math involved for a few seconds, it's > * plain to see that the integral part is the input, with the > * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, > - * the the fractional part is the part with the rest of the > + * the fractional part is the part with the rest of the > * bits zeroed. Just zeroing the high bits to get the > * fractional part would yield a fraction in need of > * normalization. Therefore, we take the easy way out, and > > Modified: head/lib/libc/mips/gen/modf.c > ============================================================================== > --- head/lib/libc/mips/gen/modf.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/lib/libc/mips/gen/modf.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -86,7 +86,7 @@ modf(val, iptr) > * If you look at the math involved for a few seconds, it's > * plain to see that the integral part is the input, with the > * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, > - * the the fractional part is the part with the rest of the > + * the fractional part is the part with the rest of the > * bits zeroed. Just zeroing the high bits to get the > * fractional part would yield a fraction in need of > * normalization. Therefore, we take the easy way out, and > > Modified: head/lib/libc/powerpc/gen/modf.c > ============================================================================== > --- head/lib/libc/powerpc/gen/modf.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/lib/libc/powerpc/gen/modf.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -86,7 +86,7 @@ modf(val, iptr) > * If you look at the math involved for a few seconds, it's > * plain to see that the integral part is the input, with the > * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, > - * the the fractional part is the part with the rest of the > + * the fractional part is the part with the rest of the > * bits zeroed. Just zeroing the high bits to get the > * fractional part would yield a fraction in need of > * normalization. Therefore, we take the easy way out, and > > Modified: head/lib/libc/powerpc64/gen/modf.c > ============================================================================== > --- head/lib/libc/powerpc64/gen/modf.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/lib/libc/powerpc64/gen/modf.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -86,7 +86,7 @@ modf(val, iptr) > * If you look at the math involved for a few seconds, it's > * plain to see that the integral part is the input, with the > * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, > - * the the fractional part is the part with the rest of the > + * the fractional part is the part with the rest of the > * bits zeroed. Just zeroing the high bits to get the > * fractional part would yield a fraction in need of > * normalization. Therefore, we take the easy way out, and > > Modified: head/lib/libpkg/version.c > ============================================================================== > --- head/lib/libpkg/version.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/lib/libpkg/version.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -76,7 +76,7 @@ split_version(const char *pkgname, const > if (pkgname == NULL) > errx(2, "%s: Passed NULL pkgname.", __func__); > > - /* Look for the last '-' the the pkgname */ > + /* Look for the last '-' the pkgname */ > ch = strrchr(pkgname, '-'); > /* Cheat if we are just passed a version, not a valid package name */ > versionstr = ch ? ch + 1 : pkgname; > > Modified: head/lib/libstand/environment.c > ============================================================================== > --- head/lib/libstand/environment.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/lib/libstand/environment.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -59,7 +59,7 @@ env_getenv(const char *name) > * Some notes: > * > * If the EV_VOLATILE flag is set, a copy of the variable is made. > - * If EV_DYNAMIC is set, the the variable has been allocated with > + * If EV_DYNAMIC is set, the variable has been allocated with > * malloc and ownership transferred to the environment. > * If (value) is NULL, the variable is set but has no value. > */ > > Modified: head/lib/msun/src/s_cbrt.c > ============================================================================== > --- head/lib/msun/src/s_cbrt.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/lib/msun/src/s_cbrt.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -94,7 +94,7 @@ cbrt(double x) > * 2 23-bit ulps larger). With rounding towards zero, the error bound > * would be ~5/6 instead of ~4/6. With a maximum error of 2 23-bit ulps > * in the rounded t, the infinite-precision error in the Newton > - * approximation barely affects third digit in the the final error > + * approximation barely affects third digit in the final error > * 0.667; the error in the rounded t can be up to about 3 23-bit ulps > * before the final error is larger than 0.667 ulps. > */ > > Modified: head/sys/amd64/amd64/trap.c > ============================================================================== > --- head/sys/amd64/amd64/trap.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/amd64/amd64/trap.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -235,7 +235,7 @@ trap(struct trapframe *frame) > * A trap can occur while DTrace executes a probe. Before > * executing the probe, DTrace blocks re-scheduling and sets > * a flag in it's per-cpu flags to indicate that it doesn't > - * want to fault. On returning from the the probe, the no-fault > + * want to fault. On returning from the probe, the no-fault > * flag is cleared and finally re-scheduling is enabled. > * > * If the DTrace kernel module has registered a trap handler, > > Modified: head/sys/arm/xscale/i80321/iq80321.c > ============================================================================== > --- head/sys/arm/xscale/i80321/iq80321.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/arm/xscale/i80321/iq80321.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -139,7 +139,7 @@ iq80321_attach(device_t dev) > device_get_name(dev)); > > /* > - * We have mapped the the PCI I/O windows in the early > + * We have mapped the PCI I/O windows in the early > * bootstrap phase. > */ > sc->sc_iow_vaddr = IQ80321_IOW_VBASE; > > Modified: head/sys/boot/ficl/words.c > ============================================================================== > --- head/sys/boot/ficl/words.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/boot/ficl/words.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -1293,7 +1293,7 @@ static void ifCoIm(FICL_VM *pVM) > ** compiles an "else"... > ** 1) Compile a branch and a patch address; the address gets patched > ** by "endif" to point past the "else" code. > -** 2) Pop the the "if" patch address > +** 2) Pop the "if" patch address > ** 3) Patch the "if" branch to point to the current compile address. > ** 4) Push the "else" patch address. ("endif" patches this to jump past > ** the "else" code. > > Modified: head/sys/cam/cam_xpt.c > ============================================================================== > --- head/sys/cam/cam_xpt.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/cam/cam_xpt.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -317,7 +317,7 @@ xpt_schedule_dev_allocq(struct cam_eb *b > CAMQ_GET_PRIO(&dev->drvq))) == 0)) { > /* > * The priority of a device waiting for CCB resources > - * is that of the the highest priority peripheral driver > + * is that of the highest priority peripheral driver > * enqueued. > */ > retval = xpt_schedule_dev(&bus->sim->devq->alloc_queue, > @@ -340,7 +340,7 @@ xpt_schedule_dev_sendq(struct cam_eb *bu > (cam_ccbq_frozen_top(&dev->ccbq) == 0)) { > /* > * The priority of a device waiting for controller > - * resources is that of the the highest priority CCB > + * resources is that of the highest priority CCB > * enqueued. > */ > retval = > > Modified: head/sys/cam/scsi/scsi_sa.c > ============================================================================== > --- head/sys/cam/scsi/scsi_sa.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/cam/scsi/scsi_sa.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -2654,7 +2654,7 @@ retry: > struct scsi_dev_conf_page *cp = &ntcs->dconf; > /* > * We don't really know whether this device supports > - * Data Compression if the the algorithm field is > + * Data Compression if the algorithm field is > * zero. Just say we do. > */ > *comp_supported = TRUE; > > Modified: head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c > ============================================================================== > --- head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -487,7 +487,7 @@ dtrace_trap(struct trapframe *frame, u_i > * A trap can occur while DTrace executes a probe. Before > * executing the probe, DTrace blocks re-scheduling and sets > * a flag in it's per-cpu flags to indicate that it doesn't > - * want to fault. On returning from the the probe, the no-fault > + * want to fault. On returning from the probe, the no-fault > * flag is cleared and finally re-scheduling is enabled. > * > * Check if DTrace has enabled 'no-fault' mode: > > Modified: head/sys/cddl/dev/dtrace/i386/dtrace_subr.c > ============================================================================== > --- head/sys/cddl/dev/dtrace/i386/dtrace_subr.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/cddl/dev/dtrace/i386/dtrace_subr.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -487,7 +487,7 @@ dtrace_trap(struct trapframe *frame, u_i > * A trap can occur while DTrace executes a probe. Before > * executing the probe, DTrace blocks re-scheduling and sets > * a flag in it's per-cpu flags to indicate that it doesn't > - * want to fault. On returning from the the probe, the no-fault > + * want to fault. On returning from the probe, the no-fault > * flag is cleared and finally re-scheduling is enabled. > * > * Check if DTrace has enabled 'no-fault' mode: > > Modified: head/sys/compat/ndis/subr_ntoskrnl.c > ============================================================================== > --- head/sys/compat/ndis/subr_ntoskrnl.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/compat/ndis/subr_ntoskrnl.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -3355,7 +3355,7 @@ KeSetEvent(nt_kevent *kevent, uint32_t i > * setting the state to signalled since we're supposed > * to automatically clear synchronization events anyway). > * > - * If it's a notification event, or the the first > + * If it's a notification event, or the first > * waiter is doing a WAITTYPE_ALL wait, go through > * the full wait satisfaction process. > */ > > Modified: head/sys/dev/advansys/adwcam.c > ============================================================================== > --- head/sys/dev/advansys/adwcam.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/advansys/adwcam.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -1,5 +1,5 @@ > /*- > - * CAM SCSI interface for the the Advanced Systems Inc. > + * CAM SCSI interface for the Advanced Systems Inc. > * Second Generation SCSI controllers. > * > * Product specific probe and attach routines can be found in: > > Modified: head/sys/dev/aic7xxx/aic79xx_osm.h > ============================================================================== > --- head/sys/dev/aic7xxx/aic79xx_osm.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/aic7xxx/aic79xx_osm.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -103,7 +103,7 @@ > * The number of dma segments supported. The sequencer can handle any number > * of physically contiguous S/G entrys. To reduce the driver's memory > * consumption, we limit the number supported to be sufficient to handle > - * the largest mapping supported by the the legacy kernel MAXPHYS setting of > + * the largest mapping supported by the legacy kernel MAXPHYS setting of > * 128K. This can be increased once some testing is done. Assuming the > * transfer is as fragmented as possible and unaligned, this turns out to > * be the number of paged sized transfers in MAXPHYS plus an extra element > > Modified: head/sys/dev/aic7xxx/aic7xxx_osm.h > ============================================================================== > --- head/sys/dev/aic7xxx/aic7xxx_osm.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/aic7xxx/aic7xxx_osm.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -115,7 +115,7 @@ extern devclass_t ahc_devclass; > * The number of dma segments supported. The sequencer can handle any number > * of physically contiguous S/G entrys. To reduce the driver's memory > * consumption, we limit the number supported to be sufficient to handle > - * the largest mapping supported by the the legacy kernel MAXPHYS setting of > + * the largest mapping supported by the legacy kernel MAXPHYS setting of > * 128K. This can be increased once some testing is done. Assuming the > * be the number of paged sized transfers in MAXPHYS plus an extra element > * to handle any unaligned residual. The sequencer fetches SG elements > > Modified: head/sys/dev/asr/i2omsg.h > ============================================================================== > --- head/sys/dev/asr/i2omsg.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/asr/i2omsg.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -183,7 +183,7 @@ PRAGMA_PACK_PUSH > #define I2O_VERSION_OFFSET_SGL_TRL_OFFSET_MASK 0xF0 > > /* Defines for the Message Flags Field. */ > -/* Please Note the the FAIL bit is only set in the Transport Fail Message. */ > +/* Please Note the FAIL bit is only set in the Transport Fail Message. */ > #define I2O_MESSAGE_FLAGS_STATIC 0x01 > #define I2O_MESSAGE_FLAGS_64BIT_CONTEXT 0x02 > #define I2O_MESSAGE_FLAGS_MULTIPLE 0x10 > > Modified: head/sys/dev/bktr/bktr_card.c > ============================================================================== > --- head/sys/dev/bktr/bktr_card.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/bktr/bktr_card.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -570,7 +570,7 @@ static int locate_eeprom_address( bktr_p > * > * However some makes of card (eg Hauppauge) come with a configuration eeprom > * which tells us the make of the card. Most eeproms also tell us the > - * tuner type and other features of the the cards. > + * tuner type and other features of the cards. > * > * The current probe code works as follows > * A) If the card uses a Bt878/879: > > Modified: head/sys/dev/ctau/ctau.c > ============================================================================== > --- head/sys/dev/ctau/ctau.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/ctau/ctau.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -1734,7 +1734,7 @@ ct_board_opt_t ct_board_opt_dflt = { > 0, /* board control register 2 */ > { /* DMA priority control register */ > PCR_PRIO_ROTATE, > - 0, /* all channels share the the bus hold */ > + 0, /* all channels share the bus hold */ > 0, /* hold the bus until all transfers done */ > }, > CFG_A, /* E1/G.703 config: two independent channels */ > > Modified: head/sys/dev/ctau/ctddk.h > ============================================================================== > --- head/sys/dev/ctau/ctddk.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/ctau/ctddk.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -206,7 +206,7 @@ typedef struct { > typedef struct { > unsigned prio : 3; /* priority of channels */ > unsigned noshare : 1; /* 1 - chan holds the bus until end of data */ > - /* 0 - all channels share the the bus hold */ > + /* 0 - all channels share the bus hold */ > unsigned release : 1; /* 1 - release the bus between transfers */ > /* 0 - hold the bus until all transfers done */ > } ct_pcr_t; > > Modified: head/sys/dev/cxgb/cxgb_main.c > ============================================================================== > --- head/sys/dev/cxgb/cxgb_main.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/cxgb/cxgb_main.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -1908,7 +1908,7 @@ cxgb_uninit_synchronized(struct port_inf > /* > * Clear this port's bit from the open device map, and then drain all > * the tasks that can access/manipulate this port's port_info or ifp. > - * We disable this port's interrupts here and so the the slow/ext > + * We disable this port's interrupts here and so the slow/ext > * interrupt tasks won't be enqueued. The tick task will continue to > * be enqueued every second but the runs after this drain will not see > * this port in the open device map. > @@ -2858,7 +2858,7 @@ cxgb_extension_ioctl(struct cdev *dev, u > u64 buf[32]; > > /* > - * Use these to avoid modifying len/addr in the the return > + * Use these to avoid modifying len/addr in the return > * struct > */ > uint32_t len = t->len, addr = t->addr; > > Modified: head/sys/dev/drm/mach64_dma.c > ============================================================================== > --- head/sys/dev/drm/mach64_dma.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/drm/mach64_dma.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -173,7 +173,7 @@ static int mach64_ring_idle(drm_mach64_p > } > > /** > - * Reset the the ring buffer descriptors. > + * Reset the ring buffer descriptors. > * > * \sa mach64_do_engine_reset() > */ > > Modified: head/sys/dev/drm/r300_reg.h > ============================================================================== > --- head/sys/dev/drm/r300_reg.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/drm/r300_reg.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -353,7 +353,7 @@ __FBSDID("$FreeBSD$"); > # define R300_PVS_CNTL_1_PROGRAM_START_SHIFT 0 > # define R300_PVS_CNTL_1_POS_END_SHIFT 10 > # define R300_PVS_CNTL_1_PROGRAM_END_SHIFT 20 > -/* Addresses are relative the the vertex program parameters area. */ > +/* Addresses are relative the vertex program parameters area. */ > #define R300_VAP_PVS_CNTL_2 0x22D4 > # define R300_PVS_CNTL_2_PARAM_OFFSET_SHIFT 0 > # define R300_PVS_CNTL_2_PARAM_COUNT_SHIFT 16 > > Modified: head/sys/dev/e1000/e1000_82575.c > ============================================================================== > --- head/sys/dev/e1000/e1000_82575.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/e1000/e1000_82575.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -1986,7 +1986,7 @@ out: > * e1000_reset_mdicnfg_82580 - Reset MDICNFG destination and com_mdio bits > * @hw: pointer to the HW structure > * > - * This resets the the MDICNFG.Destination and MDICNFG.Com_MDIO bits based on > + * This resets the MDICNFG.Destination and MDICNFG.Com_MDIO bits based on > * the values found in the EEPROM. This addresses an issue in which these > * bits are not restored from EEPROM after reset. > **/ > > Modified: head/sys/dev/e1000/e1000_ich8lan.c > ============================================================================== > --- head/sys/dev/e1000/e1000_ich8lan.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/e1000/e1000_ich8lan.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -3218,7 +3218,7 @@ out: > * @hw: pointer to the HW structure > * > * ICH8 use the PCI Express bus, but does not contain a PCI Express Capability > - * register, so the the bus width is hard coded. > + * register, so the bus width is hard coded. > **/ > static s32 e1000_get_bus_info_ich8lan(struct e1000_hw *hw) > { > > Modified: head/sys/dev/ep/if_epreg.h > ============================================================================== > --- head/sys/dev/ep/if_epreg.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/ep/if_epreg.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -113,7 +113,7 @@ > /************************************************************************** > * * > * These are the registers for the 3Com 3c509 and their bit patterns when * > - * applicable. They have been taken out the the "EtherLink III Parallel * > + * applicable. They have been taken out the "EtherLink III Parallel * > * Tasking EISA and ISA Technical Reference" "Beta Draft 10/30/92" manual * > * from 3com. * > * * > > Modified: head/sys/dev/fdc/fdc.c > ============================================================================== > --- head/sys/dev/fdc/fdc.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/fdc/fdc.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -1261,7 +1261,7 @@ fdmisccmd(struct fd_data *fd, u_int cmd, > > /* > * Set up a bio request for fdstrategy(). bio_offset is faked > - * so that fdstrategy() will seek to the the requested > + * so that fdstrategy() will seek to the requested > * cylinder, and use the desired head. > */ > bp->bio_cmd = cmd; > > Modified: head/sys/dev/ixgb/ixgb_ee.c > ============================================================================== > --- head/sys/dev/ixgb/ixgb_ee.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/ixgb/ixgb_ee.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -325,7 +325,7 @@ ixgb_wait_eeprom_command(struct ixgb_hw > * hw - Struct containing variables accessed by shared code > * > * Reads the first 64 16 bit words of the EEPROM and sums the values read. > - * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is > + * If the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is > * valid. > * > * Returns: > > Modified: head/sys/dev/malo/if_malohal.h > ============================================================================== > --- head/sys/dev/malo/if_malohal.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/malo/if_malohal.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -133,7 +133,7 @@ struct malo_hal_hwstats { > /* > * Set Antenna Configuration (legacy operation). > * > - * The RX antenna can be selected using the the bitmask > + * The RX antenna can be selected using the bitmask > * ant (bit 0 = antenna 1, bit 1 = antenna 2, etc.) > * (diversity?XXX) > */ > > Modified: head/sys/dev/mwl/mwlhal.h > ============================================================================== > --- head/sys/dev/mwl/mwlhal.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/mwl/mwlhal.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -291,7 +291,7 @@ int mwl_hal_setradio(struct mwl_hal *mh, > /* > * Set Antenna Configuration (legacy operation). > * > - * The RX antenna can be selected using the the bitmask > + * The RX antenna can be selected using the bitmask > * ant (bit 0 = antenna 1, bit 1 = antenna 2, etc.) > * (diversity?XXX) > */ > > Modified: head/sys/dev/nxge/xgehal/xgehal-device.c > ============================================================================== > --- head/sys/dev/nxge/xgehal/xgehal-device.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/nxge/xgehal/xgehal-device.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -4418,7 +4418,7 @@ xge_hal_device_status(xge_hal_device_t * > #ifndef XGE_HAL_HERC_EMULATION > /* > * Andrew: in PCI 33 mode, the P_PLL is not used, and therefore, > - * the the P_PLL_LOCK bit in the adapter_status register will > + * the P_PLL_LOCK bit in the adapter_status register will > * not be asserted. > */ > if (!(tmp64 & XGE_HAL_ADAPTER_STATUS_P_PLL_LOCK) && > > Modified: head/sys/dev/nxge/xgehal/xgehal-ring-fp.c > ============================================================================== > --- head/sys/dev/nxge/xgehal/xgehal-ring-fp.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/nxge/xgehal/xgehal-ring-fp.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -801,7 +801,7 @@ xge_hal_ring_dtr_free(xge_hal_channel_h > * xge_hal_ring_is_next_dtr_completed - Check if the next dtr is completed > * @channelh: Channel handle. > * > - * Checks if the the _next_ completed descriptor is in host memory > + * Checks if the _next_ completed descriptor is in host memory > * > * Returns: XGE_HAL_OK - success. > * XGE_HAL_INF_NO_MORE_COMPLETED_DESCRIPTORS - No completed descriptors > > Modified: head/sys/dev/random/randomdev_soft.c > ============================================================================== > --- head/sys/dev/random/randomdev_soft.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/random/randomdev_soft.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -347,7 +347,7 @@ random_yarrow_write(void *buf, int count > > /* > * Break the input up into HARVESTSIZE chunks. The writer has too > - * much control here, so "estimate" the the entropy as zero. > + * much control here, so "estimate" the entropy as zero. > */ > for (i = 0; i < count; i += HARVESTSIZE) { > chunk = HARVESTSIZE; > > Modified: head/sys/dev/sound/pci/es137x.c > ============================================================================== > --- head/sys/dev/sound/pci/es137x.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/sound/pci/es137x.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -584,7 +584,7 @@ eschan1370_setspeed(kobj_t obj, void *da > /* > * DAC1 does not support continuous rate settings. > * Pick the nearest and use it since FEEDER_RATE will > - * do the the proper conversion for us. > + * do the proper conversion for us. > */ > es->ctrl &= ~CTRL_WTSRSEL; > if (speed < 8268) { > > Modified: head/sys/dev/sym/sym_fw1.h > ============================================================================== > --- head/sys/dev/sym/sym_fw1.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/sym/sym_fw1.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -262,7 +262,7 @@ static const struct SYM_FWA_SCR SYM_FWA_ > * The below GETJOB_BEGIN to GETJOB_END section of SCRIPTS > * is a critical path. If it is partially executed, it then > * may happen that the job address is not yet in the DSA > - * and the the next queue position points to the next JOB. > + * and the next queue position points to the next JOB. > */ > }/*-------------------------< GETJOB_BEGIN >---------------------*/,{ > /* > > Modified: head/sys/dev/sym/sym_fw2.h > ============================================================================== > --- head/sys/dev/sym/sym_fw2.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/sym/sym_fw2.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -252,7 +252,7 @@ static const struct SYM_FWA_SCR SYM_FWA_ > * The below GETJOB_BEGIN to GETJOB_END section of SCRIPTS > * is a critical path. If it is partially executed, it then > * may happen that the job address is not yet in the DSA > - * and the the next queue position points to the next JOB. > + * and the next queue position points to the next JOB. > */ > SCR_LOAD_ABS (dsa, 4), > PADDR_B (startpos), > > Modified: head/sys/dev/uart/uart_dev_ns8250.c > ============================================================================== > --- head/sys/dev/uart/uart_dev_ns8250.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/uart/uart_dev_ns8250.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -693,7 +693,7 @@ ns8250_bus_probe(struct uart_softc *sc) > /* > * We should have a sufficiently clean "pipe" to determine the > * size of the FIFOs. We send as much characters as is reasonable > - * and wait for the the overflow bit in the LSR register to be > + * and wait for the overflow bit in the LSR register to be > * asserted, counting the characters as we send them. Based on > * that count we know the FIFO size. > */ > > Modified: head/sys/dev/usb/usb_process.c > ============================================================================== > --- head/sys/dev/usb/usb_process.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/usb/usb_process.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -462,7 +462,7 @@ usb_proc_drain(struct usb_process *up) > /*------------------------------------------------------------------------* > * usb_proc_rewakeup > * > - * This function is called to re-wakeup the the given USB > + * This function is called to re-wakeup the given USB > * process. This usually happens after that the USB system has been in > * polling mode, like during a panic. This function must be called > * having "up->up_mtx" locked. > > Modified: head/sys/dev/vx/if_vxreg.h > ============================================================================== > --- head/sys/dev/vx/if_vxreg.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/vx/if_vxreg.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -112,7 +112,7 @@ > > /************************************************************************** > * These are the registers for the 3Com 3c509 and their bit patterns when * > - * applicable. They have been taken out the the "EtherLink III Parallel * > + * applicable. They have been taken out the "EtherLink III Parallel * > * Tasking EISA and ISA Technical Reference" "Beta Draft 10/30/92" manual * > * from 3com. * > **************************************************************************/ > > Modified: head/sys/dev/wpi/if_wpi.c > ============================================================================== > --- head/sys/dev/wpi/if_wpi.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/dev/wpi/if_wpi.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$"); > * state and told to load boot firmware. The boot firmware loads an init and a > * main binary firmware image into SRAM on the card via DMA. > * Once the firmware is loaded, the driver/hw then > - * communicate by way of circular dma rings via the the SRAM to the firmware. > + * communicate by way of circular dma rings via the SRAM to the firmware. > * > * There is 6 memory rings. 1 command ring, 1 rx data ring & 4 tx data rings. > * The 4 tx data rings allow for prioritization QoS. > > Modified: head/sys/fs/fdescfs/fdesc_vnops.c > ============================================================================== > --- head/sys/fs/fdescfs/fdesc_vnops.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/fs/fdescfs/fdesc_vnops.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -368,7 +368,7 @@ fdesc_open(ap) > return (0); > > /* > - * XXX Kludge: set td->td_proc->p_dupfd to contain the value of the the file > + * XXX Kludge: set td->td_proc->p_dupfd to contain the value of the file > * descriptor being sought for duplication. The error return ensures > * that the vnode for this device will be released by vn_open. Open > * will detect this special error and take the actions in dupfdopen. > > Modified: head/sys/fs/msdosfs/msdosfs_vnops.c > ============================================================================== > --- head/sys/fs/msdosfs/msdosfs_vnops.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/fs/msdosfs/msdosfs_vnops.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -1530,7 +1530,7 @@ msdosfs_readdir(ap) > > /* > * msdosfs_readdir() won't operate properly on regular files since > - * it does i/o only with the the filesystem vnode, and hence can > + * it does i/o only with the filesystem vnode, and hence can > * retrieve the wrong block from the buffer cache for a plain file. > * So, fail attempts to readdir() on a plain file. > */ > > Modified: head/sys/geom/geom_vfs.c > ============================================================================== > --- head/sys/geom/geom_vfs.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/geom/geom_vfs.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -109,7 +109,7 @@ g_vfs_strategy(struct bufobj *bo, struct > /* G_VALID_CONSUMER(cp); We likely lack topology lock */ > > /* > - * If the the provider has orphaned us, just return EXIO. > + * If the provider has orphaned us, just return EXIO. > */ > if (cp->provider == NULL) { > bp->b_error = ENXIO; > > Modified: head/sys/geom/part/g_part_ebr.c > ============================================================================== > --- head/sys/geom/part/g_part_ebr.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/geom/part/g_part_ebr.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -591,7 +591,7 @@ g_part_ebr_write(struct g_part_table *ba > while (baseentry != NULL && baseentry->gpe_deleted) > baseentry = LIST_NEXT(baseentry, gpe_entry); > > - /* Wipe-out the the first EBR when there are no slices. */ > + /* Wipe-out the first EBR when there are no slices. */ > if (baseentry == NULL) { > error = g_write_data(cp, 0, buf, pp->sectorsize); > goto out; > > Modified: head/sys/geom/sched/gs_scheduler.h > ============================================================================== > --- head/sys/geom/sched/gs_scheduler.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/geom/sched/gs_scheduler.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -144,7 +144,7 @@ struct g_sched_class { > > /* > * Manipulate the classifier's data. g_sched_get_class() gets a reference > - * to the the class corresponding to bp in gp, allocating and initializing > + * to the class corresponding to bp in gp, allocating and initializing > * it if necessary. g_sched_put_class() releases the reference. > * The returned value points to the private data for the class. > */ > > Modified: head/sys/gnu/fs/xfs/xfs_dir_leaf.c > ============================================================================== > --- head/sys/gnu/fs/xfs/xfs_dir_leaf.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/gnu/fs/xfs/xfs_dir_leaf.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -2153,7 +2153,7 @@ xfs_dir_leaf_getdents_int( > } > > /* > - * Format a dirent64 structure and copy it out the the user's buffer. > + * Format a dirent64 structure and copy it out the user's buffer. > */ > int > xfs_dir_put_dirent64_direct(xfs_dir_put_args_t *pa) > @@ -2185,7 +2185,7 @@ xfs_dir_put_dirent64_direct(xfs_dir_put_ > } > > /* > - * Format a dirent64 structure and copy it out the the user's buffer. > + * Format a dirent64 structure and copy it out the user's buffer. > */ > int > xfs_dir_put_dirent64_uio(xfs_dir_put_args_t *pa) > > Modified: head/sys/gnu/fs/xfs/xfs_itable.c > ============================================================================== > --- head/sys/gnu/fs/xfs/xfs_itable.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/gnu/fs/xfs/xfs_itable.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -777,7 +777,7 @@ xfs_inumbers( > xfs_buf_relse(agbp); > agbp = NULL; > /* > - * Move up the the last inode in the current > + * Move up the last inode in the current > * chunk. The lookup_ge will always get > * us the first inode in the next chunk. > */ > > Modified: head/sys/i386/i386/trap.c > ============================================================================== > --- head/sys/i386/i386/trap.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/i386/i386/trap.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -255,7 +255,7 @@ trap(struct trapframe *frame) > * A trap can occur while DTrace executes a probe. Before > * executing the probe, DTrace blocks re-scheduling and sets > * a flag in it's per-cpu flags to indicate that it doesn't > - * want to fault. On returning from the the probe, the no-fault > + * want to fault. On returning from the probe, the no-fault > * flag is cleared and finally re-scheduling is enabled. > * > * If the DTrace kernel module has registered a trap handler, > > Modified: head/sys/kern/subr_unit.c > ============================================================================== > --- head/sys/kern/subr_unit.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/kern/subr_unit.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -41,7 +41,7 @@ > * > * If a mutex is not provided when the unit number space is created, a > * default global mutex is used. The advantage to passing a mutex in, is > - * that the the alloc_unrl() function can be called with the mutex already > + * that the alloc_unrl() function can be called with the mutex already > * held (it will not be released by alloc_unrl()). > * > * The allocation function alloc_unr{l}() never sleeps (but it may block on > @@ -52,7 +52,7 @@ > * > * A userland test program is included. > * > - * Memory usage is a very complex function of the the exact allocation > + * Memory usage is a very complex function of the exact allocation > * pattern, but always very compact: > * * For the very typical case where a single unbroken run of unit > * numbers are allocated 44 bytes are used on i386. > > Modified: head/sys/kern/subr_witness.c > ============================================================================== > --- head/sys/kern/subr_witness.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/kern/subr_witness.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -1175,7 +1175,7 @@ witness_checkorder(struct lock_object *l > mtx_assert(&w_mtx, MA_OWNED); > > /* > - * If we know that the the lock we are acquiring comes after > + * If we know that the lock we are acquiring comes after > * the lock we most recently acquired in the lock order tree, > * then there is no need for any further checks. > */ > > Modified: head/sys/kern/uipc_mbuf.c > ============================================================================== > --- head/sys/kern/uipc_mbuf.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/kern/uipc_mbuf.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -280,7 +280,7 @@ mb_free_ext(struct mbuf *m) > } > > /* > - * Attach the the cluster from *m to *n, set up m_ext in *n > + * Attach the cluster from *m to *n, set up m_ext in *n > * and bump the refcount of the cluster. > */ > static void > > Modified: head/sys/mips/mips/pmap.c > ============================================================================== > --- head/sys/mips/mips/pmap.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/mips/mips/pmap.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -2018,7 +2018,7 @@ validate: > pmap_update_page(pmap, va, newpte); > > /* > - * Sync I & D caches for executable pages. Do this only if the the > + * Sync I & D caches for executable pages. Do this only if the > * target pmap belongs to the current process. Otherwise, an > * unresolvable TLB miss may occur. > */ > @@ -2152,7 +2152,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_ > else { > *pte |= PTE_RO; > /* > - * Sync I & D caches. Do this only if the the target pmap > + * Sync I & D caches. Do this only if the target pmap > * belongs to the current process. Otherwise, an > * unresolvable TLB miss may occur. */ > if (pmap == &curproc->p_vmspace->vm_pmap) { > > Modified: head/sys/mips/rmi/fmn.c > ============================================================================== > --- head/sys/mips/rmi/fmn.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/mips/rmi/fmn.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -99,7 +99,7 @@ static int msgring_maxthreads = 3; > TUNABLE_INT("hw.fmn.maxthreads", &msgring_maxthreads); > > /* > - * The device drivers can register a handler for the the messages sent > + * The device drivers can register a handler for the messages sent > * from a station (corresponding to the device). > */ > struct tx_stn_handler { > @@ -148,7 +148,7 @@ xlr_msgring_cpu_init(void) > * For sending FMN messages, we need credits on the destination > * bucket. Program the credits this core has on the 128 possible > * destination buckets. > - * We cannot use a loop here, because the the first argument has > + * We cannot use a loop here, because the first argument has > * to be a constant integer value. > */ > MSGRNG_CC_INIT_CPU_DEST(0, cc_config->counters); > > Modified: head/sys/mips/sibyte/sb_zbpci.c > ============================================================================== > --- head/sys/mips/sibyte/sb_zbpci.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/mips/sibyte/sb_zbpci.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -110,7 +110,7 @@ zbpci_attach(device_t dev) > panic("%s: port_rman", __func__); > > /* > - * Reserve the the physical memory that is used to read/write to the > + * Reserve the physical memory that is used to read/write to the > * pci config space but don't activate it. We are using a page worth > * of KVA as a window over this region. > */ > > Modified: head/sys/net/if_media.c > ============================================================================== > --- head/sys/net/if_media.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/net/if_media.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -235,7 +235,7 @@ ifmedia_ioctl(ifp, ifr, ifm, cmd) > /* > * If no change, we're done. > * XXX Automedia may invole software intervention. > - * Keep going in case the the connected media changed. > + * Keep going in case the connected media changed. > * Similarly, if best match changed (kernel debugger?). > */ > if ((IFM_SUBTYPE(newmedia) != IFM_AUTO) && > > Modified: head/sys/net/route.c > ============================================================================== > --- head/sys/net/route.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/net/route.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -539,7 +539,7 @@ rtredirect_fib(struct sockaddr *dst, > goto done; > /* > * Create a new entry if we just got back a wildcard entry > - * or the the lookup failed. This is necessary for hosts > + * or the lookup failed. This is necessary for hosts > * which use routing redirects generated by smart gateways > * to dynamically build the routing tables. > */ > > Modified: head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c > ============================================================================== > --- head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -560,7 +560,7 @@ ng_btsocket_rfcomm_connect(struct socket > soclose(l2so); /* we don't need new L2CAP socket */ > > /* > - * Check if we already have the same DLCI the the same session > + * Check if we already have the same DLCI the same session > */ > > mtx_lock(&s->session_mtx); > > Modified: head/sys/netgraph/ng_source.c > ============================================================================== > --- head/sys/netgraph/ng_source.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/netgraph/ng_source.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -604,7 +604,7 @@ ng_source_disconnect(hook_p hook) > } > > /* > - * Set sc->output_ifp to point to the the struct ifnet of the interface > + * Set sc->output_ifp to point to the struct ifnet of the interface > * reached via our output hook. > */ > static int > > Modified: head/sys/netinet/if_ether.c > ============================================================================== > --- head/sys/netinet/if_ether.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/netinet/if_ether.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -810,7 +810,7 @@ reply: > > /* > * Also check that the node which sent the ARP packet > - * is on the the interface we expect it to be on. This > + * is on the interface we expect it to be on. This > * avoids ARP chaos if an interface is connected to the > * wrong network. > */ > > Modified: head/sys/netinet/ip_input.c > ============================================================================== > --- head/sys/netinet/ip_input.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/netinet/ip_input.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -1031,7 +1031,7 @@ found: > * segment. If it provides all of our data, drop us, otherwise > * stick new segment in the proper place. > * > - * If some of the data is dropped from the the preceding > + * If some of the data is dropped from the preceding > * segment, then it's checksum is invalidated. > */ > if (p) { > > Modified: head/sys/netinet/ipfw/ip_fw_private.h > ============================================================================== > --- head/sys/netinet/ipfw/ip_fw_private.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/netinet/ipfw/ip_fw_private.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -90,7 +90,7 @@ struct ip_fw_args { > /* > * On return, it points to the matching rule. > * On entry, rule.slot > 0 means the info is valid and > - * contains the the starting rule for an ipfw search. > + * contains the starting rule for an ipfw search. > * If chain_id == chain->id && slot >0 then jump to that slot. > * Otherwise, we locate the first rule >= rulenum:rule_id > */ > > Modified: head/sys/netinet/libalias/alias_sctp.c > ============================================================================== > --- head/sys/netinet/libalias/alias_sctp.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/netinet/libalias/alias_sctp.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -1929,7 +1929,7 @@ UP_process(struct libalias *la, int dire > * @brief Process SCTP message while association is in the process of closing > * > * This function waits for a SHUT-COMP to close the association. Depending on > - * the the setting of sysctl_holddown_timer it may not remove the association > + * the setting of sysctl_holddown_timer it may not remove the association > * immediately, but leave it up until SN_X_T(la). Only SHUT-COMP, SHUT-ACK, and > * ABORT packets are permitted in this state. All other packets are dropped. > * > > Modified: head/sys/netinet/tcp_offload.h > ============================================================================== > --- head/sys/netinet/tcp_offload.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/netinet/tcp_offload.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -56,7 +56,7 @@ > * > * It is assumed that individuals deploying TOE will want connections > * to be offloaded without software changes so all connections on an > - * interface providing TOE are offloaded unless the the SO_NO_OFFLOAD > + * interface providing TOE are offloaded unless the SO_NO_OFFLOAD > * flag is set on the socket. > * > * > > Modified: head/sys/netinet/tcp_subr.c > ============================================================================== > --- head/sys/netinet/tcp_subr.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/netinet/tcp_subr.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -1383,7 +1383,7 @@ tcp_ctlinput(int cmd, struct sockaddr *s > mtu = V_tcp_minmss > + sizeof(struct tcpiphdr); > /* > - * Only cache the the MTU if it > + * Only cache the MTU if it > * is smaller than the interface > * or route MTU. tcp_mtudisc() > * will do right thing by itself. > > Modified: head/sys/netinet/tcp_syncache.c > ============================================================================== > --- head/sys/netinet/tcp_syncache.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/netinet/tcp_syncache.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -524,7 +524,7 @@ syncache_chkrst(struct in_conninfo *inc, > * used, or we are under memory pressure, a valid RST > * may not find a syncache entry. In that case we're > * done and no SYN|ACK retransmissions will happen. > - * Otherwise the the RST was misdirected or spoofed. > + * Otherwise the RST was misdirected or spoofed. > */ > if (sc == NULL) { > if ((s = tcp_log_addrs(inc, th, NULL, NULL))) > > Modified: head/sys/netinet/tcp_timewait.c > ============================================================================== > --- head/sys/netinet/tcp_timewait.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/netinet/tcp_timewait.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -397,7 +397,7 @@ tcp_twcheck(struct inpcb *inp, struct tc > } > > /* > - * Drop the the segment if it does not contain an ACK. > + * Drop the segment if it does not contain an ACK. > */ > if ((thflags & TH_ACK) == 0) > goto drop; > > Modified: head/sys/netinet6/in6.h > ============================================================================== > --- head/sys/netinet6/in6.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/netinet6/in6.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -78,7 +78,7 @@ > > /* > * IPv6 port allocation rules should mirror the IPv4 rules and are controlled > - * by the the net.inet.ip.portrange sysctl tree. The following defines exist > + * by the net.inet.ip.portrange sysctl tree. The following defines exist > * for compatibility with userland applications that need them. > */ > #if __BSD_VISIBLE > > Modified: head/sys/pc98/cbus/fdc.c > ============================================================================== > --- head/sys/pc98/cbus/fdc.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/pc98/cbus/fdc.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -2378,7 +2378,7 @@ fdmisccmd(struct cdev *dev, u_int cmd, v > > /* > * Set up a bio request for fdstrategy(). bio_offset is faked > - * so that fdstrategy() will seek to the the requested > + * so that fdstrategy() will seek to the requested > * cylinder, and use the desired head. > */ > bp->bio_cmd = cmd; > > Modified: head/sys/sparc64/include/iommureg.h > ============================================================================== > --- head/sys/sparc64/include/iommureg.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/sparc64/include/iommureg.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -194,7 +194,7 @@ > * Unfortunately, sabres on UltraSPARC IIi and IIe processors does not use > * this scheme to determine the IOVA base address. Instead, bits 31-29 are > * used to check against the Target Address Space register in the IIi and > - * the the IOMMU is used if they hit. God knows what goes on in the IIe. > + * the IOMMU is used if they hit. God knows what goes on in the IIe. > * > */ > > > Modified: head/sys/sparc64/pci/sbbc.c > ============================================================================== > --- head/sys/sparc64/pci/sbbc.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/sparc64/pci/sbbc.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -335,7 +335,7 @@ sbbc_pci_attach(device_t dev) > rid = SBBC_PCI_BAR; > /* > * Note that we don't activate the resource so it's not mapped twice > - * but only once by the the firmware. > + * but only once by the firmware. > */ > sc->sc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, 0); > if (sc->sc_res == NULL) { > > Modified: head/sys/sparc64/sparc64/trap.c > ============================================================================== > --- head/sys/sparc64/sparc64/trap.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/sparc64/sparc64/trap.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -433,7 +433,7 @@ trap_cecc(void) > cache_flush(); > /* Ensure the caches are still turned on (should be). */ > cache_enable(PCPU_GET(impl)); > - /* Clear the the error from the AFSR. */ > + /* Clear the error from the AFSR. */ > stxa_sync(0, ASI_AFSR, ldxa(0, ASI_AFSR)); > corrected_ecc++; > printf("corrected ECC error\n"); > > Modified: head/sys/sys/aac_ioctl.h > ============================================================================== > --- head/sys/sys/aac_ioctl.h Mon Feb 21 05:10:34 2011 (r218908) > +++ head/sys/sys/aac_ioctl.h Mon Feb 21 09:01:34 2011 (r218909) > @@ -117,7 +117,7 @@ union aac_statrequest { > /* Do the native version of the ioctls. Since the BSD encoding scheme > * conflicts with the 'standard' AAC encoding scheme, the resulting numbers > * will be different. The '8' comes from the fact that the previous scheme > - * used 12 bits for the number, with the the 12th bit being the only set > + * used 12 bits for the number, with the 12th bit being the only set > * bit above bit 8. Thus the value of 8, with the lower 8 bits holding the > * command number. 9 is used for the odd overflow case. > */ > > Modified: head/usr.bin/lex/misc.c > ============================================================================== > --- head/usr.bin/lex/misc.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/usr.bin/lex/misc.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -707,7 +707,7 @@ const char str[]; > } > > > -/* readable_form - return the the human-readable form of a character > +/* readable_form - return the human-readable form of a character > * > * The returned string is in static storage. > */ > > Modified: head/usr.bin/m4/gnum4.c > ============================================================================== > --- head/usr.bin/m4/gnum4.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/usr.bin/m4/gnum4.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -54,7 +54,7 @@ int mimic_gnu = 0; > > /* > * Support for include path search > - * First search in the the current directory. > + * First search in the current directory. > * If not found, and the path is not absolute, include path kicks in. > * First, -I options, in the order found on the command line. > * Then M4PATH env variable > > Modified: head/usr.bin/make/lst.c > ============================================================================== > --- head/usr.bin/make/lst.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/usr.bin/make/lst.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -98,7 +98,7 @@ Lst_Append(Lst *list, LstNode *ln, void > * LST_CONCLINK if should just be relinked > * > * Side Effects: > - * New elements are created and appended the the first list. > + * New elements are created and appended the first list. > */ > void > Lst_Concat(Lst *list1, Lst *list2, int flags) > > Modified: head/usr.bin/rpcinfo/rpcinfo.c > ============================================================================== > --- head/usr.bin/rpcinfo/rpcinfo.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/usr.bin/rpcinfo/rpcinfo.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); > > /* > * rpcinfo: ping a particular rpc program > - * or dump the the registered programs on the remote machine. > + * or dump the registered programs on the remote machine. > */ > > /* > > Modified: head/usr.bin/xinstall/xinstall.c > ============================================================================== > --- head/usr.bin/xinstall/xinstall.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/usr.bin/xinstall/xinstall.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -492,7 +492,7 @@ install(const char *from_name, const cha > * flags, except for the dump flag. > * NFS does not support flags. Ignore EOPNOTSUPP flags if we're just > * trying to turn off UF_NODUMP. If we're trying to set real flags, > - * then warn if the the fs doesn't support it, otherwise fail. > + * then warn if the fs doesn't support it, otherwise fail. > */ > if (!devnull && (flags & SETFLAGS || > (from_sb.st_flags & ~UF_NODUMP) != to_sb.st_flags) && > > Modified: head/usr.sbin/moused/moused.c > ============================================================================== > --- head/usr.sbin/moused/moused.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/usr.sbin/moused/moused.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -931,7 +931,7 @@ main(int argc, char *argv[]) > /* > * We cannot continue because of error. Exit if the > * program has not become a daemon. Otherwise, block > - * until the the user corrects the problem and issues SIGHUP. > + * until the user corrects the problem and issues SIGHUP. > */ > if (!background) > exit(1); > > Modified: head/usr.sbin/rpcbind/util.c > ============================================================================== > --- head/usr.sbin/rpcbind/util.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/usr.sbin/rpcbind/util.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -237,7 +237,7 @@ addrmerge(struct netbuf *caller, char *s > > found: > /* > - * Construct the new address using the the address from > + * Construct the new address using the address from > * `bestif', and the port number from `serv_uaddr'. > */ > serv_nbp = uaddr2taddr(nconf, serv_uaddr); > > Modified: head/usr.sbin/sysinstall/install.c > ============================================================================== > --- head/usr.sbin/sysinstall/install.c Mon Feb 21 05:10:34 2011 (r218908) > +++ head/usr.sbin/sysinstall/install.c Mon Feb 21 09:01:34 2011 (r218909) > @@ -953,7 +953,7 @@ installFixupBase(dialogMenuItem *self) > vsystem("mtree -deU -f /etc/mtree/BSD.usr.dist -p /usr"); > > #ifdef __ia64__ > - /* Move /boot to the the EFI partition and make /boot a link to it. */ > + /* Move /boot to the EFI partition and make /boot a link to it. */ > efi_mntpt = (EfiChunk != NULL) ? ((PartInfo *)EfiChunk->private_data)->mountpoint : NULL; > if (efi_mntpt != NULL) { > vsystem("if [ ! -L /boot ]; then mv /boot %s; fi", efi_mntpt); -- a13x From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 00:01:19 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 801EE1065670; Tue, 22 Feb 2011 00:01:19 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6DA438FC13; Tue, 22 Feb 2011 00:01:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1M01J81087404; Tue, 22 Feb 2011 00:01:19 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M01Jud087402; Tue, 22 Feb 2011 00:01:19 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201102220001.p1M01Jud087402@svn.freebsd.org> From: Adrian Chadd Date: Tue, 22 Feb 2011 00:01:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218931 - head/sys/dev/ath X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 00:01:19 -0000 Author: adrian Date: Tue Feb 22 00:01:19 2011 New Revision: 218931 URL: http://svn.freebsd.org/changeset/base/218931 Log: * Don't setup the scenario if the try count is 0 * Comment what else is going on during rate scenario setup Modified: head/sys/dev/ath/if_ath_tx_ht.c Modified: head/sys/dev/ath/if_ath_tx_ht.c ============================================================================== --- head/sys/dev/ath/if_ath_tx_ht.c Mon Feb 21 21:13:18 2011 (r218930) +++ head/sys/dev/ath/if_ath_tx_ht.c Tue Feb 22 00:01:19 2011 (r218931) @@ -110,11 +110,29 @@ ath_rateseries_setup(struct ath_softc *s memset(series, 0, sizeof(HAL_11N_RATE_SERIES) * 4); for (i = 0; i < 4; i++) { + /* Only set flags for actual TX attempts */ + if (try[i] == 0) + continue; + series[i].Tries = try[i]; + + /* + * XXX this isn't strictly correct - sc_txchainmask + * XXX isn't the currently active chainmask; + * XXX it's the interface chainmask at startup. + * XXX It's overridden in the HAL rate scenario function + * XXX for now. + */ series[i].ChSel = sc->sc_txchainmask; + + /* + * This merely enables RTS or RTS/CTS for the given scenario; + * it needs to be enabled elsewhere. + */ if (ic->ic_protmode == IEEE80211_PROT_RTSCTS || ic->ic_protmode == IEEE80211_PROT_CTSONLY) series[i].RateFlags |= HAL_RATESERIES_RTS_CTS; + if (ni->ni_htcap & IEEE80211_HTCAP_CHWIDTH40) series[i].RateFlags |= HAL_RATESERIES_2040; From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 00:37:53 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A8D3106566B; Tue, 22 Feb 2011 00:37:53 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 579768FC18; Tue, 22 Feb 2011 00:37:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1M0brn0088273; Tue, 22 Feb 2011 00:37:53 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M0brv3088271; Tue, 22 Feb 2011 00:37:53 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201102220037.p1M0brv3088271@svn.freebsd.org> From: Adrian Chadd Date: Tue, 22 Feb 2011 00:37:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218932 - head/sys/dev/ath X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 00:37:53 -0000 Author: adrian Date: Tue Feb 22 00:37:53 2011 New Revision: 218932 URL: http://svn.freebsd.org/changeset/base/218932 Log: Shuffle around the RTS/CTS rate/duration logic. * Turn ath_tx_calc_ctsduration() into a function that returns the ctsduration, or -1 for HT rates; * add a printf() to ath_tx_calc_ctsduration() which will be very loud if somehow that function is called with an MCS rate; * Add ath_tx_get_rtscts_rate() which returns the RTS/CTS rate to use for the given data rate, incl. the short preamble flag; * Only call ath_tx_calc_ctsduration() for non-11n chipsets; 11n chipsets don't require the rtscts duration to be calculated. Modified: head/sys/dev/ath/if_ath_tx.c Modified: head/sys/dev/ath/if_ath_tx.c ============================================================================== --- head/sys/dev/ath/if_ath_tx.c Tue Feb 22 00:01:19 2011 (r218931) +++ head/sys/dev/ath/if_ath_tx.c Tue Feb 22 00:37:53 2011 (r218932) @@ -420,11 +420,12 @@ ath_tx_tag_crypto(struct ath_softc *sc, return 1; } -static void -ath_tx_calc_ctsduration(struct ath_hal *ah, int rix, int cix, - int shortPreamble, int pktlen, const HAL_RATE_TABLE *rt, - int flags, u_int8_t *ctsrate, int *ctsduration) +static uint8_t +ath_tx_get_rtscts_rate(struct ath_hal *ah, const HAL_RATE_TABLE *rt, + int rix, int cix, int shortPreamble) { + uint8_t ctsrate; + /* * CTS transmit rate is derived from the transmit rate * by looking in the h/w rate table. We must also factor @@ -432,7 +433,33 @@ ath_tx_calc_ctsduration(struct ath_hal * */ /* NB: cix is set above where RTS/CTS is enabled */ KASSERT(cix != 0xff, ("cix not setup")); - (*ctsrate) = rt->info[cix].rateCode; + ctsrate = rt->info[cix].rateCode; + + /* XXX this should only matter for legacy rates */ + if (shortPreamble) + ctsrate |= rt->info[cix].shortPreamble; + + return ctsrate; +} + + +/* + * Calculate the RTS/CTS duration for legacy frames. + */ +static int +ath_tx_calc_ctsduration(struct ath_hal *ah, int rix, int cix, + int shortPreamble, int pktlen, const HAL_RATE_TABLE *rt, + int flags) +{ + int ctsduration = 0; + + /* This mustn't be called for HT modes */ + if (rt->info[cix].phy == IEEE80211_T_HT) { + printf("%s: HT rate where it shouldn't be (0x%x)\n", + __func__, rt->info[cix].rateCode); + return -1; + } + /* * Compute the transmit duration based on the frame * size and the size of an ACK frame. We call into the @@ -443,21 +470,22 @@ ath_tx_calc_ctsduration(struct ath_hal * * use the precalculated ACK durations. */ if (shortPreamble) { - (*ctsrate) |= rt->info[cix].shortPreamble; if (flags & HAL_TXDESC_RTSENA) /* SIFS + CTS */ - (*ctsduration) += rt->info[cix].spAckDuration; - (*ctsduration) += ath_hal_computetxtime(ah, + ctsduration += rt->info[cix].spAckDuration; + ctsduration += ath_hal_computetxtime(ah, rt, pktlen, rix, AH_TRUE); if ((flags & HAL_TXDESC_NOACK) == 0) /* SIFS + ACK */ - (*ctsduration) += rt->info[rix].spAckDuration; + ctsduration += rt->info[rix].spAckDuration; } else { if (flags & HAL_TXDESC_RTSENA) /* SIFS + CTS */ - (*ctsduration) += rt->info[cix].lpAckDuration; - (*ctsduration) += ath_hal_computetxtime(ah, + ctsduration += rt->info[cix].lpAckDuration; + ctsduration += ath_hal_computetxtime(ah, rt, pktlen, rix, AH_FALSE); if ((flags & HAL_TXDESC_NOACK) == 0) /* SIFS + ACK */ - (*ctsduration) += rt->info[rix].lpAckDuration; + ctsduration += rt->info[rix].lpAckDuration; } + + return ctsduration; } int @@ -714,8 +742,12 @@ ath_tx_start(struct ath_softc *sc, struc */ ctsduration = 0; if (flags & (HAL_TXDESC_RTSENA|HAL_TXDESC_CTSENA)) { - (void) ath_tx_calc_ctsduration(ah, rix, cix, shortPreamble, pktlen, - rt, flags, &ctsrate, &ctsduration); + ctsrate = ath_tx_get_rtscts_rate(ah, rt, rix, cix, shortPreamble); + + /* The 11n chipsets do ctsduration calculations for you */ + if (! ath_tx_is_11n(sc)) + ctsduration = ath_tx_calc_ctsduration(ah, rix, cix, shortPreamble, + pktlen, rt, flags); /* * Must disable multi-rate retry when using RTS/CTS. */ @@ -893,9 +925,12 @@ ath_tx_raw_start(struct ath_softc *sc, s ctsduration = 0; if (flags & (HAL_TXDESC_RTSENA|HAL_TXDESC_CTSENA)) { cix = ath_tx_findrix(sc, params->ibp_ctsrate); - (void) ath_tx_calc_ctsduration(ah, rix, cix, - params->ibp_flags & IEEE80211_BPF_SHORTPRE, pktlen, - rt, flags, &ctsrate, &ctsduration); + ctsrate = ath_tx_get_rtscts_rate(ah, rt, rix, cix, params->ibp_flags & IEEE80211_BPF_SHORTPRE); + /* The 11n chipsets do ctsduration calculations for you */ + if (! ath_tx_is_11n(sc)) + ctsduration = ath_tx_calc_ctsduration(ah, rix, cix, + params->ibp_flags & IEEE80211_BPF_SHORTPRE, pktlen, + rt, flags); /* * Must disable multi-rate retry when using RTS/CTS. */ From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 04:03:33 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C86D6106566B; Tue, 22 Feb 2011 04:03:33 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B67108FC08; Tue, 22 Feb 2011 04:03:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1M43XL7093238; Tue, 22 Feb 2011 04:03:33 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M43X1k093236; Tue, 22 Feb 2011 04:03:33 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201102220403.p1M43X1k093236@svn.freebsd.org> From: Warner Losh Date: Tue, 22 Feb 2011 04:03:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218933 - head/share/mk X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 04:03:33 -0000 Author: imp Date: Tue Feb 22 04:03:33 2011 New Revision: 218933 URL: http://svn.freebsd.org/changeset/base/218933 Log: Testing based on MACHINE_ARCH is problematic. Default to yes to build clang. A separate change will fix buildworld to default to yes or no based on the target. Modified: head/share/mk/bsd.own.mk Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Tue Feb 22 00:37:53 2011 (r218932) +++ head/share/mk/bsd.own.mk Tue Feb 22 04:03:33 2011 (r218933) @@ -282,18 +282,6 @@ WITH_IDEA= .endif # -# Default behaviour of MK_CLANG depends on the architecture. -# -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ - ${MACHINE_ARCH} == "powerpc" -_clang_yes=CLANG -_clang_no= -.else -_clang_yes= -_clang_no=CLANG -.endif - -# # MK_* options which default to "yes". # .for var in \ @@ -320,7 +308,7 @@ _clang_no=CLANG BZIP2 \ CALENDAR \ CDDL \ - ${_clang_yes} \ + CLANG \ CPP \ CRYPT \ CTM \ @@ -424,7 +412,6 @@ MK_${var}:= yes BIND_SIGCHASE \ BIND_XML \ BSD_GREP \ - ${_clang_no} \ GPIO \ HESIOD \ IDEA From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 04:07:15 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68C0B106564A; Tue, 22 Feb 2011 04:07:15 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 56EA78FC19; Tue, 22 Feb 2011 04:07:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1M47FC9093367; Tue, 22 Feb 2011 04:07:15 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M47FWE093365; Tue, 22 Feb 2011 04:07:15 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201102220407.p1M47FWE093365@svn.freebsd.org> From: Warner Losh Date: Tue, 22 Feb 2011 04:07:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218934 - head X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 04:07:15 -0000 Author: imp Date: Tue Feb 22 04:07:15 2011 New Revision: 218934 URL: http://svn.freebsd.org/changeset/base/218934 Log: Select building CLANG based on ${TARGET_ARCH} and existence of WITH{,OUT}_CLANG. We default to yes on some archs, no on others, unless WITHOUT_CLANG or WITH_CLANG is defined respectively. Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Feb 22 04:03:33 2011 (r218933) +++ head/Makefile.inc1 Tue Feb 22 04:07:15 2011 (r218934) @@ -42,6 +42,20 @@ TARGET_ARCH=${TARGET} .include .include +# Clang is a special case. We have to use it to bootstrap the target, not +# where we're building from. +.if ${TARGET_ARCH} == i386 || ${TARGET_ARCH} == amd64 || \ + ${TARGET_ARCH} == arm || ${TARGET_ARCH} == powerpc64 || \ + ${TARGET_ARCH} == powerpc +.if !defined(WITHOUT_CLANG) +MK_CLANG=yes +.endif +.else +.if !defined(WITH_CLANG) +MK_CLANG=no +.endif +.endif + # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to # grow dependencies on include and lib than vice versa. @@ -970,11 +984,11 @@ _gensnmptree= usr.sbin/bsnmpd/gensnmptre _crunchgen= usr.sbin/crunch/crunchgen .endif -# XXX: There is no way to specify bootstrap tools depending on MK-flags -# with different per-architecture default values. Always build tblgen. +.if ${MK_CLANG} != "no" _clang_tblgen= \ lib/clang/libllvmsupport \ usr.bin/clang/tblgen +.endif .if ${MK_CDDL} != "no" _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 04:41:05 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C2F91065675; Tue, 22 Feb 2011 04:41:05 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 401528FC15; Tue, 22 Feb 2011 04:41:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1M4f51n094188; Tue, 22 Feb 2011 04:41:05 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M4f5Ht094186; Tue, 22 Feb 2011 04:41:05 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201102220441.p1M4f5Ht094186@svn.freebsd.org> From: Adrian Chadd Date: Tue, 22 Feb 2011 04:41:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218935 - head/sys/dev/ath X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 04:41:05 -0000 Author: adrian Date: Tue Feb 22 04:41:04 2011 New Revision: 218935 URL: http://svn.freebsd.org/changeset/base/218935 Log: Don't set the RTS/CTS enable bit per-scenario if the global RTS/CTS flags aren't set. Modified: head/sys/dev/ath/if_ath_tx_ht.c Modified: head/sys/dev/ath/if_ath_tx_ht.c ============================================================================== --- head/sys/dev/ath/if_ath_tx_ht.c Tue Feb 22 04:07:15 2011 (r218934) +++ head/sys/dev/ath/if_ath_tx_ht.c Tue Feb 22 04:41:04 2011 (r218935) @@ -96,7 +96,7 @@ __FBSDID("$FreeBSD$"); static void ath_rateseries_setup(struct ath_softc *sc, struct ieee80211_node *ni, HAL_11N_RATE_SERIES *series, unsigned int pktlen, uint8_t *rix, - uint8_t *try) + uint8_t *try, int flags) { struct ieee80211com *ic = ni->ni_ic; struct ath_hal *ah = sc->sc_ah; @@ -125,12 +125,7 @@ ath_rateseries_setup(struct ath_softc *s */ series[i].ChSel = sc->sc_txchainmask; - /* - * This merely enables RTS or RTS/CTS for the given scenario; - * it needs to be enabled elsewhere. - */ - if (ic->ic_protmode == IEEE80211_PROT_RTSCTS || - ic->ic_protmode == IEEE80211_PROT_CTSONLY) + if (flags & (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA)) series[i].RateFlags |= HAL_RATESERIES_RTS_CTS; if (ni->ni_htcap & IEEE80211_HTCAP_CHWIDTH40) @@ -201,7 +196,7 @@ ath_buf_set_rate(struct ath_softc *sc, s /* Setup rate scenario */ memset(&series, 0, sizeof(series)); - ath_rateseries_setup(sc, ni, series, pktlen, rix, try); + ath_rateseries_setup(sc, ni, series, pktlen, rix, try, flags); /* Enforce AR5416 aggregate limit - can't do RTS w/ an agg frame > 8k */ @@ -210,6 +205,11 @@ ath_buf_set_rate(struct ath_softc *sc, s /* Get a pointer to the last tx descriptor in the list */ lastds = &bf->bf_desc[bf->bf_nseg - 1]; +#if 0 + printf("pktlen: %d; flags 0x%x\n", pktlen, flags); + ath_rateseries_print(series); +#endif + /* Set rate scenario */ ath_hal_set11nratescenario(ah, ds, !is_pspoll, /* whether to override the duration or not */ From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 04:49:57 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73B70106566B; Tue, 22 Feb 2011 04:49:57 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 61BF08FC12; Tue, 22 Feb 2011 04:49:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1M4nvFA094452; Tue, 22 Feb 2011 04:49:57 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M4nvIL094449; Tue, 22 Feb 2011 04:49:57 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201102220449.p1M4nvIL094449@svn.freebsd.org> From: Warner Losh Date: Tue, 22 Feb 2011 04:49:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218936 - in head: . share/mk X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 04:49:57 -0000 Author: imp Date: Tue Feb 22 04:49:57 2011 New Revision: 218936 URL: http://svn.freebsd.org/changeset/base/218936 Log: Back out 218933 and 281934. The easy cases still worked, but some hard cases broke in worse ways than the status quo. Back them out until that can be resolved. Modified: head/Makefile.inc1 head/share/mk/bsd.own.mk Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Feb 22 04:41:04 2011 (r218935) +++ head/Makefile.inc1 Tue Feb 22 04:49:57 2011 (r218936) @@ -42,20 +42,6 @@ TARGET_ARCH=${TARGET} .include .include -# Clang is a special case. We have to use it to bootstrap the target, not -# where we're building from. -.if ${TARGET_ARCH} == i386 || ${TARGET_ARCH} == amd64 || \ - ${TARGET_ARCH} == arm || ${TARGET_ARCH} == powerpc64 || \ - ${TARGET_ARCH} == powerpc -.if !defined(WITHOUT_CLANG) -MK_CLANG=yes -.endif -.else -.if !defined(WITH_CLANG) -MK_CLANG=no -.endif -.endif - # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to # grow dependencies on include and lib than vice versa. @@ -984,11 +970,11 @@ _gensnmptree= usr.sbin/bsnmpd/gensnmptre _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${MK_CLANG} != "no" +# XXX: There is no way to specify bootstrap tools depending on MK-flags +# with different per-architecture default values. Always build tblgen. _clang_tblgen= \ lib/clang/libllvmsupport \ usr.bin/clang/tblgen -.endif .if ${MK_CDDL} != "no" _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Tue Feb 22 04:41:04 2011 (r218935) +++ head/share/mk/bsd.own.mk Tue Feb 22 04:49:57 2011 (r218936) @@ -282,6 +282,18 @@ WITH_IDEA= .endif # +# Default behaviour of MK_CLANG depends on the architecture. +# +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ + ${MACHINE_ARCH} == "powerpc" +_clang_yes=CLANG +_clang_no= +.else +_clang_yes= +_clang_no=CLANG +.endif + +# # MK_* options which default to "yes". # .for var in \ @@ -301,6 +313,7 @@ WITH_IDEA= BIND_MTREE \ BIND_NAMED \ BIND_UTILS \ + BINUTILS \ BLUETOOTH \ BOOT \ BSD_CPIO \ @@ -308,7 +321,7 @@ WITH_IDEA= BZIP2 \ CALENDAR \ CDDL \ - CLANG \ + ${_clang_yes} \ CPP \ CRYPT \ CTM \ @@ -323,6 +336,7 @@ WITH_IDEA= FP_LIBC \ FREEBSD_UPDATE \ GAMES \ + GCC \ GCOV \ GDB \ GNU \ @@ -412,6 +426,7 @@ MK_${var}:= yes BIND_SIGCHASE \ BIND_XML \ BSD_GREP \ + ${_clang_no} \ GPIO \ HESIOD \ IDEA From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 05:10:13 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A78C5106566C; Tue, 22 Feb 2011 05:10:13 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7C0708FC1A; Tue, 22 Feb 2011 05:10:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1M5ADtv094941; Tue, 22 Feb 2011 05:10:13 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M5ADes094940; Tue, 22 Feb 2011 05:10:13 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201102220510.p1M5ADes094940@svn.freebsd.org> From: Martin Wilke Date: Tue, 22 Feb 2011 05:10:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218937 - head/sys/dev/drm X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 05:10:13 -0000 Author: miwi Date: Tue Feb 22 05:10:13 2011 New Revision: 218937 URL: http://svn.freebsd.org/changeset/base/218937 Log: - Remove no longer in use PR: kern/152354 Submitted by: vehemens Discussion with:kib Approved by: rwatson (mentor) Deleted: head/sys/dev/drm/drm-preprocess.sh head/sys/dev/drm/drm-subprocess.pl From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 05:13:27 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47283106564A; Tue, 22 Feb 2011 05:13:27 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 352CC8FC0C; Tue, 22 Feb 2011 05:13:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1M5DRSa095044; Tue, 22 Feb 2011 05:13:27 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M5DRrQ095042; Tue, 22 Feb 2011 05:13:27 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201102220513.p1M5DRrQ095042@svn.freebsd.org> From: Martin Wilke Date: Tue, 22 Feb 2011 05:13:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218938 - head/tools/regression/aio/kqueue X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 05:13:27 -0000 Author: miwi Date: Tue Feb 22 05:13:26 2011 New Revision: 218938 URL: http://svn.freebsd.org/changeset/base/218938 Log: - Fix QA issues PR: misc/146687 Submitted by: Garrett Cooper Approved by: rwatson (mentor) Modified: head/tools/regression/aio/kqueue/aio_kqueue.c Modified: head/tools/regression/aio/kqueue/aio_kqueue.c ============================================================================== --- head/tools/regression/aio/kqueue/aio_kqueue.c Tue Feb 22 05:10:13 2011 (r218937) +++ head/tools/regression/aio/kqueue/aio_kqueue.c Tue Feb 22 05:13:26 2011 (r218938) @@ -26,18 +26,24 @@ */ /* + * Prerequisities: + * - AIO support must be compiled into the kernel (see sys//NOTES for + * more details). + * * Note: it is a good idea to run this against a physical drive to * exercise the physio fast path (ie. aio_kqueue /dev/) */ +#include +#include +#include #include +#include +#include #include #include #include -#include -#include -#include -#include +#include #include #define PATH_TEMPLATE "/tmp/aio.XXXXXXXXXX" @@ -46,7 +52,9 @@ #define MAX_RUNS 300 /* #define DEBUG */ -main(int argc, char *argv[]){ +int +main (int argc, char *argv[]) +{ int fd; struct aiocb *iocb[MAX], *kq_iocb; int i, result, run, error, j; @@ -55,7 +63,7 @@ main(int argc, char *argv[]){ struct kevent ke, kq_returned; struct timespec ts; int cancel, pending, tmp_file = 0, failed = 0; - char *file, pathname[sizeof(PATH_TEMPLATE)-1]; + char *file, pathname[sizeof(PATH_TEMPLATE)+1]; if (kq < 0) { perror("No kqeueue\n"); @@ -71,23 +79,22 @@ main(int argc, char *argv[]){ file = argv[1]; fd = open(file, O_RDWR|O_CREAT, 0666); } - if (fd < 0){ - fprintf(stderr, "Can't open %s\n", file); - perror(""); - exit(1); - } + if (fd == -1) + err(1, "Can't open %s\n", file); for (run = 0; run < MAX_RUNS; run++){ #ifdef DEBUG printf("Run %d\n", run); #endif - for(i = 0; i < MAX; i++) { - iocb[i] = (struct aiocb *)malloc(sizeof(struct aiocb)); - bzero(iocb[i], sizeof(struct aiocb)); + for (i = 0; i < MAX; i++) { + iocb[i] = (struct aiocb *)calloc(1, + sizeof(struct aiocb)); + if (iocb[i] == NULL) + err(1, "calloc"); } pending = 0; - for(i = 0; i < MAX; i++) { + for (i = 0; i < MAX; i++) { pending++; iocb[i]->aio_nbytes = sizeof(buffer); iocb[i]->aio_buf = buffer; @@ -101,7 +108,7 @@ main(int argc, char *argv[]){ result = aio_write(iocb[i]); if (result != 0) { perror("aio_write"); - printf("Result %d iteration %d\n",result, i); + printf("Result %d iteration %d\n", result, i); exit(1); } #ifdef DEBUG @@ -116,7 +123,7 @@ main(int argc, char *argv[]){ #endif if (result == AIO_CANCELED) { aio_return(iocb[i]); - iocb[i]=NULL; + iocb[i] = NULL; pending--; } } @@ -125,8 +132,10 @@ main(int argc, char *argv[]){ cancel = MAX - pending; i = 0; - while(pending) { - for(;;) { + while (pending) { + + for (;;) { + bzero(&ke, sizeof(ke)); bzero(&kq_returned, sizeof(ke)); ts.tv_sec = 0; @@ -134,9 +143,8 @@ main(int argc, char *argv[]){ result = kevent(kq, NULL, 0, &kq_returned, 1, &ts); error = errno; - if (result < 0) { + if (result < 0) perror("kevent error: "); - } kq_iocb = kq_returned.udata; #ifdef DEBUG printf("kevent %d %d errno %d return.ident %p " @@ -147,51 +155,53 @@ main(int argc, char *argv[]){ kq_iocb); #endif - if(kq_iocb) + if (kq_iocb) break; #ifdef DEBUG - printf("Try again left %d out of %d %d\n",pending, MAX, cancel); + printf("Try again left %d out of %d %d\n", + pending, MAX, cancel); #endif } - for(j = 0; j < MAX; j++) { - if (iocb[j] == kq_iocb) { - break; - } - } + for (j = 0; j < MAX && iocb[j] != kq_iocb; + j++) ; #ifdef DEBUG printf("kq_iocb %p\n", kq_iocb); - printf("Error Result for %d is %d pending %d\n", j, result, pending); + printf("Error Result for %d is %d pending %d\n", + j, result, pending); #endif result = aio_return(kq_iocb); #ifdef DEBUG - printf("Return Result for %d is %d\n", j, result); - printf("\n"); + printf("Return Result for %d is %d\n\n", j, result); #endif if (result != sizeof(buffer)) { - printf("FAIL: run %d, operation %d, result %d (errno=%d) should be %d\n", run, pending, result, errno, sizeof(buffer)); - failed = 1; - } else { - printf("PASS: run %d, left %d\n", run, pending - 1); - } + printf("FAIL: run %d, operation %d, result %d " + " (errno=%d) should be %d\n", run, pending, + result, errno, sizeof(buffer)); + failed++; + } else + printf("PASS: run %d, left %d\n", run, + pending - 1); free(kq_iocb); iocb[j] = NULL; pending--; i++; } + + for (i = 0; i < MAX; i++) + free(iocb[i]); + } - if (tmp_file) { + if (tmp_file) unlink(pathname); - } - if (failed) { - printf("FAIL: Atleast one\n"); - exit(1); - } else { - printf("PASS: All\n"); - exit(0); - } + if (failed != 0) + printf("FAIL: %d tests failed\n", failed); + else + printf("PASS: All tests passed\n"); + + exit (failed == 0 ? 0 : 1); } From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 07:49:51 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C964106564A; Tue, 22 Feb 2011 07:49:51 +0000 (UTC) (envelope-from jchandra@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6B6448FC0C; Tue, 22 Feb 2011 07:49:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1M7np9m098770; Tue, 22 Feb 2011 07:49:51 GMT (envelope-from jchandra@svn.freebsd.org) Received: (from jchandra@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M7npLt098768; Tue, 22 Feb 2011 07:49:51 GMT (envelope-from jchandra@svn.freebsd.org) Message-Id: <201102220749.p1M7npLt098768@svn.freebsd.org> From: "Jayachandran C." Date: Tue, 22 Feb 2011 07:49:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218939 - head/lib/libc/mips/string X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 07:49:51 -0000 Author: jchandra Date: Tue Feb 22 07:49:51 2011 New Revision: 218939 URL: http://svn.freebsd.org/changeset/base/218939 Log: Fix bzero() for 64-bit. The existing implementation of bzero incorrectly clears bytes when the start address is not word aligned. Fix it by using REG_SHI macro which works on both 32 and 64 bit. Submitted by: Artem Belevich (fbsdlist at src cx) Modified: head/lib/libc/mips/string/bzero.S Modified: head/lib/libc/mips/string/bzero.S ============================================================================== --- head/lib/libc/mips/string/bzero.S Tue Feb 22 05:13:26 2011 (r218938) +++ head/lib/libc/mips/string/bzero.S Tue Feb 22 07:49:51 2011 (r218939) @@ -58,27 +58,9 @@ LEAF(bzero) PTR_SUBU a3, zero, a0 # compute # bytes to word align address and a3, a3, SZREG-1 beq a3, zero, 1f # skip if word aligned -#if SZREG == 4 PTR_SUBU a1, a1, a3 # subtract from remaining count - SWHI zero, 0(a0) # clear 1, 2, or 3 bytes to align + REG_SHI zero, 0(a0) # clear 1, 2, or 3 bytes to align PTR_ADDU a0, a0, a3 -#endif -#if SZREG == 8 - PTR_SUBU a1, a1, a3 # subtract from remaining count - PTR_ADDU a0, a0, a3 # align dst to next word - sll a3, a3, 3 # bits to bytes - li a2, -1 # make a mask -#if _BYTE_ORDER == _BIG_ENDIAN - REG_SRLV a2, a2, a3 # we want to keep the MSB bytes -#endif -#if _BYTE_ORDER == _LITTLE_ENDIAN - REG_SLLV a2, a2, a3 # we want to keep the LSB bytes -#endif - nor a2, zero, a2 # complement the mask - REG_L v0, -SZREG(a0) # load the word to partially clear - and v0, v0, a2 # clear the bytes - REG_S v0, -SZREG(a0) # store it back -#endif 1: and v0, a1, SZREG-1 # compute number of words left PTR_SUBU a3, a1, v0 From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 08:07:17 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 989A0106566C; Tue, 22 Feb 2011 08:07:17 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6D6F38FC19; Tue, 22 Feb 2011 08:07:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1M87HSi099279; Tue, 22 Feb 2011 08:07:17 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M87HH6099276; Tue, 22 Feb 2011 08:07:17 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201102220807.p1M87HH6099276@svn.freebsd.org> From: Ulrich Spoerlein Date: Tue, 22 Feb 2011 08:07:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218940 - in head: tools usr.bin/xinstall X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 08:07:17 -0000 Author: uqs Date: Tue Feb 22 08:07:17 2011 New Revision: 218940 URL: http://svn.freebsd.org/changeset/base/218940 Log: Teach tools/install.sh the -d directory mode. Sync up with flags understood by install(1) [1], and make install(1)'s usage output not hide the clearly documented -M flag. PR: misc/154739 [1] Submitted by: arundel Modified: head/tools/install.sh head/usr.bin/xinstall/xinstall.c Modified: head/tools/install.sh ============================================================================== --- head/tools/install.sh Tue Feb 22 07:49:51 2011 (r218939) +++ head/tools/install.sh Tue Feb 22 08:07:17 2011 (r218940) @@ -29,14 +29,30 @@ # $FreeBSD$ # parse install's options and ignore them completely. +dirmode="" while [ $# -gt 0 ]; do case $1 in - -[bCcMpSs]) shift;; + -d) dirmode="YES"; shift;; + -[bCcMpSsv]) shift;; -[Bfgmo]) shift; shift;; -[Bfgmo]*) shift;; *) break; esac done +if [ "$#" -eq 0 ]; then + echo "$0: no files/dirs specified" >&2 + exit 1 +fi + +if [ -z "$dirmode" ] && [ "$#" -lt 2 ]; then + echo "$0: no target specified" >&2 + exit 1 +fi + # the remaining arguments are assumed to be files/dirs only. -exec install -p $* +if [ -z "$dirmode" ]; then + exec install -p "$@" +else + exec install -d "$@" +fi Modified: head/usr.bin/xinstall/xinstall.c ============================================================================== --- head/usr.bin/xinstall/xinstall.c Tue Feb 22 07:49:51 2011 (r218939) +++ head/usr.bin/xinstall/xinstall.c Tue Feb 22 08:07:17 2011 (r218940) @@ -769,9 +769,9 @@ static void usage(void) { (void)fprintf(stderr, -"usage: install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n" +"usage: install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n" " [-o owner] file1 file2\n" -" install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n" +" install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n" " [-o owner] file1 ... fileN directory\n" " install -d [-v] [-g group] [-m mode] [-o owner] directory ...\n"); exit(EX_USAGE); From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 08:13:50 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47EEA106566C; Tue, 22 Feb 2011 08:13:50 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 355018FC0C; Tue, 22 Feb 2011 08:13:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1M8DoF8099498; Tue, 22 Feb 2011 08:13:50 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M8DnMh099488; Tue, 22 Feb 2011 08:13:50 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201102220813.p1M8DnMh099488@svn.freebsd.org> From: Ulrich Spoerlein Date: Tue, 22 Feb 2011 08:13:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218941 - in head: . etc etc/mtree share/doc tools/build/mk tools/build/options usr.bin X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 08:13:50 -0000 Author: uqs Date: Tue Feb 22 08:13:49 2011 New Revision: 218941 URL: http://svn.freebsd.org/changeset/base/218941 Log: Flesh out WITHOUT_GROFF support to DTRT. A full featured groff is required during buildworld, so build it always and don't rely on it being present on the host system. vgrind(1) is tightly coupled to a roff processor and will not be built/installed when groff is disabled. Also much of the roff'ed documentation under share/doc will not be built/installed when WITHOUT_GROFF is defined. Reviewed by: ru (partial) Added: head/etc/mtree/BSD.groff.dist (contents, props changed) Modified: head/Makefile.inc1 head/etc/Makefile head/etc/mtree/BSD.usr.dist head/etc/mtree/Makefile head/share/doc/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc head/tools/build/options/WITHOUT_GROFF head/usr.bin/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Feb 22 08:07:17 2011 (r218940) +++ head/Makefile.inc1 Tue Feb 22 08:13:49 2011 (r218941) @@ -213,13 +213,15 @@ BOOTSTRAPPING?= 0 CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \ MACHINE_ARCH=${TARGET_ARCH} \ MACHINE=${TARGET} \ - CPUTYPE=${TARGET_CPUTYPE} \ - GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ - GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ - GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac + CPUTYPE=${TARGET_CPUTYPE} .if ${OSRELDATE} < 700044 CROSSENV+= AR=gnu-ar RANLIB=gnu-ranlib .endif +.if ${MK_GROFF} != "no" +CROSSENV+= GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ + GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ + GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac +.endif # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -364,6 +366,10 @@ _worldtmp: .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ -p ${WORLDTMP}/legacy/usr >/dev/null +.if ${MK_GROFF} != "no" + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.groff.dist \ + -p ${WORLDTMP}/legacy/usr >/dev/null +.endif mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ -p ${WORLDTMP}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ @@ -937,11 +943,10 @@ _strfile= games/fortune/strfile .if ${MK_CXX} != "no" _gperf= gnu/usr.bin/gperf -.if ${BOOTSTRAPPING} < 700004 -_groff= gnu/usr.bin/groff -.else -_groff= gnu/usr.bin/groff/tmac .endif + +.if ${MK_GROFF} != "no" +_groff= gnu/usr.bin/groff .endif .if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022 Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Tue Feb 22 08:07:17 2011 (r218940) +++ head/etc/Makefile Tue Feb 22 08:13:49 2011 (r218941) @@ -271,6 +271,9 @@ distrib-dirs: mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \ -p ${DESTDIR}/var/named .endif +.if ${MK_GROFF} != "no" + mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.groff.dist -p ${DESTDIR}/usr +.endif .if ${MK_SENDMAIL} != "no" mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/ .endif Added: head/etc/mtree/BSD.groff.dist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/etc/mtree/BSD.groff.dist Tue Feb 22 08:13:49 2011 (r218941) @@ -0,0 +1,48 @@ +# $FreeBSD$ +# +# Please see the file src/etc/mtree/README before making changes to this file. +# + +/set type=dir uname=root gname=wheel mode=0755 +. + share + groff_font + devX100 + .. + devX100-12 + .. + devX75 + .. + devX75-12 + .. + devascii + .. + devcp1047 + .. + devdvi + .. + devhtml + .. + devkoi8-r + .. + devlatin1 + .. + devlbp + .. + devlj4 + .. + devps + .. + devutf8 + .. + .. + me + .. + tmac + mdoc + .. + mm + .. + .. + .. +.. Modified: head/etc/mtree/BSD.usr.dist ============================================================================== --- head/etc/mtree/BSD.usr.dist Tue Feb 22 08:07:17 2011 (r218940) +++ head/etc/mtree/BSD.usr.dist Tue Feb 22 08:13:49 2011 (r218941) @@ -310,36 +310,6 @@ fortune .. .. - groff_font - devX100 - .. - devX100-12 - .. - devX75 - .. - devX75-12 - .. - devascii - .. - devcp1047 - .. - devdvi - .. - devhtml - .. - devkoi8-r - .. - devlatin1 - .. - devlbp - .. - devlj4 - .. - devps - .. - devutf8 - .. - .. info .. locale @@ -890,8 +860,6 @@ man9 .. .. - me - .. misc fonts .. @@ -1266,12 +1234,6 @@ .. tabset .. - tmac - mdoc - .. - mm - .. - .. vi catalog .. Modified: head/etc/mtree/Makefile ============================================================================== --- head/etc/mtree/Makefile Tue Feb 22 08:07:17 2011 (r218940) +++ head/etc/mtree/Makefile Tue Feb 22 08:13:49 2011 (r218941) @@ -16,6 +16,9 @@ _BIND.chroot.dist= BIND.chroot.dist _BIND.include.dist= BIND.include.dist .endif .endif +.if ${MK_GROFF} != "no" +_BSD.groff.dist= BSD.groff.dist +.endif .if ${MK_SENDMAIL} != "no" _BSD.sendmail.dist= BSD.sendmail.dist .endif Modified: head/share/doc/Makefile ============================================================================== --- head/share/doc/Makefile Tue Feb 22 08:07:17 2011 (r218940) +++ head/share/doc/Makefile Tue Feb 22 08:13:49 2011 (r218941) @@ -3,12 +3,17 @@ .include -SUBDIR= ${_bind9} IPv6 legal papers psd smm usd +SUBDIR= ${_bind9} IPv6 legal ${_roffdocs} .if ${MK_BIND} != "no" _bind9= bind9 .endif +# FIXME this is not a real solution ... +.if ${MK_GROFF} != "no" +_roffdocs= papers psd smm usd +.endif + # Default output format for troff documents is ascii. # To generate postscript versions of troff documents, use: # make PRINTERDEVICE=ps Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 22 08:07:17 2011 (r218940) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 22 08:13:49 2011 (r218941) @@ -813,6 +813,491 @@ OLD_FILES+=usr/sbin/gpioctl OLD_FILES+=usr/share/man/man8/gpioctl.8.gz .endif +# Also includes vgrind(1) +.if ${MK_GROFF} == no +OLD_FILES+=usr/bin/addftinfo +OLD_FILES+=usr/bin/afmtodit +OLD_FILES+=usr/bin/eqn +OLD_FILES+=usr/bin/grn +OLD_FILES+=usr/bin/grodvi +OLD_FILES+=usr/bin/groff +OLD_FILES+=usr/bin/grog +OLD_FILES+=usr/bin/grolbp +OLD_FILES+=usr/bin/grolj4 +OLD_FILES+=usr/bin/grops +OLD_FILES+=usr/bin/grotty +OLD_FILES+=usr/bin/hpftodit +OLD_FILES+=usr/bin/indxbib +OLD_FILES+=usr/bin/lkbib +OLD_FILES+=usr/bin/lookbib +OLD_FILES+=usr/bin/mmroff +OLD_FILES+=usr/bin/neqn +OLD_FILES+=usr/bin/nroff +OLD_FILES+=usr/bin/pfbtops +OLD_FILES+=usr/bin/pic +OLD_FILES+=usr/bin/post-grohtml +OLD_FILES+=usr/bin/pre-grohtml +OLD_FILES+=usr/bin/psroff +OLD_FILES+=usr/bin/refer +OLD_FILES+=usr/bin/soelim +OLD_FILES+=usr/bin/tbl +OLD_FILES+=usr/bin/tfmtodit +OLD_FILES+=usr/bin/troff +OLD_FILES+=usr/bin/vgrind +OLD_FILES+=usr/libexec/vfontedpr +OLD_FILES+=usr/share/groff_font/devX100-12/CB +OLD_FILES+=usr/share/groff_font/devX100-12/CBI +OLD_FILES+=usr/share/groff_font/devX100-12/CI +OLD_FILES+=usr/share/groff_font/devX100-12/CR +OLD_FILES+=usr/share/groff_font/devX100-12/DESC +OLD_FILES+=usr/share/groff_font/devX100-12/HB +OLD_FILES+=usr/share/groff_font/devX100-12/HBI +OLD_FILES+=usr/share/groff_font/devX100-12/HI +OLD_FILES+=usr/share/groff_font/devX100-12/HR +OLD_FILES+=usr/share/groff_font/devX100-12/NB +OLD_FILES+=usr/share/groff_font/devX100-12/NBI +OLD_FILES+=usr/share/groff_font/devX100-12/NI +OLD_FILES+=usr/share/groff_font/devX100-12/NR +OLD_FILES+=usr/share/groff_font/devX100-12/S +OLD_FILES+=usr/share/groff_font/devX100-12/TB +OLD_FILES+=usr/share/groff_font/devX100-12/TBI +OLD_FILES+=usr/share/groff_font/devX100-12/TI +OLD_FILES+=usr/share/groff_font/devX100-12/TR +OLD_DIRS+=usr/share/groff_font/devX100-12 +OLD_FILES+=usr/share/groff_font/devX100/CB +OLD_FILES+=usr/share/groff_font/devX100/CBI +OLD_FILES+=usr/share/groff_font/devX100/CI +OLD_FILES+=usr/share/groff_font/devX100/CR +OLD_FILES+=usr/share/groff_font/devX100/DESC +OLD_FILES+=usr/share/groff_font/devX100/HB +OLD_FILES+=usr/share/groff_font/devX100/HBI +OLD_FILES+=usr/share/groff_font/devX100/HI +OLD_FILES+=usr/share/groff_font/devX100/HR +OLD_FILES+=usr/share/groff_font/devX100/NB +OLD_FILES+=usr/share/groff_font/devX100/NBI +OLD_FILES+=usr/share/groff_font/devX100/NI +OLD_FILES+=usr/share/groff_font/devX100/NR +OLD_FILES+=usr/share/groff_font/devX100/S +OLD_FILES+=usr/share/groff_font/devX100/TB +OLD_FILES+=usr/share/groff_font/devX100/TBI +OLD_FILES+=usr/share/groff_font/devX100/TI +OLD_FILES+=usr/share/groff_font/devX100/TR +OLD_DIRS+=usr/share/groff_font/devX100 +OLD_FILES+=usr/share/groff_font/devX75-12/CB +OLD_FILES+=usr/share/groff_font/devX75-12/CBI +OLD_FILES+=usr/share/groff_font/devX75-12/CI +OLD_FILES+=usr/share/groff_font/devX75-12/CR +OLD_FILES+=usr/share/groff_font/devX75-12/DESC +OLD_FILES+=usr/share/groff_font/devX75-12/HB +OLD_FILES+=usr/share/groff_font/devX75-12/HBI +OLD_FILES+=usr/share/groff_font/devX75-12/HI +OLD_FILES+=usr/share/groff_font/devX75-12/HR +OLD_FILES+=usr/share/groff_font/devX75-12/NB +OLD_FILES+=usr/share/groff_font/devX75-12/NBI +OLD_FILES+=usr/share/groff_font/devX75-12/NI +OLD_FILES+=usr/share/groff_font/devX75-12/NR +OLD_FILES+=usr/share/groff_font/devX75-12/S +OLD_FILES+=usr/share/groff_font/devX75-12/TB +OLD_FILES+=usr/share/groff_font/devX75-12/TBI +OLD_FILES+=usr/share/groff_font/devX75-12/TI +OLD_FILES+=usr/share/groff_font/devX75-12/TR +OLD_DIRS+=usr/share/groff_font/devX75-12 +OLD_FILES+=usr/share/groff_font/devX75/CB +OLD_FILES+=usr/share/groff_font/devX75/CBI +OLD_FILES+=usr/share/groff_font/devX75/CI +OLD_FILES+=usr/share/groff_font/devX75/CR +OLD_FILES+=usr/share/groff_font/devX75/DESC +OLD_FILES+=usr/share/groff_font/devX75/HB +OLD_FILES+=usr/share/groff_font/devX75/HBI +OLD_FILES+=usr/share/groff_font/devX75/HI +OLD_FILES+=usr/share/groff_font/devX75/HR +OLD_FILES+=usr/share/groff_font/devX75/NB +OLD_FILES+=usr/share/groff_font/devX75/NBI +OLD_FILES+=usr/share/groff_font/devX75/NI +OLD_FILES+=usr/share/groff_font/devX75/NR +OLD_FILES+=usr/share/groff_font/devX75/S +OLD_FILES+=usr/share/groff_font/devX75/TB +OLD_FILES+=usr/share/groff_font/devX75/TBI +OLD_FILES+=usr/share/groff_font/devX75/TI +OLD_FILES+=usr/share/groff_font/devX75/TR +OLD_DIRS+=usr/share/groff_font/devX75 +OLD_FILES+=usr/share/groff_font/devascii/B +OLD_FILES+=usr/share/groff_font/devascii/BI +OLD_FILES+=usr/share/groff_font/devascii/CW +OLD_FILES+=usr/share/groff_font/devascii/DESC +OLD_FILES+=usr/share/groff_font/devascii/I +OLD_FILES+=usr/share/groff_font/devascii/L +OLD_FILES+=usr/share/groff_font/devascii/R +OLD_FILES+=usr/share/groff_font/devascii/S +OLD_DIRS+=usr/share/groff_font/devascii +OLD_FILES+=usr/share/groff_font/devcp1047/B +OLD_FILES+=usr/share/groff_font/devcp1047/BI +OLD_FILES+=usr/share/groff_font/devcp1047/CW +OLD_FILES+=usr/share/groff_font/devcp1047/DESC +OLD_FILES+=usr/share/groff_font/devcp1047/I +OLD_FILES+=usr/share/groff_font/devcp1047/L +OLD_FILES+=usr/share/groff_font/devcp1047/R +OLD_FILES+=usr/share/groff_font/devcp1047/S +OLD_DIRS+=usr/share/groff_font/devcp1047 +OLD_FILES+=usr/share/groff_font/devdvi/CW +OLD_FILES+=usr/share/groff_font/devdvi/CWEC +OLD_FILES+=usr/share/groff_font/devdvi/CWI +OLD_FILES+=usr/share/groff_font/devdvi/CWIEC +OLD_FILES+=usr/share/groff_font/devdvi/CWITC +OLD_FILES+=usr/share/groff_font/devdvi/CWTC +OLD_FILES+=usr/share/groff_font/devdvi/CompileFonts +OLD_FILES+=usr/share/groff_font/devdvi/DESC +OLD_FILES+=usr/share/groff_font/devdvi/EX +OLD_FILES+=usr/share/groff_font/devdvi/HB +OLD_FILES+=usr/share/groff_font/devdvi/HBEC +OLD_FILES+=usr/share/groff_font/devdvi/HBI +OLD_FILES+=usr/share/groff_font/devdvi/HBIEC +OLD_FILES+=usr/share/groff_font/devdvi/HBITC +OLD_FILES+=usr/share/groff_font/devdvi/HBTC +OLD_FILES+=usr/share/groff_font/devdvi/HI +OLD_FILES+=usr/share/groff_font/devdvi/HIEC +OLD_FILES+=usr/share/groff_font/devdvi/HITC +OLD_FILES+=usr/share/groff_font/devdvi/HR +OLD_FILES+=usr/share/groff_font/devdvi/HREC +OLD_FILES+=usr/share/groff_font/devdvi/HRTC +OLD_FILES+=usr/share/groff_font/devdvi/MI +OLD_FILES+=usr/share/groff_font/devdvi/Makefile +OLD_FILES+=usr/share/groff_font/devdvi/S +OLD_FILES+=usr/share/groff_font/devdvi/SA +OLD_FILES+=usr/share/groff_font/devdvi/SB +OLD_FILES+=usr/share/groff_font/devdvi/SC +OLD_FILES+=usr/share/groff_font/devdvi/TB +OLD_FILES+=usr/share/groff_font/devdvi/TBEC +OLD_FILES+=usr/share/groff_font/devdvi/TBI +OLD_FILES+=usr/share/groff_font/devdvi/TBIEC +OLD_FILES+=usr/share/groff_font/devdvi/TBITC +OLD_FILES+=usr/share/groff_font/devdvi/TBTC +OLD_FILES+=usr/share/groff_font/devdvi/TI +OLD_FILES+=usr/share/groff_font/devdvi/TIEC +OLD_FILES+=usr/share/groff_font/devdvi/TITC +OLD_FILES+=usr/share/groff_font/devdvi/TR +OLD_FILES+=usr/share/groff_font/devdvi/TREC +OLD_FILES+=usr/share/groff_font/devdvi/TRTC +OLD_FILES+=usr/share/groff_font/devdvi/ec.map +OLD_FILES+=usr/share/groff_font/devdvi/msam.map +OLD_FILES+=usr/share/groff_font/devdvi/msbm.map +OLD_FILES+=usr/share/groff_font/devdvi/tc.map +OLD_FILES+=usr/share/groff_font/devdvi/texb.map +OLD_FILES+=usr/share/groff_font/devdvi/texex.map +OLD_FILES+=usr/share/groff_font/devdvi/texi.map +OLD_FILES+=usr/share/groff_font/devdvi/texmi.map +OLD_FILES+=usr/share/groff_font/devdvi/texr.map +OLD_FILES+=usr/share/groff_font/devdvi/texsy.map +OLD_FILES+=usr/share/groff_font/devdvi/textex.map +OLD_FILES+=usr/share/groff_font/devdvi/textt.map +OLD_DIRS+=usr/share/groff_font/devdvi +OLD_FILES+=usr/share/groff_font/devhtml/B +OLD_FILES+=usr/share/groff_font/devhtml/BI +OLD_FILES+=usr/share/groff_font/devhtml/CB +OLD_FILES+=usr/share/groff_font/devhtml/CBI +OLD_FILES+=usr/share/groff_font/devhtml/CI +OLD_FILES+=usr/share/groff_font/devhtml/CR +OLD_FILES+=usr/share/groff_font/devhtml/DESC +OLD_FILES+=usr/share/groff_font/devhtml/I +OLD_FILES+=usr/share/groff_font/devhtml/R +OLD_FILES+=usr/share/groff_font/devhtml/S +OLD_DIRS+=usr/share/groff_font/devhtml +OLD_FILES+=usr/share/groff_font/devkoi8-r/B +OLD_FILES+=usr/share/groff_font/devkoi8-r/BI +OLD_FILES+=usr/share/groff_font/devkoi8-r/CW +OLD_FILES+=usr/share/groff_font/devkoi8-r/DESC +OLD_FILES+=usr/share/groff_font/devkoi8-r/I +OLD_FILES+=usr/share/groff_font/devkoi8-r/L +OLD_FILES+=usr/share/groff_font/devkoi8-r/R +OLD_FILES+=usr/share/groff_font/devkoi8-r/S +OLD_DIRS+=usr/share/groff_font/devkoi8-r +OLD_FILES+=usr/share/groff_font/devlatin1/B +OLD_FILES+=usr/share/groff_font/devlatin1/BI +OLD_FILES+=usr/share/groff_font/devlatin1/CW +OLD_FILES+=usr/share/groff_font/devlatin1/DESC +OLD_FILES+=usr/share/groff_font/devlatin1/I +OLD_FILES+=usr/share/groff_font/devlatin1/L +OLD_FILES+=usr/share/groff_font/devlatin1/R +OLD_FILES+=usr/share/groff_font/devlatin1/S +OLD_DIRS+=usr/share/groff_font/devlatin1 +OLD_FILES+=usr/share/groff_font/devlbp/CB +OLD_FILES+=usr/share/groff_font/devlbp/CI +OLD_FILES+=usr/share/groff_font/devlbp/CR +OLD_FILES+=usr/share/groff_font/devlbp/DESC +OLD_FILES+=usr/share/groff_font/devlbp/EB +OLD_FILES+=usr/share/groff_font/devlbp/EI +OLD_FILES+=usr/share/groff_font/devlbp/ER +OLD_FILES+=usr/share/groff_font/devlbp/HB +OLD_FILES+=usr/share/groff_font/devlbp/HBI +OLD_FILES+=usr/share/groff_font/devlbp/HI +OLD_FILES+=usr/share/groff_font/devlbp/HNB +OLD_FILES+=usr/share/groff_font/devlbp/HNBI +OLD_FILES+=usr/share/groff_font/devlbp/HNI +OLD_FILES+=usr/share/groff_font/devlbp/HNR +OLD_FILES+=usr/share/groff_font/devlbp/HR +OLD_FILES+=usr/share/groff_font/devlbp/TB +OLD_FILES+=usr/share/groff_font/devlbp/TBI +OLD_FILES+=usr/share/groff_font/devlbp/TI +OLD_FILES+=usr/share/groff_font/devlbp/TR +OLD_DIRS+=usr/share/groff_font/devlbp +OLD_FILES+=usr/share/groff_font/devlj4/AB +OLD_FILES+=usr/share/groff_font/devlj4/ABI +OLD_FILES+=usr/share/groff_font/devlj4/AI +OLD_FILES+=usr/share/groff_font/devlj4/ALBB +OLD_FILES+=usr/share/groff_font/devlj4/ALBR +OLD_FILES+=usr/share/groff_font/devlj4/AOB +OLD_FILES+=usr/share/groff_font/devlj4/AOI +OLD_FILES+=usr/share/groff_font/devlj4/AOR +OLD_FILES+=usr/share/groff_font/devlj4/AR +OLD_FILES+=usr/share/groff_font/devlj4/CB +OLD_FILES+=usr/share/groff_font/devlj4/CBI +OLD_FILES+=usr/share/groff_font/devlj4/CI +OLD_FILES+=usr/share/groff_font/devlj4/CLARENDON +OLD_FILES+=usr/share/groff_font/devlj4/CORONET +OLD_FILES+=usr/share/groff_font/devlj4/CR +OLD_FILES+=usr/share/groff_font/devlj4/DESC +OLD_FILES+=usr/share/groff_font/devlj4/GB +OLD_FILES+=usr/share/groff_font/devlj4/GBI +OLD_FILES+=usr/share/groff_font/devlj4/GI +OLD_FILES+=usr/share/groff_font/devlj4/GR +OLD_FILES+=usr/share/groff_font/devlj4/LGB +OLD_FILES+=usr/share/groff_font/devlj4/LGI +OLD_FILES+=usr/share/groff_font/devlj4/LGR +OLD_FILES+=usr/share/groff_font/devlj4/MARIGOLD +OLD_FILES+=usr/share/groff_font/devlj4/OB +OLD_FILES+=usr/share/groff_font/devlj4/OBI +OLD_FILES+=usr/share/groff_font/devlj4/OI +OLD_FILES+=usr/share/groff_font/devlj4/OR +OLD_FILES+=usr/share/groff_font/devlj4/S +OLD_FILES+=usr/share/groff_font/devlj4/SYMBOL +OLD_FILES+=usr/share/groff_font/devlj4/TB +OLD_FILES+=usr/share/groff_font/devlj4/TBI +OLD_FILES+=usr/share/groff_font/devlj4/TI +OLD_FILES+=usr/share/groff_font/devlj4/TNRB +OLD_FILES+=usr/share/groff_font/devlj4/TNRBI +OLD_FILES+=usr/share/groff_font/devlj4/TNRI +OLD_FILES+=usr/share/groff_font/devlj4/TNRR +OLD_FILES+=usr/share/groff_font/devlj4/TR +OLD_FILES+=usr/share/groff_font/devlj4/UB +OLD_FILES+=usr/share/groff_font/devlj4/UBI +OLD_FILES+=usr/share/groff_font/devlj4/UCB +OLD_FILES+=usr/share/groff_font/devlj4/UCBI +OLD_FILES+=usr/share/groff_font/devlj4/UCI +OLD_FILES+=usr/share/groff_font/devlj4/UCR +OLD_FILES+=usr/share/groff_font/devlj4/UI +OLD_FILES+=usr/share/groff_font/devlj4/UR +OLD_FILES+=usr/share/groff_font/devlj4/WINGDINGS +OLD_DIRS+=usr/share/groff_font/devlj4 +OLD_FILES+=usr/share/groff_font/devps/AB +OLD_FILES+=usr/share/groff_font/devps/ABI +OLD_FILES+=usr/share/groff_font/devps/AI +OLD_FILES+=usr/share/groff_font/devps/AR +OLD_FILES+=usr/share/groff_font/devps/BMB +OLD_FILES+=usr/share/groff_font/devps/BMBI +OLD_FILES+=usr/share/groff_font/devps/BMI +OLD_FILES+=usr/share/groff_font/devps/BMR +OLD_FILES+=usr/share/groff_font/devps/CB +OLD_FILES+=usr/share/groff_font/devps/CBI +OLD_FILES+=usr/share/groff_font/devps/CI +OLD_FILES+=usr/share/groff_font/devps/CR +OLD_FILES+=usr/share/groff_font/devps/DESC +OLD_FILES+=usr/share/groff_font/devps/EURO +OLD_FILES+=usr/share/groff_font/devps/HB +OLD_FILES+=usr/share/groff_font/devps/HBI +OLD_FILES+=usr/share/groff_font/devps/HI +OLD_FILES+=usr/share/groff_font/devps/HNB +OLD_FILES+=usr/share/groff_font/devps/HNBI +OLD_FILES+=usr/share/groff_font/devps/HNI +OLD_FILES+=usr/share/groff_font/devps/HNR +OLD_FILES+=usr/share/groff_font/devps/HR +OLD_FILES+=usr/share/groff_font/devps/Makefile +OLD_FILES+=usr/share/groff_font/devps/NB +OLD_FILES+=usr/share/groff_font/devps/NBI +OLD_FILES+=usr/share/groff_font/devps/NI +OLD_FILES+=usr/share/groff_font/devps/NR +OLD_FILES+=usr/share/groff_font/devps/PB +OLD_FILES+=usr/share/groff_font/devps/PBI +OLD_FILES+=usr/share/groff_font/devps/PI +OLD_FILES+=usr/share/groff_font/devps/PR +OLD_FILES+=usr/share/groff_font/devps/S +OLD_FILES+=usr/share/groff_font/devps/SS +OLD_FILES+=usr/share/groff_font/devps/TB +OLD_FILES+=usr/share/groff_font/devps/TBI +OLD_FILES+=usr/share/groff_font/devps/TI +OLD_FILES+=usr/share/groff_font/devps/TR +OLD_FILES+=usr/share/groff_font/devps/ZCMI +OLD_FILES+=usr/share/groff_font/devps/ZD +OLD_FILES+=usr/share/groff_font/devps/ZDR +OLD_FILES+=usr/share/groff_font/devps/afmname +OLD_FILES+=usr/share/groff_font/devps/dingbats.map +OLD_FILES+=usr/share/groff_font/devps/dingbats.rmap +OLD_FILES+=usr/share/groff_font/devps/download +OLD_FILES+=usr/share/groff_font/devps/freeeuro.pfa +OLD_FILES+=usr/share/groff_font/devps/lgreekmap +OLD_FILES+=usr/share/groff_font/devps/prologue +OLD_FILES+=usr/share/groff_font/devps/symbol.sed +OLD_FILES+=usr/share/groff_font/devps/symbolchars +OLD_FILES+=usr/share/groff_font/devps/symbolsl.afm +OLD_FILES+=usr/share/groff_font/devps/symbolsl.pfa +OLD_FILES+=usr/share/groff_font/devps/text.enc +OLD_FILES+=usr/share/groff_font/devps/textmap +OLD_FILES+=usr/share/groff_font/devps/zapfdr.pfa +OLD_DIRS+=usr/share/groff_font/devps +OLD_FILES+=usr/share/groff_font/devutf8/B +OLD_FILES+=usr/share/groff_font/devutf8/BI +OLD_FILES+=usr/share/groff_font/devutf8/CW +OLD_FILES+=usr/share/groff_font/devutf8/DESC +OLD_FILES+=usr/share/groff_font/devutf8/I +OLD_FILES+=usr/share/groff_font/devutf8/L +OLD_FILES+=usr/share/groff_font/devutf8/R +OLD_FILES+=usr/share/groff_font/devutf8/S +OLD_DIRS+=usr/share/groff_font/devutf8 +OLD_DIRS+=usr/share/groff_font +OLD_FILES+=usr/share/info/groff.info.gz +OLD_FILES+=usr/share/man/man1/addftinfo.1.gz +OLD_FILES+=usr/share/man/man1/afmtodit.1.gz +OLD_FILES+=usr/share/man/man1/eqn.1.gz +OLD_FILES+=usr/share/man/man1/grn.1.gz +OLD_FILES+=usr/share/man/man1/grodvi.1.gz +OLD_FILES+=usr/share/man/man1/groff.1.gz +OLD_FILES+=usr/share/man/man1/grog.1.gz +OLD_FILES+=usr/share/man/man1/grolbp.1.gz +OLD_FILES+=usr/share/man/man1/grolj4.1.gz +OLD_FILES+=usr/share/man/man1/grops.1.gz +OLD_FILES+=usr/share/man/man1/grotty.1.gz +OLD_FILES+=usr/share/man/man1/hpftodit.1.gz +OLD_FILES+=usr/share/man/man1/indxbib.1.gz +OLD_FILES+=usr/share/man/man1/lkbib.1.gz +OLD_FILES+=usr/share/man/man1/lookbib.1.gz +OLD_FILES+=usr/share/man/man1/mmroff.1.gz +OLD_FILES+=usr/share/man/man1/neqn.1.gz +OLD_FILES+=usr/share/man/man1/nroff.1.gz +OLD_FILES+=usr/share/man/man1/pfbtops.1.gz +OLD_FILES+=usr/share/man/man1/pic.1.gz +OLD_FILES+=usr/share/man/man1/psroff.1.gz +OLD_FILES+=usr/share/man/man1/refer.1.gz +OLD_FILES+=usr/share/man/man1/soelim.1.gz +OLD_FILES+=usr/share/man/man1/tbl.1.gz +OLD_FILES+=usr/share/man/man1/tfmtodit.1.gz +OLD_FILES+=usr/share/man/man1/troff.1.gz +OLD_FILES+=usr/share/man/man1/vgrind.1.gz +OLD_FILES+=usr/share/man/man5/groff_font.5.gz +OLD_FILES+=usr/share/man/man5/groff_out.5.gz +OLD_FILES+=usr/share/man/man5/groff_tmac.5.gz +OLD_FILES+=usr/share/man/man5/lj4_font.5.gz +OLD_FILES+=usr/share/man/man5/tmac.5.gz +OLD_FILES+=usr/share/man/man5/vgrindefs.5.gz +OLD_FILES+=usr/share/man/man7/ditroff.7.gz +OLD_FILES+=usr/share/man/man7/groff.7.gz +OLD_FILES+=usr/share/man/man7/groff_char.7.gz +OLD_FILES+=usr/share/man/man7/groff_diff.7.gz +OLD_FILES+=usr/share/man/man7/groff_man.7.gz +OLD_FILES+=usr/share/man/man7/groff_mdoc.7.gz +OLD_FILES+=usr/share/man/man7/groff_me.7.gz +OLD_FILES+=usr/share/man/man7/groff_mm.7.gz +OLD_FILES+=usr/share/man/man7/groff_mmse.7.gz +OLD_FILES+=usr/share/man/man7/groff_ms.7.gz +OLD_FILES+=usr/share/man/man7/groff_trace.7.gz +OLD_FILES+=usr/share/man/man7/groff_www.7.gz +OLD_FILES+=usr/share/man/man7/man.7.gz +OLD_FILES+=usr/share/man/man7/mdoc.7.gz +OLD_FILES+=usr/share/man/man7/mdoc.samples.7.gz +OLD_FILES+=usr/share/man/man7/me.7.gz +OLD_FILES+=usr/share/man/man7/mm.7.gz +OLD_FILES+=usr/share/man/man7/mmse.7.gz +OLD_FILES+=usr/share/man/man7/ms.7.gz +OLD_FILES+=usr/share/man/man7/orig_me.7.gz +OLD_FILES+=usr/share/man/man7/roff.7.gz +OLD_FILES+=usr/share/me/acm.me +OLD_FILES+=usr/share/me/chars.me +OLD_FILES+=usr/share/me/deltext.me +OLD_FILES+=usr/share/me/eqn.me +OLD_FILES+=usr/share/me/float.me +OLD_FILES+=usr/share/me/footnote.me +OLD_FILES+=usr/share/me/index.me +OLD_FILES+=usr/share/me/letterhead.me +OLD_FILES+=usr/share/me/local.me +OLD_FILES+=usr/share/me/null.me +OLD_FILES+=usr/share/me/refer.me +OLD_FILES+=usr/share/me/revisions +OLD_FILES+=usr/share/me/sh.me +OLD_FILES+=usr/share/me/tbl.me +OLD_FILES+=usr/share/me/thesis.me +OLD_DIRS+=usr/share/me +OLD_FILES+=usr/share/misc/vgrindefs +OLD_FILES+=usr/share/misc/vgrindefs.db +OLD_FILES+=usr/share/tmac/X.tmac +OLD_FILES+=usr/share/tmac/Xps.tmac +OLD_FILES+=usr/share/tmac/a4.tmac +OLD_FILES+=usr/share/tmac/an-old.tmac +OLD_FILES+=usr/share/tmac/an.tmac +OLD_FILES+=usr/share/tmac/andoc.tmac +OLD_FILES+=usr/share/tmac/composite.tmac +OLD_FILES+=usr/share/tmac/cp1047.tmac +OLD_FILES+=usr/share/tmac/devtag.tmac +OLD_FILES+=usr/share/tmac/doc.tmac +OLD_FILES+=usr/share/tmac/dvi.tmac +OLD_FILES+=usr/share/tmac/e.tmac +OLD_FILES+=usr/share/tmac/ec.tmac +OLD_FILES+=usr/share/tmac/eqnrc +OLD_FILES+=usr/share/tmac/europs.tmac +OLD_FILES+=usr/share/tmac/html-end.tmac +OLD_FILES+=usr/share/tmac/html.tmac +OLD_FILES+=usr/share/tmac/hyphen.ru +OLD_FILES+=usr/share/tmac/hyphen.us +OLD_FILES+=usr/share/tmac/hyphenex.us +OLD_FILES+=usr/share/tmac/koi8-r.tmac +OLD_FILES+=usr/share/tmac/latin1.tmac +OLD_FILES+=usr/share/tmac/latin2.tmac +OLD_FILES+=usr/share/tmac/latin9.tmac +OLD_FILES+=usr/share/tmac/lbp.tmac +OLD_FILES+=usr/share/tmac/lj4.tmac +OLD_FILES+=usr/share/tmac/m.tmac +OLD_FILES+=usr/share/tmac/man.local +OLD_FILES+=usr/share/tmac/man.tmac +OLD_FILES+=usr/share/tmac/mandoc.tmac +OLD_FILES+=usr/share/tmac/mdoc.local +OLD_FILES+=usr/share/tmac/mdoc.tmac +OLD_FILES+=usr/share/tmac/mdoc/doc-common +OLD_FILES+=usr/share/tmac/mdoc/doc-ditroff +OLD_FILES+=usr/share/tmac/mdoc/doc-nroff +OLD_FILES+=usr/share/tmac/mdoc/doc-syms +OLD_FILES+=usr/share/tmac/mdoc/fr.ISO8859-1 +OLD_FILES+=usr/share/tmac/mdoc/ru.KOI8-R +OLD_DIRS+=usr/share/tmac/mdoc +OLD_FILES+=usr/share/tmac/me.tmac +OLD_FILES+=usr/share/tmac/mm/0.MT +OLD_FILES+=usr/share/tmac/mm/4.MT +OLD_FILES+=usr/share/tmac/mm/5.MT +OLD_FILES+=usr/share/tmac/mm/locale +OLD_FILES+=usr/share/tmac/mm/mm.tmac +OLD_FILES+=usr/share/tmac/mm/mmse.tmac +OLD_FILES+=usr/share/tmac/mm/ms.cov +OLD_FILES+=usr/share/tmac/mm/se_locale +OLD_FILES+=usr/share/tmac/mm/se_ms.cov +OLD_DIRS+=usr/share/tmac/mm +OLD_FILES+=usr/share/tmac/ms.tmac +OLD_FILES+=usr/share/tmac/mse.tmac +OLD_FILES+=usr/share/tmac/papersize.tmac +OLD_FILES+=usr/share/tmac/pic.tmac +OLD_FILES+=usr/share/tmac/ps.tmac +OLD_FILES+=usr/share/tmac/psatk.tmac +OLD_FILES+=usr/share/tmac/psold.tmac +OLD_FILES+=usr/share/tmac/pspic.tmac +OLD_FILES+=usr/share/tmac/s.tmac +OLD_FILES+=usr/share/tmac/safer.tmac +OLD_FILES+=usr/share/tmac/tmac.orig_me +OLD_FILES+=usr/share/tmac/tmac.vgrind +OLD_FILES+=usr/share/tmac/trace.tmac +OLD_FILES+=usr/share/tmac/troffrc +OLD_FILES+=usr/share/tmac/troffrc-end +OLD_FILES+=usr/share/tmac/tty-char.tmac +OLD_FILES+=usr/share/tmac/tty.tmac +OLD_FILES+=usr/share/tmac/unicode.tmac +OLD_FILES+=usr/share/tmac/www.tmac +OLD_DIRS+=usr/share/tmac +.endif + .if ${MK_GSSAPI} == no OLD_FILES+=usr/lib/libgssapi.a OLD_FILES+=usr/lib/libgssapi.so @@ -892,10 +1377,6 @@ OLD_FILES+=usr/share/man/man5/qop.5.gz OLD_FILES+=usr/share/man/man8/gssd.8.gz .endif -#.if ${MK_GROFF} == no -# to be filled in -#.endif - .if ${MK_HESIOD} == no OLD_FILES+=usr/bin/hesinfo OLD_FILES+=usr/include/hesiod.h Modified: head/tools/build/options/WITHOUT_GROFF ============================================================================== --- head/tools/build/options/WITHOUT_GROFF Tue Feb 22 08:07:17 2011 (r218940) +++ head/tools/build/options/WITHOUT_GROFF Tue Feb 22 08:13:49 2011 (r218941) @@ -1,3 +1,7 @@ .\" $FreeBSD$ Set to not build -.Xr groff 1 . +.Xr groff 1 +and +.Xr vgrind 1 . +You should consider installing the textproc/groff port to not break +.Xr man 1 . Modified: head/usr.bin/Makefile ============================================================================== --- head/usr.bin/Makefile Tue Feb 22 08:07:17 2011 (r218940) +++ head/usr.bin/Makefile Tue Feb 22 08:13:49 2011 (r218941) @@ -239,6 +239,10 @@ _clang= clang SUBDIR+= hesinfo .endif +.if ${MK_GROFF} != "no" +SUBDIR+= vgrind +.endif + .if ${MK_OPENSSL} != "no" SUBDIR+= bc SUBDIR+= chkey @@ -320,8 +324,6 @@ SUBDIR+= rpcgen SUBDIR+= unifdef SUBDIR+= xlint SUBDIR+= xstr -# XXX maybe under textproc? -SUBDIR+= vgrind SUBDIR+= yacc .endif From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 08:20:13 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00E9B106564A; Tue, 22 Feb 2011 08:20:13 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E4A0E8FC0A; Tue, 22 Feb 2011 08:20:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1M8KCDW099687; Tue, 22 Feb 2011 08:20:12 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M8KCVK099685; Tue, 22 Feb 2011 08:20:12 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201102220820.p1M8KCVK099685@svn.freebsd.org> From: Ulrich Spoerlein Date: Tue, 22 Feb 2011 08:20:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218942 - head/tools/build/options X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 08:20:13 -0000 Author: uqs Date: Tue Feb 22 08:20:12 2011 New Revision: 218942 URL: http://svn.freebsd.org/changeset/base/218942 Log: The default for FDT has changed, rename the flag/options file. Added: head/tools/build/options/WITHOUT_FDT - copied, changed from r218940, head/tools/build/options/WITH_FDT Deleted: head/tools/build/options/WITH_FDT Copied and modified: head/tools/build/options/WITHOUT_FDT (from r218940, head/tools/build/options/WITH_FDT) ============================================================================== --- head/tools/build/options/WITH_FDT Tue Feb 22 08:07:17 2011 (r218940, copy source) +++ head/tools/build/options/WITHOUT_FDT Tue Feb 22 08:20:12 2011 (r218942) @@ -1,3 +1,3 @@ .\" $FreeBSD$ -Set to build Flattened Device Tree support as part of the base system. This +Set to not build Flattened Device Tree support as part of the base system. This includes the device tree compiler (dtc) and libfdt support library. From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 08:21:23 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5274E106566C; Tue, 22 Feb 2011 08:21:23 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 275C28FC12; Tue, 22 Feb 2011 08:21:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1M8LNVE099752; Tue, 22 Feb 2011 08:21:23 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M8LNe6099750; Tue, 22 Feb 2011 08:21:23 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201102220821.p1M8LNe6099750@svn.freebsd.org> From: Ulrich Spoerlein Date: Tue, 22 Feb 2011 08:21:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218943 - head/share/man/man5 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 08:21:23 -0000 Author: uqs Date: Tue Feb 22 08:21:22 2011 New Revision: 218943 URL: http://svn.freebsd.org/changeset/base/218943 Log: Regen src.conf(5) after r218941 and r218942. Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Tue Feb 22 08:20:12 2011 (r218942) +++ head/share/man/man5/src.conf.5 Tue Feb 22 08:21:22 2011 (r218943) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 188848 2009-02-20 11:09:55Z mtm .\" $FreeBSD$ -.Dd November 14, 2010 +.Dd February 22, 2011 .Dt SRC.CONF 5 .Os .Sh NAME @@ -303,9 +303,9 @@ dynamically. .\" from FreeBSD: head/tools/build/options/WITHOUT_EXAMPLES 156938 2006-03-21 09:06:24Z ru Set to avoid installing examples to .Pa /usr/share/examples/ . -.It Va WITH_FDT -.\" from FreeBSD: head/tools/build/options/WITH_FDT 208537 2010-05-25 15:12:21Z raj -Set to build Flattened Device Tree support as part of the base system. This +.It Va WITHOUT_FDT +.\" from FreeBSD: head/tools/build/options/WITHOUT_FDT 218942 2011-02-22 08:20:12Z uqs +Set to not build Flattened Device Tree support as part of the base system. This includes the device tree compiler (dtc) and libfdt support library. .It Va WITHOUT_FLOPPY .\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 183306 2008-09-23 16:15:42Z sam @@ -359,9 +359,13 @@ Set to not build GPIB bus support. .\" from FreeBSD: head/tools/build/options/WITH_GPIO 213463 2010-10-05 22:26:01Z gonzo Set to build gpioctl(8) as part of the base system. .It Va WITHOUT_GROFF -.\" from FreeBSD: head/tools/build/options/WITHOUT_GROFF 156932 2006-03-21 07:50:50Z ru +.\" from FreeBSD: head/tools/build/options/WITHOUT_GROFF 218941 2011-02-22 08:13:49Z uqs Set to not build -.Xr groff 1 . +.Xr groff 1 +and +.Xr vgrind 1 . +You should consider installing the textproc/groff port to not break +.Xr man 1 . .It Va WITHOUT_GSSAPI .\" from FreeBSD: head/tools/build/options/WITHOUT_GSSAPI 174548 2007-12-12 16:39:32Z ru Set to not build libgssapi. From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 09:11:47 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE67C1065670; Tue, 22 Feb 2011 09:11:47 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 93FFC8FC19; Tue, 22 Feb 2011 09:11:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1M9Bl16001206; Tue, 22 Feb 2011 09:11:47 GMT (envelope-from sobomax@svn.freebsd.org) Received: (from sobomax@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M9BlQn001204; Tue, 22 Feb 2011 09:11:47 GMT (envelope-from sobomax@svn.freebsd.org) Message-Id: <201102220911.p1M9BlQn001204@svn.freebsd.org> From: Maxim Sobolev Date: Tue, 22 Feb 2011 09:11:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218944 - head/usr.sbin/newsyslog X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 09:11:47 -0000 Author: sobomax Date: Tue Feb 22 09:11:47 2011 New Revision: 218944 URL: http://svn.freebsd.org/changeset/base/218944 Log: Make code more friendly to the non-C99 compilers - don't allocate local variables in the `for' loop declaration. This allows trunk newsyslog.c to be compiled on 7.x. This change should be no-op from the functional POV. Modified: head/usr.sbin/newsyslog/newsyslog.c Modified: head/usr.sbin/newsyslog/newsyslog.c ============================================================================== --- head/usr.sbin/newsyslog/newsyslog.c Tue Feb 22 08:21:22 2011 (r218943) +++ head/usr.sbin/newsyslog/newsyslog.c Tue Feb 22 09:11:47 2011 (r218944) @@ -1450,6 +1450,7 @@ delete_oldest_timelog(const struct conf_ const char *cdir; struct tm tm; DIR *dirp; + int c; oldlogs = malloc(MAX_OLDLOGS * sizeof(struct oldlog_entry)); max_logcnt = MAX_OLDLOGS; @@ -1514,7 +1515,7 @@ delete_oldest_timelog(const struct conf_ continue; } - for (int c = 0; c < COMPRESS_TYPES; c++) + for (c = 0; c < COMPRESS_TYPES; c++) if (strcmp(s, compress_type[c].suffix) == 0) valid = 1; if (valid != 1) { @@ -1629,8 +1630,9 @@ get_logfile_suffix(const char *logfile) { struct stat st; char zfile[MAXPATHLEN]; + int c; - for (int c = 0; c < COMPRESS_TYPES; c++) { + for (c = 0; c < COMPRESS_TYPES; c++) { (void) strlcpy(zfile, logfile, MAXPATHLEN); (void) strlcat(zfile, compress_type[c].suffix, MAXPATHLEN); if (lstat(zfile, &st) == 0) @@ -1653,6 +1655,7 @@ do_rotate(const struct conf_entry *ent) struct stat st; struct tm tm; time_t now; + int c; flags = ent->flags; free_or_keep = FREE_ENT; @@ -1703,7 +1706,7 @@ do_rotate(const struct conf_entry *ent) delete_oldest_timelog(ent, dirpart); else { /* name of oldest log */ - for (int c = 0; c < COMPRESS_TYPES; c++) { + for (c = 0; c < COMPRESS_TYPES; c++) { (void) snprintf(zfile1, sizeof(zfile1), "%s%s", file1, compress_type[c].suffix); if (noaction) @@ -1889,12 +1892,13 @@ do_zipwork(struct zipwork_entry *zwork) int errsav, fcount, zstatus; pid_t pidzip, wpid; char zresult[MAXPATHLEN]; + int c; pgm_path = NULL; strlcpy(zresult, zwork->zw_fname, sizeof(zresult)); if (zwork != NULL && zwork->zw_conf != NULL && zwork->zw_conf->compress > COMPRESS_NONE) - for (int c = 1; c < COMPRESS_TYPES; c++) { + for (c = 1; c < COMPRESS_TYPES; c++) { if (zwork->zw_conf->compress == c) { pgm_path = compress_type[c].path; (void) strlcat(zresult, From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 10:09:34 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9E4411065672; Tue, 22 Feb 2011 10:09:34 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8CDC68FC16; Tue, 22 Feb 2011 10:09:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MA9YKY004701; Tue, 22 Feb 2011 10:09:34 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MA9Yp8004699; Tue, 22 Feb 2011 10:09:34 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201102221009.p1MA9Yp8004699@svn.freebsd.org> From: Lawrence Stewart Date: Tue, 22 Feb 2011 10:09:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218945 - head/share/man/man4 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 10:09:34 -0000 Author: lstewart Date: Tue Feb 22 10:09:34 2011 New Revision: 218945 URL: http://svn.freebsd.org/changeset/base/218945 Log: Use a single list to simplify future maintenance and ensure all list items are aligned the same (no functional change at the moment as both list items are the same number of characters). Sponsored by: FreeBSD Foundation MFC after: 3 months X-MFC with: 218912 Modified: head/share/man/man4/cc.4 Modified: head/share/man/man4/cc.4 ============================================================================== --- head/share/man/man4/cc.4 Tue Feb 22 09:11:47 2011 (r218944) +++ head/share/man/man4/cc.4 Tue Feb 22 10:09:34 2011 (r218945) @@ -65,8 +65,6 @@ MIB: .Bl -tag -width ".Va available" .It Va available Read-only list of currently available congestion control algorithms by name. -.El -.Bl -tag -width ".Va algorithm" .It Va algorithm Returns the current default congestion control algorithm when read, and changes the default when set. From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 12:30:43 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3BAF4106566B; Tue, 22 Feb 2011 12:30:43 +0000 (UTC) (envelope-from trhodes@FreeBSD.org) Received: from hapkido.dreamhost.com (hapkido.dreamhost.com [66.33.216.122]) by mx1.freebsd.org (Postfix) with ESMTP id 12E388FC1B; Tue, 22 Feb 2011 12:30:42 +0000 (UTC) Received: from homiemail-a65.g.dreamhost.com (jankymail-mx1.g.dreamhost.com [208.97.132.126]) by hapkido.dreamhost.com (Postfix) with ESMTP id DFD77179496; Tue, 22 Feb 2011 04:30:42 -0800 (PST) Received: from homiemail-a65.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a65.g.dreamhost.com (Postfix) with ESMTP id 70BF07E4075; Tue, 22 Feb 2011 04:30:42 -0800 (PST) Received: from fbsdlab.fbsdsecure.org (c-98-231-183-112.hsd1.va.comcast.net [98.231.183.112]) (Authenticated sender: trhodes@fbsdsecure.org) by homiemail-a65.g.dreamhost.com (Postfix) with ESMTPA id 573BB7E4073; Tue, 22 Feb 2011 04:30:41 -0800 (PST) Date: Tue, 22 Feb 2011 07:30:47 -0500 From: Tom Rhodes To: Garrett Cooper Message-Id: <20110222073047.1d9e69da.trhodes@FreeBSD.org> In-Reply-To: References: <201102131818.p1DIIuLL046962@svn.freebsd.org> <201102192007.32979.bruce@cran.org.uk> <4D6051D0.8050704@dougbarton.us> <20110221111448.575858b0.trhodes@FreeBSD.org> X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i386-portbld-freebsd8.1) Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: unixmania@gmail.com, trhodes@freebsd.org, src-committers@freebsd.org, svn-src-all@freebsd.org, dougb@dougbarton.us, bruce@cran.org.uk, svn-src-head@freebsd.org Subject: Re: svn commit: r218650 - head/games/fortune/datfiles X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 12:30:43 -0000 On Mon, 21 Feb 2011 12:12:18 -0800 Garrett Cooper wrote: > On Mon, Feb 21, 2011 at 8:14 AM, Tom Rhodes wrote: > > On Sat, 19 Feb 2011 15:27:12 -0800 > > Doug Barton wrote: > > > >> On 02/19/2011 15:12, Carlos A. M. dos Santos wrote: > >> > On Sat, Feb 19, 2011 at 6:07 PM, Bruce Cran =A0wr= ote: > >> >> On Saturday 19 February 2011 17:25:32 Carlos A. M. dos Santos wrote: > >> >> > >> >>> Did anybody complain about this? If not, would you mid either reve= rt > >> >>> this commit or just go ahead and move all "potentially" offensive > >> >>> jokes to fortunes-o? Anything from Grouch Marx or Mark Twain will > >> >>> probably qualify. > >> >> > >> >> I'm happy to revert the checkin if you think the fortune should be = in the main > >> >> file, since it appears the PR submitter was complaining just as muc= h about > >> >> being unprofessional as offensive. =A0Would you like me to go ahead= and revert > >> >> the move? > >> > > >> > I suggest you to revert the commit > >> > >> Serious overkill, particularly since: > >> 1. The commit has already been MFC'ed, and > >> 2. The fortune in question actually _is_ potentially offensive > >> > > > > ... > > $ man fortune > > ... > > WARNING: Integrating fortune and your email will cause wide > > spread whining, crying, or panic which may or may not result > > in a lecture about how someone else is morally superior to > > yourself. =A0By integrating this program into your email client, > > you are accepting the risk of not being pc-enough for your > > peers (ones that you would probably never have a beer with). >=20 > "Depending on how lucky you are, your fortune may rub people the wrong wa= y" :). Tom Rhodes likes this. ;) --=20 Tom Rhodes From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 12:40:03 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1233) id BE14A1065697; Tue, 22 Feb 2011 12:40:03 +0000 (UTC) Date: Tue, 22 Feb 2011 12:40:03 +0000 From: Alexander Best To: Ulrich Spoerlein Message-ID: <20110222124003.GA85577@freebsd.org> References: <201102220807.p1M87HH6099276@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201102220807.p1M87HH6099276@svn.freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218940 - in head: tools usr.bin/xinstall X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 12:40:03 -0000 On Tue Feb 22 11, Ulrich Spoerlein wrote: > Author: uqs > Date: Tue Feb 22 08:07:17 2011 > New Revision: 218940 > URL: http://svn.freebsd.org/changeset/base/218940 > > Log: > Teach tools/install.sh the -d directory mode. > > Sync up with flags understood by install(1) [1], and make install(1)'s > usage output not hide the clearly documented -M flag. thanks a lot. i'd also like to mention that a first draft of this patch was hacked up by Eygene Ryabinkin. so credits to him too. :) > > PR: misc/154739 [1] > Submitted by: arundel > > Modified: > head/tools/install.sh > head/usr.bin/xinstall/xinstall.c > > Modified: head/tools/install.sh > ============================================================================== > --- head/tools/install.sh Tue Feb 22 07:49:51 2011 (r218939) > +++ head/tools/install.sh Tue Feb 22 08:07:17 2011 (r218940) > @@ -29,14 +29,30 @@ > # $FreeBSD$ > > # parse install's options and ignore them completely. > +dirmode="" > while [ $# -gt 0 ]; do > case $1 in > - -[bCcMpSs]) shift;; > + -d) dirmode="YES"; shift;; > + -[bCcMpSsv]) shift;; > -[Bfgmo]) shift; shift;; > -[Bfgmo]*) shift;; > *) break; > esac > done > > +if [ "$#" -eq 0 ]; then > + echo "$0: no files/dirs specified" >&2 > + exit 1 > +fi > + > +if [ -z "$dirmode" ] && [ "$#" -lt 2 ]; then > + echo "$0: no target specified" >&2 > + exit 1 > +fi > + > # the remaining arguments are assumed to be files/dirs only. > -exec install -p $* > +if [ -z "$dirmode" ]; then > + exec install -p "$@" > +else > + exec install -d "$@" > +fi > > Modified: head/usr.bin/xinstall/xinstall.c > ============================================================================== > --- head/usr.bin/xinstall/xinstall.c Tue Feb 22 07:49:51 2011 (r218939) > +++ head/usr.bin/xinstall/xinstall.c Tue Feb 22 08:07:17 2011 (r218940) > @@ -769,9 +769,9 @@ static void > usage(void) > { > (void)fprintf(stderr, > -"usage: install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n" > +"usage: install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n" > " [-o owner] file1 file2\n" > -" install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n" > +" install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n" > " [-o owner] file1 ... fileN directory\n" > " install -d [-v] [-g group] [-m mode] [-o owner] directory ...\n"); > exit(EX_USAGE); -- a13x From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 13:52:04 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 156341065670; Tue, 22 Feb 2011 13:52:04 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 03AB68FC17; Tue, 22 Feb 2011 13:52:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MDq3dj010549; Tue, 22 Feb 2011 13:52:03 GMT (envelope-from nyan@svn.freebsd.org) Received: (from nyan@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MDq35b010547; Tue, 22 Feb 2011 13:52:03 GMT (envelope-from nyan@svn.freebsd.org) Message-Id: <201102221352.p1MDq35b010547@svn.freebsd.org> From: Takahashi Yoshihiro Date: Tue, 22 Feb 2011 13:52:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218946 - head/sys/boot/pc98/boot2 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 13:52:04 -0000 Author: nyan Date: Tue Feb 22 13:52:03 2011 New Revision: 218946 URL: http://svn.freebsd.org/changeset/base/218946 Log: MFi386: revision 218926 In sys/boot/i386/boot2/boot2.c, change the type of the 'opts' variable from uint16_t back to uint32_t. The actual option bitmasks (RB_* and RBX_*) assume at least a 32 bit variable. Submitted by: rdivacky Modified: head/sys/boot/pc98/boot2/boot2.c Modified: head/sys/boot/pc98/boot2/boot2.c ============================================================================== --- head/sys/boot/pc98/boot2/boot2.c Tue Feb 22 10:09:34 2011 (r218945) +++ head/sys/boot/pc98/boot2/boot2.c Tue Feb 22 13:52:03 2011 (r218946) @@ -134,7 +134,7 @@ static struct dsk { } dsk; static char cmd[512], cmddup[512]; static char kname[1024]; -static uint16_t opts; +static uint32_t opts; static int comspeed = SIOSPD; static struct bootinfo bootinfo; static uint8_t ioctrl = IO_KEYBOARD; From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 13:56:59 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C1A5A106564A; Tue, 22 Feb 2011 13:56:59 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 94C1E8FC13; Tue, 22 Feb 2011 13:56:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MDuxKP010691; Tue, 22 Feb 2011 13:56:59 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MDuxOj010687; Tue, 22 Feb 2011 13:56:59 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201102221356.p1MDuxOj010687@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 22 Feb 2011 13:56:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218947 - in head/usr.sbin/bsdinstall: . scripts X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 13:56:59 -0000 Author: nwhitehorn Date: Tue Feb 22 13:56:59 2011 New Revision: 218947 URL: http://svn.freebsd.org/changeset/base/218947 Log: Add support for optional distributions, installation of the ports tree and src. Fitting all of this on a single CD along with a full system requires changing the default compression algorithm from gzip to xz. Modified: head/usr.sbin/bsdinstall/bsdinstall head/usr.sbin/bsdinstall/scripts/auto head/usr.sbin/bsdinstall/scripts/jail Modified: head/usr.sbin/bsdinstall/bsdinstall ============================================================================== --- head/usr.sbin/bsdinstall/bsdinstall Tue Feb 22 13:52:03 2011 (r218946) +++ head/usr.sbin/bsdinstall/bsdinstall Tue Feb 22 13:56:59 2011 (r218947) @@ -26,7 +26,6 @@ # # $FreeBSD$ -: ${DISTRIBUTIONS="kernel.tgz world.tgz"}; export DISTRIBUTIONS : ${BSDINSTALL_LOG="/tmp/bsdinstall_log"}; export BSDINSTALL_LOG : ${BSDINSTALL_TMPETC="/tmp/bsdinstall_etc"}; export BSDINSTALL_TMPETC : ${PATH_FSTAB="$BSDINSTALL_TMPETC/fstab"}; export PATH_FSTAB Modified: head/usr.sbin/bsdinstall/scripts/auto ============================================================================== --- head/usr.sbin/bsdinstall/scripts/auto Tue Feb 22 13:52:03 2011 (r218946) +++ head/usr.sbin/bsdinstall/scripts/auto Tue Feb 22 13:56:59 2011 (r218947) @@ -50,6 +50,27 @@ bsdinstall keymap trap error SIGINT # Catch cntrl-C here bsdinstall hostname || error +LIB32="" +[ `uname -p` = amd64 -o `uname -p` = powerpc64 ] && \ + LIB32="lib32 \"32-bit compatibility\" on" + +DISTMENU="doc \"Additional documentation\" on \ + games \"Games (fortune, etc.)\" on \ + $LIB32 \ + ports \"Ports tree\" on \ + src \"System source code\" off" + +exec 3>&1 +EXTRA_DISTS=$(echo $DISTMENU | xargs dialog --backtitle "FreeBSD Installer" \ + --title "Distribution Select" --nocancel --separate-output \ + --checklist "Choose optional system components to install:" \ + 0 0 0 \ +2>&1 1>&3) +DISTRIBUTIONS="base.txz kernel.txz" +for dist in $EXTRA_DISTS; do + export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz" +done + FETCH_DISTRIBUTIONS="" for dist in $DISTRIBUTIONS; do if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then Modified: head/usr.sbin/bsdinstall/scripts/jail ============================================================================== --- head/usr.sbin/bsdinstall/scripts/jail Tue Feb 22 13:52:03 2011 (r218946) +++ head/usr.sbin/bsdinstall/scripts/jail Tue Feb 22 13:56:59 2011 (r218947) @@ -29,7 +29,8 @@ echo "Begun Installation at $(date)" > $BSDINSTALL_LOG export BSDINSTALL_CHROOT=$1 -export DISTRIBUTIONS="`echo $DISTRIBUTIONS | sed 's/kernel\.[^ ]* //g'`" +export DISTRIBUTIONS="kernel.txz base.txz doc.txz games.txz" +[ `uname -p` = amd64 -o `uname -p` = powerpc64 ] && export DISTRIBUTIONS="$DISTRIBUTIONS lib32.txz" error() { dialog --backtitle "FreeBSD Installer" --title "Abort" \ From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 14:47:11 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 503001065674; Tue, 22 Feb 2011 14:47:11 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 247FA8FC24; Tue, 22 Feb 2011 14:47:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MElB6V012018; Tue, 22 Feb 2011 14:47:11 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MElBKa012016; Tue, 22 Feb 2011 14:47:11 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201102221447.p1MElBKa012016@svn.freebsd.org> From: Alan Cox Date: Tue, 22 Feb 2011 14:47:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218949 - head/sys/fs/tmpfs X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 14:47:11 -0000 Author: alc Date: Tue Feb 22 14:47:10 2011 New Revision: 218949 URL: http://svn.freebsd.org/changeset/base/218949 Log: Eliminate two dubious attempts at optimizing the implementation of a file's last accessed, modified, and changed times: TMPFS_NODE_ACCESSED and TMPFS_NODE_CHANGED should be set unconditionally in tmpfs_remove() without regard to the number of hard links to the file. Otherwise, after the last directory entry for a file has been removed, a process that still has the file open could read stale values for the last accessed and changed times with fstat(2). Similarly, tmpfs_close() should update the time-related fields even if all directory entries for a file have been removed. In this case, the effect is that the time-related fields will have values that are later than expected. They will correspond to the time at which fstat(2) is called. In collaboration with: kib MFC after: 1 week Modified: head/sys/fs/tmpfs/tmpfs_vnops.c Modified: head/sys/fs/tmpfs/tmpfs_vnops.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_vnops.c Tue Feb 22 14:02:00 2011 (r218948) +++ head/sys/fs/tmpfs/tmpfs_vnops.c Tue Feb 22 14:47:10 2011 (r218949) @@ -270,19 +270,12 @@ tmpfs_close(struct vop_close_args *v) { struct vnode *vp = v->a_vp; - struct tmpfs_node *node; - MPASS(VOP_ISLOCKED(vp)); - node = VP_TO_TMPFS_NODE(vp); - - if (node->tn_links > 0) { - /* Update node times. No need to do it if the node has - * been deleted, because it will vanish after we return. */ - tmpfs_update(vp); - } + /* Update node times. */ + tmpfs_update(vp); - return 0; + return (0); } /* --------------------------------------------------------------------- */ @@ -852,8 +845,7 @@ tmpfs_remove(struct vop_remove_args *v) * reclaimed. */ tmpfs_free_dirent(tmp, de, TRUE); - if (node->tn_links > 0) - node->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_CHANGED; + node->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_CHANGED; error = 0; out: From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 14:58:14 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B50BF106564A; Tue, 22 Feb 2011 14:58:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8B8958FC15; Tue, 22 Feb 2011 14:58:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MEwEA1012297; Tue, 22 Feb 2011 14:58:14 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MEwEqf012295; Tue, 22 Feb 2011 14:58:14 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201102221458.p1MEwEqf012295@svn.freebsd.org> From: John Baldwin Date: Tue, 22 Feb 2011 14:58:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218950 - head/sys/i386/include X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 14:58:14 -0000 Author: jhb Date: Tue Feb 22 14:58:14 2011 New Revision: 218950 URL: http://svn.freebsd.org/changeset/base/218950 Log: Fix whitespace nit. Modified: head/sys/i386/include/pmap.h Modified: head/sys/i386/include/pmap.h ============================================================================== --- head/sys/i386/include/pmap.h Tue Feb 22 14:47:10 2011 (r218949) +++ head/sys/i386/include/pmap.h Tue Feb 22 14:58:14 2011 (r218950) @@ -441,7 +441,6 @@ struct pmap { table */ #endif vm_page_t pm_root; /* spare page table pages */ - }; typedef struct pmap *pmap_t; From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 15:31:40 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9F9D1065695; Tue, 22 Feb 2011 15:31:40 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 98D278FC08; Tue, 22 Feb 2011 15:31:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MFVed9013113; Tue, 22 Feb 2011 15:31:40 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MFVeND013111; Tue, 22 Feb 2011 15:31:40 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201102221531.p1MFVeND013111@svn.freebsd.org> From: Jaakko Heinonen Date: Tue, 22 Feb 2011 15:31:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218951 - head/sbin/newfs X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 15:31:40 -0000 Author: jh Date: Tue Feb 22 15:31:40 2011 New Revision: 218951 URL: http://svn.freebsd.org/changeset/base/218951 Log: Xref makefs(8). PR: 154708 Submitted by: jhs Modified: head/sbin/newfs/newfs.8 Modified: head/sbin/newfs/newfs.8 ============================================================================== --- head/sbin/newfs/newfs.8 Tue Feb 22 14:58:14 2011 (r218950) +++ head/sbin/newfs/newfs.8 Tue Feb 22 15:31:40 2011 (r218951) @@ -28,7 +28,7 @@ .\" @(#)newfs.8 8.6 (Berkeley) 5/3/95 .\" $FreeBSD$ .\" -.Dd December 9, 2010 +.Dd February 22, 2011 .Dt NEWFS 8 .Os .Sh NAME @@ -297,6 +297,7 @@ on file systems that contain many small .Xr dumpfs 8 , .Xr fsck 8 , .Xr gjournal 8 , +.Xr makefs 8 , .Xr mount 8 , .Xr tunefs 8 , .Xr gvinum 8 From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 19:05:42 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79F5B1065670; Tue, 22 Feb 2011 19:05:42 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 670B88FC14; Tue, 22 Feb 2011 19:05:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MJ5g46018567; Tue, 22 Feb 2011 19:05:42 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MJ5gv6018561; Tue, 22 Feb 2011 19:05:42 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201102221905.p1MJ5gv6018561@svn.freebsd.org> From: Bernhard Schmidt Date: Tue, 22 Feb 2011 19:05:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218958 - head/sys/net80211 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 19:05:42 -0000 Author: bschmidt Date: Tue Feb 22 19:05:42 2011 New Revision: 218958 URL: http://svn.freebsd.org/changeset/base/218958 Log: Make sure to only accept and handle action frames which are for us. In promiscuous mode we might receive stuff which otherwise gets filtered by hardware. Modified: head/sys/net80211/ieee80211_adhoc.c head/sys/net80211/ieee80211_hostap.c head/sys/net80211/ieee80211_mesh.c head/sys/net80211/ieee80211_sta.c head/sys/net80211/ieee80211_wds.c Modified: head/sys/net80211/ieee80211_adhoc.c ============================================================================== --- head/sys/net80211/ieee80211_adhoc.c Tue Feb 22 17:51:45 2011 (r218957) +++ head/sys/net80211/ieee80211_adhoc.c Tue Feb 22 19:05:42 2011 (r218958) @@ -825,14 +825,23 @@ adhoc_recv_mgmt(struct ieee80211_node *n case IEEE80211_FC0_SUBTYPE_ACTION: case IEEE80211_FC0_SUBTYPE_ACTION_NOACK: - if (vap->iv_state == IEEE80211_S_RUN) { - if (ieee80211_parse_action(ni, m0) == 0) - (void)ic->ic_recv_action(ni, wh, frm, efrm); - } else { + if (ni == vap->iv_bss) { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "unknown node"); + vap->iv_stats.is_rx_mgtdiscard++; + } else if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr1) && + !IEEE80211_IS_MULTICAST(wh->i_addr1)) { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "not for us"); + vap->iv_stats.is_rx_mgtdiscard++; + } else if (vap->iv_state != IEEE80211_S_RUN) { IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, wh, NULL, "wrong state %s", ieee80211_state_name[vap->iv_state]); vap->iv_stats.is_rx_mgtdiscard++; + } else { + if (ieee80211_parse_action(ni, m0) == 0) + (void)ic->ic_recv_action(ni, wh, frm, efrm); } break; Modified: head/sys/net80211/ieee80211_hostap.c ============================================================================== --- head/sys/net80211/ieee80211_hostap.c Tue Feb 22 17:51:45 2011 (r218957) +++ head/sys/net80211/ieee80211_hostap.c Tue Feb 22 19:05:42 2011 (r218958) @@ -2195,14 +2195,23 @@ hostap_recv_mgmt(struct ieee80211_node * case IEEE80211_FC0_SUBTYPE_ACTION: case IEEE80211_FC0_SUBTYPE_ACTION_NOACK: - if (vap->iv_state == IEEE80211_S_RUN) { - if (ieee80211_parse_action(ni, m0) == 0) - (void)ic->ic_recv_action(ni, wh, frm, efrm); - } else { + if (ni == vap->iv_bss) { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "unknown node"); + vap->iv_stats.is_rx_mgtdiscard++; + } else if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr1) && + !IEEE80211_IS_MULTICAST(wh->i_addr1)) { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "not for us"); + vap->iv_stats.is_rx_mgtdiscard++; + } else if (vap->iv_state != IEEE80211_S_RUN) { IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, wh, NULL, "wrong state %s", ieee80211_state_name[vap->iv_state]); vap->iv_stats.is_rx_mgtdiscard++; + } else { + if (ieee80211_parse_action(ni, m0) == 0) + (void)ic->ic_recv_action(ni, wh, frm, efrm); } break; Modified: head/sys/net80211/ieee80211_mesh.c ============================================================================== --- head/sys/net80211/ieee80211_mesh.c Tue Feb 22 17:51:45 2011 (r218957) +++ head/sys/net80211/ieee80211_mesh.c Tue Feb 22 19:05:42 2011 (r218958) @@ -1492,35 +1492,23 @@ mesh_recv_mgmt(struct ieee80211_node *ni case IEEE80211_FC0_SUBTYPE_ACTION: case IEEE80211_FC0_SUBTYPE_ACTION_NOACK: - /* - * We received an action for an unknown neighbor. - * XXX: wait for it to beacon or create ieee80211_node? - */ if (ni == vap->iv_bss) { - IEEE80211_DISCARD(vap, IEEE80211_MSG_MESH, + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, wh, NULL, "%s", "unknown node"); vap->iv_stats.is_rx_mgtdiscard++; - break; - } - /* - * Discard if not for us. - * XXX: if from us too? - */ - if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr1) && + } else if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr1) && !IEEE80211_IS_MULTICAST(wh->i_addr1)) { - IEEE80211_DISCARD(vap, IEEE80211_MSG_MESH, - wh, NULL, "%s", "not for me"); + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "not for us"); vap->iv_stats.is_rx_mgtdiscard++; - break; - } - if (vap->iv_state == IEEE80211_S_RUN) { - if (ieee80211_parse_action(ni, m0) == 0) - (void)ic->ic_recv_action(ni, wh, frm, efrm); - } else { + } else if (vap->iv_state != IEEE80211_S_RUN) { IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, wh, NULL, "wrong state %s", ieee80211_state_name[vap->iv_state]); vap->iv_stats.is_rx_mgtdiscard++; + } else { + if (ieee80211_parse_action(ni, m0) == 0) + (void)ic->ic_recv_action(ni, wh, frm, efrm); } break; Modified: head/sys/net80211/ieee80211_sta.c ============================================================================== --- head/sys/net80211/ieee80211_sta.c Tue Feb 22 17:51:45 2011 (r218957) +++ head/sys/net80211/ieee80211_sta.c Tue Feb 22 19:05:42 2011 (r218958) @@ -1719,14 +1719,19 @@ sta_recv_mgmt(struct ieee80211_node *ni, case IEEE80211_FC0_SUBTYPE_ACTION: case IEEE80211_FC0_SUBTYPE_ACTION_NOACK: - if (vap->iv_state == IEEE80211_S_RUN) { - if (ieee80211_parse_action(ni, m0) == 0) - (void)ic->ic_recv_action(ni, wh, frm, efrm); - } else { + if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr1) && + !IEEE80211_IS_MULTICAST(wh->i_addr1)) { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "not for us"); + vap->iv_stats.is_rx_mgtdiscard++; + } else if (vap->iv_state != IEEE80211_S_RUN) { IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, wh, NULL, "wrong state %s", ieee80211_state_name[vap->iv_state]); vap->iv_stats.is_rx_mgtdiscard++; + } else { + if (ieee80211_parse_action(ni, m0) == 0) + (void)ic->ic_recv_action(ni, wh, frm, efrm); } break; Modified: head/sys/net80211/ieee80211_wds.c ============================================================================== --- head/sys/net80211/ieee80211_wds.c Tue Feb 22 17:51:45 2011 (r218957) +++ head/sys/net80211/ieee80211_wds.c Tue Feb 22 19:05:42 2011 (r218958) @@ -454,6 +454,9 @@ wds_input(struct ieee80211_node *ni, str */ wh = mtod(m, struct ieee80211_frame *); + if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) + ni->ni_inact = ni->ni_inact_reload; + if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) != IEEE80211_FC0_VERSION_0) { IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY, @@ -536,8 +539,6 @@ wds_input(struct ieee80211_node *ni, str vap->iv_stats.is_rx_wrongdir++;/*XXX*/ goto out; } - if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) - ni->ni_inact = ni->ni_inact_reload; /* * Handle A-MPDU re-ordering. If the frame is to be * processed directly then ieee80211_ampdu_reorder @@ -758,22 +759,23 @@ wds_recv_mgmt(struct ieee80211_node *ni, switch (subtype) { case IEEE80211_FC0_SUBTYPE_ACTION: case IEEE80211_FC0_SUBTYPE_ACTION_NOACK: - if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { - IEEE80211_DISCARD(vap, IEEE80211_MSG_MESH, - wh, NULL, "%s", "not directed to us"); + if (ni == vap->iv_bss) { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "unknown node"); vap->iv_stats.is_rx_mgtdiscard++; - break; - } else - ni->ni_inact = ni->ni_inact_reload; - - if (vap->iv_state == IEEE80211_S_RUN) { - if (ieee80211_parse_action(ni, m0) == 0) - (void)ic->ic_recv_action(ni, wh, frm, efrm); - } else { + } else if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr1)) { + /* NB: not interested in multicast frames. */ + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "not for us"); + vap->iv_stats.is_rx_mgtdiscard++; + } else if (vap->iv_state != IEEE80211_S_RUN) { IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, wh, NULL, "wrong state %s", ieee80211_state_name[vap->iv_state]); vap->iv_stats.is_rx_mgtdiscard++; + } else { + if (ieee80211_parse_action(ni, m0) == 0) + (void)ic->ic_recv_action(ni, wh, frm, efrm); } break; From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 19:18:56 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CEB71065672; Tue, 22 Feb 2011 19:18:56 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8AC988FC0C; Tue, 22 Feb 2011 19:18:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MJIu5H018895; Tue, 22 Feb 2011 19:18:56 GMT (envelope-from jpaetzel@svn.freebsd.org) Received: (from jpaetzel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MJIukV018893; Tue, 22 Feb 2011 19:18:56 GMT (envelope-from jpaetzel@svn.freebsd.org) Message-Id: <201102221918.p1MJIukV018893@svn.freebsd.org> From: Josh Paetzel Date: Tue, 22 Feb 2011 19:18:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218959 - head/usr.sbin/pc-sysinstall/backend-query X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 19:18:56 -0000 Author: jpaetzel Date: Tue Feb 22 19:18:56 2011 New Revision: 218959 URL: http://svn.freebsd.org/changeset/base/218959 Log: Better method for grabbing disk name, dmesg may produce mangled output. Approved by: kib (mentor, implicit) Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh ============================================================================== --- head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Tue Feb 22 19:05:42 2011 (r218958) +++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Tue Feb 22 19:18:56 2011 (r218959) @@ -74,7 +74,7 @@ do fi # Check the dmesg output for some more info about this device - NEWLINE=$(dmesg | sed -n "s/^$DEV: .*<\(.*\)>.*$/ <\1>/p" | head -n 1) + NEWLINE=$(camcontrol identify $DEV | grep "device model" | tr -s ' ' | sed 's |device model ||g') if [ -z "$NEWLINE" ]; then NEWLINE=" " fi From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 19:37:12 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82FF51065670; Tue, 22 Feb 2011 19:37:12 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 710BC8FC13; Tue, 22 Feb 2011 19:37:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MJbCon019330; Tue, 22 Feb 2011 19:37:12 GMT (envelope-from jpaetzel@svn.freebsd.org) Received: (from jpaetzel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MJbChP019328; Tue, 22 Feb 2011 19:37:12 GMT (envelope-from jpaetzel@svn.freebsd.org) Message-Id: <201102221937.p1MJbChP019328@svn.freebsd.org> From: Josh Paetzel Date: Tue, 22 Feb 2011 19:37:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218960 - head/usr.sbin/pc-sysinstall/backend X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 19:37:12 -0000 Author: jpaetzel Date: Tue Feb 22 19:37:12 2011 New Revision: 218960 URL: http://svn.freebsd.org/changeset/base/218960 Log: Added patch-functions-upgrade which should fix some kernel panics doing upgrades and uninstalling linux compat ports. Submitted by: Joerg-Christian Boehme Approved by: kib (mentor, implicit) Modified: head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh Modified: head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh ============================================================================== --- head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh Tue Feb 22 19:18:56 2011 (r218959) +++ head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh Tue Feb 22 19:37:12 2011 (r218960) @@ -58,7 +58,7 @@ mount_target_slice() zfs mount -a # Mount all the fstab goodies on disk - chroot ${FSMNT} /sbin/mount -a >>${LOGOUT} 2>>${LOGOUT} + chroot ${FSMNT} /sbin/mount -a -t nolinprocfs >>${LOGOUT} 2>>${LOGOUT chroot ${FSMNT} umount /proc >/dev/null 2>/dev/null chroot ${FSMNT} umount /compat/linux/proc >/dev/null 2>/dev/null @@ -79,7 +79,7 @@ mount_target_slice() if [ "$INSTALLTYPE" != "FreeBSD" ] then echo_log "Removing old packages, this may take a while... Please wait..." - echo '#/bin/sh + echo '#!/bin/sh for i in `pkg_info -E \*` do echo "Uninstalling package: ${i}" From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 21:13:40 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78477106566B; Tue, 22 Feb 2011 21:13:40 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 663D68FC16; Tue, 22 Feb 2011 21:13:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MLDenc021589; Tue, 22 Feb 2011 21:13:40 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MLDeTZ021586; Tue, 22 Feb 2011 21:13:40 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201102222113.p1MLDeTZ021586@svn.freebsd.org> From: Doug Barton Date: Tue, 22 Feb 2011 21:13:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218961 - in head/etc: periodic/daily rc.d X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 21:13:40 -0000 Author: dougb Date: Tue Feb 22 21:13:40 2011 New Revision: 218961 URL: http://svn.freebsd.org/changeset/base/218961 Log: Update how accounting log files are rotated. The old version had a race between the time that the old file was cp'ed to acct.0 and the time that 'sa -s' was run that prevented the commands that occurred in the meantime from being backed up. It's also arguable that the old version was inefficient in using cp which can be a problem on a space-constrained system. This version avoids both problems, albeit it's considerably more complicated. The advantage of putting the log rotation in the rc.d script is that it can handle the _enable and _file questions without having to do gymnastics to discover either value in the periodic script. As a side effect of reviewing the rc.d script I cleaned it up a bit. Modified: head/etc/periodic/daily/310.accounting head/etc/rc.d/accounting Modified: head/etc/periodic/daily/310.accounting ============================================================================== --- head/etc/periodic/daily/310.accounting Tue Feb 22 19:37:12 2011 (r218960) +++ head/etc/periodic/daily/310.accounting Tue Feb 22 21:13:40 2011 (r218961) @@ -41,13 +41,16 @@ case "$daily_accounting_enable" in m=$n n=$(($n - 1)) done - cp -pf acct acct.0 || rc=3 - sa -s $daily_accounting_flags || rc=3 + + /etc/rc.d/accounting rotate_log || rc=3 case "$daily_accounting_compress" in [Yy][Ee][Ss]) - gzip -f acct.0 || rc=3;; + gzip --keep -f acct.0 || rc=3;; esac + + sa -s $daily_accounting_flags /var/account/acct.0 && + unlink acct.0 || rc=3 fi;; *) rc=0;; Modified: head/etc/rc.d/accounting ============================================================================== --- head/etc/rc.d/accounting Tue Feb 22 19:37:12 2011 (r218960) +++ head/etc/rc.d/accounting Tue Feb 22 21:13:40 2011 (r218961) @@ -14,28 +14,31 @@ name="accounting" rcvar=`set_rcvar` accounting_command="/usr/sbin/accton" accounting_file="/var/account/acct" + +extra_commands="rotate_log" + start_cmd="accounting_start" stop_cmd="accounting_stop" +rotate_log_cmd="accounting_rotate_log" accounting_start() { local _dir - _dir=`dirname "$accounting_file"` - if [ ! -d `dirname "$_dir"` ]; then + _dir="${accounting_file%/*}" + if [ ! -d "$_dir" ]; then if ! mkdir -p "$_dir"; then - warn "Could not create $_dir." - return 1 + err 1 "Could not create $_dir." fi fi + if [ ! -e "$accounting_file" ]; then + echo -n "Creating accounting file ${accounting_file}" touch "$accounting_file" + echo '.' fi + chmod 644 "$accounting_file" - if [ ! -f ${accounting_file} ]; then - echo "Creating accounting file ${accounting_file}" - ( umask 022 ; > ${accounting_file} ) - fi echo "Turning on accounting." ${accounting_command} ${accounting_file} } @@ -46,5 +49,26 @@ accounting_stop() ${accounting_command} } +accounting_rotate_log() +{ + local _dir _file + + _dir="${accounting_file%/*}" + cd $_dir + + if checkyesno accounting_enable; then + _file=`mktemp newacct-XXXXX` + ${accounting_command} ${_dir}/${_file} + fi + + mv ${accounting_file} ${accounting_file}.0 + + if checkyesno accounting_enable; then + ln $_file ${accounting_file##*/} + ${accounting_command} ${accounting_file} + unlink $_file + fi +} + load_rc_config $name run_rc_command "$1" From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 21:21:47 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE1F6106564A; Tue, 22 Feb 2011 21:21:47 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 4A2FB8FC14; Tue, 22 Feb 2011 21:21:46 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id p1MLLhem032298 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 22 Feb 2011 23:21:43 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id p1MLLh5T062542; Tue, 22 Feb 2011 23:21:43 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id p1MLLhuF062541; Tue, 22 Feb 2011 23:21:43 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 22 Feb 2011 23:21:43 +0200 From: Kostik Belousov To: Josh Paetzel Message-ID: <20110222212143.GE78089@deviant.kiev.zoral.com.ua> References: <201102221918.p1MJIukV018893@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ys1XzWHRwUoZRcaf" Content-Disposition: inline In-Reply-To: <201102221918.p1MJIukV018893@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-Spam-Status: No, score=-3.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218959 - head/usr.sbin/pc-sysinstall/backend-query X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 21:21:48 -0000 --ys1XzWHRwUoZRcaf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Feb 22, 2011 at 07:18:56PM +0000, Josh Paetzel wrote: > Author: jpaetzel > Date: Tue Feb 22 19:18:56 2011 > New Revision: 218959 > URL: http://svn.freebsd.org/changeset/base/218959 >=20 > Log: > Better method for grabbing disk name, dmesg may produce mangled output. > =20 > Approved by: kib (mentor, implicit) >=20 > Modified: > head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh >=20 > Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Tue Feb 22 19:= 05:42 2011 (r218958) > +++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Tue Feb 22 19:= 18:56 2011 (r218959) > @@ -74,7 +74,7 @@ do > fi > =20 > # Check the dmesg output for some more info about this device Shouldn't the comment be updated ? > - NEWLINE=3D$(dmesg | sed -n "s/^$DEV: .*<\(.*\)>.*$/ <\1>/p" | head -n = 1) > + NEWLINE=3D$(camcontrol identify $DEV | grep "device model" | tr -s ' '= | sed 's |device model ||g') > if [ -z "$NEWLINE" ]; then > NEWLINE=3D" " > fi --ys1XzWHRwUoZRcaf Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEARECAAYFAk1kKOcACgkQC3+MBN1Mb4iHlACg4YCP2uWYkixh8S9tuwqK3rY+ nbYAoKlpuht0mekRtlgOiLEG8ulixev/ =SWa4 -----END PGP SIGNATURE----- --ys1XzWHRwUoZRcaf-- From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 21:23:10 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD1E8106566C; Tue, 22 Feb 2011 21:23:10 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 46DB28FC15; Tue, 22 Feb 2011 21:23:10 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id p1MLN6tb032443 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 22 Feb 2011 23:23:06 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id p1MLN6EZ062566; Tue, 22 Feb 2011 23:23:06 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id p1MLN6F6062565; Tue, 22 Feb 2011 23:23:06 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 22 Feb 2011 23:23:06 +0200 From: Kostik Belousov To: Josh Paetzel Message-ID: <20110222212306.GF78089@deviant.kiev.zoral.com.ua> References: <201102221937.p1MJbChP019328@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="oKa17j5kv2cZTeM9" Content-Disposition: inline In-Reply-To: <201102221937.p1MJbChP019328@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-Spam-Status: No, score=-3.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218960 - head/usr.sbin/pc-sysinstall/backend X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 21:23:11 -0000 --oKa17j5kv2cZTeM9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Feb 22, 2011 at 07:37:12PM +0000, Josh Paetzel wrote: > Author: jpaetzel > Date: Tue Feb 22 19:37:12 2011 > New Revision: 218960 > URL: http://svn.freebsd.org/changeset/base/218960 >=20 > Log: > Added patch-functions-upgrade which should fix some kernel panics > doing upgrades and uninstalling linux compat ports. This is probably wrong way to fix kernel panics. Did you show the panics with backtrace to anybody on emulation@ ? > =20 > Submitted by: Joerg-Christian Boehme > Approved by: kib (mentor, implicit) >=20 > Modified: > head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh >=20 > Modified: head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh Tue Feb 22 1= 9:18:56 2011 (r218959) > +++ head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh Tue Feb 22 1= 9:37:12 2011 (r218960) > @@ -58,7 +58,7 @@ mount_target_slice() > zfs mount -a > =20 > # Mount all the fstab goodies on disk > - chroot ${FSMNT} /sbin/mount -a >>${LOGOUT} 2>>${LOGOUT} > + chroot ${FSMNT} /sbin/mount -a -t nolinprocfs >>${LOGOUT} 2>>${LOGOUT There is a typo/syntax error at the very end of the line. > chroot ${FSMNT} umount /proc >/dev/null 2>/dev/null=20 > chroot ${FSMNT} umount /compat/linux/proc >/dev/null 2>/dev/null > =20 > @@ -79,7 +79,7 @@ mount_target_slice() > if [ "$INSTALLTYPE" !=3D "FreeBSD" ] > then > echo_log "Removing old packages, this may take a while... Please wai= t..." > - echo '#/bin/sh > + echo '#!/bin/sh > for i in `pkg_info -E \*` > do > echo "Uninstalling package: ${i}" --oKa17j5kv2cZTeM9 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEARECAAYFAk1kKToACgkQC3+MBN1Mb4gF4wCfXXyLd9oMprNSwwq26MLZy3sh zQwAoJm4fXNlkro0+BvJebKivUg6qj3x =0fGW -----END PGP SIGNATURE----- --oKa17j5kv2cZTeM9-- From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 01:25:09 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 280A7106566B; Wed, 23 Feb 2011 01:25:09 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mail.cksoft.de (mail.cksoft.de [IPv6:2001:4068:10::3]) by mx1.freebsd.org (Postfix) with ESMTP id ABDA88FC13; Wed, 23 Feb 2011 01:25:08 +0000 (UTC) Received: from localhost (amavis.fra.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id 2CBC841C710; Wed, 23 Feb 2011 02:25:07 +0100 (CET) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([192.168.74.103]) by localhost (amavis.fra.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id DfkS2-7SsEQy; Wed, 23 Feb 2011 02:25:06 +0100 (CET) Received: by mail.cksoft.de (Postfix, from userid 66) id E8BD741C735; Wed, 23 Feb 2011 02:25:05 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id 2D8294448F3; Wed, 23 Feb 2011 01:23:50 +0000 (UTC) Date: Wed, 23 Feb 2011 01:23:50 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: Josh Paetzel In-Reply-To: <201102221918.p1MJIukV018893@svn.freebsd.org> Message-ID: <20110223011759.W13400@maildrop.int.zabbadoz.net> References: <201102221918.p1MJIukV018893@svn.freebsd.org> X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218959 - head/usr.sbin/pc-sysinstall/backend-query X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 01:25:09 -0000 On Tue, 22 Feb 2011, Josh Paetzel wrote: > Author: jpaetzel > Date: Tue Feb 22 19:18:56 2011 > New Revision: 218959 > URL: http://svn.freebsd.org/changeset/base/218959 > > Log: > Better method for grabbing disk name, dmesg may produce mangled output. > > Approved by: kib (mentor, implicit) > > Modified: > head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh > > Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh > ============================================================================== > --- head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Tue Feb 22 19:05:42 2011 (r218958) > +++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Tue Feb 22 19:18:56 2011 (r218959) > @@ -74,7 +74,7 @@ do > fi > > # Check the dmesg output for some more info about this device > - NEWLINE=$(dmesg | sed -n "s/^$DEV: .*<\(.*\)>.*$/ <\1>/p" | head -n 1) > + NEWLINE=$(camcontrol identify $DEV | grep "device model" | tr -s ' ' | sed 's |device model ||g') Sure sed works if there is a blank between s and the delimiter? May I suggest nothing shorter but two pipes less, though not exactly the same with regard to whitespace stripping in and after the device name but that could be fixed easily as well. camcontrol identify $DEV | awk '/device model/ { gsub("device model[[:space:]]*", ""); print; }' I am sure it can still be done way more clever but ... > if [ -z "$NEWLINE" ]; then > NEWLINE=" " > fi > -- Bjoern A. Zeeb You have to have visions! Stop bit received. Insert coin for new address family. From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 02:40:31 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC4C9106566C; Wed, 23 Feb 2011 02:40:31 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A110A8FC15; Wed, 23 Feb 2011 02:40:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1N2eV1l028944; Wed, 23 Feb 2011 02:40:31 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1N2eVUB028942; Wed, 23 Feb 2011 02:40:31 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102230240.p1N2eVUB028942@svn.freebsd.org> From: Pyun YongHyeon Date: Wed, 23 Feb 2011 02:40:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218964 - head/sys/dev/dc X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 02:40:31 -0000 Author: yongari Date: Wed Feb 23 02:40:31 2011 New Revision: 218964 URL: http://svn.freebsd.org/changeset/base/218964 Log: Remove unnecessary controller reinitialization which resulted in link flips during alias address insertion or dhclient operation. While I'm here remove dc_reset() in DC_ISR_BUS_ERR case. Device is fully reinitialized again in dc_init_locked(). Modified: head/sys/dev/dc/if_dc.c Modified: head/sys/dev/dc/if_dc.c ============================================================================== --- head/sys/dev/dc/if_dc.c Tue Feb 22 21:27:46 2011 (r218963) +++ head/sys/dev/dc/if_dc.c Wed Feb 23 02:40:31 2011 (r218964) @@ -2894,6 +2894,7 @@ dc_rxeof(struct dc_softc *sc) if (rxstat & DC_RXSTAT_CRCERR) continue; else { + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; dc_init_locked(sc); return (rx_npkts); } @@ -3032,6 +3033,7 @@ dc_txeof(struct dc_softc *sc) if (txstat & DC_TXSTAT_LATECOLL) ifp->if_collisions++; if (!(txstat & DC_TXSTAT_UNDERRUN)) { + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; dc_init_locked(sc); return; } @@ -3143,8 +3145,10 @@ dc_tx_underrun(struct dc_softc *sc) uint32_t isr; int i; - if (DC_IS_DAVICOM(sc)) + if (DC_IS_DAVICOM(sc)) { + sc->dc_ifp->if_drv_flags &= ~IFF_DRV_RUNNING; dc_init_locked(sc); + } if (DC_IS_INTEL(sc)) { /* @@ -3164,6 +3168,7 @@ dc_tx_underrun(struct dc_softc *sc) device_printf(sc->dc_dev, "%s: failed to force tx to idle state\n", __func__); + sc->dc_ifp->if_drv_flags &= ~IFF_DRV_RUNNING; dc_init_locked(sc); } } @@ -3236,7 +3241,7 @@ dc_poll(struct ifnet *ifp, enum poll_cmd if (status & DC_ISR_BUS_ERR) { if_printf(ifp, "%s: bus error\n", __func__); - dc_reset(sc); + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; dc_init_locked(sc); } } @@ -3319,7 +3324,7 @@ dc_intr(void *arg) dc_start_locked(ifp); if (status & DC_ISR_BUS_ERR) { - dc_reset(sc); + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; dc_init_locked(sc); DC_UNLOCK(sc); return; @@ -3565,6 +3570,9 @@ dc_init_locked(struct dc_softc *sc) DC_LOCK_ASSERT(sc); + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + return; + mii = device_get_softc(sc->dc_miibus); /* @@ -3818,6 +3826,7 @@ dc_ioctl(struct ifnet *ifp, u_long comma dc_setfilt(sc); } else { sc->dc_txthresh = 0; + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; dc_init_locked(sc); } } else { @@ -3890,8 +3899,7 @@ dc_watchdog(void *xsc) ifp->if_oerrors++; device_printf(sc->dc_dev, "watchdog timeout\n"); - dc_stop(sc); - dc_reset(sc); + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; dc_init_locked(sc); if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 07:32:44 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1937D1065670; Wed, 23 Feb 2011 07:32:44 +0000 (UTC) (envelope-from to.my.trociny@gmail.com) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id 4CC078FC14; Wed, 23 Feb 2011 07:32:42 +0000 (UTC) Received: by fxm19 with SMTP id 19so4521640fxm.13 for ; Tue, 22 Feb 2011 23:32:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:organization:references:date :in-reply-to:message-id:user-agent:mime-version:content-type; bh=S5df5Ym3pnY3a4eCzkxQrqQ/dwQTLH9XSSS/oqj+oaw=; b=vuEqX3sBp74zRwdHe6UV3tB4/TmZFkUL9qXwTrkvaryItZZl3eo8uxYdiVySPjmBHM guAQdIbXxhxmg0u2v94KlQ2O1GBkGALquX3HvhqjOho5IUs5ckZ+4SubWXtWvxjTKlKf 1gISUARyMvzH/e4nP9zssrrTg/WHM7xUVJ1Lo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:organization:references:date:in-reply-to :message-id:user-agent:mime-version:content-type; b=fpqOcapoQ5aOt+mNoE71T4MYwUziECCtWwrKzPDEk9AlaCJHW6mLGSeAt+qxOYhwjC L9qsa7uKUIERX/UzCVef7iqA5Rtf/31/g7HdxVTf8uqZxNkpSPzSnKAIB8tiNc7IpmdU Vi7ywC/gi5MoN2n4pdkEOeFbYEt43r6G7ggC8= Received: by 10.223.101.131 with SMTP id c3mr4615472fao.5.1298446362239; Tue, 22 Feb 2011 23:32:42 -0800 (PST) Received: from localhost ([94.27.39.186]) by mx.google.com with ESMTPS id r24sm2462102fax.27.2011.02.22.23.32.40 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 22 Feb 2011 23:32:41 -0800 (PST) From: Mikolaj Golub To: "Bjoern A. Zeeb" Organization: TOA Ukraine References: <201102221918.p1MJIukV018893@svn.freebsd.org> <20110223011759.W13400@maildrop.int.zabbadoz.net> Date: Wed, 23 Feb 2011 09:32:37 +0200 In-Reply-To: <20110223011759.W13400@maildrop.int.zabbadoz.net> (Bjoern A. Zeeb's message of "Wed, 23 Feb 2011 01:23:50 +0000 (UTC)") Message-ID: <854o7vkxyi.fsf@in138.ua3> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Josh Paetzel , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218959 - head/usr.sbin/pc-sysinstall/backend-query X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 07:32:44 -0000 On Wed, 23 Feb 2011 01:23:50 +0000 (UTC) Bjoern A. Zeeb wrote: BAZ> On Tue, 22 Feb 2011, Josh Paetzel wrote: >> Author: jpaetzel >> Date: Tue Feb 22 19:18:56 2011 >> New Revision: 218959 >> URL: http://svn.freebsd.org/changeset/base/218959 >> >> Log: >> Better method for grabbing disk name, dmesg may produce mangled output. >> >> Approved by: kib (mentor, implicit) >> >> Modified: >> head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh >> >> Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh >> ============================================================================== >> --- head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Tue Feb 22 19:05:42 2011 (r218958) >> +++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Tue Feb 22 19:18:56 2011 (r218959) >> @@ -74,7 +74,7 @@ do >> fi >> >> # Check the dmesg output for some more info about this device >> - NEWLINE=$(dmesg | sed -n "s/^$DEV: .*<\(.*\)>.*$/ <\1>/p" | head -n 1) >> + NEWLINE=$(camcontrol identify $DEV | grep "device model" | tr -s ' ' | sed 's |device model ||g') BAZ> Sure sed works if there is a blank between s and the delimiter? BAZ> May I suggest nothing shorter but two pipes less, though not exactly BAZ> the same with regard to whitespace stripping in and after the device BAZ> name but that could be fixed easily as well. BAZ> camcontrol identify $DEV | awk '/device model/ { gsub("device model[[:space:]]*", ""); print; }' BAZ> I am sure it can still be done way more clever but ... what about this? :-) camcontrol identify $DEV | sed -ne 's/^device model *//p' -- Mikolaj Golub From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 09:22:33 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6596106566B; Wed, 23 Feb 2011 09:22:33 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 945538FC08; Wed, 23 Feb 2011 09:22:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1N9MXha040803; Wed, 23 Feb 2011 09:22:33 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1N9MXFK040794; Wed, 23 Feb 2011 09:22:33 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102230922.p1N9MXFK040794@svn.freebsd.org> From: Bruce Cran Date: Wed, 23 Feb 2011 09:22:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218965 - in head: sbin/growfs share/doc/papers/devfs share/doc/psd/23.rpc sys/fs/nullfs sys/libkern sys/net80211 sys/x86/isa usr.bin/tip/tip X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 09:22:33 -0000 Author: brucec Date: Wed Feb 23 09:22:33 2011 New Revision: 218965 URL: http://svn.freebsd.org/changeset/base/218965 Log: Fix typos - remove duplicate "is". PR: docs/154934 Submitted by: Eitan Adler MFC after: 3 days Modified: head/sbin/growfs/growfs.c head/share/doc/papers/devfs/paper.me head/share/doc/psd/23.rpc/rpc.prog.ms head/sys/fs/nullfs/null_vnops.c head/sys/libkern/jenkins.h head/sys/net80211/ieee80211_ageq.c head/sys/x86/isa/clock.c head/usr.bin/tip/tip/tip.h Modified: head/sbin/growfs/growfs.c ============================================================================== --- head/sbin/growfs/growfs.c Wed Feb 23 02:40:31 2011 (r218964) +++ head/sbin/growfs/growfs.c Wed Feb 23 09:22:33 2011 (r218965) @@ -646,7 +646,7 @@ cond_bl_upd(ufs2_daddr_t *block, struct /* * Copy the block back immediately. * - * XXX If src is is from an indirect block we have + * XXX If src is from an indirect block we have * to implement copy on write here in case of * active snapshots. */ Modified: head/share/doc/papers/devfs/paper.me ============================================================================== --- head/share/doc/papers/devfs/paper.me Wed Feb 23 02:40:31 2011 (r218964) +++ head/share/doc/papers/devfs/paper.me Wed Feb 23 09:22:33 2011 (r218965) @@ -779,7 +779,7 @@ The entry points to the device driver ar structure, removing the need for the devsw[] array and allowing device drivers to use separate entrypoints for various minor numbers. .lp -This is is very convenient for devices which have a ``control'' +This is very convenient for devices which have a ``control'' device for management and tuning. The control device, almost always have entirely separate open/close/ioctl implementations [MD.C]. .lp Modified: head/share/doc/psd/23.rpc/rpc.prog.ms ============================================================================== --- head/share/doc/psd/23.rpc/rpc.prog.ms Wed Feb 23 02:40:31 2011 (r218964) +++ head/share/doc/psd/23.rpc/rpc.prog.ms Wed Feb 23 09:22:33 2011 (r218965) @@ -71,7 +71,7 @@ manual page. .I "The Highest Layer:" .IX RPC "The Highest Layer" The highest layer is totally transparent to the operating system, -machine and network upon which is is run. It's probably best to +machine and network upon which is run. It's probably best to think of this level as a way of .I using RPC, rather than as Modified: head/sys/fs/nullfs/null_vnops.c ============================================================================== --- head/sys/fs/nullfs/null_vnops.c Wed Feb 23 02:40:31 2011 (r218964) +++ head/sys/fs/nullfs/null_vnops.c Wed Feb 23 09:22:33 2011 (r218965) @@ -672,7 +672,7 @@ null_unlock(struct vop_unlock_args *ap) * as soon as possible. * * Note, we can't release any resources nor remove vnode from hash before - * appropriate VXLOCK stuff is is done because other process can find this + * appropriate VXLOCK stuff is done because other process can find this * vnode in hash during inactivation and may be sitting in vget() and waiting * for null_inactive to unlock vnode. Thus we will do all those in VOP_RECLAIM. */ Modified: head/sys/libkern/jenkins.h ============================================================================== --- head/sys/libkern/jenkins.h Wed Feb 23 02:40:31 2011 (r218964) +++ head/sys/libkern/jenkins.h Wed Feb 23 09:22:33 2011 (r218965) @@ -16,7 +16,7 @@ the public domain. It has no warranty. You probably want to use hashlittle(). hashlittle() and hashbig() - hash byte arrays. hashlittle() is is faster than hashbig() on + hash byte arrays. hashlittle() is faster than hashbig() on little-endian machines. Intel and AMD are little-endian machines. On second thought, you probably want hashlittle2(), which is identical to hashlittle() except it returns two 32-bit hashes for the price of one. Modified: head/sys/net80211/ieee80211_ageq.c ============================================================================== --- head/sys/net80211/ieee80211_ageq.c Wed Feb 23 02:40:31 2011 (r218964) +++ head/sys/net80211/ieee80211_ageq.c Wed Feb 23 09:22:33 2011 (r218965) @@ -154,7 +154,7 @@ ieee80211_ageq_drain_node(struct ieee802 * deltas (in seconds) relative to the head so we can check * and/or adjust only the head of the list. If a frame's age * exceeds the time quanta then remove it. The list of removed - * frames is is returned to the caller joined by m_nextpkt. + * frames is returned to the caller joined by m_nextpkt. */ struct mbuf * ieee80211_ageq_age(struct ieee80211_ageq *aq, int quanta) Modified: head/sys/x86/isa/clock.c ============================================================================== --- head/sys/x86/isa/clock.c Wed Feb 23 02:40:31 2011 (r218964) +++ head/sys/x86/isa/clock.c Wed Feb 23 09:22:33 2011 (r218965) @@ -475,7 +475,7 @@ sysctl_machdep_i8254_freq(SYSCTL_HANDLER /* * Use `i8254' instead of `timer' in external names because `timer' - * is is too generic. Should use it everywhere. + * is too generic. Should use it everywhere. */ freq = i8254_freq; error = sysctl_handle_int(oidp, &freq, 0, req); Modified: head/usr.bin/tip/tip/tip.h ============================================================================== --- head/usr.bin/tip/tip/tip.h Wed Feb 23 02:40:31 2011 (r218964) +++ head/usr.bin/tip/tip/tip.h Wed Feb 23 09:22:33 2011 (r218965) @@ -259,7 +259,7 @@ int intflag; /* recognized interrupt */ int stoprompt; /* for interrupting a prompt session */ int timedout; /* ~> transfer timedout */ int cumode; /* simulating the "cu" program */ -int bits8; /* terminal is is 8-bit mode */ +int bits8; /* terminal is 8-bit mode */ #define STRIP_PAR (bits8 ? 0377 : 0177) char fname[PATH_MAX]; /* file name buffer for ~< */ From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 10:28:37 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD50F1065672; Wed, 23 Feb 2011 10:28:37 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A2B628FC14; Wed, 23 Feb 2011 10:28:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NASbMl045278; Wed, 23 Feb 2011 10:28:37 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NASbET045275; Wed, 23 Feb 2011 10:28:37 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102231028.p1NASbET045275@svn.freebsd.org> From: Bruce Cran Date: Wed, 23 Feb 2011 10:28:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218966 - head/sys/vm X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 10:28:37 -0000 Author: brucec Date: Wed Feb 23 10:28:37 2011 New Revision: 218966 URL: http://svn.freebsd.org/changeset/base/218966 Log: Calculate and return the count in vmspace_swap_count as a vm_offset_t instead of an int to avoid overflow. While here, clean up some style(9) issues. PR: kern/152200 Reviewed by: kib MFC after: 2 weeks Modified: head/sys/vm/swap_pager.c head/sys/vm/vm_map.h Modified: head/sys/vm/swap_pager.c ============================================================================== --- head/sys/vm/swap_pager.c Wed Feb 23 09:22:33 2011 (r218965) +++ head/sys/vm/swap_pager.c Wed Feb 23 10:28:37 2011 (r218966) @@ -2420,23 +2420,24 @@ SYSCTL_NODE(_vm, OID_AUTO, swap_info, CT * if the VM object has any swap use at all the associated map entries * count for at least 1 swap page. */ -int +vm_offset_t vmspace_swap_count(struct vmspace *vmspace) { - vm_map_t map = &vmspace->vm_map; + vm_map_t map; vm_map_entry_t cur; - int count = 0; + vm_object_t object; + vm_offset_t count, n; - for (cur = map->header.next; cur != &map->header; cur = cur->next) { - vm_object_t object; + map = &vmspace->vm_map; + count = 0; + for (cur = map->header.next; cur != &map->header; cur = cur->next) { if ((cur->eflags & MAP_ENTRY_IS_SUB_MAP) == 0 && (object = cur->object.vm_object) != NULL) { VM_OBJECT_LOCK(object); if (object->type == OBJT_SWAP && object->un_pager.swp.swp_bcount != 0) { - int n = (cur->end - cur->start) / PAGE_SIZE; - + n = (cur->end - cur->start) / PAGE_SIZE; count += object->un_pager.swp.swp_bcount * SWAP_META_PAGES * n / object->size + 1; } Modified: head/sys/vm/vm_map.h ============================================================================== --- head/sys/vm/vm_map.h Wed Feb 23 09:22:33 2011 (r218965) +++ head/sys/vm/vm_map.h Wed Feb 23 10:28:37 2011 (r218966) @@ -380,6 +380,6 @@ int vm_map_unwire(vm_map_t map, vm_offse int flags); int vm_map_wire(vm_map_t map, vm_offset_t start, vm_offset_t end, int flags); -int vmspace_swap_count (struct vmspace *vmspace); +vm_offset_t vmspace_swap_count(struct vmspace *vmspace); #endif /* _KERNEL */ #endif /* _VM_MAP_ */ From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 12:56:25 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2B08106564A; Wed, 23 Feb 2011 12:56:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D1ECC8FC08; Wed, 23 Feb 2011 12:56:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NCuPCL056222; Wed, 23 Feb 2011 12:56:25 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NCuPHN056220; Wed, 23 Feb 2011 12:56:25 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201102231256.p1NCuPHN056220@svn.freebsd.org> From: John Baldwin Date: Wed, 23 Feb 2011 12:56:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218967 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 12:56:26 -0000 Author: jhb Date: Wed Feb 23 12:56:25 2011 New Revision: 218967 URL: http://svn.freebsd.org/changeset/base/218967 Log: Fix off-by-one error in check against max_threads_per_proc. Submitted by: arundel MFC after: 1 week Modified: head/sys/kern/kern_thr.c Modified: head/sys/kern/kern_thr.c ============================================================================== --- head/sys/kern/kern_thr.c Wed Feb 23 10:28:37 2011 (r218966) +++ head/sys/kern/kern_thr.c Wed Feb 23 12:56:25 2011 (r218967) @@ -153,7 +153,7 @@ create_thread(struct thread *td, mcontex p = td->td_proc; /* Have race condition but it is cheap. */ - if (p->p_numthreads >= max_threads_per_proc) { + if (p->p_numthreads > max_threads_per_proc) { ++max_threads_hits; return (EPROCLIM); } From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 12:57:49 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1233) id 7E186106566B; Wed, 23 Feb 2011 12:57:49 +0000 (UTC) Date: Wed, 23 Feb 2011 12:57:49 +0000 From: Alexander Best To: John Baldwin Message-ID: <20110223125749.GA54402@freebsd.org> References: <201102231256.p1NCuPHN056220@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201102231256.p1NCuPHN056220@svn.freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218967 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 12:57:49 -0000 On Wed Feb 23 11, John Baldwin wrote: > Author: jhb > Date: Wed Feb 23 12:56:25 2011 > New Revision: 218967 > URL: http://svn.freebsd.org/changeset/base/218967 > > Log: > Fix off-by-one error in check against max_threads_per_proc. thanks a lot. :) > > Submitted by: arundel > MFC after: 1 week > > Modified: > head/sys/kern/kern_thr.c > > Modified: head/sys/kern/kern_thr.c > ============================================================================== > --- head/sys/kern/kern_thr.c Wed Feb 23 10:28:37 2011 (r218966) > +++ head/sys/kern/kern_thr.c Wed Feb 23 12:56:25 2011 (r218967) > @@ -153,7 +153,7 @@ create_thread(struct thread *td, mcontex > p = td->td_proc; > > /* Have race condition but it is cheap. */ > - if (p->p_numthreads >= max_threads_per_proc) { > + if (p->p_numthreads > max_threads_per_proc) { > ++max_threads_hits; > return (EPROCLIM); > } -- a13x From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 12:58:51 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D9E1106566B; Wed, 23 Feb 2011 12:58:51 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0CD678FC19; Wed, 23 Feb 2011 12:58:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NCwoEn056715; Wed, 23 Feb 2011 12:58:50 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NCwooh056712; Wed, 23 Feb 2011 12:58:50 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201102231258.p1NCwooh056712@svn.freebsd.org> From: John Baldwin Date: Wed, 23 Feb 2011 12:58:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218968 - head/sys/dev/pci X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 12:58:51 -0000 Author: jhb Date: Wed Feb 23 12:58:50 2011 New Revision: 218968 URL: http://svn.freebsd.org/changeset/base/218968 Log: Properly handle BARs bigger than 4G. The '1' was treated as an int causing the size calculation to be truncated to the size of an int (32-bits on all current architectures). Submitted by: Anish akgupt3 of gmail MFC after: 1 week Modified: head/sys/dev/pci/pci.c Modified: head/sys/dev/pci/pci.c ============================================================================== --- head/sys/dev/pci/pci.c Wed Feb 23 12:56:25 2011 (r218967) +++ head/sys/dev/pci/pci.c Wed Feb 23 12:58:50 2011 (r218968) @@ -2549,13 +2549,13 @@ pci_add_map(device_t bus, device_t dev, return (barlen); } - count = 1 << mapsize; + count = (pci_addr_t)1 << mapsize; if (basezero || base == pci_mapbase(testval)) { start = 0; /* Let the parent decide. */ end = ~0ULL; } else { start = base; - end = base + (1 << mapsize) - 1; + end = base + count - 1; } resource_list_add(rl, type, reg, start, end, count); @@ -3764,7 +3764,7 @@ pci_reserve_map(device_t dev, device_t c * situation where we might allocate the excess to * another driver, which won't work. */ - count = 1UL << mapsize; + count = (pci_addr_t)1 << mapsize; if (RF_ALIGNMENT(flags) < mapsize) flags = (flags & ~RF_ALIGNMENT_MASK) | RF_ALIGNMENT_LOG2(mapsize); if (PCI_BAR_MEM(testval) && (testval & PCIM_BAR_MEM_PREFETCH)) From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 13:12:33 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4C6F106566B; Wed, 23 Feb 2011 13:12:33 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 3EC218FC12; Wed, 23 Feb 2011 13:12:32 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id p1NDCSZp017313 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 23 Feb 2011 15:12:28 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id p1NDCS6X068473; Wed, 23 Feb 2011 15:12:28 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id p1NDCSGb068472; Wed, 23 Feb 2011 15:12:28 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 23 Feb 2011 15:12:28 +0200 From: Kostik Belousov To: John Baldwin Message-ID: <20110223131228.GN78089@deviant.kiev.zoral.com.ua> References: <201102231256.p1NCuPHN056220@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="pQC2pbIvkpPv3Ssp" Content-Disposition: inline In-Reply-To: <201102231256.p1NCuPHN056220@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-Spam-Status: No, score=-3.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218967 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 13:12:33 -0000 --pQC2pbIvkpPv3Ssp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Feb 23, 2011 at 12:56:25PM +0000, John Baldwin wrote: > Author: jhb > Date: Wed Feb 23 12:56:25 2011 > New Revision: 218967 > URL: http://svn.freebsd.org/changeset/base/218967 >=20 > Log: > Fix off-by-one error in check against max_threads_per_proc. > =20 > Submitted by: arundel > MFC after: 1 week >=20 > Modified: > head/sys/kern/kern_thr.c >=20 > Modified: head/sys/kern/kern_thr.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/kern_thr.c Wed Feb 23 10:28:37 2011 (r218966) > +++ head/sys/kern/kern_thr.c Wed Feb 23 12:56:25 2011 (r218967) > @@ -153,7 +153,7 @@ create_thread(struct thread *td, mcontex > p =3D td->td_proc; > =20 > /* Have race condition but it is cheap. */ > - if (p->p_numthreads >=3D max_threads_per_proc) { > + if (p->p_numthreads > max_threads_per_proc) { > ++max_threads_hits; > return (EPROCLIM); > } I do not think there was off by one error. The create_thread() function is called to create new thread, and before the process thread counter is incremented in thread_link(). The old test tried to not allow more then max_threads_per_proc threads in a process, now it allows to create max_threads_per_proc. My guess is that the reference to mentioned pthread_vfork_test failed because reporter set kern.threads.max_threads_per_proc to 100. The test actually tries to create 101 threads, 1 main + 100 new. --pQC2pbIvkpPv3Ssp Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEARECAAYFAk1lB7wACgkQC3+MBN1Mb4gAwACgwgvZepbOdMdcFCp8oqPPGFx9 yTIAn39MTj+WGnO7LWPYqNKD+lbxFIQJ =ykZ5 -----END PGP SIGNATURE----- --pQC2pbIvkpPv3Ssp-- From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 13:19:14 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7047C10656A8; Wed, 23 Feb 2011 13:19:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5EE8C8FC12; Wed, 23 Feb 2011 13:19:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NDJEMB060640; Wed, 23 Feb 2011 13:19:14 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NDJEhQ060637; Wed, 23 Feb 2011 13:19:14 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201102231319.p1NDJEhQ060637@svn.freebsd.org> From: John Baldwin Date: Wed, 23 Feb 2011 13:19:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218969 - in head/sys: kern sys X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 13:19:14 -0000 Author: jhb Date: Wed Feb 23 13:19:14 2011 New Revision: 218969 URL: http://svn.freebsd.org/changeset/base/218969 Log: Expose the umtx_key structure and API to the rest of the kernel. MFC after: 3 days Modified: head/sys/kern/kern_umtx.c head/sys/sys/umtx.h Modified: head/sys/kern/kern_umtx.c ============================================================================== --- head/sys/kern/kern_umtx.c Wed Feb 23 12:58:50 2011 (r218968) +++ head/sys/kern/kern_umtx.c Wed Feb 23 13:19:14 2011 (r218969) @@ -59,41 +59,9 @@ __FBSDID("$FreeBSD$"); #include #endif -enum { - TYPE_SIMPLE_WAIT, - TYPE_CV, - TYPE_SEM, - TYPE_SIMPLE_LOCK, - TYPE_NORMAL_UMUTEX, - TYPE_PI_UMUTEX, - TYPE_PP_UMUTEX, - TYPE_RWLOCK -}; - #define _UMUTEX_TRY 1 #define _UMUTEX_WAIT 2 -/* Key to represent a unique userland synchronous object */ -struct umtx_key { - int hash; - int type; - int shared; - union { - struct { - vm_object_t object; - uintptr_t offset; - } shared; - struct { - struct vmspace *vs; - uintptr_t addr; - } private; - struct { - void *a; - uintptr_t b; - } both; - } info; -}; - /* Priority inheritance mutex info. */ struct umtx_pi { /* Owner thread */ @@ -208,10 +176,6 @@ struct umtxq_chain { #define UMTX_CHAINS 512 #define UMTX_SHIFTS (__WORD_BIT - 9) -#define THREAD_SHARE 0 -#define PROCESS_SHARE 1 -#define AUTO_SHARE 2 - #define GET_SHARE(flags) \ (((flags) & USYNC_PROCESS_SHARED) == 0 ? THREAD_SHARE : PROCESS_SHARE) @@ -237,10 +201,6 @@ static void umtxq_insert_queue(struct um static void umtxq_remove_queue(struct umtx_q *uq, int q); static int umtxq_sleep(struct umtx_q *uq, const char *wmesg, int timo); static int umtxq_count(struct umtx_key *key); -static int umtx_key_match(const struct umtx_key *k1, const struct umtx_key *k2); -static int umtx_key_get(void *addr, int type, int share, - struct umtx_key *key); -static void umtx_key_release(struct umtx_key *key); static struct umtx_pi *umtx_pi_alloc(int); static void umtx_pi_free(struct umtx_pi *pi); static int do_unlock_pp(struct thread *td, struct umutex *m, uint32_t flags); @@ -307,14 +267,6 @@ umtxq_hash(struct umtx_key *key) key->hash = ((n * GOLDEN_RATIO_PRIME) >> UMTX_SHIFTS) % UMTX_CHAINS; } -static inline int -umtx_key_match(const struct umtx_key *k1, const struct umtx_key *k2) -{ - return (k1->type == k2->type && - k1->info.both.a == k2->info.both.a && - k1->info.both.b == k2->info.both.b); -} - static inline struct umtxq_chain * umtxq_getchain(struct umtx_key *key) { @@ -567,7 +519,7 @@ umtxq_sleep(struct umtx_q *uq, const cha /* * Convert userspace address into unique logical address. */ -static int +int umtx_key_get(void *addr, int type, int share, struct umtx_key *key) { struct thread *td = curthread; @@ -613,7 +565,7 @@ umtx_key_get(void *addr, int type, int s /* * Release key. */ -static inline void +void umtx_key_release(struct umtx_key *key) { if (key->shared) Modified: head/sys/sys/umtx.h ============================================================================== --- head/sys/sys/umtx.h Wed Feb 23 12:58:50 2011 (r218968) +++ head/sys/sys/umtx.h Wed Feb 23 13:19:14 2011 (r218969) @@ -171,8 +171,59 @@ umtx_wake(u_long *p, int nr_wakeup) #else +/* + * The umtx_key structure is used by both the Linux futex code and the + * umtx implementation to map userland addresses to unique keys. + */ + +enum { + TYPE_SIMPLE_WAIT, + TYPE_CV, + TYPE_SEM, + TYPE_SIMPLE_LOCK, + TYPE_NORMAL_UMUTEX, + TYPE_PI_UMUTEX, + TYPE_PP_UMUTEX, + TYPE_RWLOCK, +}; + +/* Key to represent a unique userland synchronous object */ +struct umtx_key { + int hash; + int type; + int shared; + union { + struct { + struct vm_object *object; + uintptr_t offset; + } shared; + struct { + struct vmspace *vs; + uintptr_t addr; + } private; + struct { + void *a; + uintptr_t b; + } both; + } info; +}; + +#define THREAD_SHARE 0 +#define PROCESS_SHARE 1 +#define AUTO_SHARE 2 + struct thread; +static inline int +umtx_key_match(const struct umtx_key *k1, const struct umtx_key *k2) +{ + return (k1->type == k2->type && + k1->info.both.a == k2->info.both.a && + k1->info.both.b == k2->info.both.b); +} + +int umtx_key_get(void *, int, int, struct umtx_key *); +void umtx_key_release(struct umtx_key *); struct umtx_q *umtxq_alloc(void); void umtxq_free(struct umtx_q *); int kern_umtx_wake(struct thread *, void *, int, int); From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 13:23:28 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97E60106566C; Wed, 23 Feb 2011 13:23:28 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7AB3E8FC1F; Wed, 23 Feb 2011 13:23:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NDNShZ061528; Wed, 23 Feb 2011 13:23:28 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NDNSVH061525; Wed, 23 Feb 2011 13:23:28 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201102231323.p1NDNSVH061525@svn.freebsd.org> From: John Baldwin Date: Wed, 23 Feb 2011 13:23:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218970 - in head/sys: compat/linux sys X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 13:23:28 -0000 Author: jhb Date: Wed Feb 23 13:23:28 2011 New Revision: 218970 URL: http://svn.freebsd.org/changeset/base/218970 Log: Use umtx_key objects to uniquely identify futexes. Private futexes in different processes that happen to use the same user address in the separate processes will now be treated as distinct futexes rather than the same futex. We can now honor shared futexes properly by mapping them to a PROCESS_SHARED umtx_key. Private futexes use THREAD_SHARED umtx_key objects. In conjunction with: dchagin Reviewed by: kib MFC after: 1 week Modified: head/sys/compat/linux/linux_futex.c head/sys/sys/umtx.h Modified: head/sys/compat/linux/linux_futex.c ============================================================================== --- head/sys/compat/linux/linux_futex.c Wed Feb 23 13:19:14 2011 (r218969) +++ head/sys/compat/linux/linux_futex.c Wed Feb 23 13:23:28 2011 (r218970) @@ -52,6 +52,7 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex. #include #include #include +#include #ifdef COMPAT_LINUX32 #include @@ -77,7 +78,8 @@ struct waiting_proc { struct futex { struct sx f_lck; - uint32_t *f_uaddr; + uint32_t *f_uaddr; /* user-supplied value, for debug */ + struct umtx_key f_key; uint32_t f_refcount; uint32_t f_bitset; LIST_ENTRY(futex) f_list; @@ -100,6 +102,7 @@ struct mtx futex_mtx; /* protects the #define FUTEX_CREATE_WP 0x1 /* create waiting_proc */ #define FUTEX_DONTCREATE 0x2 /* don't create futex if not exists */ #define FUTEX_DONTEXISTS 0x4 /* return EINVAL if futex exists */ +#define FUTEX_SHARED 0x8 /* shared futex */ /* wp_flags */ #define FUTEX_WP_REQUEUED 0x1 /* wp requeued - wp moved from wp_list @@ -136,6 +139,7 @@ futex_put(struct futex *f, struct waitin LINUX_CTR2(sys_futex, "futex_put destroy uaddr %p ref %d", f->f_uaddr, f->f_refcount); + umtx_key_release(&f->f_key); FUTEX_DESTROY(f); free(f, M_FUTEX); return; @@ -151,13 +155,19 @@ static int futex_get0(uint32_t *uaddr, struct futex **newf, uint32_t flags) { struct futex *f, *tmpf; + struct umtx_key key; + int error; *newf = tmpf = NULL; + error = umtx_key_get(uaddr, TYPE_FUTEX, (flags & FUTEX_SHARED) ? + PROCESS_SHARE : THREAD_SHARE, &key); + if (error) + return (error); retry: FUTEXES_LOCK; LIST_FOREACH(f, &futex_list, f_list) { - if (f->f_uaddr == uaddr) { + if (umtx_key_match(&f->f_key, &key)) { if (tmpf != NULL) { FUTEX_UNLOCK(tmpf); FUTEX_DESTROY(tmpf); @@ -165,6 +175,7 @@ retry: } if (flags & FUTEX_DONTEXISTS) { FUTEXES_UNLOCK; + umtx_key_release(&key); return (EINVAL); } @@ -174,6 +185,7 @@ retry: */ ++f->f_refcount; FUTEXES_UNLOCK; + umtx_key_release(&key); FUTEX_LOCK(f); *newf = f; @@ -185,6 +197,7 @@ retry: if (flags & FUTEX_DONTCREATE) { FUTEXES_UNLOCK; + umtx_key_release(&key); LINUX_CTR1(sys_futex, "futex_get uaddr %p null", uaddr); return (0); } @@ -193,6 +206,7 @@ retry: FUTEXES_UNLOCK; tmpf = malloc(sizeof(*tmpf), M_FUTEX, M_WAITOK | M_ZERO); tmpf->f_uaddr = uaddr; + tmpf->f_key = key; tmpf->f_refcount = 1; tmpf->f_bitset = FUTEX_BITSET_MATCH_ANY; FUTEX_INIT(tmpf); @@ -438,15 +452,13 @@ linux_sys_futex(struct thread *td, struc struct waiting_proc *wp; struct futex *f, *f2; int error; + uint32_t flags; - /* - * Our implementation provides only privates futexes. Most of the apps - * should use private futexes but don't claim so. Therefore we treat - * all futexes as private by clearing the FUTEX_PRIVATE_FLAG. It works - * in most cases (ie. when futexes are not shared on file descriptor - * or between different processes.). - */ - args->op = args->op & ~LINUX_FUTEX_PRIVATE_FLAG; + if (args->op & LINUX_FUTEX_PRIVATE_FLAG) { + flags = 0; + args->op &= ~LINUX_FUTEX_PRIVATE_FLAG; + } else + flags = FUTEX_SHARED; /* * Currently support for switching between CLOCK_MONOTONIC and @@ -478,7 +490,8 @@ linux_sys_futex(struct thread *td, struc "futex_wait uaddr %p val %d val3 %d"), args->uaddr, args->val, args->val3); #endif - error = futex_get(args->uaddr, &wp, &f, FUTEX_CREATE_WP); + error = futex_get(args->uaddr, &wp, &f, + flags | FUTEX_CREATE_WP); if (error) return (error); error = copyin(args->uaddr, &val, sizeof(val)); @@ -518,7 +531,8 @@ linux_sys_futex(struct thread *td, struc printf(ARGS(sys_futex, "futex_wake uaddr %p val %d val3 %d"), args->uaddr, args->val, args->val3); #endif - error = futex_get(args->uaddr, NULL, &f, FUTEX_DONTCREATE); + error = futex_get(args->uaddr, NULL, &f, + flags | FUTEX_DONTCREATE); if (error) return (error); if (f == NULL) { @@ -550,7 +564,7 @@ linux_sys_futex(struct thread *td, struc */ if (args->uaddr == args->uaddr2) return (EINVAL); - error = futex_get0(args->uaddr, &f, 0); + error = futex_get(args->uaddr, NULL, &f, flags); if (error) return (error); @@ -561,7 +575,8 @@ linux_sys_futex(struct thread *td, struc * Glibc fall back to FUTEX_WAKE in case of any error * returned by FUTEX_CMP_REQUEUE. */ - error = futex_get0(args->uaddr2, &f2, FUTEX_DONTEXISTS); + error = futex_get(args->uaddr2, NULL, &f2, + flags | FUTEX_DONTEXISTS); if (error) { futex_put(f, NULL); return (error); @@ -602,11 +617,11 @@ linux_sys_futex(struct thread *td, struc args->uaddr, args->op, args->val, args->uaddr2, args->val3); #endif - error = futex_get0(args->uaddr, &f, 0); + error = futex_get(args->uaddr, NULL, &f, flags); if (error) return (error); if (args->uaddr != args->uaddr2) - error = futex_get0(args->uaddr2, &f2, 0); + error = futex_get(args->uaddr2, NULL, &f2, flags); if (error) { futex_put(f, NULL); return (error); @@ -800,7 +815,7 @@ retry: if (!pi && (uval & FUTEX_WAITERS)) { error = futex_get(uaddr, NULL, &f, - FUTEX_DONTCREATE); + FUTEX_DONTCREATE | FUTEX_SHARED); if (error) return (error); if (f != NULL) { Modified: head/sys/sys/umtx.h ============================================================================== --- head/sys/sys/umtx.h Wed Feb 23 13:19:14 2011 (r218969) +++ head/sys/sys/umtx.h Wed Feb 23 13:23:28 2011 (r218970) @@ -185,6 +185,7 @@ enum { TYPE_PI_UMUTEX, TYPE_PP_UMUTEX, TYPE_RWLOCK, + TYPE_FUTEX }; /* Key to represent a unique userland synchronous object */ From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 13:25:42 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BBE821065672; Wed, 23 Feb 2011 13:25:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AAFC38FC21; Wed, 23 Feb 2011 13:25:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NDPg1l062116; Wed, 23 Feb 2011 13:25:42 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NDPgXp062114; Wed, 23 Feb 2011 13:25:42 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201102231325.p1NDPgXp062114@svn.freebsd.org> From: John Baldwin Date: Wed, 23 Feb 2011 13:25:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218971 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 13:25:42 -0000 Author: jhb Date: Wed Feb 23 13:25:42 2011 New Revision: 218971 URL: http://svn.freebsd.org/changeset/base/218971 Log: Revert previous change, the existing check was correct. Pointy hat to: jhb Modified: head/sys/kern/kern_thr.c Modified: head/sys/kern/kern_thr.c ============================================================================== --- head/sys/kern/kern_thr.c Wed Feb 23 13:23:28 2011 (r218970) +++ head/sys/kern/kern_thr.c Wed Feb 23 13:25:42 2011 (r218971) @@ -153,7 +153,7 @@ create_thread(struct thread *td, mcontex p = td->td_proc; /* Have race condition but it is cheap. */ - if (p->p_numthreads > max_threads_per_proc) { + if (p->p_numthreads >= max_threads_per_proc) { ++max_threads_hits; return (EPROCLIM); } From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 13:34:56 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0DA751065672; Wed, 23 Feb 2011 13:34:56 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id D486C8FC08; Wed, 23 Feb 2011 13:34:55 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 8B4F746B0C; Wed, 23 Feb 2011 08:34:55 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.10]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id A58BF8A009; Wed, 23 Feb 2011 08:34:54 -0500 (EST) From: John Baldwin To: Kostik Belousov Date: Wed, 23 Feb 2011 08:24:43 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.4-CBSD-20110107; KDE/4.4.5; amd64; ; ) References: <201102231256.p1NCuPHN056220@svn.freebsd.org> <20110223131228.GN78089@deviant.kiev.zoral.com.ua> In-Reply-To: <20110223131228.GN78089@deviant.kiev.zoral.com.ua> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201102230824.43548.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Wed, 23 Feb 2011 08:34:54 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=0.5 required=4.2 tests=BAYES_00,MAY_BE_FORGED, RDNS_DYNAMIC autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bigwig.baldwin.cx Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218967 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 13:34:56 -0000 On Wednesday, February 23, 2011 8:12:28 am Kostik Belousov wrote: > On Wed, Feb 23, 2011 at 12:56:25PM +0000, John Baldwin wrote: > > Author: jhb > > Date: Wed Feb 23 12:56:25 2011 > > New Revision: 218967 > > URL: http://svn.freebsd.org/changeset/base/218967 > > > > Log: > > Fix off-by-one error in check against max_threads_per_proc. > > > > Submitted by: arundel > > MFC after: 1 week > > > > Modified: > > head/sys/kern/kern_thr.c > > > > Modified: head/sys/kern/kern_thr.c > > ============================================================================== > > --- head/sys/kern/kern_thr.c Wed Feb 23 10:28:37 2011 (r218966) > > +++ head/sys/kern/kern_thr.c Wed Feb 23 12:56:25 2011 (r218967) > > @@ -153,7 +153,7 @@ create_thread(struct thread *td, mcontex > > p = td->td_proc; > > > > /* Have race condition but it is cheap. */ > > - if (p->p_numthreads >= max_threads_per_proc) { > > + if (p->p_numthreads > max_threads_per_proc) { > > ++max_threads_hits; > > return (EPROCLIM); > > } > > I do not think there was off by one error. The create_thread() function > is called to create new thread, and before the process thread counter > is incremented in thread_link(). The old test tried to not allow more > then max_threads_per_proc threads in a process, now it allows to > create max_threads_per_proc. > > My guess is that the reference to mentioned pthread_vfork_test failed > because reporter set kern.threads.max_threads_per_proc to 100. The > test actually tries to create 101 threads, 1 main + 100 new. Ugh, pointy hat to me for jumping on this too quickly. I will revert. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 13:50:25 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C110106566C; Wed, 23 Feb 2011 13:50:25 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 305508FC13; Wed, 23 Feb 2011 13:50:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NDoPlG069545; Wed, 23 Feb 2011 13:50:25 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NDoPO1069542; Wed, 23 Feb 2011 13:50:25 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201102231350.p1NDoPO1069542@svn.freebsd.org> From: Konstantin Belousov Date: Wed, 23 Feb 2011 13:50:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218972 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 13:50:25 -0000 Author: kib Date: Wed Feb 23 13:50:24 2011 New Revision: 218972 URL: http://svn.freebsd.org/changeset/base/218972 Log: Move the max_threads_per_proc and max_threads_hits variables to the file where they are used. Declare the kern.threads sysctl node at the same location. Since no external use for the variables exists, make them static. Discussed with: dchagin MFC after: 1 week Modified: head/sys/kern/kern_thr.c head/sys/kern/kern_thread.c Modified: head/sys/kern/kern_thr.c ============================================================================== --- head/sys/kern/kern_thr.c Wed Feb 23 13:25:42 2011 (r218971) +++ head/sys/kern/kern_thr.c Wed Feb 23 13:50:24 2011 (r218972) @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -56,6 +57,16 @@ __FBSDID("$FreeBSD$"); #include +SYSCTL_NODE(_kern, OID_AUTO, threads, CTLFLAG_RW, 0, "thread allocation"); + +static int max_threads_per_proc = 1500; +SYSCTL_INT(_kern_threads, OID_AUTO, max_threads_per_proc, CTLFLAG_RW, + &max_threads_per_proc, 0, "Limit on threads per proc"); + +static int max_threads_hits; +SYSCTL_INT(_kern_threads, OID_AUTO, max_threads_hits, CTLFLAG_RD, + &max_threads_hits, 0, ""); + #ifdef COMPAT_FREEBSD32 static inline int @@ -74,9 +85,6 @@ suword_lwpid(void *addr, lwpid_t lwpid) #define suword_lwpid suword #endif -extern int max_threads_per_proc; -extern int max_threads_hits; - static int create_thread(struct thread *td, mcontext_t *ctx, void (*start_func)(void *), void *arg, char *stack_base, size_t stack_size, Modified: head/sys/kern/kern_thread.c ============================================================================== --- head/sys/kern/kern_thread.c Wed Feb 23 13:25:42 2011 (r218971) +++ head/sys/kern/kern_thread.c Wed Feb 23 13:50:24 2011 (r218972) @@ -65,16 +65,6 @@ __FBSDID("$FreeBSD$"); */ static uma_zone_t thread_zone; -SYSCTL_NODE(_kern, OID_AUTO, threads, CTLFLAG_RW, 0, "thread allocation"); - -int max_threads_per_proc = 1500; -SYSCTL_INT(_kern_threads, OID_AUTO, max_threads_per_proc, CTLFLAG_RW, - &max_threads_per_proc, 0, "Limit on threads per proc"); - -int max_threads_hits; -SYSCTL_INT(_kern_threads, OID_AUTO, max_threads_hits, CTLFLAG_RD, - &max_threads_hits, 0, ""); - TAILQ_HEAD(, thread) zombie_threads = TAILQ_HEAD_INITIALIZER(zombie_threads); static struct mtx zombie_lock; MTX_SYSINIT(zombie_lock, &zombie_lock, "zombie lock", MTX_SPIN); From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 13:51:42 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E8251065672; Wed, 23 Feb 2011 13:51:42 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1CEB98FC17; Wed, 23 Feb 2011 13:51:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NDpgo1069954; Wed, 23 Feb 2011 13:51:42 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NDpfrF069951; Wed, 23 Feb 2011 13:51:41 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201102231351.p1NDpfrF069951@svn.freebsd.org> From: Nathan Whitehorn Date: Wed, 23 Feb 2011 13:51:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218973 - head/usr.sbin/bsdinstall/partedit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 13:51:42 -0000 Author: nwhitehorn Date: Wed Feb 23 13:51:41 2011 New Revision: 218973 URL: http://svn.freebsd.org/changeset/base/218973 Log: Add a catch-all for miscellaneous RAID volumes while seeking a better solution here. It would really help if CAM devices were part of newbus. Modified: head/usr.sbin/bsdinstall/partedit/part_wizard.c Modified: head/usr.sbin/bsdinstall/partedit/part_wizard.c ============================================================================== --- head/usr.sbin/bsdinstall/partedit/part_wizard.c Wed Feb 23 13:50:24 2011 (r218972) +++ head/usr.sbin/bsdinstall/partedit/part_wizard.c Wed Feb 23 13:51:41 2011 (r218973) @@ -127,7 +127,8 @@ boot_disk(struct gmesh *mesh) else if (strncmp(pp->lg_name, "cd", 2) == 0) { n--; continue; - } + } else + strcat(diskdesc, " Hard Disk"); disks[n-1].text = strdup(diskdesc); disks[n-1].help = NULL; disks[n-1].state = 0; From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 13:57:34 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1233) id D1A7E106564A; Wed, 23 Feb 2011 13:57:34 +0000 (UTC) Date: Wed, 23 Feb 2011 13:57:34 +0000 From: Alexander Best To: Kostik Belousov Message-ID: <20110223135734.GA62693@freebsd.org> References: <201102231256.p1NCuPHN056220@svn.freebsd.org> <20110223131228.GN78089@deviant.kiev.zoral.com.ua> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110223131228.GN78089@deviant.kiev.zoral.com.ua> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, John Baldwin Subject: Re: svn commit: r218967 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 13:57:34 -0000 On Wed Feb 23 11, Kostik Belousov wrote: > On Wed, Feb 23, 2011 at 12:56:25PM +0000, John Baldwin wrote: > > Author: jhb > > Date: Wed Feb 23 12:56:25 2011 > > New Revision: 218967 > > URL: http://svn.freebsd.org/changeset/base/218967 > > > > Log: > > Fix off-by-one error in check against max_threads_per_proc. > > > > Submitted by: arundel > > MFC after: 1 week > > > > Modified: > > head/sys/kern/kern_thr.c > > > > Modified: head/sys/kern/kern_thr.c > > ============================================================================== > > --- head/sys/kern/kern_thr.c Wed Feb 23 10:28:37 2011 (r218966) > > +++ head/sys/kern/kern_thr.c Wed Feb 23 12:56:25 2011 (r218967) > > @@ -153,7 +153,7 @@ create_thread(struct thread *td, mcontex > > p = td->td_proc; > > > > /* Have race condition but it is cheap. */ > > - if (p->p_numthreads >= max_threads_per_proc) { > > + if (p->p_numthreads > max_threads_per_proc) { > > ++max_threads_hits; > > return (EPROCLIM); > > } > > I do not think there was off by one error. The create_thread() function > is called to create new thread, and before the process thread counter > is incremented in thread_link(). The old test tried to not allow more > then max_threads_per_proc threads in a process, now it allows to > create max_threads_per_proc. doesn't the semantics of the term "maximum" imply that it's own value is also valid? if a sign says maximum weight 2000kg, does that mean that a weight of 2000kg is invalid and the highest valid weight is 1999,999..kg? cheers. alex > > My guess is that the reference to mentioned pthread_vfork_test failed > because reporter set kern.threads.max_threads_per_proc to 100. The > test actually tries to create 101 threads, 1 main + 100 new. so the main process counts as 1 thread and for each pthread_create invokation the thread number gets bumped up? so with a process doing a single pthread_create() that would imply this process is having a thread count of 2? cheers. alex -- a13x From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 14:21:13 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7B2F106566C; Wed, 23 Feb 2011 14:21:12 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 80BE38FC16; Wed, 23 Feb 2011 14:21:11 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id p1NEL8Da022132 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 23 Feb 2011 16:21:08 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id p1NEL8X0069229; Wed, 23 Feb 2011 16:21:08 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id p1NEL8LD069228; Wed, 23 Feb 2011 16:21:08 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 23 Feb 2011 16:21:08 +0200 From: Kostik Belousov To: Alexander Best Message-ID: <20110223142108.GP78089@deviant.kiev.zoral.com.ua> References: <201102231256.p1NCuPHN056220@svn.freebsd.org> <20110223131228.GN78089@deviant.kiev.zoral.com.ua> <20110223135734.GA62693@freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="DBuGsi2uG0e/X7y+" Content-Disposition: inline In-Reply-To: <20110223135734.GA62693@freebsd.org> User-Agent: Mutt/1.4.2.3i X-Spam-Status: No, score=-3.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, John Baldwin Subject: Re: svn commit: r218967 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 14:21:13 -0000 --DBuGsi2uG0e/X7y+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Feb 23, 2011 at 01:57:34PM +0000, Alexander Best wrote: > On Wed Feb 23 11, Kostik Belousov wrote: > > On Wed, Feb 23, 2011 at 12:56:25PM +0000, John Baldwin wrote: > > > Author: jhb > > > Date: Wed Feb 23 12:56:25 2011 > > > New Revision: 218967 > > > URL: http://svn.freebsd.org/changeset/base/218967 > > >=20 > > > Log: > > > Fix off-by-one error in check against max_threads_per_proc. > > > =20 > > > Submitted by: arundel > > > MFC after: 1 week > > >=20 > > > Modified: > > > head/sys/kern/kern_thr.c > > >=20 > > > Modified: head/sys/kern/kern_thr.c > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- head/sys/kern/kern_thr.c Wed Feb 23 10:28:37 2011 (r218966) > > > +++ head/sys/kern/kern_thr.c Wed Feb 23 12:56:25 2011 (r218967) > > > @@ -153,7 +153,7 @@ create_thread(struct thread *td, mcontex > > > p =3D td->td_proc; > > > =20 > > > /* Have race condition but it is cheap. */ > > > - if (p->p_numthreads >=3D max_threads_per_proc) { > > > + if (p->p_numthreads > max_threads_per_proc) { > > > ++max_threads_hits; > > > return (EPROCLIM); > > > } > >=20 > > I do not think there was off by one error. The create_thread() function > > is called to create new thread, and before the process thread counter > > is incremented in thread_link(). The old test tried to not allow more > > then max_threads_per_proc threads in a process, now it allows to > > create max_threads_per_proc. >=20 > doesn't the semantics of the term "maximum" imply that it's own value is = also > valid? >=20 > if a sign says maximum weight 2000kg, does that mean that a weight of 200= 0kg is > invalid and the highest valid weight is 1999,999..kg? >=20 > cheers. > alex >=20 > >=20 > > My guess is that the reference to mentioned pthread_vfork_test failed > > because reporter set kern.threads.max_threads_per_proc to 100. The > > test actually tries to create 101 threads, 1 main + 100 new. >=20 > so the main process counts as 1 thread and for each pthread_create > invokation the thread number gets bumped up? > > so with a process doing a single pthread_create() that would imply > this process is having a thread count of 2? Exactly. The main thread is the same as all others (almost). --DBuGsi2uG0e/X7y+ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEARECAAYFAk1lF9QACgkQC3+MBN1Mb4g+MQCgjRyvNrHbQ4WJzkiCdct3PnCg 508AnRbAkskgu0FA6K4L1HhLhqXyYSzJ =ML2p -----END PGP SIGNATURE----- --DBuGsi2uG0e/X7y+-- From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 14:22:35 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4C632106566C; Wed, 23 Feb 2011 14:22:35 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe01.c2i.net [212.247.154.2]) by mx1.freebsd.org (Postfix) with ESMTP id 363FF8FC18; Wed, 23 Feb 2011 14:22:33 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.1 cv=Vlw5OJcoxCC473z5moizI40ESYe+BpcMN2hU0iQoJwI= c=1 sm=1 a=RYRI7fz3UMUA:10 a=N659UExz7-8A:10 a=CL8lFSKtTFcA:10 a=i9M/sDlu2rpZ9XS819oYzg==:17 a=6I5d2MoRAAAA:8 a=a1r7yMRcHH9g8YGSE6wA:9 a=lw16Ru0DRNIL3o3H9-jNLSPc8UsA:4 a=pILNOxqGKmIA:10 a=i9M/sDlu2rpZ9XS819oYzg==:117 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mailfe01.swip.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.1 X-TFF-CGPSA-Version: 1.7 X-T2-CGPSA-Filter: Scanned Received: from [188.126.198.129] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe01.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 92284064; Wed, 23 Feb 2011 15:22:20 +0100 From: Hans Petter Selasky To: Alexander Best Date: Wed, 23 Feb 2011 15:22:02 +0100 User-Agent: KMail/1.13.5 (FreeBSD/8.2-PRERELEASE; KDE/4.4.5; amd64; ; ) References: <20110223131228.GN78089@deviant.kiev.zoral.com.ua> <20110223135734.GA62693@freebsd.org> In-Reply-To: <20110223135734.GA62693@freebsd.org> X-Face: *nPdTl_}RuAI6^PVpA02T?$%Xa^>@hE0uyUIoiha$pC:9TVgl.Oq, NwSZ4V"|LR.+tj}g5 %V,x^qOs~mnU3]Gn; cQLv&.N>TrxmSFf+p6(30a/{)KUU!s}w\IhQBj}[g}bj0I3^glmC( :AuzV9:.hESm-x4h240C`9=w MIME-Version: 1.0 Content-Type: Text/Plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Message-Id: <201102231522.02362.hselasky@c2i.net> Cc: Kostik Belousov , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , John Baldwin Subject: Re: svn commit: r218967 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 14:22:35 -0000 On Wednesday 23 February 2011 14:57:34 Alexander Best wrote: > On Wed Feb 23 11, Kostik Belousov wrote: > > On Wed, Feb 23, 2011 at 12:56:25PM +0000, John Baldwin wrote: > > > Author: jhb > > > Date: Wed Feb 23 12:56:25 2011 > > > New Revision: 218967 > > > URL: http://svn.freebsd.org/changeset/base/218967 > > > > > > Log: > > > Fix off-by-one error in check against max_threads_per_proc. > > > > > > Submitted by: arundel > > > MFC after: 1 week > > > > > > Modified: > > > head/sys/kern/kern_thr.c > > > > > > Modified: head/sys/kern/kern_thr.c > > > ======================================================================= > > > ======= --- head/sys/kern/kern_thr.c Wed Feb 23 10:28:37 2011 (r218966) > > > +++ head/sys/kern/kern_thr.c Wed Feb 23 12:56:25 2011 (r218967) @@ > > > -153,7 +153,7 @@ create_thread(struct thread *td, mcontex > > > > > > p = td->td_proc; > > > > > > /* Have race condition but it is cheap. */ > > > > > > - if (p->p_numthreads >= max_threads_per_proc) { > > > + if (p->p_numthreads > max_threads_per_proc) { > > > > > > ++max_threads_hits; > > > return (EPROCLIM); > > > > > > } > > > > I do not think there was off by one error. The create_thread() function > > is called to create new thread, and before the process thread counter > > is incremented in thread_link(). The old test tried to not allow more > > then max_threads_per_proc threads in a process, now it allows to > > create max_threads_per_proc. > > doesn't the semantics of the term "maximum" imply that it's own value is > also valid? > > if a sign says maximum weight 2000kg, does that mean that a weight of > 2000kg is invalid and the highest valid weight is 1999,999..kg? Hi, The sign should have used terms like EQ and GTE and LTE and a granularity. Obviously not all people writing important numerical information are programmers ;-) --HPS From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 14:30:13 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1233) id 2DD8A1065670; Wed, 23 Feb 2011 14:30:13 +0000 (UTC) Date: Wed, 23 Feb 2011 14:30:13 +0000 From: Alexander Best To: Kostik Belousov Message-ID: <20110223143013.GA67074@freebsd.org> References: <201102231256.p1NCuPHN056220@svn.freebsd.org> <20110223131228.GN78089@deviant.kiev.zoral.com.ua> <20110223135734.GA62693@freebsd.org> <20110223142108.GP78089@deviant.kiev.zoral.com.ua> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110223142108.GP78089@deviant.kiev.zoral.com.ua> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, John Baldwin Subject: Re: svn commit: r218967 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 14:30:13 -0000 On Wed Feb 23 11, Kostik Belousov wrote: > On Wed, Feb 23, 2011 at 01:57:34PM +0000, Alexander Best wrote: > > On Wed Feb 23 11, Kostik Belousov wrote: > > > On Wed, Feb 23, 2011 at 12:56:25PM +0000, John Baldwin wrote: > > > > Author: jhb > > > > Date: Wed Feb 23 12:56:25 2011 > > > > New Revision: 218967 > > > > URL: http://svn.freebsd.org/changeset/base/218967 > > > > > > > > Log: > > > > Fix off-by-one error in check against max_threads_per_proc. > > > > > > > > Submitted by: arundel > > > > MFC after: 1 week > > > > > > > > Modified: > > > > head/sys/kern/kern_thr.c > > > > > > > > Modified: head/sys/kern/kern_thr.c > > > > ============================================================================== > > > > --- head/sys/kern/kern_thr.c Wed Feb 23 10:28:37 2011 (r218966) > > > > +++ head/sys/kern/kern_thr.c Wed Feb 23 12:56:25 2011 (r218967) > > > > @@ -153,7 +153,7 @@ create_thread(struct thread *td, mcontex > > > > p = td->td_proc; > > > > > > > > /* Have race condition but it is cheap. */ > > > > - if (p->p_numthreads >= max_threads_per_proc) { > > > > + if (p->p_numthreads > max_threads_per_proc) { > > > > ++max_threads_hits; > > > > return (EPROCLIM); > > > > } > > > > > > I do not think there was off by one error. The create_thread() function > > > is called to create new thread, and before the process thread counter > > > is incremented in thread_link(). The old test tried to not allow more > > > then max_threads_per_proc threads in a process, now it allows to > > > create max_threads_per_proc. > > > > doesn't the semantics of the term "maximum" imply that it's own value is also > > valid? > > > > if a sign says maximum weight 2000kg, does that mean that a weight of 2000kg is > > invalid and the highest valid weight is 1999,999..kg? > > > > cheers. > > alex > > > > > > > > My guess is that the reference to mentioned pthread_vfork_test failed > > > because reporter set kern.threads.max_threads_per_proc to 100. The > > > test actually tries to create 101 threads, 1 main + 100 new. > > > > so the main process counts as 1 thread and for each pthread_create > > invokation the thread number gets bumped up? > > > > so with a process doing a single pthread_create() that would imply > > this process is having a thread count of 2? > > Exactly. The main thread is the same as all others (almost). thanks for the hint. i wasn't aware of that. however now proctsta -akk also displaying a thread id for a process with no additional threads makes a lot more sense. ;) so in theory: kern.threads.max_threads_per_proc=0 and kern.threads.max_threads_per_proc=1 both forbid a process to trigger any new threads. cheers. alex -- a13x From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 14:35:25 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1233) id 19F901065675; Wed, 23 Feb 2011 14:35:25 +0000 (UTC) Date: Wed, 23 Feb 2011 14:35:25 +0000 From: Alexander Best To: Hans Petter Selasky Message-ID: <20110223143525.GA67908@freebsd.org> References: <20110223131228.GN78089@deviant.kiev.zoral.com.ua> <20110223135734.GA62693@freebsd.org> <201102231522.02362.hselasky@c2i.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201102231522.02362.hselasky@c2i.net> Cc: Kostik Belousov , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , John Baldwin Subject: Re: svn commit: r218967 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 14:35:25 -0000 On Wed Feb 23 11, Hans Petter Selasky wrote: > On Wednesday 23 February 2011 14:57:34 Alexander Best wrote: > > On Wed Feb 23 11, Kostik Belousov wrote: > > > On Wed, Feb 23, 2011 at 12:56:25PM +0000, John Baldwin wrote: > > > > Author: jhb > > > > Date: Wed Feb 23 12:56:25 2011 > > > > New Revision: 218967 > > > > URL: http://svn.freebsd.org/changeset/base/218967 > > > > > > > > Log: > > > > Fix off-by-one error in check against max_threads_per_proc. > > > > > > > > Submitted by: arundel > > > > MFC after: 1 week > > > > > > > > Modified: > > > > head/sys/kern/kern_thr.c > > > > > > > > Modified: head/sys/kern/kern_thr.c > > > > ======================================================================= > > > > ======= --- head/sys/kern/kern_thr.c Wed Feb 23 10:28:37 2011 > (r218966) > > > > +++ head/sys/kern/kern_thr.c Wed Feb 23 12:56:25 2011 (r218967) @@ > > > > -153,7 +153,7 @@ create_thread(struct thread *td, mcontex > > > > > > > > p = td->td_proc; > > > > > > > > /* Have race condition but it is cheap. */ > > > > > > > > - if (p->p_numthreads >= max_threads_per_proc) { > > > > + if (p->p_numthreads > max_threads_per_proc) { > > > > > > > > ++max_threads_hits; > > > > return (EPROCLIM); > > > > > > > > } > > > > > > I do not think there was off by one error. The create_thread() function > > > is called to create new thread, and before the process thread counter > > > is incremented in thread_link(). The old test tried to not allow more > > > then max_threads_per_proc threads in a process, now it allows to > > > create max_threads_per_proc. > > > > doesn't the semantics of the term "maximum" imply that it's own value is > > also valid? > > > > if a sign says maximum weight 2000kg, does that mean that a weight of > > 2000kg is invalid and the highest valid weight is 1999,999..kg? > > Hi, > > The sign should have used terms like EQ and GTE and LTE and a granularity. > Obviously not all people writing important numerical information are > programmers ;-) *hehehe* well they don't (at least in this country): http://upload.wikimedia.org/wikipedia/commons/9/94/Zeichen_262.svg this sign includes the maximum of 5500kg and thus implies GT. cheers. alex > > --HPS -- a13x From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 17:17:05 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1C71106566C; Wed, 23 Feb 2011 17:17:05 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C0B648FC19; Wed, 23 Feb 2011 17:17:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NHH5fX001492; Wed, 23 Feb 2011 17:17:05 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NHH5q7001489; Wed, 23 Feb 2011 17:17:05 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102231717.p1NHH5q7001489@svn.freebsd.org> From: Bruce Cran Date: Wed, 23 Feb 2011 17:17:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218974 - in head/sys/boot: common efi/libefi X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 17:17:05 -0000 Author: brucec Date: Wed Feb 23 17:17:05 2011 New Revision: 218974 URL: http://svn.freebsd.org/changeset/base/218974 Log: Handle memory allocation failures in include(). PR: i386/85652 Submitted by: Ben Thomas MFC after: 3 days Modified: head/sys/boot/common/interp.c head/sys/boot/efi/libefi/efipart.c Modified: head/sys/boot/common/interp.c ============================================================================== --- head/sys/boot/common/interp.c Wed Feb 23 13:51:41 2011 (r218973) +++ head/sys/boot/common/interp.c Wed Feb 23 17:17:05 2011 (r218974) @@ -246,6 +246,17 @@ include(const char *filename) if (*cp == '\0') continue; /* ignore empty line, save memory */ sp = malloc(sizeof(struct includeline) + strlen(cp) + 1); + /* On malloc failure (it happens!), free as much as possible and exit */ + if (sp == NULL) { + while (script != NULL) { + se = script; + script = script->next; + free(se); + } + sprintf(command_errbuf, "file '%s' line %d: memory allocation " + "failure - aborting\n", filename, line); + return (CMD_ERROR); + } strcpy(sp->text, cp); #ifndef BOOT_FORTH sp->flags = flags; Modified: head/sys/boot/efi/libefi/efipart.c ============================================================================== --- head/sys/boot/efi/libefi/efipart.c Wed Feb 23 13:51:41 2011 (r218973) +++ head/sys/boot/efi/libefi/efipart.c Wed Feb 23 17:17:05 2011 (r218974) @@ -204,7 +204,7 @@ efipart_readwrite(EFI_BLOCK_IO *blkio, i } if (EFI_ERROR(status)) - printf("%s: rw=%d, status=%lu\n", __func__, rw, status); + printf("%s: rw=%d, status=%u\n", __func__, rw, status); return (efi_status_to_errno(status)); } From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 17:20:00 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B20CB106566C; Wed, 23 Feb 2011 17:20:00 +0000 (UTC) (envelope-from bruce@cran.org.uk) Received: from muon.cran.org.uk (unknown [IPv6:2a01:348:0:15:5d59:5c40:0:1]) by mx1.freebsd.org (Postfix) with ESMTP id 61F3B8FC12; Wed, 23 Feb 2011 17:20:00 +0000 (UTC) Received: from muon.cran.org.uk (localhost [127.0.0.1]) by muon.cran.org.uk (Postfix) with ESMTP id 95E3BE8C0C; Wed, 23 Feb 2011 17:19:57 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=cran.org.uk; h=subject :from:to:cc:in-reply-to:references:content-type:date:message-id :mime-version:content-transfer-encoding; s=mail; bh=LUZsotW33wSx HsCmhi+7gQmpI8A=; b=yLZ0qZbcyY7jJxC18i5xu6eZofK9e2ajuxs0k7XgkPrL mLTCiOTIa1Jy0tUfzyOQpxl8mN1MpCijTL0SWiZt72CqeEIhkh/oPvK3/77mBced zWE3qYpj53UA0YtDrLE/M47MvsqQvT4ObbAvEkvCn8pi11KXF50WTnvcih4pb3g= DomainKey-Signature: a=rsa-sha1; c=nofws; d=cran.org.uk; h=subject:from :to:cc:in-reply-to:references:content-type:date:message-id :mime-version:content-transfer-encoding; q=dns; s=mail; b=SDnlps pcD7rm5d+lm1uV97SEgFsx9S3soNlAyGW3VS3kg/fap6lQfVNpZyPv41anFGemSe W3yvYo0yGXrn8SQJvNMmkIeKqP4JIR0aBS0p0hNv10uvHcfp7YEAoCln+CozhxW5 9nzAAnMiFVMy0i7dv760dMZTuYkh1+lHcfRoQ= Received: from [192.168.0.10] (client-86-31-236-253.oxfd.adsl.virginmedia.com [86.31.236.253]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by muon.cran.org.uk (Postfix) with ESMTPSA id 495B6E8BA7; Wed, 23 Feb 2011 17:19:57 +0000 (GMT) From: Bruce Cran To: Bruce Cran In-Reply-To: <201102231717.p1NHH5q7001489@svn.freebsd.org> References: <201102231717.p1NHH5q7001489@svn.freebsd.org> Content-Type: text/plain; charset="us-ascii" Date: Wed, 23 Feb 2011 17:19:53 +0000 Message-ID: <1298481593.2895.8.camel@core.nessbank> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218974 - in head/sys/boot: common efi/libefi X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 17:20:00 -0000 On Wed, 2011-02-23 at 17:17 +0000, Bruce Cran wrote: > Author: brucec > Date: Wed Feb 23 17:17:05 2011 > New Revision: 218974 > URL: http://svn.freebsd.org/changeset/base/218974 > > Log: > Handle memory allocation failures in include(). > > if (EFI_ERROR(status)) > - printf("%s: rw=%d, status=%lu\n", __func__, rw, status); > + printf("%s: rw=%d, status=%u\n", __func__, rw, status); > return (efi_status_to_errno(status)); > } I accidentally included this unrelated change too - 'status' is of type unsigned int, not unsigned long. -- Bruce Cran From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 17:52:26 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B1E1106564A; Wed, 23 Feb 2011 17:52:26 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 59F838FC0C; Wed, 23 Feb 2011 17:52:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NHqQ7f002370; Wed, 23 Feb 2011 17:52:26 GMT (envelope-from jpaetzel@svn.freebsd.org) Received: (from jpaetzel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NHqQkB002368; Wed, 23 Feb 2011 17:52:26 GMT (envelope-from jpaetzel@svn.freebsd.org) Message-Id: <201102231752.p1NHqQkB002368@svn.freebsd.org> From: Josh Paetzel Date: Wed, 23 Feb 2011 17:52:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218975 - head/usr.sbin/pc-sysinstall/backend-query X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 17:52:26 -0000 Author: jpaetzel Date: Wed Feb 23 17:52:26 2011 New Revision: 218975 URL: http://svn.freebsd.org/changeset/base/218975 Log: Alter comment to reflect change in code. Try atacontrol if camcontrol fails. Approved by: kib (mentor, implicit) Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh ============================================================================== --- head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Wed Feb 23 17:17:05 2011 (r218974) +++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Wed Feb 23 17:52:26 2011 (r218975) @@ -73,10 +73,15 @@ do esac fi - # Check the dmesg output for some more info about this device - NEWLINE=$(camcontrol identify $DEV | grep "device model" | tr -s ' ' | sed 's |device model ||g') + # Try and find some identification information with camcontrol or atacontrol + NEWLINE=$(camcontrol identify $DEV | sed -ne 's/^device model *//p') if [ -z "$NEWLINE" ]; then - NEWLINE=" " + # Now try atacontrol + NEWLINE=$(atacontrol list | sed -n "s|^.*$DEV <\(.*\)>.*|\1|p") + + if [ -z "$NEWLINE" ]; then + NEWLINE=" " + fi fi if [ -n "${FLAGS_MD}" ] && echo "${DEV}" | grep -E '^md[0-9]+' >/dev/null 2>/dev/null From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 18:22:40 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D9C9106566B; Wed, 23 Feb 2011 18:22:40 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7CC948FC0A; Wed, 23 Feb 2011 18:22:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NIMeRC003139; Wed, 23 Feb 2011 18:22:40 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NIMexR003137; Wed, 23 Feb 2011 18:22:40 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201102231822.p1NIMexR003137@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 23 Feb 2011 18:22:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218976 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 18:22:40 -0000 Author: pluknet Date: Wed Feb 23 18:22:40 2011 New Revision: 218976 URL: http://svn.freebsd.org/changeset/base/218976 Log: Clean up the now unused #include statement. Approved by: kib (mentor) MFC after: 1 week X-MFC with: r218972 Modified: head/sys/kern/kern_thread.c Modified: head/sys/kern/kern_thread.c ============================================================================== --- head/sys/kern/kern_thread.c Wed Feb 23 17:52:26 2011 (r218975) +++ head/sys/kern/kern_thread.c Wed Feb 23 18:22:40 2011 (r218976) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 19:14:40 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F12E2106566C; Wed, 23 Feb 2011 19:14:39 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail01.syd.optusnet.com.au (mail01.syd.optusnet.com.au [211.29.132.182]) by mx1.freebsd.org (Postfix) with ESMTP id 8AC1F8FC17; Wed, 23 Feb 2011 19:14:39 +0000 (UTC) Received: from c122-107-114-89.carlnfd1.nsw.optusnet.com.au (c122-107-114-89.carlnfd1.nsw.optusnet.com.au [122.107.114.89]) by mail01.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id p1NJEap2006958 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 24 Feb 2011 06:14:37 +1100 Date: Thu, 24 Feb 2011 06:14:36 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Alexander Best In-Reply-To: <20110223135734.GA62693@freebsd.org> Message-ID: <20110224060300.S1008@besplex.bde.org> References: <201102231256.p1NCuPHN056220@svn.freebsd.org> <20110223131228.GN78089@deviant.kiev.zoral.com.ua> <20110223135734.GA62693@freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Kostik Belousov , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, John Baldwin Subject: Re: svn commit: r218967 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 19:14:40 -0000 On Wed, 23 Feb 2011, Alexander Best wrote: > On Wed Feb 23 11, Kostik Belousov wrote: >> On Wed, Feb 23, 2011 at 12:56:25PM +0000, John Baldwin wrote: >>> ... >>> Log: >>> Fix off-by-one error in check against max_threads_per_proc. >>> >>> Submitted by: arundel >>> MFC after: 1 week >>> >>> Modified: >>> head/sys/kern/kern_thr.c >>> >>> Modified: head/sys/kern/kern_thr.c >>> ============================================================================== >>> --- head/sys/kern/kern_thr.c Wed Feb 23 10:28:37 2011 (r218966) >>> +++ head/sys/kern/kern_thr.c Wed Feb 23 12:56:25 2011 (r218967) >>> @@ -153,7 +153,7 @@ create_thread(struct thread *td, mcontex >>> p = td->td_proc; >>> >>> /* Have race condition but it is cheap. */ >>> - if (p->p_numthreads >= max_threads_per_proc) { >>> + if (p->p_numthreads > max_threads_per_proc) { >>> ++max_threads_hits; >>> return (EPROCLIM); >>> } >> >> I do not think there was off by one error. The create_thread() function >> is called to create new thread, and before the process thread counter >> is incremented in thread_link(). The old test tried to not allow more >> then max_threads_per_proc threads in a process, now it allows to >> create max_threads_per_proc. Actually, now it allows to create 1 more than max_threads_per_proc threads in a process. > doesn't the semantics of the term "maximum" imply that it's own value is also > valid? Yes. Not 1 more. > if a sign says maximum weight 2000kg, does that mean that a weight of 2000kg is > invalid and the highest valid weight is 1999,999..kg? No. This means that if weights are always in units of kg, and are represented by indexes starting at index 0, then the highest valid index is 1999. But if the index is a count of the number of kg's, then the highest valud index is 2000. p->p_numthreads presumably matches its name, so it is a count of a number of threads and not a thread number. Bruce From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 21:17:38 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EEB61106564A; Wed, 23 Feb 2011 21:17:38 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DD9A78FC12; Wed, 23 Feb 2011 21:17:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NLHcci011681; Wed, 23 Feb 2011 21:17:38 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NLHcuE011679; Wed, 23 Feb 2011 21:17:38 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201102232117.p1NLHcuE011679@svn.freebsd.org> From: Dimitry Andric Date: Wed, 23 Feb 2011 21:17:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218984 - head/lib/librt X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 21:17:39 -0000 Author: dim Date: Wed Feb 23 21:17:38 2011 New Revision: 218984 URL: http://svn.freebsd.org/changeset/base/218984 Log: Fix the 32-bit build stage on amd64 when WITH_CTF is enabled. It seems ctfconvert will corrupt object files that are compiled with -g, if it is not run with -g itself. To fix it, remove -g from CFLAGS in lib/librt/Makefile. If you need to compile this library with debug info, use DEBUG_FLAGS=-g instead, which will work correctly, even when using WITH_CTF. Modified: head/lib/librt/Makefile Modified: head/lib/librt/Makefile ============================================================================== --- head/lib/librt/Makefile Wed Feb 23 20:50:42 2011 (r218983) +++ head/lib/librt/Makefile Wed Feb 23 21:17:38 2011 (r218984) @@ -6,7 +6,7 @@ CFLAGS+=-I${.CURDIR}/../libc/include -I$ .ifndef NO_THREAD_STACK_UNWIND CFLAGS+=-fexceptions .endif -CFLAGS+=-Winline -Wall -g +CFLAGS+=-Winline -Wall DPADD= ${LIBPTHREAD} LDADD= -lpthread From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 21:18:38 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1233) id 494701065673; Wed, 23 Feb 2011 21:18:38 +0000 (UTC) Date: Wed, 23 Feb 2011 21:18:38 +0000 From: Alexander Best To: Bruce Evans Message-ID: <20110223211838.GA27997@freebsd.org> References: <201102231256.p1NCuPHN056220@svn.freebsd.org> <20110223131228.GN78089@deviant.kiev.zoral.com.ua> <20110223135734.GA62693@freebsd.org> <20110224060300.S1008@besplex.bde.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110224060300.S1008@besplex.bde.org> Cc: Kostik Belousov , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, John Baldwin Subject: Re: svn commit: r218967 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 21:18:38 -0000 On Thu Feb 24 11, Bruce Evans wrote: > On Wed, 23 Feb 2011, Alexander Best wrote: > > >On Wed Feb 23 11, Kostik Belousov wrote: > >>On Wed, Feb 23, 2011 at 12:56:25PM +0000, John Baldwin wrote: > >>>... > >>>Log: > >>> Fix off-by-one error in check against max_threads_per_proc. > >>> > >>> Submitted by: arundel > >>> MFC after: 1 week > >>> > >>>Modified: > >>> head/sys/kern/kern_thr.c > >>> > >>>Modified: head/sys/kern/kern_thr.c > >>>============================================================================== > >>>--- head/sys/kern/kern_thr.c Wed Feb 23 10:28:37 2011 (r218966) > >>>+++ head/sys/kern/kern_thr.c Wed Feb 23 12:56:25 2011 (r218967) > >>>@@ -153,7 +153,7 @@ create_thread(struct thread *td, mcontex > >>> p = td->td_proc; > >>> > >>> /* Have race condition but it is cheap. */ > >>>- if (p->p_numthreads >= max_threads_per_proc) { > >>>+ if (p->p_numthreads > max_threads_per_proc) { > >>> ++max_threads_hits; > >>> return (EPROCLIM); > >>> } > >> > >>I do not think there was off by one error. The create_thread() function > >>is called to create new thread, and before the process thread counter > >>is incremented in thread_link(). The old test tried to not allow more > >>then max_threads_per_proc threads in a process, now it allows to > >>create max_threads_per_proc. > > Actually, now it allows to create 1 more than max_threads_per_proc threads > in a process. > > >doesn't the semantics of the term "maximum" imply that it's own value is > >also > >valid? > > Yes. Not 1 more. the misconception on my side was that i thought a process had an initial thread count of zero. however since a process itself counts as a single thread and has a thread id, it's now obvious to me that with max_threads_per_proc=15000 a process should only be allowed to spawn 14999 new threads. thanks for clearing things up for the n3wb. ;) cheers. alex > > >if a sign says maximum weight 2000kg, does that mean that a weight of > >2000kg is > >invalid and the highest valid weight is 1999,999..kg? > > No. This means that if weights are always in units of kg, and are > represented > by indexes starting at index 0, then the highest valid index is 1999. But > if the index is a count of the number of kg's, then the highest valud index > is 2000. > > p->p_numthreads presumably matches its name, so it is a count of a number > of threads and not a thread number. > > Bruce -- a13x From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 21:20:26 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from [127.0.0.1] (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by hub.freebsd.org (Postfix) with ESMTP id D8DE5106564A; Wed, 23 Feb 2011 21:20:25 +0000 (UTC) (envelope-from jkim@FreeBSD.org) From: Jung-uk Kim To: src-committers@FreeBSD.org Date: Wed, 23 Feb 2011 16:20:17 -0500 User-Agent: KMail/1.6.2 References: <201102232117.p1NLHcuE011679@svn.freebsd.org> In-Reply-To: <201102232117.p1NLHcuE011679@svn.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201102231620.19755.jkim@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Dimitry Andric Subject: Re: svn commit: r218984 - head/lib/librt X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 21:20:26 -0000 On Wednesday 23 February 2011 04:17 pm, Dimitry Andric wrote: > Author: dim > Date: Wed Feb 23 21:17:38 2011 > New Revision: 218984 > URL: http://svn.freebsd.org/changeset/base/218984 > > Log: > Fix the 32-bit build stage on amd64 when WITH_CTF is enabled. It > seems ctfconvert will corrupt object files that are compiled with > -g, if it is not run with -g itself. > > To fix it, remove -g from CFLAGS in lib/librt/Makefile. If you > need to compile this library with debug info, use DEBUG_FLAGS=-g > instead, which will work correctly, even when using WITH_CTF. > > Modified: > head/lib/librt/Makefile > > Modified: head/lib/librt/Makefile > =================================================================== >=========== --- head/lib/librt/Makefile Wed Feb 23 20:50:42 > 2011 (r218983) +++ head/lib/librt/Makefile Wed Feb 23 21:17:38 > 2011 (r218984) @@ -6,7 +6,7 @@ CFLAGS+=-I${.CURDIR}/../libc/include > -I$ > .ifndef NO_THREAD_STACK_UNWIND > CFLAGS+=-fexceptions > .endif > -CFLAGS+=-Winline -Wall -g > +CFLAGS+=-Winline -Wall > DPADD= ${LIBPTHREAD} > LDADD= -lpthread Thanks! Jung-uk Kim From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 21:23:55 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41F6F106566B; Wed, 23 Feb 2011 21:23:55 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail09.syd.optusnet.com.au (mail09.syd.optusnet.com.au [211.29.132.190]) by mx1.freebsd.org (Postfix) with ESMTP id A0E878FC08; Wed, 23 Feb 2011 21:23:54 +0000 (UTC) Received: from c122-107-114-89.carlnfd1.nsw.optusnet.com.au (c122-107-114-89.carlnfd1.nsw.optusnet.com.au [122.107.114.89]) by mail09.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id p1NLNnOv016502 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 24 Feb 2011 08:23:51 +1100 Date: Thu, 24 Feb 2011 08:23:49 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Bruce Cran In-Reply-To: <201102231028.p1NASbET045275@svn.freebsd.org> Message-ID: <20110224063233.Y1100@besplex.bde.org> References: <201102231028.p1NASbET045275@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218966 - head/sys/vm X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 21:23:55 -0000 On Wed, 23 Feb 2011, Bruce Cran wrote: > Log: > Calculate and return the count in vmspace_swap_count as a vm_offset_t > instead of an int to avoid overflow. > > While here, clean up some style(9) issues. vm_offset_t should not be abused to hold a count. > PR: kern/152200 > Reviewed by: kib > MFC after: 2 weeks > > Modified: > head/sys/vm/swap_pager.c > head/sys/vm/vm_map.h > > Modified: head/sys/vm/swap_pager.c > ============================================================================== > --- head/sys/vm/swap_pager.c Wed Feb 23 09:22:33 2011 (r218965) > +++ head/sys/vm/swap_pager.c Wed Feb 23 10:28:37 2011 (r218966) > @@ -2420,23 +2420,24 @@ SYSCTL_NODE(_vm, OID_AUTO, swap_info, CT > * if the VM object has any swap use at all the associated map entries > * count for at least 1 swap page. > */ > -int > +vm_offset_t > vmspace_swap_count(struct vmspace *vmspace) This is a count in pages according to its comment. Thus vm_offset_t is neither necessary not sufficient for it. I'm not sure if all the pages are mapped into vm at once, in which case vm_offset_t could count them PAGE_SIZE times over and even int can count them PAGE_SIZE/2 times over on i386, or if there can be as many pages as swap can hold, in which case, in theory, vm_offset_t is accidentally large enough on 64 bit arches and still too small on 32-bit arches. But int is large enough in practice on all arches, since 16-bit ints are not supported and 32-bit ints can count 2**31 pages = 8 TB with a minimal PAGE_SIZE of 2**12. I don't know if there is any multiple or sparse mapping involved, but it would take a lot of it to use 8 TB. vm still uses plain u_int for most of its most critical (physical) page counters, starting with cnt.v_page_count for the total number of pages in the system. Thus it doesn't already have a page counter type. > { > - vm_map_t map = &vmspace->vm_map; > + vm_map_t map; > vm_map_entry_t cur; > - int count = 0; > + vm_object_t object; > + vm_offset_t count, n; > > - for (cur = map->header.next; cur != &map->header; cur = cur->next) { > - vm_object_t object; > + map = &vmspace->vm_map; > + count = 0; > > + for (cur = map->header.next; cur != &map->header; cur = cur->next) { > if ((cur->eflags & MAP_ENTRY_IS_SUB_MAP) == 0 && > (object = cur->object.vm_object) != NULL) { > VM_OBJECT_LOCK(object); > if (object->type == OBJT_SWAP && > object->un_pager.swp.swp_bcount != 0) { > - int n = (cur->end - cur->start) / PAGE_SIZE; > - > + n = (cur->end - cur->start) / PAGE_SIZE; > count += object->un_pager.swp.swp_bcount * > SWAP_META_PAGES * n / object->size + 1; The bug seems to have been overflow in this calculation. `start' and `end' have type vm_offset_t and large style bugs (missing prefixes in their names) so they are hard to grep for. When n is 32 bits int and PAGE_SIZE is 2**12, the assignment to n overflows at a difference of 8TB, but this probably can't happen (see above). swap_bcnt still has type int; SWAP_META_PAGES is 1, 2, 4, 8 or 16; thus swp_bcount * SWAP_META_PAGES may overflow at 2**31/16 = 128 M. If this doesn't overflow, but has its maximal value of about 128 M, then multiplying it by "int n" may overflow when n is just 32. Then, if nothing has overflowed, division by object->size reduces to a relatively small count in pages. object->size seems to have type vm_pindex_t which is 64 bits even on i386 (since it is associated with vm_ooffset_t and not vm_offset_t, and vm_ooffset_t must be 64 bits to support file of sizes >= 2GB although vm_pindex_t only needs to be more than 32 bits to support files of sizes >= 8 TB (with PAGE_SIZE = 2**12). object->size has even larger bugs than `start' and `end', since it is more global. Summary: all of (object->un_pager.swp.swp_bcount * SWAP_META_PAGES * n / object->size) was done in possibly-overflowing arithmetic using the inadequately large type int, except for the final division which is done using excessively large type vm_pindex_t. Changing one of the ints to vm_offset_t reduces the overflow possibilities a little. But the reduction is very little on i386, where the change is just from a 32 bit int to a 32 bit unsigned int. > Modified: head/sys/vm/vm_map.h > ============================================================================== > --- head/sys/vm/vm_map.h Wed Feb 23 09:22:33 2011 (r218965) > +++ head/sys/vm/vm_map.h Wed Feb 23 10:28:37 2011 (r218966) > @@ -380,6 +380,6 @@ int vm_map_unwire(vm_map_t map, vm_offse > int flags); > int vm_map_wire(vm_map_t map, vm_offset_t start, vm_offset_t end, > int flags); > -int vmspace_swap_count (struct vmspace *vmspace); > +vm_offset_t vmspace_swap_count(struct vmspace *vmspace); > #endif /* _KERNEL */ Maybe the critical overflows are actually in callers doing similarly buggy multiplications. The only caller seems to be vm_pageout_oom(). It abuses vm_offset_t to hold the result of the call ("vm_offset_t size, bigsize") and to accumulate counts returned by vmspace_resident_count(), which has another bogus type (long). vm has a type vm_size_t for holding sizes, but AFAIR this is in bytes and is only meant to be used for sizes of single objects, so it is unsuitable for use here. The file containing vm_pageout_oom() (vm_pageout.c) has a couple of other `size' variables, and uses the reasonable (but much larger than necessary, until 8 TB is a small amount of memory) type vm_pindex_t for them. The file vm_map.c contains dozens of `size' variables and almost as many choices of types for them :-(: (warning: the following is from "grep size vm_map.c" reduced a bit; there is not always quite enough context): % static int vmspace_zinit(void *mem, int size, int flags); % static void vmspace_zfini(void *mem, int size); % static void vm_map_zfini(void *mem, int size); % static void vm_map_zdtor(void *mem, int size, void *arg); % static void vmspace_zdtor(void *mem, int size, void *arg); Plain int may work, but is sloppy. % vm->vm_tsize = 0; % vm->vm_dsize = 0; % vm->vm_ssize = 0; Hmm, there may actually be standard type for sizes in pages. The above 3 have type segsz_t and are documented as being sizes in pages, with XXX's for the first 2. % (vm_size_t)(prev_entry->end - prev_entry->start), % (vm_size_t)(end - prev_entry->end), charge_prev_obj)) { Correct types, but bogus casts which were only needed for K&R compilers since we have prototypes in scope. % map->size += (end - prev_entry->end); Yet another `size' struct member with no prefix in its name. I think this is the one in struct vm_map. It has size vm_size_t, which seems to be correct. % new_entry->avail_ssize = 0; avail_size in struct vm_map_entry has the bogus type vm_offset_t, and the usual bad style. % map->size += new_entry->end - new_entry->start; % vm_map_findspace(vm_map_t map, vm_offset_t start, vm_size_t length, % vm_offset_t start, vm_size_t length, vm_prot_t prot, % vm_size_t length, int find_space, vm_prot_t prot, Apparently correct. % vm_size_t prevsize, esize; % prevsize = prev->end - prev->start; % (prev->offset + prevsize == entry->offset)) && % vm_map_entry_resize_free(map, entry->prev); % esize = entry->end - entry->start; % (entry->offset + esize == next->offset)) && % vm_map_entry_resize_free(map, entry); Apparently correct except for formatting. % vm_object_t object, vm_pindex_t pindex, vm_size_t size, int flags) % vm_pindex_t psize, tmpidx; Apparently correct. This is part of vm_map_pmap_enter()'s declarations. Anything that has to deal with pindex's has to be careful with types to work at all. % psize = atop(size); Another issue is whether macros like atop() work with arbitrary integer types for arguments. I added some upcasts in some of them, but it is not easy to find the right upcast, short of [u]intmax_t which may be excessive. jake@ preferred explicit cast in the macro invovations and used this a bit for PAE and sparc64. Here atop() MD and a right shift so there is no problem. But for the related ptoa(), on at least i386 it is just a left shift, so it won't work starting with a count in pages, of type anything reasonable except vm_pindex_t, iff the count in bytes exceeds 4GB (or 2GB starting with an uint). % vm_size_t size; % size = (end <= current->end ? end : current->end) - start; % vm_size_t tsize; % tsize = tentry->end - offset; As usual, vm_size_t is correct for internal sizes. % vm_pindex_t offidxstart, offidxend, count, size1; The count and size1 variables are poorly named at best. % vm_ooffset_t size; Might be correct. vm is generally careful to distinguish sizes from offset using vm_offset_t instead of vm_size_t, but there is nothing corresponding to vm_size_t for files, so off_t and vm_offset_t are often abused for sizes. This abuse becomes larger for sizes that are accumulations. % size1 = object->size; object->size has type vm_pindex_t, so we see that size_1 has the correct type % object->size = offidxstart; % size1 -= object->size; % KASSERT(object->charge >= ptoa(size1), and ptoa(size1) will work, size size1 has a large enough type but small enough value to not overflow the left shift. % swap_release_by_cred(ptoa(size1), object->cred); % object->charge -= ptoa(size1); Correct enough. The sizes become vm_ooffset_t's after ptoa(). ptoa() strictly doesn't change the type from vm_pindex_t, but both are int64_t. But if C's type checking were complete enough to complain about int vs vm_size_t mismatches, then it would also complain about this mismatch. BTW, I recently noticed that gdb is stricter about types than gcc -- I wanted to know what a type was, but "whatis" in gdb said that it was a foo_t when I wanted to know its basic type. % vm_offset_t size; % size = src_entry->end - src_entry->start; Seems incorrect. `size' is actually a size, not an offset, but its type is spelled with "offset". % src_object->charge = size; % *fork_charge += size; % *fork_charge += size; % *fork_charge += size; This accumulates multiple sizes of the bogus type vm_offset_t into the logically larger type vm_ooffset_t. % [...] Got bored here. Bruce From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 21:45:29 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2ED6A106566C; Wed, 23 Feb 2011 21:45:29 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1DCA38FC0A; Wed, 23 Feb 2011 21:45:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NLjTWq012351; Wed, 23 Feb 2011 21:45:29 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NLjTq2012349; Wed, 23 Feb 2011 21:45:29 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102232145.p1NLjTq2012349@svn.freebsd.org> From: Bruce Cran Date: Wed, 23 Feb 2011 21:45:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218985 - head/sys/compat/ndis X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 21:45:29 -0000 Author: brucec Date: Wed Feb 23 21:45:28 2011 New Revision: 218985 URL: http://svn.freebsd.org/changeset/base/218985 Log: Use the cprd_mem field when setting the start and length for a memory resource - the layout of cprd_port is identical but using cprd_mem makes the code easier to understand. PR: kern/118493 Submitted by: Weongyo Jeong MFC after: 3 days Modified: head/sys/compat/ndis/kern_ndis.c Modified: head/sys/compat/ndis/kern_ndis.c ============================================================================== --- head/sys/compat/ndis/kern_ndis.c Wed Feb 23 21:17:38 2011 (r218984) +++ head/sys/compat/ndis/kern_ndis.c Wed Feb 23 21:45:28 2011 (r218985) @@ -591,9 +591,9 @@ ndis_convert_res(arg) CM_RESOURCE_MEMORY_READ_WRITE; prd->cprd_sharedisp = CmResourceShareDeviceExclusive; - prd->u.cprd_port.cprd_start.np_quad = + prd->u.cprd_mem.cprd_start.np_quad = brle->start; - prd->u.cprd_port.cprd_len = brle->count; + prd->u.cprd_mem.cprd_len = brle->count; break; case SYS_RES_IRQ: prd->cprd_type = CmResourceTypeInterrupt; From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 22:04:33 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 714A2106566B; Wed, 23 Feb 2011 22:04:33 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail09.syd.optusnet.com.au (mail09.syd.optusnet.com.au [211.29.132.190]) by mx1.freebsd.org (Postfix) with ESMTP id 0E02C8FC17; Wed, 23 Feb 2011 22:04:32 +0000 (UTC) Received: from c122-107-114-89.carlnfd1.nsw.optusnet.com.au (c122-107-114-89.carlnfd1.nsw.optusnet.com.au [122.107.114.89]) by mail09.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id p1NM4Sln021350 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 24 Feb 2011 09:04:30 +1100 Date: Thu, 24 Feb 2011 09:04:28 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Dimitry Andric In-Reply-To: <201102232117.p1NLHcuE011679@svn.freebsd.org> Message-ID: <20110224084812.F1571@besplex.bde.org> References: <201102232117.p1NLHcuE011679@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218984 - head/lib/librt X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 22:04:33 -0000 On Wed, 23 Feb 2011, Dimitry Andric wrote: > Log: > Fix the 32-bit build stage on amd64 when WITH_CTF is enabled. It seems > ctfconvert will corrupt object files that are compiled with -g, if it is > not run with -g itself. > > To fix it, remove -g from CFLAGS in lib/librt/Makefile. If you need to > compile this library with debug info, use DEBUG_FLAGS=-g instead, which > will work correctly, even when using WITH_CTF. Hard-coded -g is a style bug, but I wonder if this works even with -g in DEBUG_FLAGS. This may be related to the bug that -g is broken if the compilation is via an intermediate asm file: "cc -g -o foo foo.c" != "cc -g -S foo.c; cc -g -o foo foo.s" The former works, but the latter gives: % Script started on Wed Feb 23 21:47:19 2011 % % pts/0:bde@ref9-i386:~/r> gdb foo % GNU gdb 6.1.1 [FreeBSD] % Copyright 2004 Free Software Foundation, Inc. % GDB is free software, covered by the GNU General Public License, and you are % welcome to change it and/or distribute copies of it under certain conditions. % Type "show copying" to see the conditions. % There is absolutely no warranty for GDB. Type "show warranty" for details. % This GDB was configured as "i386-marcel-freebsd"...Dwarf Error: Could not find abbrev number 47 [in module /dumpster/home/bde/r/foo] % % (gdb) q % pts/0:bde@ref9-i386:~/r> exit % % Script done on Wed Feb 23 21:47:24 2011 gdb also cannot find `main'. But if everything is compiled without -g, gdb can find `main'. Similarly with multiple files, some compiled via asm and some via (implicit) .o's. I haven't found an incantantion that works. The asm file contains lots of debugging info, but the info is apparently incomplete or invalid. The object file produced from the asm file differs from the one produced directly from the C file. Perhaps you already fixed this by importing newer binutils. Bruce From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 22:12:04 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AA4D106566C; Wed, 23 Feb 2011 22:12:04 +0000 (UTC) (envelope-from bruce@cran.org.uk) Received: from muon.cran.org.uk (unknown [IPv6:2a01:348:0:15:5d59:5c40:0:1]) by mx1.freebsd.org (Postfix) with ESMTP id 897B48FC18; Wed, 23 Feb 2011 22:12:03 +0000 (UTC) Received: from muon.cran.org.uk (localhost [127.0.0.1]) by muon.cran.org.uk (Postfix) with ESMTP id C41D0E8C0C; Wed, 23 Feb 2011 22:12:00 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=cran.org.uk; h=subject :from:to:cc:in-reply-to:references:content-type:date:message-id :mime-version; s=mail; bh=u0VbMArNTEVkKEZ5X9qW0UiSsEU=; b=ma45Vj NXRAL+Q9tvowizRr7kyw2dlTfyaTOT6wbuTFJH5JEC4VITSG/uUfWSTNeyVYz0ka 3kNdVbWwRqmuVM/WS6JkB8r/TsNqhXnqotUEvhHyvTPZ77sAQbD6nhgU/lMwIGYs y/WyFInentIXNizGMW+rXaoJsRdai185v/CFs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=cran.org.uk; h=subject:from :to:cc:in-reply-to:references:content-type:date:message-id :mime-version; q=dns; s=mail; b=p6vAMfbS9S42hymRyk22wJOmc63GJNHl I2l/i5ayapGqD//vbSlIfEivWq7bPYmwOysG7LIC8aA8bR0Kg64+R8/T4/0Crv/p dYzZhsQbYi5CPkozvQFpIQuSxgZJT28DqLOMFfmJuyZ/vWucfkdXpMqCrYJsoU57 9ElcYoQav9g= Received: from [192.168.0.10] (client-86-31-236-253.oxfd.adsl.virginmedia.com [86.31.236.253]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by muon.cran.org.uk (Postfix) with ESMTPSA id 4F7E0E8BA7; Wed, 23 Feb 2011 22:12:00 +0000 (GMT) From: Bruce Cran To: Bruce Evans In-Reply-To: <20110224063233.Y1100@besplex.bde.org> References: <201102231028.p1NASbET045275@svn.freebsd.org> <20110224063233.Y1100@besplex.bde.org> Content-Type: multipart/mixed; boundary="=-JvNx3pbWdGVQz960ysnH" Date: Wed, 23 Feb 2011 22:11:56 +0000 Message-ID: <1298499116.9366.3.camel@core.nessbank> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Bruce Cran Subject: Re: svn commit: r218966 - head/sys/vm X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 22:12:04 -0000 --=-JvNx3pbWdGVQz960ysnH Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Thu, 2011-02-24 at 08:23 +1100, Bruce Evans wrote: > The bug seems to have been overflow in this calculation. `start' and > `end' have type vm_offset_t and large style bugs (missing prefixes in > their names) so they are hard to grep for. When n is 32 bits int and > PAGE_SIZE is 2**12, the assignment to n overflows at a difference of 8TB, > but this probably can't happen (see above). swap_bcnt still has type > int; SWAP_META_PAGES is 1, 2, 4, 8 or 16; thus swp_bcount * SWAP_META_PAGES > may overflow at 2**31/16 = 128 M. If this doesn't overflow, but has its > maximal value of about 128 M, then multiplying it by "int n" may overflow > when n is just 32. Then, if nothing has overflowed, division by > object->size reduces to a relatively small count in pages. object->size > seems to have type vm_pindex_t which is 64 bits even on i386 (since it > is associated with vm_ooffset_t and not vm_offset_t, and vm_ooffset_t > must be 64 bits to support file of sizes >= 2GB although vm_pindex_t only > needs to be more than 32 bits to support files of sizes >= 8 TB (with > PAGE_SIZE = 2**12). object->size has even larger bugs than `start' and > `end', since it is more global. I've attached a patch which changes 'n' to be of type vm_ooffset_t. I think this should fix the overflow bug? -- Bruce Cran --=-JvNx3pbWdGVQz960ysnH Content-Disposition: attachment; filename="vm.diff" Content-Type: text/x-patch; name="vm.diff"; charset="us-ascii" Content-Transfer-Encoding: 7bit Index: swap_pager.c =================================================================== --- swap_pager.c (revision 218966) +++ swap_pager.c (working copy) @@ -2426,7 +2426,8 @@ vm_map_t map; vm_map_entry_t cur; vm_object_t object; - vm_offset_t count, n; + vm_ooffset_t n; + vm_offset_t count; map = &vmspace->vm_map; count = 0; --=-JvNx3pbWdGVQz960ysnH-- From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 22:13:14 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EFBEB106564A; Wed, 23 Feb 2011 22:13:14 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail02.syd.optusnet.com.au (mail02.syd.optusnet.com.au [211.29.132.183]) by mx1.freebsd.org (Postfix) with ESMTP id 8B4E78FC1A; Wed, 23 Feb 2011 22:13:14 +0000 (UTC) Received: from c122-107-114-89.carlnfd1.nsw.optusnet.com.au (c122-107-114-89.carlnfd1.nsw.optusnet.com.au [122.107.114.89]) by mail02.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id p1NMDC3Z005879 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 24 Feb 2011 09:13:12 +1100 Date: Thu, 24 Feb 2011 09:13:12 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Bruce Evans In-Reply-To: <20110224084812.F1571@besplex.bde.org> Message-ID: <20110224090558.E1571@besplex.bde.org> References: <201102232117.p1NLHcuE011679@svn.freebsd.org> <20110224084812.F1571@besplex.bde.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Dimitry Andric Subject: Re: svn commit: r218984 - head/lib/librt X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 22:13:15 -0000 PS: On Thu, 24 Feb 2011, Bruce Evans wrote: > This may be related to the bug that -g is broken if the compilation is > via an intermediate asm file: > > "cc -g -o foo foo.c" != "cc -g -S foo.c; cc -g -o foo foo.s" > > The former works, but the latter gives: > > % Script started on Wed Feb 23 21:47:19 2011 > % % pts/0:bde@ref9-i386:~/r> gdb foo > % GNU gdb 6.1.1 [FreeBSD] > % Copyright 2004 Free Software Foundation, Inc. > % GDB is free software, covered by the GNU General Public License, and you > are > % welcome to change it and/or distribute copies of it under certain > conditions. > % Type "show copying" to see the conditions. > % There is absolutely no warranty for GDB. Type "show warranty" for details. > % This GDB was configured as "i386-marcel-freebsd"...Dwarf Error: Could not > find abbrev number 47 [in module /dumpster/home/bde/r/foo] > % % (gdb) q > % pts/0:bde@ref9-i386:~/r> exit > % % Script done on Wed Feb 23 21:47:24 2011 > I haven't found an incantantion that works. The asm file contains lots > of debugging info, but the info is apparently incomplete or invalid. > The object file produced from the asm file differs from the one produced > directly from the C file. Now found it easly using gcc -v. gcc -c -v foo.c produces "... /usr/bin/as -o foo.o /var/tmp/whatever.s", but gcc -c -v foo.s produces "... /usr/bin/as -gdwarf2 -o foo.o foo.s". gcc's generation of -gdwarf2 is inconsistent with itself. Do we use a nonstandard not-gdwarf2 option for the usual case but forget to change this for asm files? Bruce From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 22:17:57 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1518B106566B; Wed, 23 Feb 2011 22:17:57 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net [IPv6:2001:7b8:2ff:146::2]) by mx1.freebsd.org (Postfix) with ESMTP id C70168FC12; Wed, 23 Feb 2011 22:17:56 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7:0:1131:79f:9a2b:b0a3] (unknown [IPv6:2001:7b8:3a7:0:1131:79f:9a2b:b0a3]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id D4C295C37; Wed, 23 Feb 2011 23:17:55 +0100 (CET) Message-ID: <4D65879C.8090607@FreeBSD.org> Date: Wed, 23 Feb 2011 23:18:04 +0100 From: Dimitry Andric Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US; rv:1.9.2.15pre) Gecko/20110221 Lanikai/3.1.9pre MIME-Version: 1.0 To: Bruce Evans References: <201102232117.p1NLHcuE011679@svn.freebsd.org> <20110224084812.F1571@besplex.bde.org> In-Reply-To: <20110224084812.F1571@besplex.bde.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218984 - head/lib/librt X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 22:17:57 -0000 On 2011-02-23 23:04, Bruce Evans wrote: > Hard-coded -g is a style bug, but I wonder if this works even with -g in > DEBUG_FLAGS. Yes, it works, I tested it. The issue is that bsd.lib.mk contains this fragment: .if defined(WITH_CTF) .undef NO_CTF .endif .if defined(DEBUG_FLAGS) CFLAGS+= ${DEBUG_FLAGS} .if !defined(NO_CTF) && (${DEBUG_FLAGS:M-g} != "") CTFFLAGS+= -g .endif .endif E.g. if you put '-g' in CFLAGS, this fragment will fail to add the required '-g to CTFFLAGS. On the other hand, if you add '-g' to DEBUG_FLAGS, '-g' will be added to both CFLAGS and CTFFLAGS. > This may be related to the bug that -g is broken if the compilation is > via an intermediate asm file: > > "cc -g -o foo foo.c" != "cc -g -S foo.c; cc -g -o foo foo.s" > > The former works, but the latter gives: > > % Script started on Wed Feb 23 21:47:19 2011 > % > % pts/0:bde@ref9-i386:~/r> gdb foo > % GNU gdb 6.1.1 [FreeBSD] > % Copyright 2004 Free Software Foundation, Inc. > % GDB is free software, covered by the GNU General Public License, and you are > % welcome to change it and/or distribute copies of it under certain conditions. > % Type "show copying" to see the conditions. > % There is absolutely no warranty for GDB. Type "show warranty" for details. > % This GDB was configured as "i386-marcel-freebsd"...Dwarf Error: Could not find abbrev number 47 [in module /dumpster/home/bde/r/foo] > % > % (gdb) q > % pts/0:bde@ref9-i386:~/r> exit Seems to work fine here (tree as of r218915, so with binutils 2.17.50): $ cc -g -S hello.c $ cc -g hello.s -o hello $ file hello hello: ELF 32-bit LSB executable, Intel 80386, version 1 (FreeBSD), dynamically linked (uses shared libs), for FreeBSD 9.0 (900033), not stripped $ gdb ./hello GNU gdb 6.1.1 [FreeBSD] Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type "show copying" to see the conditions. There is absolutely no warranty for GDB. Type "show warranty" for details. This GDB was configured as "i386-marcel-freebsd"... (gdb) list 1 #include 2 3 int main(void) 4 { 5 puts("Hello World!"); 6 7 return 0; 8 } (gdb) > Perhaps you already fixed this by importing newer binutils. Apparently, yes. Maybe ref9-i386 should be updated again. :) From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 22:31:40 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D4C1106566C; Wed, 23 Feb 2011 22:31:40 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net [IPv6:2001:7b8:2ff:146::2]) by mx1.freebsd.org (Postfix) with ESMTP id 5AF978FC1B; Wed, 23 Feb 2011 22:31:40 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7:0:1131:79f:9a2b:b0a3] (unknown [IPv6:2001:7b8:3a7:0:1131:79f:9a2b:b0a3]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 9C79C5C37; Wed, 23 Feb 2011 23:31:39 +0100 (CET) Message-ID: <4D658AD4.9020602@FreeBSD.org> Date: Wed, 23 Feb 2011 23:31:48 +0100 From: Dimitry Andric Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US; rv:1.9.2.15pre) Gecko/20110221 Lanikai/3.1.9pre MIME-Version: 1.0 To: Bruce Evans References: <201102232117.p1NLHcuE011679@svn.freebsd.org> <20110224084812.F1571@besplex.bde.org> <20110224090558.E1571@besplex.bde.org> In-Reply-To: <20110224090558.E1571@besplex.bde.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218984 - head/lib/librt X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 22:31:40 -0000 On 2011-02-23 23:13, Bruce Evans wrote: > Now found it easly using gcc -v. gcc -c -v foo.c produces "... /usr/bin/as > -o foo.o /var/tmp/whatever.s", but gcc -c -v foo.s produces "... /usr/bin/as > -gdwarf2 -o foo.o foo.s". gcc's generation of -gdwarf2 is inconsistent > with itself. Do we use a nonstandard not-gdwarf2 option for the usual case > but forget to change this for asm files? I don't think so, but there is simply no need to pass '-g' in the gcc invocation that assembles and links the .s file, since the debug info is already embedded in the .s file itself. E.g. the following works just fine: $ cc -g -S hello.c $ cc -o hello hello.s $ file hello hello: ELF 32-bit LSB executable, Intel 80386, version 1 (FreeBSD), dynamically linked (uses shared libs), for FreeBSD 9.0 (900033), not stripped $ gdb ./hello GNU gdb 6.1.1 [FreeBSD] Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type "show copying" to see the conditions. There is absolutely no warranty for GDB. Type "show warranty" for details. This GDB was configured as "i386-marcel-freebsd"... (gdb) list 1 #include 2 3 int main(void) 4 { 5 puts("Hello World!"); 6 7 return 0; 8 } Apparently, if you use --gdwarf2 with GNU as 2.15, it messes up the already existing debug info. It looks like 2.17.50 has no such problem, though. From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 23:36:39 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8ABA610656A4; Wed, 23 Feb 2011 23:36:39 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail07.syd.optusnet.com.au (mail07.syd.optusnet.com.au [211.29.132.188]) by mx1.freebsd.org (Postfix) with ESMTP id 24BE88FC17; Wed, 23 Feb 2011 23:36:38 +0000 (UTC) Received: from c122-107-114-89.carlnfd1.nsw.optusnet.com.au (c122-107-114-89.carlnfd1.nsw.optusnet.com.au [122.107.114.89]) by mail07.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id p1NNaUP4027761 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 24 Feb 2011 10:36:31 +1100 Date: Thu, 24 Feb 2011 10:36:30 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Bruce Cran In-Reply-To: <1298499116.9366.3.camel@core.nessbank> Message-ID: <20110224102112.P1871@besplex.bde.org> References: <201102231028.p1NASbET045275@svn.freebsd.org> <20110224063233.Y1100@besplex.bde.org> <1298499116.9366.3.camel@core.nessbank> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Bruce Evans , Bruce Cran Subject: Re: svn commit: r218966 - head/sys/vm X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 23:36:39 -0000 On Wed, 23 Feb 2011, Bruce Cran wrote: > On Thu, 2011-02-24 at 08:23 +1100, Bruce Evans wrote: > >> The bug seems to have been overflow in this calculation. >> [swap_bcount * SWAP_META_PAGES * n / ] > > I've attached a patch which changes 'n' to be of type vm_ooffset_t. I > think this should fix the overflow bug? I don't like using vm_ooffset_t either. There are no offsets here, and it's bad technique to depend on having a large type to avoid overflows in expressions when the result type is different. I would cast operand(s) in the expression as necessary to prevent overflow of subexpressions. vm_pindex_t would work, but I prefer to use a type related to the subexpressions. Not sure what that is. Maybe just uintmax_t for safety (even that is not safe if the subexpressions have large values). So: (uintmax_t)swap_bcount * SWAP_META_PAGES * n / mumble. I like to cast only the leftmost term if possible, and depend on the larger type propagating to all subexpressions via left-to-right evaluation. This saves a lot of casts. Here this may be sub-optimal and we could probably delay the cast to the final multiplication, which reduces to the same safeness as using uintmax_t for n. Next, there is the return type to consider. I don't see why it needs to be changed from int. The patch in the PR actually changed it to long, while changing n to vm_offset_t. But on 32-bit machines, long is essentially the same as int, and vm_offset_t is not much larger. Even 32-bit machine might actually need a type larger than 32 bits to prevent overflow in expressions like the above. Bruce From owner-svn-src-head@FreeBSD.ORG Wed Feb 23 23:50:11 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 56306106564A; Wed, 23 Feb 2011 23:50:11 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail06.syd.optusnet.com.au (mail06.syd.optusnet.com.au [211.29.132.187]) by mx1.freebsd.org (Postfix) with ESMTP id CA0AA8FC0A; Wed, 23 Feb 2011 23:50:10 +0000 (UTC) Received: from c122-107-114-89.carlnfd1.nsw.optusnet.com.au (c122-107-114-89.carlnfd1.nsw.optusnet.com.au [122.107.114.89]) by mail06.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id p1NNo7tU019463 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 24 Feb 2011 10:50:07 +1100 Date: Thu, 24 Feb 2011 10:50:07 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Dimitry Andric In-Reply-To: <4D658AD4.9020602@FreeBSD.org> Message-ID: <20110224103713.I1871@besplex.bde.org> References: <201102232117.p1NLHcuE011679@svn.freebsd.org> <20110224084812.F1571@besplex.bde.org> <20110224090558.E1571@besplex.bde.org> <4D658AD4.9020602@FreeBSD.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Bruce Evans Subject: Re: svn commit: r218984 - head/lib/librt X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 23:50:11 -0000 On Wed, 23 Feb 2011, Dimitry Andric wrote: > On 2011-02-23 23:13, Bruce Evans wrote: >> Now found it easly using gcc -v. gcc -c -v foo.c produces "... /usr/bin/as >> -o foo.o /var/tmp/whatever.s", but gcc -c -v foo.s produces "... >> /usr/bin/as >> -gdwarf2 -o foo.o foo.s". gcc's generation of -gdwarf2 is inconsistent >> with itself. Do we use a nonstandard not-gdwarf2 option for the usual case >> but forget to change this for asm files? > > I don't think so, but there is simply no need to pass '-g' in the gcc > invocation that assembles and links the .s file, since the debug info is > already embedded in the .s file itself. Except I want to write "cc ${CFLAGS} -o foo *.s *.c [*.o]" and not have variant ${CFLAGS} for *.s and *.c. It is a nice feature of cc that you can use the same ${CFLAGS} for *.[cos...] in most contexts, and FreeBSD .mk files depend on this. > Apparently, if you use --gdwarf2 with GNU as 2.15, it messes up the > already existing debug info. It looks like 2.17.50 has no such problem, > though. So we won't worry much about this. Does new binutils/as completely ignore --gdwarf2 iff the asm file already has suitable debugging info? I would have expected at least an error message if the debugging info says --gother and you try to add or change to --gdwarf2. Normal debugging info doesn't seem to have any id to distinguish its type. Bruce From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 06:28:49 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00253106564A; Thu, 24 Feb 2011 06:28:48 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E26288FC17; Thu, 24 Feb 2011 06:28:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1O6Sm9X024502; Thu, 24 Feb 2011 06:28:48 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1O6Smi3024500; Thu, 24 Feb 2011 06:28:48 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201102240628.p1O6Smi3024500@svn.freebsd.org> From: Doug Barton Date: Thu, 24 Feb 2011 06:28:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218986 - head/etc/rc.d X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 06:28:49 -0000 Author: dougb Date: Thu Feb 24 06:28:48 2011 New Revision: 218986 URL: http://svn.freebsd.org/changeset/base/218986 Log: The new accounting file needs to be 644 so that unprivileged users can use lastcomm(1) Modified: head/etc/rc.d/accounting Modified: head/etc/rc.d/accounting ============================================================================== --- head/etc/rc.d/accounting Wed Feb 23 21:45:28 2011 (r218985) +++ head/etc/rc.d/accounting Thu Feb 24 06:28:48 2011 (r218986) @@ -58,6 +58,7 @@ accounting_rotate_log() if checkyesno accounting_enable; then _file=`mktemp newacct-XXXXX` + chmod 644 $_file ${accounting_command} ${_dir}/${_file} fi From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 09:13:47 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ABA3D106564A; Thu, 24 Feb 2011 09:13:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9974D8FC0A; Thu, 24 Feb 2011 09:13:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1O9Dlx9029883; Thu, 24 Feb 2011 09:13:47 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1O9DlGY029878; Thu, 24 Feb 2011 09:13:47 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201102240913.p1O9DlGY029878@svn.freebsd.org> From: Hans Petter Selasky Date: Thu, 24 Feb 2011 09:13:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218988 - in head/sys/dev: sound/usb usb usb/quirk X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 09:13:47 -0000 Author: hselasky Date: Thu Feb 24 09:13:47 2011 New Revision: 218988 URL: http://svn.freebsd.org/changeset/base/218988 Log: - Add support for some non-standard USB MIDI devices from Roland, by means of allowing vendor specific interface class for audio and MIDI devices. - Add new quirks for this. The vendor and product list in OpenBSD's dev/usb/umidi_quirks.c was used as reference. MFC after: 14 days Approved by: thompsa (mentor) Modified: head/sys/dev/sound/usb/uaudio.c head/sys/dev/usb/quirk/usb_quirk.c head/sys/dev/usb/quirk/usb_quirk.h head/sys/dev/usb/usbdevs Modified: head/sys/dev/sound/usb/uaudio.c ============================================================================== --- head/sys/dev/sound/usb/uaudio.c Thu Feb 24 09:12:45 2011 (r218987) +++ head/sys/dev/sound/usb/uaudio.c Thu Feb 24 09:13:47 2011 (r218988) @@ -265,6 +265,7 @@ struct uaudio_softc { uint8_t sc_uq_au_inp_async:1; uint8_t sc_uq_au_no_xu:1; uint8_t sc_uq_bad_adc:1; + uint8_t sc_uq_au_vendor_class:1; }; struct uaudio_search_result { @@ -401,8 +402,8 @@ static int umidi_open(struct usb_fifo *, static int umidi_ioctl(struct usb_fifo *, u_long cmd, void *, int); static void umidi_close(struct usb_fifo *, int); static void umidi_init(device_t dev); -static int32_t umidi_probe(device_t dev); -static int32_t umidi_detach(device_t dev); +static int umidi_probe(device_t dev); +static int umidi_detach(device_t dev); #ifdef USB_DEBUG static void uaudio_chan_dump_ep_desc( @@ -541,10 +542,16 @@ uaudio_probe(device_t dev) if (uaa->use_generic == 0) return (ENXIO); - /* trigger on the control interface */ + /* lookup non-standard device */ - if ((uaa->info.bInterfaceClass == UICLASS_AUDIO) && - (uaa->info.bInterfaceSubClass == UISUBCLASS_AUDIOCONTROL)) { + if (uaa->info.bInterfaceClass != UICLASS_AUDIO) { + if (usb_test_quirk(uaa, UQ_AU_VENDOR_CLASS) == 0) + return (ENXIO); + } + + /* check for AUDIO control interface */ + + if (uaa->info.bInterfaceSubClass == UISUBCLASS_AUDIOCONTROL) { if (usb_test_quirk(uaa, UQ_BAD_AUDIO)) return (ENXIO); else @@ -553,9 +560,11 @@ uaudio_probe(device_t dev) /* check for MIDI stream */ - if ((uaa->info.bInterfaceClass == UICLASS_AUDIO) && - (uaa->info.bInterfaceSubClass == UISUBCLASS_MIDISTREAM)) { - return (0); + if (uaa->info.bInterfaceSubClass == UISUBCLASS_MIDISTREAM) { + if (usb_test_quirk(uaa, UQ_BAD_MIDI)) + return (ENXIO); + else + return (0); } return (ENXIO); } @@ -586,6 +595,9 @@ uaudio_attach(device_t dev) if (usb_test_quirk(uaa, UQ_BAD_ADC)) sc->sc_uq_bad_adc = 1; + if (usb_test_quirk(uaa, UQ_AU_VENDOR_CLASS)) + sc->sc_uq_au_vendor_class = 1; + umidi_init(dev); device_set_usb_desc(dev); @@ -800,6 +812,7 @@ uaudio_chan_fill_info_sub(struct uaudio_ uint8_t bBitResolution; uint8_t x; uint8_t audio_if = 0; + uint8_t uma_if_class; while ((desc = usb_desc_foreach(cd, desc))) { @@ -817,19 +830,22 @@ uaudio_chan_fill_info_sub(struct uaudio_ alt_index++; } - if ((id->bInterfaceClass == UICLASS_AUDIO) && - (id->bInterfaceSubClass == UISUBCLASS_AUDIOSTREAM)) { + uma_if_class = + ((id->bInterfaceClass == UICLASS_AUDIO) || + ((id->bInterfaceClass == UICLASS_VENDOR) && + (sc->sc_uq_au_vendor_class != 0))); + + if ((uma_if_class != 0) && (id->bInterfaceSubClass == UISUBCLASS_AUDIOSTREAM)) { audio_if = 1; } else { audio_if = 0; } - if ((id->bInterfaceClass == UICLASS_AUDIO) && + if ((uma_if_class != 0) && (id->bInterfaceSubClass == UISUBCLASS_MIDISTREAM)) { /* * XXX could allow multiple MIDI interfaces - * XXX */ if ((sc->sc_midi_chan.valid == 0) && @@ -1340,7 +1356,8 @@ uaudio_chan_init(struct uaudio_softc *sc usbd_errstr(err)); goto error; } - usbd_set_parent_iface(sc->sc_udev, iface_index, sc->sc_mixer_iface_index); + usbd_set_parent_iface(sc->sc_udev, iface_index, + sc->sc_mixer_iface_index); /* * If just one sampling rate is supported, @@ -3705,7 +3722,7 @@ static struct usb_fifo_methods umidi_fif .basename[0] = "umidi", }; -static int32_t +static int umidi_probe(device_t dev) { struct uaudio_softc *sc = device_get_softc(dev); @@ -3770,7 +3787,7 @@ detach: return (ENXIO); /* failure */ } -static int32_t +static int umidi_detach(device_t dev) { struct uaudio_softc *sc = device_get_softc(dev); Modified: head/sys/dev/usb/quirk/usb_quirk.c ============================================================================== --- head/sys/dev/usb/quirk/usb_quirk.c Thu Feb 24 09:12:45 2011 (r218987) +++ head/sys/dev/usb/quirk/usb_quirk.c Thu Feb 24 09:13:47 2011 (r218988) @@ -94,11 +94,7 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(SILICONPORTALS, YAPPHONE, 0x100, 0x100, UQ_AU_INP_ASYNC), USB_QUIRK(LOGITECH, UN53B, 0x0000, 0xffff, UQ_NO_STRINGS), USB_QUIRK(ELSA, MODEM1, 0x0000, 0xffff, UQ_CFG_INDEX_1), - - /* - * XXX The following quirks should have a more specific revision - * number: - */ + /* Quirks for printer devices */ USB_QUIRK(HP, 895C, 0x0000, 0xffff, UQ_BROKEN_BIDIR), USB_QUIRK(HP, 880C, 0x0000, 0xffff, UQ_BROKEN_BIDIR), USB_QUIRK(HP, 815C, 0x0000, 0xffff, UQ_BROKEN_BIDIR), @@ -458,6 +454,24 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(CHIPSBANK, USBMEMSTICK, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(CHIPSBANK, USBMEMSTICK1, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(NEWLINK, USB2IDEBRIDGE, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), + + /* Non-standard USB MIDI devices */ + USB_QUIRK(ROLAND, UM1, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, SC8850, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, SD90, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, UM880N, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, UA100, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, UM4, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, U8, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, UM2, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, SC8820, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, PC300, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, SK500, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, SCD70, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, UM550, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, SD20, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, SD80, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, UA700, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), }; #undef USB_QUIRK_VP #undef USB_QUIRK @@ -522,6 +536,8 @@ static const char *usb_quirk_str[USB_QUI [UQ_MSC_EJECT_SAEL_M460] = "UQ_MSC_EJECT_SAEL_M460", [UQ_MSC_EJECT_HUAWEISCSI] = "UQ_MSC_EJECT_HUAWEISCSI", [UQ_MSC_EJECT_TCT] = "UQ_MSC_EJECT_TCT", + [UQ_BAD_MIDI] = "UQ_BAD_MIDI", + [UQ_AU_VENDOR_CLASS] = "UQ_AU_VENDOR_CLASS", }; /*------------------------------------------------------------------------* Modified: head/sys/dev/usb/quirk/usb_quirk.h ============================================================================== --- head/sys/dev/usb/quirk/usb_quirk.h Thu Feb 24 09:12:45 2011 (r218987) +++ head/sys/dev/usb/quirk/usb_quirk.h Thu Feb 24 09:13:47 2011 (r218988) @@ -100,6 +100,9 @@ enum { UQ_MSC_EJECT_HUAWEISCSI, /* ejects after Huawei SCSI command */ UQ_MSC_EJECT_TCT, /* ejects after TCT SCSI command */ + UQ_BAD_MIDI, /* device claims MIDI class, but isn't */ + UQ_AU_VENDOR_CLASS, /* audio device uses vendor and not audio class */ + USB_QUIRK_MAX }; Modified: head/sys/dev/usb/usbdevs ============================================================================== --- head/sys/dev/usb/usbdevs Thu Feb 24 09:12:45 2011 (r218987) +++ head/sys/dev/usb/usbdevs Thu Feb 24 09:13:47 2011 (r218988) @@ -2782,9 +2782,23 @@ product RICOH VGPVCC8 0x183b VGP-VCC8 C product REINERSCT CYBERJACK_ECOM 0x0100 e-com cyberJack /* Roland products */ +product ROLAND UA100 0x0000 UA-100 Audio I/F +product ROLAND UM4 0x0002 UM-4 MIDI I/F +product ROLAND SC8850 0x0003 SC-8850 MIDI Synth +product ROLAND U8 0x0004 U-8 Audio I/F +product ROLAND UM2 0x0005 UM-2 MIDI I/F +product ROLAND SC8820 0x0007 SC-8820 MIDI Synth +product ROLAND PC300 0x0008 PC-300 MIDI Keyboard product ROLAND UM1 0x0009 UM-1 MIDI I/F +product ROLAND SK500 0x000b SK-500 MIDI Keyboard +product ROLAND SCD70 0x000c SC-D70 MIDI Synth product ROLAND UM880N 0x0014 EDIROL UM-880 MIDI I/F (native) product ROLAND UM880G 0x0015 EDIROL UM-880 MIDI I/F (generic) +product ROLAND SD90 0x0016 SD-90 MIDI Synth +product ROLAND UM550 0x0023 UM-550 MIDI I/F +product ROLAND SD20 0x0027 SD-20 MIDI Synth +product ROLAND SD80 0x0029 SD-80 MIDI Synth +product ROLAND UA700 0x002b UA-700 Audio I/F /* Rockfire products */ product ROCKFIRE GAMEPAD 0x2033 gamepad 203USB @@ -3394,10 +3408,11 @@ product XYRATEX PRISM_GT_2 0x2002 PrismG /* Yamaha products */ product YAMAHA UX256 0x1000 UX256 MIDI I/F product YAMAHA UX96 0x1008 UX96 MIDI I/F +product YAMAHA RPU200 0x3104 RP-U200 product YAMAHA RTA54I 0x4000 NetVolante RTA54i Broadband&ISDN Router -product YAMAHA RTA55I 0x4004 NetVolante RTA55i Broadband VoIP Router product YAMAHA RTW65B 0x4001 NetVolante RTW65b Broadband Wireless Router product YAMAHA RTW65I 0x4002 NetVolante RTW65i Broadband&ISDN Wireless Router +product YAMAHA RTA55I 0x4004 NetVolante RTA55i Broadband VoIP Router /* Yano products */ product YANO U640MO 0x0101 U640MO-03 From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 09:22:57 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 30A8C1065698; Thu, 24 Feb 2011 09:22:57 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1F6CA8FC16; Thu, 24 Feb 2011 09:22:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1O9MvLU030212; Thu, 24 Feb 2011 09:22:57 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1O9MuEk030209; Thu, 24 Feb 2011 09:22:56 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201102240922.p1O9MuEk030209@svn.freebsd.org> From: Sergey Kandaurov Date: Thu, 24 Feb 2011 09:22:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218989 - in head: lib/libc/sys sys/vm X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 09:22:57 -0000 Author: pluknet Date: Thu Feb 24 09:22:56 2011 New Revision: 218989 URL: http://svn.freebsd.org/changeset/base/218989 Log: Remove sysctl vm.max_proc_mmap used to protect from KVA space exhaustion. As it was pointed out by Alan Cox, that no longer serves its purpose with the modern UMA allocator compared to the old one used in 4.x days. The removal of sysctl eliminates max_proc_mmap type overflow leading to the broken mmap(2) seen with large amount of physical memory on arches with factually unbound KVA space (such as amd64). It was found that slightly less than 256GB of physmem was enough to trigger the overflow. Reviewed by: alc, kib Approved by: avg (mentor) MFC after: 2 months Modified: head/lib/libc/sys/mmap.2 head/sys/vm/vm_mmap.c Modified: head/lib/libc/sys/mmap.2 ============================================================================== --- head/lib/libc/sys/mmap.2 Thu Feb 24 09:13:47 2011 (r218988) +++ head/lib/libc/sys/mmap.2 Thu Feb 24 09:22:56 2011 (r218989) @@ -346,9 +346,6 @@ was specified and the argument was not available. .Dv MAP_ANON was specified and insufficient memory was available. -The system has reached the per-process mmap limit specified in the -.Va vm.max_proc_mmap -sysctl. .El .Sh SEE ALSO .Xr madvise 2 , Modified: head/sys/vm/vm_mmap.c ============================================================================== --- head/sys/vm/vm_mmap.c Thu Feb 24 09:13:47 2011 (r218988) +++ head/sys/vm/vm_mmap.c Thu Feb 24 09:22:56 2011 (r218989) @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include @@ -66,7 +65,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include @@ -80,7 +78,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #ifdef HWPMC_HOOKS #include @@ -92,30 +89,6 @@ struct sbrk_args { }; #endif -static int max_proc_mmap; -SYSCTL_INT(_vm, OID_AUTO, max_proc_mmap, CTLFLAG_RW, &max_proc_mmap, 0, - "Maximum number of memory-mapped files per process"); - -/* - * Set the maximum number of vm_map_entry structures per process. Roughly - * speaking vm_map_entry structures are tiny, so allowing them to eat 1/100 - * of our KVM malloc space still results in generous limits. We want a - * default that is good enough to prevent the kernel running out of resources - * if attacked from compromised user account but generous enough such that - * multi-threaded processes are not unduly inconvenienced. - */ -static void vmmapentry_rsrc_init(void *); -SYSINIT(vmmersrc, SI_SUB_KVM_RSRC, SI_ORDER_FIRST, vmmapentry_rsrc_init, - NULL); - -static void -vmmapentry_rsrc_init(dummy) - void *dummy; -{ - max_proc_mmap = vm_kmem_size / sizeof(struct vm_map_entry); - max_proc_mmap /= 100; -} - static int vm_mmap_vnode(struct thread *, vm_size_t, vm_prot_t, vm_prot_t *, int *, struct vnode *, vm_ooffset_t *, vm_object_t *); static int vm_mmap_cdev(struct thread *, vm_size_t, vm_prot_t, vm_prot_t *, @@ -377,18 +350,6 @@ mmap(td, uap) handle_type = OBJT_VNODE; } map: - - /* - * Do not allow more then a certain number of vm_map_entry structures - * per process. Scale with the number of rforks sharing the map - * to make the limit reasonable for threads. - */ - if (max_proc_mmap && - vms->vm_map.nentries >= max_proc_mmap * vms->vm_refcnt) { - error = ENOMEM; - goto done; - } - td->td_fpop = fp; error = vm_mmap(&vms->vm_map, &addr, size, prot, maxprot, flags, handle_type, handle, pos); From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 10:21:26 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B7AA106564A; Thu, 24 Feb 2011 10:21:26 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5B3E78FC12; Thu, 24 Feb 2011 10:21:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OALQYS033725; Thu, 24 Feb 2011 10:21:26 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OALQE8033723; Thu, 24 Feb 2011 10:21:26 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201102241021.p1OALQE8033723@svn.freebsd.org> From: Pietro Cerutti Date: Thu, 24 Feb 2011 10:21:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218991 - head/share/man/man3 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 10:21:26 -0000 Author: gahr (ports committer) Date: Thu Feb 24 10:21:26 2011 New Revision: 218991 URL: http://svn.freebsd.org/changeset/base/218991 Log: - Fix typo Approved by: davidxu Modified: head/share/man/man3/pthread_rwlock_timedwrlock.3 Modified: head/share/man/man3/pthread_rwlock_timedwrlock.3 ============================================================================== --- head/share/man/man3/pthread_rwlock_timedwrlock.3 Thu Feb 24 10:11:29 2011 (r218990) +++ head/share/man/man3/pthread_rwlock_timedwrlock.3 Thu Feb 24 10:21:26 2011 (r218991) @@ -77,7 +77,7 @@ The lock could not be acquired before th .El .Pp The -.Fn pthread_rwlock_timedrwlock +.Fn pthread_rwlock_timedwrlock function may fail if: .Bl -tag -width Er .It Bq Er EDEADLK From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 13:03:48 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1478C1065670; Thu, 24 Feb 2011 13:03:48 +0000 (UTC) (envelope-from remko@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 043708FC12; Thu, 24 Feb 2011 13:03:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OD3lI8039616; Thu, 24 Feb 2011 13:03:47 GMT (envelope-from remko@svn.freebsd.org) Received: (from remko@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OD3lX4039612; Thu, 24 Feb 2011 13:03:47 GMT (envelope-from remko@svn.freebsd.org) Message-Id: <201102241303.p1OD3lX4039612@svn.freebsd.org> From: Remko Lodder Date: Thu, 24 Feb 2011 13:03:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218998 - in head/share/man: man7 man8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 13:03:48 -0000 Author: remko Date: Thu Feb 24 13:03:47 2011 New Revision: 218998 URL: http://svn.freebsd.org/changeset/base/218998 Log: Move the sticky manual from section 8 to section 7 like NetBSD has, since this is not a command on itself. PR: 124468 MFC after: 1 week Added: head/share/man/man7/sticky.7 - copied, changed from r196178, head/share/man/man8/sticky.8 Deleted: head/share/man/man8/sticky.8 Modified: head/share/man/man7/Makefile head/share/man/man8/Makefile Modified: head/share/man/man7/Makefile ============================================================================== --- head/share/man/man7/Makefile Thu Feb 24 11:09:41 2011 (r218997) +++ head/share/man/man7/Makefile Thu Feb 24 13:03:47 2011 (r218998) @@ -25,6 +25,7 @@ MAN= adding_user.7 \ security.7 \ sprog.7 \ stdint.7 \ + sticky.7 \ tuning.7 MLINKS= intro.7 miscellaneous.7 Copied and modified: head/share/man/man7/sticky.7 (from r196178, head/share/man/man8/sticky.8) ============================================================================== --- head/share/man/man8/sticky.8 Thu Aug 13 10:31:02 2009 (r196178, copy source) +++ head/share/man/man7/sticky.7 Thu Feb 24 13:03:47 2011 (r218998) @@ -33,7 +33,7 @@ .\" $FreeBSD$ .\" .Dd June 5, 1993 -.Dt STICKY 8 +.Dt STICKY 7 .Os .Sh NAME .Nm sticky Modified: head/share/man/man8/Makefile ============================================================================== --- head/share/man/man8/Makefile Thu Feb 24 11:09:41 2011 (r218997) +++ head/share/man/man8/Makefile Thu Feb 24 13:03:47 2011 (r218998) @@ -10,7 +10,6 @@ MAN= crash.8 \ rc.sendmail.8 \ rc.subr.8 \ rescue.8 \ - sticky.8 \ yp.8 MLINKS= rc.8 rc.atm.8 \ From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 13:42:35 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA8821065670; Thu, 24 Feb 2011 13:42:35 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 97EFF8FC08; Thu, 24 Feb 2011 13:42:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1ODgZ89041242; Thu, 24 Feb 2011 13:42:35 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1ODgZ74041235; Thu, 24 Feb 2011 13:42:35 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201102241342.p1ODgZ74041235@svn.freebsd.org> From: Martin Matuska Date: Thu, 24 Feb 2011 13:42:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219001 - in head/contrib/xz: . po src/common src/liblzma/api/lzma src/liblzma/common src/xz X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 13:42:35 -0000 Author: mm Date: Thu Feb 24 13:42:35 2011 New Revision: 219001 URL: http://svn.freebsd.org/changeset/base/219001 Log: Update xz to release 5.0.1 MFC after: 1 week Modified: head/contrib/xz/ChangeLog head/contrib/xz/FREEBSD-upgrade head/contrib/xz/THANKS head/contrib/xz/po/cs.po head/contrib/xz/po/de.po head/contrib/xz/po/it.po head/contrib/xz/po/xz.pot head/contrib/xz/src/common/sysdefs.h head/contrib/xz/src/liblzma/api/lzma/lzma.h head/contrib/xz/src/liblzma/api/lzma/version.h head/contrib/xz/src/liblzma/common/common.h head/contrib/xz/src/xz/file_io.c head/contrib/xz/src/xz/suffix.c head/contrib/xz/src/xz/util.h Directory Properties: head/contrib/xz/ (props changed) Modified: head/contrib/xz/ChangeLog ============================================================================== --- head/contrib/xz/ChangeLog Thu Feb 24 13:23:40 2011 (r219000) +++ head/contrib/xz/ChangeLog Thu Feb 24 13:42:35 2011 (r219001) @@ -1,3 +1,125 @@ +commit 7232fcf96bf4bd5f9cd4fc6c93ca2912c665e004 +Author: Lasse Collin +Date: Fri Jan 28 20:26:38 2011 +0200 + + Bump package version and liblzma soname to 5.0.1. + +commit 5fbce0b8d96dc96775aa0215e3581addc830e23d +Author: Lasse Collin +Date: Fri Jan 28 20:16:57 2011 +0200 + + Update NEWS for 5.0.1. + +commit 03ebd1bbb314f9f204940219a835c883bf442475 +Author: Lasse Collin +Date: Wed Jan 26 12:19:08 2011 +0200 + + xz: Fix --force on setuid/setgid/sticky and multi-hardlink files. + + xz didn't compress setuid/setgid/sticky files and files + with multiple hard links even with --force. This bug was + introduced in 23ac2c44c3ac76994825adb7f9a8f719f78b5ee4. + + Thanks to Charles Wilson. + +commit 7bd0a5e7ccc354f7c2e95c8bc27569c820f6a136 +Author: Lasse Collin +Date: Tue Jan 18 21:25:24 2011 +0200 + + Updated THANKS. + +commit f71c4e16e913f660977526f0ef8d2acdf458d7c9 +Author: Lasse Collin +Date: Tue Jan 18 21:23:50 2011 +0200 + + Add alloc_size and malloc attributes to a few functions. + + Thanks to Cristian Rodríguez for the original patch. + +commit 316cbe24465143edde8f6ffb7532834b7b2ea93f +Author: Lasse Collin +Date: Mon Dec 13 16:36:33 2010 +0200 + + Scripts: Fix gzip and bzip2 support in xzdiff. + +commit 9311774c493c19deab51ded919dcd2e9c4aa2829 +Author: Lasse Collin +Date: Sun Dec 12 21:23:55 2010 +0200 + + Build: Enable ASM on DJGPP by default. + +commit 4a42aaee282fc73b482581684d65110506d5efdd +Author: Lasse Collin +Date: Sun Dec 12 16:09:42 2010 +0200 + + Updated THANKS. + +commit ce56f63c41ee210e6308090eb6d49221fdf67d6c +Author: Lasse Collin +Date: Sun Dec 12 16:07:11 2010 +0200 + + Add missing PRIx32 and PRIx64 compatibility definitions. + + This fixes portability to systems that lack C99 inttypes.h. + + Thanks to Juan Manuel Guerrero. + +commit e6baedddcf54e7da049ebc49183565b99facd4c7 +Author: Lasse Collin +Date: Sun Dec 12 14:50:04 2010 +0200 + + DOS-like: Treat \ and : as directory separators in addition to /. + + Juan Manuel Guerrero had fixed this in his XZ Utils port + to DOS/DJGPP. The bug affects also Windows and OS/2. + +commit b7afd3e22a8fac115b75c738d40d3eb1de7e286f +Author: Lasse Collin +Date: Tue Dec 7 18:52:04 2010 +0200 + + Translations: Fix Czech translation of "sparse file". + + Thanks to Petr Hubený and Marek Černocký. + +commit 3e564704bc6f463cb2db11e3f3f0dbd71d85992e +Author: Lasse Collin +Date: Mon Nov 15 14:28:26 2010 +0200 + + liblzma: Document the return value of lzma_lzma_preset(). + +commit 2964d8d691ed92abdcf214888d79ad6d79774735 +Author: Jonathan Nieder +Date: Fri Nov 12 15:22:13 2010 -0600 + + Simplify paths in generated API docs + + Currently the file list generated by Doxygen has src/ at the + beginning of each path. Paths like common/sysdefs.h and + liblzma/api/lzma.h are easier to read without such a prefix. + + Builds from a separate build directory with + + mkdir build + cd build + ../configure + doxygen Doxyfile + + include an even longer prefix /home/someone/src/xz/src; this + patch has the nice side-effect of eliminating that prefix, too. + + Fixes: http://bugs.debian.org/572273 + +commit 37c25658efd25b034266daf87cd381d20d1df776 +Author: Lasse Collin +Date: Tue Oct 26 15:48:48 2010 +0300 + + Build: Copy the example programs to $docdir/examples. + + The example programs by Daniel Mealha Cabrita were included + in the git repository, but I had forgot to add them to + Makefile.am. Thus, they didn't get included in the source + package at all by "make dist". + commit e45929260cd902036efd40c5610a8d0a50d5712b Author: Lasse Collin Date: Sat Oct 23 17:25:52 2010 +0300 Modified: head/contrib/xz/FREEBSD-upgrade ============================================================================== --- head/contrib/xz/FREEBSD-upgrade Thu Feb 24 13:23:40 2011 (r219000) +++ head/contrib/xz/FREEBSD-upgrade Thu Feb 24 13:42:35 2011 (r219001) @@ -4,7 +4,7 @@ xz The source code is pulled with git: - git clone git://ctrl.tukaani.org/xz.git xz + git clone http://git.tukaani.org/xz.git xz ChangeLog is generated with: Modified: head/contrib/xz/THANKS ============================================================================== --- head/contrib/xz/THANKS Thu Feb 24 13:23:40 2011 (r219000) +++ head/contrib/xz/THANKS Thu Feb 24 13:42:35 2011 (r219001) @@ -22,6 +22,7 @@ has been important. :-) In alphabetical - Gilles Espinasse - Denis Excoffier - Mike Frysinger + - Juan Manuel Guerrero - Joachim Henke - Peter Ivanov - Jouk Jansen @@ -46,6 +47,7 @@ has been important. :-) In alphabetical - Mikko Pouru - Robert Readman - Bernhard Reutner-Fischer + - Cristian Rodríguez - Christian von Roques - Jukka Salmi - Alexandre Sauvé Modified: head/contrib/xz/po/cs.po ============================================================================== --- head/contrib/xz/po/cs.po Thu Feb 24 13:23:40 2011 (r219000) +++ head/contrib/xz/po/cs.po Thu Feb 24 13:42:35 2011 (r219001) @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: xz-utils\n" "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n" -"POT-Creation-Date: 2010-10-23 17:48+0300\n" -"PO-Revision-Date: 2010-09-17 18:54+0200\n" +"POT-Creation-Date: 2010-12-03 11:25+0100\n" +"PO-Revision-Date: 2010-12-03 11:32+0100\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" "Language: cs\n" @@ -30,7 +30,8 @@ msgstr "%s: Neznámý typ kontroly integ #: src/xz/args.c:382 msgid "Only one file can be specified with `--files' or `--files0'." -msgstr "Spolu s přepínači „--files“ nebo „--files0“ může být zadán pouze jeden soubor" +msgstr "" +"Spolu s přepínači „--files“ nebo „--files0“ může být zadán pouze jeden soubor" #: src/xz/args.c:445 #, c-format @@ -51,7 +52,8 @@ msgstr "Použití přednastavení v rež #: src/xz/coder.c:131 msgid "The exact options of the presets may vary between software versions." -msgstr "Přesné volby u přednastavení se mohou lišit mezi různými verzemi softwaru." +msgstr "" +"Přesné volby u přednastavení se mohou lišit mezi různými verzemi softwaru." #: src/xz/coder.c:157 msgid "The .lzma format supports only the LZMA1 filter" @@ -72,8 +74,12 @@ msgstr "Dekomprimace bude vyžadovat %s #: src/xz/coder.c:247 #, c-format -msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Přizpůsobit velikost slovníku LZMA%c z %s MiB na %s MiB, tak aby nebylo překročeno omezení použitelné paměti %s MiB" +msgid "" +"Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the " +"memory usage limit of %s MiB" +msgstr "" +"Přizpůsobit velikost slovníku LZMA%c z %s MiB na %s MiB, tak aby nebylo " +"překročeno omezení použitelné paměti %s MiB" #. TRANSLATORS: When compression or decompression finishes, #. and xz is going to remove the source file, xz first checks @@ -153,7 +159,8 @@ msgstr "%s: Selhalo zavření souboru: % #: src/xz/file_io.c:762 src/xz/file_io.c:946 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" -msgstr "%s: Selhalo nastavení pozice při pokusu o vytvoření záložního souboru: %s" +msgstr "" +"%s: Selhalo nastavení pozice při pokusu o vytvoření souboru řídké matice: %s" #: src/xz/file_io.c:821 #, c-format @@ -312,10 +319,12 @@ msgstr " Zarovnání proudu: %s\ #: src/xz/list.c:693 msgid "" " Streams:\n" -" Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" +" Stream Blocks CompOffset UncompOffset CompSize " +"UncompSize Ratio Check Padding" msgstr "" " Proudy:\n" -" Proud Bloky KomprPozice NekomprPozice KomprVelikost NekomprVelikost Poměr Kontrola Zarovnání" +" Proud Bloky KomprPozice NekomprPozice KomprVelikost " +"NekomprVelikost Poměr Kontrola Zarovnání" #. TRANSLATORS: The second line is column headings. All #. except Check are right aligned; Check is left aligned. @@ -323,10 +332,12 @@ msgstr "" #, c-format msgid "" " Blocks:\n" -" Stream Block CompOffset UncompOffset TotalSize UncompSize Ratio Check" +" Stream Block CompOffset UncompOffset TotalSize " +"UncompSize Ratio Check" msgstr "" " Bloky:\n" -" Proud Blok KomprPozice NekomprPozice CelkVelikost NekomprVelikost Poměr Kontrola" +" Proud Blok KomprPozice NekomprPozice CelkVelikost " +"NekomprVelikost Poměr Kontrola" #. TRANSLATORS: These are additional column headings #. for the most verbose listing mode. CheckVal @@ -397,16 +408,24 @@ msgstr "%s: Neočekávaný konec vstupu #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" -msgstr "%s: Byl nalezen nulový znak při čtení názvů souborů; nechtěli jste náhodou použít „--files0“ místo „--files“?" +msgid "" +"%s: Null character found when reading filenames; maybe you meant to use `--" +"files0' instead of `--files'?" +msgstr "" +"%s: Byl nalezen nulový znak při čtení názvů souborů; nechtěli jste náhodou " +"použít „--files0“ místo „--files“?" #: src/xz/main.c:174 msgid "Compression and decompression with --robot are not supported yet." msgstr "Komprimace a dekomprimace s přepínačem --robot není zatím podporovaná." #: src/xz/main.c:231 -msgid "Cannot read data from standard input when reading filenames from standard input" -msgstr "Ze standardního vstupu nelze číst data, když se ze standardního vstupu načítají názvy souborů" +msgid "" +"Cannot read data from standard input when reading filenames from standard " +"input" +msgstr "" +"Ze standardního vstupu nelze číst data, když se ze standardního vstupu " +"načítají názvy souborů" #: src/xz/message.c:792 src/xz/message.c:842 msgid "Internal error (bug)" @@ -422,7 +441,8 @@ msgstr "Žádná kontrola integrity; int #: src/xz/message.c:811 msgid "Unsupported type of integrity check; not verifying file integrity" -msgstr "Nepodporovaný typ kontroly integrity; integrita souboru se nebude ověřovat" +msgstr "" +"Nepodporovaný typ kontroly integrity; integrita souboru se nebude ověřovat" #: src/xz/message.c:818 msgid "Memory usage limit reached" @@ -471,8 +491,11 @@ msgstr "" "\n" #: src/xz/message.c:1091 -msgid "Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "Povinné argumenty pro dlouhé přepínače jsou povinné rovněž pro krátké přepínače.\n" +msgid "" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Povinné argumenty pro dlouhé přepínače jsou povinné rovněž pro krátké " +"přepínače.\n" #: src/xz/message.c:1095 msgid " Operation mode:\n" @@ -505,8 +528,10 @@ msgid "" " -c, --stdout write to standard output and don't delete input files" msgstr "" " -k, --keep zachovat (nemazat) vstupní soubory\n" -" -f, --force vynutit přepis výstupního souboru a de/komprimovat odkazy\n" -" -c, --stdout zapisovat na standardní výstup a nemazat vstupní soubory" +" -f, --force vynutit přepis výstupního souboru a de/komprimovat " +"odkazy\n" +" -c, --stdout zapisovat na standardní výstup a nemazat vstupní " +"soubory" #: src/xz/message.c:1113 msgid "" @@ -514,15 +539,19 @@ msgid "" " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" -" filenames must be terminated with the newline character\n" +" filenames must be terminated with the newline " +"character\n" " --files0[=FILE] like --files but use the null character as terminator" msgstr "" -" --no-sparse nevytvářet při dekomprimaci záložní soubory\n" +" --no-sparse nevytvářet při dekomprimaci soubory řídkých matic\n" " -S, --suffix=.PRIP použít u komprimovaných souborů příponu „.PRIP“\n" -" --files[=SOUBOR] číst názvy souborů, které se mají zpracovat, ze SOUBORu;\n" -" pokud není SOUBOR zadán, čte se ze standardního vstupu;\n" +" --files[=SOUBOR] číst názvy souborů, které se mají zpracovat, ze " +"SOUBORu;\n" +" pokud není SOUBOR zadán, čte se ze standardního " +"vstupu;\n" " názvy souborů musí být zakončeny znakem nového řádku\n" -" --files0[=SOUBOR] stejné jako --files, ale použít k zakončování nulový znak" +" --files0[=SOUBOR] stejné jako --files, ale použít k zakončování nulový " +"znak" #: src/xz/message.c:1121 msgid "" @@ -541,20 +570,26 @@ msgid "" msgstr "" " -F, --format=FORMÁT formát souboru k zakódování nebo dekódování; možné\n" " hodnoty jsou „auto“ (výchozí), „xz“, „lzma“ a „raw“\n" -" -C, --check=KONTROLA typ kontroly integrity: „none“ (používejte s rozmyslem),\n" +" -C, --check=KONTROLA typ kontroly integrity: „none“ (používejte s " +"rozmyslem),\n" " „crc32“, „crc64“ (výchozí) nebo „sha256“" #: src/xz/message.c:1130 msgid "" -" -0 ... -9 compression preset; default is 6; take compressor *and*\n" -" decompressor memory usage into account before using 7-9!" -msgstr "" -" -0 .. -9 přednastavení komprimace; výchozí je 6; než použijete\n" -" hodnoty 7 – 9, vezměte do úvahy množství použité paměti" +" -0 ... -9 compression preset; default is 6; take compressor " +"*and*\n" +" decompressor memory usage into account before using " +"7-9!" +msgstr "" +" -0 .. -9 přednastavení komprimace; výchozí je 6; než " +"použijete\n" +" hodnoty 7 – 9, vezměte do úvahy množství použité " +"paměti" #: src/xz/message.c:1134 msgid "" -" -e, --extreme try to improve compression ratio by using more CPU time;\n" +" -e, --extreme try to improve compression ratio by using more CPU " +"time;\n" " does not affect decompressor memory requirements" msgstr "" " -e, --extreme zkusit zlepšit poměr komprimace využitím více času\n" @@ -566,22 +601,27 @@ msgid "" " --memlimit-compress=LIMIT\n" " --memlimit-decompress=LIMIT\n" " -M, --memlimit=LIMIT\n" -" set memory usage limit for compression, decompression,\n" +" set memory usage limit for compression, " +"decompression,\n" " or both; LIMIT is in bytes, % of RAM, or 0 for defaults" msgstr "" " --memlimit-compress=LIMIT\n" " --memlimit-decompress=LIMIT\n" " -M, --memlimit=LIMIT\n" " nastaví omezení použitelné paměti pro komprimaci,\n" -" dekomprimaci nebo obojí; LIMIT je v bajtech, % z paměti\n" +" dekomprimaci nebo obojí; LIMIT je v bajtech, % z " +"paměti\n" " RAM nebo 0 pro výchozí" #: src/xz/message.c:1146 msgid "" -" --no-adjust if compression settings exceed the memory usage limit,\n" -" give an error instead of adjusting the settings downwards" +" --no-adjust if compression settings exceed the memory usage " +"limit,\n" +" give an error instead of adjusting the settings " +"downwards" msgstr "" -" --no-adjust pokud nastavení komprimace přesáhne omezení použitelné\n" +" --no-adjust pokud nastavení komprimace přesáhne omezení " +"použitelné\n" " paměti, předat chybu namísto snížení nastavení" #: src/xz/message.c:1152 @@ -590,13 +630,16 @@ msgid "" " Custom filter chain for compression (alternative for using presets):" msgstr "" "\n" -"Vlastní omezující filtr pro komprimaci (alternativa k použití přednastavených):" +"Vlastní omezující filtr pro komprimaci (alternativa k použití " +"přednastavených):" #: src/xz/message.c:1161 msgid "" "\n" -" --lzma1[=OPTS] LZMA1 or LZMA2; OPTS is a comma-separated list of zero or\n" -" --lzma2[=OPTS] more of the following options (valid values; default):\n" +" --lzma1[=OPTS] LZMA1 or LZMA2; OPTS is a comma-separated list of zero " +"or\n" +" --lzma2[=OPTS] more of the following options (valid values; " +"default):\n" " preset=PRE reset options to a preset (0-9[e])\n" " dict=NUM dictionary size (4KiB - 1536MiB; 8MiB)\n" " lc=NUM number of literal context bits (0-4; 3)\n" @@ -604,20 +647,29 @@ msgid "" " pb=NUM number of position bits (0-4; 2)\n" " mode=MODE compression mode (fast, normal; normal)\n" " nice=NUM nice length of a match (2-273; 64)\n" -" mf=NAME match finder (hc3, hc4, bt2, bt3, bt4; bt4)\n" -" depth=NUM maximum search depth; 0=automatic (default)" -msgstr "" -"\n" -" --lzma1[=VOLBY] LZMA1 nebo LZMA2; VOLBY je čárkou oddělovaný seznam žádné\n" -" --lzma2[=VOLBY] nebo více následujících voleb (platné hodnoty; výchozí):\n" -" preset=PŘE změnit volby na PŘEdnastavené (0 – 9[e])\n" -" dict=POČ velikost slovníku (4 KiB – 1536 MiB; 8 MiB)\n" -" lc=POČ počet kontextových bitů literálu (0 – 4; 3)\n" -" lp=POČ počet pozičních bitů literálu (0 – 4; 0)\n" +" mf=NAME match finder (hc3, hc4, bt2, bt3, bt4; " +"bt4)\n" +" depth=NUM maximum search depth; 0=automatic " +"(default)" +msgstr "" +"\n" +" --lzma1[=VOLBY] LZMA1 nebo LZMA2; VOLBY je čárkou oddělovaný seznam " +"žádné\n" +" --lzma2[=VOLBY] nebo více následujících voleb (platné hodnoty; " +"výchozí):\n" +" preset=PŘE změnit volby na PŘEdnastavené (0 – 9" +"[e])\n" +" dict=POČ velikost slovníku (4 KiB – 1536 MiB; 8 " +"MiB)\n" +" lc=POČ počet kontextových bitů literálu (0 – 4; " +"3)\n" +" lp=POČ počet pozičních bitů literálu (0 – 4; " +"0)\n" " pb=POČ počet pozičních bitů (0 – 4; 2)\n" " mode=REŽIM režim komprimace (fast, normal; normal)\n" " nice=NUM příznivá délka shody (2 – 273; 64)\n" -" mf=NÁZEV hledání shod (hc3, hc4, bt2, bt3, bt4; bt4)\n" +" mf=NÁZEV hledání shod (hc3, hc4, bt2, bt3, bt4; " +"bt4)\n" " depth=POČ maximální hloubka prohledávání;\n" " 0 = automaticky (výchozí)" @@ -652,7 +704,8 @@ msgid "" msgstr "" "\n" " --delta[=VOLBY] Filtr Delta; platné VOLBY (platné hodnoty; výchozí):\n" -" dist=POČ vzdálenost mezi bajty, které jsou odečítány\n" +" dist=POČ vzdálenost mezi bajty, které jsou " +"odečítány\n" " jeden od druhého (1 – 256; 1)" #: src/xz/message.c:1196 @@ -665,10 +718,12 @@ msgstr "" #: src/xz/message.c:1199 msgid "" -" -q, --quiet suppress warnings; specify twice to suppress errors too\n" +" -q, --quiet suppress warnings; specify twice to suppress errors " +"too\n" " -v, --verbose be verbose; specify twice for even more verbose" msgstr "" -" -q, --quiet potlačit varování; zadáním dvakrát, potlačíte i chyby\n" +" -q, --quiet potlačit varování; zadáním dvakrát, potlačíte i " +"chyby\n" " -v, --verbose podrobnější zprávy; zadáním dvakrát, budou ještě\n" " podrobnější" @@ -677,17 +732,20 @@ msgid " -Q, --no-warn make warnin msgstr " -Q, --no-warn způsobí, že varování neovlivní stav ukončení" #: src/xz/message.c:1206 -msgid " --robot use machine-parsable messages (useful for scripts)" +msgid "" +" --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot použít strojově analyzovatelné zprávy (užitečné pro\n" " skripty)" #: src/xz/message.c:1209 msgid "" -" --info-memory display the total amount of RAM and the currently active\n" +" --info-memory display the total amount of RAM and the currently " +"active\n" " memory usage limits, and exit" msgstr "" -" --info-memory zobrazit celkové množství paměti RAM a současné aktivní\n" +" --info-memory zobrazit celkové množství paměti RAM a současné " +"aktivní\n" " omezení použitelné paměti a skončit" #: src/xz/message.c:1212 @@ -695,7 +753,8 @@ msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" msgstr "" -" -h, --help zobrazit krátkou nápovědu (vypíše jen základní přepínače)\n" +" -h, --help zobrazit krátkou nápovědu (vypíše jen základní " +"přepínače)\n" " -H, --long-help zobrazit tuto úplnou nápovědu a skončit" #: src/xz/message.c:1216 @@ -704,7 +763,8 @@ msgid "" " -H, --long-help display the long help (lists also the advanced options)" msgstr "" " -h, --help zobrazit tuto zkrácenou nápovědu a skončit\n" -" -H, --long-help zobrazit úplnou nápovědu (vypíše i pokročilé přepínače)" +" -H, --long-help zobrazit úplnou nápovědu (vypíše i pokročilé " +"přepínače)" #: src/xz/message.c:1221 msgid " -V, --version display the version number and exit" @@ -716,7 +776,8 @@ msgid "" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" "\n" -"Pokud SOUBOR není zadán nebo pokud je -, bude se číst ze standardního vstupu.\n" +"Pokud SOUBOR není zadán nebo pokud je -, bude se číst ze standardního " +"vstupu.\n" #. TRANSLATORS: This message indicates the bug reporting address #. for this package. Please add _another line_ saying @@ -763,8 +824,11 @@ msgstr "Vybraný vyhledávač shod vyža #: src/xz/suffix.c:79 src/xz/suffix.c:164 #, c-format -msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" -msgstr "%s: S přepínačem --format=raw je vyžadován --sufix=.PRIP, vyjma zápisu do standardního výstupu" +msgid "" +"%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" +msgstr "" +"%s: S přepínačem --format=raw je vyžadován --sufix=.PRIP, vyjma zápisu do " +"standardního výstupu" #: src/xz/suffix.c:99 #, c-format @@ -793,7 +857,9 @@ msgstr "%s: Neplatná jednotka s předpo #: src/xz/util.c:105 msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." -msgstr "Platné jednotky s předponami jsou „KiB“ (2^10 B), „MiB“ (2^20 B) a „GiB“ (2^30 B)." +msgstr "" +"Platné jednotky s předponami jsou „KiB“ (2^10 B), „MiB“ (2^20 B) a " +"„GiB“ (2^30 B)." #: src/xz/util.c:122 #, c-format @@ -827,37 +893,49 @@ msgstr "Neznámá chyba" #~ msgstr "%s MiB (%s bajtů)\n" #~ msgid "" -#~ " -e, --extreme use more CPU time when encoding to increase compression\n" +#~ " -e, --extreme use more CPU time when encoding to increase " +#~ "compression\n" #~ " ratio without increasing memory usage of the decoder" #~ msgstr "" -#~ " -e, --extreme využít více procesorového času pro kódování, čímž se\n" -#~ " zvýší kompresní poměr bez zvýšení paměti použité kodérem" +#~ " -e, --extreme využít více procesorového času pro kódování, čímž " +#~ "se\n" +#~ " zvýší kompresní poměr bez zvýšení paměti použité " +#~ "kodérem" #~ msgid "" -#~ " -M, --memory=NUM use roughly NUM bytes of memory at maximum; 0 indicates\n" +#~ " -M, --memory=NUM use roughly NUM bytes of memory at maximum; 0 " +#~ "indicates\n" #~ " the default setting, which is 40 % of total RAM" #~ msgstr "" -#~ " -M, --memory=POČ použít zhruba POČ bajtů paměti jako maximum; 0 znamená\n" -#~ " výchozí nastavení, což je 40% celkového množství paměti" +#~ " -M, --memory=POČ použít zhruba POČ bajtů paměti jako maximum; 0 " +#~ "znamená\n" +#~ " výchozí nastavení, což je 40% celkového množství " +#~ "paměti" #~ msgid "" #~ "\n" -#~ " --subblock[=OPTS] Subblock filter; valid OPTS (valid values; default):\n" +#~ " --subblock[=OPTS] Subblock filter; valid OPTS (valid values; " +#~ "default):\n" #~ " size=NUM number of bytes of data per subblock\n" #~ " (1 - 256Mi; 4Ki)\n" -#~ " rle=NUM run-length encoder chunk size (0-256; 0)" +#~ " rle=NUM run-length encoder chunk size (0-256; " +#~ "0)" #~ msgstr "" #~ "\n" -#~ " --subblock[=VOLBY] Subblokový filtr; platné VOLBY (platné hodnoty; výchozí):\n" +#~ " --subblock[=VOLBY] Subblokový filtr; platné VOLBY (platné hodnoty; " +#~ "výchozí):\n" #~ " size=POČ počet bajtů dat na subblok\n" #~ " (1 - 256 Mi; 4 Ki)\n" -#~ " rle=POČ velikost dávky pro kodér run-length (0-256; 0)" +#~ " rle=POČ velikost dávky pro kodér run-length " +#~ "(0-256; 0)" #~ msgid "" -#~ "On this system and configuration, this program will use a maximum of roughly\n" +#~ "On this system and configuration, this program will use a maximum of " +#~ "roughly\n" #~ "%s MiB RAM and " #~ msgstr "" -#~ "Na tomto systému a s tímto nastavením použije tento program maximum ze zhruba\n" +#~ "Na tomto systému a s tímto nastavením použije tento program maximum ze " +#~ "zhruba\n" #~ "%s MiB RAM a " #~ msgid "" Modified: head/contrib/xz/po/de.po ============================================================================== --- head/contrib/xz/po/de.po Thu Feb 24 13:23:40 2011 (r219000) +++ head/contrib/xz/po/de.po Thu Feb 24 13:42:35 2011 (r219001) @@ -6,11 +6,10 @@ msgid "" msgstr "" "Project-Id-Version: XZ Utils 4.999.9beta\n" "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n" -"POT-Creation-Date: 2010-10-23 17:48+0300\n" +"POT-Creation-Date: 2010-09-11 17:07+0200\n" "PO-Revision-Date: 2010-09-07 20:27+0200\n" "Last-Translator: \n" "Language-Team: German\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -28,7 +27,8 @@ msgstr "%s: Integritäts-Check Typ nicht #: src/xz/args.c:382 msgid "Only one file can be specified with `--files' or `--files0'." -msgstr "Nur ein file kann als Argument für --files oder --files0 angegeben werden." +msgstr "" +"Nur ein file kann als Argument für --files oder --files0 angegeben werden." #: src/xz/args.c:445 #, c-format @@ -41,7 +41,8 @@ msgstr "Maximal vier Filter möglich" #: src/xz/coder.c:108 msgid "Memory usage limit is too low for the given filter setup." -msgstr "Das Speicher Limit ist zu niedrig für die gegebene Filter Konfiguration." +msgstr "" +"Das Speicher Limit ist zu niedrig für die gegebene Filter Konfiguration." #: src/xz/coder.c:129 msgid "Using a preset in raw mode is discouraged." @@ -49,7 +50,9 @@ msgstr "Verwendung der Voreinstellung im #: src/xz/coder.c:131 msgid "The exact options of the presets may vary between software versions." -msgstr "Die genauen Optionen der Voreinstellung können zwischen Software Versionen variieren." +msgstr "" +"Die genauen Optionen der Voreinstellung können zwischen Software Versionen " +"variieren." #: src/xz/coder.c:157 msgid "The .lzma format supports only the LZMA1 filter" @@ -70,8 +73,12 @@ msgstr "Dekompression wird %s MiB Speich #: src/xz/coder.c:247 #, c-format -msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Passte LZMA%c Wörterbuch Größe von %s MiB to %s MiB an, um nicht das Speicher Nutzungslimit von %s MiB zu übersteigen" +msgid "" +"Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the " +"memory usage limit of %s MiB" +msgstr "" +"Passte LZMA%c Wörterbuch Größe von %s MiB to %s MiB an, um nicht das " +"Speicher Nutzungslimit von %s MiB zu übersteigen" #. TRANSLATORS: When compression or decompression finishes, #. and xz is going to remove the source file, xz first checks @@ -86,7 +93,8 @@ msgstr "Passte LZMA%c Wörterbuch Größ #: src/xz/file_io.c:137 #, c-format msgid "%s: File seems to have been moved, not removing" -msgstr "%s: Datei scheint umbenannt worden zu sein, daher wird sie nicht gelöscht" +msgstr "" +"%s: Datei scheint umbenannt worden zu sein, daher wird sie nicht gelöscht" #: src/xz/file_io.c:144 src/xz/file_io.c:590 #, c-format @@ -141,7 +149,8 @@ msgstr "%s: Eingabedatei hat mehr als ei #: src/xz/file_io.c:714 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" -msgstr "Fehler beim Wiederherstellen des O_APPEND flags bei Standard Output: %s" +msgstr "" +"Fehler beim Wiederherstellen des O_APPEND flags bei Standard Output: %s" #: src/xz/file_io.c:726 #, c-format @@ -151,7 +160,8 @@ msgstr "%s: Fehler beim Schießen der Da #: src/xz/file_io.c:762 src/xz/file_io.c:946 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" -msgstr "%s: Positionierungsfehler beim Versuch eine sparse Datei zu erzeugen: %s" +msgstr "" +"%s: Positionierungsfehler beim Versuch eine sparse Datei zu erzeugen: %s" #: src/xz/file_io.c:821 #, c-format @@ -202,7 +212,7 @@ msgstr "Kein" #. but the Check ID is known (here 2). This and other "Unknown-N" #. strings are used in tables, so the width must not exceed ten #. columns with a fixed-width font. It's OK to omit the dash if -#. you need space for one extra letter, but don't use spaces. +#. you need space for one extra letter. #: src/xz/list.c:69 msgid "Unknown-2" msgstr "Unbek.2" @@ -310,10 +320,12 @@ msgstr " Strom Auffüllung: %s\n" #: src/xz/list.c:693 msgid "" " Streams:\n" -" Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" +" Stream Blocks CompOffset UncompOffset CompSize " +"UncompSize Ratio Check Padding" msgstr "" " Ströme:\n" -" Strom Blöcke KompOffset UnkompOffset KompGröße UnkompGröße Verh. Check Auffüllung" +" Strom Blöcke KompOffset UnkompOffset KompGröße " +"UnkompGröße Verh. Check Auffüllung" #. TRANSLATORS: The second line is column headings. All #. except Check are right aligned; Check is left aligned. @@ -321,10 +333,12 @@ msgstr "" #, c-format msgid "" " Blocks:\n" -" Stream Block CompOffset UncompOffset TotalSize UncompSize Ratio Check" +" Stream Block CompOffset UncompOffset TotalSize " +"UncompSize Ratio Check" msgstr "" " Blöcke:\n" -" Strom Block KompOffset UnkompOffset TotalGröße UnkompGröße Verh. Check" +" Strom Block KompOffset UnkompOffset TotalGröße " +"UnkompGröße Verh. Check" #. TRANSLATORS: These are additional column headings #. for the most verbose listing mode. CheckVal @@ -376,7 +390,8 @@ msgstr " Anzahl Dateien: %s\n" #: src/xz/list.c:1072 msgid "--list works only on .xz files (--format=xz or --format=auto)" -msgstr "--list funktioniert nur mit .xz Dateien (--format=xz oder --format=auto)" +msgstr "" +"--list funktioniert nur mit .xz Dateien (--format=xz oder --format=auto)" #: src/xz/list.c:1078 msgid "--list does not support reading from standard input" @@ -394,69 +409,79 @@ msgstr "%s: Unerwartetes Ende beim Lesen #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" -msgstr "%s: Null Charakter gefunden beim Lesen der Dateinamen; Meinten Sie `--files0' statt `--files'?" +msgid "" +"%s: Null character found when reading filenames; maybe you meant to use `--" +"files0' instead of `--files'?" +msgstr "" +"%s: Null Charakter gefunden beim Lesen der Dateinamen; Meinten Sie `--" +"files0' statt `--files'?" #: src/xz/main.c:174 msgid "Compression and decompression with --robot are not supported yet." msgstr "Kompression und Dekompression mit --robot ist noch nicht unterstützt." #: src/xz/main.c:231 -msgid "Cannot read data from standard input when reading filenames from standard input" -msgstr "Lesen der Standardeingabe ist nicht möglich, wenn die Dateinamen auch von der Standardeingabe gelesen werden" +msgid "" +"Cannot read data from standard input when reading filenames from standard " +"input" +msgstr "" +"Lesen der Standardeingabe ist nicht möglich, wenn die Dateinamen auch von " +"der Standardeingabe gelesen werden" -#: src/xz/message.c:792 src/xz/message.c:842 +#: src/xz/message.c:800 src/xz/message.c:844 msgid "Internal error (bug)" msgstr "Interner Fehler (Bug)" -#: src/xz/message.c:799 +#: src/xz/message.c:807 msgid "Cannot establish signal handlers" msgstr "Kann Signal Routine nicht setzen" -#: src/xz/message.c:808 +#: src/xz/message.c:816 msgid "No integrity check; not verifying file integrity" msgstr "Kein Integritäts-Check; werde Datei-Integrität nicht überprüfen" -#: src/xz/message.c:811 +#: src/xz/message.c:819 msgid "Unsupported type of integrity check; not verifying file integrity" -msgstr "Typ des Integritäts-Checks nicht unterstützt; werde Datei-Integrität nicht überprüfen" +msgstr "" +"Typ des Integritäts-Checks nicht unterstützt; werde Datei-Integrität nicht " +"überprüfen" -#: src/xz/message.c:818 +#: src/xz/message.c:826 msgid "Memory usage limit reached" msgstr "Speicher-Limit erreicht" -#: src/xz/message.c:821 +#: src/xz/message.c:829 msgid "File format not recognized" msgstr "Datei Format nicht erkannt" -#: src/xz/message.c:824 +#: src/xz/message.c:832 msgid "Unsupported options" msgstr "Optionen nicht unterstützt" -#: src/xz/message.c:827 +#: src/xz/message.c:835 msgid "Compressed data is corrupt" msgstr "Komprimierte Daten sind korrupt" -#: src/xz/message.c:830 +#: src/xz/message.c:838 msgid "Unexpected end of input" msgstr "Unerwartetes Eingabe Ende" -#: src/xz/message.c:881 +#: src/xz/message.c:886 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB Speicher wird benötigt. Limit ist %s." -#: src/xz/message.c:1048 +#: src/xz/message.c:1053 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Filter Kette: %s\n" -#: src/xz/message.c:1058 +#: src/xz/message.c:1063 #, c-format msgid "Try `%s --help' for more information." msgstr "Versuchen Sie `%s --help' für mehr Informationen." -#: src/xz/message.c:1084 +#: src/xz/message.c:1089 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -467,17 +492,18 @@ msgstr "" "Komprimiert oder dekomprimiert .xz DATEI(EN).\n" "\n" -#: src/xz/message.c:1091 -msgid "Mandatory arguments to long options are mandatory for short options too.\n" +#: src/xz/message.c:1096 +msgid "" +"Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Obligatorische Argumente für lange Optionen sind auch für kurze Optionen\n" "zwingend.\n" -#: src/xz/message.c:1095 +#: src/xz/message.c:1100 msgid " Operation mode:\n" msgstr " Operationsmodus:\n" -#: src/xz/message.c:1098 +#: src/xz/message.c:1103 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -489,7 +515,7 @@ msgstr "" " -t, --test überprüfe Datei Integrität\n" " -l, --list liste Datei Informationen" -#: src/xz/message.c:1104 +#: src/xz/message.c:1109 msgid "" "\n" " Operation modifiers:\n" @@ -497,7 +523,7 @@ msgstr "" "\n" " Operationsmodifikatoren:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1112 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -509,13 +535,14 @@ msgstr "" " -c, --stdout schreibe nach Standard Output und lösche nicht die\n" " Eingabedateien" -#: src/xz/message.c:1113 +#: src/xz/message.c:1118 msgid "" " --no-sparse do not create sparse files when decompressing\n" " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" -" filenames must be terminated with the newline character\n" +" filenames must be terminated with the newline " +"character\n" " --files0[=FILE] like --files but use the null character as terminator" msgstr "" " --no-sparse erzeuge keine sparse Datei beim Dekomprimieren\n" @@ -524,9 +551,10 @@ msgstr "" " DATEI nicht angegeben wurde, werden Dateinamen\n" " von Standard Input gelesen. Dateinamen müssen mit\n" " einem Zeilenumbruch voneinander getrennt werden\n" -" --files0=[DATEI] wie --files, aber benutze den Null Charakter als Trenner" +" --files0=[DATEI] wie --files, aber benutze den Null Charakter als " +"Trenner" -#: src/xz/message.c:1121 +#: src/xz/message.c:1126 msgid "" "\n" " Basic file format and compression options:\n" @@ -534,62 +562,76 @@ msgstr "" "\n" " Grundlegende Optionen für Dateiformat und Kompression:\n" -#: src/xz/message.c:1123 +#: src/xz/message.c:1128 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" " `auto' (default), `xz', `lzma', and `raw'\n" " -C, --check=CHECK integrity check type: `none' (use with caution),\n" " `crc32', `crc64' (default), or `sha256'" msgstr "" -" -F, --format=FMT Dateiformat zur Kodierung oder Dekodierung; mögliche\n" -" Werte sind `auto' (Voreinstellung), `xz', `lzma' und\n" +" -F, --format=FMT Dateiformat zur Kodierung oder Dekodierung; " +"mögliche\n" +" Werte sind `auto' (Voreinstellung), `xz', `lzma' " +"und\n" " `raw'\n" -" -C, --check=CHECK Typ des Integritätschecks: `none' (Vorsicht), `crc32',\n" +" -C, --check=CHECK Typ des Integritätschecks: `none' (Vorsicht), " +"`crc32',\n" " `crc64' (Voreinstellung), oder `sha256'" -#: src/xz/message.c:1130 +#: src/xz/message.c:1135 msgid "" -" -0 ... -9 compression preset; default is 6; take compressor *and*\n" -" decompressor memory usage into account before using 7-9!" -msgstr "" -" -0 .. -9 Kompressionseinstellung; Voreinstellung is 6. Beachten\n" -" Sie den Speicherverbrauch des Komprimieres *und* des\n" +" -0 ... -9 compression preset; default is 6; take compressor " +"*and*\n" +" decompressor memory usage into account before using 7-" +"9!" +msgstr "" +" -0 .. -9 Kompressionseinstellung; Voreinstellung is 6. " +"Beachten\n" +" Sie den Speicherverbrauch des Komprimieres *und* " +"des\n" " Dekomprimierers, wenn Sie 7-9 benutzen!" -#: src/xz/message.c:1134 +#: src/xz/message.c:1139 msgid "" -" -e, --extreme try to improve compression ratio by using more CPU time;\n" +" -e, --extreme try to improve compression ratio by using more CPU " +"time;\n" " does not affect decompressor memory requirements" msgstr "" -" -e, --extreme Versuche durch stärkere CPU Nutzung das Kompressions-\n" +" -e, --extreme Versuche durch stärkere CPU Nutzung das " +"Kompressions-\n" " verhältnis zu verbessern. Das beeinflusst nicht den\n" " Speicherbedarf des Dekomprimierers." -#: src/xz/message.c:1139 +#: src/xz/message.c:1144 #, no-c-format msgid "" *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 16:13:33 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 661991065694; Thu, 24 Feb 2011 16:13:33 +0000 (UTC) (envelope-from remko@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 556C98FC20; Thu, 24 Feb 2011 16:13:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OGDXW0047079; Thu, 24 Feb 2011 16:13:33 GMT (envelope-from remko@svn.freebsd.org) Received: (from remko@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OGDXpM047076; Thu, 24 Feb 2011 16:13:33 GMT (envelope-from remko@svn.freebsd.org) Message-Id: <201102241613.p1OGDXpM047076@svn.freebsd.org> From: Remko Lodder Date: Thu, 24 Feb 2011 16:13:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219003 - head/usr.bin/nice X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 16:13:33 -0000 Author: remko Date: Thu Feb 24 16:13:33 2011 New Revision: 219003 URL: http://svn.freebsd.org/changeset/base/219003 Log: Add wording about the priority range and mention what effect this has at certain values. PR: 124469 Obtained from: NetBSD nice.1 v1.14 MFC after: 1 week Modified: head/usr.bin/nice/nice.1 Modified: head/usr.bin/nice/nice.1 ============================================================================== --- head/usr.bin/nice/nice.1 Thu Feb 24 14:56:12 2011 (r219002) +++ head/usr.bin/nice/nice.1 Thu Feb 24 16:13:33 2011 (r219003) @@ -28,7 +28,7 @@ .\" @(#)nice.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd June 6, 1993 +.Dd February 24, 2011 .Dt NICE 1 .Os .Sh NAME @@ -50,6 +50,11 @@ value by the specified .Ar increment , or a default value of 10. The lower the nice value of a process, the higher its scheduling priority. +.Ar increment . +The priority can be adjusted over a range of -20 (the higest) to 20 (the +lowest). +A priority of 19 or 20 will prevent a process from taking any cycles from +others at nice 0 or better. .Pp The superuser may specify a negative increment in order to run a utility with a higher scheduling priority. @@ -107,6 +112,7 @@ option has been deprecated but is still .Xr rtprio 1 , .Xr getpriority 2 , .Xr setpriority 2 , +.Xr nice 3, .Xr renice 8 .Sh STANDARDS The From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 18:08:23 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86A64106566B; Thu, 24 Feb 2011 18:08:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 73D828FC18; Thu, 24 Feb 2011 18:08:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OI8NLD053982; Thu, 24 Feb 2011 18:08:23 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OI8NDB053974; Thu, 24 Feb 2011 18:08:23 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201102241808.p1OI8NDB053974@svn.freebsd.org> From: Hans Petter Selasky Date: Thu, 24 Feb 2011 18:08:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219004 - head/share/man/man4 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 18:08:23 -0000 Author: hselasky Date: Thu Feb 24 18:08:23 2011 New Revision: 219004 URL: http://svn.freebsd.org/changeset/base/219004 Log: - Add missing xhci(4) manual page. - Minor update in some USB manual pages. MFC after: 3 days Approved by: thompsa (mentor) Added: head/share/man/man4/xhci.4 (contents, props changed) Modified: head/share/man/man4/Makefile head/share/man/man4/ehci.4 head/share/man/man4/ohci.4 head/share/man/man4/snd_uaudio.4 head/share/man/man4/uhci.4 head/share/man/man4/usb.4 Modified: head/share/man/man4/Makefile ============================================================================== --- head/share/man/man4/Makefile Thu Feb 24 16:13:33 2011 (r219003) +++ head/share/man/man4/Makefile Thu Feb 24 18:08:23 2011 (r219004) @@ -509,6 +509,7 @@ MAN= aac.4 \ ${_wpi.4} \ xe.4 \ ${_xen.4} \ + xhci.4 \ xl.4 \ xpt.4 \ zero.4 \ Modified: head/share/man/man4/ehci.4 ============================================================================== --- head/share/man/man4/ehci.4 Thu Feb 24 16:13:33 2011 (r219003) +++ head/share/man/man4/ehci.4 Thu Feb 24 18:08:23 2011 (r219004) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 20, 2005 +.Dd February 24, 2011 .Dt EHCI 4 .Os .Sh NAME @@ -70,6 +70,7 @@ but can be noticed since 2.0 devices plugged in to the same connector appear to connect to different USB busses. .Sh SEE ALSO +.Xr xhci 4 , .Xr ohci 4 , .Xr uhci 4 , .Xr usb 4 @@ -78,7 +79,19 @@ The .Nm device driver first appeared in .Fx 5.1 . -.Sh BUGS -The driver is not finished and is quite buggy. -.Pp -There is currently no support for isochronous transfers. +.Sh LOADER TUNABLES +Tunables can be set at the +.Xr loader 8 +prompt before booting the kernel or stored in +.Xr loader.conf 5 . +.Bl -tag -width "xxxxxx" +.It Va hw.usb.ehci.lostintrbug +This tunable enables the lost interrupt quirk. +The default value is 0 (off). +.It Va hw.usb.ehci.iaadbug +This tunable enables the EHCI doorbell quirk. +The default value is 0 (off). +.It Va hw.usb.ehci.no_hs +This tunable disables USB devices to attach like HIGH-speed ones and will force all attached devices to attach to the FULL- or LOW-speed companion controller. +The default value is 0 (off). +.El Modified: head/share/man/man4/ohci.4 ============================================================================== --- head/share/man/man4/ohci.4 Thu Feb 24 16:13:33 2011 (r219003) +++ head/share/man/man4/ohci.4 Thu Feb 24 18:08:23 2011 (r219004) @@ -60,6 +60,7 @@ NVIDIA nForce3 Sun PCIO-2 (RIO USB) .El .Sh SEE ALSO +.Xr xhci 4 , .Xr ehci 4 , .Xr uhci 4 .Sh HISTORY Modified: head/share/man/man4/snd_uaudio.4 ============================================================================== --- head/share/man/man4/snd_uaudio.4 Thu Feb 24 16:13:33 2011 (r219003) +++ head/share/man/man4/snd_uaudio.4 Thu Feb 24 18:08:23 2011 (r219004) @@ -29,12 +29,12 @@ .\" .\" $FreeBSD$ .\" -.Dd December 15, 2005 +.Dd February 24, 2011 .Dt SND_UAUDIO 4 .Os .Sh NAME .Nm snd_uaudio -.Nd USB audio device driver +.Nd USB audio and MIDI device driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your kernel configuration file: @@ -55,7 +55,9 @@ The .Nm driver provides support for .Tn USB -audio class devices. +audio class devices and +.Tn USB +MIDI class devices. .Pp A .Tn USB @@ -94,8 +96,7 @@ as of this writing, does not handle devi abstracted manner, i.e., a detach request is refused by the .Tn PCM framework if the device is in use. -For -.Tn USB -and supposedly other detach-able busses, it is necessary to allow the -device un-registration to complete successfully, otherwise the driver -leaves wild pointers to invalid data structures and thus leading to a panic. +It is necessary to allow the device un-registration to complete +successfully, otherwise the +.Tn PCM +layer will panic. Modified: head/share/man/man4/uhci.4 ============================================================================== --- head/share/man/man4/uhci.4 Thu Feb 24 16:13:33 2011 (r219003) +++ head/share/man/man4/uhci.4 Thu Feb 24 18:08:23 2011 (r219004) @@ -50,6 +50,7 @@ Intel 82371SB (PIIX3) VIA 83C572 .El .Sh SEE ALSO +.Xr xhci 4 , .Xr ehci 4 , .Xr ohci 4 .Sh HISTORY Modified: head/share/man/man4/usb.4 ============================================================================== --- head/share/man/man4/usb.4 Thu Feb 24 16:13:33 2011 (r219003) +++ head/share/man/man4/usb.4 Thu Feb 24 18:08:23 2011 (r219004) @@ -164,7 +164,8 @@ specifications can be found at: .Xr uplcom 4 , .Xr urio 4 , .Xr uvscom 4 , -.Xr usbconfig 8 +.Xr usbconfig 8 , +.Xr xhci 4 .Sh STANDARDS The .Nm Added: head/share/man/man4/xhci.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/xhci.4 Thu Feb 24 18:08:23 2011 (r219004) @@ -0,0 +1,61 @@ +.\" +.\" Copyright (c) 2011 Hans Petter Selasky. All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd February 24, 2011 +.Dt XHCI 4 +.Os +.Sh NAME +.Nm xhci +.Nd USB eXtensible Host Controller driver +.Sh SYNOPSIS +.Cd "device xhci" +.Sh DESCRIPTION +The +.Nm +driver provides support for the +.Tn USB +eXtensible Host Controller Interface, +which allows use of +.Tn USB +1.0, 2.0 and 3.0 devices on the same +.Tn USB +port. +.Pp +The +.Tn XHCI +controller supports +.Tn USB +connection speeds up to 4.8Gbps when using a USB 3.0 compliant device. +.Sh SEE ALSO +.Xr ehci 4 , +.Xr ohci 4 , +.Xr uhci 4 , +.Xr usb 4 +.Sh HISTORY +The +.Nm +device driver first appeared in +.Fx 8.2 . From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 18:13:53 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E22AE106566C; Thu, 24 Feb 2011 18:13:53 +0000 (UTC) (envelope-from remko@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D10728FC0C; Thu, 24 Feb 2011 18:13:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OIDrJa054195; Thu, 24 Feb 2011 18:13:53 GMT (envelope-from remko@svn.freebsd.org) Received: (from remko@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OIDr9P054193; Thu, 24 Feb 2011 18:13:53 GMT (envelope-from remko@svn.freebsd.org) Message-Id: <201102241813.p1OIDr9P054193@svn.freebsd.org> From: Remko Lodder Date: Thu, 24 Feb 2011 18:13:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219005 - head X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 18:13:54 -0000 Author: remko Date: Thu Feb 24 18:13:53 2011 New Revision: 219005 URL: http://svn.freebsd.org/changeset/base/219005 Log: Add sticky.8 to the obsolete files since it had been moved to sticky.7 Submitted by: maxim and pluknet Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Thu Feb 24 18:08:23 2011 (r219004) +++ head/ObsoleteFiles.inc Thu Feb 24 18:13:53 2011 (r219005) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20110224: sticky.8 -> sticky.7 +OLD_FILES+=usr/share/man/man8/sticky.8.gz # 20110220: new clang import which bumps version from 2.8 to 2.9 OLD_FILES+=usr/include/clang/2.8/emmintrin.h OLD_FILES+=usr/include/clang/2.8/mm_malloc.h From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 18:48:27 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7806D106567A; Thu, 24 Feb 2011 18:48:27 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 48C878FC1C; Thu, 24 Feb 2011 18:48:27 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id EC78F46B29; Thu, 24 Feb 2011 13:48:26 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.10]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id F00C28A01D; Thu, 24 Feb 2011 13:48:25 -0500 (EST) From: John Baldwin To: Remko Lodder Date: Thu, 24 Feb 2011 13:47:39 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.4-CBSD-20110107; KDE/4.4.5; amd64; ; ) References: <201102241613.p1OGDXpM047076@svn.freebsd.org> In-Reply-To: <201102241613.p1OGDXpM047076@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201102241347.39267.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Thu, 24 Feb 2011 13:48:26 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=0.5 required=4.2 tests=BAYES_00,MAY_BE_FORGED, RDNS_DYNAMIC autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bigwig.baldwin.cx Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r219003 - head/usr.bin/nice X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 18:48:27 -0000 On Thursday, February 24, 2011 11:13:33 am Remko Lodder wrote: > Author: remko > Date: Thu Feb 24 16:13:33 2011 > New Revision: 219003 > URL: http://svn.freebsd.org/changeset/base/219003 > > Log: > Add wording about the priority range and > mention what effect this has at certain > values. > > PR: 124469 > Obtained from: NetBSD nice.1 v1.14 > MFC after: 1 week > > Modified: > head/usr.bin/nice/nice.1 > > Modified: head/usr.bin/nice/nice.1 > ============================================================================== > --- head/usr.bin/nice/nice.1 Thu Feb 24 14:56:12 2011 (r219002) > +++ head/usr.bin/nice/nice.1 Thu Feb 24 16:13:33 2011 (r219003) > @@ -28,7 +28,7 @@ > .\" @(#)nice.1 8.1 (Berkeley) 6/6/93 > .\" $FreeBSD$ > .\" > -.Dd June 6, 1993 > +.Dd February 24, 2011 > .Dt NICE 1 > .Os > .Sh NAME > @@ -50,6 +50,11 @@ value by the specified > .Ar increment , > or a default value of 10. > The lower the nice value of a process, the higher its scheduling priority. > +.Ar increment . > +The priority can be adjusted over a range of -20 (the higest) to 20 (the > +lowest). > +A priority of 19 or 20 will prevent a process from taking any cycles from > +others at nice 0 or better. Are you sure that this statement applies to both ULE and 4BSD? The two schedulers treat nice values a bit differently. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 19:03:39 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5BDE7106566B; Thu, 24 Feb 2011 19:03:39 +0000 (UTC) (envelope-from remko@elvandar.org) Received: from mailgate.jr-hosting.nl (mailgate.jr-hosting.nl [IPv6:2a01:4f8:63:1281::3]) by mx1.freebsd.org (Postfix) with ESMTP id 1A46D8FC14; Thu, 24 Feb 2011 19:03:39 +0000 (UTC) Received: from [10.0.2.10] (caelis.elvandar.org [83.163.38.147]) by mailgate.jr-hosting.nl (Postfix) with ESMTPSA id 913EF1CC4A; Thu, 24 Feb 2011 20:03:37 +0100 (CET) Mime-Version: 1.0 (Apple Message framework v1082) Content-Type: text/plain; charset=us-ascii From: Remko Lodder In-Reply-To: <201102241347.39267.jhb@freebsd.org> Date: Thu, 24 Feb 2011 20:03:33 +0100 Content-Transfer-Encoding: quoted-printable Message-Id: <5965E5EC-A725-423A-9420-B84AD09993DC@elvandar.org> References: <201102241613.p1OGDXpM047076@svn.freebsd.org> <201102241347.39267.jhb@freebsd.org> To: John Baldwin , davidxu@Freebsd.org X-Mailer: Apple Mail (2.1082) Cc: svn-src-head@freebsd.org, Remko Lodder , src-committers@freebsd.org, svn-src-all@freebsd.org Subject: Re: svn commit: r219003 - head/usr.bin/nice X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 19:03:39 -0000 =09 On Feb 24, 2011, at 7:47 PM, John Baldwin wrote: >>=20 >=20 > Are you sure that this statement applies to both ULE and 4BSD? The = two=20 > schedulers treat nice values a bit differently. No I am not sure that the statement applies, given your response I = understand that both schedulers work differently. Can you or David tell me what the = difference is so that I can properly document it? I thought that the tool is doin = the same for all schedulers, but that the backend might treat it differently. Thanks Remko >=20 > --=20 > John Baldwin >=20 --=20 /"\ Best regards, | remko@FreeBSD.org \ / Remko Lodder | X http://www.evilcoder.org/ | Quis custodiet ipsos custodes / \ ASCII Ribbon Campaign | Against HTML Mail and News From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 19:37:55 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5CCD0106566B; Thu, 24 Feb 2011 19:37:55 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 2BAD18FC12; Thu, 24 Feb 2011 19:37:55 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id D10DE46B1A; Thu, 24 Feb 2011 14:37:54 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.10]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id EA4628A009; Thu, 24 Feb 2011 14:37:53 -0500 (EST) From: John Baldwin To: Remko Lodder Date: Thu, 24 Feb 2011 14:35:08 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.4-CBSD-20110107; KDE/4.4.5; amd64; ; ) References: <201102241613.p1OGDXpM047076@svn.freebsd.org> <201102241347.39267.jhb@freebsd.org> <5965E5EC-A725-423A-9420-B84AD09993DC@elvandar.org> In-Reply-To: <5965E5EC-A725-423A-9420-B84AD09993DC@elvandar.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201102241435.09011.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Thu, 24 Feb 2011 14:37:54 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=0.5 required=4.2 tests=BAYES_00,MAY_BE_FORGED, RDNS_DYNAMIC autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bigwig.baldwin.cx Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Remko Lodder , src-committers@freebsd.org, davidxu@freebsd.org Subject: Re: svn commit: r219003 - head/usr.bin/nice X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 19:37:55 -0000 On Thursday, February 24, 2011 2:03:33 pm Remko Lodder wrote: > > On Feb 24, 2011, at 7:47 PM, John Baldwin wrote: > > >> > > > > Are you sure that this statement applies to both ULE and 4BSD? The two > > schedulers treat nice values a bit differently. > > No I am not sure that the statement applies, given your response I understand > that both schedulers work differently. Can you or David tell me what the difference > is so that I can properly document it? I thought that the tool is doin the same for all > schedulers, but that the backend might treat it differently. In the case of ULE, ULE decides first if you are interactive or not. If a thread is interactive, nice is completely ignored. For non-interactive threads, ULE computes a priority based on how CPU hoggish the thread is. The nice value is then added to that priority. Thus, a nice value applied to a slightly hoggish process might still end up with a lower priority value (and thus "more" important) than a very hoggish process with a nice value of 0. In 4BSD it is somewhat similar in that when you sleep on a socket ('sbwait') or select, etc. in the kernel, the nice value is effectively ignored. 4BSD relies on the priority values passed to tsleep(), etc. to mark interactive processes whereas ULE uses its own set of heuristics. The effect though is that nice is also ignored for interactive processes under 4BSD and is then added to the resulting 'user priority' (which for 4BSD is always based on how CPU hoggish a process is). I think for 4BSD it might be true that certain nice values will never yield to certain other nice values, but I'm not sure that '0' and '19' are the right numbers there. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 21:18:02 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7922B106566C; Thu, 24 Feb 2011 21:18:02 +0000 (UTC) (envelope-from pawel@dawidek.net) Received: from mail.garage.freebsd.pl (60.wheelsystems.com [83.12.187.60]) by mx1.freebsd.org (Postfix) with ESMTP id 0F1CC8FC1C; Thu, 24 Feb 2011 21:18:01 +0000 (UTC) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 83B2645C89; Thu, 24 Feb 2011 22:17:59 +0100 (CET) Received: from localhost (89-73-195-149.dynamic.chello.pl [89.73.195.149]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 9D7DF4569A; Thu, 24 Feb 2011 22:17:54 +0100 (CET) Date: Thu, 24 Feb 2011 22:17:34 +0100 From: Pawel Jakub Dawidek To: Remko Lodder Message-ID: <20110224211734.GB2453@garage.freebsd.pl> References: <201102241613.p1OGDXpM047076@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="WfZ7S8PLGjBY9Voh" Content-Disposition: inline In-Reply-To: <201102241613.p1OGDXpM047076@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 9.0-CURRENT amd64 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-0.6 required=4.5 tests=BAYES_00,RCVD_IN_SORBS_DUL autolearn=no version=3.0.4 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r219003 - head/usr.bin/nice X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 21:18:02 -0000 --WfZ7S8PLGjBY9Voh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 24, 2011 at 04:13:33PM +0000, Remko Lodder wrote: > Author: remko > Date: Thu Feb 24 16:13:33 2011 > New Revision: 219003 > URL: http://svn.freebsd.org/changeset/base/219003 >=20 > Log: > Add wording about the priority range and > mention what effect this has at certain > values. > =20 > PR: 124469 > Obtained from: NetBSD nice.1 v1.14 > MFC after: 1 week [...] > @@ -107,6 +112,7 @@ option has been deprecated but is still=20 > .Xr rtprio 1 , > .Xr getpriority 2 , > .Xr setpriority 2 , > +.Xr nice 3, You need space before comma. --=20 Pawel Jakub Dawidek http://www.wheelsystems.com pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --WfZ7S8PLGjBY9Voh Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAk1myu0ACgkQForvXbEpPzSGSwCfer4G0dETvb/pv0lXmi4APaPw YDEAn31FOT1stFlVkq0/kjKHpbFUpr/R =i2GK -----END PGP SIGNATURE----- --WfZ7S8PLGjBY9Voh-- From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 21:45:59 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 646F0106566C; Thu, 24 Feb 2011 21:45:59 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 387DE8FC1D; Thu, 24 Feb 2011 21:45:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OLjxEp063008; Thu, 24 Feb 2011 21:45:59 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OLjxd3063006; Thu, 24 Feb 2011 21:45:59 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201102242145.p1OLjxd3063006@svn.freebsd.org> From: Dimitry Andric Date: Thu, 24 Feb 2011 21:45:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219011 - head/contrib/llvm/tools/clang/lib/Driver X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 21:45:59 -0000 Author: dim Date: Thu Feb 24 21:45:58 2011 New Revision: 219011 URL: http://svn.freebsd.org/changeset/base/219011 Log: Recently, in upstream clang, a fix was done to add -L/usr/lib to the arguments passed to ld, when linking. This was to appease configure scripts in several ports, that grep for such a -L option in "${CC} -v" output, to determine the startup objects passed to ld. Note ld itself does not need to be told about /usr/lib, since it has this path builtin anyway. However, if clang is built as a bootstrap tool during buildworld, it should not use *anything* outside ${WORLDTMP} to include or link with. The upstream fix to add -L/usr/lib breaks this assumption, and can thus cause libraries from /usr/lib to be linked in during buildworld. This can result in buildworld dying during linking of zinject, where it picks up the wrong copy of libzpool.so, eventually leading to: /usr/obj/usr/src/tmp/lib/libthr.so.3: undefined reference to `_rtld_get_stack_prot' Fix this issue by not adding any hardcoded paths, but by looping through the run-time library path list, which is already correctly set for the bootstrap phase. Reported by: datastream.freecity@gmail.com Pointy hat to: dim Modified: head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Modified: head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp ============================================================================== --- head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Thu Feb 24 21:19:30 2011 (r219010) +++ head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Thu Feb 24 21:45:58 2011 (r219011) @@ -3206,7 +3206,12 @@ void freebsd::Link::ConstructJob(Compila } Args.AddAllArgs(CmdArgs, options::OPT_L); - CmdArgs.push_back("-L/usr/lib"); + + const ToolChain::path_list Paths = getToolChain().getFilePaths(); + for (ToolChain::path_list::const_iterator i = Paths.begin(), e = Paths.end(); + i != e; ++i) + CmdArgs.push_back(Args.MakeArgString(llvm::StringRef("-L") + *i)); + Args.AddAllArgs(CmdArgs, options::OPT_T_Group); Args.AddAllArgs(CmdArgs, options::OPT_e); Args.AddAllArgs(CmdArgs, options::OPT_s); @@ -3568,13 +3573,9 @@ void linuxtools::Link::ConstructJob(Comp Args.AddAllArgs(CmdArgs, options::OPT_L); const ToolChain::path_list Paths = ToolChain.getFilePaths(); - - for (ToolChain::path_list::const_iterator i = Paths.begin(), - e = Paths.end(); - i != e; ++i) { - const std::string &s = *i; - CmdArgs.push_back(Args.MakeArgString(std::string("-L") + s)); - } + for (ToolChain::path_list::const_iterator i = Paths.begin(), e = Paths.end(); + i != e; ++i) + CmdArgs.push_back(Args.MakeArgString(llvm::StringRef("-L") + *i)); AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs); From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 21:47:44 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4504F1065670; Thu, 24 Feb 2011 21:47:44 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail06.syd.optusnet.com.au (mail06.syd.optusnet.com.au [211.29.132.187]) by mx1.freebsd.org (Postfix) with ESMTP id BB54C8FC14; Thu, 24 Feb 2011 21:47:43 +0000 (UTC) Received: from c122-107-114-89.carlnfd1.nsw.optusnet.com.au (c122-107-114-89.carlnfd1.nsw.optusnet.com.au [122.107.114.89]) by mail06.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id p1OLlLNX025736 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 25 Feb 2011 08:47:22 +1100 Date: Fri, 25 Feb 2011 08:47:21 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: John Baldwin In-Reply-To: <201102241435.09011.jhb@freebsd.org> Message-ID: <20110225070237.F983@besplex.bde.org> References: <201102241613.p1OGDXpM047076@svn.freebsd.org> <201102241347.39267.jhb@freebsd.org> <5965E5EC-A725-423A-9420-B84AD09993DC@elvandar.org> <201102241435.09011.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Remko Lodder , svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, davidxu@FreeBSD.org, svn-src-head@FreeBSD.org, Remko Lodder Subject: Re: svn commit: r219003 - head/usr.bin/nice X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 21:47:44 -0000 On Thu, 24 Feb 2011, John Baldwin wrote: > On Thursday, February 24, 2011 2:03:33 pm Remko Lodder wrote: >> [contex restored: +A priority of 19 or 20 will prevent a process from taking any cycles from +others at nice 0 or better.] >> On Feb 24, 2011, at 7:47 PM, John Baldwin wrote: >> >>> Are you sure that this statement applies to both ULE and 4BSD? The two >>> schedulers treat nice values a bit differently. >> >> No I am not sure that the statement applies, given your response I understand >> that both schedulers work differently. Can you or David tell me what the difference >> is so that I can properly document it? I thought that the tool is doin the same for all >> schedulers, but that the backend might treat it differently. I'm sure that testing would show that it doesn't apply in FreeBSD. It is supposed to apply only approximately in FreeBSD, but niceness handling in FreeBSD is quite broken so it doesn't apply at all. Also, the magic numbers of 19 and 20 probably don't apply in FreeBSD. These were because there nicenesses that are the same mod 2 (maybe after adding 1) have the same effect, since priorities that are the same mode RQ_PPQ = 4 have the same effect and the niceness space was scaled to the priority space by multiplying by NICE_WEIGHT = 2. But NICE_WEIGHT has been broken to be 1 in FreeBSD with SCHED_4BSD and doesn't apply with SCHED_ULE. With SCHED_4BSD, there are 4 (not 2) nice values near 20 that give the same behaviour. It strictly only applies to broken schedulers. Preventing a process from taking *any* cycles gives priority inversion livelock. FreeBSD has priority propagation to prevent this. > In the case of ULE, ULE decides first if you are interactive or not. If a > thread is interactive, nice is completely ignored. For non-interactive > threads, ULE computes a priority based on how CPU hoggish the thread is. > The nice value is then added to that priority. Thus, a nice value applied > to a slightly hoggish process might still end up with a lower priority value > (and thus "more" important) than a very hoggish process with a nice value of > 0. I don't know much about ULE, but it never worked right for me, especially for my tests of niceness. > In 4BSD it is somewhat similar in that when you sleep on a socket ('sbwait') > or select, etc. in the kernel, the nice value is effectively ignored. 4BSD > relies on the priority values passed to tsleep(), etc. to mark interactive > processes whereas ULE uses its own set of heuristics. The effect though is > that nice is also ignored for interactive processes under 4BSD and is then > added to the resulting 'user priority' (which for 4BSD is always based on > how CPU hoggish a process is). I think for 4BSD it might be true that certain > nice values will never yield to certain other nice values, but I'm not sure > that '0' and '19' are the right numbers there. Niceness isn't really ignored for interactive processes, since to obtain the priority boost on waking up after blocking they need to actually run enough to block, and large differences in niceness tend to prevent this. It should be large differences in niceness and not just the difference between 0 and 19 or 20 that prevent the lower priority process running (except via priority propagation and boosts). In FreeBSD-4 or FreeBSD-3. I imported fixes from NetBSD which among other things made niceness sort of work. There was still a large problem with clamping of the hoggishness variable (p_estcpu is clamped by ESTCPULIM()). This gives nonlinearities in the scaling from hoggishness to priority. NetBSD had the same problem. There was a relatively small problem with congestion in priority space combined with the limit on hoggishness causing the mapping from niceness space to priority space not being quite right to give the desired separation between events of different niceness. The mapping used NICE_WEIGHT = 2 to expand from niceness space to priority space. NetBSD apparently still uses this, since this is what makes the magic numbers of 19 and 20 have the same behaviour -- priority space has buckets of size RQ_PPQ = 4, with priorities that are the same mod RQ_PPQ making little difference to scheduling; we would like to expand niceness by NICE_WEIGHT = RQ_PPQ so that different values of niceness actually have an effect, but priority space was too congested to allow this, so we settled for NICE_WEIGHT = 2. RQ_PPQ / NICE_WEIGHT was then 2, so it took differences in niceness of 2 to have an effect. Apparently there is a bias of 1, so that it is nicenesses of 19 and 20 and not 18 and 19 which end up in the same priority bucket. The problem with congestion became relatively large in FreeBSD-5 and is still large. The priority space became more congested so as to fit interrupt threads and rtprio threads in the same space (rtprio threads used to use separate queues, and priorities didn't apply to them in the normal way). This more than doubled the congestion. It takes 2*32 slots for rtprio and about 64 for ithreads. PZERO only changed from 22 to 84 (which I think was not enough and is related to rtprio priorities not being mapped very well, which was recently improved by you (jhb)), but PUSER changed from 50 to 160. The nice space of size 41 (-20 to +20) must now be mapped to the user priority space of size 96 (160 to 255) where it was mapped to a space of size 206 (50 to 255). Expansion by a factor of 4 is even more impossible than before (4*41 would fit in 206, but would leave insufficient space for normal operation without niceness). NICE_WEIGHT was reduced to 1 so as to fit. This reduced the dynamic range of the effect of niceness significanlty. It now takes a niceness difference of 20 to get the same effect as a niceness difference of 10 did in FreeBSD-4 and presumably still does in NetBSD. Apart from small differences in niceness not having enough effect to be very useful, there is no way to reach a %CPU difference of 1:infinity for a niceness difference of a mere 20. I think "nice 20" didn't give anywhere near this ratio even in FreeBSD-4. Now it is further away from giving this. If we really want a ration of 1:infinity, this could be implemented by special handling of niceness values near 20, but the nonlinearity gets in the way of this and FreeBSD never had any special handling. In my version of SCHED_4BSD, the relative effects of niceness are according to a table. I normally use a geometric scale: static int niceweights[PRIO_MAX - PRIO_MIN + 1] = { #if 1 /* * Geometric niceness. The weight at index i is * floor(2 * 3 * pow(2.0, i / 4.0) + 0.5). */ 6, 7, 8, 10, 12, 14, 17, 20, 24, 29, 34, 40, 48, 57, 68, 81, 96, 114, 136, 161, 192, 228, 272, 323, 384, 457, 543, 646, 768, 913, 1086, 1292, 1536, 1827, 2172, 2583, 3072, 3653, 4344, 5166, 6144, #else /* * Arithmetic niceness. The weight at index i is * 2 * 2 * 2 * 3 * 3 * 5 * 7 / (40 - i) * (except the one at index 40 is an approximation for infinity). */ 63, 64, 66, 68, 70, 72, 74, 76, 78, 81, 84, 86, 90, 93, 96, 100, 105, 109, 114, 120, 126, 132, 140, 148, 157, 168, 180, 193, 210, 229, 252, 280, 315, 360, 420, 504, 630, 840, 1260, 2520, 20000, #endif }; So with 1 process at nice 20 and another at nice 0, the %CPU ration is 192:6144 = 1:32 with geometric niceness. A ratio actually achieved was 144:4471 ~= 1:31: % last pid: 1228; load averages: 2.00, 2.00, 1.93 up 0+01:46:56 08:37:31 % 32 processes: 3 running, 29 sleeping % CPU: 96.5% user, 3.1% nice, 0.0% system, 0.4% interrupt, 0.0% idle % Mem: 28M Active, 21M Inact, 54M Wired, 16K Cache, 58M Buf, 899M Free % Swap: % % PID USERNAME THR PRI NICE SIZE RES STATE TIME WCPU COMMAND % 1030 root 1 122 0 856K 572K RUN 74:31 95.02% sh % 1031 root 1 126 20 856K 572K RUN 2:24 2.05% sh This is implemented mainly by incrementing td_estcpu by niceweights[... ->p_nice - PRI_MIN] instead of by 1 (or 0 after clamping) in sched_clock(). Clamping and its nonlinearity are also avoided/fixed. td_estcpu can grow very large and must be scaled to a priority according to its maximum across all threads instead of according to the buggy maximum given by clamping. No one cares about this since then never use niceness :-). Niceness is even less useful on multi-CPU systems. Bruce From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 22:11:37 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 54CB71065672; Thu, 24 Feb 2011 22:11:37 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 43EA88FC1C; Thu, 24 Feb 2011 22:11:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OMBbfd064074; Thu, 24 Feb 2011 22:11:37 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OMBbx9064072; Thu, 24 Feb 2011 22:11:37 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201102242211.p1OMBbx9064072@svn.freebsd.org> From: John Baldwin Date: Thu, 24 Feb 2011 22:11:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219012 - head/sys/fs/ext2fs X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 22:11:37 -0000 Author: jhb Date: Thu Feb 24 22:11:36 2011 New Revision: 219012 URL: http://svn.freebsd.org/changeset/base/219012 Log: Use ffs() to locate free bits in the inode and block bitmaps rather than loops with bit shifts. Modified: head/sys/fs/ext2fs/ext2_alloc.c Modified: head/sys/fs/ext2fs/ext2_alloc.c ============================================================================== --- head/sys/fs/ext2fs/ext2_alloc.c Thu Feb 24 21:45:58 2011 (r219011) +++ head/sys/fs/ext2fs/ext2_alloc.c Thu Feb 24 22:11:36 2011 (r219012) @@ -815,16 +815,12 @@ ext2_nodealloccg(struct inode *ip, int c } } i = start + len - loc; - map = ibp[i]; - ipref = i * NBBY; - for (i = 1; i < (1 << NBBY); i <<= 1, ipref++) { - if ((map & i) == 0) { - goto gotit; - } + map = ibp[i] ^ 0xff; + if (map == 0) { + printf("fs = %s\n", fs->e2fs_fsmnt); + panic("ext2fs_nodealloccg: block not in map"); } - printf("fs = %s\n", fs->e2fs_fsmnt); - panic("ext2fs_nodealloccg: block not in map"); - /* NOTREACHED */ + ipref = i * NBBY + ffs(map) - 1; gotit: setbit(ibp, ipref); EXT2_LOCK(ump); @@ -952,7 +948,6 @@ ext2_vfree(pvp, ino, mode) static daddr_t ext2_mapsearch(struct m_ext2fs *fs, char *bbp, daddr_t bpref) { - daddr_t bno; int start, len, loc, i, map; /* @@ -977,15 +972,12 @@ ext2_mapsearch(struct m_ext2fs *fs, char } } i = start + len - loc; - map = bbp[i]; - bno = i * NBBY; - for (i = 1; i < (1 << NBBY); i <<= 1, bno++) { - if ((map & i) == 0) - return (bno); - } - printf("fs = %s\n", fs->e2fs_fsmnt); - panic("ext2fs_mapsearch: block not in map"); - /* NOTREACHED */ + map = bbp[i] ^ 0xff; + if (map == 0) { + printf("fs = %s\n", fs->e2fs_fsmnt); + panic("ext2fs_mapsearch: block not in map"); + } + return (i * NBBY + ffs(map) - 1); } /* From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 22:23:01 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6DD37106566B; Thu, 24 Feb 2011 22:23:01 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail04.syd.optusnet.com.au (mail04.syd.optusnet.com.au [211.29.132.185]) by mx1.freebsd.org (Postfix) with ESMTP id E57CE8FC2A; Thu, 24 Feb 2011 22:23:00 +0000 (UTC) Received: from c122-107-114-89.carlnfd1.nsw.optusnet.com.au (c122-107-114-89.carlnfd1.nsw.optusnet.com.au [122.107.114.89]) by mail04.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id p1OMMcHJ013652 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 25 Feb 2011 09:22:39 +1100 Date: Fri, 25 Feb 2011 09:22:38 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Bruce Evans In-Reply-To: <20110225070237.F983@besplex.bde.org> Message-ID: <20110225085508.O1276@besplex.bde.org> References: <201102241613.p1OGDXpM047076@svn.freebsd.org> <201102241347.39267.jhb@freebsd.org> <5965E5EC-A725-423A-9420-B84AD09993DC@elvandar.org> <201102241435.09011.jhb@freebsd.org> <20110225070237.F983@besplex.bde.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Remko Lodder , John Baldwin , svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, davidxu@FreeBSD.org, svn-src-head@FreeBSD.org, Remko Lodder Subject: Re: svn commit: r219003 - head/usr.bin/nice X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 22:23:01 -0000 On Fri, 25 Feb 2011, Bruce Evans wrote: > On Thu, 24 Feb 2011, John Baldwin wrote: > >> On Thursday, February 24, 2011 2:03:33 pm Remko Lodder wrote: >>> > [contex restored: > +A priority of 19 or 20 will prevent a process from taking any cycles from > +others at nice 0 or better.] > >>> On Feb 24, 2011, at 7:47 PM, John Baldwin wrote: >>> >>>> Are you sure that this statement applies to both ULE and 4BSD? The two >>>> schedulers treat nice values a bit differently. >>> >>> No I am not sure that the statement applies, given your response I >>> understand >>> that both schedulers work differently. Can you or David tell me what the >>> difference >>> is so that I can properly document it? I thought that the tool is doin the >>> same for all >>> schedulers, but that the backend might treat it differently. > > I'm sure that testing would show that it doesn't apply in FreeBSD. It is > supposed to apply only approximately in FreeBSD, but niceness handling in > FreeBSD is quite broken so it doesn't apply at all. Also, the magic numbers > of 19 and 20 probably don't apply in FreeBSD. These were because there > nicenesses that are the same mod 2 (maybe after adding 1) have the same > effect, since priorities that are the same mode RQ_PPQ = 4 have the same > effect and the niceness space was scaled to the priority space by > multiplying by NICE_WEIGHT = 2. But NICE_WEIGHT has been broken to be 1 > in FreeBSD with SCHED_4BSD and doesn't apply with SCHED_ULE. With > SCHED_4BSD, there are 4 (not 2) nice values near 20 that give the same > behaviour. > > It strictly only applies to broken schedulers. Preventing a process > from taking *any* cycles gives priority inversion livelock. FreeBSD > has priority propagation to prevent this. Just tried it with SCHED_4BSD. On a multi-CPU system (ref9-i386), but I think I used cpuset correctly to emulate 1 CPU. % last pid: 85392; load averages: 1.71, 0.86, 0.38 up 94+01:00:36 21:55:59 % 66 processes: 3 running, 63 sleeping % CPU: 6.9% user, 3.7% nice, 2.0% system, 0.0% interrupt, 87.3% idle % Mem: 268M Active, 4969M Inact, 310M Wired, 50M Cache, 112M Buf, 2413M Free % Swap: 8192M Total, 580K Used, 8191M Free % % PID USERNAME THR PRI NICE SIZE RES STATE C TIME WCPU COMMAND % [... system is not nearly idle, but plenty of CPUs to spare] % 85368 bde 1 111 0 9892K 1312K RUN 1 1:07 65.67% sh % 85369 bde 1 123 20 9892K 1312K CPU1 1 0:35 37.89% sh This shows the bogus 1:2 ratio even for a niceness difference of 20. I've seen too much of this ratio. IIRC, before FreeBSD-4 was fixed, the various nonlinearities caused by not even clamping, combined with the broken scaling, gave a ratio of about this. Then FreeBSD-5 restored a similarly bogus ratio. Apparently, the algorithm for decaying p_estcpu in SCHED_4BSD tends to generate this ratio. SCHED_ULE uses a completely different algorithm and I think it has more control over the scaling, so it is surprising that it duplicates this brokenness so perfectly. And here is what it does with more nice values: this was generated by: % for i in 0 2 4 6 8 10 12 14 16 18 20 % do % cpuset -l 1 nice -$i sh -c "while :; do echo -n;done" & % done % top -o time % last pid: 85649; load averages: 10.99, 9.06, 5.35 up 94+01:19:33 22:14:56 % 74 processes: 12 running, 62 sleeping % % Mem: 270M Active, 4969M Inact, 310M Wired, 50M Cache, 112M Buf, 2411M Free % Swap: 8192M Total, 580K Used, 8191M Free % % % PID USERNAME THR PRI NICE SIZE RES STATE C TIME WCPU COMMAND % 85581 bde 1 98 0 9892K 1312K RUN 1 0:48 11.47% sh % 85582 bde 1 100 2 9892K 1312K RUN 1 0:45 10.69% sh % 85583 bde 1 102 4 9892K 1312K RUN 1 0:42 10.35% sh % 85584 bde 1 104 6 9892K 1312K CPU1 1 0:40 9.47% sh % 85585 bde 1 106 8 9892K 1312K RUN 1 0:38 8.79% sh % 85586 bde 1 108 10 9892K 1312K RUN 1 0:36 8.06% sh % 85587 bde 1 110 12 9892K 1312K RUN 1 0:34 8.40% sh % 85588 bde 1 111 14 9892K 1312K RUN 1 0:33 8.50% sh % 85589 bde 1 113 16 9892K 1312K RUN 1 0:31 7.67% sh % 85590 bde 1 115 18 9892K 1312K RUN 1 0:30 7.28% sh % 85591 bde 1 117 20 9892K 1312K RUN 1 0:29 6.69% sh This is OK except for the far-too-small dynamic range of 29:48 (even worse than 1:2). My version spaces out things nicely according to its table: % last pid: 1374; load averages: 11.02, 8.74, 4.93 up 0+02:26:12 09:16:47 % 43 processes: 12 running, 31 sleeping % CPU: 14.0% user, 85.7% nice, 0.0% system, 0.4% interrupt, 0.0% idle % Mem: 35M Active, 23M Inact, 67M Wired, 24K Cache, 61M Buf, 876M Free % Swap: % % PID USERNAME THR PRI NICE SIZE RES STATE TIME WCPU COMMAND % 1325 root 1 120 0 856K 572K RUN 2:18 28.52% sh % 1326 root 1 120 2 856K 572K RUN 1:39 19.97% sh % 1327 root 1 120 4 856K 572K RUN 1:10 13.96% sh % 1328 root 1 120 6 856K 572K RUN 0:50 9.72% sh % 1329 root 1 123 8 856K 572K RUN 0:36 7.18% sh % 1330 root 1 123 10 856K 572K RUN 0:25 5.03% sh % 1331 root 1 124 12 856K 572K RUN 0:18 2.93% sh % 1332 root 1 124 14 856K 572K RUN 0:13 1.86% sh % 1333 root 1 124 16 856K 572K RUN 0:09 0.98% sh % 1334 root 1 124 18 856K 572K RUN 0:06 1.07% sh % 1335 root 1 123 20 856K 572K RUN 0:05 0.15% sh The dynamic range here is 5:138. Not as close to the table's 1:32 as I would like. Bruce From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 22:36:41 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3AE65106564A; Thu, 24 Feb 2011 22:36:41 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 297F88FC16; Thu, 24 Feb 2011 22:36:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OMafYx065131; Thu, 24 Feb 2011 22:36:41 GMT (envelope-from tuexen@svn.freebsd.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OMafSo065127; Thu, 24 Feb 2011 22:36:41 GMT (envelope-from tuexen@svn.freebsd.org) Message-Id: <201102242236.p1OMafSo065127@svn.freebsd.org> From: Michael Tuexen Date: Thu, 24 Feb 2011 22:36:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219013 - head/sys/netinet X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 22:36:41 -0000 Author: tuexen Date: Thu Feb 24 22:36:40 2011 New Revision: 219013 URL: http://svn.freebsd.org/changeset/base/219013 Log: * Cleanup the code computing the retransmission timeout. * Fix an initialization bug for the scaled variance of the RTO. MFC after: 3 months. Modified: head/sys/netinet/sctp_structs.h head/sys/netinet/sctp_sysctl.c head/sys/netinet/sctputil.c Modified: head/sys/netinet/sctp_structs.h ============================================================================== --- head/sys/netinet/sctp_structs.h Thu Feb 24 22:11:36 2011 (r219012) +++ head/sys/netinet/sctp_structs.h Thu Feb 24 22:36:40 2011 (r219013) @@ -245,7 +245,7 @@ struct sctp_nets { /* smoothed average things for RTT and RTO itself */ int lastsa; int lastsv; - int rtt; /* last measured rtt value in ms */ + uint64_t rtt; /* last measured rtt value in us */ unsigned int RTO; /* This is used for SHUTDOWN/SHUTDOWN-ACK/SEND or INIT timers */ @@ -254,6 +254,10 @@ struct sctp_nets { /* last time in seconds I sent to it */ struct timeval last_sent_time; + + /* JRS - struct used in HTCP algorithm */ + struct htcp htcp_ca; + int ref_count; /* Congestion stats per destination */ @@ -267,7 +271,6 @@ struct sctp_nets { uint32_t ecn_prev_cwnd; /* ECN prev cwnd at first ecn_echo seen in new * window */ uint32_t partial_bytes_acked; /* in CA tracks when to incr a MTU */ - uint32_t prev_rtt; /* tracking variables to avoid the aloc/free in sack processing */ unsigned int net_ack; unsigned int net_ack2; @@ -298,7 +301,6 @@ struct sctp_nets { uint32_t tos_flowlabel; struct timeval start_time; /* time when this net was created */ - struct timeval last_measured_rtt; uint32_t marked_retrans;/* number or DATA chunks marked for timer * based retransmissions */ uint32_t marked_fastretrans; @@ -348,8 +350,6 @@ struct sctp_nets { uint8_t RTO_measured; /* Have we done the first measure */ uint8_t last_hs_used; /* index into the last HS table entry we used */ uint8_t lan_type; - /* JRS - struct used in HTCP algorithm */ - struct htcp htcp_ca; uint32_t flowid; #ifdef INVARIANTS uint8_t flowidset; Modified: head/sys/netinet/sctp_sysctl.c ============================================================================== --- head/sys/netinet/sctp_sysctl.c Thu Feb 24 22:11:36 2011 (r219012) +++ head/sys/netinet/sctp_sysctl.c Thu Feb 24 22:36:40 2011 (r219013) @@ -477,7 +477,7 @@ sctp_assoclist(SYSCTL_HANDLER_ARGS) xraddr.cwnd = net->cwnd; xraddr.flight_size = net->flight_size; xraddr.mtu = net->mtu; - xraddr.rtt = net->rtt; + xraddr.rtt = net->rtt / 1000; xraddr.start_time.tv_sec = (uint32_t) net->start_time.tv_sec; xraddr.start_time.tv_usec = (uint32_t) net->start_time.tv_usec; SCTP_INP_RUNLOCK(inp); Modified: head/sys/netinet/sctputil.c ============================================================================== --- head/sys/netinet/sctputil.c Thu Feb 24 22:11:36 2011 (r219012) +++ head/sys/netinet/sctputil.c Thu Feb 24 22:36:40 2011 (r219013) @@ -113,7 +113,7 @@ rto_logging(struct sctp_nets *net, int f memset(&sctp_clog, 0, sizeof(sctp_clog)); sctp_clog.x.rto.net = (void *)net; - sctp_clog.x.rto.rtt = net->prev_rtt; + sctp_clog.x.rto.rtt = net->rtt / 1000; SCTP_CTR6(KTR_SCTP, "SCTP:%d[%d]:%x-%x-%x-%x", SCTP_LOG_EVENT_RTT, from, @@ -2475,9 +2475,8 @@ sctp_calculate_rto(struct sctp_tcb *stcb * given an association and the starting time of the current RTT * period (in value1/value2) return RTO in number of msecs. */ - int calc_time = 0; - int o_calctime; - uint32_t new_rto = 0; + int32_t rtt; /* RTT in ms */ + uint32_t new_rto; int first_measure = 0; struct timeval now, then, *old; @@ -2497,95 +2496,58 @@ sctp_calculate_rto(struct sctp_tcb *stcb /************************/ /* get the current time */ (void)SCTP_GETTIME_TIMEVAL(&now); - /* - * Record the real time of the last RTT for use in DC-CC. - */ - net->last_measured_rtt = now; - timevalsub(&net->last_measured_rtt, old); + timevalsub(&now, old); + /* store the current RTT in us */ + net->rtt = (uint64_t) 10000000 *(uint64_t) now.tv_sec + + (uint64_t) now.tv_usec; + + /* computer rtt in ms */ + rtt = net->rtt / 1000; /* Do we need to determine the lan type? */ - if ((local_lan_determine == SCTP_DETERMINE_LL_OK) && (net->lan_type == SCTP_LAN_UNKNOWN)) { - if ((net->last_measured_rtt.tv_sec) || - (net->last_measured_rtt.tv_usec > SCTP_LOCAL_LAN_RTT)) { + if ((local_lan_determine == SCTP_DETERMINE_LL_OK) && + (net->lan_type == SCTP_LAN_UNKNOWN)) { + if (net->rtt > SCTP_LOCAL_LAN_RTT) { net->lan_type = SCTP_LAN_INTERNET; } else { net->lan_type = SCTP_LAN_LOCAL; } } - /* compute the RTT value */ - if ((u_long)now.tv_sec > (u_long)old->tv_sec) { - calc_time = ((u_long)now.tv_sec - (u_long)old->tv_sec) * 1000; - if ((u_long)now.tv_usec > (u_long)old->tv_usec) { - calc_time += (((u_long)now.tv_usec - - (u_long)old->tv_usec) / 1000); - } else if ((u_long)now.tv_usec < (u_long)old->tv_usec) { - /* Borrow 1,000ms from current calculation */ - calc_time -= 1000; - /* Add in the slop over */ - calc_time += ((int)now.tv_usec / 1000); - /* Add in the pre-second ms's */ - calc_time += (((int)1000000 - (int)old->tv_usec) / 1000); - } - } else if ((u_long)now.tv_sec == (u_long)old->tv_sec) { - if ((u_long)now.tv_usec > (u_long)old->tv_usec) { - calc_time = ((u_long)now.tv_usec - - (u_long)old->tv_usec) / 1000; - } else if ((u_long)now.tv_usec < (u_long)old->tv_usec) { - /* impossible .. garbage in nothing out */ - goto calc_rto; - } else if ((u_long)now.tv_usec == (u_long)old->tv_usec) { - /* - * We have to have 1 usec :-D this must be the - * loopback. - */ - calc_time = 1; - } else { - /* impossible .. garbage in nothing out */ - goto calc_rto; - } - } else { - /* Clock wrapped? */ - goto calc_rto; - } /***************************/ /* 2. update RTTVAR & SRTT */ /***************************/ - net->rtt = o_calctime = calc_time; - /* this is Van Jacobson's integer version */ + /*- + * Compute the scaled average lastsa and the + * scaled variance lastsv as described in van Jacobson + * Paper "Congestion Avoidance and Control", Annex A. + * + * (net->lastsa >> SCTP_RTT_SHIFT) is the srtt + * (net->lastsa >> SCTP_RTT_VAR_SHIFT) is the rttvar + */ if (net->RTO_measured) { - calc_time -= (net->lastsa >> SCTP_RTT_SHIFT); /* take away 1/8th when - * shift=3 */ + rtt -= (net->lastsa >> SCTP_RTT_SHIFT); + net->lastsa += rtt; + if (rtt < 0) { + rtt = -rtt; + } + rtt -= (net->lastsv >> SCTP_RTT_VAR_SHIFT); + net->lastsv += rtt; if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_RTTVAR_LOGGING_ENABLE) { rto_logging(net, SCTP_LOG_RTTVAR); } - net->prev_rtt = o_calctime; - net->lastsa += calc_time; /* add 7/8th into sa when - * shift=3 */ - if (calc_time < 0) { - calc_time = -calc_time; - } - calc_time -= (net->lastsv >> SCTP_RTT_VAR_SHIFT); /* take away 1/4 when - * VAR shift=2 */ - net->lastsv += calc_time; - if (net->lastsv == 0) { - net->lastsv = SCTP_CLOCK_GRANULARITY; - } } else { /* First RTO measurment */ net->RTO_measured = 1; - net->lastsa = calc_time << SCTP_RTT_SHIFT; /* Multiply by 8 when - * shift=3 */ - net->lastsv = calc_time; - if (net->lastsv == 0) { - net->lastsv = SCTP_CLOCK_GRANULARITY; - } first_measure = 1; - net->prev_rtt = o_calctime; + net->lastsa = rtt << SCTP_RTT_SHIFT; + net->lastsv = (rtt / 2) << SCTP_RTT_VAR_SHIFT; if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_RTTVAR_LOGGING_ENABLE) { rto_logging(net, SCTP_LOG_INITIAL_RTT); } } -calc_rto: + if (net->lastsv == 0) { + net->lastsv = SCTP_CLOCK_GRANULARITY; + } new_rto = (net->lastsa >> SCTP_RTT_SHIFT) + net->lastsv; if ((new_rto > SCTP_SAT_NETWORK_MIN) && (stcb->asoc.sat_network_lockout == 0)) { From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 22:43:22 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 584D71065695; Thu, 24 Feb 2011 22:43:22 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from mx0.deglitch.com (cl-414.sto-01.se.sixxs.net [IPv6:2001:16d8:ff00:19d::2]) by mx1.freebsd.org (Postfix) with ESMTP id 0327A8FC28; Thu, 24 Feb 2011 22:43:22 +0000 (UTC) Received: from orion.SpringDaemons.com (207.47.0.2.static.nextweb.net [207.47.0.2]) by mx0.deglitch.com (Postfix) with ESMTPA id B70668FC2B; Fri, 25 Feb 2011 01:43:19 +0300 (MSK) Received: from orion (localhost [127.0.0.1]) by orion.SpringDaemons.com (Postfix) with SMTP id D59E35C38; Thu, 24 Feb 2011 14:43:08 -0800 (PST) Date: Thu, 24 Feb 2011 14:43:03 -0800 From: Stanislav Sedov To: Martin Wilke Message-Id: <20110224144303.baa6e809.stas@FreeBSD.org> In-Reply-To: <201102220513.p1M5DRrQ095042@svn.freebsd.org> References: <201102220513.p1M5DRrQ095042@svn.freebsd.org> Organization: The FreeBSD Project X-Mailer: carrier-pigeon Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Thu__24_Feb_2011_14_43_03_-0800_dtov=Sjx6vLZY5XL" Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, rwatson@FreeBSD.org Subject: Re: svn commit: r218938 - head/tools/regression/aio/kqueue X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 22:43:22 -0000 --Signature=_Thu__24_Feb_2011_14_43_03_-0800_dtov=Sjx6vLZY5XL Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, 22 Feb 2011 05:13:27 +0000 (UTC) Martin Wilke mentioned: > Author: miwi > Date: Tue Feb 22 05:13:26 2011 > New Revision: 218938 > URL: http://svn.freebsd.org/changeset/base/218938 >=20 > Log: > - Fix QA issues > =20 What kind these QA issues are of? Also, style(9) does not encourage extra bland lines for now reason. --=20 Stanislav Sedov ST4096-RIPE () ascii ribbon campaign - against html e-mail=20 /\ www.asciiribbon.org - against proprietary attachments --Signature=_Thu__24_Feb_2011_14_43_03_-0800_dtov=Sjx6vLZY5XL Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- iQIcBAEBAgAGBQJNZt78AAoJEL8lojEJL9nwAPcP+gK53J9CWq1dKEYeeBWGSzFB T17RVIzF+DnEZ/USwQTG2NWfadgwzbs3BFtYa7gF1eyV5H8J5lEblJABNk2hxN8G Ft2YiqH3kKS0kAep6H3o3VJHQcEXUi2ViqbLSmbZUIlvhPIxcb3P+uB0s26s7JHm VMNiibKrArm3Pu6hVOxpBAW5TrGUXjBdHnpT76qb5O4r2CCCN4pgT/HXd6+LJfuH 0xUTYr7ytc7BddfhIWaiFE3bBkRv2q2z7JYiLJm2pGerh6J0lr25Uz03/I7G+iMp v18WspfnQI2Uvvq8uXl6AEJ4yHeyBg087V9RTizAY8rCBfgMOANKsHmdbyn1QOMG bhitPEZeK77arKUa8lirJDtcui7wOesK6Wbrd144YC+GcAdiGk3u2L85vG41UiMd 0N8Ua3j3z4Dg5K9F6luj5QCY9UEonqTbZteOtTfIl5UPa/vvHw0llj2LBBURMkGR 5RNZuzFOTdVME6t5NKBGxmCJv8Tc0Rr2FVQp2fGm+tK264xzvFbvnA+aS1VOJLRV Tx+wzfil+CZJ+XvNb4V2Z+OM3hW+3BV4vxXOSouzIFyORQCPJw2bPSCEX99oleU/ kr5G7lPgUfyfPnt808//fL+6tbPLwjMfsz+ZEGJ5DHhV4ekblxIxW1QeHSI7r+b5 XK2+Wb0S/IYHCjdskgro =cR4K -----END PGP SIGNATURE----- --Signature=_Thu__24_Feb_2011_14_43_03_-0800_dtov=Sjx6vLZY5XL-- From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 22:58:16 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6DB181065672; Thu, 24 Feb 2011 22:58:16 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5C6AF8FC12; Thu, 24 Feb 2011 22:58:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OMwGUH066150; Thu, 24 Feb 2011 22:58:16 GMT (envelope-from tuexen@svn.freebsd.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OMwGmE066146; Thu, 24 Feb 2011 22:58:16 GMT (envelope-from tuexen@svn.freebsd.org) Message-Id: <201102242258.p1OMwGmE066146@svn.freebsd.org> From: Michael Tuexen Date: Thu, 24 Feb 2011 22:58:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219014 - head/sys/netinet X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 22:58:16 -0000 Author: tuexen Date: Thu Feb 24 22:58:15 2011 New Revision: 219014 URL: http://svn.freebsd.org/changeset/base/219014 Log: * Fix several bugs where the scaled versions of srtt and rttvar where used incorrectly. * Use appropriate variable names for RTO instead of RTT. MFC after: 3 months. Modified: head/sys/netinet/sctp_cc_functions.c head/sys/netinet/sctp_timer.c head/sys/netinet/sctp_usrreq.c Modified: head/sys/netinet/sctp_cc_functions.c ============================================================================== --- head/sys/netinet/sctp_cc_functions.c Thu Feb 24 22:36:40 2011 (r219013) +++ head/sys/netinet/sctp_cc_functions.c Thu Feb 24 22:58:15 2011 (r219014) @@ -428,7 +428,7 @@ skip_cwnd_update: */ if (net->net_ack2) { /* restore any doubled timers */ - net->RTO = ((net->lastsa >> 2) + net->lastsv) >> 1; + net->RTO = (net->lastsa >> SCTP_RTT_SHIFT) + net->lastsv; if (net->RTO < stcb->asoc.minrto) { net->RTO = stcb->asoc.minrto; } @@ -518,8 +518,8 @@ sctp_cwnd_update_after_packet_dropped(st unsigned int incr; int old_cwnd = net->cwnd; - /* need real RTT for this calc */ - rtt = ((net->lastsa >> 2) + net->lastsv) >> 1; + /* need real RTT in msd for this calc */ + rtt = net->rtt / 1000; /* get bottle neck bw */ *bottle_bw = ntohl(cp->bottle_bw); /* and whats on queue */ @@ -1079,7 +1079,7 @@ skip_cwnd_update: */ if (net->net_ack2) { /* restore any doubled timers */ - net->RTO = ((net->lastsa >> 2) + net->lastsv) >> 1; + net->RTO = (net->lastsa >> SCTP_RTT_SHIFT) + net->lastsv; if (net->RTO < stcb->asoc.minrto) { net->RTO = stcb->asoc.minrto; } @@ -1146,7 +1146,7 @@ htcp_cwnd_undo(struct sctp_tcb *stcb, st static inline void measure_rtt(struct sctp_tcb *stcb, struct sctp_nets *net) { - uint32_t srtt = net->lastsa >> 3; + uint32_t srtt = net->lastsa >> SCTP_RTT_SHIFT; /* keep track of minimum RTT seen so far, minRTT is zero at first */ if (net->htcp_ca.minRTT > srtt || !net->htcp_ca.minRTT) @@ -1532,7 +1532,7 @@ skip_cwnd_update: */ if (net->net_ack2) { /* restore any doubled timers */ - net->RTO = ((net->lastsa >> 2) + net->lastsv) >> 1; + net->RTO = (net->lastsa >> SCTP_RTT_SHIFT) + net->lastsv; if (net->RTO < stcb->asoc.minrto) { net->RTO = stcb->asoc.minrto; } Modified: head/sys/netinet/sctp_timer.c ============================================================================== --- head/sys/netinet/sctp_timer.c Thu Feb 24 22:36:40 2011 (r219013) +++ head/sys/netinet/sctp_timer.c Thu Feb 24 22:58:15 2011 (r219014) @@ -61,24 +61,24 @@ sctp_early_fr_timer(struct sctp_inpcb *i { struct sctp_tmit_chunk *chk, *pchk; struct timeval now, min_wait, tv; - unsigned int cur_rtt, cnt = 0, cnt_resend = 0; + unsigned int cur_rto, cnt = 0, cnt_resend = 0; /* an early FR is occuring. */ (void)SCTP_GETTIME_TIMEVAL(&now); /* get cur rto in micro-seconds */ if (net->lastsa == 0) { /* Hmm no rtt estimate yet? */ - cur_rtt = stcb->asoc.initial_rto >> 2; + cur_rto = stcb->asoc.initial_rto >> 2; } else { - cur_rtt = ((net->lastsa >> 2) + net->lastsv) >> 1; + cur_rto = (net->lastsa >> SCTP_RTT_SHIFT) + net->lastsv; } - if (cur_rtt < SCTP_BASE_SYSCTL(sctp_early_fr_msec)) { - cur_rtt = SCTP_BASE_SYSCTL(sctp_early_fr_msec); + if (cur_rto < SCTP_BASE_SYSCTL(sctp_early_fr_msec)) { + cur_rto = SCTP_BASE_SYSCTL(sctp_early_fr_msec); } - cur_rtt *= 1000; - tv.tv_sec = cur_rtt / 1000000; - tv.tv_usec = cur_rtt % 1000000; + cur_rto *= 1000; + tv.tv_sec = cur_rto / 1000000; + tv.tv_usec = cur_rto % 1000000; min_wait = now; timevalsub(&min_wait, &tv); if (min_wait.tv_sec < 0 || min_wait.tv_usec < 0) { @@ -626,7 +626,7 @@ sctp_mark_all_for_resend(struct sctp_tcb struct sctp_tmit_chunk *chk, *nchk; struct sctp_nets *lnets; struct timeval now, min_wait, tv; - int cur_rtt; + int cur_rto; int cnt_abandoned; int audit_tf, num_mk, fir; unsigned int cnt_mk; @@ -644,10 +644,10 @@ sctp_mark_all_for_resend(struct sctp_tcb */ (void)SCTP_GETTIME_TIMEVAL(&now); /* get cur rto in micro-seconds */ - cur_rtt = (((net->lastsa >> 2) + net->lastsv) >> 1); - cur_rtt *= 1000; + cur_rto = (net->lastsa >> SCTP_RTT_SHIFT) + net->lastsv; + cur_rto *= 1000; if (SCTP_BASE_SYSCTL(sctp_logging_level) & (SCTP_EARLYFR_LOGGING_ENABLE | SCTP_FR_LOGGING_ENABLE)) { - sctp_log_fr(cur_rtt, + sctp_log_fr(cur_rto, stcb->asoc.peers_rwnd, window_probe, SCTP_FR_T3_MARK_TIME); @@ -657,8 +657,8 @@ sctp_mark_all_for_resend(struct sctp_tcb SCTP_FR_CWND_REPORT); sctp_log_fr(net->flight_size, net->cwnd, stcb->asoc.total_flight, SCTP_FR_CWND_REPORT); } - tv.tv_sec = cur_rtt / 1000000; - tv.tv_usec = cur_rtt % 1000000; + tv.tv_sec = cur_rto / 1000000; + tv.tv_usec = cur_rto % 1000000; min_wait = now; timevalsub(&min_wait, &tv); if (min_wait.tv_sec < 0 || min_wait.tv_usec < 0) { @@ -671,7 +671,7 @@ sctp_mark_all_for_resend(struct sctp_tcb min_wait.tv_sec = min_wait.tv_usec = 0; } if (SCTP_BASE_SYSCTL(sctp_logging_level) & (SCTP_EARLYFR_LOGGING_ENABLE | SCTP_FR_LOGGING_ENABLE)) { - sctp_log_fr(cur_rtt, now.tv_sec, now.tv_usec, SCTP_FR_T3_MARK_TIME); + sctp_log_fr(cur_rto, now.tv_sec, now.tv_usec, SCTP_FR_T3_MARK_TIME); sctp_log_fr(0, min_wait.tv_sec, min_wait.tv_usec, SCTP_FR_T3_MARK_TIME); } /* Modified: head/sys/netinet/sctp_usrreq.c ============================================================================== --- head/sys/netinet/sctp_usrreq.c Thu Feb 24 22:36:40 2011 (r219013) +++ head/sys/netinet/sctp_usrreq.c Thu Feb 24 22:58:15 2011 (r219014) @@ -2401,7 +2401,7 @@ flags_out: paddri->spinfo_state = SCTP_INACTIVE; } paddri->spinfo_cwnd = net->cwnd; - paddri->spinfo_srtt = ((net->lastsa >> 2) + net->lastsv) >> 1; + paddri->spinfo_srtt = net->lastsa >> SCTP_RTT_SHIFT; paddri->spinfo_rto = net->RTO; paddri->spinfo_assoc_id = sctp_get_associd(stcb); SCTP_TCB_UNLOCK(stcb); @@ -2478,7 +2478,7 @@ flags_out: sstat->sstat_primary.spinfo_state = SCTP_INACTIVE; } sstat->sstat_primary.spinfo_cwnd = net->cwnd; - sstat->sstat_primary.spinfo_srtt = net->lastsa; + sstat->sstat_primary.spinfo_srtt = net->lastsa >> SCTP_RTT_SHIFT; sstat->sstat_primary.spinfo_rto = net->RTO; sstat->sstat_primary.spinfo_mtu = net->mtu; sstat->sstat_primary.spinfo_assoc_id = sctp_get_associd(stcb); From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 23:11:49 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 329A3106566B; Thu, 24 Feb 2011 23:11:49 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-ww0-f50.google.com (mail-ww0-f50.google.com [74.125.82.50]) by mx1.freebsd.org (Postfix) with ESMTP id EBFE58FC16; Thu, 24 Feb 2011 23:11:47 +0000 (UTC) Received: by wwb31 with SMTP id 31so1455868wwb.31 for ; Thu, 24 Feb 2011 15:11:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=HhHy3j0DGflH99e+pbSZNmvaXXnlkIIDrkSFUEk40yg=; b=qfZaOi6qxxXnyxNExefO0WSKv87MVA7ivCjly6SdCuDetCYwC0H1mICNAEbbbraKBk w/utvhAM7ay7y8LBe4tuRwjvzLdqG0/JezkkbJ5yzwSeXfZI0Hk9mMcffwQdHB/ROreq nbOscrKUVtczjMvsVOSRViIb6Z9faKhbvcMss= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=YsXl17Gp3jwJkRnN1YKBoewcayQ/ItovcJ6BI1MAl0UOrphqto+kKmMUqFWWzsnOW9 XYC6t4BYORCd44S0ucreXEogQzDuKefAOpKxoGNxW6hNVqTC2YYDnsyWOTwlClD9I/uw PDXEzbUUM3W87GMkCTN+idrzriWnXyTHkdhDs= MIME-Version: 1.0 Received: by 10.216.162.70 with SMTP id x48mr6517727wek.4.1298589106910; Thu, 24 Feb 2011 15:11:46 -0800 (PST) Sender: yanegomi@gmail.com Received: by 10.216.15.74 with HTTP; Thu, 24 Feb 2011 15:11:46 -0800 (PST) In-Reply-To: <20110224144303.baa6e809.stas@FreeBSD.org> References: <201102220513.p1M5DRrQ095042@svn.freebsd.org> <20110224144303.baa6e809.stas@FreeBSD.org> Date: Thu, 24 Feb 2011 15:11:46 -0800 X-Google-Sender-Auth: AUmIZLZkmOOx1hkz0F-t3yjJ0tM Message-ID: From: Garrett Cooper To: Stanislav Sedov Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, rwatson@freebsd.org, Martin Wilke Subject: Re: svn commit: r218938 - head/tools/regression/aio/kqueue X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 23:11:49 -0000 On Thu, Feb 24, 2011 at 2:43 PM, Stanislav Sedov wrote: > On Tue, 22 Feb 2011 05:13:27 +0000 (UTC) > Martin Wilke mentioned: > >> Author: miwi >> Date: Tue Feb 22 05:13:26 2011 >> New Revision: 218938 >> URL: http://svn.freebsd.org/changeset/base/218938 >> >> Log: >> =A0 - Fix QA issues >> > > What kind these QA issues are of? Stupid me. This was wrong: - char *file, pathname[sizeof(PATH_TEMPLATE)-1]; + char *file, pathname[sizeof(PATH_TEMPLATE)+1]; (sizeof will return the buffer size -- the above item was true if I was using strlen) NULL pointer derefs: + iocb[i] =3D (struct aiocb *)calloc(1, + sizeof(struct aiocb)); + if (iocb[i] =3D=3D NULL) + err(1, "calloc"); Memory leaks: + for (i =3D 0; i < MAX; i++) + free(iocb[i]); + > Also, style(9) does not encourage extra bland lines for now reason. Sorry .. the blank lines for my mistake :(... Thanks, -Garrett From owner-svn-src-head@FreeBSD.ORG Thu Feb 24 23:51:59 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61B261065695; Thu, 24 Feb 2011 23:51:59 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 515758FC27; Thu, 24 Feb 2011 23:51:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1ONpxAg068778; Thu, 24 Feb 2011 23:51:59 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1ONpxO0068776; Thu, 24 Feb 2011 23:51:59 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201102242351.p1ONpxO0068776@svn.freebsd.org> From: Brooks Davis Date: Thu, 24 Feb 2011 23:51:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219018 - head/etc/defaults X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 23:51:59 -0000 Author: brooks Date: Thu Feb 24 23:51:59 2011 New Revision: 219018 URL: http://svn.freebsd.org/changeset/base/219018 Log: Enable the check for negative permissions (the group on a file can't do something "everyone" can) by default. X-MFC after: never Modified: head/etc/defaults/periodic.conf Modified: head/etc/defaults/periodic.conf ============================================================================== --- head/etc/defaults/periodic.conf Thu Feb 24 23:45:13 2011 (r219017) +++ head/etc/defaults/periodic.conf Thu Feb 24 23:51:59 2011 (r219018) @@ -161,7 +161,7 @@ daily_status_security_diff_flags="-b -u" daily_status_security_chksetuid_enable="YES" # 110.neggrpperm -daily_status_security_neggrpperm_enable="NO" +daily_status_security_neggrpperm_enable="YES" # 200.chkmounts daily_status_security_chkmounts_enable="YES" From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 00:04:41 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41F8A1065674; Fri, 25 Feb 2011 00:04:41 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2BB168FC1A; Fri, 25 Feb 2011 00:04:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1P04fps069420; Fri, 25 Feb 2011 00:04:41 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1P04eTx069404; Fri, 25 Feb 2011 00:04:40 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201102250004.p1P04eTx069404@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 25 Feb 2011 00:04:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219019 - in head: . etc/mtree include lib lib/libc lib/libc/iconv lib/libiconv lib/libiconv_modules lib/libiconv_modules/BIG5 lib/libiconv_modules/DECHanyu lib/libiconv_modules/EUC lib... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 00:04:41 -0000 Author: gabor Date: Fri Feb 25 00:04:39 2011 New Revision: 219019 URL: http://svn.freebsd.org/changeset/base/219019 Log: Add the BSD-licensed Citrus iconv to the base system with default off setting. It can be built by setting the WITH_ICONV knob. While this knob is unset, the library part, the binaries, the header file and the metadata files will not be built or installed so it makes no impact on the system if left turned off. This work is based on the iconv implementation in NetBSD but a great number of improvements and feature additions have been included: - Some utilities have been added. There is a conversion table generator, which can compare conversion tables to reference data generated by GNU libiconv. This helps ensuring conversion compatibility. - UTF-16 surrogate support and some endianness issues have been fixed. - The rather chaotic Makefiles to build metadata have been refactored and cleaned up, now it is easy to read and it is also easier to add support for new encodings. - A bunch of new encodings and encoding aliases have been added. - Support for 1->2, 1->3 and 1->4 mappings, which is needed for transliterating with flying accents as GNU does, like "u. - Lots of warnings have been fixed, the major part of the code is now WARNS=6 clean. - New section 1 and section 5 manual pages have been added. - Some GNU-specific calls have been implemented: iconvlist(), iconvctl(), iconv_canonicalize(), iconv_open_into() - Support for GNU's //IGNORE suffix has been added. - The "-" argument for stdin is now recognized in iconv(1) as per POSIX. - The Big5 conversion module has been fixed. - The iconv.h header files is supposed to be compatible with the GNU version, i.e. sources should build with base iconv.h and GNU libiconv. It also includes a macro magic to deal with the char ** and const char ** incompatibility. - GNU compatibility: "" or "char" means the current local encoding in use - Various cleanups and style(9) fixes. Approved by: delphij (mentor) Obtained from: The NetBSD Project Sponsored by: Google Summer of Code 2009 Added: head/include/iconv.h (contents, props changed) head/lib/libc/iconv/ head/lib/libc/iconv/Makefile.inc (contents, props changed) head/lib/libc/iconv/Symbol.map (contents, props changed) head/lib/libc/iconv/__iconv_get_list.3 (contents, props changed) head/lib/libc/iconv/_strtol.h (contents, props changed) head/lib/libc/iconv/_strtoul.h (contents, props changed) head/lib/libc/iconv/citrus_aliasname_local.h (contents, props changed) head/lib/libc/iconv/citrus_bcs.c (contents, props changed) head/lib/libc/iconv/citrus_bcs.h (contents, props changed) head/lib/libc/iconv/citrus_bcs_strtol.c (contents, props changed) head/lib/libc/iconv/citrus_bcs_strtoul.c (contents, props changed) head/lib/libc/iconv/citrus_csmapper.c (contents, props changed) head/lib/libc/iconv/citrus_csmapper.h (contents, props changed) head/lib/libc/iconv/citrus_db.c (contents, props changed) head/lib/libc/iconv/citrus_db.h (contents, props changed) head/lib/libc/iconv/citrus_db_factory.c (contents, props changed) head/lib/libc/iconv/citrus_db_factory.h (contents, props changed) head/lib/libc/iconv/citrus_db_file.h (contents, props changed) head/lib/libc/iconv/citrus_db_hash.c (contents, props changed) head/lib/libc/iconv/citrus_db_hash.h (contents, props changed) head/lib/libc/iconv/citrus_esdb.c (contents, props changed) head/lib/libc/iconv/citrus_esdb.h (contents, props changed) head/lib/libc/iconv/citrus_esdb_file.h (contents, props changed) head/lib/libc/iconv/citrus_fix_grouping.h (contents, props changed) head/lib/libc/iconv/citrus_hash.c (contents, props changed) head/lib/libc/iconv/citrus_hash.h (contents, props changed) head/lib/libc/iconv/citrus_iconv.c (contents, props changed) head/lib/libc/iconv/citrus_iconv.h (contents, props changed) head/lib/libc/iconv/citrus_iconv_local.h (contents, props changed) head/lib/libc/iconv/citrus_lock.h (contents, props changed) head/lib/libc/iconv/citrus_lookup.c (contents, props changed) head/lib/libc/iconv/citrus_lookup.h (contents, props changed) head/lib/libc/iconv/citrus_lookup_factory.c (contents, props changed) head/lib/libc/iconv/citrus_lookup_factory.h (contents, props changed) head/lib/libc/iconv/citrus_lookup_file.h (contents, props changed) head/lib/libc/iconv/citrus_mapper.c (contents, props changed) head/lib/libc/iconv/citrus_mapper.h (contents, props changed) head/lib/libc/iconv/citrus_mapper_local.h (contents, props changed) head/lib/libc/iconv/citrus_memstream.c (contents, props changed) head/lib/libc/iconv/citrus_memstream.h (contents, props changed) head/lib/libc/iconv/citrus_mmap.c (contents, props changed) head/lib/libc/iconv/citrus_mmap.h (contents, props changed) head/lib/libc/iconv/citrus_module.c (contents, props changed) head/lib/libc/iconv/citrus_module.h (contents, props changed) head/lib/libc/iconv/citrus_namespace.h (contents, props changed) head/lib/libc/iconv/citrus_none.c (contents, props changed) head/lib/libc/iconv/citrus_none.h (contents, props changed) head/lib/libc/iconv/citrus_pivot_factory.c (contents, props changed) head/lib/libc/iconv/citrus_pivot_factory.h (contents, props changed) head/lib/libc/iconv/citrus_pivot_file.h (contents, props changed) head/lib/libc/iconv/citrus_prop.c (contents, props changed) head/lib/libc/iconv/citrus_prop.h (contents, props changed) head/lib/libc/iconv/citrus_region.h (contents, props changed) head/lib/libc/iconv/citrus_stdenc.c (contents, props changed) head/lib/libc/iconv/citrus_stdenc.h (contents, props changed) head/lib/libc/iconv/citrus_stdenc_local.h (contents, props changed) head/lib/libc/iconv/citrus_stdenc_template.h (contents, props changed) head/lib/libc/iconv/citrus_types.h (contents, props changed) head/lib/libc/iconv/iconv.3 (contents, props changed) head/lib/libc/iconv/iconv.c (contents, props changed) head/lib/libc/iconv/iconv_canonicalize.3 (contents, props changed) head/lib/libc/iconv/iconvctl.3 (contents, props changed) head/lib/libc/iconv/iconvlist.3 (contents, props changed) head/lib/libiconv/ head/lib/libiconv/Makefile (contents, props changed) head/lib/libiconv_modules/ head/lib/libiconv_modules/BIG5/ head/lib/libiconv_modules/BIG5/Makefile (contents, props changed) head/lib/libiconv_modules/BIG5/citrus_big5.c (contents, props changed) head/lib/libiconv_modules/BIG5/citrus_big5.h (contents, props changed) head/lib/libiconv_modules/DECHanyu/ head/lib/libiconv_modules/DECHanyu/Makefile (contents, props changed) head/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c (contents, props changed) head/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h (contents, props changed) head/lib/libiconv_modules/EUC/ head/lib/libiconv_modules/EUC/Makefile (contents, props changed) head/lib/libiconv_modules/EUC/citrus_euc.c (contents, props changed) head/lib/libiconv_modules/EUC/citrus_euc.h (contents, props changed) head/lib/libiconv_modules/EUCTW/ head/lib/libiconv_modules/EUCTW/Makefile (contents, props changed) head/lib/libiconv_modules/EUCTW/citrus_euctw.c (contents, props changed) head/lib/libiconv_modules/EUCTW/citrus_euctw.h (contents, props changed) head/lib/libiconv_modules/GBK2K/ head/lib/libiconv_modules/GBK2K/Makefile (contents, props changed) head/lib/libiconv_modules/GBK2K/citrus_gbk2k.c (contents, props changed) head/lib/libiconv_modules/GBK2K/citrus_gbk2k.h (contents, props changed) head/lib/libiconv_modules/HZ/ head/lib/libiconv_modules/HZ/Makefile (contents, props changed) head/lib/libiconv_modules/HZ/citrus_hz.c (contents, props changed) head/lib/libiconv_modules/HZ/citrus_hz.h (contents, props changed) head/lib/libiconv_modules/ISO2022/ head/lib/libiconv_modules/ISO2022/Makefile (contents, props changed) head/lib/libiconv_modules/ISO2022/citrus_iso2022.c (contents, props changed) head/lib/libiconv_modules/ISO2022/citrus_iso2022.h (contents, props changed) head/lib/libiconv_modules/JOHAB/ head/lib/libiconv_modules/JOHAB/Makefile (contents, props changed) head/lib/libiconv_modules/JOHAB/citrus_johab.c (contents, props changed) head/lib/libiconv_modules/JOHAB/citrus_johab.h (contents, props changed) head/lib/libiconv_modules/MSKanji/ head/lib/libiconv_modules/MSKanji/Makefile (contents, props changed) head/lib/libiconv_modules/MSKanji/citrus_mskanji.c (contents, props changed) head/lib/libiconv_modules/MSKanji/citrus_mskanji.h (contents, props changed) head/lib/libiconv_modules/Makefile (contents, props changed) head/lib/libiconv_modules/Makefile.inc (contents, props changed) head/lib/libiconv_modules/UES/ head/lib/libiconv_modules/UES/Makefile (contents, props changed) head/lib/libiconv_modules/UES/citrus_ues.c (contents, props changed) head/lib/libiconv_modules/UES/citrus_ues.h (contents, props changed) head/lib/libiconv_modules/UTF1632/ head/lib/libiconv_modules/UTF1632/Makefile (contents, props changed) head/lib/libiconv_modules/UTF1632/citrus_utf1632.c (contents, props changed) head/lib/libiconv_modules/UTF1632/citrus_utf1632.h (contents, props changed) head/lib/libiconv_modules/UTF7/ head/lib/libiconv_modules/UTF7/Makefile (contents, props changed) head/lib/libiconv_modules/UTF7/citrus_utf7.c (contents, props changed) head/lib/libiconv_modules/UTF7/citrus_utf7.h (contents, props changed) head/lib/libiconv_modules/UTF8/ head/lib/libiconv_modules/UTF8/Makefile (contents, props changed) head/lib/libiconv_modules/UTF8/citrus_utf8.c (contents, props changed) head/lib/libiconv_modules/UTF8/citrus_utf8.h (contents, props changed) head/lib/libiconv_modules/VIQR/ head/lib/libiconv_modules/VIQR/Makefile (contents, props changed) head/lib/libiconv_modules/VIQR/citrus_viqr.c (contents, props changed) head/lib/libiconv_modules/VIQR/citrus_viqr.h (contents, props changed) head/lib/libiconv_modules/ZW/ head/lib/libiconv_modules/ZW/Makefile (contents, props changed) head/lib/libiconv_modules/ZW/citrus_zw.c (contents, props changed) head/lib/libiconv_modules/ZW/citrus_zw.h (contents, props changed) head/lib/libiconv_modules/iconv_none/ head/lib/libiconv_modules/iconv_none/Makefile (contents, props changed) head/lib/libiconv_modules/iconv_none/citrus_iconv_none.c (contents, props changed) head/lib/libiconv_modules/iconv_none/citrus_iconv_none.h (contents, props changed) head/lib/libiconv_modules/iconv_std/ head/lib/libiconv_modules/iconv_std/Makefile (contents, props changed) head/lib/libiconv_modules/iconv_std/citrus_iconv_std.c (contents, props changed) head/lib/libiconv_modules/iconv_std/citrus_iconv_std.h (contents, props changed) head/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h (contents, props changed) head/lib/libiconv_modules/mapper_646/ head/lib/libiconv_modules/mapper_646/Makefile (contents, props changed) head/lib/libiconv_modules/mapper_646/citrus_mapper_646.c (contents, props changed) head/lib/libiconv_modules/mapper_646/citrus_mapper_646.h (contents, props changed) head/lib/libiconv_modules/mapper_none/ head/lib/libiconv_modules/mapper_none/Makefile (contents, props changed) head/lib/libiconv_modules/mapper_none/citrus_mapper_none.c (contents, props changed) head/lib/libiconv_modules/mapper_none/citrus_mapper_none.h (contents, props changed) head/lib/libiconv_modules/mapper_parallel/ head/lib/libiconv_modules/mapper_parallel/Makefile (contents, props changed) head/lib/libiconv_modules/mapper_serial/ head/lib/libiconv_modules/mapper_serial/Makefile (contents, props changed) head/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c (contents, props changed) head/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h (contents, props changed) head/lib/libiconv_modules/mapper_std/ head/lib/libiconv_modules/mapper_std/Makefile (contents, props changed) head/lib/libiconv_modules/mapper_std/citrus_mapper_std.c (contents, props changed) head/lib/libiconv_modules/mapper_std/citrus_mapper_std.h (contents, props changed) head/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h (contents, props changed) head/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h (contents, props changed) head/lib/libiconv_modules/mapper_zone/ head/lib/libiconv_modules/mapper_zone/Makefile (contents, props changed) head/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c (contents, props changed) head/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h (contents, props changed) head/share/i18n/ head/share/i18n/Makefile (contents, props changed) head/share/i18n/csmapper/ head/share/i18n/csmapper/APPLE/ head/share/i18n/csmapper/APPLE/ARABIC%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/CELTIC%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/CENTEURO%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/CROATIAN%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/CYRILLIC%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/DEVANAGA%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/DINGBATS%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/FARSI%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/GAELIC%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/GREEK%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/GUJARATI%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/GURMUKHI%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/HEBREW%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/ICELAND%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/INUIT%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/KEYBOARD%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/MAC.part (contents, props changed) head/share/i18n/csmapper/APPLE/Makefile (contents, props changed) head/share/i18n/csmapper/APPLE/ROMAN%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/ROMANIAN%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/SYMBOL%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/THAI%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/TURKISH%UCS.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%ARABIC.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%CELTIC.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%CENTEURO.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%CROATIAN.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%CYRILLIC.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%DEVANAGA.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%DINGBATS.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%FARSI.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%GAELIC.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%GREEK.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%GUJARATI.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%GURMUKHI.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%HEBREW.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%ICELAND.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%INUIT.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%KEYBOARD.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%ROMAN.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%ROMANIAN.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%SYMBOL.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%THAI.src (contents, props changed) head/share/i18n/csmapper/APPLE/UCS%TURKISH.src (contents, props changed) head/share/i18n/csmapper/AST/ head/share/i18n/csmapper/AST/ARMSCII-7%UCS.src (contents, props changed) head/share/i18n/csmapper/AST/ARMSCII-8%UCS.src (contents, props changed) head/share/i18n/csmapper/AST/ARMSCII-8A%UCS.src (contents, props changed) head/share/i18n/csmapper/AST/ARMSCII.part (contents, props changed) head/share/i18n/csmapper/AST/Makefile (contents, props changed) head/share/i18n/csmapper/AST/UCS%ARMSCII-7.src (contents, props changed) head/share/i18n/csmapper/AST/UCS%ARMSCII-8.src (contents, props changed) head/share/i18n/csmapper/AST/UCS%ARMSCII-8A.src (contents, props changed) head/share/i18n/csmapper/BIG5/ head/share/i18n/csmapper/BIG5/Big5@1984%UCS.src (contents, props changed) head/share/i18n/csmapper/BIG5/Big5EXT@2003%UCS.src (contents, props changed) head/share/i18n/csmapper/BIG5/Big5EXT@E%UCS.src (contents, props changed) head/share/i18n/csmapper/BIG5/Big5EXT@IBM%UCS.src (contents, props changed) head/share/i18n/csmapper/BIG5/Big5EXT@Plus%UCS.src (contents, props changed) head/share/i18n/csmapper/BIG5/Big5UDA%UCS.src (contents, props changed) head/share/i18n/csmapper/BIG5/ETen%UCS@BMP.src (contents, props changed) head/share/i18n/csmapper/BIG5/ETen%UCS@SIP.src (contents, props changed) head/share/i18n/csmapper/BIG5/HKSCS%UCS@BMP.src (contents, props changed) head/share/i18n/csmapper/BIG5/HKSCS%UCS@SIP.src (contents, props changed) head/share/i18n/csmapper/BIG5/Makefile (contents, props changed) head/share/i18n/csmapper/BIG5/UCS%Big5@1984.src (contents, props changed) head/share/i18n/csmapper/BIG5/UCS%Big5EXT@2003.src (contents, props changed) head/share/i18n/csmapper/BIG5/UCS%Big5EXT@E.src (contents, props changed) head/share/i18n/csmapper/BIG5/UCS%Big5EXT@IBM.src (contents, props changed) head/share/i18n/csmapper/BIG5/UCS%Big5EXT@Plus.src (contents, props changed) head/share/i18n/csmapper/BIG5/UCS%Big5UDA.src (contents, props changed) head/share/i18n/csmapper/BIG5/UCS@BMP%ETen.src (contents, props changed) head/share/i18n/csmapper/BIG5/UCS@BMP%HKSCS.src (contents, props changed) head/share/i18n/csmapper/BIG5/UCS@SIP%ETen.src (contents, props changed) head/share/i18n/csmapper/BIG5/UCS@SIP%HKSCS.src (contents, props changed) head/share/i18n/csmapper/BIG5/charset.pivot.BIG5.src (contents, props changed) head/share/i18n/csmapper/BIG5/mapper.dir.BIG5.src (contents, props changed) head/share/i18n/csmapper/CNS/ head/share/i18n/csmapper/CNS/CNS11643-1%UCS.src (contents, props changed) head/share/i18n/csmapper/CNS/CNS11643-2%UCS.src (contents, props changed) head/share/i18n/csmapper/CNS/CNS11643-3%UCS@BMP.src (contents, props changed) head/share/i18n/csmapper/CNS/CNS11643-3%UCS@SIP.src (contents, props changed) head/share/i18n/csmapper/CNS/CNS11643-4%UCS@BMP.src (contents, props changed) head/share/i18n/csmapper/CNS/CNS11643-4%UCS@SIP.src (contents, props changed) head/share/i18n/csmapper/CNS/CNS11643-5%UCS@BMP.src (contents, props changed) head/share/i18n/csmapper/CNS/CNS11643-5%UCS@SIP.src (contents, props changed) head/share/i18n/csmapper/CNS/CNS11643-6%UCS@BMP.src (contents, props changed) head/share/i18n/csmapper/CNS/CNS11643-6%UCS@SIP.src (contents, props changed) head/share/i18n/csmapper/CNS/CNS11643-7%UCS@BMP.src (contents, props changed) head/share/i18n/csmapper/CNS/CNS11643-7%UCS@SIP.src (contents, props changed) head/share/i18n/csmapper/CNS/Makefile (contents, props changed) head/share/i18n/csmapper/CNS/UCS%CNS11643-1.src (contents, props changed) head/share/i18n/csmapper/CNS/UCS%CNS11643-2.src (contents, props changed) head/share/i18n/csmapper/CNS/UCS@BMP%CNS11643-3.src (contents, props changed) head/share/i18n/csmapper/CNS/UCS@BMP%CNS11643-4.src (contents, props changed) head/share/i18n/csmapper/CNS/UCS@BMP%CNS11643-5.src (contents, props changed) head/share/i18n/csmapper/CNS/UCS@BMP%CNS11643-6.src (contents, props changed) head/share/i18n/csmapper/CNS/UCS@BMP%CNS11643-7.src (contents, props changed) head/share/i18n/csmapper/CNS/UCS@SIP%CNS11643-3.src (contents, props changed) head/share/i18n/csmapper/CNS/UCS@SIP%CNS11643-4.src (contents, props changed) head/share/i18n/csmapper/CNS/UCS@SIP%CNS11643-5.src (contents, props changed) head/share/i18n/csmapper/CNS/UCS@SIP%CNS11643-6.src (contents, props changed) head/share/i18n/csmapper/CNS/UCS@SIP%CNS11643-7.src (contents, props changed) head/share/i18n/csmapper/CNS/charset.pivot.CNS.src (contents, props changed) head/share/i18n/csmapper/CNS/mapper.dir.CNS.src (contents, props changed) head/share/i18n/csmapper/CP/ head/share/i18n/csmapper/CP/CP.part (contents, props changed) head/share/i18n/csmapper/CP/CP037%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP038%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP10000%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP10006%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP10007%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP10029%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1006%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP10079%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP10081%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1026%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1046%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1124%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1125%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1129%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1131%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1133%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1161%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1162%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1163%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1250%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1251%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1252%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1253%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1254%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1255%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1256%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1257%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP1258%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP273%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP274%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP275%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP277%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP278%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP280%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP281%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP284%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP285%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP290%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP297%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP420%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP423%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP424%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP437%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP500%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP737%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP775%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP850%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP851%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP852%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP853%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP855%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP856%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP857%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP858%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP860%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP861%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP862%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP863%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP864%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP865%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP866%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP868%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP869%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP870%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP871%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP874%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP875%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP880%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP891%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP903%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP904%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP905%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP918%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP922%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP932UDA%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP932VDC@IBM%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP932VDC@NEC_IBM%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP936EXT%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP942EXT%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP949EXT%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/CP950%UCS.src (contents, props changed) head/share/i18n/csmapper/CP/Makefile (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP037.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP038.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP10000.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP10006.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP10007.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP10029.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1006.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP10079.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP10081.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1026.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1046.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1124.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1125.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1129.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1131.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1133.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1161.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1162.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1163.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1250.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1251.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1252.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1253.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1254.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1255.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1256.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1257.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP1258.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP273.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP274.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP275.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP277.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP278.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP280.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP281.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP284.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP285.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP290.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP297.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP420.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP423.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP424.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP437.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP500.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP737.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP775.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP850.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP851.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP852.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP853.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP855.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP856.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP857.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP858.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP860.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP861.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP862.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP863.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP864.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP865.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP866.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP868.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP869.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP870.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP871.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP874.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP875.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP880.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP891.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP903.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP904.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP905.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP918.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP922.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP932UDA.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP932VDC@IBM.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP932VDC@NEC_IBM.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP936EXT.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP942EXT.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP949EXT.src (contents, props changed) head/share/i18n/csmapper/CP/UCS%CP950.src (contents, props changed) head/share/i18n/csmapper/CP/charset.pivot.CP.src (contents, props changed) head/share/i18n/csmapper/CP/mapper.dir.CP.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/ head/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE%UCS.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE-A%UCS.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/EBCDIC-CA-FR%UCS.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO%UCS.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO-A%UCS.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/EBCDIC-ES%UCS.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/EBCDIC-ES-A%UCS.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/EBCDIC-ES-S%UCS.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE%UCS.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE-A%UCS.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/EBCDIC-FR%UCS.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/EBCDIC-IT%UCS.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/EBCDIC-PT%UCS.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/EBCDIC-UK%UCS.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/EBCDIC.part (contents, props changed) head/share/i18n/csmapper/EBCDIC/Makefile (contents, props changed) head/share/i18n/csmapper/EBCDIC/UCS%EBCDIC-AT-DE-A.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/UCS%EBCDIC-AT-DE.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/UCS%EBCDIC-CA-FR.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/UCS%EBCDIC-DK-NO-A.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/UCS%EBCDIC-DK-NO.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/UCS%EBCDIC-ES-A.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/UCS%EBCDIC-ES-S.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/UCS%EBCDIC-ES.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/UCS%EBCDIC-FI-SE-A.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/UCS%EBCDIC-FI-SE.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/UCS%EBCDIC-FR.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/UCS%EBCDIC-IT.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/UCS%EBCDIC-PT.src (contents, props changed) head/share/i18n/csmapper/EBCDIC/UCS%EBCDIC-UK.src (contents, props changed) head/share/i18n/csmapper/GB/ head/share/i18n/csmapper/GB/GB12345%UCS.src (contents, props changed) head/share/i18n/csmapper/GB/GB18030%UCS@BMP.src (contents, props changed) head/share/i18n/csmapper/GB/GB2312%UCS.src (contents, props changed) head/share/i18n/csmapper/GB/GB2312EXT%UCS.src (contents, props changed) head/share/i18n/csmapper/GB/GB2312GBK%UCS.src (contents, props changed) head/share/i18n/csmapper/GB/GB2312UDA1%UCS.src (contents, props changed) head/share/i18n/csmapper/GB/GB2312UDA2%UCS.src (contents, props changed) head/share/i18n/csmapper/GB/GBKEXT%UCS.src (contents, props changed) head/share/i18n/csmapper/GB/GBKUDA%UCS.src (contents, props changed) head/share/i18n/csmapper/GB/ISO-IR-165EXT%UCS.src (contents, props changed) head/share/i18n/csmapper/GB/Makefile (contents, props changed) head/share/i18n/csmapper/GB/UCS%GB12345.src (contents, props changed) head/share/i18n/csmapper/GB/UCS%GB2312.src (contents, props changed) head/share/i18n/csmapper/GB/UCS%GB2312EXT.src (contents, props changed) head/share/i18n/csmapper/GB/UCS%GB2312UDA1.src (contents, props changed) head/share/i18n/csmapper/GB/UCS%GB2312UDA2.src (contents, props changed) head/share/i18n/csmapper/GB/UCS%GBKEXT.src (contents, props changed) head/share/i18n/csmapper/GB/UCS%GBKUDA.src (contents, props changed) head/share/i18n/csmapper/GB/UCS%ISO-IR-165EXT.src (contents, props changed) head/share/i18n/csmapper/GB/UCS@BMP%GB18030.src (contents, props changed) head/share/i18n/csmapper/GB/charset.pivot.GB.src (contents, props changed) head/share/i18n/csmapper/GB/mapper.dir.GB.src (contents, props changed) head/share/i18n/csmapper/GEORGIAN/ head/share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY%UCS.src (contents, props changed) head/share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY@OldCapital%UCS.src (contents, props changed) head/share/i18n/csmapper/GEORGIAN/GEORGIAN-PS%UCS.src (contents, props changed) head/share/i18n/csmapper/GEORGIAN/GEORGIAN-PS@OldCapital%UCS.src (contents, props changed) head/share/i18n/csmapper/GEORGIAN/GEORGIAN.part (contents, props changed) head/share/i18n/csmapper/GEORGIAN/Makefile (contents, props changed) head/share/i18n/csmapper/GEORGIAN/UCS%GEORGIAN-ACADEMY.src (contents, props changed) head/share/i18n/csmapper/GEORGIAN/UCS%GEORGIAN-ACADEMY@OldCapital.src (contents, props changed) head/share/i18n/csmapper/GEORGIAN/UCS%GEORGIAN-PS.src (contents, props changed) head/share/i18n/csmapper/GEORGIAN/UCS%GEORGIAN-PS@OldCapital.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/ head/share/i18n/csmapper/ISO-8859/ISO-8859-10%UCS.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/ISO-8859-11%UCS.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/ISO-8859-13%UCS.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/ISO-8859-14%UCS.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/ISO-8859-15%UCS.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/ISO-8859-16%UCS.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/ISO-8859-2%UCS.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/ISO-8859-3%UCS.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/ISO-8859-4%UCS.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/ISO-8859-5%UCS.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/ISO-8859-6%UCS.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/ISO-8859-7%UCS.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/ISO-8859-8%UCS.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/ISO-8859-9%UCS.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/ISO-8859.part (contents, props changed) head/share/i18n/csmapper/ISO-8859/Makefile (contents, props changed) head/share/i18n/csmapper/ISO-8859/UCS%ISO-8859-10.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/UCS%ISO-8859-11.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/UCS%ISO-8859-13.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/UCS%ISO-8859-14.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/UCS%ISO-8859-15.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/UCS%ISO-8859-16.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/UCS%ISO-8859-2.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/UCS%ISO-8859-3.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/UCS%ISO-8859-4.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/UCS%ISO-8859-5.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/UCS%ISO-8859-6.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/UCS%ISO-8859-7.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/UCS%ISO-8859-8.src (contents, props changed) head/share/i18n/csmapper/ISO-8859/UCS%ISO-8859-9.src (contents, props changed) head/share/i18n/csmapper/ISO646/ head/share/i18n/csmapper/ISO646/ISO646-BASIC@1983%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-CA%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-CA2%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-CN%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-CU%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-DE%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-DK%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-ES%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-ES2%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-FI%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-FR%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-FR1%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-GB%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-HU%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-IRV@1983%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-IT%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-JP%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-JP-OCR-B%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-KR%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-NO%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-NO2%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-PT%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-PT2%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-SE%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-SE2%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-US%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646-YU%UCS.646 (contents, props changed) head/share/i18n/csmapper/ISO646/ISO646.part (contents, props changed) head/share/i18n/csmapper/ISO646/Makefile (contents, props changed) head/share/i18n/csmapper/JIS/ head/share/i18n/csmapper/JIS/JISX0201-KANA%UCS.src (contents, props changed) head/share/i18n/csmapper/JIS/JISX0208@1978%UCS.src (contents, props changed) head/share/i18n/csmapper/JIS/JISX0208@1990%UCS.src (contents, props changed) head/share/i18n/csmapper/JIS/JISX0208@MS%UCS.src (contents, props changed) head/share/i18n/csmapper/JIS/JISX0208UDC%UCS.src (contents, props changed) head/share/i18n/csmapper/JIS/JISX0208VDC@NEC%UCS.src (contents, props changed) head/share/i18n/csmapper/JIS/JISX0212%UCS.src (contents, props changed) head/share/i18n/csmapper/JIS/JISX0212@MS%UCS.src (contents, props changed) head/share/i18n/csmapper/JIS/JISX0212UDC%UCS.src (contents, props changed) head/share/i18n/csmapper/JIS/JISX0212VDC@IBM%UCS.src (contents, props changed) head/share/i18n/csmapper/JIS/JISX0213-1%UCS@BMP.src (contents, props changed) head/share/i18n/csmapper/JIS/JISX0213-1%UCS@SIP.src (contents, props changed) head/share/i18n/csmapper/JIS/JISX0213-2%UCS@BMP.src (contents, props changed) head/share/i18n/csmapper/JIS/JISX0213-2%UCS@SIP.src (contents, props changed) head/share/i18n/csmapper/JIS/Makefile (contents, props changed) head/share/i18n/csmapper/JIS/UCS%JISX0201-KANA.src (contents, props changed) head/share/i18n/csmapper/JIS/UCS%JISX0208@1978.src (contents, props changed) head/share/i18n/csmapper/JIS/UCS%JISX0208@1990.src (contents, props changed) head/share/i18n/csmapper/JIS/UCS%JISX0208@MS.src (contents, props changed) head/share/i18n/csmapper/JIS/UCS%JISX0208UDC.src (contents, props changed) head/share/i18n/csmapper/JIS/UCS%JISX0208VDC@NEC.src (contents, props changed) head/share/i18n/csmapper/JIS/UCS%JISX0212.src (contents, props changed) head/share/i18n/csmapper/JIS/UCS%JISX0212@MS.src (contents, props changed) head/share/i18n/csmapper/JIS/UCS%JISX0212UDC.src (contents, props changed) head/share/i18n/csmapper/JIS/UCS%JISX0212VDC@IBM.src (contents, props changed) head/share/i18n/csmapper/JIS/UCS@BMP%JISX0213-1.src (contents, props changed) head/share/i18n/csmapper/JIS/UCS@BMP%JISX0213-2.src (contents, props changed) head/share/i18n/csmapper/JIS/UCS@SIP%JISX0213-1.src (contents, props changed) head/share/i18n/csmapper/JIS/UCS@SIP%JISX0213-2.src (contents, props changed) head/share/i18n/csmapper/JIS/charset.pivot.JIS.src (contents, props changed) head/share/i18n/csmapper/JIS/mapper.dir.JIS.src (contents, props changed) head/share/i18n/csmapper/KAZAKH/ head/share/i18n/csmapper/KAZAKH/KZ1048%UCS.src (contents, props changed) head/share/i18n/csmapper/KAZAKH/Makefile (contents, props changed) head/share/i18n/csmapper/KAZAKH/PTCP154%UCS.src (contents, props changed) head/share/i18n/csmapper/KAZAKH/UCS%KZ1048.src (contents, props changed) head/share/i18n/csmapper/KAZAKH/UCS%PTCP154.src (contents, props changed) head/share/i18n/csmapper/KAZAKH/charset.pivot.KAZAKH.src (contents, props changed) head/share/i18n/csmapper/KAZAKH/mapper.dir.KAZAKH.src (contents, props changed) head/share/i18n/csmapper/KOI/ head/share/i18n/csmapper/KOI/GOST19768-74%UCS.src (contents, props changed) head/share/i18n/csmapper/KOI/ISO-5427%UCS.src (contents, props changed) head/share/i18n/csmapper/KOI/KOI7%UCS.src (contents, props changed) head/share/i18n/csmapper/KOI/KOI8%UCS.src (contents, props changed) head/share/i18n/csmapper/KOI/KOI8-C%UCS.src (contents, props changed) head/share/i18n/csmapper/KOI/KOI8-CyrillicOld%UCS.src (contents, props changed) head/share/i18n/csmapper/KOI/KOI8-E%UCS.src (contents, props changed) head/share/i18n/csmapper/KOI/KOI8-R%UCS.src (contents, props changed) head/share/i18n/csmapper/KOI/KOI8-RU%UCS.src (contents, props changed) head/share/i18n/csmapper/KOI/KOI8-T%UCS.src (contents, props changed) head/share/i18n/csmapper/KOI/KOI8-U%UCS.src (contents, props changed) head/share/i18n/csmapper/KOI/KOI8.part (contents, props changed) head/share/i18n/csmapper/KOI/Makefile (contents, props changed) head/share/i18n/csmapper/KOI/UCS%GOST19768-74.src (contents, props changed) head/share/i18n/csmapper/KOI/UCS%ISO-5427.src (contents, props changed) head/share/i18n/csmapper/KOI/UCS%KOI7.src (contents, props changed) head/share/i18n/csmapper/KOI/UCS%KOI8-C.src (contents, props changed) head/share/i18n/csmapper/KOI/UCS%KOI8-CyrillicOld.src (contents, props changed) head/share/i18n/csmapper/KOI/UCS%KOI8-E.src (contents, props changed) head/share/i18n/csmapper/KOI/UCS%KOI8-R.src (contents, props changed) head/share/i18n/csmapper/KOI/UCS%KOI8-RU.src (contents, props changed) head/share/i18n/csmapper/KOI/UCS%KOI8-T.src (contents, props changed) head/share/i18n/csmapper/KOI/UCS%KOI8-U.src (contents, props changed) head/share/i18n/csmapper/KOI/UCS%KOI8.src (contents, props changed) head/share/i18n/csmapper/KOI/charset.pivot.KOI.src (contents, props changed) head/share/i18n/csmapper/KOI/mapper.dir.KOI.src (contents, props changed) head/share/i18n/csmapper/KS/ head/share/i18n/csmapper/KS/JOHAB%UCS.src (contents, props changed) head/share/i18n/csmapper/KS/KSC5601HANGUL%UCS.src (contents, props changed) head/share/i18n/csmapper/KS/KSC5601HANJA%UCS.src (contents, props changed) head/share/i18n/csmapper/KS/Makefile (contents, props changed) head/share/i18n/csmapper/KS/UCS%JOHAB.src (contents, props changed) head/share/i18n/csmapper/KS/UCS%KSC5601HANGUL.src (contents, props changed) head/share/i18n/csmapper/KS/UCS%KSC5601HANJA.src (contents, props changed) head/share/i18n/csmapper/KS/charset.pivot.KS.src (contents, props changed) head/share/i18n/csmapper/KS/mapper.dir.KS.src (contents, props changed) head/share/i18n/csmapper/MISC/ head/share/i18n/csmapper/MISC/ATARIST%UCS.src (contents, props changed) head/share/i18n/csmapper/MISC/DECMCS%UCS.src (contents, props changed) head/share/i18n/csmapper/MISC/HP-ROMAN8%UCS.src (contents, props changed) head/share/i18n/csmapper/MISC/MULELAO-1%UCS.src (contents, props changed) head/share/i18n/csmapper/MISC/Makefile (contents, props changed) head/share/i18n/csmapper/MISC/NEXTSTEP%UCS.src (contents, props changed) head/share/i18n/csmapper/MISC/RISCOS-LATIN1%UCS.src (contents, props changed) head/share/i18n/csmapper/MISC/TDS565%UCS.src (contents, props changed) head/share/i18n/csmapper/MISC/UCS%ATARIST.src (contents, props changed) head/share/i18n/csmapper/MISC/UCS%DECMCS.src (contents, props changed) head/share/i18n/csmapper/MISC/UCS%HP-ROMAN8.src (contents, props changed) head/share/i18n/csmapper/MISC/UCS%MULELAO-1.src (contents, props changed) head/share/i18n/csmapper/MISC/UCS%NEXTSTEP.src (contents, props changed) head/share/i18n/csmapper/MISC/UCS%RISCOS-LATIN1.src (contents, props changed) head/share/i18n/csmapper/MISC/UCS%TDS565.src (contents, props changed) head/share/i18n/csmapper/MISC/charset.pivot.MISC.src (contents, props changed) head/share/i18n/csmapper/MISC/mapper.dir.MISC.src (contents, props changed) head/share/i18n/csmapper/Makefile (contents, props changed) head/share/i18n/csmapper/Makefile.inc (contents, props changed) head/share/i18n/csmapper/Makefile.part (contents, props changed) head/share/i18n/csmapper/TCVN/ head/share/i18n/csmapper/TCVN/Makefile (contents, props changed) head/share/i18n/csmapper/TCVN/TCVN5712-1%UCS.src (contents, props changed) head/share/i18n/csmapper/TCVN/UCS%TCVN5712-1.src (contents, props changed) head/share/i18n/csmapper/TCVN/UCS%VISCII.src (contents, props changed) head/share/i18n/csmapper/TCVN/VISCII%UCS.src (contents, props changed) head/share/i18n/csmapper/TCVN/charset.pivot.TCVN.src (contents, props changed) head/share/i18n/csmapper/TCVN/mapper.dir.TCVN.src (contents, props changed) head/share/i18n/csmapper/charset.pivot.src (contents, props changed) head/share/i18n/csmapper/mapper.dir.src (contents, props changed) head/share/i18n/esdb/ head/share/i18n/esdb/APPLE/ head/share/i18n/esdb/APPLE/MAC.alias (contents, props changed) head/share/i18n/esdb/APPLE/MAC.part (contents, props changed) head/share/i18n/esdb/APPLE/MAC.src (contents, props changed) head/share/i18n/esdb/APPLE/Makefile (contents, props changed) head/share/i18n/esdb/AST/ head/share/i18n/esdb/AST/ARMSCII-7.src (contents, props changed) head/share/i18n/esdb/AST/ARMSCII.alias (contents, props changed) head/share/i18n/esdb/AST/ARMSCII.part (contents, props changed) head/share/i18n/esdb/AST/ARMSCII.src (contents, props changed) head/share/i18n/esdb/AST/Makefile (contents, props changed) head/share/i18n/esdb/BIG5/ head/share/i18n/esdb/BIG5/Big5.alias (contents, props changed) head/share/i18n/esdb/BIG5/Big5.part (contents, props changed) head/share/i18n/esdb/BIG5/Big5.src (contents, props changed) head/share/i18n/esdb/BIG5/Big5.variable (contents, props changed) head/share/i18n/esdb/BIG5/Makefile (contents, props changed) head/share/i18n/esdb/CP/ head/share/i18n/esdb/CP/CP.alias (contents, props changed) head/share/i18n/esdb/CP/CP.part (contents, props changed) head/share/i18n/esdb/CP/CP.src (contents, props changed) head/share/i18n/esdb/CP/CP50220.src (contents, props changed) head/share/i18n/esdb/CP/CP50221.src (contents, props changed) head/share/i18n/esdb/CP/CP50222.src (contents, props changed) head/share/i18n/esdb/CP/CP51932.src (contents, props changed) head/share/i18n/esdb/CP/CP932.src (contents, props changed) head/share/i18n/esdb/CP/CP936.src (contents, props changed) head/share/i18n/esdb/CP/CP942.src (contents, props changed) head/share/i18n/esdb/CP/CP942C.src (contents, props changed) head/share/i18n/esdb/CP/CP943.src (contents, props changed) head/share/i18n/esdb/CP/CP943C.src (contents, props changed) head/share/i18n/esdb/CP/CP949.src (contents, props changed) head/share/i18n/esdb/CP/CP950.src (contents, props changed) head/share/i18n/esdb/CP/Makefile (contents, props changed) head/share/i18n/esdb/DEC/ head/share/i18n/esdb/DEC/DEC.alias (contents, props changed) head/share/i18n/esdb/DEC/DEC.part (contents, props changed) head/share/i18n/esdb/DEC/DEC.src (contents, props changed) head/share/i18n/esdb/DEC/DECHanyu.src (contents, props changed) head/share/i18n/esdb/DEC/Makefile (contents, props changed) head/share/i18n/esdb/EBCDIC/ head/share/i18n/esdb/EBCDIC/EBCDIC.alias (contents, props changed) head/share/i18n/esdb/EBCDIC/EBCDIC.part (contents, props changed) head/share/i18n/esdb/EBCDIC/EBCDIC.src (contents, props changed) head/share/i18n/esdb/EBCDIC/Makefile (contents, props changed) head/share/i18n/esdb/EUC/ head/share/i18n/esdb/EUC/EUC-CN.src (contents, props changed) head/share/i18n/esdb/EUC/EUC-JIS-2004.src (contents, props changed) head/share/i18n/esdb/EUC/EUC-JP-MS.src (contents, props changed) head/share/i18n/esdb/EUC/EUC-JP.src (contents, props changed) head/share/i18n/esdb/EUC/EUC-KR.src (contents, props changed) head/share/i18n/esdb/EUC/EUC-TW.src (contents, props changed) head/share/i18n/esdb/EUC/EUC.alias (contents, props changed) head/share/i18n/esdb/EUC/EUC.part (contents, props changed) head/share/i18n/esdb/EUC/Makefile (contents, props changed) head/share/i18n/esdb/GB/ head/share/i18n/esdb/GB/GB.alias (contents, props changed) head/share/i18n/esdb/GB/GB.part (contents, props changed) head/share/i18n/esdb/GB/GB12345.src (contents, props changed) head/share/i18n/esdb/GB/GB18030.src (contents, props changed) head/share/i18n/esdb/GB/GBK.src (contents, props changed) head/share/i18n/esdb/GB/Makefile (contents, props changed) head/share/i18n/esdb/GEORGIAN/ head/share/i18n/esdb/GEORGIAN/GEORGIAN.alias (contents, props changed) head/share/i18n/esdb/GEORGIAN/GEORGIAN.part (contents, props changed) head/share/i18n/esdb/GEORGIAN/GEORGIAN.src (contents, props changed) head/share/i18n/esdb/GEORGIAN/Makefile (contents, props changed) head/share/i18n/esdb/ISO-2022/ head/share/i18n/esdb/ISO-2022/ISO-2022-CN-EXT.src (contents, props changed) head/share/i18n/esdb/ISO-2022/ISO-2022-CN.src (contents, props changed) head/share/i18n/esdb/ISO-2022/ISO-2022-JP-1.src (contents, props changed) head/share/i18n/esdb/ISO-2022/ISO-2022-JP-2.src (contents, props changed) head/share/i18n/esdb/ISO-2022/ISO-2022-JP-2004.src (contents, props changed) head/share/i18n/esdb/ISO-2022/ISO-2022-JP.src (contents, props changed) head/share/i18n/esdb/ISO-2022/ISO-2022-KR.src (contents, props changed) head/share/i18n/esdb/ISO-2022/ISO-2022.alias (contents, props changed) head/share/i18n/esdb/ISO-2022/ISO-2022.part (contents, props changed) head/share/i18n/esdb/ISO-2022/Makefile (contents, props changed) head/share/i18n/esdb/ISO-8859/ head/share/i18n/esdb/ISO-8859/ISO-8859.alias (contents, props changed) head/share/i18n/esdb/ISO-8859/ISO-8859.part (contents, props changed) head/share/i18n/esdb/ISO-8859/ISO-8859.src (contents, props changed) head/share/i18n/esdb/ISO-8859/Makefile (contents, props changed) head/share/i18n/esdb/ISO646/ head/share/i18n/esdb/ISO646/ISO646.alias (contents, props changed) head/share/i18n/esdb/ISO646/ISO646.part (contents, props changed) head/share/i18n/esdb/ISO646/ISO646.src (contents, props changed) head/share/i18n/esdb/ISO646/Makefile (contents, props changed) head/share/i18n/esdb/KAZAKH/ head/share/i18n/esdb/KAZAKH/KAZAKH.alias (contents, props changed) head/share/i18n/esdb/KAZAKH/KAZAKH.part (contents, props changed) head/share/i18n/esdb/KAZAKH/KZ1048.src (contents, props changed) head/share/i18n/esdb/KAZAKH/Makefile (contents, props changed) head/share/i18n/esdb/KAZAKH/PTCP154.src (contents, props changed) head/share/i18n/esdb/KOI/ head/share/i18n/esdb/KOI/KOI.alias (contents, props changed) head/share/i18n/esdb/KOI/KOI.part (contents, props changed) head/share/i18n/esdb/KOI/KOI.src (contents, props changed) head/share/i18n/esdb/KOI/KOI7-switched.src (contents, props changed) head/share/i18n/esdb/KOI/KOI7.src (contents, props changed) head/share/i18n/esdb/KOI/Makefile (contents, props changed) head/share/i18n/esdb/MISC/ head/share/i18n/esdb/MISC/ATARIST.src (contents, props changed) head/share/i18n/esdb/MISC/C99.src (contents, props changed) head/share/i18n/esdb/MISC/CTEXT.src (contents, props changed) head/share/i18n/esdb/MISC/HP-ROMAN8.src (contents, props changed) head/share/i18n/esdb/MISC/HZ.src (contents, props changed) head/share/i18n/esdb/MISC/HZ8.src (contents, props changed) head/share/i18n/esdb/MISC/ISO-IR-165.src (contents, props changed) head/share/i18n/esdb/MISC/JAVA.src (contents, props changed) head/share/i18n/esdb/MISC/JISX0201-KANA.src (contents, props changed) head/share/i18n/esdb/MISC/JISX0208@1990.src (contents, props changed) head/share/i18n/esdb/MISC/JOHAB.src (contents, props changed) head/share/i18n/esdb/MISC/MISC.alias (contents, props changed) head/share/i18n/esdb/MISC/MISC.part (contents, props changed) head/share/i18n/esdb/MISC/MULELAO-1.src (contents, props changed) head/share/i18n/esdb/MISC/Makefile (contents, props changed) head/share/i18n/esdb/MISC/NEXTSTEP.src (contents, props changed) head/share/i18n/esdb/MISC/RISCOS-LATIN1.src (contents, props changed) head/share/i18n/esdb/MISC/Shift_JIS-2004.src (contents, props changed) head/share/i18n/esdb/MISC/Shift_JIS.src (contents, props changed) head/share/i18n/esdb/MISC/TDS565.src (contents, props changed) head/share/i18n/esdb/MISC/ZW.src (contents, props changed) head/share/i18n/esdb/Makefile (contents, props changed) head/share/i18n/esdb/Makefile.inc (contents, props changed) head/share/i18n/esdb/Makefile.part (contents, props changed) head/share/i18n/esdb/TCVN/ head/share/i18n/esdb/TCVN/Makefile (contents, props changed) head/share/i18n/esdb/TCVN/TCVN.alias (contents, props changed) head/share/i18n/esdb/TCVN/TCVN.part (contents, props changed) head/share/i18n/esdb/TCVN/TCVN5712-1.src (contents, props changed) head/share/i18n/esdb/TCVN/VIQR.src (contents, props changed) head/share/i18n/esdb/TCVN/VISCII.src (contents, props changed) head/share/i18n/esdb/UTF/ head/share/i18n/esdb/UTF/Makefile (contents, props changed) head/share/i18n/esdb/UTF/UTF.alias (contents, props changed) head/share/i18n/esdb/UTF/UTF.part (contents, props changed) head/share/i18n/esdb/UTF/UTF.src (contents, props changed) head/tools/test/iconv/ head/tools/test/iconv/Makefile (contents, props changed) head/tools/test/iconv/gnu/ head/tools/test/iconv/gnu/Makefile (contents, props changed) head/tools/test/iconv/gnu/gnu.c (contents, props changed) head/tools/test/iconv/posix/ head/tools/test/iconv/posix/Makefile (contents, props changed) head/tools/test/iconv/posix/posix.c (contents, props changed) head/tools/test/iconv/ref/ head/tools/test/iconv/ref/ARMSCII-8 (contents, props changed) head/tools/test/iconv/ref/ARMSCII-8-rev (contents, props changed) head/tools/test/iconv/ref/ASCII (contents, props changed) head/tools/test/iconv/ref/ASCII-rev (contents, props changed) head/tools/test/iconv/ref/ATARIST (contents, props changed) head/tools/test/iconv/ref/ATARIST-rev (contents, props changed) head/tools/test/iconv/ref/BIG5 (contents, props changed) head/tools/test/iconv/ref/BIG5-2003 (contents, props changed) head/tools/test/iconv/ref/BIG5-2003-rev (contents, props changed) head/tools/test/iconv/ref/BIG5-HKSCS (contents, props changed) head/tools/test/iconv/ref/BIG5-HKSCS-rev (contents, props changed) head/tools/test/iconv/ref/BIG5-rev (contents, props changed) head/tools/test/iconv/ref/BIG5HKSCS (contents, props changed) head/tools/test/iconv/ref/BIG5HKSCS-rev (contents, props changed) head/tools/test/iconv/ref/C99 (contents, props changed) head/tools/test/iconv/ref/C99-rev (contents, props changed) head/tools/test/iconv/ref/CP1046 (contents, props changed) head/tools/test/iconv/ref/CP1046-rev (contents, props changed) head/tools/test/iconv/ref/CP1124 (contents, props changed) head/tools/test/iconv/ref/CP1124-rev (contents, props changed) head/tools/test/iconv/ref/CP1125 (contents, props changed) head/tools/test/iconv/ref/CP1125-rev (contents, props changed) head/tools/test/iconv/ref/CP1129 (contents, props changed) head/tools/test/iconv/ref/CP1129-rev (contents, props changed) head/tools/test/iconv/ref/CP1131 (contents, props changed) head/tools/test/iconv/ref/CP1131-rev (contents, props changed) head/tools/test/iconv/ref/CP1133 (contents, props changed) head/tools/test/iconv/ref/CP1133-rev (contents, props changed) head/tools/test/iconv/ref/CP1161 (contents, props changed) head/tools/test/iconv/ref/CP1161-rev (contents, props changed) head/tools/test/iconv/ref/CP1162 (contents, props changed) head/tools/test/iconv/ref/CP1162-rev (contents, props changed) head/tools/test/iconv/ref/CP1163 (contents, props changed) head/tools/test/iconv/ref/CP1163-rev (contents, props changed) head/tools/test/iconv/ref/CP1250 (contents, props changed) head/tools/test/iconv/ref/CP1250-rev (contents, props changed) head/tools/test/iconv/ref/CP1251 (contents, props changed) head/tools/test/iconv/ref/CP1251-rev (contents, props changed) head/tools/test/iconv/ref/CP1252 (contents, props changed) head/tools/test/iconv/ref/CP1252-rev (contents, props changed) head/tools/test/iconv/ref/CP1253 (contents, props changed) head/tools/test/iconv/ref/CP1253-rev (contents, props changed) head/tools/test/iconv/ref/CP1254 (contents, props changed) head/tools/test/iconv/ref/CP1254-rev (contents, props changed) head/tools/test/iconv/ref/CP1255 (contents, props changed) head/tools/test/iconv/ref/CP1255-rev (contents, props changed) head/tools/test/iconv/ref/CP1256 (contents, props changed) head/tools/test/iconv/ref/CP1256-rev (contents, props changed) head/tools/test/iconv/ref/CP1257 (contents, props changed) head/tools/test/iconv/ref/CP1257-rev (contents, props changed) head/tools/test/iconv/ref/CP1258 (contents, props changed) head/tools/test/iconv/ref/CP1258-rev (contents, props changed) head/tools/test/iconv/ref/CP437 (contents, props changed) head/tools/test/iconv/ref/CP437-rev (contents, props changed) head/tools/test/iconv/ref/CP737 (contents, props changed) head/tools/test/iconv/ref/CP737-rev (contents, props changed) head/tools/test/iconv/ref/CP775 (contents, props changed) head/tools/test/iconv/ref/CP775-rev (contents, props changed) head/tools/test/iconv/ref/CP850 (contents, props changed) head/tools/test/iconv/ref/CP850-rev (contents, props changed) head/tools/test/iconv/ref/CP852 (contents, props changed) head/tools/test/iconv/ref/CP852-rev (contents, props changed) head/tools/test/iconv/ref/CP853 (contents, props changed) head/tools/test/iconv/ref/CP853-rev (contents, props changed) head/tools/test/iconv/ref/CP855 (contents, props changed) head/tools/test/iconv/ref/CP855-rev (contents, props changed) head/tools/test/iconv/ref/CP856 (contents, props changed) head/tools/test/iconv/ref/CP856-rev (contents, props changed) head/tools/test/iconv/ref/CP857 (contents, props changed) head/tools/test/iconv/ref/CP857-rev (contents, props changed) head/tools/test/iconv/ref/CP858 (contents, props changed) head/tools/test/iconv/ref/CP858-rev (contents, props changed) head/tools/test/iconv/ref/CP860 (contents, props changed) head/tools/test/iconv/ref/CP860-rev (contents, props changed) head/tools/test/iconv/ref/CP861 (contents, props changed) head/tools/test/iconv/ref/CP861-rev (contents, props changed) head/tools/test/iconv/ref/CP862 (contents, props changed) head/tools/test/iconv/ref/CP862-rev (contents, props changed) head/tools/test/iconv/ref/CP863 (contents, props changed) head/tools/test/iconv/ref/CP863-rev (contents, props changed) head/tools/test/iconv/ref/CP864 (contents, props changed) head/tools/test/iconv/ref/CP864-rev (contents, props changed) head/tools/test/iconv/ref/CP865 (contents, props changed) head/tools/test/iconv/ref/CP865-rev (contents, props changed) head/tools/test/iconv/ref/CP866 (contents, props changed) head/tools/test/iconv/ref/CP866-rev (contents, props changed) head/tools/test/iconv/ref/CP869 (contents, props changed) head/tools/test/iconv/ref/CP869-rev (contents, props changed) head/tools/test/iconv/ref/CP874 (contents, props changed) head/tools/test/iconv/ref/CP874-rev (contents, props changed) head/tools/test/iconv/ref/CP922 (contents, props changed) head/tools/test/iconv/ref/CP922-rev (contents, props changed) head/tools/test/iconv/ref/CP932 (contents, props changed) head/tools/test/iconv/ref/CP932-rev (contents, props changed) head/tools/test/iconv/ref/CP936 (contents, props changed) head/tools/test/iconv/ref/CP936-rev (contents, props changed) head/tools/test/iconv/ref/CP943 (contents, props changed) head/tools/test/iconv/ref/CP943-rev (contents, props changed) head/tools/test/iconv/ref/CP949 (contents, props changed) head/tools/test/iconv/ref/CP949-rev (contents, props changed) head/tools/test/iconv/ref/CP950 (contents, props changed) head/tools/test/iconv/ref/CP950-rev (contents, props changed) head/tools/test/iconv/ref/DEC-HANYU (contents, props changed) head/tools/test/iconv/ref/DEC-HANYU-rev (contents, props changed) head/tools/test/iconv/ref/EUC-CN (contents, props changed) head/tools/test/iconv/ref/EUC-CN-rev (contents, props changed) head/tools/test/iconv/ref/EUC-JIS-2004 (contents, props changed) head/tools/test/iconv/ref/EUC-JIS-2004-rev (contents, props changed) head/tools/test/iconv/ref/EUC-JP (contents, props changed) head/tools/test/iconv/ref/EUC-JP-rev (contents, props changed) head/tools/test/iconv/ref/EUC-KR (contents, props changed) head/tools/test/iconv/ref/EUC-KR-rev (contents, props changed) head/tools/test/iconv/ref/EUC-TW (contents, props changed) head/tools/test/iconv/ref/EUC-TW-rev (contents, props changed) head/tools/test/iconv/ref/GB18030 (contents, props changed) head/tools/test/iconv/ref/GB18030-rev (contents, props changed) head/tools/test/iconv/ref/GB2312 (contents, props changed) head/tools/test/iconv/ref/GB2312-rev (contents, props changed) head/tools/test/iconv/ref/GBK (contents, props changed) head/tools/test/iconv/ref/GBK-rev (contents, props changed) head/tools/test/iconv/ref/GEORGIAN-ACADEMY (contents, props changed) head/tools/test/iconv/ref/GEORGIAN-ACADEMY-rev (contents, props changed) head/tools/test/iconv/ref/GEORGIAN-PS (contents, props changed) head/tools/test/iconv/ref/GEORGIAN-PS-rev (contents, props changed) head/tools/test/iconv/ref/HP-ROMAN8 (contents, props changed) head/tools/test/iconv/ref/HP-ROMAN8-rev (contents, props changed) head/tools/test/iconv/ref/HZ (contents, props changed) head/tools/test/iconv/ref/HZ-rev (contents, props changed) head/tools/test/iconv/ref/ISO-2022-CN (contents, props changed) head/tools/test/iconv/ref/ISO-2022-CN-EXT (contents, props changed) head/tools/test/iconv/ref/ISO-2022-CN-EXT-rev (contents, props changed) head/tools/test/iconv/ref/ISO-2022-CN-rev (contents, props changed) head/tools/test/iconv/ref/ISO-2022-JP (contents, props changed) head/tools/test/iconv/ref/ISO-2022-JP-1 (contents, props changed) head/tools/test/iconv/ref/ISO-2022-JP-1-rev (contents, props changed) head/tools/test/iconv/ref/ISO-2022-JP-2 (contents, props changed) head/tools/test/iconv/ref/ISO-2022-JP-2-rev (contents, props changed) head/tools/test/iconv/ref/ISO-2022-JP-2004 (contents, props changed) head/tools/test/iconv/ref/ISO-2022-JP-2004-rev (contents, props changed) head/tools/test/iconv/ref/ISO-2022-JP-rev (contents, props changed) head/tools/test/iconv/ref/ISO-2022-KR (contents, props changed) head/tools/test/iconv/ref/ISO-2022-KR-rev (contents, props changed) head/tools/test/iconv/ref/ISO-IR-14 (contents, props changed) head/tools/test/iconv/ref/ISO-IR-14-rev (contents, props changed) head/tools/test/iconv/ref/ISO-IR-165 (contents, props changed) head/tools/test/iconv/ref/ISO-IR-165-rev (contents, props changed) head/tools/test/iconv/ref/ISO-IR-57 (contents, props changed) head/tools/test/iconv/ref/ISO-IR-57-rev (contents, props changed) head/tools/test/iconv/ref/ISO8859-1 (contents, props changed) head/tools/test/iconv/ref/ISO8859-1-rev (contents, props changed) head/tools/test/iconv/ref/ISO8859-10 (contents, props changed) head/tools/test/iconv/ref/ISO8859-10-rev (contents, props changed) head/tools/test/iconv/ref/ISO8859-11 (contents, props changed) head/tools/test/iconv/ref/ISO8859-11-rev (contents, props changed) head/tools/test/iconv/ref/ISO8859-13 (contents, props changed) head/tools/test/iconv/ref/ISO8859-13-rev (contents, props changed) head/tools/test/iconv/ref/ISO8859-14 (contents, props changed) head/tools/test/iconv/ref/ISO8859-14-rev (contents, props changed) head/tools/test/iconv/ref/ISO8859-15 (contents, props changed) head/tools/test/iconv/ref/ISO8859-15-rev (contents, props changed) head/tools/test/iconv/ref/ISO8859-16 (contents, props changed) head/tools/test/iconv/ref/ISO8859-16-rev (contents, props changed) head/tools/test/iconv/ref/ISO8859-2 (contents, props changed) head/tools/test/iconv/ref/ISO8859-2-rev (contents, props changed) head/tools/test/iconv/ref/ISO8859-3 (contents, props changed) head/tools/test/iconv/ref/ISO8859-3-rev (contents, props changed) head/tools/test/iconv/ref/ISO8859-4 (contents, props changed) head/tools/test/iconv/ref/ISO8859-4-rev (contents, props changed) head/tools/test/iconv/ref/ISO8859-5 (contents, props changed) head/tools/test/iconv/ref/ISO8859-5-rev (contents, props changed) head/tools/test/iconv/ref/ISO8859-6 (contents, props changed) head/tools/test/iconv/ref/ISO8859-6-rev (contents, props changed) head/tools/test/iconv/ref/ISO8859-7 (contents, props changed) head/tools/test/iconv/ref/ISO8859-7-rev (contents, props changed) head/tools/test/iconv/ref/ISO8859-8 (contents, props changed) head/tools/test/iconv/ref/ISO8859-8-rev (contents, props changed) head/tools/test/iconv/ref/ISO8859-9 (contents, props changed) head/tools/test/iconv/ref/ISO8859-9-rev (contents, props changed) head/tools/test/iconv/ref/JAVA (contents, props changed) head/tools/test/iconv/ref/JAVA-rev (contents, props changed) head/tools/test/iconv/ref/JIS_X0201 (contents, props changed) head/tools/test/iconv/ref/JIS_X0201-rev (contents, props changed) head/tools/test/iconv/ref/JIS_X0208-1990 (contents, props changed) head/tools/test/iconv/ref/JIS_X0208-1990-rev (contents, props changed) head/tools/test/iconv/ref/JOHAB (contents, props changed) head/tools/test/iconv/ref/JOHAB-rev (contents, props changed) head/tools/test/iconv/ref/KOI8-R (contents, props changed) head/tools/test/iconv/ref/KOI8-R-rev (contents, props changed) head/tools/test/iconv/ref/KOI8-RU (contents, props changed) head/tools/test/iconv/ref/KOI8-RU-rev (contents, props changed) head/tools/test/iconv/ref/KOI8-T (contents, props changed) head/tools/test/iconv/ref/KOI8-T-rev (contents, props changed) head/tools/test/iconv/ref/KOI8-U (contents, props changed) head/tools/test/iconv/ref/KOI8-U-rev (contents, props changed) head/tools/test/iconv/ref/KZ-1048 (contents, props changed) head/tools/test/iconv/ref/KZ-1048-rev (contents, props changed) head/tools/test/iconv/ref/MACARABIC (contents, props changed) head/tools/test/iconv/ref/MACARABIC-rev (contents, props changed) head/tools/test/iconv/ref/MACCENTRALEUROPE (contents, props changed) head/tools/test/iconv/ref/MACCENTRALEUROPE-rev (contents, props changed) head/tools/test/iconv/ref/MACCROATIAN (contents, props changed) head/tools/test/iconv/ref/MACCROATIAN-rev (contents, props changed) head/tools/test/iconv/ref/MACCYRILLIC (contents, props changed) head/tools/test/iconv/ref/MACCYRILLIC-rev (contents, props changed) head/tools/test/iconv/ref/MACGREEK (contents, props changed) head/tools/test/iconv/ref/MACGREEK-rev (contents, props changed) head/tools/test/iconv/ref/MACHEBREW (contents, props changed) head/tools/test/iconv/ref/MACHEBREW-rev (contents, props changed) head/tools/test/iconv/ref/MACICELAND (contents, props changed) head/tools/test/iconv/ref/MACICELAND-rev (contents, props changed) head/tools/test/iconv/ref/MACROMAN (contents, props changed) head/tools/test/iconv/ref/MACROMAN-rev (contents, props changed) head/tools/test/iconv/ref/MACROMANIA (contents, props changed) head/tools/test/iconv/ref/MACROMANIA-rev (contents, props changed) head/tools/test/iconv/ref/MACTHAI (contents, props changed) head/tools/test/iconv/ref/MACTHAI-rev (contents, props changed) head/tools/test/iconv/ref/MACTURKISH (contents, props changed) head/tools/test/iconv/ref/MACTURKISH-rev (contents, props changed) head/tools/test/iconv/ref/MACUKRAINE (contents, props changed) head/tools/test/iconv/ref/MACUKRAINE-rev (contents, props changed) head/tools/test/iconv/ref/MULELAO-1 (contents, props changed) head/tools/test/iconv/ref/MULELAO-1-rev (contents, props changed) head/tools/test/iconv/ref/NEXTSTEP (contents, props changed) head/tools/test/iconv/ref/NEXTSTEP-rev (contents, props changed) head/tools/test/iconv/ref/PT154 (contents, props changed) head/tools/test/iconv/ref/PT154-rev (contents, props changed) head/tools/test/iconv/ref/RISCOS-LATIN1 (contents, props changed) head/tools/test/iconv/ref/RISCOS-LATIN1-rev (contents, props changed) head/tools/test/iconv/ref/SHIFT_JIS (contents, props changed) head/tools/test/iconv/ref/SHIFT_JIS-rev (contents, props changed) head/tools/test/iconv/ref/TCVN5712-1 (contents, props changed) head/tools/test/iconv/ref/TCVN5712-1-rev (contents, props changed) head/tools/test/iconv/ref/TDS565 (contents, props changed) head/tools/test/iconv/ref/TDS565-rev (contents, props changed) head/tools/test/iconv/ref/UTF-16BE (contents, props changed) head/tools/test/iconv/ref/UTF-16BE-rev (contents, props changed) head/tools/test/iconv/ref/UTF-16LE (contents, props changed) head/tools/test/iconv/ref/UTF-16LE-rev (contents, props changed) head/tools/test/iconv/ref/UTF-32BE (contents, props changed) head/tools/test/iconv/ref/UTF-32BE-rev (contents, props changed) head/tools/test/iconv/ref/UTF-32LE (contents, props changed) head/tools/test/iconv/ref/UTF-32LE-rev (contents, props changed) head/tools/test/iconv/ref/UTF-7 (contents, props changed) head/tools/test/iconv/ref/UTF-7-rev (contents, props changed) head/tools/test/iconv/ref/UTF-8 (contents, props changed) head/tools/test/iconv/ref/UTF-8-rev (contents, props changed) head/tools/test/iconv/ref/VISCII (contents, props changed) head/tools/test/iconv/ref/VISCII-rev (contents, props changed) head/tools/test/iconv/refgen/ head/tools/test/iconv/refgen/Makefile (contents, props changed) head/tools/test/iconv/tablegen/ head/tools/test/iconv/tablegen/Makefile (contents, props changed) head/tools/test/iconv/tablegen/cmp.sh (contents, props changed) head/tools/test/iconv/tablegen/tablegen.c (contents, props changed) head/usr.bin/iconv/ head/usr.bin/iconv/Makefile (contents, props changed) head/usr.bin/iconv/iconv.1 (contents, props changed) head/usr.bin/iconv/iconv.c (contents, props changed) head/usr.bin/mkcsmapper/ head/usr.bin/mkcsmapper/Makefile (contents, props changed) head/usr.bin/mkcsmapper/Makefile.inc (contents, props changed) head/usr.bin/mkcsmapper/ldef.h (contents, props changed) head/usr.bin/mkcsmapper/lex.l (contents, props changed) head/usr.bin/mkcsmapper/mkcsmapper.1 (contents, props changed) head/usr.bin/mkcsmapper/yacc.y (contents, props changed) head/usr.bin/mkcsmapper_static/ head/usr.bin/mkcsmapper_static/Makefile (contents, props changed) head/usr.bin/mkesdb/ head/usr.bin/mkesdb/Makefile (contents, props changed) head/usr.bin/mkesdb/Makefile.inc (contents, props changed) head/usr.bin/mkesdb/ldef.h (contents, props changed) head/usr.bin/mkesdb/lex.l (contents, props changed) head/usr.bin/mkesdb/mkesdb.1 (contents, props changed) head/usr.bin/mkesdb/yacc.y (contents, props changed) head/usr.bin/mkesdb_static/ head/usr.bin/mkesdb_static/Makefile (contents, props changed) Modified: head/Makefile.inc1 head/etc/mtree/BSD.usr.dist head/include/Makefile head/include/paths.h head/lib/Makefile head/lib/libc/Makefile head/share/Makefile head/share/mk/bsd.own.mk head/usr.bin/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Thu Feb 24 23:51:59 2011 (r219018) +++ head/Makefile.inc1 Fri Feb 25 00:04:39 2011 (r219019) @@ -452,7 +452,7 @@ build32: @echo "--------------------------------------------------------------" @echo ">>> stage 5.1: building 32 bit shim libraries" @echo "--------------------------------------------------------------" - mkdir -p ${LIB32TMP}/usr/lib32 + mkdir -p ${LIB32TMP}/usr/include mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ -p ${LIB32TMP}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ @@ -496,13 +496,6 @@ build32: .endfor distribute32 install32: -.if make(distribute32) - mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32 # XXX add to mtree - mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32/dtrace # XXX add to mtree -.else - mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree - mkdir -p ${DESTDIR}/usr/lib32/dtrace # XXX add to mtree -.endif cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .if ${MK_CDDL} != "no" cd ${.CURDIR}/cddl/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} @@ -1048,7 +1041,9 @@ build-tools: ${_aicasm} \ usr.bin/awk \ lib/libmagic \ - usr.sbin/sysinstall + usr.sbin/sysinstall \ + usr.bin/mkesdb_static \ + usr.bin/mkcsmapper_static ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ Modified: head/etc/mtree/BSD.usr.dist ============================================================================== --- head/etc/mtree/BSD.usr.dist Thu Feb 24 23:51:59 2011 (r219018) +++ head/etc/mtree/BSD.usr.dist Fri Feb 25 00:04:39 2011 (r219019) @@ -22,6 +22,14 @@ .. engines .. + i18n + .. + .. + lib32 + dtrace + .. + i18n + .. .. libdata gcc @@ -311,6 +319,78 @@ .. .. info + .. + i18n + csmapper + APPLE + .. + AST + .. + BIG5 + .. + CNS + .. + CP + .. + EBCDIC + .. + GB + .. + GEORGIAN + .. + ISO-8859 + .. + ISO646 + .. + JIS + .. + KAZAKH + .. + KOI + .. + KS + .. + MISC + .. + TCVN + .. + .. + esdb + APPLE + .. + AST + .. + BIG5 + .. + CP + .. + DEC + .. + EBCDIC + .. + EUC + .. + GB + .. + GEORGIAN + .. + ISO-2022 + .. + ISO-8859 + .. + ISO646 + .. + KAZAKH + .. + KOI + .. + MISC + .. + TCVN + .. + UTF + .. + .. .. locale UTF-8 Modified: head/include/Makefile ============================================================================== --- head/include/Makefile Thu Feb 24 23:51:59 2011 (r219018) +++ head/include/Makefile Fri Feb 25 00:04:39 2011 (r219019) @@ -68,6 +68,10 @@ _dev_ieee488= dev/ieee488 INCS+= hesiod.h .endif +.if ${MK_ICONV} != "no" +INCS+= iconv.h +.endif + .if ${MK_BLUETOOTH} != "no" LSUBSUBDIRS+= netgraph/bluetooth/include .endif Added: head/include/iconv.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/include/iconv.h Fri Feb 25 00:04:39 2011 (r219019) @@ -0,0 +1,138 @@ +/* $FreeBSD$ */ +/* $NetBSD: iconv.h,v 1.6 2005/02/03 04:39:32 perry Exp $ */ + +/*- + * Copyright (c) 2003 Citrus Project, + * Copyright (c) 2009, 2010 Gabor Kovesdan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#ifndef _ICONV_H_ +#define _ICONV_H_ + +#include +#include + +#include +#include + +#include +#include + +#define iconv_open libiconv_open +#define iconv_close libiconv_close +#define iconv(cd, in, insize, out, outsize) libiconv(cd, __DECONST(char **, in), insize, out, outsize) +#define iconv_t libiconv_t + +struct __tag_iconv_t; +typedef struct __tag_iconv_t *iconv_t; + +__BEGIN_DECLS +iconv_t libiconv_open(const char *, const char *); +size_t libiconv(iconv_t, char ** __restrict, + size_t * __restrict, char ** __restrict, + size_t * __restrict); +int libiconv_close(iconv_t); +/* + * non-portable interfaces for iconv + */ +int __iconv_get_list(char ***, size_t *, bool); +void __iconv_free_list(char **, size_t); +size_t __iconv(iconv_t, char **, size_t *, char **, + size_t *, __uint32_t, size_t *); +#define __ICONV_F_HIDE_INVALID 0x0001 + +/* + * GNU interfaces for iconv + */ +#define iconv_open_into libiconv_open_into +#define iconvctl libiconvctl +#define iconvlist libiconvlist + +/* We have iconvctl() */ +#define _LIBICONV_VERSION 0x0108 +extern int _libiconv_version; + +typedef struct { + void *spaceholder[64]; +} iconv_allocation_t; + +int iconv_open_into(const char *, const char *, iconv_allocation_t *); +void libiconv_set_relocation_prefix (const char *orig_prefix, + const char *curr_prefix); + +/* + * iconvctl() request macros + */ +#define ICONV_TRIVIALP 0 +#define ICONV_GET_TRANSLITERATE 1 +#define ICONV_SET_TRANSLITERATE 2 +#define ICONV_GET_DISCARD_ILSEQ 3 +#define ICONV_SET_DISCARD_ILSEQ 4 +#define ICONV_SET_HOOKS 5 +#define ICONV_SET_FALLBACKS 6 + +typedef void (*iconv_unicode_char_hook) (unsigned int mbr, void *data); +typedef void (*iconv_wide_char_hook) (wchar_t wc, void *data); + +struct iconv_hooks { + iconv_unicode_char_hook uc_hook; + iconv_wide_char_hook wc_hook; + void *data; +}; + +/* + * Fallbacks aren't supported but type definitions are provided for + * source compatibility. + */ +typedef void (*iconv_unicode_mb_to_uc_fallback) (const char*, + size_t, void (*write_replacement) (const unsigned int *, + size_t, void*), void*, void*); +typedef void (*iconv_unicode_uc_to_mb_fallback) (unsigned int, + void (*write_replacement) (const char *, size_t, void*), + void*, void*); +typedef void (*iconv_wchar_mb_to_wc_fallback) (const char*, size_t, + void (*write_replacement) (const wchar_t *, size_t, void*), + void*, void*); +typedef void (*iconv_wchar_wc_to_mb_fallback) (wchar_t, + void (*write_replacement) (const char *, size_t, void*), + void*, void*); + +struct iconv_fallbacks { + iconv_unicode_mb_to_uc_fallback mb_to_uc_fallback; + iconv_unicode_uc_to_mb_fallback uc_to_mb_fallback; + iconv_wchar_mb_to_wc_fallback mb_to_wc_fallback; + iconv_wchar_wc_to_mb_fallback wc_to_mb_fallback; + void *data; +}; + + +void iconvlist(int (*do_one) (unsigned int, const char * const *, + void *), void *); +const char *iconv_canonicalize(const char *); +int iconvctl(iconv_t, int, void *); +__END_DECLS + +#endif /* !_ICONV_H_ */ Modified: head/include/paths.h ============================================================================== --- head/include/paths.h Thu Feb 24 23:51:59 2011 (r219018) +++ head/include/paths.h Fri Feb 25 00:04:39 2011 (r219019) @@ -49,14 +49,21 @@ #define _PATH_CONSOLE "/dev/console" #define _PATH_CP "/bin/cp" #define _PATH_CSHELL "/bin/csh" +#define _PATH_CSMAPPER "/usr/share/i18n/csmapper" #define _PATH_DEFTAPE "/dev/sa0" #define _PATH_DEVNULL "/dev/null" #define _PATH_DEVZERO "/dev/zero" #define _PATH_DRUM "/dev/drum" +#define _PATH_ESDB "/usr/share/i18n/esdb" #define _PATH_ETC "/etc" #define _PATH_FTPUSERS "/etc/ftpusers" #define _PATH_FWMEM "/dev/fwmem" #define _PATH_HALT "/sbin/halt" +#ifdef COMPAT_32BIT +#define _PATH_I18NMODULE "/usr/lib32/i18n" +#else +#define _PATH_I18NMODULE "/usr/lib/i18n" +#endif #define _PATH_IFCONFIG "/sbin/ifconfig" #define _PATH_KMEM "/dev/kmem" #define _PATH_LIBMAP_CONF "/etc/libmap.conf" Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Thu Feb 24 23:51:59 2011 (r219018) +++ head/lib/Makefile Fri Feb 25 00:04:39 2011 (r219019) @@ -37,6 +37,7 @@ SUBDIR_ORDERED= ${_csu} \ libcompiler_rt \ libcrypt \ libelf \ + ${_libiconv_modules} \ libkvm \ msun \ libmd \ @@ -156,6 +157,10 @@ _libgssapi= libgssapi _librpcsec_gss= librpcsec_gss .endif +.if ${MK_ICONV} != "no" +_libiconv_modules= libiconv_modules +.endif + .if ${MK_IPX} != "no" _libipx= libipx .endif Modified: head/lib/libc/Makefile ============================================================================== --- head/lib/libc/Makefile Thu Feb 24 23:51:59 2011 (r219018) +++ head/lib/libc/Makefile Fri Feb 25 00:04:39 2011 (r219019) @@ -57,6 +57,9 @@ NOASM= .include "${.CURDIR}/gdtoa/Makefile.inc" .include "${.CURDIR}/gen/Makefile.inc" .include "${.CURDIR}/gmon/Makefile.inc" +.if ${MK_ICONV} != "no" +.include "${.CURDIR}/iconv/Makefile.inc" +.endif .include "${.CURDIR}/inet/Makefile.inc" .include "${.CURDIR}/isc/Makefile.inc" .include "${.CURDIR}/locale/Makefile.inc" Added: head/lib/libc/iconv/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/iconv/Makefile.inc Fri Feb 25 00:04:39 2011 (r219019) @@ -0,0 +1,18 @@ +# $FreeBSD$ + +# iconv sources +.PATH: ${.CURDIR}/iconv + +MAN+= iconv.3 iconvctl.3 iconv_canonicalize.3 iconvlist.3 __iconv_get_list.3 +MLINKS+= iconv.3 iconv_open.3 \ + iconv.3 iconv_open_into.3 \ + iconv.3 iconv_close.3 \ + iconv.3 __iconv.3 \ + __iconv_get_list.3 __iconv_free_list.3 +SRCS+= citrus_bcs.c citrus_bcs_strtol.c citrus_bcs_strtoul.c \ + citrus_csmapper.c citrus_db.c citrus_db_factory.c citrus_db_hash.c \ + citrus_esdb.c citrus_hash.c citrus_iconv.c citrus_lookup.c \ + citrus_lookup_factory.c citrus_mapper.c citrus_memstream.c \ + citrus_mmap.c citrus_module.c citrus_none.c citrus_pivot_factory.c \ + citrus_prop.c citrus_stdenc.c iconv.c +SYM_MAPS+= ${.CURDIR}/iconv/Symbol.map Added: head/lib/libc/iconv/Symbol.map ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/iconv/Symbol.map Fri Feb 25 00:04:39 2011 (r219019) @@ -0,0 +1,101 @@ +/* + * $FreeBSD$ + */ + +FBSD_1.2 { + __iconv; + __iconv_free_list; + __iconv_get_list; + _citrus_bcs_convert_to_lower; + _citrus_bcs_convert_to_upper; + _citrus_bcs_isalnum; + _citrus_bcs_isalpha; + _citrus_bcs_isblank; + _citrus_bcs_isdigit; + _citrus_bcs_iseol; + _citrus_bcs_islower; + _citrus_bcs_isspace; + _citrus_bcs_isupper; + _citrus_bcs_isxdigit; + _citrus_bcs_skip_nonws; + _citrus_bcs_skip_nonws_len; + _citrus_bcs_skip_ws; + _citrus_bcs_skip_ws_len; + _citrus_bcs_strcasecmp; + _citrus_bcs_strncasecmp; + _citrus_bcs_strtol; + _citrus_bcs_strtoul; + _citrus_bcs_tolower; + _citrus_bcs_toupper; + _citrus_bcs_trunc_ws_len; + _citrus_csmapper_open; + _citrus_csmapper_close; + _citrus_db_factory_add_by_string; + _citrus_db_factory_add_string_by_string; + _citrus_db_factory_add32_by_string; + _citrus_db_factory_calc_size; + _citrus_db_factory_create; + _citrus_db_factory_serialize; + _citrus_db_hash_std; + _citrus_db_close; + _citrus_db_get_entry; + _citrus_db_get_number_of_entries; + _citrus_db_lookup; + _citrus_db_lookup_by_string; + _citrus_db_lookup8_by_string; + _citrus_db_lookup16_by_string; + _citrus_db_lookup_string_by_string; + _citrus_db_open; + _citrus_esdb_close; + _citrus_esdb_open; + _citrus_lookup_factory_convert; + _citrus_map_file; + _citrus_mapper_close; + _citrus_mapper_convert; + _citrus_mapper_create_area; + _citrus_mapper_get_dst_max; + _citrus_mapper_get_src_max; + _citrus_mapper_get_state_size; + _citrus_mapper_init_state; + _citrus_mapper_open; + _citrus_mapper_open_direct; + _citrus_mapper_set_persistent; + _citrus_memory_stream_bind; + _citrus_memory_stream_chr; + _citrus_memory_stream_getc; + _citrus_memory_stream_getln; + _citrus_memory_stream_getln_region; + _citrus_memory_stream_getregion; + _citrus_memory_stream_iseof; + _citrus_memory_stream_matchline; + _citrus_memory_stream_peek; + _citrus_memory_stream_remainder; + _citrus_memory_stream_rewind; + _citrus_memory_stream_seek; + _citrus_memory_stream_skip_ws; + _citrus_memory_stream_tell; + _citrus_memory_stream_ungetc; + _citrus_pivot_factory_convert; + _citrus_prop_object_init; + _citrus_prop_object_uninit; + _citrus_prop_parse_variable; + _citrus_prop_read_bool; + _citrus_prop_read_character; + _citrus_prop_read_character_common; + _citrus_prop_read_element; + _citrus_prop_read_num; + _citrus_prop_read_str; + _citrus_prop_read_symbol; + _citrus_stdenc_close; + _citrus_stdenc_open; + _citrus_unmap_file; + _libiconv_version; + iconv_canonicalize; + libiconv; + libiconv_close; + libiconv_open; + libiconv_open_into; + libiconv_set_relocation_prefix; + libiconvctl; + libiconvlist; +}; Added: head/lib/libc/iconv/__iconv_get_list.3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/iconv/__iconv_get_list.3 Fri Feb 25 00:04:39 2011 (r219019) @@ -0,0 +1,95 @@ +.\" Copyright (c) 2009 Gabor Kovesdan +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" Portions of this text are reprinted and reproduced in electronic form +.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +.\" Portable Operating System Interface (POSIX), The Open Group Base +.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +.\" Electrical and Electronics Engineers, Inc and The Open Group. In the +.\" event of any discrepancy between this version and the original IEEE and +.\" The Open Group Standard, the original IEEE and The Open Group Standard is +.\" the referee document. The original Standard can be obtained online at +.\" http://www.opengroup.org/unix/online.html. +.\" +.\" $FreeBSD$ +.\" +.Dd October 20, 2009 +.Dt __ICONV_GET_LIST 3 +.Os +.Sh NAME +.Nm __iconv_get_list +.Nm __iconv_free_list +.Nd retrieving a list of character encodings supported by +.Xr iconv 3 +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.In iconv.h +.Ft int +.Fn __iconv_get_list "char ***names" "size_t count" "bool paired" +.Ft void +.Fn __iconv_free_list "char **names" "size_t count" +.Sh DESCRIPTION +The +.Fn __iconv_get_list +function obtains a list of character encodings that are supported by the +.Xr iconv 3 +call. +The list of the encoding names will be stored in +.Fa names +and the number of the entries is stored in +.Fa count . +If the +.Fa paired +variable is true, the list will be arranged into +canonical/alias name pairs. +.Pp +The +.Fn __iconv_free_list +function is to free the allocated memory during the call of +.Fn __iconv_get_list . +.Sh RETURN VALUES +Upon successful completion +.Fn __iconv_get_list +returns 0 and set the +.Fa names +and +.Fa count +arguments. +Otherwise, \-1 is returned and errno is set to indicate the error. +.Sh SEE ALSO +.Xr iconv 3 , +.Xr iconvlist 3 +.Sh STANDARDS +The +.Nm __iconv_get_list +and +.Nm __iconv_free_list +functions are non-standard interfaces, which appeared in +the implementation of the Citrus Project. +The iconv implementation of the Citrus Project was adopted in +.Fx 9 . +.Sh AUTHORS +This manual page was written by +.An Gabor Kovesdan Aq gabor@FreeBSD.org . Added: head/lib/libc/iconv/_strtol.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/iconv/_strtol.h Fri Feb 25 00:04:39 2011 (r219019) @@ -0,0 +1,167 @@ +/* $FreeBSD$ */ +/* $NetBSD: _strtol.h,v 1.2 2009/05/20 22:03:29 christos Exp $ */ + +/*- + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * Original version ID: + * NetBSD: src/lib/libc/locale/_wcstol.h,v 1.2 2003/08/07 16:43:03 agc Exp + */ + +/* + * function template for strtol, strtoll and strtoimax. + * + * parameters: + * _FUNCNAME : function name + * __INT : return type + * __INT_MIN : lower limit of the return type + * __INT_MAX : upper limit of the return type + */ + +__INT +_FUNCNAME(const char *nptr, char **endptr, int base) +{ + const char *s; + __INT acc, cutoff; + unsigned char c; + int any, cutlim, i, neg; + + /* check base value */ + if (base && (base < 2 || base > 36)) { +#if !defined(_KERNEL) && !defined(_STANDALONE) + errno = EINVAL; + if (endptr != NULL) + /* LINTED interface specification */ + *endptr = __DECONST(void *, nptr); + return (0); +#else + panic("%s: invalid base %d", __func__, base); +#endif + } + + /* + * Skip white space and pick up leading +/- sign if any. + * If base is 0, allow 0x for hex and 0 for octal, else + * assume decimal; if base is already 16, allow 0x. + */ + s = nptr; + do { + c = *s++; + } while (isspace(c)); + if (c == '-') { + neg = 1; + c = *s++; + } else { + neg = 0; + if (c == '+') + c = *s++; + } + if ((base == 0 || base == 16) && + c == '0' && (*s == 'x' || *s == 'X')) { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = (c == '0' ? 8 : 10); + + /* + * Compute the cutoff value between legal numbers and illegal + * numbers. That is the largest legal value, divided by the + * base. An input number that is greater than this value, if + * followed by a legal input character, is too big. One that + * is equal to this value may be valid or not; the limit + * between valid and invalid numbers is then based on the last + * digit. For instance, if the range for longs is + * [-2147483648..2147483647] and the input base is 10, + * cutoff will be set to 214748364 and cutlim to either + * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated + * a value > 214748364, or equal but the next digit is > 7 (or 8), + * the number is too big, and we will return a range error. + * + * Set any if any `digits' consumed; make it negative to indicate + * overflow. + */ + cutoff = (neg ? __INT_MIN : __INT_MAX); + cutlim = (int)(cutoff % base); + cutoff /= base; + if (neg) { + if (cutlim > 0) { + cutlim -= base; + cutoff += 1; + } + cutlim = -cutlim; + } + for (acc = 0, any = 0;; c = *s++) { + if (isdigit(c)) + i = c - '0'; + else if (isalpha(c)) + i = c - (isupper(c) ? 'A' - 10 : 'a' - 10); + else + break; + if (i >= base) + break; + if (any < 0) + continue; + if (neg) { + if (acc < cutoff || (acc == cutoff && i > cutlim)) { + acc = __INT_MIN; +#if !defined(_KERNEL) && !defined(_STANDALONE) + any = -1; + errno = ERANGE; +#else + any = 0; + break; +#endif + } else { + any = 1; + acc *= base; + acc -= i; + } + } else { + if (acc > cutoff || (acc == cutoff && i > cutlim)) { + acc = __INT_MAX; +#if !defined(_KERNEL) && !defined(_STANDALONE) + any = -1; + errno = ERANGE; +#else + any = 0; + break; +#endif + } else { + any = 1; + acc *= base; + acc += i; + } + } + } + if (endptr != NULL) + /* LINTED interface specification */ + *endptr = __DECONST(void *, any ? s - 1 : nptr); + return(acc); +} Added: head/lib/libc/iconv/_strtoul.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/iconv/_strtoul.h Fri Feb 25 00:04:39 2011 (r219019) @@ -0,0 +1,126 @@ +/* $FreeBSD$ */ +/* $NetBSD: _strtoul.h,v 1.1 2008/08/20 12:42:26 joerg Exp $ */ + +/*- + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * Original version ID: + * NetBSD: src/lib/libc/locale/_wcstoul.h,v 1.2 2003/08/07 16:43:03 agc Exp + */ + +/* + * function template for strtoul, strtoull and strtoumax. + * + * parameters: + * _FUNCNAME : function name + * __UINT : return type + * __UINT_MAX : upper limit of the return type + */ + +__UINT +_FUNCNAME(const char *nptr, char **endptr, int base) +{ + const char *s; + __UINT acc, cutoff; + unsigned char c; + int any, cutlim, i, neg; + + /* check base value */ + if (base && (base < 2 || base > 36)) { +#if !defined(_KERNEL) && !defined(_STANDALONE) + errno = EINVAL; + return (0); +#else + panic("%s: invalid base %d", __func__, base); +#endif + } + + /* + * Skip white space and pick up leading +/- sign if any. + * If base is 0, allow 0x for hex and 0 for octal, else + * assume decimal; if base is already 16, allow 0x. + */ + s = nptr; + do { + c = *s++; + } while (isspace(c)); + if (c == '-') { + neg = 1; + c = *s++; + } else { + neg = 0; + if (c == '+') + c = *s++; + } + if ((base == 0 || base == 16) && + c == '0' && (*s == 'x' || *s == 'X')) { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = (c == '0' ? 8 : 10); + + /* + * See strtol for comments as to the logic used. + */ + cutoff = __UINT_MAX / (__UINT)base; + cutlim = (int)(__UINT_MAX % (__UINT)base); + for (acc = 0, any = 0;; c = *s++) { + if (isdigit(c)) + i = c - '0'; + else if (isalpha(c)) + i = c - (isupper(c) ? 'A' - 10 : 'a' - 10); + else + break; + if (i >= base) + break; + if (any < 0) + continue; + if (acc > cutoff || (acc == cutoff && i > cutlim)) { + acc = __UINT_MAX; +#if !defined(_KERNEL) && !defined(_STANDALONE) + any = -1; + errno = ERANGE; +#else + any = 0; + break; +#endif + } else { + any = 1; + acc *= (__UINT)base; + acc += i; + } + } + if (neg && any > 0) + acc = -acc; + if (endptr != NULL) + /* LINTED interface specification */ + *endptr = __DECONST(void *, any ? s - 1 : nptr); + return (acc); +} Added: head/lib/libc/iconv/citrus_aliasname_local.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/iconv/citrus_aliasname_local.h Fri Feb 25 00:04:39 2011 (r219019) @@ -0,0 +1,49 @@ +/* $FreeBSD$ */ +/* $NetBSD: citrus_aliasname_local.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */ + +/*- + * Copyright (c)2008 Citrus Project, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _CITRUS_ALIASNAME_LOCAL_H_ +#define _CITRUS_ALIASNAME_LOCAL_H_ + +static __inline const char * +__unaliasname(const char *dbname, const char *alias, + void *buf, size_t bufsize) +{ + + return (_lookup_simple(dbname, alias, + buf, bufsize, _LOOKUP_CASE_SENSITIVE)); +} + +static __inline int +__isforcemapping(const char *name) +{ + + return (_bcs_strcasecmp("/force", name)); +} + +#endif /*_CITRUS_ALIASNAME_LOCAL_H_*/ Added: head/lib/libc/iconv/citrus_bcs.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/iconv/citrus_bcs.c Fri Feb 25 00:04:39 2011 (r219019) @@ -0,0 +1,168 @@ +/* $FreeBSD$ */ +/* $NetBSD: citrus_bcs.c,v 1.5 2005/05/14 17:55:42 tshiozak Exp $ */ + +/*- + * Copyright (c)2003 Citrus Project, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include +#include + +#include "citrus_namespace.h" +#include "citrus_bcs.h" + +/* + * case insensitive comparison between two C strings. + */ +int +_citrus_bcs_strcasecmp(const char * __restrict str1, + const char * __restrict str2) +{ + int c1, c2; + + c1 = c2 = 1; + + while (c1 && c2 && c1 == c2) { + c1 = _bcs_toupper(*str1++); + c2 = _bcs_toupper(*str2++); + } + + return ((c1 == c2) ? 0 : ((c1 > c2) ? 1 : -1)); +} + +/* + * case insensitive comparison between two C strings with limitation of length. + */ +int +_citrus_bcs_strncasecmp(const char * __restrict str1, + const char * __restrict str2, size_t sz) +{ + int c1, c2; + + c1 = c2 = 1; + + while (c1 && c2 && c1 == c2 && sz != 0) { + c1 = _bcs_toupper(*str1++); + c2 = _bcs_toupper(*str2++); + sz--; + } + + return ((c1 == c2) ? 0 : ((c1 > c2) ? 1 : -1)); +} + +/* + * skip white space characters. + */ +const char * *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 00:10:27 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2145F106566C; Fri, 25 Feb 2011 00:10:27 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 067A68FC18; Fri, 25 Feb 2011 00:10:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1P0AQxm069663; Fri, 25 Feb 2011 00:10:26 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1P0AQhC069660; Fri, 25 Feb 2011 00:10:26 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201102250010.p1P0AQhC069660@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 25 Feb 2011 00:10:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219020 - in head/tools: build/options test/iconv X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 00:10:27 -0000 Author: gabor Date: Fri Feb 25 00:10:26 2011 New Revision: 219020 URL: http://svn.freebsd.org/changeset/base/219020 Log: - Add two more iconv-related files, which were left out from previous commit Approved by: delphij (mentor) Added: head/tools/build/options/WITH_ICONV (contents, props changed) head/tools/test/iconv/const-gnuism.c (contents, props changed) Added: head/tools/build/options/WITH_ICONV ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_ICONV Fri Feb 25 00:10:26 2011 (r219020) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to build iconv as part of libc. Added: head/tools/test/iconv/const-gnuism.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/test/iconv/const-gnuism.c Fri Feb 25 00:10:26 2011 (r219020) @@ -0,0 +1,70 @@ +/*- + * Copyright (C) 2010 Gabor Kovesdan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include + +#include +#include +#include +#include + +int +main(void) +{ + iconv_t cd; + size_t inbytes, outbytes; + char *str1 = "FOOBAR"; + const char *str2 = "FOOBAR"; + char ** in1; + const char ** in2 = &str2; + char *out1, *out2; + + inbytes = outbytes = strlen("FOOBAR"); + + if ((cd = iconv_open("UTF-8", "ASCII")) == (iconv_t)-1) + err(1, NULL); + + if ((out2 = malloc(inbytes)) == NULL) + err(1, NULL); + + if (iconv(cd, in2, &inbytes, &out2, &outbytes) == -1) + err(1, NULL); + + in1 = &str1; + inbytes = outbytes = strlen("FOOBAR"); + + if ((out1 = malloc(inbytes)) == NULL) + err(1, NULL); + + if (iconv(cd, in1, &inbytes, &out1, &outbytes) == -1) + err(1, NULL); + + return (EXIT_SUCCESS); + +} From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 02:44:49 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72A12106566B; Fri, 25 Feb 2011 02:44:49 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail08.syd.optusnet.com.au (mail08.syd.optusnet.com.au [211.29.132.189]) by mx1.freebsd.org (Postfix) with ESMTP id EA31E8FC0C; Fri, 25 Feb 2011 02:44:48 +0000 (UTC) Received: from c122-107-114-89.carlnfd1.nsw.optusnet.com.au (c122-107-114-89.carlnfd1.nsw.optusnet.com.au [122.107.114.89]) by mail08.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id p1P2iOm5014946 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 25 Feb 2011 13:44:25 +1100 Date: Fri, 25 Feb 2011 13:44:24 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Bruce Evans In-Reply-To: <20110225085508.O1276@besplex.bde.org> Message-ID: <20110225131532.W938@besplex.bde.org> References: <201102241613.p1OGDXpM047076@svn.freebsd.org> <201102241347.39267.jhb@freebsd.org> <5965E5EC-A725-423A-9420-B84AD09993DC@elvandar.org> <201102241435.09011.jhb@freebsd.org> <20110225070237.F983@besplex.bde.org> <20110225085508.O1276@besplex.bde.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Remko Lodder , John Baldwin , svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, davidxu@FreeBSD.org, svn-src-head@FreeBSD.org, Remko Lodder Subject: Re: svn commit: r219003 - head/usr.bin/nice X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 02:44:49 -0000 On Fri, 25 Feb 2011, Bruce Evans wrote: > On Fri, 25 Feb 2011, Bruce Evans wrote: > >> On Thu, 24 Feb 2011, John Baldwin wrote: >> >>> On Thursday, February 24, 2011 2:03:33 pm Remko Lodder wrote: >>>> >> [contex restored: >> +A priority of 19 or 20 will prevent a process from taking any cycles from >> +others at nice 0 or better.] >> >>>> On Feb 24, 2011, at 7:47 PM, John Baldwin wrote: >>>> >>>>> Are you sure that this statement applies to both ULE and 4BSD? The two >>>>> schedulers treat nice values a bit differently. >>>> >>>> No I am not sure that the statement applies, given your response I >>>> understand >>>> that both schedulers work differently. Can you or David tell me what the >>>> difference >>>> is so that I can properly document it? I thought that the tool is doin >>>> the same for all >>>> schedulers, but that the backend might treat it differently. >> >> I'm sure that testing would show that it doesn't apply in FreeBSD. It is >> supposed to apply only approximately in FreeBSD, but niceness handling in >> FreeBSD is quite broken so it doesn't apply at all. Also, the magic >> numbers >> of 19 and 20 probably don't apply in FreeBSD. These were because there >> nicenesses that are the same mod 2 (maybe after adding 1) have the same >> effect, since priorities that are the same mode RQ_PPQ = 4 have the same >> effect and the niceness space was scaled to the priority space by >> multiplying by NICE_WEIGHT = 2. But NICE_WEIGHT has been broken to be 1 >> in FreeBSD with SCHED_4BSD and doesn't apply with SCHED_ULE. With >> SCHED_4BSD, there are 4 (not 2) nice values near 20 that give the same >> behaviour. >> >> It strictly only applies to broken schedulers. Preventing a process >> from taking *any* cycles gives priority inversion livelock. FreeBSD >> has priority propagation to prevent this. > > Just tried it with SCHED_4BSD. On a multi-CPU system (ref9-i386), but > I think I used cpuset correctly to emulate 1 CPU. > > % last pid: 85392; load averages: 1.71, 0.86, 0.38 up 94+01:00:36 > 21:55:59 > % 66 processes: 3 running, 63 sleeping > % CPU: 6.9% user, 3.7% nice, 2.0% system, 0.0% interrupt, 87.3% idle > % Mem: 268M Active, 4969M Inact, 310M Wired, 50M Cache, 112M Buf, 2413M Free > % Swap: 8192M Total, 580K Used, 8191M Free > % % PID USERNAME THR PRI NICE SIZE RES STATE C TIME WCPU > COMMAND > % [... system is not nearly idle, but plenty of CPUs to spare] > % 85368 bde 1 111 0 9892K 1312K RUN 1 1:07 65.67% sh > % 85369 bde 1 123 20 9892K 1312K CPU1 1 0:35 37.89% sh > > This shows the bogus 1:2 ratio even for a niceness difference of 20. I've > seen too much of this ratio. IIRC, before FreeBSD-4 was fixed, the More tests: FreeBSD-5 with 4BSD on a 1-CPU system: % last pid: 1875; load averages: 11.94, 11.87, 10.76 up 0+00:36:11 10:45:09 % 35 processes: 13 running, 22 sleeping % CPU: 87.2% user, 12.1% nice, 0.0% system, 0.8% interrupt, 0.0% idle % Mem: 15M Active, 15M Inact, 21M Wired, 20K Cache, 9472K Buf, 950M Free % Swap: % % PID USERNAME THR PRI NICE SIZE RES STATE TIME WCPU COMMAND % 1229 root 1 112 -20 856K 576K RUN 12:03 49.85% sh % 1231 root 1 114 -16 856K 576K RUN 2:27 8.94% sh % 1233 root 1 114 -12 856K 576K RUN 2:09 7.91% sh % 1235 root 1 115 -8 856K 576K RUN 1:53 6.64% sh % 1237 root 1 115 -4 856K 576K RUN 1:32 5.91% sh % 1239 root 1 115 0 856K 576K RUN 1:24 4.93% sh % 1241 root 1 115 4 856K 576K RUN 1:13 3.96% sh % 1243 root 1 116 8 856K 576K RUN 0:45 1.95% sh % 1251 root 1 115 12 856K 576K RUN 0:35 1.86% sh % 1253 root 1 116 16 856K 576K RUN 0:22 0.05% sh % 1255 root 1 116 20 856K 576K RUN 0:00 0.00% sh I reduced the tests to only every 4 values after comfirming that the other 3 don't have much different behaviour (but the behaviour is not exactly dependent on the value mod 4). The "nice -20" process really does seem to get 0% of the CPU. It takes niceness difference of 40 to completely starve the low-priority process. So a swing of 20 for doing this is about right with the unbroken NICE_WEIGHT of 2. However, I think complete starvation is accidental and a bug. The low priority process should be allowed to run for maybe 0.01% of the time; this automatically avoids priority inversion bugs, and lets it become interactive transiently if it needs to, at no signficant cost. Note the nonlinear && non-geometric %CPU for the "nice --20" process only. This is almost certainly caused by the nonlinearity of the scaling giving by the clamping. Otherwise %CPU is sort of linear in the niceness. The dynamic range is too small, but otherwise the %CPU is a reasonable function of niceness. Removing just the "nice --20" process from the mix allows the "nice -20" process to get some cycles (about 1%). I don't remember if the nonlinearity is transferred to the "nice --16" process. FreeBSD-8 with 4BSD from 3 years ago: % last pid: 1899; load averages: 10.99, 10.97, 9.81 up 0+00:35:16 11:31:15 % 35 processes: 12 running, 23 sleeping % CPU states: 89.6% user, 10.4% nice, 0.0% system, 0.0% interrupt, 0.0% idle % Mem: 15M Active, 14M Inact, 16M Wired, 368K Cache, 9472K Buf, 952M Free % Swap: % % PID USERNAME THR PRI NICE SIZE RES STATE TIME WCPU COMMAND % 745 root 1 112 -20 856K 572K RUN 14:23 45.95% sh % 747 root 1 112 -16 856K 572K RUN 3:59 11.91% sh % 749 root 1 112 -12 856K 572K RUN 3:19 9.91% sh % 751 root 1 112 -8 856K 572K RUN 2:57 8.98% sh % 753 root 1 112 -4 856K 572K RUN 2:28 6.98% sh % 756 root 1 112 0 856K 572K RUN 1:57 5.91% sh % 759 root 1 112 4 856K 572K RUN 1:35 4.98% sh % 764 root 1 112 8 856K 572K RUN 0:58 2.98% sh % 767 root 1 112 12 856K 572K RUN 0:37 1.71% sh % 769 root 1 112 16 856K 572K RUN 0:00 0.00% sh % 771 root 1 116 20 856K 572K RUN 0:00 0.00% sh Similar to FreeBSD-5 behaviour, but now the "nice -16" process also gets no CPU. FreeBSD-8 with ULE from 3 years ago: Tests hung, since even a single shell loop wasn't preempted properly. % bde FreeBSD-~5.2 with 4BSD: % last pid: 1178; load averages: 10.99, 9.12, 5.09 up 0+00:11:56 11:44:39 % 37 processes: 12 running, 25 sleeping % CPU: 95.3% user, 4.7% nice, 0.0% system, 0.0% interrupt, 0.0% idle % Mem: 15M Active, 14M Inact, 20M Wired, 80K Cache, 9072K Buf, 952M Free % Swap: % % PID USERNAME THR PRI NICE SIZE RES STATE TIME WCPU COMMAND % 841 root 1 94 -20 856K 572K RUN 4:13 49.80% sh % 843 root 1 93 -16 856K 572K RUN 2:11 24.71% sh % 845 root 1 92 -12 856K 572K RUN 1:09 10.79% sh % 847 root 1 93 -8 856K 572K RUN 0:35 5.66% sh % 849 root 1 93 -4 856K 572K RUN 0:18 2.69% sh % 851 root 1 93 0 856K 572K RUN 0:09 0.98% sh % 853 root 1 96 4 856K 572K RUN 0:05 0.00% sh % 855 root 1 96 8 856K 572K RUN 0:02 0.00% sh % 857 root 1 98 12 856K 572K RUN 0:01 0.00% sh % 859 root 1 98 16 856K 572K RUN 0:01 0.00% sh % 861 root 1 108 20 856K 572K RUN 0:00 0.00% sh The mapping from niceness to %CPU is geometric -- each reduction in niceness of 4 or 5 gives about twice as much CPU. The "nice -20" process contending with the "nice --20" process gets a tiny but nonzero amount of CPU. Other things that my version were very noticeable in these tests: - the shell used to start them and shells used to control them don't need to have equal or larger negative niceness so as to run promptly, provided these shells haven't been hogs and don't bogusly become hogs, since niceness doesn't affect priority unless a process is using too much CPU. - similarly for the processes. They all start up fast since they all start up with equal minimal priority since they haven't used any CPU to begin with (modulo bogus p_estcpu inheritance in sched_fork()). FreeBSD-9 with 4BSD from a few months ago: % last pid: 894; load averages: 11.99, 11.89, 9.78 up 0+00:25:32 12:45:53 % 40 processes: 13 running, 27 sleeping % CPU states: 90.6% user, 7.0% nice, 2.3% system, 0.0% interrupt, 0.0% idle % Mem: 78M Active, 13M Inact, 18M Wired, 440K Cache, 9328K Buf, 886M Free % Swap: % % PID USERNAME THR PRI NICE SIZE RES STATE TIME WCPU COMMAND % 708 root 1 112 -20 856K 572K RUN 12:31 54.93% sh % 710 root 1 112 -16 856K 572K RUN 2:15 7.76% sh % 712 root 1 112 -12 856K 572K RUN 1:49 6.79% sh % 714 root 1 112 -8 856K 572K RUN 1:32 5.96% sh % 716 root 1 112 -4 856K 572K RUN 1:21 4.98% sh % 718 root 1 112 0 856K 572K RUN 1:12 3.91% sh % 720 root 1 112 4 856K 572K RUN 0:45 2.83% sh % 722 root 1 112 8 856K 572K RUN 0:29 1.90% sh % 724 root 1 112 12 856K 572K RUN 0:28 0.98% sh % 726 root 1 112 16 856K 572K RUN 0:00 0.00% sh % 728 root 1 116 20 856K 572K RUN 0:00 0.00% sh Same as FreeBSD-8, except the nonlinearity for "nice --20" is even larger and the dynamic range for the others is even smaller. Bruce From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 07:33:43 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D4561065670; Fri, 25 Feb 2011 07:33:43 +0000 (UTC) (envelope-from maxim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 10DD68FC24; Fri, 25 Feb 2011 07:33:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1P7XgAf092768; Fri, 25 Feb 2011 07:33:42 GMT (envelope-from maxim@svn.freebsd.org) Received: (from maxim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1P7XgFr092766; Fri, 25 Feb 2011 07:33:42 GMT (envelope-from maxim@svn.freebsd.org) Message-Id: <201102250733.p1P7XgFr092766@svn.freebsd.org> From: Maxim Konovalov Date: Fri, 25 Feb 2011 07:33:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219024 - head/share/misc X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 07:33:43 -0000 Author: maxim Date: Fri Feb 25 07:33:42 2011 New Revision: 219024 URL: http://svn.freebsd.org/changeset/base/219024 Log: o FreeBSD 8.2 and 7.4-RELEASE added. Mac OS X 10.6 added belatedly. Modified: head/share/misc/bsd-family-tree Modified: head/share/misc/bsd-family-tree ============================================================================== --- head/share/misc/bsd-family-tree Fri Feb 25 03:19:24 2011 (r219023) +++ head/share/misc/bsd-family-tree Fri Feb 25 07:33:42 2011 (r219024) @@ -229,19 +229,24 @@ FreeBSD 5.2 | | | | | | | DragonFly 2.2.0 | FreeBSD 7.2 | NetBSD 5.0 OpenBSD 4.5 | | \ | | | | | + | | Mac OS X | | | + | | 10.6 | | | | | | | | | DragonFly 2.4.0 | | | | | OpenBSD 4.6 | | | | | | | | *--FreeBSD | | | | | | | 8.0 | | | | | | - | | FreeBSD | | | | | + | | FreeBSD | | | | | | | 7.3 | | | | DragonFly 2.6.0 - | | | | | OpenBSD 4.7 | - | FreeBSD | | | | | - | 8.1 | | | | | - | | | | | | DragonFly 2.8.2 - | | | | | OpenBSD 4.8 | - | V | | NetBSD 5.1 | | + | | | | | | OpenBSD 4.7 | + | FreeBSD | | | | | | + | 8.1 | | | | | | + | | | | | | | DragonFly 2.8.2 + | | | | | | OpenBSD 4.8 | + | | | | | NetBSD 5.1 | | + | FreeBSD FreeBSD | | | | + | 8.2 7.4 | | | | + | v | | | | | | | | | FreeBSD 9 -current | NetBSD -current OpenBSD -current | | | | | | @@ -514,6 +519,7 @@ DragonFly 2.2.0 2009-02-17 [DFB] NetBSD 5.0 2009-04-29 [NBD] OpenBSD 4.5 2009-05-01 [OBD] FreeBSD 7.2 2009-05-04 [FBD] +Mac OS X 10.6 2009-06-08 [APL] DragonFly 2.4.0 2009-09-16 [DFB] OpenBSD 4.6 2009-10-18 [OBD] FreeBSD 8.0 2009-11-26 [FBD] @@ -524,6 +530,8 @@ FreeBSD 8.1 2010-07-24 [FBD] DragonFly 2.8.2 2010-10-30 [DFB] OpenBSD 4.8 2010-11-01 [OBD] NetBSD 5.1 2010-11-19 [NBD] +FreeBSD 7.4 2011-02-24 [FBD] +FreeBSD 8.2 2011-02-24 [FBD] Bibliography ------------------------ From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 09:07:17 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C65C0106564A; Fri, 25 Feb 2011 09:07:17 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B591D8FC12; Fri, 25 Feb 2011 09:07:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1P97His003465; Fri, 25 Feb 2011 09:07:17 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1P97Hhr003462; Fri, 25 Feb 2011 09:07:17 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201102250907.p1P97Hhr003462@svn.freebsd.org> From: "David E. O'Brien" Date: Fri, 25 Feb 2011 09:07:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219025 - head/sys/arm/xscale/ixp425 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 09:07:17 -0000 Author: obrien Date: Fri Feb 25 09:07:17 2011 New Revision: 219025 URL: http://svn.freebsd.org/changeset/base/219025 Log: Add a real dependency on the microcode. Now when one does 'make kernel ; make kernel' the second invocation only does: `kernel.ko' is up to date. rather than reproduce all the binary microcode files and relink the kernel. [continuation of r212429] Modified: head/sys/arm/xscale/ixp425/files.ixp425 Modified: head/sys/arm/xscale/ixp425/files.ixp425 ============================================================================== --- head/sys/arm/xscale/ixp425/files.ixp425 Fri Feb 25 07:33:42 2011 (r219024) +++ head/sys/arm/xscale/ixp425/files.ixp425 Fri Feb 25 09:07:17 2011 (r219025) @@ -38,7 +38,7 @@ IxNpeMicrocode.fwo optional npe_fw \ no-implicit-rule \ clean "IxNpeMicrocode.fwo" IxNpeMicrocode.dat optional npe_fw \ - dependency ".PHONY" \ + dependency "$S/contrib/dev/npe/IxNpeMicrocode.dat.uu" \ compile-with "uudecode < $S/contrib/dev/npe/IxNpeMicrocode.dat.uu" \ no-obj no-implicit-rule \ clean "IxNpeMicrocode.dat" From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 09:29:33 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 07EE21065670; Fri, 25 Feb 2011 09:29:33 +0000 (UTC) (envelope-from vanhu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EB70D8FC12; Fri, 25 Feb 2011 09:29:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1P9TWkX005285; Fri, 25 Feb 2011 09:29:32 GMT (envelope-from vanhu@svn.freebsd.org) Received: (from vanhu@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1P9TWMo005283; Fri, 25 Feb 2011 09:29:32 GMT (envelope-from vanhu@svn.freebsd.org) Message-Id: <201102250929.p1P9TWMo005283@svn.freebsd.org> From: VANHULLEBUS Yvan Date: Fri, 25 Feb 2011 09:29:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219026 - head/sys/opencrypto X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 09:29:33 -0000 Author: vanhu Date: Fri Feb 25 09:29:32 2011 New Revision: 219026 URL: http://svn.freebsd.org/changeset/base/219026 Log: fixed size of AH_ALEN_MAX, which is 64 bytes for SHA-512. Obtained from: Matthias Drochner MFC after: 3d Modified: head/sys/opencrypto/xform.h Modified: head/sys/opencrypto/xform.h ============================================================================== --- head/sys/opencrypto/xform.h Fri Feb 25 09:07:17 2011 (r219025) +++ head/sys/opencrypto/xform.h Fri Feb 25 09:29:32 2011 (r219026) @@ -43,7 +43,8 @@ struct auth_hash { void (*Final) (u_int8_t *, void *); }; -#define AH_ALEN_MAX 20 /* max authenticator hash length */ +/* XXX use a define common with other hash stuff ! */ +#define AH_ALEN_MAX 64 /* max authenticator hash length */ struct enc_xform { int type; From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 09:40:17 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C54BB106566C; Fri, 25 Feb 2011 09:40:17 +0000 (UTC) (envelope-from phk@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B2E8E8FC08; Fri, 25 Feb 2011 09:40:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1P9eHSn006126; Fri, 25 Feb 2011 09:40:17 GMT (envelope-from phk@svn.freebsd.org) Received: (from phk@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1P9eH7k006116; Fri, 25 Feb 2011 09:40:17 GMT (envelope-from phk@svn.freebsd.org) Message-Id: <201102250940.p1P9eH7k006116@svn.freebsd.org> From: Poul-Henning Kamp Date: Fri, 25 Feb 2011 09:40:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219027 - in head/usr.sbin/fifolog: fifolog_create fifolog_reader fifolog_writer lib X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 09:40:17 -0000 Author: phk Date: Fri Feb 25 09:40:17 2011 New Revision: 219027 URL: http://svn.freebsd.org/changeset/base/219027 Log: Fix a bunch of trivial whitespace mistakes and update the miniobj.h file before the real work starts. Modified: head/usr.sbin/fifolog/fifolog_create/fifolog_create.c head/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c head/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c head/usr.sbin/fifolog/lib/fifolog.h head/usr.sbin/fifolog/lib/fifolog_create.c head/usr.sbin/fifolog/lib/fifolog_int.c head/usr.sbin/fifolog/lib/fifolog_reader.c head/usr.sbin/fifolog/lib/fifolog_write_poll.c head/usr.sbin/fifolog/lib/miniobj.h Modified: head/usr.sbin/fifolog/fifolog_create/fifolog_create.c ============================================================================== --- head/usr.sbin/fifolog/fifolog_create/fifolog_create.c Fri Feb 25 09:29:32 2011 (r219026) +++ head/usr.sbin/fifolog/fifolog_create/fifolog_create.c Fri Feb 25 09:40:17 2011 (r219027) @@ -78,11 +78,11 @@ main(int argc, char * const *argv) } argc -= optind; argv += optind; - if (argc != 1) + if (argc != 1) usage(); if (size != 0 && reccnt != 0 && recsize != 0) { /* N N N */ - if (size != reccnt * recsize) + if (size != reccnt * recsize) errx(1, "Inconsistent -l, -r and -s values"); } else if (size != 0 && reccnt != 0 && recsize == 0) { /* N N Z */ if (size % reccnt) Modified: head/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c ============================================================================== --- head/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c Fri Feb 25 09:29:32 2011 (r219026) +++ head/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c Fri Feb 25 09:40:17 2011 (r219027) @@ -156,7 +156,7 @@ main(int argc, char * const *argv) errx(1, "Begin time not before End time"); fl = fifolog_reader_open(argv[0]); - + if (!strcmp(opt_o, "-")) fo = stdout; else { Modified: head/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c ============================================================================== --- head/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c Fri Feb 25 09:29:32 2011 (r219026) +++ head/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c Fri Feb 25 09:40:17 2011 (r219027) @@ -76,7 +76,7 @@ main(int argc, char * const *argv) } argc -= optind; argv += optind; - if (argc != 1) + if (argc != 1) usage(); if (z_opt > 9) Modified: head/usr.sbin/fifolog/lib/fifolog.h ============================================================================== --- head/usr.sbin/fifolog/lib/fifolog.h Fri Feb 25 09:29:32 2011 (r219026) +++ head/usr.sbin/fifolog/lib/fifolog.h Fri Feb 25 09:40:17 2011 (r219027) @@ -68,7 +68,7 @@ * present in these records as well: * 5 32be time_t containing POSIX's understanding of UTC. * - * These fields are immediately followed by the inner layer payload as + * These fields are immediately followed by the inner layer payload as * described below, which has variable length. * * If the inner layer payload is shorter than the available space in @@ -95,10 +95,10 @@ * * The inner layer: * ---------------- - * The inner layer contains data identification and to the second - * timestamping (the timestamp in the outer layer only marks the + * The inner layer contains data identification and to the second + * timestamping (the timestamp in the outer layer only marks the * first possible timestamp for content in the SYNC record). - * + * * offset type contents * -------------------------------------------------------------- * 0 32be ident Modified: head/usr.sbin/fifolog/lib/fifolog_create.c ============================================================================== --- head/usr.sbin/fifolog/lib/fifolog_create.c Fri Feb 25 09:29:32 2011 (r219026) +++ head/usr.sbin/fifolog/lib/fifolog_create.c Fri Feb 25 09:40:17 2011 (r219027) @@ -91,7 +91,7 @@ fifolog_create(const char *fn, off_t siz if (size == 0 && S_ISREG(st.st_mode)) size = st.st_size; - if (size == 0) + if (size == 0) size = recsize * (off_t)(24*60*60); if (S_ISREG(st.st_mode) && ftruncate(fd, size) < 0) Modified: head/usr.sbin/fifolog/lib/fifolog_int.c ============================================================================== --- head/usr.sbin/fifolog/lib/fifolog_int.c Fri Feb 25 09:29:32 2011 (r219026) +++ head/usr.sbin/fifolog/lib/fifolog_int.c Fri Feb 25 09:40:17 2011 (r219027) @@ -66,7 +66,7 @@ fifo_zfree(voidpf opaque __unused, voidp * Return value is NULL for success or a error description string to * be augmented by errno if non-zero. * - * The second function is just an error-handling wrapper around the + * The second function is just an error-handling wrapper around the * first which, does the actual work. */ @@ -88,7 +88,7 @@ fifolog_int_open_i(struct fifolog_file * if (i != 0) { i = fstat(f->fd, &st); - if (!S_ISREG(st.st_mode)) + if (!S_ISREG(st.st_mode)) return ("Neither disk nor regular file"); f->recsize = 512; f->logsize = st.st_size; Modified: head/usr.sbin/fifolog/lib/fifolog_reader.c ============================================================================== --- head/usr.sbin/fifolog/lib/fifolog_reader.c Fri Feb 25 09:29:32 2011 (r219026) +++ head/usr.sbin/fifolog/lib/fifolog_reader.c Fri Feb 25 09:40:17 2011 (r219027) @@ -48,7 +48,7 @@ struct fifolog_reader { #define FIFOLOG_READER_MAGIC 0x1036d139 struct fifolog_file *ff; unsigned olen; - unsigned char *obuf; + unsigned char *obuf; time_t now; }; @@ -75,7 +75,7 @@ fifolog_reader_open(const char *fname) i = inflateInit(fr->ff->zs); assert(i == Z_OK); - fr->magic = FIFOLOG_READER_MAGIC; + fr->magic = FIFOLOG_READER_MAGIC; return (fr); } @@ -144,7 +144,7 @@ fifolog_reader_seek(const struct fifolog e = fifolog_reader_findsync(fr->ff, &o); if (e == 0) return (0); /* empty fifolog */ - assert(e == 1); + assert(e == 1); assert(fr->ff->recbuf[4] & FIFOLOG_FLG_SYNC); seq = be32dec(fr->ff->recbuf); @@ -297,7 +297,7 @@ fifolog_reader_process(struct fifolog_re zs->avail_out, fr->olen); exit (250); #else - + i = Z_OK; #endif } @@ -312,7 +312,7 @@ fifolog_reader_process(struct fifolog_re if (zs->avail_out != fr->olen) { q = fr->obuf + (fr->olen - zs->avail_out); p = fifolog_reader_chop(fr, func, priv); - if (p < q) + if (p < q) (void)memmove(fr->obuf, p, q - p); zs->avail_out = fr->olen - (q - p); zs->next_out = fr->obuf + (q - p); Modified: head/usr.sbin/fifolog/lib/fifolog_write_poll.c ============================================================================== --- head/usr.sbin/fifolog/lib/fifolog_write_poll.c Fri Feb 25 09:29:32 2011 (r219026) +++ head/usr.sbin/fifolog/lib/fifolog_write_poll.c Fri Feb 25 09:40:17 2011 (r219027) @@ -52,12 +52,12 @@ const char *fifolog_write_statnames[] = { -[FIFOLOG_PT_BYTES_PRE] = "Bytes before compression", -[FIFOLOG_PT_BYTES_POST] = "Bytes after compression", -[FIFOLOG_PT_WRITES] = "Writes", -[FIFOLOG_PT_FLUSH] = "Flushes", -[FIFOLOG_PT_SYNC] = "Syncs", -[FIFOLOG_PT_RUNTIME] = "Runtime" + [FIFOLOG_PT_BYTES_PRE] = "Bytes before compression", + [FIFOLOG_PT_BYTES_POST] = "Bytes after compression", + [FIFOLOG_PT_WRITES] = "Writes", + [FIFOLOG_PT_FLUSH] = "Flushes", + [FIFOLOG_PT_SYNC] = "Syncs", + [FIFOLOG_PT_RUNTIME] = "Runtime" }; /* @@ -182,7 +182,7 @@ fifolog_write_output(struct fifolog_writ return (0); - if (h + l < (long)f->ff->recsize && fl == Z_NO_FLUSH) + if (h + l < (long)f->ff->recsize && fl == Z_NO_FLUSH) return (0); w = f->ff->recsize - l; @@ -258,7 +258,7 @@ fprintf(stderr, "Z len %3d fin %d now %l #ifdef DBG if (i || f->ff->zs->avail_in) -fprintf(stderr, "fl = %d, i = %d ai = %u ao = %u fx=%02x\n", fl, i, +fprintf(stderr, "fl = %d, i = %d ai = %u ao = %u fx=%02x\n", fl, i, f->ff->zs->avail_in, f->ff->zs->avail_out, f->flag); #endif @@ -321,7 +321,7 @@ fifolog_write_bytes(struct fifolog_write if (now != f->last) { id |= FIFOLOG_TIMESTAMP; f->last = now; - } + } /* Emit instance+flag */ be32enc(buf, id); Modified: head/usr.sbin/fifolog/lib/miniobj.h ============================================================================== --- head/usr.sbin/fifolog/lib/miniobj.h Fri Feb 25 09:29:32 2011 (r219026) +++ head/usr.sbin/fifolog/lib/miniobj.h Fri Feb 25 09:40:17 2011 (r219027) @@ -26,11 +26,11 @@ * $FreeBSD$ */ -#define ALLOC_OBJ(to, type_magic) \ +#define ALLOC_OBJ(to, type_magic) \ do { \ (to) = calloc(sizeof *(to), 1); \ - assert((to) != NULL); \ - (to)->magic = (type_magic); \ + if ((to) != NULL) \ + (to)->magic = (type_magic); \ } while (0) #define FREE_OBJ(to) \ @@ -39,6 +39,9 @@ free(to); \ } while (0) +#define VALID_OBJ(ptr, type_magic) \ + ((ptr) != NULL && (ptr)->magic == (type_magic)) + #define CHECK_OBJ(ptr, type_magic) \ do { \ assert((ptr)->magic == type_magic); \ @@ -50,6 +53,12 @@ assert((ptr)->magic == type_magic); \ } while (0) +#define CHECK_OBJ_ORNULL(ptr, type_magic) \ + do { \ + if ((ptr) != NULL) \ + assert((ptr)->magic == type_magic); \ + } while (0) + #define CAST_OBJ(to, from, type_magic) \ do { \ (to) = (from); \ @@ -57,10 +66,9 @@ CHECK_OBJ((to), (type_magic)); \ } while (0) -#define CAST_OBJ_NOTNULL(to, from, type_magic) \ +#define CAST_OBJ_NOTNULL(to, from, type_magic) \ do { \ (to) = (from); \ assert((to) != NULL); \ CHECK_OBJ((to), (type_magic)); \ } while (0) - From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 10:11:02 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 50BF01065672; Fri, 25 Feb 2011 10:11:02 +0000 (UTC) (envelope-from netchild@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3D3448FC0C; Fri, 25 Feb 2011 10:11:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PAB2Aq024556; Fri, 25 Feb 2011 10:11:02 GMT (envelope-from netchild@svn.freebsd.org) Received: (from netchild@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PAB1XR024532; Fri, 25 Feb 2011 10:11:01 GMT (envelope-from netchild@svn.freebsd.org) Message-Id: <201102251011.p1PAB1XR024532@svn.freebsd.org> From: Alexander Leidinger Date: Fri, 25 Feb 2011 10:11:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219028 - in head/sys: cam fs/nfsclient fs/nfsserver kern nfsclient nfsserver security/audit security/mac X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 10:11:02 -0000 Author: netchild Date: Fri Feb 25 10:11:01 2011 New Revision: 219028 URL: http://svn.freebsd.org/changeset/base/219028 Log: Add some FEATURE macros for various features (AUDIT/CAM/IPC/KTR/MAC/NFS/NTP/ PMC/SYSV/...). No FreeBSD version bump, the userland application to query the features will be committed last and can serve as an indication of the availablility if needed. Sponsored by: Google Summer of Code 2010 Submitted by: kibab Reviewed by: arch@ (parts by rwatson, trasz, jhb) X-MFC after: to be determined in last commit with code from this project Modified: head/sys/cam/cam.c head/sys/fs/nfsclient/nfs_clvfsops.c head/sys/fs/nfsserver/nfs_nfsdport.c head/sys/kern/kern_dtrace.c head/sys/kern/kern_ktr.c head/sys/kern/kern_ktrace.c head/sys/kern/kern_lock.c head/sys/kern/kern_ntptime.c head/sys/kern/kern_pmc.c head/sys/kern/kern_prot.c head/sys/kern/ksched.c head/sys/kern/subr_mchain.c head/sys/kern/subr_stack.c head/sys/kern/sysv_msg.c head/sys/kern/sysv_sem.c head/sys/kern/sysv_shm.c head/sys/kern/uipc_cow.c head/sys/kern/uipc_mqueue.c head/sys/kern/uipc_sem.c head/sys/nfsclient/nfs_vfsops.c head/sys/nfsserver/nfs_serv.c head/sys/security/audit/audit.c head/sys/security/mac/mac_syscalls.c Modified: head/sys/cam/cam.c ============================================================================== --- head/sys/cam/cam.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/cam/cam.c Fri Feb 25 10:11:01 2011 (r219028) @@ -51,6 +51,9 @@ __FBSDID("$FreeBSD$"); #include #include #include + +FEATURE(scbus, "SCSI devices support"); + #endif static int camstatusentrycomp(const void *key, const void *member); Modified: head/sys/fs/nfsclient/nfs_clvfsops.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clvfsops.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/fs/nfsclient/nfs_clvfsops.c Fri Feb 25 10:11:01 2011 (r219028) @@ -73,6 +73,8 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(nfscl, "NFSv4 client"); + extern int nfscl_ticks; extern struct timeval nfsboottime; extern struct nfsstats newnfsstats; Modified: head/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdport.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/fs/nfsserver/nfs_nfsdport.c Fri Feb 25 10:11:01 2011 (r219028) @@ -46,6 +46,8 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(nfsd, "NFSv4 server"); + extern u_int32_t newnfs_true, newnfs_false, newnfs_xdrneg1; extern int nfsrv_useacl; extern int newnfs_numnfsd; Modified: head/sys/kern/kern_dtrace.c ============================================================================== --- head/sys/kern/kern_dtrace.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/kern_dtrace.c Fri Feb 25 10:11:01 2011 (r219028) @@ -37,10 +37,14 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define KDTRACE_PROC_SIZE 64 #define KDTRACE_THREAD_SIZE 256 +FEATURE(kdtrace_hooks, + "Kernel DTrace hooks which are required to load DTrace kernel modules"); + MALLOC_DEFINE(M_KDTRACE, "kdtrace", "DTrace hooks"); /* Return the DTrace process data size compiled in the kernel hooks. */ Modified: head/sys/kern/kern_ktr.c ============================================================================== --- head/sys/kern/kern_ktr.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/kern_ktr.c Fri Feb 25 10:11:01 2011 (r219028) @@ -80,6 +80,8 @@ __FBSDID("$FreeBSD$"); #define KTR_CPU PCPU_GET(cpuid) #endif +FEATURE(ktr, "Kernel support for KTR kernel tracing facility"); + SYSCTL_NODE(_debug, OID_AUTO, ktr, CTLFLAG_RD, 0, "KTR options"); int ktr_cpumask = KTR_CPUMASK; Modified: head/sys/kern/kern_ktrace.c ============================================================================== --- head/sys/kern/kern_ktrace.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/kern_ktrace.c Fri Feb 25 10:11:01 2011 (r219028) @@ -83,6 +83,8 @@ static MALLOC_DEFINE(M_KTRACE, "KTRACE", #ifdef KTRACE +FEATURE(ktrace, "Kernel support for system-call tracing"); + #ifndef KTRACE_REQUEST_POOL #define KTRACE_REQUEST_POOL 100 #endif Modified: head/sys/kern/kern_lock.c ============================================================================== --- head/sys/kern/kern_lock.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/kern_lock.c Fri Feb 25 10:11:01 2011 (r219028) @@ -1299,6 +1299,10 @@ lockstatus(struct lock *lk) } #ifdef INVARIANT_SUPPORT + +FEATURE(invariant_support, + "Support for modules compiled with INVARIANTS option"); + #ifndef INVARIANTS #undef _lockmgr_assert #endif Modified: head/sys/kern/kern_ntptime.c ============================================================================== --- head/sys/kern/kern_ntptime.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/kern_ntptime.c Fri Feb 25 10:11:01 2011 (r219028) @@ -51,6 +51,10 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef PPS_SYNC +FEATURE(pps_sync, "Support usage of external PPS signal by kernel PLL"); +#endif + /* * Single-precision macros for 64-bit machines */ Modified: head/sys/kern/kern_pmc.c ============================================================================== --- head/sys/kern/kern_pmc.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/kern_pmc.c Fri Feb 25 10:11:01 2011 (r219028) @@ -37,8 +37,10 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef HWPMC_HOOKS +FEATURE(hwpmc_hooks, "Kernel support for HW PMC"); #define PMC_KERNEL_VERSION PMC_VERSION #else #define PMC_KERNEL_VERSION 0 Modified: head/sys/kern/kern_prot.c ============================================================================== --- head/sys/kern/kern_prot.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/kern_prot.c Fri Feb 25 10:11:01 2011 (r219028) @@ -69,6 +69,11 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef REGRESSION +FEATURE(regression, + "Kernel support for interfaces nessesary for regression testing (SECURITY RISK!)"); +#endif + #if defined(INET) || defined(INET6) #include #include Modified: head/sys/kern/ksched.c ============================================================================== --- head/sys/kern/ksched.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/ksched.c Fri Feb 25 10:11:01 2011 (r219028) @@ -41,12 +41,16 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include #include #include #include #include #include +FEATURE(kposix_priority_scheduling, "POSIX P1003.1B realtime extensions"); + /* ksched: Real-time extension to support POSIX priority scheduling. */ Modified: head/sys/kern/subr_mchain.c ============================================================================== --- head/sys/kern/subr_mchain.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/subr_mchain.c Fri Feb 25 10:11:01 2011 (r219028) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -40,6 +41,8 @@ __FBSDID("$FreeBSD$"); #include +FEATURE(libmchain, "mchain library"); + MODULE_VERSION(libmchain, 1); #define MBERROR(format, ...) printf("%s(%d): "format, __func__ , \ Modified: head/sys/kern/subr_stack.c ============================================================================== --- head/sys/kern/subr_stack.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/subr_stack.c Fri Feb 25 10:11:01 2011 (r219028) @@ -39,6 +39,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include + +FEATURE(stack, "Support for capturing kernel stack"); static MALLOC_DEFINE(M_STACK, "stack", "Stack Traces"); Modified: head/sys/kern/sysv_msg.c ============================================================================== --- head/sys/kern/sysv_msg.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/sysv_msg.c Fri Feb 25 10:11:01 2011 (r219028) @@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$"); #include +FEATURE(sysv_msg, "System V message queues support"); + static MALLOC_DEFINE(M_MSG, "msg", "SVID compatible message queues"); static int msginit(void); Modified: head/sys/kern/sysv_sem.c ============================================================================== --- head/sys/kern/sysv_sem.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/sysv_sem.c Fri Feb 25 10:11:01 2011 (r219028) @@ -62,6 +62,8 @@ __FBSDID("$FreeBSD$"); #include +FEATURE(sysv_sem, "System V semaphores support"); + static MALLOC_DEFINE(M_SEM, "sem", "SVID compatible semaphores"); #ifdef SEM_DEBUG Modified: head/sys/kern/sysv_shm.c ============================================================================== --- head/sys/kern/sysv_shm.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/sysv_shm.c Fri Feb 25 10:11:01 2011 (r219028) @@ -95,6 +95,8 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(sysv_shm, "System V shared memory segments support"); + static MALLOC_DEFINE(M_SHM, "shm", "SVID compatible shared memory segments"); static int shmget_allocate_segment(struct thread *td, Modified: head/sys/kern/uipc_cow.c ============================================================================== --- head/sys/kern/uipc_cow.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/uipc_cow.c Fri Feb 25 10:11:01 2011 (r219028) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -57,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(zero_copy_sockets, "Zero copy sockets support"); struct netsend_cow_stats { int attempted; Modified: head/sys/kern/uipc_mqueue.c ============================================================================== --- head/sys/kern/uipc_mqueue.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/uipc_mqueue.c Fri Feb 25 10:11:01 2011 (r219028) @@ -82,6 +82,8 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(p1003_1b_mqueue, "POSIX P1003.1B message queues support"); + /* * Limits and constants */ Modified: head/sys/kern/uipc_sem.c ============================================================================== --- head/sys/kern/uipc_sem.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/kern/uipc_sem.c Fri Feb 25 10:11:01 2011 (r219028) @@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$"); #include +FEATURE(p1003_1b_semaphores, "POSIX1003.1B semaphores support"); /* * TODO * Modified: head/sys/nfsclient/nfs_vfsops.c ============================================================================== --- head/sys/nfsclient/nfs_vfsops.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/nfsclient/nfs_vfsops.c Fri Feb 25 10:11:01 2011 (r219028) @@ -78,6 +78,8 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(nfsclient, "NFS client"); + MALLOC_DEFINE(M_NFSREQ, "nfsclient_req", "NFS request header"); MALLOC_DEFINE(M_NFSBIGFH, "nfsclient_bigfh", "NFS version 3 file handle"); MALLOC_DEFINE(M_NFSDIROFF, "nfsclient_diroff", "NFS directory offset data"); Modified: head/sys/nfsserver/nfs_serv.c ============================================================================== --- head/sys/nfsserver/nfs_serv.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/nfsserver/nfs_serv.c Fri Feb 25 10:11:01 2011 (r219028) @@ -97,6 +97,8 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(nfsserver, "NFS server"); + #ifdef NFSRV_DEBUG #define nfsdbprintf(info) printf info #else Modified: head/sys/security/audit/audit.c ============================================================================== --- head/sys/security/audit/audit.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/security/audit/audit.c Fri Feb 25 10:11:01 2011 (r219028) @@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$"); #include +FEATURE(audit, "BSM audit support"); + static uma_zone_t audit_record_zone; static MALLOC_DEFINE(M_AUDITCRED, "audit_cred", "Audit cred storage"); MALLOC_DEFINE(M_AUDITDATA, "audit_data", "Audit data storage"); Modified: head/sys/security/mac/mac_syscalls.c ============================================================================== --- head/sys/security/mac/mac_syscalls.c Fri Feb 25 09:40:17 2011 (r219027) +++ head/sys/security/mac/mac_syscalls.c Fri Feb 25 10:11:01 2011 (r219028) @@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -72,6 +73,8 @@ __FBSDID("$FreeBSD$"); #ifdef MAC +FEATURE(mac, "Mandatory Access Control Framework support"); + int __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap) { From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 10:23:08 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 875AE106566B; Fri, 25 Feb 2011 10:23:08 +0000 (UTC) (envelope-from remko@elvandar.org) Received: from mailgate.jr-hosting.nl (mailgate.jr-hosting.nl [IPv6:2a01:4f8:63:1281::3]) by mx1.freebsd.org (Postfix) with ESMTP id 1C1788FC13; Fri, 25 Feb 2011 10:23:08 +0000 (UTC) Received: from [10.0.2.10] (caelis.elvandar.org [83.163.38.147]) by mailgate.jr-hosting.nl (Postfix) with ESMTPSA id 433FF1CC4A; Fri, 25 Feb 2011 11:23:06 +0100 (CET) Mime-Version: 1.0 (Apple Message framework v1082) Content-Type: text/plain; charset=us-ascii From: Remko Lodder In-Reply-To: <20110225070237.F983@besplex.bde.org> Date: Fri, 25 Feb 2011 11:23:04 +0100 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201102241613.p1OGDXpM047076@svn.freebsd.org> <201102241347.39267.jhb@freebsd.org> <5965E5EC-A725-423A-9420-B84AD09993DC@elvandar.org> <201102241435.09011.jhb@freebsd.org> <20110225070237.F983@besplex.bde.org> To: Bruce Evans X-Mailer: Apple Mail (2.1082) Cc: src-committers@FreeBSD.org, John Baldwin , svn-src-all@FreeBSD.org, davidxu@FreeBSD.org, svn-src-head@FreeBSD.org, Remko Lodder Subject: Re: svn commit: r219003 - head/usr.bin/nice X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 10:23:08 -0000 On Feb 24, 2011, at 10:47 PM, Bruce Evans wrote: > On Thu, 24 Feb 2011, John Baldwin wrote: >=20 >> On Thursday, February 24, 2011 2:03:33 pm Remko Lodder wrote: >>>=20 > [contex restored: > +A priority of 19 or 20 will prevent a process from taking any cycles = from > +others at nice 0 or better.] [strip information overload]. So, what is the consensus instead of overwelming me with too much = information? --=20 /"\ Best regards, | remko@FreeBSD.org \ / Remko Lodder | X http://www.evilcoder.org/ | Quis custodiet ipsos custodes / \ ASCII Ribbon Campaign | Against HTML Mail and News From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 10:24:35 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E1C561065672; Fri, 25 Feb 2011 10:24:35 +0000 (UTC) (envelope-from netchild@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CDF148FC16; Fri, 25 Feb 2011 10:24:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PAOZMp025666; Fri, 25 Feb 2011 10:24:35 GMT (envelope-from netchild@svn.freebsd.org) Received: (from netchild@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PAOZUs025635; Fri, 25 Feb 2011 10:24:35 GMT (envelope-from netchild@svn.freebsd.org) Message-Id: <201102251024.p1PAOZUs025635@svn.freebsd.org> From: Alexander Leidinger Date: Fri, 25 Feb 2011 10:24:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219029 - in head/sys/geom: . bde cache concat eli gate journal label linux_lvm mirror multipath part raid3 shsec stripe uzip virstor X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 10:24:36 -0000 Author: netchild Date: Fri Feb 25 10:24:35 2011 New Revision: 219029 URL: http://svn.freebsd.org/changeset/base/219029 Log: Add some FEATURE macros for various GEOM classes. No FreeBSD version bump, the userland application to query the features will be committed last and can serve as an indication of the availablility if needed. Sponsored by: Google Summer of Code 2010 Submitted by: kibab Reviewed by: silence on geom@ during 2 weeks X-MFC after: to be determined in last commit with code from this project Modified: head/sys/geom/bde/g_bde.c head/sys/geom/cache/g_cache.c head/sys/geom/concat/g_concat.c head/sys/geom/eli/g_eli.c head/sys/geom/gate/g_gate.c head/sys/geom/geom_bsd.c head/sys/geom/geom_fox.c head/sys/geom/geom_mbr.c head/sys/geom/geom_pc98.c head/sys/geom/geom_sunlabel.c head/sys/geom/geom_vol_ffs.c head/sys/geom/journal/g_journal.c head/sys/geom/label/g_label.c head/sys/geom/linux_lvm/g_linux_lvm.c head/sys/geom/mirror/g_mirror.c head/sys/geom/multipath/g_multipath.c head/sys/geom/part/g_part_apm.c head/sys/geom/part/g_part_bsd.c head/sys/geom/part/g_part_ebr.c head/sys/geom/part/g_part_gpt.c head/sys/geom/part/g_part_mbr.c head/sys/geom/part/g_part_pc98.c head/sys/geom/part/g_part_vtoc8.c head/sys/geom/raid3/g_raid3.c head/sys/geom/shsec/g_shsec.c head/sys/geom/stripe/g_stripe.c head/sys/geom/uzip/g_uzip.c head/sys/geom/virstor/g_virstor.c Modified: head/sys/geom/bde/g_bde.c ============================================================================== --- head/sys/geom/bde/g_bde.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/bde/g_bde.c Fri Feb 25 10:24:35 2011 (r219029) @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -48,6 +49,8 @@ #include #define BDE_CLASS_NAME "BDE" +FEATURE(geom_bde, "GEOM-based Disk Encryption"); + static void g_bde_start(struct bio *bp) { Modified: head/sys/geom/cache/g_cache.c ============================================================================== --- head/sys/geom/cache/g_cache.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/cache/g_cache.c Fri Feb 25 10:24:35 2011 (r219029) @@ -42,6 +42,8 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(geom_cache, "GEOM cache module"); + static MALLOC_DEFINE(M_GCACHE, "gcache_data", "GEOM_CACHE Data"); SYSCTL_DECL(_kern_geom); Modified: head/sys/geom/concat/g_concat.c ============================================================================== --- head/sys/geom/concat/g_concat.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/concat/g_concat.c Fri Feb 25 10:24:35 2011 (r219029) @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(geom_concat, "GEOM concatenation support"); static MALLOC_DEFINE(M_CONCAT, "concat_data", "GEOM_CONCAT Data"); Modified: head/sys/geom/eli/g_eli.c ============================================================================== --- head/sys/geom/eli/g_eli.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/eli/g_eli.c Fri Feb 25 10:24:35 2011 (r219029) @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(geom_eli, "GEOM crypto module"); MALLOC_DEFINE(M_ELI, "eli data", "GEOM_ELI Data"); Modified: head/sys/geom/gate/g_gate.c ============================================================================== --- head/sys/geom/gate/g_gate.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/gate/g_gate.c Fri Feb 25 10:24:35 2011 (r219029) @@ -53,6 +53,8 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(geom_gate, "GEOM Gate module"); + static MALLOC_DEFINE(M_GATE, "gg_data", "GEOM Gate Data"); SYSCTL_DECL(_kern_geom); Modified: head/sys/geom/geom_bsd.c ============================================================================== --- head/sys/geom/geom_bsd.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/geom_bsd.c Fri Feb 25 10:24:35 2011 (r219029) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -60,6 +61,8 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(geom_bsd, "GEOM BSD disklabels support"); + #define BSD_CLASS_NAME "BSD" #define ALPHA_LABEL_OFFSET 64 Modified: head/sys/geom/geom_fox.c ============================================================================== --- head/sys/geom/geom_fox.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/geom_fox.c Fri Feb 25 10:24:35 2011 (r219029) @@ -37,6 +37,7 @@ #include #include +#include #include #include #include @@ -52,6 +53,8 @@ #define FOX_CLASS_NAME "FOX" #define FOX_MAGIC "GEOM::FOX" +FEATURE(geom_fox, "GEOM FOX redundant path mitigation support"); + struct g_fox_softc { off_t mediasize; u_int sectorsize; Modified: head/sys/geom/geom_mbr.c ============================================================================== --- head/sys/geom/geom_mbr.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/geom_mbr.c Fri Feb 25 10:24:35 2011 (r219029) @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -50,6 +51,8 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(geom_mbr, "GEOM DOS/MBR partitioning support"); + #define MBR_CLASS_NAME "MBR" #define MBREXT_CLASS_NAME "MBREXT" Modified: head/sys/geom/geom_pc98.c ============================================================================== --- head/sys/geom/geom_pc98.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/geom_pc98.c Fri Feb 25 10:24:35 2011 (r219029) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -47,6 +48,8 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(geom_pc98, "GEOM NEC PC9800 partitioning support"); + #define PC98_CLASS_NAME "PC98" struct g_pc98_softc { Modified: head/sys/geom/geom_sunlabel.c ============================================================================== --- head/sys/geom/geom_sunlabel.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/geom_sunlabel.c Fri Feb 25 10:24:35 2011 (r219029) @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -51,6 +52,8 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(geom_sunlabel, "GEOM Sun/Solaris partitioning support"); + #define SUNLABEL_CLASS_NAME "SUN" struct g_sunlabel_softc { Modified: head/sys/geom/geom_vol_ffs.c ============================================================================== --- head/sys/geom/geom_vol_ffs.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/geom_vol_ffs.c Fri Feb 25 10:24:35 2011 (r219029) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -42,6 +43,8 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(geom_vol, "GEOM support for volume names from UFS superblock"); + #define VOL_FFS_CLASS_NAME "VOL_FFS" static int superblocks[] = SBLOCKSEARCH; Modified: head/sys/geom/journal/g_journal.c ============================================================================== --- head/sys/geom/journal/g_journal.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/journal/g_journal.c Fri Feb 25 10:24:35 2011 (r219029) @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #include +FEATURE(geom_journal, "GEOM journaling support"); /* * On-disk journal format: Modified: head/sys/geom/label/g_label.c ============================================================================== --- head/sys/geom/label/g_label.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/label/g_label.c Fri Feb 25 10:24:35 2011 (r219029) @@ -36,10 +36,12 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include +FEATURE(geom_label, "GEOM labeling support"); SYSCTL_DECL(_kern_geom); SYSCTL_NODE(_kern_geom, OID_AUTO, label, CTLFLAG_RW, 0, "GEOM_LABEL stuff"); Modified: head/sys/geom/linux_lvm/g_linux_lvm.c ============================================================================== --- head/sys/geom/linux_lvm/g_linux_lvm.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/linux_lvm/g_linux_lvm.c Fri Feb 25 10:24:35 2011 (r219029) @@ -42,6 +42,8 @@ __FBSDID("$FreeBSD$"); #include +FEATURE(geom_linux_lvm, "GEOM Linux LVM partitioning support"); + /* Declare malloc(9) label */ static MALLOC_DEFINE(M_GLLVM, "gllvm", "GEOM_LINUX_LVM Data"); Modified: head/sys/geom/mirror/g_mirror.c ============================================================================== --- head/sys/geom/mirror/g_mirror.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/mirror/g_mirror.c Fri Feb 25 10:24:35 2011 (r219029) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(geom_mirror, "GEOM mirroring support"); static MALLOC_DEFINE(M_MIRROR, "mirror_data", "GEOM_MIRROR Data"); Modified: head/sys/geom/multipath/g_multipath.c ============================================================================== --- head/sys/geom/multipath/g_multipath.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/multipath/g_multipath.c Fri Feb 25 10:24:35 2011 (r219029) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(geom_multipath, "GEOM multipath support"); SYSCTL_DECL(_kern_geom); SYSCTL_NODE(_kern_geom, OID_AUTO, multipath, CTLFLAG_RW, 0, Modified: head/sys/geom/part/g_part_apm.c ============================================================================== --- head/sys/geom/part/g_part_apm.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/part/g_part_apm.c Fri Feb 25 10:24:35 2011 (r219029) @@ -41,11 +41,14 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include "g_part_if.h" +FEATURE(geom_part_apm, "GEOM partitioning class for Apple-style partitions"); + struct g_part_apm_table { struct g_part_table base; struct apm_ddr ddr; Modified: head/sys/geom/part/g_part_bsd.c ============================================================================== --- head/sys/geom/part/g_part_bsd.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/part/g_part_bsd.c Fri Feb 25 10:24:35 2011 (r219029) @@ -40,11 +40,14 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include "g_part_if.h" +FEATURE(geom_part_bsd, "GEOM partitioning class for BSD disklabels"); + struct g_part_bsd_table { struct g_part_table base; u_char *bbarea; Modified: head/sys/geom/part/g_part_ebr.c ============================================================================== --- head/sys/geom/part/g_part_ebr.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/part/g_part_ebr.c Fri Feb 25 10:24:35 2011 (r219029) @@ -42,11 +42,19 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include "g_part_if.h" +FEATURE(geom_part_ebr, + "GEOM partitioning class for extended boot records support"); +#if defined(GEOM_PART_EBR_COMPAT) +FEATURE(geom_part_ebr_compat, + "GEOM EBR partitioning class: backward-compatible partition names"); +#endif + #define EBRSIZE 512 struct g_part_ebr_table { Modified: head/sys/geom/part/g_part_gpt.c ============================================================================== --- head/sys/geom/part/g_part_gpt.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/part/g_part_gpt.c Fri Feb 25 10:24:35 2011 (r219029) @@ -41,12 +41,15 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include "g_part_if.h" +FEATURE(geom_part_gpt, "GEOM partitioning class for GPT partitions support"); + CTASSERT(offsetof(struct gpt_hdr, padding) == 92); CTASSERT(sizeof(struct gpt_ent) == 128); Modified: head/sys/geom/part/g_part_mbr.c ============================================================================== --- head/sys/geom/part/g_part_mbr.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/part/g_part_mbr.c Fri Feb 25 10:24:35 2011 (r219029) @@ -40,11 +40,14 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include "g_part_if.h" +FEATURE(geom_part_mbr, "GEOM partitioning class for MBR support"); + #define MBRSIZE 512 struct g_part_mbr_table { Modified: head/sys/geom/part/g_part_pc98.c ============================================================================== --- head/sys/geom/part/g_part_pc98.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/part/g_part_pc98.c Fri Feb 25 10:24:35 2011 (r219029) @@ -40,11 +40,14 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include "g_part_if.h" +FEATURE(geom_part_pc98, "GEOM partitioning class for PC-9800 disk partitions"); + #define SECSIZE 512 #define MENUSIZE 7168 #define BOOTSIZE 8192 Modified: head/sys/geom/part/g_part_vtoc8.c ============================================================================== --- head/sys/geom/part/g_part_vtoc8.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/part/g_part_vtoc8.c Fri Feb 25 10:24:35 2011 (r219029) @@ -39,12 +39,15 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include "g_part_if.h" +FEATURE(geom_part_vtoc8, "GEOM partitioning class for SMI VTOC8 disk labels"); + struct g_part_vtoc8_table { struct g_part_table base; struct vtoc8 vtoc; Modified: head/sys/geom/raid3/g_raid3.c ============================================================================== --- head/sys/geom/raid3/g_raid3.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/raid3/g_raid3.c Fri Feb 25 10:24:35 2011 (r219029) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(geom_raid3, "GEOM RAID-3 functionality"); static MALLOC_DEFINE(M_RAID3, "raid3_data", "GEOM_RAID3 Data"); Modified: head/sys/geom/shsec/g_shsec.c ============================================================================== --- head/sys/geom/shsec/g_shsec.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/shsec/g_shsec.c Fri Feb 25 10:24:35 2011 (r219029) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(geom_shsec, "GEOM shared secret device support"); static MALLOC_DEFINE(M_SHSEC, "shsec_data", "GEOM_SHSEC Data"); Modified: head/sys/geom/stripe/g_stripe.c ============================================================================== --- head/sys/geom/stripe/g_stripe.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/stripe/g_stripe.c Fri Feb 25 10:24:35 2011 (r219029) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(geom_stripe, "GEOM striping support"); static MALLOC_DEFINE(M_STRIPE, "stripe_data", "GEOM_STRIPE Data"); Modified: head/sys/geom/uzip/g_uzip.c ============================================================================== --- head/sys/geom/uzip/g_uzip.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/uzip/g_uzip.c Fri Feb 25 10:24:35 2011 (r219029) @@ -36,10 +36,13 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include +FEATURE(geom_uzip, "GEOM uzip read-only compressed disks support"); + #undef GEOM_UZIP_DEBUG #ifdef GEOM_UZIP_DEBUG #define DPRINTF(a) printf a Modified: head/sys/geom/virstor/g_virstor.c ============================================================================== --- head/sys/geom/virstor/g_virstor.c Fri Feb 25 10:11:01 2011 (r219028) +++ head/sys/geom/virstor/g_virstor.c Fri Feb 25 10:24:35 2011 (r219029) @@ -52,6 +52,8 @@ __FBSDID("$FreeBSD$"); #include #include +FEATURE(g_virstor, "GEOM virtual storage support"); + /* Declare malloc(9) label */ static MALLOC_DEFINE(M_GVIRSTOR, "gvirstor", "GEOM_VIRSTOR Data"); From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 12:46:43 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B80D7106564A; Fri, 25 Feb 2011 12:46:43 +0000 (UTC) (envelope-from netchild@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A6B908FC13; Fri, 25 Feb 2011 12:46:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PCkhYf039038; Fri, 25 Feb 2011 12:46:43 GMT (envelope-from netchild@svn.freebsd.org) Received: (from netchild@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PCkhXb039036; Fri, 25 Feb 2011 12:46:43 GMT (envelope-from netchild@svn.freebsd.org) Message-Id: <201102251246.p1PCkhXb039036@svn.freebsd.org> From: Alexander Leidinger Date: Fri, 25 Feb 2011 12:46:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219030 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 12:46:43 -0000 Author: netchild Date: Fri Feb 25 12:46:43 2011 New Revision: 219030 URL: http://svn.freebsd.org/changeset/base/219030 Log: Make the description of the feature consistent with another similar description for another feature. Noticed by: trasz Modified: head/sys/kern/uipc_sem.c Modified: head/sys/kern/uipc_sem.c ============================================================================== --- head/sys/kern/uipc_sem.c Fri Feb 25 10:24:35 2011 (r219029) +++ head/sys/kern/uipc_sem.c Fri Feb 25 12:46:43 2011 (r219030) @@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$"); #include -FEATURE(p1003_1b_semaphores, "POSIX1003.1B semaphores support"); +FEATURE(p1003_1b_semaphores, "POSIX P1003.1B semaphores support"); /* * TODO * From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 12:58:41 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3F6B106564A; Fri, 25 Feb 2011 12:58:41 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id B02C68FC08; Fri, 25 Feb 2011 12:58:41 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 4156946B17; Fri, 25 Feb 2011 07:58:41 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.10]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 530A88A009; Fri, 25 Feb 2011 07:58:40 -0500 (EST) From: John Baldwin To: Remko Lodder Date: Fri, 25 Feb 2011 07:37:42 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.4-CBSD-20110107; KDE/4.4.5; amd64; ; ) References: <201102241613.p1OGDXpM047076@svn.freebsd.org> <20110225070237.F983@besplex.bde.org> In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201102250737.43182.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Fri, 25 Feb 2011 07:58:40 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=0.5 required=4.2 tests=BAYES_00,MAY_BE_FORGED, RDNS_DYNAMIC autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bigwig.baldwin.cx Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, davidxu@freebsd.org, Bruce Evans , svn-src-head@freebsd.org, Remko Lodder Subject: Re: svn commit: r219003 - head/usr.bin/nice X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 12:58:42 -0000 On Friday, February 25, 2011 5:23:04 am Remko Lodder wrote: > > On Feb 24, 2011, at 10:47 PM, Bruce Evans wrote: > > > On Thu, 24 Feb 2011, John Baldwin wrote: > > > >> On Thursday, February 24, 2011 2:03:33 pm Remko Lodder wrote: > >>> > > [contex restored: > > +A priority of 19 or 20 will prevent a process from taking any cycles from > > +others at nice 0 or better.] > > > [strip information overload]. > > So, what is the consensus instead of overwelming me with too much information? Take that sentence out. It is not accurate for our schedulers. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 13:59:59 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EFACF106564A; Fri, 25 Feb 2011 13:59:59 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DE3DA8FC22; Fri, 25 Feb 2011 13:59:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PDxxgr053384; Fri, 25 Feb 2011 13:59:59 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PDxxT0053382; Fri, 25 Feb 2011 13:59:59 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201102251359.p1PDxxT0053382@svn.freebsd.org> From: Sergey Kandaurov Date: Fri, 25 Feb 2011 13:59:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219031 - head/usr.sbin/mfiutil X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 14:00:00 -0000 Author: pluknet Date: Fri Feb 25 13:59:59 2011 New Revision: 219031 URL: http://svn.freebsd.org/changeset/base/219031 Log: Fix division by zero, causing floating point exception in a drive progress command. It was possible to read a value of zero from a busy controller used as the divisor to calculate the remaining rebuild time. Reported by: Pavel Udovenko Discussed with: jhb Approved by: kib (mentor) MFC after: 1 week Modified: head/usr.sbin/mfiutil/mfi_cmd.c Modified: head/usr.sbin/mfiutil/mfi_cmd.c ============================================================================== --- head/usr.sbin/mfiutil/mfi_cmd.c Fri Feb 25 12:46:43 2011 (r219030) +++ head/usr.sbin/mfiutil/mfi_cmd.c Fri Feb 25 13:59:59 2011 (r219031) @@ -316,7 +316,7 @@ mfi_display_progress(const char *label, printf("%s: %.2f%% complete, after %ds", label, (float)prog->progress * 100 / 0xffff, prog->elapsed_seconds); - if (prog->elapsed_seconds > 10) { + if (prog->progress != 0 && prog->elapsed_seconds > 10) { printf(" finished in "); seconds = (0x10000 * (uint32_t)prog->elapsed_seconds) / prog->progress - prog->elapsed_seconds; From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 16:21:11 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9587D106566C; Fri, 25 Feb 2011 16:21:11 +0000 (UTC) (envelope-from alc@rice.edu) Received: from mh2.mail.rice.edu (mh2.mail.rice.edu [128.42.201.21]) by mx1.freebsd.org (Postfix) with ESMTP id 5C7BF8FC12; Fri, 25 Feb 2011 16:21:11 +0000 (UTC) Received: from mh2.mail.rice.edu (localhost.localdomain [127.0.0.1]) by mh2.mail.rice.edu (Postfix) with ESMTP id 4FD5C28FAA7; Fri, 25 Feb 2011 10:05:46 -0600 (CST) X-Virus-Scanned: by amavis-2.6.4 at mh2.mail.rice.edu, auth channel Received: from mh2.mail.rice.edu ([127.0.0.1]) by mh2.mail.rice.edu (mh2.mail.rice.edu [127.0.0.1]) (amavis, port 10026) with ESMTP id 9upgLclPKoHe; Fri, 25 Feb 2011 10:05:46 -0600 (CST) Received: from adsl-216-63-78-18.dsl.hstntx.swbell.net (adsl-216-63-78-18.dsl.hstntx.swbell.net [216.63.78.18]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) (Authenticated sender: alc) by mh2.mail.rice.edu (Postfix) with ESMTPSA id 8108B28FAA2; Fri, 25 Feb 2011 10:05:45 -0600 (CST) Message-ID: <4D67D358.2070909@rice.edu> Date: Fri, 25 Feb 2011 10:05:44 -0600 From: Alan Cox User-Agent: Thunderbird 2.0.0.24 (X11/20100725) MIME-Version: 1.0 To: Bruce Evans References: <201102231028.p1NASbET045275@svn.freebsd.org> <20110224063233.Y1100@besplex.bde.org> <1298499116.9366.3.camel@core.nessbank> <20110224102112.P1871@besplex.bde.org> In-Reply-To: <20110224102112.P1871@besplex.bde.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Bruce Cran , svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Bruce Cran Subject: Re: svn commit: r218966 - head/sys/vm X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 16:21:11 -0000 Bruce Evans wrote: > On Wed, 23 Feb 2011, Bruce Cran wrote: > >> On Thu, 2011-02-24 at 08:23 +1100, Bruce Evans wrote: >> >>> The bug seems to have been overflow in this calculation. >>> [swap_bcount * SWAP_META_PAGES * n / ] >> >> I've attached a patch which changes 'n' to be of type vm_ooffset_t. I >> think this should fix the overflow bug? > > I don't like using vm_ooffset_t either. There are no offsets here, and > it's bad technique to depend on having a large type to avoid overflows > in expressions when the result type is different. > > I would cast operand(s) in the expression as necessary to prevent > overflow > of subexpressions. vm_pindex_t would work, but I prefer to use a type > related to the subexpressions. Not sure what that is. Maybe just > uintmax_t for safety (even that is not safe if the subexpressions have > large values). So: > > (uintmax_t)swap_bcount * SWAP_META_PAGES * n / mumble. > > I like to cast only the leftmost term if possible, and depend on the > larger type propagating to all subexpressions via left-to-right > evaluation. This saves a lot of casts. Here this may be sub-optimal > and we could probably delay the cast to the final multiplication, which > reduces to the same safeness as using uintmax_t for n. > > Next, there is the return type to consider. I don't see why it needs > to be changed from int. The patch in the PR actually changed it to > long, while changing n to vm_offset_t. But on 32-bit machines, long > is essentially the same as int, and vm_offset_t is not much larger. > Even 32-bit machine might actually need a type larger than 32 bits to > prevent overflow in expressions like the above. > With one exception, I would agree with what you have suggested above. I would argue for using a long. HP is already shipping amd64 architecture machines that support 2TB of RAM. In fact, we have already made changes to HEAD so that FreeBSD boots on these machines, albeit with a more modest amount of RAM. So, we are not that far away from the number of 4KB pages overflowing an int. In fact, it might plausibly happen before the End of Life for 9-STABLE. As you point out, most if not all of our page counters are still ints, but I see no reason for new or modified code like this not to begin the transition to a larger type. Alan From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 17:30:25 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE6EA106566B; Fri, 25 Feb 2011 17:30:25 +0000 (UTC) (envelope-from ken@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A56E98FC1D; Fri, 25 Feb 2011 17:30:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PHUPhf095727; Fri, 25 Feb 2011 17:30:25 GMT (envelope-from ken@svn.freebsd.org) Received: (from ken@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PHUPPx095723; Fri, 25 Feb 2011 17:30:25 GMT (envelope-from ken@svn.freebsd.org) Message-Id: <201102251730.p1PHUPPx095723@svn.freebsd.org> From: "Kenneth D. Merry" Date: Fri, 25 Feb 2011 17:30:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219036 - head/sys/dev/mps X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 17:30:25 -0000 Author: ken Date: Fri Feb 25 17:30:25 2011 New Revision: 219036 URL: http://svn.freebsd.org/changeset/base/219036 Log: Silence 'out of chain frames' warnings and bump the number of frames. mps.c: Hide the 'out of chain frames' warning behind MPS_INFO. mps_sas.c: Hide the SIM queue freeze/unfreeze messages behind MPS_INFO. mpsvar.h: Bump the number of chain frames from 1024 to 2048. From testing, it looks like this makes it less likely that we'll run out of chain frames, and it doesn't cost much memory (32K). MFC after: 3 days Modified: head/sys/dev/mps/mps.c head/sys/dev/mps/mps_sas.c head/sys/dev/mps/mpsvar.h Modified: head/sys/dev/mps/mps.c ============================================================================== --- head/sys/dev/mps/mps.c Fri Feb 25 16:08:31 2011 (r219035) +++ head/sys/dev/mps/mps.c Fri Feb 25 17:30:25 2011 (r219036) @@ -1705,7 +1705,7 @@ mps_data_cb(void *arg, bus_dma_segment_t sflags, nsegs - i); if (error != 0) { /* Resource shortage, roll back! */ - mps_printf(sc, "out of chain frames\n"); + mps_dprint(sc, MPS_INFO, "out of chain frames\n"); cm->cm_flags |= MPS_CM_FLAGS_CHAIN_FAILED; mps_complete_command(cm); return; Modified: head/sys/dev/mps/mps_sas.c ============================================================================== --- head/sys/dev/mps/mps_sas.c Fri Feb 25 16:08:31 2011 (r219035) +++ head/sys/dev/mps/mps_sas.c Fri Feb 25 17:30:25 2011 (r219036) @@ -1542,8 +1542,8 @@ mpssas_scsiio_complete(struct mps_softc if ((sassc->flags & MPSSAS_QUEUE_FROZEN) == 0) { xpt_freeze_simq(sassc->sim, 1); sassc->flags |= MPSSAS_QUEUE_FROZEN; - mps_printf(sc, "Error sending command, freezing " - "SIM queue\n"); + mps_dprint(sc, MPS_INFO, "Error sending command, " + "freezing SIM queue\n"); } } @@ -1556,7 +1556,8 @@ mpssas_scsiio_complete(struct mps_softc if (sassc->flags & MPSSAS_QUEUE_FROZEN) { ccb->ccb_h.status |= CAM_RELEASE_SIMQ; sassc->flags &= ~MPSSAS_QUEUE_FROZEN; - mps_printf(sc, "Unfreezing SIM queue\n"); + mps_dprint(sc, MPS_INFO, + "Unfreezing SIM queue\n"); } } else { ccb->ccb_h.status |= CAM_DEV_QFRZN; Modified: head/sys/dev/mps/mpsvar.h ============================================================================== --- head/sys/dev/mps/mpsvar.h Fri Feb 25 16:08:31 2011 (r219035) +++ head/sys/dev/mps/mpsvar.h Fri Feb 25 17:30:25 2011 (r219036) @@ -34,7 +34,7 @@ #define MPS_REQ_FRAMES 1024 #define MPS_EVT_REPLY_FRAMES 32 #define MPS_REPLY_FRAMES MPS_REQ_FRAMES -#define MPS_CHAIN_FRAMES 1024 +#define MPS_CHAIN_FRAMES 2048 #define MPS_SENSE_LEN SSD_FULL_SIZE #define MPS_MSI_COUNT 1 #define MPS_SGE64_SIZE 12 From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 18:29:58 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 492DC1065674; Fri, 25 Feb 2011 18:29:58 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1E7318FC0A; Fri, 25 Feb 2011 18:29:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PITw7F002513; Fri, 25 Feb 2011 18:29:58 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PITwOB002511; Fri, 25 Feb 2011 18:29:58 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201102251829.p1PITwOB002511@svn.freebsd.org> From: Jung-uk Kim Date: Fri, 25 Feb 2011 18:29:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219037 - head/sys/dev/acpica X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 18:29:58 -0000 Author: jkim Date: Fri Feb 25 18:29:57 2011 New Revision: 219037 URL: http://svn.freebsd.org/changeset/base/219037 Log: Add more definitions for vendor-specific CPU capability bits to the last revision, which is renamed to "Intel Processor Vendor-Specific ACPI". Modified: head/sys/dev/acpica/acpivar.h Modified: head/sys/dev/acpica/acpivar.h ============================================================================== --- head/sys/dev/acpica/acpivar.h Fri Feb 25 17:30:25 2011 (r219036) +++ head/sys/dev/acpica/acpivar.h Fri Feb 25 18:29:57 2011 (r219037) @@ -186,18 +186,20 @@ extern struct mtx acpi_mutex; /* * Various features and capabilities for the acpi_get_features() method. * In particular, these are used for the ACPI 3.0 _PDC and _OSC methods. - * See the Intel document titled "Processor Driver Capabilities Bit - * Definitions", number 302223-002. + * See the Intel document titled "Intel Processor Vendor-Specific ACPI", + * number 302223-005. */ -#define ACPI_CAP_PERF_MSRS (1 << 0) /* Intel SpeedStep PERF_CTL MSRs */ -#define ACPI_CAP_C1_IO_HALT (1 << 1) /* Intel C1 "IO then halt" sequence */ -#define ACPI_CAP_THR_MSRS (1 << 2) /* Intel OnDemand throttling MSRs */ -#define ACPI_CAP_SMP_SAME (1 << 3) /* MP C1, Px, and Tx (all the same) */ -#define ACPI_CAP_SMP_SAME_C3 (1 << 4) /* MP C2 and C3 (all the same) */ -#define ACPI_CAP_SMP_DIFF_PX (1 << 5) /* MP Px (different, using _PSD) */ -#define ACPI_CAP_SMP_DIFF_CX (1 << 6) /* MP Cx (different, using _CSD) */ -#define ACPI_CAP_SMP_DIFF_TX (1 << 7) /* MP Tx (different, using _TSD) */ -#define ACPI_CAP_SMP_C1_NATIVE (1 << 8) /* MP C1 support other than halt */ +#define ACPI_CAP_PERF_MSRS (1 << 0) /* Intel SpeedStep PERF_CTL MSRs */ +#define ACPI_CAP_C1_IO_HALT (1 << 1) /* Intel C1 "IO then halt" sequence */ +#define ACPI_CAP_THR_MSRS (1 << 2) /* Intel OnDemand throttling MSRs */ +#define ACPI_CAP_SMP_SAME (1 << 3) /* MP C1, Px, and Tx (all the same) */ +#define ACPI_CAP_SMP_SAME_C3 (1 << 4) /* MP C2 and C3 (all the same) */ +#define ACPI_CAP_SMP_DIFF_PX (1 << 5) /* MP Px (different, using _PSD) */ +#define ACPI_CAP_SMP_DIFF_CX (1 << 6) /* MP Cx (different, using _CSD) */ +#define ACPI_CAP_SMP_DIFF_TX (1 << 7) /* MP Tx (different, using _TSD) */ +#define ACPI_CAP_SMP_C1_NATIVE (1 << 8) /* MP C1 support other than halt */ +#define ACPI_CAP_SMP_C3_NATIVE (1 << 9) /* MP C2 and C3 support */ +#define ACPI_CAP_PX_HW_COORD (1 << 11) /* Intel P-state HW coordination */ /* * Quirk flags. From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 19:10:19 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA2BC1065679; Fri, 25 Feb 2011 19:10:19 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9A5A98FC16; Fri, 25 Feb 2011 19:10:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PJAJjU005320; Fri, 25 Feb 2011 19:10:19 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PJAJK8005318; Fri, 25 Feb 2011 19:10:19 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201102251910.p1PJAJK8005318@svn.freebsd.org> From: Jaakko Heinonen Date: Fri, 25 Feb 2011 19:10:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219038 - head/usr.bin/rs X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 19:10:19 -0000 Author: jh Date: Fri Feb 25 19:10:19 2011 New Revision: 219038 URL: http://svn.freebsd.org/changeset/base/219038 Log: Document the input line length limit. Submitted by: Dominic Fandrey (original version) Modified: head/usr.bin/rs/rs.1 Modified: head/usr.bin/rs/rs.1 ============================================================================== --- head/usr.bin/rs/rs.1 Fri Feb 25 18:29:57 2011 (r219037) +++ head/usr.bin/rs/rs.1 Fri Feb 25 19:10:19 2011 (r219038) @@ -28,7 +28,7 @@ .\" @(#)rs.1 8.2 (Berkeley) 12/30/93 .\" $FreeBSD$ .\" -.Dd July 30, 2004 +.Dd February 25, 2011 .Dt RS 1 .Os .Sh NAME @@ -237,4 +237,9 @@ Re-ordering of columns is not yet possib There are too many options. .It Multibyte characters are not recognized. +.It +Lines longer than +.Dv LINE_MAX +(2048) bytes are not processed and result in immediate termination of +.Nm . .El From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 19:38:42 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90F0C106564A; Fri, 25 Feb 2011 19:38:42 +0000 (UTC) (envelope-from remko@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 80D5A8FC13; Fri, 25 Feb 2011 19:38:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PJcgwW006477; Fri, 25 Feb 2011 19:38:42 GMT (envelope-from remko@svn.freebsd.org) Received: (from remko@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PJcg8C006475; Fri, 25 Feb 2011 19:38:42 GMT (envelope-from remko@svn.freebsd.org) Message-Id: <201102251938.p1PJcg8C006475@svn.freebsd.org> From: Remko Lodder Date: Fri, 25 Feb 2011 19:38:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219039 - head/usr.bin/nice X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 19:38:42 -0000 Author: remko Date: Fri Feb 25 19:38:42 2011 New Revision: 219039 URL: http://svn.freebsd.org/changeset/base/219039 Log: Revert the commit that I made, there is a lot of discussion and it's not accurate anyway Requested by: jb, bde Modified: head/usr.bin/nice/nice.1 Modified: head/usr.bin/nice/nice.1 ============================================================================== --- head/usr.bin/nice/nice.1 Fri Feb 25 19:10:19 2011 (r219038) +++ head/usr.bin/nice/nice.1 Fri Feb 25 19:38:42 2011 (r219039) @@ -50,11 +50,6 @@ value by the specified .Ar increment , or a default value of 10. The lower the nice value of a process, the higher its scheduling priority. -.Ar increment . -The priority can be adjusted over a range of -20 (the higest) to 20 (the -lowest). -A priority of 19 or 20 will prevent a process from taking any cycles from -others at nice 0 or better. .Pp The superuser may specify a negative increment in order to run a utility with a higher scheduling priority. From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 20:49:08 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2995B1065672; Fri, 25 Feb 2011 20:49:08 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 19DD48FC0C; Fri, 25 Feb 2011 20:49:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PKn7ms009448; Fri, 25 Feb 2011 20:49:07 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PKn7Y7009446; Fri, 25 Feb 2011 20:49:07 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201102252049.p1PKn7Y7009446@svn.freebsd.org> From: Doug Barton Date: Fri, 25 Feb 2011 20:49:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219040 - head/sbin/mount X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 20:49:08 -0000 Author: dougb Date: Fri Feb 25 20:49:07 2011 New Revision: 219040 URL: http://svn.freebsd.org/changeset/base/219040 Log: Revert r217871. Modified: head/sbin/mount/mount.8 Modified: head/sbin/mount/mount.8 ============================================================================== --- head/sbin/mount/mount.8 Fri Feb 25 19:38:42 2011 (r219039) +++ head/sbin/mount/mount.8 Fri Feb 25 20:49:07 2011 (r219040) @@ -28,7 +28,7 @@ .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 .\" $FreeBSD$ .\" -.Dd January 25, 2011 +.Dd February 10, 2010 .Dt MOUNT 8 .Os .Sh NAME @@ -208,11 +208,7 @@ This option is useful on file systems where there are large numbers of files and performance is more critical than updating the file access time (which is rarely ever important). -This option is not supported on network file systems when the -server is FreeBSD. -Support in network files servers on other operating systems -with a FreeBSD client is possible, -but should be tested before it is relied on. +This option is currently only supported on local file systems. .It Cm noauto This file system should be skipped when .Nm From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 22:03:29 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21FDC1065670; Fri, 25 Feb 2011 22:03:29 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 05B868FC12; Fri, 25 Feb 2011 22:03:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PM3SKT013729; Fri, 25 Feb 2011 22:03:28 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PM3SF2013727; Fri, 25 Feb 2011 22:03:28 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <201102252203.p1PM3SF2013727@svn.freebsd.org> From: Dmitry Chagin Date: Fri, 25 Feb 2011 22:03:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219041 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 22:03:29 -0000 Author: dchagin Date: Fri Feb 25 22:03:28 2011 New Revision: 219041 URL: http://svn.freebsd.org/changeset/base/219041 Log: ktrace_resize_pool() locking slightly reworked: 1) do not take a lock around the single atomic operation. 2) do not lose the invariant of lock by dropping/acquiring ktrace_mtx around free() or malloc(). MFC after: 1 Month. Modified: head/sys/kern/kern_ktrace.c Modified: head/sys/kern/kern_ktrace.c ============================================================================== --- head/sys/kern/kern_ktrace.c Fri Feb 25 20:49:07 2011 (r219040) +++ head/sys/kern/kern_ktrace.c Fri Feb 25 22:03:28 2011 (r219041) @@ -133,7 +133,7 @@ static struct sx ktrace_sx; static void ktrace_init(void *dummy); static int sysctl_kern_ktrace_request_pool(SYSCTL_HANDLER_ARGS); -static u_int ktrace_resize_pool(u_int newsize); +static u_int ktrace_resize_pool(u_int oldsize, u_int newsize); static struct ktr_request *ktr_getrequest(int type); static void ktr_submitrequest(struct thread *td, struct ktr_request *req); static void ktr_freeproc(struct proc *p, struct ucred **uc, @@ -199,9 +199,7 @@ sysctl_kern_ktrace_request_pool(SYSCTL_H /* Handle easy read-only case first to avoid warnings from GCC. */ if (!req->newptr) { - mtx_lock(&ktrace_mtx); oldsize = ktr_requestpool; - mtx_unlock(&ktrace_mtx); return (SYSCTL_OUT(req, &oldsize, sizeof(u_int))); } @@ -210,10 +208,8 @@ sysctl_kern_ktrace_request_pool(SYSCTL_H return (error); td = curthread; ktrace_enter(td); - mtx_lock(&ktrace_mtx); oldsize = ktr_requestpool; - newsize = ktrace_resize_pool(wantsize); - mtx_unlock(&ktrace_mtx); + newsize = ktrace_resize_pool(oldsize, wantsize); ktrace_exit(td); error = SYSCTL_OUT(req, &oldsize, sizeof(u_int)); if (error) @@ -227,38 +223,40 @@ SYSCTL_PROC(_kern_ktrace, OID_AUTO, requ "Pool buffer size for ktrace(1)"); static u_int -ktrace_resize_pool(u_int newsize) +ktrace_resize_pool(u_int oldsize, u_int newsize) { + STAILQ_HEAD(, ktr_request) ktr_new; struct ktr_request *req; int bound; - mtx_assert(&ktrace_mtx, MA_OWNED); print_message = 1; - bound = newsize - ktr_requestpool; + bound = newsize - oldsize; if (bound == 0) return (ktr_requestpool); - if (bound < 0) + if (bound < 0) { + mtx_lock(&ktrace_mtx); /* Shrink pool down to newsize if possible. */ while (bound++ < 0) { req = STAILQ_FIRST(&ktr_free); if (req == NULL) - return (ktr_requestpool); + break; STAILQ_REMOVE_HEAD(&ktr_free, ktr_list); ktr_requestpool--; - mtx_unlock(&ktrace_mtx); free(req, M_KTRACE); - mtx_lock(&ktrace_mtx); } - else + } else { /* Grow pool up to newsize. */ + STAILQ_INIT(&ktr_new); while (bound-- > 0) { - mtx_unlock(&ktrace_mtx); req = malloc(sizeof(struct ktr_request), M_KTRACE, M_WAITOK); - mtx_lock(&ktrace_mtx); - STAILQ_INSERT_HEAD(&ktr_free, req, ktr_list); - ktr_requestpool++; + STAILQ_INSERT_HEAD(&ktr_new, req, ktr_list); } + mtx_lock(&ktrace_mtx); + STAILQ_CONCAT(&ktr_free, &ktr_new); + ktr_requestpool += (newsize - oldsize); + } + mtx_unlock(&ktrace_mtx); return (ktr_requestpool); } From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 22:05:34 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EBC21065675; Fri, 25 Feb 2011 22:05:34 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F17108FC0C; Fri, 25 Feb 2011 22:05:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PM5XEf013878; Fri, 25 Feb 2011 22:05:33 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PM5Xlr013873; Fri, 25 Feb 2011 22:05:33 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <201102252205.p1PM5Xlr013873@svn.freebsd.org> From: Dmitry Chagin Date: Fri, 25 Feb 2011 22:05:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219042 - in head/sys: kern sys X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 22:05:34 -0000 Author: dchagin Date: Fri Feb 25 22:05:33 2011 New Revision: 219042 URL: http://svn.freebsd.org/changeset/base/219042 Log: Introduce preliminary support of the show description of the ABI of traced process by adding two new events which records value of process sv_flags to the trace file at process creation/execing/exiting time. MFC after: 1 Month. Modified: head/sys/kern/kern_exec.c head/sys/kern/kern_fork.c head/sys/kern/kern_ktrace.c head/sys/sys/ktrace.h Modified: head/sys/kern/kern_exec.c ============================================================================== --- head/sys/kern/kern_exec.c Fri Feb 25 22:03:28 2011 (r219041) +++ head/sys/kern/kern_exec.c Fri Feb 25 22:05:33 2011 (r219042) @@ -899,6 +899,12 @@ done2: exit1(td, W_EXITCODE(0, SIGABRT)); /* NOT REACHED */ } + +#ifdef KTRACE + if (error == 0) + ktrprocctor(p); +#endif + return (error); } Modified: head/sys/kern/kern_fork.c ============================================================================== --- head/sys/kern/kern_fork.c Fri Feb 25 22:03:28 2011 (r219041) +++ head/sys/kern/kern_fork.c Fri Feb 25 22:05:33 2011 (r219042) @@ -557,10 +557,6 @@ do_fork(struct thread *td, int flags, st callout_init(&p2->p_itcallout, CALLOUT_MPSAFE); -#ifdef KTRACE - ktrprocfork(p1, p2); -#endif - /* * If PF_FORK is set, the child process inherits the * procfs ioctl flags from its parent. @@ -596,6 +592,10 @@ do_fork(struct thread *td, int flags, st p2->p_acflag = AFORK; PROC_UNLOCK(p2); +#ifdef KTRACE + ktrprocfork(p1, p2); +#endif + /* * Finish creating the child process. It will return via a different * execution path later. (ie: directly into user mode) Modified: head/sys/kern/kern_ktrace.c ============================================================================== --- head/sys/kern/kern_ktrace.c Fri Feb 25 22:03:28 2011 (r219041) +++ head/sys/kern/kern_ktrace.c Fri Feb 25 22:05:33 2011 (r219042) @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -93,6 +94,7 @@ struct ktr_request { struct ktr_header ktr_header; void *ktr_buffer; union { + struct ktr_proc_ctor ktr_proc_ctor; struct ktr_syscall ktr_syscall; struct ktr_sysret ktr_sysret; struct ktr_genio ktr_genio; @@ -113,6 +115,8 @@ static int data_lengths[] = { 0, /* KTR_USER */ 0, /* KTR_STRUCT */ 0, /* KTR_SYSCTL */ + sizeof(struct ktr_proc_ctor), /* KTR_PROCCTOR */ + 0, /* KTR_PROCDTOR */ }; static STAILQ_HEAD(, ktr_request) ktr_free; @@ -134,7 +138,9 @@ static struct sx ktrace_sx; static void ktrace_init(void *dummy); static int sysctl_kern_ktrace_request_pool(SYSCTL_HANDLER_ARGS); static u_int ktrace_resize_pool(u_int oldsize, u_int newsize); +static struct ktr_request *ktr_getrequest_ne(struct thread *, int type); static struct ktr_request *ktr_getrequest(int type); +static void ktr_submitrequest_ne(struct thread *td, struct ktr_request *req); static void ktr_submitrequest(struct thread *td, struct ktr_request *req); static void ktr_freeproc(struct proc *p, struct ucred **uc, struct vnode **vp); @@ -144,6 +150,7 @@ static void ktr_writerequest(struct thre static int ktrcanset(struct thread *,struct proc *); static int ktrsetchildren(struct thread *,struct proc *,int,int,struct vnode *); static int ktrops(struct thread *,struct proc *,int,int,struct vnode *); +static void ktrprocctor_ne(struct thread *, struct proc *p); /* * ktrace itself generates events, such as context switches, which we do not @@ -265,18 +272,15 @@ CTASSERT(sizeof(((struct ktr_header *)NU (sizeof((struct thread *)NULL)->td_name)); static struct ktr_request * -ktr_getrequest(int type) +ktr_getrequest_ne(struct thread *td, int type) { struct ktr_request *req; - struct thread *td = curthread; struct proc *p = td->td_proc; int pm; - ktrace_enter(td); /* XXX: In caller instead? */ mtx_lock(&ktrace_mtx); if (!KTRCHECK(td, type)) { mtx_unlock(&ktrace_mtx); - ktrace_exit(td); return (NULL); } req = STAILQ_FIRST(&ktr_free); @@ -302,11 +306,24 @@ ktr_getrequest(int type) mtx_unlock(&ktrace_mtx); if (pm) printf("Out of ktrace request objects.\n"); - ktrace_exit(td); } return (req); } +static struct ktr_request * +ktr_getrequest(int type) +{ + struct thread *td = curthread; + struct ktr_request *req; + + ktrace_enter(td); + req = ktr_getrequest_ne(td, type); + if (req == NULL) + ktrace_exit(td); + + return (req); +} + /* * Some trace generation environments don't permit direct access to VFS, * such as during a context switch where sleeping is not allowed. Under these @@ -360,7 +377,7 @@ ktr_drain(struct thread *td) * been cached in the thread. */ static void -ktr_submitrequest(struct thread *td, struct ktr_request *req) +ktr_submitrequest_ne(struct thread *td, struct ktr_request *req) { ktrace_assert(td); @@ -370,7 +387,14 @@ ktr_submitrequest(struct thread *td, str ktr_writerequest(td, req); ktr_freerequest(req); sx_xunlock(&ktrace_sx); +} + +static void +ktr_submitrequest(struct thread *td, struct ktr_request *req) +{ + ktrace_assert(td); + ktr_submitrequest_ne(td, req); ktrace_exit(td); } @@ -488,6 +512,7 @@ ktrprocexec(struct proc *p, struct ucred void ktrprocexit(struct thread *td) { + struct ktr_request *req; struct proc *p; struct ucred *cred; struct vnode *vp; @@ -501,6 +526,9 @@ ktrprocexit(struct thread *td) sx_xlock(&ktrace_sx); ktr_drain(td); sx_xunlock(&ktrace_sx); + req = ktr_getrequest_ne(td, KTR_PROCDTOR); + if (req != NULL) + ktr_submitrequest_ne(td, req); PROC_LOCK(p); mtx_lock(&ktrace_mtx); ktr_freeproc(p, &cred, &vp); @@ -516,6 +544,37 @@ ktrprocexit(struct thread *td) ktrace_exit(td); } +static void +ktrprocctor_ne(struct thread *td, struct proc *p) +{ + struct ktr_proc_ctor *ktp; + struct ktr_request *req; + struct thread *td2; + + ktrace_assert(td); + td2 = FIRST_THREAD_IN_PROC(p); + req = ktr_getrequest_ne(td2, KTR_PROCCTOR); + if (req == NULL) + return; + + ktp = &req->ktr_data.ktr_proc_ctor; + ktp->sv_flags = p->p_sysent->sv_flags; + ktr_submitrequest_ne(td, req); +} + +void +ktrprocctor(struct proc *p) +{ + struct thread *td = curthread; + + if ((p->p_traceflag & KTRFAC_MASK) == 0) + return; + + ktrace_enter(td); + ktrprocctor_ne(td, p); + ktrace_exit(td); +} + /* * When a process forks, enable tracing in the new process if needed. */ @@ -523,8 +582,7 @@ void ktrprocfork(struct proc *p1, struct proc *p2) { - PROC_LOCK_ASSERT(p1, MA_OWNED); - PROC_LOCK_ASSERT(p2, MA_OWNED); + PROC_LOCK(p1); mtx_lock(&ktrace_mtx); KASSERT(p2->p_tracevp == NULL, ("new process has a ktrace vnode")); if (p1->p_traceflag & KTRFAC_INHERIT) { @@ -537,6 +595,9 @@ ktrprocfork(struct proc *p1, struct proc } } mtx_unlock(&ktrace_mtx); + PROC_UNLOCK(p1); + + ktrprocctor(p2); } /* @@ -971,6 +1032,9 @@ ktrops(td, p, ops, facs, vp) if (tracecred != NULL) crfree(tracecred); + if ((p->p_traceflag & KTRFAC_MASK) != 0) + ktrprocctor_ne(td, p); + return (1); } Modified: head/sys/sys/ktrace.h ============================================================================== --- head/sys/sys/ktrace.h Fri Feb 25 22:03:28 2011 (r219041) +++ head/sys/sys/ktrace.h Fri Feb 25 22:05:33 2011 (r219042) @@ -156,6 +156,7 @@ struct ktr_csw { */ struct sockaddr; struct stat; +struct sysentvec; /* * KTR_SYSCTL - name of a sysctl MIB @@ -164,6 +165,19 @@ struct stat; /* record contains null-terminated MIB name */ /* + * KTR_PROCCTOR - trace process creation (multiple ABI support) + */ +#define KTR_PROCCTOR 10 +struct ktr_proc_ctor { + u_int sv_flags; /* struct sysentvec sv_flags copy */ +}; + +/* + * KTR_PROCDTOR - trace process destruction (multiple ABI support) + */ +#define KTR_PROCDTOR 11 + +/* * KTR_DROP - If this bit is set in ktr_type, then at least one event * between the previous record and this record was dropped. */ @@ -182,6 +196,8 @@ struct stat; #define KTRFAC_USER (1< Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC4F4106564A; Fri, 25 Feb 2011 22:07:23 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DAC778FC13; Fri, 25 Feb 2011 22:07:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PM7N0S013992; Fri, 25 Feb 2011 22:07:23 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PM7NR9013988; Fri, 25 Feb 2011 22:07:23 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <201102252207.p1PM7NR9013988@svn.freebsd.org> From: Dmitry Chagin Date: Fri, 25 Feb 2011 22:07:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219043 - in head/usr.bin: kdump ktrace X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 22:07:24 -0000 Author: dchagin Date: Fri Feb 25 22:07:23 2011 New Revision: 219043 URL: http://svn.freebsd.org/changeset/base/219043 Log: Teach kdump to understand sv_flags records in the trace files. MFC after: 1 Month. Modified: head/usr.bin/kdump/kdump.c head/usr.bin/ktrace/ktrace.c head/usr.bin/ktrace/ktrace.h Modified: head/usr.bin/kdump/kdump.c ============================================================================== --- head/usr.bin/kdump/kdump.c Fri Feb 25 22:05:33 2011 (r219042) +++ head/usr.bin/kdump/kdump.c Fri Feb 25 22:07:23 2011 (r219043) @@ -55,7 +55,9 @@ extern int errno; #include #include #include +#include #include +#include #ifdef IPX #include #include @@ -81,15 +83,17 @@ extern int errno; #include "ktrace.h" #include "kdump_subr.h" +u_int abidump(struct ktr_header *); +int fetchprocinfo(struct ktr_header *, u_int *); int fread_tail(void *, int, int); void dumpheader(struct ktr_header *); -void ktrsyscall(struct ktr_syscall *); -void ktrsysret(struct ktr_sysret *); +void ktrsyscall(struct ktr_syscall *, u_int); +void ktrsysret(struct ktr_sysret *, u_int); void ktrnamei(char *, int); void hexdump(char *, int, int); void visdump(char *, int, int); void ktrgenio(struct ktr_genio *, int); -void ktrpsig(struct ktr_psig *); +void ktrpsig(struct ktr_psig *, u_int); void ktrcsw(struct ktr_csw *); void ktruser(int, unsigned char *); void ktrsockaddr(struct sockaddr *); @@ -100,13 +104,22 @@ void sockfamilyname(int); const char *ioctlname(u_long); int timestamp, decimal, fancy = 1, suppressdata, tail, threads, maxdata, - resolv = 0; + resolv = 0, abiflag = 0; const char *tracefile = DEF_TRACEFILE; struct ktr_header ktr_header; #define TIME_FORMAT "%b %e %T %Y" #define eqs(s1, s2) (strcmp((s1), (s2)) == 0) +struct proc_info +{ + TAILQ_ENTRY(proc_info) info; + u_int sv_flags; + pid_t pid; +}; + +TAILQ_HEAD(trace_procs, proc_info) trace_procs; + int main(int argc, char *argv[]) { @@ -115,11 +128,15 @@ main(int argc, char *argv[]) int trpoints = ALL_POINTS; int drop_logged; pid_t pid = 0; + u_int sv_flags; (void) setlocale(LC_CTYPE, ""); - while ((ch = getopt(argc,argv,"f:dElm:np:HRrsTt:")) != -1) + while ((ch = getopt(argc,argv,"f:dElm:np:AHRrsTt:")) != -1) switch((char)ch) { + case 'A': + abiflag = 1; + break; case 'f': tracefile = optarg; break; @@ -173,6 +190,7 @@ main(int argc, char *argv[]) errx(1, "%s", strerror(ENOMEM)); if (!freopen(tracefile, "r", stdin)) err(1, "%s", tracefile); + TAILQ_INIT(&trace_procs); drop_logged = 0; while (fread_tail(&ktr_header, sizeof(struct ktr_header), 1)) { if (ktr_header.ktr_type & KTR_DROP) { @@ -205,6 +223,9 @@ main(int argc, char *argv[]) } if (ktrlen && fread_tail(m, ktrlen, 1) == 0) errx(1, "data too short"); + if (fetchprocinfo(&ktr_header, (u_int *)m) != 0) + continue; + sv_flags = abidump(&ktr_header); if (pid && ktr_header.ktr_pid != pid) continue; if ((trpoints & (1<ktr_type) { + case KTR_PROCCTOR: + TAILQ_FOREACH(pi, &trace_procs, info) { + if (pi->pid == kth->ktr_pid) { + TAILQ_REMOVE(&trace_procs, pi, info); + break; + } + } + pi = malloc(sizeof(struct proc_info)); + if (pi == NULL) + errx(1, "%s", strerror(ENOMEM)); + pi->sv_flags = *flags; + pi->pid = kth->ktr_pid; + TAILQ_INSERT_TAIL(&trace_procs, pi, info); + return (1); + + case KTR_PROCDTOR: + TAILQ_FOREACH(pi, &trace_procs, info) { + if (pi->pid == kth->ktr_pid) { + TAILQ_REMOVE(&trace_procs, pi, info); + free(pi); + break; + } + } + return (1); + } + + return (0); +} + +u_int +abidump(struct ktr_header *kth) +{ + struct proc_info *pi; + const char *abi; + const char *arch; + u_int flags = 0; + + TAILQ_FOREACH(pi, &trace_procs, info) { + if (pi->pid == kth->ktr_pid) { + flags = pi->sv_flags; + break; + } + } + + if (abiflag == 0) + return (flags); + + switch (flags & SV_ABI_MASK) { + case SV_ABI_LINUX: + abi = "L"; + break; + case SV_ABI_FREEBSD: + abi = "F"; + break; + default: + abi = "U"; + break; + } + + if (flags != 0) { + if (flags & SV_LP64) + arch = "64"; + else + arch = "32"; + } else + arch = "00"; + + printf("%s%s ", abi, arch); + + return (flags); +} + void dumpheader(struct ktr_header *kth) { @@ -293,6 +392,10 @@ dumpheader(struct ktr_header *kth) case KTR_SYSCTL: type = "SCTL"; break; + case KTR_PROCCTOR: + /* FALLTHROUGH */ + case KTR_PROCDTOR: + return; default: (void)sprintf(unknown, "UNKNOWN(%d)", kth->ktr_type); type = unknown; @@ -337,19 +440,21 @@ dumpheader(struct ktr_header *kth) int nsyscalls = sizeof (syscallnames) / sizeof (syscallnames[0]); void -ktrsyscall(struct ktr_syscall *ktr) +ktrsyscall(struct ktr_syscall *ktr, u_int flags) { int narg = ktr->ktr_narg; register_t *ip; - if (ktr->ktr_code >= nsyscalls || ktr->ktr_code < 0) + if ((flags != 0 && ((flags & SV_ABI_MASK) != SV_ABI_FREEBSD)) || + (ktr->ktr_code >= nsyscalls || ktr->ktr_code < 0)) (void)printf("[%d]", ktr->ktr_code); else (void)printf("%s", syscallnames[ktr->ktr_code]); ip = &ktr->ktr_args[0]; if (narg) { char c = '('; - if (fancy) { + if (fancy && + (flags == 0 || (flags & SV_ABI_MASK) == SV_ABI_FREEBSD)) { #define print_number(i,n,c) do { \ if (decimal) \ @@ -807,13 +912,14 @@ ktrsyscall(struct ktr_syscall *ktr) } void -ktrsysret(struct ktr_sysret *ktr) +ktrsysret(struct ktr_sysret *ktr, u_int flags) { register_t ret = ktr->ktr_retval; int error = ktr->ktr_error; int code = ktr->ktr_code; - if (code >= nsyscalls || code < 0) + if ((flags != 0 && ((flags & SV_ABI_MASK) != SV_ABI_FREEBSD)) || + (code >= nsyscalls || code < 0)) (void)printf("[%d] ", code); else (void)printf("%s ", syscallnames[code]); @@ -987,9 +1093,10 @@ const char *signames[] = { }; void -ktrpsig(struct ktr_psig *psig) +ktrpsig(struct ktr_psig *psig, u_int flags) { - if (psig->signo > 0 && psig->signo < NSIG) + if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD && + psig->signo > 0 && psig->signo < NSIG) (void)printf("SIG%s ", signames[psig->signo]); else (void)printf("SIG %d ", psig->signo); @@ -1367,7 +1474,7 @@ invalid: void usage(void) { - fprintf(stderr, "usage: kdump [-dEnlHRrsT] [-f trfile] " + fprintf(stderr, "usage: kdump [-dEnlHRrsTA] [-f trfile] " "[-m maxdata] [-p pid] [-t trstr]\n"); exit(1); } Modified: head/usr.bin/ktrace/ktrace.c ============================================================================== --- head/usr.bin/ktrace/ktrace.c Fri Feb 25 22:05:33 2011 (r219042) +++ head/usr.bin/ktrace/ktrace.c Fri Feb 25 22:07:23 2011 (r219043) @@ -159,6 +159,8 @@ main(int argc, char *argv[]) (void)umask(omask); (void)close(fd); + trpoints |= PROC_ABI_POINTS; + if (*argv) { if (ktrace(tracefile, ops, trpoints, getpid()) < 0) err(1, "%s", tracefile); Modified: head/usr.bin/ktrace/ktrace.h ============================================================================== --- head/usr.bin/ktrace/ktrace.h Fri Feb 25 22:05:33 2011 (r219042) +++ head/usr.bin/ktrace/ktrace.h Fri Feb 25 22:07:23 2011 (r219043) @@ -34,7 +34,9 @@ KTRFAC_GENIO | KTRFAC_PSIG | KTRFAC_USER | \ KTRFAC_STRUCT | KTRFAC_SYSCTL) -#define ALL_POINTS (DEF_POINTS | KTRFAC_CSW) +#define PROC_ABI_POINTS (KTRFAC_PROCCTOR | KTRFAC_PROCDTOR) + +#define ALL_POINTS (DEF_POINTS | KTRFAC_CSW | PROC_ABI_POINTS) #define DEF_TRACEFILE "ktrace.out" From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 22:14:12 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6AA9C106564A; Fri, 25 Feb 2011 22:14:12 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5A1A98FC08; Fri, 25 Feb 2011 22:14:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PMEC51014341; Fri, 25 Feb 2011 22:14:12 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PMECxg014339; Fri, 25 Feb 2011 22:14:12 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <201102252214.p1PMECxg014339@svn.freebsd.org> From: Dmitry Chagin Date: Fri, 25 Feb 2011 22:14:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219044 - head/usr.bin/kdump X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 22:14:12 -0000 Author: dchagin Date: Fri Feb 25 22:14:12 2011 New Revision: 219044 URL: http://svn.freebsd.org/changeset/base/219044 Log: Update manual page to reflect latest changes of ABI description support. MFC after: 1 Month. Modified: head/usr.bin/kdump/kdump.1 Modified: head/usr.bin/kdump/kdump.1 ============================================================================== --- head/usr.bin/kdump/kdump.1 Fri Feb 25 22:07:23 2011 (r219043) +++ head/usr.bin/kdump/kdump.1 Fri Feb 25 22:14:12 2011 (r219044) @@ -36,7 +36,7 @@ .Nd display kernel trace data .Sh SYNOPSIS .Nm -.Op Fl dEnlHRsT +.Op Fl dEnlHRsTA .Op Fl f Ar trfile .Op Fl m Ar maxdata .Op Fl p Ar pid @@ -99,6 +99,8 @@ GIDs, dates etc. symbolically instead of Suppress display of I/O data. .It Fl T Display absolute timestamps for each entry (seconds since epoch). +.It Fl A +Display description of the ABI of traced process. .It Fl t Ar trstr See the .Fl t From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 22:22:45 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E94BC106566B; Fri, 25 Feb 2011 22:22:45 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id BEEB28FC12; Fri, 25 Feb 2011 22:22:45 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 6154D46B0C; Fri, 25 Feb 2011 17:22:45 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.10]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id F25E68A01D; Fri, 25 Feb 2011 17:22:44 -0500 (EST) From: John Baldwin To: Dmitry Chagin Date: Fri, 25 Feb 2011 17:21:28 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.4-CBSD-20110107; KDE/4.4.5; amd64; ; ) References: <201102252205.p1PM5Xlr013873@svn.freebsd.org> In-Reply-To: <201102252205.p1PM5Xlr013873@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201102251721.28461.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Fri, 25 Feb 2011 17:22:45 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r219042 - in head/sys: kern sys X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 22:22:46 -0000 On Friday, February 25, 2011 5:05:33 pm Dmitry Chagin wrote: > Author: dchagin > Date: Fri Feb 25 22:05:33 2011 > New Revision: 219042 > URL: http://svn.freebsd.org/changeset/base/219042 > > Log: > Introduce preliminary support of the show description of the ABI of > traced process by adding two new events which records value of process > sv_flags to the trace file at process creation/execing/exiting time. > > MFC after: 1 Month. Hmm, I don't find ktrace_submitrequest_ne() an intuitive name (took a bit to figure out 'not-entered', and it doesn't map well between getrequest() (where it means 'already-entered') and submitrequest ('don't exit')). I would rather only have submitrequest() and getrequest() and push the ktrace_enter() and ktrace_exit() into all the callers. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 22:22:47 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20E071065672; Fri, 25 Feb 2011 22:22:47 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id EB6B88FC0A; Fri, 25 Feb 2011 22:22:46 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id A44AA46B1A; Fri, 25 Feb 2011 17:22:46 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.10]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 367A78A027; Fri, 25 Feb 2011 17:22:46 -0500 (EST) From: John Baldwin To: Dmitry Chagin Date: Fri, 25 Feb 2011 17:22:30 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.4-CBSD-20110107; KDE/4.4.5; amd64; ; ) References: <201102252207.p1PM7NR9013988@svn.freebsd.org> In-Reply-To: <201102252207.p1PM7NR9013988@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201102251722.31108.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Fri, 25 Feb 2011 17:22:46 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r219043 - in head/usr.bin: kdump ktrace X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 22:22:47 -0000 On Friday, February 25, 2011 5:07:23 pm Dmitry Chagin wrote: > Author: dchagin > Date: Fri Feb 25 22:07:23 2011 > New Revision: 219043 > URL: http://svn.freebsd.org/changeset/base/219043 > > Log: > Teach kdump to understand sv_flags records in the trace files. > > MFC after: 1 Month. Ohhh, are you going to merge in Linux kdump?? :) That and a way to process ktrace records for freebsd32 processes? That would be really cool. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 22:28:08 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8EE31106566C; Fri, 25 Feb 2011 22:28:08 +0000 (UTC) (envelope-from dchagin@dchagin.static.corbina.ru) Received: from contrabass.post.ru (contrabass.post.ru [85.21.78.5]) by mx1.freebsd.org (Postfix) with ESMTP id 36C048FC0C; Fri, 25 Feb 2011 22:28:07 +0000 (UTC) Received: from corbina.ru (mail.post.ru [195.14.50.16]) by contrabass.post.ru (Postfix) with ESMTP id A7CEAC9884; Sat, 26 Feb 2011 01:28:05 +0300 (MSK) X-Virus-Scanned: by cgpav Uf39PSi9pFi9oFi9 Received: from [10.208.17.3] (HELO dchagin.static.corbina.ru) by corbina.ru (CommuniGate Pro SMTP 5.1.14) with ESMTPS id 303865411; Sat, 26 Feb 2011 01:28:05 +0300 Received: from dchagin.static.corbina.ru (localhost [127.0.0.1]) by dchagin.static.corbina.ru (8.14.4/8.14.4) with ESMTP id p1PMS50d007853; Sat, 26 Feb 2011 01:28:05 +0300 (MSK) (envelope-from dchagin@dchagin.static.corbina.ru) Received: (from dchagin@localhost) by dchagin.static.corbina.ru (8.14.4/8.14.4/Submit) id p1PMS09M007852; Sat, 26 Feb 2011 01:28:00 +0300 (MSK) (envelope-from dchagin) Date: Sat, 26 Feb 2011 01:28:00 +0300 From: Chagin Dmitry To: John Baldwin Message-ID: <20110225222800.GA7829@dchagin.static.corbina.ru> References: <201102252207.p1PM7NR9013988@svn.freebsd.org> <201102251722.31108.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="dDRMvlgZJXvWKvBx" Content-Disposition: inline In-Reply-To: <201102251722.31108.jhb@freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r219043 - in head/usr.bin: kdump ktrace X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 22:28:08 -0000 --dDRMvlgZJXvWKvBx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Feb 25, 2011 at 05:22:30PM -0500, John Baldwin wrote: > On Friday, February 25, 2011 5:07:23 pm Dmitry Chagin wrote: > > Author: dchagin > > Date: Fri Feb 25 22:07:23 2011 > > New Revision: 219043 > > URL: http://svn.freebsd.org/changeset/base/219043 > >=20 > > Log: > > Teach kdump to understand sv_flags records in the trace files. > > =20 > > MFC after: 1 Month. >=20 > Ohhh, are you going to merge in Linux kdump?? :) >=20 Definitely yes :) > That and a way to process ktrace records for freebsd32 processes? >=20 > That would be really cool. >=20 hmm, ok. --=20 Have fun! chd --dDRMvlgZJXvWKvBx Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (FreeBSD) iEYEARECAAYFAk1oLO8ACgkQ0t2Tb3OO/O1bUACgkkzoe14+1lXbkDTnYwsxWxl4 UDsAnjK58EHImfVMEvqv55856LnQcR51 =Tped -----END PGP SIGNATURE----- --dDRMvlgZJXvWKvBx-- From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 22:34:20 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23171106566B; Fri, 25 Feb 2011 22:34:20 +0000 (UTC) (envelope-from dchagin@dchagin.static.corbina.ru) Received: from contrabass.post.ru (contrabass.post.ru [85.21.78.5]) by mx1.freebsd.org (Postfix) with ESMTP id C0A218FC0A; Fri, 25 Feb 2011 22:34:19 +0000 (UTC) Received: from corbina.ru (mail.post.ru [195.14.50.16]) by contrabass.post.ru (Postfix) with ESMTP id 27163CAE97; Sat, 26 Feb 2011 01:34:18 +0300 (MSK) X-Virus-Scanned: by cgpav Uf39PSi9pFi9oFi9 Received: from [10.208.17.3] (HELO dchagin.static.corbina.ru) by corbina.ru (CommuniGate Pro SMTP 5.1.14) with ESMTPS id 303866243; Sat, 26 Feb 2011 01:34:17 +0300 Received: from dchagin.static.corbina.ru (localhost [127.0.0.1]) by dchagin.static.corbina.ru (8.14.4/8.14.4) with ESMTP id p1PMYHRZ007911; Sat, 26 Feb 2011 01:34:17 +0300 (MSK) (envelope-from dchagin@dchagin.static.corbina.ru) Received: (from dchagin@localhost) by dchagin.static.corbina.ru (8.14.4/8.14.4/Submit) id p1PMYCiS007910; Sat, 26 Feb 2011 01:34:12 +0300 (MSK) (envelope-from dchagin) Date: Sat, 26 Feb 2011 01:34:12 +0300 From: Chagin Dmitry To: John Baldwin Message-ID: <20110225223412.GA7884@dchagin.static.corbina.ru> References: <201102252205.p1PM5Xlr013873@svn.freebsd.org> <201102251721.28461.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="pf9I7BMVVzbSWLtt" Content-Disposition: inline In-Reply-To: <201102251721.28461.jhb@freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r219042 - in head/sys: kern sys X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 22:34:20 -0000 --pf9I7BMVVzbSWLtt Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Feb 25, 2011 at 05:21:28PM -0500, John Baldwin wrote: > On Friday, February 25, 2011 5:05:33 pm Dmitry Chagin wrote: > > Author: dchagin > > Date: Fri Feb 25 22:05:33 2011 > > New Revision: 219042 > > URL: http://svn.freebsd.org/changeset/base/219042 > >=20 > > Log: > > Introduce preliminary support of the show description of the ABI of > > traced process by adding two new events which records value of process > > sv_flags to the trace file at process creation/execing/exiting time. > > =20 > > MFC after: 1 Month. >=20 > Hmm, I don't find ktrace_submitrequest_ne() an intuitive name (took a bit > to figure out 'not-entered', and it doesn't map well between getrequest() > (where it means 'already-entered') and submitrequest ('don't exit')). >=20 > I would rather only have submitrequest() and getrequest() and push the > ktrace_enter() and ktrace_exit() into all the callers. >=20 thnx for the reply, I thought about it. --=20 Have fun! chd --pf9I7BMVVzbSWLtt Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (FreeBSD) iEYEARECAAYFAk1oLmMACgkQ0t2Tb3OO/O19zwCfTA5pVrpGc8jW2MvajwvDp/TV kXAAnAj4OIESnq8tOnAuiKTlo5otUvVQ =bx96 -----END PGP SIGNATURE----- --pf9I7BMVVzbSWLtt-- From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 23:05:36 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12F5D106566B; Fri, 25 Feb 2011 23:05:36 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 025A98FC21; Fri, 25 Feb 2011 23:05:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PN5ZZs016962; Fri, 25 Feb 2011 23:05:35 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PN5Zf4016960; Fri, 25 Feb 2011 23:05:35 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201102252305.p1PN5Zf4016960@svn.freebsd.org> From: Ed Schouten Date: Fri, 25 Feb 2011 23:05:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219045 - head/lib/libc/gen X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 23:05:36 -0000 Author: ed Date: Fri Feb 25 23:05:35 2011 New Revision: 219045 URL: http://svn.freebsd.org/changeset/base/219045 Log: Fix style(9) issues in pututxline(3). Also, make sure to initialize the `ret' variable properly. Reported by: Cedric Jonas Patch by: Garrett Cooper Modified: head/lib/libc/gen/pututxline.c Modified: head/lib/libc/gen/pututxline.c ============================================================================== --- head/lib/libc/gen/pututxline.c Fri Feb 25 22:14:12 2011 (r219044) +++ head/lib/libc/gen/pututxline.c Fri Feb 25 23:05:35 2011 (r219045) @@ -43,8 +43,8 @@ __FBSDID("$FreeBSD$"); static FILE * futx_open(const char *file) { - struct stat sb; FILE *fp; + struct stat sb; int fd; fd = _open(file, O_CREAT|O_RDWR|O_EXLOCK, 0644); @@ -69,11 +69,14 @@ futx_open(const char *file) static int utx_active_add(const struct futx *fu) { - struct futx fe; FILE *fp; - off_t partial = -1; + struct futx fe; + off_t partial; int error, ret; + partial = -1; + ret = 0; + /* * Register user login sessions. Overwrite entries of sessions * that have already been terminated. @@ -132,8 +135,8 @@ exact: static int utx_active_remove(struct futx *fu) { - struct futx fe; FILE *fp; + struct futx fe; int error, ret; /* @@ -266,7 +269,9 @@ struct utmpx * pututxline(const struct utmpx *utmpx) { struct futx fu; - int bad = 0; + int bad; + + bad = 0; utx_to_futx(utmpx, &fu); From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 23:13:09 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE2A71065670; Fri, 25 Feb 2011 23:13:09 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id D4FD78FC08; Fri, 25 Feb 2011 23:13:08 +0000 (UTC) Received: by wyb32 with SMTP id 32so2505201wyb.13 for ; Fri, 25 Feb 2011 15:13:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=QQSVyMfMY/WeKpXoc8eX/f3B2IM1jAFYXmtH9qjtNWI=; b=gwtxxAQlsU1v5gvJDdKjRPiLITU8IzpsAMfqqVCx9cDtQcBJYpdvKGY9BYMnzjjOYM MPZuwqTluDshASa5OWhs2ecYNSu8lmsNeXfpTPON5jm/O9XvcSo08SuqyoU3FegpMSIm lp6ABXSRiMhQKaP96NkvYSBh3vLJw4acCmMv0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=gM1QBKhmp34pc9VaJ2l08ScjJH2FHKiZxERL+jCWs0FZuWlMI0NI/Mi4GYof8KgWBF XR28XQtc63R6/tJwKypp8hj+wndung5+lhGCDJWCiuIiMJNVFZz/7q2G9IC4gTOPtUbw SBHfQhKE36YsdVvy8R2fP7dMVY6deh3x8Lu1U= MIME-Version: 1.0 Received: by 10.216.50.193 with SMTP id z43mr2588285web.49.1298675587962; Fri, 25 Feb 2011 15:13:07 -0800 (PST) Received: by 10.216.15.74 with HTTP; Fri, 25 Feb 2011 15:13:07 -0800 (PST) In-Reply-To: <201102252305.p1PN5Zf4016960@svn.freebsd.org> References: <201102252305.p1PN5Zf4016960@svn.freebsd.org> Date: Fri, 25 Feb 2011 15:13:07 -0800 Message-ID: From: Garrett Cooper To: Ed Schouten Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r219045 - head/lib/libc/gen X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 23:13:09 -0000 On Fri, Feb 25, 2011 at 3:05 PM, Ed Schouten wrote: > Author: ed > Date: Fri Feb 25 23:05:35 2011 > New Revision: 219045 > URL: http://svn.freebsd.org/changeset/base/219045 > > Log: > =A0Fix style(9) issues in pututxline(3). > > =A0Also, make sure to initialize the `ret' variable properly. I guess it's my first pointy hat by proxy :/... -Garrett From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 23:14:24 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EEB2110656A3; Fri, 25 Feb 2011 23:14:24 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DE00B8FC19; Fri, 25 Feb 2011 23:14:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PNEOv2017379; Fri, 25 Feb 2011 23:14:24 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PNEOSN017377; Fri, 25 Feb 2011 23:14:24 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201102252314.p1PNEOSN017377@svn.freebsd.org> From: Jung-uk Kim Date: Fri, 25 Feb 2011 23:14:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219046 - head/sys/x86/cpufreq X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 23:14:25 -0000 Author: jkim Date: Fri Feb 25 23:14:24 2011 New Revision: 219046 URL: http://svn.freebsd.org/changeset/base/219046 Log: Set C1 "I/O then Halt" capability bit for Intel EIST. Some broken BIOSes refuse to load external SSDTs if this bit is unset for _PDC. It seems Linux and OpenSolaris did the same long ago. MFC after: 1 week Modified: head/sys/x86/cpufreq/est.c Modified: head/sys/x86/cpufreq/est.c ============================================================================== --- head/sys/x86/cpufreq/est.c Fri Feb 25 23:05:35 2011 (r219045) +++ head/sys/x86/cpufreq/est.c Fri Feb 25 23:14:24 2011 (r219046) @@ -947,8 +947,11 @@ static int est_features(driver_t *driver, u_int *features) { - /* Notify the ACPI CPU that we support direct access to MSRs */ - *features = ACPI_CAP_PERF_MSRS; + /* + * Notify the ACPI CPU that we support direct access to MSRs. + * XXX C1 "I/O then Halt" seems necessary for some broken BIOS. + */ + *features = ACPI_CAP_PERF_MSRS | ACPI_CAP_C1_IO_HALT; return (0); } From owner-svn-src-head@FreeBSD.ORG Fri Feb 25 23:32:06 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from [127.0.0.1] (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by hub.freebsd.org (Postfix) with ESMTP id 4162A1065673; Fri, 25 Feb 2011 23:32:06 +0000 (UTC) (envelope-from jkim@FreeBSD.org) From: Jung-uk Kim To: src-committers@FreeBSD.org Date: Fri, 25 Feb 2011 18:31:45 -0500 User-Agent: KMail/1.6.2 References: <201102252314.p1PNEOSN017377@svn.freebsd.org> In-Reply-To: <201102252314.p1PNEOSN017377@svn.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201102251831.51396.jkim@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org Subject: Re: svn commit: r219046 - head/sys/x86/cpufreq X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 23:32:06 -0000 On Friday 25 February 2011 06:14 pm, Jung-uk Kim wrote: > Author: jkim > Date: Fri Feb 25 23:14:24 2011 > New Revision: 219046 > URL: http://svn.freebsd.org/changeset/base/219046 > > Log: > Set C1 "I/O then Halt" capability bit for Intel EIST. Some > broken BIOSes refuse to load external SSDTs if this bit is unset > for _PDC. It seems Linux and OpenSolaris did the same long ago. > > MFC after: 1 week Please note, however, it only works when cpufreq(4) is loaded with acpi(4) because acpi_cpu evaluates _PDC (or _OSC) only once. FYI, this is an OpenSolaris PR I found: http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6667515 Jung-uk Kim From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 07:31:04 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 144BB1065670; Sat, 26 Feb 2011 07:31:04 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail04.syd.optusnet.com.au (mail04.syd.optusnet.com.au [211.29.132.185]) by mx1.freebsd.org (Postfix) with ESMTP id 87EB08FC19; Sat, 26 Feb 2011 07:31:03 +0000 (UTC) Received: from c122-107-114-89.carlnfd1.nsw.optusnet.com.au (c122-107-114-89.carlnfd1.nsw.optusnet.com.au [122.107.114.89]) by mail04.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id p1Q7Ug3T032042 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 26 Feb 2011 18:30:43 +1100 Date: Sat, 26 Feb 2011 18:30:42 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: John Baldwin In-Reply-To: <201102250737.43182.jhb@freebsd.org> Message-ID: <20110226174551.Y1199@besplex.bde.org> References: <201102241613.p1OGDXpM047076@svn.freebsd.org> <20110225070237.F983@besplex.bde.org> <201102250737.43182.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Remko Lodder , svn-src-all@freebsd.org, src-committers@freebsd.org, davidxu@freebsd.org, Bruce Evans , svn-src-head@freebsd.org, Remko Lodder Subject: Re: svn commit: r219003 - head/usr.bin/nice X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 07:31:04 -0000 On Fri, 25 Feb 2011, John Baldwin wrote: > On Friday, February 25, 2011 5:23:04 am Remko Lodder wrote: >> >> On Feb 24, 2011, at 10:47 PM, Bruce Evans wrote: >> >>> On Thu, 24 Feb 2011, John Baldwin wrote: >>> >>>> On Thursday, February 24, 2011 2:03:33 pm Remko Lodder wrote: >>>>> >>> [contex restored: >>> +A priority of 19 or 20 will prevent a process from taking any cycles from >>> +others at nice 0 or better.] >> >> >> [strip information overload]. >> >> So, what is the consensus instead of overwelming me with too much > information? > > Take that sentence out. It is not accurate for our schedulers. And an accurate sentence would require condensing even more information :-). I just remembered another difference for the multi-CPU case that is probably very large. Long ago, I hacked SCHED_4BSD to scale td_estcpu by the number of CPUs (INVERSE_ESTCPU_WEIGHT = 8 for !SMP but (8 * smp_cpus) for SMP. Without this, td_estcpu built up too fast (really, failed to decay fast enough due to the decay not being scaled by the number of CPUs) in some common cases, so the nonlinear region of mapping from td_estcpu to td_priority was often reached. With this, td_priority is too insensitive to td_estcpu in some hopefully-less-common cases. I haven't tested SCHED_4BSD on a multi-CPU system recently, but the test method of pinning all the CPU hogs to 1 CPU gives an uncommon case for which the hack works especially badly. The pinning gives only 1 active CPU so the !SMP scale factor should be applied, but it isn't. So td_estcpu decays 8 times faster than it should ((?) -- I think the scaling is linear), and may even decay to 0 before it is used. If there is still some left when the thread is rescheduled, then the sensitivity is just reduced by a factor of 8, but if there is none then the scheduling becomes unfair. OTOH, the sensitivity to niceness isn't changed, so in the best case where the decay is not to 0, niceness become smp_cpus times more sensitive than ordinary scheduling relative to the !SMP case. And this is a relatively simple case to understand and fix. The load average and/or INVERSE_ESTCPU_WEIGHT probably need to be per-CPU to give the old algorithm a chance of working, but only if there is some manual scheduling by pinning threads to CPUs. Otherwise, assignment of threads to CPUs should make things average out -- non-affinity is required to make things sort of work. In my version of SCHED_4BSD, the scale factor is calculated dynamically according to the maximum td_estcpu. This too gives insensitivity of scheduling to td_estcpu, but only when the maximum td_estcpu is large, in which case there is nothing much that can be done (when you have a large dynamic range of td_estcpu's, it is just impossible to map them linearly or logarithmically into the small priority space and it may be impossible to map them uniquely). I don't try to support SMP, and my maximum td_estcpu only does the right thing if the maximum td_estcpu for threads that will run on each CPU is almost the same for all CPUs. Bruce From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 07:48:59 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1E4E1065672; Sat, 26 Feb 2011 07:48:59 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail02.syd.optusnet.com.au (mail02.syd.optusnet.com.au [211.29.132.183]) by mx1.freebsd.org (Postfix) with ESMTP id 0F8AF8FC14; Sat, 26 Feb 2011 07:48:58 +0000 (UTC) Received: from c122-107-114-89.carlnfd1.nsw.optusnet.com.au (c122-107-114-89.carlnfd1.nsw.optusnet.com.au [122.107.114.89]) by mail02.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id p1Q7muP5015119 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 26 Feb 2011 18:48:57 +1100 Date: Sat, 26 Feb 2011 18:48:56 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Doug Barton In-Reply-To: <201102252049.p1PKn7Y7009446@svn.freebsd.org> Message-ID: <20110226184334.T1199@besplex.bde.org> References: <201102252049.p1PKn7Y7009446@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r219040 - head/sbin/mount X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 07:48:59 -0000 On Fri, 25 Feb 2011, Doug Barton wrote: > Log: > Revert r217871. Thanks. Did you figure out exactly what happens with a Solaris server? Bruce From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 09:28:52 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3C681065672; Sat, 26 Feb 2011 09:28:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 91B688FC13; Sat, 26 Feb 2011 09:28:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1Q9Sqvh052177; Sat, 26 Feb 2011 09:28:52 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1Q9Sqfh052173; Sat, 26 Feb 2011 09:28:52 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201102260928.p1Q9Sqfh052173@svn.freebsd.org> From: Hans Petter Selasky Date: Sat, 26 Feb 2011 09:28:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219048 - in head: share/man/man4 sys/dev/usb/controller usr.sbin/usbconfig X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 09:28:52 -0000 Author: hselasky Date: Sat Feb 26 09:28:52 2011 New Revision: 219048 URL: http://svn.freebsd.org/changeset/base/219048 Log: - Correct USB 3.0 wire-speed to 5.0Gbps MFC after: 3 days Approved by: thompsa (mentor) Modified: head/share/man/man4/xhci.4 head/sys/dev/usb/controller/usb_controller.c head/usr.sbin/usbconfig/dump.c Modified: head/share/man/man4/xhci.4 ============================================================================== --- head/share/man/man4/xhci.4 Sat Feb 26 04:02:54 2011 (r219047) +++ head/share/man/man4/xhci.4 Sat Feb 26 09:28:52 2011 (r219048) @@ -48,7 +48,7 @@ The .Tn XHCI controller supports .Tn USB -connection speeds up to 4.8Gbps when using a USB 3.0 compliant device. +connection speeds up to 5.0Gbps when using a USB 3.0 compliant device. .Sh SEE ALSO .Xr ehci 4 , .Xr ohci 4 , Modified: head/sys/dev/usb/controller/usb_controller.c ============================================================================== --- head/sys/dev/usb/controller/usb_controller.c Sat Feb 26 04:02:54 2011 (r219047) +++ head/sys/dev/usb/controller/usb_controller.c Sat Feb 26 09:28:52 2011 (r219048) @@ -365,7 +365,7 @@ usb_bus_attach(struct usb_proc_msg *pm) case USB_REV_3_0: speed = USB_SPEED_SUPER; - device_printf(bus->bdev, "4.8Gbps Super Speed USB v3.0\n"); + device_printf(bus->bdev, "5.0Gbps Super Speed USB v3.0\n"); break; default: Modified: head/usr.sbin/usbconfig/dump.c ============================================================================== --- head/usr.sbin/usbconfig/dump.c Sat Feb 26 04:02:54 2011 (r219047) +++ head/usr.sbin/usbconfig/dump.c Sat Feb 26 09:28:52 2011 (r219048) @@ -65,11 +65,11 @@ dump_speed(uint8_t value) case LIBUSB20_SPEED_VARIABLE: return ("VARIABLE (52-480Mbps)"); case LIBUSB20_SPEED_SUPER: - return ("SUPER (4.8Gbps)"); + return ("SUPER (5.0Gbps)"); default: break; } - return ("unknown"); + return ("UNKNOWN ()"); } const char * From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 11:20:52 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28C55106566B; Sat, 26 Feb 2011 11:20:52 +0000 (UTC) (envelope-from remko@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1845A8FC18; Sat, 26 Feb 2011 11:20:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QBKpsH068640; Sat, 26 Feb 2011 11:20:51 GMT (envelope-from remko@svn.freebsd.org) Received: (from remko@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QBKpkM068637; Sat, 26 Feb 2011 11:20:51 GMT (envelope-from remko@svn.freebsd.org) Message-Id: <201102261120.p1QBKpkM068637@svn.freebsd.org> From: Remko Lodder Date: Sat, 26 Feb 2011 11:20:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219050 - head/usr.bin/nice X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 11:20:52 -0000 Author: remko Date: Sat Feb 26 11:20:51 2011 New Revision: 219050 URL: http://svn.freebsd.org/changeset/base/219050 Log: Not only had I included a syntax / style error, nice.3 is also deprecated. Modified: head/usr.bin/nice/nice.1 Modified: head/usr.bin/nice/nice.1 ============================================================================== --- head/usr.bin/nice/nice.1 Sat Feb 26 10:29:53 2011 (r219049) +++ head/usr.bin/nice/nice.1 Sat Feb 26 11:20:51 2011 (r219050) @@ -107,7 +107,6 @@ option has been deprecated but is still .Xr rtprio 1 , .Xr getpriority 2 , .Xr setpriority 2 , -.Xr nice 3, .Xr renice 8 .Sh STANDARDS The From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 12:50:28 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 582CD106566B; Sat, 26 Feb 2011 12:50:28 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 480FA8FC14; Sat, 26 Feb 2011 12:50:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QCoSlp073179; Sat, 26 Feb 2011 12:50:28 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QCoSOp073177; Sat, 26 Feb 2011 12:50:28 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102261250.p1QCoSOp073177@svn.freebsd.org> From: Bruce Cran Date: Sat, 26 Feb 2011 12:50:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219055 - head/share/doc/psd/23.rpc X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 12:50:28 -0000 Author: brucec Date: Sat Feb 26 12:50:28 2011 New Revision: 219055 URL: http://svn.freebsd.org/changeset/base/219055 Log: Fix typo - "is is" should have been changed to "it is" in r218965. Modified: head/share/doc/psd/23.rpc/rpc.prog.ms Modified: head/share/doc/psd/23.rpc/rpc.prog.ms ============================================================================== --- head/share/doc/psd/23.rpc/rpc.prog.ms Sat Feb 26 12:07:16 2011 (r219054) +++ head/share/doc/psd/23.rpc/rpc.prog.ms Sat Feb 26 12:50:28 2011 (r219055) @@ -71,7 +71,7 @@ manual page. .I "The Highest Layer:" .IX RPC "The Highest Layer" The highest layer is totally transparent to the operating system, -machine and network upon which is run. It's probably best to +machine and network upon which it is run. It's probably best to think of this level as a way of .I using RPC, rather than as From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 14:58:55 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 17767106566B; Sat, 26 Feb 2011 14:58:55 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 060A28FC14; Sat, 26 Feb 2011 14:58:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QEwsVn077594; Sat, 26 Feb 2011 14:58:54 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QEws75077588; Sat, 26 Feb 2011 14:58:54 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201102261458.p1QEws75077588@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 26 Feb 2011 14:58:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219056 - in head/sys: cam/ata cam/scsi dev/ata geom X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 14:58:55 -0000 Author: nwhitehorn Date: Sat Feb 26 14:58:54 2011 New Revision: 219056 URL: http://svn.freebsd.org/changeset/base/219056 Log: Add the disk ident and a human-meaningful description (here, the disk model string) to the geom_disk config XML so that they are easily accessible from userland. MFC after: 1 week Modified: head/sys/cam/ata/ata_da.c head/sys/cam/scsi/scsi_cd.c head/sys/dev/ata/ata-disk.c head/sys/geom/geom_disk.c head/sys/geom/geom_disk.h Modified: head/sys/cam/ata/ata_da.c ============================================================================== --- head/sys/cam/ata/ata_da.c Sat Feb 26 12:50:28 2011 (r219055) +++ head/sys/cam/ata/ata_da.c Sat Feb 26 14:58:54 2011 (r219056) @@ -746,6 +746,8 @@ adaregister(struct cam_periph *periph, v softc->disk->d_flags |= DISKFLAG_CANDELETE; strlcpy(softc->disk->d_ident, cgd->serial_num, MIN(sizeof(softc->disk->d_ident), cgd->serial_num_len + 1)); + strlcpy(softc->disk->d_descr, cgd->ident_data.model, + MIN(sizeof(softc->disk->d_descr), sizeof(cgd->ident_data.model))); softc->disk->d_hba_vendor = cpi.hba_vendor; softc->disk->d_hba_device = cpi.hba_device; softc->disk->d_hba_subvendor = cpi.hba_subvendor; Modified: head/sys/cam/scsi/scsi_cd.c ============================================================================== --- head/sys/cam/scsi/scsi_cd.c Sat Feb 26 12:50:28 2011 (r219055) +++ head/sys/cam/scsi/scsi_cd.c Sat Feb 26 14:58:54 2011 (r219056) @@ -724,6 +724,12 @@ cdregister(struct cam_periph *periph, vo softc->disk->d_strategy = cdstrategy; softc->disk->d_ioctl = cdioctl; softc->disk->d_name = "cd"; + cam_strvis(softc->disk->d_descr, cgd->inq_data.vendor, + sizeof(cgd->inq_data.vendor), sizeof(softc->disk->d_descr)); + strlcat(softc->disk->d_descr, " ", sizeof(softc->disk->d_descr)); + cam_strvis(&softc->disk->d_descr[strlen(softc->disk->d_descr)], + cgd->inq_data.product, sizeof(cgd->inq_data.product), + sizeof(softc->disk->d_descr) - strlen(softc->disk->d_descr)); softc->disk->d_unit = periph->unit_number; softc->disk->d_drv1 = periph; if (cpi.maxio == 0) Modified: head/sys/dev/ata/ata-disk.c ============================================================================== --- head/sys/dev/ata/ata-disk.c Sat Feb 26 12:50:28 2011 (r219055) +++ head/sys/dev/ata/ata-disk.c Sat Feb 26 14:58:54 2011 (r219056) @@ -145,6 +145,8 @@ ad_attach(device_t dev) adp->disk->d_flags |= DISKFLAG_CANDELETE; strlcpy(adp->disk->d_ident, atadev->param.serial, sizeof(adp->disk->d_ident)); + strlcpy(adp->disk->d_descr, atadev->param.model, + sizeof(adp->disk->d_descr)); parent = device_get_parent(ch->dev); if (parent != NULL && device_get_parent(parent) != NULL && (device_get_devclass(parent) == Modified: head/sys/geom/geom_disk.c ============================================================================== --- head/sys/geom/geom_disk.c Sat Feb 26 12:50:28 2011 (r219055) +++ head/sys/geom/geom_disk.c Sat Feb 26 14:58:54 2011 (r219056) @@ -371,6 +371,8 @@ g_disk_dumpconf(struct sbuf *sb, const c indent, dp->d_fwheads); sbuf_printf(sb, "%s%u\n", indent, dp->d_fwsectors); + sbuf_printf(sb, "%s%s\n", indent, dp->d_ident); + sbuf_printf(sb, "%s%s\n", indent, dp->d_descr); } } Modified: head/sys/geom/geom_disk.h ============================================================================== --- head/sys/geom/geom_disk.h Sat Feb 26 12:50:28 2011 (r219055) +++ head/sys/geom/geom_disk.h Sat Feb 26 14:58:54 2011 (r219056) @@ -85,6 +85,7 @@ struct disk { u_int d_stripeoffset; u_int d_stripesize; char d_ident[DISK_IDENT_SIZE]; + char d_descr[DISK_IDENT_SIZE]; uint16_t d_hba_vendor; uint16_t d_hba_device; uint16_t d_hba_subvendor; From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 15:23:46 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D73F2106564A; Sat, 26 Feb 2011 15:23:46 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C555F8FC0A; Sat, 26 Feb 2011 15:23:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QFNkWb078775; Sat, 26 Feb 2011 15:23:46 GMT (envelope-from rrs@svn.freebsd.org) Received: (from rrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QFNkUG078759; Sat, 26 Feb 2011 15:23:46 GMT (envelope-from rrs@svn.freebsd.org) Message-Id: <201102261523.p1QFNkUG078759@svn.freebsd.org> From: Randall Stewart Date: Sat, 26 Feb 2011 15:23:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219057 - head/sys/netinet X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 15:23:46 -0000 Author: rrs Date: Sat Feb 26 15:23:46 2011 New Revision: 219057 URL: http://svn.freebsd.org/changeset/base/219057 Log: Improvements to CC modules: 1) Add four new points that allow you to get more information to cc algo's 2) Fix the case where user changes module on a existing TCB, in such a case, the initialization module needs to be called on all nets. 3) Move htcp_cc structure to a union that other modules can use. 4) Add 5th point for get/set socket options for cc_module specific options MFC after: 2 months Modified: head/sys/netinet/sctp.h head/sys/netinet/sctp_cc_functions.c head/sys/netinet/sctp_dtrace_declare.h head/sys/netinet/sctp_dtrace_define.h head/sys/netinet/sctp_indata.c head/sys/netinet/sctp_output.c head/sys/netinet/sctp_pcb.c head/sys/netinet/sctp_structs.h head/sys/netinet/sctp_sysctl.c head/sys/netinet/sctp_sysctl.h head/sys/netinet/sctp_timer.c head/sys/netinet/sctp_uio.h head/sys/netinet/sctp_usrreq.c head/sys/netinet/sctputil.c Modified: head/sys/netinet/sctp.h ============================================================================== --- head/sys/netinet/sctp.h Sat Feb 26 14:58:54 2011 (r219056) +++ head/sys/netinet/sctp.h Sat Feb 26 15:23:46 2011 (r219057) @@ -161,9 +161,10 @@ struct sctp_paramhdr { /* JRS - Pluggable Congestion Control Socket option */ #define SCTP_PLUGGABLE_CC 0x00001202 /* RS - Pluggable Stream Scheduling Socket option */ -#define SCTP_PLUGGABLE_SS 0x00001203 -#define SCTP_SS_VALUE 0x00001204 - +#define SCTP_PLUGGABLE_SS 0x00001203 +#define SCTP_SS_VALUE 0x00001204 +#define SCTP_CC_OPTION 0x00001205 /* Options for CC + * modules */ /* read only */ #define SCTP_GET_SNDBUF_USE 0x00001101 #define SCTP_GET_STAT_LOG 0x00001103 Modified: head/sys/netinet/sctp_cc_functions.c ============================================================================== --- head/sys/netinet/sctp_cc_functions.c Sat Feb 26 14:58:54 2011 (r219056) +++ head/sys/netinet/sctp_cc_functions.c Sat Feb 26 15:23:46 2011 (r219057) @@ -1135,10 +1135,10 @@ htcp_reset(struct htcp *ca) static uint32_t htcp_cwnd_undo(struct sctp_tcb *stcb, struct sctp_nets *net) { - net->htcp_ca.last_cong = net->htcp_ca.undo_last_cong; - net->htcp_ca.maxRTT = net->htcp_ca.undo_maxRTT; - net->htcp_ca.old_maxB = net->htcp_ca.undo_old_maxB; - return max(net->cwnd, ((net->ssthresh / net->mtu << 7) / net->htcp_ca.beta) * net->mtu); + net->cc_mod.htcp_ca.last_cong = net->cc_mod.htcp_ca.undo_last_cong; + net->cc_mod.htcp_ca.maxRTT = net->cc_mod.htcp_ca.undo_maxRTT; + net->cc_mod.htcp_ca.old_maxB = net->cc_mod.htcp_ca.undo_old_maxB; + return max(net->cwnd, ((net->ssthresh / net->mtu << 7) / net->cc_mod.htcp_ca.beta) * net->mtu); } #endif @@ -1149,15 +1149,15 @@ measure_rtt(struct sctp_tcb *stcb, struc uint32_t srtt = net->lastsa >> SCTP_RTT_SHIFT; /* keep track of minimum RTT seen so far, minRTT is zero at first */ - if (net->htcp_ca.minRTT > srtt || !net->htcp_ca.minRTT) - net->htcp_ca.minRTT = srtt; + if (net->cc_mod.htcp_ca.minRTT > srtt || !net->cc_mod.htcp_ca.minRTT) + net->cc_mod.htcp_ca.minRTT = srtt; /* max RTT */ - if (net->fast_retran_ip == 0 && net->ssthresh < 0xFFFF && htcp_ccount(&net->htcp_ca) > 3) { - if (net->htcp_ca.maxRTT < net->htcp_ca.minRTT) - net->htcp_ca.maxRTT = net->htcp_ca.minRTT; - if (net->htcp_ca.maxRTT < srtt && srtt <= net->htcp_ca.maxRTT + MSEC_TO_TICKS(20)) - net->htcp_ca.maxRTT = srtt; + if (net->fast_retran_ip == 0 && net->ssthresh < 0xFFFF && htcp_ccount(&net->cc_mod.htcp_ca) > 3) { + if (net->cc_mod.htcp_ca.maxRTT < net->cc_mod.htcp_ca.minRTT) + net->cc_mod.htcp_ca.maxRTT = net->cc_mod.htcp_ca.minRTT; + if (net->cc_mod.htcp_ca.maxRTT < srtt && srtt <= net->cc_mod.htcp_ca.maxRTT + MSEC_TO_TICKS(20)) + net->cc_mod.htcp_ca.maxRTT = srtt; } } @@ -1167,7 +1167,7 @@ measure_achieved_throughput(struct sctp_ uint32_t now = sctp_get_tick_count(); if (net->fast_retran_ip == 0) - net->htcp_ca.bytes_acked = net->net_ack; + net->cc_mod.htcp_ca.bytes_acked = net->net_ack; if (!use_bandwidth_switch) return; @@ -1175,29 +1175,29 @@ measure_achieved_throughput(struct sctp_ /* achieved throughput calculations */ /* JRS - not 100% sure of this statement */ if (net->fast_retran_ip == 1) { - net->htcp_ca.bytecount = 0; - net->htcp_ca.lasttime = now; + net->cc_mod.htcp_ca.bytecount = 0; + net->cc_mod.htcp_ca.lasttime = now; return; } - net->htcp_ca.bytecount += net->net_ack; + net->cc_mod.htcp_ca.bytecount += net->net_ack; - if (net->htcp_ca.bytecount >= net->cwnd - ((net->htcp_ca.alpha >> 7 ? : 1) * net->mtu) - && now - net->htcp_ca.lasttime >= net->htcp_ca.minRTT - && net->htcp_ca.minRTT > 0) { - uint32_t cur_Bi = net->htcp_ca.bytecount / net->mtu * hz / (now - net->htcp_ca.lasttime); + if (net->cc_mod.htcp_ca.bytecount >= net->cwnd - ((net->cc_mod.htcp_ca.alpha >> 7 ? : 1) * net->mtu) + && now - net->cc_mod.htcp_ca.lasttime >= net->cc_mod.htcp_ca.minRTT + && net->cc_mod.htcp_ca.minRTT > 0) { + uint32_t cur_Bi = net->cc_mod.htcp_ca.bytecount / net->mtu * hz / (now - net->cc_mod.htcp_ca.lasttime); - if (htcp_ccount(&net->htcp_ca) <= 3) { + if (htcp_ccount(&net->cc_mod.htcp_ca) <= 3) { /* just after backoff */ - net->htcp_ca.minB = net->htcp_ca.maxB = net->htcp_ca.Bi = cur_Bi; + net->cc_mod.htcp_ca.minB = net->cc_mod.htcp_ca.maxB = net->cc_mod.htcp_ca.Bi = cur_Bi; } else { - net->htcp_ca.Bi = (3 * net->htcp_ca.Bi + cur_Bi) / 4; - if (net->htcp_ca.Bi > net->htcp_ca.maxB) - net->htcp_ca.maxB = net->htcp_ca.Bi; - if (net->htcp_ca.minB > net->htcp_ca.maxB) - net->htcp_ca.minB = net->htcp_ca.maxB; + net->cc_mod.htcp_ca.Bi = (3 * net->cc_mod.htcp_ca.Bi + cur_Bi) / 4; + if (net->cc_mod.htcp_ca.Bi > net->cc_mod.htcp_ca.maxB) + net->cc_mod.htcp_ca.maxB = net->cc_mod.htcp_ca.Bi; + if (net->cc_mod.htcp_ca.minB > net->cc_mod.htcp_ca.maxB) + net->cc_mod.htcp_ca.minB = net->cc_mod.htcp_ca.maxB; } - net->htcp_ca.bytecount = 0; - net->htcp_ca.lasttime = now; + net->cc_mod.htcp_ca.bytecount = 0; + net->cc_mod.htcp_ca.lasttime = now; } } @@ -1264,25 +1264,25 @@ htcp_alpha_update(struct htcp *ca) static void htcp_param_update(struct sctp_tcb *stcb, struct sctp_nets *net) { - uint32_t minRTT = net->htcp_ca.minRTT; - uint32_t maxRTT = net->htcp_ca.maxRTT; + uint32_t minRTT = net->cc_mod.htcp_ca.minRTT; + uint32_t maxRTT = net->cc_mod.htcp_ca.maxRTT; - htcp_beta_update(&net->htcp_ca, minRTT, maxRTT); - htcp_alpha_update(&net->htcp_ca); + htcp_beta_update(&net->cc_mod.htcp_ca, minRTT, maxRTT); + htcp_alpha_update(&net->cc_mod.htcp_ca); /* * add slowly fading memory for maxRTT to accommodate routing * changes etc */ if (minRTT > 0 && maxRTT > minRTT) - net->htcp_ca.maxRTT = minRTT + ((maxRTT - minRTT) * 95) / 100; + net->cc_mod.htcp_ca.maxRTT = minRTT + ((maxRTT - minRTT) * 95) / 100; } static uint32_t htcp_recalc_ssthresh(struct sctp_tcb *stcb, struct sctp_nets *net) { htcp_param_update(stcb, net); - return max(((net->cwnd / net->mtu * net->htcp_ca.beta) >> 7) * net->mtu, 2U * net->mtu); + return max(((net->cwnd / net->mtu * net->cc_mod.htcp_ca.beta) >> 7) * net->mtu, 2U * net->mtu); } static void @@ -1323,14 +1323,14 @@ htcp_cong_avoid(struct sctp_tcb *stcb, s * net->cwnd += alpha / net->cwnd */ /* What is snd_cwnd_cnt?? */ - if (((net->partial_bytes_acked / net->mtu * net->htcp_ca.alpha) >> 7) * net->mtu >= net->cwnd) { + if (((net->partial_bytes_acked / net->mtu * net->cc_mod.htcp_ca.alpha) >> 7) * net->mtu >= net->cwnd) { /*- * Does SCTP have a cwnd clamp? * if (net->snd_cwnd < net->snd_cwnd_clamp) - Nope (RRS). */ net->cwnd += net->mtu; net->partial_bytes_acked = 0; - htcp_alpha_update(&net->htcp_ca); + htcp_alpha_update(&net->cc_mod.htcp_ca); if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_MONITOR_ENABLE) { sctp_log_cwnd(stcb, net, net->mtu, SCTP_CWND_LOG_FROM_CA); @@ -1343,7 +1343,7 @@ htcp_cong_avoid(struct sctp_tcb *stcb, s } } - net->htcp_ca.bytes_acked = net->mtu; + net->cc_mod.htcp_ca.bytes_acked = net->mtu; } } @@ -1360,11 +1360,11 @@ htcp_min_cwnd(struct sctp_tcb *stcb, str static void htcp_init(struct sctp_tcb *stcb, struct sctp_nets *net) { - memset(&net->htcp_ca, 0, sizeof(struct htcp)); - net->htcp_ca.alpha = ALPHA_BASE; - net->htcp_ca.beta = BETA_MIN; - net->htcp_ca.bytes_acked = net->mtu; - net->htcp_ca.last_cong = sctp_get_tick_count(); + memset(&net->cc_mod.htcp_ca, 0, sizeof(struct htcp)); + net->cc_mod.htcp_ca.alpha = ALPHA_BASE; + net->cc_mod.htcp_ca.beta = BETA_MIN; + net->cc_mod.htcp_ca.bytes_acked = net->mtu; + net->cc_mod.htcp_ca.last_cong = sctp_get_tick_count(); } static void @@ -1568,7 +1568,7 @@ sctp_htcp_cwnd_update_after_fr(struct sc int old_cwnd = net->cwnd; /* JRS - reset as if state were changed */ - htcp_reset(&net->htcp_ca); + htcp_reset(&net->cc_mod.htcp_ca); net->ssthresh = htcp_recalc_ssthresh(stcb, net); net->cwnd = net->ssthresh; if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_MONITOR_ENABLE) { @@ -1622,7 +1622,7 @@ sctp_htcp_cwnd_update_after_timeout(stru int old_cwnd = net->cwnd; /* JRS - reset as if the state were being changed to timeout */ - htcp_reset(&net->htcp_ca); + htcp_reset(&net->cc_mod.htcp_ca); net->ssthresh = htcp_recalc_ssthresh(stcb, net); net->cwnd = net->mtu; net->partial_bytes_acked = 0; @@ -1640,7 +1640,7 @@ sctp_htcp_cwnd_update_after_fr_timer(str old_cwnd = net->cwnd; sctp_chunk_output(inp, stcb, SCTP_OUTPUT_FROM_EARLY_FR_TMR, SCTP_SO_NOT_LOCKED); - net->htcp_ca.last_cong = sctp_get_tick_count(); + net->cc_mod.htcp_ca.last_cong = sctp_get_tick_count(); /* * make a small adjustment to cwnd and force to CA. */ @@ -1665,7 +1665,7 @@ sctp_htcp_cwnd_update_after_ecn_echo(str /* JRS - reset hctp as if state changed */ if (in_window == 0) { - htcp_reset(&net->htcp_ca); + htcp_reset(&net->cc_mod.htcp_ca); SCTP_STAT_INCR(sctps_ecnereducedcwnd); net->ssthresh = htcp_recalc_ssthresh(stcb, net); if (net->ssthresh < net->mtu) { Modified: head/sys/netinet/sctp_dtrace_declare.h ============================================================================== --- head/sys/netinet/sctp_dtrace_declare.h Sat Feb 26 14:58:54 2011 (r219056) +++ head/sys/netinet/sctp_dtrace_declare.h Sat Feb 26 15:23:46 2011 (r219057) @@ -55,6 +55,8 @@ SDT_PROBE_DECLARE(sctp, cwnd, net, bl); SDT_PROBE_DECLARE(sctp, cwnd, net, ecn); /* update at a Packet-Drop -- decrease */ SDT_PROBE_DECLARE(sctp, cwnd, net, pd); +/* Rttvar probe declaration */ +SDT_PROBE_DECLARE(sctp, cwnd, net, rttvar); /* One to track an associations rwnd */ SDT_PROBE_DECLARE(sctp, rwnd, assoc, val); Modified: head/sys/netinet/sctp_dtrace_define.h ============================================================================== --- head/sys/netinet/sctp_dtrace_define.h Sat Feb 26 14:58:54 2011 (r219056) +++ head/sys/netinet/sctp_dtrace_define.h Sat Feb 26 15:23:46 2011 (r219057) @@ -71,6 +71,21 @@ SDT_PROBE_ARGTYPE(sctp, cwnd, net, ack, /* The new value of the cwnd */ SDT_PROBE_ARGTYPE(sctp, cwnd, net, ack, 4, "int"); + +/* ACK-INCREASE */ +SDT_PROBE_DEFINE(sctp, cwnd, net, rttvar, rttvar); +/* The Vtag << 32 | localport << 16 | remoteport */ +SDT_PROBE_ARGTYPE(sctp, cwnd, net, rttvar, 0, "uint64_t"); +/* obw | nbw */ +SDT_PROBE_ARGTYPE(sctp, cwnd, net, rttvar, 1, "uint64_t"); +/* newrtt */ +SDT_PROBE_ARGTYPE(sctp, cwnd, net, rttvar, 2, "uint64_t"); +/* bwrtt */ +SDT_PROBE_ARGTYPE(sctp, cwnd, net, rttvar, 3, "uint64_t"); +/* (cwnd << 32) | point << 16 | retval(0/1) */ +SDT_PROBE_ARGTYPE(sctp, cwnd, net, rttvar, 4, "uint64_t"); + + /* FastRetransmit-DECREASE */ SDT_PROBE_DEFINE(sctp, cwnd, net, fr, fr); /* The Vtag for this end */ Modified: head/sys/netinet/sctp_indata.c ============================================================================== --- head/sys/netinet/sctp_indata.c Sat Feb 26 14:58:54 2011 (r219056) +++ head/sys/netinet/sctp_indata.c Sat Feb 26 15:23:46 2011 (r219057) @@ -2939,6 +2939,10 @@ sctp_process_segment_range(struct sctp_t tp1->rec.data.TSN_seq); } sctp_flight_size_decrease(tp1); + if (stcb->asoc.cc_functions.sctp_cwnd_update_tsn_acknowledged) { + (*stcb->asoc.cc_functions.sctp_cwnd_update_tsn_acknowledged) (tp1->whoTo, + tp1); + } sctp_total_flight_decrease(stcb, tp1); tp1->whoTo->net_ack += tp1->send_size; @@ -3442,6 +3446,10 @@ sctp_strike_gap_ack_chunks(struct sctp_t if (tp1->whoTo) { tp1->whoTo->net_ack++; sctp_flight_size_decrease(tp1); + if (stcb->asoc.cc_functions.sctp_cwnd_update_tsn_acknowledged) { + (*stcb->asoc.cc_functions.sctp_cwnd_update_tsn_acknowledged) (tp1->whoTo, + tp1); + } } if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LOG_RWND_ENABLE) { sctp_log_rwnd(SCTP_INCREASE_PEER_RWND, @@ -3737,6 +3745,10 @@ sctp_window_probe_recovery(struct sctp_t return; } /* First setup this by shrinking flight */ + if (stcb->asoc.cc_functions.sctp_cwnd_update_tsn_acknowledged) { + (*stcb->asoc.cc_functions.sctp_cwnd_update_tsn_acknowledged) (tp1->whoTo, + tp1); + } sctp_flight_size_decrease(tp1); sctp_total_flight_decrease(stcb, tp1); /* Now mark for resend */ @@ -3810,6 +3822,9 @@ sctp_express_handle_sack(struct sctp_tcb */ net->new_pseudo_cumack = 0; net->will_exit_fast_recovery = 0; + if (stcb->asoc.cc_functions.sctp_cwnd_prepare_net_for_sack) { + (*stcb->asoc.cc_functions.sctp_cwnd_prepare_net_for_sack) (stcb, net); + } } if (SCTP_BASE_SYSCTL(sctp_strict_sacks)) { uint32_t send_s; @@ -3883,6 +3898,10 @@ sctp_express_handle_sack(struct sctp_tcb tp1->rec.data.TSN_seq); } sctp_flight_size_decrease(tp1); + if (stcb->asoc.cc_functions.sctp_cwnd_update_tsn_acknowledged) { + (*stcb->asoc.cc_functions.sctp_cwnd_update_tsn_acknowledged) (tp1->whoTo, + tp1); + } /* sa_ignore NO_NULL_CHK */ sctp_total_flight_decrease(stcb, tp1); } @@ -4447,6 +4466,9 @@ sctp_handle_sack(struct mbuf *m, int off */ net->new_pseudo_cumack = 0; net->will_exit_fast_recovery = 0; + if (stcb->asoc.cc_functions.sctp_cwnd_prepare_net_for_sack) { + (*stcb->asoc.cc_functions.sctp_cwnd_prepare_net_for_sack) (stcb, net); + } } /* process the new consecutive TSN first */ TAILQ_FOREACH(tp1, &asoc->sent_queue, sctp_next) { @@ -4483,6 +4505,10 @@ sctp_handle_sack(struct mbuf *m, int off } sctp_flight_size_decrease(tp1); sctp_total_flight_decrease(stcb, tp1); + if (stcb->asoc.cc_functions.sctp_cwnd_update_tsn_acknowledged) { + (*stcb->asoc.cc_functions.sctp_cwnd_update_tsn_acknowledged) (tp1->whoTo, + tp1); + } } tp1->whoTo->net_ack += tp1->send_size; Modified: head/sys/netinet/sctp_output.c ============================================================================== --- head/sys/netinet/sctp_output.c Sat Feb 26 14:58:54 2011 (r219056) +++ head/sys/netinet/sctp_output.c Sat Feb 26 15:23:46 2011 (r219057) @@ -6476,6 +6476,9 @@ all_done: asoc->peers_rwnd = 0; } } + if (asoc->cc_functions.sctp_cwnd_update_packet_transmitted) { + (*asoc->cc_functions.sctp_cwnd_update_packet_transmitted) (stcb, net); + } } static void @@ -7341,6 +7344,10 @@ nothing_to_send: } continue; } + if ((stcb->asoc.cc_functions.sctp_cwnd_new_transmission_begins) && + (net->flight_size == 0)) { + (*stcb->asoc.cc_functions.sctp_cwnd_new_transmission_begins) (stcb, net); + } if ((asoc->sctp_cmt_on_off == 0) && (asoc->primary_destination != net) && (net->ref_count < 2)) { Modified: head/sys/netinet/sctp_pcb.c ============================================================================== --- head/sys/netinet/sctp_pcb.c Sat Feb 26 14:58:54 2011 (r219056) +++ head/sys/netinet/sctp_pcb.c Sat Feb 26 15:23:46 2011 (r219057) @@ -3953,7 +3953,8 @@ sctp_add_remote_addr(struct sctp_tcb *st stcb->asoc.smallest_mtu = net->mtu; } /* JRS - Use the congestion control given in the CC module */ - stcb->asoc.cc_functions.sctp_set_initial_cc_param(stcb, net); + if (stcb->asoc.cc_functions.sctp_set_initial_cc_param != NULL) + (*stcb->asoc.cc_functions.sctp_set_initial_cc_param) (stcb, net); /* * CMT: CUC algo - set find_pseudo_cumack to TRUE (1) at beginning Modified: head/sys/netinet/sctp_structs.h ============================================================================== --- head/sys/netinet/sctp_structs.h Sat Feb 26 14:58:54 2011 (r219056) +++ head/sys/netinet/sctp_structs.h Sat Feb 26 15:23:46 2011 (r219057) @@ -219,7 +219,6 @@ struct htcp { uint32_t lasttime; }; - struct sctp_nets { TAILQ_ENTRY(sctp_nets) sctp_next; /* next link */ @@ -254,10 +253,9 @@ struct sctp_nets { /* last time in seconds I sent to it */ struct timeval last_sent_time; - - /* JRS - struct used in HTCP algorithm */ - struct htcp htcp_ca; - + union cc_control_data { + struct htcp htcp_ca; /* JRS - struct used in HTCP algorithm */ + } cc_mod; int ref_count; /* Congestion stats per destination */ @@ -648,6 +646,15 @@ struct sctp_cc_functions { struct sctp_nets *net, int burst_limit); void (*sctp_cwnd_update_after_fr_timer) (struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct sctp_nets *net); + void (*sctp_cwnd_update_packet_transmitted) (struct sctp_tcb *stcb, + struct sctp_nets *net); + void (*sctp_cwnd_update_tsn_acknowledged) (struct sctp_nets *net, + struct sctp_tmit_chunk *); + void (*sctp_cwnd_new_transmission_begins) (struct sctp_tcb *stcb, + struct sctp_nets *net); + void (*sctp_cwnd_prepare_net_for_sack) (struct sctp_tcb *stcb, + struct sctp_nets *net); + int (*sctp_cwnd_socket_option) (struct sctp_tcb *stcb, int set, struct sctp_cc_option *); }; /* @@ -1166,6 +1173,7 @@ struct sctp_association { uint8_t sctp_nr_sack_on_off; /* JRS 5/21/07 - CMT PF variable */ uint8_t sctp_cmt_pf; + uint8_t use_precise_time; /* * The mapping array is used to track out of order sequences above * last_acked_seq. 0 indicates packet missing 1 indicates packet Modified: head/sys/netinet/sctp_sysctl.c ============================================================================== --- head/sys/netinet/sctp_sysctl.c Sat Feb 26 14:58:54 2011 (r219056) +++ head/sys/netinet/sctp_sysctl.c Sat Feb 26 15:23:46 2011 (r219057) @@ -115,6 +115,9 @@ sctp_init_sysctls() SCTP_BASE_SYSCTL(sctp_vtag_time_wait) = SCTPCTL_TIME_WAIT_DEFAULT; SCTP_BASE_SYSCTL(sctp_buffer_splitting) = SCTPCTL_BUFFER_SPLITTING_DEFAULT; SCTP_BASE_SYSCTL(sctp_initial_cwnd) = SCTPCTL_INITIAL_CWND_DEFAULT; + SCTP_BASE_SYSCTL(sctp_rttvar_bw) = SCTPCTL_RTTVAR_BW_DEFAULT; + SCTP_BASE_SYSCTL(sctp_rttvar_rtt) = SCTPCTL_RTTVAR_RTT_DEFAULT; + SCTP_BASE_SYSCTL(sctp_rttvar_eqret) = SCTPCTL_RTTVAR_EQRET_DEFAULT; #if defined(SCTP_LOCAL_TRACE_BUF) memset(&SCTP_BASE_SYSCTL(sctp_log), 0, sizeof(struct sctp_log)); #endif @@ -633,6 +636,9 @@ sysctl_sctp_check(SYSCTL_HANDLER_ARGS) RANGECHK(SCTP_BASE_SYSCTL(sctp_vtag_time_wait), SCTPCTL_TIME_WAIT_MIN, SCTPCTL_TIME_WAIT_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_buffer_splitting), SCTPCTL_BUFFER_SPLITTING_MIN, SCTPCTL_BUFFER_SPLITTING_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_initial_cwnd), SCTPCTL_INITIAL_CWND_MIN, SCTPCTL_INITIAL_CWND_MAX); + RANGECHK(SCTP_BASE_SYSCTL(sctp_rttvar_bw), SCTPCTL_RTTVAR_BW_MIN, SCTPCTL_RTTVAR_BW_MAX); + RANGECHK(SCTP_BASE_SYSCTL(sctp_rttvar_rtt), SCTPCTL_RTTVAR_RTT_MIN, SCTPCTL_RTTVAR_RTT_MAX); + RANGECHK(SCTP_BASE_SYSCTL(sctp_rttvar_eqret), SCTPCTL_RTTVAR_EQRET_MIN, SCTPCTL_RTTVAR_EQRET_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_mobility_base), SCTPCTL_MOBILITY_BASE_MIN, SCTPCTL_MOBILITY_BASE_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_mobility_fasthandoff), SCTPCTL_MOBILITY_FASTHANDOFF_MIN, SCTPCTL_MOBILITY_FASTHANDOFF_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_udp_tunneling_for_client_enable), SCTPCTL_UDP_TUNNELING_FOR_CLIENT_ENABLE_MIN, SCTPCTL_UDP_TUNNELING_FOR_CLIENT_ENABLE_MAX); @@ -1100,6 +1106,18 @@ SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUT &SCTP_BASE_SYSCTL(sctp_initial_cwnd), 0, sysctl_sctp_check, "IU", SCTPCTL_INITIAL_CWND_DESC); +SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, rttvar_bw, CTLTYPE_UINT | CTLFLAG_RW, + &SCTP_BASE_SYSCTL(sctp_rttvar_bw), 0, sysctl_sctp_check, "IU", + SCTPCTL_RTTVAR_BW_DESC); + +SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, rttvar_rtt, CTLTYPE_UINT | CTLFLAG_RW, + &SCTP_BASE_SYSCTL(sctp_rttvar_rtt), 0, sysctl_sctp_check, "IU", + SCTPCTL_RTTVAR_RTT_DESC); + +SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, rttvar_eqret, CTLTYPE_UINT | CTLFLAG_RW, + &SCTP_BASE_SYSCTL(sctp_rttvar_eqret), 0, sysctl_sctp_check, "IU", + SCTPCTL_RTTVAR_EQRET_DESC); + #ifdef SCTP_DEBUG SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, debug, CTLTYPE_UINT | CTLFLAG_RW, &SCTP_BASE_SYSCTL(sctp_debug_on), 0, sysctl_sctp_check, "IU", Modified: head/sys/netinet/sctp_sysctl.h ============================================================================== --- head/sys/netinet/sctp_sysctl.h Sat Feb 26 14:58:54 2011 (r219056) +++ head/sys/netinet/sctp_sysctl.h Sat Feb 26 15:23:46 2011 (r219057) @@ -104,6 +104,11 @@ struct sctp_sysctl { uint32_t sctp_mobility_base; uint32_t sctp_mobility_fasthandoff; uint32_t sctp_inits_include_nat_friendly; +#ifdef SCTP_HAS_RTTCC + uint32_t sctp_rttvar_bw; + uint32_t sctp_rttvar_rtt; + uint32_t sctp_rttvar_eqret; +#endif #if defined(SCTP_LOCAL_TRACE_BUF) struct sctp_log sctp_log; #endif @@ -514,6 +519,25 @@ struct sctp_sysctl { #define SCTPCTL_INITIAL_CWND_MIN 0 #define SCTPCTL_INITIAL_CWND_MAX 0xffffffff #define SCTPCTL_INITIAL_CWND_DEFAULT 3 +#ifdef SCTP_HAS_RTTCC + +/* rttvar smooth avg for bw calc */ +#define SCTPCTL_RTTVAR_BW_DESC "Shift amount for bw smothing on rtt calc" +#define SCTPCTL_RTTVAR_BW_MIN 0 +#define SCTPCTL_RTTVAR_BW_MAX 32 +#define SCTPCTL_RTTVAR_BW_DEFAULT 4 + +/* rttvar smooth avg for bw calc */ +#define SCTPCTL_RTTVAR_RTT_DESC "Shift amount for rtt smothing on rtt calc" +#define SCTPCTL_RTTVAR_RTT_MIN 0 +#define SCTPCTL_RTTVAR_RTT_MAX 32 +#define SCTPCTL_RTTVAR_RTT_DEFAULT 5 + +#define SCTPCTL_RTTVAR_EQRET_DESC "When rtt and bw are unchanged return what" +#define SCTPCTL_RTTVAR_EQRET_MIN 0 +#define SCTPCTL_RTTVAR_EQRET_MAX 1 +#define SCTPCTL_RTTVAR_EQRET_DEFAULT 0 +#endif #if defined(SCTP_DEBUG) /* debug: Configure debug output */ Modified: head/sys/netinet/sctp_timer.c ============================================================================== --- head/sys/netinet/sctp_timer.c Sat Feb 26 14:58:54 2011 (r219056) +++ head/sys/netinet/sctp_timer.c Sat Feb 26 15:23:46 2011 (r219057) @@ -1015,7 +1015,10 @@ sctp_t3rxt_timer(struct sctp_inpcb *inp, /* CMT FR loss recovery ended with the T3 */ net->fast_retran_loss_recovery = 0; - + if ((stcb->asoc.cc_functions.sctp_cwnd_new_transmission_begins) && + (net->flight_size == 0)) { + (*stcb->asoc.cc_functions.sctp_cwnd_new_transmission_begins) (stcb, net); + } /* * setup the sat loss recovery that prevents satellite cwnd advance. */ Modified: head/sys/netinet/sctp_uio.h ============================================================================== --- head/sys/netinet/sctp_uio.h Sat Feb 26 14:58:54 2011 (r219056) +++ head/sys/netinet/sctp_uio.h Sat Feb 26 15:23:46 2011 (r219057) @@ -533,6 +533,11 @@ struct sctp_assoc_value { uint32_t assoc_value; }; +struct sctp_cc_option { + int option; + struct sctp_assoc_value aid_value; +}; + struct sctp_stream_value { sctp_assoc_t assoc_id; uint16_t stream_id; Modified: head/sys/netinet/sctp_usrreq.c ============================================================================== --- head/sys/netinet/sctp_usrreq.c Sat Feb 26 14:58:54 2011 (r219056) +++ head/sys/netinet/sctp_usrreq.c Sat Feb 26 15:23:46 2011 (r219057) @@ -1758,6 +1758,25 @@ flags_out: *optsize = sizeof(*av); } break; + case SCTP_CC_OPTION: + { + struct sctp_cc_option *cc_opt; + + SCTP_CHECK_AND_CAST(cc_opt, optval, struct sctp_cc_option, *optsize); + SCTP_FIND_STCB(inp, stcb, cc_opt->aid_value.assoc_id); + if (stcb == NULL) { + error = EINVAL; + } else { + if (stcb->asoc.cc_functions.sctp_cwnd_socket_option == NULL) { + error = ENOTSUP; + } else { + error = (*stcb->asoc.cc_functions.sctp_cwnd_socket_option) (stcb, 0, + cc_opt); + *optsize = sizeof(*cc_opt); + } + SCTP_TCB_UNLOCK(stcb); + } + } /* RS - Get socket option for pluggable stream scheduling */ case SCTP_PLUGGABLE_SS: { @@ -2929,6 +2948,7 @@ sctp_setopt(struct socket *so, int optna case SCTP_PLUGGABLE_CC: { struct sctp_assoc_value *av; + struct sctp_nets *net; SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, optsize); SCTP_FIND_STCB(inp, stcb, av->assoc_id); @@ -2939,6 +2959,11 @@ sctp_setopt(struct socket *so, int optna case SCTP_CC_HTCP: stcb->asoc.cc_functions = sctp_cc_functions[av->assoc_value]; stcb->asoc.congestion_control_module = av->assoc_value; + if (stcb->asoc.cc_functions.sctp_set_initial_cc_param != NULL) { + TAILQ_FOREACH(net, &stcb->asoc.nets, sctp_next) { + stcb->asoc.cc_functions.sctp_set_initial_cc_param(stcb, net); + } + } break; default: SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL); @@ -2962,6 +2987,24 @@ sctp_setopt(struct socket *so, int optna } } } + case SCTP_CC_OPTION: + { + struct sctp_cc_option *cc_opt; + + SCTP_CHECK_AND_CAST(cc_opt, optval, struct sctp_cc_option, optsize); + SCTP_FIND_STCB(inp, stcb, cc_opt->aid_value.assoc_id); + if (stcb == NULL) { + error = EINVAL; + } else { + if (stcb->asoc.cc_functions.sctp_cwnd_socket_option == NULL) { + error = ENOTSUP; + } else { + error = (*stcb->asoc.cc_functions.sctp_cwnd_socket_option) (stcb, 1, + cc_opt); + } + SCTP_TCB_UNLOCK(stcb); + } + } break; /* RS - Set socket option for pluggable stream scheduling */ case SCTP_PLUGGABLE_SS: Modified: head/sys/netinet/sctputil.c ============================================================================== --- head/sys/netinet/sctputil.c Sat Feb 26 14:58:54 2011 (r219056) +++ head/sys/netinet/sctputil.c Sat Feb 26 15:23:46 2011 (r219057) @@ -2495,7 +2495,11 @@ sctp_calculate_rto(struct sctp_tcb *stcb /* 1. calculate new RTT */ /************************/ /* get the current time */ - (void)SCTP_GETTIME_TIMEVAL(&now); + if (stcb->asoc.use_precise_time) { + (void)SCTP_GETPTIME_TIMEVAL(&now); + } else { + (void)SCTP_GETTIME_TIMEVAL(&now); + } timevalsub(&now, old); /* store the current RTT in us */ net->rtt = (uint64_t) 10000000 *(uint64_t) now.tv_sec + From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 15:44:04 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A49D1065670; Sat, 26 Feb 2011 15:44:04 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D2CA28FC13; Sat, 26 Feb 2011 15:44:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QFi3Ga080530; Sat, 26 Feb 2011 15:44:03 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QFi3Kk080528; Sat, 26 Feb 2011 15:44:03 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201102261544.p1QFi3Kk080528@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 26 Feb 2011 15:44:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219058 - head/usr.sbin/bsdinstall/partedit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 15:44:04 -0000 Author: nwhitehorn Date: Sat Feb 26 15:44:03 2011 New Revision: 219058 URL: http://svn.freebsd.org/changeset/base/219058 Log: Show disk model numbers in partition wizard screen. Also, since da(4) disks are probably more likely to be USB or Firewire these days than SCSI, just call them and anyone unknown "Disk" instead of SCSI disk. Modified: head/usr.sbin/bsdinstall/partedit/part_wizard.c Modified: head/usr.sbin/bsdinstall/partedit/part_wizard.c ============================================================================== --- head/usr.sbin/bsdinstall/partedit/part_wizard.c Sat Feb 26 15:23:46 2011 (r219057) +++ head/usr.sbin/bsdinstall/partedit/part_wizard.c Sat Feb 26 15:44:03 2011 (r219058) @@ -89,7 +89,7 @@ boot_disk(struct gmesh *mesh) struct ggeom *gp; struct gprovider *pp; DIALOG_LISTITEM *disks = NULL; - const char *type; + const char *type, *desc; char diskdesc[512]; char *chosen; int i, err, selected, n = 0; @@ -104,15 +104,20 @@ boot_disk(struct gmesh *mesh) continue; LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { - type = NULL; - LIST_FOREACH(gc, &pp->lg_config, lg_config) + desc = type = NULL; + LIST_FOREACH(gc, &pp->lg_config, lg_config) { if (strcmp(gc->lg_name, "type") == 0) type = gc->lg_val; + if (strcmp(gc->lg_name, "descr") == 0) + desc = gc->lg_val; + } - /* Skip swap-backed md devices */ + /* Skip swap-backed md and WORM devices */ if (strcmp(classp->lg_name, "MD") == 0 && type != NULL && strcmp(type, "swap") == 0) continue; + if (strncmp(pp->lg_name, "cd", 2) == 0) + continue; disks = realloc(disks, (++n)*sizeof(disks[0])); disks[n-1].name = pp->lg_name; @@ -120,15 +125,15 @@ boot_disk(struct gmesh *mesh) "B", HN_AUTOSCALE, HN_DECIMAL); if (strncmp(pp->lg_name, "ad", 2) == 0) strcat(diskdesc, " ATA Hard Disk"); - else if (strncmp(pp->lg_name, "da", 2) == 0) - strcat(diskdesc, " SCSI Hard Disk"); else if (strncmp(pp->lg_name, "md", 2) == 0) strcat(diskdesc, " Memory Disk"); - else if (strncmp(pp->lg_name, "cd", 2) == 0) { - n--; - continue; - } else - strcat(diskdesc, " Hard Disk"); + else + strcat(diskdesc, " Disk"); + + if (desc != NULL) + snprintf(diskdesc, sizeof(diskdesc), + "%s <%s>", diskdesc, desc); + disks[n-1].text = strdup(diskdesc); disks[n-1].help = NULL; disks[n-1].state = 0; From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 17:22:11 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90349106564A; Sat, 26 Feb 2011 17:22:11 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7F19C8FC08; Sat, 26 Feb 2011 17:22:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QHMB1k084153; Sat, 26 Feb 2011 17:22:11 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QHMBP2084151; Sat, 26 Feb 2011 17:22:11 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201102261722.p1QHMBP2084151@svn.freebsd.org> From: Gleb Smirnoff Date: Sat, 26 Feb 2011 17:22:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219059 - head/sys/modules/usb X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 17:22:11 -0000 Author: glebius Date: Sat Feb 26 17:22:11 2011 New Revision: 219059 URL: http://svn.freebsd.org/changeset/base/219059 Log: Connect uep.ko to build PR: kern/155044 Submitted by: Carl MFC after: 1 week Modified: head/sys/modules/usb/Makefile Modified: head/sys/modules/usb/Makefile ============================================================================== --- head/sys/modules/usb/Makefile Sat Feb 26 15:44:03 2011 (r219058) +++ head/sys/modules/usb/Makefile Sat Feb 26 17:22:11 2011 (r219059) @@ -28,7 +28,7 @@ SUBDIR = usb SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci} SUBDIR += rum run uath upgt ural zyd ${_urtw} -SUBDIR += atp uhid ukbd ums udbp ufm +SUBDIR += atp uhid ukbd ums udbp ufm uep SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ umct umodem umoscom uplcom uslcom uvisor uvscom SUBDIR += uether aue axe cdce cue kue mos rue udav uhso ipheth From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 17:28:09 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D7621065672; Sat, 26 Feb 2011 17:28:09 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7C27B8FC0A; Sat, 26 Feb 2011 17:28:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QHS9Ck084408; Sat, 26 Feb 2011 17:28:09 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QHS9GZ084406; Sat, 26 Feb 2011 17:28:09 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201102261728.p1QHS9GZ084406@svn.freebsd.org> From: Marius Strobl Date: Sat, 26 Feb 2011 17:28:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219060 - head/sys/dev/fxp X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 17:28:09 -0000 Author: marius Date: Sat Feb 26 17:28:09 2011 New Revision: 219060 URL: http://svn.freebsd.org/changeset/base/219060 Log: - Allocate the DMA memory shared between the host and the controller as coherent. - Update a comment to no longer reference Alpha. Modified: head/sys/dev/fxp/if_fxp.c Modified: head/sys/dev/fxp/if_fxp.c ============================================================================== --- head/sys/dev/fxp/if_fxp.c Sat Feb 26 17:22:11 2011 (r219059) +++ head/sys/dev/fxp/if_fxp.c Sat Feb 26 17:28:09 2011 (r219060) @@ -87,7 +87,7 @@ MODULE_DEPEND(fxp, miibus, 1, 1, 1); #include "miibus_if.h" /* - * NOTE! On the Alpha, we have an alignment constraint. The + * NOTE! On !x86 we typically have an alignment constraint. The * card DMAs the packet immediately following the RFA. However, * the first thing in the packet is a 14-byte Ethernet header. * This means that the packet is misaligned. To compensate, @@ -675,7 +675,7 @@ fxp_attach(device_t dev) } error = bus_dmamem_alloc(sc->fxp_stag, (void **)&sc->fxp_stats, - BUS_DMA_NOWAIT | BUS_DMA_ZERO, &sc->fxp_smap); + BUS_DMA_NOWAIT | BUS_DMA_COHERENT | BUS_DMA_ZERO, &sc->fxp_smap); if (error) { device_printf(dev, "could not allocate stats DMA memory\n"); goto fail; @@ -697,7 +697,7 @@ fxp_attach(device_t dev) } error = bus_dmamem_alloc(sc->cbl_tag, (void **)&sc->fxp_desc.cbl_list, - BUS_DMA_NOWAIT | BUS_DMA_ZERO, &sc->cbl_map); + BUS_DMA_NOWAIT | BUS_DMA_COHERENT | BUS_DMA_ZERO, &sc->cbl_map); if (error) { device_printf(dev, "could not allocate TxCB DMA memory\n"); goto fail; @@ -722,7 +722,7 @@ fxp_attach(device_t dev) } error = bus_dmamem_alloc(sc->mcs_tag, (void **)&sc->mcsp, - BUS_DMA_NOWAIT | BUS_DMA_ZERO, &sc->mcs_map); + BUS_DMA_NOWAIT | BUS_DMA_COHERENT | BUS_DMA_ZERO, &sc->mcs_map); if (error) { device_printf(dev, "could not allocate multicast setup DMA memory\n"); From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 18:54:54 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63FC610656A3; Sat, 26 Feb 2011 18:54:54 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 522C98FC08; Sat, 26 Feb 2011 18:54:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QIss6m088886; Sat, 26 Feb 2011 18:54:54 GMT (envelope-from ume@svn.freebsd.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QIssPQ088883; Sat, 26 Feb 2011 18:54:54 GMT (envelope-from ume@svn.freebsd.org) Message-Id: <201102261854.p1QIssPQ088883@svn.freebsd.org> From: Hajimu UMEMOTO Date: Sat, 26 Feb 2011 18:54:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219061 - head/bin/csh X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 18:54:54 -0000 Author: ume Date: Sat Feb 26 18:54:54 2011 New Revision: 219061 URL: http://svn.freebsd.org/changeset/base/219061 Log: When WITH_ICONV is set, use our in-tree iconv. Added: head/bin/csh/iconv_stub.h - copied unchanged from r219060, head/bin/csh/iconv.h Deleted: head/bin/csh/iconv.h Modified: head/bin/csh/Makefile Modified: head/bin/csh/Makefile ============================================================================== --- head/bin/csh/Makefile Sat Feb 26 17:28:09 2011 (r219060) +++ head/bin/csh/Makefile Sat Feb 26 18:54:54 2011 (r219061) @@ -76,18 +76,26 @@ NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859- CFLAGS+= -DNO_NLS_CATALOGS .else CFLAGS+= -DHAVE_ICONV +.if ${MK_ICONV} != "no" +NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8 +NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8 +NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8 +NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8 +NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8 +NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8 +NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8 +NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8 +NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8 +NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8 +.else +# Above links can be installed from ports/shells/tcsh_nls + +GENHDRS+= iconv.h SRCS+= iconv_stub.c -# Following links can be installed from ports/shells/tcsh_nls: -# NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8 -# NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8 -# NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8 -# NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8 -# NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8 -# NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8 -# NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8 -# NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8 -# NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8 -# NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8 + +iconv.h: ${.CURDIR}/iconv_stub.h + cp ${.CURDIR}/iconv_stub.h ${.TARGET} +.endif .endif NLSNAME= tcsh @@ -105,7 +113,8 @@ build-tools: gethost gethost: gethost.c sh.err.h tc.const.h sh.h @rm -f ${.TARGET} - ${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${TCSHDIR}/gethost.c + ${CC} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \ + ${TCSHDIR}/gethost.c tc.defs.c: gethost ${.CURDIR}/host.defs @rm -f ${.TARGET} @@ -133,7 +142,8 @@ tc.const.h: tc.const.c sh.char.h config. @echo '/* Do not edit this file, make creates it. */' > ${.TARGET} @echo '#ifndef _h_tc_const' >> ${.TARGET} @echo '#define _h_tc_const' >> ${.TARGET} - ${CC} -E ${CFLAGS} ${.ALLSRC} -D_h_tc_const | grep 'Char STR' | \ + ${CC} -E ${CFLAGS:C/-DHAVE_ICONV//} ${.ALLSRC} -D_h_tc_const | \ + grep 'Char STR' | \ sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \ sort >> ${.TARGET} @echo '#endif /* _h_tc_const */' >> ${.TARGET} Copied: head/bin/csh/iconv_stub.h (from r219060, head/bin/csh/iconv.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/csh/iconv_stub.h Sat Feb 26 18:54:54 2011 (r219061, copy of r219060, head/bin/csh/iconv.h) @@ -0,0 +1,44 @@ +/*- + * Copyright (c) 2006 Hajimu UMEMOTO + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _ICONV_H_ +#define _ICONV_H_ + +typedef void *iconv_t; +typedef size_t dl_iconv_t(iconv_t, const char **, size_t *, char **, size_t *); +typedef int dl_iconv_close_t(iconv_t); + +extern iconv_t dl_iconv_open(const char *, const char *); +extern dl_iconv_t *dl_iconv; +extern dl_iconv_close_t *dl_iconv_close; + +#define iconv_open dl_iconv_open +#define iconv dl_iconv +#define iconv_close dl_iconv_close + +#endif /* !_ICONV_H_ */ From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 22:45:40 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3003106566C; Sat, 26 Feb 2011 22:45:40 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 878EB8FC12; Sat, 26 Feb 2011 22:45:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QMjeDk099544; Sat, 26 Feb 2011 22:45:40 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QMjefm099542; Sat, 26 Feb 2011 22:45:40 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201102262245.p1QMjefm099542@svn.freebsd.org> From: Dimitry Andric Date: Sat, 26 Feb 2011 22:45:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219071 - head/sys/netinet X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 22:45:40 -0000 Author: dim Date: Sat Feb 26 22:45:40 2011 New Revision: 219071 URL: http://svn.freebsd.org/changeset/base/219071 Log: Fix breakage in sys/netinet/sctp_sysctl.c, introduced by r219057. If SCTP_HAS_RTTC is not defined, this file fails to compile. Insert the necessary #ifdefs to make it work. Pointy hat to: rrs Modified: head/sys/netinet/sctp_sysctl.c Modified: head/sys/netinet/sctp_sysctl.c ============================================================================== --- head/sys/netinet/sctp_sysctl.c Sat Feb 26 22:09:57 2011 (r219070) +++ head/sys/netinet/sctp_sysctl.c Sat Feb 26 22:45:40 2011 (r219071) @@ -115,9 +115,11 @@ sctp_init_sysctls() SCTP_BASE_SYSCTL(sctp_vtag_time_wait) = SCTPCTL_TIME_WAIT_DEFAULT; SCTP_BASE_SYSCTL(sctp_buffer_splitting) = SCTPCTL_BUFFER_SPLITTING_DEFAULT; SCTP_BASE_SYSCTL(sctp_initial_cwnd) = SCTPCTL_INITIAL_CWND_DEFAULT; +#ifdef SCTP_HAS_RTTCC SCTP_BASE_SYSCTL(sctp_rttvar_bw) = SCTPCTL_RTTVAR_BW_DEFAULT; SCTP_BASE_SYSCTL(sctp_rttvar_rtt) = SCTPCTL_RTTVAR_RTT_DEFAULT; SCTP_BASE_SYSCTL(sctp_rttvar_eqret) = SCTPCTL_RTTVAR_EQRET_DEFAULT; +#endif #if defined(SCTP_LOCAL_TRACE_BUF) memset(&SCTP_BASE_SYSCTL(sctp_log), 0, sizeof(struct sctp_log)); #endif @@ -636,9 +638,11 @@ sysctl_sctp_check(SYSCTL_HANDLER_ARGS) RANGECHK(SCTP_BASE_SYSCTL(sctp_vtag_time_wait), SCTPCTL_TIME_WAIT_MIN, SCTPCTL_TIME_WAIT_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_buffer_splitting), SCTPCTL_BUFFER_SPLITTING_MIN, SCTPCTL_BUFFER_SPLITTING_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_initial_cwnd), SCTPCTL_INITIAL_CWND_MIN, SCTPCTL_INITIAL_CWND_MAX); +#ifdef SCTP_HAS_RTTCC RANGECHK(SCTP_BASE_SYSCTL(sctp_rttvar_bw), SCTPCTL_RTTVAR_BW_MIN, SCTPCTL_RTTVAR_BW_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_rttvar_rtt), SCTPCTL_RTTVAR_RTT_MIN, SCTPCTL_RTTVAR_RTT_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_rttvar_eqret), SCTPCTL_RTTVAR_EQRET_MIN, SCTPCTL_RTTVAR_EQRET_MAX); +#endif RANGECHK(SCTP_BASE_SYSCTL(sctp_mobility_base), SCTPCTL_MOBILITY_BASE_MIN, SCTPCTL_MOBILITY_BASE_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_mobility_fasthandoff), SCTPCTL_MOBILITY_FASTHANDOFF_MIN, SCTPCTL_MOBILITY_FASTHANDOFF_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_udp_tunneling_for_client_enable), SCTPCTL_UDP_TUNNELING_FOR_CLIENT_ENABLE_MIN, SCTPCTL_UDP_TUNNELING_FOR_CLIENT_ENABLE_MAX); @@ -1106,6 +1110,7 @@ SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUT &SCTP_BASE_SYSCTL(sctp_initial_cwnd), 0, sysctl_sctp_check, "IU", SCTPCTL_INITIAL_CWND_DESC); +#ifdef SCTP_HAS_RTTCC SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, rttvar_bw, CTLTYPE_UINT | CTLFLAG_RW, &SCTP_BASE_SYSCTL(sctp_rttvar_bw), 0, sysctl_sctp_check, "IU", SCTPCTL_RTTVAR_BW_DESC); @@ -1117,6 +1122,7 @@ SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUT SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, rttvar_eqret, CTLTYPE_UINT | CTLFLAG_RW, &SCTP_BASE_SYSCTL(sctp_rttvar_eqret), 0, sysctl_sctp_check, "IU", SCTPCTL_RTTVAR_EQRET_DESC); +#endif #ifdef SCTP_DEBUG SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, debug, CTLTYPE_UINT | CTLFLAG_RW, From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 23:05:47 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 807DD106567A; Sat, 26 Feb 2011 23:05:47 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6F9958FC13; Sat, 26 Feb 2011 23:05:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QN5lHJ000745; Sat, 26 Feb 2011 23:05:47 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QN5l9I000743; Sat, 26 Feb 2011 23:05:47 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201102262305.p1QN5l9I000743@svn.freebsd.org> From: Dimitry Andric Date: Sat, 26 Feb 2011 23:05:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219072 - head/contrib/llvm/tools/clang/lib/Driver X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 23:05:47 -0000 Author: dim Date: Sat Feb 26 23:05:47 2011 New Revision: 219072 URL: http://svn.freebsd.org/changeset/base/219072 Log: Remove misapplied space. Modified: head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Modified: head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp ============================================================================== --- head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Sat Feb 26 22:45:40 2011 (r219071) +++ head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Sat Feb 26 23:05:47 2011 (r219072) @@ -3206,7 +3206,7 @@ void freebsd::Link::ConstructJob(Compila } Args.AddAllArgs(CmdArgs, options::OPT_L); - + const ToolChain::path_list Paths = getToolChain().getFilePaths(); for (ToolChain::path_list::const_iterator i = Paths.begin(), e = Paths.end(); i != e; ++i) From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 23:07:44 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C1CF106564A; Sat, 26 Feb 2011 23:07:44 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EF5918FC15; Sat, 26 Feb 2011 23:07:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QN7hkK000943; Sat, 26 Feb 2011 23:07:43 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QN7hJt000941; Sat, 26 Feb 2011 23:07:43 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201102262307.p1QN7hJt000941@svn.freebsd.org> From: Dimitry Andric Date: Sat, 26 Feb 2011 23:07:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219073 - head/contrib/llvm/tools/clang/lib/Driver X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 23:07:44 -0000 Author: dim Date: Sat Feb 26 23:07:43 2011 New Revision: 219073 URL: http://svn.freebsd.org/changeset/base/219073 Log: Remove getDriver().Dir + /../libexec and /usr/libexec from clang's program paths. Unlike gcc, clang has no executables in libexec. Modified: head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp Modified: head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp ============================================================================== --- head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp Sat Feb 26 23:05:47 2011 (r219072) +++ head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp Sat Feb 26 23:07:43 2011 (r219073) @@ -1108,8 +1108,6 @@ FreeBSD::FreeBSD(const HostInfo &Host, c llvm::Triple::x86_64) Lib32 = true; - getProgramPaths().push_back(getDriver().Dir + "/../libexec"); - getProgramPaths().push_back("/usr/libexec"); if (Lib32) { getFilePaths().push_back(CLANG_PREFIX "/usr/lib32"); } else { From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 23:12:36 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2649106564A; Sat, 26 Feb 2011 23:12:36 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 912D58FC08; Sat, 26 Feb 2011 23:12:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QNCauY001395; Sat, 26 Feb 2011 23:12:36 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QNCa86001392; Sat, 26 Feb 2011 23:12:36 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201102262312.p1QNCa86001392@svn.freebsd.org> From: Dimitry Andric Date: Sat, 26 Feb 2011 23:12:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219074 - head/lib/clang/include/llvm/Config X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 23:12:36 -0000 Author: dim Date: Sat Feb 26 23:12:36 2011 New Revision: 219074 URL: http://svn.freebsd.org/changeset/base/219074 Log: Update llvm's config.h files to match more closely what is generated by a regular autoconf-based build. More cosmetic than functional changes. Modified: head/lib/clang/include/llvm/Config/config.h head/lib/clang/include/llvm/Config/llvm-config.h Modified: head/lib/clang/include/llvm/Config/config.h ============================================================================== --- head/lib/clang/include/llvm/Config/config.h Sat Feb 26 23:07:43 2011 (r219073) +++ head/lib/clang/include/llvm/Config/config.h Sat Feb 26 23:12:36 2011 (r219074) @@ -27,13 +27,13 @@ #define ENABLE_CBE_PRINTF_A 1 /* Define if position independent code is enabled */ -#define ENABLE_PIC 1 +#define ENABLE_PIC 0 /* Define if threads enabled */ -/* #undef ENABLE_THREADS */ +#define ENABLE_THREADS 0 /* Define if timestamp information (e.g., __DATE___) is allowed */ -/* #undef ENABLE_TIMESTAMPS */ +#define ENABLE_TIMESTAMPS 0 /* Define to 1 if you have the `argz_append' function. */ /* #undef HAVE_ARGZ_APPEND */ @@ -74,9 +74,16 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_CRASHREPORTERCLIENT_H */ +/* Define if __crashreporter_info__ exists. */ +#define HAVE_CRASHREPORTER_INFO 0 + /* Define to 1 if you have the header file. */ #define HAVE_CTYPE_H 1 +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + /* Define to 1 if you have the header file, and it defines `DIR'. */ #define HAVE_DIRENT_H 1 @@ -202,7 +209,7 @@ /* #undef HAVE_LIBPSAPI */ /* Define to 1 if you have the `pthread' library (-lpthread). */ -#define HAVE_LIBPTHREAD 1 +/* #undef HAVE_LIBPTHREAD */ /* Define to 1 if you have the `udis86' library (-ludis86). */ /* #undef HAVE_LIBUDIS86 */ @@ -383,9 +390,6 @@ /* Define to 1 if you have the `strerror_r' function. */ #define HAVE_STRERROR_R 1 -/* Define to 1 if you have the `strerror_s' function. */ -/* #undef HAVE_STRERROR_S */ - /* Define to 1 if you have the header file. */ #define HAVE_STRINGS_H 1 @@ -439,6 +443,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UIO_H 1 + /* Define to 1 if you have that is POSIX.1 compatible. */ #define HAVE_SYS_WAIT_H 1 @@ -466,14 +473,98 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_WINDOWS_H */ +/* Define to 1 if you have the `writev' function. */ +#define HAVE_WRITEV 1 + /* Define if the xdot.py program is available */ /* #undef HAVE_XDOT_PY */ +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + /* Define to 1 if you have the `__dso_handle' function. */ #define HAVE___DSO_HANDLE 1 +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Installation directory for binary executables */ +/* #undef LLVM_BINDIR */ + +/* Time at which LLVM was configured */ +/* #undef LLVM_CONFIGTIME */ + +/* Installation directory for data files */ +/* #undef LLVM_DATADIR */ + +/* Installation directory for documentation */ +/* #undef LLVM_DOCSDIR */ + +/* Installation directory for config files */ +/* #undef LLVM_ETCDIR */ + +/* Host triple we were built on */ +/* #undef LLVM_HOSTTRIPLE */ + +/* Installation directory for include files */ +/* #undef LLVM_INCLUDEDIR */ + +/* Installation directory for .info files */ +/* #undef LLVM_INFODIR */ + +/* Installation directory for libraries */ +/* #undef LLVM_LIBDIR */ + +/* Installation directory for man pages */ +/* #undef LLVM_MANDIR */ + /* Build multithreading support into LLVM */ -/* #undef LLVM_MULTITHREADED */ +#define LLVM_MULTITHREADED 0 /* LLVM architecture name for the native architecture, if available */ #define LLVM_NATIVE_ARCH X86 @@ -521,7 +612,7 @@ /* #undef LLVM_PATH_XDOT_PY */ /* Installation prefix directory */ -#define LLVM_PREFIX "/usr" +/* #undef LLVM_PREFIX */ /* Define if the OS needs help to load dependent libraries for dlopen(). */ #define LTDL_DLOPEN_DEPLIBS 1 Modified: head/lib/clang/include/llvm/Config/llvm-config.h ============================================================================== --- head/lib/clang/include/llvm/Config/llvm-config.h Sat Feb 26 23:07:43 2011 (r219073) +++ head/lib/clang/include/llvm/Config/llvm-config.h Sat Feb 26 23:12:36 2011 (r219074) @@ -18,8 +18,38 @@ /* TODO: This is a bit of a hack. */ #ifndef CONFIG_H +/* Installation directory for binary executables */ +/* #undef LLVM_BINDIR */ + +/* Time at which LLVM was configured */ +/* #undef LLVM_CONFIGTIME */ + +/* Installation directory for data files */ +/* #undef LLVM_DATADIR */ + +/* Installation directory for documentation */ +/* #undef LLVM_DOCSDIR */ + +/* Installation directory for config files */ +/* #undef LLVM_ETCDIR */ + +/* Host triple we were built on */ +/* #undef LLVM_HOSTTRIPLE */ + +/* Installation directory for include files */ +/* #undef LLVM_INCLUDEDIR */ + +/* Installation directory for .info files */ +/* #undef LLVM_INFODIR */ + +/* Installation directory for libraries */ +/* #undef LLVM_LIBDIR */ + +/* Installation directory for man pages */ +/* #undef LLVM_MANDIR */ + /* Build multithreading support into LLVM */ -/* #undef LLVM_MULTITHREADED */ +#define LLVM_MULTITHREADED 0 /* LLVM architecture name for the native architecture, if available */ #define LLVM_NATIVE_ARCH X86 @@ -64,6 +94,6 @@ /* #undef LLVM_PATH_TWOPI */ /* Installation prefix directory */ -#define LLVM_PREFIX "/usr" +/* #undef LLVM_PREFIX */ #endif From owner-svn-src-head@FreeBSD.ORG Sat Feb 26 23:30:32 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A660106564A; Sat, 26 Feb 2011 23:30:32 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 79CAA8FC0A; Sat, 26 Feb 2011 23:30:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QNUWcs003526; Sat, 26 Feb 2011 23:30:32 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QNUWDv003524; Sat, 26 Feb 2011 23:30:32 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201102262330.p1QNUWDv003524@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 26 Feb 2011 23:30:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219075 - head/sys/cam/scsi X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 23:30:32 -0000 Author: nwhitehorn Date: Sat Feb 26 23:30:32 2011 New Revision: 219075 URL: http://svn.freebsd.org/changeset/base/219075 Log: Missed a file in r219056: add disk description for da(4). Modified: head/sys/cam/scsi/scsi_da.c Modified: head/sys/cam/scsi/scsi_da.c ============================================================================== --- head/sys/cam/scsi/scsi_da.c Sat Feb 26 23:12:36 2011 (r219074) +++ head/sys/cam/scsi/scsi_da.c Sat Feb 26 23:30:32 2011 (r219075) @@ -1310,6 +1310,12 @@ daregister(struct cam_periph *periph, vo softc->disk->d_flags |= DISKFLAG_CANFLUSHCACHE; strlcpy(softc->disk->d_ident, cgd->serial_num, MIN(sizeof(softc->disk->d_ident), cgd->serial_num_len + 1)); + cam_strvis(softc->disk->d_descr, cgd->inq_data.vendor, + sizeof(cgd->inq_data.vendor), sizeof(softc->disk->d_descr)); + strlcat(softc->disk->d_descr, " ", sizeof(softc->disk->d_descr)); + cam_strvis(&softc->disk->d_descr[strlen(softc->disk->d_descr)], + cgd->inq_data.product, sizeof(cgd->inq_data.product), + sizeof(softc->disk->d_descr) - strlen(softc->disk->d_descr)); softc->disk->d_hba_vendor = cpi.hba_vendor; softc->disk->d_hba_device = cpi.hba_device; softc->disk->d_hba_subvendor = cpi.hba_subvendor;