From owner-svn-src-user@freebsd.org Sun Dec 27 14:50:41 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 843F6A523A1 for ; Sun, 27 Dec 2015 14:50:41 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F20515F3; Sun, 27 Dec 2015 14:50:41 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBREoej6080071; Sun, 27 Dec 2015 14:50:40 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBREoekV080068; Sun, 27 Dec 2015 14:50:40 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201512271450.tBREoekV080068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 27 Dec 2015 14:50:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292773 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Dec 2015 14:50:41 -0000 Author: pho Date: Sun Dec 27 14:50:40 2015 New Revision: 292773 URL: https://svnweb.freebsd.org/changeset/base/292773 Log: Added a new isofs regression test. Cleaned up other test. Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/isofs2.sh (contents, props changed) Modified: user/pho/stress2/misc/isofs.sh Modified: user/pho/stress2/misc/isofs.sh ============================================================================== --- user/pho/stress2/misc/isofs.sh Sun Dec 27 14:42:39 2015 (r292772) +++ user/pho/stress2/misc/isofs.sh Sun Dec 27 14:50:40 2015 (r292773) @@ -48,15 +48,15 @@ mkdir $D mkisofs -o $I -r $D > /dev/null 2>&1 -mdconfig -a -t vnode -f $I -u ${mdstart} -mount -t cd9660 /dev/md${mdstart} $mntpoint +mdconfig -a -t vnode -f $I -u $mdstart +mount -t cd9660 /dev/md$mdstart $mntpoint for i in `jot 64`; do find /$mntpoint -type f > /dev/null 2>&1 & done wait -umount ${mntpoint} -mdconfig -d -u ${mdstart} +umount $mntpoint +mdconfig -d -u $mdstart rm -rf $D $I fstool Added: user/pho/stress2/misc/isofs2.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/isofs2.sh Sun Dec 27 14:50:40 2015 (r292773) @@ -0,0 +1,60 @@ +#!/bin/sh + +# +# Copyright (c) 2015 EMC Corp. +# 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$ +# + +# Run program from isofs file system +# "panic: userret: returning with the following locks held:" +# https://people.freebsd.org/~pho/stress/log/isofs2.txt +# Fixed by: r292772. + +[ `id -u ` -ne 0 ] && echo "Must not be root!" && exit 1 + +[ -z "`type mkisofs 2>/dev/null`" ] && echo "mkisofs not found" && exit 1 + +. ../default.cfg + +D=`dirname $diskimage`/dir +I=`dirname $diskimage`/dir.iso +here=`pwd` +cd /tmp +rm -rf $D $I +mkdir $D +cp `which date` $D +mkisofs -o $I -r $D > /dev/null 2>&1 +mdconfig -a -t vnode -f $I -u $mdstart +mount -t cd9660 /dev/md$mdstart $mntpoint + +cd $mntpoint +./date > /dev/null +cd $here + +umount $mntpoint +mdconfig -d -u $mdstart + +rm -rf $D $I From owner-svn-src-user@freebsd.org Sun Dec 27 14:53:32 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF2EFA524D1 for ; Sun, 27 Dec 2015 14:53:32 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A4B2519C6; Sun, 27 Dec 2015 14:53:32 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBRErVwG082667; Sun, 27 Dec 2015 14:53:31 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBRErVDa082664; Sun, 27 Dec 2015 14:53:31 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201512271453.tBRErVDa082664@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 27 Dec 2015 14:53:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292774 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Dec 2015 14:53:33 -0000 Author: pho Date: Sun Dec 27 14:53:31 2015 New Revision: 292774 URL: https://svnweb.freebsd.org/changeset/base/292774 Log: Added two extreme file system load tests (3 & 4) and one regression test (5). Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/marcus3.sh (contents, props changed) user/pho/stress2/misc/marcus4.sh (contents, props changed) user/pho/stress2/misc/marcus5.sh (contents, props changed) Added: user/pho/stress2/misc/marcus3.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/marcus3.sh Sun Dec 27 14:53:31 2015 (r292774) @@ -0,0 +1,54 @@ +#!/bin/sh + +# +# Copyright (c) 2013 Peter Holm +# 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$ +# + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +# Watchdog fired: +# https://people.freebsd.org/~pho/stress/log/kostik853.txt +# but runs for a long time without watchdogd and deadlkres. + +. ../default.cfg + +pgrep -q watchdogd && exit 0 +dev=$(df -h `dirname $RUNDIR` | tail -1 | awk '{print $1}') +mount | grep $dev | grep -q journaled && exit 0 +size=$((`sysctl -n hw.physmem` / 1024 / 1024)) +[ $size -gt $((4 * 1024)) ] && + { echo "RAM must be capped to 4GB for this test."; exit 0; } +[ "`sysctl -n debug.deadlkres.sleepfreq 2>/dev/null`" = "3" ] && + { echo "deadlkres must be disabled for this test."; exit 0; } + +n=`find ../testcases -perm -1 -type f | wc -l` +m=`su $testuser -c "limits | grep maxprocesses | awk '{print \\$NF}'"` +export runRUNTIME=15m +export INCARNATIONS=$((m / n)) +export swapINCARNATIONS=$INCARNATIONS + +su $testuser -c 'cd ..; ./run.sh marcus.cfg' Added: user/pho/stress2/misc/marcus4.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/marcus4.sh Sun Dec 27 14:53:31 2015 (r292774) @@ -0,0 +1,70 @@ +#!/bin/sh + +# +# Copyright (c) 2013 Peter Holm +# 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$ +# + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +# Copy of marcus3.sh, but without the VM (page stealer) pressure. +# Deadlock and "panic: smp_targeted_tlb_shootdown: interrupts disabled" +# https://people.freebsd.org/~pho/stress/log/marcus4.txt + +. ../default.cfg + +pgrep -q watchdogd && exit 0 +dev=$(df -h `dirname $RUNDIR` | tail -1 | awk '{print $1}') +mount | grep $dev | grep -q journaled && exit 0 +size=$((`sysctl -n hw.physmem` / 1024 / 1024)) +[ $size -gt $((4 * 1024)) ] && + { echo "RAM must be capped to 4GB for this test."; exit 0; } +[ "`sysctl -n debug.deadlkres.sleepfreq 2>/dev/null`" = "3" ] && + { echo "deadlkres must be disabled for this test."; exit 0; } + +n=`find ../testcases -perm -1 -type f | wc -l` +m=`su $testuser -c "limits | grep maxprocesses | awk '{print \\$NF}'"` + +export INCARNATIONS=$((m / n)) +export runRUNTIME=15m +export LOAD=80 +export symlinkLOAD=80 +export rwLOAD=80 +export TESTPROGS=" +testcases/lockf2/lockf2 +testcases/symlink/symlink +testcases/openat/openat +testcases/rw/rw +testcases/fts/fts +testcases/link/link +testcases/lockf/lockf +testcases/creat/creat +testcases/mkdir/mkdir +testcases/rename/rename +testcases/mkfifo/mkfifo +" + +su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' Added: user/pho/stress2/misc/marcus5.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/marcus5.sh Sun Dec 27 14:53:31 2015 (r292774) @@ -0,0 +1,84 @@ +#!/bin/sh + +# +# Copyright (c) 2013 Peter Holm +# 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$ +# + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ `swapinfo | wc -l` -eq 1 ] && exit 0 + +# Copy of marcus4.sh, but with a md(4) disk. +# "panic: userret: Returning with SU cleanup request not handled" seen: +# https://people.freebsd.org/~pho/stress/log/marcus5.txt +# Fixed by r292541. + +. ../default.cfg + +mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint +mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart +mdconfig -a -t swap -s 5g -u $mdstart +bsdlabel -w md$mdstart auto +newfs $newfs_flags md${mdstart}$part > /dev/null +mount /dev/md${mdstart}$part $mntpoint +chmod 777 $mntpoint + +size=$((`sysctl -n hw.physmem` / 1024 / 1024)) +[ $size -gt $((4 * 1024)) ] && + echo "RAM should be capped to 4GB for this test." +[ "`sysctl -n debug.deadlkres.sleepfreq 2>/dev/null`" = "3" ] && + { echo "deadlkres must be disabled for this test."; exit 0; } + +n=`find ../testcases -perm -1 -type f | wc -l` +m=`su $testuser -c "limits | grep maxprocesses | awk '{print \\$NF}'"` + +export RUNDIR=$mntpoint/stressX +export INCARNATIONS=$((m / n)) +export runRUNTIME=15m +export LOAD=80 +export symlinkLOAD=80 +export rwLOAD=80 +export TESTPROGS=" +testcases/lockf2/lockf2 +testcases/symlink/symlink +testcases/openat/openat +testcases/rw/rw +testcases/fts/fts +testcases/link/link +testcases/lockf/lockf +testcases/creat/creat +testcases/mkdir/mkdir +testcases/rename/rename +testcases/mkfifo/mkfifo +" + +su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' + +while mount | grep $mntpoint | grep -q /dev/md; do + umount $mntpoint || sleep 1 +done +checkfs /dev/md${mdstart}$part +mdconfig -d -u $mdstart From owner-svn-src-user@freebsd.org Tue Dec 29 01:21:44 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6315BA4BDD5 for ; Tue, 29 Dec 2015 01:21:44 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F1BE6157B; Tue, 29 Dec 2015 01:21:43 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBT1LhQT022055; Tue, 29 Dec 2015 01:21:43 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBT1LfL5022035; Tue, 29 Dec 2015 01:21:41 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512290121.tBT1LfL5022035@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 29 Dec 2015 01:21:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292857 - in user/ngie/stable-10-libnv: bin/ed bin/sh contrib/netbsd-tests/lib/libc/gen contrib/netbsd-tests/lib/libc/ssp contrib/netbsd-tests/usr.bin/grep contrib/smbfs etc etc/default... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2015 01:21:44 -0000 Author: ngie Date: Tue Dec 29 01:21:40 2015 New Revision: 292857 URL: https://svnweb.freebsd.org/changeset/base/292857 Log: MFstable/10 @ r292856 Added: user/ngie/stable-10-libnv/lib/libc/tests/nss/ - copied from r292856, stable/10/lib/libc/tests/nss/ user/ngie/stable-10-libnv/lib/libc/tests/resolv/ - copied from r292856, stable/10/lib/libc/tests/resolv/ user/ngie/stable-10-libnv/sys/dev/rl/ - copied from r292856, stable/10/sys/dev/rl/ user/ngie/stable-10-libnv/sys/netinet/tcp_fastopen.c - copied unchanged from r292856, stable/10/sys/netinet/tcp_fastopen.c user/ngie/stable-10-libnv/sys/netinet/tcp_fastopen.h - copied unchanged from r292856, stable/10/sys/netinet/tcp_fastopen.h user/ngie/stable-10-libnv/sys/sparc64/pci/ofw_pci.c - copied unchanged from r292856, stable/10/sys/sparc64/pci/ofw_pci.c Deleted: user/ngie/stable-10-libnv/sys/pci/if_rl.c user/ngie/stable-10-libnv/sys/pci/if_rlreg.h Modified: user/ngie/stable-10-libnv/bin/ed/main.c user/ngie/stable-10-libnv/bin/sh/mknodes.c user/ngie/stable-10-libnv/bin/sh/var.c user/ngie/stable-10-libnv/contrib/netbsd-tests/lib/libc/gen/t_assert.c user/ngie/stable-10-libnv/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh user/ngie/stable-10-libnv/contrib/netbsd-tests/usr.bin/grep/d_binary.out user/ngie/stable-10-libnv/contrib/netbsd-tests/usr.bin/grep/t_grep.sh user/ngie/stable-10-libnv/contrib/smbfs/README user/ngie/stable-10-libnv/etc/defaults/periodic.conf user/ngie/stable-10-libnv/etc/mtree/BSD.tests.dist user/ngie/stable-10-libnv/etc/periodic/daily/800.scrub-zfs user/ngie/stable-10-libnv/etc/periodic/security/520.pfdenied user/ngie/stable-10-libnv/etc/services user/ngie/stable-10-libnv/gnu/usr.bin/Makefile user/ngie/stable-10-libnv/include/netdb.h user/ngie/stable-10-libnv/lib/libc/gen/lockf.c user/ngie/stable-10-libnv/lib/libc/net/getaddrinfo.3 user/ngie/stable-10-libnv/lib/libc/net/getaddrinfo.c user/ngie/stable-10-libnv/lib/libc/net/map_v4v6.c user/ngie/stable-10-libnv/lib/libc/net/name6.c user/ngie/stable-10-libnv/lib/libc/sys/clock_gettime.2 user/ngie/stable-10-libnv/lib/libc/sys/gettimeofday.2 user/ngie/stable-10-libnv/lib/libc/tests/Makefile user/ngie/stable-10-libnv/lib/liblzma/Makefile user/ngie/stable-10-libnv/share/examples/tests/tests/atf/printf_test.c user/ngie/stable-10-libnv/share/mk/bsd.README user/ngie/stable-10-libnv/share/mk/bsd.test.mk user/ngie/stable-10-libnv/share/mk/suite.test.mk user/ngie/stable-10-libnv/share/mk/tap.test.mk user/ngie/stable-10-libnv/sys/conf/files user/ngie/stable-10-libnv/sys/conf/files.sparc64 user/ngie/stable-10-libnv/sys/conf/options user/ngie/stable-10-libnv/sys/contrib/ipfilter/netinet/ip_nat.c user/ngie/stable-10-libnv/sys/dev/hyperv/vmbus/hv_channel_mgmt.c user/ngie/stable-10-libnv/sys/dev/md/md.c user/ngie/stable-10-libnv/sys/dev/mii/rgephy.c user/ngie/stable-10-libnv/sys/dev/mii/rlphy.c user/ngie/stable-10-libnv/sys/dev/mii/rlswitch.c user/ngie/stable-10-libnv/sys/dev/mpt/mpt.c user/ngie/stable-10-libnv/sys/dev/mpt/mpt.h user/ngie/stable-10-libnv/sys/dev/re/if_re.c user/ngie/stable-10-libnv/sys/dev/usb/net/if_urndis.c user/ngie/stable-10-libnv/sys/dev/vt/colors/vt_termcolors.c user/ngie/stable-10-libnv/sys/modules/hyperv/netvsc/Makefile user/ngie/stable-10-libnv/sys/modules/rl/Makefile user/ngie/stable-10-libnv/sys/netgraph/ng_base.c user/ngie/stable-10-libnv/sys/netinet/tcp.h user/ngie/stable-10-libnv/sys/netinet/tcp_input.c user/ngie/stable-10-libnv/sys/netinet/tcp_output.c user/ngie/stable-10-libnv/sys/netinet/tcp_subr.c user/ngie/stable-10-libnv/sys/netinet/tcp_syncache.c user/ngie/stable-10-libnv/sys/netinet/tcp_syncache.h user/ngie/stable-10-libnv/sys/netinet/tcp_timer.c user/ngie/stable-10-libnv/sys/netinet/tcp_usrreq.c user/ngie/stable-10-libnv/sys/netinet/tcp_var.h user/ngie/stable-10-libnv/sys/sparc64/ebus/ebus.c user/ngie/stable-10-libnv/sys/sparc64/include/md_var.h user/ngie/stable-10-libnv/sys/sparc64/include/smp.h user/ngie/stable-10-libnv/sys/sparc64/pci/fire.c user/ngie/stable-10-libnv/sys/sparc64/pci/firereg.h user/ngie/stable-10-libnv/sys/sparc64/pci/firevar.h user/ngie/stable-10-libnv/sys/sparc64/pci/ofw_pci.h user/ngie/stable-10-libnv/sys/sparc64/pci/psycho.c user/ngie/stable-10-libnv/sys/sparc64/pci/psychoreg.h user/ngie/stable-10-libnv/sys/sparc64/pci/psychovar.h user/ngie/stable-10-libnv/sys/sparc64/pci/schizo.c user/ngie/stable-10-libnv/sys/sparc64/pci/schizoreg.h user/ngie/stable-10-libnv/sys/sparc64/pci/schizovar.h user/ngie/stable-10-libnv/sys/sparc64/sparc64/machdep.c user/ngie/stable-10-libnv/sys/sparc64/sparc64/mp_machdep.c user/ngie/stable-10-libnv/sys/ufs/ffs/ffs_softdep.c user/ngie/stable-10-libnv/sys/x86/x86/busdma_bounce.c user/ngie/stable-10-libnv/tests/freebsd_test_suite/macros.h user/ngie/stable-10-libnv/tests/sys/file/flock_test.sh user/ngie/stable-10-libnv/tools/debugscripts/README user/ngie/stable-10-libnv/tools/regression/lib/libc/nss/mach user/ngie/stable-10-libnv/tools/regression/lib/libc/resolv/mach user/ngie/stable-10-libnv/tools/regression/lib/msun/test-ctrig.c user/ngie/stable-10-libnv/tools/regression/lib/msun/test-exponential.c user/ngie/stable-10-libnv/tools/regression/lib/msun/test-fma.c user/ngie/stable-10-libnv/tools/regression/lib/msun/test-invtrig.c user/ngie/stable-10-libnv/tools/regression/mac/mac_portacl/misc.sh user/ngie/stable-10-libnv/tools/regression/mac/mac_portacl/nobody.t user/ngie/stable-10-libnv/tools/regression/mac/mac_portacl/root.t user/ngie/stable-10-libnv/usr.bin/bc/bc.1 user/ngie/stable-10-libnv/usr.bin/bc/bc.y user/ngie/stable-10-libnv/usr.bin/bc/extern.h user/ngie/stable-10-libnv/usr.bin/bc/tty.c user/ngie/stable-10-libnv/usr.sbin/sysrc/sysrc user/ngie/stable-10-libnv/usr.sbin/sysrc/sysrc.8 user/ngie/stable-10-libnv/usr.sbin/uhsoctl/uhsoctl.c user/ngie/stable-10-libnv/usr.sbin/ypserv/Makefile.yp Directory Properties: user/ngie/stable-10-libnv/ (props changed) Modified: user/ngie/stable-10-libnv/bin/ed/main.c ============================================================================== --- user/ngie/stable-10-libnv/bin/ed/main.c Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/bin/ed/main.c Tue Dec 29 01:21:40 2015 (r292857) @@ -505,7 +505,8 @@ exec_command(void) return ERR; else if (open_sbuf() < 0) return FATAL; - if (*fnp && *fnp != '!') strcpy(old_filename, fnp); + if (*fnp && *fnp != '!') + strlcpy(old_filename, fnp, PATH_MAX); #ifdef BACKWARDS if (*fnp == '\0' && *old_filename == '\0') { errmsg = "no current filename"; @@ -532,7 +533,8 @@ exec_command(void) return ERR; } GET_COMMAND_SUFFIX(); - if (*fnp) strcpy(old_filename, fnp); + if (*fnp) + strlcpy(old_filename, fnp, PATH_MAX); printf("%s\n", strip_escapes(old_filename)); break; case 'g': @@ -663,7 +665,7 @@ exec_command(void) GET_COMMAND_SUFFIX(); if (!isglobal) clear_undo_stack(); if (*old_filename == '\0' && *fnp != '!') - strcpy(old_filename, fnp); + strlcpy(old_filename, fnp, PATH_MAX); #ifdef BACKWARDS if (*fnp == '\0' && *old_filename == '\0') { errmsg = "no current filename"; @@ -797,7 +799,7 @@ exec_command(void) return ERR; GET_COMMAND_SUFFIX(); if (*old_filename == '\0' && *fnp != '!') - strcpy(old_filename, fnp); + strlcpy(old_filename, fnp, PATH_MAX); #ifdef BACKWARDS if (*fnp == '\0' && *old_filename == '\0') { errmsg = "no current filename"; Modified: user/ngie/stable-10-libnv/bin/sh/mknodes.c ============================================================================== --- user/ngie/stable-10-libnv/bin/sh/mknodes.c Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/bin/sh/mknodes.c Tue Dec 29 01:21:40 2015 (r292857) @@ -89,7 +89,6 @@ static struct str *nodestr[MAXTYPES]; /* static int nstr; /* number of structures */ static struct str str[MAXTYPES]; /* the structures */ static struct str *curstr; /* current structure */ -static FILE *infp; static char line[1024]; static int linno; static char *linep; @@ -102,7 +101,7 @@ static void outfunc(FILE *, int); static void indent(int, FILE *); static int nextfield(char *); static void skipbl(void); -static int readline(void); +static int readline(FILE *); static void error(const char *, ...) __printf0like(1, 2) __dead2; static char *savestr(const char *); @@ -110,17 +109,19 @@ static char *savestr(const char *); int main(int argc, char *argv[]) { + FILE *infp; + if (argc != 3) error("usage: mknodes file"); - infp = stdin; if ((infp = fopen(argv[1], "r")) == NULL) error("Can't open %s: %s", argv[1], strerror(errno)); - while (readline()) { + while (readline(infp)) { if (line[0] == ' ' || line[0] == '\t') parsefield(); else if (line[0] != '\0') parsenode(); } + fclose(infp); output(argv[2]); exit(0); } @@ -253,6 +254,10 @@ output(char *file) fputs("union node *getfuncnode(struct funcdef *);\n", hfile); fputs("void reffunc(struct funcdef *);\n", hfile); fputs("void unreffunc(struct funcdef *);\n", hfile); + if (ferror(hfile)) + error("Can't write to nodes.h"); + if (fclose(hfile)) + error("Can't close nodes.h"); fputs(writer, cfile); while (fgets(line, sizeof line, patfile) != NULL) { @@ -266,6 +271,11 @@ output(char *file) else fputs(line, cfile); } + fclose(patfile); + if (ferror(cfile)) + error("Can't write to nodes.c"); + if (fclose(cfile)) + error("Can't close nodes.c"); } @@ -401,7 +411,7 @@ skipbl(void) static int -readline(void) +readline(FILE *infp) { char *p; Modified: user/ngie/stable-10-libnv/bin/sh/var.c ============================================================================== --- user/ngie/stable-10-libnv/bin/sh/var.c Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/bin/sh/var.c Tue Dec 29 01:21:40 2015 (r292857) @@ -328,7 +328,7 @@ setvareq(char *s, int flags) if (vp->flags & VREADONLY) { if ((flags & (VTEXTFIXED|VSTACK)) == 0) ckfree(s); - error("%.*s: is read only", vp->name_len, s); + error("%.*s: is read only", vp->name_len, vp->text); } if (flags & VNOSET) { if ((flags & (VTEXTFIXED|VSTACK)) == 0) Modified: user/ngie/stable-10-libnv/contrib/netbsd-tests/lib/libc/gen/t_assert.c ============================================================================== --- user/ngie/stable-10-libnv/contrib/netbsd-tests/lib/libc/gen/t_assert.c Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/contrib/netbsd-tests/lib/libc/gen/t_assert.c Tue Dec 29 01:21:40 2015 (r292857) @@ -40,6 +40,23 @@ __RCSID("$NetBSD: t_assert.c,v 1.2 2011/ #include #include +#ifdef __FreeBSD__ +#include +#include +#include + +static void +disable_corefile(void) +{ + struct rlimit limits; + + limits.rlim_cur = 0; + limits.rlim_max = 0; + + ATF_REQUIRE(setrlimit(RLIMIT_CORE, &limits) == 0); +} +#endif + static void handler(int); static void @@ -65,6 +82,9 @@ ATF_TC_BODY(assert_false, tc) if (pid == 0) { +#ifdef __FreeBSD__ + disable_corefile(); +#endif (void)closefrom(0); (void)memset(&sa, 0, sizeof(struct sigaction)); @@ -102,6 +122,9 @@ ATF_TC_BODY(assert_true, tc) if (pid == 0) { +#ifdef __FreeBSD__ + disable_corefile(); +#endif (void)closefrom(0); (void)memset(&sa, 0, sizeof(struct sigaction)); Modified: user/ngie/stable-10-libnv/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh ============================================================================== --- user/ngie/stable-10-libnv/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh Tue Dec 29 01:21:40 2015 (r292857) @@ -35,6 +35,7 @@ h_fail() { echo "Executing command [ $2$1 ]" # Begin FreeBSD + ulimit -c 0 if true; then eval $2 atf_check -s signal -o ignore -e ignore $1 else Modified: user/ngie/stable-10-libnv/contrib/netbsd-tests/usr.bin/grep/d_binary.out ============================================================================== --- user/ngie/stable-10-libnv/contrib/netbsd-tests/usr.bin/grep/d_binary.out Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/contrib/netbsd-tests/usr.bin/grep/d_binary.out Tue Dec 29 01:21:40 2015 (r292857) @@ -1 +1 @@ -Binary file /bin/sh matches +Binary file test.file matches Modified: user/ngie/stable-10-libnv/contrib/netbsd-tests/usr.bin/grep/t_grep.sh ============================================================================== --- user/ngie/stable-10-libnv/contrib/netbsd-tests/usr.bin/grep/t_grep.sh Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/contrib/netbsd-tests/usr.bin/grep/t_grep.sh Tue Dec 29 01:21:40 2015 (r292857) @@ -43,7 +43,20 @@ binary_head() } binary_body() { + # Begin FreeBSD + # + # Generate stable output instead of depending on uname to match the + # branded OS name of /bin/sh + if true; then + dd if=/dev/zero count=1 of=test.file + echo -n "foobar" >> test.file + atf_check -o file:"$(atf_get_srcdir)/d_binary.out" grep foobar test.file + else + # End FreeBSD atf_check -o file:"$(atf_get_srcdir)/d_binary.out" grep $(uname) /bin/sh + # Begin FreeBSD + fi + # End FreeBSD } atf_test_case recurse Modified: user/ngie/stable-10-libnv/contrib/smbfs/README ============================================================================== --- user/ngie/stable-10-libnv/contrib/smbfs/README Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/contrib/smbfs/README Tue Dec 29 01:21:40 2015 (r292857) @@ -15,7 +15,7 @@ It is a complete, kernel side implementa Darwin maintained in the Darwin's tree. - I'm would be very grateful for any feedback, bug reports etc. + I would be very grateful for any feedback, bug reports etc. Supported SMB servers: Samba @@ -23,14 +23,14 @@ It is a complete, kernel side implementa IBM LanManager NetApp - An updated versions of this package can be retrieved from ftp server: + An updated version of this package can be retrieved from ftp server: ftp://ftp.butya.kz/pub/smbfs/smbfs.tar.gz - Perfomance + Performance ========== - There is some perfomance benchmarks over 10Mbit network: + These are some performance benchmarks over a 10Mbit network: Win95 machine as server: IOZONE: auto-test mode Modified: user/ngie/stable-10-libnv/etc/defaults/periodic.conf ============================================================================== --- user/ngie/stable-10-libnv/etc/defaults/periodic.conf Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/etc/defaults/periodic.conf Tue Dec 29 01:21:40 2015 (r292857) @@ -319,8 +319,8 @@ if [ -z "${source_periodic_confs_defined "use \$$var instead." >&2 case "$value" in [Yy][Ee][Ss]) - $var=YES - $periodvar=daily + eval $var=YES + eval $periodvar=daily ;; *) eval $var=\"$value\" Modified: user/ngie/stable-10-libnv/etc/mtree/BSD.tests.dist ============================================================================== --- user/ngie/stable-10-libnv/etc/mtree/BSD.tests.dist Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/etc/mtree/BSD.tests.dist Tue Dec 29 01:21:40 2015 (r292857) @@ -109,10 +109,14 @@ .. .. .. + nss + .. regex data .. .. + resolv + .. rpc .. ssp Modified: user/ngie/stable-10-libnv/etc/periodic/daily/800.scrub-zfs ============================================================================== --- user/ngie/stable-10-libnv/etc/periodic/daily/800.scrub-zfs Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/etc/periodic/daily/800.scrub-zfs Tue Dec 29 01:21:40 2015 (r292857) @@ -43,6 +43,10 @@ case "$daily_scrub_zfs_enable" in rc=3 echo "Skipping faulted pool: ${pool}" continue ;; + *UNAVAIL*) + rc=4 + echo "Skipping unavailable pool: ${pool}" + continue ;; esac # determine how many days shall be between scrubs Modified: user/ngie/stable-10-libnv/etc/periodic/security/520.pfdenied ============================================================================== --- user/ngie/stable-10-libnv/etc/periodic/security/520.pfdenied Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/etc/periodic/security/520.pfdenied Tue Dec 29 01:21:40 2015 (r292857) @@ -44,7 +44,7 @@ rc=0 if check_yesno_period security_status_pfdenied_enable then TMP=`mktemp -t security` - if pfctl -sr -v 2>/dev/null | nawk '{if (/^block/) {buf=$0; getline; gsub(" +"," ",$0); print buf$0;} }' > ${TMP}; then + if pfctl -sr -v 2>/dev/null | nawk '{if (/^block/) {buf=$0; getline; gsub(" +"," ",$0); if ($5 > 0) print buf$0;} }' > ${TMP}; then check_diff new_only pf ${TMP} "${host} pf denied packets:" fi rc=$? Modified: user/ngie/stable-10-libnv/etc/services ============================================================================== --- user/ngie/stable-10-libnv/etc/services Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/etc/services Tue Dec 29 01:21:40 2015 (r292857) @@ -1029,7 +1029,7 @@ nntps 563/udp snntp #nntp protocol o whoami 565/tcp whoami 565/udp streettalk 566/tcp -streettalk 566/udp +streettalk 566/udp banyan-rpc 567/tcp banyan-rpc 567/udp ms-shuttle 568/tcp #Microsoft shuttle @@ -1099,16 +1099,16 @@ acp 599/tcp #Aeolon Core Protocol acp 599/udp #Aeolon Core Protocol ipcserver 600/tcp #Sun IPC server ipcserver 600/udp #Sun IPC server -syslog-conn 601/tcp #Reliable Syslog Service -syslog-conn 601/udp #Reliable Syslog Service -xmlrpc-beep 602/tcp #XML-RPC over BEEP -xmlrpc-beep 602/udp #XML-RPC over BEEP -idxp 603/tcp -idxp 603/udp -tunnel 604/tcp -tunnel 604/udp -soap-beep 605/tcp #SOAP over BEEP -soap-beep 605/udp #SOAP over BEEP +syslog-conn 601/tcp #Reliable Syslog Service +syslog-conn 601/udp #Reliable Syslog Service +xmlrpc-beep 602/tcp #XML-RPC over BEEP +xmlrpc-beep 602/udp #XML-RPC over BEEP +idxp 603/tcp +idxp 603/udp +tunnel 604/tcp +tunnel 604/udp +soap-beep 605/tcp #SOAP over BEEP +soap-beep 605/udp #SOAP over BEEP urm 606/tcp #Cray Unified Resource Manager urm 606/udp #Cray Unified Resource Manager nqs 607/tcp @@ -1137,14 +1137,14 @@ dei-icda 618/tcp dei-icda 618/udp compaq-evm 619/tcp #Compaq EVM compaq-evm 619/udp #Compaq EVM -sco-websrvrmgr 620/tcp #SCO WebServer Manager -sco-websrvrmgr 620/udp #SCO WebServer Manager +sco-websrvrmgr 620/tcp #SCO WebServer Manager +sco-websrvrmgr 620/udp #SCO WebServer Manager escp-ip 621/tcp #ESCP escp-ip 621/udp #ESCP collaborator 622/tcp collaborator 622/udp -asf-rmcp 623/tcp #ASF Remote Management and Control Protocol -asf-rmcp 623/udp #ASF Remote Management and Control Protocol +asf-rmcp 623/tcp #ASF Remote Management and Control Protocol +asf-rmcp 623/udp #ASF Remote Management and Control Protocol cryptoadmin 624/tcp #Crypto Admin cryptoadmin 624/udp #Crypto Admin dec_dlm 625/tcp #DEC DLM @@ -1167,12 +1167,12 @@ servstat 633/tcp #Service Status upda servstat 633/udp #Service Status update (Sterling Software) ginad 634/tcp ginad 634/udp -rlzdbase 635/tcp #RLZ DBase -rlzdbase 635/udp #RLZ DBase +rlzdbase 635/tcp #RLZ DBase +rlzdbase 635/udp #RLZ DBase ldaps 636/tcp sldap #ldap protocol over TLS/SSL ldaps 636/udp sldap -lanserver 637/tcp -lanserver 637/udp +lanserver 637/tcp +lanserver 637/udp mcns-sec 638/tcp mcns-sec 638/udp msdp 639/tcp @@ -1191,12 +1191,12 @@ pssc 645/tcp pssc 645/udp ldp 646/tcp ldp 646/udp -dhcp-failover 647/tcp #DHCP Failover -dhcp-failover 647/udp #DHCP Failover -rrp 648/tcp #Registry Registrar Protocol (RRP) -rrp 648/udp #Registry Registrar Protocol (RRP) -cadview-3d 649/tcp #Cadview-3d - streaming 3d models over the internet -cadview-3d 649/udp #Cadview-3d - streaming 3d models over the internet +dhcp-failover 647/tcp #DHCP Failover +dhcp-failover 647/udp #DHCP Failover +rrp 648/tcp #Registry Registrar Protocol (RRP) +rrp 648/udp #Registry Registrar Protocol (RRP) +cadview-3d 649/tcp #Cadview-3d - streaming 3d models over the internet +cadview-3d 649/udp #Cadview-3d - streaming 3d models over the internet obex 650/tcp obex 650/udp ieee-mms 651/tcp #IEEE MMS @@ -1215,38 +1215,38 @@ rmc 657/tcp rmc 657/udp tenfold 658/tcp tenfold 658/udp -mac-srvr-admin 660/tcp #MacOS Server Admin -mac-srvr-admin 660/udp #MacOS Server Admin -hap 661/tcp -hap 661/udp -pftp 662/tcp -pftp 662/udp -purenoise 663/tcp #PureNoise -purenoise 663/udp #PureNoise -asf-secure-rmcp 664/tcp #ASF Secure Remote Management and Control Protocol -asf-secure-rmcp 664/udp #ASF Secure Remote Management and Control Protocol -sun-dr 665/tcp #Sun DR -sun-dr 665/udp #Sun DR +mac-srvr-admin 660/tcp #MacOS Server Admin +mac-srvr-admin 660/udp #MacOS Server Admin +hap 661/tcp +hap 661/udp +pftp 662/tcp +pftp 662/udp +purenoise 663/tcp #PureNoise +purenoise 663/udp #PureNoise +asf-secure-rmcp 664/tcp #ASF Secure Remote Management and Control Protocol +asf-secure-rmcp 664/udp #ASF Secure Remote Management and Control Protocol +sun-dr 665/tcp #Sun DR +sun-dr 665/udp #Sun DR mdqs 666/tcp mdqs 666/udp #PROBLEMS!=============================================== doom 666/tcp #doom Id Software doom 666/udp #doom Id Software #PROBLEMS!=============================================== -disclose 667/tcp #campaign contribution disclosures - SDR Technologies -disclose 667/udp #campaign contribution disclosures - SDR Technologies -mecomm 668/tcp -mecomm 668/udp -meregister 669/tcp -meregister 669/udp -vacdsm-sws 670/tcp -vacdsm-sws 670/udp -vacdsm-app 671/tcp -vacdsm-app 671/udp -vpps-qua 672/tcp -vpps-qua 672/udp -cimplex 673/tcp -cimplex 673/udp +disclose 667/tcp #campaign contribution disclosures - SDR Technologies +disclose 667/udp #campaign contribution disclosures - SDR Technologies +mecomm 668/tcp +mecomm 668/udp +meregister 669/tcp +meregister 669/udp +vacdsm-sws 670/tcp +vacdsm-sws 670/udp +vacdsm-app 671/tcp +vacdsm-app 671/udp +vpps-qua 672/tcp +vpps-qua 672/udp +cimplex 673/tcp +cimplex 673/udp acap 674/tcp #Application Configuration Access Protocol acap 674/udp #Application Configuration Access Protocol dctp 675/tcp @@ -1257,70 +1257,70 @@ vpp 677/tcp #Virtual Presence Protoc vpp 677/udp #Virtual Presence Protocol ggf-ncp 678/tcp #GNU Generation Foundation NCP ggf-ncp 678/udp #GNU Generation Foundation NCP -mrm 679/tcp -mrm 679/udp +mrm 679/tcp +mrm 679/udp entrust-aaas 680/tcp entrust-aaas 680/udp entrust-aams 681/tcp entrust-aams 681/udp -xfr 682/tcp -xfr 682/udp -corba-iiop 683/tcp #CORBA IIOP -corba-iiop 683/udp #CORBA IIOP +xfr 682/tcp +xfr 682/udp +corba-iiop 683/tcp #CORBA IIOP +corba-iiop 683/udp #CORBA IIOP corba-iiop-ssl 684/tcp #CORBA IIOP SSL corba-iiop-ssl 684/udp #CORBA IIOP SSL mdc-portmapper 685/tcp #MDC Port Mapper mdc-portmapper 685/udp #MDC Port Mapper -hcp-wismar 686/tcp #Hardware Control Protocol Wismar -hcp-wismar 686/udp #Hardware Control Protocol Wismar +hcp-wismar 686/tcp #Hardware Control Protocol Wismar +hcp-wismar 686/udp #Hardware Control Protocol Wismar asipregistry 687/tcp asipregistry 687/udp -realm-rusd 688/tcp #ApplianceWare management protocol -realm-rusd 688/udp #ApplianceWare management protocol -nmap 689/tcp -nmap 689/udp -vatp 690/tcp #Velazquez Application Transfer Protocol -vatp 690/udp #Velazquez Application Transfer Protocol +realm-rusd 688/tcp #ApplianceWare management protocol +realm-rusd 688/udp #ApplianceWare management protocol +nmap 689/tcp +nmap 689/udp +vatp 690/tcp #Velazquez Application Transfer Protocol +vatp 690/udp #Velazquez Application Transfer Protocol msexch-routing 691/tcp #MS Exchange Routing msexch-routing 691/udp #MS Exchange Routing hyperwave-isp 692/tcp #Hyperwave-ISP hyperwave-isp 692/udp #Hyperwave-ISP -connendp 693/tcp -connendp 693/udp -ha-cluster 694/tcp -ha-cluster 694/udp -ieee-mms-ssl 695/tcp -ieee-mms-ssl 695/udp -rushd 696/tcp -rushd 696/udp -uuidgen 697/tcp -uuidgen 697/udp -olsr 698/tcp -olsr 698/udp -accessnetwork 699/tcp #Access Network -accessnetwork 699/udp #Access Network -epp 700/tcp #Extensible Provisioning Protocol -epp 700/udp #Extensible Provisioning Protocol -lmp 701/tcp #Link Management Protocol (LMP) -lmp 701/udp #Link Management Protocol (LMP) -iris-beep 702/tcp #IRIS over BEEP -iris-beep 702/udp #IRIS over BEEP +connendp 693/tcp +connendp 693/udp +ha-cluster 694/tcp +ha-cluster 694/udp +ieee-mms-ssl 695/tcp +ieee-mms-ssl 695/udp +rushd 696/tcp +rushd 696/udp +uuidgen 697/tcp +uuidgen 697/udp +olsr 698/tcp +olsr 698/udp +accessnetwork 699/tcp #Access Network +accessnetwork 699/udp #Access Network +epp 700/tcp #Extensible Provisioning Protocol +epp 700/udp #Extensible Provisioning Protocol +lmp 701/tcp #Link Management Protocol (LMP) +lmp 701/udp #Link Management Protocol (LMP) +iris-beep 702/tcp #IRIS over BEEP +iris-beep 702/udp #IRIS over BEEP elcsd 704/tcp #errlog copy/server daemon elcsd 704/udp #errlog copy/server daemon -agentx 705/tcp #AgentX -agentx 705/udp #AgentX -silc 706/tcp -silc 706/udp -borland-dsj 707/tcp #Borland DSJ -borland-dsj 707/udp #Borland DSJ +agentx 705/tcp #AgentX +agentx 705/udp #AgentX +silc 706/tcp +silc 706/udp +borland-dsj 707/tcp #Borland DSJ +borland-dsj 707/udp #Borland DSJ entrustmanager 709/tcp #EntrustManager entrustmanager 709/udp #EntrustManager -entrust-ash 710/tcp #Entrust Administration Service Handler -entrust-ash 710/udp #Entrust Administration Service Handler -cisco-tdp 711/tcp #Cisco TDP -cisco-tdp 711/udp #Cisco TDP -tbrpf 712/tcp -tbrpf 712/udp +entrust-ash 710/tcp #Entrust Administration Service Handler +entrust-ash 710/udp #Entrust Administration Service Handler +cisco-tdp 711/tcp #Cisco TDP +cisco-tdp 711/udp #Cisco TDP +tbrpf 712/tcp +tbrpf 712/udp iris-xpc 713/tcp #IRIS over XPC iris-xpc 713/udp #IRIS over XPC iris-xpcs 714/tcp #IRIS over XPCS @@ -1419,49 +1419,49 @@ fcp-udp 810/udp #FCP Datagram itm-mcell-s 828/tcp itm-mcell-s 828/udp pkix-3-ca-ra 829/tcp #PKIX-3 CA/RA -pkix-3-ca-ra 829/udp #PKIX-3 CA/RA -netconf-ssh 830/tcp #NETCONF over SSH -netconf-ssh 830/udp #NETCONF over SSH -netconf-beep 831/tcp #NETCONF over BEEP -netconf-beep 831/udp #NETCONF over BEEP -netconfsoaphttp 832/tcp #NETCONF for SOAP over HTTPS -netconfsoaphttp 832/udp #NETCONF for SOAP over HTTPS -netconfsoapbeep 833/tcp #NETCONF for SOAP over BEEP -netconfsoapbeep 833/udp #NETCONF for SOAP over BEEP -dhcp-failover2 847/tcp #dhcp-failover 2 -dhcp-failover2 847/udp #dhcp-failover 2 -gdoi 848/tcp -gdoi 848/udp -iscsi 860/tcp -iscsi 860/udp -owamp-control 861/tcp -owamp-control 861/udp +pkix-3-ca-ra 829/udp #PKIX-3 CA/RA +netconf-ssh 830/tcp #NETCONF over SSH +netconf-ssh 830/udp #NETCONF over SSH +netconf-beep 831/tcp #NETCONF over BEEP +netconf-beep 831/udp #NETCONF over BEEP +netconfsoaphttp 832/tcp #NETCONF for SOAP over HTTPS +netconfsoaphttp 832/udp #NETCONF for SOAP over HTTPS +netconfsoapbeep 833/tcp #NETCONF for SOAP over BEEP +netconfsoapbeep 833/udp #NETCONF for SOAP over BEEP +dhcp-failover2 847/tcp #dhcp-failover 2 +dhcp-failover2 847/udp #dhcp-failover 2 +gdoi 848/tcp +gdoi 848/udp +iscsi 860/tcp +iscsi 860/udp +owamp-control 861/tcp +owamp-control 861/udp supfilesrv 871/tcp # for SUP rsync 873/tcp rsync 873/udp -iclcnet-locate 886/tcp #ICL coNETion locate server -iclcnet-locate 886/udp #ICL coNETion locate server -iclcnet_svinfo 887/tcp #ICL coNETion server info -iclcnet_svinfo 887/udp #ICL coNETion server info +iclcnet-locate 886/tcp #ICL coNETion locate server +iclcnet-locate 886/udp #ICL coNETion locate server +iclcnet_svinfo 887/tcp #ICL coNETion server info +iclcnet_svinfo 887/udp #ICL coNETion server info accessbuilder 888/tcp accessbuilder 888/udp -omginitialrefs 900/tcp #OMG Initial Refs -omginitialrefs 900/udp #OMG Initial Refs +omginitialrefs 900/tcp #OMG Initial Refs +omginitialrefs 900/udp #OMG Initial Refs swat 901/tcp # samba web configuration tool -smpnameres 901/tcp -smpnameres 901/udp -ideafarm-chat 902/tcp -ideafarm-chat 902/udp -ideafarm-catch 903/tcp -ideafarm-catch 903/udp -kink 910/tcp #Kerberized Internet Negotiation of Keys (KINK) -kink 910/udp #Kerberized Internet Negotiation of Keys (KINK) -xact-backup 911/tcp -xact-backup 911/udp -apex-mesh 912/tcp #APEX relay-relay service -apex-mesh 912/udp #APEX relay-relay service -apex-edge 913/tcp #APEX endpoint-relay service -apex-edge 913/udp #APEX endpoint-relay service +smpnameres 901/tcp +smpnameres 901/udp +ideafarm-chat 902/tcp +ideafarm-chat 902/udp +ideafarm-catch 903/tcp +ideafarm-catch 903/udp +kink 910/tcp #Kerberized Internet Negotiation of Keys (KINK) +kink 910/udp #Kerberized Internet Negotiation of Keys (KINK) +xact-backup 911/tcp +xact-backup 911/udp +apex-mesh 912/tcp #APEX relay-relay service +apex-mesh 912/udp #APEX relay-relay service +apex-edge 913/tcp #APEX endpoint-relay service +apex-edge 913/udp #APEX endpoint-relay service rndc 953/tcp # named's rndc control socket ftps-data 989/tcp # ftp protocol, data, over TLS/SSL ftps-data 989/udp @@ -1491,10 +1491,10 @@ cadlock2 1000/tcp cadlock2 1000/udp surf 1010/tcp surf 1010/udp -exp1 1021/tcp #RFC3692-style Experiment 1 (*) [RFC4727] -exp1 1021/udp #RFC3692-style Experiment 1 (*) [RFC4727] -exp2 1022/tcp #RFC3692-style Experiment 2 (*) [RFC4727] -exp2 1022/udp #RFC3692-style Experiment 2 (*) [RFC4727] +exp1 1021/tcp #RFC3692-style Experiment 1 (*) [RFC4727] +exp1 1021/udp #RFC3692-style Experiment 1 (*) [RFC4727] +exp2 1022/tcp #RFC3692-style Experiment 2 (*) [RFC4727] +exp2 1022/udp #RFC3692-style Experiment 2 (*) [RFC4727] # # REGISTERED PORT NUMBERS # @@ -2399,6 +2399,7 @@ xdsxdm 6558/udp sane-port 6566/tcp #Scanner Access Now Easy (SANE) Control Port sane-port 6566/udp #Scanner Access Now Easy (SANE) Control Port ircd 6667/tcp #Internet Relay Chat (unofficial) +ircs-u 6697/tcp #Internet Relay Chat over TLS/SSL frc-hp 6704/sctp #ForCES HP (High Priority) channel frc-mp 6705/sctp #ForCES MP (Medium Priority) channel frc-lp 6706/sctp #ForCES LP (Low priority) channel Modified: user/ngie/stable-10-libnv/gnu/usr.bin/Makefile ============================================================================== --- user/ngie/stable-10-libnv/gnu/usr.bin/Makefile Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/gnu/usr.bin/Makefile Tue Dec 29 01:21:40 2015 (r292857) @@ -17,6 +17,8 @@ SUBDIR= ${_binutils} \ ${_tests} \ ${_texinfo} +SUBDIR_DEPEND_gdb= ${_binutils} + .if ${MK_CXX} != "no" _gperf= gperf .if ${MK_GROFF} != "no" Modified: user/ngie/stable-10-libnv/include/netdb.h ============================================================================== --- user/ngie/stable-10-libnv/include/netdb.h Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/include/netdb.h Tue Dec 29 01:21:40 2015 (r292857) @@ -122,7 +122,7 @@ struct protoent { struct addrinfo { int ai_flags; /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */ - int ai_family; /* PF_xxx */ + int ai_family; /* AF_xxx */ int ai_socktype; /* SOCK_xxx */ int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */ socklen_t ai_addrlen; /* length of ai_addr */ @@ -179,7 +179,7 @@ struct addrinfo { /* valid flags for addrinfo (not a standard def, apps should not use it) */ #define AI_MASK \ (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV | \ - AI_ADDRCONFIG) + AI_ADDRCONFIG | AI_ALL | AI_V4MAPPED) #define AI_ALL 0x00000100 /* IPv6 and IPv4-mapped (with AI_V4MAPPED) */ #define AI_V4MAPPED_CFG 0x00000200 /* accept IPv4-mapped if kernel supports */ Modified: user/ngie/stable-10-libnv/lib/libc/gen/lockf.c ============================================================================== --- user/ngie/stable-10-libnv/lib/libc/gen/lockf.c Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/lib/libc/gen/lockf.c Tue Dec 29 01:21:40 2015 (r292857) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include "un-namespace.h" +#include "libc_private.h" int lockf(int filedes, int function, off_t size) @@ -62,9 +63,12 @@ lockf(int filedes, int function, off_t s break; case F_TEST: fl.l_type = F_WRLCK; - if (_fcntl(filedes, F_GETLK, &fl) == -1) + if (((int (*)(int, int, ...)) + __libc_interposing[INTERPOS_fcntl])(filedes, F_GETLK, &fl) + == -1) return (-1); - if (fl.l_type == F_UNLCK || (fl.l_sysid == 0 && fl.l_pid == getpid())) + if (fl.l_type == F_UNLCK || (fl.l_sysid == 0 && + fl.l_pid == getpid())) return (0); errno = EAGAIN; return (-1); @@ -75,5 +79,6 @@ lockf(int filedes, int function, off_t s /* NOTREACHED */ } - return (_fcntl(filedes, cmd, &fl)); + return (((int (*)(int, int, ...)) + __libc_interposing[INTERPOS_fcntl])(filedes, cmd, &fl)); } Modified: user/ngie/stable-10-libnv/lib/libc/net/getaddrinfo.3 ============================================================================== --- user/ngie/stable-10-libnv/lib/libc/net/getaddrinfo.3 Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/lib/libc/net/getaddrinfo.3 Tue Dec 29 01:21:40 2015 (r292857) @@ -18,7 +18,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 5, 2015 +.Dd December 21, 2015 .Dt GETADDRINFO 3 .Os .Sh NAME @@ -78,7 +78,7 @@ as defined by .Bd -literal struct addrinfo { int ai_flags; /* input flags */ - int ai_family; /* protocol family for socket */ + int ai_family; /* address family for socket */ int ai_socktype; /* socket type */ int ai_protocol; /* protocol for socket */ socklen_t ai_addrlen; /* length of socket-address */ @@ -94,12 +94,12 @@ The caller can supply the following stru .Fa hints : .Bl -tag -width "ai_socktypeXX" .It Fa ai_family -The protocol family that should be used. +The address family that should be used. When .Fa ai_family is set to -.Dv PF_UNSPEC , -it means the caller will accept any protocol family supported by the +.Dv AF_UNSPEC , +it means the caller will accept any address family supported by the operating system. .It Fa ai_socktype Denotes the type of socket that is wanted: @@ -126,11 +126,13 @@ field to which the parameter points shall be set to zero or be the bitwise-inclusive OR of one or more of the values .Dv AI_ADDRCONFIG , +.Dv AI_ALL , .Dv AI_CANONNAME , .Dv AI_NUMERICHOST , -.Dv AI_NUMERICSERV +.Dv AI_NUMERICSERV , +.Dv AI_PASSIVE and -.Dv AI_PASSIVE . +.Dv AI_V4MAPPED . .Bl -tag -width "AI_CANONNAMEXX" .It Dv AI_ADDRCONFIG If the @@ -139,6 +141,25 @@ bit is set, IPv4 addresses shall be retu an IPv4 address is configured on the local system, and IPv6 addresses shall be returned only if an IPv6 address is configured on the local system. +.It Dv AI_ALL +If the +.Dv AI_ALL +flag is used with the +.Dv AI_V4MAPPED +flag, then +.Fn getaddrinfo +shall return all matching IPv6 and IPv4 addresses. +.Pp +For example, when using the DNS, queries are made for both AAAA records and A records, and +.Fn getaddrinfo +returns the combined results of both queries. +Any IPv4 addresses found are returned as IPv4-mapped IPv6 addresses. +.Pp +The +.Dv AI_ALL +flag without the +.Dv AI_V4MAPPED +flag is ignored. .It Dv AI_CANONNAME If the .Dv AI_CANONNAME @@ -203,6 +224,25 @@ loopback address if is the null pointer and .Dv AI_PASSIVE is not set. +.It Dv AI_V4MAPPED +If the +.Dv AI_V4MAPPED +flag is specified along with an ai_family of +.Dv AF_INET6 , +then +.Fn getaddrinfo +shall return IPv4-mapped IPv6 addresses on finding no matching IPv6 addresses ( +.Fa ai_addrlen +shall be 16). +.Pp +For example, when using the DNS, if no AAAA records are found then a query is made for A records and any found are returned as IPv4-mapped IPv6 addresses. +.Pp +The +.Dv AI_V4MAPPED +flag shall be ignored unless +.Fa ai_family +equals +.Dv AF_INET6 . .El .El .Pp @@ -221,7 +261,7 @@ behaves as if the caller provided a with .Fa ai_family set to -.Dv PF_UNSPEC +.Dv AF_UNSPEC and all other elements set to zero or .Dv NULL . .Pp @@ -333,7 +373,7 @@ int s; const char *cause = NULL; memset(&hints, 0, sizeof(hints)); -hints.ai_family = PF_UNSPEC; +hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; error = getaddrinfo("www.kame.net", "http", &hints, &res0); if (error) { @@ -376,7 +416,7 @@ int nsock; const char *cause = NULL; memset(&hints, 0, sizeof(hints)); -hints.ai_family = PF_UNSPEC; +hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE; error = getaddrinfo(NULL, "http", &hints, &res0); Modified: user/ngie/stable-10-libnv/lib/libc/net/getaddrinfo.c ============================================================================== --- user/ngie/stable-10-libnv/lib/libc/net/getaddrinfo.c Tue Dec 29 01:09:53 2015 (r292856) +++ user/ngie/stable-10-libnv/lib/libc/net/getaddrinfo.c Tue Dec 29 01:21:40 2015 (r292857) @@ -96,6 +96,7 @@ __FBSDID("$FreeBSD$"); #include #include #include "un-namespace.h" +#include "netdb_private.h" #include "libc_private.h" #ifdef NS_CACHING #include "nscache.h" @@ -451,6 +452,24 @@ getaddrinfo(const char *hostname, const } /* + * RFC 3493: AI_ALL and AI_V4MAPPED are effective only against + * AF_INET6 query. They need to be ignored if specified in other + * occassions. + */ + switch (pai->ai_flags & (AI_ALL | AI_V4MAPPED)) { + case AI_V4MAPPED: + case AI_ALL | AI_V4MAPPED: +#ifdef INET6 + if (pai->ai_family != AF_INET6) + pai->ai_flags &= ~(AI_ALL | AI_V4MAPPED); + break; +#endif + case AI_ALL: + pai->ai_flags &= ~(AI_ALL | AI_V4MAPPED); + break; + } + + /* * check for special cases. (1) numeric servname is disallowed if * socktype/protocol are left unspecified. (2) servname is disallowed * for raw and other inet{,6} sockets. @@ -759,10 +778,9 @@ match_addrselectpolicy(struct sockaddr * memset(&key, 0, sizeof(key)); key.sin6_family = AF_INET6; key.sin6_len = sizeof(key); - key.sin6_addr.s6_addr[10] = 0xff; - key.sin6_addr.s6_addr[11] = 0xff; - memcpy(&key.sin6_addr.s6_addr[12], - &((struct sockaddr_in *)addr)->sin_addr, 4); + _map_v4v6_address( + (char *)&((struct sockaddr_in *)addr)->sin_addr, + (char *)&key.sin6_addr); break; default: return(NULL); @@ -842,6 +860,16 @@ set_source(struct ai_order *aio, struct if ((s = _socket(ai.ai_family, ai.ai_socktype | SOCK_CLOEXEC, ai.ai_protocol)) < 0) return; /* give up */ +#ifdef INET6 + if (ai.ai_family == AF_INET6) { + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)ai.ai_addr; + int off = 0; + + if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) + (void)_setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, + (char *)&off, sizeof(off)); + } +#endif if (_connect(s, ai.ai_addr, ai.ai_addrlen) < 0) goto cleanup; srclen = ai.ai_addrlen; @@ -1177,7 +1205,7 @@ explore_numeric(const struct addrinfo *p const char *servname, struct addrinfo **res, const char *canonname) { const struct afd *afd; - struct addrinfo *ai; + struct addrinfo *ai, ai0; int error; char pton[PTON_MAX]; @@ -1201,8 +1229,17 @@ explore_numeric(const struct addrinfo *p return 0; break; default: - if (inet_pton(afd->a_af, hostname, pton) != 1) - return 0; + if (inet_pton(afd->a_af, hostname, pton) != 1) { + if (pai->ai_family != AF_INET6 || + (pai->ai_flags & AI_V4MAPPED) != AI_V4MAPPED) + return 0; + if (inet_aton(hostname, (struct in_addr *)pton) != 1) + return 0; + afd = &afdl[N_INET]; + ai0 = *pai; + ai0.ai_family = AF_INET; + pai = &ai0; + } break; } @@ -1321,6 +1358,9 @@ get_ai(const struct addrinfo *pai, const char *fp_str; int translate = 0; #endif +#ifdef INET6 + struct in6_addr mapaddr; +#endif #ifdef FAITH /* @@ -1358,6 +1398,14 @@ get_ai(const struct addrinfo *pai, const } #endif +#ifdef INET6 + if (afd->a_af == AF_INET && (pai->ai_flags & AI_V4MAPPED) != 0) { + afd = &afdl[N_INET6]; + _map_v4v6_address(addr, (char *)&mapaddr); + addr = (char *)&mapaddr; + } +#endif + ai = (struct addrinfo *)malloc(sizeof(struct addrinfo) + (afd->a_socklen)); if (ai == NULL) @@ -2117,7 +2165,11 @@ getanswer(const querybuf *answer, int an return sentinel.ai_next; } - RES_SET_H_ERRNO(res, NO_RECOVERY); + /* + * We could have walked a CNAME chain, but the ultimate target + * may not have what we looked for. + */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Tue Dec 29 08:19:08 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A692A5286F for ; Tue, 29 Dec 2015 08:19:08 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 24C531F73; Tue, 29 Dec 2015 08:19:08 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBT8J7Is042993; Tue, 29 Dec 2015 08:19:07 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBT8J6mL042988; Tue, 29 Dec 2015 08:19:06 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512290819.tBT8J6mL042988@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 29 Dec 2015 08:19:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292860 - in user/ngie/stable-10-libnv/sys: dev/pci ofed/include/linux X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2015 08:19:08 -0000 Author: ngie Date: Tue Dec 29 08:19:06 2015 New Revision: 292860 URL: https://svnweb.freebsd.org/changeset/base/292860 Log: MFC r270212: r270212 (by royger): pci: make MSI(-X) enable and disable methods of the PCI bus Make the functions pci_disable_msi, pci_enable_msi and pci_enable_msix methods of the newbus PCI bus. This code should not include any functional change. Sponsored by: Citrix Systems R&D Reviewed by: imp, jhb Differential Revision: https://reviews.freebsd.org/D354 dev/pci/pci.c: - Convert the mentioned functions to newbus methods. - Fix the callers of the converted functions. sys/dev/pci/pci_private.h: dev/pci/pci_if.m: - Declare the new methods. dev/pci/pcivar.h: - Add helpers to call the newbus methods. ofed/include/linux/pci.h: - Add define to prevent the ofed version of pci_enable_msix from clashing with the FreeBSD native version. Modified: user/ngie/stable-10-libnv/sys/dev/pci/pci.c user/ngie/stable-10-libnv/sys/dev/pci/pci_if.m user/ngie/stable-10-libnv/sys/dev/pci/pci_private.h user/ngie/stable-10-libnv/sys/dev/pci/pcivar.h user/ngie/stable-10-libnv/sys/ofed/include/linux/pci.h Directory Properties: user/ngie/stable-10-libnv/ (props changed) Modified: user/ngie/stable-10-libnv/sys/dev/pci/pci.c ============================================================================== --- user/ngie/stable-10-libnv/sys/dev/pci/pci.c Tue Dec 29 07:54:55 2015 (r292859) +++ user/ngie/stable-10-libnv/sys/dev/pci/pci.c Tue Dec 29 08:19:06 2015 (r292860) @@ -110,11 +110,6 @@ static int pci_write_vpd_reg(device_t p int reg, uint32_t data); #endif static void pci_read_vpd(device_t pcib, pcicfgregs *cfg); -static void pci_disable_msi(device_t dev); -static void pci_enable_msi(device_t dev, uint64_t address, - uint16_t data); -static void pci_enable_msix(device_t dev, u_int index, - uint64_t address, uint32_t data); static void pci_mask_msix(device_t dev, u_int index); static void pci_unmask_msix(device_t dev, u_int index); static int pci_msi_blacklisted(void); @@ -180,6 +175,9 @@ static device_method_t pci_methods[] = { DEVMETHOD(pci_find_htcap, pci_find_htcap_method), DEVMETHOD(pci_alloc_msi, pci_alloc_msi_method), DEVMETHOD(pci_alloc_msix, pci_alloc_msix_method), + DEVMETHOD(pci_enable_msi, pci_enable_msi_method), + DEVMETHOD(pci_enable_msix, pci_enable_msix_method), + DEVMETHOD(pci_disable_msi, pci_disable_msi_method), DEVMETHOD(pci_remap_msix, pci_remap_msix_method), DEVMETHOD(pci_release_msi, pci_release_msi_method), DEVMETHOD(pci_msi_count, pci_msi_count_method), @@ -1374,9 +1372,10 @@ pci_find_extcap_method(device_t dev, dev * Support for MSI-X message interrupts. */ void -pci_enable_msix(device_t dev, u_int index, uint64_t address, uint32_t data) +pci_enable_msix_method(device_t dev, device_t child, u_int index, + uint64_t address, uint32_t data) { - struct pci_devinfo *dinfo = device_get_ivars(dev); + struct pci_devinfo *dinfo = device_get_ivars(child); struct pcicfg_msix *msix = &dinfo->cfg.msix; uint32_t offset; @@ -1387,7 +1386,7 @@ pci_enable_msix(device_t dev, u_int inde bus_write_4(msix->msix_table_res, offset + 8, data); /* Enable MSI -> HT mapping. */ - pci_ht_map_msi(dev, address); + pci_ht_map_msi(child, address); } void @@ -1956,45 +1955,46 @@ pcie_adjust_config(device_t dev, int reg * Support for MSI message signalled interrupts. */ void -pci_enable_msi(device_t dev, uint64_t address, uint16_t data) +pci_enable_msi_method(device_t dev, device_t child, uint64_t address, + uint16_t data) { - struct pci_devinfo *dinfo = device_get_ivars(dev); + struct pci_devinfo *dinfo = device_get_ivars(child); struct pcicfg_msi *msi = &dinfo->cfg.msi; /* Write data and address values. */ - pci_write_config(dev, msi->msi_location + PCIR_MSI_ADDR, + pci_write_config(child, msi->msi_location + PCIR_MSI_ADDR, address & 0xffffffff, 4); if (msi->msi_ctrl & PCIM_MSICTRL_64BIT) { - pci_write_config(dev, msi->msi_location + PCIR_MSI_ADDR_HIGH, + pci_write_config(child, msi->msi_location + PCIR_MSI_ADDR_HIGH, address >> 32, 4); - pci_write_config(dev, msi->msi_location + PCIR_MSI_DATA_64BIT, + pci_write_config(child, msi->msi_location + PCIR_MSI_DATA_64BIT, data, 2); } else - pci_write_config(dev, msi->msi_location + PCIR_MSI_DATA, data, + pci_write_config(child, msi->msi_location + PCIR_MSI_DATA, data, 2); /* Enable MSI in the control register. */ msi->msi_ctrl |= PCIM_MSICTRL_MSI_ENABLE; - pci_write_config(dev, msi->msi_location + PCIR_MSI_CTRL, msi->msi_ctrl, - 2); + pci_write_config(child, msi->msi_location + PCIR_MSI_CTRL, + msi->msi_ctrl, 2); /* Enable MSI -> HT mapping. */ - pci_ht_map_msi(dev, address); + pci_ht_map_msi(child, address); } void -pci_disable_msi(device_t dev) +pci_disable_msi_method(device_t dev, device_t child) { - struct pci_devinfo *dinfo = device_get_ivars(dev); + struct pci_devinfo *dinfo = device_get_ivars(child); struct pcicfg_msi *msi = &dinfo->cfg.msi; /* Disable MSI -> HT mapping. */ - pci_ht_map_msi(dev, 0); + pci_ht_map_msi(child, 0); /* Disable MSI in the control register. */ msi->msi_ctrl &= ~PCIM_MSICTRL_MSI_ENABLE; - pci_write_config(dev, msi->msi_location + PCIR_MSI_CTRL, msi->msi_ctrl, - 2); + pci_write_config(child, msi->msi_location + PCIR_MSI_CTRL, + msi->msi_ctrl, 2); } /* Modified: user/ngie/stable-10-libnv/sys/dev/pci/pci_if.m ============================================================================== --- user/ngie/stable-10-libnv/sys/dev/pci/pci_if.m Tue Dec 29 07:54:55 2015 (r292859) +++ user/ngie/stable-10-libnv/sys/dev/pci/pci_if.m Tue Dec 29 08:19:06 2015 (r292860) @@ -138,6 +138,26 @@ METHOD int alloc_msix { int *count; }; +METHOD void enable_msi { + device_t dev; + device_t child; + uint64_t address; + uint16_t data; +}; + +METHOD void enable_msix { + device_t dev; + device_t child; + u_int index; + uint64_t address; + uint32_t data; +}; + +METHOD void disable_msi { + device_t dev; + device_t child; +}; + METHOD int remap_msix { device_t dev; device_t child; Modified: user/ngie/stable-10-libnv/sys/dev/pci/pci_private.h ============================================================================== --- user/ngie/stable-10-libnv/sys/dev/pci/pci_private.h Tue Dec 29 07:54:55 2015 (r292859) +++ user/ngie/stable-10-libnv/sys/dev/pci/pci_private.h Tue Dec 29 08:19:06 2015 (r292860) @@ -90,6 +90,11 @@ int pci_find_htcap_method(device_t dev, int capability, int *capreg); int pci_alloc_msi_method(device_t dev, device_t child, int *count); int pci_alloc_msix_method(device_t dev, device_t child, int *count); +void pci_enable_msi_method(device_t dev, device_t child, + uint64_t address, uint16_t data); +void pci_enable_msix_method(device_t dev, device_t child, + u_int index, uint64_t address, uint32_t data); +void pci_disable_msi_method(device_t dev, device_t child); int pci_remap_msix_method(device_t dev, device_t child, int count, const u_int *vectors); int pci_release_msi_method(device_t dev, device_t child); Modified: user/ngie/stable-10-libnv/sys/dev/pci/pcivar.h ============================================================================== --- user/ngie/stable-10-libnv/sys/dev/pci/pcivar.h Tue Dec 29 07:54:55 2015 (r292859) +++ user/ngie/stable-10-libnv/sys/dev/pci/pcivar.h Tue Dec 29 08:19:06 2015 (r292860) @@ -458,6 +458,24 @@ pci_alloc_msix(device_t dev, int *count) return (PCI_ALLOC_MSIX(device_get_parent(dev), dev, count)); } +static __inline void +pci_enable_msi(device_t dev, uint64_t address, uint16_t data) +{ + PCI_ENABLE_MSI(device_get_parent(dev), dev, address, data); +} + +static __inline void +pci_enable_msix(device_t dev, u_int index, uint64_t address, uint32_t data) +{ + PCI_ENABLE_MSIX(device_get_parent(dev), dev, index, address, data); +} + +static __inline void +pci_disable_msi(device_t dev) +{ + PCI_DISABLE_MSI(device_get_parent(dev), dev); +} + static __inline int pci_remap_msix(device_t dev, int count, const u_int *vectors) { Modified: user/ngie/stable-10-libnv/sys/ofed/include/linux/pci.h ============================================================================== --- user/ngie/stable-10-libnv/sys/ofed/include/linux/pci.h Tue Dec 29 07:54:55 2015 (r292859) +++ user/ngie/stable-10-libnv/sys/ofed/include/linux/pci.h Tue Dec 29 08:19:06 2015 (r292860) @@ -566,7 +566,11 @@ struct msix_entry { /* * Enable msix, positive errors indicate actual number of available * vectors. Negative errors are failures. + * + * NB: define added to prevent this definition of pci_enable_msix from + * clashing with the native FreeBSD version. */ +#define pci_enable_msix linux_pci_enable_msix static inline int pci_enable_msix(struct pci_dev *pdev, struct msix_entry *entries, int nreq) { From owner-svn-src-user@freebsd.org Tue Dec 29 08:39:09 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73687A53151 for ; Tue, 29 Dec 2015 08:39:09 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DF8B1A8E; Tue, 29 Dec 2015 08:39:09 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBT8d8hH049400; Tue, 29 Dec 2015 08:39:08 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBT8d84U049396; Tue, 29 Dec 2015 08:39:08 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512290839.tBT8d84U049396@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 29 Dec 2015 08:39:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292862 - user/ngie/stable-10-libnv/sys/dev/pci X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2015 08:39:09 -0000 Author: ngie Date: Tue Dec 29 08:39:07 2015 New Revision: 292862 URL: https://svnweb.freebsd.org/changeset/base/292862 Log: MFC r270332: r270332 (by royger): pci: add a new pci_child_added newbus method. This is needed so when running under Xen the calls to pci_child_added can be intercepted and a custom Xen method can be used to register those devices with Xen. This should not include any functional change, since the Xen implementation will be added in a following patch and the native implementation is a noop. Sponsored by: Citrix Systems R&D Reviewed by: jhb dev/pci/pci.c: dev/pci/pci_if.m: dev/pci/pci_private.h: dev/pci/pcivar.h: - Add the pci_child_added newbus method. Modified: user/ngie/stable-10-libnv/sys/dev/pci/pci.c user/ngie/stable-10-libnv/sys/dev/pci/pci_if.m user/ngie/stable-10-libnv/sys/dev/pci/pci_private.h user/ngie/stable-10-libnv/sys/dev/pci/pcivar.h Directory Properties: user/ngie/stable-10-libnv/ (props changed) Modified: user/ngie/stable-10-libnv/sys/dev/pci/pci.c ============================================================================== --- user/ngie/stable-10-libnv/sys/dev/pci/pci.c Tue Dec 29 08:19:43 2015 (r292861) +++ user/ngie/stable-10-libnv/sys/dev/pci/pci.c Tue Dec 29 08:39:07 2015 (r292862) @@ -183,6 +183,7 @@ static device_method_t pci_methods[] = { DEVMETHOD(pci_msi_count, pci_msi_count_method), DEVMETHOD(pci_msix_count, pci_msix_count_method), DEVMETHOD(pci_get_rid, pci_get_rid_method), + DEVMETHOD(pci_child_added, pci_child_added_method), DEVMETHOD_END }; @@ -3604,6 +3605,13 @@ pci_add_child(device_t bus, struct pci_d pci_cfg_restore(dinfo->cfg.dev, dinfo); pci_print_verbose(dinfo); pci_add_resources(bus, dinfo->cfg.dev, 0, 0); + pci_child_added(dinfo->cfg.dev); +} + +void +pci_child_added_method(device_t dev, device_t child) +{ + } static int Modified: user/ngie/stable-10-libnv/sys/dev/pci/pci_if.m ============================================================================== --- user/ngie/stable-10-libnv/sys/dev/pci/pci_if.m Tue Dec 29 08:19:43 2015 (r292861) +++ user/ngie/stable-10-libnv/sys/dev/pci/pci_if.m Tue Dec 29 08:39:07 2015 (r292862) @@ -185,3 +185,7 @@ METHOD uint16_t get_rid { device_t child; }; +METHOD void child_added { + device_t dev; + device_t child; +}; Modified: user/ngie/stable-10-libnv/sys/dev/pci/pci_private.h ============================================================================== --- user/ngie/stable-10-libnv/sys/dev/pci/pci_private.h Tue Dec 29 08:19:43 2015 (r292861) +++ user/ngie/stable-10-libnv/sys/dev/pci/pci_private.h Tue Dec 29 08:39:07 2015 (r292862) @@ -125,6 +125,7 @@ int pci_assign_interrupt_method(device_ int pci_resume(device_t dev); int pci_suspend(device_t dev); bus_dma_tag_t pci_get_dma_tag(device_t bus, device_t dev); +void pci_child_added_method(device_t dev, device_t child); /** Restore the config register state. The state must be previously * saved with pci_cfg_save. However, the pci bus driver takes care of Modified: user/ngie/stable-10-libnv/sys/dev/pci/pcivar.h ============================================================================== --- user/ngie/stable-10-libnv/sys/dev/pci/pcivar.h Tue Dec 29 08:19:43 2015 (r292861) +++ user/ngie/stable-10-libnv/sys/dev/pci/pcivar.h Tue Dec 29 08:39:07 2015 (r292862) @@ -506,6 +506,13 @@ pci_get_rid(device_t dev) return (PCI_GET_RID(device_get_parent(dev), dev)); } +static __inline void +pci_child_added(device_t dev) +{ + + return (PCI_CHILD_ADDED(device_get_parent(dev), dev)); +} + device_t pci_find_bsf(uint8_t, uint8_t, uint8_t); device_t pci_find_dbsf(uint32_t, uint8_t, uint8_t, uint8_t); device_t pci_find_device(uint16_t, uint16_t); From owner-svn-src-user@freebsd.org Tue Dec 29 12:08:55 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8EB6FA5494B for ; Tue, 29 Dec 2015 12:08:55 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5FB7A123B; Tue, 29 Dec 2015 12:08:55 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBTC8sD9013328; Tue, 29 Dec 2015 12:08:54 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBTC8sXe013326; Tue, 29 Dec 2015 12:08:54 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201512291208.tBTC8sXe013326@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 29 Dec 2015 12:08:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292866 - user/pho/stress2 X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2015 12:08:55 -0000 Author: pho Date: Tue Dec 29 12:08:54 2015 New Revision: 292866 URL: https://svnweb.freebsd.org/changeset/base/292866 Log: Make the origin check warning work. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/default.cfg user/pho/stress2/run.sh Modified: user/pho/stress2/default.cfg ============================================================================== --- user/pho/stress2/default.cfg Tue Dec 29 11:53:13 2015 (r292865) +++ user/pho/stress2/default.cfg Tue Dec 29 12:08:54 2015 (r292866) @@ -61,6 +61,7 @@ testuser=pho # Name of non root test u mdstart=5 # Start of free md units part=a # partition to use on a md FS newfs_flags="-U" # default file system flags +export stress2origin=${stress2origin:-`pwd`} # Wrapper for dd dede () { # file, blocksize, count Modified: user/pho/stress2/run.sh ============================================================================== --- user/pho/stress2/run.sh Tue Dec 29 11:53:13 2015 (r292865) +++ user/pho/stress2/run.sh Tue Dec 29 12:08:54 2015 (r292866) @@ -41,8 +41,9 @@ while getopts a name; do done shift $(($OPTIND - 1)) -pgrep -fq all.sh || - echo "Note: all.sh in stress2/misc is the preferred test to run." +[ `basename ${stress2origin:-X}` != misc ] && + echo "Note: all.sh in stress2/misc is the preferred test to run." \ + 1>&2 if [ ! -z "$aflag" ]; then . ./default.cfg export runRUNTIME=5m From owner-svn-src-user@freebsd.org Tue Dec 29 12:32:53 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A43EAA5360C for ; Tue, 29 Dec 2015 12:32:53 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 759721188; Tue, 29 Dec 2015 12:32:53 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBTCWqjf021703; Tue, 29 Dec 2015 12:32:52 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBTCWqPL021701; Tue, 29 Dec 2015 12:32:52 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201512291232.tBTCWqPL021701@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 29 Dec 2015 12:32:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292867 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2015 12:32:53 -0000 Author: pho Date: Tue Dec 29 12:32:52 2015 New Revision: 292867 URL: https://svnweb.freebsd.org/changeset/base/292867 Log: Fix copy / paste error in comment. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/marcus4.sh user/pho/stress2/misc/marcus5.sh Modified: user/pho/stress2/misc/marcus4.sh ============================================================================== --- user/pho/stress2/misc/marcus4.sh Tue Dec 29 12:08:54 2015 (r292866) +++ user/pho/stress2/misc/marcus4.sh Tue Dec 29 12:32:52 2015 (r292867) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2013 Peter Holm +# Copyright (c) 2015 EMC Corp. # All rights reserved. # # Redistribution and use in source and binary forms, with or without Modified: user/pho/stress2/misc/marcus5.sh ============================================================================== --- user/pho/stress2/misc/marcus5.sh Tue Dec 29 12:08:54 2015 (r292866) +++ user/pho/stress2/misc/marcus5.sh Tue Dec 29 12:32:52 2015 (r292867) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2013 Peter Holm +# Copyright (c) 2015 EMC Corp. # All rights reserved. # # Redistribution and use in source and binary forms, with or without From owner-svn-src-user@freebsd.org Tue Dec 29 12:35:14 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37882A537AC for ; Tue, 29 Dec 2015 12:35:14 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0558D13D9; Tue, 29 Dec 2015 12:35:13 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBTCZDfK021849; Tue, 29 Dec 2015 12:35:13 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBTCZDYo021848; Tue, 29 Dec 2015 12:35:13 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201512291235.tBTCZDYo021848@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 29 Dec 2015 12:35:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292868 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2015 12:35:14 -0000 Author: pho Date: Tue Dec 29 12:35:12 2015 New Revision: 292868 URL: https://svnweb.freebsd.org/changeset/base/292868 Log: Remove '#' from cleanup code. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/pthread8.sh Modified: user/pho/stress2/misc/pthread8.sh ============================================================================== --- user/pho/stress2/misc/pthread8.sh Tue Dec 29 12:32:52 2015 (r292867) +++ user/pho/stress2/misc/pthread8.sh Tue Dec 29 12:35:12 2015 (r292868) @@ -36,11 +36,11 @@ here=`pwd` cd /tmp sed '1,/^EOF/d' < $here/$0 > pthread8.c mycc -o pthread8 -Wall -Wextra -O0 -g pthread8.c -lpthread || exit 1 -#rm -f pthread8.c /tmp/pthread8.core +rm -f pthread8.c /tmp/pthread8.core /tmp/pthread8 -#rm -f /tmp/pthread8 +rm -f /tmp/pthread8 exit 0 EOF /* $Id: pi.c,v 1.2 2015/01/31 11:36:07 kostik Exp kostik $ */ From owner-svn-src-user@freebsd.org Tue Dec 29 12:38:05 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AF081A53905 for ; Tue, 29 Dec 2015 12:38:05 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 80F7117EB; Tue, 29 Dec 2015 12:38:05 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBTCc4qS021981; Tue, 29 Dec 2015 12:38:04 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBTCc46Y021980; Tue, 29 Dec 2015 12:38:04 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201512291238.tBTCc46Y021980@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 29 Dec 2015 12:38:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292869 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2015 12:38:05 -0000 Author: pho Date: Tue Dec 29 12:38:04 2015 New Revision: 292869 URL: https://svnweb.freebsd.org/changeset/base/292869 Log: Make sure the directory for the $diskimage file exists. Added IPC cleanup. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/cleanup.sh Modified: user/pho/stress2/misc/cleanup.sh ============================================================================== --- user/pho/stress2/misc/cleanup.sh Tue Dec 29 12:35:12 2015 (r292868) +++ user/pho/stress2/misc/cleanup.sh Tue Dec 29 12:38:04 2015 (r292869) @@ -37,6 +37,7 @@ mount | grep -q "on $mntpoint " && umoun rm -rf ${mntpoint}/stressX* rm -f /tmp/.snap/stress2* /var/.snap/stress2* rm -rf /tmp/stressX.control $RUNDIR /tmp/misc.name +[ -d `dirname "$diskimage"` ] || mkdir -p `dirname "$diskimage"` mkdir -p $RUNDIR chmod 0777 $RUNDIR @@ -59,3 +60,8 @@ for i in `jot $MOUNTS`; do [ -c /dev/md$m ] && mdconfig -d -u $m m=$((m + 1)) done + +# Delete $testuser's ipcs +ipcs | awk "\$5 ~/$testuser/ && \$6 ~/$testuser/ {print \"-\" \$1,\$2}" | \ + xargs -t ipcrm + From owner-svn-src-user@freebsd.org Tue Dec 29 19:44:38 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 10FDCA558D0 for ; Tue, 29 Dec 2015 19:44:38 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 538D915B6; Tue, 29 Dec 2015 19:44:37 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBTJia3D054551; Tue, 29 Dec 2015 19:44:36 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBTJiX4X054522; Tue, 29 Dec 2015 19:44:33 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512291944.tBTJiX4X054522@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 29 Dec 2015 19:44:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292882 - in user/ngie/detangle-rc: . bin/ed bin/pax bin/sh bin/sh/tests/expansion cddl/contrib/opensolaris/cmd/zdb cddl/sbin/zfs cddl/sbin/zpool cddl/usr.sbin/zdb cddl/usr.sbin/zhack c... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2015 19:44:38 -0000 Author: ngie Date: Tue Dec 29 19:44:32 2015 New Revision: 292882 URL: https://svnweb.freebsd.org/changeset/base/292882 Log: MFhead @ r292881 Added: user/ngie/detangle-rc/bin/sh/tests/expansion/trim9.0 - copied unchanged from r292881, head/bin/sh/tests/expansion/trim9.0 user/ngie/detangle-rc/contrib/llvm/patches/patch-08-clang-cc1as-dwarf2.diff - copied unchanged from r292881, head/contrib/llvm/patches/patch-08-clang-cc1as-dwarf2.diff user/ngie/detangle-rc/contrib/openbsm/.travis.yml - copied unchanged from r292881, head/contrib/openbsm/.travis.yml user/ngie/detangle-rc/contrib/openbsm/libbsm/au_notify.3 - copied unchanged from r292881, head/contrib/openbsm/libbsm/au_notify.3 user/ngie/detangle-rc/contrib/unbound/.gitignore - copied unchanged from r292881, head/contrib/unbound/.gitignore user/ngie/detangle-rc/contrib/unbound/compat/isblank.c - copied unchanged from r292881, head/contrib/unbound/compat/isblank.c user/ngie/detangle-rc/lib/libc/stdlib/hcreate_r.c - copied unchanged from r292881, head/lib/libc/stdlib/hcreate_r.c user/ngie/detangle-rc/lib/libc/stdlib/hdestroy_r.c - copied unchanged from r292881, head/lib/libc/stdlib/hdestroy_r.c user/ngie/detangle-rc/lib/libc/stdlib/hsearch.h - copied unchanged from r292881, head/lib/libc/stdlib/hsearch.h user/ngie/detangle-rc/lib/libc/stdlib/hsearch_r.c - copied unchanged from r292881, head/lib/libc/stdlib/hsearch_r.c user/ngie/detangle-rc/lib/libc/stdlib/tsearch_path.h - copied unchanged from r292881, head/lib/libc/stdlib/tsearch_path.h user/ngie/detangle-rc/lib/libc/tests/nss/ - copied from r292881, head/lib/libc/tests/nss/ user/ngie/detangle-rc/lib/libc/tests/resolv/ - copied from r292881, head/lib/libc/tests/resolv/ user/ngie/detangle-rc/lib/libc/tests/stdlib/tsearch_test.c - copied unchanged from r292881, head/lib/libc/tests/stdlib/tsearch_test.c user/ngie/detangle-rc/lib/libstand/uuid_from_string.c - copied unchanged from r292881, head/lib/libstand/uuid_from_string.c user/ngie/detangle-rc/lib/libstand/uuid_to_string.c - copied unchanged from r292881, head/lib/libstand/uuid_to_string.c user/ngie/detangle-rc/lib/libsysdecode/ - copied from r292881, head/lib/libsysdecode/ user/ngie/detangle-rc/lib/msun/tests/cexp_test.c - copied unchanged from r292881, head/lib/msun/tests/cexp_test.c user/ngie/detangle-rc/lib/msun/tests/conj_test.c - copied unchanged from r292881, head/lib/msun/tests/conj_test.c user/ngie/detangle-rc/lib/msun/tests/csqrt_test.c - copied unchanged from r292881, head/lib/msun/tests/csqrt_test.c user/ngie/detangle-rc/lib/msun/tests/ctrig_test.c - copied unchanged from r292881, head/lib/msun/tests/ctrig_test.c user/ngie/detangle-rc/lib/msun/tests/exponential_test.c - copied unchanged from r292881, head/lib/msun/tests/exponential_test.c user/ngie/detangle-rc/lib/msun/tests/fenv_test.c - copied unchanged from r292881, head/lib/msun/tests/fenv_test.c user/ngie/detangle-rc/lib/msun/tests/fma_test.c - copied unchanged from r292881, head/lib/msun/tests/fma_test.c user/ngie/detangle-rc/lib/msun/tests/fmaxmin_test.c - copied unchanged from r292881, head/lib/msun/tests/fmaxmin_test.c user/ngie/detangle-rc/lib/msun/tests/ilogb_test.c - copied unchanged from r292881, head/lib/msun/tests/ilogb_test.c user/ngie/detangle-rc/lib/msun/tests/invctrig_test.c - copied unchanged from r292881, head/lib/msun/tests/invctrig_test.c user/ngie/detangle-rc/lib/msun/tests/invtrig_test.c - copied unchanged from r292881, head/lib/msun/tests/invtrig_test.c user/ngie/detangle-rc/lib/msun/tests/logarithm_test.c - copied unchanged from r292881, head/lib/msun/tests/logarithm_test.c user/ngie/detangle-rc/lib/msun/tests/lrint_test.c - copied unchanged from r292881, head/lib/msun/tests/lrint_test.c user/ngie/detangle-rc/lib/msun/tests/lround_test.c - copied unchanged from r292881, head/lib/msun/tests/lround_test.c user/ngie/detangle-rc/lib/msun/tests/lround_test.t - copied unchanged from r292881, head/lib/msun/tests/lround_test.t user/ngie/detangle-rc/lib/msun/tests/nan_test.c - copied unchanged from r292881, head/lib/msun/tests/nan_test.c user/ngie/detangle-rc/lib/msun/tests/nearbyint_test.c - copied unchanged from r292881, head/lib/msun/tests/nearbyint_test.c user/ngie/detangle-rc/lib/msun/tests/next_test.c - copied unchanged from r292881, head/lib/msun/tests/next_test.c user/ngie/detangle-rc/lib/msun/tests/rem_test.c - copied unchanged from r292881, head/lib/msun/tests/rem_test.c user/ngie/detangle-rc/lib/msun/tests/test-utils.h - copied unchanged from r292881, head/lib/msun/tests/test-utils.h user/ngie/detangle-rc/lib/msun/tests/trig_test.c - copied unchanged from r292881, head/lib/msun/tests/trig_test.c user/ngie/detangle-rc/libexec/rtld-elf/riscv/ - copied from r292881, head/libexec/rtld-elf/riscv/ user/ngie/detangle-rc/share/man/man4/mdio.4 - copied unchanged from r292881, head/share/man/man4/mdio.4 user/ngie/detangle-rc/sys/arm/arm/machdep_intr.c - copied unchanged from r292881, head/sys/arm/arm/machdep_intr.c user/ngie/detangle-rc/sys/arm/arm/ofw_machdep.c - copied unchanged from r292881, head/sys/arm/arm/ofw_machdep.c user/ngie/detangle-rc/sys/arm/freescale/imx/imx6_hdmi.c - copied unchanged from r292881, head/sys/arm/freescale/imx/imx6_hdmi.c user/ngie/detangle-rc/sys/arm/freescale/imx/imx6_hdmireg.h - copied unchanged from r292881, head/sys/arm/freescale/imx/imx6_hdmireg.h user/ngie/detangle-rc/sys/arm/freescale/imx/imx6_ipu.c - copied unchanged from r292881, head/sys/arm/freescale/imx/imx6_ipu.c user/ngie/detangle-rc/sys/arm/freescale/imx/imx_iomuxreg.h - copied unchanged from r292881, head/sys/arm/freescale/imx/imx_iomuxreg.h user/ngie/detangle-rc/sys/compat/linuxkpi/common/include/linux/srcu.h - copied unchanged from r292881, head/sys/compat/linuxkpi/common/include/linux/srcu.h user/ngie/detangle-rc/sys/crypto/sha2/sha384.h - copied unchanged from r292881, head/sys/crypto/sha2/sha384.h user/ngie/detangle-rc/sys/crypto/sha2/sha512.h - copied unchanged from r292881, head/sys/crypto/sha2/sha512.h user/ngie/detangle-rc/sys/crypto/sha2/sha512c.c - copied unchanged from r292881, head/sys/crypto/sha2/sha512c.c user/ngie/detangle-rc/sys/dev/bxe/bxe_dump.h - copied unchanged from r292881, head/sys/dev/bxe/bxe_dump.h user/ngie/detangle-rc/sys/dev/bxe/bxe_ioctl.h - copied unchanged from r292881, head/sys/dev/bxe/bxe_ioctl.h user/ngie/detangle-rc/sys/dev/cxgbe/cxgbei/ - copied from r292881, head/sys/dev/cxgbe/cxgbei/ user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe_osdep.c - copied unchanged from r292881, head/sys/dev/ixgbe/ixgbe_osdep.c user/ngie/detangle-rc/sys/dev/mdio/ - copied from r292881, head/sys/dev/mdio/ user/ngie/detangle-rc/sys/dev/ofw/ofw_subr.c - copied unchanged from r292881, head/sys/dev/ofw/ofw_subr.c user/ngie/detangle-rc/sys/dev/ofw/ofw_subr.h - copied unchanged from r292881, head/sys/dev/ofw/ofw_subr.h user/ngie/detangle-rc/sys/geom/sched/gs_delay.c - copied unchanged from r292881, head/sys/geom/sched/gs_delay.c user/ngie/detangle-rc/sys/kern/pic_if.m - copied unchanged from r292881, head/sys/kern/pic_if.m user/ngie/detangle-rc/sys/kern/subr_intr.c - copied unchanged from r292881, head/sys/kern/subr_intr.c user/ngie/detangle-rc/sys/mips/conf/MT7620 - copied unchanged from r292881, head/sys/mips/conf/MT7620 user/ngie/detangle-rc/sys/mips/conf/MT7620.hints - copied unchanged from r292881, head/sys/mips/conf/MT7620.hints user/ngie/detangle-rc/sys/mips/conf/RT5350 - copied unchanged from r292881, head/sys/mips/conf/RT5350 user/ngie/detangle-rc/sys/mips/conf/RT5350.hints - copied unchanged from r292881, head/sys/mips/conf/RT5350.hints user/ngie/detangle-rc/sys/mips/mips/ofw_machdep.c - copied unchanged from r292881, head/sys/mips/mips/ofw_machdep.c user/ngie/detangle-rc/sys/mips/rt305x/rt305x_ehci.c - copied unchanged from r292881, head/sys/mips/rt305x/rt305x_ehci.c user/ngie/detangle-rc/sys/mips/rt305x/rt305x_ohci.c - copied unchanged from r292881, head/sys/mips/rt305x/rt305x_ohci.c user/ngie/detangle-rc/sys/mips/rt305x/rt305x_pci.c - copied unchanged from r292881, head/sys/mips/rt305x/rt305x_pci.c user/ngie/detangle-rc/sys/mips/rt305x/rt305x_pcireg.h - copied unchanged from r292881, head/sys/mips/rt305x/rt305x_pcireg.h user/ngie/detangle-rc/sys/mips/rt305x/rt305x_spi.c - copied unchanged from r292881, head/sys/mips/rt305x/rt305x_spi.c user/ngie/detangle-rc/sys/modules/cxgbe/cxgbei/ - copied from r292881, head/sys/modules/cxgbe/cxgbei/ user/ngie/detangle-rc/sys/modules/geom/geom_sched/gsched_delay/ - copied from r292881, head/sys/modules/geom/geom_sched/gsched_delay/ user/ngie/detangle-rc/sys/modules/mdio/ - copied from r292881, head/sys/modules/mdio/ user/ngie/detangle-rc/sys/modules/tcp/ - copied from r292881, head/sys/modules/tcp/ user/ngie/detangle-rc/sys/netinet/tcp_fastopen.c - copied unchanged from r292881, head/sys/netinet/tcp_fastopen.c user/ngie/detangle-rc/sys/netinet/tcp_fastopen.h - copied unchanged from r292881, head/sys/netinet/tcp_fastopen.h user/ngie/detangle-rc/sys/netinet/tcp_stacks/ - copied from r292881, head/sys/netinet/tcp_stacks/ user/ngie/detangle-rc/sys/riscv/ - copied from r292881, head/sys/riscv/ user/ngie/detangle-rc/sys/x86/include/cputypes.h - copied unchanged from r292881, head/sys/x86/include/cputypes.h user/ngie/detangle-rc/tests/sys/mac/ - copied from r292881, head/tests/sys/mac/ Replaced: user/ngie/detangle-rc/lib/libc/stdlib/hcreate.c - copied unchanged from r292881, head/lib/libc/stdlib/hcreate.c Deleted: user/ngie/detangle-rc/contrib/llvm/patches/patch-08-llvm-r250085-fix-avx-crash.diff user/ngie/detangle-rc/contrib/llvm/patches/patch-09-clang-r250657-openmp.diff user/ngie/detangle-rc/contrib/llvm/patches/patch-10-clang-cc1as-dwarf2.diff user/ngie/detangle-rc/lib/libmd/sha512.h user/ngie/detangle-rc/lib/libmd/sha512c.c user/ngie/detangle-rc/sys/arm/arm/intrng.c user/ngie/detangle-rc/sys/arm/arm/pic_if.m user/ngie/detangle-rc/sys/arm/include/katelib.h user/ngie/detangle-rc/sys/crypto/sha2/sha2.c user/ngie/detangle-rc/sys/crypto/sha2/sha2.h user/ngie/detangle-rc/sys/dev/etherswitch/mdio.c user/ngie/detangle-rc/sys/dev/etherswitch/mdio.h user/ngie/detangle-rc/sys/dev/etherswitch/mdio_if.m user/ngie/detangle-rc/sys/dev/ixgbe/LICENSE user/ngie/detangle-rc/sys/dev/ixgbe/README user/ngie/detangle-rc/tools/regression/lib/libc/nss/ user/ngie/detangle-rc/tools/regression/lib/libc/resolv/ user/ngie/detangle-rc/tools/regression/lib/msun/ user/ngie/detangle-rc/tools/regression/mac/ user/ngie/detangle-rc/usr.bin/kdump/mkioctls user/ngie/detangle-rc/usr.bin/kdump/utrace.c Modified: user/ngie/detangle-rc/MAINTAINERS (contents, props changed) user/ngie/detangle-rc/Makefile user/ngie/detangle-rc/Makefile.inc1 user/ngie/detangle-rc/ObsoleteFiles.inc user/ngie/detangle-rc/UPDATING user/ngie/detangle-rc/bin/ed/main.c user/ngie/detangle-rc/bin/pax/pat_rep.c user/ngie/detangle-rc/bin/sh/mknodes.c user/ngie/detangle-rc/bin/sh/tests/expansion/Makefile user/ngie/detangle-rc/bin/sh/var.c user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/zdb/zdb.c user/ngie/detangle-rc/cddl/sbin/zfs/Makefile user/ngie/detangle-rc/cddl/sbin/zpool/Makefile user/ngie/detangle-rc/cddl/usr.sbin/zdb/Makefile user/ngie/detangle-rc/cddl/usr.sbin/zhack/Makefile user/ngie/detangle-rc/contrib/binutils/bfd/elf32-arm.c user/ngie/detangle-rc/contrib/bmake/ChangeLog user/ngie/detangle-rc/contrib/bmake/Makefile user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog user/ngie/detangle-rc/contrib/bmake/mk/auto.obj.mk user/ngie/detangle-rc/contrib/bmake/mk/install-mk user/ngie/detangle-rc/contrib/bmake/os.sh user/ngie/detangle-rc/contrib/bmake/suff.c user/ngie/detangle-rc/contrib/bsnmp/snmpd/action.c user/ngie/detangle-rc/contrib/bsnmp/snmpd/main.c user/ngie/detangle-rc/contrib/bsnmp/snmpd/trap.c user/ngie/detangle-rc/contrib/gcc/config/rs6000/sysv4.h user/ngie/detangle-rc/contrib/libexecinfo/backtrace.3 user/ngie/detangle-rc/contrib/llvm/include/llvm-c/Core.h user/ngie/detangle-rc/contrib/llvm/include/llvm/CodeGen/CommandFlags.h user/ngie/detangle-rc/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.cpp user/ngie/detangle-rc/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp user/ngie/detangle-rc/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp user/ngie/detangle-rc/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp user/ngie/detangle-rc/contrib/llvm/lib/IR/AsmWriter.cpp user/ngie/detangle-rc/contrib/llvm/lib/IR/Core.cpp user/ngie/detangle-rc/contrib/llvm/lib/LTO/LTOCodeGenerator.cpp user/ngie/detangle-rc/contrib/llvm/lib/MC/MCContext.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.td user/ngie/detangle-rc/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/AMDGPU/SIISelLowering.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.h user/ngie/detangle-rc/contrib/llvm/lib/Target/AMDGPU/SIInstructions.td user/ngie/detangle-rc/contrib/llvm/lib/Target/AMDGPU/SIPrepareScratchRegs.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.h user/ngie/detangle-rc/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/BPF/BPFISelDAGToDAG.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/BPF/BPFISelLowering.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/BPF/BPFInstrInfo.td user/ngie/detangle-rc/contrib/llvm/lib/Target/BPF/BPFRegisterInfo.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/Mips/MipsISelLowering.h user/ngie/detangle-rc/contrib/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td user/ngie/detangle-rc/contrib/llvm/lib/Target/PowerPC/PPCInstrQPX.td user/ngie/detangle-rc/contrib/llvm/lib/Target/PowerPC/PPCInstrVSX.td user/ngie/detangle-rc/contrib/llvm/lib/Target/PowerPC/PPCVSXFMAMutate.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp user/ngie/detangle-rc/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp (contents, props changed) user/ngie/detangle-rc/contrib/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp user/ngie/detangle-rc/contrib/llvm/lib/Transforms/Scalar/GVN.cpp user/ngie/detangle-rc/contrib/llvm/lib/Transforms/Utils/Local.cpp user/ngie/detangle-rc/contrib/llvm/patches/README.TXT user/ngie/detangle-rc/contrib/llvm/tools/clang/lib/Basic/Targets.cpp user/ngie/detangle-rc/contrib/llvm/tools/clang/lib/Basic/Version.cpp user/ngie/detangle-rc/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp user/ngie/detangle-rc/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp user/ngie/detangle-rc/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp user/ngie/detangle-rc/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp user/ngie/detangle-rc/contrib/llvm/tools/lldb/docs/lldb.1 user/ngie/detangle-rc/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm64.cpp user/ngie/detangle-rc/contrib/llvm/tools/llvm-lto/llvm-lto.cpp user/ngie/detangle-rc/contrib/mdocml/lib.in user/ngie/detangle-rc/contrib/netbsd-tests/lib/libc/gen/t_assert.c user/ngie/detangle-rc/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh user/ngie/detangle-rc/contrib/netbsd-tests/usr.bin/grep/d_binary.out user/ngie/detangle-rc/contrib/netbsd-tests/usr.bin/grep/t_grep.sh user/ngie/detangle-rc/contrib/openbsm/INSTALL user/ngie/detangle-rc/contrib/openbsm/LICENSE user/ngie/detangle-rc/contrib/openbsm/Makefile.am user/ngie/detangle-rc/contrib/openbsm/Makefile.in user/ngie/detangle-rc/contrib/openbsm/NEWS user/ngie/detangle-rc/contrib/openbsm/README user/ngie/detangle-rc/contrib/openbsm/TODO user/ngie/detangle-rc/contrib/openbsm/VERSION user/ngie/detangle-rc/contrib/openbsm/autogen.sh user/ngie/detangle-rc/contrib/openbsm/bin/Makefile.am user/ngie/detangle-rc/contrib/openbsm/bin/audit/Makefile.am user/ngie/detangle-rc/contrib/openbsm/bin/audit/audit.8 user/ngie/detangle-rc/contrib/openbsm/bin/audit/audit.c user/ngie/detangle-rc/contrib/openbsm/bin/auditd/Makefile.am user/ngie/detangle-rc/contrib/openbsm/bin/auditd/audit_triggers.defs user/ngie/detangle-rc/contrib/openbsm/bin/auditd/audit_warn.c user/ngie/detangle-rc/contrib/openbsm/bin/auditd/auditd.8 user/ngie/detangle-rc/contrib/openbsm/bin/auditd/auditd.c user/ngie/detangle-rc/contrib/openbsm/bin/auditd/auditd.h user/ngie/detangle-rc/contrib/openbsm/bin/auditd/auditd_control.defs user/ngie/detangle-rc/contrib/openbsm/bin/auditd/auditd_darwin.c user/ngie/detangle-rc/contrib/openbsm/bin/auditd/auditd_fbsd.c user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/Makefile.am user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/auditdistd.8 user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/auditdistd.c user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/auditdistd.h user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/faccessat.h user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/fstatat.h user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/openat.h user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/parse.y user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/pjdlog.c user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/pjdlog.h user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/proto.c user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/proto.h user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/proto_common.c user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/proto_impl.h user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/proto_socketpair.c user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/proto_tcp.c user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/proto_tls.c user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/proto_uds.c user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/receiver.c user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/renameat.h user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/sandbox.c user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/sandbox.h user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/sender.c user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/sigtimedwait.h user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/strndup.h user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/subr.c user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/subr.h user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/synch.h user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/token.l user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/trail.c user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/trail.h user/ngie/detangle-rc/contrib/openbsm/bin/auditdistd/unlinkat.h user/ngie/detangle-rc/contrib/openbsm/bin/auditfilterd/Makefile.am user/ngie/detangle-rc/contrib/openbsm/bin/auditfilterd/auditfilterd.8 user/ngie/detangle-rc/contrib/openbsm/bin/auditfilterd/auditfilterd.c user/ngie/detangle-rc/contrib/openbsm/bin/auditfilterd/auditfilterd.h user/ngie/detangle-rc/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c user/ngie/detangle-rc/contrib/openbsm/bin/auditreduce/Makefile.am user/ngie/detangle-rc/contrib/openbsm/bin/auditreduce/auditreduce.1 user/ngie/detangle-rc/contrib/openbsm/bin/auditreduce/auditreduce.c user/ngie/detangle-rc/contrib/openbsm/bin/auditreduce/auditreduce.h user/ngie/detangle-rc/contrib/openbsm/bin/praudit/Makefile.am user/ngie/detangle-rc/contrib/openbsm/bin/praudit/praudit.1 user/ngie/detangle-rc/contrib/openbsm/bin/praudit/praudit.c user/ngie/detangle-rc/contrib/openbsm/bsm/Makefile.am user/ngie/detangle-rc/contrib/openbsm/bsm/audit_filter.h user/ngie/detangle-rc/contrib/openbsm/bsm/audit_uevents.h user/ngie/detangle-rc/contrib/openbsm/bsm/auditd_lib.h user/ngie/detangle-rc/contrib/openbsm/bsm/libbsm.h user/ngie/detangle-rc/contrib/openbsm/compat/clock_gettime.h user/ngie/detangle-rc/contrib/openbsm/compat/closefrom.h user/ngie/detangle-rc/contrib/openbsm/compat/compat.h user/ngie/detangle-rc/contrib/openbsm/compat/endian.h user/ngie/detangle-rc/contrib/openbsm/compat/endian_enc.h user/ngie/detangle-rc/contrib/openbsm/compat/flopen.h user/ngie/detangle-rc/contrib/openbsm/compat/pidfile.h user/ngie/detangle-rc/contrib/openbsm/compat/queue.h user/ngie/detangle-rc/contrib/openbsm/compat/strlcat.h user/ngie/detangle-rc/contrib/openbsm/compat/strlcpy.h user/ngie/detangle-rc/contrib/openbsm/config/config.h user/ngie/detangle-rc/contrib/openbsm/configure user/ngie/detangle-rc/contrib/openbsm/configure.ac user/ngie/detangle-rc/contrib/openbsm/etc/audit_class user/ngie/detangle-rc/contrib/openbsm/etc/audit_control user/ngie/detangle-rc/contrib/openbsm/etc/audit_event user/ngie/detangle-rc/contrib/openbsm/etc/audit_filter user/ngie/detangle-rc/contrib/openbsm/etc/audit_user user/ngie/detangle-rc/contrib/openbsm/etc/audit_warn user/ngie/detangle-rc/contrib/openbsm/libauditd/Makefile.am user/ngie/detangle-rc/contrib/openbsm/libauditd/auditd_lib.c user/ngie/detangle-rc/contrib/openbsm/libauditd/libauditd.3 user/ngie/detangle-rc/contrib/openbsm/libbsm/Makefile.am user/ngie/detangle-rc/contrib/openbsm/libbsm/Makefile.in user/ngie/detangle-rc/contrib/openbsm/libbsm/au_class.3 user/ngie/detangle-rc/contrib/openbsm/libbsm/au_control.3 user/ngie/detangle-rc/contrib/openbsm/libbsm/au_domain.3 user/ngie/detangle-rc/contrib/openbsm/libbsm/au_errno.3 user/ngie/detangle-rc/contrib/openbsm/libbsm/au_event.3 user/ngie/detangle-rc/contrib/openbsm/libbsm/au_fcntl_cmd.3 user/ngie/detangle-rc/contrib/openbsm/libbsm/au_free_token.3 user/ngie/detangle-rc/contrib/openbsm/libbsm/au_io.3 user/ngie/detangle-rc/contrib/openbsm/libbsm/au_mask.3 user/ngie/detangle-rc/contrib/openbsm/libbsm/au_open.3 user/ngie/detangle-rc/contrib/openbsm/libbsm/au_socket_type.3 user/ngie/detangle-rc/contrib/openbsm/libbsm/au_token.3 user/ngie/detangle-rc/contrib/openbsm/libbsm/au_user.3 user/ngie/detangle-rc/contrib/openbsm/libbsm/audit_submit.3 user/ngie/detangle-rc/contrib/openbsm/libbsm/bsm_audit.c user/ngie/detangle-rc/contrib/openbsm/libbsm/bsm_class.c user/ngie/detangle-rc/contrib/openbsm/libbsm/bsm_control.c user/ngie/detangle-rc/contrib/openbsm/libbsm/bsm_domain.c user/ngie/detangle-rc/contrib/openbsm/libbsm/bsm_errno.c user/ngie/detangle-rc/contrib/openbsm/libbsm/bsm_event.c user/ngie/detangle-rc/contrib/openbsm/libbsm/bsm_fcntl.c user/ngie/detangle-rc/contrib/openbsm/libbsm/bsm_flags.c user/ngie/detangle-rc/contrib/openbsm/libbsm/bsm_io.c user/ngie/detangle-rc/contrib/openbsm/libbsm/bsm_mask.c user/ngie/detangle-rc/contrib/openbsm/libbsm/bsm_notify.c user/ngie/detangle-rc/contrib/openbsm/libbsm/bsm_socket_type.c user/ngie/detangle-rc/contrib/openbsm/libbsm/bsm_token.c user/ngie/detangle-rc/contrib/openbsm/libbsm/bsm_user.c user/ngie/detangle-rc/contrib/openbsm/libbsm/bsm_wrappers.c user/ngie/detangle-rc/contrib/openbsm/libbsm/libbsm.3 user/ngie/detangle-rc/contrib/openbsm/man/Makefile.am user/ngie/detangle-rc/contrib/openbsm/man/Makefile.in user/ngie/detangle-rc/contrib/openbsm/man/audit.2 user/ngie/detangle-rc/contrib/openbsm/man/audit.log.5 user/ngie/detangle-rc/contrib/openbsm/man/audit_class.5 user/ngie/detangle-rc/contrib/openbsm/man/audit_control.5 user/ngie/detangle-rc/contrib/openbsm/man/audit_event.5 user/ngie/detangle-rc/contrib/openbsm/man/audit_user.5 user/ngie/detangle-rc/contrib/openbsm/man/audit_warn.5 user/ngie/detangle-rc/contrib/openbsm/man/auditctl.2 user/ngie/detangle-rc/contrib/openbsm/man/auditon.2 user/ngie/detangle-rc/contrib/openbsm/man/getaudit.2 user/ngie/detangle-rc/contrib/openbsm/man/getauid.2 user/ngie/detangle-rc/contrib/openbsm/man/setaudit.2 user/ngie/detangle-rc/contrib/openbsm/man/setauid.2 user/ngie/detangle-rc/contrib/openbsm/modules/Makefile.am user/ngie/detangle-rc/contrib/openbsm/modules/auditfilter_noop/Makefile.am user/ngie/detangle-rc/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c user/ngie/detangle-rc/contrib/openbsm/sys/Makefile.am user/ngie/detangle-rc/contrib/openbsm/sys/bsm/Makefile.am user/ngie/detangle-rc/contrib/openbsm/sys/bsm/audit.h user/ngie/detangle-rc/contrib/openbsm/sys/bsm/audit_domain.h user/ngie/detangle-rc/contrib/openbsm/sys/bsm/audit_errno.h user/ngie/detangle-rc/contrib/openbsm/sys/bsm/audit_fcntl.h user/ngie/detangle-rc/contrib/openbsm/sys/bsm/audit_internal.h user/ngie/detangle-rc/contrib/openbsm/sys/bsm/audit_kevents.h user/ngie/detangle-rc/contrib/openbsm/sys/bsm/audit_record.h user/ngie/detangle-rc/contrib/openbsm/sys/bsm/audit_socket_type.h user/ngie/detangle-rc/contrib/openbsm/test/Makefile.am user/ngie/detangle-rc/contrib/openbsm/test/bsm/Makefile.am user/ngie/detangle-rc/contrib/openbsm/test/bsm/generate.c user/ngie/detangle-rc/contrib/openbsm/tools/Makefile.am user/ngie/detangle-rc/contrib/openbsm/tools/audump.c user/ngie/detangle-rc/contrib/smbfs/README user/ngie/detangle-rc/contrib/smbfs/lib/smb/nb_name.c user/ngie/detangle-rc/contrib/unbound/Makefile.in user/ngie/detangle-rc/contrib/unbound/acx_nlnetlabs.m4 user/ngie/detangle-rc/contrib/unbound/compat/arc4random.c user/ngie/detangle-rc/contrib/unbound/compat/getentropy_linux.c user/ngie/detangle-rc/contrib/unbound/compat/getentropy_solaris.c user/ngie/detangle-rc/contrib/unbound/compat/reallocarray.c user/ngie/detangle-rc/contrib/unbound/compat/sha512.c user/ngie/detangle-rc/contrib/unbound/compat/snprintf.c user/ngie/detangle-rc/contrib/unbound/config.h user/ngie/detangle-rc/contrib/unbound/config.h.in user/ngie/detangle-rc/contrib/unbound/configure user/ngie/detangle-rc/contrib/unbound/configure.ac user/ngie/detangle-rc/contrib/unbound/daemon/remote.c user/ngie/detangle-rc/contrib/unbound/daemon/unbound.c user/ngie/detangle-rc/contrib/unbound/daemon/worker.c user/ngie/detangle-rc/contrib/unbound/dns64/dns64.c user/ngie/detangle-rc/contrib/unbound/dnstap/dnstap.proto user/ngie/detangle-rc/contrib/unbound/doc/Changelog user/ngie/detangle-rc/contrib/unbound/doc/README user/ngie/detangle-rc/contrib/unbound/doc/example.conf user/ngie/detangle-rc/contrib/unbound/doc/example.conf.in user/ngie/detangle-rc/contrib/unbound/doc/libunbound.3 user/ngie/detangle-rc/contrib/unbound/doc/libunbound.3.in user/ngie/detangle-rc/contrib/unbound/doc/unbound-anchor.8 user/ngie/detangle-rc/contrib/unbound/doc/unbound-anchor.8.in user/ngie/detangle-rc/contrib/unbound/doc/unbound-checkconf.8 user/ngie/detangle-rc/contrib/unbound/doc/unbound-checkconf.8.in user/ngie/detangle-rc/contrib/unbound/doc/unbound-control.8 user/ngie/detangle-rc/contrib/unbound/doc/unbound-control.8.in user/ngie/detangle-rc/contrib/unbound/doc/unbound-host.1 user/ngie/detangle-rc/contrib/unbound/doc/unbound-host.1.in user/ngie/detangle-rc/contrib/unbound/doc/unbound.8 user/ngie/detangle-rc/contrib/unbound/doc/unbound.8.in user/ngie/detangle-rc/contrib/unbound/doc/unbound.conf.5 user/ngie/detangle-rc/contrib/unbound/doc/unbound.conf.5.in user/ngie/detangle-rc/contrib/unbound/iterator/iter_scrub.c user/ngie/detangle-rc/contrib/unbound/iterator/iter_utils.c user/ngie/detangle-rc/contrib/unbound/iterator/iterator.c user/ngie/detangle-rc/contrib/unbound/iterator/iterator.h user/ngie/detangle-rc/contrib/unbound/libunbound/libunbound.c user/ngie/detangle-rc/contrib/unbound/libunbound/python/Makefile user/ngie/detangle-rc/contrib/unbound/libunbound/python/doc/install.rst user/ngie/detangle-rc/contrib/unbound/libunbound/python/doc/modules/unbound.rst user/ngie/detangle-rc/contrib/unbound/libunbound/python/examples/dnssec-valid.py user/ngie/detangle-rc/contrib/unbound/libunbound/python/libunbound.i user/ngie/detangle-rc/contrib/unbound/ltmain.sh user/ngie/detangle-rc/contrib/unbound/services/cache/dns.c user/ngie/detangle-rc/contrib/unbound/services/cache/rrset.c user/ngie/detangle-rc/contrib/unbound/sldns/parseutil.h user/ngie/detangle-rc/contrib/unbound/sldns/wire2str.c user/ngie/detangle-rc/contrib/unbound/smallapp/unbound-anchor.c user/ngie/detangle-rc/contrib/unbound/smallapp/unbound-checkconf.c user/ngie/detangle-rc/contrib/unbound/smallapp/unbound-control-setup.sh user/ngie/detangle-rc/contrib/unbound/smallapp/unbound-control-setup.sh.in user/ngie/detangle-rc/contrib/unbound/smallapp/unbound-control.c user/ngie/detangle-rc/contrib/unbound/util/config_file.c user/ngie/detangle-rc/contrib/unbound/util/config_file.h user/ngie/detangle-rc/contrib/unbound/util/configlexer.lex user/ngie/detangle-rc/contrib/unbound/util/configparser.y user/ngie/detangle-rc/contrib/unbound/util/iana_ports.inc user/ngie/detangle-rc/contrib/unbound/util/locks.c user/ngie/detangle-rc/contrib/unbound/util/net_help.c user/ngie/detangle-rc/contrib/unbound/util/random.c user/ngie/detangle-rc/contrib/unbound/util/rbtree.c user/ngie/detangle-rc/contrib/unbound/util/rtt.h user/ngie/detangle-rc/contrib/unbound/util/storage/lookup3.c user/ngie/detangle-rc/contrib/unbound/util/tube.h user/ngie/detangle-rc/contrib/unbound/util/winsock_event.h user/ngie/detangle-rc/contrib/unbound/validator/autotrust.c user/ngie/detangle-rc/contrib/unbound/validator/val_neg.c user/ngie/detangle-rc/contrib/unbound/validator/val_neg.h user/ngie/detangle-rc/contrib/unbound/validator/val_nsec.c user/ngie/detangle-rc/contrib/unbound/validator/val_nsec.h user/ngie/detangle-rc/contrib/unbound/validator/val_nsec3.c user/ngie/detangle-rc/contrib/unbound/validator/val_nsec3.h user/ngie/detangle-rc/contrib/unbound/validator/val_secalgo.c user/ngie/detangle-rc/contrib/unbound/validator/val_secalgo.h user/ngie/detangle-rc/contrib/unbound/validator/val_sigcrypt.c user/ngie/detangle-rc/contrib/unbound/validator/val_utils.h user/ngie/detangle-rc/contrib/unbound/validator/validator.c user/ngie/detangle-rc/crypto/openssh/digest-libc.c user/ngie/detangle-rc/etc/defaults/rc.conf user/ngie/detangle-rc/etc/mtree/BSD.debug.dist user/ngie/detangle-rc/etc/mtree/BSD.tests.dist user/ngie/detangle-rc/etc/mtree/BSD.usr.dist user/ngie/detangle-rc/etc/periodic/daily/800.scrub-zfs user/ngie/detangle-rc/etc/rc.d/NETWORKING user/ngie/detangle-rc/etc/rc.d/jail user/ngie/detangle-rc/etc/rc.d/netwait user/ngie/detangle-rc/etc/services user/ngie/detangle-rc/gnu/usr.bin/binutils/ld/Makefile user/ngie/detangle-rc/include/netdb.h user/ngie/detangle-rc/include/resolv.h user/ngie/detangle-rc/include/search.h user/ngie/detangle-rc/lib/Makefile user/ngie/detangle-rc/lib/clang/include/Makefile user/ngie/detangle-rc/lib/clang/include/clang/Basic/Version.inc user/ngie/detangle-rc/lib/clang/include/clang/Config/config.h user/ngie/detangle-rc/lib/clang/include/llvm/Config/config.h user/ngie/detangle-rc/lib/clang/include/llvm/Config/llvm-config.h user/ngie/detangle-rc/lib/lib80211/lib80211.3 user/ngie/detangle-rc/lib/libbsm/Makefile user/ngie/detangle-rc/lib/libc/Makefile user/ngie/detangle-rc/lib/libc/arm/sys/__vdso_gettc.c user/ngie/detangle-rc/lib/libc/gen/getpeereid.c user/ngie/detangle-rc/lib/libc/gen/lockf.c user/ngie/detangle-rc/lib/libc/gen/nlist.c user/ngie/detangle-rc/lib/libc/gen/sysconf.c user/ngie/detangle-rc/lib/libc/iconv/citrus_mmap.c user/ngie/detangle-rc/lib/libc/net/getaddrinfo.3 user/ngie/detangle-rc/lib/libc/net/getaddrinfo.c user/ngie/detangle-rc/lib/libc/net/gethostbynis.c user/ngie/detangle-rc/lib/libc/net/map_v4v6.c user/ngie/detangle-rc/lib/libc/net/name6.c user/ngie/detangle-rc/lib/libc/net/netdb_private.h user/ngie/detangle-rc/lib/libc/net/rcmdsh.c user/ngie/detangle-rc/lib/libc/resolv/res_init.c user/ngie/detangle-rc/lib/libc/resolv/res_mkquery.c user/ngie/detangle-rc/lib/libc/resolv/res_mkupdate.c user/ngie/detangle-rc/lib/libc/resolv/res_private.h user/ngie/detangle-rc/lib/libc/resolv/res_query.c user/ngie/detangle-rc/lib/libc/resolv/res_send.c user/ngie/detangle-rc/lib/libc/resolv/res_state.c user/ngie/detangle-rc/lib/libc/stdio/findfp.c user/ngie/detangle-rc/lib/libc/stdlib/Makefile.inc user/ngie/detangle-rc/lib/libc/stdlib/hcreate.3 user/ngie/detangle-rc/lib/libc/stdlib/tdelete.c user/ngie/detangle-rc/lib/libc/stdlib/tsearch.3 user/ngie/detangle-rc/lib/libc/stdlib/tsearch.c user/ngie/detangle-rc/lib/libc/sys/brk.2 user/ngie/detangle-rc/lib/libc/sys/clock_gettime.2 user/ngie/detangle-rc/lib/libc/sys/getgid.2 user/ngie/detangle-rc/lib/libc/sys/getpid.2 user/ngie/detangle-rc/lib/libc/sys/gettimeofday.2 user/ngie/detangle-rc/lib/libc/sys/getuid.2 user/ngie/detangle-rc/lib/libc/sys/read.2 user/ngie/detangle-rc/lib/libc/sys/setuid.2 user/ngie/detangle-rc/lib/libc/sys/utrace.2 user/ngie/detangle-rc/lib/libc/sys/write.2 user/ngie/detangle-rc/lib/libc/tests/Makefile user/ngie/detangle-rc/lib/libc/tests/stdlib/Makefile user/ngie/detangle-rc/lib/libclang_rt/Makefile.inc user/ngie/detangle-rc/lib/libcrypt/Makefile user/ngie/detangle-rc/lib/libcuse/cuse_lib.c user/ngie/detangle-rc/lib/libfetch/http.c user/ngie/detangle-rc/lib/libmd/Makefile user/ngie/detangle-rc/lib/libmd/sha512.3 user/ngie/detangle-rc/lib/libmd/shadriver.c user/ngie/detangle-rc/lib/libstand/Makefile user/ngie/detangle-rc/lib/libstand/bootp.c user/ngie/detangle-rc/lib/libstand/tftp.c user/ngie/detangle-rc/lib/libthr/thread/thr_fork.c user/ngie/detangle-rc/lib/libthr/thread/thr_init.c user/ngie/detangle-rc/lib/libthr/thread/thr_private.h user/ngie/detangle-rc/lib/msun/tests/Makefile user/ngie/detangle-rc/libexec/rtld-elf/arm/reloc.c user/ngie/detangle-rc/libexec/rtld-elf/rtld.c user/ngie/detangle-rc/sbin/gbde/Makefile user/ngie/detangle-rc/sbin/gbde/gbde.c user/ngie/detangle-rc/sbin/geom/class/eli/Makefile user/ngie/detangle-rc/sbin/ifconfig/Makefile user/ngie/detangle-rc/sbin/ifconfig/sfp.c user/ngie/detangle-rc/sbin/md5/Makefile user/ngie/detangle-rc/sbin/md5/md5.1 user/ngie/detangle-rc/sbin/md5/md5.c user/ngie/detangle-rc/sbin/mount/mount.c user/ngie/detangle-rc/sbin/reboot/reboot.8 user/ngie/detangle-rc/sbin/reboot/reboot.c user/ngie/detangle-rc/sbin/umount/umount.c user/ngie/detangle-rc/secure/lib/libcrypto/engines/Makefile user/ngie/detangle-rc/share/colldef/Makefile user/ngie/detangle-rc/share/ctypedef/Makefile user/ngie/detangle-rc/share/examples/tests/tests/atf/printf_test.c user/ngie/detangle-rc/share/man/man4/Makefile user/ngie/detangle-rc/share/man/man4/aesni.4 user/ngie/detangle-rc/share/man/man4/blackhole.4 user/ngie/detangle-rc/share/man/man4/crypto.4 user/ngie/detangle-rc/share/man/man4/dtrace_io.4 user/ngie/detangle-rc/share/man/man4/dtrace_ip.4 user/ngie/detangle-rc/share/man/man4/dtrace_tcp.4 user/ngie/detangle-rc/share/man/man4/dtrace_udp.4 user/ngie/detangle-rc/share/man/man4/ioat.4 user/ngie/detangle-rc/share/man/man4/mlx5en.4 user/ngie/detangle-rc/share/man/man4/netmap.4 user/ngie/detangle-rc/share/man/man4/pass.4 user/ngie/detangle-rc/share/man/man5/procfs.5 user/ngie/detangle-rc/share/man/man5/src.conf.5 user/ngie/detangle-rc/share/man/man9/Makefile user/ngie/detangle-rc/share/man/man9/VOP_GETPAGES.9 user/ngie/detangle-rc/share/man/man9/pci.9 user/ngie/detangle-rc/share/man/man9/zone.9 user/ngie/detangle-rc/share/misc/committers-ports.dot user/ngie/detangle-rc/share/misc/organization.dot user/ngie/detangle-rc/share/mk/bsd.README user/ngie/detangle-rc/share/mk/bsd.lib.mk user/ngie/detangle-rc/share/mk/bsd.libnames.mk user/ngie/detangle-rc/share/mk/bsd.snmpmod.mk user/ngie/detangle-rc/share/mk/bsd.test.mk user/ngie/detangle-rc/share/mk/local.dirdeps.mk user/ngie/detangle-rc/share/mk/src.libnames.mk user/ngie/detangle-rc/share/mk/src.opts.mk user/ngie/detangle-rc/share/mk/suite.test.mk user/ngie/detangle-rc/share/mk/sys.mk user/ngie/detangle-rc/share/mk/tap.test.mk user/ngie/detangle-rc/share/monetdef/Makefile user/ngie/detangle-rc/share/msgdef/Makefile user/ngie/detangle-rc/share/numericdef/Makefile user/ngie/detangle-rc/share/timedef/Makefile user/ngie/detangle-rc/share/timedef/ja_JP.SJIS.src user/ngie/detangle-rc/share/timedef/ja_JP.UTF-8.src user/ngie/detangle-rc/share/timedef/ja_JP.eucJP.src user/ngie/detangle-rc/sys/amd64/amd64/initcpu.c user/ngie/detangle-rc/sys/amd64/amd64/machdep.c user/ngie/detangle-rc/sys/amd64/include/cputypes.h user/ngie/detangle-rc/sys/amd64/include/md_var.h user/ngie/detangle-rc/sys/arm/allwinner/a10_mmc.c user/ngie/detangle-rc/sys/arm/allwinner/a20/a20_mp.c user/ngie/detangle-rc/sys/arm/altera/socfpga/socfpga_mp.c user/ngie/detangle-rc/sys/arm/amlogic/aml8726/aml8726_mmc.c user/ngie/detangle-rc/sys/arm/amlogic/aml8726/aml8726_mp.c user/ngie/detangle-rc/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c user/ngie/detangle-rc/sys/arm/annapurna/alpine/alpine_machdep_mp.c user/ngie/detangle-rc/sys/arm/arm/exception.S user/ngie/detangle-rc/sys/arm/arm/gic.c user/ngie/detangle-rc/sys/arm/arm/intr.c user/ngie/detangle-rc/sys/arm/arm/locore-v4.S user/ngie/detangle-rc/sys/arm/arm/mp_machdep.c user/ngie/detangle-rc/sys/arm/arm/nexus.c user/ngie/detangle-rc/sys/arm/arm/pmap-v6-new.c user/ngie/detangle-rc/sys/arm/arm/trap.c user/ngie/detangle-rc/sys/arm/at91/at91_mci.c user/ngie/detangle-rc/sys/arm/at91/std.bwct user/ngie/detangle-rc/sys/arm/at91/std.eb9200 user/ngie/detangle-rc/sys/arm/at91/std.ethernut5 user/ngie/detangle-rc/sys/arm/at91/std.hl200 user/ngie/detangle-rc/sys/arm/at91/std.hl201 user/ngie/detangle-rc/sys/arm/at91/std.kb920x user/ngie/detangle-rc/sys/arm/at91/std.qila9g20 user/ngie/detangle-rc/sys/arm/at91/std.sam9260ek user/ngie/detangle-rc/sys/arm/at91/std.sam9g20ek user/ngie/detangle-rc/sys/arm/at91/std.sam9x25ek user/ngie/detangle-rc/sys/arm/at91/std.sn9g45 user/ngie/detangle-rc/sys/arm/at91/std.tsc4370 user/ngie/detangle-rc/sys/arm/broadcom/bcm2835/bcm2835_fbd.c user/ngie/detangle-rc/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c user/ngie/detangle-rc/sys/arm/cavium/cns11xx/std.econa user/ngie/detangle-rc/sys/arm/conf/ATMEL user/ngie/detangle-rc/sys/arm/conf/CNS11XXNAS user/ngie/detangle-rc/sys/arm/conf/CRB user/ngie/detangle-rc/sys/arm/conf/GUMSTIX user/ngie/detangle-rc/sys/arm/conf/IMX6 user/ngie/detangle-rc/sys/arm/conf/NOTES user/ngie/detangle-rc/sys/arm/conf/NSLU user/ngie/detangle-rc/sys/arm/conf/SAM9260EK user/ngie/detangle-rc/sys/arm/conf/SAM9G20EK user/ngie/detangle-rc/sys/arm/freescale/imx/files.imx6 user/ngie/detangle-rc/sys/arm/freescale/imx/imx6_ccm.c user/ngie/detangle-rc/sys/arm/freescale/imx/imx6_ccmreg.h user/ngie/detangle-rc/sys/arm/freescale/imx/imx6_mp.c user/ngie/detangle-rc/sys/arm/freescale/imx/imx_ccmvar.h user/ngie/detangle-rc/sys/arm/freescale/imx/imx_gpio.c user/ngie/detangle-rc/sys/arm/freescale/imx/imx_sdhci.c user/ngie/detangle-rc/sys/arm/include/cpufunc.h user/ngie/detangle-rc/sys/arm/include/intr.h user/ngie/detangle-rc/sys/arm/include/ofw_machdep.h user/ngie/detangle-rc/sys/arm/include/pmap-v6.h user/ngie/detangle-rc/sys/arm/include/smp.h user/ngie/detangle-rc/sys/arm/lpc/lpc_mmc.c user/ngie/detangle-rc/sys/arm/lpc/std.lpc user/ngie/detangle-rc/sys/arm/mv/discovery/std.db78xxx user/ngie/detangle-rc/sys/arm/mv/kirkwood/std.kirkwood user/ngie/detangle-rc/sys/arm/mv/orion/std.db88f5xxx user/ngie/detangle-rc/sys/arm/mv/orion/std.ts7800 user/ngie/detangle-rc/sys/arm/qemu/virt_mp.c user/ngie/detangle-rc/sys/arm/rockchip/rk30xx_mp.c user/ngie/detangle-rc/sys/arm/samsung/exynos/exynos5_mp.c user/ngie/detangle-rc/sys/arm/ti/aintc.c user/ngie/detangle-rc/sys/arm/ti/omap4/omap4_mp.c user/ngie/detangle-rc/sys/arm/ti/ti_sdhci.c user/ngie/detangle-rc/sys/arm/xilinx/zy7_mp.c user/ngie/detangle-rc/sys/arm/xscale/i80321/ep80219_machdep.c user/ngie/detangle-rc/sys/arm/xscale/i80321/iq31244_machdep.c user/ngie/detangle-rc/sys/arm/xscale/i8134x/crb_machdep.c user/ngie/detangle-rc/sys/arm/xscale/ixp425/avila_machdep.c user/ngie/detangle-rc/sys/arm/xscale/ixp425/std.avila user/ngie/detangle-rc/sys/arm/xscale/pxa/pxa_machdep.c user/ngie/detangle-rc/sys/arm64/arm64/exception.S user/ngie/detangle-rc/sys/arm64/arm64/gic.c user/ngie/detangle-rc/sys/arm64/include/ofw_machdep.h user/ngie/detangle-rc/sys/arm64/include/setjmp.h user/ngie/detangle-rc/sys/boot/efi/boot1/boot1.c user/ngie/detangle-rc/sys/boot/efi/loader/Makefile user/ngie/detangle-rc/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c user/ngie/detangle-rc/sys/boot/efi/loader/arch/amd64/framebuffer.c user/ngie/detangle-rc/sys/boot/efi/loader/arch/arm/exec.c user/ngie/detangle-rc/sys/boot/efi/loader/arch/arm64/exec.c user/ngie/detangle-rc/sys/boot/efi/loader/bootinfo.c user/ngie/detangle-rc/sys/boot/efi/loader/devicename.c user/ngie/detangle-rc/sys/boot/efi/loader/loader_efi.h user/ngie/detangle-rc/sys/boot/efi/loader/main.c user/ngie/detangle-rc/sys/boot/i386/libi386/biosmem.c user/ngie/detangle-rc/sys/boot/i386/libi386/libi386.h user/ngie/detangle-rc/sys/boot/i386/libi386/pxe.c user/ngie/detangle-rc/sys/boot/i386/loader/main.c user/ngie/detangle-rc/sys/boot/i386/zfsboot/zfsboot.c user/ngie/detangle-rc/sys/boot/libstand32/Makefile user/ngie/detangle-rc/sys/boot/pc98/boot2/boot2.c user/ngie/detangle-rc/sys/boot/pc98/libpc98/biosdisk.c user/ngie/detangle-rc/sys/boot/uboot/common/main.c user/ngie/detangle-rc/sys/bsm/audit.h user/ngie/detangle-rc/sys/bsm/audit_domain.h user/ngie/detangle-rc/sys/bsm/audit_errno.h user/ngie/detangle-rc/sys/bsm/audit_fcntl.h user/ngie/detangle-rc/sys/bsm/audit_internal.h user/ngie/detangle-rc/sys/bsm/audit_kevents.h user/ngie/detangle-rc/sys/bsm/audit_record.h user/ngie/detangle-rc/sys/bsm/audit_socket_type.h user/ngie/detangle-rc/sys/cam/ctl/ctl.c user/ngie/detangle-rc/sys/cam/ctl/ctl_backend_block.c user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/ngie/detangle-rc/sys/cddl/dev/dtrace/dtrace_cddl.h user/ngie/detangle-rc/sys/cddl/dev/fbt/arm/fbt_isa.c user/ngie/detangle-rc/sys/cddl/dev/systrace/systrace.c user/ngie/detangle-rc/sys/compat/linux/linux_dtrace.h user/ngie/detangle-rc/sys/compat/linux/linux_futex.c user/ngie/detangle-rc/sys/compat/linux/linux_timer.c user/ngie/detangle-rc/sys/compat/linuxkpi/common/include/linux/compiler.h user/ngie/detangle-rc/sys/compat/linuxkpi/common/include/linux/kobject.h user/ngie/detangle-rc/sys/compat/linuxkpi/common/include/linux/workqueue.h user/ngie/detangle-rc/sys/compat/linuxkpi/common/src/linux_compat.c user/ngie/detangle-rc/sys/conf/files user/ngie/detangle-rc/sys/conf/files.arm user/ngie/detangle-rc/sys/conf/files.mips user/ngie/detangle-rc/sys/conf/files.powerpc user/ngie/detangle-rc/sys/conf/kmod.mk user/ngie/detangle-rc/sys/conf/options user/ngie/detangle-rc/sys/conf/options.arm user/ngie/detangle-rc/sys/conf/options.mips user/ngie/detangle-rc/sys/contrib/ipfilter/netinet/ip_nat.c user/ngie/detangle-rc/sys/crypto/sha2/sha256.h user/ngie/detangle-rc/sys/dev/atkbdc/psm.c user/ngie/detangle-rc/sys/dev/bxe/bxe.c user/ngie/detangle-rc/sys/dev/bxe/bxe.h user/ngie/detangle-rc/sys/dev/bxe/bxe_stats.c user/ngie/detangle-rc/sys/dev/bxe/bxe_stats.h user/ngie/detangle-rc/sys/dev/bxe/ecore_init.h user/ngie/detangle-rc/sys/dev/cxgbe/adapter.h user/ngie/detangle-rc/sys/dev/cxgbe/offload.h user/ngie/detangle-rc/sys/dev/cxgbe/t4_main.c user/ngie/detangle-rc/sys/dev/cxgbe/tom/t4_cpl_io.c user/ngie/detangle-rc/sys/dev/cxgbe/tom/t4_ddp.c user/ngie/detangle-rc/sys/dev/cxgbe/tom/t4_tom.c user/ngie/detangle-rc/sys/dev/cxgbe/tom/t4_tom.h user/ngie/detangle-rc/sys/dev/drm2/i915/i915_gem.c user/ngie/detangle-rc/sys/dev/drm2/i915/intel_iic.c user/ngie/detangle-rc/sys/dev/drm2/ttm/ttm_bo.c user/ngie/detangle-rc/sys/dev/drm2/ttm/ttm_page_alloc.c user/ngie/detangle-rc/sys/dev/drm2/ttm/ttm_tt.c user/ngie/detangle-rc/sys/dev/e1000/if_igb.c user/ngie/detangle-rc/sys/dev/e1000/if_igb.h user/ngie/detangle-rc/sys/dev/etherswitch/arswitch/arswitch.c user/ngie/detangle-rc/sys/dev/etherswitch/arswitch/arswitch_7240.c user/ngie/detangle-rc/sys/dev/etherswitch/arswitch/arswitch_8216.c user/ngie/detangle-rc/sys/dev/etherswitch/arswitch/arswitch_8226.c user/ngie/detangle-rc/sys/dev/etherswitch/arswitch/arswitch_8316.c user/ngie/detangle-rc/sys/dev/etherswitch/arswitch/arswitch_8327.c user/ngie/detangle-rc/sys/dev/etherswitch/arswitch/arswitch_9340.c user/ngie/detangle-rc/sys/dev/etherswitch/arswitch/arswitch_phy.c user/ngie/detangle-rc/sys/dev/etherswitch/arswitch/arswitch_reg.c user/ngie/detangle-rc/sys/dev/etherswitch/e6000sw/e6000sw.c user/ngie/detangle-rc/sys/dev/etherswitch/ip17x/ip17x.c user/ngie/detangle-rc/sys/dev/etherswitch/ukswitch/ukswitch.c user/ngie/detangle-rc/sys/dev/hyperv/include/hyperv.h user/ngie/detangle-rc/sys/dev/hyperv/utilities/hv_kvp.c user/ngie/detangle-rc/sys/dev/hyperv/vmbus/hv_channel_mgmt.c user/ngie/detangle-rc/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c user/ngie/detangle-rc/sys/dev/hyperv/vmbus/hv_vmbus_priv.h user/ngie/detangle-rc/sys/dev/if_ndis/if_ndis_pci.c user/ngie/detangle-rc/sys/dev/ioat/ioat.c user/ngie/detangle-rc/sys/dev/ioat/ioat.h user/ngie/detangle-rc/sys/dev/ioat/ioat_hw.h user/ngie/detangle-rc/sys/dev/ioat/ioat_internal.h user/ngie/detangle-rc/sys/dev/ioat/ioat_test.c user/ngie/detangle-rc/sys/dev/ioat/ioat_test.h user/ngie/detangle-rc/sys/dev/isci/scil/scic_sds_phy.h user/ngie/detangle-rc/sys/dev/iscsi/iscsi.c user/ngie/detangle-rc/sys/dev/isp/isp.c user/ngie/detangle-rc/sys/dev/isp/isp_freebsd.c user/ngie/detangle-rc/sys/dev/isp/isp_freebsd.h user/ngie/detangle-rc/sys/dev/isp/isp_library.c user/ngie/detangle-rc/sys/dev/isp/isp_library.h user/ngie/detangle-rc/sys/dev/isp/isp_pci.c user/ngie/detangle-rc/sys/dev/isp/isp_sbus.c user/ngie/detangle-rc/sys/dev/isp/isp_target.c user/ngie/detangle-rc/sys/dev/isp/ispmbox.h user/ngie/detangle-rc/sys/dev/isp/ispvar.h user/ngie/detangle-rc/sys/dev/ixgbe/if_ix.c user/ngie/detangle-rc/sys/dev/ixgbe/if_ixv.c user/ngie/detangle-rc/sys/dev/ixgbe/ix_txrx.c user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe.h user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe_82598.c user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe_82599.c user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe_api.c user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe_api.h user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe_common.c user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe_dcb.c user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe_osdep.h user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe_phy.c user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe_phy.h user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe_type.h user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe_vf.c user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe_x540.c user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe_x550.c user/ngie/detangle-rc/sys/dev/ixgbe/ixgbe_x550.h user/ngie/detangle-rc/sys/dev/md/md.c user/ngie/detangle-rc/sys/dev/mge/if_mge.c user/ngie/detangle-rc/sys/dev/mlx5/device.h user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/en.h user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_main.c user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c user/ngie/detangle-rc/sys/dev/mmc/bridge.h user/ngie/detangle-rc/sys/dev/mmc/host/dwmmc.c user/ngie/detangle-rc/sys/dev/mmc/mmc.c user/ngie/detangle-rc/sys/dev/mpr/mpr_sas_lsi.c user/ngie/detangle-rc/sys/dev/mps/mps_sas_lsi.c user/ngie/detangle-rc/sys/dev/nand/nand_cdev.c user/ngie/detangle-rc/sys/dev/nand/nand_geom.c user/ngie/detangle-rc/sys/dev/netmap/netmap.c user/ngie/detangle-rc/sys/dev/ofw/ofw_bus_subr.c user/ngie/detangle-rc/sys/dev/ofw/ofw_bus_subr.h user/ngie/detangle-rc/sys/dev/ofw/openfirm.h user/ngie/detangle-rc/sys/dev/pci/pci.c user/ngie/detangle-rc/sys/dev/pci/pci_host_generic.c user/ngie/detangle-rc/sys/dev/pci/pci_if.m user/ngie/detangle-rc/sys/dev/pci/pci_private.h user/ngie/detangle-rc/sys/dev/pci/pcivar.h user/ngie/detangle-rc/sys/dev/puc/pucdata.c user/ngie/detangle-rc/sys/dev/random/build.sh user/ngie/detangle-rc/sys/dev/random/fortuna.c user/ngie/detangle-rc/sys/dev/random/hash.c user/ngie/detangle-rc/sys/dev/random/other_algorithm.c user/ngie/detangle-rc/sys/dev/random/randomdev.c user/ngie/detangle-rc/sys/dev/random/unit_test.c user/ngie/detangle-rc/sys/dev/random/yarrow.c user/ngie/detangle-rc/sys/dev/rt/if_rt.c user/ngie/detangle-rc/sys/dev/rt/if_rtreg.h user/ngie/detangle-rc/sys/dev/rt/if_rtvar.h user/ngie/detangle-rc/sys/dev/sdhci/sdhci_fdt.c user/ngie/detangle-rc/sys/dev/sdhci/sdhci_pci.c user/ngie/detangle-rc/sys/dev/usb/controller/xhci.h user/ngie/detangle-rc/sys/dev/usb/controller/xhci_pci.c user/ngie/detangle-rc/sys/dev/usb/serial/uftdi.c user/ngie/detangle-rc/sys/dev/usb/usb_lookup.c user/ngie/detangle-rc/sys/dev/usb/usbdi.h user/ngie/detangle-rc/sys/dev/usb/wlan/if_urtwn.c user/ngie/detangle-rc/sys/dev/usb/wlan/if_urtwnvar.h user/ngie/detangle-rc/sys/fs/cuse/cuse.c user/ngie/detangle-rc/sys/fs/cuse/cuse_ioctl.h user/ngie/detangle-rc/sys/fs/devfs/devfs_vnops.c user/ngie/detangle-rc/sys/fs/ext2fs/ext2fs.h user/ngie/detangle-rc/sys/fs/fuse/fuse_vnops.c user/ngie/detangle-rc/sys/fs/nfsclient/nfs_clbio.c user/ngie/detangle-rc/sys/fs/smbfs/smbfs_io.c user/ngie/detangle-rc/sys/fs/tmpfs/tmpfs_subr.c user/ngie/detangle-rc/sys/geom/bde/g_bde.c user/ngie/detangle-rc/sys/geom/bde/g_bde_crypt.c user/ngie/detangle-rc/sys/geom/bde/g_bde_lock.c user/ngie/detangle-rc/sys/geom/bde/g_bde_work.c user/ngie/detangle-rc/sys/geom/eli/g_eli.h user/ngie/detangle-rc/sys/geom/geom_map.c user/ngie/detangle-rc/sys/geom/multipath/g_multipath.c user/ngie/detangle-rc/sys/geom/part/g_part.c user/ngie/detangle-rc/sys/geom/part/g_part.h user/ngie/detangle-rc/sys/geom/part/g_part_gpt.c user/ngie/detangle-rc/sys/i386/i386/initcpu.c user/ngie/detangle-rc/sys/i386/include/cputypes.h user/ngie/detangle-rc/sys/kern/imgact_elf.c user/ngie/detangle-rc/sys/kern/kern_exec.c user/ngie/detangle-rc/sys/kern/kern_exit.c user/ngie/detangle-rc/sys/kern/kern_fork.c user/ngie/detangle-rc/sys/kern/kern_jail.c user/ngie/detangle-rc/sys/kern/kern_mbuf.c user/ngie/detangle-rc/sys/kern/kern_proc.c user/ngie/detangle-rc/sys/kern/kern_racct.c user/ngie/detangle-rc/sys/kern/kern_resource.c user/ngie/detangle-rc/sys/kern/kern_sig.c user/ngie/detangle-rc/sys/kern/kern_time.c user/ngie/detangle-rc/sys/kern/kern_timeout.c user/ngie/detangle-rc/sys/kern/link_elf.c user/ngie/detangle-rc/sys/kern/subr_syscall.c user/ngie/detangle-rc/sys/kern/uipc_shm.c user/ngie/detangle-rc/sys/kern/uipc_syscalls.c user/ngie/detangle-rc/sys/kern/vfs_bio.c user/ngie/detangle-rc/sys/kern/vfs_cache.c user/ngie/detangle-rc/sys/kern/vfs_default.c user/ngie/detangle-rc/sys/kern/vfs_subr.c user/ngie/detangle-rc/sys/kern/vnode_if.src user/ngie/detangle-rc/sys/mips/atheros/apb.c user/ngie/detangle-rc/sys/mips/atheros/if_arge.c user/ngie/detangle-rc/sys/mips/atheros/qca953x_chip.c user/ngie/detangle-rc/sys/mips/cavium/cvmx_config.h user/ngie/detangle-rc/sys/mips/conf/RT305X user/ngie/detangle-rc/sys/mips/include/cpufunc.h user/ngie/detangle-rc/sys/mips/include/cpuinfo.h user/ngie/detangle-rc/sys/mips/include/cpuregs.h user/ngie/detangle-rc/sys/mips/include/ofw_machdep.h user/ngie/detangle-rc/sys/mips/include/pmap.h user/ngie/detangle-rc/sys/mips/include/pte.h user/ngie/detangle-rc/sys/mips/mips/cpu.c user/ngie/detangle-rc/sys/mips/mips/pmap.c user/ngie/detangle-rc/sys/mips/mips/uma_machdep.c user/ngie/detangle-rc/sys/mips/rt305x/files.rt305x user/ngie/detangle-rc/sys/mips/rt305x/obio.c user/ngie/detangle-rc/sys/mips/rt305x/rt305x_dotg.c user/ngie/detangle-rc/sys/mips/rt305x/rt305x_machdep.c user/ngie/detangle-rc/sys/mips/rt305x/rt305x_sysctl.c user/ngie/detangle-rc/sys/mips/rt305x/rt305xreg.h user/ngie/detangle-rc/sys/mips/rt305x/uart_bus_rt305x.c user/ngie/detangle-rc/sys/mips/rt305x/uart_cpu_rt305x.c user/ngie/detangle-rc/sys/modules/Makefile user/ngie/detangle-rc/sys/modules/crypto/Makefile user/ngie/detangle-rc/sys/modules/cxgbe/Makefile user/ngie/detangle-rc/sys/modules/geom/geom_bde/Makefile user/ngie/detangle-rc/sys/modules/geom/geom_sched/Makefile user/ngie/detangle-rc/sys/modules/ix/Makefile user/ngie/detangle-rc/sys/modules/ixv/Makefile user/ngie/detangle-rc/sys/modules/usb/rsufw/Makefile.inc user/ngie/detangle-rc/sys/modules/usb/urtwnfw/Makefile.inc user/ngie/detangle-rc/sys/modules/zfs/Makefile user/ngie/detangle-rc/sys/net/bpf.c user/ngie/detangle-rc/sys/net/if.c user/ngie/detangle-rc/sys/net/if_llatbl.c user/ngie/detangle-rc/sys/net/if_stf.c user/ngie/detangle-rc/sys/net/route.h user/ngie/detangle-rc/sys/net/sff8436.h user/ngie/detangle-rc/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c user/ngie/detangle-rc/sys/netinet/if_ether.c user/ngie/detangle-rc/sys/netinet/in_kdtrace.c user/ngie/detangle-rc/sys/netinet/in_kdtrace.h user/ngie/detangle-rc/sys/netinet/in_rmx.c user/ngie/detangle-rc/sys/netinet/sctp_cc_functions.c user/ngie/detangle-rc/sys/netinet/sctp_indata.c user/ngie/detangle-rc/sys/netinet/sctp_os_bsd.h user/ngie/detangle-rc/sys/netinet/sctp_output.c user/ngie/detangle-rc/sys/netinet/tcp.h user/ngie/detangle-rc/sys/netinet/tcp_input.c user/ngie/detangle-rc/sys/netinet/tcp_output.c user/ngie/detangle-rc/sys/netinet/tcp_sack.c user/ngie/detangle-rc/sys/netinet/tcp_subr.c user/ngie/detangle-rc/sys/netinet/tcp_syncache.c user/ngie/detangle-rc/sys/netinet/tcp_syncache.h user/ngie/detangle-rc/sys/netinet/tcp_timer.c user/ngie/detangle-rc/sys/netinet/tcp_usrreq.c user/ngie/detangle-rc/sys/netinet/tcp_var.h user/ngie/detangle-rc/sys/netinet/toecore.c user/ngie/detangle-rc/sys/netinet/udp_usrreq.c user/ngie/detangle-rc/sys/netinet6/in6.c user/ngie/detangle-rc/sys/netinet6/in6_rmx.c user/ngie/detangle-rc/sys/netinet6/nd6.c user/ngie/detangle-rc/sys/netpfil/ipfw/ip_dn_io.c user/ngie/detangle-rc/sys/netpfil/ipfw/ip_dummynet.c user/ngie/detangle-rc/sys/netpfil/ipfw/ip_fw2.c user/ngie/detangle-rc/sys/opencrypto/xform.h user/ngie/detangle-rc/sys/powerpc/booke/pmap.c user/ngie/detangle-rc/sys/powerpc/conf/GENERIC64 user/ngie/detangle-rc/sys/powerpc/include/ofw_machdep.h user/ngie/detangle-rc/sys/powerpc/include/param.h user/ngie/detangle-rc/sys/powerpc/include/platform.h user/ngie/detangle-rc/sys/powerpc/include/pmap.h user/ngie/detangle-rc/sys/powerpc/mpc85xx/fsl_sdhc.c user/ngie/detangle-rc/sys/powerpc/ofw/ofw_machdep.c user/ngie/detangle-rc/sys/powerpc/powerpc/cpu.c user/ngie/detangle-rc/sys/powerpc/powerpc/machdep.c user/ngie/detangle-rc/sys/powerpc/powerpc/platform.c user/ngie/detangle-rc/sys/powerpc/powerpc/pmap_dispatch.c user/ngie/detangle-rc/sys/powerpc/pseries/phyp_llan.c user/ngie/detangle-rc/sys/security/audit/bsm_domain.c user/ngie/detangle-rc/sys/security/audit/bsm_errno.c user/ngie/detangle-rc/sys/security/audit/bsm_fcntl.c user/ngie/detangle-rc/sys/security/audit/bsm_socket_type.c user/ngie/detangle-rc/sys/security/audit/bsm_token.c user/ngie/detangle-rc/sys/security/mac/mac_framework.c user/ngie/detangle-rc/sys/security/mac/mac_internal.h user/ngie/detangle-rc/sys/sys/buf.h user/ngie/detangle-rc/sys/sys/efi.h user/ngie/detangle-rc/sys/sys/fcntl.h user/ngie/detangle-rc/sys/sys/gpt.h user/ngie/detangle-rc/sys/sys/libkern.h user/ngie/detangle-rc/sys/sys/linker.h user/ngie/detangle-rc/sys/sys/param.h user/ngie/detangle-rc/sys/sys/proc.h user/ngie/detangle-rc/sys/sys/sysent.h user/ngie/detangle-rc/sys/sys/vnode.h user/ngie/detangle-rc/sys/ufs/ffs/ffs_softdep.c user/ngie/detangle-rc/sys/vm/default_pager.c user/ngie/detangle-rc/sys/vm/device_pager.c user/ngie/detangle-rc/sys/vm/phys_pager.c user/ngie/detangle-rc/sys/vm/sg_pager.c user/ngie/detangle-rc/sys/vm/swap_pager.c user/ngie/detangle-rc/sys/vm/uma.h user/ngie/detangle-rc/sys/vm/uma_core.c user/ngie/detangle-rc/sys/vm/uma_int.h user/ngie/detangle-rc/sys/vm/vm_fault.c user/ngie/detangle-rc/sys/vm/vm_glue.c user/ngie/detangle-rc/sys/vm/vm_kern.c user/ngie/detangle-rc/sys/vm/vm_object.c user/ngie/detangle-rc/sys/vm/vm_object.h user/ngie/detangle-rc/sys/vm/vm_page.c user/ngie/detangle-rc/sys/vm/vm_page.h user/ngie/detangle-rc/sys/vm/vm_pageout.c user/ngie/detangle-rc/sys/vm/vm_pageout.h user/ngie/detangle-rc/sys/vm/vm_pager.c user/ngie/detangle-rc/sys/vm/vm_pager.h user/ngie/detangle-rc/sys/vm/vm_phys.c user/ngie/detangle-rc/sys/vm/vm_phys.h user/ngie/detangle-rc/sys/vm/vm_reserv.c user/ngie/detangle-rc/sys/vm/vm_reserv.h user/ngie/detangle-rc/sys/vm/vnode_pager.c user/ngie/detangle-rc/sys/vm/vnode_pager.h user/ngie/detangle-rc/sys/x86/include/specialreg.h user/ngie/detangle-rc/sys/x86/x86/busdma_bounce.c user/ngie/detangle-rc/sys/x86/x86/identcpu.c user/ngie/detangle-rc/sys/x86/xen/pv.c user/ngie/detangle-rc/sys/x86/xen/xen_apic.c user/ngie/detangle-rc/tests/freebsd_test_suite/macros.h user/ngie/detangle-rc/tests/sys/Makefile user/ngie/detangle-rc/tests/sys/aio/aio_kqueue_test.c user/ngie/detangle-rc/tests/sys/aio/lio_kqueue_test.c user/ngie/detangle-rc/tests/sys/file/flock_test.sh user/ngie/detangle-rc/tests/sys/kern/pipe/pipe_overcommit1_test.c user/ngie/detangle-rc/tests/sys/kern/unix_seqpacket_test.c user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc user/ngie/detangle-rc/tools/build/options/makeman user/ngie/detangle-rc/tools/debugscripts/README user/ngie/detangle-rc/tools/regression/sockets/unix_passfd/unix_passfd.c user/ngie/detangle-rc/tools/tools/ath/athratestats/Makefile user/ngie/detangle-rc/tools/tools/ioat/ioatcontrol.8 user/ngie/detangle-rc/tools/tools/ioat/ioatcontrol.c user/ngie/detangle-rc/tools/tools/locale/tools/cldr2def.pl user/ngie/detangle-rc/tools/tools/locale/tools/finalize (contents, props changed) user/ngie/detangle-rc/tools/tools/nanobsd/embedded/common user/ngie/detangle-rc/tools/tools/nanobsd/embedded/rpi2.cfg user/ngie/detangle-rc/usr.bin/bmake/Makefile user/ngie/detangle-rc/usr.bin/calendar/calendars/calendar.freebsd user/ngie/detangle-rc/usr.bin/column/column.c user/ngie/detangle-rc/usr.bin/dtc/Makefile user/ngie/detangle-rc/usr.bin/dtc/checking.cc user/ngie/detangle-rc/usr.bin/dtc/checking.hh user/ngie/detangle-rc/usr.bin/dtc/dtb.hh user/ngie/detangle-rc/usr.bin/dtc/fdt.cc user/ngie/detangle-rc/usr.bin/dtc/fdt.hh user/ngie/detangle-rc/usr.bin/dtc/input_buffer.cc user/ngie/detangle-rc/usr.bin/dtc/input_buffer.hh user/ngie/detangle-rc/usr.bin/kdump/Makefile user/ngie/detangle-rc/usr.bin/kdump/Makefile.depend user/ngie/detangle-rc/usr.bin/kdump/kdump.c user/ngie/detangle-rc/usr.bin/locate/locate/util.c user/ngie/detangle-rc/usr.bin/netstat/ipsec.c user/ngie/detangle-rc/usr.bin/netstat/main.c user/ngie/detangle-rc/usr.bin/nfsstat/Makefile user/ngie/detangle-rc/usr.bin/nfsstat/nfsstat.c user/ngie/detangle-rc/usr.bin/systat/vmstat.c user/ngie/detangle-rc/usr.bin/truss/Makefile user/ngie/detangle-rc/usr.bin/truss/Makefile.depend.amd64 user/ngie/detangle-rc/usr.bin/truss/syscalls.c user/ngie/detangle-rc/usr.bin/vmstat/vmstat.c user/ngie/detangle-rc/usr.bin/xargs/xargs.c user/ngie/detangle-rc/usr.sbin/Makefile user/ngie/detangle-rc/usr.sbin/Makefile.amd64 user/ngie/detangle-rc/usr.sbin/Makefile.arm user/ngie/detangle-rc/usr.sbin/Makefile.i386 user/ngie/detangle-rc/usr.sbin/Makefile.powerpc user/ngie/detangle-rc/usr.sbin/Makefile.sparc64 user/ngie/detangle-rc/usr.sbin/boot0cfg/boot0cfg.c user/ngie/detangle-rc/usr.sbin/bsdinstall/scripts/entropy user/ngie/detangle-rc/usr.sbin/camdd/Makefile user/ngie/detangle-rc/usr.sbin/cron/cron/do_command.c user/ngie/detangle-rc/usr.sbin/cron/cron/popen.c user/ngie/detangle-rc/usr.sbin/cron/crontab/crontab.c user/ngie/detangle-rc/usr.sbin/ctm/ctm/ctm.1 user/ngie/detangle-rc/usr.sbin/fstyp/Makefile user/ngie/detangle-rc/usr.sbin/fstyp/fstyp.c user/ngie/detangle-rc/usr.sbin/fstyp/geli.c user/ngie/detangle-rc/usr.sbin/fstyp/zfs.c user/ngie/detangle-rc/usr.sbin/jls/Makefile user/ngie/detangle-rc/usr.sbin/jls/jls.8 user/ngie/detangle-rc/usr.sbin/jls/jls.c user/ngie/detangle-rc/usr.sbin/makefs/makefs.c user/ngie/detangle-rc/usr.sbin/mountd/mountd.c user/ngie/detangle-rc/usr.sbin/mpsutil/mps_cmd.c user/ngie/detangle-rc/usr.sbin/ndp/ndp.c user/ngie/detangle-rc/usr.sbin/pw/pw_conf.c user/ngie/detangle-rc/usr.sbin/pw/pw_group.c user/ngie/detangle-rc/usr.sbin/pw/pw_vpw.c user/ngie/detangle-rc/usr.sbin/pwd_mkdb/pwd_mkdb.c user/ngie/detangle-rc/usr.sbin/rpc.lockd/lockd.c user/ngie/detangle-rc/usr.sbin/rpc.statd/statd.c user/ngie/detangle-rc/usr.sbin/rtsold/rtsold.c user/ngie/detangle-rc/usr.sbin/sesutil/sesutil.c user/ngie/detangle-rc/usr.sbin/uhsoctl/uhsoctl.c user/ngie/detangle-rc/usr.sbin/ypldap/aldap.c user/ngie/detangle-rc/usr.sbin/ypldap/ber.c user/ngie/detangle-rc/usr.sbin/ypldap/ldapclient.c user/ngie/detangle-rc/usr.sbin/ypldap/ypldap.c user/ngie/detangle-rc/usr.sbin/ypldap/ypldap_dns.c user/ngie/detangle-rc/usr.sbin/ypserv/Makefile.yp Directory Properties: user/ngie/detangle-rc/ (props changed) user/ngie/detangle-rc/cddl/ (props changed) user/ngie/detangle-rc/cddl/contrib/opensolaris/ (props changed) user/ngie/detangle-rc/contrib/binutils/ (props changed) user/ngie/detangle-rc/contrib/bmake/ (props changed) user/ngie/detangle-rc/contrib/gcc/ (props changed) user/ngie/detangle-rc/contrib/libexecinfo/ (props changed) user/ngie/detangle-rc/contrib/llvm/ (props changed) user/ngie/detangle-rc/contrib/llvm/tools/clang/ (props changed) user/ngie/detangle-rc/contrib/llvm/tools/lldb/ (props changed) user/ngie/detangle-rc/contrib/llvm/tools/llvm-dwarfdump/ (props changed) user/ngie/detangle-rc/contrib/llvm/tools/llvm-lto/ (props changed) user/ngie/detangle-rc/contrib/mdocml/ (props changed) user/ngie/detangle-rc/contrib/openbsm/ (props changed) user/ngie/detangle-rc/contrib/unbound/ (props changed) user/ngie/detangle-rc/crypto/openssh/ (props changed) user/ngie/detangle-rc/gnu/usr.bin/binutils/ (props changed) user/ngie/detangle-rc/include/ (props changed) user/ngie/detangle-rc/lib/libc/ (props changed) user/ngie/detangle-rc/sbin/ (props changed) user/ngie/detangle-rc/share/ (props changed) user/ngie/detangle-rc/share/man/man4/ (props changed) user/ngie/detangle-rc/sys/ (props changed) user/ngie/detangle-rc/sys/boot/ (props changed) user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/ (props changed) user/ngie/detangle-rc/sys/conf/ (props changed) user/ngie/detangle-rc/sys/contrib/ipfilter/ (props changed) user/ngie/detangle-rc/sys/dev/hyperv/ (props changed) user/ngie/detangle-rc/usr.bin/calendar/ (props changed) user/ngie/detangle-rc/usr.sbin/rtsold/ (props changed) Modified: user/ngie/detangle-rc/MAINTAINERS ============================================================================== --- user/ngie/detangle-rc/MAINTAINERS Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/MAINTAINERS Tue Dec 29 19:44:32 2015 (r292882) @@ -24,6 +24,15 @@ maintainer of a sub-system is to check r sub-system. *** +*** +Maintainers are encouraged to visit: + https://reviews.freebsd.org/herald + +and configure notifications for parts of the tree which they maintain. +Notifications can automatically be sent when someone proposes a revision or +makes a commit to the specified subtree. +*** + subsystem login notes ----------------------------- atf freebsd-testing,jmmv,ngie Pre-commit review requested. @@ -37,20 +46,26 @@ contrib/llvm/tools/lldb emaste Pre-commi contrib/netbsd-tests freebsd-testing,ngie Pre-commit review requested. contrib/pjdfstest freebsd-testing,ngie,pjd Pre-commit review requested. dev/usb/wlan adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +*env(3) secteam Due to the problematic security history of this + code, please have patches reviewed by secteam. etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. fetch des Pre-commit review requested. +geli pjd Pre-commit review requested (both sys/geom/eli/ and sbin/geom/class/eli/). isci(4) jimharris Pre-commit review requested. iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org kqueue jmg Pre-commit review requested. Documentation Required. +libdpv dteske Pre-commit review requested. Keep in sync with dpv(1). libfetch des Pre-commit review requested. +libfigpar dteske Pre-commit review requested. libpam des Pre-commit review requested. linprocfs des Pre-commit review requested. lpr gad Pre-commit review requested, particularly for lpd/recvjob.c and lpd/printjob.c. nanobsd imp Pre-commit phabricator review requested. net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +nfs freebsd-fs@FreeBSD.org, rmacklem is best for reviews. nis(8), yp(8) araujo Pre-commit review requested. nvd(4) jimharris Pre-commit review requested. nvme(4) jimharris Pre-commit review requested. @@ -59,6 +74,7 @@ opencrypto jmg Pre-commit review request openssh des Pre-commit review requested. openssl benl,jkim Pre-commit review requested. otus(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +pci bus imp,jhb Pre-commit review requested. pmcstudy(8) rrs Pre-commit review requested. procfs des Pre-commit review requested. pseudofs des Pre-commit review requested. @@ -71,6 +87,7 @@ sh(1) jilles Pre-commit review request compiled in as builtins. share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. share/mk/*.test.mk freebsd-testing,ngie (same list as share/mk too) Pre-commit review requested. +sys/boot/forth dteske Pre-commit review requested. sys/compat/linuxkpi hselasky If in doubt, ask. sys/dev/e1000 erj Pre-commit phabricator review requested. sys/dev/ixgbe erj Pre-commit phabricator review requested. @@ -80,79 +97,8 @@ sys/dev/usb hselasky If in doubt, ask. sys/netinet/ip_carp.c glebius Pre-commit review recommended. sys/netpfil/pf kp,glebius Pre-commit review recommended. tests freebsd-testing,ngie Pre-commit review requested. +usr.sbin/bsdconfig dteske Pre-commit phabricator review requested. +usr.sbin/dpv dteske Pre-commit review requested. Keep in sync with libdpv. usr.sbin/pkg pkg@ Please coordinate behavior or flag changes with pkg team. +usr.sbin/sysrc dteske Pre-commit phabricator review requested. Keep in sync with bsdconfig(8) sysrc.subr. vmm(4) neel,grehan Pre-commit review requested. ----- OLD ---- -libc/posix1e rwatson Pre-commit review requested. -POSIX.1e ACLs rwatson Pre-commit review requested. -UFS EAs rwatson Pre-commit review requested. -MAC Framework rwatson Pre-commit review requested. -MAC Modules rwatson Pre-commit review requested. -contrib/openbsm rwatson Pre-commit review requested. -sys/security/audit rwatson Pre-commit review requested. -ahc(4) gibbs Pre-commit review requested. -ahd(4) gibbs Pre-commit review requested. -pci bus imp,jhb Pre-commit review requested. -cdboot jhb Pre-commit review requested. -pxeboot jhb Pre-commit review requested. -witness jhb Pre-commit review requested. -CAM gibbs, - ken Pre-commit review requested. send to scsi@freebsd.org -devstat(9) ken Pre-commit review requested. -camcontrol(8) ken Pre-commit review requested. -libcam ken Pre-commit review requested. -libdevstat ken Pre-commit review requested. -iostat(8) ken Pre-commit review requested. -cd(4) ken Pre-commit review requested. -pass(4) ken Pre-commit review requested. -ch(4) ken Pre-commit review requested. -em(4) jfv Pre-commit review requested. -nvi peter Try not to break it. -libz peter Try not to break it. -groff ru Recommends pre-commit review. -ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org -drm rnoland Just keep me informed of changes, try not to break it. -unifdef(1) fanf Pre-commit review requested. -ntp roberto Pre-commit review requested. -inetd dwmalone Recommends pre-commit review. -contrib/smbfs bp Open for in-tree committs. In case of functional - changes pre-commit review requested. -file obrien Insists to keep file blocked from other's unapproved - commits -contrib/bzip2 obrien Pre-commit review required. -geom freebsd-geom@FreeBSD.org -geom_concat pjd Pre-commit review preferred. -geom_eli pjd Pre-commit review preferred. -geom_gate pjd Pre-commit review preferred. -geom_label pjd Pre-commit review preferred. -geom_mirror pjd Pre-commit review preferred. -geom_nop pjd Pre-commit review preferred. -geom_raid3 pjd Pre-commit review preferred. -geom_shsec pjd Pre-commit review preferred. -geom_stripe pjd Pre-commit review preferred. -geom_zero pjd Pre-commit review preferred. -sbin/geom pjd Pre-commit review preferred. -zfs freebsd-fs@FreeBSD.org -nfs freebsd-fs@FreeBSD.org, rmacklem is best for reviews. -linux emul emulation Please discuss changes here. -bs{diff,patch} cperciva Pre-commit review requested. -portsnap cperciva Pre-commit review requested. -freebsd-update cperciva Pre-commit review requested. -sys/netgraph/bluetooth emax Pre-commit review preferred. -lib/libbluetooth emax Pre-commit review preferred. -lib/libsdp emax Pre-commit review preferred. -usr.bin/bluetooth emax Pre-commit review preferred. -usr.sbin/bluetooth emax Pre-commit review preferred. -*env(3) secteam Due to the problematic security history of this - code, please have patches reviewed by secteam. -share/zoneinfo edwin Heads-up appreciated, since our data is coming - from a third party source. -usr.sbin/zic edwin Heads-up appreciated, since this code is - maintained by a third party source. -lib/libc/stdtime edwin Heads-up appreciated, since parts of this code - is maintained by a third party source. -sbin/routed bms Pre-commit review; notify vendor at rhyolite.com -cmx daniel@roe.ch Pre-commit review preferred. -filemon obrien Pre-commit review preferred. -sysdoc trhodes Pre-commit review preferred. - Modified: user/ngie/detangle-rc/Makefile ============================================================================== --- user/ngie/detangle-rc/Makefile Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/Makefile Tue Dec 29 19:44:32 2015 (r292882) @@ -57,8 +57,8 @@ # Makefile.inc1. The exceptions are universe, tinderbox and targets. # # If you want to build your system from source be sure that /usr/obj has -# at least 1GB of diskspace available. A complete 'universe' build requires -# about 15GB of space. +# at least 6GB of diskspace available. A complete 'universe' build requires +# about 100GB of space. # # For individuals wanting to build from the sources currently on their # system, the simple instructions are: Modified: user/ngie/detangle-rc/Makefile.inc1 ============================================================================== --- user/ngie/detangle-rc/Makefile.inc1 Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/Makefile.inc1 Tue Dec 29 19:44:32 2015 (r292882) @@ -48,10 +48,11 @@ .error "Both TARGET and TARGET_ARCH must be defined." .endif +LOCALBASE?= /usr/local + # Cross toolchain changes must be in effect before bsd.compiler.mk # so that gets the right CC, and pass CROSS_TOOLCHAIN to submakes. .if defined(CROSS_TOOLCHAIN) -LOCALBASE?= /usr/local .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}" .endif @@ -146,7 +147,11 @@ CLEANDIR= cleandir LOCAL_TOOL_DIRS?= PACKAGEDIR?= ${DESTDIR}/${DISTDIR} +.if empty(SHELL:M*csh*) BUILDENV_SHELL?=${SHELL} +.else +BUILDENV_SHELL?=/bin/sh +.endif SVN?= /usr/local/bin/svn SVNFLAGS?= -r HEAD @@ -172,10 +177,24 @@ VERSION= FreeBSD ${REVISION}-${BRANCH:C/ .export VERSION .endif -KNOWN_ARCHES?= aarch64/arm64 amd64 arm armeb/arm armv6/arm armv6hf/arm \ - i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips \ - mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc \ - riscv64/riscv sparc64 +KNOWN_ARCHES?= aarch64/arm64 \ + amd64 \ + arm \ + armeb/arm \ + armv6/arm \ + armv6hf/arm \ + i386 \ + i386/pc98 \ + mips \ + mipsel/mips \ + mips64el/mips \ + mips64/mips \ + mipsn32el/mips \ + mipsn32/mips \ + powerpc \ + powerpc64/powerpc \ + riscv64/riscv \ + sparc64 .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} @@ -1296,7 +1315,7 @@ packagekernel: # Build the API documentation with doxygen # doxygen: .PHONY - @if [ ! -x `/usr/bin/which doxygen` ]; then \ + @if [ ! -x ${LOCALBASE}/bin/doxygen ]; then \ echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \ exit 1; \ fi @@ -1658,7 +1677,7 @@ NXBMAKE= ${NXBENV} ${MAKE} \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \ -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \ - MK_LLDB=no + MK_LLDB=no MK_DEBUG_FILES=no # native-xtools is the current target for qemu-user cross builds of ports # via poudriere and the imgact_binmisc kernel module. Modified: user/ngie/detangle-rc/ObsoleteFiles.inc ============================================================================== --- user/ngie/detangle-rc/ObsoleteFiles.inc Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/ObsoleteFiles.inc Tue Dec 29 19:44:32 2015 (r292882) @@ -38,6 +38,88 @@ # xargs -n1 | sort | uniq -d; # done +# 20151225: new clang import which bumps version from 3.7.0 to 3.7.1. +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/common_interface_defs.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/coverage_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/dfsan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/linux_syscall_hooks.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/lsan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/msan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/tsan_interface_atomic.h +OLD_DIRS+=usr/lib/clang/3.7.0/include/sanitizer +OLD_FILES+=usr/lib/clang/3.7.0/include/__stddef_max_align_t.h +OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_aes.h +OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_pclmul.h +OLD_FILES+=usr/lib/clang/3.7.0/include/adxintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/altivec.h +OLD_FILES+=usr/lib/clang/3.7.0/include/ammintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/arm_acle.h +OLD_FILES+=usr/lib/clang/3.7.0/include/arm_neon.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx2intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512bwintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512cdintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512dqintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512erintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512fintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlbwintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vldqintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avxintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/bmi2intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/bmiintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/cpuid.h +OLD_FILES+=usr/lib/clang/3.7.0/include/cuda_builtin_vars.h +OLD_FILES+=usr/lib/clang/3.7.0/include/emmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/f16cintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/fma4intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/fmaintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/fxsrintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/htmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/htmxlintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/ia32intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/immintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/lzcntintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/mm3dnow.h +OLD_FILES+=usr/lib/clang/3.7.0/include/mm_malloc.h +OLD_FILES+=usr/lib/clang/3.7.0/include/mmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/module.modulemap +OLD_FILES+=usr/lib/clang/3.7.0/include/nmmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/pmmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/popcntintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/prfchwintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/rdseedintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/rtmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/s390intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/shaintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/smmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/tbmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/tmmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/vadefs.h +OLD_FILES+=usr/lib/clang/3.7.0/include/vecintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/wmmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/x86intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/xmmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/xopintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/xtestintrin.h +OLD_DIRS+=usr/lib/clang/3.7.0/include +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-arm.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a +OLD_DIRS+=usr/lib/clang/3.7.0/lib/freebsd +OLD_DIRS+=usr/lib/clang/3.7.0/lib +OLD_DIRS+=usr/lib/clang/3.7.0 # 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406) OLD_LIBS+=usr/lib/libelf.so.2 # 20151115: Fox bad upgrade scheme Modified: user/ngie/detangle-rc/UPDATING ============================================================================== --- user/ngie/detangle-rc/UPDATING Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/UPDATING Tue Dec 29 19:44:32 2015 (r292882) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20151216: + The tftp loader (pxeboot) now uses the option root-path directive. As a + consequence it no longer looks for a pxeboot.4th file on the tftp + server. Instead it uses the regular /boot infrastructure as with the + other loaders. + 20151211: The code to start recording plug and play data into the modules has been committed. While the old tools will properly build a new kernel, Modified: user/ngie/detangle-rc/bin/ed/main.c ============================================================================== --- user/ngie/detangle-rc/bin/ed/main.c Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/bin/ed/main.c Tue Dec 29 19:44:32 2015 (r292882) @@ -505,7 +505,8 @@ exec_command(void) return ERR; else if (open_sbuf() < 0) return FATAL; - if (*fnp && *fnp != '!') strcpy(old_filename, fnp); + if (*fnp && *fnp != '!') + strlcpy(old_filename, fnp, PATH_MAX); #ifdef BACKWARDS if (*fnp == '\0' && *old_filename == '\0') { errmsg = "no current filename"; @@ -532,7 +533,8 @@ exec_command(void) return ERR; } GET_COMMAND_SUFFIX(); - if (*fnp) strcpy(old_filename, fnp); + if (*fnp) + strlcpy(old_filename, fnp, PATH_MAX); printf("%s\n", strip_escapes(old_filename)); break; case 'g': @@ -663,7 +665,7 @@ exec_command(void) GET_COMMAND_SUFFIX(); if (!isglobal) clear_undo_stack(); if (*old_filename == '\0' && *fnp != '!') - strcpy(old_filename, fnp); + strlcpy(old_filename, fnp, PATH_MAX); #ifdef BACKWARDS if (*fnp == '\0' && *old_filename == '\0') { errmsg = "no current filename"; @@ -797,7 +799,7 @@ exec_command(void) return ERR; GET_COMMAND_SUFFIX(); if (*old_filename == '\0' && *fnp != '!') - strcpy(old_filename, fnp); + strlcpy(old_filename, fnp, PATH_MAX); #ifdef BACKWARDS if (*fnp == '\0' && *old_filename == '\0') { errmsg = "no current filename"; Modified: user/ngie/detangle-rc/bin/pax/pat_rep.c ============================================================================== --- user/ngie/detangle-rc/bin/pax/pat_rep.c Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/bin/pax/pat_rep.c Tue Dec 29 19:44:32 2015 (r292882) @@ -878,7 +878,7 @@ rep_name(char *name, int *nlen, int prnt * (the user already saw that substitution go by) */ pt = rephead; - (void)strcpy(buf1, name); + (void)strlcpy(buf1, name, sizeof(buf1)); inpt = buf1; outpt = nname; endpt = outpt + PAXPATHLEN; Modified: user/ngie/detangle-rc/bin/sh/mknodes.c ============================================================================== --- user/ngie/detangle-rc/bin/sh/mknodes.c Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/bin/sh/mknodes.c Tue Dec 29 19:44:32 2015 (r292882) @@ -89,7 +89,6 @@ static struct str *nodestr[MAXTYPES]; /* static int nstr; /* number of structures */ static struct str str[MAXTYPES]; /* the structures */ static struct str *curstr; /* current structure */ -static FILE *infp; static char line[1024]; static int linno; static char *linep; @@ -102,7 +101,7 @@ static void outfunc(FILE *, int); static void indent(int, FILE *); static int nextfield(char *); static void skipbl(void); -static int readline(void); +static int readline(FILE *); static void error(const char *, ...) __printf0like(1, 2) __dead2; static char *savestr(const char *); @@ -110,17 +109,19 @@ static char *savestr(const char *); int main(int argc, char *argv[]) { + FILE *infp; + if (argc != 3) error("usage: mknodes file"); - infp = stdin; if ((infp = fopen(argv[1], "r")) == NULL) error("Can't open %s: %s", argv[1], strerror(errno)); - while (readline()) { + while (readline(infp)) { if (line[0] == ' ' || line[0] == '\t') parsefield(); else if (line[0] != '\0') parsenode(); } + fclose(infp); output(argv[2]); exit(0); } @@ -253,6 +254,10 @@ output(char *file) fputs("union node *getfuncnode(struct funcdef *);\n", hfile); fputs("void reffunc(struct funcdef *);\n", hfile); fputs("void unreffunc(struct funcdef *);\n", hfile); + if (ferror(hfile)) + error("Can't write to nodes.h"); + if (fclose(hfile)) + error("Can't close nodes.h"); fputs(writer, cfile); while (fgets(line, sizeof line, patfile) != NULL) { @@ -266,6 +271,11 @@ output(char *file) else fputs(line, cfile); } + fclose(patfile); + if (ferror(cfile)) + error("Can't write to nodes.c"); + if (fclose(cfile)) + error("Can't close nodes.c"); } @@ -401,7 +411,7 @@ skipbl(void) static int -readline(void) +readline(FILE *infp) { char *p; Modified: user/ngie/detangle-rc/bin/sh/tests/expansion/Makefile ============================================================================== --- user/ngie/detangle-rc/bin/sh/tests/expansion/Makefile Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/bin/sh/tests/expansion/Makefile Tue Dec 29 19:44:32 2015 (r292882) @@ -90,5 +90,6 @@ FILES+= trim5.0 FILES+= trim6.0 FILES+= trim7.0 FILES+= trim8.0 +FILES+= trim9.0 .include Copied: user/ngie/detangle-rc/bin/sh/tests/expansion/trim9.0 (from r292881, head/bin/sh/tests/expansion/trim9.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/detangle-rc/bin/sh/tests/expansion/trim9.0 Tue Dec 29 19:44:32 2015 (r292882, copy of r292881, head/bin/sh/tests/expansion/trim9.0) @@ -0,0 +1,61 @@ +# $FreeBSD$ + +# POSIX does not specify these but they occasionally occur in the wild. +# This just serves to keep working what currently works. + +failures='' +ok='' + +testcase() { + code="$1" + expected="$2" + oIFS="$IFS" + eval "$code" + IFS='|' + result="$#|$*" + IFS="$oIFS" + if [ "x$result" = "x$expected" ]; then + ok=x$ok + else + failures=x$failures + echo "For $code, expected $expected actual $result" + fi +} + +testcase 'shift $#; set -- "${*#Q}"' '1|' +testcase 'shift $#; set -- "${*##Q}"' '1|' +testcase 'shift $#; set -- "${*%Q}"' '1|' +testcase 'shift $#; set -- "${*%%Q}"' '1|' +testcase 'set -- Q R; set -- "${*#Q}"' '1| R' +testcase 'set -- Q R; set -- "${*##Q}"' '1| R' +testcase 'set -- Q R; set -- "${*%R}"' '1|Q ' +testcase 'set -- Q R; set -- "${*%%R}"' '1|Q ' +testcase 'set -- Q R; set -- "${*#S}"' '1|Q R' +testcase 'set -- Q R; set -- "${*##S}"' '1|Q R' +testcase 'set -- Q R; set -- "${*%S}"' '1|Q R' +testcase 'set -- Q R; set -- "${*%%S}"' '1|Q R' +testcase 'set -- Q R; set -- ${*#Q}' '1|R' +testcase 'set -- Q R; set -- ${*##Q}' '1|R' +testcase 'set -- Q R; set -- ${*%R}' '1|Q' +testcase 'set -- Q R; set -- ${*%%R}' '1|Q' +testcase 'set -- Q R; set -- ${*#S}' '2|Q|R' +testcase 'set -- Q R; set -- ${*##S}' '2|Q|R' +testcase 'set -- Q R; set -- ${*%S}' '2|Q|R' +testcase 'set -- Q R; set -- ${*%%S}' '2|Q|R' +testcase 'set -- Q R; set -- ${@#Q}' '1|R' +testcase 'set -- Q R; set -- ${@##Q}' '1|R' +testcase 'set -- Q R; set -- ${@%R}' '1|Q' +testcase 'set -- Q R; set -- ${@%%R}' '1|Q' +testcase 'set -- Q R; set -- ${@#S}' '2|Q|R' +testcase 'set -- Q R; set -- ${@##S}' '2|Q|R' +testcase 'set -- Q R; set -- ${@%S}' '2|Q|R' +testcase 'set -- Q R; set -- ${@%%S}' '2|Q|R' +testcase 'set -- Q R; set -- "${@#Q}"' '2||R' +testcase 'set -- Q R; set -- "${@%R}"' '2|Q|' +testcase 'set -- Q R; set -- "${@%%R}"' '2|Q|' +testcase 'set -- Q R; set -- "${@#S}"' '2|Q|R' +testcase 'set -- Q R; set -- "${@##S}"' '2|Q|R' +testcase 'set -- Q R; set -- "${@%S}"' '2|Q|R' +testcase 'set -- Q R; set -- "${@%%S}"' '2|Q|R' + +test "x$failures" = x Modified: user/ngie/detangle-rc/bin/sh/var.c ============================================================================== --- user/ngie/detangle-rc/bin/sh/var.c Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/bin/sh/var.c Tue Dec 29 19:44:32 2015 (r292882) @@ -330,7 +330,7 @@ setvareq(char *s, int flags) if (vp->flags & VREADONLY) { if ((flags & (VTEXTFIXED|VSTACK)) == 0) ckfree(s); - error("%.*s: is read only", vp->name_len, s); + error("%.*s: is read only", vp->name_len, vp->text); } if (flags & VNOSET) { if ((flags & (VTEXTFIXED|VSTACK)) == 0) Modified: user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Dec 29 19:44:32 2015 (r292882) @@ -3657,7 +3657,8 @@ main(int argc, char **argv) kernel_init(FREAD); g_zfs = libzfs_init(); - ASSERT(g_zfs != NULL); + if (g_zfs == NULL) + fatal("Fail to initialize zfs"); if (dump_all) verbose = MAX(verbose, 1); Modified: user/ngie/detangle-rc/cddl/sbin/zfs/Makefile ============================================================================== --- user/ngie/detangle-rc/cddl/sbin/zfs/Makefile Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/cddl/sbin/zfs/Makefile Tue Dec 29 19:44:32 2015 (r292882) @@ -22,6 +22,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -LIBADD= geom jail nvpair umem util uutil zfs_core zfs +LIBADD= jail nvpair uutil zfs_core zfs .include Modified: user/ngie/detangle-rc/cddl/sbin/zpool/Makefile ============================================================================== --- user/ngie/detangle-rc/cddl/sbin/zpool/Makefile Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/cddl/sbin/zpool/Makefile Tue Dec 29 19:44:32 2015 (r292882) @@ -27,6 +27,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common -LIBADD= avl geom nvpair umem util uutil zfs_core zfs +LIBADD= geom nvpair uutil zfs .include Modified: user/ngie/detangle-rc/cddl/usr.sbin/zdb/Makefile ============================================================================== --- user/ngie/detangle-rc/cddl/usr.sbin/zdb/Makefile Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/cddl/usr.sbin/zdb/Makefile Tue Dec 29 19:44:32 2015 (r292882) @@ -24,7 +24,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -LIBADD= geom m nvpair pthread umem uutil zfs_core zfs zpool +LIBADD= nvpair umem uutil zfs zpool # Since there are many asserts in this program, it makes no sense to compile # it without debugging. Modified: user/ngie/detangle-rc/cddl/usr.sbin/zhack/Makefile ============================================================================== --- user/ngie/detangle-rc/cddl/usr.sbin/zhack/Makefile Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/cddl/usr.sbin/zhack/Makefile Tue Dec 29 19:44:32 2015 (r292882) @@ -23,7 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -LIBADD= geom m nvpair pthread umem uutil zfs_core zfs zpool +LIBADD= nvpair zfs zpool CFLAGS+= -DDEBUG=1 #DEBUG_FLAGS+= -g Modified: user/ngie/detangle-rc/contrib/binutils/bfd/elf32-arm.c ============================================================================== --- user/ngie/detangle-rc/contrib/binutils/bfd/elf32-arm.c Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/contrib/binutils/bfd/elf32-arm.c Tue Dec 29 19:44:32 2015 (r292882) @@ -5800,7 +5800,7 @@ elf32_arm_final_link_relocate (reloc_how if (globals->use_rel) { addend = ((insn >> 4) & 0xf000) | (insn & 0xfff); - signed_addend = (addend ^ 0x10000) - 0x10000; + signed_addend = (addend ^ 0x8000) - 0x8000; } value += signed_addend; Modified: user/ngie/detangle-rc/contrib/bmake/ChangeLog ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/ChangeLog Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/contrib/bmake/ChangeLog Tue Dec 29 19:44:32 2015 (r292882) @@ -1,3 +1,9 @@ +2015-12-20 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20151220 + Merge with NetBSD make, pick up + o suff.c: re-initialize suffNull when clearing suffixes. + 2015-12-01 Simon J. Gerraty * Makefile (MAKE_VERSION): 20151201 Modified: user/ngie/detangle-rc/contrib/bmake/Makefile ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/Makefile Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/contrib/bmake/Makefile Tue Dec 29 19:44:32 2015 (r292882) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.48 2015/12/02 00:36:42 sjg Exp $ +# $Id: Makefile,v 1.49 2015/12/20 22:54:40 sjg Exp $ # Base version on src date -MAKE_VERSION= 20151201 +MAKE_VERSION= 20151220 PROG= bmake Modified: user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog Tue Dec 29 19:44:32 2015 (r292882) @@ -1,3 +1,9 @@ +2015-12-12 Simon J. Gerraty + + * install-mk (MK_VERSION): 20151212 + * auto.obj.mk: do not require MAKEOBJDIRPREFIX to exist. + only apply :tA to __objdir when comparing to .OBJDIR + 2015-11-14 Simon J. Gerraty * install-mk (MK_VERSION): 20151111 Modified: user/ngie/detangle-rc/contrib/bmake/mk/auto.obj.mk ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/mk/auto.obj.mk Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/contrib/bmake/mk/auto.obj.mk Tue Dec 29 19:44:32 2015 (r292882) @@ -1,4 +1,4 @@ -# $Id: auto.obj.mk,v 1.11 2015/06/16 06:28:21 sjg Exp $ +# $Id: auto.obj.mk,v 1.12 2015/12/16 01:57:06 sjg Exp $ # # @(#) Copyright (c) 2004, Simon J. Gerraty # @@ -40,12 +40,12 @@ MKOBJDIRS= auto .if !defined(NOOBJ) && !defined(NO_OBJ) && ${MKOBJDIRS:Uno} == auto # Use __objdir here so it is easier to tweak without impacting # the logic. -.if !empty(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX}) +.if !empty(MAKEOBJDIRPREFIX) __objdir?= ${MAKEOBJDIRPREFIX}${.CURDIR} .endif __objdir?= ${MAKEOBJDIR:Uobj} -__objdir:= ${__objdir:tA} -.if ${.OBJDIR} != ${__objdir} +__objdir:= ${__objdir} +.if ${.OBJDIR:tA} != ${__objdir:tA} # We need to chdir, make the directory if needed .if !exists(${__objdir}/) && \ (${.TARGETS} == "" || ${.TARGETS:Nclean*:N*clean:Ndestroy*} != "") @@ -53,11 +53,10 @@ __objdir:= ${__objdir:tA} __objdir_made != echo ${__objdir}/; umask ${OBJDIR_UMASK:U002}; \ ${ECHO_TRACE} "[Creating objdir ${__objdir}...]" >&2; \ ${Mkdirs}; Mkdirs ${__objdir} -__objdir:= ${__objdir:tA} .endif # This causes make to use the specified directory as .OBJDIR .OBJDIR: ${__objdir} -.if ${.OBJDIR} != ${__objdir} && ${__objdir_made:Uno:M${__objdir}/*} != "" +.if ${.OBJDIR:tA} != ${__objdir:tA} && ${__objdir_made:Uno:M${__objdir}/*} != "" .error could not use ${__objdir}: .OBJDIR=${.OBJDIR} .endif .endif Modified: user/ngie/detangle-rc/contrib/bmake/mk/install-mk ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/mk/install-mk Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/contrib/bmake/mk/install-mk Tue Dec 29 19:44:32 2015 (r292882) @@ -55,7 +55,7 @@ # Simon J. Gerraty # RCSid: -# $Id: install-mk,v 1.117 2015/11/14 18:09:57 sjg Exp $ +# $Id: install-mk,v 1.118 2015/12/16 01:57:06 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -70,7 +70,7 @@ # sjg@crufty.net # -MK_VERSION=20151111 +MK_VERSION=20151212 OWNER= GROUP= MODE=444 Modified: user/ngie/detangle-rc/contrib/bmake/os.sh ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/os.sh Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/contrib/bmake/os.sh Tue Dec 29 19:44:32 2015 (r292882) @@ -17,7 +17,7 @@ # Simon J. Gerraty # RCSid: -# $Id: os.sh,v 1.49 2015/10/25 00:05:40 sjg Exp $ +# $Id: os.sh,v 1.50 2015/12/17 17:06:29 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -56,10 +56,10 @@ Which() { case "$1" in /*) test $t $1 && echo $1;; *) - # some shells cannot correctly handle `IFS` - # in conjunction with the for loop. - _dirs=`IFS=:; echo ${2:-$PATH}` - for d in $_dirs + # some shells cannot correctly handle `IFS` + # in conjunction with the for loop. + _dirs=`IFS=:; echo ${2:-$PATH}` + for d in $_dirs do test $t $d/$1 && { echo $d/$1; break; } done @@ -70,11 +70,11 @@ Which() { # tr is insanely non-portable wrt char classes, so we need to # spell out the alphabet. sed y/// would work too. toUpper() { - ${TR:-tr} abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ + ${TR:-tr} abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ } toLower() { - ${TR:-tr} ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz + ${TR:-tr} ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz } K= @@ -91,7 +91,7 @@ SunOS) export CHOWN # Great! Solaris keeps moving arch(1) - # should just bite the bullet and use uname -p + # should just bite the bullet and use uname -p arch=`Which arch /usr/bin:/usr/ucb` MAILER=/usr/ucb/Mail @@ -105,8 +105,8 @@ SunOS) MACHINE=$MACHINE_ARCH ;; 4*) - MACHINE_ARCH=`arch` - ;; + MACHINE_ARCH=`arch` + ;; 5*) K=-k LOCAL_FS=ufs @@ -116,8 +116,8 @@ SunOS) # overwriting an existing file!!!!! We want one that works! test -x /usr/xpg4/bin/ln && LN=${LN:-/usr/xpg4/bin/ln} # wonderful, 5.8's tr again require's []'s - # but /usr/xpg4/bin/tr causes problems if LC_COLLATE is set! - # use toUpper/toLower instead. + # but /usr/xpg4/bin/tr causes problems if LC_COLLATE is set! + # use toUpper/toLower instead. ;; esac case "$OS/$MACHINE_ARCH" in @@ -142,9 +142,9 @@ SunOS) SHARE_ARCH=$OS/$HOST ;; OpenBSD) - arch=`Which arch /usr/bin:/usr/ucb:$PATH` - MACHINE_ARCH=`$arch -s` - ;; + arch=`Which arch /usr/bin:/usr/ucb:$PATH` + MACHINE_ARCH=`$arch -s` + ;; esac NAWK=awk export NAWK @@ -218,17 +218,25 @@ export HOST_TARGET case `echo -n .` in -n*) N=; C="\c";; *) N=-n; C=;; esac -export HOSTNAME HOST +Echo() { + case "$1" in + -n) _n=$N _c=$C; shift;; + *) _n= _c=;; + esac + echo $_n "$@" $_c +} + +export HOSTNAME HOST export OS MACHINE MACHINE_ARCH OSREL OSMAJOR LOCAL_FS TMP_DIRS MAILER N C K PS_AXC export LN SHARE_ARCH TR case /$0 in */os.sh) - for v in $* + for v in $* do - eval vv=\$$v - echo "$v='$vv'" + eval vv=\$$v + echo "$v='$vv'" done - ;; + ;; esac Modified: user/ngie/detangle-rc/contrib/bmake/suff.c ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/suff.c Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/contrib/bmake/suff.c Tue Dec 29 19:44:32 2015 (r292882) @@ -1,4 +1,4 @@ -/* $NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $ */ +/* $NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $"; +static char rcsid[] = "$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94"; #else -__RCSID("$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $"); +__RCSID("$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -553,7 +553,20 @@ Suff_ClearSuffixes(void) #endif sufflist = Lst_Init(FALSE); sNum = 0; - suffNull = emptySuff; + if (suffNull) + SuffFree(suffNull); + emptySuff = suffNull = bmake_malloc(sizeof(Suff)); + + suffNull->name = bmake_strdup(""); + suffNull->nameLen = 0; + suffNull->searchPath = Lst_Init(FALSE); + Dir_Concat(suffNull->searchPath, dirSearchPath); + suffNull->children = Lst_Init(FALSE); + suffNull->parents = Lst_Init(FALSE); + suffNull->ref = Lst_Init(FALSE); + suffNull->sNum = sNum++; + suffNull->flags = SUFF_NULL; + suffNull->refCount = 1; } /*- @@ -2524,32 +2537,18 @@ Suff_SetNull(char *name) void Suff_Init(void) { - sufflist = Lst_Init(FALSE); #ifdef CLEANUP suffClean = Lst_Init(FALSE); #endif srclist = Lst_Init(FALSE); transforms = Lst_Init(FALSE); - sNum = 0; /* * Create null suffix for single-suffix rules (POSIX). The thing doesn't * actually go on the suffix list or everyone will think that's its * suffix. */ - emptySuff = suffNull = bmake_malloc(sizeof(Suff)); - - suffNull->name = bmake_strdup(""); - suffNull->nameLen = 0; - suffNull->searchPath = Lst_Init(FALSE); - Dir_Concat(suffNull->searchPath, dirSearchPath); - suffNull->children = Lst_Init(FALSE); - suffNull->parents = Lst_Init(FALSE); - suffNull->ref = Lst_Init(FALSE); - suffNull->sNum = sNum++; - suffNull->flags = SUFF_NULL; - suffNull->refCount = 1; - + Suff_ClearSuffixes(); } Modified: user/ngie/detangle-rc/contrib/bsnmp/snmpd/action.c ============================================================================== --- user/ngie/detangle-rc/contrib/bsnmp/snmpd/action.c Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/contrib/bsnmp/snmpd/action.c Tue Dec 29 19:44:32 2015 (r292882) @@ -60,29 +60,6 @@ static const struct asn_oid #endif /* - * Get a string value from the KERN sysctl subtree. - */ -static char * -act_getkernstring(int id) -{ - int mib[2]; - size_t len; - char *string; - - mib[0] = CTL_KERN; - mib[1] = id; - if (sysctl(mib, 2, NULL, &len, NULL, 0) != 0) - return (NULL); - if ((string = malloc(len)) == NULL) - return (NULL); - if (sysctl(mib, 2, string, &len, NULL, 0) != 0) { - free(string); - return (NULL); - } - return (string); -} - -/* * Get an integer value from the KERN sysctl subtree. */ static char * Modified: user/ngie/detangle-rc/contrib/bsnmp/snmpd/main.c ============================================================================== --- user/ngie/detangle-rc/contrib/bsnmp/snmpd/main.c Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/contrib/bsnmp/snmpd/main.c Tue Dec 29 19:44:32 2015 (r292882) @@ -119,26 +119,30 @@ static struct lmodules modules_start = T struct community_list community_list = TAILQ_HEAD_INITIALIZER(community_list); /* list of all known USM users */ -struct usm_userlist usm_userlist = SLIST_HEAD_INITIALIZER(usm_userlist); +static struct usm_userlist usm_userlist = SLIST_HEAD_INITIALIZER(usm_userlist); /* A list of all VACM users configured, including v1, v2c and v3 */ -struct vacm_userlist vacm_userlist = SLIST_HEAD_INITIALIZER(vacm_userlist); +static struct vacm_userlist vacm_userlist = + SLIST_HEAD_INITIALIZER(vacm_userlist); /* A list of all VACM groups */ -struct vacm_grouplist vacm_grouplist = SLIST_HEAD_INITIALIZER(vacm_grouplist); +static struct vacm_grouplist vacm_grouplist = + SLIST_HEAD_INITIALIZER(vacm_grouplist); static struct vacm_group vacm_default_group = { .groupname = "", }; /* The list of configured access entries */ -struct vacm_accesslist vacm_accesslist = TAILQ_HEAD_INITIALIZER(vacm_accesslist); +static struct vacm_accesslist vacm_accesslist = + TAILQ_HEAD_INITIALIZER(vacm_accesslist); /* The list of configured views */ -struct vacm_viewlist vacm_viewlist = SLIST_HEAD_INITIALIZER(vacm_viewlist); +static struct vacm_viewlist vacm_viewlist = + SLIST_HEAD_INITIALIZER(vacm_viewlist); /* The list of configured contexts */ -struct vacm_contextlist vacm_contextlist = +static struct vacm_contextlist vacm_contextlist = SLIST_HEAD_INITIALIZER(vacm_contextlist); /* list of all installed object resources */ Modified: user/ngie/detangle-rc/contrib/bsnmp/snmpd/trap.c ============================================================================== --- user/ngie/detangle-rc/contrib/bsnmp/snmpd/trap.c Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/contrib/bsnmp/snmpd/trap.c Tue Dec 29 19:44:32 2015 (r292882) @@ -60,15 +60,15 @@ struct trapsink_list trapsink_list = TAILQ_HEAD_INITIALIZER(trapsink_list); /* List of target addresses */ -struct target_addresslist target_addresslist = +static struct target_addresslist target_addresslist = SLIST_HEAD_INITIALIZER(target_addresslist); /* List of target parameters */ -struct target_paramlist target_paramlist = +static struct target_paramlist target_paramlist = SLIST_HEAD_INITIALIZER(target_paramlist); /* List of notification targets */ -struct target_notifylist target_notifylist = +static struct target_notifylist target_notifylist = SLIST_HEAD_INITIALIZER(target_notifylist); static const struct asn_oid oid_begemotTrapSinkTable = Modified: user/ngie/detangle-rc/contrib/gcc/config/rs6000/sysv4.h ============================================================================== --- user/ngie/detangle-rc/contrib/gcc/config/rs6000/sysv4.h Tue Dec 29 19:20:39 2015 (r292881) +++ user/ngie/detangle-rc/contrib/gcc/config/rs6000/sysv4.h Tue Dec 29 19:44:32 2015 (r292882) @@ -282,7 +282,9 @@ do { \ #define RESTORE_FP_SUFFIX "_l" /* Type used for ptrdiff_t, as a string used in a declaration. */ +#ifndef PTRDIFF_TYPE #define PTRDIFF_TYPE "int" +#endif *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Tue Dec 29 19:56:31 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D14B7A55CBA for ; Tue, 29 Dec 2015 19:56:31 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4229B1D43; Tue, 29 Dec 2015 19:56:31 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBTJuUAV057586; Tue, 29 Dec 2015 19:56:30 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBTJuRaQ057553; Tue, 29 Dec 2015 19:56:27 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512291956.tBTJuRaQ057553@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 29 Dec 2015 19:56:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292883 - in user/ngie/more-tests2: . bin/pax bin/sh bin/sh/tests/expansion cddl/contrib/opensolaris/cmd/zdb cddl/sbin/zfs cddl/sbin/zpool cddl/usr.sbin/zdb cddl/usr.sbin/zhack contrib/... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2015 19:56:31 -0000 Author: ngie Date: Tue Dec 29 19:56:26 2015 New Revision: 292883 URL: https://svnweb.freebsd.org/changeset/base/292883 Log: MFhead @ r292618 Added: user/ngie/more-tests2/bin/sh/tests/expansion/trim9.0 - copied unchanged from r292882, head/bin/sh/tests/expansion/trim9.0 user/ngie/more-tests2/contrib/llvm/patches/patch-08-clang-cc1as-dwarf2.diff - copied unchanged from r292882, head/contrib/llvm/patches/patch-08-clang-cc1as-dwarf2.diff user/ngie/more-tests2/lib/libc/stdlib/hcreate_r.c - copied unchanged from r292882, head/lib/libc/stdlib/hcreate_r.c user/ngie/more-tests2/lib/libc/stdlib/hdestroy_r.c - copied unchanged from r292882, head/lib/libc/stdlib/hdestroy_r.c user/ngie/more-tests2/lib/libc/stdlib/hsearch.h - copied unchanged from r292882, head/lib/libc/stdlib/hsearch.h user/ngie/more-tests2/lib/libc/stdlib/hsearch_r.c - copied unchanged from r292882, head/lib/libc/stdlib/hsearch_r.c user/ngie/more-tests2/lib/libc/stdlib/tsearch_path.h - copied unchanged from r292882, head/lib/libc/stdlib/tsearch_path.h user/ngie/more-tests2/lib/libc/tests/stdlib/tsearch_test.c - copied unchanged from r292882, head/lib/libc/tests/stdlib/tsearch_test.c user/ngie/more-tests2/lib/libsysdecode/mkioctls - copied unchanged from r292882, head/lib/libsysdecode/mkioctls user/ngie/more-tests2/lib/libsysdecode/sysdecode_ioctlname.3 - copied unchanged from r292882, head/lib/libsysdecode/sysdecode_ioctlname.3 user/ngie/more-tests2/lib/msun/tests/ctrig_test.c - copied unchanged from r292882, head/lib/msun/tests/ctrig_test.c user/ngie/more-tests2/lib/msun/tests/exponential_test.c - copied unchanged from r292882, head/lib/msun/tests/exponential_test.c user/ngie/more-tests2/lib/msun/tests/fma_test.c - copied unchanged from r292882, head/lib/msun/tests/fma_test.c user/ngie/more-tests2/lib/msun/tests/invtrig_test.c - copied unchanged from r292882, head/lib/msun/tests/invtrig_test.c user/ngie/more-tests2/lib/msun/tests/lround_test.c - copied unchanged from r292882, head/lib/msun/tests/lround_test.c user/ngie/more-tests2/lib/msun/tests/lround_test.t - copied unchanged from r292882, head/lib/msun/tests/lround_test.t user/ngie/more-tests2/lib/msun/tests/test-utils.h - copied unchanged from r292882, head/lib/msun/tests/test-utils.h user/ngie/more-tests2/libexec/rtld-elf/riscv/ - copied from r292882, head/libexec/rtld-elf/riscv/ user/ngie/more-tests2/share/man/man4/mdio.4 - copied unchanged from r292882, head/share/man/man4/mdio.4 user/ngie/more-tests2/sys/arm/arm/ofw_machdep.c - copied unchanged from r292882, head/sys/arm/arm/ofw_machdep.c user/ngie/more-tests2/sys/arm/freescale/imx/imx6_hdmi.c - copied unchanged from r292882, head/sys/arm/freescale/imx/imx6_hdmi.c user/ngie/more-tests2/sys/arm/freescale/imx/imx6_hdmireg.h - copied unchanged from r292882, head/sys/arm/freescale/imx/imx6_hdmireg.h user/ngie/more-tests2/sys/arm/freescale/imx/imx6_ipu.c - copied unchanged from r292882, head/sys/arm/freescale/imx/imx6_ipu.c user/ngie/more-tests2/sys/arm/freescale/imx/imx_iomuxreg.h - copied unchanged from r292882, head/sys/arm/freescale/imx/imx_iomuxreg.h user/ngie/more-tests2/sys/compat/linuxkpi/common/include/linux/srcu.h - copied unchanged from r292882, head/sys/compat/linuxkpi/common/include/linux/srcu.h user/ngie/more-tests2/sys/crypto/sha2/sha384.h - copied unchanged from r292882, head/sys/crypto/sha2/sha384.h user/ngie/more-tests2/sys/crypto/sha2/sha512.h - copied unchanged from r292882, head/sys/crypto/sha2/sha512.h user/ngie/more-tests2/sys/crypto/sha2/sha512c.c - copied unchanged from r292882, head/sys/crypto/sha2/sha512c.c user/ngie/more-tests2/sys/dev/bxe/bxe_dump.h - copied unchanged from r292882, head/sys/dev/bxe/bxe_dump.h user/ngie/more-tests2/sys/dev/bxe/bxe_ioctl.h - copied unchanged from r292882, head/sys/dev/bxe/bxe_ioctl.h user/ngie/more-tests2/sys/dev/cxgbe/cxgbei/ - copied from r292882, head/sys/dev/cxgbe/cxgbei/ user/ngie/more-tests2/sys/dev/ixgbe/ixgbe_osdep.c - copied unchanged from r292882, head/sys/dev/ixgbe/ixgbe_osdep.c user/ngie/more-tests2/sys/dev/mdio/ - copied from r292882, head/sys/dev/mdio/ user/ngie/more-tests2/sys/dev/ofw/ofw_subr.c - copied unchanged from r292882, head/sys/dev/ofw/ofw_subr.c user/ngie/more-tests2/sys/dev/ofw/ofw_subr.h - copied unchanged from r292882, head/sys/dev/ofw/ofw_subr.h user/ngie/more-tests2/sys/mips/conf/MT7620 - copied unchanged from r292882, head/sys/mips/conf/MT7620 user/ngie/more-tests2/sys/mips/conf/MT7620.hints - copied unchanged from r292882, head/sys/mips/conf/MT7620.hints user/ngie/more-tests2/sys/mips/conf/RT5350 - copied unchanged from r292882, head/sys/mips/conf/RT5350 user/ngie/more-tests2/sys/mips/conf/RT5350.hints - copied unchanged from r292882, head/sys/mips/conf/RT5350.hints user/ngie/more-tests2/sys/mips/mips/ofw_machdep.c - copied unchanged from r292882, head/sys/mips/mips/ofw_machdep.c user/ngie/more-tests2/sys/mips/rt305x/rt305x_ehci.c - copied unchanged from r292882, head/sys/mips/rt305x/rt305x_ehci.c user/ngie/more-tests2/sys/mips/rt305x/rt305x_ohci.c - copied unchanged from r292882, head/sys/mips/rt305x/rt305x_ohci.c user/ngie/more-tests2/sys/mips/rt305x/rt305x_pci.c - copied unchanged from r292882, head/sys/mips/rt305x/rt305x_pci.c user/ngie/more-tests2/sys/mips/rt305x/rt305x_pcireg.h - copied unchanged from r292882, head/sys/mips/rt305x/rt305x_pcireg.h user/ngie/more-tests2/sys/mips/rt305x/rt305x_spi.c - copied unchanged from r292882, head/sys/mips/rt305x/rt305x_spi.c user/ngie/more-tests2/sys/modules/cxgbe/cxgbei/ - copied from r292882, head/sys/modules/cxgbe/cxgbei/ user/ngie/more-tests2/sys/modules/mdio/ - copied from r292882, head/sys/modules/mdio/ user/ngie/more-tests2/sys/netinet/tcp_fastopen.c - copied unchanged from r292882, head/sys/netinet/tcp_fastopen.c user/ngie/more-tests2/sys/netinet/tcp_fastopen.h - copied unchanged from r292882, head/sys/netinet/tcp_fastopen.h user/ngie/more-tests2/sys/x86/include/cputypes.h - copied unchanged from r292882, head/sys/x86/include/cputypes.h user/ngie/more-tests2/tests/sys/mac/ - copied from r292882, head/tests/sys/mac/ Replaced: user/ngie/more-tests2/lib/libc/stdlib/hcreate.c - copied unchanged from r292882, head/lib/libc/stdlib/hcreate.c Deleted: user/ngie/more-tests2/contrib/llvm/patches/patch-08-llvm-r250085-fix-avx-crash.diff user/ngie/more-tests2/contrib/llvm/patches/patch-09-clang-r250657-openmp.diff user/ngie/more-tests2/contrib/llvm/patches/patch-10-clang-cc1as-dwarf2.diff user/ngie/more-tests2/lib/libmd/sha512.h user/ngie/more-tests2/lib/libmd/sha512c.c user/ngie/more-tests2/sys/crypto/sha2/sha2.c user/ngie/more-tests2/sys/crypto/sha2/sha2.h user/ngie/more-tests2/sys/dev/etherswitch/mdio.c user/ngie/more-tests2/sys/dev/etherswitch/mdio.h user/ngie/more-tests2/sys/dev/etherswitch/mdio_if.m user/ngie/more-tests2/sys/dev/ixgbe/LICENSE user/ngie/more-tests2/sys/dev/ixgbe/README user/ngie/more-tests2/tools/regression/lib/msun/ user/ngie/more-tests2/tools/regression/mac/ user/ngie/more-tests2/usr.bin/kdump/mkioctls Modified: user/ngie/more-tests2/MAINTAINERS (contents, props changed) user/ngie/more-tests2/Makefile.inc1 user/ngie/more-tests2/ObsoleteFiles.inc user/ngie/more-tests2/bin/pax/pat_rep.c user/ngie/more-tests2/bin/sh/mknodes.c user/ngie/more-tests2/bin/sh/tests/expansion/Makefile user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/zdb/zdb.c user/ngie/more-tests2/cddl/sbin/zfs/Makefile user/ngie/more-tests2/cddl/sbin/zpool/Makefile user/ngie/more-tests2/cddl/usr.sbin/zdb/Makefile user/ngie/more-tests2/cddl/usr.sbin/zhack/Makefile user/ngie/more-tests2/contrib/binutils/bfd/elf32-arm.c user/ngie/more-tests2/contrib/bmake/ChangeLog user/ngie/more-tests2/contrib/bmake/Makefile user/ngie/more-tests2/contrib/bmake/mk/ChangeLog user/ngie/more-tests2/contrib/bmake/mk/auto.obj.mk user/ngie/more-tests2/contrib/bmake/mk/install-mk user/ngie/more-tests2/contrib/bmake/os.sh user/ngie/more-tests2/contrib/bmake/suff.c user/ngie/more-tests2/contrib/bsnmp/snmpd/action.c user/ngie/more-tests2/contrib/bsnmp/snmpd/main.c user/ngie/more-tests2/contrib/bsnmp/snmpd/trap.c user/ngie/more-tests2/contrib/gcc/config/rs6000/sysv4.h user/ngie/more-tests2/contrib/libexecinfo/backtrace.3 user/ngie/more-tests2/contrib/llvm/include/llvm-c/Core.h user/ngie/more-tests2/contrib/llvm/include/llvm/CodeGen/CommandFlags.h user/ngie/more-tests2/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.cpp user/ngie/more-tests2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp user/ngie/more-tests2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp user/ngie/more-tests2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp user/ngie/more-tests2/contrib/llvm/lib/IR/AsmWriter.cpp user/ngie/more-tests2/contrib/llvm/lib/IR/Core.cpp user/ngie/more-tests2/contrib/llvm/lib/LTO/LTOCodeGenerator.cpp user/ngie/more-tests2/contrib/llvm/lib/MC/MCContext.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.td user/ngie/more-tests2/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/AMDGPU/SIISelLowering.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.h user/ngie/more-tests2/contrib/llvm/lib/Target/AMDGPU/SIInstructions.td user/ngie/more-tests2/contrib/llvm/lib/Target/AMDGPU/SIPrepareScratchRegs.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.h user/ngie/more-tests2/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/BPF/BPFISelDAGToDAG.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/BPF/BPFISelLowering.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/BPF/BPFInstrInfo.td user/ngie/more-tests2/contrib/llvm/lib/Target/BPF/BPFRegisterInfo.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/Mips/MipsISelLowering.h user/ngie/more-tests2/contrib/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td user/ngie/more-tests2/contrib/llvm/lib/Target/PowerPC/PPCInstrQPX.td user/ngie/more-tests2/contrib/llvm/lib/Target/PowerPC/PPCInstrVSX.td user/ngie/more-tests2/contrib/llvm/lib/Target/PowerPC/PPCVSXFMAMutate.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp user/ngie/more-tests2/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp (contents, props changed) user/ngie/more-tests2/contrib/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp user/ngie/more-tests2/contrib/llvm/lib/Transforms/Scalar/GVN.cpp user/ngie/more-tests2/contrib/llvm/lib/Transforms/Utils/Local.cpp user/ngie/more-tests2/contrib/llvm/patches/README.TXT user/ngie/more-tests2/contrib/llvm/tools/clang/lib/Basic/Targets.cpp user/ngie/more-tests2/contrib/llvm/tools/clang/lib/Basic/Version.cpp user/ngie/more-tests2/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp user/ngie/more-tests2/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp user/ngie/more-tests2/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp user/ngie/more-tests2/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp user/ngie/more-tests2/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm64.cpp user/ngie/more-tests2/contrib/llvm/tools/llvm-lto/llvm-lto.cpp user/ngie/more-tests2/contrib/netbsd-tests/lib/libc/gen/t_assert.c user/ngie/more-tests2/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh user/ngie/more-tests2/contrib/netbsd-tests/usr.bin/grep/d_binary.out user/ngie/more-tests2/contrib/netbsd-tests/usr.bin/grep/t_grep.sh user/ngie/more-tests2/contrib/smbfs/lib/smb/nb_name.c user/ngie/more-tests2/etc/defaults/rc.conf user/ngie/more-tests2/etc/mtree/BSD.debug.dist user/ngie/more-tests2/etc/mtree/BSD.tests.dist user/ngie/more-tests2/etc/mtree/BSD.usr.dist user/ngie/more-tests2/etc/rc.d/NETWORKING user/ngie/more-tests2/etc/rc.d/jail user/ngie/more-tests2/etc/rc.d/netwait user/ngie/more-tests2/etc/services user/ngie/more-tests2/gnu/usr.bin/binutils/ld/Makefile user/ngie/more-tests2/include/netdb.h user/ngie/more-tests2/include/search.h user/ngie/more-tests2/lib/Makefile user/ngie/more-tests2/lib/clang/include/Makefile user/ngie/more-tests2/lib/clang/include/clang/Basic/Version.inc user/ngie/more-tests2/lib/clang/include/clang/Config/config.h user/ngie/more-tests2/lib/clang/include/llvm/Config/config.h user/ngie/more-tests2/lib/clang/include/llvm/Config/llvm-config.h user/ngie/more-tests2/lib/libc/Makefile user/ngie/more-tests2/lib/libc/arm/sys/__vdso_gettc.c user/ngie/more-tests2/lib/libc/gen/getpeereid.c user/ngie/more-tests2/lib/libc/gen/lockf.c user/ngie/more-tests2/lib/libc/gen/nlist.c user/ngie/more-tests2/lib/libc/gen/sysconf.c user/ngie/more-tests2/lib/libc/iconv/citrus_mmap.c user/ngie/more-tests2/lib/libc/net/getaddrinfo.3 user/ngie/more-tests2/lib/libc/net/getaddrinfo.c user/ngie/more-tests2/lib/libc/net/gethostbynis.c user/ngie/more-tests2/lib/libc/net/map_v4v6.c user/ngie/more-tests2/lib/libc/net/name6.c user/ngie/more-tests2/lib/libc/net/netdb_private.h user/ngie/more-tests2/lib/libc/net/rcmdsh.c user/ngie/more-tests2/lib/libc/stdio/findfp.c user/ngie/more-tests2/lib/libc/stdlib/Makefile.inc user/ngie/more-tests2/lib/libc/stdlib/hcreate.3 user/ngie/more-tests2/lib/libc/stdlib/tdelete.c user/ngie/more-tests2/lib/libc/stdlib/tsearch.3 user/ngie/more-tests2/lib/libc/stdlib/tsearch.c user/ngie/more-tests2/lib/libc/sys/clock_gettime.2 user/ngie/more-tests2/lib/libc/sys/gettimeofday.2 user/ngie/more-tests2/lib/libc/tests/resolv/Makefile user/ngie/more-tests2/lib/libc/tests/resolv/resolv_test.c user/ngie/more-tests2/lib/libc/tests/stdlib/Makefile user/ngie/more-tests2/lib/libclang_rt/Makefile.inc user/ngie/more-tests2/lib/libcrypt/Makefile user/ngie/more-tests2/lib/libcuse/cuse_lib.c user/ngie/more-tests2/lib/libmd/Makefile user/ngie/more-tests2/lib/libmd/sha512.3 user/ngie/more-tests2/lib/libmd/shadriver.c user/ngie/more-tests2/lib/libstand/bootp.c user/ngie/more-tests2/lib/libsysdecode/Makefile user/ngie/more-tests2/lib/libsysdecode/sysdecode.3 user/ngie/more-tests2/lib/libsysdecode/sysdecode.h user/ngie/more-tests2/lib/libthr/thread/thr_fork.c user/ngie/more-tests2/lib/libthr/thread/thr_init.c user/ngie/more-tests2/lib/libthr/thread/thr_private.h user/ngie/more-tests2/lib/msun/tests/Makefile user/ngie/more-tests2/libexec/rtld-elf/arm/reloc.c user/ngie/more-tests2/libexec/rtld-elf/rtld.c user/ngie/more-tests2/sbin/gbde/Makefile user/ngie/more-tests2/sbin/gbde/gbde.c user/ngie/more-tests2/sbin/geom/class/eli/Makefile user/ngie/more-tests2/sbin/ifconfig/Makefile user/ngie/more-tests2/sbin/ifconfig/sfp.c user/ngie/more-tests2/sbin/md5/Makefile user/ngie/more-tests2/sbin/md5/md5.1 user/ngie/more-tests2/sbin/md5/md5.c user/ngie/more-tests2/sbin/mount/mount.c user/ngie/more-tests2/sbin/umount/umount.c user/ngie/more-tests2/share/examples/tests/tests/atf/printf_test.c user/ngie/more-tests2/share/man/man4/Makefile user/ngie/more-tests2/share/man/man5/procfs.5 user/ngie/more-tests2/share/man/man9/Makefile user/ngie/more-tests2/share/man/man9/pci.9 user/ngie/more-tests2/share/man/man9/zone.9 user/ngie/more-tests2/share/misc/committers-ports.dot user/ngie/more-tests2/share/misc/organization.dot user/ngie/more-tests2/share/mk/bsd.README user/ngie/more-tests2/share/mk/bsd.lib.mk user/ngie/more-tests2/share/mk/bsd.test.mk user/ngie/more-tests2/share/mk/suite.test.mk user/ngie/more-tests2/share/mk/sys.mk user/ngie/more-tests2/share/mk/tap.test.mk user/ngie/more-tests2/share/timedef/ja_JP.SJIS.src user/ngie/more-tests2/share/timedef/ja_JP.UTF-8.src user/ngie/more-tests2/share/timedef/ja_JP.eucJP.src user/ngie/more-tests2/sys/amd64/amd64/initcpu.c user/ngie/more-tests2/sys/amd64/include/cputypes.h user/ngie/more-tests2/sys/amd64/include/md_var.h user/ngie/more-tests2/sys/arm/arm/locore-v4.S user/ngie/more-tests2/sys/arm/arm/pmap-v6-new.c user/ngie/more-tests2/sys/arm/at91/std.bwct user/ngie/more-tests2/sys/arm/at91/std.eb9200 user/ngie/more-tests2/sys/arm/at91/std.ethernut5 user/ngie/more-tests2/sys/arm/at91/std.hl200 user/ngie/more-tests2/sys/arm/at91/std.hl201 user/ngie/more-tests2/sys/arm/at91/std.kb920x user/ngie/more-tests2/sys/arm/at91/std.qila9g20 user/ngie/more-tests2/sys/arm/at91/std.sam9260ek user/ngie/more-tests2/sys/arm/at91/std.sam9g20ek user/ngie/more-tests2/sys/arm/at91/std.sam9x25ek user/ngie/more-tests2/sys/arm/at91/std.sn9g45 user/ngie/more-tests2/sys/arm/at91/std.tsc4370 user/ngie/more-tests2/sys/arm/broadcom/bcm2835/bcm2835_fbd.c user/ngie/more-tests2/sys/arm/cavium/cns11xx/std.econa user/ngie/more-tests2/sys/arm/conf/ATMEL user/ngie/more-tests2/sys/arm/conf/CNS11XXNAS user/ngie/more-tests2/sys/arm/conf/CRB user/ngie/more-tests2/sys/arm/conf/GUMSTIX user/ngie/more-tests2/sys/arm/conf/IMX6 user/ngie/more-tests2/sys/arm/conf/NOTES user/ngie/more-tests2/sys/arm/conf/NSLU user/ngie/more-tests2/sys/arm/conf/SAM9260EK user/ngie/more-tests2/sys/arm/conf/SAM9G20EK user/ngie/more-tests2/sys/arm/freescale/imx/files.imx6 user/ngie/more-tests2/sys/arm/freescale/imx/imx6_ccm.c user/ngie/more-tests2/sys/arm/freescale/imx/imx6_ccmreg.h user/ngie/more-tests2/sys/arm/freescale/imx/imx_ccmvar.h user/ngie/more-tests2/sys/arm/include/ofw_machdep.h user/ngie/more-tests2/sys/arm/lpc/std.lpc user/ngie/more-tests2/sys/arm/mv/discovery/std.db78xxx user/ngie/more-tests2/sys/arm/mv/kirkwood/std.kirkwood user/ngie/more-tests2/sys/arm/mv/orion/std.db88f5xxx user/ngie/more-tests2/sys/arm/mv/orion/std.ts7800 user/ngie/more-tests2/sys/arm/xscale/i80321/ep80219_machdep.c user/ngie/more-tests2/sys/arm/xscale/i80321/iq31244_machdep.c user/ngie/more-tests2/sys/arm/xscale/i8134x/crb_machdep.c user/ngie/more-tests2/sys/arm/xscale/ixp425/avila_machdep.c user/ngie/more-tests2/sys/arm/xscale/ixp425/std.avila user/ngie/more-tests2/sys/arm/xscale/pxa/pxa_machdep.c user/ngie/more-tests2/sys/arm64/include/setjmp.h user/ngie/more-tests2/sys/boot/efi/boot1/boot1.c user/ngie/more-tests2/sys/boot/efi/loader/Makefile user/ngie/more-tests2/sys/boot/efi/loader/arch/amd64/framebuffer.c user/ngie/more-tests2/sys/boot/efi/loader/bootinfo.c user/ngie/more-tests2/sys/boot/efi/loader/devicename.c user/ngie/more-tests2/sys/boot/efi/loader/main.c user/ngie/more-tests2/sys/boot/i386/libi386/biosmem.c user/ngie/more-tests2/sys/boot/i386/zfsboot/zfsboot.c user/ngie/more-tests2/sys/boot/libstand32/Makefile user/ngie/more-tests2/sys/boot/pc98/boot2/boot2.c user/ngie/more-tests2/sys/boot/pc98/libpc98/biosdisk.c user/ngie/more-tests2/sys/bsm/audit.h user/ngie/more-tests2/sys/bsm/audit_domain.h user/ngie/more-tests2/sys/bsm/audit_errno.h user/ngie/more-tests2/sys/bsm/audit_fcntl.h user/ngie/more-tests2/sys/bsm/audit_internal.h user/ngie/more-tests2/sys/bsm/audit_kevents.h user/ngie/more-tests2/sys/bsm/audit_record.h user/ngie/more-tests2/sys/bsm/audit_socket_type.h user/ngie/more-tests2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c user/ngie/more-tests2/sys/cddl/dev/fbt/arm/fbt_isa.c user/ngie/more-tests2/sys/compat/linux/linux_futex.c user/ngie/more-tests2/sys/compat/linux/linux_timer.c user/ngie/more-tests2/sys/compat/linuxkpi/common/include/linux/compiler.h user/ngie/more-tests2/sys/compat/linuxkpi/common/include/linux/kobject.h user/ngie/more-tests2/sys/compat/linuxkpi/common/include/linux/workqueue.h user/ngie/more-tests2/sys/compat/linuxkpi/common/src/linux_compat.c user/ngie/more-tests2/sys/conf/Makefile.mips user/ngie/more-tests2/sys/conf/files user/ngie/more-tests2/sys/conf/files.arm user/ngie/more-tests2/sys/conf/files.mips user/ngie/more-tests2/sys/conf/files.powerpc user/ngie/more-tests2/sys/conf/kern.mk user/ngie/more-tests2/sys/conf/kmod.mk user/ngie/more-tests2/sys/conf/options user/ngie/more-tests2/sys/conf/options.arm user/ngie/more-tests2/sys/conf/options.mips user/ngie/more-tests2/sys/contrib/ipfilter/netinet/ip_nat.c user/ngie/more-tests2/sys/crypto/sha2/sha256.h user/ngie/more-tests2/sys/dev/bxe/bxe.c user/ngie/more-tests2/sys/dev/bxe/bxe.h user/ngie/more-tests2/sys/dev/bxe/bxe_stats.c user/ngie/more-tests2/sys/dev/bxe/bxe_stats.h user/ngie/more-tests2/sys/dev/bxe/ecore_init.h user/ngie/more-tests2/sys/dev/cxgbe/adapter.h user/ngie/more-tests2/sys/dev/cxgbe/offload.h user/ngie/more-tests2/sys/dev/cxgbe/t4_main.c user/ngie/more-tests2/sys/dev/cxgbe/tom/t4_cpl_io.c user/ngie/more-tests2/sys/dev/cxgbe/tom/t4_ddp.c user/ngie/more-tests2/sys/dev/cxgbe/tom/t4_tom.c user/ngie/more-tests2/sys/dev/cxgbe/tom/t4_tom.h user/ngie/more-tests2/sys/dev/e1000/if_igb.c user/ngie/more-tests2/sys/dev/e1000/if_igb.h user/ngie/more-tests2/sys/dev/etherswitch/arswitch/arswitch.c user/ngie/more-tests2/sys/dev/etherswitch/arswitch/arswitch_7240.c user/ngie/more-tests2/sys/dev/etherswitch/arswitch/arswitch_8216.c user/ngie/more-tests2/sys/dev/etherswitch/arswitch/arswitch_8226.c user/ngie/more-tests2/sys/dev/etherswitch/arswitch/arswitch_8316.c user/ngie/more-tests2/sys/dev/etherswitch/arswitch/arswitch_8327.c user/ngie/more-tests2/sys/dev/etherswitch/arswitch/arswitch_9340.c user/ngie/more-tests2/sys/dev/etherswitch/arswitch/arswitch_phy.c user/ngie/more-tests2/sys/dev/etherswitch/arswitch/arswitch_reg.c user/ngie/more-tests2/sys/dev/etherswitch/e6000sw/e6000sw.c user/ngie/more-tests2/sys/dev/etherswitch/ip17x/ip17x.c user/ngie/more-tests2/sys/dev/etherswitch/ukswitch/ukswitch.c user/ngie/more-tests2/sys/dev/hyperv/include/hyperv.h user/ngie/more-tests2/sys/dev/hyperv/vmbus/hv_channel_mgmt.c user/ngie/more-tests2/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c user/ngie/more-tests2/sys/dev/hyperv/vmbus/hv_vmbus_priv.h user/ngie/more-tests2/sys/dev/isci/scil/scic_sds_phy.h user/ngie/more-tests2/sys/dev/iscsi/iscsi.c user/ngie/more-tests2/sys/dev/isp/isp.c user/ngie/more-tests2/sys/dev/isp/isp_freebsd.c user/ngie/more-tests2/sys/dev/isp/isp_freebsd.h user/ngie/more-tests2/sys/dev/isp/isp_library.c user/ngie/more-tests2/sys/dev/isp/isp_library.h user/ngie/more-tests2/sys/dev/isp/isp_pci.c user/ngie/more-tests2/sys/dev/isp/isp_sbus.c user/ngie/more-tests2/sys/dev/isp/isp_target.c user/ngie/more-tests2/sys/dev/isp/ispmbox.h user/ngie/more-tests2/sys/dev/isp/ispvar.h user/ngie/more-tests2/sys/dev/ixgbe/if_ix.c user/ngie/more-tests2/sys/dev/ixgbe/if_ixv.c user/ngie/more-tests2/sys/dev/ixgbe/ix_txrx.c user/ngie/more-tests2/sys/dev/ixgbe/ixgbe.h user/ngie/more-tests2/sys/dev/ixgbe/ixgbe_82598.c user/ngie/more-tests2/sys/dev/ixgbe/ixgbe_82599.c user/ngie/more-tests2/sys/dev/ixgbe/ixgbe_api.c user/ngie/more-tests2/sys/dev/ixgbe/ixgbe_api.h user/ngie/more-tests2/sys/dev/ixgbe/ixgbe_common.c user/ngie/more-tests2/sys/dev/ixgbe/ixgbe_dcb.c user/ngie/more-tests2/sys/dev/ixgbe/ixgbe_osdep.h user/ngie/more-tests2/sys/dev/ixgbe/ixgbe_phy.c user/ngie/more-tests2/sys/dev/ixgbe/ixgbe_phy.h user/ngie/more-tests2/sys/dev/ixgbe/ixgbe_type.h user/ngie/more-tests2/sys/dev/ixgbe/ixgbe_vf.c user/ngie/more-tests2/sys/dev/ixgbe/ixgbe_x540.c user/ngie/more-tests2/sys/dev/ixgbe/ixgbe_x550.c user/ngie/more-tests2/sys/dev/ixgbe/ixgbe_x550.h user/ngie/more-tests2/sys/dev/mge/if_mge.c user/ngie/more-tests2/sys/dev/mlx5/device.h user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/en.h user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_main.c user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c user/ngie/more-tests2/sys/dev/netmap/netmap.c user/ngie/more-tests2/sys/dev/ofw/openfirm.h user/ngie/more-tests2/sys/dev/pci/pci.c user/ngie/more-tests2/sys/dev/pci/pci_if.m user/ngie/more-tests2/sys/dev/pci/pci_private.h user/ngie/more-tests2/sys/dev/pci/pcivar.h user/ngie/more-tests2/sys/dev/puc/pucdata.c user/ngie/more-tests2/sys/dev/random/build.sh user/ngie/more-tests2/sys/dev/random/fortuna.c user/ngie/more-tests2/sys/dev/random/hash.c user/ngie/more-tests2/sys/dev/random/other_algorithm.c user/ngie/more-tests2/sys/dev/random/randomdev.c user/ngie/more-tests2/sys/dev/random/unit_test.c user/ngie/more-tests2/sys/dev/random/yarrow.c user/ngie/more-tests2/sys/dev/rt/if_rt.c user/ngie/more-tests2/sys/dev/rt/if_rtreg.h user/ngie/more-tests2/sys/dev/rt/if_rtvar.h user/ngie/more-tests2/sys/dev/usb/controller/xhci.h user/ngie/more-tests2/sys/dev/usb/controller/xhci_pci.c user/ngie/more-tests2/sys/dev/usb/usb_lookup.c user/ngie/more-tests2/sys/dev/usb/usbdi.h user/ngie/more-tests2/sys/fs/cuse/cuse.c user/ngie/more-tests2/sys/fs/cuse/cuse_ioctl.h user/ngie/more-tests2/sys/fs/devfs/devfs_vnops.c user/ngie/more-tests2/sys/fs/ext2fs/ext2fs.h user/ngie/more-tests2/sys/geom/bde/g_bde.c user/ngie/more-tests2/sys/geom/bde/g_bde_crypt.c user/ngie/more-tests2/sys/geom/bde/g_bde_lock.c user/ngie/more-tests2/sys/geom/bde/g_bde_work.c user/ngie/more-tests2/sys/geom/eli/g_eli.h user/ngie/more-tests2/sys/geom/geom_map.c user/ngie/more-tests2/sys/geom/part/g_part.c user/ngie/more-tests2/sys/geom/part/g_part.h user/ngie/more-tests2/sys/geom/part/g_part_gpt.c user/ngie/more-tests2/sys/i386/i386/initcpu.c user/ngie/more-tests2/sys/i386/include/cputypes.h user/ngie/more-tests2/sys/kern/imgact_elf.c user/ngie/more-tests2/sys/kern/kern_mbuf.c user/ngie/more-tests2/sys/kern/kern_resource.c user/ngie/more-tests2/sys/kern/kern_time.c user/ngie/more-tests2/sys/kern/link_elf.c user/ngie/more-tests2/sys/mips/atheros/if_arge.c user/ngie/more-tests2/sys/mips/cavium/cvmx_config.h user/ngie/more-tests2/sys/mips/conf/RT305X user/ngie/more-tests2/sys/mips/include/cpufunc.h user/ngie/more-tests2/sys/mips/include/cpuinfo.h user/ngie/more-tests2/sys/mips/include/cpuregs.h user/ngie/more-tests2/sys/mips/include/ofw_machdep.h user/ngie/more-tests2/sys/mips/include/pte.h user/ngie/more-tests2/sys/mips/mips/cpu.c user/ngie/more-tests2/sys/mips/rt305x/files.rt305x user/ngie/more-tests2/sys/mips/rt305x/obio.c user/ngie/more-tests2/sys/mips/rt305x/rt305x_dotg.c user/ngie/more-tests2/sys/mips/rt305x/rt305x_machdep.c user/ngie/more-tests2/sys/mips/rt305x/rt305x_sysctl.c user/ngie/more-tests2/sys/mips/rt305x/rt305xreg.h user/ngie/more-tests2/sys/mips/rt305x/uart_bus_rt305x.c user/ngie/more-tests2/sys/mips/rt305x/uart_cpu_rt305x.c user/ngie/more-tests2/sys/modules/Makefile user/ngie/more-tests2/sys/modules/crypto/Makefile user/ngie/more-tests2/sys/modules/cxgbe/Makefile user/ngie/more-tests2/sys/modules/geom/geom_bde/Makefile user/ngie/more-tests2/sys/modules/ix/Makefile user/ngie/more-tests2/sys/modules/ixv/Makefile user/ngie/more-tests2/sys/modules/tcp/fastpath/Makefile user/ngie/more-tests2/sys/modules/usb/rsufw/Makefile.inc user/ngie/more-tests2/sys/modules/usb/urtwnfw/Makefile.inc user/ngie/more-tests2/sys/modules/zfs/Makefile user/ngie/more-tests2/sys/net/bpf.c user/ngie/more-tests2/sys/net/if.c user/ngie/more-tests2/sys/net/if_llatbl.c user/ngie/more-tests2/sys/net/sff8436.h user/ngie/more-tests2/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c user/ngie/more-tests2/sys/netinet/if_ether.c user/ngie/more-tests2/sys/netinet/in_rmx.c user/ngie/more-tests2/sys/netinet/sctp_indata.c user/ngie/more-tests2/sys/netinet/sctp_os_bsd.h user/ngie/more-tests2/sys/netinet/sctp_output.c user/ngie/more-tests2/sys/netinet/tcp.h user/ngie/more-tests2/sys/netinet/tcp_input.c user/ngie/more-tests2/sys/netinet/tcp_output.c user/ngie/more-tests2/sys/netinet/tcp_subr.c user/ngie/more-tests2/sys/netinet/tcp_syncache.c user/ngie/more-tests2/sys/netinet/tcp_syncache.h user/ngie/more-tests2/sys/netinet/tcp_timer.c user/ngie/more-tests2/sys/netinet/tcp_usrreq.c user/ngie/more-tests2/sys/netinet/tcp_var.h user/ngie/more-tests2/sys/netinet/udp_usrreq.c user/ngie/more-tests2/sys/netinet6/in6.c user/ngie/more-tests2/sys/netinet6/in6_rmx.c user/ngie/more-tests2/sys/opencrypto/xform.h user/ngie/more-tests2/sys/powerpc/booke/pmap.c user/ngie/more-tests2/sys/powerpc/include/ofw_machdep.h user/ngie/more-tests2/sys/powerpc/include/param.h user/ngie/more-tests2/sys/powerpc/include/platform.h user/ngie/more-tests2/sys/powerpc/include/pmap.h user/ngie/more-tests2/sys/powerpc/ofw/ofw_machdep.c user/ngie/more-tests2/sys/powerpc/powerpc/cpu.c user/ngie/more-tests2/sys/powerpc/powerpc/machdep.c user/ngie/more-tests2/sys/powerpc/powerpc/platform.c user/ngie/more-tests2/sys/powerpc/powerpc/pmap_dispatch.c user/ngie/more-tests2/sys/security/audit/bsm_domain.c user/ngie/more-tests2/sys/security/audit/bsm_errno.c user/ngie/more-tests2/sys/security/audit/bsm_fcntl.c user/ngie/more-tests2/sys/security/audit/bsm_socket_type.c user/ngie/more-tests2/sys/security/audit/bsm_token.c user/ngie/more-tests2/sys/sys/fcntl.h user/ngie/more-tests2/sys/sys/gpt.h user/ngie/more-tests2/sys/sys/libkern.h user/ngie/more-tests2/sys/sys/param.h user/ngie/more-tests2/sys/ufs/ffs/ffs_softdep.c user/ngie/more-tests2/sys/vm/uma.h user/ngie/more-tests2/sys/vm/uma_core.c user/ngie/more-tests2/sys/vm/uma_int.h user/ngie/more-tests2/sys/vm/vnode_pager.c user/ngie/more-tests2/sys/x86/include/specialreg.h user/ngie/more-tests2/sys/x86/x86/identcpu.c user/ngie/more-tests2/sys/x86/xen/pv.c user/ngie/more-tests2/sys/x86/xen/xen_apic.c user/ngie/more-tests2/tests/sys/Makefile user/ngie/more-tests2/tests/sys/aio/aio_kqueue_test.c user/ngie/more-tests2/tests/sys/aio/lio_kqueue_test.c user/ngie/more-tests2/tests/sys/file/flock_test.sh user/ngie/more-tests2/tests/sys/kern/pipe/pipe_overcommit1_test.c user/ngie/more-tests2/tests/sys/kern/unix_seqpacket_test.c user/ngie/more-tests2/tools/build/mk/OptionalObsoleteFiles.inc user/ngie/more-tests2/tools/regression/sockets/unix_passfd/unix_passfd.c user/ngie/more-tests2/tools/tools/locale/tools/cldr2def.pl user/ngie/more-tests2/tools/tools/nanobsd/embedded/common user/ngie/more-tests2/tools/tools/nanobsd/embedded/rpi2.cfg user/ngie/more-tests2/usr.bin/bmake/Makefile user/ngie/more-tests2/usr.bin/column/column.c user/ngie/more-tests2/usr.bin/dtc/Makefile user/ngie/more-tests2/usr.bin/dtc/checking.cc user/ngie/more-tests2/usr.bin/dtc/checking.hh user/ngie/more-tests2/usr.bin/dtc/dtb.hh user/ngie/more-tests2/usr.bin/dtc/fdt.cc user/ngie/more-tests2/usr.bin/dtc/fdt.hh user/ngie/more-tests2/usr.bin/dtc/input_buffer.cc user/ngie/more-tests2/usr.bin/dtc/input_buffer.hh user/ngie/more-tests2/usr.bin/kdump/Makefile user/ngie/more-tests2/usr.bin/kdump/kdump.c user/ngie/more-tests2/usr.bin/locate/locate/util.c user/ngie/more-tests2/usr.bin/nfsstat/Makefile user/ngie/more-tests2/usr.bin/nfsstat/nfsstat.c user/ngie/more-tests2/usr.bin/systat/vmstat.c user/ngie/more-tests2/usr.bin/truss/Makefile user/ngie/more-tests2/usr.bin/truss/syscalls.c user/ngie/more-tests2/usr.bin/vmstat/vmstat.c user/ngie/more-tests2/usr.bin/xargs/xargs.c user/ngie/more-tests2/usr.sbin/Makefile user/ngie/more-tests2/usr.sbin/Makefile.amd64 user/ngie/more-tests2/usr.sbin/Makefile.arm user/ngie/more-tests2/usr.sbin/Makefile.i386 user/ngie/more-tests2/usr.sbin/Makefile.powerpc user/ngie/more-tests2/usr.sbin/Makefile.sparc64 user/ngie/more-tests2/usr.sbin/bsdinstall/scripts/entropy user/ngie/more-tests2/usr.sbin/camdd/Makefile user/ngie/more-tests2/usr.sbin/cron/cron/do_command.c user/ngie/more-tests2/usr.sbin/cron/cron/popen.c user/ngie/more-tests2/usr.sbin/cron/crontab/crontab.c user/ngie/more-tests2/usr.sbin/fstyp/Makefile user/ngie/more-tests2/usr.sbin/fstyp/fstyp.c user/ngie/more-tests2/usr.sbin/fstyp/geli.c user/ngie/more-tests2/usr.sbin/fstyp/zfs.c user/ngie/more-tests2/usr.sbin/jls/Makefile user/ngie/more-tests2/usr.sbin/jls/jls.8 user/ngie/more-tests2/usr.sbin/jls/jls.c user/ngie/more-tests2/usr.sbin/makefs/makefs.c user/ngie/more-tests2/usr.sbin/mountd/mountd.c user/ngie/more-tests2/usr.sbin/mpsutil/mps_cmd.c user/ngie/more-tests2/usr.sbin/pw/pw_conf.c user/ngie/more-tests2/usr.sbin/pw/pw_group.c user/ngie/more-tests2/usr.sbin/pw/pw_vpw.c user/ngie/more-tests2/usr.sbin/pwd_mkdb/pwd_mkdb.c user/ngie/more-tests2/usr.sbin/rpc.lockd/lockd.c user/ngie/more-tests2/usr.sbin/rpc.statd/statd.c user/ngie/more-tests2/usr.sbin/rtsold/rtsold.c user/ngie/more-tests2/usr.sbin/uhsoctl/uhsoctl.c Directory Properties: user/ngie/more-tests2/ (props changed) user/ngie/more-tests2/cddl/ (props changed) user/ngie/more-tests2/cddl/contrib/opensolaris/ (props changed) user/ngie/more-tests2/contrib/binutils/ (props changed) user/ngie/more-tests2/contrib/bmake/ (props changed) user/ngie/more-tests2/contrib/gcc/ (props changed) user/ngie/more-tests2/contrib/libexecinfo/ (props changed) user/ngie/more-tests2/contrib/llvm/ (props changed) user/ngie/more-tests2/contrib/llvm/tools/clang/ (props changed) user/ngie/more-tests2/contrib/llvm/tools/lldb/ (props changed) user/ngie/more-tests2/contrib/llvm/tools/llvm-dwarfdump/ (props changed) user/ngie/more-tests2/contrib/llvm/tools/llvm-lto/ (props changed) user/ngie/more-tests2/gnu/usr.bin/binutils/ (props changed) user/ngie/more-tests2/include/ (props changed) user/ngie/more-tests2/lib/libc/ (props changed) user/ngie/more-tests2/sbin/ (props changed) user/ngie/more-tests2/share/ (props changed) user/ngie/more-tests2/share/man/man4/ (props changed) user/ngie/more-tests2/sys/ (props changed) user/ngie/more-tests2/sys/boot/ (props changed) user/ngie/more-tests2/sys/cddl/contrib/opensolaris/ (props changed) user/ngie/more-tests2/sys/conf/ (props changed) user/ngie/more-tests2/sys/contrib/ipfilter/ (props changed) user/ngie/more-tests2/sys/dev/hyperv/ (props changed) user/ngie/more-tests2/usr.sbin/rtsold/ (props changed) Modified: user/ngie/more-tests2/MAINTAINERS ============================================================================== --- user/ngie/more-tests2/MAINTAINERS Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/MAINTAINERS Tue Dec 29 19:56:26 2015 (r292883) @@ -24,6 +24,15 @@ maintainer of a sub-system is to check r sub-system. *** +*** +Maintainers are encouraged to visit: + https://reviews.freebsd.org/herald + +and configure notifications for parts of the tree which they maintain. +Notifications can automatically be sent when someone proposes a revision or +makes a commit to the specified subtree. +*** + subsystem login notes ----------------------------- atf freebsd-testing,jmmv,ngie Pre-commit review requested. @@ -47,7 +56,9 @@ isci(4) jimharris Pre-commit review req iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org kqueue jmg Pre-commit review requested. Documentation Required. +libdpv dteske Pre-commit review requested. Keep in sync with dpv(1). libfetch des Pre-commit review requested. +libfigpar dteske Pre-commit review requested. libpam des Pre-commit review requested. linprocfs des Pre-commit review requested. lpr gad Pre-commit review requested, particularly for @@ -76,6 +87,7 @@ sh(1) jilles Pre-commit review request compiled in as builtins. share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. share/mk/*.test.mk freebsd-testing,ngie (same list as share/mk too) Pre-commit review requested. +sys/boot/forth dteske Pre-commit review requested. sys/compat/linuxkpi hselasky If in doubt, ask. sys/dev/e1000 erj Pre-commit phabricator review requested. sys/dev/ixgbe erj Pre-commit phabricator review requested. @@ -85,74 +97,8 @@ sys/dev/usb hselasky If in doubt, ask. sys/netinet/ip_carp.c glebius Pre-commit review recommended. sys/netpfil/pf kp,glebius Pre-commit review recommended. tests freebsd-testing,ngie Pre-commit review requested. +usr.sbin/bsdconfig dteske Pre-commit phabricator review requested. +usr.sbin/dpv dteske Pre-commit review requested. Keep in sync with libdpv. usr.sbin/pkg pkg@ Please coordinate behavior or flag changes with pkg team. +usr.sbin/sysrc dteske Pre-commit phabricator review requested. Keep in sync with bsdconfig(8) sysrc.subr. vmm(4) neel,grehan Pre-commit review requested. ----- OLD ---- -libc/posix1e rwatson Pre-commit review requested. -POSIX.1e ACLs rwatson Pre-commit review requested. -UFS EAs rwatson Pre-commit review requested. -MAC Framework rwatson Pre-commit review requested. -MAC Modules rwatson Pre-commit review requested. -contrib/openbsm rwatson Pre-commit review requested. -sys/security/audit rwatson Pre-commit review requested. -ahc(4) gibbs Pre-commit review requested. -ahd(4) gibbs Pre-commit review requested. -cdboot jhb Pre-commit review requested. -pxeboot jhb Pre-commit review requested. -witness jhb Pre-commit review requested. -CAM gibbs, - ken Pre-commit review requested. send to scsi@freebsd.org -devstat(9) ken Pre-commit review requested. -camcontrol(8) ken Pre-commit review requested. -libcam ken Pre-commit review requested. -libdevstat ken Pre-commit review requested. -iostat(8) ken Pre-commit review requested. -cd(4) ken Pre-commit review requested. -pass(4) ken Pre-commit review requested. -ch(4) ken Pre-commit review requested. -em(4) jfv Pre-commit review requested. -nvi peter Try not to break it. -libz peter Try not to break it. -groff ru Recommends pre-commit review. -ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org -drm rnoland Just keep me informed of changes, try not to break it. -unifdef(1) fanf Pre-commit review requested. -ntp roberto Pre-commit review requested. -inetd dwmalone Recommends pre-commit review. -contrib/smbfs bp Open for in-tree committs. In case of functional - changes pre-commit review requested. -file obrien Insists to keep file blocked from other's unapproved - commits -contrib/bzip2 obrien Pre-commit review required. -geom freebsd-geom@FreeBSD.org -geom_concat pjd Pre-commit review preferred. -geom_gate pjd Pre-commit review preferred. -geom_label pjd Pre-commit review preferred. -geom_mirror pjd Pre-commit review preferred. -geom_nop pjd Pre-commit review preferred. -geom_raid3 pjd Pre-commit review preferred. -geom_shsec pjd Pre-commit review preferred. -geom_stripe pjd Pre-commit review preferred. -geom_zero pjd Pre-commit review preferred. -sbin/geom pjd Pre-commit review preferred. -zfs freebsd-fs@FreeBSD.org -linux emul emulation Please discuss changes here. -bs{diff,patch} cperciva Pre-commit review requested. -portsnap cperciva Pre-commit review requested. -freebsd-update cperciva Pre-commit review requested. -sys/netgraph/bluetooth emax Pre-commit review preferred. -lib/libbluetooth emax Pre-commit review preferred. -lib/libsdp emax Pre-commit review preferred. -usr.bin/bluetooth emax Pre-commit review preferred. -usr.sbin/bluetooth emax Pre-commit review preferred. -share/zoneinfo edwin Heads-up appreciated, since our data is coming - from a third party source. -usr.sbin/zic edwin Heads-up appreciated, since this code is - maintained by a third party source. -lib/libc/stdtime edwin Heads-up appreciated, since parts of this code - is maintained by a third party source. -sbin/routed bms Pre-commit review; notify vendor at rhyolite.com -cmx daniel@roe.ch Pre-commit review preferred. -filemon obrien Pre-commit review preferred. -sysdoc trhodes Pre-commit review preferred. - Modified: user/ngie/more-tests2/Makefile.inc1 ============================================================================== --- user/ngie/more-tests2/Makefile.inc1 Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/Makefile.inc1 Tue Dec 29 19:56:26 2015 (r292883) @@ -48,10 +48,11 @@ .error "Both TARGET and TARGET_ARCH must be defined." .endif +LOCALBASE?= /usr/local + # Cross toolchain changes must be in effect before bsd.compiler.mk # so that gets the right CC, and pass CROSS_TOOLCHAIN to submakes. .if defined(CROSS_TOOLCHAIN) -LOCALBASE?= /usr/local .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}" .endif @@ -1314,7 +1315,7 @@ packagekernel: # Build the API documentation with doxygen # doxygen: .PHONY - @if [ ! -x `/usr/bin/which doxygen` ]; then \ + @if [ ! -x ${LOCALBASE}/bin/doxygen ]; then \ echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \ exit 1; \ fi @@ -1676,7 +1677,7 @@ NXBMAKE= ${NXBENV} ${MAKE} \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \ -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \ - MK_LLDB=no + MK_LLDB=no MK_DEBUG_FILES=no # native-xtools is the current target for qemu-user cross builds of ports # via poudriere and the imgact_binmisc kernel module. Modified: user/ngie/more-tests2/ObsoleteFiles.inc ============================================================================== --- user/ngie/more-tests2/ObsoleteFiles.inc Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/ObsoleteFiles.inc Tue Dec 29 19:56:26 2015 (r292883) @@ -38,6 +38,88 @@ # xargs -n1 | sort | uniq -d; # done +# 20151225: new clang import which bumps version from 3.7.0 to 3.7.1. +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/common_interface_defs.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/coverage_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/dfsan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/linux_syscall_hooks.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/lsan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/msan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/tsan_interface_atomic.h +OLD_DIRS+=usr/lib/clang/3.7.0/include/sanitizer +OLD_FILES+=usr/lib/clang/3.7.0/include/__stddef_max_align_t.h +OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_aes.h +OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_pclmul.h +OLD_FILES+=usr/lib/clang/3.7.0/include/adxintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/altivec.h +OLD_FILES+=usr/lib/clang/3.7.0/include/ammintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/arm_acle.h +OLD_FILES+=usr/lib/clang/3.7.0/include/arm_neon.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx2intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512bwintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512cdintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512dqintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512erintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512fintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlbwintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vldqintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avxintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/bmi2intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/bmiintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/cpuid.h +OLD_FILES+=usr/lib/clang/3.7.0/include/cuda_builtin_vars.h +OLD_FILES+=usr/lib/clang/3.7.0/include/emmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/f16cintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/fma4intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/fmaintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/fxsrintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/htmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/htmxlintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/ia32intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/immintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/lzcntintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/mm3dnow.h +OLD_FILES+=usr/lib/clang/3.7.0/include/mm_malloc.h +OLD_FILES+=usr/lib/clang/3.7.0/include/mmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/module.modulemap +OLD_FILES+=usr/lib/clang/3.7.0/include/nmmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/pmmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/popcntintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/prfchwintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/rdseedintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/rtmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/s390intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/shaintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/smmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/tbmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/tmmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/vadefs.h +OLD_FILES+=usr/lib/clang/3.7.0/include/vecintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/wmmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/x86intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/xmmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/xopintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/xtestintrin.h +OLD_DIRS+=usr/lib/clang/3.7.0/include +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-arm.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a +OLD_DIRS+=usr/lib/clang/3.7.0/lib/freebsd +OLD_DIRS+=usr/lib/clang/3.7.0/lib +OLD_DIRS+=usr/lib/clang/3.7.0 # 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406) OLD_LIBS+=usr/lib/libelf.so.2 # 20151115: Fox bad upgrade scheme Modified: user/ngie/more-tests2/bin/pax/pat_rep.c ============================================================================== --- user/ngie/more-tests2/bin/pax/pat_rep.c Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/bin/pax/pat_rep.c Tue Dec 29 19:56:26 2015 (r292883) @@ -878,7 +878,7 @@ rep_name(char *name, int *nlen, int prnt * (the user already saw that substitution go by) */ pt = rephead; - (void)strcpy(buf1, name); + (void)strlcpy(buf1, name, sizeof(buf1)); inpt = buf1; outpt = nname; endpt = outpt + PAXPATHLEN; Modified: user/ngie/more-tests2/bin/sh/mknodes.c ============================================================================== --- user/ngie/more-tests2/bin/sh/mknodes.c Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/bin/sh/mknodes.c Tue Dec 29 19:56:26 2015 (r292883) @@ -89,7 +89,6 @@ static struct str *nodestr[MAXTYPES]; /* static int nstr; /* number of structures */ static struct str str[MAXTYPES]; /* the structures */ static struct str *curstr; /* current structure */ -static FILE *infp; static char line[1024]; static int linno; static char *linep; @@ -102,7 +101,7 @@ static void outfunc(FILE *, int); static void indent(int, FILE *); static int nextfield(char *); static void skipbl(void); -static int readline(void); +static int readline(FILE *); static void error(const char *, ...) __printf0like(1, 2) __dead2; static char *savestr(const char *); @@ -110,17 +109,19 @@ static char *savestr(const char *); int main(int argc, char *argv[]) { + FILE *infp; + if (argc != 3) error("usage: mknodes file"); - infp = stdin; if ((infp = fopen(argv[1], "r")) == NULL) error("Can't open %s: %s", argv[1], strerror(errno)); - while (readline()) { + while (readline(infp)) { if (line[0] == ' ' || line[0] == '\t') parsefield(); else if (line[0] != '\0') parsenode(); } + fclose(infp); output(argv[2]); exit(0); } @@ -253,6 +254,10 @@ output(char *file) fputs("union node *getfuncnode(struct funcdef *);\n", hfile); fputs("void reffunc(struct funcdef *);\n", hfile); fputs("void unreffunc(struct funcdef *);\n", hfile); + if (ferror(hfile)) + error("Can't write to nodes.h"); + if (fclose(hfile)) + error("Can't close nodes.h"); fputs(writer, cfile); while (fgets(line, sizeof line, patfile) != NULL) { @@ -266,6 +271,11 @@ output(char *file) else fputs(line, cfile); } + fclose(patfile); + if (ferror(cfile)) + error("Can't write to nodes.c"); + if (fclose(cfile)) + error("Can't close nodes.c"); } @@ -401,7 +411,7 @@ skipbl(void) static int -readline(void) +readline(FILE *infp) { char *p; Modified: user/ngie/more-tests2/bin/sh/tests/expansion/Makefile ============================================================================== --- user/ngie/more-tests2/bin/sh/tests/expansion/Makefile Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/bin/sh/tests/expansion/Makefile Tue Dec 29 19:56:26 2015 (r292883) @@ -90,5 +90,6 @@ FILES+= trim5.0 FILES+= trim6.0 FILES+= trim7.0 FILES+= trim8.0 +FILES+= trim9.0 .include Copied: user/ngie/more-tests2/bin/sh/tests/expansion/trim9.0 (from r292882, head/bin/sh/tests/expansion/trim9.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/bin/sh/tests/expansion/trim9.0 Tue Dec 29 19:56:26 2015 (r292883, copy of r292882, head/bin/sh/tests/expansion/trim9.0) @@ -0,0 +1,61 @@ +# $FreeBSD$ + +# POSIX does not specify these but they occasionally occur in the wild. +# This just serves to keep working what currently works. + +failures='' +ok='' + +testcase() { + code="$1" + expected="$2" + oIFS="$IFS" + eval "$code" + IFS='|' + result="$#|$*" + IFS="$oIFS" + if [ "x$result" = "x$expected" ]; then + ok=x$ok + else + failures=x$failures + echo "For $code, expected $expected actual $result" + fi +} + +testcase 'shift $#; set -- "${*#Q}"' '1|' +testcase 'shift $#; set -- "${*##Q}"' '1|' +testcase 'shift $#; set -- "${*%Q}"' '1|' +testcase 'shift $#; set -- "${*%%Q}"' '1|' +testcase 'set -- Q R; set -- "${*#Q}"' '1| R' +testcase 'set -- Q R; set -- "${*##Q}"' '1| R' +testcase 'set -- Q R; set -- "${*%R}"' '1|Q ' +testcase 'set -- Q R; set -- "${*%%R}"' '1|Q ' +testcase 'set -- Q R; set -- "${*#S}"' '1|Q R' +testcase 'set -- Q R; set -- "${*##S}"' '1|Q R' +testcase 'set -- Q R; set -- "${*%S}"' '1|Q R' +testcase 'set -- Q R; set -- "${*%%S}"' '1|Q R' +testcase 'set -- Q R; set -- ${*#Q}' '1|R' +testcase 'set -- Q R; set -- ${*##Q}' '1|R' +testcase 'set -- Q R; set -- ${*%R}' '1|Q' +testcase 'set -- Q R; set -- ${*%%R}' '1|Q' +testcase 'set -- Q R; set -- ${*#S}' '2|Q|R' +testcase 'set -- Q R; set -- ${*##S}' '2|Q|R' +testcase 'set -- Q R; set -- ${*%S}' '2|Q|R' +testcase 'set -- Q R; set -- ${*%%S}' '2|Q|R' +testcase 'set -- Q R; set -- ${@#Q}' '1|R' +testcase 'set -- Q R; set -- ${@##Q}' '1|R' +testcase 'set -- Q R; set -- ${@%R}' '1|Q' +testcase 'set -- Q R; set -- ${@%%R}' '1|Q' +testcase 'set -- Q R; set -- ${@#S}' '2|Q|R' +testcase 'set -- Q R; set -- ${@##S}' '2|Q|R' +testcase 'set -- Q R; set -- ${@%S}' '2|Q|R' +testcase 'set -- Q R; set -- ${@%%S}' '2|Q|R' +testcase 'set -- Q R; set -- "${@#Q}"' '2||R' +testcase 'set -- Q R; set -- "${@%R}"' '2|Q|' +testcase 'set -- Q R; set -- "${@%%R}"' '2|Q|' +testcase 'set -- Q R; set -- "${@#S}"' '2|Q|R' +testcase 'set -- Q R; set -- "${@##S}"' '2|Q|R' +testcase 'set -- Q R; set -- "${@%S}"' '2|Q|R' +testcase 'set -- Q R; set -- "${@%%S}"' '2|Q|R' + +test "x$failures" = x Modified: user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Dec 29 19:56:26 2015 (r292883) @@ -3657,7 +3657,8 @@ main(int argc, char **argv) kernel_init(FREAD); g_zfs = libzfs_init(); - ASSERT(g_zfs != NULL); + if (g_zfs == NULL) + fatal("Fail to initialize zfs"); if (dump_all) verbose = MAX(verbose, 1); Modified: user/ngie/more-tests2/cddl/sbin/zfs/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/sbin/zfs/Makefile Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/cddl/sbin/zfs/Makefile Tue Dec 29 19:56:26 2015 (r292883) @@ -22,6 +22,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -LIBADD= geom jail nvpair umem util uutil zfs_core zfs +LIBADD= jail nvpair uutil zfs_core zfs .include Modified: user/ngie/more-tests2/cddl/sbin/zpool/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/sbin/zpool/Makefile Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/cddl/sbin/zpool/Makefile Tue Dec 29 19:56:26 2015 (r292883) @@ -27,6 +27,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common -LIBADD= avl geom nvpair umem util uutil zfs_core zfs +LIBADD= geom nvpair uutil zfs .include Modified: user/ngie/more-tests2/cddl/usr.sbin/zdb/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/zdb/Makefile Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/cddl/usr.sbin/zdb/Makefile Tue Dec 29 19:56:26 2015 (r292883) @@ -24,7 +24,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -LIBADD= geom m nvpair pthread umem uutil zfs_core zfs zpool +LIBADD= nvpair umem uutil zfs zpool # Since there are many asserts in this program, it makes no sense to compile # it without debugging. Modified: user/ngie/more-tests2/cddl/usr.sbin/zhack/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/zhack/Makefile Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/cddl/usr.sbin/zhack/Makefile Tue Dec 29 19:56:26 2015 (r292883) @@ -23,7 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -LIBADD= geom m nvpair pthread umem uutil zfs_core zfs zpool +LIBADD= nvpair zfs zpool CFLAGS+= -DDEBUG=1 #DEBUG_FLAGS+= -g Modified: user/ngie/more-tests2/contrib/binutils/bfd/elf32-arm.c ============================================================================== --- user/ngie/more-tests2/contrib/binutils/bfd/elf32-arm.c Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/binutils/bfd/elf32-arm.c Tue Dec 29 19:56:26 2015 (r292883) @@ -5800,7 +5800,7 @@ elf32_arm_final_link_relocate (reloc_how if (globals->use_rel) { addend = ((insn >> 4) & 0xf000) | (insn & 0xfff); - signed_addend = (addend ^ 0x10000) - 0x10000; + signed_addend = (addend ^ 0x8000) - 0x8000; } value += signed_addend; Modified: user/ngie/more-tests2/contrib/bmake/ChangeLog ============================================================================== --- user/ngie/more-tests2/contrib/bmake/ChangeLog Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/bmake/ChangeLog Tue Dec 29 19:56:26 2015 (r292883) @@ -1,3 +1,9 @@ +2015-12-20 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20151220 + Merge with NetBSD make, pick up + o suff.c: re-initialize suffNull when clearing suffixes. + 2015-12-01 Simon J. Gerraty * Makefile (MAKE_VERSION): 20151201 Modified: user/ngie/more-tests2/contrib/bmake/Makefile ============================================================================== --- user/ngie/more-tests2/contrib/bmake/Makefile Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/bmake/Makefile Tue Dec 29 19:56:26 2015 (r292883) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.48 2015/12/02 00:36:42 sjg Exp $ +# $Id: Makefile,v 1.49 2015/12/20 22:54:40 sjg Exp $ # Base version on src date -MAKE_VERSION= 20151201 +MAKE_VERSION= 20151220 PROG= bmake Modified: user/ngie/more-tests2/contrib/bmake/mk/ChangeLog ============================================================================== --- user/ngie/more-tests2/contrib/bmake/mk/ChangeLog Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/bmake/mk/ChangeLog Tue Dec 29 19:56:26 2015 (r292883) @@ -1,3 +1,9 @@ +2015-12-12 Simon J. Gerraty + + * install-mk (MK_VERSION): 20151212 + * auto.obj.mk: do not require MAKEOBJDIRPREFIX to exist. + only apply :tA to __objdir when comparing to .OBJDIR + 2015-11-14 Simon J. Gerraty * install-mk (MK_VERSION): 20151111 Modified: user/ngie/more-tests2/contrib/bmake/mk/auto.obj.mk ============================================================================== --- user/ngie/more-tests2/contrib/bmake/mk/auto.obj.mk Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/bmake/mk/auto.obj.mk Tue Dec 29 19:56:26 2015 (r292883) @@ -1,4 +1,4 @@ -# $Id: auto.obj.mk,v 1.11 2015/06/16 06:28:21 sjg Exp $ +# $Id: auto.obj.mk,v 1.12 2015/12/16 01:57:06 sjg Exp $ # # @(#) Copyright (c) 2004, Simon J. Gerraty # @@ -40,12 +40,12 @@ MKOBJDIRS= auto .if !defined(NOOBJ) && !defined(NO_OBJ) && ${MKOBJDIRS:Uno} == auto # Use __objdir here so it is easier to tweak without impacting # the logic. -.if !empty(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX}) +.if !empty(MAKEOBJDIRPREFIX) __objdir?= ${MAKEOBJDIRPREFIX}${.CURDIR} .endif __objdir?= ${MAKEOBJDIR:Uobj} -__objdir:= ${__objdir:tA} -.if ${.OBJDIR} != ${__objdir} +__objdir:= ${__objdir} +.if ${.OBJDIR:tA} != ${__objdir:tA} # We need to chdir, make the directory if needed .if !exists(${__objdir}/) && \ (${.TARGETS} == "" || ${.TARGETS:Nclean*:N*clean:Ndestroy*} != "") @@ -53,11 +53,10 @@ __objdir:= ${__objdir:tA} __objdir_made != echo ${__objdir}/; umask ${OBJDIR_UMASK:U002}; \ ${ECHO_TRACE} "[Creating objdir ${__objdir}...]" >&2; \ ${Mkdirs}; Mkdirs ${__objdir} -__objdir:= ${__objdir:tA} .endif # This causes make to use the specified directory as .OBJDIR .OBJDIR: ${__objdir} -.if ${.OBJDIR} != ${__objdir} && ${__objdir_made:Uno:M${__objdir}/*} != "" +.if ${.OBJDIR:tA} != ${__objdir:tA} && ${__objdir_made:Uno:M${__objdir}/*} != "" .error could not use ${__objdir}: .OBJDIR=${.OBJDIR} .endif .endif Modified: user/ngie/more-tests2/contrib/bmake/mk/install-mk ============================================================================== --- user/ngie/more-tests2/contrib/bmake/mk/install-mk Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/bmake/mk/install-mk Tue Dec 29 19:56:26 2015 (r292883) @@ -55,7 +55,7 @@ # Simon J. Gerraty # RCSid: -# $Id: install-mk,v 1.117 2015/11/14 18:09:57 sjg Exp $ +# $Id: install-mk,v 1.118 2015/12/16 01:57:06 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -70,7 +70,7 @@ # sjg@crufty.net # -MK_VERSION=20151111 +MK_VERSION=20151212 OWNER= GROUP= MODE=444 Modified: user/ngie/more-tests2/contrib/bmake/os.sh ============================================================================== --- user/ngie/more-tests2/contrib/bmake/os.sh Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/bmake/os.sh Tue Dec 29 19:56:26 2015 (r292883) @@ -17,7 +17,7 @@ # Simon J. Gerraty # RCSid: -# $Id: os.sh,v 1.49 2015/10/25 00:05:40 sjg Exp $ +# $Id: os.sh,v 1.50 2015/12/17 17:06:29 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -56,10 +56,10 @@ Which() { case "$1" in /*) test $t $1 && echo $1;; *) - # some shells cannot correctly handle `IFS` - # in conjunction with the for loop. - _dirs=`IFS=:; echo ${2:-$PATH}` - for d in $_dirs + # some shells cannot correctly handle `IFS` + # in conjunction with the for loop. + _dirs=`IFS=:; echo ${2:-$PATH}` + for d in $_dirs do test $t $d/$1 && { echo $d/$1; break; } done @@ -70,11 +70,11 @@ Which() { # tr is insanely non-portable wrt char classes, so we need to # spell out the alphabet. sed y/// would work too. toUpper() { - ${TR:-tr} abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ + ${TR:-tr} abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ } toLower() { - ${TR:-tr} ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz + ${TR:-tr} ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz } K= @@ -91,7 +91,7 @@ SunOS) export CHOWN # Great! Solaris keeps moving arch(1) - # should just bite the bullet and use uname -p + # should just bite the bullet and use uname -p arch=`Which arch /usr/bin:/usr/ucb` MAILER=/usr/ucb/Mail @@ -105,8 +105,8 @@ SunOS) MACHINE=$MACHINE_ARCH ;; 4*) - MACHINE_ARCH=`arch` - ;; + MACHINE_ARCH=`arch` + ;; 5*) K=-k LOCAL_FS=ufs @@ -116,8 +116,8 @@ SunOS) # overwriting an existing file!!!!! We want one that works! test -x /usr/xpg4/bin/ln && LN=${LN:-/usr/xpg4/bin/ln} # wonderful, 5.8's tr again require's []'s - # but /usr/xpg4/bin/tr causes problems if LC_COLLATE is set! - # use toUpper/toLower instead. + # but /usr/xpg4/bin/tr causes problems if LC_COLLATE is set! + # use toUpper/toLower instead. ;; esac case "$OS/$MACHINE_ARCH" in @@ -142,9 +142,9 @@ SunOS) SHARE_ARCH=$OS/$HOST ;; OpenBSD) - arch=`Which arch /usr/bin:/usr/ucb:$PATH` - MACHINE_ARCH=`$arch -s` - ;; + arch=`Which arch /usr/bin:/usr/ucb:$PATH` + MACHINE_ARCH=`$arch -s` + ;; esac NAWK=awk export NAWK @@ -218,17 +218,25 @@ export HOST_TARGET case `echo -n .` in -n*) N=; C="\c";; *) N=-n; C=;; esac -export HOSTNAME HOST +Echo() { + case "$1" in + -n) _n=$N _c=$C; shift;; + *) _n= _c=;; + esac + echo $_n "$@" $_c +} + +export HOSTNAME HOST export OS MACHINE MACHINE_ARCH OSREL OSMAJOR LOCAL_FS TMP_DIRS MAILER N C K PS_AXC export LN SHARE_ARCH TR case /$0 in */os.sh) - for v in $* + for v in $* do - eval vv=\$$v - echo "$v='$vv'" + eval vv=\$$v + echo "$v='$vv'" done - ;; + ;; esac Modified: user/ngie/more-tests2/contrib/bmake/suff.c ============================================================================== --- user/ngie/more-tests2/contrib/bmake/suff.c Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/bmake/suff.c Tue Dec 29 19:56:26 2015 (r292883) @@ -1,4 +1,4 @@ -/* $NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $ */ +/* $NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $"; +static char rcsid[] = "$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94"; #else -__RCSID("$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $"); +__RCSID("$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -553,7 +553,20 @@ Suff_ClearSuffixes(void) #endif sufflist = Lst_Init(FALSE); sNum = 0; - suffNull = emptySuff; + if (suffNull) + SuffFree(suffNull); + emptySuff = suffNull = bmake_malloc(sizeof(Suff)); + + suffNull->name = bmake_strdup(""); + suffNull->nameLen = 0; + suffNull->searchPath = Lst_Init(FALSE); + Dir_Concat(suffNull->searchPath, dirSearchPath); + suffNull->children = Lst_Init(FALSE); + suffNull->parents = Lst_Init(FALSE); + suffNull->ref = Lst_Init(FALSE); + suffNull->sNum = sNum++; + suffNull->flags = SUFF_NULL; + suffNull->refCount = 1; } /*- @@ -2524,32 +2537,18 @@ Suff_SetNull(char *name) void Suff_Init(void) { - sufflist = Lst_Init(FALSE); #ifdef CLEANUP suffClean = Lst_Init(FALSE); #endif srclist = Lst_Init(FALSE); transforms = Lst_Init(FALSE); - sNum = 0; /* * Create null suffix for single-suffix rules (POSIX). The thing doesn't * actually go on the suffix list or everyone will think that's its * suffix. */ - emptySuff = suffNull = bmake_malloc(sizeof(Suff)); - - suffNull->name = bmake_strdup(""); - suffNull->nameLen = 0; - suffNull->searchPath = Lst_Init(FALSE); - Dir_Concat(suffNull->searchPath, dirSearchPath); - suffNull->children = Lst_Init(FALSE); - suffNull->parents = Lst_Init(FALSE); - suffNull->ref = Lst_Init(FALSE); - suffNull->sNum = sNum++; - suffNull->flags = SUFF_NULL; - suffNull->refCount = 1; - + Suff_ClearSuffixes(); } Modified: user/ngie/more-tests2/contrib/bsnmp/snmpd/action.c ============================================================================== --- user/ngie/more-tests2/contrib/bsnmp/snmpd/action.c Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/bsnmp/snmpd/action.c Tue Dec 29 19:56:26 2015 (r292883) @@ -60,29 +60,6 @@ static const struct asn_oid #endif /* - * Get a string value from the KERN sysctl subtree. - */ -static char * -act_getkernstring(int id) -{ - int mib[2]; - size_t len; - char *string; - - mib[0] = CTL_KERN; - mib[1] = id; - if (sysctl(mib, 2, NULL, &len, NULL, 0) != 0) - return (NULL); - if ((string = malloc(len)) == NULL) - return (NULL); - if (sysctl(mib, 2, string, &len, NULL, 0) != 0) { - free(string); - return (NULL); - } - return (string); -} - -/* * Get an integer value from the KERN sysctl subtree. */ static char * Modified: user/ngie/more-tests2/contrib/bsnmp/snmpd/main.c ============================================================================== --- user/ngie/more-tests2/contrib/bsnmp/snmpd/main.c Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/bsnmp/snmpd/main.c Tue Dec 29 19:56:26 2015 (r292883) @@ -119,26 +119,30 @@ static struct lmodules modules_start = T struct community_list community_list = TAILQ_HEAD_INITIALIZER(community_list); /* list of all known USM users */ -struct usm_userlist usm_userlist = SLIST_HEAD_INITIALIZER(usm_userlist); +static struct usm_userlist usm_userlist = SLIST_HEAD_INITIALIZER(usm_userlist); /* A list of all VACM users configured, including v1, v2c and v3 */ -struct vacm_userlist vacm_userlist = SLIST_HEAD_INITIALIZER(vacm_userlist); +static struct vacm_userlist vacm_userlist = + SLIST_HEAD_INITIALIZER(vacm_userlist); /* A list of all VACM groups */ -struct vacm_grouplist vacm_grouplist = SLIST_HEAD_INITIALIZER(vacm_grouplist); +static struct vacm_grouplist vacm_grouplist = + SLIST_HEAD_INITIALIZER(vacm_grouplist); static struct vacm_group vacm_default_group = { .groupname = "", }; /* The list of configured access entries */ -struct vacm_accesslist vacm_accesslist = TAILQ_HEAD_INITIALIZER(vacm_accesslist); +static struct vacm_accesslist vacm_accesslist = + TAILQ_HEAD_INITIALIZER(vacm_accesslist); /* The list of configured views */ -struct vacm_viewlist vacm_viewlist = SLIST_HEAD_INITIALIZER(vacm_viewlist); +static struct vacm_viewlist vacm_viewlist = + SLIST_HEAD_INITIALIZER(vacm_viewlist); /* The list of configured contexts */ -struct vacm_contextlist vacm_contextlist = +static struct vacm_contextlist vacm_contextlist = SLIST_HEAD_INITIALIZER(vacm_contextlist); /* list of all installed object resources */ Modified: user/ngie/more-tests2/contrib/bsnmp/snmpd/trap.c ============================================================================== --- user/ngie/more-tests2/contrib/bsnmp/snmpd/trap.c Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/bsnmp/snmpd/trap.c Tue Dec 29 19:56:26 2015 (r292883) @@ -60,15 +60,15 @@ struct trapsink_list trapsink_list = TAILQ_HEAD_INITIALIZER(trapsink_list); /* List of target addresses */ -struct target_addresslist target_addresslist = +static struct target_addresslist target_addresslist = SLIST_HEAD_INITIALIZER(target_addresslist); /* List of target parameters */ -struct target_paramlist target_paramlist = +static struct target_paramlist target_paramlist = SLIST_HEAD_INITIALIZER(target_paramlist); /* List of notification targets */ -struct target_notifylist target_notifylist = +static struct target_notifylist target_notifylist = SLIST_HEAD_INITIALIZER(target_notifylist); static const struct asn_oid oid_begemotTrapSinkTable = Modified: user/ngie/more-tests2/contrib/gcc/config/rs6000/sysv4.h ============================================================================== --- user/ngie/more-tests2/contrib/gcc/config/rs6000/sysv4.h Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/gcc/config/rs6000/sysv4.h Tue Dec 29 19:56:26 2015 (r292883) @@ -282,7 +282,9 @@ do { \ #define RESTORE_FP_SUFFIX "_l" /* Type used for ptrdiff_t, as a string used in a declaration. */ +#ifndef PTRDIFF_TYPE #define PTRDIFF_TYPE "int" +#endif /* Type used for wchar_t, as a string used in a declaration. */ /* Override svr4.h definition. */ Modified: user/ngie/more-tests2/contrib/libexecinfo/backtrace.3 ============================================================================== --- user/ngie/more-tests2/contrib/libexecinfo/backtrace.3 Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/libexecinfo/backtrace.3 Tue Dec 29 19:56:26 2015 (r292883) @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 3, 2015 +.Dd December 12, 2015 .Dt BACKTRACE 3 .Os .Sh NAME @@ -47,7 +47,7 @@ .Ft "char **" .Fn backtrace_symbols_fmt "void * const *addrlist" "size_t len" "const char *fmt" .Ft int -.Fn backtrace_symbols_fd_fmt "void * const *addrlist" "size_t len" "const char *fmt" "int fd" +.Fn backtrace_symbols_fd_fmt "void * const *addrlist" "size_t len" "int fd" "const char *fmt" .Sh DESCRIPTION The .Fn backtrace @@ -85,7 +85,7 @@ the /proc filesystem is available to det The difference of the symbol address and the address element printed using 0x%tx. .It Dv D -The difference of the symbol addresss and the address element printed using +The difference of the symbol address and the address element printed using +0x%tx if non-zero, or nothing if zero. .It Dv f The filename of the symbol as determined by Modified: user/ngie/more-tests2/contrib/llvm/include/llvm-c/Core.h ============================================================================== --- user/ngie/more-tests2/contrib/llvm/include/llvm-c/Core.h Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/llvm/include/llvm-c/Core.h Tue Dec 29 19:56:26 2015 (r292883) @@ -2675,7 +2675,8 @@ LLVMValueRef LLVMBuildInvoke(LLVMBuilder LLVMBasicBlockRef Then, LLVMBasicBlockRef Catch, const char *Name); LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty, - unsigned NumClauses, const char *Name); + LLVMValueRef PersFn, unsigned NumClauses, + const char *Name); LLVMValueRef LLVMBuildResume(LLVMBuilderRef B, LLVMValueRef Exn); LLVMValueRef LLVMBuildUnreachable(LLVMBuilderRef); Modified: user/ngie/more-tests2/contrib/llvm/include/llvm/CodeGen/CommandFlags.h ============================================================================== --- user/ngie/more-tests2/contrib/llvm/include/llvm/CodeGen/CommandFlags.h Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/llvm/include/llvm/CodeGen/CommandFlags.h Tue Dec 29 19:56:26 2015 (r292883) @@ -21,7 +21,7 @@ #include "llvm/IR/Intrinsics.h" #include "llvm/IR/Module.h" #include "llvm/MC/MCTargetOptionsCommandFlags.h" -#include "llvm//MC/SubtargetFeature.h" +#include "llvm/MC/SubtargetFeature.h" #include "llvm/Support/CodeGen.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Host.h" Modified: user/ngie/more-tests2/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.cpp ============================================================================== --- user/ngie/more-tests2/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.cpp Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.cpp Tue Dec 29 19:56:26 2015 (r292883) @@ -169,7 +169,7 @@ void WinException::endFunction(const Mac Asm->OutStreamer->PopSection(); } - if (shouldEmitMoves) + if (shouldEmitMoves || shouldEmitPersonality) Asm->OutStreamer->EmitWinCFIEndProc(); } Modified: user/ngie/more-tests2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp ============================================================================== --- user/ngie/more-tests2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Tue Dec 29 19:56:26 2015 (r292883) @@ -439,7 +439,7 @@ ExpandUnalignedLoad(LoadSDNode *LD, Sele ISD::ANY_EXTEND, dl, VT, Result); ValResult = Result; - ChainResult = Chain; + ChainResult = newLoad.getValue(1); return; } Modified: user/ngie/more-tests2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp ============================================================================== --- user/ngie/more-tests2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp Tue Dec 29 19:56:26 2015 (r292883) @@ -1010,6 +1010,8 @@ SDValue DAGTypeLegalizer::GetVectorEleme // Calculate the element offset and add it to the pointer. unsigned EltSize = EltVT.getSizeInBits() / 8; // FIXME: should be ABI size. + assert(EltSize * 8 == EltVT.getSizeInBits() && + "Converting bits to bytes lost precision"); Index = DAG.getNode(ISD::MUL, dl, Index.getValueType(), Index, DAG.getConstant(EltSize, dl, Index.getValueType())); Modified: user/ngie/more-tests2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp ============================================================================== --- user/ngie/more-tests2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp Tue Dec 29 19:56:26 2015 (r292883) @@ -1528,9 +1528,25 @@ SDValue DAGTypeLegalizer::SplitVecOp_EXT if (CustomLowerNode(N, N->getValueType(0), true)) return SDValue(); - // Store the vector to the stack. - EVT EltVT = VecVT.getVectorElementType(); + // Make the vector elements byte-addressable if they aren't already. SDLoc dl(N); + EVT EltVT = VecVT.getVectorElementType(); + if (EltVT.getSizeInBits() < 8) { + SmallVector ElementOps; + for (unsigned i = 0; i < VecVT.getVectorNumElements(); ++i) { + ElementOps.push_back(DAG.getAnyExtOrTrunc( + DAG.getNode(ISD::EXTRACT_VECTOR_ELT, dl, EltVT, Vec, + DAG.getConstant(i, dl, MVT::i8)), + dl, MVT::i8)); + } + + EltVT = MVT::i8; + VecVT = EVT::getVectorVT(*DAG.getContext(), EltVT, + VecVT.getVectorNumElements()); + Vec = DAG.getNode(ISD::BUILD_VECTOR, dl, VecVT, ElementOps); + } + + // Store the vector to the stack. SDValue StackPtr = DAG.CreateStackTemporary(VecVT); SDValue Store = DAG.getStore(DAG.getEntryNode(), dl, Vec, StackPtr, MachinePointerInfo(), false, false, 0); Modified: user/ngie/more-tests2/contrib/llvm/lib/IR/AsmWriter.cpp ============================================================================== --- user/ngie/more-tests2/contrib/llvm/lib/IR/AsmWriter.cpp Tue Dec 29 19:44:32 2015 (r292882) +++ user/ngie/more-tests2/contrib/llvm/lib/IR/AsmWriter.cpp Tue Dec 29 19:56:26 2015 (r292883) @@ -794,6 +794,10 @@ void SlotTracker::processFunction() { ST_DEBUG("begin processFunction!\n"); fNext = 0; + // Process function metadata if it wasn't hit at the module-level. + if (!ShouldInitializeAllMetadata) + processFunctionMetadata(*TheFunction); + // Add all the function arguments with no names. for(Function::const_arg_iterator AI = TheFunction->arg_begin(), AE = TheFunction->arg_end(); AI != AE; ++AI) @@ -807,8 +811,6 @@ void SlotTracker::processFunction() { if (!BB.hasName()) CreateFunctionSlot(&BB); - processFunctionMetadata(*TheFunction); - for (auto &I : BB) { if (!I.getType()->isVoidTy() && !I.hasName()) CreateFunctionSlot(&I); @@ -836,11 +838,11 @@ void SlotTracker::processFunction() { void SlotTracker::processFunctionMetadata(const Function &F) { SmallVector, 4> MDs; - for (auto &BB : F) { - F.getAllMetadata(MDs); - for (auto &MD : MDs) - CreateMetadataSlot(MD.second); + F.getAllMetadata(MDs); + for (auto &MD : MDs) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Tue Dec 29 20:42:44 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77621A54E2D for ; Tue, 29 Dec 2015 20:42:44 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 318DE15F4; Tue, 29 Dec 2015 20:42:44 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBTKgh37072361; Tue, 29 Dec 2015 20:42:43 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBTKggq8072356; Tue, 29 Dec 2015 20:42:42 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512292042.tBTKggq8072356@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 29 Dec 2015 20:42:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292886 - in user/ngie/stable-10-libnv: . sys/fs/devfs sys/kern usr.sbin/crunch/crunchide X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2015 20:42:44 -0000 Author: ngie Date: Tue Dec 29 20:42:42 2015 New Revision: 292886 URL: https://svnweb.freebsd.org/changeset/base/292886 Log: MFstable/10 @ r292885 Added: user/ngie/stable-10-libnv/.arcconfig - copied unchanged from r292885, stable/10/.arcconfig user/ngie/stable-10-libnv/.arclint - copied unchanged from r292885, stable/10/.arclint Modified: user/ngie/stable-10-libnv/sys/fs/devfs/devfs_vnops.c user/ngie/stable-10-libnv/sys/kern/imgact_elf.c user/ngie/stable-10-libnv/usr.sbin/crunch/crunchide/exec_elf32.c Directory Properties: user/ngie/stable-10-libnv/ (props changed) Copied: user/ngie/stable-10-libnv/.arcconfig (from r292885, stable/10/.arcconfig) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/stable-10-libnv/.arcconfig Tue Dec 29 20:42:42 2015 (r292886, copy of r292885, stable/10/.arcconfig) @@ -0,0 +1,6 @@ +{ + "project.name": "S", + "repository.callsign" : "S", + "phabricator.uri" : "https://reviews.freebsd.org/", + "history.immutable" : true +} Copied: user/ngie/stable-10-libnv/.arclint (from r292885, stable/10/.arclint) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/stable-10-libnv/.arclint Tue Dec 29 20:42:42 2015 (r292886, copy of r292885, stable/10/.arclint) @@ -0,0 +1,25 @@ +{ + "exclude": "(contrib|crypto)", + "linters": { + "python": { + "type": "pep8", + "include": "(\\.py$)" + }, + "spelling": { + "type": "spelling" + }, + "chmod": { + "type": "chmod" + }, + "merge-conflict": { + "type": "merge-conflict" + }, + "filename": { + "type": "filename" + }, + "json": { + "type": "json", + "include": "(\\.arclint|\\.json$)" + } + } +} Modified: user/ngie/stable-10-libnv/sys/fs/devfs/devfs_vnops.c ============================================================================== --- user/ngie/stable-10-libnv/sys/fs/devfs/devfs_vnops.c Tue Dec 29 20:36:11 2015 (r292885) +++ user/ngie/stable-10-libnv/sys/fs/devfs/devfs_vnops.c Tue Dec 29 20:42:42 2015 (r292886) @@ -1533,11 +1533,15 @@ devfs_setattr(struct vop_setattr_args *a return (EINVAL); } + error = devfs_populate_vp(vp); + if (error != 0) + return (error); + de = vp->v_data; if (vp->v_type == VDIR) de = de->de_dir; - error = c = 0; + c = 0; if (vap->va_uid == (uid_t)VNOVAL) uid = de->de_uid; else @@ -1550,8 +1554,8 @@ devfs_setattr(struct vop_setattr_args *a if ((ap->a_cred->cr_uid != de->de_uid) || uid != de->de_uid || (gid != de->de_gid && !groupmember(gid, ap->a_cred))) { error = priv_check(td, PRIV_VFS_CHOWN); - if (error) - return (error); + if (error != 0) + goto ret; } de->de_uid = uid; de->de_gid = gid; @@ -1561,8 +1565,8 @@ devfs_setattr(struct vop_setattr_args *a if (vap->va_mode != (mode_t)VNOVAL) { if (ap->a_cred->cr_uid != de->de_uid) { error = priv_check(td, PRIV_VFS_ADMIN); - if (error) - return (error); + if (error != 0) + goto ret; } de->de_mode = vap->va_mode; c = 1; @@ -1571,7 +1575,7 @@ devfs_setattr(struct vop_setattr_args *a if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) { error = vn_utimes_perm(vp, vap, ap->a_cred, td); if (error != 0) - return (error); + goto ret; if (vap->va_atime.tv_sec != VNOVAL) { if (vp->v_type == VCHR) vp->v_rdev->si_atime = vap->va_atime; @@ -1593,7 +1597,10 @@ devfs_setattr(struct vop_setattr_args *a else vfs_timestamp(&de->de_mtime); } - return (0); + +ret: + sx_xunlock(&VFSTODEVFS(vp->v_mount)->dm_lock); + return (error); } #ifdef MAC Modified: user/ngie/stable-10-libnv/sys/kern/imgact_elf.c ============================================================================== --- user/ngie/stable-10-libnv/sys/kern/imgact_elf.c Tue Dec 29 20:36:11 2015 (r292885) +++ user/ngie/stable-10-libnv/sys/kern/imgact_elf.c Tue Dec 29 20:42:42 2015 (r292886) @@ -993,7 +993,8 @@ __CONCAT(exec_, __elfN(imgact))(struct i } vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY); if (error != 0) { - uprintf("ELF interpreter %s not found\n", interp); + uprintf("ELF interpreter %s not found, error %d\n", + interp, error); goto ret; } } else Modified: user/ngie/stable-10-libnv/usr.sbin/crunch/crunchide/exec_elf32.c ============================================================================== --- user/ngie/stable-10-libnv/usr.sbin/crunch/crunchide/exec_elf32.c Tue Dec 29 20:36:11 2015 (r292885) +++ user/ngie/stable-10-libnv/usr.sbin/crunch/crunchide/exec_elf32.c Tue Dec 29 20:42:42 2015 (r292886) @@ -183,6 +183,7 @@ ELFNAMEEND(check)(int fd, const char *fn #endif case EM_AARCH64: break; case EM_ARM: break; + case EM_IA_64: break; case EM_MIPS: break; case /* EM_MIPS_RS3_LE */ EM_MIPS_RS4_BE: break; case EM_PPC: break; From owner-svn-src-user@freebsd.org Wed Dec 30 07:59:59 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E0FFA5545A for ; Wed, 30 Dec 2015 07:59:59 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1978914A5; Wed, 30 Dec 2015 07:59:59 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBU7xw4f076059; Wed, 30 Dec 2015 07:59:58 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBU7xwbK076058; Wed, 30 Dec 2015 07:59:58 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201512300759.tBU7xwbK076058@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 30 Dec 2015 07:59:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292904 - user/pho/stress2/tools X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2015 07:59:59 -0000 Author: pho Date: Wed Dec 30 07:59:58 2015 New Revision: 292904 URL: https://svnweb.freebsd.org/changeset/base/292904 Log: Add option "a" for random size writes. Clean up test while here. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/tools/fstool.c Modified: user/pho/stress2/tools/fstool.c ============================================================================== --- user/pho/stress2/tools/fstool.c Wed Dec 30 03:43:25 2015 (r292903) +++ user/pho/stress2/tools/fstool.c Wed Dec 30 07:59:58 2015 (r292904) @@ -28,23 +28,23 @@ #include __FBSDID("$FreeBSD$"); -#include +#include +#include +#include #include -#include +#include + +#include +#include #include #include -#include -#include -#include -#include #include -#include - +#include static int files = 5; static int fs = 1024; +static int max, rnd; static char *buffer; -static int max; void error(char *op, char* arg, char* file, int line) { @@ -54,19 +54,22 @@ error(char *op, char* arg, char* file, i void mkDir(char *path, int level) { - int fd, j; + int fd, j, len; char newPath[MAXPATHLEN + 1]; char file[128]; if (mkdir(path, 0770) == -1) { error("mkdir", path, __FILE__, __LINE__); - fprintf(stderr, "length(path) = %d\n", strlen(path)); + fprintf(stderr, "length(path) = %d\n", (int)strlen(path)); fprintf(stderr, ") level = %d\n", level); exit(2); } chdir(path); + len = fs; for (j = 0; j < files; j++) { + if (rnd) + len = arc4random() % fs + 1; sprintf(file,"f%05d", j); if ((fd = creat(file, 0660)) == -1) { if (errno != EINTR) { @@ -74,7 +77,7 @@ mkDir(char *path, int level) { break; } } - if (write(fd, buffer, fs) != fs) + if (write(fd, buffer, len) != len) err(1, "%d: write(%s), %s:%d", level, file, __FILE__, __LINE__); if (fd != -1 && close(fd) == -1) @@ -104,7 +107,6 @@ void rmDir(char *path, int level) { char newPath[10]; - if (level < max) { sprintf(newPath,"d%d", level+1); rmDir(newPath, level+1); @@ -138,14 +140,17 @@ rmDir2(char *path, int level) { int main(int argc, char **argv) { + pid_t pid; int c, levels = 1, leave = 0; char path[128], rpath[128] = ""; char ch = 0; extern char *optarg; - pid_t pid; - while ((c = getopt(argc, argv, "ln:r:f:s:")) != -1) + while ((c = getopt(argc, argv, "aln:r:f:s:")) != -1) switch (c) { + case 'a': + rnd = 1; + break; case 'l': leave = 1; break; @@ -192,5 +197,6 @@ main(int argc, char **argv) mkDir(path, 1); if (leave == 0) rmDir(path, 1); } - return 0; + + return (0); } From owner-svn-src-user@freebsd.org Wed Dec 30 08:02:12 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3705A556E3 for ; Wed, 30 Dec 2015 08:02:12 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6EE41896; Wed, 30 Dec 2015 08:02:12 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBU82Bci076510; Wed, 30 Dec 2015 08:02:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBU82Bnn076507; Wed, 30 Dec 2015 08:02:11 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512300802.tBU82Bnn076507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 30 Dec 2015 08:02:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292905 - in user/ngie/more-tests2/sbin/geom: . tests X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2015 08:02:13 -0000 Author: ngie Date: Wed Dec 30 08:02:11 2015 New Revision: 292905 URL: https://svnweb.freebsd.org/changeset/base/292905 Log: Hook the tests into the build automatically by creating a stub tests/ directory which installs the autotraversing Kyuafile Added: user/ngie/more-tests2/sbin/geom/tests/ user/ngie/more-tests2/sbin/geom/tests/Makefile (contents, props changed) Modified: user/ngie/more-tests2/sbin/geom/Makefile Modified: user/ngie/more-tests2/sbin/geom/Makefile ============================================================================== --- user/ngie/more-tests2/sbin/geom/Makefile Wed Dec 30 07:59:58 2015 (r292904) +++ user/ngie/more-tests2/sbin/geom/Makefile Wed Dec 30 08:02:11 2015 (r292905) @@ -20,8 +20,14 @@ LIBADD= geom util .else +.include + SUBDIR= core class +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include .endif Added: user/ngie/more-tests2/sbin/geom/tests/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/sbin/geom/tests/Makefile Wed Dec 30 08:02:11 2015 (r292905) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +.PATH: ${SRCTOP}/tests + +TESTSDIR= ${TESTSBASE}/sbin/geom +KYUAFILE= yes + +.include From owner-svn-src-user@freebsd.org Wed Dec 30 08:55:15 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C8249A55B9A for ; Wed, 30 Dec 2015 08:55:15 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8DB3A1631; Wed, 30 Dec 2015 08:55:15 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBU8tESk095608; Wed, 30 Dec 2015 08:55:14 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBU8tEae095600; Wed, 30 Dec 2015 08:55:14 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512300855.tBU8tEae095600@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 30 Dec 2015 08:55:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292909 - in user/ngie/stable-10-libnv: gnu/usr.bin/binutils/ld sys/dev/virtio/balloon sys/dev/xen/balloon sys/fs/nfs sys/fs/nfsclient sys/kern sys/sys sys/ufs/ffs X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2015 08:55:16 -0000 Author: ngie Date: Wed Dec 30 08:55:13 2015 New Revision: 292909 URL: https://svnweb.freebsd.org/changeset/base/292909 Log: MFstable/10 @ r292908 Modified: user/ngie/stable-10-libnv/gnu/usr.bin/binutils/ld/Makefile user/ngie/stable-10-libnv/sys/dev/virtio/balloon/virtio_balloon.c user/ngie/stable-10-libnv/sys/dev/xen/balloon/balloon.c user/ngie/stable-10-libnv/sys/fs/nfs/nfsport.h user/ngie/stable-10-libnv/sys/fs/nfsclient/nfs_clnode.c user/ngie/stable-10-libnv/sys/fs/nfsclient/nfs_clport.c user/ngie/stable-10-libnv/sys/kern/vfs_subr.c user/ngie/stable-10-libnv/sys/sys/param.h user/ngie/stable-10-libnv/sys/ufs/ffs/ffs_vfsops.c Directory Properties: user/ngie/stable-10-libnv/ (props changed) Modified: user/ngie/stable-10-libnv/gnu/usr.bin/binutils/ld/Makefile ============================================================================== --- user/ngie/stable-10-libnv/gnu/usr.bin/binutils/ld/Makefile Wed Dec 30 08:53:12 2015 (r292908) +++ user/ngie/stable-10-libnv/gnu/usr.bin/binutils/ld/Makefile Wed Dec 30 08:55:13 2015 (r292909) @@ -52,6 +52,7 @@ CLEANFILES+= ldemul-list.h stringify.sed FILES= ${LDSCRIPTS:S|^|ldscripts/|} FILESDIR= ${SCRIPTDIR} +LINKS= ${BINDIR}/ld ${BINDIR}/ld.bfd HOST= ${TARGET_TUPLE} LIBSEARCHPATH= \"=/lib\":\"=/usr/lib\" Modified: user/ngie/stable-10-libnv/sys/dev/virtio/balloon/virtio_balloon.c ============================================================================== --- user/ngie/stable-10-libnv/sys/dev/virtio/balloon/virtio_balloon.c Wed Dec 30 08:53:12 2015 (r292908) +++ user/ngie/stable-10-libnv/sys/dev/virtio/balloon/virtio_balloon.c Wed Dec 30 08:55:13 2015 (r292909) @@ -438,8 +438,7 @@ vtballoon_alloc_page(struct vtballoon_so { vm_page_t m; - m = vm_page_alloc(NULL, 0, VM_ALLOC_NORMAL | VM_ALLOC_WIRED | - VM_ALLOC_NOOBJ); + m = vm_page_alloc(NULL, 0, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ); if (m != NULL) sc->vtballoon_current_npages++; @@ -450,7 +449,6 @@ static void vtballoon_free_page(struct vtballoon_softc *sc, vm_page_t m) { - vm_page_unwire(m, 0); vm_page_free(m); sc->vtballoon_current_npages--; } Modified: user/ngie/stable-10-libnv/sys/dev/xen/balloon/balloon.c ============================================================================== --- user/ngie/stable-10-libnv/sys/dev/xen/balloon/balloon.c Wed Dec 30 08:53:12 2015 (r292908) +++ user/ngie/stable-10-libnv/sys/dev/xen/balloon/balloon.c Wed Dec 30 08:55:13 2015 (r292909) @@ -94,13 +94,8 @@ SYSCTL_ULONG(_dev_xen_balloon, OID_AUTO, SYSCTL_ULONG(_dev_xen_balloon, OID_AUTO, high_mem, CTLFLAG_RD, &bs.balloon_high, 0, "High-mem balloon"); -struct balloon_entry { - vm_page_t page; - STAILQ_ENTRY(balloon_entry) list; -}; - /* List of ballooned pages, threaded through the mem_map array. */ -static STAILQ_HEAD(,balloon_entry) ballooned_pages; +static TAILQ_HEAD(,vm_page) ballooned_pages; /* Main work function, always executed in process context. */ static void balloon_process(void *unused); @@ -110,47 +105,6 @@ static void balloon_process(void *unused #define WPRINTK(fmt, args...) \ printk(KERN_WARNING "xen_mem: " fmt, ##args) -/* balloon_append: add the given page to the balloon. */ -static int -balloon_append(vm_page_t page) -{ - struct balloon_entry *entry; - - mtx_assert(&balloon_mutex, MA_OWNED); - - entry = malloc(sizeof(struct balloon_entry), M_BALLOON, M_NOWAIT); - if (!entry) - return (ENOMEM); - entry->page = page; - STAILQ_INSERT_HEAD(&ballooned_pages, entry, list); - bs.balloon_low++; - - return (0); -} - -/* balloon_retrieve: rescue a page from the balloon, if it is not empty. */ -static vm_page_t -balloon_retrieve(void) -{ - vm_page_t page; - struct balloon_entry *entry; - - mtx_assert(&balloon_mutex, MA_OWNED); - - if (STAILQ_EMPTY(&ballooned_pages)) - return (NULL); - - entry = STAILQ_FIRST(&ballooned_pages); - STAILQ_REMOVE_HEAD(&ballooned_pages, list); - - page = entry->page; - free(entry, M_BALLOON); - - bs.balloon_low--; - - return (page); -} - static unsigned long current_target(void) { @@ -203,7 +157,6 @@ static int increase_reservation(unsigned long nr_pages) { unsigned long pfn, i; - struct balloon_entry *entry; vm_page_t page; long rc; struct xen_memory_reservation reservation = { @@ -217,10 +170,9 @@ increase_reservation(unsigned long nr_pa if (nr_pages > nitems(frame_list)) nr_pages = nitems(frame_list); - for (entry = STAILQ_FIRST(&ballooned_pages), i = 0; - i < nr_pages; i++, entry = STAILQ_NEXT(entry, list)) { - KASSERT(entry, ("ballooned_pages list corrupt")); - page = entry->page; + for (page = TAILQ_FIRST(&ballooned_pages), i = 0; + i < nr_pages; i++, page = TAILQ_NEXT(page, plinks.q)) { + KASSERT(page != NULL, ("ballooned_pages list corrupt")); frame_list[i] = (VM_PAGE_TO_PHYS(page) >> PAGE_SHIFT); } @@ -245,8 +197,10 @@ increase_reservation(unsigned long nr_pa } for (i = 0; i < nr_pages; i++) { - page = balloon_retrieve(); - KASSERT(page, ("balloon_retrieve failed")); + page = TAILQ_FIRST(&ballooned_pages); + KASSERT(page != NULL, ("Unable to get ballooned page")); + TAILQ_REMOVE(&ballooned_pages, page, plinks.q); + bs.balloon_low--; pfn = (VM_PAGE_TO_PHYS(page) >> PAGE_SHIFT); KASSERT((xen_feature(XENFEAT_auto_translated_physmap) || @@ -255,7 +209,6 @@ increase_reservation(unsigned long nr_pa set_phys_to_machine(pfn, frame_list[i]); - vm_page_unwire(page, 0); vm_page_free(page); } @@ -286,24 +239,29 @@ decrease_reservation(unsigned long nr_pa for (i = 0; i < nr_pages; i++) { if ((page = vm_page_alloc(NULL, 0, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ | - VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) { + VM_ALLOC_ZERO)) == NULL) { nr_pages = i; need_sleep = 1; break; } + if ((page->flags & PG_ZERO) == 0) { + /* + * Zero the page, or else we might be leaking + * important data to other domains on the same + * host. Xen doesn't scrub ballooned out memory + * pages, the guest is in charge of making + * sure that no information is leaked. + */ + pmap_zero_page(page); + } + pfn = (VM_PAGE_TO_PHYS(page) >> PAGE_SHIFT); frame_list[i] = PFNTOMFN(pfn); set_phys_to_machine(pfn, INVALID_P2M_ENTRY); - if (balloon_append(page) != 0) { - vm_page_unwire(page, 0); - vm_page_free(page); - - nr_pages = i; - need_sleep = 1; - break; - } + TAILQ_INSERT_HEAD(&ballooned_pages, page, plinks.q); + bs.balloon_low++; } set_xen_guest_handle(reservation.extent_start, frame_list); @@ -438,7 +396,8 @@ balloon_init(void *arg) /* Initialise the balloon with excess memory space. */ for (pfn = xen_start_info->nr_pages; pfn < max_pfn; pfn++) { page = PHYS_TO_VM_PAGE(pfn << PAGE_SHIFT); - balloon_append(page); + TAILQ_INSERT_HEAD(&ballooned_pages, page, plinks.q); + bs.balloon_low++; } #undef max_pfn #endif Modified: user/ngie/stable-10-libnv/sys/fs/nfs/nfsport.h ============================================================================== --- user/ngie/stable-10-libnv/sys/fs/nfs/nfsport.h Wed Dec 30 08:53:12 2015 (r292908) +++ user/ngie/stable-10-libnv/sys/fs/nfs/nfsport.h Wed Dec 30 08:55:13 2015 (r292909) @@ -981,6 +981,13 @@ struct nfsreq { #define NFSVNO_DELEGOK(v) (1) #endif +/* + * Name used by getnewvnode() to describe filesystem, "newnfs". + * For perfomance reasons it is useful to have the same string + * used in both places that call getnewvnode(). + */ +extern const char nfs_vnode_tag[]; + #endif /* _KERNEL */ #endif /* _NFS_NFSPORT_H */ Modified: user/ngie/stable-10-libnv/sys/fs/nfsclient/nfs_clnode.c ============================================================================== --- user/ngie/stable-10-libnv/sys/fs/nfsclient/nfs_clnode.c Wed Dec 30 08:53:12 2015 (r292908) +++ user/ngie/stable-10-libnv/sys/fs/nfsclient/nfs_clnode.c Wed Dec 30 08:55:13 2015 (r292909) @@ -66,6 +66,8 @@ MALLOC_DECLARE(M_NEWNFSREQ); uma_zone_t newnfsnode_zone; +const char nfs_vnode_tag[] = "newnfs"; + static void nfs_freesillyrename(void *arg, __unused int pending); void @@ -124,7 +126,7 @@ ncl_nget(struct mount *mntp, u_int8_t *f } np = uma_zalloc(newnfsnode_zone, M_WAITOK | M_ZERO); - error = getnewvnode("newnfs", mntp, &newnfs_vnodeops, &nvp); + error = getnewvnode(nfs_vnode_tag, mntp, &newnfs_vnodeops, &nvp); if (error) { uma_zfree(newnfsnode_zone, np); return (error); @@ -332,4 +334,3 @@ ncl_invalcaches(struct vnode *vp) KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp); mtx_unlock(&np->n_mtx); } - Modified: user/ngie/stable-10-libnv/sys/fs/nfsclient/nfs_clport.c ============================================================================== --- user/ngie/stable-10-libnv/sys/fs/nfsclient/nfs_clport.c Wed Dec 30 08:53:12 2015 (r292908) +++ user/ngie/stable-10-libnv/sys/fs/nfsclient/nfs_clport.c Wed Dec 30 08:55:13 2015 (r292909) @@ -199,7 +199,7 @@ nfscl_nget(struct mount *mntp, struct vn } np = uma_zalloc(newnfsnode_zone, M_WAITOK | M_ZERO); - error = getnewvnode("newnfs", mntp, &newnfs_vnodeops, &nvp); + error = getnewvnode(nfs_vnode_tag, mntp, &newnfs_vnodeops, &nvp); if (error) { uma_zfree(newnfsnode_zone, np); FREE((caddr_t)nfhp, M_NFSFH); Modified: user/ngie/stable-10-libnv/sys/kern/vfs_subr.c ============================================================================== --- user/ngie/stable-10-libnv/sys/kern/vfs_subr.c Wed Dec 30 08:53:12 2015 (r292908) +++ user/ngie/stable-10-libnv/sys/kern/vfs_subr.c Wed Dec 30 08:55:13 2015 (r292909) @@ -145,24 +145,51 @@ int vttoif_tab[10] = { static TAILQ_HEAD(freelst, vnode) vnode_free_list; /* - * Free vnode target. Free vnodes may simply be files which have been stat'd - * but not read. This is somewhat common, and a small cache of such files - * should be kept to avoid recreation costs. + * "Free" vnode target. Free vnodes are rarely completely free, but are + * just ones that are cheap to recycle. Usually they are for files which + * have been stat'd but not read; these usually have inode and namecache + * data attached to them. This target is the preferred minimum size of a + * sub-cache consisting mostly of such files. The system balances the size + * of this sub-cache with its complement to try to prevent either from + * thrashing while the other is relatively inactive. The targets express + * a preference for the best balance. + * + * "Above" this target there are 2 further targets (watermarks) related + * to recyling of free vnodes. In the best-operating case, the cache is + * exactly full, the free list has size between vlowat and vhiwat above the + * free target, and recycling from it and normal use maintains this state. + * Sometimes the free list is below vlowat or even empty, but this state + * is even better for immediate use provided the cache is not full. + * Otherwise, vnlru_proc() runs to reclaim enough vnodes (usually non-free + * ones) to reach one of these states. The watermarks are currently hard- + * coded as 4% and 9% of the available space higher. These and the default + * of 25% for wantfreevnodes are too large if the memory size is large. + * E.g., 9% of 75% of MAXVNODES is more than 566000 vnodes to reclaim + * whenever vnlru_proc() becomes active. */ static u_long wantfreevnodes; -SYSCTL_ULONG(_vfs, OID_AUTO, wantfreevnodes, CTLFLAG_RW, &wantfreevnodes, 0, ""); -/* Number of vnodes in the free list. */ +SYSCTL_ULONG(_vfs, OID_AUTO, wantfreevnodes, CTLFLAG_RW, + &wantfreevnodes, 0, "Target for minimum number of \"free\" vnodes"); static u_long freevnodes; -SYSCTL_ULONG(_vfs, OID_AUTO, freevnodes, CTLFLAG_RD, &freevnodes, 0, - "Number of vnodes in the free list"); +SYSCTL_ULONG(_vfs, OID_AUTO, freevnodes, CTLFLAG_RD, + &freevnodes, 0, "Number of \"free\" vnodes"); +/* + * The vfs.vlru_allow_cache_src sysctl variable is no longer used but + * the sysctl remains to provide ABI compatibility. The new code frees + * namecache sources as the last chance to satisfy the highest watermark, + * instead of selecting the source vnodes randomly. This provides good + * enough behaviour to keep vn_fullpath() working in most situations. + * The filesystem layout with deep trees, where the depricated knob was + * required, is thus handled automatically. + */ static int vlru_allow_cache_src; SYSCTL_INT(_vfs, OID_AUTO, vlru_allow_cache_src, CTLFLAG_RW, - &vlru_allow_cache_src, 0, "Allow vlru to reclaim source vnode"); + &vlru_allow_cache_src, 0, "Placeholder for API compatibility (unused)"); static u_long recycles_count; SYSCTL_ULONG(_vfs, OID_AUTO, recycles, CTLFLAG_RD, &recycles_count, 0, - "Number of vnodes recycled to avoid exceding kern.maxvnodes"); + "Number of vnodes recycled to meet vnode cache targets"); /* * Various variables used for debugging the new implementation of @@ -272,14 +299,13 @@ static int syncer_worklist_len; static enum { SYNCER_RUNNING, SYNCER_SHUTTING_DOWN, SYNCER_FINAL_DELAY } syncer_state; -/* - * Number of vnodes we want to exist at any one time. This is mostly used - * to size hash tables in vnode-related code. It is normally not used in - * getnewvnode(), as wantfreevnodes is normally nonzero.) - * - * XXX desiredvnodes is historical cruft and should not exist. - */ +/* Target for maximum number of vnodes. */ int desiredvnodes; +static int gapvnodes; /* gap between wanted and desired */ +static int vhiwat; /* enough extras after expansion */ +static int vlowat; /* minimal extras before expansion */ +static int vstir; /* nonzero to stir non-free vnodes */ +static volatile int vsmalltrigger = 8; /* pref to keep if > this many pages */ static int sysctl_update_desiredvnodes(SYSCTL_HANDLER_ARGS) @@ -290,6 +316,8 @@ sysctl_update_desiredvnodes(SYSCTL_HANDL if ((error = sysctl_handle_int(oidp, arg1, arg2, req)) != 0) return (error); if (old_desiredvnodes != desiredvnodes) { + wantfreevnodes = desiredvnodes / 4; + /* XXX locking seems to be incomplete. */ vfs_hash_changesize(desiredvnodes); cache_changesize(desiredvnodes); } @@ -298,9 +326,9 @@ sysctl_update_desiredvnodes(SYSCTL_HANDL SYSCTL_PROC(_kern, KERN_MAXVNODES, maxvnodes, CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RW, &desiredvnodes, 0, - sysctl_update_desiredvnodes, "I", "Maximum number of vnodes"); + sysctl_update_desiredvnodes, "I", "Target for maximum number of vnodes"); SYSCTL_ULONG(_kern, OID_AUTO, minvnodes, CTLFLAG_RW, - &wantfreevnodes, 0, "Minimum number of vnodes (legacy)"); + &wantfreevnodes, 0, "Old name for vfs.wantfreevnodes (legacy)"); static int vnlru_nowhere; SYSCTL_INT(_debug, OID_AUTO, vnlru_nowhere, CTLFLAG_RW, &vnlru_nowhere, 0, "Number of times the vnlru process ran without success"); @@ -331,11 +359,71 @@ PCTRIE_DEFINE(BUF, buf, b_lblkno, buf_tr * * Reevaluate the following cap on the number of vnodes after the physical * memory size exceeds 512GB. In the limit, as the physical memory size - * grows, the ratio of physical pages to vnodes approaches sixteen to one. + * grows, the ratio of the memory size in KB to to vnodes approaches 64:1. */ #ifndef MAXVNODES_MAX -#define MAXVNODES_MAX (512 * (1024 * 1024 * 1024 / (int)PAGE_SIZE / 16)) +#define MAXVNODES_MAX (512 * 1024 * 1024 / 64) /* 8M */ #endif + +/* + * Initialize a vnode as it first enters the zone. + */ +static int +vnode_init(void *mem, int size, int flags) +{ + struct vnode *vp; + struct bufobj *bo; + + vp = mem; + bzero(vp, size); + /* + * Setup locks. + */ + vp->v_vnlock = &vp->v_lock; + mtx_init(&vp->v_interlock, "vnode interlock", NULL, MTX_DEF); + /* + * By default, don't allow shared locks unless filesystems opt-in. + */ + lockinit(vp->v_vnlock, PVFS, "vnode", VLKTIMEOUT, + LK_NOSHARE | LK_IS_VNODE); + /* + * Initialize bufobj. + */ + bo = &vp->v_bufobj; + bo->__bo_vnode = vp; + rw_init(BO_LOCKPTR(bo), "bufobj interlock"); + bo->bo_private = vp; + TAILQ_INIT(&bo->bo_clean.bv_hd); + TAILQ_INIT(&bo->bo_dirty.bv_hd); + /* + * Initialize namecache. + */ + LIST_INIT(&vp->v_cache_src); + TAILQ_INIT(&vp->v_cache_dst); + /* + * Initialize rangelocks. + */ + rangelock_init(&vp->v_rl); + return (0); +} + +/* + * Free a vnode when it is cleared from the zone. + */ +static void +vnode_fini(void *mem, int size) +{ + struct vnode *vp; + struct bufobj *bo; + + vp = mem; + rangelock_destroy(&vp->v_rl); + lockdestroy(vp->v_vnlock); + mtx_destroy(&vp->v_interlock); + bo = &vp->v_bufobj; + rw_destroy(BO_LOCKPTR(bo)); +} + static void vntblinit(void *dummy __unused) { @@ -345,15 +433,16 @@ vntblinit(void *dummy __unused) /* * Desiredvnodes is a function of the physical memory size and the * kernel's heap size. Generally speaking, it scales with the - * physical memory size. The ratio of desiredvnodes to physical pages - * is one to four until desiredvnodes exceeds 98,304. Thereafter, the - * marginal ratio of desiredvnodes to physical pages is one to - * sixteen. However, desiredvnodes is limited by the kernel's heap + * physical memory size. The ratio of desiredvnodes to the physical + * memory size is 1:16 until desiredvnodes exceeds 98,304. + * Thereafter, the + * marginal ratio of desiredvnodes to the physical memory size is + * 1:64. However, desiredvnodes is limited by the kernel's heap * size. The memory required by desiredvnodes vnodes and vm objects - * may not exceed one seventh of the kernel's heap size. + * must not exceed 1/7th of the kernel's heap size. */ - physvnodes = maxproc + cnt.v_page_count / 16 + 3 * min(98304 * 4, - cnt.v_page_count) / 16; + physvnodes = maxproc + pgtok(cnt.v_page_count) / 64 + + 3 * min(98304 * 16, pgtok(cnt.v_page_count)) / 64; virtvnodes = vm_kmem_size / (7 * (sizeof(struct vm_object) + sizeof(struct vnode))); desiredvnodes = min(physvnodes, virtvnodes); @@ -368,7 +457,7 @@ vntblinit(void *dummy __unused) TAILQ_INIT(&vnode_free_list); mtx_init(&vnode_free_list_mtx, "vnode_free_list", NULL, MTX_DEF); vnode_zone = uma_zcreate("VNODE", sizeof (struct vnode), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, 0); + vnode_init, vnode_fini, UMA_ALIGN_PTR, 0); vnodepoll_zone = uma_zcreate("VNODEPOLL", sizeof (struct vpollinfo), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); /* @@ -742,35 +831,41 @@ vattr_null(struct vattr *vap) * you set kern.maxvnodes to. Do not set kern.maxvnodes too low. */ static int -vlrureclaim(struct mount *mp) +vlrureclaim(struct mount *mp, int reclaim_nc_src, int trigger) { struct vnode *vp; - int done; - int trigger; - int usevnodes; - int count; + int count, done, target; - /* - * Calculate the trigger point, don't allow user - * screwups to blow us up. This prevents us from - * recycling vnodes with lots of resident pages. We - * aren't trying to free memory, we are trying to - * free vnodes. - */ - usevnodes = desiredvnodes; - if (usevnodes <= 0) - usevnodes = 1; - trigger = cnt.v_page_count * 2 / usevnodes; done = 0; vn_start_write(NULL, &mp, V_WAIT); MNT_ILOCK(mp); - count = mp->mnt_nvnodelistsize / 10 + 1; - while (count != 0) { + count = mp->mnt_nvnodelistsize; + target = count * (int64_t)gapvnodes / imax(desiredvnodes, 1); + target = target / 10 + 1; + while (count != 0 && done < target) { vp = TAILQ_FIRST(&mp->mnt_nvnodelist); while (vp != NULL && vp->v_type == VMARKER) vp = TAILQ_NEXT(vp, v_nmntvnodes); if (vp == NULL) break; + /* + * XXX LRU is completely broken for non-free vnodes. First + * by calling here in mountpoint order, then by moving + * unselected vnodes to the end here, and most grossly by + * removing the vlruvp() function that was supposed to + * maintain the order. (This function was born broken + * since syncer problems prevented it doing anything.) The + * order is closer to LRC (C = Created). + * + * LRU reclaiming of vnodes seems to have last worked in + * FreeBSD-3 where LRU wasn't mentioned under any spelling. + * Then there was no hold count, and inactive vnodes were + * simply put on the free list in LRU order. The separate + * lists also break LRU. We prefer to reclaim from the + * free list for technical reasons. This tends to thrash + * the free list to keep very unrecently used held vnodes. + * The problem is mitigated by keeping the free list large. + */ TAILQ_REMOVE(&mp->mnt_nvnodelist, vp, v_nmntvnodes); TAILQ_INSERT_TAIL(&mp->mnt_nvnodelist, vp, v_nmntvnodes); --count; @@ -779,10 +874,12 @@ vlrureclaim(struct mount *mp) /* * If it's been deconstructed already, it's still * referenced, or it exceeds the trigger, skip it. + * Also skip free vnodes. We are trying to make space + * to expand the free list, not reduce it. */ if (vp->v_usecount || - (!vlru_allow_cache_src && - !LIST_EMPTY(&(vp)->v_cache_src)) || + (!reclaim_nc_src && !LIST_EMPTY(&vp->v_cache_src)) || + ((vp->v_iflag & VI_FREE) != 0) || (vp->v_iflag & VI_DOOMED) != 0 || (vp->v_object != NULL && vp->v_object->resident_page_count > trigger)) { VI_UNLOCK(vp); @@ -808,8 +905,8 @@ vlrureclaim(struct mount *mp) * vnode lock before our VOP_LOCK() call fails. */ if (vp->v_usecount || - (!vlru_allow_cache_src && - !LIST_EMPTY(&(vp)->v_cache_src)) || + (!reclaim_nc_src && !LIST_EMPTY(&vp->v_cache_src)) || + (vp->v_iflag & VI_FREE) != 0 || (vp->v_object != NULL && vp->v_object->resident_page_count > trigger)) { VOP_UNLOCK(vp, LK_INTERLOCK); @@ -842,7 +939,7 @@ relock_mnt: } /* - * Attempt to keep the free list at wantfreevnodes length. + * Attempt to reduce the free list by the requested amount. */ static void vnlru_free(int count) @@ -899,6 +996,24 @@ vnlru_free(int count) mtx_lock(&vnode_free_list_mtx); } } + +/* XXX some names and initialization are bad for limits and watermarks. */ +static int +vspace(void) +{ + int space; + + gapvnodes = imax(desiredvnodes - wantfreevnodes, 100); + vhiwat = gapvnodes / 11; /* 9% -- just under the 10% in vlrureclaim() */ + vlowat = vhiwat / 2; + if (numvnodes > desiredvnodes) + return (0); + space = desiredvnodes - numvnodes; + if (freevnodes > wantfreevnodes) + space += freevnodes - wantfreevnodes; + return (space); +} + /* * Attempt to recycle vnodes in a context that is always safe to block. * Calling vlrurecycle() from the bowels of filesystem code has some @@ -911,18 +1026,36 @@ static void vnlru_proc(void) { struct mount *mp, *nmp; - int done; - struct proc *p = vnlruproc; + unsigned long ofreevnodes, onumvnodes; + int done, force, reclaim_nc_src, trigger, usevnodes; - EVENTHANDLER_REGISTER(shutdown_pre_sync, kproc_shutdown, p, + EVENTHANDLER_REGISTER(shutdown_pre_sync, kproc_shutdown, vnlruproc, SHUTDOWN_PRI_FIRST); + force = 0; for (;;) { - kproc_suspend_check(p); + kproc_suspend_check(vnlruproc); mtx_lock(&vnode_free_list_mtx); - if (freevnodes > wantfreevnodes) - vnlru_free(freevnodes - wantfreevnodes); - if (numvnodes <= desiredvnodes * 9 / 10) { + /* + * If numvnodes is too large (due to desiredvnodes being + * adjusted using its sysctl, or emergency growth), first + * try to reduce it by discarding from the free list. + */ + if (numvnodes > desiredvnodes && freevnodes > 0) + vnlru_free(ulmin(numvnodes - desiredvnodes, + freevnodes)); + /* + * Sleep if the vnode cache is in a good state. This is + * when it is not over-full and has space for about a 4% + * or 9% expansion (by growing its size or inexcessively + * reducing its free list). Otherwise, try to reclaim + * space for a 10% expansion. + */ + if (vstir && force == 0) { + force = 1; + vstir = 0; + } + if (vspace() >= vlowat && force == 0) { vnlruproc_sig = 0; wakeup(&vnlruproc_sig); msleep(vnlruproc, &vnode_free_list_mtx, @@ -931,30 +1064,66 @@ vnlru_proc(void) } mtx_unlock(&vnode_free_list_mtx); done = 0; + ofreevnodes = freevnodes; + onumvnodes = numvnodes; + /* + * Calculate parameters for recycling. These are the same + * throughout the loop to give some semblance of fairness. + * The trigger point is to avoid recycling vnodes with lots + * of resident pages. We aren't trying to free memory; we + * are trying to recycle or at least free vnodes. + */ + if (numvnodes <= desiredvnodes) + usevnodes = numvnodes - freevnodes; + else + usevnodes = numvnodes; + if (usevnodes <= 0) + usevnodes = 1; + /* + * The trigger value is is chosen to give a conservatively + * large value to ensure that it alone doesn't prevent + * making progress. The value can easily be so large that + * it is effectively infinite in some congested and + * misconfigured cases, and this is necessary. Normally + * it is about 8 to 100 (pages), which is quite large. + */ + trigger = cnt.v_page_count * 2 / usevnodes; + if (force < 2) + trigger = vsmalltrigger; + reclaim_nc_src = force >= 3; mtx_lock(&mountlist_mtx); for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) { if (vfs_busy(mp, MBF_NOWAIT | MBF_MNTLSTLOCK)) { nmp = TAILQ_NEXT(mp, mnt_list); continue; } - done += vlrureclaim(mp); + done += vlrureclaim(mp, reclaim_nc_src, trigger); mtx_lock(&mountlist_mtx); nmp = TAILQ_NEXT(mp, mnt_list); vfs_unbusy(mp); } mtx_unlock(&mountlist_mtx); + if (onumvnodes > desiredvnodes && numvnodes <= desiredvnodes) + uma_reclaim(); if (done == 0) { -#if 0 - /* These messages are temporary debugging aids */ - if (vnlru_nowhere < 5) - printf("vnlru process getting nowhere..\n"); - else if (vnlru_nowhere == 5) - printf("vnlru process messages stopped.\n"); -#endif + if (force == 0 || force == 1) { + force = 2; + continue; + } + if (force == 2) { + force = 3; + continue; + } + force = 0; vnlru_nowhere++; tsleep(vnlruproc, PPAUSE, "vlrup", hz * 3); } else kern_yield(PRI_USER); + /* + * After becoming active to expand above low water, keep + * active until above high water. + */ + force = vspace() < vhiwat; } } @@ -1028,22 +1197,31 @@ vtryrecycle(struct vnode *vp) return (0); } +static void +vcheckspace(void) +{ + + if (vspace() < vlowat && vnlruproc_sig == 0) { + vnlruproc_sig = 1; + wakeup(vnlruproc); + } +} + /* - * Wait for available vnodes. + * Wait if necessary for space for a new vnode. */ static int getnewvnode_wait(int suspended) { mtx_assert(&vnode_free_list_mtx, MA_OWNED); - if (numvnodes > desiredvnodes) { + if (numvnodes >= desiredvnodes) { if (suspended) { /* - * File system is beeing suspended, we cannot risk a - * deadlock here, so allocate new vnode anyway. + * The file system is being suspended. We cannot + * risk a deadlock here, so allow allocation of + * another vnode even if this would give too many. */ - if (freevnodes > wantfreevnodes) - vnlru_free(freevnodes - wantfreevnodes); return (0); } if (vnlruproc_sig == 0) { @@ -1053,18 +1231,34 @@ getnewvnode_wait(int suspended) msleep(&vnlruproc_sig, &vnode_free_list_mtx, PVFS, "vlruwk", hz); } - return (numvnodes > desiredvnodes ? ENFILE : 0); + /* Post-adjust like the pre-adjust in getnewvnode(). */ + if (numvnodes + 1 > desiredvnodes && freevnodes > 1) + vnlru_free(1); + return (numvnodes >= desiredvnodes ? ENFILE : 0); } +/* + * This hack is fragile, and probably not needed any more now that the + * watermark handling works. + */ void getnewvnode_reserve(u_int count) { struct thread *td; + /* Pre-adjust like the pre-adjust in getnewvnode(), with any count. */ + /* XXX no longer so quick, but this part is not racy. */ + mtx_lock(&vnode_free_list_mtx); + if (numvnodes + count > desiredvnodes && freevnodes > wantfreevnodes) + vnlru_free(ulmin(numvnodes + count - desiredvnodes, + freevnodes - wantfreevnodes)); + mtx_unlock(&vnode_free_list_mtx); + td = curthread; /* First try to be quick and racy. */ if (atomic_fetchadd_long(&numvnodes, count) + count <= desiredvnodes) { td->td_vp_reserv += count; + vcheckspace(); /* XXX no longer so quick, but more racy */ return; } else atomic_subtract_long(&numvnodes, count); @@ -1077,9 +1271,18 @@ getnewvnode_reserve(u_int count) atomic_add_long(&numvnodes, 1); } } + vcheckspace(); mtx_unlock(&vnode_free_list_mtx); } +/* + * This hack is fragile, especially if desiredvnodes or wantvnodes are + * misconfgured or changed significantly. Reducing desiredvnodes below + * the reserved amount should cause bizarre behaviour like reducing it + * below the number of active vnodes -- the system will try to reduce + * numvnodes to match, but should fail, so the subtraction below should + * not overflow. + */ void getnewvnode_drop_reserve(void) { @@ -1098,8 +1301,9 @@ getnewvnode(const char *tag, struct moun struct vnode **vpp) { struct vnode *vp; - struct bufobj *bo; struct thread *td; + struct lock_object *lo; + static int cyclecount; int error; CTR3(KTR_VFS, "%s: mp %p with tag %s", __func__, mp, tag); @@ -1110,57 +1314,77 @@ getnewvnode(const char *tag, struct moun goto alloc; } mtx_lock(&vnode_free_list_mtx); - /* - * Lend our context to reclaim vnodes if they've exceeded the max. - */ - if (freevnodes > wantfreevnodes) + if (numvnodes < desiredvnodes) + cyclecount = 0; + else if (cyclecount++ >= freevnodes) { + cyclecount = 0; + vstir = 1; + } + /* + * Grow the vnode cache if it will not be above its target max + * after growing. Otherwise, if the free list is nonempty, try + * to reclaim 1 item from it before growing the cache (possibly + * above its target max if the reclamation failed or is delayed). + * Otherwise, wait for some space. In all cases, schedule + * vnlru_proc() if we are getting short of space. The watermarks + * should be chosen so that we never wait or even reclaim from + * the free list to below its target minimum. + */ + if (numvnodes + 1 <= desiredvnodes) + ; + else if (freevnodes > 0) vnlru_free(1); - error = getnewvnode_wait(mp != NULL && (mp->mnt_kern_flag & - MNTK_SUSPEND)); + else { + error = getnewvnode_wait(mp != NULL && (mp->mnt_kern_flag & + MNTK_SUSPEND)); #if 0 /* XXX Not all VFS_VGET/ffs_vget callers check returns. */ - if (error != 0) { - mtx_unlock(&vnode_free_list_mtx); - return (error); - } + if (error != 0) { + mtx_unlock(&vnode_free_list_mtx); + return (error); + } #endif + } + vcheckspace(); atomic_add_long(&numvnodes, 1); mtx_unlock(&vnode_free_list_mtx); alloc: atomic_add_long(&vnodes_created, 1); - vp = (struct vnode *) uma_zalloc(vnode_zone, M_WAITOK|M_ZERO); - /* - * Setup locks. - */ - vp->v_vnlock = &vp->v_lock; - mtx_init(&vp->v_interlock, "vnode interlock", NULL, MTX_DEF); - /* - * By default, don't allow shared locks unless filesystems - * opt-in. - */ - lockinit(vp->v_vnlock, PVFS, tag, VLKTIMEOUT, LK_NOSHARE | LK_IS_VNODE); + vp = (struct vnode *) uma_zalloc(vnode_zone, M_WAITOK); /* - * Initialize bufobj. + * Locks are given the generic name "vnode" when created. + * Follow the historic practice of using the filesystem + * name when they allocated, e.g., "zfs", "ufs", "nfs, etc. + * + * Locks live in a witness group keyed on their name. Thus, + * when a lock is renamed, it must also move from the witness + * group of its old name to the witness group of its new name. + * + * The change only needs to be made when the vnode moves + * from one filesystem type to another. We ensure that each + * filesystem use a single static name pointer for its tag so + * that we can compare pointers rather than doing a strcmp(). */ - bo = &vp->v_bufobj; - bo->__bo_vnode = vp; - rw_init(BO_LOCKPTR(bo), "bufobj interlock"); - bo->bo_ops = &buf_ops_bio; - bo->bo_private = vp; - TAILQ_INIT(&bo->bo_clean.bv_hd); - TAILQ_INIT(&bo->bo_dirty.bv_hd); + lo = &vp->v_vnlock->lock_object; + if (lo->lo_name != tag) { + lo->lo_name = tag; + WITNESS_DESTROY(lo); + WITNESS_INIT(lo, tag); + } /* - * Initialize namecache. + * By default, don't allow shared locks unless filesystems opt-in. */ - LIST_INIT(&vp->v_cache_src); - TAILQ_INIT(&vp->v_cache_dst); + vp->v_vnlock->lock_object.lo_flags |= LK_NOSHARE; /* * Finalize various vnode identity bits. */ + KASSERT(vp->v_object == NULL, ("stale v_object %p", vp)); + KASSERT(vp->v_lockf == NULL, ("stale v_lockf %p", vp)); + KASSERT(vp->v_pollinfo == NULL, ("stale v_pollinfo %p", vp)); vp->v_type = VNON; vp->v_tag = tag; vp->v_op = vops; v_incr_usecount(vp); - vp->v_data = NULL; + vp->v_bufobj.bo_ops = &buf_ops_bio; #ifdef MAC mac_vnode_init(vp); if (mp != NULL && (mp->mnt_flag & MNT_MULTILABEL) == 0) @@ -1169,11 +1393,10 @@ alloc: printf("NULL mp in getnewvnode()\n"); #endif if (mp != NULL) { - bo->bo_bsize = mp->mnt_stat.f_iosize; + vp->v_bufobj.bo_bsize = mp->mnt_stat.f_iosize; if ((mp->mnt_kern_flag & MNTK_NOKNOTE) != 0) vp->v_vflag |= VV_NOKNOTE; } - rangelock_init(&vp->v_rl); /* * For the filesystems which do not use vfs_hash_insert(), @@ -2399,7 +2622,7 @@ vholdl(struct vnode *vp) mtx_lock(&vnode_free_list_mtx); TAILQ_REMOVE(&vnode_free_list, vp, v_actfreelist); freevnodes--; - vp->v_iflag &= ~(VI_FREE|VI_AGE); + vp->v_iflag &= ~VI_FREE; KASSERT((vp->v_iflag & VI_ACTIVE) == 0, ("Activating already active vnode")); vp->v_iflag |= VI_ACTIVE; @@ -2467,15 +2690,9 @@ vdropl(struct vnode *vp) v_actfreelist); mp->mnt_activevnodelistsize--; } - if (vp->v_iflag & VI_AGE) { - TAILQ_INSERT_HEAD(&vnode_free_list, vp, - v_actfreelist); - } else { - TAILQ_INSERT_TAIL(&vnode_free_list, vp, - v_actfreelist); - } + TAILQ_INSERT_TAIL(&vnode_free_list, vp, + v_actfreelist); freevnodes++; - vp->v_iflag &= ~VI_AGE; vp->v_iflag |= VI_FREE; mtx_unlock(&vnode_free_list_mtx); } else { @@ -2486,6 +2703,12 @@ vdropl(struct vnode *vp) } /* * The vnode has been marked for destruction, so free it. + * + * The vnode will be returned to the zone where it will + * normally remain until it is needed for another vnode. We + * need to cleanup (or verify that the cleanup has already + * been done) any residual data left from its current use + * so as not to contaminate the freshly allocated vnode. */ CTR2(KTR_VFS, "%s: destroying the vnode %p", __func__, vp); atomic_subtract_long(&numvnodes, 1); @@ -2506,20 +2729,25 @@ vdropl(struct vnode *vp) VNASSERT(TAILQ_EMPTY(&vp->v_cache_dst), vp, ("vp has namecache dst")); VNASSERT(LIST_EMPTY(&vp->v_cache_src), vp, ("vp has namecache src")); VNASSERT(vp->v_cache_dd == NULL, vp, ("vp has namecache for ..")); + VNASSERT(TAILQ_EMPTY(&vp->v_rl.rl_waiters), vp, + ("Dangling rangelock waiters")); VI_UNLOCK(vp); #ifdef MAC mac_vnode_destroy(vp); #endif - if (vp->v_pollinfo != NULL) + if (vp->v_pollinfo != NULL) { destroy_vpollinfo(vp->v_pollinfo); + vp->v_pollinfo = NULL; + } #ifdef INVARIANTS /* XXX Elsewhere we detect an already freed vnode via NULL v_op. */ vp->v_op = NULL; #endif - rangelock_destroy(&vp->v_rl); - lockdestroy(vp->v_vnlock); - mtx_destroy(&vp->v_interlock); - rw_destroy(BO_LOCKPTR(bo)); + bzero(&vp->v_un, sizeof(vp->v_un)); + vp->v_lasta = vp->v_clen = vp->v_cstart = vp->v_lastw = 0; + vp->v_iflag = 0; + vp->v_vflag = 0; + bo->bo_flag = 0; uma_zfree(vnode_zone, vp); } @@ -2884,6 +3112,7 @@ vgonel(struct vnode *vp) * Clear the advisory locks and wake up waiting threads. */ (void)VOP_ADVLOCKPURGE(vp); + vp->v_lockf = NULL; /* * Delete from old mount point vnode list. */ @@ -2986,8 +3215,6 @@ vn_printf(struct vnode *vp, const char * } if (vp->v_iflag & VI_MOUNT) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Wed Dec 30 09:02:05 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B5B66A55FE1 for ; Wed, 30 Dec 2015 09:02:05 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7DF671AD1; Wed, 30 Dec 2015 09:02:05 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBU924h8098505; Wed, 30 Dec 2015 09:02:04 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBU924Pw098498; Wed, 30 Dec 2015 09:02:04 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512300902.tBU924Pw098498@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 30 Dec 2015 09:02:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292910 - in user/ngie/stable-10-libnv: share/man/man9 sys/dev/pci X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2015 09:02:05 -0000 Author: ngie Date: Wed Dec 30 09:02:03 2015 New Revision: 292910 URL: https://svnweb.freebsd.org/changeset/base/292910 Log: MFC r279442,r279446: r279442 (by rstone): Refactor PCI resource allocation Refactor PCI resource allocation code to allow a request for a memory-mapped I/O window that is a multiple of a requested size. This is needed by the SR-IOV code because the VF BARs are all allocated contiguously. We can't just allocate a resource that is a multiple of a single VF BAR because the size of an allocation implies its alignment requirement. Differential Revision: https://reviews.freebsd.org/D71 Reviewed by: jhb Sponsored by: Sandvine Inc. r279446 (by rstone): Add manpages for SR-IOV enable/disable driver interface Differential Revision: https://reviews.freebsd.org/D75 Reviewed by: wblock Sponsored by: Sandvine Inc. Added: user/ngie/stable-10-libnv/share/man/man9/PCI_ADD_VF.9 - copied unchanged from r279446, head/share/man/man9/PCI_ADD_VF.9 user/ngie/stable-10-libnv/share/man/man9/PCI_INIT_IOV.9 - copied unchanged from r279446, head/share/man/man9/PCI_INIT_IOV.9 user/ngie/stable-10-libnv/share/man/man9/PCI_UNINIT_IOV.9 - copied unchanged from r279446, head/share/man/man9/PCI_UNINIT_IOV.9 Modified: user/ngie/stable-10-libnv/share/man/man9/Makefile user/ngie/stable-10-libnv/sys/dev/pci/pci.c user/ngie/stable-10-libnv/sys/dev/pci/pci_private.h Directory Properties: user/ngie/stable-10-libnv/ (props changed) Modified: user/ngie/stable-10-libnv/share/man/man9/Makefile ============================================================================== --- user/ngie/stable-10-libnv/share/man/man9/Makefile Wed Dec 30 08:55:13 2015 (r292909) +++ user/ngie/stable-10-libnv/share/man/man9/Makefile Wed Dec 30 09:02:03 2015 (r292910) @@ -194,6 +194,9 @@ MAN= accept_filter.9 \ p_candebug.9 \ p_cansee.9 \ pci.9 \ + PCI_ADD_VF.9 \ + PCI_INIT_IOV.9 \ + PCI_UNINIT_IOV.9 \ pfil.9 \ pfind.9 \ pget.9 \ Copied: user/ngie/stable-10-libnv/share/man/man9/PCI_ADD_VF.9 (from r279446, head/share/man/man9/PCI_ADD_VF.9) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/stable-10-libnv/share/man/man9/PCI_ADD_VF.9 Wed Dec 30 09:02:03 2015 (r292910, copy of r279446, head/share/man/man9/PCI_ADD_VF.9) @@ -0,0 +1,113 @@ +.\" +.\" Copyright (c) 2014 Sandvine Inc. +.\" 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$ +.\" +.Dd May 24, 2014 +.Dt PCI_ADD_VF 9 +.Os +.Sh NAME +.Nm PCI_ADD_VF +.Nd inform a PF driver that a VF is being created +.Sh SYNOPSIS +.In sys/bus.h +.In machine/stdarg.h +.In sys/nv.h +.In dev/pci/pcireg.h +.In dev/pci/pcivar.h +.Ft int +.Fn PCI_ADD_VF "device_t dev" "uint16_t vfnum" "const nvlist_t *vf_config" +.Sh DESCRIPTION +The +.Fn PCI_ADD_VF +method is called by the PCI Single-Root I/O Virtualization +.Pq SR-IOV +infrastructure when it is initializating a new Virtual Function (VF) as a child +of the given Physical Function (PF) device. +This method will not be called until a successful call to +.Xr PCI_INIT_IOV 9 +has been made. +It is not guaranteed that this method will be called following a successful call +to +.Xr PCI_INIT_IOV 9 . +If the infrastructure encounters a failure to allocate resources following the +call to +.Xr PCI_INIT_IOV 9 , +the VF creation will be aborted and +.Xr PCI_UNINIT_IOV 9 +will be called immediately without any preceding calls to +.Nm . +.Pp +The index of the VF being initialized is passed in the +.Fa vfnum +argument. +VFs are always numbered sequentially starting at 0. +.Pp +If the driver requested device-specific configuration parameters via a VF schema +in its call to +.Xr pci_iov_attach 9 , +those parameters will be contained in the +.Pa vf_config +argument. +All configuration parameters that were either set as required parameters or that +had a default value set in the VF schema are guaranteed to be present in +.Fa vf_config . +Configuration parameters that were neither set as required nor were given a +default value are optional and may or may not be present in +.Fa vf_config . +.Fa vf_config +will not contain any configuration parameters that were not specified in the VF +schema. +All configuration parameters will have the correct type and will be in the range +of valid values specified in the schema. +.Pp +Note that it is possible for the user to set different configuration values on +different VF devices that are children of the same PF. +The PF driver must not cache configuration parameters passed in previous calls +to +.Fn PCI_ADD_VF +for other VFs and apply those parameters to the current VF. +.Pp +This function will not be called twice for the same +.Fa vf_num +on the same PF device without +.Xr PCI_UNINIT_IOV 9 +and +.Xr PCI_INIT_IOV 9 +first being called, in that order. +.Sh RETURN VALUES +This method returns 0 on success, otherwise an appropriate error is returned. +If this method returns an error then the current VF device will be destroyed +but the rest of the VF devices will be created and SR-IOV will be enabled on +the PF. +.Sh SEE ALSO +.Xr nv 9 , +.Xr pci 9 , +.Xr pci_iov_schema 9 , +.Xr PCI_INIT_IOV 9 , +.Xr PCI_UNINIT_IOV 9 +.Sh AUTHORS +This manual page was written by +.An Ryan Stone Aq Mt rstone@FreeBSD.org . Copied: user/ngie/stable-10-libnv/share/man/man9/PCI_INIT_IOV.9 (from r279446, head/share/man/man9/PCI_INIT_IOV.9) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/stable-10-libnv/share/man/man9/PCI_INIT_IOV.9 Wed Dec 30 09:02:03 2015 (r292910, copy of r279446, head/share/man/man9/PCI_INIT_IOV.9) @@ -0,0 +1,86 @@ +.\" +.\" Copyright (c) 2014 Sandvine Inc. +.\" 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$ +.\" +.Dd May 24, 2014 +.Dt PCI_INIT_IOV 9 +.Os +.Sh NAME +.Nm PCI_INIT_IOV +.Nd enable SR-IOV on a PF device +.Sh SYNOPSIS +.In sys/bus.h +.In machine/stdarg.h +.In sys/nv.h +.In dev/pci/pcireg.h +.In dev/pci/pcivar.h +.Ft int +.Fn PCI_INIT_IOV "device_t dev" "uint16_t num_vfs" "const nvlist_t *pf_config" +.Sh DESCRIPTION +The +.Fn PCI_INIT_IOV +method is called by the PCI Single-Root I/O Virtualization (SR-IOV) +infrastucture when the user requests that SR-IOV be enabled on a Physical +Function (PF). +The number of Virtual Functions (VFs) that will be created is passed to this +method in the +.Fa num_vfs +argument. +.Pp +If the driver requested device-specific PF configuration parameters via a PF +schema in its call to +.Xr pci_iov_attach 9 , +those parameters will be available in the +.Fa pf_config +argument. +All configuration parameters that were either set as required parameters or that +had a default value set in the PF schema are guaranteed to be present in +.Fa pf_config . +Configuration parameters that were neither set as required nor were given a +default value are optional and may or may not be present in +.Fa pf_config . +.Fa pf_config +will not contain any configuration parameters that were not specified in the PF +schema. +All configuration parameters will have the correct type and are in the range of +valid values specified in the schema. +.Pp +If this method returns successfully, then this method will not be called again +on the same device until after a call to +.Xr PCI_UNINIT_IOV . +.Sh RETURN VALUES +Returns 0 on success, otherwise an appropriate error is returned. +If this method returns an error then the SR-IOV configuration will be aborted +and no VFs will be created. +.Sh SEE ALSO +.Xr nv 9 , +.Xr pci 9 , +.Xr pci_iov_schema 9 , +.Xr PCI_ADD_VF 9 , +.Xr PCI_UNINIT_IOV 9 +.Sh AUTHORS +This manual page was written by +.An Ryan Stone Aq Mt rstone@FreeBSD.org . Copied: user/ngie/stable-10-libnv/share/man/man9/PCI_UNINIT_IOV.9 (from r279446, head/share/man/man9/PCI_UNINIT_IOV.9) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/stable-10-libnv/share/man/man9/PCI_UNINIT_IOV.9 Wed Dec 30 09:02:03 2015 (r292910, copy of r279446, head/share/man/man9/PCI_UNINIT_IOV.9) @@ -0,0 +1,64 @@ +.\" +.\" Copyright (c) 2014 Sandvine Inc. +.\" 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$ +.\" +.Dd May 24, 2014 +.Dt PCI_UNINIT_IOV 9 +.Os +.Sh NAME +.Nm PCI_UNINIT_IOV +.Nd disable SR-IOV on a PF device +.Sh SYNOPSIS +.In sys/bus.h +.In dev/pci/pcireg.h +.In dev/pci/pcivar.h +.Ft void +.Fn PCI_UNINIT_IOV "device_t dev" +.Sh DESCRIPTION +The +.Fn PCI_UNINIT_IOV +method is called by the PCI Single-Root I/O Virtualization (SR-IOV) +infrastructure when the user requests that SR-IOV be disabled on a Physical +Function (PF). +When this method is called, the PF driver must release any SR-IOV-related +resources that it has allocated and disable any device-specific SR-IOV +configuration in the device. +.Pp +This method will only be called following a successful call to +.Xr PCI_INIT_IOV . +It is not guaranteed that +.Xr PCI_ADD_VF +will have been called for any Virtual Function (VF) after the call to +.Xr PCI_INIT_IOV +and before the call to +.Nm . +.Sh SEE ALSO +.Xr pci 9 , +.Xr PCI_ADD_VF 9 , +.Xr PCI_INIT_IOV 9 +.Sh AUTHORS +This manual page was written by +.An Ryan Stone Aq Mt rstone@FreeBSD.org . Modified: user/ngie/stable-10-libnv/sys/dev/pci/pci.c ============================================================================== --- user/ngie/stable-10-libnv/sys/dev/pci/pci.c Wed Dec 30 08:55:13 2015 (r292909) +++ user/ngie/stable-10-libnv/sys/dev/pci/pci.c Wed Dec 30 09:02:03 2015 (r292910) @@ -77,7 +77,6 @@ __FBSDID("$FreeBSD$"); static int pci_has_quirk(uint32_t devid, int quirk); static pci_addr_t pci_mapbase(uint64_t mapreg); static const char *pci_maptype(uint64_t mapreg); -static int pci_mapsize(uint64_t testval); static int pci_maprange(uint64_t mapreg); static pci_addr_t pci_rombase(uint64_t mapreg); static int pci_romsize(uint64_t testval); @@ -492,7 +491,7 @@ pci_maptype(uint64_t mapreg) /* return log2 of map size decoded for memory or port map */ -static int +int pci_mapsize(uint64_t testval) { int ln2size; @@ -2674,8 +2673,9 @@ pci_memen(device_t dev) return (pci_read_config(dev, PCIR_COMMAND, 2) & PCIM_CMD_MEMEN) != 0; } -static void -pci_read_bar(device_t dev, int reg, pci_addr_t *mapp, pci_addr_t *testvalp) +void +pci_read_bar(device_t dev, int reg, pci_addr_t *mapp, pci_addr_t *testvalp, + int *bar64) { struct pci_devinfo *dinfo; pci_addr_t map, testval; @@ -2695,6 +2695,8 @@ pci_read_bar(device_t dev, int reg, pci_ pci_write_config(dev, reg, map, 4); *mapp = map; *testvalp = testval; + if (bar64 != NULL) + *bar64 = 0; return; } @@ -2736,6 +2738,8 @@ pci_read_bar(device_t dev, int reg, pci_ *mapp = map; *testvalp = testval; + if (bar64 != NULL) + *bar64 = (ln2range == 64); } static void @@ -2790,7 +2794,7 @@ pci_bar_enabled(device_t dev, struct pci return ((cmd & PCIM_CMD_PORTEN) != 0); } -static struct pci_map * +struct pci_map * pci_add_bar(device_t dev, int reg, pci_addr_t value, pci_addr_t size) { struct pci_devinfo *dinfo; @@ -2861,7 +2865,7 @@ pci_add_map(device_t bus, device_t dev, return (barlen); } - pci_read_bar(dev, reg, &map, &testval); + pci_read_bar(dev, reg, &map, &testval, NULL); if (PCI_BAR_MEM(map)) { type = SYS_RES_MEMORY; if (map & PCIM_BAR_MEM_PREFETCH) @@ -4531,7 +4535,7 @@ DB_SHOW_COMMAND(pciregs, db_pci_dump) static struct resource * pci_reserve_map(device_t dev, device_t child, int type, int *rid, - u_long start, u_long end, u_long count, u_int flags) + u_long start, u_long end, u_long count, u_int num, u_int flags) { struct pci_devinfo *dinfo = device_get_ivars(child); struct resource_list *rl = &dinfo->resources; @@ -4555,7 +4559,7 @@ pci_reserve_map(device_t dev, device_t c * have a atapci device in legacy mode and it fails * here, that other code is broken. */ - pci_read_bar(child, *rid, &map, &testval); + pci_read_bar(child, *rid, &map, &testval, NULL); /* * Determine the size of the BAR and ignore BARs with a size @@ -4597,7 +4601,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 = (pci_addr_t)1 << mapsize; + count = ((pci_addr_t)1 << mapsize) * num; if (RF_ALIGNMENT(flags) < mapsize) flags = (flags & ~RF_ALIGNMENT_MASK) | RF_ALIGNMENT_LOG2(mapsize); if (PCI_BAR_MEM(map) && (map & PCIM_BAR_MEM_PREFETCH)) @@ -4628,8 +4632,8 @@ out: } struct resource * -pci_alloc_resource(device_t dev, device_t child, int type, int *rid, - u_long start, u_long end, u_long count, u_int flags) +pci_alloc_multi_resource(device_t dev, device_t child, int type, int *rid, + u_long start, u_long end, u_long count, u_long num, u_int flags) { struct pci_devinfo *dinfo; struct resource_list *rl; @@ -4637,10 +4641,6 @@ pci_alloc_resource(device_t dev, device_ struct resource *res; pcicfgregs *cfg; - if (device_get_parent(child) != dev) - return (BUS_ALLOC_RESOURCE(device_get_parent(dev), child, - type, rid, start, end, count, flags)); - /* * Perform lazy resource allocation */ @@ -4697,7 +4697,7 @@ pci_alloc_resource(device_t dev, device_ rle = resource_list_find(rl, type, *rid); if (rle == NULL) { res = pci_reserve_map(dev, child, type, rid, start, end, - count, flags); + count, num, flags); if (res == NULL) return (NULL); } @@ -4706,6 +4706,19 @@ pci_alloc_resource(device_t dev, device_ start, end, count, flags)); } +struct resource * +pci_alloc_resource(device_t dev, device_t child, int type, int *rid, + u_long start, u_long end, u_long count, u_int flags) +{ + + if (device_get_parent(child) != dev) + return (BUS_ALLOC_RESOURCE(device_get_parent(dev), child, + type, rid, start, end, count, flags)); + + return (pci_alloc_multi_resource(dev, child, type, rid, start, end, + count, 1, flags)); +} + int pci_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r) Modified: user/ngie/stable-10-libnv/sys/dev/pci/pci_private.h ============================================================================== --- user/ngie/stable-10-libnv/sys/dev/pci/pci_private.h Wed Dec 30 08:55:13 2015 (r292909) +++ user/ngie/stable-10-libnv/sys/dev/pci/pci_private.h Wed Dec 30 09:02:03 2015 (r292910) @@ -139,4 +139,14 @@ void pci_cfg_restore(device_t, struct p */ void pci_cfg_save(device_t, struct pci_devinfo *, int); +int pci_mapsize(uint64_t testval); +void pci_read_bar(device_t dev, int reg, pci_addr_t *mapp, + pci_addr_t *testvalp, int *bar64); +struct pci_map *pci_add_bar(device_t dev, int reg, pci_addr_t value, + pci_addr_t size); + +struct resource *pci_alloc_multi_resource(device_t dev, device_t child, + int type, int *rid, u_long start, u_long end, u_long count, + u_long num, u_int flags); + #endif /* _PCI_PRIVATE_H_ */ From owner-svn-src-user@freebsd.org Wed Dec 30 09:33:32 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 95B3CA568BB for ; Wed, 30 Dec 2015 09:33:32 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4B99C1940; Wed, 30 Dec 2015 09:33:32 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBU9XVr8007657; Wed, 30 Dec 2015 09:33:31 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBU9XVgX007656; Wed, 30 Dec 2015 09:33:31 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512300933.tBU9XVgX007656@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 30 Dec 2015 09:33:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292912 - in user/ngie/stable-10-libnv: . sys/gnu/dts X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2015 09:33:32 -0000 Author: ngie Date: Wed Dec 30 09:33:31 2015 New Revision: 292912 URL: https://svnweb.freebsd.org/changeset/base/292912 Log: Do record-only merges of r264001 and r264006 to reduce eligible mergeinfo Modified: Directory Properties: user/ngie/stable-10-libnv/ (props changed) user/ngie/stable-10-libnv/sys/gnu/dts/ (props changed) From owner-svn-src-user@freebsd.org Wed Dec 30 20:15:31 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 67F7FA55D8F for ; Wed, 30 Dec 2015 20:15:31 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1927818CB; Wed, 30 Dec 2015 20:15:31 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBUKFUdr002897; Wed, 30 Dec 2015 20:15:30 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBUKFUrd002896; Wed, 30 Dec 2015 20:15:30 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201512302015.tBUKFUrd002896@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 30 Dec 2015 20:15:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292962 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2015 20:15:31 -0000 Author: pho Date: Wed Dec 30 20:15:29 2015 New Revision: 292962 URL: https://svnweb.freebsd.org/changeset/base/292962 Log: Added a regression test. PR: 178238 Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/nullfs16.sh (contents, props changed) Added: user/pho/stress2/misc/nullfs16.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/nullfs16.sh Wed Dec 30 20:15:29 2015 (r292962) @@ -0,0 +1,63 @@ +#!/bin/sh + +# +# Copyright (c) 2015 EMC Corp. +# 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$ +# + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg + +# [Bug 178238] [nullfs] nullfs don't release i-nodes on unlink. +# Test scenaro by: noah.bergbauer@tum.de +# Fixed by: r292961 + +mount | grep -q "on $mntpoint " && umount -f $mntpoint +mount -o size=1g -t tmpfs tmpfs $mntpoint + +mp2=${mntpoint}2 +[ -d $mp2 ] || mkdir -p $mp2 +mount | grep -q "on $mp2 " && umount -f $mp2 +mount -t nullfs $mntpoint $mp2 + +# Expect second dd to fail +for i in `jot 2`; do + dd if=/dev/zero of=$mp2/file bs=1m count=1023 2>&1 | \ + egrep -v 'records|transferred' + rm -f $mp2/file +done +if [ `df -i $mp2 | tail -1 | awk '{print $5}'` = "100%" ]; then + echo FAIL + s=1 + ls -al $mntpoint $mp2 + df -i | egrep "${mntpoint}$|${mp2}$" +fi + +umount $mp2 +umount $mntpoint + +exit $s From owner-svn-src-user@freebsd.org Thu Dec 31 03:32:45 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2701A56F53 for ; Thu, 31 Dec 2015 03:32:45 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 492D31D58; Thu, 31 Dec 2015 03:32:45 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBV3Wis3034374; Thu, 31 Dec 2015 03:32:44 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBV3WhRQ034367; Thu, 31 Dec 2015 03:32:43 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512310332.tBV3WhRQ034367@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 31 Dec 2015 03:32:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292974 - in user/ngie/stable-10-libnv: . etc/rc.d release share/mk sys/dev/isp usr.sbin/pw X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Dec 2015 03:32:45 -0000 Author: ngie Date: Thu Dec 31 03:32:43 2015 New Revision: 292974 URL: https://svnweb.freebsd.org/changeset/base/292974 Log: MFstable/10 @ r292973 Modified: user/ngie/stable-10-libnv/Makefile.inc1 user/ngie/stable-10-libnv/etc/rc.d/jail user/ngie/stable-10-libnv/release/Makefile user/ngie/stable-10-libnv/release/Makefile.vm user/ngie/stable-10-libnv/share/mk/bsd.own.mk user/ngie/stable-10-libnv/sys/dev/isp/isp.c user/ngie/stable-10-libnv/sys/dev/isp/isp_freebsd.c user/ngie/stable-10-libnv/sys/dev/isp/isp_freebsd.h user/ngie/stable-10-libnv/sys/dev/isp/isp_library.c user/ngie/stable-10-libnv/sys/dev/isp/isp_library.h user/ngie/stable-10-libnv/sys/dev/isp/isp_pci.c user/ngie/stable-10-libnv/sys/dev/isp/isp_sbus.c user/ngie/stable-10-libnv/sys/dev/isp/isp_target.c user/ngie/stable-10-libnv/sys/dev/isp/ispmbox.h user/ngie/stable-10-libnv/sys/dev/isp/ispvar.h user/ngie/stable-10-libnv/usr.sbin/pw/pw_conf.c user/ngie/stable-10-libnv/usr.sbin/pw/pw_group.c user/ngie/stable-10-libnv/usr.sbin/pw/pw_vpw.c Directory Properties: user/ngie/stable-10-libnv/ (props changed) Modified: user/ngie/stable-10-libnv/Makefile.inc1 ============================================================================== --- user/ngie/stable-10-libnv/Makefile.inc1 Thu Dec 31 03:28:14 2015 (r292973) +++ user/ngie/stable-10-libnv/Makefile.inc1 Thu Dec 31 03:32:43 2015 (r292974) @@ -913,13 +913,13 @@ packageworld: .for dist in base ${EXTRA_DISTRIBUTIONS} .if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ - --exclude usr/lib/debug \ - @${DESTDIR}/${DISTDIR}/${dist}.meta + tar cvf - --exclude usr/lib/debug \ + @${DESTDIR}/${DISTDIR}/${dist}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz .else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ - --exclude usr/lib/debug . + tar cvf - --exclude usr/lib/debug . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz .endif .endfor @@ -927,12 +927,12 @@ packageworld: . for dist in base ${EXTRA_DISTRIBUTIONS} . if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \ - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta + tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.debug.txz . else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \ - usr/lib/debug + tar cvLf - usr/lib/debug | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-debug.txz . endif . endfor .endif @@ -1141,19 +1141,21 @@ distributekernel distributekernel.debug: packagekernel: .if defined(NO_ROOT) cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \ - @${DESTDIR}/${DISTDIR}/kernel.meta + tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \ - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta + tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .endfor .else cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz . + tar cvf - . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz . + tar cvf - . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .endfor .endif Modified: user/ngie/stable-10-libnv/etc/rc.d/jail ============================================================================== --- user/ngie/stable-10-libnv/etc/rc.d/jail Thu Dec 31 03:28:14 2015 (r292973) +++ user/ngie/stable-10-libnv/etc/rc.d/jail Thu Dec 31 03:32:43 2015 (r292974) @@ -28,16 +28,16 @@ extra_commands="config console status" need_dad_wait= -# extract_var jail name param num defval -# Extract value from ${jail_$jail_$name} or ${jail_$name} and +# extract_var jv name param num defval +# Extract value from ${jail_$jv_$name} or ${jail_$name} and # set it to $param. If not defined, $defval is used. -# When $num is [0-9]*, ${jail_$jail_$name$num} are looked up and +# When $num is [0-9]*, ${jail_$jv_$name$num} are looked up and # $param is set by using +=. # When $num is YN or NY, the value is interpret as boolean. extract_var() { - local i _j _name _param _num _def _name1 _name2 - _j=$1 + local i _jv _name _param _num _def _name1 _name2 + _jv=$1 _name=$2 _param=$3 _num=$4 @@ -45,7 +45,7 @@ extract_var() case $_num in YN) - _name1=jail_${_j}_${_name} + _name1=jail_${_jv}_${_name} _name2=jail_${_name} eval $_name1=\"\${$_name1:-\${$_name2:-$_def}}\" if checkyesno $_name1; then @@ -55,7 +55,7 @@ extract_var() fi ;; NY) - _name1=jail_${_j}_${_name} + _name1=jail_${_jv}_${_name} _name2=jail_${_name} eval $_name1=\"\${$_name1:-\${$_name2:-$_def}}\" if checkyesno $_name1; then @@ -67,7 +67,7 @@ extract_var() [0-9]*) i=$_num while : ; do - _name1=jail_${_j}_${_name}${i} + _name1=jail_${_jv}_${_name}${i} _name2=jail_${_name}${i} eval _tmpargs=\"\${$_name1:-\${$_name2:-$_def}}\" if [ -n "$_tmpargs" ]; then @@ -79,7 +79,7 @@ extract_var() done ;; *) - _name1=jail_${_j}_${_name} + _name1=jail_${_jv}_${_name} _name2=jail_${_name} eval _tmpargs=\"\${$_name1:-\${$_name2:-$_def}}\" if [ -n "$_tmpargs" ]; then @@ -89,22 +89,23 @@ extract_var() esac } -# parse_options _j +# parse_options _j _jv # Parse options and create a temporary configuration file if necessary. # parse_options() { - local _j _p + local _j _jv _p _j=$1 + _jv=$2 _confwarn=0 if [ -z "$_j" ]; then warn "parse_options: you must specify a jail" return fi - eval _jconf=\"\${jail_${_j}_conf:-/etc/jail.${_j}.conf}\" - eval _rootdir=\"\$jail_${_j}_rootdir\" - eval _hostname=\"\$jail_${_j}_hostname\" + eval _jconf=\"\${jail_${_jv}_conf:-/etc/jail.${_j}.conf}\" + eval _rootdir=\"\$jail_${_jv}_rootdir\" + eval _hostname=\"\$jail_${_jv}_hostname\" if [ -z "$_rootdir" -o \ -z "$_hostname" ]; then if [ -r "$_jconf" ]; then @@ -120,7 +121,7 @@ parse_options() fi return 1 fi - eval _ip=\"\$jail_${_j}_ip\" + eval _ip=\"\$jail_${_jv}_ip\" if [ -z "$_ip" ] && ! check_kern_features vimage; then warn "no ipaddress specified and no vimage support. " \ "Jail $_j was ignored." @@ -138,10 +139,10 @@ parse_options() fi /usr/bin/install -m 0644 -o root -g wheel /dev/null $_conf || return 1 - eval : \${jail_${_j}_flags:=${jail_flags}} - eval _exec=\"\$jail_${_j}_exec\" - eval _exec_start=\"\$jail_${_j}_exec_start\" - eval _exec_stop=\"\$jail_${_j}_exec_stop\" + eval : \${jail_${_jv}_flags:=${jail_flags}} + eval _exec=\"\$jail_${_jv}_exec\" + eval _exec_start=\"\$jail_${_jv}_exec_start\" + eval _exec_stop=\"\$jail_${_jv}_exec_stop\" if [ -n "${_exec}" ]; then # simple/backward-compatible execution _exec_start="${_exec}" @@ -155,20 +156,20 @@ parse_options() fi fi fi - eval _interface=\"\${jail_${_j}_interface:-${jail_interface}}\" - eval _parameters=\"\${jail_${_j}_parameters:-${jail_parameters}}\" - eval _fstab=\"\${jail_${_j}_fstab:-${jail_fstab:-/etc/fstab.$_j}}\" + eval _interface=\"\${jail_${_jv}_interface:-${jail_interface}}\" + eval _parameters=\"\${jail_${_jv}_parameters:-${jail_parameters}}\" + eval _fstab=\"\${jail_${_jv}_fstab:-${jail_fstab:-/etc/fstab.$_j}}\" ( date +"# Generated by rc.d/jail at %Y-%m-%d %H:%M:%S" echo "$_j {" - extract_var $_j hostname host.hostname - "" - extract_var $_j rootdir path - "" + extract_var $_jv hostname host.hostname - "" + extract_var $_jv rootdir path - "" if [ -n "$_ip" ]; then - extract_var $_j interface interface - "" + extract_var $_jv interface interface - "" jail_handle_ips_option $_ip $_interface alias=0 while : ; do - eval _x=\"\$jail_${_j}_ip_multi${alias}\" + eval _x=\"\$jail_${_jv}_ip_multi${alias}\" [ -z "$_x" ] && break jail_handle_ips_option $_x $_interface @@ -184,37 +185,37 @@ parse_options() ;; esac # These are applicable only to non-vimage jails. - extract_var $_j fib exec.fib - "" - extract_var $_j socket_unixiproute_only \ + extract_var $_jv fib exec.fib - "" + extract_var $_jv socket_unixiproute_only \ allow.raw_sockets NY YES else echo " vnet;" - extract_var $_j vnet_interface vnet.interface - "" + extract_var $_jv vnet_interface vnet.interface - "" fi echo " exec.clean;" echo " exec.system_user = \"root\";" echo " exec.jail_user = \"root\";" - extract_var $_j exec_prestart exec.prestart 0 "" - extract_var $_j exec_poststart exec.poststart 0 "" - extract_var $_j exec_prestop exec.prestop 0 "" - extract_var $_j exec_poststop exec.poststop 0 "" + extract_var $_jv exec_prestart exec.prestart 0 "" + extract_var $_jv exec_poststart exec.poststart 0 "" + extract_var $_jv exec_prestop exec.prestop 0 "" + extract_var $_jv exec_poststop exec.poststop 0 "" echo " exec.start += \"$_exec_start\";" - extract_var $_j exec_afterstart exec.start 1 "" + extract_var $_jv exec_afterstart exec.start 1 "" echo " exec.stop = \"$_exec_stop\";" - extract_var $_j consolelog exec.consolelog - \ + extract_var $_jv consolelog exec.consolelog - \ /var/log/jail_${_j}_console.log if [ -r $_fstab ]; then echo " mount.fstab = \"$_fstab\";" fi - eval : \${jail_${_j}_devfs_enable:=${jail_devfs_enable:-NO}} - if checkyesno jail_${_j}_devfs_enable; then + eval : \${jail_${_jv}_devfs_enable:=${jail_devfs_enable:-NO}} + if checkyesno jail_${_jv}_devfs_enable; then echo " mount.devfs;" - eval _ruleset=\${jail_${_j}_devfs_ruleset:-${jail_devfs_ruleset}} + eval _ruleset=\${jail_${_jv}_devfs_ruleset:-${jail_devfs_ruleset}} case $_ruleset in "") ;; [0-9]*) echo " devfs_ruleset = \"$_ruleset\";" ;; @@ -227,22 +228,22 @@ parse_options() *) warn "devfs_ruleset must be an integer." ;; esac fi - eval : \${jail_${_j}_fdescfs_enable:=${jail_fdescfs_enable:-NO}} - if checkyesno jail_${_j}_fdescfs_enable; then + eval : \${jail_${_jv}_fdescfs_enable:=${jail_fdescfs_enable:-NO}} + if checkyesno jail_${_jv}_fdescfs_enable; then echo " mount.fdescfs;" fi - eval : \${jail_${_j}_procfs_enable:=${jail_procfs_enable:-NO}} - if checkyesno jail_${_j}_procfs_enable; then + eval : \${jail_${_jv}_procfs_enable:=${jail_procfs_enable:-NO}} + if checkyesno jail_${_jv}_procfs_enable; then echo " mount.procfs;" fi - eval : \${jail_${_j}_mount_enable:=${jail_mount_enable:-NO}} - if checkyesno jail_${_j}_mount_enable; then - echo " allow.mount;" >> $_conf + eval : \${jail_${_jv}_mount_enable:=${jail_mount_enable:-NO}} + if checkyesno jail_${_jv}_mount_enable; then + echo " allow.mount;" fi - extract_var $_j set_hostname_allow allow.set_hostname YN NO - extract_var $_j sysvipc_allow allow.sysvipc YN NO + extract_var $_jv set_hostname_allow allow.set_hostname YN NO + extract_var $_jv sysvipc_allow allow.sysvipc YN NO for _p in $_parameters; do echo " ${_p%\;};" done @@ -380,14 +381,15 @@ jail_handle_ips_option() jail_config() { - local _j + local _j _jv case $1 in _ALL) return ;; esac for _j in $@; do _j=$(echo $_j | tr /. _) - if parse_options $_j; then + _jv=$(echo -n $_j | tr -c '[:alnum:]' _) + if parse_options $_j $_jv; then echo "$_j: parameters are in $_conf." fi done @@ -395,7 +397,7 @@ jail_config() jail_console() { - local _j _cmd + local _j _jv _cmd # One argument that is not _ALL. case $#:$1 in @@ -403,9 +405,10 @@ jail_console() 1:*) ;; esac _j=$(echo $1 | tr /. _) + _jv=$(echo -n $1 | tr -c '[:alnum:]' _) shift case $# in - 0) eval _cmd=\${jail_${_j}_consolecmd:-$jail_consolecmd} ;; + 0) eval _cmd=\${jail_${_jv}_consolecmd:-$jail_consolecmd} ;; *) _cmd=$@ ;; esac $jail_jexec $_j $_cmd @@ -419,7 +422,7 @@ jail_status() jail_start() { - local _j _jid _jl _id _name + local _j _jv _jid _jl _id _name if [ $# = 0 ]; then return @@ -452,11 +455,12 @@ jail_start() _jl= for _j in $@; do _j=$(echo $_j | tr /. _) - parse_options $_j || continue + _jv=$(echo -n $_j | tr -c '[:alnum:]' _) + parse_options $_j $_jv || continue _jl="$_jl $_j" - eval rc_flags=\${jail_${_j}_flags:-$jail_flags} - eval command=\${jail_${_j}_program:-$jail_program} + eval rc_flags=\${jail_${_jv}_flags:-$jail_flags} + eval command=\${jail_${_jv}_program:-$jail_program} command_args="-i -f $_conf -c $_j" $command $rc_flags $command_args \ >/dev/null 2>&1 /dev/null 2>&1; then continue fi - eval command=\${jail_${_j}_program:-$jail_program} + eval command=\${jail_${_jv}_program:-$jail_program} echo -n " ${_hostname:-${_j}}" _tmp=`mktemp -t jail` || exit 3 $command -q -f $_conf -r $_j >> $_tmp 2>&1 Modified: user/ngie/stable-10-libnv/release/Makefile ============================================================================== --- user/ngie/stable-10-libnv/release/Makefile Thu Dec 31 03:28:14 2015 (r292973) +++ user/ngie/stable-10-libnv/release/Makefile Thu Dec 31 03:32:43 2015 (r292974) @@ -40,7 +40,6 @@ WORLDDIR?= ${.CURDIR}/.. PORTSDIR?= /usr/ports DOCDIR?= /usr/doc RELNOTES_LANG?= en_US.ISO8859-1 -XZCMD?= /usr/bin/xz .if !defined(TARGET) || empty(TARGET) TARGET= ${MACHINE} @@ -161,16 +160,18 @@ kernel.txz: src.txz: mkdir -p ${DISTDIR}/usr ln -fs ${WORLDDIR} ${DISTDIR}/usr/src - cd ${DISTDIR} && tar cLvJf ${.OBJDIR}/src.txz --exclude .svn --exclude .zfs \ - --exclude .git --exclude @ --exclude usr/src/release/dist usr/src + cd ${DISTDIR} && tar cLvf - --exclude .svn --exclude .zfs \ + --exclude .git --exclude @ --exclude usr/src/release/dist usr/src | \ + ${XZ_CMD} > ${.OBJDIR}/src.txz ports.txz: mkdir -p ${DISTDIR}/usr ln -fs ${PORTSDIR} ${DISTDIR}/usr/ports - cd ${DISTDIR} && tar cLvJf ${.OBJDIR}/ports.txz \ + cd ${DISTDIR} && tar cLvf - \ --exclude .git --exclude .svn \ --exclude usr/ports/distfiles --exclude usr/ports/packages \ - --exclude 'usr/ports/INDEX*' --exclude work usr/ports + --exclude 'usr/ports/INDEX*' --exclude work usr/ports | \ + ${XZ_CMD} > ${.OBJDIR}/ports.txz reldoc: cd ${.CURDIR}/doc && ${MAKE} all install clean 'FORMATS=html txt' \ @@ -333,7 +334,7 @@ release-install: .for I in ${IMAGES} cp -p ${I} ${DESTDIR}/${OSRELEASE}-${I} . if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES) - ${XZCMD} -k ${DESTDIR}/${OSRELEASE}-${I} + ${XZ_CMD} -k ${DESTDIR}/${OSRELEASE}-${I} . endif .endfor cd ${DESTDIR} && sha512 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA512 Modified: user/ngie/stable-10-libnv/release/Makefile.vm ============================================================================== --- user/ngie/stable-10-libnv/release/Makefile.vm Thu Dec 31 03:28:14 2015 (r292973) +++ user/ngie/stable-10-libnv/release/Makefile.vm Thu Dec 31 03:32:43 2015 (r292974) @@ -137,7 +137,7 @@ vm-install: . if defined(WITH_COMPRESSED_VMIMAGES) && !empty(WITH_COMPRESSED_VMIMAGES) . for FORMAT in ${VMFORMATS} # Don't keep the originals. There is a copy in ${.OBJDIR} if needed. - ${XZCMD} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT} + ${XZ_CMD} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT} . endfor . endif cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \ Modified: user/ngie/stable-10-libnv/share/mk/bsd.own.mk ============================================================================== --- user/ngie/stable-10-libnv/share/mk/bsd.own.mk Thu Dec 31 03:28:14 2015 (r292973) +++ user/ngie/stable-10-libnv/share/mk/bsd.own.mk Thu Dec 31 03:32:43 2015 (r292974) @@ -213,6 +213,15 @@ STRIP?= -s COMPRESS_CMD?= gzip -cn COMPRESS_EXT?= .gz +# Set XZ_THREADS to 1 to disable multi-threading. +XZ_THREADS?= 0 + +.if !empty(XZ_THREADS) +XZ_CMD?= xz -T ${XZ_THREADS} +.else +XZ_CMD?= xz +.endif + .if !defined(_WITHOUT_SRCCONF) # # Define MK_* variables (which are either "yes" or "no") for users Modified: user/ngie/stable-10-libnv/sys/dev/isp/isp.c ============================================================================== --- user/ngie/stable-10-libnv/sys/dev/isp/isp.c Thu Dec 31 03:28:14 2015 (r292973) +++ user/ngie/stable-10-libnv/sys/dev/isp/isp.c Thu Dec 31 03:32:43 2015 (r292974) @@ -108,12 +108,12 @@ static void isp_fibre_init(ispsoftc_t *) static void isp_fibre_init_2400(ispsoftc_t *); static void isp_clear_portdb(ispsoftc_t *, int); static void isp_mark_portdb(ispsoftc_t *, int); -static int isp_plogx(ispsoftc_t *, int, uint16_t, uint32_t, int, int); +static int isp_plogx(ispsoftc_t *, int, uint16_t, uint32_t, int); static int isp_port_login(ispsoftc_t *, uint16_t, uint32_t); static int isp_port_logout(ispsoftc_t *, uint16_t, uint32_t); -static int isp_getpdb(ispsoftc_t *, int, uint16_t, isp_pdb_t *, int); -static int isp_gethandles(ispsoftc_t *, int, uint16_t *, int *, int, int); -static void isp_dump_chip_portdb(ispsoftc_t *, int, int); +static int isp_getpdb(ispsoftc_t *, int, uint16_t, isp_pdb_t *); +static int isp_gethandles(ispsoftc_t *, int, uint16_t *, int *, int); +static void isp_dump_chip_portdb(ispsoftc_t *, int); static uint64_t isp_get_wwn(ispsoftc_t *, int, int, int); static int isp_fclink_test(ispsoftc_t *, int, int); static int isp_pdb_sync(ispsoftc_t *, int); @@ -2142,19 +2142,41 @@ isp_fibre_init_2400(ispsoftc_t *isp) if ((icbp->icb_fwoptions3 & ICB2400_OPT3_RSPSZ_MASK) == 0) { icbp->icb_fwoptions3 |= ICB2400_OPT3_RSPSZ_24; } - icbp->icb_fwoptions3 &= ~ICB2400_OPT3_RATE_AUTO; if (isp->isp_confopts & ISP_CFG_1GB) { + icbp->icb_fwoptions3 &= ~ICB2400_OPT3_RATE_MASK; icbp->icb_fwoptions3 |= ICB2400_OPT3_RATE_1GB; } else if (isp->isp_confopts & ISP_CFG_2GB) { + icbp->icb_fwoptions3 &= ~ICB2400_OPT3_RATE_MASK; icbp->icb_fwoptions3 |= ICB2400_OPT3_RATE_2GB; } else if (isp->isp_confopts & ISP_CFG_4GB) { + icbp->icb_fwoptions3 &= ~ICB2400_OPT3_RATE_MASK; icbp->icb_fwoptions3 |= ICB2400_OPT3_RATE_4GB; } else if (isp->isp_confopts & ISP_CFG_8GB) { + icbp->icb_fwoptions3 &= ~ICB2400_OPT3_RATE_MASK; icbp->icb_fwoptions3 |= ICB2400_OPT3_RATE_8GB; } else if (isp->isp_confopts & ISP_CFG_16GB) { + icbp->icb_fwoptions3 &= ~ICB2400_OPT3_RATE_MASK; icbp->icb_fwoptions3 |= ICB2400_OPT3_RATE_16GB; } else { - icbp->icb_fwoptions3 |= ICB2400_OPT3_RATE_AUTO; + switch (icbp->icb_fwoptions3 & ICB2400_OPT3_RATE_MASK) { + case ICB2400_OPT3_RATE_4GB: + case ICB2400_OPT3_RATE_8GB: + case ICB2400_OPT3_RATE_16GB: + case ICB2400_OPT3_RATE_AUTO: + break; + case ICB2400_OPT3_RATE_2GB: + if (isp->isp_type <= ISP_HA_FC_2500) + break; + /*FALLTHROUGH*/ + case ICB2400_OPT3_RATE_1GB: + if (isp->isp_type <= ISP_HA_FC_2400) + break; + /*FALLTHROUGH*/ + default: + icbp->icb_fwoptions3 &= ~ICB2400_OPT3_RATE_MASK; + icbp->icb_fwoptions3 |= ICB2400_OPT3_RATE_AUTO; + break; + } } icbp->icb_logintime = ICB_LOGIN_TOV; @@ -2322,6 +2344,161 @@ isp_fibre_init_2400(ispsoftc_t *isp) isp->isp_state = ISP_RUNSTATE; } +static int +isp_fc_enable_vp(ispsoftc_t *isp, int chan) +{ + fcparam *fcp = FCPARAM(isp, chan); + vp_modify_t vp; + void *reqp; + uint8_t resp[QENTRY_LEN]; + + /* Build a VP MODIFY command in memory */ + ISP_MEMZERO(&vp, sizeof(vp)); + vp.vp_mod_hdr.rqs_entry_type = RQSTYPE_VP_MODIFY; + vp.vp_mod_hdr.rqs_entry_count = 1; + vp.vp_mod_cnt = 1; + vp.vp_mod_idx0 = chan; + vp.vp_mod_cmd = VP_MODIFY_ENA; + vp.vp_mod_ports[0].options = ICB2400_VPOPT_ENABLED | + ICB2400_VPOPT_ENA_SNSLOGIN; + if (fcp->role & ISP_ROLE_INITIATOR) + vp.vp_mod_ports[0].options |= ICB2400_VPOPT_INI_ENABLE; + if ((fcp->role & ISP_ROLE_TARGET) == 0) + vp.vp_mod_ports[0].options |= ICB2400_VPOPT_TGT_DISABLE; + if (fcp->isp_loopid < LOCAL_LOOP_LIM) { + vp.vp_mod_ports[0].loopid = fcp->isp_loopid; + if (isp->isp_confopts & ISP_CFG_OWNLOOPID) + vp.vp_mod_ports[0].options |= ICB2400_VPOPT_HARD_ADDRESS; + else + vp.vp_mod_ports[0].options |= ICB2400_VPOPT_PREV_ADDRESS; + } + MAKE_NODE_NAME_FROM_WWN(vp.vp_mod_ports[0].wwpn, fcp->isp_wwpn); + MAKE_NODE_NAME_FROM_WWN(vp.vp_mod_ports[0].wwnn, fcp->isp_wwnn); + + /* Prepare space for response in memory */ + memset(resp, 0xff, sizeof(resp)); + vp.vp_mod_hdl = isp_allocate_handle(isp, resp, ISP_HANDLE_CTRL); + if (vp.vp_mod_hdl == 0) { + isp_prt(isp, ISP_LOGERR, + "%s: VP_MODIFY of Chan %d out of handles", __func__, chan); + return (EIO); + } + + /* Send request and wait for response. */ + reqp = isp_getrqentry(isp); + if (reqp == NULL) { + isp_prt(isp, ISP_LOGERR, + "%s: VP_MODIFY of Chan %d out of rqent", __func__, chan); + isp_destroy_handle(isp, vp.vp_mod_hdl); + return (EIO); + } + isp_put_vp_modify(isp, &vp, (vp_modify_t *)reqp); + ISP_SYNC_REQUEST(isp); + if (msleep(resp, &isp->isp_lock, 0, "VP_MODIFY", 5*hz) == EWOULDBLOCK) { + isp_prt(isp, ISP_LOGERR, + "%s: VP_MODIFY of Chan %d timed out", __func__, chan); + isp_destroy_handle(isp, vp.vp_mod_hdl); + return (EIO); + } + isp_get_vp_modify(isp, (vp_modify_t *)resp, &vp); + + if (vp.vp_mod_hdr.rqs_flags != 0 || vp.vp_mod_status != VP_STS_OK) { + isp_prt(isp, ISP_LOGERR, + "%s: VP_MODIFY of Chan %d failed with flags %x status %d", + __func__, chan, vp.vp_mod_hdr.rqs_flags, vp.vp_mod_status); + return (EIO); + } + return (0); +} + +static int +isp_fc_disable_vp(ispsoftc_t *isp, int chan) +{ + vp_ctrl_info_t vp; + void *reqp; + uint8_t resp[QENTRY_LEN]; + + /* Build a VP CTRL command in memory */ + ISP_MEMZERO(&vp, sizeof(vp)); + vp.vp_ctrl_hdr.rqs_entry_type = RQSTYPE_VP_CTRL; + vp.vp_ctrl_hdr.rqs_entry_count = 1; + if (ISP_CAP_VP0(isp)) { + vp.vp_ctrl_status = 1; + } else { + vp.vp_ctrl_status = 0; + chan--; /* VP0 can not be controlled in this case. */ + } + vp.vp_ctrl_command = VP_CTRL_CMD_DISABLE_VP_LOGO_ALL; + vp.vp_ctrl_vp_count = 1; + vp.vp_ctrl_idmap[chan / 16] |= (1 << chan % 16); + + /* Prepare space for response in memory */ + memset(resp, 0xff, sizeof(resp)); + vp.vp_ctrl_handle = isp_allocate_handle(isp, resp, ISP_HANDLE_CTRL); + if (vp.vp_ctrl_handle == 0) { + isp_prt(isp, ISP_LOGERR, + "%s: VP_CTRL of Chan %d out of handles", __func__, chan); + return (EIO); + } + + /* Send request and wait for response. */ + reqp = isp_getrqentry(isp); + if (reqp == NULL) { + isp_prt(isp, ISP_LOGERR, + "%s: VP_CTRL of Chan %d out of rqent", __func__, chan); + isp_destroy_handle(isp, vp.vp_ctrl_handle); + return (EIO); + } + isp_put_vp_ctrl_info(isp, &vp, (vp_ctrl_info_t *)reqp); + ISP_SYNC_REQUEST(isp); + if (msleep(resp, &isp->isp_lock, 0, "VP_CTRL", 5*hz) == EWOULDBLOCK) { + isp_prt(isp, ISP_LOGERR, + "%s: VP_CTRL of Chan %d timed out", __func__, chan); + isp_destroy_handle(isp, vp.vp_ctrl_handle); + return (EIO); + } + isp_get_vp_ctrl_info(isp, (vp_ctrl_info_t *)resp, &vp); + + if (vp.vp_ctrl_hdr.rqs_flags != 0 || vp.vp_ctrl_status != 0) { + isp_prt(isp, ISP_LOGERR, + "%s: VP_CTRL of Chan %d failed with flags %x status %d %d", + __func__, chan, vp.vp_ctrl_hdr.rqs_flags, + vp.vp_ctrl_status, vp.vp_ctrl_index_fail); + return (EIO); + } + return (0); +} + +static int +isp_fc_change_role(ispsoftc_t *isp, int chan, int new_role) +{ + fcparam *fcp = FCPARAM(isp, chan); + int i, was, res = 0; + + if (chan >= isp->isp_nchan) { + isp_prt(isp, ISP_LOGWARN, "%s: bad channel %d", __func__, chan); + return (ENXIO); + } + if (fcp->role == new_role) + return (0); + for (was = 0, i = 0; i < isp->isp_nchan; i++) { + if (FCPARAM(isp, i)->role != ISP_ROLE_NONE) + was++; + } + if (was == 0 || (was == 1 && fcp->role != ISP_ROLE_NONE)) { + fcp->role = new_role; + return (isp_reinit(isp, 0)); + } + if (fcp->role != ISP_ROLE_NONE) { + res = isp_fc_disable_vp(isp, chan); + isp_clear_portdb(isp, chan); + } + fcp->role = new_role; + if (fcp->role != ISP_ROLE_NONE) + res = isp_fc_enable_vp(isp, chan); + return (res); +} + static void isp_clear_portdb(ispsoftc_t *isp, int chan) { @@ -2373,13 +2550,11 @@ isp_mark_portdb(ispsoftc_t *isp, int cha * or via FABRIC LOGIN/FABRIC LOGOUT for other cards. */ static int -isp_plogx(ispsoftc_t *isp, int chan, uint16_t handle, uint32_t portid, int flags, int gs) +isp_plogx(ispsoftc_t *isp, int chan, uint16_t handle, uint32_t portid, int flags) { - mbreg_t mbs; - uint8_t q[QENTRY_LEN]; - isp_plogx_t *plp; - fcparam *fcp; - uint8_t *scp; + isp_plogx_t pl; + void *reqp; + uint8_t resp[QENTRY_LEN]; uint32_t sst, parm1; int rval, lev; const char *msg; @@ -2399,63 +2574,58 @@ isp_plogx(ispsoftc_t *isp, int chan, uin } } - ISP_MEMZERO(q, QENTRY_LEN); - plp = (isp_plogx_t *) q; - plp->plogx_header.rqs_entry_count = 1; - plp->plogx_header.rqs_entry_type = RQSTYPE_LOGIN; - plp->plogx_handle = 0xffffffff; - plp->plogx_nphdl = handle; - plp->plogx_vphdl = chan; - plp->plogx_portlo = portid; - plp->plogx_rspsz_porthi = (portid >> 16) & 0xff; - plp->plogx_flags = flags; - - if (isp->isp_dblev & ISP_LOGDEBUG1) { - isp_print_bytes(isp, "IOCB LOGX", QENTRY_LEN, plp); - } - - if (gs == 0) { - if (FC_SCRATCH_ACQUIRE(isp, chan)) { - isp_prt(isp, ISP_LOGERR, sacq); - return (-1); - } + ISP_MEMZERO(&pl, sizeof(pl)); + pl.plogx_header.rqs_entry_count = 1; + pl.plogx_header.rqs_entry_type = RQSTYPE_LOGIN; + pl.plogx_nphdl = handle; + pl.plogx_vphdl = chan; + pl.plogx_portlo = portid; + pl.plogx_rspsz_porthi = (portid >> 16) & 0xff; + pl.plogx_flags = flags; + + /* Prepare space for response in memory */ + memset(resp, 0xff, sizeof(resp)); + pl.plogx_handle = isp_allocate_handle(isp, resp, ISP_HANDLE_CTRL); + if (pl.plogx_handle == 0) { + isp_prt(isp, ISP_LOGERR, + "%s: PLOGX of Chan %d out of handles", __func__, chan); + return (-1); } - fcp = FCPARAM(isp, chan); - scp = fcp->isp_scratch; - isp_put_plogx(isp, plp, (isp_plogx_t *) scp); - MBSINIT(&mbs, MBOX_EXEC_COMMAND_IOCB_A64, MBLOGALL, 500000); - mbs.param[1] = QENTRY_LEN; - mbs.param[2] = DMA_WD1(fcp->isp_scdma); - mbs.param[3] = DMA_WD0(fcp->isp_scdma); - mbs.param[6] = DMA_WD3(fcp->isp_scdma); - mbs.param[7] = DMA_WD2(fcp->isp_scdma); - MEMORYBARRIER(isp, SYNC_SFORDEV, 0, QENTRY_LEN, chan); - isp_mboxcmd(isp, &mbs); - if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { - rval = mbs.param[0]; - goto out; + /* Send request and wait for response. */ + reqp = isp_getrqentry(isp); + if (reqp == NULL) { + isp_prt(isp, ISP_LOGERR, + "%s: PLOGX of Chan %d out of rqent", __func__, chan); + isp_destroy_handle(isp, pl.plogx_handle); + return (-1); } - MEMORYBARRIER(isp, SYNC_SFORCPU, QENTRY_LEN, QENTRY_LEN, chan); - scp += QENTRY_LEN; - isp_get_plogx(isp, (isp_plogx_t *) scp, plp); - if (isp->isp_dblev & ISP_LOGDEBUG1) { - isp_print_bytes(isp, "IOCB LOGX response", QENTRY_LEN, plp); + if (isp->isp_dblev & ISP_LOGDEBUG1) + isp_print_bytes(isp, "IOCB LOGX", QENTRY_LEN, &pl); + isp_put_plogx(isp, &pl, (isp_plogx_t *)reqp); + ISP_SYNC_REQUEST(isp); + if (msleep(resp, &isp->isp_lock, 0, "PLOGX", 3 * ICB_LOGIN_TOV * hz) + == EWOULDBLOCK) { + isp_prt(isp, ISP_LOGERR, + "%s: PLOGX of Chan %d timed out", __func__, chan); + isp_destroy_handle(isp, pl.plogx_handle); + return (-1); } + isp_get_plogx(isp, (isp_plogx_t *)resp, &pl); + if (isp->isp_dblev & ISP_LOGDEBUG1) + isp_print_bytes(isp, "IOCB LOGX response", QENTRY_LEN, &pl); - if (plp->plogx_status == PLOGX_STATUS_OK) { - rval = 0; - goto out; - } else if (plp->plogx_status != PLOGX_STATUS_IOCBERR) { + if (pl.plogx_status == PLOGX_STATUS_OK) { + return (0); + } else if (pl.plogx_status != PLOGX_STATUS_IOCBERR) { isp_prt(isp, ISP_LOGWARN, "status 0x%x on port login IOCB channel %d", - plp->plogx_status, chan); - rval = -1; - goto out; + pl.plogx_status, chan); + return (-1); } - sst = plp->plogx_ioparm[0].lo16 | (plp->plogx_ioparm[0].hi16 << 16); - parm1 = plp->plogx_ioparm[1].lo16 | (plp->plogx_ioparm[1].hi16 << 16); + sst = pl.plogx_ioparm[0].lo16 | (pl.plogx_ioparm[0].hi16 << 16); + parm1 = pl.plogx_ioparm[1].lo16 | (pl.plogx_ioparm[1].hi16 << 16); rval = -1; lev = ISP_LOGERR; @@ -2516,17 +2686,13 @@ isp_plogx(ispsoftc_t *isp, int chan, uin msg = "no FLOGI_ACC"; break; default: - ISP_SNPRINTF(buf, sizeof (buf), "status %x from %x", plp->plogx_status, flags); + ISP_SNPRINTF(buf, sizeof (buf), "status %x from %x", pl.plogx_status, flags); msg = buf; break; } if (msg) { isp_prt(isp, ISP_LOGERR, "Chan %d PLOGX PortID 0x%06x to N-Port handle 0x%x: %s", chan, portid, handle, msg); } -out: - if (gs == 0) { - FC_SCRATCH_RELEASE(isp, chan); - } return (rval); } @@ -2596,7 +2762,7 @@ isp_port_logout(ispsoftc_t *isp, uint16_ } static int -isp_getpdb(ispsoftc_t *isp, int chan, uint16_t id, isp_pdb_t *pdb, int dolock) +isp_getpdb(ispsoftc_t *isp, int chan, uint16_t id, isp_pdb_t *pdb) { fcparam *fcp = FCPARAM(isp, chan); mbreg_t mbs; @@ -2620,18 +2786,14 @@ isp_getpdb(ispsoftc_t *isp, int chan, ui mbs.param[3] = DMA_WD0(fcp->isp_scdma); mbs.param[6] = DMA_WD3(fcp->isp_scdma); mbs.param[7] = DMA_WD2(fcp->isp_scdma); - if (dolock) { - if (FC_SCRATCH_ACQUIRE(isp, chan)) { - isp_prt(isp, ISP_LOGERR, sacq); - return (-1); - } + if (FC_SCRATCH_ACQUIRE(isp, chan)) { + isp_prt(isp, ISP_LOGERR, sacq); + return (-1); } MEMORYBARRIER(isp, SYNC_SFORDEV, 0, sizeof (un), chan); isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { - if (dolock) { - FC_SCRATCH_RELEASE(isp, chan); - } + FC_SCRATCH_RELEASE(isp, chan); return (mbs.param[0] | (mbs.param[1] << 16)); } if (IS_24XX(isp)) { @@ -2647,9 +2809,7 @@ isp_getpdb(ispsoftc_t *isp, int chan, ui un.bill.pdb_curstate); if (un.bill.pdb_curstate < PDB2400_STATE_PLOGI_DONE || un.bill.pdb_curstate > PDB2400_STATE_LOGGED_IN) { mbs.param[0] = MBOX_NOT_LOGGED_IN; - if (dolock) { - FC_SCRATCH_RELEASE(isp, chan); - } + FC_SCRATCH_RELEASE(isp, chan); return (mbs.param[0]); } } else { @@ -2662,15 +2822,12 @@ isp_getpdb(ispsoftc_t *isp, int chan, ui isp_prt(isp, ISP_LOGDEBUG1, "Chan %d handle 0x%x Port 0x%06x", chan, id, pdb->portid); } - if (dolock) { - FC_SCRATCH_RELEASE(isp, chan); - } + FC_SCRATCH_RELEASE(isp, chan); return (0); } static int -isp_gethandles(ispsoftc_t *isp, int chan, uint16_t *handles, int *num, - int dolock, int loop) +isp_gethandles(ispsoftc_t *isp, int chan, uint16_t *handles, int *num, int loop) { fcparam *fcp = FCPARAM(isp, chan); mbreg_t mbs; @@ -2696,18 +2853,14 @@ isp_gethandles(ispsoftc_t *isp, int chan mbs.param[3] = DMA_WD3(fcp->isp_scdma); mbs.param[6] = DMA_WD2(fcp->isp_scdma); } - if (dolock) { - if (FC_SCRATCH_ACQUIRE(isp, chan)) { - isp_prt(isp, ISP_LOGERR, sacq); - return (-1); - } + if (FC_SCRATCH_ACQUIRE(isp, chan)) { + isp_prt(isp, ISP_LOGERR, sacq); + return (-1); } MEMORYBARRIER(isp, SYNC_SFORDEV, 0, ISP_FC_SCRLEN, chan); isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { - if (dolock) { - FC_SCRATCH_RELEASE(isp, chan); - } + FC_SCRATCH_RELEASE(isp, chan); return (mbs.param[0] | (mbs.param[1] << 16)); } elp1 = fcp->isp_scratch; @@ -2735,13 +2888,12 @@ isp_gethandles(ispsoftc_t *isp, int chan handles[j++] = h; } *num = j; - if (dolock) - FC_SCRATCH_RELEASE(isp, chan); + FC_SCRATCH_RELEASE(isp, chan); return (0); } static void -isp_dump_chip_portdb(ispsoftc_t *isp, int chan, int dolock) +isp_dump_chip_portdb(ispsoftc_t *isp, int chan) { isp_pdb_t pdb; uint16_t lim, nphdl; @@ -2753,7 +2905,7 @@ isp_dump_chip_portdb(ispsoftc_t *isp, in lim = NPH_MAX; } for (nphdl = 0; nphdl != lim; nphdl++) { - if (isp_getpdb(isp, chan, nphdl, &pdb, dolock)) { + if (isp_getpdb(isp, chan, nphdl, &pdb)) { continue; } isp_prt(isp, ISP_LOG_SANCFG|ISP_LOGINFO, "Chan %d Handle 0x%04x " @@ -2903,7 +3055,7 @@ isp_fclink_test(ispsoftc_t *isp, int cha if (fcp->isp_topo == TOPO_F_PORT || fcp->isp_topo == TOPO_FL_PORT) { nphdl = IS_24XX(isp) ? NPH_FL_ID : FL_ID; - r = isp_getpdb(isp, chan, nphdl, &pdb, 1); + r = isp_getpdb(isp, chan, nphdl, &pdb); if (r != 0 || pdb.portid == 0) { if (IS_2100(isp)) { fcp->isp_topo = TOPO_NL_PORT; @@ -3018,7 +3170,7 @@ isp_pdb_sync(ispsoftc_t *isp, int chan) lp->portid, PLOGX_FLG_CMD_LOGO | PLOGX_FLG_IMPLICIT | - PLOGX_FLG_FREE_NPHDL, 0); + PLOGX_FLG_FREE_NPHDL); } /* * Note that we might come out of this with our state @@ -3145,7 +3297,7 @@ isp_fix_portids(ispsoftc_t *isp, int cha if (VALID_PORT(lp->portid)) continue; - r = isp_getpdb(isp, chan, lp->handle, &pdb, 1); + r = isp_getpdb(isp, chan, lp->handle, &pdb); if (fcp->isp_loopstate < LOOP_SCANNING_LOOP) return; if (r != 0) { @@ -3174,7 +3326,7 @@ isp_scan_loop(ispsoftc_t *isp, int chan) fcparam *fcp = FCPARAM(isp, chan); int idx, lim, r; isp_pdb_t pdb; - uint16_t handles[LOCAL_LOOP_LIM]; + uint16_t *handles; uint16_t handle; if (fcp->isp_loopstate < LOOP_LTEST_DONE) @@ -3196,8 +3348,9 @@ isp_scan_loop(ispsoftc_t *isp, int chan) return (0); } - lim = LOCAL_LOOP_LIM; - r = isp_gethandles(isp, chan, handles, &lim, 1, 1); + handles = (uint16_t *)fcp->isp_scanscratch; + lim = ISP_FC_SCRLEN / 2; + r = isp_gethandles(isp, chan, handles, &lim, 1); if (r != 0) { isp_prt(isp, ISP_LOG_SANCFG, "Chan %d Getting list of handles failed with %x", chan, r); @@ -3247,7 +3400,7 @@ abort: /* * Get the port database entity for this index. */ - r = isp_getpdb(isp, chan, handle, &pdb, 1); + r = isp_getpdb(isp, chan, handle, &pdb); if (fcp->isp_loopstate < LOOP_SCANNING_LOOP) goto abort; if (r != 0) { @@ -3276,20 +3429,10 @@ abort: * *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Thu Dec 31 04:14:07 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A2C2A57C2D for ; Thu, 31 Dec 2015 04:14:07 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 17F7212E7; Thu, 31 Dec 2015 04:14:07 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBV4E6TB046685; Thu, 31 Dec 2015 04:14:06 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBV4E6Se046684; Thu, 31 Dec 2015 04:14:06 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512310414.tBV4E6Se046684@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 31 Dec 2015 04:14:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292977 - user/ngie/stable-10-libnv/sys/dev/pci X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Dec 2015 04:14:07 -0000 Author: ngie Date: Thu Dec 31 04:14:05 2015 New Revision: 292977 URL: https://svnweb.freebsd.org/changeset/base/292977 Log: MFstable/10 @ r292976 Modified: user/ngie/stable-10-libnv/sys/dev/pci/pci.c Directory Properties: user/ngie/stable-10-libnv/ (props changed) Modified: user/ngie/stable-10-libnv/sys/dev/pci/pci.c ============================================================================== --- user/ngie/stable-10-libnv/sys/dev/pci/pci.c Thu Dec 31 04:01:52 2015 (r292976) +++ user/ngie/stable-10-libnv/sys/dev/pci/pci.c Thu Dec 31 04:14:05 2015 (r292977) @@ -614,8 +614,6 @@ pci_read_device(device_t pcib, int d, in if (REG(PCIR_DEVVENDOR, 4) != 0xfffffffful) { devlist_entry = malloc(size, M_DEVBUF, M_WAITOK | M_ZERO); - if (devlist_entry == NULL) - return (NULL); cfg = &devlist_entry->cfg; From owner-svn-src-user@freebsd.org Thu Dec 31 21:51:39 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E324DA57CA8 for ; Thu, 31 Dec 2015 21:51:39 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AA27B125B; Thu, 31 Dec 2015 21:51:39 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBVLpcQW063599; Thu, 31 Dec 2015 21:51:38 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBVLpc7I063589; Thu, 31 Dec 2015 21:51:38 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512312151.tBVLpc7I063589@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 31 Dec 2015 21:51:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r293007 - in user/ngie/more-tests2: . bin/sh contrib/binutils/bfd contrib/llvm/patches contrib/llvm/tools/clang/tools/driver lib/libc/stdio lib/libc/sys lib/libmd lib/libstand sbin/rebo... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Dec 2015 21:51:40 -0000 Author: ngie Date: Thu Dec 31 21:51:38 2015 New Revision: 293007 URL: https://svnweb.freebsd.org/changeset/base/293007 Log: MFhead @ r293006 Added: user/ngie/more-tests2/sys/opencrypto/xform_aes_icm.c - copied unchanged from r293006, head/sys/opencrypto/xform_aes_icm.c user/ngie/more-tests2/sys/opencrypto/xform_aes_xts.c - copied unchanged from r293006, head/sys/opencrypto/xform_aes_xts.c user/ngie/more-tests2/sys/opencrypto/xform_auth.h - copied unchanged from r293006, head/sys/opencrypto/xform_auth.h user/ngie/more-tests2/sys/opencrypto/xform_blf.c - copied unchanged from r293006, head/sys/opencrypto/xform_blf.c user/ngie/more-tests2/sys/opencrypto/xform_cast5.c - copied unchanged from r293006, head/sys/opencrypto/xform_cast5.c user/ngie/more-tests2/sys/opencrypto/xform_cml.c - copied unchanged from r293006, head/sys/opencrypto/xform_cml.c user/ngie/more-tests2/sys/opencrypto/xform_comp.h - copied unchanged from r293006, head/sys/opencrypto/xform_comp.h user/ngie/more-tests2/sys/opencrypto/xform_deflate.c - copied unchanged from r293006, head/sys/opencrypto/xform_deflate.c user/ngie/more-tests2/sys/opencrypto/xform_des1.c - copied unchanged from r293006, head/sys/opencrypto/xform_des1.c user/ngie/more-tests2/sys/opencrypto/xform_des3.c - copied unchanged from r293006, head/sys/opencrypto/xform_des3.c user/ngie/more-tests2/sys/opencrypto/xform_enc.h - copied unchanged from r293006, head/sys/opencrypto/xform_enc.h user/ngie/more-tests2/sys/opencrypto/xform_gmac.c - copied unchanged from r293006, head/sys/opencrypto/xform_gmac.c user/ngie/more-tests2/sys/opencrypto/xform_md5.c - copied unchanged from r293006, head/sys/opencrypto/xform_md5.c user/ngie/more-tests2/sys/opencrypto/xform_null.c - copied unchanged from r293006, head/sys/opencrypto/xform_null.c user/ngie/more-tests2/sys/opencrypto/xform_rijndael.c - copied unchanged from r293006, head/sys/opencrypto/xform_rijndael.c user/ngie/more-tests2/sys/opencrypto/xform_rmd160.c - copied unchanged from r293006, head/sys/opencrypto/xform_rmd160.c user/ngie/more-tests2/sys/opencrypto/xform_sha1.c - copied unchanged from r293006, head/sys/opencrypto/xform_sha1.c user/ngie/more-tests2/sys/opencrypto/xform_sha2.c - copied unchanged from r293006, head/sys/opencrypto/xform_sha2.c user/ngie/more-tests2/sys/opencrypto/xform_skipjack.c - copied unchanged from r293006, head/sys/opencrypto/xform_skipjack.c user/ngie/more-tests2/sys/opencrypto/xform_userland.h - copied unchanged from r293006, head/sys/opencrypto/xform_userland.h user/ngie/more-tests2/tests/sys/kern/unix_passfd_test.c - copied unchanged from r293006, head/tests/sys/kern/unix_passfd_test.c user/ngie/more-tests2/usr.bin/clang/clang/CC.sh - copied unchanged from r293006, head/usr.bin/clang/clang/CC.sh Deleted: user/ngie/more-tests2/contrib/llvm/patches/patch-02-add-CC-aliases.diff user/ngie/more-tests2/tools/regression/sockets/unix_passfd/ Modified: user/ngie/more-tests2/COPYRIGHT user/ngie/more-tests2/ObsoleteFiles.inc user/ngie/more-tests2/bin/sh/expand.c user/ngie/more-tests2/bin/sh/expand.h user/ngie/more-tests2/contrib/binutils/bfd/elf32-arm.c user/ngie/more-tests2/contrib/llvm/tools/clang/tools/driver/driver.cpp user/ngie/more-tests2/lib/libc/stdio/findfp.c user/ngie/more-tests2/lib/libc/sys/ptrace.2 user/ngie/more-tests2/lib/libmd/mdXhl.c user/ngie/more-tests2/lib/libstand/Makefile user/ngie/more-tests2/sbin/reboot/reboot.c user/ngie/more-tests2/sys/arm/arm/locore-v6.S user/ngie/more-tests2/sys/arm64/arm64/identcpu.c user/ngie/more-tests2/sys/arm64/arm64/mp_machdep.c user/ngie/more-tests2/sys/arm64/include/armreg.h user/ngie/more-tests2/sys/arm64/include/cpu.h user/ngie/more-tests2/sys/boot/forth/loader.conf user/ngie/more-tests2/sys/boot/forth/menu-commands.4th user/ngie/more-tests2/sys/boot/forth/menu.rc user/ngie/more-tests2/sys/boot/forth/support.4th user/ngie/more-tests2/sys/boot/i386/loader/main.c user/ngie/more-tests2/sys/boot/uboot/common/main.c user/ngie/more-tests2/sys/boot/zfs/libzfs.h user/ngie/more-tests2/sys/boot/zfs/zfs.c user/ngie/more-tests2/sys/boot/zfs/zfsimpl.c user/ngie/more-tests2/sys/compat/linuxkpi/common/include/linux/cdev.h user/ngie/more-tests2/sys/compat/linuxkpi/common/include/linux/device.h user/ngie/more-tests2/sys/compat/linuxkpi/common/include/linux/file.h user/ngie/more-tests2/sys/compat/linuxkpi/common/include/linux/kobject.h user/ngie/more-tests2/sys/compat/linuxkpi/common/include/linux/miscdevice.h user/ngie/more-tests2/sys/compat/linuxkpi/common/src/linux_compat.c user/ngie/more-tests2/sys/compat/linuxkpi/common/src/linux_pci.c user/ngie/more-tests2/sys/conf/newvers.sh user/ngie/more-tests2/sys/crypto/sha1.h user/ngie/more-tests2/sys/dev/cxgb/ulp/tom/cxgb_l2t.c user/ngie/more-tests2/sys/dev/cxgbe/tom/t4_tom_l2t.c user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/en.h user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_main.c user/ngie/more-tests2/sys/dev/usb/net/if_axe.c user/ngie/more-tests2/sys/dev/usb/usbdevs user/ngie/more-tests2/sys/fs/nullfs/null_vnops.c user/ngie/more-tests2/sys/kern/kern_fork.c user/ngie/more-tests2/sys/kern/kern_ktr.c user/ngie/more-tests2/sys/kern/kern_sig.c user/ngie/more-tests2/sys/kern/kern_thr.c user/ngie/more-tests2/sys/kern/kern_thread.c user/ngie/more-tests2/sys/kern/sys_process.c user/ngie/more-tests2/sys/net/bpf.c user/ngie/more-tests2/sys/net/flowtable.c user/ngie/more-tests2/sys/net/if.c user/ngie/more-tests2/sys/net/if_ethersubr.c user/ngie/more-tests2/sys/net/if_gif.c user/ngie/more-tests2/sys/net/if_gre.c user/ngie/more-tests2/sys/net/if_llatbl.c user/ngie/more-tests2/sys/net/if_llatbl.h user/ngie/more-tests2/sys/net/if_var.h user/ngie/more-tests2/sys/net/route.h user/ngie/more-tests2/sys/netinet/if_ether.c user/ngie/more-tests2/sys/netinet/if_ether.h user/ngie/more-tests2/sys/netinet/in.c user/ngie/more-tests2/sys/netinet/ip_output.c user/ngie/more-tests2/sys/netinet/toecore.c user/ngie/more-tests2/sys/netinet6/icmp6.c user/ngie/more-tests2/sys/netinet6/in6.c user/ngie/more-tests2/sys/netinet6/in6.h user/ngie/more-tests2/sys/netinet6/ip6_output.c user/ngie/more-tests2/sys/netinet6/nd6.c user/ngie/more-tests2/sys/netinet6/nd6.h user/ngie/more-tests2/sys/netinet6/nd6_nbr.c user/ngie/more-tests2/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c user/ngie/more-tests2/sys/opencrypto/skipjack.h user/ngie/more-tests2/sys/opencrypto/xform.c user/ngie/more-tests2/sys/opencrypto/xform.h user/ngie/more-tests2/sys/powerpc/booke/booke_machdep.c user/ngie/more-tests2/sys/powerpc/booke/locore.S user/ngie/more-tests2/sys/powerpc/booke/machdep_e500.c user/ngie/more-tests2/sys/powerpc/booke/pmap.c user/ngie/more-tests2/sys/powerpc/mpc85xx/mpc85xx.c user/ngie/more-tests2/sys/powerpc/mpc85xx/mpc85xx.h user/ngie/more-tests2/sys/powerpc/mpc85xx/platform_mpc85xx.c user/ngie/more-tests2/sys/sparc64/include/ktr.h user/ngie/more-tests2/sys/sparc64/sparc64/exception.S user/ngie/more-tests2/sys/sparc64/sparc64/mp_exception.S user/ngie/more-tests2/sys/sparc64/sparc64/pmap.c user/ngie/more-tests2/sys/sparc64/sparc64/swtch.S user/ngie/more-tests2/sys/sys/copyright.h user/ngie/more-tests2/sys/sys/param.h user/ngie/more-tests2/sys/sys/proc.h user/ngie/more-tests2/sys/sys/ptrace.h user/ngie/more-tests2/sys/x86/include/specialreg.h user/ngie/more-tests2/sys/x86/x86/identcpu.c user/ngie/more-tests2/sys/xen/xenbus/xenbusb.c user/ngie/more-tests2/tests/sys/kern/Makefile user/ngie/more-tests2/tests/sys/kern/ptrace_test.c user/ngie/more-tests2/usr.bin/clang/clang/Makefile user/ngie/more-tests2/usr.sbin/bhyve/bhyverun.c user/ngie/more-tests2/usr.sbin/bhyve/pci_emul.c user/ngie/more-tests2/usr.sbin/camdd/camdd.c user/ngie/more-tests2/usr.sbin/makefs/makefs.c Directory Properties: user/ngie/more-tests2/ (props changed) user/ngie/more-tests2/contrib/binutils/ (props changed) user/ngie/more-tests2/contrib/llvm/ (props changed) user/ngie/more-tests2/contrib/llvm/tools/clang/ (props changed) user/ngie/more-tests2/lib/libc/ (props changed) user/ngie/more-tests2/sbin/ (props changed) user/ngie/more-tests2/sys/ (props changed) user/ngie/more-tests2/sys/boot/ (props changed) user/ngie/more-tests2/sys/conf/ (props changed) user/ngie/more-tests2/usr.sbin/bhyve/ (props changed) Modified: user/ngie/more-tests2/COPYRIGHT ============================================================================== --- user/ngie/more-tests2/COPYRIGHT Thu Dec 31 21:01:06 2015 (r293006) +++ user/ngie/more-tests2/COPYRIGHT Thu Dec 31 21:51:38 2015 (r293007) @@ -4,7 +4,7 @@ The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2015 The FreeBSD Project. All rights reserved. +Copyright (c) 1992-2016 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions Modified: user/ngie/more-tests2/ObsoleteFiles.inc ============================================================================== --- user/ngie/more-tests2/ObsoleteFiles.inc Thu Dec 31 21:01:06 2015 (r293006) +++ user/ngie/more-tests2/ObsoleteFiles.inc Thu Dec 31 21:51:38 2015 (r293007) @@ -105,6 +105,8 @@ OLD_FILES+=usr/lib/clang/3.7.0/include/x OLD_FILES+=usr/lib/clang/3.7.0/include/xtestintrin.h OLD_DIRS+=usr/lib/clang/3.7.0/include OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-preinit-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-x86_64.a OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-i386.a OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a Modified: user/ngie/more-tests2/bin/sh/expand.c ============================================================================== --- user/ngie/more-tests2/bin/sh/expand.c Thu Dec 31 21:01:06 2015 (r293006) +++ user/ngie/more-tests2/bin/sh/expand.c Thu Dec 31 21:51:38 2015 (r293007) @@ -3,6 +3,8 @@ * The Regents of the University of California. All rights reserved. * Copyright (c) 1997-2005 * Herbert Xu . All rights reserved. + * Copyright (c) 2010-2015 + * Jilles Tjoelker . All rights reserved. * * This code is derived from software contributed to Berkeley by * Kenneth Almquist. @@ -79,41 +81,32 @@ __FBSDID("$FreeBSD$"); #include "show.h" #include "builtins.h" -/* - * Structure specifying which parts of the string should be searched - * for IFS characters. - */ +enum wordstate { WORD_IDLE, WORD_WS_DELIMITED, WORD_QUOTEMARK }; -struct ifsregion { - struct ifsregion *next; /* next region in list */ - int begoff; /* offset of start of region */ - int endoff; /* offset of end of region */ - int inquotes; /* search for nul bytes only */ +struct worddest { + struct arglist *list; + enum wordstate state; }; - static char *expdest; /* output of current string */ static struct nodelist *argbackq; /* list of back quote expressions */ -static struct ifsregion ifsfirst; /* first struct in list of ifs regions */ -static struct ifsregion *ifslastp; /* last struct in list */ -static char *argstr(char *, int); +static char *argstr(char *, int, struct worddest *); static char *exptilde(char *, int); -static char *expari(char *); -static void expbackq(union node *, int, int); -static int subevalvar(char *, char *, int, int, int, int, int); -static char *evalvar(char *, int); +static char *expari(char *, int, struct worddest *); +static void expbackq(union node *, int, int, struct worddest *); +static void subevalvar_trim(char *, int, int, int); +static int subevalvar_misc(char *, const char *, int, int, int); +static char *evalvar(char *, int, struct worddest *); static int varisset(const char *, int); -static void strtodest(const char *, int, int, int); -static void varvalue(const char *, int, int, int); -static void recordregion(int, int, int); -static void removerecordregions(int); -static void ifsbreakup(char *, struct arglist *); -static void expandmeta(struct arglist *, struct arglist *); +static void strtodest(const char *, int, int, int, struct worddest *); +static void reprocess(int, int, int, int, struct worddest *); +static void varvalue(const char *, int, int, int, struct worddest *); +static void expandmeta(char *, struct arglist *); static void expmeta(char *, char *, struct arglist *); static int expsortcmp(const void *, const void *); -static int patmatch(const char *, const char *, int); -static char *cvtnum(int, char *); +static int patmatch(const char *, const char *); +static void cvtnum(int, char *); static int collate_range_cmp(wchar_t, wchar_t); void @@ -168,6 +161,53 @@ stputs_quotes(const char *data, const ch } #define STPUTS_QUOTES(data, syntax, p) p = stputs_quotes((data), syntax, p) +static char * +nextword(char c, int flag, char *p, struct worddest *dst) +{ + int is_ws; + + is_ws = c == '\t' || c == '\n' || c == ' '; + if (p != stackblock() || (is_ws ? dst->state == WORD_QUOTEMARK : + dst->state != WORD_WS_DELIMITED) || c == '\0') { + STPUTC('\0', p); + if (flag & EXP_GLOB) + expandmeta(grabstackstr(p), dst->list); + else + appendarglist(dst->list, grabstackstr(p)); + dst->state = is_ws ? WORD_WS_DELIMITED : WORD_IDLE; + } else if (!is_ws && dst->state == WORD_WS_DELIMITED) + dst->state = WORD_IDLE; + /* Reserve space while the stack string is empty. */ + appendarglist(dst->list, NULL); + dst->list->count--; + STARTSTACKSTR(p); + return p; +} +#define NEXTWORD(c, flag, p, dstlist) p = nextword(c, flag, p, dstlist) + +static char * +stputs_split(const char *data, const char *syntax, int flag, char *p, + struct worddest *dst) +{ + const char *ifs; + char c; + + ifs = ifsset() ? ifsval() : " \t\n"; + while (*data) { + CHECKSTRSPACE(2, p); + c = *data++; + if (strchr(ifs, c) != NULL) { + NEXTWORD(c, flag, p, dst); + continue; + } + if (flag & EXP_GLOB && syntax[(int)c] == CCTL) + USTPUTC(CTLESC, p); + USTPUTC(c, p); + } + return (p); +} +#define STPUTS_SPLIT(data, syntax, flag, p, dst) p = stputs_split((data), syntax, flag, p, dst) + /* * Perform expansions on an argument, placing the resulting list of arguments * in arglist. Parameter expansion, command substitution and arithmetic @@ -183,34 +223,31 @@ stputs_quotes(const char *data, const ch void expandarg(union node *arg, struct arglist *arglist, int flag) { - struct arglist exparg; - char *p; + struct worddest exparg; + if (fflag) + flag &= ~EXP_GLOB; argbackq = arg->narg.backquote; + exparg.list = arglist; + exparg.state = WORD_IDLE; STARTSTACKSTR(expdest); - ifsfirst.next = NULL; - ifslastp = NULL; - argstr(arg->narg.text, flag); + argstr(arg->narg.text, flag, &exparg); if (arglist == NULL) { STACKSTRNUL(expdest); return; /* here document expanded */ } - STPUTC('\0', expdest); - p = grabstackstr(expdest); - emptyarglist(&exparg); - if (flag & EXP_FULL) { - ifsbreakup(p, &exparg); - expandmeta(&exparg, arglist); - } else - appendarglist(arglist, p); - while (ifsfirst.next != NULL) { - struct ifsregion *ifsp; - INTOFF; - ifsp = ifsfirst.next->next; - ckfree(ifsfirst.next); - ifsfirst.next = ifsp; - INTON; + if ((flag & EXP_SPLIT) == 0 || expdest != stackblock() || + exparg.state == WORD_QUOTEMARK) { + STPUTC('\0', expdest); + if (flag & EXP_SPLIT) { + if (flag & EXP_GLOB) + expandmeta(grabstackstr(expdest), exparg.list); + else + appendarglist(exparg.list, grabstackstr(expdest)); + } } + if ((flag & EXP_SPLIT) == 0) + appendarglist(arglist, grabstackstr(expdest)); } @@ -220,15 +257,16 @@ expandarg(union node *arg, struct arglis * expansion, and tilde expansion if requested via EXP_TILDE/EXP_VARTILDE. * Processing ends at a CTLENDVAR or CTLENDARI character as well as '\0'. * This is used to expand word in ${var+word} etc. - * If EXP_FULL or EXP_CASE are set, keep and/or generate CTLESC + * If EXP_GLOB or EXP_CASE are set, keep and/or generate CTLESC * characters to allow for further processing. - * If EXP_FULL is set, also preserve CTLQUOTEMARK characters. + * + * If EXP_SPLIT is set, dst receives any complete words produced. */ static char * -argstr(char *p, int flag) +argstr(char *p, int flag, struct worddest *dst) { char c; - int quotes = flag & (EXP_FULL | EXP_CASE); /* do CTLESC */ + int quotes = flag & (EXP_GLOB | EXP_CASE); /* do CTLESC */ int firsteq = 1; int split_lit; int lit_quoted; @@ -252,32 +290,33 @@ argstr(char *p, int flag) if (p[0] == CTLVAR && (p[1] & VSQUOTE) != 0 && p[2] == '@' && p[3] == '=') break; - if ((flag & EXP_FULL) != 0) - USTPUTC(c, expdest); + if ((flag & EXP_SPLIT) != 0 && expdest == stackblock()) + dst->state = WORD_QUOTEMARK; break; case CTLQUOTEEND: lit_quoted = 0; break; case CTLESC: - if (quotes) - USTPUTC(c, expdest); c = *p++; + if (split_lit && !lit_quoted && + strchr(ifsset() ? ifsval() : " \t\n", c) != NULL) { + NEXTWORD(c, flag, expdest, dst); + break; + } + if (quotes) + USTPUTC(CTLESC, expdest); USTPUTC(c, expdest); - if (split_lit && !lit_quoted) - recordregion(expdest - stackblock() - - (quotes ? 2 : 1), - expdest - stackblock(), 0); break; case CTLVAR: - p = evalvar(p, flag); + p = evalvar(p, flag, dst); break; case CTLBACKQ: case CTLBACKQ|CTLQUOTE: - expbackq(argbackq->n, c & CTLQUOTE, flag); + expbackq(argbackq->n, c & CTLQUOTE, flag, dst); argbackq = argbackq->next; break; case CTLARI: - p = expari(p); + p = expari(p, flag, dst); break; case ':': case '=': @@ -285,10 +324,12 @@ argstr(char *p, int flag) * sort of a hack - expand tildes in variable * assignments (after the first '=' and after ':'s). */ + if (split_lit && !lit_quoted && + strchr(ifsset() ? ifsval() : " \t\n", c) != NULL) { + NEXTWORD(c, flag, expdest, dst); + break; + } USTPUTC(c, expdest); - if (split_lit && !lit_quoted) - recordregion(expdest - stackblock() - 1, - expdest - stackblock(), 0); if (flag & EXP_VARTILDE && *p == '~' && (c != '=' || firsteq)) { if (c == '=') @@ -297,10 +338,12 @@ argstr(char *p, int flag) } break; default: + if (split_lit && !lit_quoted && + strchr(ifsset() ? ifsval() : " \t\n", c) != NULL) { + NEXTWORD(c, flag, expdest, dst); + break; + } USTPUTC(c, expdest); - if (split_lit && !lit_quoted) - recordregion(expdest - stackblock() - 1, - expdest - stackblock(), 0); } } } @@ -344,7 +387,7 @@ exptilde(char *p, int flag) *p = c; if (home == NULL || *home == '\0') return (startp); - strtodest(home, flag, VSNORMAL, 1); + strtodest(home, flag, VSNORMAL, 1, NULL); return (p); } p++; @@ -352,51 +395,11 @@ exptilde(char *p, int flag) } -static void -removerecordregions(int endoff) -{ - if (ifslastp == NULL) - return; - - if (ifsfirst.endoff > endoff) { - while (ifsfirst.next != NULL) { - struct ifsregion *ifsp; - INTOFF; - ifsp = ifsfirst.next->next; - ckfree(ifsfirst.next); - ifsfirst.next = ifsp; - INTON; - } - if (ifsfirst.begoff > endoff) - ifslastp = NULL; - else { - ifslastp = &ifsfirst; - ifsfirst.endoff = endoff; - } - return; - } - - ifslastp = &ifsfirst; - while (ifslastp->next && ifslastp->next->begoff < endoff) - ifslastp=ifslastp->next; - while (ifslastp->next != NULL) { - struct ifsregion *ifsp; - INTOFF; - ifsp = ifslastp->next->next; - ckfree(ifslastp->next); - ifslastp->next = ifsp; - INTON; - } - if (ifslastp->endoff > endoff) - ifslastp->endoff = endoff; -} - /* * Expand arithmetic expression. - * Note that flag is not required as digits never require CTLESC characters. */ static char * -expari(char *p) +expari(char *p, int flag, struct worddest *dst) { char *q, *start; arith_t result; @@ -406,8 +409,7 @@ expari(char *p) quoted = *p++ == '"'; begoff = expdest - stackblock(); - p = argstr(p, 0); - removerecordregions(begoff); + p = argstr(p, 0, NULL); STPUTC('\0', expdest); start = stackblock() + begoff; @@ -424,7 +426,7 @@ expari(char *p) adj = strlen(expdest); STADJUST(adj, expdest); if (!quoted) - recordregion(begoff, expdest - stackblock(), 0); + reprocess(expdest - adj - stackblock(), flag, VSNORMAL, 0, dst); return p; } @@ -433,35 +435,34 @@ expari(char *p) * Perform command substitution. */ static void -expbackq(union node *cmd, int quoted, int flag) +expbackq(union node *cmd, int quoted, int flag, struct worddest *dst) { struct backcmd in; int i; char buf[128]; char *p; char *dest = expdest; - struct ifsregion saveifs, *savelastp; struct nodelist *saveargbackq; char lastc; - int startloc = dest - stackblock(); char const *syntax = quoted? DQSYNTAX : BASESYNTAX; - int quotes = flag & (EXP_FULL | EXP_CASE); + int quotes = flag & (EXP_GLOB | EXP_CASE); size_t nnl; + const char *ifs; INTOFF; - saveifs = ifsfirst; - savelastp = ifslastp; saveargbackq = argbackq; p = grabstackstr(dest); evalbackcmd(cmd, &in); ungrabstackstr(p, dest); - ifsfirst = saveifs; - ifslastp = savelastp; argbackq = saveargbackq; p = in.buf; lastc = '\0'; nnl = 0; + if (!quoted && flag & EXP_SPLIT) + ifs = ifsset() ? ifsval() : " \t\n"; + else + ifs = ""; /* Don't copy trailing newlines */ for (;;) { if (--in.nleft < 0) { @@ -475,15 +476,27 @@ expbackq(union node *cmd, int quoted, in in.nleft = i - 1; } lastc = *p++; - if (lastc != '\0') { - if (lastc == '\n') { - nnl++; - } else { - CHECKSTRSPACE(nnl + 2, dest); - while (nnl > 0) { - nnl--; - USTPUTC('\n', dest); + if (lastc == '\0') + continue; + if (lastc == '\n') { + nnl++; + } else { + if (nnl > 0) { + if (strchr(ifs, '\n') != NULL) { + NEXTWORD('\n', flag, dest, dst); + nnl = 0; + } else { + CHECKSTRSPACE(nnl + 2, dest); + while (nnl > 0) { + nnl--; + USTPUTC('\n', dest); + } } + } + if (strchr(ifs, lastc) != NULL) + NEXTWORD(lastc, flag, dest, dst); + else { + CHECKSTRSPACE(2, dest); if (quotes && syntax[(int)lastc] == CCTL) USTPUTC(CTLESC, dest); USTPUTC(lastc, dest); @@ -497,8 +510,6 @@ expbackq(union node *cmd, int quoted, in ckfree(in.buf); if (in.jp) exitstatus = waitforjob(in.jp, (int *)NULL); - if (quoted == 0) - recordregion(startloc, dest - stackblock(), 0); TRACE(("expbackq: size=%td: \"%.*s\"\n", ((dest - stackblock()) - startloc), (int)((dest - stackblock()) - startloc), @@ -520,113 +531,112 @@ recordleft(const char *str, const char * *startp++ = *loc++; } -static int -subevalvar(char *p, char *str, int strloc, int subtype, int startloc, - int varflags, int quotes) +static void +subevalvar_trim(char *p, int strloc, int subtype, int startloc) { char *startp; char *loc = NULL; - char *q; + char *str; int c = 0; struct nodelist *saveargbackq = argbackq; int amount; - argstr(p, (subtype == VSTRIMLEFT || subtype == VSTRIMLEFTMAX || - subtype == VSTRIMRIGHT || subtype == VSTRIMRIGHTMAX ? - EXP_CASE : 0) | EXP_TILDE); + argstr(p, EXP_CASE | EXP_TILDE, NULL); STACKSTRNUL(expdest); argbackq = saveargbackq; startp = stackblock() + startloc; - if (str == NULL) - str = stackblock() + strloc; + str = stackblock() + strloc; switch (subtype) { - case VSASSIGN: - setvar(str, startp, 0); - amount = startp - expdest; - STADJUST(amount, expdest); - varflags &= ~VSNUL; - return 1; - - case VSQUESTION: - if (*p != CTLENDVAR) { - outfmt(out2, "%s\n", startp); - error((char *)NULL); - } - error("%.*s: parameter %snot set", (int)(p - str - 1), - str, (varflags & VSNUL) ? "null or " : ""); - return 0; - case VSTRIMLEFT: for (loc = startp; loc < str; loc++) { c = *loc; *loc = '\0'; - if (patmatch(str, startp, quotes)) { + if (patmatch(str, startp)) { *loc = c; recordleft(str, loc, startp); - return 1; + return; } *loc = c; - if (quotes && *loc == CTLESC) - loc++; } - return 0; + break; case VSTRIMLEFTMAX: for (loc = str - 1; loc >= startp;) { c = *loc; *loc = '\0'; - if (patmatch(str, startp, quotes)) { + if (patmatch(str, startp)) { *loc = c; recordleft(str, loc, startp); - return 1; + return; } *loc = c; loc--; - if (quotes && loc > startp && *(loc - 1) == CTLESC) { - for (q = startp; q < loc; q++) - if (*q == CTLESC) - q++; - if (q > loc) - loc--; - } } - return 0; + break; case VSTRIMRIGHT: for (loc = str - 1; loc >= startp;) { - if (patmatch(str, loc, quotes)) { + if (patmatch(str, loc)) { amount = loc - expdest; STADJUST(amount, expdest); - return 1; + return; } loc--; - if (quotes && loc > startp && *(loc - 1) == CTLESC) { - for (q = startp; q < loc; q++) - if (*q == CTLESC) - q++; - if (q > loc) - loc--; - } } - return 0; + break; case VSTRIMRIGHTMAX: for (loc = startp; loc < str - 1; loc++) { - if (patmatch(str, loc, quotes)) { + if (patmatch(str, loc)) { amount = loc - expdest; STADJUST(amount, expdest); - return 1; + return; } - if (quotes && *loc == CTLESC) - loc++; } - return 0; + break; default: abort(); } + amount = (expdest - stackblock() - strloc) + 1; + STADJUST(-amount, expdest); +} + + +static int +subevalvar_misc(char *p, const char *var, int subtype, int startloc, + int varflags) +{ + char *startp; + struct nodelist *saveargbackq = argbackq; + int amount; + + argstr(p, EXP_TILDE, NULL); + STACKSTRNUL(expdest); + argbackq = saveargbackq; + startp = stackblock() + startloc; + + switch (subtype) { + case VSASSIGN: + setvar(var, startp, 0); + amount = startp - expdest; + STADJUST(amount, expdest); + return 1; + + case VSQUESTION: + if (*p != CTLENDVAR) { + outfmt(out2, "%s\n", startp); + error((char *)NULL); + } + error("%.*s: parameter %snot set", (int)(p - var - 1), + var, (varflags & VSNUL) ? "null or " : ""); + return 0; + + default: + abort(); + } } @@ -636,7 +646,7 @@ subevalvar(char *p, char *str, int strlo */ static char * -evalvar(char *p, int flag) +evalvar(char *p, int flag, struct worddest *dst) { int subtype; int varflags; @@ -649,9 +659,7 @@ evalvar(char *p, int flag) int startloc; int varlen; int varlenb; - int easy; - int quotes = flag & (EXP_FULL | EXP_CASE); - int record = 0; + char buf[21]; varflags = (unsigned char)*p++; subtype = varflags & VSTYPE; @@ -693,10 +701,16 @@ again: /* jump here after setting a vari if (set && subtype != VSPLUS) { /* insert the value of the variable */ if (special) { - if (varflags & VSLINENO) - STPUTBIN(var, p - var - 1, expdest); - else - varvalue(var, varflags & VSQUOTE, subtype, flag); + if (varflags & VSLINENO) { + if (p - var > (ptrdiff_t)sizeof(buf)) + abort(); + memcpy(buf, var, p - var - 1); + buf[p - var - 1] = '\0'; + strtodest(buf, flag, subtype, + varflags & VSQUOTE, dst); + } else + varvalue(var, varflags & VSQUOTE, subtype, flag, + dst); if (subtype == VSLENGTH) { varlenb = expdest - stackblock() - startloc; varlen = varlenb; @@ -717,35 +731,29 @@ again: /* jump here after setting a vari } else strtodest(val, flag, subtype, - varflags & VSQUOTE); + varflags & VSQUOTE, dst); } } if (subtype == VSPLUS) set = ! set; - easy = ((varflags & VSQUOTE) == 0 || - (*var == '@' && shellparam.nparam != 1)); - - switch (subtype) { case VSLENGTH: - expdest = cvtnum(varlen, expdest); - record = 1; + cvtnum(varlen, buf); + strtodest(buf, flag, VSNORMAL, varflags & VSQUOTE, dst); break; case VSNORMAL: - record = easy; break; case VSPLUS: case VSMINUS: if (!set) { - argstr(p, flag | (flag & EXP_FULL ? EXP_SPLIT_LIT : 0) | - (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0)); + argstr(p, flag | (flag & EXP_SPLIT ? EXP_SPLIT_LIT : 0) | + (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0), dst); break; } - record = easy; break; case VSTRIMLEFT: @@ -760,32 +768,22 @@ again: /* jump here after setting a vari */ STPUTC('\0', expdest); patloc = expdest - stackblock(); - if (subevalvar(p, NULL, patloc, subtype, - startloc, varflags, quotes) == 0) { - int amount = (expdest - stackblock() - patloc) + 1; - STADJUST(-amount, expdest); - } - /* Remove any recorded regions beyond start of variable */ - removerecordregions(startloc); - record = 1; + subevalvar_trim(p, patloc, subtype, startloc); + reprocess(startloc, flag, VSNORMAL, varflags & VSQUOTE, dst); + if (flag & EXP_SPLIT && *var == '@' && varflags & VSQUOTE) + dst->state = WORD_QUOTEMARK; break; case VSASSIGN: case VSQUESTION: if (!set) { - if (subevalvar(p, var, 0, subtype, startloc, varflags, - quotes)) { + if (subevalvar_misc(p, var, subtype, startloc, + varflags)) { varflags &= ~VSNUL; - /* - * Remove any recorded regions beyond - * start of variable - */ - removerecordregions(startloc); goto again; } break; } - record = easy; break; case VSERROR: @@ -797,11 +795,6 @@ again: /* jump here after setting a vari abort(); } - if (record) - recordregion(startloc, expdest - stackblock(), - varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' && - (*var == '@' || *var == '*'))); - if (subtype != VSNORMAL) { /* skip to end of alternative */ int nesting = 1; for (;;) { @@ -867,26 +860,80 @@ varisset(const char *name, int nulok) } static void -strtodest(const char *p, int flag, int subtype, int quoted) +strtodest(const char *p, int flag, int subtype, int quoted, + struct worddest *dst) { - if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH) + if (subtype == VSLENGTH || subtype == VSTRIMLEFT || + subtype == VSTRIMLEFTMAX || subtype == VSTRIMRIGHT || + subtype == VSTRIMRIGHTMAX) + STPUTS(p, expdest); + else if (flag & EXP_SPLIT && !quoted && dst != NULL) + STPUTS_SPLIT(p, BASESYNTAX, flag, expdest, dst); + else if (flag & (EXP_GLOB | EXP_CASE)) STPUTS_QUOTES(p, quoted ? DQSYNTAX : BASESYNTAX, expdest); else STPUTS(p, expdest); } +static void +reprocess(int startloc, int flag, int subtype, int quoted, + struct worddest *dst) +{ + static char *buf = NULL; + static size_t buflen = 0; + char *startp; + size_t len, zpos, zlen; + + startp = stackblock() + startloc; + len = expdest - startp; + if (len >= SIZE_MAX / 2) + abort(); + INTOFF; + if (len >= buflen) { + ckfree(buf); + buf = NULL; + } + if (buflen < 128) + buflen = 128; + while (len >= buflen) + buflen <<= 1; + if (buf == NULL) + buf = ckmalloc(buflen); + INTON; + memcpy(buf, startp, len); + buf[len] = '\0'; + STADJUST(-len, expdest); + for (zpos = 0;;) { + zlen = strlen(buf + zpos); + strtodest(buf + zpos, flag, subtype, quoted, dst); + zpos += zlen + 1; + if (zpos == len + 1) + break; + if (flag & EXP_SPLIT && (quoted || (zlen > 0 && zpos < len))) + NEXTWORD('\0', flag, expdest, dst); + } +} + /* * Add the value of a specialized variable to the stack string. */ static void -varvalue(const char *name, int quoted, int subtype, int flag) +varvalue(const char *name, int quoted, int subtype, int flag, + struct worddest *dst) { int num; char *p; int i; + int splitlater; char sep[2]; char **ap; + char buf[(NSHORTOPTS > 10 ? NSHORTOPTS : 10) + 1]; + + if (subtype == VSLENGTH) + flag &= ~EXP_FULL; + splitlater = subtype == VSTRIMLEFT || subtype == VSTRIMLEFTMAX || + subtype == VSTRIMRIGHT || subtype == VSTRIMRIGHTMAX; switch (*name) { case '$': @@ -902,18 +949,28 @@ varvalue(const char *name, int quoted, i num = backgndpidval(); break; case '-': + p = buf; for (i = 0 ; i < NSHORTOPTS ; i++) { if (optlist[i].val) - STPUTC(optlist[i].letter, expdest); + *p++ = optlist[i].letter; } + *p = '\0'; + strtodest(buf, flag, subtype, quoted, dst); return; case '@': - if (flag & EXP_FULL && quoted) { + if (flag & EXP_SPLIT && quoted) { for (ap = shellparam.p ; (p = *ap++) != NULL ; ) { - strtodest(p, flag, subtype, quoted); - if (*ap) - STPUTC('\0', expdest); + strtodest(p, flag, subtype, quoted, dst); + if (*ap) { + if (splitlater) + STPUTC('\0', expdest); + else + NEXTWORD('\0', flag, expdest, + dst); + } } + if (shellparam.nparam > 0) + dst->state = WORD_QUOTEMARK; return; } /* FALLTHROUGH */ @@ -924,13 +981,17 @@ varvalue(const char *name, int quoted, i sep[0] = ' '; sep[1] = '\0'; for (ap = shellparam.p ; (p = *ap++) != NULL ; ) { - strtodest(p, flag, subtype, quoted); + strtodest(p, flag, subtype, quoted, dst); if (!*ap) break; if (sep[0]) - strtodest(sep, flag, subtype, quoted); - else if (flag & EXP_FULL && !quoted && **ap != '\0') - STPUTC('\0', expdest); + strtodest(sep, flag, subtype, quoted, dst); + else if (flag & EXP_SPLIT && !quoted && **ap != '\0') { + if (splitlater) + STPUTC('\0', expdest); + else + NEXTWORD('\0', flag, expdest, dst); + } } return; default: @@ -942,192 +1003,53 @@ varvalue(const char *name, int quoted, i p = shellparam.p[num - 1]; else return; - strtodest(p, flag, subtype, quoted); + strtodest(p, flag, subtype, quoted, dst); } return; } - expdest = cvtnum(num, expdest); -} - - - -/* - * Record the fact that we have to scan this region of the - * string for IFS characters. - */ - -static void -recordregion(int start, int end, int inquotes) -{ - struct ifsregion *ifsp; - - INTOFF; - if (ifslastp == NULL) { - ifsp = &ifsfirst; - } else { - if (ifslastp->endoff == start - && ifslastp->inquotes == inquotes) { - /* extend previous area */ - ifslastp->endoff = end; - INTON; - return; - } - ifsp = (struct ifsregion *)ckmalloc(sizeof (struct ifsregion)); - ifslastp->next = ifsp; - } - ifslastp = ifsp; - ifslastp->next = NULL; - ifslastp->begoff = start; - ifslastp->endoff = end; - ifslastp->inquotes = inquotes; - INTON; + cvtnum(num, buf); + strtodest(buf, flag, subtype, quoted, dst); } -/* - * Break the argument string into pieces based upon IFS and add the - * strings to the argument list. The regions of the string to be - * searched for IFS characters have been stored by recordregion. - * CTLESC characters are preserved but have little effect in this pass - * other than escaping CTL* characters. In particular, they do not escape - * IFS characters: that should be done with the ifsregion mechanism. - * CTLQUOTEMARK characters are used to preserve empty quoted strings. - * This pass treats them as a regular character, making the string non-empty. - * Later, they are removed along with the other CTL* characters. - */ -static void -ifsbreakup(char *string, struct arglist *arglist) -{ - struct ifsregion *ifsp; - char *start; - char *p; - char *q; - const char *ifs; - const char *ifsspc; - int had_param_ch = 0; - - start = string; - - if (ifslastp == NULL) { - /* Return entire argument, IFS doesn't apply to any of it */ - appendarglist(arglist, start); - return; - } - - ifs = ifsset() ? ifsval() : " \t\n"; - - for (ifsp = &ifsfirst; ifsp != NULL; ifsp = ifsp->next) { - p = string + ifsp->begoff; - while (p < string + ifsp->endoff) { - q = p; - if (*p == CTLESC) - p++; - if (ifsp->inquotes) { - /* Only NULs (should be from "$@") end args */ - had_param_ch = 1; - if (*p != 0) { - p++; - continue; - } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Thu Dec 31 22:20:43 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A0BB3A5751C for ; Thu, 31 Dec 2015 22:20:43 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C6A51016; Thu, 31 Dec 2015 22:20:42 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBVMKgAf070215; Thu, 31 Dec 2015 22:20:42 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBVMKfqw070208; Thu, 31 Dec 2015 22:20:41 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512312220.tBVMKfqw070208@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 31 Dec 2015 22:20:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r293008 - in user/ngie/make_check: . bin/pax bin/sh bin/sh/tests/expansion cddl/contrib/opensolaris/cmd/zdb cddl/sbin/zfs cddl/sbin/zpool cddl/usr.sbin/zdb cddl/usr.sbin/zhack contrib/b... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Dec 2015 22:20:43 -0000 Author: ngie Date: Thu Dec 31 22:20:40 2015 New Revision: 293008 URL: https://svnweb.freebsd.org/changeset/base/293008 Log: MFhead @ r293007 Added: user/ngie/make_check/bin/sh/tests/expansion/trim9.0 - copied unchanged from r293007, head/bin/sh/tests/expansion/trim9.0 user/ngie/make_check/contrib/llvm/patches/patch-08-clang-cc1as-dwarf2.diff - copied unchanged from r293007, head/contrib/llvm/patches/patch-08-clang-cc1as-dwarf2.diff user/ngie/make_check/lib/libc/stdlib/hcreate_r.c - copied unchanged from r293007, head/lib/libc/stdlib/hcreate_r.c user/ngie/make_check/lib/libc/stdlib/hdestroy_r.c - copied unchanged from r293007, head/lib/libc/stdlib/hdestroy_r.c user/ngie/make_check/lib/libc/stdlib/hsearch.h - copied unchanged from r293007, head/lib/libc/stdlib/hsearch.h user/ngie/make_check/lib/libc/stdlib/hsearch_r.c - copied unchanged from r293007, head/lib/libc/stdlib/hsearch_r.c user/ngie/make_check/lib/libc/stdlib/tsearch_path.h - copied unchanged from r293007, head/lib/libc/stdlib/tsearch_path.h user/ngie/make_check/lib/libc/tests/stdlib/tsearch_test.c - copied unchanged from r293007, head/lib/libc/tests/stdlib/tsearch_test.c user/ngie/make_check/lib/libsysdecode/mkioctls - copied unchanged from r293007, head/lib/libsysdecode/mkioctls user/ngie/make_check/lib/libsysdecode/sysdecode_ioctlname.3 - copied unchanged from r293007, head/lib/libsysdecode/sysdecode_ioctlname.3 user/ngie/make_check/libexec/rtld-elf/riscv/ - copied from r293007, head/libexec/rtld-elf/riscv/ user/ngie/make_check/share/man/man4/mdio.4 - copied unchanged from r293007, head/share/man/man4/mdio.4 user/ngie/make_check/sys/arm/arm/ofw_machdep.c - copied unchanged from r293007, head/sys/arm/arm/ofw_machdep.c user/ngie/make_check/sys/arm/freescale/imx/imx6_hdmi.c - copied unchanged from r293007, head/sys/arm/freescale/imx/imx6_hdmi.c user/ngie/make_check/sys/arm/freescale/imx/imx6_hdmireg.h - copied unchanged from r293007, head/sys/arm/freescale/imx/imx6_hdmireg.h user/ngie/make_check/sys/arm/freescale/imx/imx6_ipu.c - copied unchanged from r293007, head/sys/arm/freescale/imx/imx6_ipu.c user/ngie/make_check/sys/arm/freescale/imx/imx_iomuxreg.h - copied unchanged from r293007, head/sys/arm/freescale/imx/imx_iomuxreg.h user/ngie/make_check/sys/compat/linuxkpi/common/include/linux/srcu.h - copied unchanged from r293007, head/sys/compat/linuxkpi/common/include/linux/srcu.h user/ngie/make_check/sys/crypto/sha2/sha384.h - copied unchanged from r293007, head/sys/crypto/sha2/sha384.h user/ngie/make_check/sys/crypto/sha2/sha512.h - copied unchanged from r293007, head/sys/crypto/sha2/sha512.h user/ngie/make_check/sys/crypto/sha2/sha512c.c - copied unchanged from r293007, head/sys/crypto/sha2/sha512c.c user/ngie/make_check/sys/dev/bxe/bxe_dump.h - copied unchanged from r293007, head/sys/dev/bxe/bxe_dump.h user/ngie/make_check/sys/dev/bxe/bxe_ioctl.h - copied unchanged from r293007, head/sys/dev/bxe/bxe_ioctl.h user/ngie/make_check/sys/dev/cxgbe/cxgbei/ - copied from r293007, head/sys/dev/cxgbe/cxgbei/ user/ngie/make_check/sys/dev/ixgbe/ixgbe_osdep.c - copied unchanged from r293007, head/sys/dev/ixgbe/ixgbe_osdep.c user/ngie/make_check/sys/dev/mdio/ - copied from r293007, head/sys/dev/mdio/ user/ngie/make_check/sys/dev/ofw/ofw_subr.c - copied unchanged from r293007, head/sys/dev/ofw/ofw_subr.c user/ngie/make_check/sys/dev/ofw/ofw_subr.h - copied unchanged from r293007, head/sys/dev/ofw/ofw_subr.h user/ngie/make_check/sys/mips/conf/MT7620 - copied unchanged from r293007, head/sys/mips/conf/MT7620 user/ngie/make_check/sys/mips/conf/MT7620.hints - copied unchanged from r293007, head/sys/mips/conf/MT7620.hints user/ngie/make_check/sys/mips/conf/RT5350 - copied unchanged from r293007, head/sys/mips/conf/RT5350 user/ngie/make_check/sys/mips/conf/RT5350.hints - copied unchanged from r293007, head/sys/mips/conf/RT5350.hints user/ngie/make_check/sys/mips/mips/ofw_machdep.c - copied unchanged from r293007, head/sys/mips/mips/ofw_machdep.c user/ngie/make_check/sys/mips/rt305x/rt305x_ehci.c - copied unchanged from r293007, head/sys/mips/rt305x/rt305x_ehci.c user/ngie/make_check/sys/mips/rt305x/rt305x_ohci.c - copied unchanged from r293007, head/sys/mips/rt305x/rt305x_ohci.c user/ngie/make_check/sys/mips/rt305x/rt305x_pci.c - copied unchanged from r293007, head/sys/mips/rt305x/rt305x_pci.c user/ngie/make_check/sys/mips/rt305x/rt305x_pcireg.h - copied unchanged from r293007, head/sys/mips/rt305x/rt305x_pcireg.h user/ngie/make_check/sys/mips/rt305x/rt305x_spi.c - copied unchanged from r293007, head/sys/mips/rt305x/rt305x_spi.c user/ngie/make_check/sys/modules/cxgbe/cxgbei/ - copied from r293007, head/sys/modules/cxgbe/cxgbei/ user/ngie/make_check/sys/modules/mdio/ - copied from r293007, head/sys/modules/mdio/ user/ngie/make_check/sys/netinet/tcp_fastopen.c - copied unchanged from r293007, head/sys/netinet/tcp_fastopen.c user/ngie/make_check/sys/netinet/tcp_fastopen.h - copied unchanged from r293007, head/sys/netinet/tcp_fastopen.h user/ngie/make_check/sys/opencrypto/xform_aes_icm.c - copied unchanged from r293007, head/sys/opencrypto/xform_aes_icm.c user/ngie/make_check/sys/opencrypto/xform_aes_xts.c - copied unchanged from r293007, head/sys/opencrypto/xform_aes_xts.c user/ngie/make_check/sys/opencrypto/xform_auth.h - copied unchanged from r293007, head/sys/opencrypto/xform_auth.h user/ngie/make_check/sys/opencrypto/xform_blf.c - copied unchanged from r293007, head/sys/opencrypto/xform_blf.c user/ngie/make_check/sys/opencrypto/xform_cast5.c - copied unchanged from r293007, head/sys/opencrypto/xform_cast5.c user/ngie/make_check/sys/opencrypto/xform_cml.c - copied unchanged from r293007, head/sys/opencrypto/xform_cml.c user/ngie/make_check/sys/opencrypto/xform_comp.h - copied unchanged from r293007, head/sys/opencrypto/xform_comp.h user/ngie/make_check/sys/opencrypto/xform_deflate.c - copied unchanged from r293007, head/sys/opencrypto/xform_deflate.c user/ngie/make_check/sys/opencrypto/xform_des1.c - copied unchanged from r293007, head/sys/opencrypto/xform_des1.c user/ngie/make_check/sys/opencrypto/xform_des3.c - copied unchanged from r293007, head/sys/opencrypto/xform_des3.c user/ngie/make_check/sys/opencrypto/xform_enc.h - copied unchanged from r293007, head/sys/opencrypto/xform_enc.h user/ngie/make_check/sys/opencrypto/xform_gmac.c - copied unchanged from r293007, head/sys/opencrypto/xform_gmac.c user/ngie/make_check/sys/opencrypto/xform_md5.c - copied unchanged from r293007, head/sys/opencrypto/xform_md5.c user/ngie/make_check/sys/opencrypto/xform_null.c - copied unchanged from r293007, head/sys/opencrypto/xform_null.c user/ngie/make_check/sys/opencrypto/xform_rijndael.c - copied unchanged from r293007, head/sys/opencrypto/xform_rijndael.c user/ngie/make_check/sys/opencrypto/xform_rmd160.c - copied unchanged from r293007, head/sys/opencrypto/xform_rmd160.c user/ngie/make_check/sys/opencrypto/xform_sha1.c - copied unchanged from r293007, head/sys/opencrypto/xform_sha1.c user/ngie/make_check/sys/opencrypto/xform_sha2.c - copied unchanged from r293007, head/sys/opencrypto/xform_sha2.c user/ngie/make_check/sys/opencrypto/xform_skipjack.c - copied unchanged from r293007, head/sys/opencrypto/xform_skipjack.c user/ngie/make_check/sys/opencrypto/xform_userland.h - copied unchanged from r293007, head/sys/opencrypto/xform_userland.h user/ngie/make_check/sys/x86/include/cputypes.h - copied unchanged from r293007, head/sys/x86/include/cputypes.h user/ngie/make_check/tests/sys/kern/unix_passfd_test.c - copied unchanged from r293007, head/tests/sys/kern/unix_passfd_test.c user/ngie/make_check/tests/sys/mac/ - copied from r293007, head/tests/sys/mac/ user/ngie/make_check/usr.bin/clang/clang/CC.sh - copied unchanged from r293007, head/usr.bin/clang/clang/CC.sh Replaced: user/ngie/make_check/lib/libc/stdlib/hcreate.c - copied unchanged from r293007, head/lib/libc/stdlib/hcreate.c Deleted: user/ngie/make_check/contrib/llvm/patches/patch-02-add-CC-aliases.diff user/ngie/make_check/contrib/llvm/patches/patch-08-llvm-r250085-fix-avx-crash.diff user/ngie/make_check/contrib/llvm/patches/patch-09-clang-r250657-openmp.diff user/ngie/make_check/contrib/llvm/patches/patch-10-clang-cc1as-dwarf2.diff user/ngie/make_check/lib/libmd/sha512.h user/ngie/make_check/lib/libmd/sha512c.c user/ngie/make_check/sys/crypto/sha2/sha2.c user/ngie/make_check/sys/crypto/sha2/sha2.h user/ngie/make_check/sys/dev/etherswitch/mdio.c user/ngie/make_check/sys/dev/etherswitch/mdio.h user/ngie/make_check/sys/dev/etherswitch/mdio_if.m user/ngie/make_check/sys/dev/ixgbe/LICENSE user/ngie/make_check/sys/dev/ixgbe/README user/ngie/make_check/tools/regression/mac/ user/ngie/make_check/tools/regression/sockets/unix_passfd/ user/ngie/make_check/usr.bin/kdump/mkioctls Modified: user/ngie/make_check/COPYRIGHT user/ngie/make_check/MAINTAINERS (contents, props changed) user/ngie/make_check/Makefile.inc1 user/ngie/make_check/ObsoleteFiles.inc user/ngie/make_check/bin/pax/pat_rep.c user/ngie/make_check/bin/sh/expand.c user/ngie/make_check/bin/sh/expand.h user/ngie/make_check/bin/sh/mknodes.c user/ngie/make_check/bin/sh/tests/expansion/Makefile user/ngie/make_check/cddl/contrib/opensolaris/cmd/zdb/zdb.c user/ngie/make_check/cddl/sbin/zfs/Makefile user/ngie/make_check/cddl/sbin/zpool/Makefile user/ngie/make_check/cddl/usr.sbin/zdb/Makefile user/ngie/make_check/cddl/usr.sbin/zhack/Makefile user/ngie/make_check/contrib/binutils/bfd/elf32-arm.c user/ngie/make_check/contrib/bmake/ChangeLog user/ngie/make_check/contrib/bmake/Makefile user/ngie/make_check/contrib/bmake/mk/ChangeLog user/ngie/make_check/contrib/bmake/mk/auto.obj.mk user/ngie/make_check/contrib/bmake/mk/install-mk user/ngie/make_check/contrib/bmake/os.sh user/ngie/make_check/contrib/bmake/suff.c user/ngie/make_check/contrib/bsnmp/snmpd/action.c user/ngie/make_check/contrib/bsnmp/snmpd/main.c user/ngie/make_check/contrib/bsnmp/snmpd/trap.c user/ngie/make_check/contrib/gcc/config/rs6000/sysv4.h user/ngie/make_check/contrib/libexecinfo/backtrace.3 user/ngie/make_check/contrib/llvm/include/llvm-c/Core.h user/ngie/make_check/contrib/llvm/include/llvm/CodeGen/CommandFlags.h user/ngie/make_check/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.cpp user/ngie/make_check/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp user/ngie/make_check/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp user/ngie/make_check/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp user/ngie/make_check/contrib/llvm/lib/IR/AsmWriter.cpp user/ngie/make_check/contrib/llvm/lib/IR/Core.cpp user/ngie/make_check/contrib/llvm/lib/LTO/LTOCodeGenerator.cpp user/ngie/make_check/contrib/llvm/lib/MC/MCContext.cpp user/ngie/make_check/contrib/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp user/ngie/make_check/contrib/llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp user/ngie/make_check/contrib/llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.td user/ngie/make_check/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp user/ngie/make_check/contrib/llvm/lib/Target/AMDGPU/SIISelLowering.cpp user/ngie/make_check/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp user/ngie/make_check/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.h user/ngie/make_check/contrib/llvm/lib/Target/AMDGPU/SIInstructions.td user/ngie/make_check/contrib/llvm/lib/Target/AMDGPU/SIPrepareScratchRegs.cpp user/ngie/make_check/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp user/ngie/make_check/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.h user/ngie/make_check/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp user/ngie/make_check/contrib/llvm/lib/Target/BPF/BPFISelDAGToDAG.cpp user/ngie/make_check/contrib/llvm/lib/Target/BPF/BPFISelLowering.cpp user/ngie/make_check/contrib/llvm/lib/Target/BPF/BPFInstrInfo.td user/ngie/make_check/contrib/llvm/lib/Target/BPF/BPFRegisterInfo.cpp user/ngie/make_check/contrib/llvm/lib/Target/Mips/MipsISelLowering.h user/ngie/make_check/contrib/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp user/ngie/make_check/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp user/ngie/make_check/contrib/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp user/ngie/make_check/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp user/ngie/make_check/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp user/ngie/make_check/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp user/ngie/make_check/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td user/ngie/make_check/contrib/llvm/lib/Target/PowerPC/PPCInstrQPX.td user/ngie/make_check/contrib/llvm/lib/Target/PowerPC/PPCInstrVSX.td user/ngie/make_check/contrib/llvm/lib/Target/PowerPC/PPCVSXFMAMutate.cpp user/ngie/make_check/contrib/llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp user/ngie/make_check/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp (contents, props changed) user/ngie/make_check/contrib/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp user/ngie/make_check/contrib/llvm/lib/Transforms/Scalar/GVN.cpp user/ngie/make_check/contrib/llvm/lib/Transforms/Utils/Local.cpp user/ngie/make_check/contrib/llvm/patches/README.TXT user/ngie/make_check/contrib/llvm/tools/clang/lib/Basic/Targets.cpp user/ngie/make_check/contrib/llvm/tools/clang/lib/Basic/Version.cpp user/ngie/make_check/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp user/ngie/make_check/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp user/ngie/make_check/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp user/ngie/make_check/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp user/ngie/make_check/contrib/llvm/tools/clang/tools/driver/driver.cpp user/ngie/make_check/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm64.cpp user/ngie/make_check/contrib/llvm/tools/llvm-lto/llvm-lto.cpp user/ngie/make_check/contrib/netbsd-tests/lib/libc/gen/t_assert.c user/ngie/make_check/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh user/ngie/make_check/contrib/netbsd-tests/usr.bin/grep/d_binary.out user/ngie/make_check/contrib/netbsd-tests/usr.bin/grep/t_grep.sh user/ngie/make_check/contrib/smbfs/lib/smb/nb_name.c user/ngie/make_check/etc/defaults/rc.conf user/ngie/make_check/etc/mtree/BSD.debug.dist user/ngie/make_check/etc/mtree/BSD.tests.dist user/ngie/make_check/etc/mtree/BSD.usr.dist user/ngie/make_check/etc/rc.d/NETWORKING user/ngie/make_check/etc/rc.d/jail user/ngie/make_check/etc/rc.d/netwait user/ngie/make_check/etc/services user/ngie/make_check/gnu/usr.bin/binutils/ld/Makefile user/ngie/make_check/include/netdb.h user/ngie/make_check/include/search.h user/ngie/make_check/lib/Makefile user/ngie/make_check/lib/clang/include/Makefile user/ngie/make_check/lib/clang/include/clang/Basic/Version.inc user/ngie/make_check/lib/clang/include/clang/Config/config.h user/ngie/make_check/lib/clang/include/llvm/Config/config.h user/ngie/make_check/lib/clang/include/llvm/Config/llvm-config.h user/ngie/make_check/lib/libc/Makefile user/ngie/make_check/lib/libc/arm/sys/__vdso_gettc.c user/ngie/make_check/lib/libc/gen/getpeereid.c user/ngie/make_check/lib/libc/gen/lockf.c user/ngie/make_check/lib/libc/gen/nlist.c user/ngie/make_check/lib/libc/gen/sysconf.c user/ngie/make_check/lib/libc/iconv/citrus_mmap.c user/ngie/make_check/lib/libc/net/getaddrinfo.3 user/ngie/make_check/lib/libc/net/getaddrinfo.c user/ngie/make_check/lib/libc/net/gethostbynis.c user/ngie/make_check/lib/libc/net/map_v4v6.c user/ngie/make_check/lib/libc/net/name6.c user/ngie/make_check/lib/libc/net/netdb_private.h user/ngie/make_check/lib/libc/net/rcmdsh.c user/ngie/make_check/lib/libc/stdio/findfp.c user/ngie/make_check/lib/libc/stdlib/Makefile.inc user/ngie/make_check/lib/libc/stdlib/hcreate.3 user/ngie/make_check/lib/libc/stdlib/tdelete.c user/ngie/make_check/lib/libc/stdlib/tsearch.3 user/ngie/make_check/lib/libc/stdlib/tsearch.c user/ngie/make_check/lib/libc/sys/clock_gettime.2 user/ngie/make_check/lib/libc/sys/gettimeofday.2 user/ngie/make_check/lib/libc/sys/ptrace.2 user/ngie/make_check/lib/libc/tests/resolv/Makefile user/ngie/make_check/lib/libc/tests/resolv/resolv_test.c user/ngie/make_check/lib/libc/tests/stdlib/Makefile user/ngie/make_check/lib/libclang_rt/Makefile.inc user/ngie/make_check/lib/libcrypt/Makefile user/ngie/make_check/lib/libcuse/cuse_lib.c user/ngie/make_check/lib/libmd/Makefile user/ngie/make_check/lib/libmd/mdXhl.c user/ngie/make_check/lib/libmd/sha512.3 user/ngie/make_check/lib/libmd/shadriver.c user/ngie/make_check/lib/libstand/Makefile user/ngie/make_check/lib/libstand/bootp.c user/ngie/make_check/lib/libsysdecode/Makefile user/ngie/make_check/lib/libsysdecode/sysdecode.3 user/ngie/make_check/lib/libsysdecode/sysdecode.h user/ngie/make_check/lib/libthr/thread/thr_fork.c user/ngie/make_check/lib/libthr/thread/thr_init.c user/ngie/make_check/lib/libthr/thread/thr_private.h user/ngie/make_check/lib/msun/tests/fma_test.c user/ngie/make_check/libexec/rtld-elf/arm/reloc.c user/ngie/make_check/libexec/rtld-elf/rtld.c user/ngie/make_check/sbin/gbde/Makefile user/ngie/make_check/sbin/gbde/gbde.c user/ngie/make_check/sbin/geom/class/eli/Makefile user/ngie/make_check/sbin/ifconfig/Makefile user/ngie/make_check/sbin/ifconfig/sfp.c user/ngie/make_check/sbin/md5/Makefile user/ngie/make_check/sbin/md5/md5.1 user/ngie/make_check/sbin/md5/md5.c user/ngie/make_check/sbin/mount/mount.c user/ngie/make_check/sbin/reboot/reboot.c user/ngie/make_check/sbin/umount/umount.c user/ngie/make_check/share/man/man4/Makefile user/ngie/make_check/share/man/man5/procfs.5 user/ngie/make_check/share/man/man9/Makefile user/ngie/make_check/share/man/man9/pci.9 user/ngie/make_check/share/misc/committers-ports.dot user/ngie/make_check/share/misc/organization.dot user/ngie/make_check/share/mk/bsd.lib.mk user/ngie/make_check/share/mk/sys.mk user/ngie/make_check/share/timedef/ja_JP.SJIS.src user/ngie/make_check/share/timedef/ja_JP.UTF-8.src user/ngie/make_check/share/timedef/ja_JP.eucJP.src user/ngie/make_check/sys/amd64/amd64/initcpu.c user/ngie/make_check/sys/amd64/include/cputypes.h user/ngie/make_check/sys/amd64/include/md_var.h user/ngie/make_check/sys/arm/arm/locore-v4.S user/ngie/make_check/sys/arm/arm/locore-v6.S user/ngie/make_check/sys/arm/arm/pmap-v6-new.c user/ngie/make_check/sys/arm/at91/std.bwct user/ngie/make_check/sys/arm/at91/std.eb9200 user/ngie/make_check/sys/arm/at91/std.ethernut5 user/ngie/make_check/sys/arm/at91/std.hl200 user/ngie/make_check/sys/arm/at91/std.hl201 user/ngie/make_check/sys/arm/at91/std.kb920x user/ngie/make_check/sys/arm/at91/std.qila9g20 user/ngie/make_check/sys/arm/at91/std.sam9260ek user/ngie/make_check/sys/arm/at91/std.sam9g20ek user/ngie/make_check/sys/arm/at91/std.sam9x25ek user/ngie/make_check/sys/arm/at91/std.sn9g45 user/ngie/make_check/sys/arm/at91/std.tsc4370 user/ngie/make_check/sys/arm/cavium/cns11xx/std.econa user/ngie/make_check/sys/arm/conf/ATMEL user/ngie/make_check/sys/arm/conf/CNS11XXNAS user/ngie/make_check/sys/arm/conf/CRB user/ngie/make_check/sys/arm/conf/GUMSTIX user/ngie/make_check/sys/arm/conf/IMX6 user/ngie/make_check/sys/arm/conf/NOTES user/ngie/make_check/sys/arm/conf/NSLU user/ngie/make_check/sys/arm/conf/SAM9260EK user/ngie/make_check/sys/arm/conf/SAM9G20EK user/ngie/make_check/sys/arm/freescale/imx/files.imx6 user/ngie/make_check/sys/arm/freescale/imx/imx6_ccm.c user/ngie/make_check/sys/arm/freescale/imx/imx6_ccmreg.h user/ngie/make_check/sys/arm/freescale/imx/imx_ccmvar.h user/ngie/make_check/sys/arm/include/ofw_machdep.h user/ngie/make_check/sys/arm/lpc/std.lpc user/ngie/make_check/sys/arm/mv/discovery/std.db78xxx user/ngie/make_check/sys/arm/mv/kirkwood/std.kirkwood user/ngie/make_check/sys/arm/mv/orion/std.db88f5xxx user/ngie/make_check/sys/arm/mv/orion/std.ts7800 user/ngie/make_check/sys/arm/xscale/i80321/ep80219_machdep.c user/ngie/make_check/sys/arm/xscale/i80321/iq31244_machdep.c user/ngie/make_check/sys/arm/xscale/i8134x/crb_machdep.c user/ngie/make_check/sys/arm/xscale/ixp425/avila_machdep.c user/ngie/make_check/sys/arm/xscale/ixp425/std.avila user/ngie/make_check/sys/arm/xscale/pxa/pxa_machdep.c user/ngie/make_check/sys/arm64/arm64/identcpu.c user/ngie/make_check/sys/arm64/arm64/mp_machdep.c user/ngie/make_check/sys/arm64/include/armreg.h user/ngie/make_check/sys/arm64/include/cpu.h user/ngie/make_check/sys/arm64/include/setjmp.h user/ngie/make_check/sys/boot/efi/boot1/boot1.c user/ngie/make_check/sys/boot/efi/loader/Makefile user/ngie/make_check/sys/boot/efi/loader/arch/amd64/framebuffer.c user/ngie/make_check/sys/boot/efi/loader/bootinfo.c user/ngie/make_check/sys/boot/efi/loader/devicename.c user/ngie/make_check/sys/boot/efi/loader/main.c user/ngie/make_check/sys/boot/forth/loader.conf user/ngie/make_check/sys/boot/forth/menu-commands.4th user/ngie/make_check/sys/boot/forth/menu.rc user/ngie/make_check/sys/boot/forth/support.4th user/ngie/make_check/sys/boot/i386/loader/main.c user/ngie/make_check/sys/boot/i386/zfsboot/zfsboot.c user/ngie/make_check/sys/boot/libstand32/Makefile user/ngie/make_check/sys/boot/pc98/boot2/boot2.c user/ngie/make_check/sys/boot/pc98/libpc98/biosdisk.c user/ngie/make_check/sys/boot/uboot/common/main.c user/ngie/make_check/sys/boot/zfs/libzfs.h user/ngie/make_check/sys/boot/zfs/zfs.c user/ngie/make_check/sys/boot/zfs/zfsimpl.c user/ngie/make_check/sys/bsm/audit.h user/ngie/make_check/sys/bsm/audit_domain.h user/ngie/make_check/sys/bsm/audit_errno.h user/ngie/make_check/sys/bsm/audit_fcntl.h user/ngie/make_check/sys/bsm/audit_internal.h user/ngie/make_check/sys/bsm/audit_kevents.h user/ngie/make_check/sys/bsm/audit_record.h user/ngie/make_check/sys/bsm/audit_socket_type.h user/ngie/make_check/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c user/ngie/make_check/sys/cddl/dev/fbt/arm/fbt_isa.c user/ngie/make_check/sys/compat/linux/linux_futex.c user/ngie/make_check/sys/compat/linux/linux_timer.c user/ngie/make_check/sys/compat/linuxkpi/common/include/linux/cdev.h user/ngie/make_check/sys/compat/linuxkpi/common/include/linux/compiler.h user/ngie/make_check/sys/compat/linuxkpi/common/include/linux/device.h user/ngie/make_check/sys/compat/linuxkpi/common/include/linux/file.h user/ngie/make_check/sys/compat/linuxkpi/common/include/linux/kobject.h user/ngie/make_check/sys/compat/linuxkpi/common/include/linux/miscdevice.h user/ngie/make_check/sys/compat/linuxkpi/common/include/linux/workqueue.h user/ngie/make_check/sys/compat/linuxkpi/common/src/linux_compat.c user/ngie/make_check/sys/compat/linuxkpi/common/src/linux_pci.c user/ngie/make_check/sys/conf/Makefile.mips user/ngie/make_check/sys/conf/files user/ngie/make_check/sys/conf/files.arm user/ngie/make_check/sys/conf/files.mips user/ngie/make_check/sys/conf/files.powerpc user/ngie/make_check/sys/conf/kern.mk user/ngie/make_check/sys/conf/kmod.mk user/ngie/make_check/sys/conf/newvers.sh user/ngie/make_check/sys/conf/options user/ngie/make_check/sys/conf/options.arm user/ngie/make_check/sys/conf/options.mips user/ngie/make_check/sys/contrib/ipfilter/netinet/ip_nat.c user/ngie/make_check/sys/crypto/sha1.h user/ngie/make_check/sys/crypto/sha2/sha256.h user/ngie/make_check/sys/dev/bxe/bxe.c user/ngie/make_check/sys/dev/bxe/bxe.h user/ngie/make_check/sys/dev/bxe/bxe_stats.c user/ngie/make_check/sys/dev/bxe/bxe_stats.h user/ngie/make_check/sys/dev/bxe/ecore_init.h user/ngie/make_check/sys/dev/cxgb/ulp/tom/cxgb_l2t.c user/ngie/make_check/sys/dev/cxgbe/adapter.h user/ngie/make_check/sys/dev/cxgbe/offload.h user/ngie/make_check/sys/dev/cxgbe/t4_main.c user/ngie/make_check/sys/dev/cxgbe/tom/t4_cpl_io.c user/ngie/make_check/sys/dev/cxgbe/tom/t4_ddp.c user/ngie/make_check/sys/dev/cxgbe/tom/t4_tom.c user/ngie/make_check/sys/dev/cxgbe/tom/t4_tom.h user/ngie/make_check/sys/dev/cxgbe/tom/t4_tom_l2t.c user/ngie/make_check/sys/dev/e1000/if_igb.c user/ngie/make_check/sys/dev/e1000/if_igb.h user/ngie/make_check/sys/dev/etherswitch/arswitch/arswitch.c user/ngie/make_check/sys/dev/etherswitch/arswitch/arswitch_7240.c user/ngie/make_check/sys/dev/etherswitch/arswitch/arswitch_8216.c user/ngie/make_check/sys/dev/etherswitch/arswitch/arswitch_8226.c user/ngie/make_check/sys/dev/etherswitch/arswitch/arswitch_8316.c user/ngie/make_check/sys/dev/etherswitch/arswitch/arswitch_8327.c user/ngie/make_check/sys/dev/etherswitch/arswitch/arswitch_9340.c user/ngie/make_check/sys/dev/etherswitch/arswitch/arswitch_phy.c user/ngie/make_check/sys/dev/etherswitch/arswitch/arswitch_reg.c user/ngie/make_check/sys/dev/etherswitch/e6000sw/e6000sw.c user/ngie/make_check/sys/dev/etherswitch/ip17x/ip17x.c user/ngie/make_check/sys/dev/etherswitch/ukswitch/ukswitch.c user/ngie/make_check/sys/dev/hyperv/include/hyperv.h user/ngie/make_check/sys/dev/hyperv/vmbus/hv_channel_mgmt.c user/ngie/make_check/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c user/ngie/make_check/sys/dev/hyperv/vmbus/hv_vmbus_priv.h user/ngie/make_check/sys/dev/isci/scil/scic_sds_phy.h user/ngie/make_check/sys/dev/iscsi/iscsi.c user/ngie/make_check/sys/dev/isp/isp.c user/ngie/make_check/sys/dev/isp/isp_freebsd.c user/ngie/make_check/sys/dev/isp/isp_freebsd.h user/ngie/make_check/sys/dev/isp/isp_library.c user/ngie/make_check/sys/dev/isp/isp_library.h user/ngie/make_check/sys/dev/isp/isp_pci.c user/ngie/make_check/sys/dev/isp/isp_sbus.c user/ngie/make_check/sys/dev/isp/isp_target.c user/ngie/make_check/sys/dev/isp/ispmbox.h user/ngie/make_check/sys/dev/isp/ispvar.h user/ngie/make_check/sys/dev/ixgbe/if_ix.c user/ngie/make_check/sys/dev/ixgbe/if_ixv.c user/ngie/make_check/sys/dev/ixgbe/ix_txrx.c user/ngie/make_check/sys/dev/ixgbe/ixgbe.h user/ngie/make_check/sys/dev/ixgbe/ixgbe_82598.c user/ngie/make_check/sys/dev/ixgbe/ixgbe_82599.c user/ngie/make_check/sys/dev/ixgbe/ixgbe_api.c user/ngie/make_check/sys/dev/ixgbe/ixgbe_api.h user/ngie/make_check/sys/dev/ixgbe/ixgbe_common.c user/ngie/make_check/sys/dev/ixgbe/ixgbe_dcb.c user/ngie/make_check/sys/dev/ixgbe/ixgbe_osdep.h user/ngie/make_check/sys/dev/ixgbe/ixgbe_phy.c user/ngie/make_check/sys/dev/ixgbe/ixgbe_phy.h user/ngie/make_check/sys/dev/ixgbe/ixgbe_type.h user/ngie/make_check/sys/dev/ixgbe/ixgbe_vf.c user/ngie/make_check/sys/dev/ixgbe/ixgbe_x540.c user/ngie/make_check/sys/dev/ixgbe/ixgbe_x550.c user/ngie/make_check/sys/dev/ixgbe/ixgbe_x550.h user/ngie/make_check/sys/dev/mge/if_mge.c user/ngie/make_check/sys/dev/mlx5/device.h user/ngie/make_check/sys/dev/mlx5/mlx5_en/en.h user/ngie/make_check/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c user/ngie/make_check/sys/dev/mlx5/mlx5_en/mlx5_en_main.c user/ngie/make_check/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c user/ngie/make_check/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c user/ngie/make_check/sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c user/ngie/make_check/sys/dev/netmap/netmap.c user/ngie/make_check/sys/dev/ofw/openfirm.h user/ngie/make_check/sys/dev/pci/pci.c user/ngie/make_check/sys/dev/pci/pci_if.m user/ngie/make_check/sys/dev/pci/pci_private.h user/ngie/make_check/sys/dev/pci/pcivar.h user/ngie/make_check/sys/dev/puc/pucdata.c user/ngie/make_check/sys/dev/random/build.sh user/ngie/make_check/sys/dev/random/fortuna.c user/ngie/make_check/sys/dev/random/hash.c user/ngie/make_check/sys/dev/random/other_algorithm.c user/ngie/make_check/sys/dev/random/randomdev.c user/ngie/make_check/sys/dev/random/unit_test.c user/ngie/make_check/sys/dev/random/yarrow.c user/ngie/make_check/sys/dev/rt/if_rt.c user/ngie/make_check/sys/dev/rt/if_rtreg.h user/ngie/make_check/sys/dev/rt/if_rtvar.h user/ngie/make_check/sys/dev/usb/controller/xhci.h user/ngie/make_check/sys/dev/usb/controller/xhci_pci.c user/ngie/make_check/sys/dev/usb/net/if_axe.c user/ngie/make_check/sys/dev/usb/usb_lookup.c user/ngie/make_check/sys/dev/usb/usbdevs user/ngie/make_check/sys/dev/usb/usbdi.h user/ngie/make_check/sys/fs/cuse/cuse.c user/ngie/make_check/sys/fs/cuse/cuse_ioctl.h user/ngie/make_check/sys/fs/devfs/devfs_vnops.c user/ngie/make_check/sys/fs/ext2fs/ext2fs.h user/ngie/make_check/sys/fs/nullfs/null_vnops.c user/ngie/make_check/sys/geom/bde/g_bde.c user/ngie/make_check/sys/geom/bde/g_bde_crypt.c user/ngie/make_check/sys/geom/bde/g_bde_lock.c user/ngie/make_check/sys/geom/bde/g_bde_work.c user/ngie/make_check/sys/geom/eli/g_eli.h user/ngie/make_check/sys/geom/geom_map.c user/ngie/make_check/sys/geom/part/g_part.c user/ngie/make_check/sys/geom/part/g_part.h user/ngie/make_check/sys/geom/part/g_part_gpt.c user/ngie/make_check/sys/i386/i386/initcpu.c user/ngie/make_check/sys/i386/include/cputypes.h user/ngie/make_check/sys/kern/imgact_elf.c user/ngie/make_check/sys/kern/kern_fork.c user/ngie/make_check/sys/kern/kern_ktr.c user/ngie/make_check/sys/kern/kern_resource.c user/ngie/make_check/sys/kern/kern_sig.c user/ngie/make_check/sys/kern/kern_thr.c user/ngie/make_check/sys/kern/kern_thread.c user/ngie/make_check/sys/kern/kern_time.c user/ngie/make_check/sys/kern/link_elf.c user/ngie/make_check/sys/kern/sys_process.c user/ngie/make_check/sys/mips/atheros/if_arge.c user/ngie/make_check/sys/mips/cavium/cvmx_config.h user/ngie/make_check/sys/mips/conf/RT305X user/ngie/make_check/sys/mips/include/cpufunc.h user/ngie/make_check/sys/mips/include/cpuinfo.h user/ngie/make_check/sys/mips/include/cpuregs.h user/ngie/make_check/sys/mips/include/ofw_machdep.h user/ngie/make_check/sys/mips/include/pte.h user/ngie/make_check/sys/mips/mips/cpu.c user/ngie/make_check/sys/mips/rt305x/files.rt305x user/ngie/make_check/sys/mips/rt305x/obio.c user/ngie/make_check/sys/mips/rt305x/rt305x_dotg.c user/ngie/make_check/sys/mips/rt305x/rt305x_machdep.c user/ngie/make_check/sys/mips/rt305x/rt305x_sysctl.c user/ngie/make_check/sys/mips/rt305x/rt305xreg.h user/ngie/make_check/sys/mips/rt305x/uart_bus_rt305x.c user/ngie/make_check/sys/mips/rt305x/uart_cpu_rt305x.c user/ngie/make_check/sys/modules/Makefile user/ngie/make_check/sys/modules/crypto/Makefile user/ngie/make_check/sys/modules/cxgbe/Makefile user/ngie/make_check/sys/modules/geom/geom_bde/Makefile user/ngie/make_check/sys/modules/ix/Makefile user/ngie/make_check/sys/modules/ixv/Makefile user/ngie/make_check/sys/modules/tcp/fastpath/Makefile user/ngie/make_check/sys/modules/usb/rsufw/Makefile.inc user/ngie/make_check/sys/modules/usb/urtwnfw/Makefile.inc user/ngie/make_check/sys/modules/zfs/Makefile user/ngie/make_check/sys/net/bpf.c user/ngie/make_check/sys/net/flowtable.c user/ngie/make_check/sys/net/if.c user/ngie/make_check/sys/net/if_ethersubr.c user/ngie/make_check/sys/net/if_gif.c user/ngie/make_check/sys/net/if_gre.c user/ngie/make_check/sys/net/if_llatbl.c user/ngie/make_check/sys/net/if_llatbl.h user/ngie/make_check/sys/net/if_var.h user/ngie/make_check/sys/net/route.h user/ngie/make_check/sys/net/sff8436.h user/ngie/make_check/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c user/ngie/make_check/sys/netinet/if_ether.c user/ngie/make_check/sys/netinet/if_ether.h user/ngie/make_check/sys/netinet/in.c user/ngie/make_check/sys/netinet/in_rmx.c user/ngie/make_check/sys/netinet/ip_output.c user/ngie/make_check/sys/netinet/sctp_indata.c user/ngie/make_check/sys/netinet/sctp_os_bsd.h user/ngie/make_check/sys/netinet/sctp_output.c user/ngie/make_check/sys/netinet/tcp.h user/ngie/make_check/sys/netinet/tcp_input.c user/ngie/make_check/sys/netinet/tcp_output.c user/ngie/make_check/sys/netinet/tcp_subr.c user/ngie/make_check/sys/netinet/tcp_syncache.c user/ngie/make_check/sys/netinet/tcp_syncache.h user/ngie/make_check/sys/netinet/tcp_timer.c user/ngie/make_check/sys/netinet/tcp_usrreq.c user/ngie/make_check/sys/netinet/tcp_var.h user/ngie/make_check/sys/netinet/toecore.c user/ngie/make_check/sys/netinet/udp_usrreq.c user/ngie/make_check/sys/netinet6/icmp6.c user/ngie/make_check/sys/netinet6/in6.c user/ngie/make_check/sys/netinet6/in6.h user/ngie/make_check/sys/netinet6/in6_rmx.c user/ngie/make_check/sys/netinet6/ip6_output.c user/ngie/make_check/sys/netinet6/nd6.c user/ngie/make_check/sys/netinet6/nd6.h user/ngie/make_check/sys/netinet6/nd6_nbr.c user/ngie/make_check/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c user/ngie/make_check/sys/opencrypto/skipjack.h user/ngie/make_check/sys/opencrypto/xform.c user/ngie/make_check/sys/opencrypto/xform.h user/ngie/make_check/sys/powerpc/booke/booke_machdep.c user/ngie/make_check/sys/powerpc/booke/locore.S user/ngie/make_check/sys/powerpc/booke/machdep_e500.c user/ngie/make_check/sys/powerpc/booke/pmap.c user/ngie/make_check/sys/powerpc/include/ofw_machdep.h user/ngie/make_check/sys/powerpc/include/param.h user/ngie/make_check/sys/powerpc/include/platform.h user/ngie/make_check/sys/powerpc/include/pmap.h user/ngie/make_check/sys/powerpc/mpc85xx/mpc85xx.c user/ngie/make_check/sys/powerpc/mpc85xx/mpc85xx.h user/ngie/make_check/sys/powerpc/mpc85xx/platform_mpc85xx.c user/ngie/make_check/sys/powerpc/ofw/ofw_machdep.c user/ngie/make_check/sys/powerpc/powerpc/cpu.c user/ngie/make_check/sys/powerpc/powerpc/machdep.c user/ngie/make_check/sys/powerpc/powerpc/platform.c user/ngie/make_check/sys/powerpc/powerpc/pmap_dispatch.c user/ngie/make_check/sys/security/audit/bsm_domain.c user/ngie/make_check/sys/security/audit/bsm_errno.c user/ngie/make_check/sys/security/audit/bsm_fcntl.c user/ngie/make_check/sys/security/audit/bsm_socket_type.c user/ngie/make_check/sys/security/audit/bsm_token.c user/ngie/make_check/sys/sparc64/include/ktr.h user/ngie/make_check/sys/sparc64/sparc64/exception.S user/ngie/make_check/sys/sparc64/sparc64/mp_exception.S user/ngie/make_check/sys/sparc64/sparc64/pmap.c user/ngie/make_check/sys/sparc64/sparc64/swtch.S user/ngie/make_check/sys/sys/copyright.h user/ngie/make_check/sys/sys/fcntl.h user/ngie/make_check/sys/sys/gpt.h user/ngie/make_check/sys/sys/libkern.h user/ngie/make_check/sys/sys/param.h user/ngie/make_check/sys/sys/proc.h user/ngie/make_check/sys/sys/ptrace.h user/ngie/make_check/sys/ufs/ffs/ffs_softdep.c user/ngie/make_check/sys/vm/vnode_pager.c user/ngie/make_check/sys/x86/include/specialreg.h user/ngie/make_check/sys/x86/x86/identcpu.c user/ngie/make_check/sys/x86/xen/pv.c user/ngie/make_check/sys/x86/xen/xen_apic.c user/ngie/make_check/sys/xen/xenbus/xenbusb.c user/ngie/make_check/tests/sys/Makefile user/ngie/make_check/tests/sys/aio/aio_kqueue_test.c user/ngie/make_check/tests/sys/aio/lio_kqueue_test.c user/ngie/make_check/tests/sys/file/flock_test.sh user/ngie/make_check/tests/sys/kern/Makefile user/ngie/make_check/tests/sys/kern/pipe/pipe_overcommit1_test.c user/ngie/make_check/tests/sys/kern/ptrace_test.c user/ngie/make_check/tests/sys/kern/unix_seqpacket_test.c user/ngie/make_check/tools/build/mk/OptionalObsoleteFiles.inc user/ngie/make_check/tools/tools/locale/tools/cldr2def.pl user/ngie/make_check/tools/tools/nanobsd/embedded/common user/ngie/make_check/tools/tools/nanobsd/embedded/rpi2.cfg user/ngie/make_check/usr.bin/bmake/Makefile user/ngie/make_check/usr.bin/clang/clang/Makefile user/ngie/make_check/usr.bin/column/column.c user/ngie/make_check/usr.bin/dtc/Makefile user/ngie/make_check/usr.bin/dtc/checking.cc user/ngie/make_check/usr.bin/dtc/checking.hh user/ngie/make_check/usr.bin/dtc/dtb.hh user/ngie/make_check/usr.bin/dtc/fdt.cc user/ngie/make_check/usr.bin/dtc/fdt.hh user/ngie/make_check/usr.bin/dtc/input_buffer.cc user/ngie/make_check/usr.bin/dtc/input_buffer.hh user/ngie/make_check/usr.bin/kdump/Makefile user/ngie/make_check/usr.bin/kdump/kdump.c user/ngie/make_check/usr.bin/locate/locate/util.c user/ngie/make_check/usr.bin/nfsstat/Makefile user/ngie/make_check/usr.bin/nfsstat/nfsstat.c user/ngie/make_check/usr.bin/systat/vmstat.c user/ngie/make_check/usr.bin/truss/Makefile user/ngie/make_check/usr.bin/truss/syscalls.c user/ngie/make_check/usr.bin/vmstat/vmstat.c user/ngie/make_check/usr.bin/xargs/xargs.c user/ngie/make_check/usr.sbin/Makefile user/ngie/make_check/usr.sbin/Makefile.amd64 user/ngie/make_check/usr.sbin/Makefile.arm user/ngie/make_check/usr.sbin/Makefile.i386 user/ngie/make_check/usr.sbin/Makefile.powerpc user/ngie/make_check/usr.sbin/Makefile.sparc64 user/ngie/make_check/usr.sbin/bhyve/bhyverun.c user/ngie/make_check/usr.sbin/bhyve/pci_emul.c user/ngie/make_check/usr.sbin/bsdinstall/scripts/entropy user/ngie/make_check/usr.sbin/camdd/Makefile user/ngie/make_check/usr.sbin/camdd/camdd.c user/ngie/make_check/usr.sbin/cron/cron/do_command.c user/ngie/make_check/usr.sbin/cron/cron/popen.c user/ngie/make_check/usr.sbin/cron/crontab/crontab.c user/ngie/make_check/usr.sbin/fstyp/Makefile user/ngie/make_check/usr.sbin/fstyp/fstyp.c user/ngie/make_check/usr.sbin/fstyp/geli.c user/ngie/make_check/usr.sbin/fstyp/zfs.c user/ngie/make_check/usr.sbin/jls/Makefile user/ngie/make_check/usr.sbin/jls/jls.8 user/ngie/make_check/usr.sbin/jls/jls.c user/ngie/make_check/usr.sbin/makefs/makefs.c user/ngie/make_check/usr.sbin/mountd/mountd.c user/ngie/make_check/usr.sbin/mpsutil/mps_cmd.c user/ngie/make_check/usr.sbin/pw/pw_conf.c user/ngie/make_check/usr.sbin/pw/pw_group.c user/ngie/make_check/usr.sbin/pw/pw_vpw.c user/ngie/make_check/usr.sbin/pwd_mkdb/pwd_mkdb.c user/ngie/make_check/usr.sbin/rpc.lockd/lockd.c user/ngie/make_check/usr.sbin/rpc.statd/statd.c user/ngie/make_check/usr.sbin/rtsold/rtsold.c user/ngie/make_check/usr.sbin/uhsoctl/uhsoctl.c Directory Properties: user/ngie/make_check/ (props changed) user/ngie/make_check/cddl/ (props changed) user/ngie/make_check/cddl/contrib/opensolaris/ (props changed) user/ngie/make_check/contrib/binutils/ (props changed) user/ngie/make_check/contrib/bmake/ (props changed) user/ngie/make_check/contrib/gcc/ (props changed) user/ngie/make_check/contrib/libexecinfo/ (props changed) user/ngie/make_check/contrib/llvm/ (props changed) user/ngie/make_check/contrib/llvm/tools/clang/ (props changed) user/ngie/make_check/contrib/llvm/tools/lldb/ (props changed) user/ngie/make_check/contrib/llvm/tools/llvm-dwarfdump/ (props changed) user/ngie/make_check/contrib/llvm/tools/llvm-lto/ (props changed) user/ngie/make_check/gnu/usr.bin/binutils/ (props changed) user/ngie/make_check/include/ (props changed) user/ngie/make_check/lib/libc/ (props changed) user/ngie/make_check/sbin/ (props changed) user/ngie/make_check/share/ (props changed) user/ngie/make_check/share/man/man4/ (props changed) user/ngie/make_check/sys/ (props changed) user/ngie/make_check/sys/boot/ (props changed) user/ngie/make_check/sys/cddl/contrib/opensolaris/ (props changed) user/ngie/make_check/sys/conf/ (props changed) user/ngie/make_check/sys/contrib/ipfilter/ (props changed) user/ngie/make_check/sys/dev/hyperv/ (props changed) user/ngie/make_check/usr.sbin/bhyve/ (props changed) user/ngie/make_check/usr.sbin/rtsold/ (props changed) Modified: user/ngie/make_check/COPYRIGHT ============================================================================== --- user/ngie/make_check/COPYRIGHT Thu Dec 31 21:51:38 2015 (r293007) +++ user/ngie/make_check/COPYRIGHT Thu Dec 31 22:20:40 2015 (r293008) @@ -4,7 +4,7 @@ The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2015 The FreeBSD Project. All rights reserved. +Copyright (c) 1992-2016 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions Modified: user/ngie/make_check/MAINTAINERS ============================================================================== --- user/ngie/make_check/MAINTAINERS Thu Dec 31 21:51:38 2015 (r293007) +++ user/ngie/make_check/MAINTAINERS Thu Dec 31 22:20:40 2015 (r293008) @@ -24,6 +24,15 @@ maintainer of a sub-system is to check r sub-system. *** +*** +Maintainers are encouraged to visit: + https://reviews.freebsd.org/herald + +and configure notifications for parts of the tree which they maintain. +Notifications can automatically be sent when someone proposes a revision or +makes a commit to the specified subtree. +*** + subsystem login notes ----------------------------- atf freebsd-testing,jmmv,ngie Pre-commit review requested. @@ -47,7 +56,9 @@ isci(4) jimharris Pre-commit review req iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org kqueue jmg Pre-commit review requested. Documentation Required. +libdpv dteske Pre-commit review requested. Keep in sync with dpv(1). libfetch des Pre-commit review requested. +libfigpar dteske Pre-commit review requested. libpam des Pre-commit review requested. linprocfs des Pre-commit review requested. lpr gad Pre-commit review requested, particularly for @@ -76,6 +87,7 @@ sh(1) jilles Pre-commit review request compiled in as builtins. share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. share/mk/*.test.mk freebsd-testing,ngie (same list as share/mk too) Pre-commit review requested. +sys/boot/forth dteske Pre-commit review requested. sys/compat/linuxkpi hselasky If in doubt, ask. sys/dev/e1000 erj Pre-commit phabricator review requested. sys/dev/ixgbe erj Pre-commit phabricator review requested. @@ -85,74 +97,8 @@ sys/dev/usb hselasky If in doubt, ask. sys/netinet/ip_carp.c glebius Pre-commit review recommended. sys/netpfil/pf kp,glebius Pre-commit review recommended. tests freebsd-testing,ngie Pre-commit review requested. +usr.sbin/bsdconfig dteske Pre-commit phabricator review requested. +usr.sbin/dpv dteske Pre-commit review requested. Keep in sync with libdpv. usr.sbin/pkg pkg@ Please coordinate behavior or flag changes with pkg team. +usr.sbin/sysrc dteske Pre-commit phabricator review requested. Keep in sync with bsdconfig(8) sysrc.subr. vmm(4) neel,grehan Pre-commit review requested. ----- OLD ---- -libc/posix1e rwatson Pre-commit review requested. -POSIX.1e ACLs rwatson Pre-commit review requested. -UFS EAs rwatson Pre-commit review requested. -MAC Framework rwatson Pre-commit review requested. -MAC Modules rwatson Pre-commit review requested. -contrib/openbsm rwatson Pre-commit review requested. -sys/security/audit rwatson Pre-commit review requested. -ahc(4) gibbs Pre-commit review requested. -ahd(4) gibbs Pre-commit review requested. -cdboot jhb Pre-commit review requested. -pxeboot jhb Pre-commit review requested. -witness jhb Pre-commit review requested. -CAM gibbs, - ken Pre-commit review requested. send to scsi@freebsd.org -devstat(9) ken Pre-commit review requested. -camcontrol(8) ken Pre-commit review requested. -libcam ken Pre-commit review requested. -libdevstat ken Pre-commit review requested. -iostat(8) ken Pre-commit review requested. -cd(4) ken Pre-commit review requested. -pass(4) ken Pre-commit review requested. -ch(4) ken Pre-commit review requested. -em(4) jfv Pre-commit review requested. -nvi peter Try not to break it. -libz peter Try not to break it. -groff ru Recommends pre-commit review. -ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org -drm rnoland Just keep me informed of changes, try not to break it. -unifdef(1) fanf Pre-commit review requested. -ntp roberto Pre-commit review requested. -inetd dwmalone Recommends pre-commit review. -contrib/smbfs bp Open for in-tree committs. In case of functional - changes pre-commit review requested. -file obrien Insists to keep file blocked from other's unapproved - commits -contrib/bzip2 obrien Pre-commit review required. -geom freebsd-geom@FreeBSD.org -geom_concat pjd Pre-commit review preferred. -geom_gate pjd Pre-commit review preferred. -geom_label pjd Pre-commit review preferred. -geom_mirror pjd Pre-commit review preferred. -geom_nop pjd Pre-commit review preferred. -geom_raid3 pjd Pre-commit review preferred. -geom_shsec pjd Pre-commit review preferred. -geom_stripe pjd Pre-commit review preferred. -geom_zero pjd Pre-commit review preferred. -sbin/geom pjd Pre-commit review preferred. -zfs freebsd-fs@FreeBSD.org -linux emul emulation Please discuss changes here. -bs{diff,patch} cperciva Pre-commit review requested. -portsnap cperciva Pre-commit review requested. -freebsd-update cperciva Pre-commit review requested. -sys/netgraph/bluetooth emax Pre-commit review preferred. -lib/libbluetooth emax Pre-commit review preferred. -lib/libsdp emax Pre-commit review preferred. -usr.bin/bluetooth emax Pre-commit review preferred. -usr.sbin/bluetooth emax Pre-commit review preferred. -share/zoneinfo edwin Heads-up appreciated, since our data is coming - from a third party source. -usr.sbin/zic edwin Heads-up appreciated, since this code is - maintained by a third party source. -lib/libc/stdtime edwin Heads-up appreciated, since parts of this code - is maintained by a third party source. -sbin/routed bms Pre-commit review; notify vendor at rhyolite.com -cmx daniel@roe.ch Pre-commit review preferred. -filemon obrien Pre-commit review preferred. -sysdoc trhodes Pre-commit review preferred. - Modified: user/ngie/make_check/Makefile.inc1 ============================================================================== --- user/ngie/make_check/Makefile.inc1 Thu Dec 31 21:51:38 2015 (r293007) +++ user/ngie/make_check/Makefile.inc1 Thu Dec 31 22:20:40 2015 (r293008) @@ -1692,7 +1692,7 @@ NXBMAKE= ${NXBENV} ${MAKE} \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \ -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \ - MK_LLDB=no + MK_LLDB=no MK_DEBUG_FILES=no # native-xtools is the current target for qemu-user cross builds of ports # via poudriere and the imgact_binmisc kernel module. Modified: user/ngie/make_check/ObsoleteFiles.inc ============================================================================== --- user/ngie/make_check/ObsoleteFiles.inc Thu Dec 31 21:51:38 2015 (r293007) +++ user/ngie/make_check/ObsoleteFiles.inc Thu Dec 31 22:20:40 2015 (r293008) @@ -38,6 +38,90 @@ # xargs -n1 | sort | uniq -d; # done +# 20151225: new clang import which bumps version from 3.7.0 to 3.7.1. +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/common_interface_defs.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/coverage_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/dfsan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/linux_syscall_hooks.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/lsan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/msan_interface.h +OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/tsan_interface_atomic.h +OLD_DIRS+=usr/lib/clang/3.7.0/include/sanitizer +OLD_FILES+=usr/lib/clang/3.7.0/include/__stddef_max_align_t.h +OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_aes.h +OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_pclmul.h +OLD_FILES+=usr/lib/clang/3.7.0/include/adxintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/altivec.h +OLD_FILES+=usr/lib/clang/3.7.0/include/ammintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/arm_acle.h +OLD_FILES+=usr/lib/clang/3.7.0/include/arm_neon.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx2intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512bwintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512cdintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512dqintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512erintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512fintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlbwintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vldqintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/avxintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/bmi2intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/bmiintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/cpuid.h +OLD_FILES+=usr/lib/clang/3.7.0/include/cuda_builtin_vars.h +OLD_FILES+=usr/lib/clang/3.7.0/include/emmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/f16cintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/fma4intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/fmaintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/fxsrintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/htmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/htmxlintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/ia32intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/immintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/lzcntintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/mm3dnow.h +OLD_FILES+=usr/lib/clang/3.7.0/include/mm_malloc.h +OLD_FILES+=usr/lib/clang/3.7.0/include/mmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/module.modulemap +OLD_FILES+=usr/lib/clang/3.7.0/include/nmmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/pmmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/popcntintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/prfchwintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/rdseedintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/rtmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/s390intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/shaintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/smmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/tbmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/tmmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/vadefs.h +OLD_FILES+=usr/lib/clang/3.7.0/include/vecintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/wmmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/x86intrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/xmmintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/xopintrin.h +OLD_FILES+=usr/lib/clang/3.7.0/include/xtestintrin.h +OLD_DIRS+=usr/lib/clang/3.7.0/include +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-preinit-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-arm.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a +OLD_DIRS+=usr/lib/clang/3.7.0/lib/freebsd +OLD_DIRS+=usr/lib/clang/3.7.0/lib +OLD_DIRS+=usr/lib/clang/3.7.0 # 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406) OLD_LIBS+=usr/lib/libelf.so.2 # 20151115: Fox bad upgrade scheme Modified: user/ngie/make_check/bin/pax/pat_rep.c ============================================================================== --- user/ngie/make_check/bin/pax/pat_rep.c Thu Dec 31 21:51:38 2015 (r293007) +++ user/ngie/make_check/bin/pax/pat_rep.c Thu Dec 31 22:20:40 2015 (r293008) @@ -878,7 +878,7 @@ rep_name(char *name, int *nlen, int prnt * (the user already saw that substitution go by) */ pt = rephead; - (void)strcpy(buf1, name); + (void)strlcpy(buf1, name, sizeof(buf1)); inpt = buf1; outpt = nname; endpt = outpt + PAXPATHLEN; Modified: user/ngie/make_check/bin/sh/expand.c ============================================================================== --- user/ngie/make_check/bin/sh/expand.c Thu Dec 31 21:51:38 2015 (r293007) +++ user/ngie/make_check/bin/sh/expand.c Thu Dec 31 22:20:40 2015 (r293008) @@ -3,6 +3,8 @@ * The Regents of the University of California. All rights reserved. * Copyright (c) 1997-2005 * Herbert Xu . All rights reserved. + * Copyright (c) 2010-2015 + * Jilles Tjoelker . All rights reserved. * * This code is derived from software contributed to Berkeley by * Kenneth Almquist. @@ -79,41 +81,32 @@ __FBSDID("$FreeBSD$"); #include "show.h" #include "builtins.h" -/* - * Structure specifying which parts of the string should be searched - * for IFS characters. - */ +enum wordstate { WORD_IDLE, WORD_WS_DELIMITED, WORD_QUOTEMARK }; -struct ifsregion { - struct ifsregion *next; /* next region in list */ - int begoff; /* offset of start of region */ - int endoff; /* offset of end of region */ - int inquotes; /* search for nul bytes only */ +struct worddest { + struct arglist *list; + enum wordstate state; }; - static char *expdest; /* output of current string */ static struct nodelist *argbackq; /* list of back quote expressions */ -static struct ifsregion ifsfirst; /* first struct in list of ifs regions */ -static struct ifsregion *ifslastp; /* last struct in list */ -static char *argstr(char *, int); +static char *argstr(char *, int, struct worddest *); static char *exptilde(char *, int); -static char *expari(char *); -static void expbackq(union node *, int, int); -static int subevalvar(char *, char *, int, int, int, int, int); -static char *evalvar(char *, int); +static char *expari(char *, int, struct worddest *); +static void expbackq(union node *, int, int, struct worddest *); +static void subevalvar_trim(char *, int, int, int); +static int subevalvar_misc(char *, const char *, int, int, int); +static char *evalvar(char *, int, struct worddest *); static int varisset(const char *, int); -static void strtodest(const char *, int, int, int); -static void varvalue(const char *, int, int, int); -static void recordregion(int, int, int); -static void removerecordregions(int); -static void ifsbreakup(char *, struct arglist *); -static void expandmeta(struct arglist *, struct arglist *); +static void strtodest(const char *, int, int, int, struct worddest *); +static void reprocess(int, int, int, int, struct worddest *); +static void varvalue(const char *, int, int, int, struct worddest *); +static void expandmeta(char *, struct arglist *); static void expmeta(char *, char *, struct arglist *); static int expsortcmp(const void *, const void *); -static int patmatch(const char *, const char *, int); -static char *cvtnum(int, char *); +static int patmatch(const char *, const char *); +static void cvtnum(int, char *); static int collate_range_cmp(wchar_t, wchar_t); void @@ -168,6 +161,53 @@ stputs_quotes(const char *data, const ch } #define STPUTS_QUOTES(data, syntax, p) p = stputs_quotes((data), syntax, p) +static char * +nextword(char c, int flag, char *p, struct worddest *dst) +{ + int is_ws; + + is_ws = c == '\t' || c == '\n' || c == ' '; + if (p != stackblock() || (is_ws ? dst->state == WORD_QUOTEMARK : + dst->state != WORD_WS_DELIMITED) || c == '\0') { + STPUTC('\0', p); + if (flag & EXP_GLOB) + expandmeta(grabstackstr(p), dst->list); + else + appendarglist(dst->list, grabstackstr(p)); + dst->state = is_ws ? WORD_WS_DELIMITED : WORD_IDLE; + } else if (!is_ws && dst->state == WORD_WS_DELIMITED) + dst->state = WORD_IDLE; + /* Reserve space while the stack string is empty. */ + appendarglist(dst->list, NULL); + dst->list->count--; + STARTSTACKSTR(p); + return p; +} +#define NEXTWORD(c, flag, p, dstlist) p = nextword(c, flag, p, dstlist) + +static char * +stputs_split(const char *data, const char *syntax, int flag, char *p, + struct worddest *dst) +{ + const char *ifs; + char c; + + ifs = ifsset() ? ifsval() : " \t\n"; + while (*data) { + CHECKSTRSPACE(2, p); + c = *data++; + if (strchr(ifs, c) != NULL) { + NEXTWORD(c, flag, p, dst); + continue; + } + if (flag & EXP_GLOB && syntax[(int)c] == CCTL) + USTPUTC(CTLESC, p); + USTPUTC(c, p); + } + return (p); +} +#define STPUTS_SPLIT(data, syntax, flag, p, dst) p = stputs_split((data), syntax, flag, p, dst) + /* * Perform expansions on an argument, placing the resulting list of arguments * in arglist. Parameter expansion, command substitution and arithmetic @@ -183,34 +223,31 @@ stputs_quotes(const char *data, const ch void expandarg(union node *arg, struct arglist *arglist, int flag) { - struct arglist exparg; - char *p; + struct worddest exparg; + if (fflag) + flag &= ~EXP_GLOB; argbackq = arg->narg.backquote; + exparg.list = arglist; + exparg.state = WORD_IDLE; STARTSTACKSTR(expdest); - ifsfirst.next = NULL; - ifslastp = NULL; - argstr(arg->narg.text, flag); + argstr(arg->narg.text, flag, &exparg); if (arglist == NULL) { STACKSTRNUL(expdest); return; /* here document expanded */ } - STPUTC('\0', expdest); - p = grabstackstr(expdest); - emptyarglist(&exparg); - if (flag & EXP_FULL) { - ifsbreakup(p, &exparg); - expandmeta(&exparg, arglist); - } else - appendarglist(arglist, p); - while (ifsfirst.next != NULL) { - struct ifsregion *ifsp; - INTOFF; - ifsp = ifsfirst.next->next; - ckfree(ifsfirst.next); - ifsfirst.next = ifsp; - INTON; + if ((flag & EXP_SPLIT) == 0 || expdest != stackblock() || + exparg.state == WORD_QUOTEMARK) { + STPUTC('\0', expdest); + if (flag & EXP_SPLIT) { + if (flag & EXP_GLOB) + expandmeta(grabstackstr(expdest), exparg.list); + else + appendarglist(exparg.list, grabstackstr(expdest)); + } } + if ((flag & EXP_SPLIT) == 0) + appendarglist(arglist, grabstackstr(expdest)); } @@ -220,15 +257,16 @@ expandarg(union node *arg, struct arglis * expansion, and tilde expansion if requested via EXP_TILDE/EXP_VARTILDE. * Processing ends at a CTLENDVAR or CTLENDARI character as well as '\0'. * This is used to expand word in ${var+word} etc. - * If EXP_FULL or EXP_CASE are set, keep and/or generate CTLESC + * If EXP_GLOB or EXP_CASE are set, keep and/or generate CTLESC * characters to allow for further processing. - * If EXP_FULL is set, also preserve CTLQUOTEMARK characters. + * + * If EXP_SPLIT is set, dst receives any complete words produced. */ static char * -argstr(char *p, int flag) +argstr(char *p, int flag, struct worddest *dst) { char c; - int quotes = flag & (EXP_FULL | EXP_CASE); /* do CTLESC */ + int quotes = flag & (EXP_GLOB | EXP_CASE); /* do CTLESC */ int firsteq = 1; int split_lit; int lit_quoted; @@ -252,32 +290,33 @@ argstr(char *p, int flag) if (p[0] == CTLVAR && (p[1] & VSQUOTE) != 0 && p[2] == '@' && p[3] == '=') break; - if ((flag & EXP_FULL) != 0) - USTPUTC(c, expdest); + if ((flag & EXP_SPLIT) != 0 && expdest == stackblock()) + dst->state = WORD_QUOTEMARK; break; case CTLQUOTEEND: lit_quoted = 0; break; case CTLESC: - if (quotes) - USTPUTC(c, expdest); c = *p++; + if (split_lit && !lit_quoted && + strchr(ifsset() ? ifsval() : " \t\n", c) != NULL) { + NEXTWORD(c, flag, expdest, dst); + break; + } + if (quotes) + USTPUTC(CTLESC, expdest); USTPUTC(c, expdest); - if (split_lit && !lit_quoted) - recordregion(expdest - stackblock() - - (quotes ? 2 : 1), - expdest - stackblock(), 0); break; case CTLVAR: - p = evalvar(p, flag); + p = evalvar(p, flag, dst); break; case CTLBACKQ: case CTLBACKQ|CTLQUOTE: - expbackq(argbackq->n, c & CTLQUOTE, flag); + expbackq(argbackq->n, c & CTLQUOTE, flag, dst); argbackq = argbackq->next; break; case CTLARI: - p = expari(p); + p = expari(p, flag, dst); break; case ':': case '=': @@ -285,10 +324,12 @@ argstr(char *p, int flag) * sort of a hack - expand tildes in variable * assignments (after the first '=' and after ':'s). */ + if (split_lit && !lit_quoted && + strchr(ifsset() ? ifsval() : " \t\n", c) != NULL) { + NEXTWORD(c, flag, expdest, dst); + break; + } USTPUTC(c, expdest); - if (split_lit && !lit_quoted) - recordregion(expdest - stackblock() - 1, - expdest - stackblock(), 0); if (flag & EXP_VARTILDE && *p == '~' && (c != '=' || firsteq)) { if (c == '=') @@ -297,10 +338,12 @@ argstr(char *p, int flag) } break; default: + if (split_lit && !lit_quoted && + strchr(ifsset() ? ifsval() : " \t\n", c) != NULL) { + NEXTWORD(c, flag, expdest, dst); + break; + } USTPUTC(c, expdest); - if (split_lit && !lit_quoted) - recordregion(expdest - stackblock() - 1, - expdest - stackblock(), 0); } } } @@ -344,7 +387,7 @@ exptilde(char *p, int flag) *p = c; if (home == NULL || *home == '\0') return (startp); - strtodest(home, flag, VSNORMAL, 1); + strtodest(home, flag, VSNORMAL, 1, NULL); return (p); } p++; @@ -352,51 +395,11 @@ exptilde(char *p, int flag) } -static void -removerecordregions(int endoff) -{ - if (ifslastp == NULL) - return; - - if (ifsfirst.endoff > endoff) { - while (ifsfirst.next != NULL) { - struct ifsregion *ifsp; - INTOFF; - ifsp = ifsfirst.next->next; - ckfree(ifsfirst.next); - ifsfirst.next = ifsp; - INTON; - } - if (ifsfirst.begoff > endoff) - ifslastp = NULL; - else { - ifslastp = &ifsfirst; - ifsfirst.endoff = endoff; - } - return; - } - - ifslastp = &ifsfirst; - while (ifslastp->next && ifslastp->next->begoff < endoff) - ifslastp=ifslastp->next; - while (ifslastp->next != NULL) { - struct ifsregion *ifsp; - INTOFF; - ifsp = ifslastp->next->next; - ckfree(ifslastp->next); - ifslastp->next = ifsp; - INTON; - } - if (ifslastp->endoff > endoff) - ifslastp->endoff = endoff; -} - /* * Expand arithmetic expression. - * Note that flag is not required as digits never require CTLESC characters. */ static char * -expari(char *p) +expari(char *p, int flag, struct worddest *dst) { char *q, *start; arith_t result; @@ -406,8 +409,7 @@ expari(char *p) quoted = *p++ == '"'; begoff = expdest - stackblock(); - p = argstr(p, 0); - removerecordregions(begoff); + p = argstr(p, 0, NULL); STPUTC('\0', expdest); start = stackblock() + begoff; @@ -424,7 +426,7 @@ expari(char *p) adj = strlen(expdest); STADJUST(adj, expdest); if (!quoted) - recordregion(begoff, expdest - stackblock(), 0); + reprocess(expdest - adj - stackblock(), flag, VSNORMAL, 0, dst); return p; } @@ -433,35 +435,34 @@ expari(char *p) * Perform command substitution. */ static void -expbackq(union node *cmd, int quoted, int flag) +expbackq(union node *cmd, int quoted, int flag, struct worddest *dst) { struct backcmd in; int i; char buf[128]; char *p; char *dest = expdest; - struct ifsregion saveifs, *savelastp; struct nodelist *saveargbackq; char lastc; - int startloc = dest - stackblock(); char const *syntax = quoted? DQSYNTAX : BASESYNTAX; - int quotes = flag & (EXP_FULL | EXP_CASE); + int quotes = flag & (EXP_GLOB | EXP_CASE); size_t nnl; + const char *ifs; INTOFF; - saveifs = ifsfirst; - savelastp = ifslastp; saveargbackq = argbackq; p = grabstackstr(dest); evalbackcmd(cmd, &in); ungrabstackstr(p, dest); - ifsfirst = saveifs; - ifslastp = savelastp; argbackq = saveargbackq; p = in.buf; lastc = '\0'; nnl = 0; + if (!quoted && flag & EXP_SPLIT) + ifs = ifsset() ? ifsval() : " \t\n"; + else + ifs = ""; /* Don't copy trailing newlines */ for (;;) { if (--in.nleft < 0) { @@ -475,15 +476,27 @@ expbackq(union node *cmd, int quoted, in in.nleft = i - 1; } lastc = *p++; - if (lastc != '\0') { - if (lastc == '\n') { - nnl++; - } else { - CHECKSTRSPACE(nnl + 2, dest); - while (nnl > 0) { - nnl--; - USTPUTC('\n', dest); + if (lastc == '\0') + continue; + if (lastc == '\n') { + nnl++; + } else { + if (nnl > 0) { + if (strchr(ifs, '\n') != NULL) { + NEXTWORD('\n', flag, dest, dst); + nnl = 0; + } else { + CHECKSTRSPACE(nnl + 2, dest); + while (nnl > 0) { + nnl--; + USTPUTC('\n', dest); + } } + } + if (strchr(ifs, lastc) != NULL) + NEXTWORD(lastc, flag, dest, dst); + else { + CHECKSTRSPACE(2, dest); if (quotes && syntax[(int)lastc] == CCTL) USTPUTC(CTLESC, dest); USTPUTC(lastc, dest); @@ -497,8 +510,6 @@ expbackq(union node *cmd, int quoted, in ckfree(in.buf); if (in.jp) exitstatus = waitforjob(in.jp, (int *)NULL); - if (quoted == 0) - recordregion(startloc, dest - stackblock(), 0); TRACE(("expbackq: size=%td: \"%.*s\"\n", ((dest - stackblock()) - startloc), (int)((dest - stackblock()) - startloc), @@ -520,113 +531,112 @@ recordleft(const char *str, const char * *startp++ = *loc++; } -static int -subevalvar(char *p, char *str, int strloc, int subtype, int startloc, - int varflags, int quotes) +static void +subevalvar_trim(char *p, int strloc, int subtype, int startloc) { char *startp; char *loc = NULL; - char *q; + char *str; int c = 0; struct nodelist *saveargbackq = argbackq; int amount; - argstr(p, (subtype == VSTRIMLEFT || subtype == VSTRIMLEFTMAX || - subtype == VSTRIMRIGHT || subtype == VSTRIMRIGHTMAX ? - EXP_CASE : 0) | EXP_TILDE); + argstr(p, EXP_CASE | EXP_TILDE, NULL); STACKSTRNUL(expdest); argbackq = saveargbackq; startp = stackblock() + startloc; - if (str == NULL) - str = stackblock() + strloc; + str = stackblock() + strloc; switch (subtype) { - case VSASSIGN: - setvar(str, startp, 0); - amount = startp - expdest; - STADJUST(amount, expdest); - varflags &= ~VSNUL; - return 1; - - case VSQUESTION: - if (*p != CTLENDVAR) { - outfmt(out2, "%s\n", startp); - error((char *)NULL); - } - error("%.*s: parameter %snot set", (int)(p - str - 1), - str, (varflags & VSNUL) ? "null or " : ""); - return 0; - case VSTRIMLEFT: for (loc = startp; loc < str; loc++) { c = *loc; *loc = '\0'; - if (patmatch(str, startp, quotes)) { + if (patmatch(str, startp)) { *loc = c; recordleft(str, loc, startp); - return 1; + return; } *loc = c; - if (quotes && *loc == CTLESC) - loc++; } - return 0; + break; case VSTRIMLEFTMAX: for (loc = str - 1; loc >= startp;) { c = *loc; *loc = '\0'; - if (patmatch(str, startp, quotes)) { + if (patmatch(str, startp)) { *loc = c; recordleft(str, loc, startp); - return 1; + return; } *loc = c; loc--; - if (quotes && loc > startp && *(loc - 1) == CTLESC) { - for (q = startp; q < loc; q++) - if (*q == CTLESC) - q++; - if (q > loc) - loc--; - } } - return 0; + break; case VSTRIMRIGHT: for (loc = str - 1; loc >= startp;) { - if (patmatch(str, loc, quotes)) { + if (patmatch(str, loc)) { amount = loc - expdest; STADJUST(amount, expdest); - return 1; + return; } loc--; - if (quotes && loc > startp && *(loc - 1) == CTLESC) { - for (q = startp; q < loc; q++) - if (*q == CTLESC) - q++; - if (q > loc) - loc--; - } } - return 0; + break; case VSTRIMRIGHTMAX: for (loc = startp; loc < str - 1; loc++) { - if (patmatch(str, loc, quotes)) { + if (patmatch(str, loc)) { amount = loc - expdest; STADJUST(amount, expdest); - return 1; + return; } - if (quotes && *loc == CTLESC) - loc++; } - return 0; + break; default: abort(); } + amount = (expdest - stackblock() - strloc) + 1; + STADJUST(-amount, expdest); +} + + +static int +subevalvar_misc(char *p, const char *var, int subtype, int startloc, + int varflags) +{ + char *startp; + struct nodelist *saveargbackq = argbackq; + int amount; + + argstr(p, EXP_TILDE, NULL); + STACKSTRNUL(expdest); + argbackq = saveargbackq; + startp = stackblock() + startloc; + + switch (subtype) { + case VSASSIGN: + setvar(var, startp, 0); + amount = startp - expdest; + STADJUST(amount, expdest); + return 1; + + case VSQUESTION: + if (*p != CTLENDVAR) { + outfmt(out2, "%s\n", startp); + error((char *)NULL); + } + error("%.*s: parameter %snot set", (int)(p - var - 1), + var, (varflags & VSNUL) ? "null or " : ""); + return 0; + + default: + abort(); + } } @@ -636,7 +646,7 @@ subevalvar(char *p, char *str, int strlo */ static char * -evalvar(char *p, int flag) +evalvar(char *p, int flag, struct worddest *dst) { int subtype; int varflags; @@ -649,9 +659,7 @@ evalvar(char *p, int flag) int startloc; int varlen; int varlenb; - int easy; - int quotes = flag & (EXP_FULL | EXP_CASE); - int record = 0; + char buf[21]; varflags = (unsigned char)*p++; subtype = varflags & VSTYPE; @@ -693,10 +701,16 @@ again: /* jump here after setting a vari if (set && subtype != VSPLUS) { /* insert the value of the variable */ if (special) { - if (varflags & VSLINENO) - STPUTBIN(var, p - var - 1, expdest); - else - varvalue(var, varflags & VSQUOTE, subtype, flag); + if (varflags & VSLINENO) { + if (p - var > (ptrdiff_t)sizeof(buf)) + abort(); + memcpy(buf, var, p - var - 1); + buf[p - var - 1] = '\0'; + strtodest(buf, flag, subtype, + varflags & VSQUOTE, dst); + } else + varvalue(var, varflags & VSQUOTE, subtype, flag, + dst); if (subtype == VSLENGTH) { varlenb = expdest - stackblock() - startloc; varlen = varlenb; @@ -717,35 +731,29 @@ again: /* jump here after setting a vari } else strtodest(val, flag, subtype, - varflags & VSQUOTE); + varflags & VSQUOTE, dst); } } if (subtype == VSPLUS) set = ! set; - easy = ((varflags & VSQUOTE) == 0 || - (*var == '@' && shellparam.nparam != 1)); - - switch (subtype) { case VSLENGTH: - expdest = cvtnum(varlen, expdest); - record = 1; + cvtnum(varlen, buf); + strtodest(buf, flag, VSNORMAL, varflags & VSQUOTE, dst); break; case VSNORMAL: - record = easy; break; case VSPLUS: case VSMINUS: if (!set) { - argstr(p, flag | (flag & EXP_FULL ? EXP_SPLIT_LIT : 0) | - (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0)); + argstr(p, flag | (flag & EXP_SPLIT ? EXP_SPLIT_LIT : 0) | + (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0), dst); break; } - record = easy; break; case VSTRIMLEFT: @@ -760,32 +768,22 @@ again: /* jump here after setting a vari */ STPUTC('\0', expdest); patloc = expdest - stackblock(); - if (subevalvar(p, NULL, patloc, subtype, - startloc, varflags, quotes) == 0) { - int amount = (expdest - stackblock() - patloc) + 1; - STADJUST(-amount, expdest); - } - /* Remove any recorded regions beyond start of variable */ - removerecordregions(startloc); - record = 1; + subevalvar_trim(p, patloc, subtype, startloc); + reprocess(startloc, flag, VSNORMAL, varflags & VSQUOTE, dst); + if (flag & EXP_SPLIT && *var == '@' && varflags & VSQUOTE) + dst->state = WORD_QUOTEMARK; break; case VSASSIGN: case VSQUESTION: if (!set) { - if (subevalvar(p, var, 0, subtype, startloc, varflags, - quotes)) { + if (subevalvar_misc(p, var, subtype, startloc, + varflags)) { varflags &= ~VSNUL; - /* - * Remove any recorded regions beyond - * start of variable - */ - removerecordregions(startloc); goto again; } break; } - record = easy; break; case VSERROR: @@ -797,11 +795,6 @@ again: /* jump here after setting a vari abort(); } - if (record) - recordregion(startloc, expdest - stackblock(), - varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' && - (*var == '@' || *var == '*'))); - if (subtype != VSNORMAL) { /* skip to end of alternative */ int nesting = 1; for (;;) { @@ -867,26 +860,80 @@ varisset(const char *name, int nulok) } static void -strtodest(const char *p, int flag, int subtype, int quoted) +strtodest(const char *p, int flag, int subtype, int quoted, + struct worddest *dst) { - if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH) + if (subtype == VSLENGTH || subtype == VSTRIMLEFT || + subtype == VSTRIMLEFTMAX || subtype == VSTRIMRIGHT || + subtype == VSTRIMRIGHTMAX) + STPUTS(p, expdest); + else if (flag & EXP_SPLIT && !quoted && dst != NULL) + STPUTS_SPLIT(p, BASESYNTAX, flag, expdest, dst); + else if (flag & (EXP_GLOB | EXP_CASE)) STPUTS_QUOTES(p, quoted ? DQSYNTAX : BASESYNTAX, expdest); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Fri Jan 1 00:12:12 2016 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 87501A5791B for ; Fri, 1 Jan 2016 00:12:12 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5E8451F8F; Fri, 1 Jan 2016 00:12:12 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u010CBgY006215; Fri, 1 Jan 2016 00:12:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u010CBic006210; Fri, 1 Jan 2016 00:12:11 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201601010012.u010CBic006210@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 1 Jan 2016 00:12:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r293019 - in user/ngie/more-tests2: etc/mtree sbin/geom/class/tests sbin/geom/tests tests/sys tests/sys/geom tests/sys/geom/class tests/sys/geom/class/concat tests/sys/geom/class/eli te... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jan 2016 00:12:12 -0000 Author: ngie Date: Fri Jan 1 00:12:10 2016 New Revision: 293019 URL: https://svnweb.freebsd.org/changeset/base/293019 Log: Move sbin/geom/class/tests to tests/sys/geom/class and remove sbin/geom/tests This is inspired by parallel efforts being done on projects/zfsd (and makes more sense because these are functional tests of the subsystems, not the geom(8) commands Added: user/ngie/more-tests2/tests/sys/geom/ user/ngie/more-tests2/tests/sys/geom/class/ user/ngie/more-tests2/tests/sys/geom/class/Makefile - copied, changed from r293018, user/ngie/more-tests2/sbin/geom/class/tests/Makefile user/ngie/more-tests2/tests/sys/geom/class/Makefile.inc - copied, changed from r293018, user/ngie/more-tests2/sbin/geom/class/tests/Makefile.inc user/ngie/more-tests2/tests/sys/geom/class/concat/ - copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/concat/ user/ngie/more-tests2/tests/sys/geom/class/eli/ - copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/eli/ user/ngie/more-tests2/tests/sys/geom/class/gate/ - copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/gate/ user/ngie/more-tests2/tests/sys/geom/class/geom_subr.sh - copied unchanged from r293018, user/ngie/more-tests2/sbin/geom/class/tests/geom_subr.sh user/ngie/more-tests2/tests/sys/geom/class/gpt/ - copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/gpt/ user/ngie/more-tests2/tests/sys/geom/class/mirror/ - copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/mirror/ user/ngie/more-tests2/tests/sys/geom/class/nop/ - copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/nop/ user/ngie/more-tests2/tests/sys/geom/class/raid3/ - copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/raid3/ user/ngie/more-tests2/tests/sys/geom/class/shsec/ - copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/shsec/ user/ngie/more-tests2/tests/sys/geom/class/stripe/ - copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/stripe/ user/ngie/more-tests2/tests/sys/geom/class/uzip/ - copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/uzip/ Deleted: user/ngie/more-tests2/sbin/geom/class/tests/ user/ngie/more-tests2/sbin/geom/tests/ Modified: user/ngie/more-tests2/etc/mtree/BSD.tests.dist user/ngie/more-tests2/tests/sys/Makefile Modified: user/ngie/more-tests2/etc/mtree/BSD.tests.dist ============================================================================== --- user/ngie/more-tests2/etc/mtree/BSD.tests.dist Fri Jan 1 00:11:29 2016 (r293018) +++ user/ngie/more-tests2/etc/mtree/BSD.tests.dist Fri Jan 1 00:12:10 2016 (r293019) @@ -341,30 +341,6 @@ devd .. geom - class - concat - .. - eli - .. - gate - .. - gpt - .. - mirror - .. - nop - .. - raid3 - .. - shsec - .. - stripe - .. - uzip - etalon - .. - .. - .. core ConfCmp .. @@ -412,6 +388,32 @@ .. file .. + geom + class + concat + .. + eli + .. + gate + .. + gpt + .. + mirror + .. + nop + .. + raid3 + .. + shsec + .. + stripe + .. + uzip + etalon + .. + .. + .. + .. kern acct .. Modified: user/ngie/more-tests2/tests/sys/Makefile ============================================================================== --- user/ngie/more-tests2/tests/sys/Makefile Fri Jan 1 00:11:29 2016 (r293018) +++ user/ngie/more-tests2/tests/sys/Makefile Fri Jan 1 00:12:10 2016 (r293019) @@ -8,6 +8,7 @@ TESTS_SUBDIRS+= acl TESTS_SUBDIRS+= aio TESTS_SUBDIRS+= fifo TESTS_SUBDIRS+= file +TESTS_SUBDIRS+= geom TESTS_SUBDIRS+= kern TESTS_SUBDIRS+= kqueue TESTS_SUBDIRS+= mac Copied and modified: user/ngie/more-tests2/tests/sys/geom/class/Makefile (from r293018, user/ngie/more-tests2/sbin/geom/class/tests/Makefile) ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/Makefile Fri Jan 1 00:11:29 2016 (r293018, copy source) +++ user/ngie/more-tests2/tests/sys/geom/class/Makefile Fri Jan 1 00:12:10 2016 (r293019) @@ -1,5 +1,7 @@ # $FreeBSD$ +TESTSDIR= ${TESTSBASE}/sys/geom/class + TESTS_SUBDIRS+= concat TESTS_SUBDIRS+= eli TESTS_SUBDIRS+= gate @@ -12,7 +14,7 @@ TESTS_SUBDIRS+= shsec TESTS_SUBDIRS+= stripe TESTS_SUBDIRS+= uzip -BINDIR= ${TESTSBASE}/sbin/geom/class +BINDIR= ${TESTSDIR} FILES+= geom_subr.sh Copied and modified: user/ngie/more-tests2/tests/sys/geom/class/Makefile.inc (from r293018, user/ngie/more-tests2/sbin/geom/class/tests/Makefile.inc) ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/Makefile.inc Fri Jan 1 00:11:29 2016 (r293018, copy source) +++ user/ngie/more-tests2/tests/sys/geom/class/Makefile.inc Fri Jan 1 00:12:10 2016 (r293019) @@ -1,3 +1,5 @@ +# $FreeBSD$ + GEOM_CLASS= ${.CURDIR:T} -TESTSDIR= ${TESTSBASE}/sbin/geom/class/${GEOM_CLASS} +TESTSDIR= ${TESTSBASE}/sys/geom/class/${GEOM_CLASS} Copied: user/ngie/more-tests2/tests/sys/geom/class/geom_subr.sh (from r293018, user/ngie/more-tests2/sbin/geom/class/tests/geom_subr.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/tests/sys/geom/class/geom_subr.sh Fri Jan 1 00:12:10 2016 (r293019, copy of r293018, user/ngie/more-tests2/sbin/geom/class/tests/geom_subr.sh) @@ -0,0 +1,48 @@ +#!/bin/sh +# $FreeBSD$ + +if [ $(id -u) -ne 0 ]; then + echo 'Tests must be run as root' + echo 'Bail out!' + exit 1 +fi +kldstat -q -m g_${class} || g${class} load || exit 1 + +devwait() +{ + while :; do + if [ -c /dev/${class}/${name} ]; then + return + fi + sleep 0.2 + done +} + +# Need to keep track of the test md devices to avoid the scenario where a test +# failing will cause the other tests to bomb out, or a test failing will leave +# a large number of md(4) devices lingering around +: ${TMPDIR=/tmp} +export TMPDIR +TEST_MDS_FILE=${TMPDIR}/test_mds + +attach_md() +{ + local test_md + + test_md=$(mdconfig -a "$@") || exit + echo $test_md >> $TEST_MDS_FILE || exit + echo $test_md +} + +geom_test_cleanup() +{ + local test_md + + if [ -f $TEST_MDS_FILE ]; then + while read test_md; do + # The "#" tells the TAP parser this is a comment + echo "# Removing test memory disk: $test_md" + mdconfig -d -u $test_md + done < $TEST_MDS_FILE + fi +} From owner-svn-src-user@freebsd.org Fri Jan 1 00:13:06 2016 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F645A5797A for ; Fri, 1 Jan 2016 00:13:06 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1078B10FB; Fri, 1 Jan 2016 00:13:05 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u010D5Wa006287; Fri, 1 Jan 2016 00:13:05 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u010D56o006286; Fri, 1 Jan 2016 00:13:05 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201601010013.u010D56o006286@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 1 Jan 2016 00:13:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r293020 - user/ngie/more-tests2/tests/sys/geom X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jan 2016 00:13:06 -0000 Author: ngie Date: Fri Jan 1 00:13:04 2016 New Revision: 293020 URL: https://svnweb.freebsd.org/changeset/base/293020 Log: Add missing Makefile Added: user/ngie/more-tests2/tests/sys/geom/Makefile (contents, props changed) Added: user/ngie/more-tests2/tests/sys/geom/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/tests/sys/geom/Makefile Fri Jan 1 00:13:04 2016 (r293020) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/sys/geom + +TESTS_SUBDIRS+= class + +.include From owner-svn-src-user@freebsd.org Fri Jan 1 00:16:56 2016 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 12E37A57A3D for ; Fri, 1 Jan 2016 00:16:56 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CE5C6124E; Fri, 1 Jan 2016 00:16:55 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u010GsMj006442; Fri, 1 Jan 2016 00:16:54 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u010GsRg006441; Fri, 1 Jan 2016 00:16:54 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201601010016.u010GsRg006441@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 1 Jan 2016 00:16:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r293021 - user/ngie/more-tests2/tests/sys/geom/class/uzip X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jan 2016 00:16:56 -0000 Author: ngie Date: Fri Jan 1 00:16:54 2016 New Revision: 293021 URL: https://svnweb.freebsd.org/changeset/base/293021 Log: Only try to unmount/remove mountpt if it's defined Modified: user/ngie/more-tests2/tests/sys/geom/class/uzip/conf.sh Modified: user/ngie/more-tests2/tests/sys/geom/class/uzip/conf.sh ============================================================================== --- user/ngie/more-tests2/tests/sys/geom/class/uzip/conf.sh Fri Jan 1 00:13:04 2016 (r293020) +++ user/ngie/more-tests2/tests/sys/geom/class/uzip/conf.sh Fri Jan 1 00:16:54 2016 (r293021) @@ -6,8 +6,10 @@ base=`basename $0` uzip_test_cleanup() { - umount $mntpoint - rmdir $mntpoint + if [ -n "$mntpoint" ]; then + umount $mntpoint + rmdir $mntpoint + fi geom_test_cleanup } trap uzip_test_cleanup ABRT EXIT INT TERM From owner-svn-src-user@freebsd.org Fri Jan 1 01:04:55 2016 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3ECB6A587B2 for ; Fri, 1 Jan 2016 01:04:55 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 01DD21C25; Fri, 1 Jan 2016 01:04:54 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0114sB6020953; Fri, 1 Jan 2016 01:04:54 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0114s1F020952; Fri, 1 Jan 2016 01:04:54 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201601010104.u0114s1F020952@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 1 Jan 2016 01:04:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r293027 - user/ngie/more-tests2/tests/sys/geom/class X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jan 2016 01:04:55 -0000 Author: ngie Date: Fri Jan 1 01:04:53 2016 New Revision: 293027 URL: https://svnweb.freebsd.org/changeset/base/293027 Log: Use `geom load` instead of `g load` (`g` doesn't exist for geom_uzip(4)..) Modified: user/ngie/more-tests2/tests/sys/geom/class/geom_subr.sh Modified: user/ngie/more-tests2/tests/sys/geom/class/geom_subr.sh ============================================================================== --- user/ngie/more-tests2/tests/sys/geom/class/geom_subr.sh Fri Jan 1 00:38:17 2016 (r293026) +++ user/ngie/more-tests2/tests/sys/geom/class/geom_subr.sh Fri Jan 1 01:04:53 2016 (r293027) @@ -6,7 +6,7 @@ if [ $(id -u) -ne 0 ]; then echo 'Bail out!' exit 1 fi -kldstat -q -m g_${class} || g${class} load || exit 1 +kldstat -q -m g_${class} || geom ${class} load || exit 1 devwait() { From owner-svn-src-user@freebsd.org Fri Jan 1 02:52:30 2016 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A00F0A5735C for ; Fri, 1 Jan 2016 02:52:30 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E373189B; Fri, 1 Jan 2016 02:52:30 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u012qTaX052810; Fri, 1 Jan 2016 02:52:29 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u012qTbD052809; Fri, 1 Jan 2016 02:52:29 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201601010252.u012qTbD052809@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 1 Jan 2016 02:52:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r293031 - user/ngie/more-tests2/tests/sys/geom/class/raid3 X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jan 2016 02:52:30 -0000 Author: ngie Date: Fri Jan 1 02:52:29 2016 New Revision: 293031 URL: https://svnweb.freebsd.org/changeset/base/293031 Log: Use a more unique name for the graid device Modified: user/ngie/more-tests2/tests/sys/geom/class/raid3/conf.sh Modified: user/ngie/more-tests2/tests/sys/geom/class/raid3/conf.sh ============================================================================== --- user/ngie/more-tests2/tests/sys/geom/class/raid3/conf.sh Fri Jan 1 02:47:40 2016 (r293030) +++ user/ngie/more-tests2/tests/sys/geom/class/raid3/conf.sh Fri Jan 1 02:52:29 2016 (r293031) @@ -1,7 +1,7 @@ #!/bin/sh # $FreeBSD$ -name="test" +name="$(mktemp -u graid3.XXXXXX)" class="raid3" base=`basename $0`