From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 00:13:31 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id EB601F35; Sun, 13 Oct 2013 00:13:31 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D5B8F27E0; Sun, 13 Oct 2013 00:13:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9D0DVL9060658; Sun, 13 Oct 2013 00:13:31 GMT (envelope-from benno@svn.freebsd.org) Received: (from benno@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9D0DUFt060648; Sun, 13 Oct 2013 00:13:30 GMT (envelope-from benno@svn.freebsd.org) Message-Id: <201310130013.r9D0DUFt060648@svn.freebsd.org> From: Benno Rice Date: Sun, 13 Oct 2013 00:13:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256413 - in projects/uefi: . bin bin/dd bin/freebsd-version bin/pkill cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/zfs cddl/lib/libdtrace contrib/binutils/bfd contr... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 00:13:32 -0000 Author: benno Date: Sun Oct 13 00:13:29 2013 New Revision: 256413 URL: http://svnweb.freebsd.org/changeset/base/256413 Log: MFH @ r256411 Added: projects/uefi/bin/freebsd-version/ - copied from r256411, head/bin/freebsd-version/ projects/uefi/share/man/man9/VOP_ADVISE.9 - copied unchanged from r256411, head/share/man/man9/VOP_ADVISE.9 projects/uefi/share/man/man9/VOP_ALLOCATE.9 - copied unchanged from r256411, head/share/man/man9/VOP_ALLOCATE.9 projects/uefi/sys/dev/random/dummy_rng.c - copied unchanged from r256411, head/sys/dev/random/dummy_rng.c projects/uefi/sys/dev/random/live_entropy_sources.c - copied unchanged from r256411, head/sys/dev/random/live_entropy_sources.c projects/uefi/sys/dev/random/live_entropy_sources.h - copied unchanged from r256411, head/sys/dev/random/live_entropy_sources.h projects/uefi/sys/dev/random/rwfile.c - copied unchanged from r256411, head/sys/dev/random/rwfile.c projects/uefi/sys/dev/random/rwfile.h - copied unchanged from r256411, head/sys/dev/random/rwfile.h projects/uefi/tools/regression/lib/libutil/test-humanize_number.c - copied unchanged from r256411, head/tools/regression/lib/libutil/test-humanize_number.c projects/uefi/tools/regression/lib/libutil/test-humanize_number.t - copied unchanged from r256411, head/tools/regression/lib/libutil/test-humanize_number.t projects/uefi/usr.sbin/bhyve/ahci.h - copied unchanged from r256411, head/usr.sbin/bhyve/ahci.h projects/uefi/usr.sbin/bhyve/block_if.c - copied unchanged from r256411, head/usr.sbin/bhyve/block_if.c projects/uefi/usr.sbin/bhyve/block_if.h - copied unchanged from r256411, head/usr.sbin/bhyve/block_if.h projects/uefi/usr.sbin/bhyve/pci_ahci.c - copied unchanged from r256411, head/usr.sbin/bhyve/pci_ahci.c projects/uefi/usr.sbin/bsdconfig/share/keymap.subr - copied unchanged from r256411, head/usr.sbin/bsdconfig/share/keymap.subr projects/uefi/usr.sbin/bsdinstall/scripts/entropy - copied unchanged from r256411, head/usr.sbin/bsdinstall/scripts/entropy projects/uefi/usr.sbin/bsdinstall/scripts/zfsboot - copied unchanged from r256411, head/usr.sbin/bsdinstall/scripts/zfsboot Deleted: projects/uefi/etc/atf/ projects/uefi/gnu/usr.bin/binutils/ar/Makefile projects/uefi/gnu/usr.bin/binutils/ar/ar.1 projects/uefi/gnu/usr.bin/binutils/ranlib/Makefile projects/uefi/gnu/usr.bin/binutils/ranlib/ranlib.1 projects/uefi/share/atf/ projects/uefi/share/examples/atf/ projects/uefi/share/xml/ projects/uefi/share/xsl/ projects/uefi/sys/dev/random/pseudo_rng.c projects/uefi/sys/kern/uipc_cow.c projects/uefi/usr.bin/atf/atf-config/ projects/uefi/usr.bin/atf/atf-report/ projects/uefi/usr.bin/atf/atf-run/ projects/uefi/usr.bin/atf/atf-version/ projects/uefi/usr.bin/dig/ Modified: projects/uefi/Makefile.inc1 projects/uefi/ObsoleteFiles.inc projects/uefi/UPDATING projects/uefi/bin/Makefile projects/uefi/bin/dd/dd.1 projects/uefi/bin/pkill/pkill.c projects/uefi/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/uefi/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/uefi/cddl/lib/libdtrace/tcp.d projects/uefi/contrib/binutils/bfd/elfxx-mips.c projects/uefi/contrib/binutils/opcodes/i386-dis.c projects/uefi/contrib/binutils/opcodes/i386-opc.h projects/uefi/contrib/binutils/opcodes/i386-opc.tbl projects/uefi/contrib/binutils/opcodes/i386-tbl.h projects/uefi/contrib/libc++/include/memory projects/uefi/contrib/llvm/include/llvm/IR/CallingConv.h projects/uefi/contrib/llvm/lib/AsmParser/LLLexer.cpp projects/uefi/contrib/llvm/lib/AsmParser/LLParser.cpp projects/uefi/contrib/llvm/lib/AsmParser/LLToken.h projects/uefi/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp projects/uefi/contrib/llvm/lib/IR/AsmWriter.cpp projects/uefi/contrib/llvm/lib/Target/X86/X86CallingConv.td projects/uefi/contrib/llvm/lib/Target/X86/X86FastISel.cpp projects/uefi/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp projects/uefi/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/uefi/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp projects/uefi/contrib/llvm/lib/Target/X86/X86Subtarget.h projects/uefi/contrib/llvm/tools/clang/include/clang-c/Index.h projects/uefi/contrib/llvm/tools/clang/include/clang/AST/Type.h projects/uefi/contrib/llvm/tools/clang/include/clang/Basic/Attr.td projects/uefi/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h projects/uefi/contrib/llvm/tools/clang/lib/AST/DumpXML.cpp projects/uefi/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp projects/uefi/contrib/llvm/tools/clang/lib/AST/Type.cpp projects/uefi/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp projects/uefi/contrib/llvm/tools/clang/lib/Basic/Targets.cpp projects/uefi/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp projects/uefi/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp projects/uefi/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp projects/uefi/etc/Makefile projects/uefi/etc/defaults/periodic.conf projects/uefi/etc/defaults/rc.conf projects/uefi/etc/ftpusers projects/uefi/etc/group projects/uefi/etc/master.passwd projects/uefi/etc/mtree/BSD.root.dist projects/uefi/etc/mtree/BSD.usr.dist projects/uefi/etc/mtree/Makefile projects/uefi/etc/network.subr projects/uefi/etc/periodic/daily/Makefile projects/uefi/etc/rc.d/Makefile projects/uefi/etc/rc.d/initrandom projects/uefi/etc/rc.d/jail projects/uefi/etc/rc.d/netif projects/uefi/etc/rc.d/sshd projects/uefi/etc/rc.subr projects/uefi/games/fortune/datfiles/freebsd-tips projects/uefi/gnu/usr.bin/binutils/Makefile projects/uefi/gnu/usr.bin/cc/cc_tools/freebsd-native.h projects/uefi/gnu/usr.bin/groff/tmac/mdoc.local projects/uefi/lib/clang/clang.build.mk projects/uefi/lib/libc/sys/accept.2 projects/uefi/lib/libcrypt/tests/crypt_tests.c projects/uefi/lib/libprocstat/libprocstat.c projects/uefi/lib/libstand/tftp.c projects/uefi/lib/libutil/humanize_number.3 projects/uefi/lib/libutil/humanize_number.c projects/uefi/lib/libvmmapi/vmmapi.c projects/uefi/lib/libvmmapi/vmmapi.h projects/uefi/libexec/rtld-elf/rtld.c projects/uefi/libexec/rtld-elf/rtld.h projects/uefi/release/release.sh projects/uefi/sbin/bsdlabel/bsdlabel.8 projects/uefi/sbin/camcontrol/camcontrol.c projects/uefi/sbin/camcontrol/fwdownload.c projects/uefi/sbin/camcontrol/modeedit.c projects/uefi/sbin/ccdconfig/ccdconfig.8 projects/uefi/sbin/fdisk/fdisk.8 projects/uefi/sbin/gbde/gbde.8 projects/uefi/sbin/geom/class/eli/geli.8 projects/uefi/sbin/geom/class/shsec/gshsec.8 projects/uefi/sbin/geom/class/virstor/gvirstor.8 projects/uefi/sbin/gvinum/gvinum.8 projects/uefi/sbin/iscontrol/iscsi.conf.5 projects/uefi/sbin/mount_msdosfs/mount_msdosfs.8 projects/uefi/sbin/newfs/newfs.8 projects/uefi/sbin/newfs_msdos/newfs_msdos.8 projects/uefi/sbin/newfs_nandfs/newfs_nandfs.8 projects/uefi/sbin/nvmecontrol/perftest.c projects/uefi/sbin/recoverdisk/recoverdisk.1 projects/uefi/sbin/route/route.c projects/uefi/share/Makefile projects/uefi/share/examples/Makefile projects/uefi/share/examples/bhyve/vmrun.sh projects/uefi/share/examples/kld/random_adaptor/random_adaptor_example.c projects/uefi/share/man/man4/altera_avgen.4 projects/uefi/share/man/man4/geom_linux_lvm.4 projects/uefi/share/man/man4/random.4 projects/uefi/share/man/man4/rsu.4 projects/uefi/share/man/man4/urtwn.4 projects/uefi/share/man/man5/Makefile projects/uefi/share/man/man5/ext2fs.5 projects/uefi/share/man/man5/msdosfs.5 projects/uefi/share/man/man5/rc.conf.5 projects/uefi/share/man/man5/reiserfs.5 projects/uefi/share/man/man5/src.conf.5 projects/uefi/share/man/man7/Makefile projects/uefi/share/man/man8/picobsd.8 projects/uefi/share/man/man9/Makefile projects/uefi/share/man/man9/VOP_FSYNC.9 projects/uefi/share/man/man9/firmware.9 projects/uefi/share/man/man9/lock.9 projects/uefi/share/man/man9/vm_page_grab.9 projects/uefi/share/man/man9/vnode.9 projects/uefi/share/misc/bsd-family-tree projects/uefi/share/misc/committers-src.dot projects/uefi/share/mk/atf.test.mk projects/uefi/share/syscons/keymaps/INDEX.keymaps projects/uefi/sys/amd64/amd64/machdep.c projects/uefi/sys/amd64/amd64/pmap.c projects/uefi/sys/amd64/amd64/trap.c projects/uefi/sys/amd64/conf/GENERIC projects/uefi/sys/amd64/conf/NOTES projects/uefi/sys/amd64/include/pcpu.h projects/uefi/sys/amd64/include/pmap.h projects/uefi/sys/amd64/include/vmm.h (contents, props changed) projects/uefi/sys/amd64/include/vmm_dev.h (contents, props changed) projects/uefi/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/uefi/sys/amd64/vmm/amd/amdv.c projects/uefi/sys/amd64/vmm/intel/ept.c projects/uefi/sys/amd64/vmm/intel/ept.h projects/uefi/sys/amd64/vmm/intel/vmcs.c projects/uefi/sys/amd64/vmm/intel/vmcs.h projects/uefi/sys/amd64/vmm/intel/vmx.c projects/uefi/sys/amd64/vmm/intel/vmx.h projects/uefi/sys/amd64/vmm/intel/vmx_genassym.c projects/uefi/sys/amd64/vmm/intel/vmx_support.S projects/uefi/sys/amd64/vmm/io/ppt.c projects/uefi/sys/amd64/vmm/io/ppt.h projects/uefi/sys/amd64/vmm/vmm.c projects/uefi/sys/amd64/vmm/vmm_dev.c projects/uefi/sys/amd64/vmm/vmm_instruction_emul.c projects/uefi/sys/amd64/vmm/vmm_mem.c projects/uefi/sys/amd64/vmm/vmm_mem.h projects/uefi/sys/arm/s3c2xx0/uart_bus_s3c2410.c projects/uefi/sys/arm/s3c2xx0/uart_cpu_s3c2410.c projects/uefi/sys/arm/samsung/exynos/exynos5_machdep.c projects/uefi/sys/arm/versatile/versatile_pci.c projects/uefi/sys/boot/common/loader.8 projects/uefi/sys/boot/forth/loader.conf projects/uefi/sys/boot/i386/btx/btx/btx.S projects/uefi/sys/cam/cam_xpt.c projects/uefi/sys/cam/ctl/ctl_frontend_iscsi.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/uefi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c projects/uefi/sys/cddl/dev/dtrace/dtrace_load.c projects/uefi/sys/cddl/dev/dtrace/dtrace_unload.c projects/uefi/sys/compat/freebsd32/freebsd32.h projects/uefi/sys/compat/linux/linux_futex.c projects/uefi/sys/compat/linux/linux_uid16.c projects/uefi/sys/conf/NOTES projects/uefi/sys/conf/files projects/uefi/sys/conf/files.amd64 projects/uefi/sys/conf/files.i386 projects/uefi/sys/conf/files.powerpc projects/uefi/sys/conf/newvers.sh projects/uefi/sys/conf/options projects/uefi/sys/conf/options.mips projects/uefi/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c projects/uefi/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c projects/uefi/sys/dev/ata/ata-all.c projects/uefi/sys/dev/ata/ata-card.c projects/uefi/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/uefi/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c projects/uefi/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/uefi/sys/dev/bxe/bxe.c projects/uefi/sys/dev/bxe/bxe_stats.c projects/uefi/sys/dev/bxe/ecore_sp.h projects/uefi/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c projects/uefi/sys/dev/cxgbe/t4_main.c projects/uefi/sys/dev/cxgbe/t4_sge.c projects/uefi/sys/dev/e1000/e1000_80003es2lan.c projects/uefi/sys/dev/e1000/e1000_80003es2lan.h projects/uefi/sys/dev/e1000/e1000_82571.c projects/uefi/sys/dev/e1000/e1000_82575.c projects/uefi/sys/dev/e1000/e1000_82575.h projects/uefi/sys/dev/e1000/e1000_api.c projects/uefi/sys/dev/e1000/e1000_defines.h projects/uefi/sys/dev/e1000/e1000_hw.h projects/uefi/sys/dev/e1000/e1000_i210.c projects/uefi/sys/dev/e1000/e1000_i210.h projects/uefi/sys/dev/e1000/e1000_ich8lan.c projects/uefi/sys/dev/e1000/e1000_ich8lan.h projects/uefi/sys/dev/e1000/e1000_mac.c projects/uefi/sys/dev/e1000/e1000_osdep.h projects/uefi/sys/dev/e1000/e1000_phy.c projects/uefi/sys/dev/e1000/e1000_phy.h projects/uefi/sys/dev/e1000/e1000_regs.h projects/uefi/sys/dev/e1000/e1000_vf.h projects/uefi/sys/dev/e1000/if_igb.c projects/uefi/sys/dev/e1000/if_igb.h projects/uefi/sys/dev/glxsb/glxsb.c projects/uefi/sys/dev/hifn/hifn7751.c projects/uefi/sys/dev/hyperv/include/hyperv.h projects/uefi/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/uefi/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/uefi/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c projects/uefi/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/uefi/sys/dev/hyperv/storvsc/hv_vstorage.h projects/uefi/sys/dev/hyperv/vmbus/hv_channel.c projects/uefi/sys/dev/hyperv/vmbus/hv_hv.c projects/uefi/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c projects/uefi/sys/dev/hyperv/vmbus/hv_vmbus_priv.h projects/uefi/sys/dev/isci/isci.c projects/uefi/sys/dev/isci/isci_io_request.c projects/uefi/sys/dev/isci/isci_sysctl.c projects/uefi/sys/dev/isci/isci_task_request.c projects/uefi/sys/dev/iscsi/icl.c projects/uefi/sys/dev/iscsi/iscsi.c projects/uefi/sys/dev/ixgbe/ixgbe.c projects/uefi/sys/dev/netmap/if_igb_netmap.h projects/uefi/sys/dev/nfe/if_nfe.c projects/uefi/sys/dev/nvd/nvd.c projects/uefi/sys/dev/nvme/nvme.c projects/uefi/sys/dev/nvme/nvme.h projects/uefi/sys/dev/nvme/nvme_ctrlr.c projects/uefi/sys/dev/nvme/nvme_ns.c projects/uefi/sys/dev/nvme/nvme_private.h projects/uefi/sys/dev/nvme/nvme_test.c projects/uefi/sys/dev/random/harvest.c projects/uefi/sys/dev/random/hash.h projects/uefi/sys/dev/random/ivy.c projects/uefi/sys/dev/random/nehemiah.c projects/uefi/sys/dev/random/random_adaptors.c projects/uefi/sys/dev/random/random_adaptors.h projects/uefi/sys/dev/random/random_harvestq.c projects/uefi/sys/dev/random/random_harvestq.h projects/uefi/sys/dev/random/randomdev.c projects/uefi/sys/dev/random/randomdev.h projects/uefi/sys/dev/random/randomdev_soft.c projects/uefi/sys/dev/random/randomdev_soft.h projects/uefi/sys/dev/random/yarrow.c projects/uefi/sys/dev/random/yarrow.h projects/uefi/sys/dev/rndtest/rndtest.c projects/uefi/sys/dev/safe/safe.c projects/uefi/sys/dev/syscons/scmouse.c projects/uefi/sys/dev/syscons/syscons.c projects/uefi/sys/dev/ubsec/ubsec.c projects/uefi/sys/dev/virtio/network/if_vtnet.c projects/uefi/sys/dev/vmware/vmxnet3/if_vmx.c projects/uefi/sys/dev/vmware/vmxnet3/if_vmxvar.h projects/uefi/sys/dev/xen/control/control.c projects/uefi/sys/dev/xen/timer/timer.c projects/uefi/sys/i386/conf/GENERIC projects/uefi/sys/i386/conf/NOTES projects/uefi/sys/i386/ibcs2/ibcs2_sysvec.c projects/uefi/sys/i386/include/pcpu.h projects/uefi/sys/i386/include/xen/xen-os.h projects/uefi/sys/i386/xen/mp_machdep.c projects/uefi/sys/i386/xen/mptable.c projects/uefi/sys/kern/kern_descrip.c projects/uefi/sys/kern/kern_intr.c projects/uefi/sys/kern/kern_malloc.c projects/uefi/sys/kern/kern_mbuf.c projects/uefi/sys/kern/subr_bus.c projects/uefi/sys/kern/uipc_sockbuf.c projects/uefi/sys/kern/vfs_bio.c projects/uefi/sys/kern/vfs_mount.c projects/uefi/sys/kern/vfs_subr.c projects/uefi/sys/mips/atheros/apb.c projects/uefi/sys/mips/atheros/ar71xxreg.h projects/uefi/sys/mips/atheros/ar934xreg.h projects/uefi/sys/mips/cavium/octeon_rnd.c projects/uefi/sys/mips/conf/AR934X_BASE projects/uefi/sys/mips/conf/MALTA projects/uefi/sys/mips/include/asm.h projects/uefi/sys/mips/include/cpuregs.h projects/uefi/sys/mips/mips/bus_space_generic.c projects/uefi/sys/mips/mips/elf_trampoline.c projects/uefi/sys/mips/nlm/dev/sec/nlmrsa.c projects/uefi/sys/mips/nlm/dev/sec/nlmrsalib.h projects/uefi/sys/modules/ibcore/Makefile projects/uefi/sys/modules/random/Makefile projects/uefi/sys/net/if.h projects/uefi/sys/net/if_ethersubr.c projects/uefi/sys/net/if_lagg.c projects/uefi/sys/net/if_tap.c projects/uefi/sys/net/if_tun.c projects/uefi/sys/net80211/ieee80211_freebsd.c projects/uefi/sys/netgraph/ng_iface.c projects/uefi/sys/netinet/in_kdtrace.c projects/uefi/sys/netinet/tcp_input.c projects/uefi/sys/netinet6/in6_ifattach.c projects/uefi/sys/netinet6/ip6_mroute.c projects/uefi/sys/ofed/drivers/infiniband/core/device.c projects/uefi/sys/ofed/drivers/infiniband/core/ucm.c projects/uefi/sys/ofed/drivers/infiniband/core/umem.c projects/uefi/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/uefi/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/uefi/sys/ofed/drivers/net/mlx4/main.c projects/uefi/sys/ofed/include/linux/sysfs.h projects/uefi/sys/ofed/include/rdma/ib_umem.h projects/uefi/sys/ofed/include/rdma/ib_verbs.h projects/uefi/sys/powerpc/include/proc.h projects/uefi/sys/security/mac/mac_framework.c projects/uefi/sys/security/mac/mac_internal.h projects/uefi/sys/security/mac/mac_posix_shm.c projects/uefi/sys/security/mac/mac_vfs.c projects/uefi/sys/sys/elf_common.h projects/uefi/sys/sys/param.h projects/uefi/sys/sys/random.h projects/uefi/sys/sys/sockbuf.h projects/uefi/sys/vm/vm_phys.c projects/uefi/sys/x86/acpica/madt.c projects/uefi/sys/x86/include/stdarg.h projects/uefi/sys/x86/xen/hvm.c projects/uefi/sys/x86/xen/xen_intr.c projects/uefi/tools/build/mk/OptionalObsoleteFiles.inc projects/uefi/tools/build/options/WITHOUT_BINUTILS projects/uefi/tools/build/options/makeman projects/uefi/tools/regression/lib/libutil/Makefile projects/uefi/usr.bin/Makefile projects/uefi/usr.bin/atf/Makefile projects/uefi/usr.bin/atf/Makefile.inc projects/uefi/usr.bin/calendar/calendar.1 projects/uefi/usr.bin/kdump/kdump.c projects/uefi/usr.bin/svn/lib/libapr/apr_private.h projects/uefi/usr.bin/svn/svn_private_config.h projects/uefi/usr.sbin/bhyve/Makefile projects/uefi/usr.sbin/bhyve/bhyverun.c projects/uefi/usr.sbin/bhyve/bhyverun.h projects/uefi/usr.sbin/bhyve/dbgport.h projects/uefi/usr.sbin/bhyve/pci_emul.c projects/uefi/usr.sbin/bhyve/pci_virtio_block.c projects/uefi/usr.sbin/bhyve/pit_8254.c projects/uefi/usr.sbin/bhyve/rtc.c projects/uefi/usr.sbin/bhyvectl/Makefile projects/uefi/usr.sbin/bhyvectl/bhyvectl.c projects/uefi/usr.sbin/bhyveload/Makefile projects/uefi/usr.sbin/bhyveload/bhyveload.8 projects/uefi/usr.sbin/bhyveload/bhyveload.c projects/uefi/usr.sbin/boot0cfg/boot0cfg.8 projects/uefi/usr.sbin/bsdconfig/bsdconfig projects/uefi/usr.sbin/bsdconfig/console/ttys projects/uefi/usr.sbin/bsdconfig/include/messages.subr projects/uefi/usr.sbin/bsdconfig/mouse/enable projects/uefi/usr.sbin/bsdconfig/networking/devices projects/uefi/usr.sbin/bsdconfig/networking/share/device.subr projects/uefi/usr.sbin/bsdconfig/networking/share/hostname.subr projects/uefi/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/uefi/usr.sbin/bsdconfig/networking/share/media.subr projects/uefi/usr.sbin/bsdconfig/networking/share/netmask.subr projects/uefi/usr.sbin/bsdconfig/networking/share/resolv.subr projects/uefi/usr.sbin/bsdconfig/networking/share/routing.subr projects/uefi/usr.sbin/bsdconfig/password/share/password.subr projects/uefi/usr.sbin/bsdconfig/security/kern_securelevel projects/uefi/usr.sbin/bsdconfig/security/security projects/uefi/usr.sbin/bsdconfig/share/Makefile projects/uefi/usr.sbin/bsdconfig/share/common.subr projects/uefi/usr.sbin/bsdconfig/share/device.subr projects/uefi/usr.sbin/bsdconfig/share/dialog.subr projects/uefi/usr.sbin/bsdconfig/share/media/any.subr projects/uefi/usr.sbin/bsdconfig/share/media/cdrom.subr projects/uefi/usr.sbin/bsdconfig/share/media/common.subr projects/uefi/usr.sbin/bsdconfig/share/media/dos.subr projects/uefi/usr.sbin/bsdconfig/share/media/floppy.subr projects/uefi/usr.sbin/bsdconfig/share/media/ftp.subr projects/uefi/usr.sbin/bsdconfig/share/media/http.subr projects/uefi/usr.sbin/bsdconfig/share/media/nfs.subr projects/uefi/usr.sbin/bsdconfig/share/media/options.subr projects/uefi/usr.sbin/bsdconfig/share/media/tcpip.subr projects/uefi/usr.sbin/bsdconfig/share/media/ufs.subr projects/uefi/usr.sbin/bsdconfig/share/media/usb.subr projects/uefi/usr.sbin/bsdconfig/share/mustberoot.subr projects/uefi/usr.sbin/bsdconfig/share/packages/packages.subr projects/uefi/usr.sbin/bsdconfig/share/strings.subr projects/uefi/usr.sbin/bsdconfig/share/variable.subr projects/uefi/usr.sbin/bsdconfig/startup/misc projects/uefi/usr.sbin/bsdconfig/startup/rcconf projects/uefi/usr.sbin/bsdconfig/startup/rcdelete projects/uefi/usr.sbin/bsdconfig/startup/rcvar projects/uefi/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/uefi/usr.sbin/bsdconfig/startup/share/rcedit.subr projects/uefi/usr.sbin/bsdconfig/timezone/timezone projects/uefi/usr.sbin/bsdconfig/usermgmt/groupdel projects/uefi/usr.sbin/bsdconfig/usermgmt/groupedit projects/uefi/usr.sbin/bsdconfig/usermgmt/groupinput projects/uefi/usr.sbin/bsdconfig/usermgmt/share/group_input.subr projects/uefi/usr.sbin/bsdconfig/usermgmt/share/user_input.subr projects/uefi/usr.sbin/bsdconfig/usermgmt/userdel projects/uefi/usr.sbin/bsdconfig/usermgmt/useredit projects/uefi/usr.sbin/bsdconfig/usermgmt/userinput projects/uefi/usr.sbin/bsdconfig/usermgmt/usermgmt projects/uefi/usr.sbin/bsdinstall/bsdinstall projects/uefi/usr.sbin/bsdinstall/bsdinstall.8 projects/uefi/usr.sbin/bsdinstall/scripts/Makefile projects/uefi/usr.sbin/bsdinstall/scripts/auto projects/uefi/usr.sbin/bsdinstall/scripts/config projects/uefi/usr.sbin/bsdinstall/scripts/jail projects/uefi/usr.sbin/bsdinstall/scripts/keymap projects/uefi/usr.sbin/bsdinstall/scripts/netconfig projects/uefi/usr.sbin/bsdinstall/scripts/script projects/uefi/usr.sbin/bsdinstall/scripts/services projects/uefi/usr.sbin/ctladm/ctladm.c projects/uefi/usr.sbin/ctld/kernel.c projects/uefi/usr.sbin/ctld/login.c projects/uefi/usr.sbin/iscsid/discovery.c projects/uefi/usr.sbin/jail/command.c projects/uefi/usr.sbin/jail/config.c projects/uefi/usr.sbin/jail/jail.8 projects/uefi/usr.sbin/jail/jail.c projects/uefi/usr.sbin/jail/jailp.h projects/uefi/usr.sbin/kldxref/kldxref.c projects/uefi/usr.sbin/ntp/config.h projects/uefi/usr.sbin/ntp/libparse/Makefile Directory Properties: projects/uefi/ (props changed) projects/uefi/cddl/ (props changed) projects/uefi/cddl/contrib/opensolaris/ (props changed) projects/uefi/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/uefi/contrib/binutils/ (props changed) projects/uefi/contrib/libc++/ (props changed) projects/uefi/contrib/llvm/ (props changed) projects/uefi/contrib/llvm/tools/clang/ (props changed) projects/uefi/gnu/usr.bin/binutils/ (props changed) projects/uefi/gnu/usr.bin/cc/cc_tools/ (props changed) projects/uefi/lib/libc/ (props changed) projects/uefi/lib/libutil/ (props changed) projects/uefi/lib/libvmmapi/ (props changed) projects/uefi/sbin/ (props changed) projects/uefi/share/man/man4/ (props changed) projects/uefi/sys/ (props changed) projects/uefi/sys/amd64/vmm/ (props changed) projects/uefi/sys/boot/ (props changed) projects/uefi/sys/cddl/contrib/opensolaris/ (props changed) projects/uefi/sys/conf/ (props changed) projects/uefi/sys/contrib/ipfilter/ (props changed) projects/uefi/sys/dev/hyperv/ (props changed) projects/uefi/usr.bin/calendar/ (props changed) projects/uefi/usr.sbin/bhyve/ (props changed) projects/uefi/usr.sbin/bhyvectl/ (props changed) projects/uefi/usr.sbin/bhyveload/ (props changed) projects/uefi/usr.sbin/jail/ (props changed) Modified: projects/uefi/Makefile.inc1 ============================================================================== --- projects/uefi/Makefile.inc1 Sun Oct 13 00:10:48 2013 (r256412) +++ projects/uefi/Makefile.inc1 Sun Oct 13 00:13:29 2013 (r256413) @@ -329,7 +329,7 @@ TARGET_ABI= gnueabi .else TARGET_ABI= unknown .endif -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XFLAGS+= -target ${TARGET_TRIPLE} .endif .endif @@ -1673,7 +1673,7 @@ delete-old-files: # the Makefile parser segfault. @exec 3<&0; \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | sort -r | \ + -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \ while read file; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ @@ -1738,7 +1738,7 @@ check-old-libs: delete-old-dirs: @echo ">>> Removing old directories" @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_DIRS | xargs -n1 | \ + -V OLD_DIRS | xargs -n1 | sort -r | \ while read dir; do \ if [ -d "${DESTDIR}/$${dir}" ]; then \ rmdir -v "${DESTDIR}/$${dir}" || true; \ Modified: projects/uefi/ObsoleteFiles.inc ============================================================================== --- projects/uefi/ObsoleteFiles.inc Sun Oct 13 00:10:48 2013 (r256412) +++ projects/uefi/ObsoleteFiles.inc Sun Oct 13 00:13:29 2013 (r256413) @@ -38,6 +38,32 @@ # xargs -n1 | sort | uniq -d; # done +# 20131013: Removal of the ATF tools +OLD_FILES+=etc/atf/FreeBSD.conf +OLD_FILES+=etc/atf/atf-run.hooks +OLD_FILES+=etc/atf/common.conf +OLD_FILES+=usr/bin/atf-config +OLD_FILES+=usr/bin/atf-report +OLD_FILES+=usr/bin/atf-run +OLD_FILES+=usr/bin/atf-version +OLD_FILES+=usr/share/atf/atf-run.hooks +OLD_FILES+=usr/share/examples/atf/atf-run.hooks +OLD_FILES+=usr/share/examples/atf/tests-results.css +OLD_FILES+=usr/share/man/man1/atf-config.1.gz +OLD_FILES+=usr/share/man/man1/atf-report.1.gz +OLD_FILES+=usr/share/man/man1/atf-run.1.gz +OLD_FILES+=usr/share/man/man1/atf-version.1.gz +OLD_FILES+=usr/share/man/man5/atf-formats.5.gz +OLD_FILES+=usr/share/man/man7/atf.7.gz +OLD_FILES+=usr/share/xml/atf/tests-results.dtd +OLD_FILES+=usr/share/xsl/atf/tests-results.xsl +# 20131009: freebsd-version moved from /libexec to /bin +OLD_FILES+=libexec/freebsd-version +# 20131001: ar and ranlib from binutils not used +OLD_FILES+=usr/bin/gnu-ar +OLD_FILES+=usr/bin/gnu-ranlib +OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz +OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz # 20130930: BIND removed from base OLD_FILES+=etc/namedb OLD_FILES+=etc/periodic/daily/470.status-named @@ -6086,6 +6112,13 @@ OLD_LIBS+=usr/lib/libkse.so.1 OLD_LIBS+=usr/lib/liblwres.so.3 OLD_LIBS+=usr/lib/pam_ftp.so.2 +# 20131013: Removal of the ATF tools +OLD_DIRS+=etc/atf +OLD_DIRS+=usr/share/examples/atf +OLD_DIRS+=usr/share/xml/atf +OLD_DIRS+=usr/share/xml +OLD_DIRS+=usr/share/xsl/atf +OLD_DIRS+=usr/share/xsl # 20040925: bind9 import OLD_DIRS+=usr/share/doc/bind/html OLD_DIRS+=usr/share/doc/bind/misc Modified: projects/uefi/UPDATING ============================================================================== --- projects/uefi/UPDATING Sun Oct 13 00:10:48 2013 (r256412) +++ projects/uefi/UPDATING Sun Oct 13 00:13:29 2013 (r256413) @@ -16,8 +16,8 @@ from older versions of FreeBSD, try WITH head, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW: - FreeBSD 10.x has many debugging features turned on, in both the kernel +NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW: + FreeBSD 11.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They also substantially impact @@ -31,6 +31,25 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131010: + The rc.d/jail script has been updated to support jail(8) + configuration file. The "jail__*" rc.conf(5) variables + for per-jail configuration are automatically converted to + /var/run/jail..conf before the jail(8) utility is invoked. + This is transparently backward compatible. See below about some + incompatibilities and rc.conf(5) manual page for more details. + + These variables are now deprecated in favor of jail(8) configuration + file. One can use "rc.d/jail config " command to generate + a jail(8) configuration file in /var/run/jail..conf without + running the jail(8) utility. The default pathname of the + configuration file is /etc/jail.conf and can be specified by + using $jail_conf or $jail__conf variables. + + Please note that jail_devfs_ruleset accepts an integer at + this moment. Please consider to rewrite the ruleset name + with an integer. + 20130930: BIND has been removed from the base system. If all you need is a local resolver, simply enable and start the local_unbound @@ -73,19 +92,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 has been updated to use this support. A new gcc is required to build the aesni module on both i386 and amd64. -20130827: - Thomas Dickey (vendor author thereof) reports that dialog(1) since - 2011/10/18 has a bug in handling --hline. Testers and I noticed the - --hline is not ignored but displayed as a NULL string, regardless of - value. This will cause confusion in some bsdconfig dialogs where the - --hline is used to inform users which keybindings to use. This will - likewise affect any other persons relying on --hline. It also looks - rather strange seeing "[]" at the bottom of dialog(1) widgets when - passing --hline "anything". Thomas said he will have a look in a few - weeks. NOTE: The "[]" brackets appear with the left-edge where it - would normally appear given the width of text to display, but the - displayed text is not there (part of the bug). - 20130821: The PADLOCK_RNG and RDRAND_RNG kernel options are now devices. Thus "device padlock_rng" and "device rdrand_rng" should be Modified: projects/uefi/bin/Makefile ============================================================================== --- projects/uefi/bin/Makefile Sun Oct 13 00:10:48 2013 (r256412) +++ projects/uefi/bin/Makefile Sun Oct 13 00:13:29 2013 (r256413) @@ -15,6 +15,7 @@ SUBDIR= cat \ echo \ ed \ expr \ + freebsd-version \ getfacl \ hostname \ kenv \ Modified: projects/uefi/bin/dd/dd.1 ============================================================================== --- projects/uefi/bin/dd/dd.1 Sun Oct 13 00:10:48 2013 (r256412) +++ projects/uefi/bin/dd/dd.1 Sun Oct 13 00:13:29 2013 (r256413) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd January 23, 2009 +.Dd October 1, 2013 .Dt DD 1 .Os .Sh NAME @@ -378,12 +378,12 @@ will exit. .Sh EXAMPLES Check that a disk drive contains no bad blocks: .Pp -.Dl "dd if=/dev/ad0 of=/dev/null bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/null bs=1m" .Pp Do a refresh of a disk drive, in order to prevent presently recoverable read errors from progressing into unrecoverable read errors: .Pp -.Dl "dd if=/dev/ad0 of=/dev/ad0 bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/ada0 bs=1m" .Pp Remove parity bit from a file: .Pp Modified: projects/uefi/bin/pkill/pkill.c ============================================================================== --- projects/uefi/bin/pkill/pkill.c Sun Oct 13 00:10:48 2013 (r256412) +++ projects/uefi/bin/pkill/pkill.c Sun Oct 13 00:13:29 2013 (r256413) @@ -481,7 +481,6 @@ main(int argc, char **argv) * We skip P_SYSTEM processes to match ps(1) output. */ if ((kp->ki_flag & P_SYSTEM) == 0 && - kp->ki_loginclass != NULL && strcmp(kp->ki_loginclass, li->li_name) == 0) break; } Modified: projects/uefi/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ============================================================================== --- projects/uefi/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Sun Oct 13 00:10:48 2013 (r256412) +++ projects/uefi/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Sun Oct 13 00:13:29 2013 (r256413) @@ -2,7 +2,7 @@ .\" CDDL HEADER START .\" .\" The contents of this file are subject to the terms of the -.\" Common Development and Distribution License (the "License"). +.\" Common Development and Distribution License (the "License"). .\" You may not use this file except in compliance with the License. .\" .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE @@ -18,653 +18,660 @@ .\" .\" CDDL HEADER END .\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved. -.TH dtrace 1M "5 Sep 2006" "SunOS 5.11" "System Administration Commands" -.SH NAME -dtrace \- DTrace dynamic tracing compiler and tracing utility -.SH SYNOPSIS -.LP -.nf -\fBdtrace\fR [\fB-32\fR | \fB-64\fR] [\fB-aACeFGHhlqSvVwZ\fR] [\fB-b\fR \fIbufsz\fR] [\fB-c\fR \fIcmd\fR] - [\fB-D\fR \fIname\fR [\fI=value\fR]] [\fB-I\fR \fIpath\fR] [\fB-L\fR \fIpath\fR] [\fB-o\fR \fIoutput\fR] - [\fB-s\fR \fIscript\fR] [\fB-U\fR \fIname\fR] [\fB-x\fR \fIarg\fR [\fI=val\fR]] - [\fB-X\fR a | c | s | t] [\fB-p\fR \fIpid\fR] - [\fB-P\fR \fIprovider\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-m\fR [\fIprovider:\fR] \fImodule\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-f\fR [[\fIprovider:\fR] \fImodule:\fR] \fIfunction\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-i\fR \fIprobe-id\fR [[\fIpredicate\fR] \fIaction\fR]] -.fi - -.SH DESCRIPTION -.sp -.LP -DTrace is a comprehensive dynamic tracing framework for the Solaris Operating System. DTrace provides a powerful infrastructure that permits administrators, developers, and service personnel to concisely answer arbitrary questions about the behavior of the operating system and user programs. -.sp -.LP -The \fISolaris Dynamic Tracing Guide\fR describes how to use DTrace to observe, debug, and tune system behavior. Refer to this book for a detailed description of DTrace features, including the bundled DTrace observability -tools, instrumentation providers, and the D programming language. -.sp -.LP -The \fBdtrace\fR command provides a generic interface to the essential services provided by the DTrace facility, including: -.RS +4 -.TP -.ie t \(bu -.el o +.\" +.\" $FreeBSD$ +.\" +.Dd October 5, 2013 +.Dt DTRACE 1 +.Os +.Sh NAME +.Nm dtrace +.Nd dynamic tracing compiler and tracing utility +.Sh SYNOPSIS +.Nm +.Op Fl 32 | Fl 64 +.Op Fl aACeFGhHlqSvVwZ +.Op Fl b Ar bufsz +.Op Fl c Ar cmd +.Op Fl D Ar name Op Ns = Ns value +.Op Fl I Ar path +.Op Fl L Ar path +.Op Fl o Ar output +.Op Fl s Ar script +.Op Fl U Ar name +.Op Fl x Ar arg Op Ns = Ns value +.Op Fl X Cm a | c | s | t +.Op Fl p Ar pid +.Op Fl P Ar provider Oo Oo Ar predicate Oc Ar action Oc +.Op Fl m Oo Ar provider : Oc Ar module Oo Oo Ar predicate Oc Ar action Oc +.Op Fl f Oo Oo Ar provider : Oc Ar module : Oc Ar function Oo Oo Ar predicate \ + Oc Ar action Oc +.Op Fl n Oo Oo Oo Ar provider : Oc Ar module : Oc Ar function : Oc Ar name \ + Oo Oo Ar predicate Oc Ar action Oc +.Op Fl i Ar probe-id Oo Oo Ar predicate Oc Ar action Oc +.Sh DESCRIPTION +DTrace is a comprehensive dynamic tracing framework ported from Solaris. +DTrace provides a powerful infrastructure that permits administrators, +developers, and service personnel to concisely answer arbitrary questions about +the behavior of the operating system and user programs. +.Pp +The +.Nm +command provides a generic interface to the essential services provided by the +DTrace facility, including: +.Bl -bullet -offset indent +.It Options that list the set of probes and providers currently published by DTrace -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that enable probes directly using any of the probe description specifiers (provider, module, function, name) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that run the D compiler and compile one or more D program files or programs written directly on the command line -.RE -.RS +4 -.TP -.ie t \(bu -.el o +.It +Options that enable probes directly using any of the probe description +specifiers (provider, module, function, name) +.It +Options that run the D compiler and compile one or more D program files or +programs written directly on the command line +.It Options that generate anonymous tracing programs -.RE -.RS +4 -.TP -.ie t \(bu -.el o +.It Options that generate program stability reports -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that modify DTrace tracing and buffering behavior and enable additional D compiler features -.RE -.sp -.LP -You can use \fBdtrace\fR to create D scripts by using it in a \fB#!\fR declaration to create an interpreter file. You can also use \fBdtrace\fR to attempt to compile D programs and determine their properties without actually enabling tracing using the \fB-e\fR option. See \fBOPTIONS\fR. See the \fISolaris Dynamic Tracing Guide\fR for detailed examples of how to use the \fBdtrace\fR utility to perform these tasks. -.SH OPTIONS -.sp -.LP -The arguments accepted by the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, and \fB-i\fR options can include an optional D language \fIpredicate\fR enclosed in slashes \fB//\fR and optional D language \fIaction\fR statement list enclosed in braces \fB{}\fR. D program code specified on the command line must be appropriately quoted to avoid intepretation of meta-characters by the shell. -.sp -.LP +.It +Options that modify DTrace tracing and buffering behavior and enable +additional D compiler features +.El +.Pp +You can use +.Nm +to create D scripts by using it in a shebang declaration to create an +interpreter file. +You can also use +.Nm +to attempt to compile D programs and determine their properties without +actually enabling traces using the +.Fl e +option. +.Sh OPTIONS +The arguments accepted by the +.Fl P , +.Fl m , +.Fl f , +.Fl n , +and +.Fl i +options can include an optional D language +.Ar predicate +enclosed in slashes and an optional D language +.Ar action +statement list enclosed in braces. +D program code specified on the command line must be appropriately quoted to +avoid interpretation of meta-characters by the shell. +.Pp The following options are supported: -.sp -.ne 2 -.mk -.na -\fB\fB-32\fR | \fB-64\fR\fR -.ad -.sp .6 -.RS 4n -The D compiler produces programs using the native data model of the operating system kernel. You can use the \fBisainfo\fR \fB-b\fR command to determine the current operating system data model. If the \fB-32\fR option is specified, \fBdtrace\fR forces -the D compiler to compile a D program using the 32-bit data model. If the \fB-64\fR option is specified, \fBdtrace\fR forces the D compiler to compile a D program using the 64-bit data model. These options are typically not required as \fBdtrace\fR selects the -native data model as the default. The data model affects the sizes of integer types and other language properties. D programs compiled for either data model can be executed on both 32-bit and 64-bit kernels. The \fB-32\fR and \fB-64\fR options also determine the ELF file format -(ELF32 or ELF64) produced by the \fB-G\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-a\fR\fR -.ad -.sp .6 -.RS 4n -Claim anonymous tracing state and display the traced data. You can combine the \fB-a\fR option with the \fB-e\fR option to force \fBdtrace\fR to exit immediately after consuming the anonymous tracing state rather than continuing to wait for new -data. See the \fISolaris Dynamic Tracing Guide\fR for more information about anonymous tracing. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-A\fR\fR -.ad -.sp .6 -.RS 4n -Generate \fBdriver.conf\fR(4) directives for anonymous tracing. This option constructs a set of \fBdtrace\fR(7D) configuration file directives to enable the specified probes for anonymous tracing and then exits. By default, \fBdtrace\fR attempts to store the directives to the file \fB/kernel/drv/dtrace.conf\fR. You can modify this behavior if you use the \fB-o\fR option to specify an alternate output file. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-b\fR \fIbufsz\fR\fR -.ad -.sp .6 -.RS 4n -Set principal trace buffer size (\fIbufsz\fR). The trace buffer size can include any of the size suffixes \fBk\fR, \fBm\fR, \fBg\fR, or \fBt\fR. If the buffer space cannot be allocated, \fBdtrace\fR attempts -to reduce the buffer size or exit depending on the setting of the \fBbufresize\fR property. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-c\fR \fIcmd\fR\fR -.ad -.sp .6 -.RS 4n -Run the specified command \fIcmd\fR and exit upon its completion. If more than one \fB-c\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status for each child process as it -terminates. The process-ID of the first command is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for more information -on macro variables. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-C\fR\fR -.ad -.sp .6 -.RS 4n -Run the C preprocessor \fBcpp\fR(1) over D programs before compiling them. You can pass options to the C preprocessor using the \fB-D\fR, \fB-U\fR, \fB-I\fR, and \fB-H\fR options. You can select the degree of C standard conformance if you use the \fB-X\fR option. For a description of the set of tokens defined by the D compiler when invoking the C preprocessor, see \fB-X\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-D\fR \fIname\fR \fB[=\fR\fIvalue\fR\fB]\fR\fR -.ad -.sp .6 -.RS 4n -Define \fIname\fR when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). If you specify the equals sign (\fB=\fR) -and additional \fIvalue\fR, the name is assigned the corresponding value. This option passes the \fB-D\fR option to each \fBcpp\fR invocation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-e\fR\fR -.ad -.sp .6 -.RS 4n -Exit after compiling any requests and consuming anonymous tracing state (\fB-a\fR option) but prior to enabling any probes. You can combine this option with the \fB-a\fR option to print anonymous tracing data and exit. You can also combine this option with D -compiler options. This combination verifies that the programs compile without actually executing them and enabling the corresponding instrumentation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-f\fR\fB[[\fR\fIprovider\fR\fB:]\fR\fImodule\fR\fB:]\fR\fIfunction\fR\fB[[\fR\fIpredicate\fR\fB]\fR\fIaction\fR\fB]]\fR\fR -.ad -.sp .6 -.RS 4n -Specify function name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function\fR, \fImodule:function\fR, or \fIfunction\fR. -Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIfunction\fR are specified in the description, all probes with the corresponding \fIfunction\fR are matched. -The \fB-f\fR argument can be suffixed with an optional D probe clause. You can specify more than one \fB-f\fR option on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-F\fR\fR -.ad -.sp .6 -.RS 4n -Coalesce trace output by identifying function entry and return. Function entry probe reports are indented and their output is prefixed with \fB->\fR. Function return probe reports are unindented and their output is prefixed with \fB<-\fR\&. System call -entry probe reports are indented and their output is prefixed with \fB=>\fR. System call return probe reports are unindented and their output is prefixed with \fB<=\fR\&. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-G\fR\fR -.ad -.sp .6 -.RS 4n -Generate an ELF file containing an embedded DTrace program. The DTrace probes specified in the program are saved inside of a relocatable ELF object which can be linked into another program. If the \fB-o\fR option is present, the ELF file is saved using the pathname specified -as the argument for this operand. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fB\fIfilename\fR.d\fR, then the ELF file is saved using the name \fB\fIfilename\fR.o\fR. -Otherwise the ELF file is saved using the name \fBd.out\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-H\fR\fR -.ad -.sp .6 -.RS 4n -Print the pathnames of included files when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). This option passes the \fB-H\fR option -to each \fBcpp\fR invocation, causing it to display the list of pathnames, one for each line, to \fBstderr\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-h\fR\fR -.ad -.sp .6 -.RS 4n -Generate a header file containing macros that correspond to probes in the specified provider definitions. This option should be used to generate a header file that is included by other source files for later use with the \fB-G\fR option. If the \fB-o\fR option -is present, the header file is saved using the pathname specified as the argument for that option. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fIfilename\fR\fB\&.d\fR, then the header file is saved -using the name \fIfilename\fR\fB\&.h\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-i\fR \fIprobe-id\fR\fB[[\fR\fIpredicate\fR] \fIaction\fR\fB]\fR\fR -.ad -.sp .6 -.RS 4n -Specify probe identifier (\fIprobe-id\fR) to trace or list (\fB-l\fR option). You can specify probe IDs using decimal integers as shown by \fBdtrace\fR \fB-l\fR. The \fB-i\fR argument can be suffixed with an optional -D probe clause. You can specify more than one \fB-i\fR option at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-I\fR \fIpath\fR\fR -.ad -.sp .6 -.RS 4n -Add the specified directory \fIpath\fR to the search path for \fB#include\fR files when invoking \fBcpp\fR(1) (enabled -using the \fB-C\fR option). This option passes the \fB-I\fR option to each \fBcpp\fR invocation. The specified \fIpath\fR is inserted into the search path ahead of the default directory list. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-L\fR \fIpath\fR\fR -.ad -.sp .6 -.RS 4n -Add the specified directory \fIpath\fR to the search path for DTrace libraries. DTrace libraries are used to contain common definitions that can be used when writing D programs. The specified \fIpath\fR is added after the default library -search path. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-l\fR\fR -.ad -.sp .6 -.RS 4n -List probes instead of enabling them. If the \fB-l\fR option is specified, \fBdtrace\fR produces a report of the probes matching the descriptions given using the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, \fB-i\fR, -and \fB-s\fR options. If none of these options are specified, this option lists all probes. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-m\fR [[\fIprovider:\fR] \fImodule:\fR [[\fIpredicate\fR] \fIaction\fR]]\fR -.ad -.sp .6 -.RS 4n -Specify module name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module\fR or \fImodule\fR. Unspecified probe description fields are left blank and match -any probes regardless of the values in those fields. If no qualifiers other than \fImodule\fR are specified in the description, all probes with a corresponding \fImodule\fR are matched. The \fB-m\fR argument can be suffixed with an optional D -probe clause. More than one \fB-m\fR option can be specified on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]\fR -.ad -.sp .6 -.RS 4n -Specify probe name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function:name\fR, \fImodule:function:name\fR, \fIfunction:name\fR, -or \fIname\fR. Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIname\fR are specified in the description, all probes with a corresponding \fIname\fR are -matched. The \fB-n\fR argument can be suffixed with an optional D probe clause. More than one \fB-n\fR option can be specified on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-o\fR \fIoutput\fR\fR -.ad -.sp .6 -.RS 4n -Specify the \fIoutput\fR file for the \fB-A\fR , \fB-G\fR, and \fB-l\fR options, or for the traced data itself. If the \fB-A\fR option is present and \fB-o\fR is not present, the default output file is \fB/kernel/drv/dtrace.conf\fR. If the \fB-G\fR option is present and the \fB-s\fR option's argument is of the form \fB\fIfilename\fR.d\fR and \fB-o\fR is not present, the default output file is \fB\fIfilename\fR.o\fR. -Otherwise the default output file is \fBd.out\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-p\fR \fIpid\fR\fR -.ad -.sp .6 -.RS 4n -Grab the specified process-ID \fIpid\fR, cache its symbol tables, and exit upon its completion. If more than one \fB-p\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status -for each process as it terminates. The first process-ID is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for -more information on macro variables. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-P\fR \fIprovider\fR \fB[[\fR\fIpredicate\fR\fB]\fR \fIaction\fR]\fR -.ad -.sp .6 -.RS 4n -Specify provider name to trace or list (\fB-l\fR option). The remaining probe description fields module, function, and name are left blank and match any probes regardless of the values in those fields. The \fB-P\fR argument can be suffixed with an optional D -probe clause. You can specify more than one \fB-P\fR option on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-q\fR\fR -.ad -.sp .6 -.RS 4n -Set quiet mode. \fBdtrace\fR suppresses messages such as the number of probes matched by the specified options and D programs and does not print column headers, the CPU ID, the probe ID, or insert newlines into the output. Only data traced and formatted by D program -statements such as \fBtrace()\fR and \fBprintf()\fR is displayed to \fBstdout\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-s\fR\fR -.ad -.sp .6 -.RS 4n -Compile the specified D program source file. If the \fB-e\fR option is present, the program is compiled but instrumentation is not enabled. If the \fB-l\fR option is present, the program is compiled and the set of probes matched by it is listed, but instrumentation -is not enabled. If none of \fB-e\fR, \fB-l\fR, \fB-G\fR, or \fB-A\fR are present, the instrumentation specified by the D program is enabled and tracing begins. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-S\fR\fR -.ad -.sp .6 -.RS 4n -Show D compiler intermediate code. The D compiler produces a report of the intermediate code generated for each D program to \fBstderr\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-U\fR \fIname\fR\fR -.ad -.sp .6 -.RS 4n -Undefine the specified \fIname\fR when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). This option passes the \fB-U\fR option to each \fBcpp\fR invocation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-v\fR\fR -.ad -.sp .6 -.RS 4n -Set verbose mode. If the \fB-v\fR option is specified, \fBdtrace\fR produces a program stability report showing the minimum interface stability and dependency level for the specified D programs. DTrace stability levels are explained in further detail in the \fISolaris Dynamic Tracing Guide\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-V\fR\fR -.ad -.sp .6 -.RS 4n -Report the highest D programming interface version supported by \fBdtrace\fR. The version information is printed to \fBstdout\fR and the \fBdtrace\fR command exits. Refer to the \fISolaris Dynamic Tracing Guide\fR for -more information about DTrace versioning features. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-w\fR\fR -.ad -.sp .6 -.RS 4n -Permit destructive actions in D programs specified using the \fB-s\fR, \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, or \fB-i\fR options. If the \fB-w\fR option is not specified, \fBdtrace\fR does not -permit the compilation or enabling of a D program that contains destructive actions. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-x\fR \fIarg\fR [\fI=val\fR]\fR -.ad -.sp .6 -.RS 4n -Enable or modify a DTrace runtime option or D compiler option. The list of options is found in the \fISolaris Dynamic Tracing Guide\fR. Boolean options are enabled by specifying their name. Options with values are set by separating the option name and -value with an equals sign (\fB=\fR). -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-X\fR \fBa | c | s | t\fR\fR -.ad -.sp .6 -.RS 4n -Specify the degree of conformance to the ISO C standard that should be selected when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). -The \fB-X\fR option argument affects the value and presence of the \fB__STDC__\fR macro depending upon the value of the argument letter. -.sp -The \fB-X\fR option supports the following arguments: -.sp -.ne 2 -.mk -.na -\fB\fBa\fR\fR -.ad -.RS 5n -.rt -Default. ISO C plus K&R compatibility extensions, with semantic changes required by ISO C. This is the default mode if \fB-X\fR is not specified. The predefined macro \fB__STDC__\fR has a value of 0 when \fBcpp\fR is invoked in conjunction -with the \fB-Xa\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fBc\fR\fR -.ad -.RS 5n -.rt -Conformance. Strictly conformant ISO C, without K&R C compatibility extensions. The predefined macro \fB__STDC__\fR has a value of 1 when \fBcpp\fR is invoked in conjunction with the \fB-Xc\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fBs\fR\fR -.ad -.RS 5n -.rt -K&R C only. The macro \fB__STDC__\fR is not defined when \fBcpp\fR is invoked in conjunction with the \fB-Xs\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fBt\fR\fR -.ad -.RS 5n -.rt -Transition. ISO C plus K&R C compatibility extensions, without semantic changes required by ISO C. The predefined macro \fB__STDC__\fR has a value of 0 when \fBcpp\fR is invoked in conjunction with the \fB-Xt\fR option. -.RE - -As the \fB-X\fR option only affects how the D compiler invokes the C preprocessor, the \fB-Xa\fR and \fB-Xt\fR options are equivalent from the perspective of D and both are provided only to ease re-use of settings from a C build environment. -.sp -Regardless of the \fB-X\fR mode, the following additional C preprocessor definitions are always specified and valid in all modes: -.RS +4 -.TP -.ie t \(bu -.el o -\fB__sun\fR -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__unix\fR -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__SVR4\fR -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__sparc\fR (on SPARC systems only) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__sparcv9\fR (on SPARC systems only when 64-bit programs are compiled) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__i386\fR (on x86 systems only when 32-bit programs are compiled) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__amd64\fR (on x86 systems only when 64-bit programs are compiled) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__\fI`uname -s`\fR_\fI`uname -r`\fR\fR (for example, \fB__SunOS_5_10\fR) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__SUNW_D=1\fR -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__SUNW_D_VERSION=0x\fIMMmmmuuu\fR\fR -.sp -Where \fIMM\fR is the major release value in hexadecimal, \fImmm\fR is the minor release value in hexadecimal, and \fIuuu\fR is the -micro release value in hexadecimal. Refer to the \fISolaris Dynamic Tracing Guide\fR for more information about DTrace versioning. -.RE -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-Z\fR\fR -.ad -.sp .6 -.RS 4n -Permit probe descriptions that match zero probes. If the \fB-Z\fR option is not specified, \fBdtrace\fR reports an error and exits if any probe descriptions specified in D program files (\fB-s\fR option) or on the command line (\fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, or \fB-i\fR options) contain descriptions that do not match any known probes. -.RE - -.SH OPERANDS -.sp -.LP -You can specify zero or more additional arguments on the \fBdtrace\fR command line to define a set of macro variables (\fB$1\fR, \fB$2\fR, and so forth). The additional arguments can be used in D programs specified using the \fB-s\fR option -or on the command line. The use of macro variables is described further in the \fISolaris Dynamic Tracing Guide\fR. -.SH EXIT STATUS -.sp -.LP -The following exit values are returned: -.sp -.ne 2 -.mk -.na -\fB0\fR -.ad -.RS 5n -.rt -Successful completion. -.sp -For D program requests, an exit status of \fB0\fR indicates that programs were successfully compiled, probes were successfully enabled, or anonymous state was successfully retrieved. \fBdtrace\fR returns \fB0\fR even if the specified tracing requests -encountered errors or drops. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB1\fR\fR -.ad -.RS 5n -.rt +.Bl -tag -width indent +.It Fl 32 | Fl 64 +The D compiler produces programs using the native data model of the operating +system kernel. +If the +.Fl 32 +option is specified, +.Nm +forces the D compiler to compile a D program using the 32-bit data model. +If the +.Fl 64 +option is specified, +.Nm +forces the D compiler to compile a D program using the 64-bit data model. +These options are typically not required as +.Nm +selects the native data model as the default. +The data model affects the sizes of integer types and other language properties. +D programs compiled for either data model can be executed on both 32-bit and +64-bit kernels. +The +.Fl 32 +and +.Fl 64 +options also determine the +.Xr elf 5 +file format (ELF32 or ELF64) produced by the +.Fl G +option. +.It Fl a +Claim anonymous tracing state and display the traced data. +You can combine the +.Fl a +option with the +.Fl e +option to force +.Nm +to exit immediately after consuming the anonymous tracing state rather than +continuing to wait for new data. +.It Fl A +Generate directives for anonymous tracing and write them to +.Pa /boot/dtrace.dof . +This option constructs a set of dtrace configuration file directives to enable +the specified probes for anonymous tracing and then exits. +By default, +.Nm +attempts to store the directives to the file +.Pa /boot/dtrace.dof . +This behavior can be modified using the +.Fl o +option to specify an alternate output file. +.It Fl b Ar bufsz +Set the principal trace buffer size to +.Ar bufsz . +The trace buffer size can include any of the size suffixes k, m, g, or t. +If the buffer space cannot be allocated, +.Nm dtrace +attempts to reduce the buffer size or exit depending on the setting of the +bufresize property. +.It Fl c Ar cmd +Run the specified command +.Ar cmd +and exit upon its completion. +If more than one +.Fl c +option is present on the command line, +.Nm dtrace +exits when all commands have exited, reporting the exit status for each child +process as it terminates. +The process ID of the first command is made available to any D programs +specified on the command line or using the +.Fl s +option through the +.Li $target +macro variable. +.It Fl C +Run the C preprocessor +.Xr cpp 1 +over D programs before compiling them. +You can pass options to the C preprocessor using the +.Fl D , +.Fl U , +.Fl I , +and +.Fl H +options. +You can select the degree of C standard conformance if you use the +.Fl X +option. +For a description of the set of tokens defined by the D compiler when invoking +the C preprocessor, see +.Fl X . +.It Fl D Ar name Op Ns = Ns value +Define +.Ar name +when invoking +.Xr cpp 1 +(enabled using the +.Fl C +option). +If you specify an additional +.Ar value , +the name is assigned the corresponding value. +This option passes the +.Fl D +option to each +.Xr cpp 1 +invocation. +.It Fl e +Exit after compiling any requests and consuming anonymous tracing state +.Fl ( a +option) but prior to enabling any probes. +You can combine this option with the +.Fl a +option to print anonymous tracing data and exit. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 00:17:25 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 88CD22DD; Sun, 13 Oct 2013 00:17:25 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 75CE327F8; Sun, 13 Oct 2013 00:17:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9D0HPdM061840; Sun, 13 Oct 2013 00:17:25 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9D0HP33061839; Sun, 13 Oct 2013 00:17:25 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310130017.r9D0HP33061839@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sun, 13 Oct 2013 00:17:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256415 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 00:17:25 -0000 Author: sjg Date: Sun Oct 13 00:17:24 2013 New Revision: 256415 URL: http://svnweb.freebsd.org/changeset/base/256415 Log: Ensure _objroot is correctly formatted Modified: projects/bmake/share/mk/meta.stage.mk Modified: projects/bmake/share/mk/meta.stage.mk ============================================================================== --- projects/bmake/share/mk/meta.stage.mk Sun Oct 13 00:13:57 2013 (r256414) +++ projects/bmake/share/mk/meta.stage.mk Sun Oct 13 00:17:24 2013 (r256415) @@ -35,7 +35,13 @@ _stage_file_basename = $${f\#\#*/} _stage_target_dirname = $${t%/*} .endif +_OBJROOT ?= ${OBJROOT:U${OBJTOP:H}} +.if ${_OBJROOT:M*/} != "" +_objroot ?= ${_OBJROOT:tA}/ +.else _objroot ?= ${_OBJROOT:tA} +.endif + # make sure this is global _STAGED_DIRS ?= .export _STAGED_DIRS From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 00:19:32 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 334D33E0; Sun, 13 Oct 2013 00:19:32 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 217352800; Sun, 13 Oct 2013 00:19:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9D0JWnx062514; Sun, 13 Oct 2013 00:19:32 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9D0JVVD062513; Sun, 13 Oct 2013 00:19:31 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310130019.r9D0JVVD062513@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sun, 13 Oct 2013 00:19:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256416 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 00:19:32 -0000 Author: sjg Date: Sun Oct 13 00:19:31 2013 New Revision: 256416 URL: http://svnweb.freebsd.org/changeset/base/256416 Log: Latest version. Report better parse errors. Modified: projects/bmake/share/mk/meta2deps.py Modified: projects/bmake/share/mk/meta2deps.py ============================================================================== --- projects/bmake/share/mk/meta2deps.py Sun Oct 13 00:17:24 2013 (r256415) +++ projects/bmake/share/mk/meta2deps.py Sun Oct 13 00:19:31 2013 (r256416) @@ -35,7 +35,7 @@ We only pay attention to a subset of the """ RCSid: - $Id: meta2deps.py,v 1.12 2013/03/31 22:31:59 sjg Exp $ + $Id: meta2deps.py,v 1.15 2013/07/29 20:41:23 sjg Exp $ Copyright (c) 2011-2013, Juniper Networks, Inc. All rights reserved. @@ -77,7 +77,7 @@ def resolve(path, cwd, last_dir=None, de """ if path.endswith('/.'): path = path[0:-2] - if path[0] == '/': + if len(path) > 0 and path[0] == '/': return path if path == '.': return cwd @@ -107,10 +107,12 @@ def abspath(path, cwd, last_dir=None, de this gets called a lot, so we try to avoid calling realpath until we know we have something. """ - path = resolve(path, cwd, last_dir, debug, debug_out) - if path and (path.find('./') > 0 or - path.endswith('/..') or - os.path.islink(path)): + rpath = resolve(path, cwd, last_dir, debug, debug_out) + if rpath: + path = rpath + if (path.find('./') > 0 or + path.endswith('/..') or + os.path.islink(path)): return os.path.realpath(path) return path @@ -191,6 +193,7 @@ class MetaFile: self.curdir = getv(conf, 'CURDIR') self.reldir = getv(conf, 'RELDIR') self.dpdeps = getv(conf, 'DPDEPS') + self.line = 0 if not self.conf: # some of the steps below we want to do only once @@ -254,7 +257,7 @@ class MetaFile: self.cwd = os.getcwd() # make sure this is initialized if name: - self.parse() + self.try_parse() def reset(self): """reset state if we are being passed meta files from multiple directories.""" @@ -333,6 +336,15 @@ class MetaFile: return ddep + def try_parse(self, name=None, file=None): + """give file and line number causing exception""" + try: + self.parse(name, file) + except: + # give a useful clue + print >> sys.stderr, '{}:{}: '.format(self.name, self.line), + raise + def parse(self, name=None, file=None): """A meta file looks like: @@ -373,11 +385,13 @@ class MetaFile: pid_last_dir = {} last_pid = 0 + self.line = 0 if self.curdir: self.seenit(self.curdir) # we ignore this interesting = 'CEFLRV' for line in f: + self.line += 1 # ignore anything we don't care about if not line[0] in interesting: continue @@ -634,7 +648,13 @@ def main(argv, klass=MetaFile, xopts='', print >> debug_out, "%s=%s" % (k,v) for a in args: - m = klass(a, conf) + if a.endswith('.meta'): + m = klass(a, conf) + elif a.startswith('@'): + # there can actually multiple files per line + for line in open(a[1:]): + for f in line.strip().split(): + m = klass(f, conf) if output: print m.dirdeps() From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 00:20:13 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 75D854D9; Sun, 13 Oct 2013 00:20:13 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4A4612807; Sun, 13 Oct 2013 00:20:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9D0KD6R063770; Sun, 13 Oct 2013 00:20:13 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9D0KD49063734; Sun, 13 Oct 2013 00:20:13 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310130020.r9D0KD49063734@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sun, 13 Oct 2013 00:20:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256417 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 00:20:13 -0000 Author: sjg Date: Sun Oct 13 00:20:12 2013 New Revision: 256417 URL: http://svnweb.freebsd.org/changeset/base/256417 Log: We want an objdir Modified: projects/bmake/share/mk/Makefile Modified: projects/bmake/share/mk/Makefile ============================================================================== --- projects/bmake/share/mk/Makefile Sun Oct 13 00:19:31 2013 (r256416) +++ projects/bmake/share/mk/Makefile Sun Oct 13 00:20:12 2013 (r256417) @@ -40,7 +40,6 @@ FILES= \ sys.mk \ version_gen.awk -NO_OBJ= FILESDIR= ${BINDIR}/mk .if ${MK_ATF} != "no" From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 00:22:53 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 965595C2; Sun, 13 Oct 2013 00:22:53 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 80D552837; Sun, 13 Oct 2013 00:22:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9D0Mrms065955; Sun, 13 Oct 2013 00:22:53 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9D0Mi6R065863; Sun, 13 Oct 2013 00:22:44 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310130022.r9D0Mi6R065863@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sun, 13 Oct 2013 00:22:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256418 - in projects/bmake: lib/clang/libclangrewritecore lib/clang/libclangrewritefrontend lib/clang/libllvmirreader lib/clang/libllvmmipsdisassembler lib/clang/libllvmobjcarcopts lib... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 00:22:53 -0000 Author: sjg Date: Sun Oct 13 00:22:44 2013 New Revision: 256418 URL: http://svnweb.freebsd.org/changeset/base/256418 Log: New dependencies Added: projects/bmake/lib/clang/libclangrewritecore/Makefile.depend (contents, props changed) projects/bmake/lib/clang/libclangrewritefrontend/Makefile.depend (contents, props changed) projects/bmake/lib/clang/libllvmirreader/Makefile.depend (contents, props changed) projects/bmake/lib/clang/libllvmmipsdisassembler/Makefile.depend (contents, props changed) projects/bmake/lib/clang/libllvmobjcarcopts/Makefile.depend (contents, props changed) projects/bmake/lib/libexecinfo/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_compat/Makefile.depend (contents, props changed) projects/bmake/lib/libldns/Makefile.depend (contents, props changed) projects/bmake/lib/libnetbsd/Makefile.depend (contents, props changed) projects/bmake/libexec/save-entropy/Makefile.depend (contents, props changed) projects/bmake/share/doc/legal/realtek/Makefile.depend (contents, props changed) projects/bmake/tools/regression/file/fcntlflags/Makefile.depend (contents, props changed) projects/bmake/tools/regression/include/stdatomic/Makefile.depend (contents, props changed) projects/bmake/tools/tools/ath/ath_ee_9300_print/Makefile.depend (contents, props changed) projects/bmake/tools/tools/drm/radeon/mkregtable/Makefile.depend (contents, props changed) projects/bmake/tools/tools/makeroot/Makefile.depend (contents, props changed) projects/bmake/tools/tools/usbtest/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libapr/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libapr_util/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libserf/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libsqlite3/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libsvn_client/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libsvn_delta/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libsvn_diff/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libsvn_fs/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libsvn_fs_fs/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libsvn_fs_util/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libsvn_ra/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libsvn_ra_local/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libsvn_ra_serf/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libsvn_ra_svn/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libsvn_repos/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libsvn_subr/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/lib/libsvn_wc/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/svn/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/svnadmin/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/svndumpfilter/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/svnlook/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/svnmucc/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/svnrdump/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/svnserve/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/svnsync/Makefile.depend (contents, props changed) projects/bmake/usr.bin/svn/svnversion/Makefile.depend (contents, props changed) projects/bmake/usr.sbin/bsdconfig/packages/Makefile.depend (contents, props changed) projects/bmake/usr.sbin/bsdconfig/packages/include/Makefile.depend (contents, props changed) projects/bmake/usr.sbin/bsdconfig/share/packages/Makefile.depend (contents, props changed) projects/bmake/usr.sbin/bsdinstall/scripts/Makefile.depend (contents, props changed) projects/bmake/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend (contents, props changed) projects/bmake/usr.sbin/pc-sysinstall/examples/Makefile.depend (contents, props changed) Added: projects/bmake/lib/clang/libclangrewritecore/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/clang/libclangrewritecore/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,26 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libstdc++ \ + gnu/lib/libsupc++ \ + include \ + include/xlocale \ + lib/msun \ + usr.bin/clang/clang-tblgen.host \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +HTMLRewrite.o: DiagnosticCommonKinds.inc.h +HTMLRewrite.po: DiagnosticCommonKinds.inc.h +Rewriter.o: DeclNodes.inc.h +Rewriter.o: DiagnosticCommonKinds.inc.h +Rewriter.o: StmtNodes.inc.h +Rewriter.po: DeclNodes.inc.h +Rewriter.po: DiagnosticCommonKinds.inc.h +Rewriter.po: StmtNodes.inc.h +.endif Added: projects/bmake/lib/clang/libclangrewritefrontend/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/clang/libclangrewritefrontend/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,74 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libstdc++ \ + gnu/lib/libsupc++ \ + include \ + include/xlocale \ + lib/msun \ + usr.bin/clang/clang-tblgen.host \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +FixItRewriter.o: DiagnosticCommonKinds.inc.h +FixItRewriter.o: DiagnosticFrontendKinds.inc.h +FixItRewriter.po: DiagnosticCommonKinds.inc.h +FixItRewriter.po: DiagnosticFrontendKinds.inc.h +FrontendActions.o: AttrList.inc.h +FrontendActions.o: AttrParsedAttrList.inc.h +FrontendActions.o: Attrs.inc.h +FrontendActions.o: DeclNodes.inc.h +FrontendActions.o: DiagnosticCommonKinds.inc.h +FrontendActions.o: DiagnosticFrontendKinds.inc.h +FrontendActions.o: StmtNodes.inc.h +FrontendActions.po: AttrList.inc.h +FrontendActions.po: AttrParsedAttrList.inc.h +FrontendActions.po: Attrs.inc.h +FrontendActions.po: DeclNodes.inc.h +FrontendActions.po: DiagnosticCommonKinds.inc.h +FrontendActions.po: DiagnosticFrontendKinds.inc.h +FrontendActions.po: StmtNodes.inc.h +HTMLPrint.o: CommentCommandList.inc.h +HTMLPrint.o: DeclNodes.inc.h +HTMLPrint.o: DiagnosticCommonKinds.inc.h +HTMLPrint.o: StmtNodes.inc.h +HTMLPrint.po: CommentCommandList.inc.h +HTMLPrint.po: DeclNodes.inc.h +HTMLPrint.po: DiagnosticCommonKinds.inc.h +HTMLPrint.po: StmtNodes.inc.h +InclusionRewriter.o: DiagnosticCommonKinds.inc.h +InclusionRewriter.po: DiagnosticCommonKinds.inc.h +RewriteMacros.o: DiagnosticCommonKinds.inc.h +RewriteMacros.po: DiagnosticCommonKinds.inc.h +RewriteModernObjC.o: AttrList.inc.h +RewriteModernObjC.o: Attrs.inc.h +RewriteModernObjC.o: CommentCommandList.inc.h +RewriteModernObjC.o: DeclNodes.inc.h +RewriteModernObjC.o: DiagnosticCommonKinds.inc.h +RewriteModernObjC.o: StmtNodes.inc.h +RewriteModernObjC.po: AttrList.inc.h +RewriteModernObjC.po: Attrs.inc.h +RewriteModernObjC.po: CommentCommandList.inc.h +RewriteModernObjC.po: DeclNodes.inc.h +RewriteModernObjC.po: DiagnosticCommonKinds.inc.h +RewriteModernObjC.po: StmtNodes.inc.h +RewriteObjC.o: AttrList.inc.h +RewriteObjC.o: Attrs.inc.h +RewriteObjC.o: CommentCommandList.inc.h +RewriteObjC.o: DeclNodes.inc.h +RewriteObjC.o: DiagnosticCommonKinds.inc.h +RewriteObjC.o: StmtNodes.inc.h +RewriteObjC.po: AttrList.inc.h +RewriteObjC.po: Attrs.inc.h +RewriteObjC.po: CommentCommandList.inc.h +RewriteObjC.po: DeclNodes.inc.h +RewriteObjC.po: DiagnosticCommonKinds.inc.h +RewriteObjC.po: StmtNodes.inc.h +RewriteTest.o: DiagnosticCommonKinds.inc.h +RewriteTest.po: DiagnosticCommonKinds.inc.h +.endif Added: projects/bmake/lib/clang/libllvmirreader/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/clang/libllvmirreader/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,17 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libstdc++ \ + gnu/lib/libsupc++ \ + include \ + include/xlocale \ + lib/msun \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/clang/libllvmmipsdisassembler/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/clang/libllvmmipsdisassembler/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,26 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libstdc++ \ + gnu/lib/libsupc++ \ + include \ + include/xlocale \ + lib/msun \ + usr.bin/clang/tblgen.host \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +MipsDisassembler.o: MipsGenDisassemblerTables.inc.h +MipsDisassembler.o: MipsGenInstrInfo.inc.h +MipsDisassembler.o: MipsGenRegisterInfo.inc.h +MipsDisassembler.o: MipsGenSubtargetInfo.inc.h +MipsDisassembler.po: MipsGenDisassemblerTables.inc.h +MipsDisassembler.po: MipsGenInstrInfo.inc.h +MipsDisassembler.po: MipsGenRegisterInfo.inc.h +MipsDisassembler.po: MipsGenSubtargetInfo.inc.h +.endif Added: projects/bmake/lib/clang/libllvmobjcarcopts/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/clang/libllvmobjcarcopts/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,20 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libstdc++ \ + gnu/lib/libsupc++ \ + include \ + include/xlocale \ + lib/msun \ + usr.bin/clang/tblgen.host \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +ObjCARCUtil.o: Intrinsics.inc.h +ObjCARCUtil.po: Intrinsics.inc.h +.endif Added: projects/bmake/lib/libexecinfo/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libexecinfo/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,19 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libelf \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_compat/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_compat/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,16 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libldns/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libldns/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,21 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/arpa \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + secure/lib/libcrypto \ + secure/lib/libssl \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libnetbsd/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libnetbsd/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,15 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libutil \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/libexec/save-entropy/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/libexec/save-entropy/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,12 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/share/doc/legal/realtek/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/share/doc/legal/realtek/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,12 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/tools/regression/file/fcntlflags/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/tools/regression/file/fcntlflags/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,17 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/tools/regression/include/stdatomic/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/tools/regression/include/stdatomic/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,18 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/tools/tools/ath/ath_ee_9300_print/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/tools/tools/ath/ath_ee_9300_print/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,20 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +main.o: opt_ah.h +main.po: opt_ah.h +.endif Added: projects/bmake/tools/tools/drm/radeon/mkregtable/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/tools/tools/drm/radeon/mkregtable/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,18 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/tools/tools/makeroot/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/tools/tools/makeroot/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,12 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/tools/tools/usbtest/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/tools/tools/usbtest/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,19 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libusb \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libapr/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libapr/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,16 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + lib/msun \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libapr_util/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libapr_util/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,15 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libexpat \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libserf/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libserf/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,17 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libz \ + secure/lib/libcrypto \ + secure/lib/libssl \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libsqlite3/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libsqlite3/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libsvn_client/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libsvn_client/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libsvn_delta/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libsvn_delta/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,15 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libz \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libsvn_diff/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libsvn_diff/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libsvn_fs/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libsvn_fs/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libsvn_fs_fs/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libsvn_fs_fs/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libsvn_fs_util/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libsvn_fs_util/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libsvn_ra/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libsvn_ra/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libsvn_ra_local/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libsvn_ra_local/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libsvn_ra_serf/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libsvn_ra_serf/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,15 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libexpat \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libsvn_ra_svn/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libsvn_ra_svn/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libsvn_repos/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libsvn_repos/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libsvn_subr/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libsvn_subr/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,17 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libexpat \ + lib/libmagic \ + lib/libz \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/lib/libsvn_wc/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/lib/libsvn_wc/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/svn/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/svn/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,42 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libcrypt \ + lib/libexpat \ + lib/libmagic \ + lib/libthr \ + lib/libz \ + secure/lib/libcrypto \ + secure/lib/libssl \ + usr.bin/svn/lib/libapr \ + usr.bin/svn/lib/libapr_util \ + usr.bin/svn/lib/libserf \ + usr.bin/svn/lib/libsqlite3 \ + usr.bin/svn/lib/libsvn_client \ + usr.bin/svn/lib/libsvn_delta \ + usr.bin/svn/lib/libsvn_diff \ + usr.bin/svn/lib/libsvn_fs \ + usr.bin/svn/lib/libsvn_fs_fs \ + usr.bin/svn/lib/libsvn_fs_util \ + usr.bin/svn/lib/libsvn_ra \ + usr.bin/svn/lib/libsvn_ra_local \ + usr.bin/svn/lib/libsvn_ra_serf \ + usr.bin/svn/lib/libsvn_ra_svn \ + usr.bin/svn/lib/libsvn_repos \ + usr.bin/svn/lib/libsvn_subr \ + usr.bin/svn/lib/libsvn_wc \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/svnadmin/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/svnadmin/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,30 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libcrypt \ + lib/libexpat \ + lib/libz \ + usr.bin/svn/lib/libapr \ + usr.bin/svn/lib/libapr_util \ + usr.bin/svn/lib/libsqlite3 \ + usr.bin/svn/lib/libsvn_delta \ + usr.bin/svn/lib/libsvn_fs \ + usr.bin/svn/lib/libsvn_fs_fs \ + usr.bin/svn/lib/libsvn_fs_util \ + usr.bin/svn/lib/libsvn_repos \ + usr.bin/svn/lib/libsvn_subr \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/svndumpfilter/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/svndumpfilter/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,30 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libcrypt \ + lib/libexpat \ + lib/libz \ + usr.bin/svn/lib/libapr \ + usr.bin/svn/lib/libapr_util \ + usr.bin/svn/lib/libsqlite3 \ + usr.bin/svn/lib/libsvn_delta \ + usr.bin/svn/lib/libsvn_fs \ + usr.bin/svn/lib/libsvn_fs_fs \ + usr.bin/svn/lib/libsvn_fs_util \ + usr.bin/svn/lib/libsvn_repos \ + usr.bin/svn/lib/libsvn_subr \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/svnlook/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/svnlook/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,31 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libcrypt \ + lib/libexpat \ + lib/libz \ + usr.bin/svn/lib/libapr \ + usr.bin/svn/lib/libapr_util \ + usr.bin/svn/lib/libsqlite3 \ + usr.bin/svn/lib/libsvn_delta \ + usr.bin/svn/lib/libsvn_diff \ + usr.bin/svn/lib/libsvn_fs \ + usr.bin/svn/lib/libsvn_fs_fs \ + usr.bin/svn/lib/libsvn_fs_util \ + usr.bin/svn/lib/libsvn_repos \ + usr.bin/svn/lib/libsvn_subr \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/svnmucc/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/svnmucc/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,40 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libcrypt \ + lib/libexpat \ + lib/libmagic \ + lib/libthr \ + lib/libz \ + secure/lib/libcrypto \ + secure/lib/libssl \ + usr.bin/svn/lib/libapr \ + usr.bin/svn/lib/libapr_util \ + usr.bin/svn/lib/libserf \ + usr.bin/svn/lib/libsqlite3 \ + usr.bin/svn/lib/libsvn_client \ + usr.bin/svn/lib/libsvn_delta \ + usr.bin/svn/lib/libsvn_fs \ + usr.bin/svn/lib/libsvn_fs_fs \ + usr.bin/svn/lib/libsvn_fs_util \ + usr.bin/svn/lib/libsvn_ra \ + usr.bin/svn/lib/libsvn_ra_local \ + usr.bin/svn/lib/libsvn_ra_serf \ + usr.bin/svn/lib/libsvn_ra_svn \ + usr.bin/svn/lib/libsvn_repos \ + usr.bin/svn/lib/libsvn_subr \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/svnrdump/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/svnrdump/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,42 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libcrypt \ + lib/libexpat \ + lib/libmagic \ + lib/libthr \ + lib/libz \ + secure/lib/libcrypto \ + secure/lib/libssl \ + usr.bin/svn/lib/libapr \ + usr.bin/svn/lib/libapr_util \ + usr.bin/svn/lib/libserf \ + usr.bin/svn/lib/libsqlite3 \ + usr.bin/svn/lib/libsvn_client \ + usr.bin/svn/lib/libsvn_delta \ + usr.bin/svn/lib/libsvn_diff \ + usr.bin/svn/lib/libsvn_fs \ + usr.bin/svn/lib/libsvn_fs_fs \ + usr.bin/svn/lib/libsvn_fs_util \ + usr.bin/svn/lib/libsvn_ra \ + usr.bin/svn/lib/libsvn_ra_local \ + usr.bin/svn/lib/libsvn_ra_serf \ + usr.bin/svn/lib/libsvn_ra_svn \ + usr.bin/svn/lib/libsvn_repos \ + usr.bin/svn/lib/libsvn_subr \ + usr.bin/svn/lib/libsvn_wc \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/svnserve/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/svnserve/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,39 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libcrypt \ + lib/libexpat \ + lib/libmagic \ + lib/libthr \ + lib/libz \ + secure/lib/libcrypto \ + secure/lib/libssl \ + usr.bin/svn/lib/libapr \ + usr.bin/svn/lib/libapr_util \ + usr.bin/svn/lib/libserf \ + usr.bin/svn/lib/libsqlite3 \ + usr.bin/svn/lib/libsvn_delta \ + usr.bin/svn/lib/libsvn_fs \ + usr.bin/svn/lib/libsvn_fs_fs \ + usr.bin/svn/lib/libsvn_fs_util \ + usr.bin/svn/lib/libsvn_ra \ + usr.bin/svn/lib/libsvn_ra_local \ + usr.bin/svn/lib/libsvn_ra_serf \ + usr.bin/svn/lib/libsvn_ra_svn \ + usr.bin/svn/lib/libsvn_repos \ + usr.bin/svn/lib/libsvn_subr \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/usr.bin/svn/svnsync/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/usr.bin/svn/svnsync/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) @@ -0,0 +1,39 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 00:24:08 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9C2856A9; Sun, 13 Oct 2013 00:24:08 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 868DC283D; Sun, 13 Oct 2013 00:24:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9D0O8Cc066622; Sun, 13 Oct 2013 00:24:08 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9D0O1do066489; Sun, 13 Oct 2013 00:24:01 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310130024.r9D0O1do066489@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sun, 13 Oct 2013 00:24:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256419 - in projects/bmake: bin/csh bin/sh cddl/sbin/zfs cddl/sbin/zpool cddl/usr.bin/zinject cddl/usr.bin/zstreamdump cddl/usr.bin/ztest cddl/usr.sbin/zdb cddl/usr.sbin/zhack gnu/usr.... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 00:24:08 -0000 Author: sjg Date: Sun Oct 13 00:24:00 2013 New Revision: 256419 URL: http://svnweb.freebsd.org/changeset/base/256419 Log: Updated dependencies Added: projects/bmake/share/atf/Makefile.depend (contents, props changed) projects/bmake/share/doc/atf/Makefile.depend (contents, props changed) projects/bmake/share/dtrace/toolkit/Makefile.depend (contents, props changed) projects/bmake/share/examples/atf/Makefile.depend (contents, props changed) projects/bmake/share/examples/pf/Makefile.depend (contents, props changed) projects/bmake/share/xml/atf/Makefile.depend (contents, props changed) projects/bmake/share/xsl/atf/Makefile.depend (contents, props changed) projects/bmake/usr.bin/alias/Makefile.depend (contents, props changed) projects/bmake/usr.sbin/pc-sysinstall/doc/Makefile.depend (contents, props changed) Modified: projects/bmake/bin/csh/Makefile.depend projects/bmake/bin/sh/Makefile.depend projects/bmake/cddl/sbin/zfs/Makefile.depend projects/bmake/cddl/sbin/zpool/Makefile.depend projects/bmake/cddl/usr.bin/zinject/Makefile.depend projects/bmake/cddl/usr.bin/zstreamdump/Makefile.depend projects/bmake/cddl/usr.bin/ztest/Makefile.depend projects/bmake/cddl/usr.sbin/zdb/Makefile.depend projects/bmake/cddl/usr.sbin/zhack/Makefile.depend projects/bmake/gnu/usr.bin/gdb/libgdb/Makefile.depend.amd64 projects/bmake/gnu/usr.bin/groff/font/devX100-12/Makefile.depend projects/bmake/gnu/usr.bin/groff/font/devX100/Makefile.depend projects/bmake/gnu/usr.bin/groff/font/devX75-12/Makefile.depend projects/bmake/gnu/usr.bin/groff/font/devX75/Makefile.depend projects/bmake/kerberos5/lib/libheimipcc/Makefile.depend projects/bmake/kerberos5/lib/libheimipcs/Makefile.depend projects/bmake/kerberos5/libexec/digest-service/Makefile.depend projects/bmake/kerberos5/libexec/hprop/Makefile.depend projects/bmake/kerberos5/libexec/hpropd/Makefile.depend projects/bmake/kerberos5/libexec/ipropd-master/Makefile.depend projects/bmake/kerberos5/libexec/ipropd-slave/Makefile.depend projects/bmake/kerberos5/libexec/kadmind/Makefile.depend projects/bmake/kerberos5/libexec/kcm/Makefile.depend projects/bmake/kerberos5/libexec/kdc/Makefile.depend projects/bmake/kerberos5/libexec/kdigest/Makefile.depend projects/bmake/kerberos5/libexec/kfd/Makefile.depend projects/bmake/kerberos5/libexec/kimpersonate/Makefile.depend projects/bmake/kerberos5/libexec/kpasswdd/Makefile.depend projects/bmake/kerberos5/usr.bin/hxtool/Makefile.depend projects/bmake/kerberos5/usr.bin/kadmin/Makefile.depend projects/bmake/kerberos5/usr.bin/kcc/Makefile.depend projects/bmake/kerberos5/usr.bin/kdestroy/Makefile.depend projects/bmake/kerberos5/usr.bin/kf/Makefile.depend projects/bmake/kerberos5/usr.bin/kgetcred/Makefile.depend projects/bmake/kerberos5/usr.bin/kinit/Makefile.depend projects/bmake/kerberos5/usr.bin/kpasswd/Makefile.depend projects/bmake/kerberos5/usr.bin/ksu/Makefile.depend projects/bmake/kerberos5/usr.bin/string2key/Makefile.depend projects/bmake/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend projects/bmake/kerberos5/usr.sbin/iprop-log/Makefile.depend projects/bmake/kerberos5/usr.sbin/kstash/Makefile.depend projects/bmake/kerberos5/usr.sbin/ktutil/Makefile.depend projects/bmake/lib/clang/libclanganalysis/Makefile.depend projects/bmake/lib/clang/libclangarcmigrate/Makefile.depend projects/bmake/lib/clang/libclangast/Makefile.depend projects/bmake/lib/clang/libclangbasic/Makefile.depend projects/bmake/lib/clang/libclangcodegen/Makefile.depend projects/bmake/lib/clang/libclangdriver/Makefile.depend projects/bmake/lib/clang/libclangedit/Makefile.depend projects/bmake/lib/clang/libclangfrontend/Makefile.depend projects/bmake/lib/clang/libclangfrontendtool/Makefile.depend projects/bmake/lib/clang/libclanglex/Makefile.depend projects/bmake/lib/clang/libclangparse/Makefile.depend projects/bmake/lib/clang/libclangsema/Makefile.depend projects/bmake/lib/clang/libclangserialization/Makefile.depend projects/bmake/lib/clang/libclangstaticanalyzercheckers/Makefile.depend projects/bmake/lib/clang/libclangstaticanalyzercore/Makefile.depend projects/bmake/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend projects/bmake/lib/clang/libllvmanalysis/Makefile.depend projects/bmake/lib/clang/libllvmarmasmparser/Makefile.depend projects/bmake/lib/clang/libllvmarmcodegen/Makefile.depend projects/bmake/lib/clang/libllvmarmdesc/Makefile.depend projects/bmake/lib/clang/libllvmarmdisassembler/Makefile.depend projects/bmake/lib/clang/libllvmarminfo/Makefile.depend projects/bmake/lib/clang/libllvmarminstprinter/Makefile.depend projects/bmake/lib/clang/libllvmasmprinter/Makefile.depend projects/bmake/lib/clang/libllvmbitreader/Makefile.depend projects/bmake/lib/clang/libllvmcodegen/Makefile.depend projects/bmake/lib/clang/libllvmcore/Makefile.depend projects/bmake/lib/clang/libllvmdebuginfo/Makefile.depend projects/bmake/lib/clang/libllvmexecutionengine/Makefile.depend projects/bmake/lib/clang/libllvminstcombine/Makefile.depend projects/bmake/lib/clang/libllvminstrumentation/Makefile.depend projects/bmake/lib/clang/libllvminterpreter/Makefile.depend projects/bmake/lib/clang/libllvmipa/Makefile.depend projects/bmake/lib/clang/libllvmipo/Makefile.depend projects/bmake/lib/clang/libllvmjit/Makefile.depend projects/bmake/lib/clang/libllvmmcdisassembler/Makefile.depend projects/bmake/lib/clang/libllvmmcjit/Makefile.depend projects/bmake/lib/clang/libllvmmipsasmparser/Makefile.depend projects/bmake/lib/clang/libllvmmipscodegen/Makefile.depend projects/bmake/lib/clang/libllvmmipsdesc/Makefile.depend projects/bmake/lib/clang/libllvmmipsinfo/Makefile.depend projects/bmake/lib/clang/libllvmmipsinstprinter/Makefile.depend projects/bmake/lib/clang/libllvmpowerpccodegen/Makefile.depend projects/bmake/lib/clang/libllvmpowerpcdesc/Makefile.depend projects/bmake/lib/clang/libllvmpowerpcinfo/Makefile.depend projects/bmake/lib/clang/libllvmpowerpcinstprinter/Makefile.depend projects/bmake/lib/clang/libllvmruntimedyld/Makefile.depend projects/bmake/lib/clang/libllvmscalaropts/Makefile.depend projects/bmake/lib/clang/libllvmselectiondag/Makefile.depend projects/bmake/lib/clang/libllvmtransformutils/Makefile.depend projects/bmake/lib/clang/libllvmvectorize/Makefile.depend projects/bmake/lib/clang/libllvmx86asmparser/Makefile.depend projects/bmake/lib/clang/libllvmx86codegen/Makefile.depend projects/bmake/lib/clang/libllvmx86desc/Makefile.depend projects/bmake/lib/clang/libllvmx86disassembler/Makefile.depend projects/bmake/lib/clang/libllvmx86info/Makefile.depend projects/bmake/lib/clang/libllvmx86instprinter/Makefile.depend projects/bmake/lib/libprocstat/Makefile.depend projects/bmake/libexec/telnetd/Makefile.depend projects/bmake/libexec/ulog-helper/Makefile.depend projects/bmake/pkgs/pseudo/clang/Makefile.depend projects/bmake/sbin/atm/atmconfig/Makefile.depend projects/bmake/sbin/ccdconfig/Makefile.depend projects/bmake/sbin/gbde/Makefile.depend projects/bmake/sbin/gvinum/Makefile.depend projects/bmake/sbin/hastctl/Makefile.depend projects/bmake/sbin/hastd/Makefile.depend projects/bmake/sbin/iscontrol/Makefile.depend projects/bmake/secure/lib/libssh/Makefile.depend projects/bmake/secure/libexec/sftp-server/Makefile.depend projects/bmake/secure/libexec/ssh-keysign/Makefile.depend projects/bmake/secure/libexec/ssh-pkcs11-helper/Makefile.depend projects/bmake/secure/usr.bin/scp/Makefile.depend projects/bmake/secure/usr.bin/sftp/Makefile.depend projects/bmake/secure/usr.bin/ssh-add/Makefile.depend projects/bmake/secure/usr.bin/ssh-agent/Makefile.depend projects/bmake/secure/usr.bin/ssh-keygen/Makefile.depend projects/bmake/secure/usr.bin/ssh-keyscan/Makefile.depend projects/bmake/secure/usr.bin/ssh/Makefile.depend projects/bmake/secure/usr.sbin/sshd/Makefile.depend projects/bmake/share/dict/Makefile.depend projects/bmake/share/doc/IPv6/Makefile.depend projects/bmake/share/doc/legal/intel_ipw/Makefile.depend projects/bmake/share/doc/legal/intel_iwi/Makefile.depend projects/bmake/share/doc/legal/intel_iwn/Makefile.depend projects/bmake/share/doc/legal/intel_wpi/Makefile.depend projects/bmake/share/doc/llvm/clang/Makefile.depend projects/bmake/share/skel/Makefile.depend projects/bmake/share/snmp/mibs/Makefile.depend projects/bmake/share/syscons/fonts/Makefile.depend projects/bmake/share/syscons/keymaps/Makefile.depend projects/bmake/usr.bin/clang/clang/Makefile.depend projects/bmake/usr.bin/compile_et/Makefile.depend projects/bmake/usr.bin/fetch/Makefile.depend projects/bmake/usr.bin/fstat/Makefile.depend projects/bmake/usr.bin/gcore/Makefile.depend projects/bmake/usr.bin/nslookup/Makefile.depend projects/bmake/usr.bin/nsupdate/Makefile.depend projects/bmake/usr.bin/procstat/Makefile.depend projects/bmake/usr.bin/telnet/Makefile.depend projects/bmake/usr.bin/unzip/Makefile.depend projects/bmake/usr.bin/vi/Makefile.depend projects/bmake/usr.sbin/bluetooth/ath3kfw/Makefile.depend projects/bmake/usr.sbin/bsdinstall/distextract/Makefile.depend projects/bmake/usr.sbin/bsdinstall/distfetch/Makefile.depend projects/bmake/usr.sbin/bsdinstall/partedit/Makefile.depend projects/bmake/usr.sbin/bsnmpd/bsnmpd/Makefile.depend projects/bmake/usr.sbin/gssd/Makefile.depend projects/bmake/usr.sbin/makefs/Makefile.depend projects/bmake/usr.sbin/ntp/ntpd/Makefile.depend projects/bmake/usr.sbin/ntp/ntpdate/Makefile.depend projects/bmake/usr.sbin/pc-sysinstall/backend-partmanager/Makefile.depend projects/bmake/usr.sbin/pkg/Makefile.depend projects/bmake/usr.sbin/usbconfig/Makefile.depend projects/bmake/usr.sbin/wpa/wpa_cli/Makefile.depend Modified: projects/bmake/bin/csh/Makefile.depend ============================================================================== --- projects/bmake/bin/csh/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/bin/csh/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -19,329 +19,225 @@ DIRDEPS = \ .if ${DEP_RELDIR} == ${_DEP_RELDIR} # local dependencies - needed for -jN in clean tree ed.chared.o: ed.defns.h -ed.chared.o: iconv.h ed.chared.o: sh.err.h ed.chared.o: tc.const.h ed.chared.po: ed.defns.h -ed.chared.po: iconv.h ed.chared.po: sh.err.h ed.chared.po: tc.const.h -ed.defns.o: iconv.h ed.defns.o: sh.err.h ed.defns.o: tc.const.h -ed.defns.po: iconv.h ed.defns.po: sh.err.h ed.defns.po: tc.const.h ed.init.o: ed.defns.h -ed.init.o: iconv.h ed.init.o: sh.err.h ed.init.o: tc.const.h ed.init.po: ed.defns.h -ed.init.po: iconv.h ed.init.po: sh.err.h ed.init.po: tc.const.h ed.inputl.o: ed.defns.h -ed.inputl.o: iconv.h ed.inputl.o: sh.err.h ed.inputl.o: tc.const.h ed.inputl.po: ed.defns.h -ed.inputl.po: iconv.h ed.inputl.po: sh.err.h ed.inputl.po: tc.const.h -ed.refresh.o: iconv.h ed.refresh.o: sh.err.h ed.refresh.o: tc.const.h -ed.refresh.po: iconv.h ed.refresh.po: sh.err.h ed.refresh.po: tc.const.h ed.screen.o: ed.defns.h -ed.screen.o: iconv.h ed.screen.o: sh.err.h ed.screen.o: tc.const.h ed.screen.po: ed.defns.h -ed.screen.po: iconv.h ed.screen.po: sh.err.h ed.screen.po: tc.const.h -ed.term.o: iconv.h ed.term.o: sh.err.h ed.term.o: tc.const.h -ed.term.po: iconv.h ed.term.po: sh.err.h ed.term.po: tc.const.h ed.xmap.o: ed.defns.h -ed.xmap.o: iconv.h ed.xmap.o: sh.err.h ed.xmap.o: tc.const.h ed.xmap.po: ed.defns.h -ed.xmap.po: iconv.h ed.xmap.po: sh.err.h ed.xmap.po: tc.const.h -glob.o: iconv.h glob.o: sh.err.h glob.o: tc.const.h -glob.po: iconv.h glob.po: sh.err.h glob.po: tc.const.h -iconv_stub.o: iconv.h -iconv_stub.po: iconv.h -mi.termios.o: iconv.h mi.termios.o: sh.err.h mi.termios.o: tc.const.h -mi.termios.po: iconv.h mi.termios.po: sh.err.h mi.termios.po: tc.const.h -sh.char.o: iconv.h sh.char.o: sh.err.h sh.char.o: tc.const.h -sh.char.po: iconv.h sh.char.po: sh.err.h sh.char.po: tc.const.h -sh.dir.o: iconv.h sh.dir.o: sh.err.h sh.dir.o: tc.const.h -sh.dir.po: iconv.h sh.dir.po: sh.err.h sh.dir.po: tc.const.h -sh.dol.o: iconv.h sh.dol.o: sh.err.h sh.dol.o: tc.const.h -sh.dol.po: iconv.h sh.dol.po: sh.err.h sh.dol.po: tc.const.h -sh.err.o: iconv.h sh.err.o: sh.err.h sh.err.o: tc.const.h -sh.err.po: iconv.h sh.err.po: sh.err.h sh.err.po: tc.const.h -sh.exec.o: iconv.h sh.exec.o: sh.err.h sh.exec.o: tc.const.h -sh.exec.po: iconv.h sh.exec.po: sh.err.h sh.exec.po: tc.const.h -sh.exp.o: iconv.h sh.exp.o: sh.err.h sh.exp.o: tc.const.h -sh.exp.po: iconv.h sh.exp.po: sh.err.h sh.exp.po: tc.const.h -sh.file.o: iconv.h sh.file.o: sh.err.h sh.file.o: tc.const.h -sh.file.po: iconv.h sh.file.po: sh.err.h sh.file.po: tc.const.h -sh.func.o: iconv.h sh.func.o: sh.err.h sh.func.o: tc.const.h -sh.func.po: iconv.h sh.func.po: sh.err.h sh.func.po: tc.const.h -sh.glob.o: iconv.h sh.glob.o: sh.err.h sh.glob.o: tc.const.h -sh.glob.po: iconv.h sh.glob.po: sh.err.h sh.glob.po: tc.const.h -sh.hist.o: iconv.h sh.hist.o: sh.err.h sh.hist.o: tc.const.h -sh.hist.po: iconv.h sh.hist.po: sh.err.h sh.hist.po: tc.const.h -sh.init.o: iconv.h sh.init.o: sh.err.h sh.init.o: tc.const.h -sh.init.po: iconv.h sh.init.po: sh.err.h sh.init.po: tc.const.h -sh.lex.o: iconv.h sh.lex.o: sh.err.h sh.lex.o: tc.const.h -sh.lex.po: iconv.h sh.lex.po: sh.err.h sh.lex.po: tc.const.h -sh.misc.o: iconv.h sh.misc.o: sh.err.h sh.misc.o: tc.const.h -sh.misc.po: iconv.h sh.misc.po: sh.err.h sh.misc.po: tc.const.h -sh.o: iconv.h sh.o: sh.err.h sh.o: tc.const.h -sh.parse.o: iconv.h sh.parse.o: sh.err.h sh.parse.o: tc.const.h -sh.parse.po: iconv.h sh.parse.po: sh.err.h sh.parse.po: tc.const.h -sh.po: iconv.h sh.po: sh.err.h sh.po: tc.const.h -sh.print.o: iconv.h sh.print.o: sh.err.h sh.print.o: tc.const.h -sh.print.po: iconv.h sh.print.po: sh.err.h sh.print.po: tc.const.h -sh.proc.o: iconv.h sh.proc.o: sh.err.h sh.proc.o: tc.const.h -sh.proc.po: iconv.h sh.proc.po: sh.err.h sh.proc.po: tc.const.h -sh.sem.o: iconv.h sh.sem.o: sh.err.h sh.sem.o: tc.const.h -sh.sem.po: iconv.h sh.sem.po: sh.err.h sh.sem.po: tc.const.h -sh.set.o: iconv.h sh.set.o: sh.err.h sh.set.o: tc.const.h -sh.set.po: iconv.h sh.set.po: sh.err.h sh.set.po: tc.const.h -sh.time.o: iconv.h sh.time.o: sh.err.h sh.time.o: tc.const.h -sh.time.po: iconv.h sh.time.po: sh.err.h sh.time.po: tc.const.h -tc.alloc.o: iconv.h tc.alloc.o: sh.err.h tc.alloc.o: tc.const.h -tc.alloc.po: iconv.h tc.alloc.po: sh.err.h tc.alloc.po: tc.const.h tc.bind.o: ed.defns.h -tc.bind.o: iconv.h tc.bind.o: sh.err.h tc.bind.o: tc.const.h tc.bind.po: ed.defns.h -tc.bind.po: iconv.h tc.bind.po: sh.err.h tc.bind.po: tc.const.h -tc.const.o: iconv.h tc.const.o: sh.err.h tc.const.o: tc.const.h -tc.const.po: iconv.h tc.const.po: sh.err.h tc.const.po: tc.const.h -tc.defs.o: iconv.h tc.defs.o: sh.err.h tc.defs.o: tc.const.h tc.defs.o: tc.defs.c -tc.defs.po: iconv.h tc.defs.po: sh.err.h tc.defs.po: tc.const.h tc.defs.po: tc.defs.c -tc.disc.o: iconv.h tc.disc.o: sh.err.h tc.disc.o: tc.const.h -tc.disc.po: iconv.h tc.disc.po: sh.err.h tc.disc.po: tc.const.h tc.func.o: ed.defns.h -tc.func.o: iconv.h tc.func.o: sh.err.h tc.func.o: tc.const.h tc.func.po: ed.defns.h -tc.func.po: iconv.h tc.func.po: sh.err.h tc.func.po: tc.const.h -tc.nls.o: iconv.h tc.nls.o: sh.err.h tc.nls.o: tc.const.h -tc.nls.po: iconv.h tc.nls.po: sh.err.h tc.nls.po: tc.const.h tc.os.o: ed.defns.h -tc.os.o: iconv.h tc.os.o: sh.err.h tc.os.o: tc.const.h tc.os.po: ed.defns.h -tc.os.po: iconv.h tc.os.po: sh.err.h tc.os.po: tc.const.h -tc.printf.o: iconv.h tc.printf.o: sh.err.h tc.printf.o: tc.const.h -tc.printf.po: iconv.h tc.printf.po: sh.err.h tc.printf.po: tc.const.h -tc.prompt.o: iconv.h tc.prompt.o: sh.err.h tc.prompt.o: tc.const.h -tc.prompt.po: iconv.h tc.prompt.po: sh.err.h tc.prompt.po: tc.const.h -tc.sched.o: iconv.h tc.sched.o: sh.err.h tc.sched.o: tc.const.h -tc.sched.po: iconv.h tc.sched.po: sh.err.h tc.sched.po: tc.const.h -tc.sig.o: iconv.h tc.sig.o: sh.err.h tc.sig.o: tc.const.h -tc.sig.po: iconv.h tc.sig.po: sh.err.h tc.sig.po: tc.const.h -tc.str.o: iconv.h tc.str.o: sh.err.h tc.str.o: tc.const.h -tc.str.po: iconv.h tc.str.po: sh.err.h tc.str.po: tc.const.h -tc.vers.o: iconv.h tc.vers.o: sh.err.h tc.vers.o: tc.const.h -tc.vers.po: iconv.h tc.vers.po: sh.err.h tc.vers.po: tc.const.h -tc.who.o: iconv.h tc.who.o: sh.err.h tc.who.o: tc.const.h -tc.who.po: iconv.h tc.who.po: sh.err.h tc.who.po: tc.const.h -tw.color.o: iconv.h tw.color.o: sh.err.h tw.color.o: tc.const.h -tw.color.po: iconv.h tw.color.po: sh.err.h tw.color.po: tc.const.h -tw.comp.o: iconv.h tw.comp.o: sh.err.h tw.comp.o: tc.const.h -tw.comp.po: iconv.h tw.comp.po: sh.err.h tw.comp.po: tc.const.h -tw.help.o: iconv.h tw.help.o: sh.err.h tw.help.o: tc.const.h -tw.help.po: iconv.h tw.help.po: sh.err.h tw.help.po: tc.const.h -tw.init.o: iconv.h tw.init.o: sh.err.h tw.init.o: tc.const.h -tw.init.po: iconv.h tw.init.po: sh.err.h tw.init.po: tc.const.h -tw.parse.o: iconv.h tw.parse.o: sh.err.h tw.parse.o: tc.const.h -tw.parse.po: iconv.h tw.parse.po: sh.err.h tw.parse.po: tc.const.h -tw.spell.o: iconv.h tw.spell.o: sh.err.h tw.spell.o: tc.const.h -tw.spell.po: iconv.h tw.spell.po: sh.err.h tw.spell.po: tc.const.h .endif Modified: projects/bmake/bin/sh/Makefile.depend ============================================================================== --- projects/bmake/bin/sh/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/bin/sh/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -53,8 +53,6 @@ expand.po: nodes.h expand.po: syntax.h histedit.o: builtins.h histedit.po: builtins.h -init.o: init.c -init.po: init.c input.o: syntax.h input.po: syntax.h jobs.o: builtins.h Modified: projects/bmake/cddl/sbin/zfs/Makefile.depend ============================================================================== --- projects/bmake/cddl/sbin/zfs/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/cddl/sbin/zfs/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -14,8 +14,12 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libexpat \ lib/libgeom \ lib/libjail \ + lib/libmd \ + lib/libsbuf \ + lib/libthr \ lib/libutil \ lib/msun \ Modified: projects/bmake/cddl/sbin/zpool/Makefile.depend ============================================================================== --- projects/bmake/cddl/sbin/zpool/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/cddl/sbin/zpool/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -15,7 +15,11 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libexpat \ lib/libgeom \ + lib/libmd \ + lib/libsbuf \ + lib/libthr \ lib/libutil \ lib/msun \ Modified: projects/bmake/cddl/usr.bin/zinject/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.bin/zinject/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/cddl/usr.bin/zinject/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -15,7 +15,13 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libexpat \ lib/libgeom \ + lib/libmd \ + lib/libsbuf \ + lib/libthr \ + lib/libutil \ + lib/libz \ lib/msun \ Modified: projects/bmake/cddl/usr.bin/zstreamdump/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.bin/zstreamdump/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/cddl/usr.bin/zstreamdump/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -13,6 +13,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libmd \ lib/libthr \ lib/libz \ lib/msun \ Modified: projects/bmake/cddl/usr.bin/ztest/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.bin/ztest/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/cddl/usr.bin/ztest/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -16,8 +16,13 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libexpat \ lib/libgeom \ + lib/libmd \ + lib/libsbuf \ lib/libthr \ + lib/libutil \ + lib/libz \ lib/msun \ Modified: projects/bmake/cddl/usr.sbin/zdb/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.sbin/zdb/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/cddl/usr.sbin/zdb/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -15,8 +15,13 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libexpat \ lib/libgeom \ + lib/libmd \ + lib/libsbuf \ lib/libthr \ + lib/libutil \ + lib/libz \ lib/msun \ Modified: projects/bmake/cddl/usr.sbin/zhack/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.sbin/zhack/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/cddl/usr.sbin/zhack/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -15,8 +15,13 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libexpat \ lib/libgeom \ + lib/libmd \ + lib/libsbuf \ lib/libthr \ + lib/libutil \ + lib/libz \ lib/msun \ Modified: projects/bmake/gnu/usr.bin/gdb/libgdb/Makefile.depend.amd64 ============================================================================== --- projects/bmake/gnu/usr.bin/gdb/libgdb/Makefile.depend.amd64 Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/gnu/usr.bin/gdb/libgdb/Makefile.depend.amd64 Sun Oct 13 00:24:00 2013 (r256419) @@ -434,14 +434,12 @@ frame-base.o: xm.h frame-base.po: nm.h frame-base.po: tm.h frame-base.po: xm.h -frame-unwind-kluge.o: frame-unwind-kluge.c -frame-unwind-kluge.o: nm.h -frame-unwind-kluge.o: tm.h -frame-unwind-kluge.o: xm.h -frame-unwind-kluge.po: frame-unwind-kluge.c -frame-unwind-kluge.po: nm.h -frame-unwind-kluge.po: tm.h -frame-unwind-kluge.po: xm.h +frame-unwind.o: nm.h +frame-unwind.o: tm.h +frame-unwind.o: xm.h +frame-unwind.po: nm.h +frame-unwind.po: tm.h +frame-unwind.po: xm.h frame.o: nm.h frame.o: tm.h frame.o: xm.h Modified: projects/bmake/gnu/usr.bin/groff/font/devX100-12/Makefile.depend ============================================================================== --- projects/bmake/gnu/usr.bin/groff/font/devX100-12/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/gnu/usr.bin/groff/font/devX100-12/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ Modified: projects/bmake/gnu/usr.bin/groff/font/devX100/Makefile.depend ============================================================================== --- projects/bmake/gnu/usr.bin/groff/font/devX100/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/gnu/usr.bin/groff/font/devX100/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ Modified: projects/bmake/gnu/usr.bin/groff/font/devX75-12/Makefile.depend ============================================================================== --- projects/bmake/gnu/usr.bin/groff/font/devX75-12/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/gnu/usr.bin/groff/font/devX75-12/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ Modified: projects/bmake/gnu/usr.bin/groff/font/devX75/Makefile.depend ============================================================================== --- projects/bmake/gnu/usr.bin/groff/font/devX75/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/gnu/usr.bin/groff/font/devX75/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ Modified: projects/bmake/kerberos5/lib/libheimipcc/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/lib/libheimipcc/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/lib/libheimipcc/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -3,11 +3,17 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + gnu/lib/libgcc \ include \ include/arpa \ include/xlocale \ kerberos5/lib/libasn1 \ + kerberos5/lib/libheimbase \ kerberos5/lib/libroken \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libthr \ .include Modified: projects/bmake/kerberos5/lib/libheimipcs/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/lib/libheimipcs/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/lib/libheimipcs/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -3,12 +3,18 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + gnu/lib/libgcc \ include \ include/arpa \ include/xlocale \ kerberos5/lib/libasn1 \ + kerberos5/lib/libheimbase \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libthr \ .include Modified: projects/bmake/kerberos5/libexec/digest-service/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/libexec/digest-service/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/libexec/digest-service/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -10,8 +10,10 @@ DIRDEPS = \ kerberos5/lib/libasn1 \ kerberos5/lib/libhdb \ kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ kerberos5/lib/libheimipcs \ kerberos5/lib/libheimntlm \ + kerberos5/lib/libheimsqlite \ kerberos5/lib/libhx509 \ kerberos5/lib/libkdc \ kerberos5/lib/libkrb5 \ @@ -23,6 +25,7 @@ DIRDEPS = \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libthr \ lib/libutil \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/libexec/hprop/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/libexec/hprop/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/libexec/hprop/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -10,7 +10,9 @@ DIRDEPS = \ kerberos5/lib/libasn1 \ kerberos5/lib/libhdb \ kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ kerberos5/lib/libheimntlm \ + kerberos5/lib/libheimsqlite \ kerberos5/lib/libhx509 \ kerberos5/lib/libkadm5clnt \ kerberos5/lib/libkrb5 \ @@ -22,6 +24,7 @@ DIRDEPS = \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libthr \ lib/libutil \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/libexec/hpropd/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/libexec/hpropd/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/libexec/hpropd/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -10,7 +10,9 @@ DIRDEPS = \ kerberos5/lib/libasn1 \ kerberos5/lib/libhdb \ kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ kerberos5/lib/libheimntlm \ + kerberos5/lib/libheimsqlite \ kerberos5/lib/libhx509 \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ @@ -21,6 +23,7 @@ DIRDEPS = \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libthr \ lib/libutil \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/libexec/ipropd-master/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/libexec/ipropd-master/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/libexec/ipropd-master/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -9,16 +9,21 @@ DIRDEPS = \ include/xlocale \ kerberos5/lib/libasn1 \ kerberos5/lib/libhdb \ + kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ + kerberos5/lib/libheimsqlite \ kerberos5/lib/libhx509 \ kerberos5/lib/libkadm5srv \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ kerberos5/lib/libvers \ + kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libthr \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/libexec/ipropd-slave/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/libexec/ipropd-slave/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/libexec/ipropd-slave/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -9,16 +9,21 @@ DIRDEPS = \ include/xlocale \ kerberos5/lib/libasn1 \ kerberos5/lib/libhdb \ + kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ + kerberos5/lib/libheimsqlite \ kerberos5/lib/libhx509 \ kerberos5/lib/libkadm5srv \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ kerberos5/lib/libvers \ + kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libthr \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/libexec/kadmind/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/libexec/kadmind/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/libexec/kadmind/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -11,6 +11,8 @@ DIRDEPS = \ kerberos5/lib/libasn1 \ kerberos5/lib/libhdb \ kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ + kerberos5/lib/libheimsqlite \ kerberos5/lib/libhx509 \ kerberos5/lib/libkadm5clnt \ kerberos5/lib/libkadm5srv \ @@ -24,6 +26,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libcrypt \ lib/libgssapi \ + lib/libthr \ lib/libutil \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/libexec/kcm/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/libexec/kcm/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/libexec/kcm/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -9,15 +9,22 @@ DIRDEPS = \ include/xlocale \ kerberos5/lib/libasn1 \ kerberos5/lib/libhdb \ + kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ kerberos5/lib/libheimipcs \ kerberos5/lib/libheimntlm \ + kerberos5/lib/libheimsqlite \ + kerberos5/lib/libhx509 \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ kerberos5/lib/libvers \ + kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ + lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libthr \ lib/libutil \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/libexec/kdc/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/libexec/kdc/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/libexec/kdc/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -10,7 +10,9 @@ DIRDEPS = \ kerberos5/lib/libasn1 \ kerberos5/lib/libhdb \ kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ kerberos5/lib/libheimntlm \ + kerberos5/lib/libheimsqlite \ kerberos5/lib/libhx509 \ kerberos5/lib/libkdc \ kerberos5/lib/libkrb5 \ @@ -22,6 +24,7 @@ DIRDEPS = \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libthr \ lib/libutil \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/libexec/kdigest/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/libexec/kdigest/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/libexec/kdigest/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -8,17 +8,24 @@ DIRDEPS = \ include/arpa \ include/xlocale \ kerberos5/lib/libasn1 \ + kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ kerberos5/lib/libheimntlm \ + kerberos5/lib/libhx509 \ kerberos5/lib/libkafs5 \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ kerberos5/lib/libsl \ kerberos5/lib/libvers \ + kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ + lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ lib/libedit \ + lib/libthr \ + lib/ncurses/ncurses \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/libexec/kfd/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/libexec/kfd/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/libexec/kfd/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -8,13 +8,19 @@ DIRDEPS = \ include/arpa \ include/xlocale \ kerberos5/lib/libasn1 \ + kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ + kerberos5/lib/libhx509 \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ kerberos5/lib/libvers \ + kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ + lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libthr \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/libexec/kimpersonate/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/libexec/kimpersonate/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/libexec/kimpersonate/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -8,15 +8,21 @@ DIRDEPS = \ include/arpa \ include/xlocale \ kerberos5/lib/libasn1 \ + kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ kerberos5/lib/libheimntlm \ + kerberos5/lib/libhx509 \ kerberos5/lib/libkafs5 \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ kerberos5/lib/libvers \ + kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ + lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libthr \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/libexec/kpasswdd/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/libexec/kpasswdd/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/libexec/kpasswdd/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -9,17 +9,22 @@ DIRDEPS = \ include/xlocale \ kerberos5/lib/libasn1 \ kerberos5/lib/libhdb \ + kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ + kerberos5/lib/libheimsqlite \ kerberos5/lib/libhx509 \ kerberos5/lib/libkadm5clnt \ kerberos5/lib/libkadm5srv \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ kerberos5/lib/libvers \ + kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libthr \ lib/libutil \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/usr.bin/hxtool/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/usr.bin/hxtool/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/usr.bin/hxtool/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -12,12 +12,14 @@ DIRDEPS = \ kerberos5/lib/libroken \ kerberos5/lib/libsl \ kerberos5/lib/libvers \ + kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ lib/libedit \ + lib/ncurses/ncurses \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/usr.bin/kadmin/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/usr.bin/kadmin/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/usr.bin/kadmin/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -10,6 +10,8 @@ DIRDEPS = \ kerberos5/lib/libasn1 \ kerberos5/lib/libhdb \ kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ + kerberos5/lib/libheimsqlite \ kerberos5/lib/libhx509 \ kerberos5/lib/libkadm5clnt \ kerberos5/lib/libkadm5srv \ @@ -24,6 +26,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libcrypt \ lib/libedit \ + lib/libthr \ lib/libutil \ lib/ncurses/ncurses \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/usr.bin/kcc/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/usr.bin/kcc/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/usr.bin/kcc/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -8,17 +8,24 @@ DIRDEPS = \ include/arpa \ include/xlocale \ kerberos5/lib/libasn1 \ + kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ kerberos5/lib/libheimntlm \ + kerberos5/lib/libhx509 \ kerberos5/lib/libkafs5 \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ kerberos5/lib/libsl \ kerberos5/lib/libvers \ + kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ + lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ lib/libedit \ + lib/libthr \ + lib/ncurses/ncurses \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/usr.bin/kdestroy/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/usr.bin/kdestroy/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/usr.bin/kdestroy/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -8,15 +8,21 @@ DIRDEPS = \ include/arpa \ include/xlocale \ kerberos5/lib/libasn1 \ + kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ kerberos5/lib/libheimntlm \ + kerberos5/lib/libhx509 \ kerberos5/lib/libkafs5 \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ kerberos5/lib/libvers \ + kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ + lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libthr \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/usr.bin/kf/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/usr.bin/kf/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/usr.bin/kf/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -8,13 +8,19 @@ DIRDEPS = \ include/arpa \ include/xlocale \ kerberos5/lib/libasn1 \ + kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ + kerberos5/lib/libhx509 \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ kerberos5/lib/libvers \ + kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ + lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libthr \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/usr.bin/kgetcred/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/usr.bin/kgetcred/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/usr.bin/kgetcred/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -8,14 +8,20 @@ DIRDEPS = \ include/arpa \ include/xlocale \ kerberos5/lib/libasn1 \ + kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ + kerberos5/lib/libhx509 \ kerberos5/lib/libkafs5 \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ kerberos5/lib/libvers \ + kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ + lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libthr \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/usr.bin/kinit/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/usr.bin/kinit/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/usr.bin/kinit/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -8,16 +8,21 @@ DIRDEPS = \ include/arpa \ include/xlocale \ kerberos5/lib/libasn1 \ + kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ kerberos5/lib/libheimntlm \ + kerberos5/lib/libhx509 \ kerberos5/lib/libkafs5 \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ kerberos5/lib/libvers \ + kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libthr \ secure/lib/libcrypto \ Modified: projects/bmake/kerberos5/usr.bin/kpasswd/Makefile.depend ============================================================================== --- projects/bmake/kerberos5/usr.bin/kpasswd/Makefile.depend Sun Oct 13 00:22:44 2013 (r256418) +++ projects/bmake/kerberos5/usr.bin/kpasswd/Makefile.depend Sun Oct 13 00:24:00 2013 (r256419) @@ -8,15 +8,19 @@ DIRDEPS = \ include/arpa \ include/xlocale \ kerberos5/lib/libasn1 \ + kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ kerberos5/lib/libhx509 \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ kerberos5/lib/libvers \ + kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libthr \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 00:27:41 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A8A768B7; Sun, 13 Oct 2013 00:27:41 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 876E52848; Sun, 13 Oct 2013 00:27:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9D0Rfch067793; Sun, 13 Oct 2013 00:27:41 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9D0RYvp067748; Sun, 13 Oct 2013 00:27:34 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310130027.r9D0RYvp067748@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sun, 13 Oct 2013 00:27:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256421 - in projects/bmake: gnu/usr.bin/groff/font/devX100 gnu/usr.bin/groff/font/devX100-12 gnu/usr.bin/groff/font/devX75 gnu/usr.bin/groff/font/devX75-12 libexec/save-entropy share/a... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 00:27:41 -0000 Author: sjg Date: Sun Oct 13 00:27:34 2013 New Revision: 256421 URL: http://svnweb.freebsd.org/changeset/base/256421 Log: We do want objdir Modified: projects/bmake/gnu/usr.bin/groff/font/devX100-12/Makefile projects/bmake/gnu/usr.bin/groff/font/devX100/Makefile projects/bmake/gnu/usr.bin/groff/font/devX75-12/Makefile projects/bmake/gnu/usr.bin/groff/font/devX75/Makefile projects/bmake/libexec/save-entropy/Makefile projects/bmake/share/atf/Makefile projects/bmake/share/dict/Makefile projects/bmake/share/doc/IPv6/Makefile projects/bmake/share/doc/atf/Makefile projects/bmake/share/doc/bind9/Makefile projects/bmake/share/doc/legal/intel_ipw/Makefile projects/bmake/share/doc/legal/intel_iwi/Makefile projects/bmake/share/doc/legal/intel_iwn/Makefile projects/bmake/share/doc/legal/intel_wpi/Makefile projects/bmake/share/doc/llvm/clang/Makefile projects/bmake/share/dtrace/toolkit/Makefile projects/bmake/share/examples/atf/Makefile projects/bmake/share/examples/pf/Makefile projects/bmake/share/info/Makefile projects/bmake/share/misc/Makefile projects/bmake/share/sendmail/Makefile projects/bmake/share/skel/Makefile projects/bmake/share/snmp/mibs/Makefile projects/bmake/share/syscons/fonts/Makefile projects/bmake/share/syscons/keymaps/Makefile projects/bmake/share/xml/atf/Makefile projects/bmake/share/xsl/atf/Makefile projects/bmake/usr.bin/alias/Makefile projects/bmake/usr.sbin/pc-sysinstall/backend-partmanager/Makefile projects/bmake/usr.sbin/pc-sysinstall/backend-query/Makefile projects/bmake/usr.sbin/pc-sysinstall/backend/Makefile projects/bmake/usr.sbin/pc-sysinstall/conf/Makefile projects/bmake/usr.sbin/pc-sysinstall/doc/Makefile projects/bmake/usr.sbin/pc-sysinstall/examples/Makefile Modified: projects/bmake/gnu/usr.bin/groff/font/devX100-12/Makefile ============================================================================== --- projects/bmake/gnu/usr.bin/groff/font/devX100-12/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/gnu/usr.bin/groff/font/devX100-12/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - .include "../Makefile.inc" .include "${DIST_DIR}/Makefile.sub" .include "../Makefile.dev" Modified: projects/bmake/gnu/usr.bin/groff/font/devX100/Makefile ============================================================================== --- projects/bmake/gnu/usr.bin/groff/font/devX100/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/gnu/usr.bin/groff/font/devX100/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - .include "../Makefile.inc" .include "${DIST_DIR}/Makefile.sub" .include "../Makefile.dev" Modified: projects/bmake/gnu/usr.bin/groff/font/devX75-12/Makefile ============================================================================== --- projects/bmake/gnu/usr.bin/groff/font/devX75-12/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/gnu/usr.bin/groff/font/devX75-12/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - .include "../Makefile.inc" .include "${DIST_DIR}/Makefile.sub" .include "../Makefile.dev" Modified: projects/bmake/gnu/usr.bin/groff/font/devX75/Makefile ============================================================================== --- projects/bmake/gnu/usr.bin/groff/font/devX75/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/gnu/usr.bin/groff/font/devX75/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - .include "../Makefile.inc" .include "${DIST_DIR}/Makefile.sub" .include "../Makefile.dev" Modified: projects/bmake/libexec/save-entropy/Makefile ============================================================================== --- projects/bmake/libexec/save-entropy/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/libexec/save-entropy/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -1,6 +1,5 @@ # $FreeBSD$ SCRIPTS= save-entropy.sh -NO_OBJ= .include Modified: projects/bmake/share/atf/Makefile ============================================================================== --- projects/bmake/share/atf/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/atf/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -29,7 +29,6 @@ ATF= ${.CURDIR}/../../contrib/atf .PATH: ${ATF}/atf-run/sample -NO_OBJ= FILESDIR= ${SHAREDIR}/atf FILES= atf-run.hooks Modified: projects/bmake/share/dict/Makefile ============================================================================== --- projects/bmake/share/dict/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/dict/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -1,8 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -NO_OBJ= - # XXX MISSING: connectives words FILES= README propernames web2 web2a freebsd FILESDIR= ${BINDIR}/dict Modified: projects/bmake/share/doc/IPv6/Makefile ============================================================================== --- projects/bmake/share/doc/IPv6/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/doc/IPv6/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -1,6 +1,5 @@ # $FreeBSD$ -NO_OBJ= FILES= IMPLEMENTATION FILESDIR= ${SHAREDIR}/doc/IPv6 Modified: projects/bmake/share/doc/atf/Makefile ============================================================================== --- projects/bmake/share/doc/atf/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/doc/atf/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -29,7 +29,6 @@ ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF} .PATH: ${ATF}/doc -NO_OBJ= FILESGROUPS= TOP Modified: projects/bmake/share/doc/bind9/Makefile ============================================================================== --- projects/bmake/share/doc/bind9/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/doc/bind9/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -5,7 +5,6 @@ SRCDIR= ${BIND_DIR}/doc .PATH: ${BIND_DIR} ${SRCDIR}/arm ${SRCDIR}/misc -NO_OBJ= FILESGROUPS= TOP ARM MISC TOP= CHANGES COPYRIGHT FAQ HISTORY README Modified: projects/bmake/share/doc/legal/intel_ipw/Makefile ============================================================================== --- projects/bmake/share/doc/legal/intel_ipw/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/doc/legal/intel_ipw/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -1,6 +1,5 @@ # $FreeBSD$ -NO_OBJ= FILES= ${.CURDIR}/../../../../sys/contrib/dev/ipw/LICENSE FILESDIR= ${SHAREDIR}/doc/legal/intel_ipw Modified: projects/bmake/share/doc/legal/intel_iwi/Makefile ============================================================================== --- projects/bmake/share/doc/legal/intel_iwi/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/doc/legal/intel_iwi/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -1,6 +1,5 @@ # $FreeBSD$ -NO_OBJ= FILES= ${.CURDIR}/../../../../sys/contrib/dev/iwi/LICENSE FILESDIR= ${SHAREDIR}/doc/legal/intel_iwi Modified: projects/bmake/share/doc/legal/intel_iwn/Makefile ============================================================================== --- projects/bmake/share/doc/legal/intel_iwn/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/doc/legal/intel_iwn/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -1,6 +1,5 @@ # $FreeBSD$ -NO_OBJ= FILES= ${.CURDIR}/../../../../sys/contrib/dev/iwn/LICENSE FILESDIR= ${SHAREDIR}/doc/legal/intel_iwn Modified: projects/bmake/share/doc/legal/intel_wpi/Makefile ============================================================================== --- projects/bmake/share/doc/legal/intel_wpi/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/doc/legal/intel_wpi/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -1,6 +1,5 @@ # $FreeBSD$ -NO_OBJ= FILES= ${.CURDIR}/../../../../sys/contrib/dev/wpi/LICENSE FILESDIR= ${SHAREDIR}/doc/legal/intel_wpi Modified: projects/bmake/share/doc/llvm/clang/Makefile ============================================================================== --- projects/bmake/share/doc/llvm/clang/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/doc/llvm/clang/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -4,7 +4,6 @@ SRCDIR= ${.CURDIR}/../../../../contrib/ .PATH: ${SRCDIR} -NO_OBJ= FILESGROUPS= TOP TOP= LICENSE.TXT Modified: projects/bmake/share/dtrace/toolkit/Makefile ============================================================================== --- projects/bmake/share/dtrace/toolkit/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/dtrace/toolkit/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -12,6 +12,5 @@ SCRIPTS= ${DTRACETOOLKIT}/execsnoop \ SCRIPTSDIR= ${SHAREDIR}/dtrace/toolkit -NO_OBJ= .include Modified: projects/bmake/share/examples/atf/Makefile ============================================================================== --- projects/bmake/share/examples/atf/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/examples/atf/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -30,7 +30,6 @@ ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF}/atf-report .PATH: ${ATF}/atf-run/sample -NO_OBJ= FILESDIR= ${SHAREDIR}/examples/atf FILES= atf-run.hooks \ Modified: projects/bmake/share/examples/pf/Makefile ============================================================================== --- projects/bmake/share/examples/pf/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/examples/pf/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -1,6 +1,5 @@ # $FreeBSD$ -NO_OBJ= FILES= faq-example1 faq-example2 faq-example3 \ ackpri queue1 queue2 queue3 queue4 \ Modified: projects/bmake/share/info/Makefile ============================================================================== --- projects/bmake/share/info/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/info/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -1,8 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -NO_OBJ= - .include beforeinstall: Modified: projects/bmake/share/misc/Makefile ============================================================================== --- projects/bmake/share/misc/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/misc/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -9,7 +9,6 @@ FILES= ascii birthtoken bsd-family-tree scsi_modes usb_hid_usages usbdevs \ organization.dot -NO_OBJ= FILESDIR= ${BINDIR}/misc .include Modified: projects/bmake/share/sendmail/Makefile ============================================================================== --- projects/bmake/share/sendmail/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/sendmail/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -9,7 +9,6 @@ CFFILES!= (cd ${SENDMAIL_DIR}; find -L $ DDIR= ${DESTDIR}/usr/share/sendmail -NO_OBJ= # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies'') Modified: projects/bmake/share/skel/Makefile ============================================================================== --- projects/bmake/share/skel/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/skel/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -9,6 +9,5 @@ FILES1DIR= /usr/share/skel FILES2DIR= /usr/share/skel FILES1MODE= 0644 FILES2MODE= 0600 -NO_OBJ= .include Modified: projects/bmake/share/snmp/mibs/Makefile ============================================================================== --- projects/bmake/share/snmp/mibs/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/snmp/mibs/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -1,7 +1,6 @@ # $FreeBSD$ FILES= FREEBSD-MIB.txt -NO_OBJ= FILESDIR= ${SHAREDIR}/snmp/mibs .include Modified: projects/bmake/share/syscons/fonts/Makefile ============================================================================== --- projects/bmake/share/syscons/fonts/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/syscons/fonts/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -32,6 +32,5 @@ FILES= armscii8-8x8.fnt armscii8-8x14.fn FILESDIR= ${SHAREDIR}/syscons/fonts -NO_OBJ= .include Modified: projects/bmake/share/syscons/keymaps/Makefile ============================================================================== --- projects/bmake/share/syscons/keymaps/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/syscons/keymaps/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -52,6 +52,5 @@ FILES= INDEX.keymaps \ FILESDIR= ${SHAREDIR}/syscons/keymaps -NO_OBJ= .include Modified: projects/bmake/share/xml/atf/Makefile ============================================================================== --- projects/bmake/share/xml/atf/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/xml/atf/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -29,7 +29,6 @@ ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF}/atf-report -NO_OBJ= FILESGROUPS= XML Modified: projects/bmake/share/xsl/atf/Makefile ============================================================================== --- projects/bmake/share/xsl/atf/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/share/xsl/atf/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -29,7 +29,6 @@ ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF}/atf-report -NO_OBJ= FILESGROUPS= XSL Modified: projects/bmake/usr.bin/alias/Makefile ============================================================================== --- projects/bmake/usr.bin/alias/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/usr.bin/alias/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -2,7 +2,6 @@ SCRIPTS=generic.sh SCRIPTSNAME=alias -NO_OBJ= LINKS= ${BINDIR}/alias ${BINDIR}/bg \ ${BINDIR}/alias ${BINDIR}/cd \ Modified: projects/bmake/usr.sbin/pc-sysinstall/backend-partmanager/Makefile ============================================================================== --- projects/bmake/usr.sbin/pc-sysinstall/backend-partmanager/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/usr.sbin/pc-sysinstall/backend-partmanager/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -3,6 +3,5 @@ FILES= create-part.sh delete-part.sh FILESMODE= ${BINMODE} FILESDIR=${SHAREDIR}/pc-sysinstall/backend-partmanager -NO_OBJ= .include Modified: projects/bmake/usr.sbin/pc-sysinstall/backend-query/Makefile ============================================================================== --- projects/bmake/usr.sbin/pc-sysinstall/backend-query/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/usr.sbin/pc-sysinstall/backend-query/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -8,6 +8,5 @@ FILES= detect-laptop.sh detect-nics.sh d xkeyboard-models.sh xkeyboard-variants.sh FILESMODE= ${BINMODE} FILESDIR=${SHAREDIR}/pc-sysinstall/backend-query -NO_OBJ= .include Modified: projects/bmake/usr.sbin/pc-sysinstall/backend/Makefile ============================================================================== --- projects/bmake/usr.sbin/pc-sysinstall/backend/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/usr.sbin/pc-sysinstall/backend/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -10,6 +10,5 @@ FILES= functions-bsdlabel.sh functions-c functions.sh parseconfig.sh startautoinstall.sh installimage.sh FILESMODE= ${BINMODE} FILESDIR=${SHAREDIR}/pc-sysinstall/backend -NO_OBJ= .include Modified: projects/bmake/usr.sbin/pc-sysinstall/conf/Makefile ============================================================================== --- projects/bmake/usr.sbin/pc-sysinstall/conf/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/usr.sbin/pc-sysinstall/conf/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -1,6 +1,5 @@ # $FreeBSD$ -NO_OBJ= FILESGROUPS= CONF LICENSE CONF= exclude-from-upgrade pc-sysinstall.conf avail-langs Modified: projects/bmake/usr.sbin/pc-sysinstall/doc/Makefile ============================================================================== --- projects/bmake/usr.sbin/pc-sysinstall/doc/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/usr.sbin/pc-sysinstall/doc/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -3,6 +3,5 @@ FILES= help-disk-list help-disk-size help-index help-start-autoinstall FILESDIR=${SHAREDIR}/pc-sysinstall/doc -NO_OBJ= .include Modified: projects/bmake/usr.sbin/pc-sysinstall/examples/Makefile ============================================================================== --- projects/bmake/usr.sbin/pc-sysinstall/examples/Makefile Sun Oct 13 00:24:44 2013 (r256420) +++ projects/bmake/usr.sbin/pc-sysinstall/examples/Makefile Sun Oct 13 00:27:34 2013 (r256421) @@ -6,6 +6,5 @@ FILES= README pc-autoinstall.conf pcinst pcinstall.cfg.zfs FILESDIR=${SHAREDIR}/examples/pc-sysinstall -NO_OBJ= .include From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 00:29:14 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E947C993; Sun, 13 Oct 2013 00:29:14 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D63632849; Sun, 13 Oct 2013 00:29:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9D0TE9W068068; Sun, 13 Oct 2013 00:29:14 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9D0TEDk068067; Sun, 13 Oct 2013 00:29:14 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310130029.r9D0TEDk068067@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sun, 13 Oct 2013 00:29:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256422 - projects/bmake/lib/libc X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 00:29:15 -0000 Author: sjg Date: Sun Oct 13 00:29:14 2013 New Revision: 256422 URL: http://svnweb.freebsd.org/changeset/base/256422 Log: We need an extra -I from lib/msun and we need to supress dependency on it - cyclic. Modified: projects/bmake/lib/libc/Makefile Modified: projects/bmake/lib/libc/Makefile ============================================================================== --- projects/bmake/lib/libc/Makefile Sun Oct 13 00:27:34 2013 (r256421) +++ projects/bmake/lib/libc/Makefile Sun Oct 13 00:29:14 2013 (r256422) @@ -158,7 +158,15 @@ CFLAGS+= -I${.CURDIR:H}/libutil # Same issue with libm MSUN_ARCH_SUBDIR != ${MAKE} -B -C ${.CURDIR:H}/msun -V ARCH_SUBDIR # unfortunately msun/src contains both private and public headers -CFLAGS+= -I${.CURDIR:H}/msun/${MSUN_ARCH_SUBDIR} -I${.CURDIR:H}/msun/src +CFLAGS+= -I${.CURDIR:H}/msun/${MSUN_ARCH_SUBDIR} +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +CFLAGS+= -I${.CURDIR:H}/msun/x86 +.endif +CFLAGS+= -I${.CURDIR:H}/msun/src +# and we do not want to record a dependency on msun +.if ${.MAKE.LEVEL} > 0 +GENDIRDEPS_FILTER+= N${RELDIR:H}/msun +.endif .endif # Disable warnings in contributed sources. From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 02:35:24 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 27D4AC4C; Sun, 13 Oct 2013 02:35:24 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 11B5F2C3C; Sun, 13 Oct 2013 02:35:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9D2ZOQv034512; Sun, 13 Oct 2013 02:35:24 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9D2ZMxW034494; Sun, 13 Oct 2013 02:35:22 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310130235.r9D2ZMxW034494@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sun, 13 Oct 2013 02:35:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256424 - in projects/bmake: . bin bin/dd bin/freebsd-version bin/pkill cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/cont... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 02:35:24 -0000 Author: sjg Date: Sun Oct 13 02:35:19 2013 New Revision: 256424 URL: http://svnweb.freebsd.org/changeset/base/256424 Log: Merge head@256284 Added: projects/bmake/bin/freebsd-version/ - copied from r256284, head/bin/freebsd-version/ projects/bmake/contrib/dialog/package/freebsd/ - copied from r256284, head/contrib/dialog/package/freebsd/ projects/bmake/contrib/dialog/po/fa.po - copied unchanged from r256284, head/contrib/dialog/po/fa.po projects/bmake/contrib/ldns/drill/config.h - copied unchanged from r256284, head/contrib/ldns/drill/config.h projects/bmake/contrib/ldns/drill/drill.1 - copied unchanged from r256284, head/contrib/ldns/drill/drill.1 projects/bmake/contrib/llvm/tools/lldb/docs/ - copied from r256284, head/contrib/llvm/tools/lldb/docs/ projects/bmake/contrib/unbound/config.h - copied unchanged from r256284, head/contrib/unbound/config.h projects/bmake/contrib/unbound/doc/libunbound.3 - copied unchanged from r256284, head/contrib/unbound/doc/libunbound.3 projects/bmake/contrib/unbound/doc/unbound-anchor.8 - copied unchanged from r256284, head/contrib/unbound/doc/unbound-anchor.8 projects/bmake/contrib/unbound/doc/unbound-checkconf.8 - copied unchanged from r256284, head/contrib/unbound/doc/unbound-checkconf.8 projects/bmake/contrib/unbound/doc/unbound-control.8 - copied unchanged from r256284, head/contrib/unbound/doc/unbound-control.8 projects/bmake/contrib/unbound/doc/unbound.8 - copied unchanged from r256284, head/contrib/unbound/doc/unbound.8 projects/bmake/contrib/unbound/doc/unbound.conf.5 - copied unchanged from r256284, head/contrib/unbound/doc/unbound.conf.5 projects/bmake/contrib/unbound/freebsd-configure.sh - copied unchanged from r256284, head/contrib/unbound/freebsd-configure.sh projects/bmake/contrib/unbound/freebsd-sources.pl - copied unchanged from r256284, head/contrib/unbound/freebsd-sources.pl projects/bmake/contrib/unbound/libunbound/worker.h - copied unchanged from r256284, head/contrib/unbound/libunbound/worker.h projects/bmake/contrib/unbound/smallapp/unbound-control-setup.sh.in - copied unchanged from r256284, head/contrib/unbound/smallapp/unbound-control-setup.sh.in projects/bmake/crypto/openssh/Makefile.in - copied unchanged from r256284, head/crypto/openssh/Makefile.in projects/bmake/crypto/openssh/buildpkg.sh.in - copied unchanged from r256284, head/crypto/openssh/buildpkg.sh.in projects/bmake/crypto/openssh/config.sub - copied unchanged from r256284, head/crypto/openssh/config.sub projects/bmake/crypto/openssh/configure - copied unchanged from r256284, head/crypto/openssh/configure projects/bmake/crypto/openssh/configure.ac - copied unchanged from r256284, head/crypto/openssh/configure.ac projects/bmake/crypto/openssh/contrib/ - copied from r256284, head/crypto/openssh/contrib/ projects/bmake/crypto/openssh/fixalgorithms - copied unchanged from r256284, head/crypto/openssh/fixalgorithms projects/bmake/crypto/openssh/freebsd-configure.sh - copied unchanged from r256284, head/crypto/openssh/freebsd-configure.sh projects/bmake/crypto/openssh/install-sh - copied unchanged from r256284, head/crypto/openssh/install-sh projects/bmake/crypto/openssh/krb5_config.h - copied unchanged from r256284, head/crypto/openssh/krb5_config.h projects/bmake/crypto/openssh/mdoc2man.awk - copied unchanged from r256284, head/crypto/openssh/mdoc2man.awk projects/bmake/crypto/openssh/moduli.0 - copied unchanged from r256284, head/crypto/openssh/moduli.0 projects/bmake/crypto/openssh/nchan.ms - copied unchanged from r256284, head/crypto/openssh/nchan.ms projects/bmake/crypto/openssh/nchan2.ms - copied unchanged from r256284, head/crypto/openssh/nchan2.ms projects/bmake/crypto/openssh/openbsd-compat/Makefile.in - copied unchanged from r256284, head/crypto/openssh/openbsd-compat/Makefile.in projects/bmake/crypto/openssh/openbsd-compat/getopt.h - copied unchanged from r256284, head/crypto/openssh/openbsd-compat/getopt.h projects/bmake/crypto/openssh/openbsd-compat/getopt_long.c - copied unchanged from r256284, head/crypto/openssh/openbsd-compat/getopt_long.c projects/bmake/crypto/openssh/openbsd-compat/regress/ - copied from r256284, head/crypto/openssh/openbsd-compat/regress/ projects/bmake/crypto/openssh/openssh.xml.in - copied unchanged from r256284, head/crypto/openssh/openssh.xml.in projects/bmake/crypto/openssh/opensshd.init.in - copied unchanged from r256284, head/crypto/openssh/opensshd.init.in projects/bmake/crypto/openssh/regress/ - copied from r256284, head/crypto/openssh/regress/ projects/bmake/crypto/openssh/scp.0 - copied unchanged from r256284, head/crypto/openssh/scp.0 projects/bmake/crypto/openssh/sftp-server.0 - copied unchanged from r256284, head/crypto/openssh/sftp-server.0 projects/bmake/crypto/openssh/sftp.0 - copied unchanged from r256284, head/crypto/openssh/sftp.0 projects/bmake/crypto/openssh/ssh-add.0 - copied unchanged from r256284, head/crypto/openssh/ssh-add.0 projects/bmake/crypto/openssh/ssh-agent.0 - copied unchanged from r256284, head/crypto/openssh/ssh-agent.0 projects/bmake/crypto/openssh/ssh-keygen.0 - copied unchanged from r256284, head/crypto/openssh/ssh-keygen.0 projects/bmake/crypto/openssh/ssh-keyscan.0 - copied unchanged from r256284, head/crypto/openssh/ssh-keyscan.0 projects/bmake/crypto/openssh/ssh-keysign.0 - copied unchanged from r256284, head/crypto/openssh/ssh-keysign.0 projects/bmake/crypto/openssh/ssh-pkcs11-helper.0 - copied unchanged from r256284, head/crypto/openssh/ssh-pkcs11-helper.0 projects/bmake/crypto/openssh/ssh.0 - copied unchanged from r256284, head/crypto/openssh/ssh.0 projects/bmake/crypto/openssh/ssh_config.0 - copied unchanged from r256284, head/crypto/openssh/ssh_config.0 projects/bmake/crypto/openssh/sshd.0 - copied unchanged from r256284, head/crypto/openssh/sshd.0 projects/bmake/crypto/openssh/sshd_config.0 - copied unchanged from r256284, head/crypto/openssh/sshd_config.0 projects/bmake/crypto/openssh/survey.sh.in - copied unchanged from r256284, head/crypto/openssh/survey.sh.in projects/bmake/etc/rc.d/ctld - copied unchanged from r256284, head/etc/rc.d/ctld projects/bmake/etc/rc.d/iscsictl - copied unchanged from r256284, head/etc/rc.d/iscsictl projects/bmake/etc/rc.d/iscsid - copied unchanged from r256284, head/etc/rc.d/iscsid projects/bmake/etc/rc.d/local_unbound - copied unchanged from r256284, head/etc/rc.d/local_unbound projects/bmake/include/mk-osreldate.sh - copied unchanged from r256284, head/include/mk-osreldate.sh projects/bmake/lib/clang/liblldb/ - copied from r256284, head/lib/clang/liblldb/ projects/bmake/lib/clang/liblldbAPI/ - copied from r256284, head/lib/clang/liblldbAPI/ projects/bmake/lib/clang/liblldbBreakpoint/ - copied from r256284, head/lib/clang/liblldbBreakpoint/ projects/bmake/lib/clang/liblldbCommands/ - copied from r256284, head/lib/clang/liblldbCommands/ projects/bmake/lib/clang/liblldbCore/ - copied from r256284, head/lib/clang/liblldbCore/ projects/bmake/lib/clang/liblldbDataFormatters/ - copied from r256284, head/lib/clang/liblldbDataFormatters/ projects/bmake/lib/clang/liblldbExpression/ - copied from r256284, head/lib/clang/liblldbExpression/ projects/bmake/lib/clang/liblldbHostCommon/ - copied from r256284, head/lib/clang/liblldbHostCommon/ projects/bmake/lib/clang/liblldbHostFreeBSD/ - copied from r256284, head/lib/clang/liblldbHostFreeBSD/ projects/bmake/lib/clang/liblldbInterpreter/ - copied from r256284, head/lib/clang/liblldbInterpreter/ projects/bmake/lib/clang/liblldbPluginABISysV_x86_64/ - copied from r256284, head/lib/clang/liblldbPluginABISysV_x86_64/ projects/bmake/lib/clang/liblldbPluginCXXItaniumABI/ - copied from r256284, head/lib/clang/liblldbPluginCXXItaniumABI/ projects/bmake/lib/clang/liblldbPluginDisassemblerLLVM/ - copied from r256284, head/lib/clang/liblldbPluginDisassemblerLLVM/ projects/bmake/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/ - copied from r256284, head/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/ projects/bmake/lib/clang/liblldbPluginDynamicLoaderStatic/ - copied from r256284, head/lib/clang/liblldbPluginDynamicLoaderStatic/ projects/bmake/lib/clang/liblldbPluginInstructionARM/ - copied from r256284, head/lib/clang/liblldbPluginInstructionARM/ projects/bmake/lib/clang/liblldbPluginObjectContainerBSDArchive/ - copied from r256284, head/lib/clang/liblldbPluginObjectContainerBSDArchive/ projects/bmake/lib/clang/liblldbPluginObjectFileELF/ - copied from r256284, head/lib/clang/liblldbPluginObjectFileELF/ projects/bmake/lib/clang/liblldbPluginPlatformFreeBSD/ - copied from r256284, head/lib/clang/liblldbPluginPlatformFreeBSD/ projects/bmake/lib/clang/liblldbPluginPlatformGDB/ - copied from r256284, head/lib/clang/liblldbPluginPlatformGDB/ projects/bmake/lib/clang/liblldbPluginProcessElfCore/ - copied from r256284, head/lib/clang/liblldbPluginProcessElfCore/ projects/bmake/lib/clang/liblldbPluginProcessFreeBSD/ - copied from r256284, head/lib/clang/liblldbPluginProcessFreeBSD/ projects/bmake/lib/clang/liblldbPluginProcessGDBRemote/ - copied from r256284, head/lib/clang/liblldbPluginProcessGDBRemote/ projects/bmake/lib/clang/liblldbPluginProcessPOSIX/ - copied from r256284, head/lib/clang/liblldbPluginProcessPOSIX/ projects/bmake/lib/clang/liblldbPluginProcessUtility/ - copied from r256284, head/lib/clang/liblldbPluginProcessUtility/ projects/bmake/lib/clang/liblldbPluginSymbolFileDWARF/ - copied from r256284, head/lib/clang/liblldbPluginSymbolFileDWARF/ projects/bmake/lib/clang/liblldbPluginSymbolFileSymtab/ - copied from r256284, head/lib/clang/liblldbPluginSymbolFileSymtab/ projects/bmake/lib/clang/liblldbPluginSymbolVendorELF/ - copied from r256284, head/lib/clang/liblldbPluginSymbolVendorELF/ projects/bmake/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/ - copied from r256284, head/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/ projects/bmake/lib/clang/liblldbPluginUnwindAssemblyX86/ - copied from r256284, head/lib/clang/liblldbPluginUnwindAssemblyX86/ projects/bmake/lib/clang/liblldbSymbol/ - copied from r256284, head/lib/clang/liblldbSymbol/ projects/bmake/lib/clang/liblldbTarget/ - copied from r256284, head/lib/clang/liblldbTarget/ projects/bmake/lib/clang/liblldbUtility/ - copied from r256284, head/lib/clang/liblldbUtility/ projects/bmake/lib/clang/lldb.lib.mk - copied unchanged from r256284, head/lib/clang/lldb.lib.mk projects/bmake/lib/libc/sys/procctl.2 - copied unchanged from r256284, head/lib/libc/sys/procctl.2 projects/bmake/lib/libunbound/ - copied from r256284, head/lib/libunbound/ projects/bmake/share/man/man4/gpio.4 - copied unchanged from r256284, head/share/man/man4/gpio.4 projects/bmake/share/man/man9/VOP_ADVISE.9 - copied unchanged from r256284, head/share/man/man9/VOP_ADVISE.9 projects/bmake/share/man/man9/VOP_ALLOCATE.9 - copied unchanged from r256284, head/share/man/man9/VOP_ALLOCATE.9 projects/bmake/sys/cam/ctl/ctl_frontend_iscsi.c - copied unchanged from r256284, head/sys/cam/ctl/ctl_frontend_iscsi.c projects/bmake/sys/cam/ctl/ctl_frontend_iscsi.h - copied unchanged from r256284, head/sys/cam/ctl/ctl_frontend_iscsi.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_raidz.h - copied unchanged from r256284, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_raidz.h projects/bmake/sys/dev/bxe/57710_init_values.c - copied unchanged from r256284, head/sys/dev/bxe/57710_init_values.c projects/bmake/sys/dev/bxe/57710_int_offsets.h - copied unchanged from r256284, head/sys/dev/bxe/57710_int_offsets.h projects/bmake/sys/dev/bxe/57711_init_values.c - copied unchanged from r256284, head/sys/dev/bxe/57711_init_values.c projects/bmake/sys/dev/bxe/57711_int_offsets.h - copied unchanged from r256284, head/sys/dev/bxe/57711_int_offsets.h projects/bmake/sys/dev/bxe/57712_init_values.c - copied unchanged from r256284, head/sys/dev/bxe/57712_init_values.c projects/bmake/sys/dev/bxe/57712_int_offsets.h - copied unchanged from r256284, head/sys/dev/bxe/57712_int_offsets.h projects/bmake/sys/dev/bxe/bxe.c - copied unchanged from r256284, head/sys/dev/bxe/bxe.c projects/bmake/sys/dev/bxe/bxe.h - copied unchanged from r256284, head/sys/dev/bxe/bxe.h projects/bmake/sys/dev/bxe/bxe_dcb.h - copied unchanged from r256284, head/sys/dev/bxe/bxe_dcb.h projects/bmake/sys/dev/bxe/bxe_debug.c - copied unchanged from r256284, head/sys/dev/bxe/bxe_debug.c projects/bmake/sys/dev/bxe/bxe_elink.c - copied unchanged from r256284, head/sys/dev/bxe/bxe_elink.c projects/bmake/sys/dev/bxe/bxe_elink.h - copied unchanged from r256284, head/sys/dev/bxe/bxe_elink.h projects/bmake/sys/dev/bxe/bxe_stats.c - copied unchanged from r256284, head/sys/dev/bxe/bxe_stats.c projects/bmake/sys/dev/bxe/bxe_stats.h - copied unchanged from r256284, head/sys/dev/bxe/bxe_stats.h projects/bmake/sys/dev/bxe/ecore_fw_defs.h - copied unchanged from r256284, head/sys/dev/bxe/ecore_fw_defs.h projects/bmake/sys/dev/bxe/ecore_hsi.h - copied unchanged from r256284, head/sys/dev/bxe/ecore_hsi.h projects/bmake/sys/dev/bxe/ecore_init.h - copied unchanged from r256284, head/sys/dev/bxe/ecore_init.h projects/bmake/sys/dev/bxe/ecore_init_ops.h - copied unchanged from r256284, head/sys/dev/bxe/ecore_init_ops.h projects/bmake/sys/dev/bxe/ecore_mfw_req.h - copied unchanged from r256284, head/sys/dev/bxe/ecore_mfw_req.h projects/bmake/sys/dev/bxe/ecore_reg.h - copied unchanged from r256284, head/sys/dev/bxe/ecore_reg.h projects/bmake/sys/dev/bxe/ecore_sp.c - copied unchanged from r256284, head/sys/dev/bxe/ecore_sp.c projects/bmake/sys/dev/bxe/ecore_sp.h - copied unchanged from r256284, head/sys/dev/bxe/ecore_sp.h - copied from r256284, head/sys/dev/hyperv/ projects/bmake/sys/dev/iscsi/icl.c - copied unchanged from r256284, head/sys/dev/iscsi/icl.c projects/bmake/sys/dev/iscsi/icl.h - copied unchanged from r256284, head/sys/dev/iscsi/icl.h projects/bmake/sys/dev/iscsi/icl_proxy.c - copied unchanged from r256284, head/sys/dev/iscsi/icl_proxy.c projects/bmake/sys/dev/iscsi/iscsi.c - copied unchanged from r256284, head/sys/dev/iscsi/iscsi.c projects/bmake/sys/dev/iscsi/iscsi.h - copied unchanged from r256284, head/sys/dev/iscsi/iscsi.h projects/bmake/sys/dev/iscsi/iscsi_ioctl.h - copied unchanged from r256284, head/sys/dev/iscsi/iscsi_ioctl.h projects/bmake/sys/dev/iscsi/iscsi_proto.h - copied unchanged from r256284, head/sys/dev/iscsi/iscsi_proto.h projects/bmake/sys/mips/conf/WZR-300HP - copied unchanged from r256284, head/sys/mips/conf/WZR-300HP projects/bmake/sys/mips/conf/WZR-300HP.hints - copied unchanged from r256284, head/sys/mips/conf/WZR-300HP.hints - copied from r256284, head/sys/modules/hyperv/ projects/bmake/sys/modules/ibcore/ - copied from r256284, head/sys/modules/ibcore/ projects/bmake/sys/modules/ipoib/ - copied from r256284, head/sys/modules/ipoib/ projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c - copied unchanged from r256284, head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/cm.c - copied unchanged from r256284, head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c - copied unchanged from r256284, head/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c - copied unchanged from r256284, head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/bmake/sys/ofed/drivers/net/mlx4/resource_tracker.c - copied unchanged from r256284, head/sys/ofed/drivers/net/mlx4/resource_tracker.c projects/bmake/sys/ofed/drivers/net/mlx4/sys_tune.c - copied unchanged from r256284, head/sys/ofed/drivers/net/mlx4/sys_tune.c projects/bmake/sys/ofed/include/linux/atomic.h - copied unchanged from r256284, head/sys/ofed/include/linux/atomic.h projects/bmake/sys/ofed/include/linux/clocksource.h - copied unchanged from r256284, head/sys/ofed/include/linux/clocksource.h projects/bmake/sys/ofed/include/rdma/ib_pma.h - copied unchanged from r256284, head/sys/ofed/include/rdma/ib_pma.h projects/bmake/sys/powerpc/pseries/ - copied from r256284, head/sys/powerpc/pseries/ projects/bmake/sys/sys/procctl.h - copied unchanged from r256284, head/sys/sys/procctl.h projects/bmake/tools/build/options/WITHOUT_LDNS_UTILS - copied unchanged from r256284, head/tools/build/options/WITHOUT_LDNS_UTILS projects/bmake/tools/build/options/WITHOUT_UNBOUND - copied unchanged from r256284, head/tools/build/options/WITHOUT_UNBOUND projects/bmake/tools/build/options/WITH_LLDB - copied unchanged from r256284, head/tools/build/options/WITH_LLDB projects/bmake/tools/regression/iscsi/ - copied from r256284, head/tools/regression/iscsi/ projects/bmake/tools/regression/lib/libutil/test-humanize_number.c - copied unchanged from r256284, head/tools/regression/lib/libutil/test-humanize_number.c projects/bmake/tools/regression/lib/libutil/test-humanize_number.t - copied unchanged from r256284, head/tools/regression/lib/libutil/test-humanize_number.t projects/bmake/usr.bin/calendar/calcpp.c - copied unchanged from r256284, head/usr.bin/calendar/calcpp.c projects/bmake/usr.bin/clang/lldb/ - copied from r256284, head/usr.bin/clang/lldb/ projects/bmake/usr.bin/drill/ - copied from r256284, head/usr.bin/drill/ projects/bmake/usr.bin/iscsictl/ - copied from r256284, head/usr.bin/iscsictl/ projects/bmake/usr.bin/protect/ - copied from r256284, head/usr.bin/protect/ projects/bmake/usr.sbin/bhyve/ahci.h - copied unchanged from r256284, head/usr.sbin/bhyve/ahci.h projects/bmake/usr.sbin/bhyve/block_if.c - copied unchanged from r256284, head/usr.sbin/bhyve/block_if.c projects/bmake/usr.sbin/bhyve/block_if.h - copied unchanged from r256284, head/usr.sbin/bhyve/block_if.h projects/bmake/usr.sbin/bhyve/pci_ahci.c - copied unchanged from r256284, head/usr.sbin/bhyve/pci_ahci.c projects/bmake/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh - copied unchanged from r256284, head/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh projects/bmake/usr.sbin/bsdconfig/examples/browse_packages_http.sh - copied unchanged from r256284, head/usr.sbin/bsdconfig/examples/browse_packages_http.sh projects/bmake/usr.sbin/ctld/ - copied from r256284, head/usr.sbin/ctld/ projects/bmake/usr.sbin/iscsid/ - copied from r256284, head/usr.sbin/iscsid/ projects/bmake/usr.sbin/unbound/ - copied from r256284, head/usr.sbin/unbound/ Directory Properties: projects/bmake/sys/dev/hyperv/ (props changed) projects/bmake/sys/modules/hyperv/ (props changed) Deleted: projects/bmake/contrib/bind9/ projects/bmake/contrib/dialog/samples/copifuncs/ projects/bmake/contrib/dialog/samples/install/ projects/bmake/contrib/ipfilter/BSD/ projects/bmake/contrib/ipfilter/FAQ.FreeBSD projects/bmake/contrib/ipfilter/FWTK/ projects/bmake/contrib/ipfilter/FreeBSD/ projects/bmake/contrib/ipfilter/FreeBSD-2.2/ projects/bmake/contrib/ipfilter/FreeBSD-3/ projects/bmake/contrib/ipfilter/FreeBSD-4.0/ projects/bmake/contrib/ipfilter/IMPORTANT projects/bmake/contrib/ipfilter/INST.FreeBSD-2.2 projects/bmake/contrib/ipfilter/INSTALL.FreeBSD projects/bmake/contrib/ipfilter/INSTALL.xBSD projects/bmake/contrib/ipfilter/IPF.KANJI projects/bmake/contrib/ipfilter/WhatsNew40.txt projects/bmake/contrib/ipfilter/bsdinstall projects/bmake/contrib/ipfilter/etc/ projects/bmake/contrib/ipfilter/perl/ projects/bmake/contrib/ipfilter/test/ projects/bmake/contrib/ipfilter/todo projects/bmake/crypto/openssh/openbsd-compat/getopt.c projects/bmake/etc/mtree/BIND.chroot.dist projects/bmake/etc/mtree/BIND.include.dist projects/bmake/gnu/usr.bin/binutils/ar/Makefile projects/bmake/gnu/usr.bin/binutils/ar/ar.1 projects/bmake/gnu/usr.bin/binutils/ranlib/Makefile projects/bmake/gnu/usr.bin/binutils/ranlib/ranlib.1 projects/bmake/lib/bind/ projects/bmake/share/doc/bind9/ projects/bmake/sys/amd64/conf/XENHVM projects/bmake/sys/dev/bxe/bxe_debug.h projects/bmake/sys/dev/bxe/bxe_fw_defs.h projects/bmake/sys/dev/bxe/bxe_hsi.h projects/bmake/sys/dev/bxe/bxe_include.h projects/bmake/sys/dev/bxe/bxe_init.h projects/bmake/sys/dev/bxe/bxe_init_values_e1.h projects/bmake/sys/dev/bxe/bxe_init_values_e1h.h projects/bmake/sys/dev/bxe/bxe_link.c projects/bmake/sys/dev/bxe/bxe_link.h projects/bmake/sys/dev/bxe/bxe_reg.h projects/bmake/sys/dev/bxe/bxe_self_test.h projects/bmake/sys/dev/bxe/dump_e1.h projects/bmake/sys/dev/bxe/dump_e1h.h projects/bmake/sys/dev/bxe/hw_dump_reg_st.h projects/bmake/sys/dev/bxe/if_bxe.c projects/bmake/sys/dev/bxe/if_bxe.h projects/bmake/sys/i386/conf/XENHVM projects/bmake/sys/kern/uipc_cow.c projects/bmake/tools/build/options/WITHOUT_BIND projects/bmake/tools/build/options/WITHOUT_BIND_DNSSEC projects/bmake/tools/build/options/WITHOUT_BIND_ETC projects/bmake/tools/build/options/WITHOUT_BIND_LIBS_LWRES projects/bmake/tools/build/options/WITHOUT_BIND_MTREE projects/bmake/tools/build/options/WITHOUT_BIND_NAMED projects/bmake/tools/build/options/WITHOUT_BIND_UTILS projects/bmake/tools/build/options/WITH_BIND_IDN projects/bmake/tools/build/options/WITH_BIND_LARGE_FILE projects/bmake/tools/build/options/WITH_BIND_LIBS projects/bmake/tools/build/options/WITH_BIND_SIGCHASE projects/bmake/tools/build/options/WITH_BIND_XML projects/bmake/tools/build/options/WITH_LDNS_UTILS projects/bmake/usr.bin/dig/ projects/bmake/usr.bin/nslookup/ projects/bmake/usr.bin/nsupdate/ projects/bmake/usr.sbin/arpaname/ projects/bmake/usr.sbin/bsdconfig/examples/browse_packages.sh projects/bmake/usr.sbin/ddns-confgen/ projects/bmake/usr.sbin/dnssec-dsfromkey/ projects/bmake/usr.sbin/dnssec-keyfromlabel/ projects/bmake/usr.sbin/dnssec-keygen/ projects/bmake/usr.sbin/dnssec-revoke/ projects/bmake/usr.sbin/dnssec-settime/ projects/bmake/usr.sbin/dnssec-signzone/ projects/bmake/usr.sbin/dnssec-verify/ projects/bmake/usr.sbin/genrandom/ projects/bmake/usr.sbin/isc-hmac-fixup/ projects/bmake/usr.sbin/named/ projects/bmake/usr.sbin/named-checkconf/ projects/bmake/usr.sbin/named-checkzone/ projects/bmake/usr.sbin/named-journalprint/ projects/bmake/usr.sbin/nsec3hash/ projects/bmake/usr.sbin/rndc/ projects/bmake/usr.sbin/rndc-confgen/ Modified: projects/bmake/LOCKS projects/bmake/Makefile projects/bmake/Makefile.inc1 projects/bmake/ObsoleteFiles.inc projects/bmake/UPDATING projects/bmake/bin/Makefile projects/bmake/bin/dd/dd.1 projects/bmake/bin/pkill/pkill.c projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/bmake/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/bmake/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/bmake/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/bmake/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/bmake/cddl/lib/libdtrace/tcp.d projects/bmake/contrib/binutils/bfd/elflink.c projects/bmake/contrib/binutils/bfd/elfxx-mips.c projects/bmake/contrib/binutils/binutils/readelf.c projects/bmake/contrib/binutils/include/elf/common.h projects/bmake/contrib/binutils/opcodes/i386-dis.c projects/bmake/contrib/binutils/opcodes/i386-opc.h projects/bmake/contrib/binutils/opcodes/i386-opc.tbl projects/bmake/contrib/binutils/opcodes/i386-tbl.h projects/bmake/contrib/bmake/make.1 projects/bmake/contrib/dialog/CHANGES projects/bmake/contrib/dialog/VERSION projects/bmake/contrib/dialog/aclocal.m4 projects/bmake/contrib/dialog/arrows.c projects/bmake/contrib/dialog/buildlist.c projects/bmake/contrib/dialog/checklist.c projects/bmake/contrib/dialog/config.guess projects/bmake/contrib/dialog/config.sub projects/bmake/contrib/dialog/configure projects/bmake/contrib/dialog/configure.in projects/bmake/contrib/dialog/dialog.1 projects/bmake/contrib/dialog/dialog.3 projects/bmake/contrib/dialog/dialog.c projects/bmake/contrib/dialog/dialog.h projects/bmake/contrib/dialog/formbox.c projects/bmake/contrib/dialog/guage.c projects/bmake/contrib/dialog/inputstr.c projects/bmake/contrib/dialog/makefile.in projects/bmake/contrib/dialog/menubox.c projects/bmake/contrib/dialog/mixedform.c projects/bmake/contrib/dialog/package/debian/changelog projects/bmake/contrib/dialog/package/debian/copyright projects/bmake/contrib/dialog/package/dialog.spec projects/bmake/contrib/dialog/po/lt.po projects/bmake/contrib/dialog/samples/inputbox6-utf8 projects/bmake/contrib/dialog/samples/report-tempfile projects/bmake/contrib/dialog/treeview.c projects/bmake/contrib/dialog/util.c projects/bmake/contrib/ipfilter/ip_fil.c projects/bmake/contrib/ldns/ldns/dnssec_verify.h projects/bmake/contrib/ldns/ldns/util.h projects/bmake/contrib/libc++/include/memory projects/bmake/contrib/libcxxrt/libelftc_dem_gnu3.c projects/bmake/contrib/libcxxrt/typeinfo.cc projects/bmake/contrib/libcxxrt/unwind-itanium.h projects/bmake/contrib/llvm/include/llvm/IR/CallingConv.h projects/bmake/contrib/llvm/lib/AsmParser/LLLexer.cpp projects/bmake/contrib/llvm/lib/AsmParser/LLParser.cpp projects/bmake/contrib/llvm/lib/AsmParser/LLToken.h projects/bmake/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp projects/bmake/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp projects/bmake/contrib/llvm/lib/IR/AsmWriter.cpp projects/bmake/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp projects/bmake/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp projects/bmake/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp projects/bmake/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp projects/bmake/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp projects/bmake/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp projects/bmake/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp projects/bmake/contrib/llvm/lib/Target/R600/AMDILISelDAGToDAG.cpp projects/bmake/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp projects/bmake/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp projects/bmake/contrib/llvm/lib/Target/X86/X86CallingConv.td projects/bmake/contrib/llvm/lib/Target/X86/X86FastISel.cpp projects/bmake/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp projects/bmake/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp projects/bmake/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/bmake/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp projects/bmake/contrib/llvm/lib/Target/X86/X86Subtarget.h projects/bmake/contrib/llvm/tools/clang/include/clang-c/Index.h projects/bmake/contrib/llvm/tools/clang/include/clang/AST/Type.h projects/bmake/contrib/llvm/tools/clang/include/clang/Basic/Attr.td projects/bmake/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h projects/bmake/contrib/llvm/tools/clang/lib/AST/DumpXML.cpp projects/bmake/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp projects/bmake/contrib/llvm/tools/clang/lib/AST/Type.cpp projects/bmake/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp projects/bmake/contrib/llvm/tools/clang/lib/Basic/Targets.cpp projects/bmake/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp projects/bmake/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp projects/bmake/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp projects/bmake/contrib/llvm/tools/lldb/source/lldb.cpp projects/bmake/contrib/unbound/config.h.in projects/bmake/contrib/unbound/configure projects/bmake/contrib/unbound/configure.ac projects/bmake/contrib/unbound/daemon/cachedump.c projects/bmake/contrib/unbound/daemon/remote.c projects/bmake/contrib/unbound/daemon/remote.h projects/bmake/contrib/unbound/daemon/unbound.c projects/bmake/contrib/unbound/daemon/worker.c projects/bmake/contrib/unbound/daemon/worker.h projects/bmake/contrib/unbound/libunbound/context.c projects/bmake/contrib/unbound/libunbound/context.h projects/bmake/contrib/unbound/libunbound/libunbound.c projects/bmake/contrib/unbound/libunbound/libworker.c projects/bmake/contrib/unbound/libunbound/libworker.h projects/bmake/contrib/unbound/libunbound/unbound.h projects/bmake/contrib/unbound/smallapp/unbound-anchor.c projects/bmake/contrib/unbound/smallapp/unbound-control-setup.sh projects/bmake/contrib/unbound/smallapp/worker_cb.c projects/bmake/contrib/unbound/util/config_file.c projects/bmake/contrib/unbound/util/config_file.h projects/bmake/contrib/unbound/util/configlexer.c projects/bmake/contrib/unbound/util/configparser.c projects/bmake/contrib/unbound/util/configparser.h projects/bmake/contrib/unbound/util/fptr_wlist.c projects/bmake/crypto/openssh/ChangeLog projects/bmake/crypto/openssh/FREEBSD-upgrade projects/bmake/crypto/openssh/README projects/bmake/crypto/openssh/aclocal.m4 projects/bmake/crypto/openssh/addrmatch.c projects/bmake/crypto/openssh/auth-chall.c projects/bmake/crypto/openssh/auth-krb5.c projects/bmake/crypto/openssh/auth-options.c projects/bmake/crypto/openssh/auth-pam.c projects/bmake/crypto/openssh/auth-rsa.c projects/bmake/crypto/openssh/auth.c projects/bmake/crypto/openssh/auth.h projects/bmake/crypto/openssh/auth1.c projects/bmake/crypto/openssh/auth2-chall.c projects/bmake/crypto/openssh/auth2-gss.c projects/bmake/crypto/openssh/auth2-hostbased.c projects/bmake/crypto/openssh/auth2-jpake.c projects/bmake/crypto/openssh/auth2-kbdint.c projects/bmake/crypto/openssh/auth2-passwd.c projects/bmake/crypto/openssh/auth2-pubkey.c projects/bmake/crypto/openssh/auth2.c projects/bmake/crypto/openssh/authfd.c projects/bmake/crypto/openssh/authfile.c projects/bmake/crypto/openssh/bufaux.c projects/bmake/crypto/openssh/bufbn.c projects/bmake/crypto/openssh/bufec.c projects/bmake/crypto/openssh/buffer.c projects/bmake/crypto/openssh/buffer.h projects/bmake/crypto/openssh/canohost.c projects/bmake/crypto/openssh/channels.c projects/bmake/crypto/openssh/channels.h projects/bmake/crypto/openssh/cipher-3des1.c projects/bmake/crypto/openssh/cipher-aes.c projects/bmake/crypto/openssh/cipher-ctr.c projects/bmake/crypto/openssh/cipher.c projects/bmake/crypto/openssh/cipher.h projects/bmake/crypto/openssh/clientloop.c projects/bmake/crypto/openssh/clientloop.h projects/bmake/crypto/openssh/compat.c projects/bmake/crypto/openssh/config.guess projects/bmake/crypto/openssh/config.h projects/bmake/crypto/openssh/config.h.in projects/bmake/crypto/openssh/defines.h projects/bmake/crypto/openssh/dh.c projects/bmake/crypto/openssh/dns.c projects/bmake/crypto/openssh/groupaccess.c projects/bmake/crypto/openssh/gss-genr.c projects/bmake/crypto/openssh/gss-serv-krb5.c projects/bmake/crypto/openssh/gss-serv.c projects/bmake/crypto/openssh/hostfile.c projects/bmake/crypto/openssh/hostfile.h projects/bmake/crypto/openssh/includes.h projects/bmake/crypto/openssh/jpake.c projects/bmake/crypto/openssh/kex.c projects/bmake/crypto/openssh/kex.h projects/bmake/crypto/openssh/kexdhc.c projects/bmake/crypto/openssh/kexdhs.c projects/bmake/crypto/openssh/kexecdh.c projects/bmake/crypto/openssh/kexecdhc.c projects/bmake/crypto/openssh/kexecdhs.c projects/bmake/crypto/openssh/kexgexc.c projects/bmake/crypto/openssh/kexgexs.c projects/bmake/crypto/openssh/key.c projects/bmake/crypto/openssh/key.h projects/bmake/crypto/openssh/krl.c projects/bmake/crypto/openssh/log.c projects/bmake/crypto/openssh/log.h projects/bmake/crypto/openssh/loginrec.c projects/bmake/crypto/openssh/mac.c projects/bmake/crypto/openssh/mac.h projects/bmake/crypto/openssh/match.c projects/bmake/crypto/openssh/misc.c projects/bmake/crypto/openssh/misc.h projects/bmake/crypto/openssh/moduli.c projects/bmake/crypto/openssh/monitor.c projects/bmake/crypto/openssh/monitor_mm.c projects/bmake/crypto/openssh/monitor_wrap.c projects/bmake/crypto/openssh/mux.c projects/bmake/crypto/openssh/myproposal.h projects/bmake/crypto/openssh/openbsd-compat/bsd-cygwin_util.c projects/bmake/crypto/openssh/openbsd-compat/bsd-cygwin_util.h projects/bmake/crypto/openssh/openbsd-compat/bsd-misc.h projects/bmake/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c projects/bmake/crypto/openssh/openbsd-compat/openbsd-compat.h projects/bmake/crypto/openssh/openbsd-compat/port-aix.c projects/bmake/crypto/openssh/openbsd-compat/port-linux.c projects/bmake/crypto/openssh/openbsd-compat/xcrypt.c projects/bmake/crypto/openssh/packet.c projects/bmake/crypto/openssh/packet.h projects/bmake/crypto/openssh/pathnames.h projects/bmake/crypto/openssh/progressmeter.c projects/bmake/crypto/openssh/readconf.c projects/bmake/crypto/openssh/readconf.h projects/bmake/crypto/openssh/readpass.c projects/bmake/crypto/openssh/roaming_client.c projects/bmake/crypto/openssh/roaming_common.c projects/bmake/crypto/openssh/rsa.c projects/bmake/crypto/openssh/sandbox-seccomp-filter.c projects/bmake/crypto/openssh/sandbox-systrace.c projects/bmake/crypto/openssh/schnorr.c projects/bmake/crypto/openssh/scp.1 projects/bmake/crypto/openssh/scp.c projects/bmake/crypto/openssh/servconf.c projects/bmake/crypto/openssh/servconf.h projects/bmake/crypto/openssh/serverloop.c projects/bmake/crypto/openssh/session.c projects/bmake/crypto/openssh/sftp-client.c projects/bmake/crypto/openssh/sftp-client.h projects/bmake/crypto/openssh/sftp-common.c projects/bmake/crypto/openssh/sftp-glob.c projects/bmake/crypto/openssh/sftp-server.8 projects/bmake/crypto/openssh/sftp-server.c projects/bmake/crypto/openssh/sftp.1 projects/bmake/crypto/openssh/sftp.c projects/bmake/crypto/openssh/ssh-add.c projects/bmake/crypto/openssh/ssh-agent.c projects/bmake/crypto/openssh/ssh-dss.c projects/bmake/crypto/openssh/ssh-ecdsa.c projects/bmake/crypto/openssh/ssh-gss.h projects/bmake/crypto/openssh/ssh-keygen.1 projects/bmake/crypto/openssh/ssh-keygen.c projects/bmake/crypto/openssh/ssh-keyscan.1 projects/bmake/crypto/openssh/ssh-keyscan.c projects/bmake/crypto/openssh/ssh-keysign.8 projects/bmake/crypto/openssh/ssh-keysign.c projects/bmake/crypto/openssh/ssh-pkcs11-client.c projects/bmake/crypto/openssh/ssh-pkcs11-helper.8 projects/bmake/crypto/openssh/ssh-pkcs11-helper.c projects/bmake/crypto/openssh/ssh-pkcs11.c projects/bmake/crypto/openssh/ssh-rsa.c projects/bmake/crypto/openssh/ssh.1 projects/bmake/crypto/openssh/ssh.c projects/bmake/crypto/openssh/ssh_config projects/bmake/crypto/openssh/ssh_config.5 projects/bmake/crypto/openssh/ssh_namespace.h projects/bmake/crypto/openssh/sshconnect.c projects/bmake/crypto/openssh/sshconnect1.c projects/bmake/crypto/openssh/sshconnect2.c projects/bmake/crypto/openssh/sshd.8 projects/bmake/crypto/openssh/sshd.c projects/bmake/crypto/openssh/sshd_config projects/bmake/crypto/openssh/sshd_config.5 projects/bmake/crypto/openssh/sshlogin.c projects/bmake/crypto/openssh/sshlogin.h projects/bmake/crypto/openssh/uidswap.c projects/bmake/crypto/openssh/umac.c projects/bmake/crypto/openssh/umac.h projects/bmake/crypto/openssh/umac128.c projects/bmake/crypto/openssh/uuencode.c projects/bmake/crypto/openssh/version.h projects/bmake/crypto/openssh/xmalloc.c projects/bmake/crypto/openssh/xmalloc.h projects/bmake/etc/Makefile projects/bmake/etc/defaults/periodic.conf projects/bmake/etc/defaults/rc.conf projects/bmake/etc/ftpusers projects/bmake/etc/group projects/bmake/etc/master.passwd projects/bmake/etc/mtree/BSD.include.dist projects/bmake/etc/mtree/BSD.var.dist projects/bmake/etc/mtree/Makefile projects/bmake/etc/network.subr projects/bmake/etc/periodic/daily/Makefile projects/bmake/etc/portsnap.conf projects/bmake/etc/rc.d/Makefile projects/bmake/etc/rc.d/NETWORKING projects/bmake/etc/rc.d/jail projects/bmake/etc/rc.d/netif projects/bmake/etc/rc.d/sendmail projects/bmake/etc/rc.d/sshd projects/bmake/etc/rc.subr projects/bmake/games/fortune/datfiles/freebsd-tips projects/bmake/gnu/lib/libdialog/dlg_config.h projects/bmake/gnu/lib/libstdc++/Makefile projects/bmake/gnu/lib/libsupc++/Makefile projects/bmake/gnu/usr.bin/binutils/Makefile projects/bmake/gnu/usr.bin/groff/tmac/mdoc.local projects/bmake/include/Makefile projects/bmake/include/paths.h projects/bmake/lib/Makefile projects/bmake/lib/clang/Makefile projects/bmake/lib/clang/libllvmmc/Makefile projects/bmake/lib/clang/libllvmsupport/Makefile projects/bmake/lib/clang/libllvmx86disassembler/Makefile projects/bmake/lib/csu/arm/crt1.c projects/bmake/lib/csu/common/notes.h projects/bmake/lib/libarchive/Makefile projects/bmake/lib/libc/gen/lockf.3 projects/bmake/lib/libc/net/sctp_sys_calls.c projects/bmake/lib/libc/sys/Makefile.inc projects/bmake/lib/libc/sys/Symbol.map projects/bmake/lib/libc/sys/accept.2 projects/bmake/lib/libc/sys/close.2 projects/bmake/lib/libc/sys/ioctl.2 projects/bmake/lib/libc/sys/read.2 projects/bmake/lib/libc/sys/socketpair.2 projects/bmake/lib/libc/sys/write.2 projects/bmake/lib/libedit/readline.c projects/bmake/lib/libprocstat/libprocstat.c projects/bmake/lib/libstand/tftp.c projects/bmake/lib/libutil/humanize_number.3 projects/bmake/lib/libutil/humanize_number.c projects/bmake/lib/libvmmapi/vmmapi.c projects/bmake/lib/libvmmapi/vmmapi.h projects/bmake/lib/msun/Symbol.map projects/bmake/libexec/rtld-elf/libmap.c projects/bmake/libexec/rtld-elf/libmap.h projects/bmake/libexec/rtld-elf/rtld.c projects/bmake/libexec/rtld-elf/rtld.h projects/bmake/release/Makefile projects/bmake/release/powerpc/mkisoimages.sh projects/bmake/release/release.sh projects/bmake/sbin/bsdlabel/bsdlabel.8 projects/bmake/sbin/camcontrol/camcontrol.c projects/bmake/sbin/camcontrol/fwdownload.c projects/bmake/sbin/ccdconfig/ccdconfig.8 projects/bmake/sbin/etherswitchcfg/etherswitchcfg.8 projects/bmake/sbin/etherswitchcfg/etherswitchcfg.c projects/bmake/sbin/fdisk/fdisk.8 projects/bmake/sbin/gbde/gbde.8 projects/bmake/sbin/geom/class/eli/geli.8 projects/bmake/sbin/geom/class/shsec/gshsec.8 projects/bmake/sbin/geom/class/virstor/gvirstor.8 projects/bmake/sbin/gvinum/gvinum.8 projects/bmake/sbin/hastd/hast.h projects/bmake/sbin/hastd/primary.c projects/bmake/sbin/hastd/secondary.c projects/bmake/sbin/iscontrol/iscontrol.8 projects/bmake/sbin/iscontrol/iscsi.conf.5 projects/bmake/sbin/mount_msdosfs/mount_msdosfs.8 projects/bmake/sbin/newfs/newfs.8 projects/bmake/sbin/newfs_msdos/newfs_msdos.8 projects/bmake/sbin/newfs_nandfs/newfs_nandfs.8 projects/bmake/sbin/nvmecontrol/perftest.c projects/bmake/sbin/recoverdisk/recoverdisk.1 projects/bmake/sbin/route/route.c projects/bmake/secure/lib/libssh/Makefile projects/bmake/secure/usr.bin/bdes/bdes.1 projects/bmake/secure/usr.bin/ssh/Makefile projects/bmake/secure/usr.sbin/sshd/Makefile projects/bmake/share/doc/Makefile projects/bmake/share/examples/bhyve/vmrun.sh projects/bmake/share/i18n/csmapper/Makefile projects/bmake/share/i18n/esdb/Makefile projects/bmake/share/man/man4/Makefile projects/bmake/share/man/man4/altera_avgen.4 projects/bmake/share/man/man4/altq.4 projects/bmake/share/man/man4/bxe.4 projects/bmake/share/man/man4/capsicum.4 projects/bmake/share/man/man4/ctl.4 projects/bmake/share/man/man4/ddb.4 projects/bmake/share/man/man4/geom_linux_lvm.4 projects/bmake/share/man/man4/netmap.4 projects/bmake/share/man/man4/psm.4 projects/bmake/share/man/man4/rsu.4 projects/bmake/share/man/man4/urtwn.4 projects/bmake/share/man/man4/vlan.4 projects/bmake/share/man/man5/Makefile projects/bmake/share/man/man5/ext2fs.5 projects/bmake/share/man/man5/fstab.5 projects/bmake/share/man/man5/libmap.conf.5 projects/bmake/share/man/man5/msdosfs.5 projects/bmake/share/man/man5/rc.conf.5 projects/bmake/share/man/man5/reiserfs.5 projects/bmake/share/man/man5/src.conf.5 projects/bmake/share/man/man8/picobsd.8 projects/bmake/share/man/man8/rc.8 projects/bmake/share/man/man8/rc.subr.8 projects/bmake/share/man/man9/Makefile projects/bmake/share/man/man9/VOP_FSYNC.9 projects/bmake/share/man/man9/firmware.9 projects/bmake/share/man/man9/lock.9 projects/bmake/share/man/man9/sysctl.9 projects/bmake/share/man/man9/sysctl_add_oid.9 projects/bmake/share/man/man9/vm_map_find.9 projects/bmake/share/man/man9/vm_page_grab.9 projects/bmake/share/man/man9/vnode.9 projects/bmake/share/misc/bsd-family-tree projects/bmake/share/misc/committers-ports.dot projects/bmake/share/misc/committers-src.dot projects/bmake/share/mk/bsd.libnames.mk projects/bmake/share/mk/bsd.own.mk projects/bmake/sys/amd64/amd64/machdep.c projects/bmake/sys/amd64/amd64/mp_machdep.c projects/bmake/sys/amd64/amd64/pmap.c projects/bmake/sys/amd64/amd64/sys_machdep.c projects/bmake/sys/amd64/amd64/trap.c projects/bmake/sys/amd64/amd64/vm_machdep.c projects/bmake/sys/amd64/conf/GENERIC projects/bmake/sys/amd64/conf/NOTES projects/bmake/sys/amd64/include/cpu.h projects/bmake/sys/amd64/include/intr_machdep.h projects/bmake/sys/amd64/include/pcpu.h projects/bmake/sys/amd64/include/pmap.h projects/bmake/sys/amd64/include/vmm.h (contents, props changed) projects/bmake/sys/amd64/include/vmm_dev.h (contents, props changed) projects/bmake/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/bmake/sys/amd64/linux32/linux32_proto.h projects/bmake/sys/amd64/linux32/linux32_syscall.h projects/bmake/sys/amd64/linux32/linux32_syscalls.c projects/bmake/sys/amd64/linux32/linux32_sysent.c projects/bmake/sys/amd64/vmm/amd/amdv.c projects/bmake/sys/amd64/vmm/intel/ept.c projects/bmake/sys/amd64/vmm/intel/ept.h projects/bmake/sys/amd64/vmm/intel/vmcs.c projects/bmake/sys/amd64/vmm/intel/vmcs.h projects/bmake/sys/amd64/vmm/intel/vmx.c projects/bmake/sys/amd64/vmm/intel/vmx.h projects/bmake/sys/amd64/vmm/intel/vmx_genassym.c projects/bmake/sys/amd64/vmm/intel/vmx_support.S projects/bmake/sys/amd64/vmm/io/ppt.c projects/bmake/sys/amd64/vmm/io/ppt.h projects/bmake/sys/amd64/vmm/vmm.c projects/bmake/sys/amd64/vmm/vmm_dev.c projects/bmake/sys/amd64/vmm/vmm_instruction_emul.c projects/bmake/sys/amd64/vmm/vmm_mem.c projects/bmake/sys/amd64/vmm/vmm_mem.h projects/bmake/sys/amd64/vmm/vmm_msr.c projects/bmake/sys/amd64/vmm/x86.c projects/bmake/sys/arm/arm/pmap-v6.c projects/bmake/sys/arm/arm/pmap.c projects/bmake/sys/arm/arm/stdatomic.c projects/bmake/sys/arm/arm/sys_machdep.c projects/bmake/sys/arm/arm/vm_machdep.c projects/bmake/sys/arm/broadcom/bcm2835/bcm2835_systimer.c projects/bmake/sys/arm/s3c2xx0/uart_bus_s3c2410.c projects/bmake/sys/arm/s3c2xx0/uart_cpu_s3c2410.c projects/bmake/sys/arm/samsung/exynos/exynos5_machdep.c projects/bmake/sys/boot/arm/ixp425/boot2/Makefile projects/bmake/sys/boot/common/loader.8 projects/bmake/sys/boot/i386/efi/Makefile projects/bmake/sys/boot/powerpc/boot1.chrp/Makefile projects/bmake/sys/boot/userboot/libstand/Makefile projects/bmake/sys/boot/userboot/test/Makefile projects/bmake/sys/boot/userboot/userboot/Makefile projects/bmake/sys/cam/cam.h projects/bmake/sys/cam/cam_ccb.h projects/bmake/sys/cam/cam_compat.c projects/bmake/sys/cam/cam_compat.h projects/bmake/sys/cam/cam_xpt.c projects/bmake/sys/cam/ctl/ctl.c projects/bmake/sys/cam/ctl/ctl_ioctl.h projects/bmake/sys/cam/scsi/scsi_pass.c projects/bmake/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/bmake/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/bmake/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/bmake/sys/cddl/dev/dtrace/dtrace_load.c projects/bmake/sys/cddl/dev/dtrace/dtrace_unload.c projects/bmake/sys/compat/freebsd32/freebsd32.h projects/bmake/sys/compat/freebsd32/freebsd32_capability.c projects/bmake/sys/compat/freebsd32/freebsd32_misc.c projects/bmake/sys/compat/freebsd32/freebsd32_proto.h projects/bmake/sys/compat/freebsd32/freebsd32_syscall.h projects/bmake/sys/compat/freebsd32/freebsd32_syscalls.c projects/bmake/sys/compat/freebsd32/freebsd32_sysent.c projects/bmake/sys/compat/freebsd32/freebsd32_systrace_args.c projects/bmake/sys/compat/freebsd32/syscalls.master projects/bmake/sys/compat/linux/linux_futex.c projects/bmake/sys/compat/linux/linux_uid16.c projects/bmake/sys/conf/NOTES projects/bmake/sys/conf/files projects/bmake/sys/conf/files.amd64 projects/bmake/sys/conf/files.i386 projects/bmake/sys/conf/files.powerpc projects/bmake/sys/conf/newvers.sh projects/bmake/sys/conf/options projects/bmake/sys/conf/options.mips projects/bmake/sys/conf/options.powerpc projects/bmake/sys/contrib/ipfilter/netinet/ip_compat.h projects/bmake/sys/contrib/ipfilter/netinet/ip_fil.h projects/bmake/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) projects/bmake/sys/contrib/ipfilter/netinet/ip_log.c projects/bmake/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c projects/bmake/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c projects/bmake/sys/contrib/ipfilter/netinet/mlfk_ipl.c projects/bmake/sys/contrib/rdma/ib_umem.h projects/bmake/sys/dev/acpica/acpi_timer.c projects/bmake/sys/dev/adb/adb_mouse.c projects/bmake/sys/dev/arcmsr/arcmsr.c projects/bmake/sys/dev/asr/asr.c projects/bmake/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/bmake/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c projects/bmake/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/bmake/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/bmake/sys/dev/cxgbe/t4_main.c projects/bmake/sys/dev/cxgbe/t4_sge.c projects/bmake/sys/dev/drm2/radeon/r100.c projects/bmake/sys/dev/drm2/radeon/r300.c projects/bmake/sys/dev/drm2/radeon/radeon_bios.c projects/bmake/sys/dev/drm2/radeon/radeon_device.c projects/bmake/sys/dev/drm2/radeon/rs600.c projects/bmake/sys/dev/e1000/e1000_80003es2lan.c projects/bmake/sys/dev/e1000/e1000_80003es2lan.h projects/bmake/sys/dev/e1000/e1000_82571.c projects/bmake/sys/dev/e1000/e1000_82575.c projects/bmake/sys/dev/e1000/e1000_82575.h projects/bmake/sys/dev/e1000/e1000_api.c projects/bmake/sys/dev/e1000/e1000_defines.h projects/bmake/sys/dev/e1000/e1000_hw.h projects/bmake/sys/dev/e1000/e1000_i210.c projects/bmake/sys/dev/e1000/e1000_i210.h projects/bmake/sys/dev/e1000/e1000_ich8lan.c projects/bmake/sys/dev/e1000/e1000_ich8lan.h projects/bmake/sys/dev/e1000/e1000_mac.c projects/bmake/sys/dev/e1000/e1000_osdep.h projects/bmake/sys/dev/e1000/e1000_phy.c projects/bmake/sys/dev/e1000/e1000_phy.h projects/bmake/sys/dev/e1000/e1000_regs.h projects/bmake/sys/dev/e1000/e1000_vf.h projects/bmake/sys/dev/e1000/if_igb.c projects/bmake/sys/dev/e1000/if_igb.h projects/bmake/sys/dev/firewire/sbp.c projects/bmake/sys/dev/hpt27xx/hpt27xx_osm_bsd.c projects/bmake/sys/dev/hpt27xx/os_bsd.h projects/bmake/sys/dev/hptiop/hptiop.c projects/bmake/sys/dev/hptiop/hptiop.h projects/bmake/sys/dev/hptmv/entry.c projects/bmake/sys/dev/hptmv/osbsd.h projects/bmake/sys/dev/hptnr/hptnr_osm_bsd.c projects/bmake/sys/dev/hptnr/os_bsd.h projects/bmake/sys/dev/hptrr/hptrr_osm_bsd.c projects/bmake/sys/dev/hptrr/os_bsd.h projects/bmake/sys/dev/iir/iir.c projects/bmake/sys/dev/iir/iir.h projects/bmake/sys/dev/isci/isci.c projects/bmake/sys/dev/isci/isci_io_request.c projects/bmake/sys/dev/isci/isci_sysctl.c projects/bmake/sys/dev/isci/isci_task_request.c projects/bmake/sys/dev/iscsi_initiator/iscsi.c projects/bmake/sys/dev/ixgbe/ixgbe.c projects/bmake/sys/dev/mfi/mfi_pci.c projects/bmake/sys/dev/mfi/mfireg.h projects/bmake/sys/dev/mps/mps_sas_lsi.c projects/bmake/sys/dev/netmap/if_igb_netmap.h projects/bmake/sys/dev/nfe/if_nfe.c projects/bmake/sys/dev/nvd/nvd.c projects/bmake/sys/dev/nvme/nvme.c projects/bmake/sys/dev/nvme/nvme.h projects/bmake/sys/dev/nvme/nvme_ctrlr.c projects/bmake/sys/dev/nvme/nvme_ns.c projects/bmake/sys/dev/nvme/nvme_private.h projects/bmake/sys/dev/nvme/nvme_test.c projects/bmake/sys/dev/ofw/ofw_bus_subr.c projects/bmake/sys/dev/ofw/openfirm.c projects/bmake/sys/dev/ofw/openfirm.h projects/bmake/sys/dev/pci/vga_pci.c projects/bmake/sys/dev/random/ivy.c projects/bmake/sys/dev/tws/tws.c projects/bmake/sys/dev/tws/tws_cam.c projects/bmake/sys/dev/usb/controller/xhci.c projects/bmake/sys/dev/usb/controller/xhci.h projects/bmake/sys/dev/usb/controller/xhci_pci.c projects/bmake/sys/dev/usb/usb_hub.c projects/bmake/sys/dev/virtio/network/if_vtnet.c projects/bmake/sys/dev/xen/control/control.c projects/bmake/sys/dev/xen/timer/timer.c projects/bmake/sys/dev/xen/xenpci/xenpci.c projects/bmake/sys/fs/cd9660/cd9660_vfsops.c projects/bmake/sys/geom/geom_int.h projects/bmake/sys/geom/geom_kern.c projects/bmake/sys/geom/geom_subr.c projects/bmake/sys/i386/conf/GENERIC projects/bmake/sys/i386/conf/NOTES projects/bmake/sys/i386/i386/mp_machdep.c projects/bmake/sys/i386/i386/pmap.c projects/bmake/sys/i386/i386/sys_machdep.c projects/bmake/sys/i386/i386/vm_machdep.c projects/bmake/sys/i386/ibcs2/ibcs2_sysvec.c projects/bmake/sys/i386/include/cpu.h projects/bmake/sys/i386/include/intr_machdep.h projects/bmake/sys/i386/include/pcpu.h projects/bmake/sys/i386/include/xen/xen-os.h projects/bmake/sys/i386/include/xen/xenvar.h projects/bmake/sys/i386/linux/linux_proto.h projects/bmake/sys/i386/linux/linux_syscall.h projects/bmake/sys/i386/linux/linux_syscalls.c projects/bmake/sys/i386/linux/linux_sysent.c projects/bmake/sys/i386/xen/mp_machdep.c projects/bmake/sys/i386/xen/mptable.c projects/bmake/sys/i386/xen/pmap.c projects/bmake/sys/ia64/ia64/pmap.c projects/bmake/sys/kern/init_main.c projects/bmake/sys/kern/init_sysent.c projects/bmake/sys/kern/kern_condvar.c projects/bmake/sys/kern/kern_descrip.c projects/bmake/sys/kern/kern_event.c projects/bmake/sys/kern/kern_fork.c projects/bmake/sys/kern/kern_ktrace.c projects/bmake/sys/kern/kern_lock.c projects/bmake/sys/kern/kern_malloc.c projects/bmake/sys/kern/kern_mbuf.c projects/bmake/sys/kern/kern_mutex.c projects/bmake/sys/kern/kern_proc.c projects/bmake/sys/kern/kern_rmlock.c projects/bmake/sys/kern/kern_rwlock.c projects/bmake/sys/kern/kern_sx.c projects/bmake/sys/kern/kern_synch.c projects/bmake/sys/kern/kern_timeout.c projects/bmake/sys/kern/makesyscalls.sh projects/bmake/sys/kern/subr_prf.c projects/bmake/sys/kern/subr_sbuf.c projects/bmake/sys/kern/subr_smp.c projects/bmake/sys/kern/subr_uio.c projects/bmake/sys/kern/sys_process.c projects/bmake/sys/kern/syscalls.c projects/bmake/sys/kern/syscalls.master projects/bmake/sys/kern/systrace_args.c projects/bmake/sys/kern/uipc_sockbuf.c projects/bmake/sys/kern/uipc_socket.c projects/bmake/sys/kern/uipc_syscalls.c projects/bmake/sys/kern/uipc_usrreq.c projects/bmake/sys/kern/vfs_bio.c projects/bmake/sys/kern/vfs_lookup.c projects/bmake/sys/kern/vfs_mount.c projects/bmake/sys/kern/vfs_subr.c projects/bmake/sys/kern/vfs_vnops.c projects/bmake/sys/libkern/arm/aeabi_unwind.c projects/bmake/sys/libkern/ashldi3.c projects/bmake/sys/mips/atheros/apb.c projects/bmake/sys/mips/atheros/ar71xxreg.h projects/bmake/sys/mips/atheros/ar933x_chip.c projects/bmake/sys/mips/atheros/ar934xreg.h projects/bmake/sys/mips/conf/AR934X_BASE projects/bmake/sys/mips/conf/MALTA projects/bmake/sys/mips/conf/TP-WN1043ND projects/bmake/sys/mips/include/asm.h projects/bmake/sys/mips/include/cpuregs.h projects/bmake/sys/mips/mips/bus_space_generic.c projects/bmake/sys/mips/mips/elf_trampoline.c projects/bmake/sys/mips/mips/pmap.c projects/bmake/sys/mips/mips/tlb.c projects/bmake/sys/mips/mips/vm_machdep.c projects/bmake/sys/mips/nlm/dev/sec/nlmrsa.c projects/bmake/sys/mips/nlm/dev/sec/nlmrsalib.h projects/bmake/sys/modules/Makefile projects/bmake/sys/modules/bxe/Makefile projects/bmake/sys/modules/ctl/Makefile projects/bmake/sys/modules/cxgb/cxgb/Makefile projects/bmake/sys/modules/iscsi/Makefile projects/bmake/sys/modules/mlx4/Makefile projects/bmake/sys/modules/mlx4ib/Makefile projects/bmake/sys/modules/sfxge/Makefile projects/bmake/sys/modules/ti/Makefile projects/bmake/sys/net/if.h projects/bmake/sys/net/if_enc.c projects/bmake/sys/net/if_ethersubr.c projects/bmake/sys/net/if_lagg.c projects/bmake/sys/net/if_tap.c projects/bmake/sys/net/if_tun.c projects/bmake/sys/netinet/in_kdtrace.c projects/bmake/sys/netinet/ip_input.c projects/bmake/sys/netinet/tcp_input.c projects/bmake/sys/netinet/tcp_syncache.h projects/bmake/sys/netinet/tcp_var.h projects/bmake/sys/netinet6/frag6.c projects/bmake/sys/netinet6/in6_ifattach.c projects/bmake/sys/netinet6/ip6_input.c projects/bmake/sys/netinet6/ip6_mroute.c projects/bmake/sys/netpfil/ipfw/ip_fw_log.c projects/bmake/sys/ofed/drivers/infiniband/core/addr.c projects/bmake/sys/ofed/drivers/infiniband/core/cma.c projects/bmake/sys/ofed/drivers/infiniband/core/core_priv.h projects/bmake/sys/ofed/drivers/infiniband/core/device.c projects/bmake/sys/ofed/drivers/infiniband/core/sa_query.c projects/bmake/sys/ofed/drivers/infiniband/core/sysfs.c projects/bmake/sys/ofed/drivers/infiniband/core/ucm.c projects/bmake/sys/ofed/drivers/infiniband/core/umem.c projects/bmake/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/bmake/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/bmake/sys/ofed/drivers/infiniband/core/verbs.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/Kconfig projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/Makefile projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/cq.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/srq.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/user.h projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/wc.c projects/bmake/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c projects/bmake/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c projects/bmake/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c projects/bmake/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/bmake/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/bmake/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/bmake/sys/ofed/drivers/net/mlx4/Makefile projects/bmake/sys/ofed/drivers/net/mlx4/alloc.c projects/bmake/sys/ofed/drivers/net/mlx4/catas.c projects/bmake/sys/ofed/drivers/net/mlx4/cmd.c projects/bmake/sys/ofed/drivers/net/mlx4/cq.c projects/bmake/sys/ofed/drivers/net/mlx4/en_cq.c projects/bmake/sys/ofed/drivers/net/mlx4/en_main.c projects/bmake/sys/ofed/drivers/net/mlx4/en_netdev.c projects/bmake/sys/ofed/drivers/net/mlx4/en_port.c projects/bmake/sys/ofed/drivers/net/mlx4/en_port.h projects/bmake/sys/ofed/drivers/net/mlx4/en_rx.c projects/bmake/sys/ofed/drivers/net/mlx4/en_tx.c projects/bmake/sys/ofed/drivers/net/mlx4/eq.c projects/bmake/sys/ofed/drivers/net/mlx4/fw.c projects/bmake/sys/ofed/drivers/net/mlx4/fw.h projects/bmake/sys/ofed/drivers/net/mlx4/icm.c projects/bmake/sys/ofed/drivers/net/mlx4/icm.h projects/bmake/sys/ofed/drivers/net/mlx4/intf.c projects/bmake/sys/ofed/drivers/net/mlx4/main.c projects/bmake/sys/ofed/drivers/net/mlx4/mcg.c projects/bmake/sys/ofed/drivers/net/mlx4/mlx4.h projects/bmake/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/bmake/sys/ofed/drivers/net/mlx4/mr.c projects/bmake/sys/ofed/drivers/net/mlx4/pd.c projects/bmake/sys/ofed/drivers/net/mlx4/port.c projects/bmake/sys/ofed/drivers/net/mlx4/profile.c projects/bmake/sys/ofed/drivers/net/mlx4/qp.c projects/bmake/sys/ofed/drivers/net/mlx4/reset.c projects/bmake/sys/ofed/drivers/net/mlx4/sense.c projects/bmake/sys/ofed/drivers/net/mlx4/srq.c projects/bmake/sys/ofed/include/asm/atomic.h projects/bmake/sys/ofed/include/asm/byteorder.h projects/bmake/sys/ofed/include/linux/bitops.h projects/bmake/sys/ofed/include/linux/compat.h projects/bmake/sys/ofed/include/linux/device.h projects/bmake/sys/ofed/include/linux/dma-mapping.h projects/bmake/sys/ofed/include/linux/gfp.h projects/bmake/sys/ofed/include/linux/idr.h projects/bmake/sys/ofed/include/linux/if_ether.h projects/bmake/sys/ofed/include/linux/in6.h projects/bmake/sys/ofed/include/linux/kernel.h projects/bmake/sys/ofed/include/linux/linux_compat.c projects/bmake/sys/ofed/include/linux/list.h projects/bmake/sys/ofed/include/linux/log2.h projects/bmake/sys/ofed/include/linux/mlx4/cmd.h projects/bmake/sys/ofed/include/linux/mlx4/cq.h projects/bmake/sys/ofed/include/linux/mlx4/device.h projects/bmake/sys/ofed/include/linux/mlx4/driver.h projects/bmake/sys/ofed/include/linux/mlx4/qp.h projects/bmake/sys/ofed/include/linux/mlx4/srq.h projects/bmake/sys/ofed/include/linux/moduleparam.h projects/bmake/sys/ofed/include/linux/pci.h projects/bmake/sys/ofed/include/linux/sysfs.h projects/bmake/sys/ofed/include/linux/types.h projects/bmake/sys/ofed/include/linux/workqueue.h projects/bmake/sys/ofed/include/rdma/ib_cm.h projects/bmake/sys/ofed/include/rdma/ib_mad.h projects/bmake/sys/ofed/include/rdma/ib_sa.h projects/bmake/sys/ofed/include/rdma/ib_umem.h projects/bmake/sys/ofed/include/rdma/ib_user_verbs.h projects/bmake/sys/ofed/include/rdma/ib_verbs.h projects/bmake/sys/powerpc/aim/mmu_oea.c projects/bmake/sys/powerpc/aim/mmu_oea64.c projects/bmake/sys/powerpc/aim/vm_machdep.c projects/bmake/sys/powerpc/booke/pmap.c projects/bmake/sys/powerpc/booke/vm_machdep.c projects/bmake/sys/powerpc/conf/DEFAULTS projects/bmake/sys/powerpc/conf/GENERIC projects/bmake/sys/powerpc/conf/GENERIC64 projects/bmake/sys/powerpc/include/ofw_machdep.h projects/bmake/sys/powerpc/include/proc.h projects/bmake/sys/powerpc/include/spr.h projects/bmake/sys/powerpc/ofw/ofw_machdep.c projects/bmake/sys/powerpc/ofw/ofw_pcibus.c projects/bmake/sys/powerpc/ofw/ofw_syscons.c projects/bmake/sys/powerpc/ofw/ofw_syscons.h projects/bmake/sys/powerpc/powermac/platform_powermac.c projects/bmake/sys/powerpc/powerpc/busdma_machdep.c projects/bmake/sys/powerpc/powerpc/cpu.c projects/bmake/sys/powerpc/powerpc/mmu_if.m projects/bmake/sys/powerpc/powerpc/pmap_dispatch.c projects/bmake/sys/powerpc/ps3/ps3cdrom.c projects/bmake/sys/security/mac/mac_framework.c projects/bmake/sys/security/mac/mac_internal.h projects/bmake/sys/security/mac/mac_posix_shm.c projects/bmake/sys/security/mac/mac_vfs.c projects/bmake/sys/sparc64/include/proc.h projects/bmake/sys/sparc64/sparc64/pmap.c projects/bmake/sys/sparc64/sparc64/sys_machdep.c projects/bmake/sys/sparc64/sparc64/vm_machdep.c projects/bmake/sys/sys/elf_common.h projects/bmake/sys/sys/event.h projects/bmake/sys/sys/eventvar.h projects/bmake/sys/sys/lock.h projects/bmake/sys/sys/lockmgr.h projects/bmake/sys/sys/param.h projects/bmake/sys/sys/proc.h projects/bmake/sys/sys/sdt.h projects/bmake/sys/sys/sf_buf.h projects/bmake/sys/sys/smp.h projects/bmake/sys/sys/sockbuf.h projects/bmake/sys/sys/socketvar.h projects/bmake/sys/sys/syscall.h projects/bmake/sys/sys/syscall.mk projects/bmake/sys/sys/syscallsubr.h projects/bmake/sys/sys/sysctl.h projects/bmake/sys/sys/sysproto.h projects/bmake/sys/sys/timetc.h projects/bmake/sys/sys/uio.h projects/bmake/sys/sys/user.h projects/bmake/sys/vm/pmap.h projects/bmake/sys/vm/uma_int.h projects/bmake/sys/vm/vm_extern.h projects/bmake/sys/vm/vm_fault.c projects/bmake/sys/vm/vm_map.c projects/bmake/sys/vm/vm_mmap.c projects/bmake/sys/vm/vm_page.c projects/bmake/sys/vm/vm_page.h projects/bmake/sys/vm/vm_phys.c projects/bmake/sys/vm/vm_reserv.c projects/bmake/sys/x86/acpica/acpi_wakeup.c projects/bmake/sys/x86/acpica/madt.c projects/bmake/sys/x86/include/stdarg.h projects/bmake/sys/x86/isa/atpic.c projects/bmake/sys/x86/x86/intr_machdep.c projects/bmake/sys/x86/x86/io_apic.c projects/bmake/sys/x86/x86/local_apic.c projects/bmake/sys/x86/xen/hvm.c projects/bmake/sys/x86/xen/xen_intr.c projects/bmake/sys/xen/hvm.h projects/bmake/tools/build/mk/OptionalObsoleteFiles.inc projects/bmake/tools/build/options/WITHOUT_BINUTILS projects/bmake/tools/build/options/WITHOUT_LDNS projects/bmake/tools/build/options/makeman projects/bmake/tools/regression/lib/libutil/Makefile projects/bmake/tools/tools/net80211/wlanstats/Makefile projects/bmake/tools/tools/sysbuild/sysbuild.sh projects/bmake/usr.bin/Makefile projects/bmake/usr.bin/calendar/Makefile (contents, props changed) projects/bmake/usr.bin/calendar/calendar.1 (contents, props changed) projects/bmake/usr.bin/calendar/calendar.h (contents, props changed) projects/bmake/usr.bin/calendar/calendars/calendar.dutch projects/bmake/usr.bin/calendar/calendars/calendar.freebsd projects/bmake/usr.bin/calendar/io.c (contents, props changed) projects/bmake/usr.bin/calendar/pathnames.h (contents, props changed) projects/bmake/usr.bin/clang/Makefile projects/bmake/usr.bin/host/Makefile projects/bmake/usr.bin/kdump/kdump.c projects/bmake/usr.bin/kdump/mksubr projects/bmake/usr.bin/patch/patch.c projects/bmake/usr.bin/patch/util.c projects/bmake/usr.bin/procstat/procstat.1 projects/bmake/usr.bin/svn/lib/libapr/apr.h projects/bmake/usr.bin/svn/lib/libapr/apr_private.h projects/bmake/usr.bin/svn/svn_private_config.h projects/bmake/usr.bin/truss/syscall.h projects/bmake/usr.bin/truss/syscalls.c projects/bmake/usr.sbin/Makefile projects/bmake/usr.sbin/arp/arp.c projects/bmake/usr.sbin/bhyve/Makefile projects/bmake/usr.sbin/bhyve/bhyverun.c projects/bmake/usr.sbin/bhyve/bhyverun.h projects/bmake/usr.sbin/bhyve/dbgport.h projects/bmake/usr.sbin/bhyve/mevent.c projects/bmake/usr.sbin/bhyve/mevent.h projects/bmake/usr.sbin/bhyve/mevent_test.c projects/bmake/usr.sbin/bhyve/pci_emul.c projects/bmake/usr.sbin/bhyve/pci_virtio_block.c projects/bmake/usr.sbin/bhyve/pit_8254.c projects/bmake/usr.sbin/bhyve/rtc.c projects/bmake/usr.sbin/bhyve/virtio.c projects/bmake/usr.sbin/bhyvectl/Makefile projects/bmake/usr.sbin/bhyvectl/bhyvectl.c projects/bmake/usr.sbin/bhyveload/Makefile projects/bmake/usr.sbin/bhyveload/bhyveload.8 projects/bmake/usr.sbin/bhyveload/bhyveload.c projects/bmake/usr.sbin/boot0cfg/boot0cfg.8 projects/bmake/usr.sbin/bsdconfig/bsdconfig projects/bmake/usr.sbin/bsdconfig/console/ttys projects/bmake/usr.sbin/bsdconfig/examples/Makefile projects/bmake/usr.sbin/bsdconfig/mouse/enable projects/bmake/usr.sbin/bsdconfig/networking/devices projects/bmake/usr.sbin/bsdconfig/networking/share/device.subr projects/bmake/usr.sbin/bsdconfig/networking/share/hostname.subr projects/bmake/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/bmake/usr.sbin/bsdconfig/networking/share/media.subr projects/bmake/usr.sbin/bsdconfig/networking/share/netmask.subr projects/bmake/usr.sbin/bsdconfig/networking/share/resolv.subr projects/bmake/usr.sbin/bsdconfig/networking/share/routing.subr projects/bmake/usr.sbin/bsdconfig/password/share/password.subr projects/bmake/usr.sbin/bsdconfig/security/kern_securelevel projects/bmake/usr.sbin/bsdconfig/security/security projects/bmake/usr.sbin/bsdconfig/share/common.subr projects/bmake/usr.sbin/bsdconfig/share/device.subr projects/bmake/usr.sbin/bsdconfig/share/dialog.subr projects/bmake/usr.sbin/bsdconfig/share/media/any.subr projects/bmake/usr.sbin/bsdconfig/share/media/cdrom.subr projects/bmake/usr.sbin/bsdconfig/share/media/common.subr projects/bmake/usr.sbin/bsdconfig/share/media/dos.subr projects/bmake/usr.sbin/bsdconfig/share/media/floppy.subr projects/bmake/usr.sbin/bsdconfig/share/media/ftp.subr projects/bmake/usr.sbin/bsdconfig/share/media/http.subr projects/bmake/usr.sbin/bsdconfig/share/media/nfs.subr projects/bmake/usr.sbin/bsdconfig/share/media/options.subr projects/bmake/usr.sbin/bsdconfig/share/media/tcpip.subr projects/bmake/usr.sbin/bsdconfig/share/media/ufs.subr projects/bmake/usr.sbin/bsdconfig/share/media/usb.subr projects/bmake/usr.sbin/bsdconfig/share/mustberoot.subr projects/bmake/usr.sbin/bsdconfig/share/packages/packages.subr projects/bmake/usr.sbin/bsdconfig/startup/misc projects/bmake/usr.sbin/bsdconfig/startup/rcconf projects/bmake/usr.sbin/bsdconfig/startup/rcdelete projects/bmake/usr.sbin/bsdconfig/startup/rcvar projects/bmake/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/bmake/usr.sbin/bsdconfig/startup/share/rcedit.subr projects/bmake/usr.sbin/bsdconfig/timezone/timezone projects/bmake/usr.sbin/bsdconfig/usermgmt/groupdel projects/bmake/usr.sbin/bsdconfig/usermgmt/groupedit projects/bmake/usr.sbin/bsdconfig/usermgmt/groupinput projects/bmake/usr.sbin/bsdconfig/usermgmt/share/group_input.subr projects/bmake/usr.sbin/bsdconfig/usermgmt/share/user_input.subr projects/bmake/usr.sbin/bsdconfig/usermgmt/userdel projects/bmake/usr.sbin/bsdconfig/usermgmt/useredit projects/bmake/usr.sbin/bsdconfig/usermgmt/userinput projects/bmake/usr.sbin/bsdconfig/usermgmt/usermgmt projects/bmake/usr.sbin/bsdinstall/partedit/gpart_ops.c projects/bmake/usr.sbin/bsdinstall/partedit/partedit_powerpc.c projects/bmake/usr.sbin/bsdinstall/scripts/mirrorselect projects/bmake/usr.sbin/ctladm/ctladm.8 projects/bmake/usr.sbin/ctladm/ctladm.c projects/bmake/usr.sbin/daemon/daemon.8 projects/bmake/usr.sbin/daemon/daemon.c projects/bmake/usr.sbin/gpioctl/gpioctl.8 projects/bmake/usr.sbin/gpioctl/gpioctl.c projects/bmake/usr.sbin/jail/jail.c projects/bmake/usr.sbin/kldxref/kldxref.c projects/bmake/usr.sbin/mtree/create.c projects/bmake/usr.sbin/ntp/config.h projects/bmake/usr.sbin/ntp/libparse/Makefile Directory Properties: projects/bmake/ (props changed) projects/bmake/cddl/ (props changed) projects/bmake/cddl/contrib/opensolaris/ (props changed) projects/bmake/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/bmake/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/bmake/contrib/binutils/ (props changed) projects/bmake/contrib/bmake/ (props changed) projects/bmake/contrib/dialog/ (props changed) projects/bmake/contrib/ipfilter/ (props changed) projects/bmake/contrib/ldns/ (props changed) projects/bmake/contrib/libc++/ (props changed) projects/bmake/contrib/libcxxrt/ (props changed) projects/bmake/contrib/llvm/ (props changed) projects/bmake/contrib/llvm/tools/clang/ (props changed) projects/bmake/contrib/unbound/ (props changed) projects/bmake/contrib/unbound/validator/val_secalgo.c (props changed) projects/bmake/contrib/unbound/validator/val_secalgo.h (props changed) projects/bmake/crypto/openssh/ (props changed) projects/bmake/gnu/lib/ (props changed) projects/bmake/gnu/usr.bin/binutils/ (props changed) projects/bmake/lib/libc/ (props changed) projects/bmake/lib/libutil/ (props changed) projects/bmake/lib/libvmmapi/ (props changed) projects/bmake/sbin/ (props changed) projects/bmake/share/man/man4/ (props changed) projects/bmake/sys/ (props changed) projects/bmake/sys/amd64/vmm/ (props changed) projects/bmake/sys/boot/ (props changed) projects/bmake/sys/boot/i386/efi/ (props changed) projects/bmake/sys/boot/powerpc/boot1.chrp/ (props changed) projects/bmake/sys/cddl/contrib/opensolaris/ (props changed) projects/bmake/sys/conf/ (props changed) projects/bmake/sys/contrib/ipfilter/ (props changed) projects/bmake/usr.bin/calendar/ (props changed) projects/bmake/usr.bin/procstat/ (props changed) projects/bmake/usr.sbin/bhyve/ (props changed) projects/bmake/usr.sbin/bhyvectl/ (props changed) projects/bmake/usr.sbin/bhyveload/ (props changed) projects/bmake/usr.sbin/jail/ (props changed) Modified: projects/bmake/LOCKS ============================================================================== --- projects/bmake/LOCKS Sun Oct 13 02:34:20 2013 (r256423) +++ projects/bmake/LOCKS Sun Oct 13 02:35:19 2013 (r256424) @@ -12,3 +12,7 @@ releng/5.* Requires Security Officer app releng/6.* Requires Security Officer approval. releng/7.* Requires Security Officer approval. releng/8.* Requires Security Officer approval. +head/sys/dev/random Requires Security Officer approval. +head/sys/libkern/arc4random.c Requires Security Officer approval. +stable/*/sys/dev/random Requires Security Officer approval. +stable/*/sys/libkern/arc4random.c Requires Security Officer approval. Modified: projects/bmake/Makefile ============================================================================== --- projects/bmake/Makefile Sun Oct 13 02:34:20 2013 (r256423) +++ projects/bmake/Makefile Sun Oct 13 02:35:19 2013 (r256424) @@ -341,7 +341,7 @@ MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \ MMAKE= ${MMAKEENV} ${MAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ - -DNO_CPU_CFLAGS -DNO_WERROR + -DNO_CPU_CFLAGS -DNO_WERROR DESTDIR= PROGNAME=${MYMAKE:T} make bmake: .PHONY @echo @@ -349,10 +349,10 @@ make bmake: .PHONY @echo ">>> Building an up-to-date make(1)" @echo "--------------------------------------------------------------" ${_+_}@cd ${.CURDIR}/usr.bin/${.TARGET}; \ - ${MMAKE} obj DESTDIR= && \ - ${MMAKE} depend DESTDIR= && \ - ${MMAKE} all DESTDIR= && \ - ${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= PROGNAME=${MYMAKE:T} + ${MMAKE} obj && \ + ${MMAKE} depend && \ + ${MMAKE} all && \ + ${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= tinderbox toolchains kernel-toolchains: upgrade_checks @@ -374,7 +374,7 @@ kernel-toolchains: # .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 -TARGET_ARCHES_arm?= arm armeb armv6 armv6eb +TARGET_ARCHES_arm?= arm armeb armv6 TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 TARGET_ARCHES_powerpc?= powerpc powerpc64 TARGET_ARCHES_pc98?= i386 Modified: projects/bmake/Makefile.inc1 ============================================================================== --- projects/bmake/Makefile.inc1 Sun Oct 13 02:34:20 2013 (r256423) +++ projects/bmake/Makefile.inc1 Sun Oct 13 02:35:19 2013 (r256424) @@ -132,7 +132,7 @@ VERSION!= uname -srp VERSION+= ${OSRELDATE} .endif -KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm armv6eb/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 +KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -395,7 +395,7 @@ LIB32WMAKEFLAGS+= \ -DNO_LINT LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \ - -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML + -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \ ${IMAKE_INSTALL} .endif @@ -485,10 +485,6 @@ _worldtmp: mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${WORLDTMP}/usr/lib >/dev/null .endif -.if ${MK_BIND_LIBS} != "no" - mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \ - -p ${WORLDTMP}/usr/include >/dev/null -.endif .for _mtree in ${LOCAL_MTREE} mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null .endfor @@ -676,8 +672,9 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_inc # # Checks to be sure system is ready for installworld/installkernel. # -installcheck: -installcheck_UGID: +installcheck: _installcheck_world _installcheck_kernel +_installcheck_world: +_installcheck_kernel: # # Require DESTDIR to be set if installing for a different architecture or @@ -686,8 +683,9 @@ installcheck_UGID: .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} || \ defined(DB_FROM_SRC) .if !make(distributeworld) -installcheck: installcheck_DESTDIR -installcheck_DESTDIR: +_installcheck_world: __installcheck_DESTDIR +_installcheck_kernel: __installcheck_DESTDIR +__installcheck_DESTDIR: .if !defined(DESTDIR) || empty(DESTDIR) @echo "ERROR: Please set DESTDIR!"; \ false @@ -709,7 +707,12 @@ CHECK_GIDS+= smmsp CHECK_UIDS+= proxy CHECK_GIDS+= proxy authpf .endif -installcheck_UGID: +.if ${MK_UNBOUND} != "no" +CHECK_UIDS+= unbound +CHECK_GIDS+= unbound +.endif +_installcheck_world: __installcheck_UGID +__installcheck_UGID: .for uid in ${CHECK_UIDS} @if ! `id -u ${uid} >/dev/null 2>&1`; then \ echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \ @@ -764,7 +767,7 @@ EXTRA_DISTRIBUTIONS+= lib32 MTREE_MAGIC?= mtree 2.0 -distributeworld installworld: installcheck installcheck_UGID +distributeworld installworld: _installcheck_world mkdir -p ${INSTALLTMP} progs=$$(for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ @@ -1042,7 +1045,7 @@ buildkernel: # Install the kernel defined by INSTALLKERNEL # installkernel installkernel.debug \ -reinstallkernel reinstallkernel.debug: installcheck +reinstallkernel reinstallkernel.debug: _installcheck_kernel .if empty(INSTALLKERNEL) @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \ false @@ -1082,9 +1085,11 @@ distributekernel distributekernel.debug: KERNEL=${INSTKERNNAME}.${_kernel} \ DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \ ${.TARGET:S/distributekernel/install/} +.if defined(NO_ROOT) sed -e 's|^./kernel|.|' \ ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \ ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta +.endif .endfor packagekernel: @@ -1733,7 +1738,7 @@ check-old-libs: delete-old-dirs: @echo ">>> Removing old directories" @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_DIRS | xargs -n1 | \ + -V OLD_DIRS | xargs -n1 | sort -r | \ while read dir; do \ if [ -d "${DESTDIR}/$${dir}" ]; then \ rmdir -v "${DESTDIR}/$${dir}" || true; \ Modified: projects/bmake/ObsoleteFiles.inc ============================================================================== --- projects/bmake/ObsoleteFiles.inc Sun Oct 13 02:34:20 2013 (r256423) +++ projects/bmake/ObsoleteFiles.inc Sun Oct 13 02:35:19 2013 (r256424) @@ -38,6 +38,242 @@ # xargs -n1 | sort | uniq -d; # done +# 20131009: freebsd-version moved from /libexec to /bin +OLD_FILES+=/libexec/freebsd-version +# 20131001: ar and ranlib from binutils not used +OLD_FILES+=usr/bin/gnu-ar +OLD_FILES+=usr/bin/gnu-ranlib +OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz +OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz +# 20130930: BIND removed from base +OLD_FILES+=etc/namedb +OLD_FILES+=etc/periodic/daily/470.status-named +OLD_FILES+=usr/bin/dig +OLD_FILES+=usr/bin/nslookup +OLD_FILES+=usr/bin/nsupdate +OLD_DIRS+=usr/include/lwres +OLD_FILES+=usr/include/lwres/context.h +OLD_FILES+=usr/include/lwres/int.h +OLD_FILES+=usr/include/lwres/ipv6.h +OLD_FILES+=usr/include/lwres/lang.h +OLD_FILES+=usr/include/lwres/list.h +OLD_FILES+=usr/include/lwres/lwbuffer.h +OLD_FILES+=usr/include/lwres/lwpacket.h +OLD_FILES+=usr/include/lwres/lwres.h +OLD_FILES+=usr/include/lwres/net.h +OLD_FILES+=usr/include/lwres/netdb.h +OLD_FILES+=usr/include/lwres/platform.h +OLD_FILES+=usr/include/lwres/result.h +OLD_FILES+=usr/include/lwres/version.h +OLD_FILES+=usr/lib/liblwres.a +OLD_FILES+=usr/lib/liblwres.so +OLD_LIBS+=usr/lib/liblwres.so.50 +OLD_FILES+=usr/lib/liblwres_p.a +OLD_FILES+=usr/sbin/arpaname +OLD_FILES+=usr/sbin/ddns-confgen +OLD_FILES+=usr/sbin/dnssec-dsfromkey +OLD_FILES+=usr/sbin/dnssec-keyfromlabel +OLD_FILES+=usr/sbin/dnssec-keygen +OLD_FILES+=usr/sbin/dnssec-revoke +OLD_FILES+=usr/sbin/dnssec-settime +OLD_FILES+=usr/sbin/dnssec-signzone +OLD_FILES+=usr/sbin/genrandom +OLD_FILES+=usr/sbin/isc-hmac-fixup +OLD_FILES+=usr/sbin/lwresd +OLD_FILES+=usr/sbin/named +OLD_FILES+=usr/sbin/named-checkconf +OLD_FILES+=usr/sbin/named-checkzone +OLD_FILES+=usr/sbin/named-compilezone +OLD_FILES+=usr/sbin/named-journalprint +OLD_FILES+=usr/sbin/named.reconfig +OLD_FILES+=usr/sbin/named.reload +OLD_FILES+=usr/sbin/nsec3hash +OLD_FILES+=usr/sbin/rndc +OLD_FILES+=usr/sbin/rndc-confgen +OLD_DIRS+=usr/share/doc/bind9 +OLD_FILES+=usr/share/doc/bind9/CHANGES +OLD_FILES+=usr/share/doc/bind9/COPYRIGHT +OLD_FILES+=usr/share/doc/bind9/FAQ +OLD_FILES+=usr/share/doc/bind9/HISTORY +OLD_FILES+=usr/share/doc/bind9/README +OLD_DIRS+=usr/share/doc/bind9/arm +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch01.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch02.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch03.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch04.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch05.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch06.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch07.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch08.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch09.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch10.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.pdf +OLD_FILES+=usr/share/doc/bind9/arm/man.arpaname.html +OLD_FILES+=usr/share/doc/bind9/arm/man.ddns-confgen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dig.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-dsfromkey.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keyfromlabel.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keygen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-revoke.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-settime.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-signzone.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-verify.html +OLD_FILES+=usr/share/doc/bind9/arm/man.genrandom.html +OLD_FILES+=usr/share/doc/bind9/arm/man.host.html +OLD_FILES+=usr/share/doc/bind9/arm/man.isc-hmac-fixup.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkconf.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkzone.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-journalprint.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named.html +OLD_FILES+=usr/share/doc/bind9/arm/man.nsec3hash.html +OLD_FILES+=usr/share/doc/bind9/arm/man.nsupdate.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc-confgen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.conf.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.html +OLD_DIRS+=usr/share/doc/bind9/misc +OLD_FILES+=usr/share/doc/bind9/misc/dnssec +OLD_FILES+=usr/share/doc/bind9/misc/format-options.pl +OLD_FILES+=usr/share/doc/bind9/misc/ipv6 +OLD_FILES+=usr/share/doc/bind9/misc/migration +OLD_FILES+=usr/share/doc/bind9/misc/migration-4to9 +OLD_FILES+=usr/share/doc/bind9/misc/options +OLD_FILES+=usr/share/doc/bind9/misc/rfc-compliance +OLD_FILES+=usr/share/doc/bind9/misc/roadmap +OLD_FILES+=usr/share/doc/bind9/misc/sdb +OLD_FILES+=usr/share/doc/bind9/misc/sort-options.pl +OLD_FILES+=usr/share/man/man1/arpaname.1.gz +OLD_FILES+=usr/share/man/man1/dig.1.gz +OLD_FILES+=usr/share/man/man1/nslookup.1.gz +OLD_FILES+=usr/share/man/man1/nsupdate.1.gz +OLD_FILES+=usr/share/man/man3/lwres.3.gz +OLD_FILES+=usr/share/man/man3/lwres_addr_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_add.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_back.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_clear.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_first.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_forward.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint16.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint32.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint8.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_init.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_invalidate.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint16.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint32.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint8.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_subtract.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_clear.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_get.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_init.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_print.3.gz +OLD_FILES+=usr/share/man/man3/lwres_config.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_allocmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_create.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_destroy.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_freemem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_initserial.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_nextserial.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_sendrecv.3.gz +OLD_FILES+=usr/share/man/man3/lwres_endhostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_endhostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_freeaddrinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_freehostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabn.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gai_strerror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getaddrinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getaddrsbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname2.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnode.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnodebyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnodebyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getnamebyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getnameinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getrrsetbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnba.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_herror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_hstrerror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_inetntop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_lwpacket_parseheader.3.gz +OLD_FILES+=usr/share/man/man3/lwres_lwpacket_renderheader.3.gz +OLD_FILES+=usr/share/man/man3/lwres_net_ntop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_packet.3.gz +OLD_FILES+=usr/share/man/man3/lwres_resutil.3.gz +OLD_FILES+=usr/share/man/man3/lwres_sethostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_sethostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_string_parse.3.gz +OLD_FILES+=usr/share/man/man5/named.conf.5.gz +OLD_FILES+=usr/share/man/man5/rndc.conf.5.gz +OLD_FILES+=usr/share/man/man8/ddns-confgen.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-dsfromkey.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-keyfromlabel.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz +OLD_FILES+=usr/share/man/man8/genrandom.8.gz +OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz +OLD_FILES+=usr/share/man/man8/lwresd.8.gz +OLD_FILES+=usr/share/man/man8/named-checkconf.8.gz +OLD_FILES+=usr/share/man/man8/named-checkzone.8.gz +OLD_FILES+=usr/share/man/man8/named-compilezone.8.gz +OLD_FILES+=usr/share/man/man8/named-journalprint.8.gz +OLD_FILES+=usr/share/man/man8/named.8.gz +OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz +OLD_FILES+=usr/share/man/man8/named.reload.8.gz +OLD_FILES+=usr/share/man/man8/nsec3hash.8.gz +OLD_FILES+=usr/share/man/man8/rndc-confgen.8.gz +OLD_FILES+=usr/share/man/man8/rndc.8.gz +OLD_DIRS+=var/named/dev +OLD_DIRS+=var/named/etc +OLD_DIRS+=var/named/etc/namedb +OLD_FILES+=var/named/etc/namedb/PROTO.localhost-v6.rev +OLD_FILES+=var/named/etc/namedb/PROTO.localhost.rev +OLD_DIRS+=var/named/etc/namedb/dynamic +OLD_FILES+=var/named/etc/namedb/make-localhost +OLD_DIRS+=var/named/etc/namedb/master +OLD_FILES+=var/named/etc/namedb/master/empty.db +OLD_FILES+=var/named/etc/namedb/master/localhost-forward.db +OLD_FILES+=var/named/etc/namedb/master/localhost-reverse.db +#OLD_FILES+=var/named/etc/namedb/named.conf # intentionally left out +OLD_FILES+=var/named/etc/namedb/named.root +OLD_DIRS+=var/named/etc/namedb/slave +OLD_DIRS+=var/named/var +OLD_DIRS+=var/named/var/dump +OLD_DIRS+=var/named/var/log +OLD_DIRS+=var/named/var/run +OLD_DIRS+=var/named/var/run/named +OLD_DIRS+=var/named/var/stats +OLD_DIRS+=var/run/named # 20130908: libssh becomes private OLD_FILES+=usr/lib/libssh.a OLD_FILES+=usr/lib/libssh.so Modified: projects/bmake/UPDATING ============================================================================== --- projects/bmake/UPDATING Sun Oct 13 02:34:20 2013 (r256423) +++ projects/bmake/UPDATING Sun Oct 13 02:35:19 2013 (r256424) @@ -16,8 +16,8 @@ from older versions of FreeBSD, try WITH head, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW: - FreeBSD 10.x has many debugging features turned on, in both the kernel +NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW: + FreeBSD 11.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They also substantially impact @@ -31,6 +31,42 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131010: + The rc.d/jail script has been updated to support jail(8) + configuration file. The "jail__*" rc.conf(5) variables + for per-jail configuration are automatically converted to + /var/run/jail..conf before the jail(8) utility is invoked. + This is transparently backward compatible. See below about some + incompatibilities and rc.conf(5) manual page for more details. + + These variables are now deprecated in favor of jail(8) configuration + file. One can use "rc.d/jail config " command to generate + a jail(8) configuration file in /var/run/jail..conf without + running the jail(8) utility. The default pathname of the + configuration file is /etc/jail.conf and can be specified by + using $jail_conf or $jail__conf variables. + + Please note that jail_devfs_ruleset accepts an integer at + this moment. Please consider to rewrite the ruleset name + with an integer. + +20130930: + BIND has been removed from the base system. If all you need + is a local resolver, simply enable and start the local_unbound + service instead. Otherwise, several versions of BIND are + available in the ports tree. + +20130916: + With the addition of unbound(8), a new unbound user is now + required during installworld. "mergemaster -p" can be used to + add the user prior to installworld, as documented in the handbook. + +20130911: + OpenSSH is now built with DNSSEC support, and will by default + silently trust signed SSHFP records. This can be controlled with + the VerifyHostKeyDNS client configuration setting. DNSSEC support + can be disabled entirely with the WITHOUT_LDNS option in src.conf. + 20130906: The GNU Compiler Collection and C++ standard library (libstdc++) are no longer built by default on platforms where clang is the system @@ -52,22 +88,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 kdump, procstat, rwho, rwhod, uniq. 20130903: - AES-NI intrinsic support has been added to gcc. The AES-NI module - has been updated to use this support. A new gcc is required to build - the aesni module on both i386 and amd64. - -20130827: - Thomas Dickey (vendor author thereof) reports that dialog(1) since - 2011/10/18 has a bug in handling --hline. Testers and I noticed the - --hline is not ignored but displayed as a NULL string, regardless of - value. This will cause confusion in some bsdconfig dialogs where the - --hline is used to inform users which keybindings to use. This will - likewise affect any other persons relying on --hline. It also looks - rather strange seeing "[]" at the bottom of dialog(1) widgets when - passing --hline "anything". Thomas said he will have a look in a few - weeks. NOTE: The "[]" brackets appear with the left-edge where it - would normally appear given the width of text to display, but the - displayed text is not there (part of the bug). + AES-NI intrinsic support has been added to gcc. The AES-NI module + has been updated to use this support. A new gcc is required to build + the aesni module on both i386 and amd64. 20130821: The PADLOCK_RNG and RDRAND_RNG kernel options are now devices. @@ -296,8 +319,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 20121201: With the addition of auditdistd(8), a new auditdistd user is now - depended on during installworld. "mergemaster -p" can be used to add - the user prior to installworld, as documented in the handbook. + required during installworld. "mergemaster -p" can be used to + add the user prior to installworld, as documented in the handbook. 20121117: The sin6_scope_id member variable in struct sockaddr_in6 is now Modified: projects/bmake/bin/Makefile ============================================================================== --- projects/bmake/bin/Makefile Sun Oct 13 02:34:20 2013 (r256423) +++ projects/bmake/bin/Makefile Sun Oct 13 02:35:19 2013 (r256424) @@ -15,6 +15,7 @@ SUBDIR= cat \ echo \ ed \ expr \ + freebsd-version \ getfacl \ hostname \ kenv \ Modified: projects/bmake/bin/dd/dd.1 ============================================================================== --- projects/bmake/bin/dd/dd.1 Sun Oct 13 02:34:20 2013 (r256423) +++ projects/bmake/bin/dd/dd.1 Sun Oct 13 02:35:19 2013 (r256424) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd January 23, 2009 +.Dd October 1, 2013 .Dt DD 1 .Os .Sh NAME @@ -378,12 +378,12 @@ will exit. .Sh EXAMPLES Check that a disk drive contains no bad blocks: .Pp -.Dl "dd if=/dev/ad0 of=/dev/null bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/null bs=1m" .Pp Do a refresh of a disk drive, in order to prevent presently recoverable read errors from progressing into unrecoverable read errors: .Pp -.Dl "dd if=/dev/ad0 of=/dev/ad0 bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/ada0 bs=1m" .Pp Remove parity bit from a file: .Pp Modified: projects/bmake/bin/pkill/pkill.c ============================================================================== --- projects/bmake/bin/pkill/pkill.c Sun Oct 13 02:34:20 2013 (r256423) +++ projects/bmake/bin/pkill/pkill.c Sun Oct 13 02:35:19 2013 (r256424) @@ -481,7 +481,6 @@ main(int argc, char **argv) * We skip P_SYSTEM processes to match ps(1) output. */ if ((kp->ki_flag & P_SYSTEM) == 0 && - kp->ki_loginclass != NULL && strcmp(kp->ki_loginclass, li->li_name) == 0) break; } Modified: projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ============================================================================== --- projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Sun Oct 13 02:34:20 2013 (r256423) +++ projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Sun Oct 13 02:35:19 2013 (r256424) @@ -2,7 +2,7 @@ .\" CDDL HEADER START .\" .\" The contents of this file are subject to the terms of the -.\" Common Development and Distribution License (the "License"). +.\" Common Development and Distribution License (the "License"). .\" You may not use this file except in compliance with the License. .\" .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE @@ -18,653 +18,660 @@ .\" .\" CDDL HEADER END .\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved. -.TH dtrace 1M "5 Sep 2006" "SunOS 5.11" "System Administration Commands" -.SH NAME -dtrace \- DTrace dynamic tracing compiler and tracing utility -.SH SYNOPSIS -.LP -.nf -\fBdtrace\fR [\fB-32\fR | \fB-64\fR] [\fB-aACeFGHhlqSvVwZ\fR] [\fB-b\fR \fIbufsz\fR] [\fB-c\fR \fIcmd\fR] - [\fB-D\fR \fIname\fR [\fI=value\fR]] [\fB-I\fR \fIpath\fR] [\fB-L\fR \fIpath\fR] [\fB-o\fR \fIoutput\fR] - [\fB-s\fR \fIscript\fR] [\fB-U\fR \fIname\fR] [\fB-x\fR \fIarg\fR [\fI=val\fR]] - [\fB-X\fR a | c | s | t] [\fB-p\fR \fIpid\fR] - [\fB-P\fR \fIprovider\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-m\fR [\fIprovider:\fR] \fImodule\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-f\fR [[\fIprovider:\fR] \fImodule:\fR] \fIfunction\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-i\fR \fIprobe-id\fR [[\fIpredicate\fR] \fIaction\fR]] -.fi - -.SH DESCRIPTION -.sp -.LP -DTrace is a comprehensive dynamic tracing framework for the Solaris Operating System. DTrace provides a powerful infrastructure that permits administrators, developers, and service personnel to concisely answer arbitrary questions about the behavior of the operating system and user programs. -.sp -.LP -The \fISolaris Dynamic Tracing Guide\fR describes how to use DTrace to observe, debug, and tune system behavior. Refer to this book for a detailed description of DTrace features, including the bundled DTrace observability -tools, instrumentation providers, and the D programming language. -.sp -.LP -The \fBdtrace\fR command provides a generic interface to the essential services provided by the DTrace facility, including: -.RS +4 -.TP -.ie t \(bu -.el o +.\" +.\" $FreeBSD$ +.\" +.Dd October 5, 2013 +.Dt DTRACE 1 +.Os +.Sh NAME +.Nm dtrace +.Nd dynamic tracing compiler and tracing utility +.Sh SYNOPSIS +.Nm +.Op Fl 32 | Fl 64 +.Op Fl aACeFGhHlqSvVwZ +.Op Fl b Ar bufsz +.Op Fl c Ar cmd +.Op Fl D Ar name Op Ns = Ns value +.Op Fl I Ar path +.Op Fl L Ar path +.Op Fl o Ar output +.Op Fl s Ar script +.Op Fl U Ar name +.Op Fl x Ar arg Op Ns = Ns value +.Op Fl X Cm a | c | s | t +.Op Fl p Ar pid +.Op Fl P Ar provider Oo Oo Ar predicate Oc Ar action Oc +.Op Fl m Oo Ar provider : Oc Ar module Oo Oo Ar predicate Oc Ar action Oc +.Op Fl f Oo Oo Ar provider : Oc Ar module : Oc Ar function Oo Oo Ar predicate \ + Oc Ar action Oc +.Op Fl n Oo Oo Oo Ar provider : Oc Ar module : Oc Ar function : Oc Ar name \ + Oo Oo Ar predicate Oc Ar action Oc +.Op Fl i Ar probe-id Oo Oo Ar predicate Oc Ar action Oc +.Sh DESCRIPTION +DTrace is a comprehensive dynamic tracing framework ported from Solaris. +DTrace provides a powerful infrastructure that permits administrators, +developers, and service personnel to concisely answer arbitrary questions about +the behavior of the operating system and user programs. +.Pp +The +.Nm +command provides a generic interface to the essential services provided by the +DTrace facility, including: +.Bl -bullet -offset indent +.It Options that list the set of probes and providers currently published by DTrace -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that enable probes directly using any of the probe description specifiers (provider, module, function, name) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that run the D compiler and compile one or more D program files or programs written directly on the command line -.RE -.RS +4 -.TP -.ie t \(bu -.el o +.It +Options that enable probes directly using any of the probe description +specifiers (provider, module, function, name) +.It +Options that run the D compiler and compile one or more D program files or +programs written directly on the command line +.It Options that generate anonymous tracing programs -.RE -.RS +4 -.TP -.ie t \(bu -.el o +.It Options that generate program stability reports -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that modify DTrace tracing and buffering behavior and enable additional D compiler features -.RE -.sp -.LP -You can use \fBdtrace\fR to create D scripts by using it in a \fB#!\fR declaration to create an interpreter file. You can also use \fBdtrace\fR to attempt to compile D programs and determine their properties without actually enabling tracing using the \fB-e\fR option. See \fBOPTIONS\fR. See the \fISolaris Dynamic Tracing Guide\fR for detailed examples of how to use the \fBdtrace\fR utility to perform these tasks. -.SH OPTIONS -.sp -.LP -The arguments accepted by the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, and \fB-i\fR options can include an optional D language \fIpredicate\fR enclosed in slashes \fB//\fR and optional D language \fIaction\fR statement list enclosed in braces \fB{}\fR. D program code specified on the command line must be appropriately quoted to avoid intepretation of meta-characters by the shell. -.sp -.LP +.It +Options that modify DTrace tracing and buffering behavior and enable +additional D compiler features +.El +.Pp +You can use +.Nm +to create D scripts by using it in a shebang declaration to create an +interpreter file. +You can also use +.Nm +to attempt to compile D programs and determine their properties without +actually enabling traces using the +.Fl e +option. +.Sh OPTIONS +The arguments accepted by the +.Fl P , +.Fl m , +.Fl f , +.Fl n , +and +.Fl i +options can include an optional D language +.Ar predicate +enclosed in slashes and an optional D language +.Ar action +statement list enclosed in braces. +D program code specified on the command line must be appropriately quoted to +avoid interpretation of meta-characters by the shell. +.Pp The following options are supported: -.sp -.ne 2 -.mk -.na -\fB\fB-32\fR | \fB-64\fR\fR -.ad -.sp .6 -.RS 4n -The D compiler produces programs using the native data model of the operating system kernel. You can use the \fBisainfo\fR \fB-b\fR command to determine the current operating system data model. If the \fB-32\fR option is specified, \fBdtrace\fR forces -the D compiler to compile a D program using the 32-bit data model. If the \fB-64\fR option is specified, \fBdtrace\fR forces the D compiler to compile a D program using the 64-bit data model. These options are typically not required as \fBdtrace\fR selects the -native data model as the default. The data model affects the sizes of integer types and other language properties. D programs compiled for either data model can be executed on both 32-bit and 64-bit kernels. The \fB-32\fR and \fB-64\fR options also determine the ELF file format -(ELF32 or ELF64) produced by the \fB-G\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-a\fR\fR -.ad -.sp .6 -.RS 4n -Claim anonymous tracing state and display the traced data. You can combine the \fB-a\fR option with the \fB-e\fR option to force \fBdtrace\fR to exit immediately after consuming the anonymous tracing state rather than continuing to wait for new -data. See the \fISolaris Dynamic Tracing Guide\fR for more information about anonymous tracing. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-A\fR\fR -.ad -.sp .6 -.RS 4n -Generate \fBdriver.conf\fR(4) directives for anonymous tracing. This option constructs a set of \fBdtrace\fR(7D) configuration file directives to enable the specified probes for anonymous tracing and then exits. By default, \fBdtrace\fR attempts to store the directives to the file \fB/kernel/drv/dtrace.conf\fR. You can modify this behavior if you use the \fB-o\fR option to specify an alternate output file. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-b\fR \fIbufsz\fR\fR -.ad -.sp .6 -.RS 4n -Set principal trace buffer size (\fIbufsz\fR). The trace buffer size can include any of the size suffixes \fBk\fR, \fBm\fR, \fBg\fR, or \fBt\fR. If the buffer space cannot be allocated, \fBdtrace\fR attempts -to reduce the buffer size or exit depending on the setting of the \fBbufresize\fR property. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-c\fR \fIcmd\fR\fR -.ad -.sp .6 -.RS 4n -Run the specified command \fIcmd\fR and exit upon its completion. If more than one \fB-c\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status for each child process as it -terminates. The process-ID of the first command is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for more information -on macro variables. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-C\fR\fR -.ad -.sp .6 -.RS 4n -Run the C preprocessor \fBcpp\fR(1) over D programs before compiling them. You can pass options to the C preprocessor using the \fB-D\fR, \fB-U\fR, \fB-I\fR, and \fB-H\fR options. You can select the degree of C standard conformance if you use the \fB-X\fR option. For a description of the set of tokens defined by the D compiler when invoking the C preprocessor, see \fB-X\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-D\fR \fIname\fR \fB[=\fR\fIvalue\fR\fB]\fR\fR -.ad -.sp .6 -.RS 4n -Define \fIname\fR when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). If you specify the equals sign (\fB=\fR) -and additional \fIvalue\fR, the name is assigned the corresponding value. This option passes the \fB-D\fR option to each \fBcpp\fR invocation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-e\fR\fR -.ad -.sp .6 -.RS 4n -Exit after compiling any requests and consuming anonymous tracing state (\fB-a\fR option) but prior to enabling any probes. You can combine this option with the \fB-a\fR option to print anonymous tracing data and exit. You can also combine this option with D -compiler options. This combination verifies that the programs compile without actually executing them and enabling the corresponding instrumentation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-f\fR\fB[[\fR\fIprovider\fR\fB:]\fR\fImodule\fR\fB:]\fR\fIfunction\fR\fB[[\fR\fIpredicate\fR\fB]\fR\fIaction\fR\fB]]\fR\fR -.ad -.sp .6 -.RS 4n -Specify function name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function\fR, \fImodule:function\fR, or \fIfunction\fR. -Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIfunction\fR are specified in the description, all probes with the corresponding \fIfunction\fR are matched. -The \fB-f\fR argument can be suffixed with an optional D probe clause. You can specify more than one \fB-f\fR option on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-F\fR\fR -.ad -.sp .6 -.RS 4n -Coalesce trace output by identifying function entry and return. Function entry probe reports are indented and their output is prefixed with \fB->\fR. Function return probe reports are unindented and their output is prefixed with \fB<-\fR\&. System call -entry probe reports are indented and their output is prefixed with \fB=>\fR. System call return probe reports are unindented and their output is prefixed with \fB<=\fR\&. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-G\fR\fR -.ad -.sp .6 -.RS 4n -Generate an ELF file containing an embedded DTrace program. The DTrace probes specified in the program are saved inside of a relocatable ELF object which can be linked into another program. If the \fB-o\fR option is present, the ELF file is saved using the pathname specified -as the argument for this operand. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fB\fIfilename\fR.d\fR, then the ELF file is saved using the name \fB\fIfilename\fR.o\fR. -Otherwise the ELF file is saved using the name \fBd.out\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-H\fR\fR -.ad -.sp .6 -.RS 4n -Print the pathnames of included files when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). This option passes the \fB-H\fR option -to each \fBcpp\fR invocation, causing it to display the list of pathnames, one for each line, to \fBstderr\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-h\fR\fR -.ad -.sp .6 -.RS 4n -Generate a header file containing macros that correspond to probes in the specified provider definitions. This option should be used to generate a header file that is included by other source files for later use with the \fB-G\fR option. If the \fB-o\fR option -is present, the header file is saved using the pathname specified as the argument for that option. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fIfilename\fR\fB\&.d\fR, then the header file is saved -using the name \fIfilename\fR\fB\&.h\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-i\fR \fIprobe-id\fR\fB[[\fR\fIpredicate\fR] \fIaction\fR\fB]\fR\fR -.ad -.sp .6 -.RS 4n -Specify probe identifier (\fIprobe-id\fR) to trace or list (\fB-l\fR option). You can specify probe IDs using decimal integers as shown by \fBdtrace\fR \fB-l\fR. The \fB-i\fR argument can be suffixed with an optional -D probe clause. You can specify more than one \fB-i\fR option at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-I\fR \fIpath\fR\fR -.ad -.sp .6 -.RS 4n -Add the specified directory \fIpath\fR to the search path for \fB#include\fR files when invoking \fBcpp\fR(1) (enabled -using the \fB-C\fR option). This option passes the \fB-I\fR option to each \fBcpp\fR invocation. The specified \fIpath\fR is inserted into the search path ahead of the default directory list. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-L\fR \fIpath\fR\fR -.ad -.sp .6 -.RS 4n -Add the specified directory \fIpath\fR to the search path for DTrace libraries. DTrace libraries are used to contain common definitions that can be used when writing D programs. The specified \fIpath\fR is added after the default library -search path. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-l\fR\fR -.ad -.sp .6 -.RS 4n -List probes instead of enabling them. If the \fB-l\fR option is specified, \fBdtrace\fR produces a report of the probes matching the descriptions given using the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, \fB-i\fR, -and \fB-s\fR options. If none of these options are specified, this option lists all probes. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-m\fR [[\fIprovider:\fR] \fImodule:\fR [[\fIpredicate\fR] \fIaction\fR]]\fR -.ad -.sp .6 -.RS 4n -Specify module name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module\fR or \fImodule\fR. Unspecified probe description fields are left blank and match -any probes regardless of the values in those fields. If no qualifiers other than \fImodule\fR are specified in the description, all probes with a corresponding \fImodule\fR are matched. The \fB-m\fR argument can be suffixed with an optional D -probe clause. More than one \fB-m\fR option can be specified on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]\fR -.ad -.sp .6 -.RS 4n -Specify probe name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function:name\fR, \fImodule:function:name\fR, \fIfunction:name\fR, -or \fIname\fR. Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIname\fR are specified in the description, all probes with a corresponding \fIname\fR are -matched. The \fB-n\fR argument can be suffixed with an optional D probe clause. More than one \fB-n\fR option can be specified on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-o\fR \fIoutput\fR\fR -.ad -.sp .6 -.RS 4n -Specify the \fIoutput\fR file for the \fB-A\fR , \fB-G\fR, and \fB-l\fR options, or for the traced data itself. If the \fB-A\fR option is present and \fB-o\fR is not present, the default output file is \fB/kernel/drv/dtrace.conf\fR. If the \fB-G\fR option is present and the \fB-s\fR option's argument is of the form \fB\fIfilename\fR.d\fR and \fB-o\fR is not present, the default output file is \fB\fIfilename\fR.o\fR. -Otherwise the default output file is \fBd.out\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-p\fR \fIpid\fR\fR -.ad -.sp .6 -.RS 4n -Grab the specified process-ID \fIpid\fR, cache its symbol tables, and exit upon its completion. If more than one \fB-p\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status -for each process as it terminates. The first process-ID is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for -more information on macro variables. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-P\fR \fIprovider\fR \fB[[\fR\fIpredicate\fR\fB]\fR \fIaction\fR]\fR -.ad -.sp .6 -.RS 4n -Specify provider name to trace or list (\fB-l\fR option). The remaining probe description fields module, function, and name are left blank and match any probes regardless of the values in those fields. The \fB-P\fR argument can be suffixed with an optional D -probe clause. You can specify more than one \fB-P\fR option on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-q\fR\fR -.ad -.sp .6 -.RS 4n -Set quiet mode. \fBdtrace\fR suppresses messages such as the number of probes matched by the specified options and D programs and does not print column headers, the CPU ID, the probe ID, or insert newlines into the output. Only data traced and formatted by D program -statements such as \fBtrace()\fR and \fBprintf()\fR is displayed to \fBstdout\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-s\fR\fR -.ad -.sp .6 -.RS 4n -Compile the specified D program source file. If the \fB-e\fR option is present, the program is compiled but instrumentation is not enabled. If the \fB-l\fR option is present, the program is compiled and the set of probes matched by it is listed, but instrumentation *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 09:27:50 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1716120E; Sun, 13 Oct 2013 09:27:50 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 055AB2A85; Sun, 13 Oct 2013 09:27:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9D9RndR045520; Sun, 13 Oct 2013 09:27:49 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9D9RnfJ045519; Sun, 13 Oct 2013 09:27:49 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310130927.r9D9RnfJ045519@svn.freebsd.org> From: Mark Murray Date: Sun, 13 Oct 2013 09:27:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256426 - projects/random_number_generator/sys/modules/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 09:27:50 -0000 Author: markm Date: Sun Oct 13 09:27:49 2013 New Revision: 256426 URL: http://svnweb.freebsd.org/changeset/base/256426 Log: Complete the module; some files were missing. This now is loadable. Modified: projects/random_number_generator/sys/modules/random/Makefile Modified: projects/random_number_generator/sys/modules/random/Makefile ============================================================================== --- projects/random_number_generator/sys/modules/random/Makefile Sun Oct 13 02:41:30 2013 (r256425) +++ projects/random_number_generator/sys/modules/random/Makefile Sun Oct 13 09:27:49 2013 (r256426) @@ -10,7 +10,8 @@ SRCS= randomdev.c SRCS+= nehemiah.c SRCS+= ivy.c .endif -SRCS+= randomdev_soft.c yarrow.c hash.c +SRCS+= randomdev_soft.c random_harvestq.c live_entropy_sources.c +SRCS+= yarrow.c hash.c rwfile.c SRCS+= rijndael-alg-fst.c rijndael-api-fst.c sha2.c SRCS+= bus_if.h device_if.h vnode_if.h opt_cpu.h opt_random.h From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 09:33:51 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id AA65539E; Sun, 13 Oct 2013 09:33:51 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 948852AD1; Sun, 13 Oct 2013 09:33:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9D9Xp9k049356; Sun, 13 Oct 2013 09:33:51 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9D9Xm9R049337; Sun, 13 Oct 2013 09:33:48 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310130933.r9D9Xm9R049337@svn.freebsd.org> From: Mark Murray Date: Sun, 13 Oct 2013 09:33:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256427 - in projects/random_number_generator: etc/rc.d share/man/man5 sys/dev/hyperv/stordisengage sys/dev/hyperv/vmbus sys/dev/xen/blkfront sys/sys usr.sbin/bhyve usr.sbin/bsdconfig/s... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 09:33:51 -0000 Author: markm Date: Sun Oct 13 09:33:48 2013 New Revision: 256427 URL: http://svnweb.freebsd.org/changeset/base/256427 Log: MFC - tracking commit Modified: projects/random_number_generator/etc/rc.d/jail projects/random_number_generator/share/man/man5/rc.conf.5 projects/random_number_generator/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c projects/random_number_generator/sys/dev/hyperv/vmbus/hv_hv.c projects/random_number_generator/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c projects/random_number_generator/sys/dev/xen/blkfront/blkfront.c projects/random_number_generator/sys/sys/systm.h projects/random_number_generator/usr.sbin/bhyve/pci_virtio_block.c projects/random_number_generator/usr.sbin/bsdconfig/share/strings.subr projects/random_number_generator/usr.sbin/jail/command.c projects/random_number_generator/usr.sbin/jail/config.c projects/random_number_generator/usr.sbin/jail/jail.8 projects/random_number_generator/usr.sbin/jail/jail.c projects/random_number_generator/usr.sbin/jail/jailp.h Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/sys/dev/hyperv/ (props changed) projects/random_number_generator/usr.sbin/bhyve/ (props changed) projects/random_number_generator/usr.sbin/jail/ (props changed) Modified: projects/random_number_generator/etc/rc.d/jail ============================================================================== --- projects/random_number_generator/etc/rc.d/jail Sun Oct 13 09:27:49 2013 (r256426) +++ projects/random_number_generator/etc/rc.d/jail Sun Oct 13 09:33:48 2013 (r256427) @@ -226,8 +226,7 @@ parse_options() eval : \${jail_${_j}_fdescfs_enable:=${jail_fdescfs_enable:-NO}} if checkyesno jail_${_j}_fdescfs_enable; then - echo " mount += " \ - "\"fdescfs ${_rootdir%/}/dev/fd fdescfs rw 0 0\";" + echo " mount.fdescfs;" fi eval : \${jail_${_j}_procfs_enable:=${jail_procfs_enable:-NO}} if checkyesno jail_${_j}_procfs_enable; then @@ -438,7 +437,7 @@ jail_start() echo -n " ${_hostname:-${_jail}}" else echo " cannot start jail \"${_hostname:-${jail}}\": " - tail +2 $_tmp + cat $_tmp fi rm -f $_tmp done Modified: projects/random_number_generator/share/man/man5/rc.conf.5 ============================================================================== --- projects/random_number_generator/share/man/man5/rc.conf.5 Sun Oct 13 09:27:49 2013 (r256426) +++ projects/random_number_generator/share/man/man5/rc.conf.5 Sun Oct 13 09:33:48 2013 (r256427) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 10, 2013 +.Dd October 12, 2013 .Dt RC.CONF 5 .Os .Sh NAME @@ -3992,9 +3992,7 @@ set from .Va jail_ Ns Ao Ar jname Ac Ns Va _fstab .It Li mount set from -.Va jail_ Ns Ao Ar jname Ac Ns Va _fdescfs_enable -or -.Va jail_ Ns Ao Ar jname Ac Ns Va _procfs_enable. +.Va jail_ Ns Ao Ar jname Ac Ns Va _procfs_enable . .It Li exec.fib set from .Va jail_ Ns Ao Ar jname Ac Ns Va _fib @@ -4042,6 +4040,9 @@ set from .Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_ruleset . This must be an integer, not a string. +.It Li mount.fdescfs +set from +.Va jail_ Ns Ao Ar jname Ac Ns Va _fdescfs_enable .It Li allow.set_hostname set from .Va jail_ Ns Ao Ar jname Ac Ns Va _set_hostname_allow Modified: projects/random_number_generator/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c ============================================================================== --- projects/random_number_generator/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c Sun Oct 13 09:27:49 2013 (r256426) +++ projects/random_number_generator/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c Sun Oct 13 09:33:48 2013 (r256427) @@ -75,17 +75,11 @@ __FBSDID("$FreeBSD$"); #include #include -#define HV_X64_MSR_GUEST_OS_ID 0x40000000 -#define HV_X64_CPUID_MIN 0x40000005 -#define HV_X64_CPUID_MAX 0x4000ffff - /* prototypes */ static int hv_ata_pci_probe(device_t dev); static int hv_ata_pci_attach(device_t dev); static int hv_ata_pci_detach(device_t dev); -static int hv_check_for_hyper_v(void); - /* * generic PCI ATA device probe */ @@ -100,7 +94,7 @@ hv_ata_pci_probe(device_t dev) /* * Don't probe if not running in a Hyper-V environment */ - if (!hv_check_for_hyper_v()) + if (vm_guest != VM_GUEST_HV) return (ENXIO); if (device_get_unit(parent) != 0 || device_get_ivars(dev) != 0) @@ -139,33 +133,6 @@ hv_ata_pci_detach(device_t dev) return (0); } -/** -* Detect Hyper-V and enable fast IDE -* via enlighted storage driver -*/ -static int -hv_check_for_hyper_v(void) -{ - u_int regs[4]; - int hyper_v_detected; - - hyper_v_detected = 0; - do_cpuid(1, regs); - if (regs[2] & 0x80000000) { - /* - * if(a hypervisor is detected) - * make sure this really is Hyper-V - */ - do_cpuid(HV_X64_MSR_GUEST_OS_ID, regs); - hyper_v_detected = - regs[0] >= HV_X64_CPUID_MIN && - regs[0] <= HV_X64_CPUID_MAX && - !memcmp("Microsoft Hv", ®s[1], 12); - } - - return (hyper_v_detected); -} - static device_method_t hv_ata_pci_methods[] = { /* device interface */ DEVMETHOD(device_probe, hv_ata_pci_probe), Modified: projects/random_number_generator/sys/dev/hyperv/vmbus/hv_hv.c ============================================================================== --- projects/random_number_generator/sys/dev/hyperv/vmbus/hv_hv.c Sun Oct 13 09:27:49 2013 (r256426) +++ projects/random_number_generator/sys/dev/hyperv/vmbus/hv_hv.c Sun Oct 13 09:33:48 2013 (r256427) @@ -218,7 +218,7 @@ hv_vmbus_init(void) 0, sizeof(hv_vmbus_handle) * MAXCPU); - if (!hv_vmbus_query_hypervisor_presence()) + if (vm_guest != VM_GUEST_HV) goto cleanup; max_leaf = hv_vmbus_get_hypervisor_version(); Modified: projects/random_number_generator/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c ============================================================================== --- projects/random_number_generator/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c Sun Oct 13 09:27:49 2013 (r256426) +++ projects/random_number_generator/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c Sun Oct 13 09:33:48 2013 (r256427) @@ -295,11 +295,15 @@ hv_vmbus_child_device_unregister(struct return(ret); } -static void vmbus_identify(driver_t *driver, device_t parent) { +static void +vmbus_identify(driver_t *driver, device_t parent) +{ + if (!hv_vmbus_query_hypervisor_presence()) + return; + + vm_guest = VM_GUEST_HV; + BUS_ADD_CHILD(parent, 0, "vmbus", 0); - if (device_find_child(parent, "vmbus", 0) == NULL) { - BUS_ADD_CHILD(parent, 0, "vmbus", 0); - } } static int @@ -307,9 +311,6 @@ vmbus_probe(device_t dev) { if(bootverbose) device_printf(dev, "VMBUS: probe\n"); - if (!hv_vmbus_query_hypervisor_presence()) - return (ENXIO); - device_set_desc(dev, "Vmbus Devices"); return (0); @@ -491,10 +492,13 @@ vmbus_attach(device_t dev) static void vmbus_init(void) { + if (vm_guest != VM_GUEST_HV) + return; + /* * If the system has already booted and thread - * scheduling is possible indicated by the global - * cold set to zero, we just call the driver + * scheduling is possible, as indicated by the + * global cold set to zero, we just call the driver * initialization directly. */ if (!cold) Modified: projects/random_number_generator/sys/dev/xen/blkfront/blkfront.c ============================================================================== --- projects/random_number_generator/sys/dev/xen/blkfront/blkfront.c Sun Oct 13 09:27:49 2013 (r256426) +++ projects/random_number_generator/sys/dev/xen/blkfront/blkfront.c Sun Oct 13 09:33:48 2013 (r256427) @@ -1381,14 +1381,42 @@ xbd_closing(device_t dev) static int xbd_probe(device_t dev) { + if (strcmp(xenbus_get_type(dev), "vbd") != 0) + return (ENXIO); - if (!strcmp(xenbus_get_type(dev), "vbd")) { - device_set_desc(dev, "Virtual Block Device"); - device_quiet(dev); - return (0); + if (xen_hvm_domain()) { + int error; + char *type; + + /* + * When running in an HVM domain, IDE disk emulation is + * disabled early in boot so that native drivers will + * not see emulated hardware. However, CDROM device + * emulation cannot be disabled. + * + * Through use of FreeBSD's vm_guest and xen_hvm_domain() + * APIs, we could modify the native CDROM driver to fail its + * probe when running under Xen. Unfortunatlely, the PV + * CDROM support in XenServer (up through at least version + * 6.2) isn't functional, so we instead rely on the emulated + * CDROM instance, and fail to attach the PV one here in + * the blkfront driver. + */ + error = xs_read(XST_NIL, xenbus_get_node(dev), + "device-type", NULL, (void **) &type); + if (error) + return (ENXIO); + + if (strncmp(type, "cdrom", 5) == 0) { + free(type, M_XENSTORE); + return (ENXIO); + } + free(type, M_XENSTORE); } - return (ENXIO); + device_set_desc(dev, "Virtual Block Device"); + device_quiet(dev); + return (0); } /* Modified: projects/random_number_generator/sys/sys/systm.h ============================================================================== --- projects/random_number_generator/sys/sys/systm.h Sun Oct 13 09:27:49 2013 (r256426) +++ projects/random_number_generator/sys/sys/systm.h Sun Oct 13 09:33:48 2013 (r256427) @@ -71,7 +71,7 @@ extern int vm_guest; /* Running as virt * and/or add to the VM_GUEST_VM type if specific VM functionality is * ever implemented (e.g. vendor-specific paravirtualization features). */ -enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN }; +enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV }; #if defined(WITNESS) || defined(INVARIANTS) void kassert_panic(const char *fmt, ...) __printflike(1, 2); Modified: projects/random_number_generator/usr.sbin/bhyve/pci_virtio_block.c ============================================================================== --- projects/random_number_generator/usr.sbin/bhyve/pci_virtio_block.c Sun Oct 13 09:27:49 2013 (r256426) +++ projects/random_number_generator/usr.sbin/bhyve/pci_virtio_block.c Sun Oct 13 09:33:48 2013 (r256427) @@ -46,17 +46,25 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "bhyverun.h" #include "pci_emul.h" #include "virtio.h" +#ifndef min +#define min(a, b) ((a) < (b) ? (a) : (b)) +#endif + #define VTBLK_RINGSZ 64 #define VTBLK_MAXSEGS 32 #define VTBLK_S_OK 0 #define VTBLK_S_IOERR 1 +#define VTBLK_S_UNSUPP 2 + +#define VTBLK_BLK_ID_BYTES 20 /* * Host capabilities @@ -85,6 +93,7 @@ struct vtblk_config { struct virtio_blk_hdr { #define VBH_OP_READ 0 #define VBH_OP_WRITE 1 +#define VBH_OP_IDENT 8 #define VBH_FLAG_BARRIER 0x80000000 /* OR'ed into vbh_type */ uint32_t vbh_type; uint32_t vbh_ioprio; @@ -106,6 +115,7 @@ struct pci_vtblk_softc { struct vqueue_info vbsc_vq; int vbsc_fd; struct vtblk_config vbsc_cfg; + char vbsc_ident[VTBLK_BLK_ID_BYTES]; }; static void pci_vtblk_reset(void *); @@ -180,7 +190,7 @@ pci_vtblk_proc(struct pci_vtblk_softc *s for (i = 1; i < n; i++) { /* * - write op implies read-only descriptor, - * - read op implies write-only descriptor, + * - read/ident op implies write-only descriptor, * therefore test the inverse of the descriptor bit * to the op. */ @@ -189,14 +199,34 @@ pci_vtblk_proc(struct pci_vtblk_softc *s } DPRINTF(("virtio-block: %s op, %d bytes, %d segs, offset %ld\n\r", - writeop ? "write" : "read", iolen, i - 1, offset)); + writeop ? "write" : "read/ident", iolen, i - 1, offset)); - if (writeop) + switch (type) { + case VBH_OP_WRITE: err = pwritev(sc->vbsc_fd, iov + 1, i - 1, offset); - else + break; + case VBH_OP_READ: err = preadv(sc->vbsc_fd, iov + 1, i - 1, offset); + break; + case VBH_OP_IDENT: + /* Assume a single buffer */ + strlcpy(iov[1].iov_base, sc->vbsc_ident, + min(iov[1].iov_len, sizeof(sc->vbsc_ident))); + err = 0; + break; + default: + err = -ENOSYS; + break; + } - *status = err < 0 ? VTBLK_S_IOERR : VTBLK_S_OK; + /* convert errno into a virtio block error return */ + if (err < 0) { + if (err == -ENOSYS) + *status = VTBLK_S_UNSUPP; + else + *status = VTBLK_S_IOERR; + } else + *status = VTBLK_S_OK; /* * Return the descriptor back to the host. @@ -220,6 +250,8 @@ static int pci_vtblk_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts) { struct stat sbuf; + MD5_CTX mdctx; + u_char digest[16]; struct pci_vtblk_softc *sc; off_t size; int fd; @@ -274,6 +306,16 @@ pci_vtblk_init(struct vmctx *ctx, struct sc->vbsc_vq.vq_qsize = VTBLK_RINGSZ; /* sc->vbsc_vq.vq_notify = we have no per-queue notify */ + /* + * Create an identifier for the backing file. Use parts of the + * md5 sum of the filename + */ + MD5Init(&mdctx); + MD5Update(&mdctx, opts, strlen(opts)); + MD5Final(digest, &mdctx); + sprintf(sc->vbsc_ident, "BHYVE-%02X%02X-%02X%02X-%02X%02X", + digest[0], digest[1], digest[2], digest[3], digest[4], digest[5]); + /* setup virtio block config space */ sc->vbsc_cfg.vbc_capacity = size / sectsz; sc->vbsc_cfg.vbc_seg_max = VTBLK_MAXSEGS; Modified: projects/random_number_generator/usr.sbin/bsdconfig/share/strings.subr ============================================================================== --- projects/random_number_generator/usr.sbin/bsdconfig/share/strings.subr Sun Oct 13 09:27:49 2013 (r256426) +++ projects/random_number_generator/usr.sbin/bsdconfig/share/strings.subr Sun Oct 13 09:33:48 2013 (r256427) @@ -341,17 +341,19 @@ f_shell_unescape() # # NOTE: Prefixes are case-insensitive. # -# Upon successful completion, the value 0 is returned (or stored to -# $var_to_set); otherwise -1. Reasons for a -1 return include: +# Upon successful completion, success status is returned; otherwise the number +# -1 is produced ($var_to_set set to -1 or if $var_to_set is NULL or missing) +# on standard output. In the case of failure, the error status will be one of: # -# Given $string contains no digits. -# An unrecognized prefix was given. -# Result too large to calculate. +# Status Reason +# 1 Given $string contains no digits +# 2 An unrecognized prefix was given +# 3 Result too large to calculate # f_expand_number() { local __string="$1" __var_to_set="$2" - local __cp __num + local __cp __num __bshift __maxinput # Remove any leading non-digits while :; do @@ -360,14 +362,14 @@ f_expand_number() [ "$__string" = "$__cp" ] && break done - # Return `-1' if string didn't contain any digits + # Produce `-1' if string didn't contain any digits if [ ! "$__string" ]; then if [ "$__var_to_set" ]; then setvar "$__var_to_set" -1 else echo -1 fi - return $FAILURE + return 1 # 1 = "Given $string contains no digits" fi # Store the numbers @@ -390,9 +392,23 @@ f_expand_number() [ "$__string" = "$__cp" ] && break done - # Test for invalid prefix + # + # Test for invalid prefix (and determine bitshift length) + # case "$__string" in - ""|[KkMmGgTtPpEe]*) : known prefix ;; + ""|[[:space:]]*) # Shortcut + if [ "$__var_to_set" ]; then + setvar "$__var_to_set" $__num + else + echo $__num + fi + return $SUCCESS ;; + [Kk]*) __bshift=10 ;; + [Mm]*) __bshift=20 ;; + [Gg]*) __bshift=30 ;; + [Tt]*) __bshift=40 ;; + [Pp]*) __bshift=50 ;; + [Ee]*) __bshift=60 ;; *) # Unknown prefix if [ "$__var_to_set" ]; then @@ -400,29 +416,23 @@ f_expand_number() else echo -1 fi - return $FAILURE + return 2 # 2 = "An unrecognized prefix was given" esac - # Multiply the number out - case "$__string" in - [Kk]) __num=$(( $__num * 1024 )) ;; - [Mm]) __num=$(( $__num * 1048576 )) ;; - [Gg]) __num=$(( $__num * 1073741824 )) ;; - [Tt]) __num=$(( $__num * 1099511627776 )) ;; - [Pp]) __num=$(( $__num * 1125899906842624 )) ;; - [Ee]) __num=$(( $__num * 1152921504606846976 )) ;; - esac - if [ $__num -le 0 ]; then - # Arithmetic overflow + # Determine if the wheels fall off + __maxinput=$(( 0x7fffffffffffffff >> $__bshift )) + if [ $__num -gt $__maxinput ]; then + # Input (before expanding) would exceed 64-bit signed int if [ "$__var_to_set" ]; then setvar "$__var_to_set" -1 else echo -1 fi - return $FAILURE + return 3 # 3 = "Result too large to calculate" fi - # Return the number + # Shift the number out and produce it + __num=$(( $__num << $__bshift )) if [ "$__var_to_set" ]; then setvar "$__var_to_set" $__num else Modified: projects/random_number_generator/usr.sbin/jail/command.c ============================================================================== --- projects/random_number_generator/usr.sbin/jail/command.c Sun Oct 13 09:27:49 2013 (r256426) +++ projects/random_number_generator/usr.sbin/jail/command.c Sun Oct 13 09:33:48 2013 (r256427) @@ -106,7 +106,12 @@ next_command(struct cfjail *j) case IP_MOUNT_DEVFS: if (!bool_param(j->intparams[IP_MOUNT_DEVFS])) continue; - /* FALLTHROUGH */ + j->comstring = &dummystring; + break; + case IP_MOUNT_FDESCFS: + if (!bool_param(j->intparams[IP_MOUNT_FDESCFS])) + continue; + j->comstring = &dummystring; case IP__OP: case IP_STOP_TIMEOUT: j->comstring = &dummystring; @@ -452,6 +457,32 @@ run_command(struct cfjail *j) } break; + case IP_MOUNT_FDESCFS: + argv = alloca(7 * sizeof(char *)); + path = string_param(j->intparams[KP_PATH]); + if (path == NULL) { + jail_warnx(j, "mount.fdescfs: no path"); + return -1; + } + devpath = alloca(strlen(path) + 8); + sprintf(devpath, "%s/dev/fd", path); + if (check_path(j, "mount.fdescfs", devpath, 0, + down ? "fdescfs" : NULL) < 0) + return -1; + if (down) { + *(const char **)&argv[0] = "/sbin/umount"; + argv[1] = devpath; + argv[2] = NULL; + } else { + *(const char **)&argv[0] = _PATH_MOUNT; + *(const char **)&argv[1] = "-t"; + *(const char **)&argv[2] = "fdescfs"; + *(const char **)&argv[3] = "."; + argv[4] = devpath; + argv[5] = NULL; + } + break; + case IP_COMMAND: if (j->name != NULL) goto default_command; Modified: projects/random_number_generator/usr.sbin/jail/config.c ============================================================================== --- projects/random_number_generator/usr.sbin/jail/config.c Sun Oct 13 09:27:49 2013 (r256426) +++ projects/random_number_generator/usr.sbin/jail/config.c Sun Oct 13 09:33:48 2013 (r256427) @@ -83,6 +83,7 @@ static const struct ipspec intparams[] = #endif [IP_MOUNT] = {"mount", PF_INTERNAL | PF_REV}, [IP_MOUNT_DEVFS] = {"mount.devfs", PF_INTERNAL | PF_BOOL}, + [IP_MOUNT_FDESCFS] = {"mount.fdescfs", PF_INTERNAL | PF_BOOL}, [IP_MOUNT_FSTAB] = {"mount.fstab", PF_INTERNAL}, [IP_STOP_TIMEOUT] = {"stop.timeout", PF_INTERNAL | PF_INT}, [IP_VNET_INTERFACE] = {"vnet.interface", PF_INTERNAL}, Modified: projects/random_number_generator/usr.sbin/jail/jail.8 ============================================================================== --- projects/random_number_generator/usr.sbin/jail/jail.8 Sun Oct 13 09:27:49 2013 (r256426) +++ projects/random_number_generator/usr.sbin/jail/jail.8 Sun Oct 13 09:33:48 2013 (r256427) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 23, 2013 +.Dd October 12, 2013 .Dt JAIL 8 .Os .Sh NAME @@ -682,7 +682,7 @@ to. An alias for each address will be added to the interface before the prison is created, and will be removed from the interface after the prison is removed. -.It Op Va ip4.addr +.It Va ip4.addr In addition to the IP addresses that are passed to the kernel, and interface and/or a netmask may also be specified, in the form .Dq Ar interface Ns | Ns Ar ip-address Ns / Ns Ar netmask . @@ -691,7 +691,7 @@ will be added to that interface, as it i .Va interface parameter. If a netmask in either dotted-quad or CIDR form is given after IP address, it will be used when adding the IP alias. -.It Op Va ip6.addr +.It Va ip6.addr In addition to the IP addresses that are passed to the kernel, and interface and/or a prefix may also be specified, in the form .Dq Ar interface Ns | Ns Ar ip-address Ns / Ns Ar prefix . @@ -722,11 +722,19 @@ An format file containing filesystems to mount before creating a jail. .It Va mount.devfs Mount a -.Xr devfs -filesystem on the chrooted /dev directory, and apply the ruleset in the +.Xr devfs 5 +filesystem on the chrooted +.Pa /dev +directory, and apply the ruleset in the .Va devfs_ruleset parameter (or a default of ruleset 4: devfsrules_jail) to restrict the devices visible inside the prison. +.It Va mount.fdescfs +Mount a +.Xr fdescfs 5 +filesystem on the chrooted +.Pa /dev/fd +directory. .It Va allow.dying Allow making changes to a .Va dying @@ -1165,6 +1173,8 @@ environment of the first jail. .Xr ps 1 , .Xr quota 1 , .Xr jail_set 2 , +.Xr devfs 5 , +.Xr fdescfs 5 , .Xr jail.conf 5 , .Xr procfs 5 , .Xr rc.conf 5 , Modified: projects/random_number_generator/usr.sbin/jail/jail.c ============================================================================== --- projects/random_number_generator/usr.sbin/jail/jail.c Sun Oct 13 09:27:49 2013 (r256426) +++ projects/random_number_generator/usr.sbin/jail/jail.c Sun Oct 13 09:33:48 2013 (r256427) @@ -92,6 +92,7 @@ static const enum intparam startcommands IP_MOUNT, IP__MOUNT_FROM_FSTAB, IP_MOUNT_DEVFS, + IP_MOUNT_FDESCFS, IP_EXEC_PRESTART, IP__OP, IP_VNET_INTERFACE, @@ -108,6 +109,7 @@ static const enum intparam stopcommands[ IP_STOP_TIMEOUT, IP__OP, IP_EXEC_POSTSTOP, + IP_MOUNT_FDESCFS, IP_MOUNT_DEVFS, IP__MOUNT_FROM_FSTAB, IP_MOUNT, Modified: projects/random_number_generator/usr.sbin/jail/jailp.h ============================================================================== --- projects/random_number_generator/usr.sbin/jail/jailp.h Sun Oct 13 09:27:49 2013 (r256426) +++ projects/random_number_generator/usr.sbin/jail/jailp.h Sun Oct 13 09:33:48 2013 (r256427) @@ -95,6 +95,7 @@ enum intparam { #endif IP_MOUNT, /* Mount points in fstab(5) form */ IP_MOUNT_DEVFS, /* Mount /dev under prison root */ + IP_MOUNT_FDESCFS, /* Mount /dev/fd under prison root */ IP_MOUNT_FSTAB, /* A standard fstab(5) file */ IP_STOP_TIMEOUT, /* Time to wait after sending SIGTERM */ IP_VNET_INTERFACE, /* Assign interface(s) to vnet jail */ From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 10:22:35 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3339B9F0; Sun, 13 Oct 2013 10:22:35 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1FFF02C73; Sun, 13 Oct 2013 10:22:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9DAMYmx074658; Sun, 13 Oct 2013 10:22:34 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9DAMYnD074653; Sun, 13 Oct 2013 10:22:34 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310131022.r9DAMYnD074653@svn.freebsd.org> From: Alexander Motin Date: Sun, 13 Oct 2013 10:22:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256428 - in projects/camlock/sys/cam: . ata scsi X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 10:22:35 -0000 Author: mav Date: Sun Oct 13 10:22:33 2013 New Revision: 256428 URL: http://svnweb.freebsd.org/changeset/base/256428 Log: Fix several real and hypothetical cases around device hot-plug: - Do not drop potentially last periph reference from the adastart(). That caused use-after-free condition in scheduling code. Add KASSERT() into camperiphfree() to simplify debugging if the issue return some day. - Rework daclose() and adaclose() to properly cleanup even if the periph was invalidated. - Add return status checks for number of cam_periph_acquire() calls. Modified: projects/camlock/sys/cam/ata/ata_da.c projects/camlock/sys/cam/ata/ata_pmp.c projects/camlock/sys/cam/cam_periph.c projects/camlock/sys/cam/scsi/scsi_da.c Modified: projects/camlock/sys/cam/ata/ata_da.c ============================================================================== --- projects/camlock/sys/cam/ata/ata_da.c Sun Oct 13 09:33:48 2013 (r256427) +++ projects/camlock/sys/cam/ata/ata_da.c Sun Oct 13 10:22:33 2013 (r256428) @@ -629,14 +629,8 @@ adaclose(struct disk *dp) int error; periph = (struct cam_periph *)dp->d_drv1; - cam_periph_lock(periph); - if (cam_periph_hold(periph, PRIBIO) != 0) { - cam_periph_unlock(periph); - cam_periph_release(periph); - return (0); - } - softc = (struct ada_softc *)periph->softc; + cam_periph_lock(periph); CAM_DEBUG(periph->path, CAM_DEBUG_TRACE | CAM_DEBUG_PERIPH, ("adaclose\n")); @@ -644,7 +638,8 @@ adaclose(struct disk *dp) /* We only sync the cache if the drive is capable of it. */ if ((softc->flags & ADA_FLAG_DIRTY) != 0 && (softc->flags & ADA_FLAG_CAN_FLUSHCACHE) != 0 && - (periph->flags & CAM_PERIPH_INVALID) == 0) { + (periph->flags & CAM_PERIPH_INVALID) == 0 && + cam_periph_hold(periph, PRIBIO) == 0) { ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL); cam_fill_ataio(&ccb->ataio, @@ -668,10 +663,11 @@ adaclose(struct disk *dp) else softc->flags &= ~ADA_FLAG_DIRTY; xpt_release_ccb(ccb); + cam_periph_unhold(periph); } softc->flags &= ~ADA_FLAG_OPEN; - cam_periph_unhold(periph); + while (softc->refcount != 0) cam_periph_sleep(periph, &softc->refcount, PRIBIO, "adaclose", 1); cam_periph_unlock(periph); @@ -1033,8 +1029,10 @@ adaasync(void *callback_arg, u_int32_t c softc->state = ADA_STATE_WCACHE; else break; - cam_periph_acquire(periph); - xpt_schedule(periph, CAM_PRIORITY_DEV); + if (cam_periph_acquire(periph) != CAM_REQ_CMP) + softc->state = ADA_STATE_NORMAL; + else + xpt_schedule(periph, CAM_PRIORITY_DEV); } default: cam_periph_async(periph, code, path, arg); @@ -1341,8 +1339,8 @@ adaregister(struct cam_periph *periph, v * Create our sysctl variables, now that we know * we have successfully attached. */ - cam_periph_acquire(periph); - taskqueue_enqueue(taskqueue_thread, &softc->sysctl_task); + if (cam_periph_acquire(periph) == CAM_REQ_CMP) + taskqueue_enqueue(taskqueue_thread, &softc->sysctl_task); /* * Add async callbacks for bus reset and @@ -1368,16 +1366,17 @@ adaregister(struct cam_periph *periph, v if (ADA_RA >= 0 && cgd->ident_data.support.command1 & ATA_SUPPORT_LOOKAHEAD) { softc->state = ADA_STATE_RAHEAD; - cam_periph_acquire(periph); - xpt_schedule(periph, CAM_PRIORITY_DEV); } else if (ADA_WC >= 0 && cgd->ident_data.support.command1 & ATA_SUPPORT_WRITECACHE) { softc->state = ADA_STATE_WCACHE; - cam_periph_acquire(periph); - xpt_schedule(periph, CAM_PRIORITY_DEV); - } else + } else { softc->state = ADA_STATE_NORMAL; - + return(CAM_REQ_CMP); + } + if (cam_periph_acquire(periph) != CAM_REQ_CMP) + softc->state = ADA_STATE_NORMAL; + else + xpt_schedule(periph, CAM_PRIORITY_DEV); return(CAM_REQ_CMP); } @@ -1655,13 +1654,6 @@ out: case ADA_STATE_RAHEAD: case ADA_STATE_WCACHE: { - if ((periph->flags & CAM_PERIPH_INVALID) != 0) { - softc->state = ADA_STATE_NORMAL; - xpt_release_ccb(start_ccb); - cam_periph_release_locked(periph); - return; - } - cam_fill_ataio(ataio, 1, adadone, Modified: projects/camlock/sys/cam/ata/ata_pmp.c ============================================================================== --- projects/camlock/sys/cam/ata/ata_pmp.c Sun Oct 13 09:33:48 2013 (r256427) +++ projects/camlock/sys/cam/ata/ata_pmp.c Sun Oct 13 10:22:33 2013 (r256428) @@ -320,13 +320,17 @@ pmpasync(void *callback_arg, u_int32_t c if (code == AC_SENT_BDR || code == AC_BUS_RESET) softc->found = 0; /* We have to reset everything. */ if (softc->state == PMP_STATE_NORMAL) { - if (softc->pm_pid == 0x37261095 || - softc->pm_pid == 0x38261095) - softc->state = PMP_STATE_PM_QUIRKS_1; - else - softc->state = PMP_STATE_PRECONFIG; - cam_periph_acquire(periph); - xpt_schedule(periph, CAM_PRIORITY_DEV); + if (cam_periph_acquire(periph) == CAM_REQ_CMP) { + if (softc->pm_pid == 0x37261095 || + softc->pm_pid == 0x38261095) + softc->state = PMP_STATE_PM_QUIRKS_1; + else + softc->state = PMP_STATE_PRECONFIG; + xpt_schedule(periph, CAM_PRIORITY_DEV); + } else { + pmprelease(periph, softc->found); + xpt_release_boot(); + } } else softc->restart = 1; break; Modified: projects/camlock/sys/cam/cam_periph.c ============================================================================== --- projects/camlock/sys/cam/cam_periph.c Sun Oct 13 09:33:48 2013 (r256427) +++ projects/camlock/sys/cam/cam_periph.c Sun Oct 13 10:22:33 2013 (r256428) @@ -599,6 +599,8 @@ camperiphfree(struct cam_periph *periph) struct periph_driver **p_drv; cam_periph_assert(periph, MA_OWNED); + KASSERT(periph->periph_allocating == 0, ("%s%d: freed while allocating", + periph->periph_name, periph->unit_number)); for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { if (strcmp((*p_drv)->driver_name, periph->periph_name) == 0) break; Modified: projects/camlock/sys/cam/scsi/scsi_da.c ============================================================================== --- projects/camlock/sys/cam/scsi/scsi_da.c Sun Oct 13 09:33:48 2013 (r256427) +++ projects/camlock/sys/cam/scsi/scsi_da.c Sun Oct 13 10:22:33 2013 (r256428) @@ -1269,64 +1269,56 @@ daclose(struct disk *dp) { struct cam_periph *periph; struct da_softc *softc; + union ccb *ccb; int error; periph = (struct cam_periph *)dp->d_drv1; - cam_periph_lock(periph); - if (cam_periph_hold(periph, PRIBIO) != 0) { - cam_periph_unlock(periph); - cam_periph_release(periph); - return (0); - } - softc = (struct da_softc *)periph->softc; - + cam_periph_lock(periph); CAM_DEBUG(periph->path, CAM_DEBUG_TRACE | CAM_DEBUG_PERIPH, ("daclose\n")); - if ((softc->flags & DA_FLAG_DIRTY) != 0 && - (softc->quirks & DA_Q_NO_SYNC_CACHE) == 0 && - (softc->flags & DA_FLAG_PACK_INVALID) == 0) { - union ccb *ccb; + if (cam_periph_hold(periph, PRIBIO) == 0) { - ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL); - - scsi_synchronize_cache(&ccb->csio, - /*retries*/1, - /*cbfcnp*/dadone, - MSG_SIMPLE_Q_TAG, - /*begin_lba*/0,/* Cover the whole disk */ - /*lb_count*/0, - SSD_FULL_SIZE, - 5 * 60 * 1000); - - error = cam_periph_runccb(ccb, daerror, /*cam_flags*/0, - /*sense_flags*/SF_RETRY_UA | SF_QUIET_IR, - softc->disk->d_devstat); - if (error == 0) - softc->flags &= ~DA_FLAG_DIRTY; - xpt_release_ccb(ccb); + /* Flush disk cache. */ + if ((softc->flags & DA_FLAG_DIRTY) != 0 && + (softc->quirks & DA_Q_NO_SYNC_CACHE) == 0 && + (softc->flags & DA_FLAG_PACK_INVALID) == 0) { + ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL); + scsi_synchronize_cache(&ccb->csio, /*retries*/1, + /*cbfcnp*/dadone, MSG_SIMPLE_Q_TAG, + /*begin_lba*/0, /*lb_count*/0, SSD_FULL_SIZE, + 5 * 60 * 1000); + error = cam_periph_runccb(ccb, daerror, /*cam_flags*/0, + /*sense_flags*/SF_RETRY_UA | SF_QUIET_IR, + softc->disk->d_devstat); + if (error == 0) + softc->flags &= ~DA_FLAG_DIRTY; + xpt_release_ccb(ccb); + } + + /* Allow medium removal. */ + if ((softc->flags & DA_FLAG_PACK_REMOVABLE) != 0 && + (softc->quirks & DA_Q_NO_PREVENT) == 0) + daprevent(periph, PR_ALLOW); + cam_periph_unhold(periph); } - if ((softc->flags & DA_FLAG_PACK_REMOVABLE) != 0) { - if ((softc->quirks & DA_Q_NO_PREVENT) == 0) - daprevent(periph, PR_ALLOW); - /* - * If we've got removeable media, mark the blocksize as - * unavailable, since it could change when new media is - * inserted. - */ + /* + * If we've got removeable media, mark the blocksize as + * unavailable, since it could change when new media is + * inserted. + */ + if ((softc->flags & DA_FLAG_PACK_REMOVABLE) != 0) softc->disk->d_devstat->flags |= DEVSTAT_BS_UNAVAILABLE; - } softc->flags &= ~DA_FLAG_OPEN; - cam_periph_unhold(periph); while (softc->refcount != 0) cam_periph_sleep(periph, &softc->refcount, PRIBIO, "daclose", 1); cam_periph_unlock(periph); cam_periph_release(periph); - return (0); + return (0); } static void From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 13:47:49 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C49C5D65; Sun, 13 Oct 2013 13:47:49 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B2AA62455; Sun, 13 Oct 2013 13:47:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9DDlngI078760; Sun, 13 Oct 2013 13:47:49 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9DDln36078759; Sun, 13 Oct 2013 13:47:49 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310131347.r9DDln36078759@svn.freebsd.org> From: Alexander Motin Date: Sun, 13 Oct 2013 13:47:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256429 - projects/camlock/sys/geom/stripe X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 13:47:49 -0000 Author: mav Date: Sun Oct 13 13:47:49 2013 New Revision: 256429 URL: http://svnweb.freebsd.org/changeset/base/256429 Log: Add unmapped I/O support to GEOM STRIPE. Modified: projects/camlock/sys/geom/stripe/g_stripe.c Modified: projects/camlock/sys/geom/stripe/g_stripe.c ============================================================================== --- projects/camlock/sys/geom/stripe/g_stripe.c Sun Oct 13 10:22:33 2013 (r256428) +++ projects/camlock/sys/geom/stripe/g_stripe.c Sun Oct 13 13:47:49 2013 (r256429) @@ -445,7 +445,6 @@ g_stripe_start_economic(struct bio *bp, sc = bp->bio_to->geom->softc; - addr = bp->bio_data; stripesize = sc->sc_stripesize; cbp = g_clone_bio(bp); @@ -457,10 +456,18 @@ g_stripe_start_economic(struct bio *bp, /* * Fill in the component buf structure. */ - cbp->bio_done = g_stripe_done; + if (bp->bio_length == length) + cbp->bio_done = g_std_done; /* Optimized lockless case. */ + else + cbp->bio_done = g_stripe_done; cbp->bio_offset = offset; - cbp->bio_data = addr; cbp->bio_length = length; + if ((bp->bio_flags & BIO_UNMAPPED) != 0) { + bp->bio_ma_n = round_page(bp->bio_ma_offset + + bp->bio_length) / PAGE_SIZE; + addr = NULL; + } else + addr = bp->bio_data; cbp->bio_caller2 = sc->sc_disks[no]; /* offset -= offset % stripesize; */ @@ -484,12 +491,19 @@ g_stripe_start_economic(struct bio *bp, */ cbp->bio_done = g_stripe_done; cbp->bio_offset = offset; - cbp->bio_data = addr; /* * MIN() is in case when * (bp->bio_length % sc->sc_stripesize) != 0. */ cbp->bio_length = MIN(stripesize, length); + if ((bp->bio_flags & BIO_UNMAPPED) != 0) { + cbp->bio_ma_offset += (uintptr_t)addr; + cbp->bio_ma += cbp->bio_ma_offset / PAGE_SIZE; + cbp->bio_ma_offset %= PAGE_SIZE; + cbp->bio_ma_n = round_page(cbp->bio_ma_offset + + cbp->bio_length) / PAGE_SIZE; + } else + cbp->bio_data = addr; cbp->bio_caller2 = sc->sc_disks[no]; } @@ -616,9 +630,12 @@ g_stripe_start(struct bio *bp) * 3. Request size is bigger than stripesize * ndisks. If it isn't, * there will be no need to send more than one I/O request to * a provider, so there is nothing to optmize. + * and + * 4. Request is not unmapped. */ if (g_stripe_fast && bp->bio_length <= MAXPHYS && - bp->bio_length >= stripesize * sc->sc_ndisks) { + bp->bio_length >= stripesize * sc->sc_ndisks && + (bp->bio_flags & BIO_UNMAPPED) == 0) { fast = 1; } error = 0; @@ -645,6 +662,7 @@ g_stripe_start(struct bio *bp) static void g_stripe_check_and_run(struct g_stripe_softc *sc) { + struct g_provider *dp; off_t mediasize, ms; u_int no, sectorsize = 0; @@ -655,6 +673,8 @@ g_stripe_check_and_run(struct g_stripe_s sc->sc_provider = g_new_providerf(sc->sc_geom, "stripe/%s", sc->sc_name); sc->sc_provider->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE; + if (g_stripe_fast == 0) + sc->sc_provider->flags |= G_PF_ACCEPT_UNMAPPED; /* * Find the smallest disk. */ @@ -664,14 +684,21 @@ g_stripe_check_and_run(struct g_stripe_s mediasize -= mediasize % sc->sc_stripesize; sectorsize = sc->sc_disks[0]->provider->sectorsize; for (no = 1; no < sc->sc_ndisks; no++) { - ms = sc->sc_disks[no]->provider->mediasize; + dp = sc->sc_disks[no]->provider; + ms = dp->mediasize; if (sc->sc_type == G_STRIPE_TYPE_AUTOMATIC) - ms -= sc->sc_disks[no]->provider->sectorsize; + ms -= dp->sectorsize; ms -= ms % sc->sc_stripesize; if (ms < mediasize) mediasize = ms; - sectorsize = lcm(sectorsize, - sc->sc_disks[no]->provider->sectorsize); + sectorsize = lcm(sectorsize, dp->sectorsize); + + /* A provider underneath us doesn't support unmapped */ + if ((dp->flags & G_PF_ACCEPT_UNMAPPED) == 0) { + G_STRIPE_DEBUG(1, "Cancelling unmapped " + "because of %s.", dp->name); + sc->sc_provider->flags &= ~G_PF_ACCEPT_UNMAPPED; + } } sc->sc_provider->sectorsize = sectorsize; sc->sc_provider->mediasize = mediasize * sc->sc_ndisks; From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 19:02:17 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 99889B02; Sun, 13 Oct 2013 19:02:17 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8582E2252; Sun, 13 Oct 2013 19:02:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9DJ2Hn3041520; Sun, 13 Oct 2013 19:02:17 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9DJ2HoD041518; Sun, 13 Oct 2013 19:02:17 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310131902.r9DJ2HoD041518@svn.freebsd.org> From: Alexander Motin Date: Sun, 13 Oct 2013 19:02:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256431 - projects/camlock/sys/geom/concat X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 19:02:17 -0000 Author: mav Date: Sun Oct 13 19:02:16 2013 New Revision: 256431 URL: http://svnweb.freebsd.org/changeset/base/256431 Log: Add unmapped I/O and direct dispatch support to GEOM CONCAT. Modified: projects/camlock/sys/geom/concat/g_concat.c projects/camlock/sys/geom/concat/g_concat.h Modified: projects/camlock/sys/geom/concat/g_concat.c ============================================================================== --- projects/camlock/sys/geom/concat/g_concat.c Sun Oct 13 15:49:50 2013 (r256430) +++ projects/camlock/sys/geom/concat/g_concat.c Sun Oct 13 19:02:16 2013 (r256431) @@ -239,6 +239,27 @@ g_concat_kernel_dump(struct bio *bp) } static void +g_concat_done(struct bio *bp) +{ + struct g_concat_softc *sc; + struct bio *pbp; + + pbp = bp->bio_parent; + sc = pbp->bio_to->geom->softc; + mtx_lock(&sc->sc_lock); + if (pbp->bio_error == 0) + pbp->bio_error = bp->bio_error; + pbp->bio_completed += bp->bio_completed; + pbp->bio_inbed++; + if (pbp->bio_children == pbp->bio_inbed) { + mtx_unlock(&sc->sc_lock); + g_io_deliver(pbp, pbp->bio_error); + } else + mtx_unlock(&sc->sc_lock); + g_destroy_bio(bp); +} + +static void g_concat_flush(struct g_concat_softc *sc, struct bio *bp) { struct bio_queue_head queue; @@ -250,23 +271,19 @@ g_concat_flush(struct g_concat_softc *sc for (no = 0; no < sc->sc_ndisks; no++) { cbp = g_clone_bio(bp); if (cbp == NULL) { - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) g_destroy_bio(cbp); - } if (bp->bio_error == 0) bp->bio_error = ENOMEM; g_io_deliver(bp, bp->bio_error); return; } bioq_insert_tail(&queue, cbp); - cbp->bio_done = g_std_done; + cbp->bio_done = g_concat_done; cbp->bio_caller1 = sc->sc_disks[no].d_consumer; cbp->bio_to = sc->sc_disks[no].d_consumer->provider; } - for (cbp = bioq_first(&queue); cbp != NULL; cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) { G_CONCAT_LOGREQ(cbp, "Sending request."); cp = cbp->bio_caller1; cbp->bio_caller1 = NULL; @@ -320,7 +337,10 @@ g_concat_start(struct bio *bp) offset = bp->bio_offset; length = bp->bio_length; - addr = bp->bio_data; + if ((bp->bio_flags & BIO_UNMAPPED) != 0) + addr = NULL; + else + addr = bp->bio_data; end = offset + length; bioq_init(&queue); @@ -338,11 +358,8 @@ g_concat_start(struct bio *bp) cbp = g_clone_bio(bp); if (cbp == NULL) { - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) g_destroy_bio(cbp); - } if (bp->bio_error == 0) bp->bio_error = ENOMEM; g_io_deliver(bp, bp->bio_error); @@ -352,11 +369,21 @@ g_concat_start(struct bio *bp) /* * Fill in the component buf structure. */ - cbp->bio_done = g_std_done; + if (len == bp->bio_length) + cbp->bio_done = g_std_done; + else + cbp->bio_done = g_concat_done; cbp->bio_offset = off; - cbp->bio_data = addr; - addr += len; cbp->bio_length = len; + if ((bp->bio_flags & BIO_UNMAPPED) != 0) { + cbp->bio_ma_offset += (uintptr_t)addr; + cbp->bio_ma += cbp->bio_ma_offset / PAGE_SIZE; + cbp->bio_ma_offset %= PAGE_SIZE; + cbp->bio_ma_n = round_page(cbp->bio_ma_offset + + cbp->bio_length) / PAGE_SIZE; + } else + cbp->bio_data = addr; + addr += len; cbp->bio_to = disk->d_consumer->provider; cbp->bio_caller1 = disk; @@ -366,8 +393,7 @@ g_concat_start(struct bio *bp) KASSERT(length == 0, ("Length is still greater than 0 (class=%s, name=%s).", bp->bio_to->geom->class->name, bp->bio_to->geom->name)); - for (cbp = bioq_first(&queue); cbp != NULL; cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) { G_CONCAT_LOGREQ(cbp, "Sending request."); disk = cbp->bio_caller1; cbp->bio_caller1 = NULL; @@ -379,7 +405,7 @@ static void g_concat_check_and_run(struct g_concat_softc *sc) { struct g_concat_disk *disk; - struct g_provider *pp; + struct g_provider *dp, *pp; u_int no, sectorsize = 0; off_t start; @@ -388,20 +414,27 @@ g_concat_check_and_run(struct g_concat_s return; pp = g_new_providerf(sc->sc_geom, "concat/%s", sc->sc_name); + pp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE | + G_PF_ACCEPT_UNMAPPED; start = 0; for (no = 0; no < sc->sc_ndisks; no++) { disk = &sc->sc_disks[no]; + dp = disk->d_consumer->provider; disk->d_start = start; - disk->d_end = disk->d_start + - disk->d_consumer->provider->mediasize; + disk->d_end = disk->d_start + dp->mediasize; if (sc->sc_type == G_CONCAT_TYPE_AUTOMATIC) - disk->d_end -= disk->d_consumer->provider->sectorsize; + disk->d_end -= dp->sectorsize; start = disk->d_end; if (no == 0) - sectorsize = disk->d_consumer->provider->sectorsize; - else { - sectorsize = lcm(sectorsize, - disk->d_consumer->provider->sectorsize); + sectorsize = dp->sectorsize; + else + sectorsize = lcm(sectorsize, dp->sectorsize); + + /* A provider underneath us doesn't support unmapped */ + if ((dp->flags & G_PF_ACCEPT_UNMAPPED) == 0) { + G_CONCAT_DEBUG(1, "Cancelling unmapped " + "because of %s.", dp->name); + pp->flags &= ~G_PF_ACCEPT_UNMAPPED; } } pp->sectorsize = sectorsize; @@ -468,6 +501,7 @@ g_concat_add_disk(struct g_concat_softc fcp = LIST_FIRST(&gp->consumer); cp = g_new_consumer(gp); + cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE; error = g_attach(cp, pp); if (error != 0) { g_destroy_consumer(cp); @@ -557,6 +591,7 @@ g_concat_create(struct g_class *mp, cons for (no = 0; no < sc->sc_ndisks; no++) sc->sc_disks[no].d_consumer = NULL; sc->sc_type = type; + mtx_init(&sc->sc_lock, "gconcat lock", NULL, MTX_DEF); gp->softc = sc; sc->sc_geom = gp; @@ -605,6 +640,7 @@ g_concat_destroy(struct g_concat_softc * KASSERT(sc->sc_provider == NULL, ("Provider still exists? (device=%s)", gp->name)); free(sc->sc_disks, M_CONCAT); + mtx_destroy(&sc->sc_lock); free(sc, M_CONCAT); G_CONCAT_DEBUG(0, "Device %s destroyed.", gp->name); Modified: projects/camlock/sys/geom/concat/g_concat.h ============================================================================== --- projects/camlock/sys/geom/concat/g_concat.h Sun Oct 13 15:49:50 2013 (r256430) +++ projects/camlock/sys/geom/concat/g_concat.h Sun Oct 13 19:02:16 2013 (r256431) @@ -83,6 +83,7 @@ struct g_concat_softc { struct g_concat_disk *sc_disks; uint16_t sc_ndisks; + struct mtx sc_lock; }; #define sc_name sc_geom->name #endif /* _KERNEL */ From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 21:26:26 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7B0A19F5; Sun, 13 Oct 2013 21:26:26 +0000 (UTC) (envelope-from gibbs@FreeBSD.org) Received: from aslan.scsiguy.com (www.scsiguy.com [70.89.174.89]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 33F8E2845; Sun, 13 Oct 2013 21:26:25 +0000 (UTC) Received: from [10.0.0.21] (65.105.242.98.ptr.us.xo.net [65.105.242.98]) (authenticated bits=0) by aslan.scsiguy.com (8.14.7/8.14.5) with ESMTP id r9DLQHAn063036 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Sun, 13 Oct 2013 15:26:19 -0600 (MDT) (envelope-from gibbs@FreeBSD.org) Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 6.6 \(1510\)) Subject: Re: svn commit: r256295 - in projects/camlock/sys: geom kern From: "Justin T. Gibbs" In-Reply-To: <201310102003.r9AK3smQ038364@svn.freebsd.org> Date: Sun, 13 Oct 2013 15:26:12 -0600 Content-Transfer-Encoding: quoted-printable Message-Id: <2A8C3ACD-A37E-48CB-9103-DA359B3B0536@FreeBSD.org> References: <201310102003.r9AK3smQ038364@svn.freebsd.org> To: Alexander Motin X-Mailer: Apple Mail (2.1510) X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (aslan.scsiguy.com [70.89.174.89]); Sun, 13 Oct 2013 15:26:19 -0600 (MDT) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 21:26:26 -0000 On Oct 10, 2013, at 2:03 PM, Alexander Motin wrote: > Author: mav > Date: Thu Oct 10 20:03:54 2013 > New Revision: 256295 > URL: http://svnweb.freebsd.org/changeset/base/256295 >=20 > Log: > Use the same satistics for disk and its GEOM provider. >=20 > Avoiding double accounting allows to reduce CPU load on I/O, = especially on > machines with slow timecounter. As side effect it also makes gstat = show > statistics for raw disk providers even when kern.geom.collectstats is = set > to zero, making that mode more usable. =85 > Modified: projects/camlock/sys/geom/geom_io.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- projects/camlock/sys/geom/geom_io.c Thu Oct 10 19:56:31 2013 = (r256294) > +++ projects/camlock/sys/geom/geom_io.c Thu Oct 10 20:03:54 2013 = (r256295) > @@ -510,7 +510,7 @@ g_io_request(struct bio *bp, struct g_co >=20 > KASSERT(!(bp->bio_flags & BIO_ONQUEUE), > ("Bio already on queue bp=3D%p", bp)); > - if (g_collectstats) > + if ((g_collectstats & ~(pp->stat ? 0 : 1)) !=3D 0) > binuptime(&bp->bio_t0); > else > getbinuptime(&bp->bio_t0); This is pretty obscure and further compounds the original bug that there is no enum defining the bits in g_collectstats. Can you please: 1) Add an enum with constants for the two bits in g_collectstats with nice comments for what they do. 2) Use those constants everywhere and change your original logic to make = it more readable? e.g. if ((g_collecstats & G_CONSUMER_STATS) !=3D 0 || ((g_collecstats & G_PROVIDER_STATS) !=3D 0 && pp->stat !=3D = NULL)) I would bet the compiler optimizes this just as well as your original = logic. Thanks, Justin From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 00:56:39 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1619999E; Mon, 14 Oct 2013 00:56:39 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 04CD82059; Mon, 14 Oct 2013 00:56:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9E0ucEq026912; Mon, 14 Oct 2013 00:56:38 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9E0ucDW026911; Mon, 14 Oct 2013 00:56:38 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201310140056.r9E0ucDW026911@svn.freebsd.org> From: Justin Hibbits Date: Mon, 14 Oct 2013 00:56:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256434 - projects/pmac_pmu/sys/powerpc/powermac X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 00:56:39 -0000 Author: jhibbits Date: Mon Oct 14 00:56:38 2013 New Revision: 256434 URL: http://svnweb.freebsd.org/changeset/base/256434 Log: PCPU fputhread and vecthread get reset to NULL when save_fpu()/save_vec() is called. Cache these. Modified: projects/pmac_pmu/sys/powerpc/powermac/pmu.c Modified: projects/pmac_pmu/sys/powerpc/powermac/pmu.c ============================================================================== --- projects/pmac_pmu/sys/powerpc/powermac/pmu.c Sun Oct 13 21:46:08 2013 (r256433) +++ projects/pmac_pmu/sys/powerpc/powermac/pmu.c Mon Oct 14 00:56:38 2013 (r256434) @@ -1129,11 +1129,13 @@ extern void *ap_pcpu; void pmu_sleep_int(void) { + jmp_buf resetjb; u_quad_t timebase; + struct thread *fputd = NULL; + struct thread *vectd = NULL; register_t hid0; register_t msr; register_t saved_msr; - jmp_buf resetjb; ap_pcpu = pcpup; @@ -1143,9 +1145,11 @@ void pmu_sleep_int(void) saved_msr = mfmsr(); timebase = mftb(); flush_disable_caches(); - if (PCPU_GET(fputhread) != NULL) + fputd = PCPU_GET(fputhread); + vectd = PCPU_GET(vecthread); + if (fputd != NULL) save_fpu(PCPU_GET(fputhread)); - if (PCPU_GET(vecthread) != NULL) + if (vectd != NULL) save_vec(PCPU_GET(vecthread)); if (setjmp(resetjb) == 0) { sprgs[0] = mfspr(SPR_SPRG0); @@ -1177,9 +1181,9 @@ void pmu_sleep_int(void) mtspr(SPR_SRR0, srrs[0]); mtspr(SPR_SRR1, srrs[1]); mtmsr(saved_msr); - if (PCPU_GET(fputhread) == curthread) + if (fputd == curthread) enable_fpu(curthread); - if (PCPU_GET(vecthread) == curthread) + if (vectd == curthread) enable_vec(curthread); powerpc_sync(); } From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 07:36:18 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 142A59FE; Mon, 14 Oct 2013 07:36:18 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F350F2001; Mon, 14 Oct 2013 07:36:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9E7aHcV032582; Mon, 14 Oct 2013 07:36:17 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9E7aHCc032580; Mon, 14 Oct 2013 07:36:17 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310140736.r9E7aHCc032580@svn.freebsd.org> From: Alexander Motin Date: Mon, 14 Oct 2013 07:36:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256438 - projects/camlock/sys/geom/gate X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 07:36:18 -0000 Author: mav Date: Mon Oct 14 07:36:17 2013 New Revision: 256438 URL: http://svnweb.freebsd.org/changeset/base/256438 Log: Add direct dispatch support to GEOM GATE. To allow direct send on provider I had to move several auxillary g_io_deliver() calls out of the queue lock. Modified: projects/camlock/sys/geom/gate/g_gate.c Modified: projects/camlock/sys/geom/gate/g_gate.c ============================================================================== --- projects/camlock/sys/geom/gate/g_gate.c Mon Oct 14 05:56:15 2013 (r256437) +++ projects/camlock/sys/geom/gate/g_gate.c Mon Oct 14 07:36:17 2013 (r256438) @@ -91,6 +91,7 @@ static struct mtx g_gate_units_lock; static int g_gate_destroy(struct g_gate_softc *sc, boolean_t force) { + struct bio_queue_head queue; struct g_provider *pp; struct g_consumer *cp; struct g_geom *gp; @@ -113,21 +114,22 @@ g_gate_destroy(struct g_gate_softc *sc, pp->flags |= G_PF_WITHER; g_orphan_provider(pp, ENXIO); callout_drain(&sc->sc_callout); + bioq_init(&queue); mtx_lock(&sc->sc_queue_mtx); - while ((bp = bioq_first(&sc->sc_inqueue)) != NULL) { - bioq_remove(&sc->sc_inqueue, bp); + while ((bp = bioq_takefirst(&sc->sc_inqueue)) != NULL) { sc->sc_queue_count--; - G_GATE_LOGREQ(1, bp, "Request canceled."); - g_io_deliver(bp, ENXIO); + bioq_insert_tail(&queue, bp); } - while ((bp = bioq_first(&sc->sc_outqueue)) != NULL) { - bioq_remove(&sc->sc_outqueue, bp); + while ((bp = bioq_takefirst(&sc->sc_outqueue)) != NULL) { sc->sc_queue_count--; - G_GATE_LOGREQ(1, bp, "Request canceled."); - g_io_deliver(bp, ENXIO); + bioq_insert_tail(&queue, bp); } mtx_unlock(&sc->sc_queue_mtx); g_topology_unlock(); + while ((bp = bioq_takefirst(&queue)) != NULL) { + G_GATE_LOGREQ(1, bp, "Request canceled."); + g_io_deliver(bp, ENXIO); + } mtx_lock(&g_gate_units_lock); /* One reference is ours. */ sc->sc_ref--; @@ -334,6 +336,7 @@ g_gate_getunit(int unit, int *errorp) static void g_gate_guard(void *arg) { + struct bio_queue_head queue; struct g_gate_softc *sc; struct bintime curtime; struct bio *bp, *bp2; @@ -341,24 +344,27 @@ g_gate_guard(void *arg) sc = arg; binuptime(&curtime); g_gate_hold(sc->sc_unit, NULL); + bioq_init(&queue); mtx_lock(&sc->sc_queue_mtx); TAILQ_FOREACH_SAFE(bp, &sc->sc_inqueue.queue, bio_queue, bp2) { if (curtime.sec - bp->bio_t0.sec < 5) continue; bioq_remove(&sc->sc_inqueue, bp); sc->sc_queue_count--; - G_GATE_LOGREQ(1, bp, "Request timeout."); - g_io_deliver(bp, EIO); + bioq_insert_tail(&queue, bp); } TAILQ_FOREACH_SAFE(bp, &sc->sc_outqueue.queue, bio_queue, bp2) { if (curtime.sec - bp->bio_t0.sec < 5) continue; bioq_remove(&sc->sc_outqueue, bp); sc->sc_queue_count--; + bioq_insert_tail(&queue, bp); + } + mtx_unlock(&sc->sc_queue_mtx); + while ((bp = bioq_takefirst(&queue)) != NULL) { G_GATE_LOGREQ(1, bp, "Request timeout."); g_io_deliver(bp, EIO); } - mtx_unlock(&sc->sc_queue_mtx); if ((sc->sc_flags & G_GATE_FLAG_DESTROY) == 0) { callout_reset(&sc->sc_callout, sc->sc_timeout * hz, g_gate_guard, sc); @@ -542,6 +548,7 @@ g_gate_create(struct g_gate_ctl_create * if (ropp != NULL) { cp = g_new_consumer(gp); + cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE; error = g_attach(cp, ropp); if (error != 0) { G_GATE_DEBUG(1, "Unable to attach to %s.", ropp->name); @@ -560,6 +567,7 @@ g_gate_create(struct g_gate_ctl_create * ggio->gctl_unit = sc->sc_unit; pp = g_new_providerf(gp, "%s", name); + pp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE; pp->mediasize = ggio->gctl_mediasize; pp->sectorsize = ggio->gctl_sectorsize; sc->sc_provider = pp; @@ -636,6 +644,7 @@ g_gate_modify(struct g_gate_softc *sc, s return (EINVAL); } cp = g_new_consumer(sc->sc_provider->geom); + cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE; error = g_attach(cp, pp); if (error != 0) { G_GATE_DEBUG(1, "Unable to attach to %s.", From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 09:28:47 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 44BB5719; Mon, 14 Oct 2013 09:28:47 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 31CC926F2; Mon, 14 Oct 2013 09:28:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9E9Slmn089454; Mon, 14 Oct 2013 09:28:47 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9E9SkFx089452; Mon, 14 Oct 2013 09:28:46 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310140928.r9E9SkFx089452@svn.freebsd.org> From: Alexander Motin Date: Mon, 14 Oct 2013 09:28:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256439 - projects/camlock/sys/geom/mirror X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 09:28:47 -0000 Author: mav Date: Mon Oct 14 09:28:46 2013 New Revision: 256439 URL: http://svnweb.freebsd.org/changeset/base/256439 Log: Add partial (receive only) direct dispatch support to GEOM MIRROR. Modified: projects/camlock/sys/geom/mirror/g_mirror.c projects/camlock/sys/geom/mirror/g_mirror.h Modified: projects/camlock/sys/geom/mirror/g_mirror.c ============================================================================== --- projects/camlock/sys/geom/mirror/g_mirror.c Mon Oct 14 07:36:17 2013 (r256438) +++ projects/camlock/sys/geom/mirror/g_mirror.c Mon Oct 14 09:28:46 2013 (r256439) @@ -394,6 +394,7 @@ g_mirror_connect_disk(struct g_mirror_di g_topology_lock(); cp = g_new_consumer(disk->d_softc->sc_geom); + cp->flags |= G_CF_DIRECT_RECEIVE; error = g_attach(cp, pp); if (error != 0) { g_destroy_consumer(cp); @@ -554,6 +555,7 @@ g_mirror_destroy_device(struct g_mirror_ g_topology_unlock(); mtx_destroy(&sc->sc_queue_mtx); mtx_destroy(&sc->sc_events_mtx); + mtx_destroy(&sc->sc_done_mtx); sx_xunlock(&sc->sc_lock); sx_destroy(&sc->sc_lock); } @@ -852,6 +854,27 @@ g_mirror_unidle(struct g_mirror_softc *s } static void +g_mirror_flush_done(struct bio *bp) +{ + struct g_mirror_softc *sc; + struct bio *pbp; + + pbp = bp->bio_parent; + sc = pbp->bio_to->geom->softc; + mtx_lock(&sc->sc_done_mtx); + if (pbp->bio_error == 0) + pbp->bio_error = bp->bio_error; + pbp->bio_completed += bp->bio_completed; + pbp->bio_inbed++; + if (pbp->bio_children == pbp->bio_inbed) { + mtx_unlock(&sc->sc_done_mtx); + g_io_deliver(pbp, pbp->bio_error); + } else + mtx_unlock(&sc->sc_done_mtx); + g_destroy_bio(bp); +} + +static void g_mirror_done(struct bio *bp) { struct g_mirror_softc *sc; @@ -1037,23 +1060,19 @@ g_mirror_flush(struct g_mirror_softc *sc continue; cbp = g_clone_bio(bp); if (cbp == NULL) { - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) g_destroy_bio(cbp); - } if (bp->bio_error == 0) bp->bio_error = ENOMEM; g_io_deliver(bp, bp->bio_error); return; } bioq_insert_tail(&queue, cbp); - cbp->bio_done = g_std_done; + cbp->bio_done = g_mirror_flush_done; cbp->bio_caller1 = disk; cbp->bio_to = disk->d_consumer->provider; } - for (cbp = bioq_first(&queue); cbp != NULL; cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) { G_MIRROR_LOGREQ(3, cbp, "Sending request."); disk = cbp->bio_caller1; cbp->bio_caller1 = NULL; @@ -1538,11 +1557,8 @@ g_mirror_request_split(struct g_mirror_s continue; cbp = g_clone_bio(bp); if (cbp == NULL) { - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { + while ((cbp = bioq_takefirst(&queue)) != NULL) bioq_remove(&queue, cbp); - g_destroy_bio(cbp); - } if (bp->bio_error == 0) bp->bio_error = ENOMEM; g_io_deliver(bp, bp->bio_error); @@ -1561,8 +1577,7 @@ g_mirror_request_split(struct g_mirror_s offset += cbp->bio_length; data += cbp->bio_length; } - for (cbp = bioq_first(&queue); cbp != NULL; cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) { G_MIRROR_LOGREQ(3, cbp, "Sending request."); disk = cbp->bio_caller1; cbp->bio_caller1 = NULL; @@ -1643,11 +1658,8 @@ g_mirror_register_request(struct bio *bp continue; cbp = g_clone_bio(bp); if (cbp == NULL) { - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) g_destroy_bio(cbp); - } if (bp->bio_error == 0) bp->bio_error = ENOMEM; g_io_deliver(bp, bp->bio_error); @@ -1662,9 +1674,7 @@ g_mirror_register_request(struct bio *bp ("Consumer %s not opened (r%dw%de%d).", cp->provider->name, cp->acr, cp->acw, cp->ace)); } - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) { G_MIRROR_LOGREQ(3, cbp, "Sending request."); cp = cbp->bio_caller1; cbp->bio_caller1 = NULL; @@ -1920,6 +1930,7 @@ g_mirror_sync_start(struct g_mirror_disk sx_xunlock(&sc->sc_lock); g_topology_lock(); cp = g_new_consumer(sc->sc_sync.ds_geom); + cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE; error = g_attach(cp, sc->sc_provider); KASSERT(error == 0, ("Cannot attach to %s (error=%d).", sc->sc_name, error)); @@ -2034,6 +2045,7 @@ g_mirror_launch_provider(struct g_mirror g_topology_lock(); pp = g_new_providerf(sc->sc_geom, "mirror/%s", sc->sc_name); + pp->flags |= G_PF_DIRECT_RECEIVE; pp->mediasize = sc->sc_mediasize; pp->sectorsize = sc->sc_sectorsize; pp->stripesize = 0; @@ -2082,10 +2094,8 @@ g_mirror_destroy_provider(struct g_mirro g_topology_lock(); g_error_provider(sc->sc_provider, ENXIO); mtx_lock(&sc->sc_queue_mtx); - while ((bp = bioq_first(&sc->sc_queue)) != NULL) { - bioq_remove(&sc->sc_queue, bp); + while ((bp = bioq_takefirst(&sc->sc_queue)) != NULL) g_io_deliver(bp, ENXIO); - } mtx_unlock(&sc->sc_queue_mtx); G_MIRROR_DEBUG(0, "Device %s: provider %s destroyed.", sc->sc_name, sc->sc_provider->name); @@ -2896,6 +2906,7 @@ g_mirror_create(struct g_class *mp, cons TAILQ_INIT(&sc->sc_events); mtx_init(&sc->sc_events_mtx, "gmirror:events", NULL, MTX_DEF); callout_init(&sc->sc_callout, CALLOUT_MPSAFE); + mtx_init(&sc->sc_done_mtx, "gmirror:done", NULL, MTX_DEF); sc->sc_state = G_MIRROR_DEVICE_STATE_STARTING; gp->softc = sc; sc->sc_geom = gp; @@ -2914,6 +2925,7 @@ g_mirror_create(struct g_class *mp, cons G_MIRROR_DEBUG(1, "Cannot create kernel thread for %s.", sc->sc_name); g_destroy_geom(sc->sc_sync.ds_geom); + mtx_destroy(&sc->sc_done_mtx); mtx_destroy(&sc->sc_events_mtx); mtx_destroy(&sc->sc_queue_mtx); sx_destroy(&sc->sc_lock); Modified: projects/camlock/sys/geom/mirror/g_mirror.h ============================================================================== --- projects/camlock/sys/geom/mirror/g_mirror.h Mon Oct 14 07:36:17 2013 (r256438) +++ projects/camlock/sys/geom/mirror/g_mirror.h Mon Oct 14 09:28:46 2013 (r256439) @@ -212,6 +212,8 @@ struct g_mirror_softc { struct callout sc_callout; struct root_hold_token *sc_rootmount; + + struct mtx sc_done_mtx; }; #define sc_name sc_geom->name From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 15:52:49 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A7D25C3D; Mon, 14 Oct 2013 15:52:49 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 78BF721FF; Mon, 14 Oct 2013 15:52:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EFqnOK090947; Mon, 14 Oct 2013 15:52:49 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EFqkE8090927; Mon, 14 Oct 2013 15:52:46 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310141552.r9EFqkE8090927@svn.freebsd.org> From: "Simon J. Gerraty" Date: Mon, 14 Oct 2013 15:52:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256444 - in projects/bmake: . gnu/usr.bin/cc/cc_tools lib/clang sys/arm/versatile sys/boot/i386/btx/btx sys/dev/ata sys/dev/bxe sys/dev/cxgb/ulp/iw_cxgb sys/dev/hyperv/stordisengage sy... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 15:52:49 -0000 Author: sjg Date: Mon Oct 14 15:52:45 2013 New Revision: 256444 URL: http://svnweb.freebsd.org/changeset/base/256444 Log: Merge head@256308 Modified: projects/bmake/Makefile.inc1 projects/bmake/gnu/usr.bin/cc/cc_tools/freebsd-native.h projects/bmake/lib/clang/clang.build.mk projects/bmake/sys/arm/versatile/versatile_pci.c projects/bmake/sys/boot/i386/btx/btx/btx.S projects/bmake/sys/dev/ata/ata-all.c projects/bmake/sys/dev/ata/ata-card.c projects/bmake/sys/dev/bxe/bxe.c projects/bmake/sys/dev/bxe/bxe_stats.c projects/bmake/sys/dev/bxe/ecore_sp.h projects/bmake/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c projects/bmake/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c projects/bmake/sys/dev/vmware/vmxnet3/if_vmx.c projects/bmake/sys/dev/vmware/vmxnet3/if_vmxvar.h projects/bmake/sys/net80211/ieee80211_freebsd.c Directory Properties: projects/bmake/ (props changed) projects/bmake/gnu/usr.bin/cc/cc_tools/ (props changed) projects/bmake/sys/ (props changed) projects/bmake/sys/boot/ (props changed) projects/bmake/sys/dev/hyperv/ (props changed) Modified: projects/bmake/Makefile.inc1 ============================================================================== --- projects/bmake/Makefile.inc1 Mon Oct 14 15:06:47 2013 (r256443) +++ projects/bmake/Makefile.inc1 Mon Oct 14 15:52:45 2013 (r256444) @@ -329,7 +329,7 @@ TARGET_ABI= gnueabi .else TARGET_ABI= unknown .endif -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XFLAGS+= -target ${TARGET_TRIPLE} .endif .endif Modified: projects/bmake/gnu/usr.bin/cc/cc_tools/freebsd-native.h ============================================================================== --- projects/bmake/gnu/usr.bin/cc/cc_tools/freebsd-native.h Mon Oct 14 15:06:47 2013 (r256443) +++ projects/bmake/gnu/usr.bin/cc/cc_tools/freebsd-native.h Mon Oct 14 15:52:45 2013 (r256444) @@ -7,8 +7,8 @@ #define FREEBSD_NATIVE 1 /* Fake out gcc/config/freebsd.h. */ -#define FBSD_MAJOR 10 -#define FBSD_CC_VER 1000001 /* form like __FreeBSD_version */ +#define FBSD_MAJOR 11 +#define FBSD_CC_VER 1100001 /* form like __FreeBSD_version */ #undef SYSTEM_INCLUDE_DIR /* We don't need one for now. */ #undef TOOL_INCLUDE_DIR /* We don't need one for now. */ Modified: projects/bmake/lib/clang/clang.build.mk ============================================================================== --- projects/bmake/lib/clang/clang.build.mk Mon Oct 14 15:06:47 2013 (r256443) +++ projects/bmake/lib/clang/clang.build.mk Mon Oct 14 15:52:45 2013 (r256444) @@ -27,8 +27,8 @@ TARGET_ABI= gnueabi TARGET_ABI= unknown .endif -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0 -BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.0 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 +BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd11.0 CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \ -DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \ -DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\" Modified: projects/bmake/sys/arm/versatile/versatile_pci.c ============================================================================== --- projects/bmake/sys/arm/versatile/versatile_pci.c Mon Oct 14 15:06:47 2013 (r256443) +++ projects/bmake/sys/arm/versatile/versatile_pci.c Mon Oct 14 15:52:45 2013 (r256444) @@ -360,6 +360,9 @@ versatile_pci_activate_resource(device_t res = (BUS_ACTIVATE_RESOURCE(device_get_parent(bus), child, type, rid, r)); break; + default: + res = ENXIO; + break; } return (res); Modified: projects/bmake/sys/boot/i386/btx/btx/btx.S ============================================================================== --- projects/bmake/sys/boot/i386/btx/btx/btx.S Mon Oct 14 15:06:47 2013 (r256443) +++ projects/bmake/sys/boot/i386/btx/btx/btx.S Mon Oct 14 15:52:45 2013 (r256444) @@ -41,6 +41,8 @@ .set PSL_RESERVED_DEFAULT,0x00000002 .set PSL_T,0x00000100 # Trap flag .set PSL_I,0x00000200 # Interrupt enable flag + .set PSL_D,0x00000400 # String instruction direction + .set PSL_NT,0x00004000 # Nested task flag .set PSL_VM,0x00020000 # Virtual 8086 mode flag .set PSL_AC,0x00040000 # Alignment check flag /* @@ -611,8 +613,8 @@ rret_tramp: movw $MEM_ESPR-0x08,%sp # R pushl %ds # regs pushl %es pushfl # Save %eflags - cli # Disable interrupts - std # String ops dec + pushl $PSL_RESERVED_DEFAULT|PSL_D # Use clean %eflags with + popfl # string ops dec xorw %ax,%ax # Reset seg movw %ax,%ds # regs movw %ax,%es # (%ss is already 0) @@ -675,6 +677,7 @@ rret_tramp.1: xorl %ecx,%ecx # Zero testl $V86F_FLAGS,%edx # User wants flags? jz rret_tramp.3 # No movl MEM_ESPR-0x3c,%eax # Read real mode flags + andl $~(PSL_T|PSL_NT),%eax # Clear unsafe flags movw %ax,-0x08(%esi) # Update user flags (low 16) /* * Return to the user task Modified: projects/bmake/sys/dev/ata/ata-all.c ============================================================================== --- projects/bmake/sys/dev/ata/ata-all.c Mon Oct 14 15:06:47 2013 (r256443) +++ projects/bmake/sys/dev/ata/ata-all.c Mon Oct 14 15:52:45 2013 (r256444) @@ -92,7 +92,7 @@ FEATURE(ata_cam, "ATA devices are access int ata_probe(device_t dev) { - return 0; + return (BUS_PROBE_DEFAULT); } int Modified: projects/bmake/sys/dev/ata/ata-card.c ============================================================================== --- projects/bmake/sys/dev/ata/ata-card.c Mon Oct 14 15:06:47 2013 (r256443) +++ projects/bmake/sys/dev/ata/ata-card.c Mon Oct 14 15:52:45 2013 (r256444) @@ -140,7 +140,7 @@ ata_pccard_attach(device_t dev) ch-> flags |= ATA_NO_SLAVE; ata_generic_hw(dev); err = ata_probe(dev); - if (err) + if (err > 0) return (err); return (ata_attach(dev)); } Modified: projects/bmake/sys/dev/bxe/bxe.c ============================================================================== --- projects/bmake/sys/dev/bxe/bxe.c Mon Oct 14 15:06:47 2013 (r256443) +++ projects/bmake/sys/dev/bxe/bxe.c Mon Oct 14 15:52:45 2013 (r256444) @@ -34,7 +34,7 @@ #include __FBSDID("$FreeBSD$"); -#define BXE_DRIVER_VERSION "1.78.17" +#define BXE_DRIVER_VERSION "1.78.18" #include "bxe.h" #include "ecore_sp.h" @@ -936,8 +936,8 @@ bxe_dma_alloc(struct bxe_softc *sc, int rc; if (dma->size > 0) { - BLOGE(sc, "dma block '%s' already has size %lu\n", msg, - (unsigned long) dma->size); + BLOGE(sc, "dma block '%s' already has size %lu\n", msg, + (unsigned long)dma->size); return (1); } @@ -14201,8 +14201,14 @@ bxe_media_detect(struct bxe_softc *sc) uint32_t phy_idx = bxe_get_cur_phy_idx(sc); switch (sc->link_params.phy[phy_idx].media_type) { case ELINK_ETH_PHY_SFPP_10G_FIBER: - case ELINK_ETH_PHY_SFP_1G_FIBER: case ELINK_ETH_PHY_XFP_FIBER: + BLOGI(sc, "Found 10Gb Fiber media.\n"); + sc->media = IFM_10G_SR; + break; + case ELINK_ETH_PHY_SFP_1G_FIBER: + BLOGI(sc, "Found 1Gb Fiber media.\n"); + sc->media = IFM_1000_SX; + break; case ELINK_ETH_PHY_KR: case ELINK_ETH_PHY_CX4: BLOGI(sc, "Found 10GBase-CX4 media.\n"); @@ -14213,8 +14219,14 @@ bxe_media_detect(struct bxe_softc *sc) sc->media = IFM_10G_TWINAX; break; case ELINK_ETH_PHY_BASE_T: - BLOGI(sc, "Found 10GBase-T media.\n"); - sc->media = IFM_10G_T; + if (sc->link_params.speed_cap_mask[0] & + PORT_HW_CFG_SPEED_CAPABILITY_D0_10G) { + BLOGI(sc, "Found 10GBase-T media.\n"); + sc->media = IFM_10G_T; + } else { + BLOGI(sc, "Found 1000Base-T media.\n"); + sc->media = IFM_1000_T; + } break; case ELINK_ETH_PHY_NOT_PRESENT: BLOGI(sc, "Media not present.\n"); Modified: projects/bmake/sys/dev/bxe/bxe_stats.c ============================================================================== --- projects/bmake/sys/dev/bxe/bxe_stats.c Mon Oct 14 15:06:47 2013 (r256443) +++ projects/bmake/sys/dev/bxe/bxe_stats.c Mon Oct 14 15:52:45 2013 (r256444) @@ -263,6 +263,17 @@ bxe_stats_pmf_update(struct bxe_softc *s int loader_idx = PMF_DMAE_C(sc); uint32_t *stats_comp = BXE_SP(sc, stats_comp); + if (sc->devinfo.bc_ver <= 0x06001400) { + /* + * Bootcode v6.0.21 fixed a GRC timeout that occurs when accessing + * BRB registers while the BRB block is in reset. The DMA transfer + * below triggers this issue resulting in the DMAE to stop + * functioning. Skip this initial stats transfer for old bootcode + * versions <= 6.0.20. + */ + return; + } + /* sanity */ if (!sc->port.pmf || !sc->port.port_stx) { BLOGE(sc, "BUG!\n"); Modified: projects/bmake/sys/dev/bxe/ecore_sp.h ============================================================================== --- projects/bmake/sys/dev/bxe/ecore_sp.h Mon Oct 14 15:06:47 2013 (r256443) +++ projects/bmake/sys/dev/bxe/ecore_sp.h Mon Oct 14 15:52:45 2013 (r256444) @@ -77,9 +77,14 @@ struct bxe_softc; typedef bus_addr_t ecore_dma_addr_t; /* expected to be 64 bit wide */ typedef volatile int ecore_atomic_t; -#if __FreeBSD_version < 1000002 -typedef int bool; +#ifndef __bool_true_false_are_defined +#ifndef __cplusplus +#define bool _Bool +#if __STDC_VERSION__ < 199901L && __GNUC__ < 3 && !defined(__INTEL_COMPILER) +typedef _Bool bool; #endif +#endif /* !__cplusplus */ +#endif /* !__bool_true_false_are_defined$ */ #define ETH_ALEN ETHER_ADDR_LEN /* 6 */ Modified: projects/bmake/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c ============================================================================== --- projects/bmake/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c Mon Oct 14 15:06:47 2013 (r256443) +++ projects/bmake/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c Mon Oct 14 15:52:45 2013 (r256444) @@ -298,3 +298,4 @@ DECLARE_MODULE(iw_cxgb, iwch_mod_data, S MODULE_DEPEND(t3_tom, cxgbc, 1, 1, 1); MODULE_DEPEND(iw_cxgb, toecore, 1, 1, 1); MODULE_DEPEND(iw_cxgb, t3_tom, 1, 1, 1); +MODULE_DEPEND(iw_cxgb, ibcore, 1, 1, 1); Modified: projects/bmake/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c ============================================================================== --- projects/bmake/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c Mon Oct 14 15:06:47 2013 (r256443) +++ projects/bmake/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c Mon Oct 14 15:52:45 2013 (r256444) @@ -92,6 +92,7 @@ static int hv_check_for_hyper_v(void); static int hv_ata_pci_probe(device_t dev) { + device_t parent = device_get_parent(dev); int ata_disk_enable; ata_disk_enable = 0; @@ -102,23 +103,9 @@ hv_ata_pci_probe(device_t dev) if (!hv_check_for_hyper_v()) return (ENXIO); - if (bootverbose) - device_printf(dev, - "hv_ata_pci_probe dev_class/subslcass = %d, %d\n", - pci_get_class(dev), pci_get_subclass(dev)); - - /* is this a storage class device ? */ - if (pci_get_class(dev) != PCIC_STORAGE) + if (device_get_unit(parent) != 0 || device_get_ivars(dev) != 0) return (ENXIO); - /* is this an IDE/ATA type device ? */ - if (pci_get_subclass(dev) != PCIS_STORAGE_IDE) - return (ENXIO); - - if(bootverbose) - device_printf(dev, - "Hyper-V probe for disabling ATA-PCI, emulated driver\n"); - /* * On Hyper-V the default is to use the enlightened driver for * IDE disks. However, if the user wishes to use the native @@ -126,15 +113,14 @@ hv_ata_pci_probe(device_t dev) * hw_ata.disk_enable must be explicitly set to 1. */ if (getenv_int("hw.ata.disk_enable", &ata_disk_enable)) { - if(bootverbose) + if (bootverbose) device_printf(dev, "hw.ata.disk_enable flag is disabling Hyper-V" " ATA driver support\n"); return (ENXIO); } - if (bootverbose) - device_printf(dev, "Hyper-V ATA storage driver enabled.\n"); + device_set_desc(dev, "Hyper-V ATA storage disengage driver"); return (BUS_PROBE_VENDOR); } @@ -193,12 +179,12 @@ static device_method_t hv_ata_pci_method devclass_t hv_ata_pci_devclass; static driver_t hv_ata_pci_disengage_driver = { - "pciata-disable", + "ata", hv_ata_pci_methods, - sizeof(struct ata_pci_controller), + 0, }; -DRIVER_MODULE(atapci_dis, pci, hv_ata_pci_disengage_driver, - hv_ata_pci_devclass, NULL, NULL); +DRIVER_MODULE(atapci_dis, atapci, hv_ata_pci_disengage_driver, + hv_ata_pci_devclass, NULL, NULL); MODULE_VERSION(atapci_dis, 1); MODULE_DEPEND(atapci_dis, ata, 1, 1, 1); Modified: projects/bmake/sys/dev/vmware/vmxnet3/if_vmx.c ============================================================================== --- projects/bmake/sys/dev/vmware/vmxnet3/if_vmx.c Mon Oct 14 15:06:47 2013 (r256443) +++ projects/bmake/sys/dev/vmware/vmxnet3/if_vmx.c Mon Oct 14 15:52:45 2013 (r256444) @@ -1317,7 +1317,7 @@ vmxnet3_init_shared_data(struct vmxnet3_ /* DriverInfo */ ds->version = VMXNET3_DRIVER_VERSION; - ds->guest = VMXNET3_GOS_FREEBSD | VMXNET3_GUEST_OS_VERSION | + ds->guest = VMXNET3_GOS_FREEBSD | #ifdef __LP64__ VMXNET3_GOS_64BIT; #else Modified: projects/bmake/sys/dev/vmware/vmxnet3/if_vmxvar.h ============================================================================== --- projects/bmake/sys/dev/vmware/vmxnet3/if_vmxvar.h Mon Oct 14 15:06:47 2013 (r256443) +++ projects/bmake/sys/dev/vmware/vmxnet3/if_vmxvar.h Mon Oct 14 15:52:45 2013 (r256444) @@ -248,17 +248,6 @@ struct vmxnet3_softc { #define VMXNET3_DRIVER_VERSION 0x00010000 /* - * Convert the FreeBSD version in to something the hypervisor - * understands. This is apparently what VMware's driver reports - * so mimic it even though it probably is not required. - */ -#define VMXNET3_GUEST_OS_VERSION \ - (((__FreeBSD_version / 100000) << 14) | \ - (((__FreeBSD_version / 1000) % 100) << 6 ) | \ - (((__FreeBSD_version / 100) % 10) << 30) | \ - ((__FreeBSD_version % 100) << 22)) - -/* * Max descriptors per Tx packet. We must limit the size of the * any TSO packets based on the number of segments. */ Modified: projects/bmake/sys/net80211/ieee80211_freebsd.c ============================================================================== --- projects/bmake/sys/net80211/ieee80211_freebsd.c Mon Oct 14 15:06:47 2013 (r256443) +++ projects/bmake/sys/net80211/ieee80211_freebsd.c Mon Oct 14 15:52:45 2013 (r256444) @@ -808,9 +808,9 @@ static eventhandler_tag wlan_ifllevent; static void bpf_track(void *arg, struct ifnet *ifp, int dlt, int attach) { - /* NB: identify vap's by if_start */ + /* NB: identify vap's by if_init */ if (dlt == DLT_IEEE802_11_RADIO && - ifp->if_transmit == ieee80211_vap_transmit) { + ifp->if_init == ieee80211_init) { struct ieee80211vap *vap = ifp->if_softc; /* * Track bpf radiotap listener state. We mark the vap From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 16:19:54 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id CE35F5D5; Mon, 14 Oct 2013 16:19:54 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AC0032425; Mon, 14 Oct 2013 16:19:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EGJsSq003862; Mon, 14 Oct 2013 16:19:54 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EGJr2l003855; Mon, 14 Oct 2013 16:19:53 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310141619.r9EGJr2l003855@svn.freebsd.org> From: Alexander Motin Date: Mon, 14 Oct 2013 16:19:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256445 - projects/camlock/sys/geom/raid X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 16:19:55 -0000 Author: mav Date: Mon Oct 14 16:19:52 2013 New Revision: 256445 URL: http://svnweb.freebsd.org/changeset/base/256445 Log: Add unmapped I/O support to GEOM RAID. Modified: projects/camlock/sys/geom/raid/g_raid.c projects/camlock/sys/geom/raid/g_raid.h projects/camlock/sys/geom/raid/tr_concat.c projects/camlock/sys/geom/raid/tr_raid0.c projects/camlock/sys/geom/raid/tr_raid1.c projects/camlock/sys/geom/raid/tr_raid1e.c projects/camlock/sys/geom/raid/tr_raid5.c Modified: projects/camlock/sys/geom/raid/g_raid.c ============================================================================== --- projects/camlock/sys/geom/raid/g_raid.c Mon Oct 14 15:52:45 2013 (r256444) +++ projects/camlock/sys/geom/raid/g_raid.c Mon Oct 14 16:19:52 2013 (r256445) @@ -994,20 +994,15 @@ g_raid_tr_flush_common(struct g_raid_tr_ cbp->bio_caller1 = sd; bioq_insert_tail(&queue, cbp); } - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) { sd = cbp->bio_caller1; cbp->bio_caller1 = NULL; g_raid_subdisk_iostart(sd, cbp); } return; failure: - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) g_destroy_bio(cbp); - } if (bp->bio_error == 0) bp->bio_error = ENOMEM; g_raid_iodone(bp, bp->bio_error); @@ -1640,11 +1635,13 @@ static void g_raid_launch_provider(struct g_raid_volume *vol) { struct g_raid_disk *disk; + struct g_raid_subdisk *sd; struct g_raid_softc *sc; struct g_provider *pp; char name[G_RAID_MAX_VOLUMENAME]; char announce_buf[80], buf1[32]; off_t off; + int i; sc = vol->v_softc; sx_assert(&sc->sc_lock, SX_LOCKED); @@ -1675,6 +1672,17 @@ g_raid_launch_provider(struct g_raid_vol pp = g_new_providerf(sc->sc_geom, "%s", name); pp->flags |= G_PF_DIRECT_RECEIVE; + if (vol->v_tr->tro_class->trc_accept_unmapped) { + pp->flags |= G_PF_ACCEPT_UNMAPPED; + for (i = 0; i < vol->v_disks_count; i++) { + sd = &vol->v_subdisks[i]; + if (sd->sd_state == G_RAID_SUBDISK_S_NONE) + continue; + if ((sd->sd_disk->d_consumer->provider->flags & + G_PF_ACCEPT_UNMAPPED) == 0) + pp->flags &= ~G_PF_ACCEPT_UNMAPPED; + } + } pp->private = vol; pp->mediasize = vol->v_mediasize; pp->sectorsize = vol->v_sectorsize; Modified: projects/camlock/sys/geom/raid/g_raid.h ============================================================================== --- projects/camlock/sys/geom/raid/g_raid.h Mon Oct 14 15:52:45 2013 (r256444) +++ projects/camlock/sys/geom/raid/g_raid.h Mon Oct 14 16:19:52 2013 (r256445) @@ -376,6 +376,7 @@ struct g_raid_tr_class { KOBJ_CLASS_FIELDS; int trc_enable; int trc_priority; + int trc_accept_unmapped; LIST_ENTRY(g_raid_tr_class) trc_list; }; Modified: projects/camlock/sys/geom/raid/tr_concat.c ============================================================================== --- projects/camlock/sys/geom/raid/tr_concat.c Mon Oct 14 15:52:45 2013 (r256444) +++ projects/camlock/sys/geom/raid/tr_concat.c Mon Oct 14 16:19:52 2013 (r256445) @@ -74,7 +74,8 @@ static struct g_raid_tr_class g_raid_tr_ g_raid_tr_concat_methods, sizeof(struct g_raid_tr_concat_object), .trc_enable = 1, - .trc_priority = 50 + .trc_priority = 50, + .trc_accept_unmapped = 1 }; static int @@ -227,7 +228,10 @@ g_raid_tr_iostart_concat(struct g_raid_t offset = bp->bio_offset; remain = bp->bio_length; - addr = bp->bio_data; + if ((bp->bio_flags & BIO_UNMAPPED) != 0) + addr = NULL; + else + addr = bp->bio_data; no = 0; while (no < vol->v_disks_count && offset >= vol->v_subdisks[no].sd_size) { @@ -244,8 +248,16 @@ g_raid_tr_iostart_concat(struct g_raid_t if (cbp == NULL) goto failure; cbp->bio_offset = offset; - cbp->bio_data = addr; cbp->bio_length = length; + if ((bp->bio_flags & BIO_UNMAPPED) != 0 && + bp->bio_cmd != BIO_DELETE) { + cbp->bio_ma_offset += (uintptr_t)addr; + cbp->bio_ma += cbp->bio_ma_offset / PAGE_SIZE; + cbp->bio_ma_offset %= PAGE_SIZE; + cbp->bio_ma_n = round_page(cbp->bio_ma_offset + + cbp->bio_length) / PAGE_SIZE; + } else + cbp->bio_data = addr; cbp->bio_caller1 = sd; bioq_insert_tail(&queue, cbp); remain -= length; @@ -257,20 +269,15 @@ g_raid_tr_iostart_concat(struct g_raid_t ("Request ends after volume end (%ju, %ju)", bp->bio_offset, bp->bio_length)); } while (remain > 0); - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) { sd = cbp->bio_caller1; cbp->bio_caller1 = NULL; g_raid_subdisk_iostart(sd, cbp); } return; failure: - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) g_destroy_bio(cbp); - } if (bp->bio_error == 0) bp->bio_error = ENOMEM; g_raid_iodone(bp, bp->bio_error); Modified: projects/camlock/sys/geom/raid/tr_raid0.c ============================================================================== --- projects/camlock/sys/geom/raid/tr_raid0.c Mon Oct 14 15:52:45 2013 (r256444) +++ projects/camlock/sys/geom/raid/tr_raid0.c Mon Oct 14 16:19:52 2013 (r256445) @@ -74,7 +74,8 @@ static struct g_raid_tr_class g_raid_tr_ g_raid_tr_raid0_methods, sizeof(struct g_raid_tr_raid0_object), .trc_enable = 1, - .trc_priority = 100 + .trc_priority = 100, + .trc_accept_unmapped = 1 }; static int @@ -204,7 +205,10 @@ g_raid_tr_iostart_raid0(struct g_raid_tr g_raid_tr_flush_common(tr, bp); return; } - addr = bp->bio_data; + if ((bp->bio_flags & BIO_UNMAPPED) != 0) + addr = NULL; + else + addr = bp->bio_data; strip_size = vol->v_strip_size; /* Stripe number. */ @@ -225,8 +229,16 @@ g_raid_tr_iostart_raid0(struct g_raid_tr if (cbp == NULL) goto failure; cbp->bio_offset = offset + start; - cbp->bio_data = addr; cbp->bio_length = length; + if ((bp->bio_flags & BIO_UNMAPPED) != 0 && + bp->bio_cmd != BIO_DELETE) { + cbp->bio_ma_offset += (uintptr_t)addr; + cbp->bio_ma += cbp->bio_ma_offset / PAGE_SIZE; + cbp->bio_ma_offset %= PAGE_SIZE; + cbp->bio_ma_n = round_page(cbp->bio_ma_offset + + cbp->bio_length) / PAGE_SIZE; + } else + cbp->bio_data = addr; cbp->bio_caller1 = &vol->v_subdisks[no]; bioq_insert_tail(&queue, cbp); if (++no >= vol->v_disks_count) { @@ -238,20 +250,15 @@ g_raid_tr_iostart_raid0(struct g_raid_tr addr += length; start = 0; } while (remain > 0); - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) { sd = cbp->bio_caller1; cbp->bio_caller1 = NULL; g_raid_subdisk_iostart(sd, cbp); } return; failure: - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) g_destroy_bio(cbp); - } if (bp->bio_error == 0) bp->bio_error = ENOMEM; g_raid_iodone(bp, bp->bio_error); Modified: projects/camlock/sys/geom/raid/tr_raid1.c ============================================================================== --- projects/camlock/sys/geom/raid/tr_raid1.c Mon Oct 14 15:52:45 2013 (r256444) +++ projects/camlock/sys/geom/raid/tr_raid1.c Mon Oct 14 16:19:52 2013 (r256445) @@ -130,7 +130,8 @@ static struct g_raid_tr_class g_raid_tr_ g_raid_tr_raid1_methods, sizeof(struct g_raid_tr_raid1_object), .trc_enable = 1, - .trc_priority = 100 + .trc_priority = 100, + .trc_accept_unmapped = 1 }; static void g_raid_tr_raid1_rebuild_abort(struct g_raid_tr_object *tr); @@ -594,20 +595,15 @@ g_raid_tr_iostart_raid1_write(struct g_r cbp->bio_caller1 = sd; bioq_insert_tail(&queue, cbp); } - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) { sd = cbp->bio_caller1; cbp->bio_caller1 = NULL; g_raid_subdisk_iostart(sd, cbp); } return; failure: - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) g_destroy_bio(cbp); - } if (bp->bio_error == 0) bp->bio_error = ENOMEM; g_raid_iodone(bp, bp->bio_error); Modified: projects/camlock/sys/geom/raid/tr_raid1e.c ============================================================================== --- projects/camlock/sys/geom/raid/tr_raid1e.c Mon Oct 14 15:52:45 2013 (r256444) +++ projects/camlock/sys/geom/raid/tr_raid1e.c Mon Oct 14 16:19:52 2013 (r256445) @@ -134,7 +134,8 @@ static struct g_raid_tr_class g_raid_tr_ g_raid_tr_raid1e_methods, sizeof(struct g_raid_tr_raid1e_object), .trc_enable = 1, - .trc_priority = 200 + .trc_priority = 200, + .trc_accept_unmapped = 1 }; static void g_raid_tr_raid1e_rebuild_abort(struct g_raid_tr_object *tr); @@ -701,7 +702,10 @@ g_raid_tr_iostart_raid1e_read(struct g_r int best; vol = tr->tro_volume; - addr = bp->bio_data; + if ((bp->bio_flags & BIO_UNMAPPED) != 0) + addr = NULL; + else + addr = bp->bio_data; strip_size = vol->v_strip_size; V2P(vol, bp->bio_offset, &no, &offset, &start); remain = bp->bio_length; @@ -721,8 +725,15 @@ g_raid_tr_iostart_raid1e_read(struct g_r if (cbp == NULL) goto failure; cbp->bio_offset = offset + start; - cbp->bio_data = addr; cbp->bio_length = length; + if ((bp->bio_flags & BIO_UNMAPPED) != 0) { + cbp->bio_ma_offset += (uintptr_t)addr; + cbp->bio_ma += cbp->bio_ma_offset / PAGE_SIZE; + cbp->bio_ma_offset %= PAGE_SIZE; + cbp->bio_ma_n = round_page(cbp->bio_ma_offset + + cbp->bio_length) / PAGE_SIZE; + } else + cbp->bio_data = addr; cbp->bio_caller1 = &vol->v_subdisks[no]; bioq_insert_tail(&queue, cbp); no += N - best; @@ -734,20 +745,15 @@ g_raid_tr_iostart_raid1e_read(struct g_r addr += length; start = 0; } - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) { sd = cbp->bio_caller1; cbp->bio_caller1 = NULL; g_raid_subdisk_iostart(sd, cbp); } return; failure: - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) g_destroy_bio(cbp); - } if (bp->bio_error == 0) bp->bio_error = ENOMEM; g_raid_iodone(bp, bp->bio_error); @@ -766,7 +772,10 @@ g_raid_tr_iostart_raid1e_write(struct g_ int i; vol = tr->tro_volume; - addr = bp->bio_data; + if ((bp->bio_flags & BIO_UNMAPPED) != 0) + addr = NULL; + else + addr = bp->bio_data; strip_size = vol->v_strip_size; V2P(vol, bp->bio_offset, &no, &offset, &start); remain = bp->bio_length; @@ -791,8 +800,16 @@ g_raid_tr_iostart_raid1e_write(struct g_ if (cbp == NULL) goto failure; cbp->bio_offset = offset + start; - cbp->bio_data = addr; cbp->bio_length = length; + if ((bp->bio_flags & BIO_UNMAPPED) != 0 && + bp->bio_cmd != BIO_DELETE) { + cbp->bio_ma_offset += (uintptr_t)addr; + cbp->bio_ma += cbp->bio_ma_offset / PAGE_SIZE; + cbp->bio_ma_offset %= PAGE_SIZE; + cbp->bio_ma_n = round_page(cbp->bio_ma_offset + + cbp->bio_length) / PAGE_SIZE; + } else + cbp->bio_data = addr; cbp->bio_caller1 = sd; bioq_insert_tail(&queue, cbp); nextdisk: @@ -806,20 +823,15 @@ nextdisk: addr += length; start = 0; } - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) { sd = cbp->bio_caller1; cbp->bio_caller1 = NULL; g_raid_subdisk_iostart(sd, cbp); } return; failure: - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) g_destroy_bio(cbp); - } if (bp->bio_error == 0) bp->bio_error = ENOMEM; g_raid_iodone(bp, bp->bio_error); @@ -1030,6 +1042,9 @@ rebuild_round_done: cbp->bio_offset = offset + start; cbp->bio_length = bp->bio_length; cbp->bio_data = bp->bio_data; + cbp->bio_ma = bp->bio_ma; + cbp->bio_ma_offset = bp->bio_ma_offset; + cbp->bio_ma_n = bp->bio_ma_n; g_destroy_bio(bp); nsd = &vol->v_subdisks[disk]; G_RAID_LOGREQ(2, cbp, "Retrying read from %d", Modified: projects/camlock/sys/geom/raid/tr_raid5.c ============================================================================== --- projects/camlock/sys/geom/raid/tr_raid5.c Mon Oct 14 15:52:45 2013 (r256444) +++ projects/camlock/sys/geom/raid/tr_raid5.c Mon Oct 14 16:19:52 2013 (r256445) @@ -324,20 +324,15 @@ g_raid_tr_iostart_raid5_read(struct g_ra addr += length; start = 0; } while (remain > 0); - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) { sd = cbp->bio_caller1; cbp->bio_caller1 = NULL; g_raid_subdisk_iostart(sd, cbp); } return; failure: - for (cbp = bioq_first(&queue); cbp != NULL; - cbp = bioq_first(&queue)) { - bioq_remove(&queue, cbp); + while ((cbp = bioq_takefirst(&queue)) != NULL) g_destroy_bio(cbp); - } if (bp->bio_error == 0) bp->bio_error = ENOMEM; g_raid_iodone(bp, bp->bio_error); From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 20:51:52 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A069ED24; Mon, 14 Oct 2013 20:51:52 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8B040273D; Mon, 14 Oct 2013 20:51:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EKpq87051314; Mon, 14 Oct 2013 20:51:52 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EKpp4I051310; Mon, 14 Oct 2013 20:51:51 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142051.r9EKpp4I051310@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 20:51:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256451 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 20:51:52 -0000 Author: asomers Date: Mon Oct 14 20:51:51 2013 New Revision: 256451 URL: http://svnweb.freebsd.org/changeset/base/256451 Log: Move parsing policy for invalid GUIDs into the Guid class. cddl/sbin/zfsd/guid.cc: cddl/sbin/zfsd/guid.h: o Allow a Guid to be constructed from a string. The empty string is treated as an invalid Guid. o Rename NONE_FLAG to INVALID_GUID to clarify its meaning. The concept of a Guid being "none" only applies in certain contexts like reading a spare label. cddl/sbin/zfsd/dev_ctl_event.cc: Modify ZfsEvent's constructor to just use Guid's string contructor instead of embedding logic to manually create invalid guids when these nvpairs do not exist. stable/cddl/sbin/zfsd/vdev.cc: Rely on Guid's default constructor creating an invalid guid to simplify the handling of pool GUIDs parsed from a label. This also fixes a vdev/pool guid variable mixup bug that, due to Guid's default construction, had no ill effects. Submitted by: gibbs Approved by: ken (mentor) Sponsored By: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc projects/zfsd/head/cddl/sbin/zfsd/guid.cc projects/zfsd/head/cddl/sbin/zfsd/guid.h projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Mon Oct 14 18:31:15 2013 (r256450) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Mon Oct 14 20:51:51 2013 (r256451) @@ -692,24 +692,10 @@ ZfsEvent::Process() const //- ZfsEvent Protected Methods ------------------------------------------------- ZfsEvent::ZfsEvent(DevCtlEvent::Type type, NVPairMap &nvpairs, const string &eventString) - : DevCtlEvent(type, nvpairs, eventString) + : DevCtlEvent(type, nvpairs, eventString), + m_poolGUID(Guid(Value("pool_guid"))), + m_vdevGUID(Guid(Value("vdev_guid"))) { - /* - * These are zero on conversion failure as will happen if - * Value returns the empty string. - */ - if (Contains("pool_guid")) { - m_poolGUID = (uint64_t)strtoumax(Value("pool_guid").c_str(), - NULL, 0); - } - else - m_poolGUID = Guid(); - if (Contains("vdev_guid")) { - m_vdevGUID = (uint64_t)strtoumax(Value("vdev_guid").c_str(), - NULL, 0); - } - else - m_vdevGUID = Guid(); } ZfsEvent::ZfsEvent(const ZfsEvent &src) Modified: projects/zfsd/head/cddl/sbin/zfsd/guid.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/guid.cc Mon Oct 14 18:31:15 2013 (r256450) +++ projects/zfsd/head/cddl/sbin/zfsd/guid.cc Mon Oct 14 20:51:51 2013 (r256451) @@ -49,8 +49,24 @@ #include "guid.h" __FBSDID("$FreeBSD$"); +/*============================ Namespace Control =============================*/ +using std::string; + /*=========================== Class Implementations ==========================*/ /*----------------------------------- Guid -----------------------------------*/ +Guid::Guid(const string &guidString) +{ + if (guidString.empty()) { + m_GUID = INVALID_GUID; + } else { + /* + * strtoumax() returns zero on conversion failure + * which nicely matches our choice for INVALID_GUID. + */ + m_GUID = (uint64_t)strtoumax(guidString.c_str(), NULL, 0); + } +} + std::ostream& operator<< (std::ostream& out, Guid g) { Modified: projects/zfsd/head/cddl/sbin/zfsd/guid.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/guid.h Mon Oct 14 18:31:15 2013 (r256450) +++ projects/zfsd/head/cddl/sbin/zfsd/guid.h Mon Oct 14 20:51:51 2013 (r256451) @@ -46,11 +46,11 @@ * \brief Object that represents guids. * * It can generally be manipulated as a uint64_t, but with a special - * value "None" that does not equal any valid guid. + * value INVALID_GUID that does not equal any valid guid. * * As of this writing, spa_generate_guid() in spa_misc.c explicitly - * refuses to return a guid of 0. So this class uses 0 as a flag - * value for "None". In the future, if 0 is allowed to be a valid + * refuses to return a guid of 0. So this class uses 0 as the value + * for INVALID_GUID. In the future, if 0 is allowed to be a valid * guid, the implementation of this class must change. */ class Guid @@ -59,6 +59,7 @@ public: /* Constructors */ Guid(); Guid(uint64_t guid); + Guid(const std::string &guid); /* Assignment */ Guid& operator=(const Guid& rhs); @@ -74,16 +75,16 @@ public: operator uint64_t() const; operator bool() const; - static const uint64_t NONE_FLAG = 0; + static const uint64_t INVALID_GUID = 0; protected: - /* The stored value. 0 is a flag for "None" */ + /* The integer value of the GUID. */ uint64_t m_GUID; }; //- Guid Inline Public Methods ------------------------------------------------ inline Guid::Guid() - : m_GUID(NONE_FLAG) + : m_GUID(INVALID_GUID) { } @@ -103,7 +104,7 @@ Guid::operator=(const Guid &rhs) inline bool Guid::IsValid() const { - return (m_GUID != NONE_FLAG); + return (m_GUID != INVALID_GUID); } inline bool @@ -127,7 +128,7 @@ Guid::operator uint64_t() const inline Guid::operator bool() const { - return (m_GUID != NONE_FLAG); + return (m_GUID != INVALID_GUID); } /** Convert the GUID into its string representation */ Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Mon Oct 14 18:31:15 2013 (r256450) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Mon Oct 14 20:51:51 2013 (r256451) @@ -89,10 +89,15 @@ Vdev::Vdev(nvlist_t *labelConfig) : m_poolConfig(labelConfig) { uint64_t raw_guid; + + /* + * Spares do not have a Pool GUID. Tolerate its absence. + * Code accessing this Vdev in a context where the Pool GUID is + * required will find it invalid (as it is upon Vdev construction) + * and act accordingly. + */ if (nvlist_lookup_uint64(labelConfig, ZPOOL_CONFIG_POOL_GUID, - &raw_guid) != 0) - m_vdevGUID = Guid(); - else + &raw_guid) == 0) m_poolGUID = raw_guid; if (nvlist_lookup_uint64(labelConfig, ZPOOL_CONFIG_GUID, From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 20:53:52 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9B5F9E2C; Mon, 14 Oct 2013 20:53:52 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 884182753; Mon, 14 Oct 2013 20:53:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EKrqS7051897; Mon, 14 Oct 2013 20:53:52 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EKrpUf051894; Mon, 14 Oct 2013 20:53:52 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142053.r9EKrpUf051894@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 20:53:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256452 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 20:53:52 -0000 Author: asomers Date: Mon Oct 14 20:53:51 2013 New Revision: 256452 URL: http://svnweb.freebsd.org/changeset/base/256452 Log: Modify ParseException so that it records the parse buffer upon construction. This allows it to be caught at any level in the program and logged with full fidelity. cddl/sbin/zfsd/dev_ctl_event.cc: cddl/sbin/zfsd/dev_ctl_event.h: Update ParseException implementation: take the parse buffer string on construction and don't require the parse buffer string when logging or converting the exception to a string. cddl/sbin/zfsd/dev_ctl_event.cc: cddl/sbin/zfsd/case_file.cc: Adjust to Log() and ToString() taking no arguments. Submitted by: gibbs Approved by: ken (mentor) Sponsored By: Spectra Logic Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 20:51:51 2013 (r256451) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 20:53:51 2013 (r256452) @@ -649,7 +649,7 @@ CaseFile::DeSerializeFile(const char *fi } } catch (const ParseException &exp) { - exp.Log(evString); + exp.Log(); if (caseFile != existingCaseFile) delete caseFile; Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Mon Oct 14 20:51:51 2013 (r256451) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Mon Oct 14 20:53:51 2013 (r256452) @@ -61,7 +61,7 @@ using std::stringstream; /*------------------------------ ParseException ------------------------------*/ //- ParseException Public Methods ---------------------------------------------- string -ParseException::ToString(const string &parsedBuffer) const +ParseException::ToString() const { stringstream result; @@ -82,9 +82,9 @@ ParseException::ToString(const string &p } result << "exception on buffer: \'"; if (GetOffset() == 0) { - result << parsedBuffer << '\'' << endl; + result << m_parsedBuffer << '\'' << endl; } else { - string markedBuffer(parsedBuffer); + string markedBuffer(m_parsedBuffer); markedBuffer.insert(GetOffset(), ""); result << markedBuffer << '\'' << endl; @@ -94,14 +94,14 @@ ParseException::ToString(const string &p } void -ParseException::Log(const string &parsedBuffer) const +ParseException::Log() const { int priority(LOG_ERR); if (Type() == DISCARDED_EVENT_TYPE) priority = LOG_INFO; - syslog(priority, "%s", ToString(parsedBuffer).c_str()); + syslog(priority, "%s", ToString().c_str()); } /*-------------------------------- DevCtlEvent -------------------------------*/ @@ -149,7 +149,7 @@ DevCtlEvent::CreateEvent(const string &e ParseEventString(type, eventString, nvpairs); } catch (const ParseException &exp) { if (exp.GetType() == ParseException::INVALID_FORMAT) - exp.Log(eventString); + exp.Log(); return (NULL); } @@ -312,14 +312,14 @@ DevCtlEvent::ParseEventString(DevCtlEven end = eventString.find_first_of(" \t\n", start); if (end == string::npos) throw ParseException(ParseException::INVALID_FORMAT, - start); + eventString, start); nvpairs["device-name"] = eventString.substr(start, end - start); start = eventString.find(" on ", end); if (end == string::npos) throw ParseException(ParseException::INVALID_FORMAT, - start); + eventString, start); start += 4; end = eventString.find_first_of(" \t\n", start); nvpairs["parent"] = eventString.substr(start, end); @@ -327,9 +327,11 @@ DevCtlEvent::ParseEventString(DevCtlEven case NOTIFY: break; case NOMATCH: - throw ParseException(ParseException::DISCARDED_EVENT_TYPE); + throw ParseException(ParseException::DISCARDED_EVENT_TYPE, + eventString); default: - throw ParseException(ParseException::UNKNOWN_EVENT_TYPE); + throw ParseException(ParseException::UNKNOWN_EVENT_TYPE, + eventString); } /* Process common "key=value" format. */ @@ -349,7 +351,7 @@ DevCtlEvent::ParseEventString(DevCtlEven start = eventString.find_last_of("! \t\n", end); if (start == string::npos) throw ParseException(ParseException::INVALID_FORMAT, - end); + eventString, end); start++; string key(eventString.substr(start, end - start)); @@ -360,7 +362,7 @@ DevCtlEvent::ParseEventString(DevCtlEven start = end + 1; if (start >= eventString.length()) throw ParseException(ParseException::INVALID_FORMAT, - end); + eventString, end); end = eventString.find_first_of(" \t\n", start); if (end == string::npos) end = eventString.length() - 1; Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Mon Oct 14 20:51:51 2013 (r256451) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Mon Oct 14 20:53:51 2013 (r256452) @@ -80,18 +80,21 @@ public: /** * Constructor * - * \param type The type of this exception. - * \param offset The location in the parse buffer where this - * exception occurred. + * \param type The type of this exception. + * \param parsedBuffer The parsing buffer active at the time of + * the exception. + * \param offset The location in the parse buffer where this + * exception occurred. */ - ParseException(Type type, size_t offset = 0); + ParseException(Type type, const string &parsedBuffer, + size_t offset = 0); /** * Accessor * * \return The classification for this exception. */ - Type GetType() const; + Type GetType() const; /** * Accessor @@ -99,37 +102,42 @@ public: * \return The offset into the event string where this exception * occurred. */ - size_t GetOffset() const; + size_t GetOffset() const; /** * Convert an exception into a human readable string. * * \param parsedBuffer The event buffer that caused the failure. */ - string ToString(const string &parsedBuffer) const; + string ToString() const; /** * Log exception data to syslog. * * \param parsedBuffer The event buffer that caused the failure. */ - void Log(const string &parsedBuffer) const; + void Log() const; private: /** The type of this exception. */ - Type m_type; + Type m_type; + + /** The parsing buffer that was active at the time of the exception. */ + const string m_parsedBuffer; /** * The offset into the event string buffer from where this * exception was triggered. */ - size_t m_offset; + size_t m_offset; }; //- ParseException Inline Public Methods --------------------------------------- inline -ParseException::ParseException(Type type, size_t offset) +ParseException::ParseException(Type type, const string &parsedBuffer, + size_t offset) : m_type(type), + m_parsedBuffer(parsedBuffer), m_offset(offset) { } From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 20:56:52 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5916B3DC; Mon, 14 Oct 2013 20:56:52 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3745427A9; Mon, 14 Oct 2013 20:56:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EKuqkh052581; Mon, 14 Oct 2013 20:56:52 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EKup26052579; Mon, 14 Oct 2013 20:56:51 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142056.r9EKup26052579@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 20:56:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256453 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 20:56:52 -0000 Author: asomers Date: Mon Oct 14 20:56:51 2013 New Revision: 256453 URL: http://svnweb.freebsd.org/changeset/base/256453 Log: In the static method CaseFile::DeSerializeFile(), break out the acutal parsing of the serialization stream into the instance method CaseFile::DeSerialize(ifstream &caseStream). cddl/sbin/zfsd/case_file.h: Declaration of CaseFile::DeSerialize(). cddl/sbin/zfsd/case_file.cc: o Factor out CaseFile::DeSerialize() from CaseFile::DeSerializeFile(). o In CaseFile::DeSerialize() remove a superfluous return statement after a throw. Submitted by: gibbs Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/case_file.h Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 20:53:51 2013 (r256452) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 20:56:51 2013 (r256453) @@ -552,7 +552,6 @@ void CaseFile::DeSerializeFile(const char *fileName) { string fullName(s_caseFilePath + '/' + fileName); - string evString; CaseFile *existingCaseFile(NULL); CaseFile *caseFile(NULL); @@ -603,50 +602,11 @@ CaseFile::DeSerializeFile(const char *fi } ifstream caseStream(fullName.c_str()); - if (!caseStream) { + if (!caseStream) throw ZfsdException("CaseFile::DeSerialize: Unable to " "read %s.\n", fileName); - return; - } - stringstream fakeDevdSocket(stringstream::in|stringstream::out); - IstreamReader caseReader(&fakeDevdSocket); - /* Re-load EventData */ - EventBuffer eventBuffer(caseReader); - caseStream >> std::noskipws >> std::ws; - while (!caseStream.eof()) { - /* - * Outline: - * read the beginning of a line and check it for - * "tentative". If found, discard "tentative". - * Shove into fakeDevdSocket. - * call ExtractEvent - * continue - */ - DevCtlEventList* destEvents; - string tentFlag("tentative "); - string line; - std::stringbuf lineBuf; - caseStream.get(lineBuf); - caseStream.ignore(); /*discard the newline character*/ - line = lineBuf.str(); - if (line.compare(0, tentFlag.size(), tentFlag) == 0) { - line.erase(0, tentFlag.size()); - destEvents = &caseFile->m_tentativeEvents; - } else { - destEvents = &caseFile->m_events; - } - fakeDevdSocket << line; - fakeDevdSocket << '\n'; - while (eventBuffer.ExtractEvent(evString)) { - DevCtlEvent *event(DevCtlEvent::CreateEvent( - evString)); - if (event != NULL) { - destEvents->push_back(event); - caseFile->RegisterCallout(*event); - } - } - } + caseFile->DeSerialize(caseStream); } catch (const ParseException &exp) { exp.Log(); @@ -759,6 +719,50 @@ CaseFile::Serialize() } void +CaseFile::DeSerialize(ifstream &caseStream) +{ + stringstream fakeDevdSocket(stringstream::in|stringstream::out); + IstreamReader caseReader(&fakeDevdSocket); + EventBuffer eventBuffer(caseReader); + string evString; + + caseStream >> std::noskipws >> std::ws; + while (!caseStream.eof()) { + /* + * Outline: + * read the beginning of a line and check it for + * "tentative". If found, discard "tentative". + * Shove into fakeDevdSocket. + * call ExtractEvent + * continue + */ + DevCtlEventList* destEvents; + string tentFlag("tentative "); + string line; + std::stringbuf lineBuf; + + caseStream.get(lineBuf); + caseStream.ignore(); /*discard the newline character*/ + line = lineBuf.str(); + if (line.compare(0, tentFlag.size(), tentFlag) == 0) { + line.erase(0, tentFlag.size()); + destEvents = &m_tentativeEvents; + } else { + destEvents = &m_events; + } + fakeDevdSocket << line; + fakeDevdSocket << '\n'; + while (eventBuffer.ExtractEvent(evString)) { + DevCtlEvent *event(DevCtlEvent::CreateEvent(evString)); + if (event != NULL) { + destEvents->push_back(event); + RegisterCallout(*event); + } + } + } +} + +void CaseFile::Close() { /* Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.h Mon Oct 14 20:53:51 2013 (r256452) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.h Mon Oct 14 20:56:51 2013 (r256453) @@ -255,6 +255,13 @@ protected: void Serialize(); /** + * \brief Retrieve event data from a serialization stream. + * + * \param caseStream The serializtion stream to parse. + */ + void DeSerialize(std::ifstream &caseStream); + + /** * \brief Serializes the supplied event list and writes it to fd * * \param prefix If not NULL, this prefix will be prepended to From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 20:59:18 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3AC24584; Mon, 14 Oct 2013 20:59:18 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 27A4127CC; Mon, 14 Oct 2013 20:59:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EKxIkq053353; Mon, 14 Oct 2013 20:59:18 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EKxIs7053352; Mon, 14 Oct 2013 20:59:18 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142059.r9EKxIs7053352@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 20:59:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256454 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 20:59:18 -0000 Author: asomers Date: Mon Oct 14 20:59:17 2013 New Revision: 256454 URL: http://svnweb.freebsd.org/changeset/base/256454 Log: Remove information about devd reconnection policies that was distributed within comments and syslog() strings in functions well below where these decisions are made. stable/cddl/sbin/zfsd/zfsd.cc: o In ZfsDaemon::DisconnectFromDevd(), log when the connection is torn down. This removes the need to guess that this will happen in comments or log strings in code that all eventually sends us to this function. o In ZfsDaemon::EventsPending(), treat poll returning -1 with an errno other than EINTR, or 0 as a program terminating event just as it is in the other case where we invoke poll. These events indicate poll or our code is seriously broken. o In ZfsDaemon::EventsPending(), prioritize emitting a POLLERR event over POLLHUP in case they are both set. POLLHUP is benign, but POLLERR may indicate something we need to investigate. o In ZfsDaemon::EventLoop(), remove comments and log strings that claim knowledge of policy implemented in EventLoop's caller, ZfsDaemon::Run(). Submitted by: gibbs Approved by: ken (mentor) Obtained from: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 20:56:51 2013 (r256453) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 20:59:17 2013 (r256454) @@ -450,6 +450,9 @@ ZfsDaemon::ConnectToDevd() void ZfsDaemon::DisconnectFromDevd() { + if (s_devdSockFD != -1) + syslog(LOG_INFO, "Disconnecting from devd."); + delete s_reader; s_reader = NULL; close(s_devdSockFD); @@ -520,25 +523,19 @@ ZfsDaemon::EventsPending() result = poll(fds, NUM_ELEMENTS(fds), /*timeout*/0); } while (result == -1 && errno == EINTR); - if (result == -1) { - /* Unexpected error; try reconnecting the socket */ - throw ZfsdException("ZfsdDaemon::EventsPending(): " - "Unexpected error from poll()"); - } + if (result == -1) + err(1, "Polling for devd events failed"); - if ((fds->revents & POLLHUP) != 0) { - /* - * The other end hung up the socket. Throw an exception - * so ZfsDaemon will try to reconnect - */ - throw ZfsdException("ZfsDaemon::EventsPending(): Got POLLHUP"); - } + if (result == 0) + errx(1, "Unexpected result of 0 from poll. Exiting"); - if ((fds->revents & POLLERR) != 0) { - /* Try reconnecting. */ - throw ZfsdException("ZfsdDaemon:EventsPending(): Got POLLERR. " - " Reconnecting."); - } + if ((fds->revents & POLLERR) != 0) + throw ZfsdException("ZfsdDaemon:EventsPending(): " + "POLLERR detected on devd socket."); + + if ((fds->revents & POLLHUP) != 0) + throw ZfsdException("ZfsDaemon::EventsPending(): " + "POLLHUP detected on devd socket."); return ((fds->revents & POLLIN) != 0); } @@ -692,14 +689,12 @@ ZfsDaemon::EventLoop() } if ((fds[0].revents & POLLERR) != 0) { - /* Try reconnecting. */ - syslog(LOG_INFO, "Error on socket. Disconnecting."); + syslog(LOG_INFO, "POLLERROR detected on devd socket."); break; } if ((fds[0].revents & POLLHUP) != 0) { - /* Try reconnecting. */ - syslog(LOG_INFO, "Hup on socket. Disconnecting."); + syslog(LOG_INFO, "POLLHUP detected on devd socket."); break; } } From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 21:05:10 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 452C487F; Mon, 14 Oct 2013 21:05:10 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 32D77283A; Mon, 14 Oct 2013 21:05:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EL5AMF057506; Mon, 14 Oct 2013 21:05:10 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EL5ADG057505; Mon, 14 Oct 2013 21:05:10 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142105.r9EL5ADG057505@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 21:05:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256455 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 21:05:10 -0000 Author: asomers Date: Mon Oct 14 21:05:09 2013 New Revision: 256455 URL: http://svnweb.freebsd.org/changeset/base/256455 Log: cddl/sbin/zfsd/zfsd.cc In ZfsdDaemon::EventsPending(), we do not block waiting for events, so poll will return 0 if no events are pending. Don't treat this as a fatal error. Submitted by: gibbs Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 20:59:17 2013 (r256454) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 21:05:09 2013 (r256455) @@ -526,9 +526,6 @@ ZfsDaemon::EventsPending() if (result == -1) err(1, "Polling for devd events failed"); - if (result == 0) - errx(1, "Unexpected result of 0 from poll. Exiting"); - if ((fds->revents & POLLERR) != 0) throw ZfsdException("ZfsdDaemon:EventsPending(): " "POLLERR detected on devd socket."); From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 21:08:32 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8E49B9A9; Mon, 14 Oct 2013 21:08:32 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7BD1A2863; Mon, 14 Oct 2013 21:08:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EL8WrX058360; Mon, 14 Oct 2013 21:08:32 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EL8W6C058358; Mon, 14 Oct 2013 21:08:32 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142108.r9EL8W6C058358@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 21:08:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256456 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 21:08:32 -0000 Author: asomers Date: Mon Oct 14 21:08:31 2013 New Revision: 256456 URL: http://svnweb.freebsd.org/changeset/base/256456 Log: Fix compiler warnings in zfsd cddl/sbin/zfsd/case_file.cc: Use proper printf/scanf format specifiers so Zfsd operates on uint64_t variables instead of uintmax_t variables that are then assumed to be 64 bits in size. cddl/sbin/zfsd/case_file.cc: cddl/sbin/zfsd/vdev.cc: When fetching datastructures from nvlists that are an array of uint64_ts, use a uint64_t pointer to call into the nvlist API and a reinterpret_cast<> to convert it to the pointer type of interest. Fixes strict-aliasing warnings. Submitted by: gibbs Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:05:09 2013 (r256455) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:08:31 2013 (r256456) @@ -383,7 +383,7 @@ CaseFile::ActivateSpare() { ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); if (zpl.empty()) { syslog(LOG_ERR, "CaseFile::ActivateSpare: Could not find pool " - "for pool_guid %ju.", (uint64_t)m_poolGUID); + "for pool_guid %"PRIu64".", (uint64_t)m_poolGUID); return (false); } zhp = zpl.front(); @@ -407,16 +407,18 @@ CaseFile::ActivateSpare() { return (false); } for (i = 0; i < nspares; i++) { + uint64_t *nvlist_array; vdev_stat_t *vs; - unsigned nstats; + uint_t nstats; if (nvlist_lookup_uint64_array(spares[i], - ZPOOL_CONFIG_VDEV_STATS, (uint64_t**)&vs, &nstats) != 0) { + ZPOOL_CONFIG_VDEV_STATS, &nvlist_array, &nstats) != 0) { syslog(LOG_ERR, "CaseFile::ActivateSpare: Could not " "find vdev stats for pool %s, spare %d", poolname, i); return (false); } + vs = reinterpret_cast(nvlist_array); if ((vs->vs_aux != VDEV_AUX_SPARED) && (vs->vs_state == VDEV_STATE_HEALTHY)) { @@ -538,11 +540,11 @@ CaseFile::OnGracePeriodEnded(void *arg) int CaseFile::DeSerializeSelector(const struct dirent *dirEntry) { - uintmax_t poolGUID; - uintmax_t vdevGUID; + uint64_t poolGUID; + uint64_t vdevGUID; if (dirEntry->d_type == DT_REG - && sscanf(dirEntry->d_name, "pool_%ju_vdev_%ju.case", + && sscanf(dirEntry->d_name, "pool_%"PRIu64"_vdev_%"PRIu64".case", &poolGUID, &vdevGUID) == 2) return (1); return (0); @@ -556,11 +558,11 @@ CaseFile::DeSerializeFile(const char *fi CaseFile *caseFile(NULL); try { - uintmax_t poolGUID; - uintmax_t vdevGUID; + uint64_t poolGUID; + uint64_t vdevGUID; nvlist_t *vdevConf; - sscanf(fileName, "pool_%ju_vdev_%ju.case", + sscanf(fileName, "pool_%"PRIu64"_vdev_%"PRIu64".case", &poolGUID, &vdevGUID); existingCaseFile = Find(Guid(poolGUID), Guid(vdevGUID)); if (existingCaseFile != NULL) { @@ -832,7 +834,7 @@ CaseFile::Replace(const char* vdev_type, ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); if (zpl.empty()) { syslog(LOG_ERR, "CaseFile::Replace: could not find pool for " - "pool_guid %ju.", (uint64_t)m_poolGUID); + "pool_guid %"PRIu64".", (uint64_t)m_poolGUID); return (false); } zhp = zpl.front(); Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Mon Oct 14 21:05:09 2013 (r256455) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Mon Oct 14 21:08:31 2013 (r256456) @@ -120,6 +120,7 @@ Vdev::Vdev(nvlist_t *labelConfig) vdev_state Vdev::State() const { + uint64_t *nvlist_array; vdev_stat_t *vs; uint_t vsc; @@ -136,8 +137,10 @@ Vdev::State() const } if (nvlist_lookup_uint64_array(m_config, ZPOOL_CONFIG_VDEV_STATS, - (uint64_t **)&vs, &vsc) == 0) + &nvlist_array, &vsc) == 0) { + vs = reinterpret_cast(nvlist_array); return (static_cast(vs->vs_state)); + } /* * Stats are not available. This vdev was created from a label. From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 21:21:08 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F1531C7A; Mon, 14 Oct 2013 21:21:07 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C40E12920; Mon, 14 Oct 2013 21:21:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ELL7rS067090; Mon, 14 Oct 2013 21:21:07 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ELL5xk067076; Mon, 14 Oct 2013 21:21:05 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142121.r9ELL5xk067076@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 21:21:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256457 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 21:21:08 -0000 Author: asomers Date: Mon Oct 14 21:21:05 2013 New Revision: 256457 URL: http://svnweb.freebsd.org/changeset/base/256457 Log: Style, comment, and warning message improvements to zfsd. * zfsd.h Clarified member documentation * zfsd.cc Clarified warning message * case_file.cc Omits a space before the { of a control block * vdev_iterator.cc * zfsd.cc Return statements must enclose their values in parenthesis * dev_ctl_event.cc: Omit a space after flow control keywords * case_file.cc: * vdev_iterator.cc * zfsd.cc * case_file.h * dev_ctl_event.h * guid.h * zfsd_exception.h * zpool_list.h * dev_ctl_event.cc Trailing whitespace * zfsd.cc * zpool_list.cc Braces around a single line statement following a control block Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/case_file.h projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h projects/zfsd/head/cddl/sbin/zfsd/guid.h projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd.h projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.h projects/zfsd/head/cddl/sbin/zfsd/zpool_list.cc projects/zfsd/head/cddl/sbin/zfsd/zpool_list.h Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:08:31 2013 (r256456) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:21:05 2013 (r256457) @@ -202,7 +202,7 @@ CaseFile::ReEvaluate(const string &devPa */ syslog(LOG_INFO, "CaseFile::ReEvaluate(%s,%s) Pool/Vdev unconfigured. " - "Closing\n", + "Closing\n", PoolGUIDString().c_str(), VdevGUIDString().c_str()); Close(); @@ -308,7 +308,7 @@ CaseFile::ReEvaluate(const ZfsEvent &eve */ syslog(LOG_INFO, "CaseFile::ReEvaluate(%s,%s) Pool/Vdev unconfigured. " - "Closing\n", + "Closing\n", PoolGUIDString().c_str(), VdevGUIDString().c_str()); Close(); @@ -349,7 +349,7 @@ CaseFile::ReEvaluate(const ZfsEvent &eve */ ZfsDaemon::RequestSystemRescan(); - /* + /* * Consume the event if we successfully activated a spare. * Otherwise, leave it in the unconsumed events list so that the * future addition of a spare to this pool might be able to @@ -394,7 +394,8 @@ CaseFile::ActivateSpare() { "config for pool %s", poolname); return (false); } - if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, &nvroot) != 0){ + error = nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, &nvroot); + if (error != 0){ syslog(LOG_ERR, "CaseFile::ActivateSpare: Could not find vdev " "tree for pool %s", poolname); return (false); @@ -453,7 +454,7 @@ CaseFile::ActivateSpare() { void CaseFile::RegisterCallout(const DevCtlEvent &event) -{ +{ timeval now, countdown, elapsed, timestamp, zero, remaining; gettimeofday(&now, 0); @@ -484,7 +485,7 @@ CaseFile::CloseIfSolved() if (m_events.empty() && m_tentativeEvents.empty()) { - /* + /* * We currently do not track or take actions on * devices in the degraded or faulted state. * Once we have support for spare pools, we'll @@ -774,7 +775,7 @@ CaseFile::Close() syslog(LOG_INFO, "CaseFile(%s,%s) closed - State %s\n", PoolGUIDString().c_str(), VdevGUIDString().c_str(), zpool_state_to_name(VdevState(), VDEV_AUX_NONE)); - + /* * Serialization of a Case with no event data, clears the * Serialization data for that event. @@ -809,7 +810,7 @@ CaseFile::OnGracePeriodEnded() VDEV_AUX_ERR_EXCEEDED) == 0) { syslog(LOG_INFO, "Degrading vdev(%s/%s)", PoolGUIDString().c_str(), - VdevGUIDString().c_str()); + VdevGUIDString().c_str()); Close(); return; } Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.h Mon Oct 14 21:08:31 2013 (r256456) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.h Mon Oct 14 21:21:05 2013 (r256457) @@ -154,7 +154,7 @@ public: * the disk resource. * \param vdev If the disk contains ZFS label information, * a pointer to the disk label's vdev object - * data. Otherwise NULL. + * data. Otherwise NULL. * * \return True if this event was consumed by this CaseFile. */ @@ -346,7 +346,7 @@ protected: string m_vdevPhysPath; /** - * \brief Callout activated when a grace period + * \brief Callout activated when a grace period */ Callout m_tentativeTimer; }; Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Mon Oct 14 21:08:31 2013 (r256456) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Mon Oct 14 21:21:05 2013 (r256457) @@ -67,7 +67,7 @@ ParseException::ToString() const result << "Parsing "; - switch(Type()) { + switch (Type()) { case INVALID_FORMAT: result << "invalid format "; break; @@ -131,7 +131,7 @@ DevCtlEvent::Init() EventFactoryRecord *rec(s_factoryTable); EventFactoryRecord *lastRec(s_factoryTable + NUM_ELEMENTS(s_factoryTable) - 1); - + for (; rec <= lastRec; rec++) { EventFactoryKey key(rec->m_type, rec->m_subsystem); @@ -434,10 +434,10 @@ DevfsEvent::IsWholeDev(const string &dev /* alpha prefix followed only by digits. */ for (; i < devName.end() && !isdigit(*i); i++) ; - + if (i == devName.end()) return (false); - + for (; i < devName.end() && isdigit(*i); i++) ; Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Mon Oct 14 21:08:31 2013 (r256456) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Mon Oct 14 21:21:05 2013 (r256457) @@ -143,7 +143,7 @@ ParseException::ParseException(Type type } //- ParseException Inline Const Public Methods --------------------------------- -inline ParseException::Type +inline ParseException::Type ParseException::GetType() const { return (m_type); @@ -271,7 +271,7 @@ public: */ void Log(int priority) const; - /** + /** * Create and return a fully independent clone * of this event. */ Modified: projects/zfsd/head/cddl/sbin/zfsd/guid.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/guid.h Mon Oct 14 21:08:31 2013 (r256456) +++ projects/zfsd/head/cddl/sbin/zfsd/guid.h Mon Oct 14 21:21:05 2013 (r256457) @@ -47,7 +47,7 @@ * * It can generally be manipulated as a uint64_t, but with a special * value INVALID_GUID that does not equal any valid guid. - * + * * As of this writing, spa_generate_guid() in spa_misc.c explicitly * refuses to return a guid of 0. So this class uses 0 as the value * for INVALID_GUID. In the future, if 0 is allowed to be a valid Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.cc Mon Oct 14 21:08:31 2013 (r256456) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.cc Mon Oct 14 21:21:05 2013 (r256457) @@ -69,7 +69,7 @@ VdevIterator::Reset() result = nvlist_lookup_nvlist(m_poolConfig, ZPOOL_CONFIG_VDEV_TREE, &rootVdev); - if (result != 0) + if (result != 0) throw ZfsdException(m_poolConfig, "Unable to extract " "ZPOOL_CONFIG_VDEV_TREE from pool."); m_vdevQueue.assign(1, rootVdev); @@ -135,7 +135,7 @@ VdevIterator::Find(Guid vdevGUID) Vdev vdev(m_poolConfig, vdevConfig); if (vdev.GUID() == vdevGUID) - return vdevConfig; + return (vdevConfig); } return (NULL); } Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 21:08:31 2013 (r256456) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 21:21:05 2013 (r256457) @@ -35,7 +35,7 @@ * * The ZFS daemon consumes kernel devctl(4) event data via devd(8)'s * unix domain socket in order to react to system changes that impact - * the function of ZFS storage pools. The goal of this daemon is to + * the function of ZFS storage pools. The goal of this daemon is to * provide similar functionality to the Solaris ZFS Diagnostic Engine * (zfs-diagnosis), the Solaris ZFS fault handler (zfs-retire), and * the Solaris ZFS vdev insertion agent (zfs-mod sysevent handler). @@ -180,9 +180,9 @@ EventBuffer::ExtractEvent(string &eventS */ continue; } - syslog(LOG_WARNING, - "Event exceeds event size limit of %d bytes.", - MAX_EVENT_SIZE); + syslog(LOG_WARNING, "Overran event buffer\n\tm_nextEventOffset" + "=%d\n\tm_parsedLen=%d\n\tm_validLen=%d", + m_nextEventOffset, m_parsedLen, m_validLen); } else { /* * Include the normal terminator in the extracted @@ -250,11 +250,10 @@ EventBuffer::Fill() want = std::min(avail, MAX_READ_SIZE - m_validLen); consumed = m_reader.read(m_buf + m_validLen, want); if (consumed == -1) { - if (errno == EINTR) { + if (errno == EINTR) return (false); - } else { + else err(1, "EventBuffer::Fill(): Read failed"); - } } } @@ -430,7 +429,7 @@ ZfsDaemon::ConnectToDevd() sLen = SUN_LEN(&devdAddr); s_devdSockFD = socket(AF_UNIX, SOCK_STREAM, 0); - if (s_devdSockFD == -1) + if (s_devdSockFD == -1) err(1, "Unable to create socket"); result = connect(s_devdSockFD, reinterpret_cast(&devdAddr), @@ -482,9 +481,9 @@ bool ZfsDaemon::SaveEvent(const DevCtlEvent &event) { if (s_consumingEvents) - return false; + return (false); s_unconsumedEvents.push_back(event.DeepCopy()); - return true; + return (true); } /* Capture and process buffered events. */ Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.h Mon Oct 14 21:08:31 2013 (r256456) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.h Mon Oct 14 21:21:05 2013 (r256457) @@ -272,19 +272,39 @@ private: /** Characters found between successive "key=value" strings. */ static const char s_keyPairSepTokens[]; - /** Temporary space for event data during our parsing. */ + /** Temporary space for event data during our parsing. Laid out like + * this: + * <---------------------------------------------------------> + * | | | | | + * m_buf---| | | | | + * m_nextEventOffset-- | | | + * m_parsedLen------------- | | + * m_validLen-------------------------- | + * EVENT_BUFSIZE------------------------------------------------------ + * + * Data before m_nextEventOffset has already been processed. + * + * Data between m_nextEvenOffset and m_parsedLen has been parsed, but + * not processed as a single event. + * + * Data between m_parsedLen and m_validLen has been read from the + * source, but not yet parsed. + * + * Between m_validLen and EVENT_BUFSIZE is empty space. + * + * */ char m_buf[EVENT_BUFSIZE]; /** Reference to the reader linked to devd's domain socket. */ Reader& m_reader; - /** Valid bytes in m_buf. */ + /** Offset within m_buf to the beginning of free space. */ size_t m_validLen; - /** The amount of data in m_buf we have looked at. */ + /** Offset within m_buf to the beginning of data not yet parsed */ size_t m_parsedLen; - /** Offset to the start token of the next event. */ + /** Offset within m_buf to the start token of the next event. */ size_t m_nextEventOffset; /** The EventBuffer is aligned and tracking event records. */ Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.h Mon Oct 14 21:08:31 2013 (r256456) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.h Mon Oct 14 21:21:05 2013 (r256457) @@ -96,7 +96,7 @@ public: * \brief Augment/Modify a ZfsdException's string data. */ std::string& GetString(); - + /** * \brief Emit exception data to syslog(3). */ Modified: projects/zfsd/head/cddl/sbin/zfsd/zpool_list.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zpool_list.cc Mon Oct 14 21:08:31 2013 (r256456) +++ projects/zfsd/head/cddl/sbin/zfsd/zpool_list.cc Mon Oct 14 21:21:05 2013 (r256457) @@ -75,11 +75,10 @@ ZpoolList::LoadIterator(zpool_handle_t * ZpoolList *zpl(reinterpret_cast(data)); nvlist_t *poolConfig(zpool_get_config(pool, NULL)); - if (zpl->m_filter(pool, poolConfig, zpl->m_filterArg)) { + if (zpl->m_filter(pool, poolConfig, zpl->m_filterArg)) zpl->push_back(pool); - } else { + else zpool_close(pool); - } return (0); } Modified: projects/zfsd/head/cddl/sbin/zfsd/zpool_list.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zpool_list.h Mon Oct 14 21:08:31 2013 (r256456) +++ projects/zfsd/head/cddl/sbin/zfsd/zpool_list.h Mon Oct 14 21:21:05 2013 (r256457) @@ -54,7 +54,7 @@ class Vdev; /*============================= Class Definitions ============================*/ /*--------------------------------- ZpoolList --------------------------------*/ class ZpoolList; -typedef bool PoolFilter_t(zpool_handle_t *pool, nvlist_t *poolConfig, +typedef bool PoolFilter_t(zpool_handle_t *pool, nvlist_t *poolConfig, void *filterArg); /** @@ -82,7 +82,7 @@ public: /** * \brief Utility ZpoolList construction filter that causes only - * pools known to the system and having the specified name + * pools known to the system and having the specified name * to be included in the intantiated ZpoolList. */ static PoolFilter_t ZpoolByName; @@ -103,9 +103,9 @@ public: private: /** * \brief Helper routine used to populate the internal - * data store of ZFS pool objects using libzfs's + * data store of ZFS pool objects using libzfs's * zpool_iter() function. - * + * * \param pool The ZFS pool object to filter. * \param data User argument passed through zpool_iter(). */ From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 21:23:59 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2A493D7D; Mon, 14 Oct 2013 21:23:59 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F19A92933; Mon, 14 Oct 2013 21:23:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ELNwCx067747; Mon, 14 Oct 2013 21:23:58 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ELNwiN067746; Mon, 14 Oct 2013 21:23:58 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142123.r9ELNwiN067746@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 21:23:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256458 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 21:23:59 -0000 Author: asomers Date: Mon Oct 14 21:23:58 2013 New Revision: 256458 URL: http://svnweb.freebsd.org/changeset/base/256458 Log: zfsd will attempt to activate a hotspare in response to a drive becoming DEGRADED or FAULTED. case_file.cc Attempt to activate a spare whenver we get a "resource.fs.zfs.statechange" event and the vdev state is either DEGRADED or FAULTED. Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:21:05 2013 (r256457) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:23:58 2013 (r256458) @@ -356,8 +356,19 @@ CaseFile::ReEvaluate(const ZfsEvent &eve * close the case */ consumed = spare_activated; - } else if (event.Value("class") == "ereport.fs.zfs.io" - || event.Value("class") == "ereport.fs.zfs.checksum") { + } else if (event.Value("class") == "resource.fs.zfs.statechange") { + /* + * If this vdev is DEGRADED or FAULTED, try to activate a + * hotspare. Otherwise, ignore the event + */ + if (VdevState() == VDEV_STATE_FAULTED || + VdevState() == VDEV_STATE_DEGRADED) + consumed = ActivateSpare(); + else + consumed = true; + } + else if (event.Value("class") == "ereport.fs.zfs.io" || + event.Value("class") == "ereport.fs.zfs.checksum") { m_tentativeEvents.push_front(event.DeepCopy()); RegisterCallout(event); @@ -370,6 +381,10 @@ CaseFile::ReEvaluate(const ZfsEvent &eve } +/* + * TODO: ensure that we don't activate a spare for a vdev that is already being + * replaced by another spare. + */ bool CaseFile::ActivateSpare() { nvlist_t *config, *nvroot; @@ -405,6 +420,8 @@ CaseFile::ActivateSpare() { &nspares); if (nspares == 0) { /* The pool has no spares configured */ + syslog(LOG_INFO, "CaseFile::ActivateSpare: " + "No spares available for pool %s", poolname); return (false); } for (i = 0; i < nspares; i++) { From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 21:30:02 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 13A092C1; Mon, 14 Oct 2013 21:30:02 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DB65E298C; Mon, 14 Oct 2013 21:30:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ELU1EO069595; Mon, 14 Oct 2013 21:30:01 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ELU1a6069589; Mon, 14 Oct 2013 21:30:01 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142130.r9ELU1a6069589@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 21:30:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256460 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 21:30:02 -0000 Author: asomers Date: Mon Oct 14 21:30:00 2013 New Revision: 256460 URL: http://svnweb.freebsd.org/changeset/base/256460 Log: Fixed ZfsEvent::ProcessPoolEvent(): it was never getting called, and didn't have the right string for removal events. dev_ctl_event.cc Fixed event strings dev_ctl_event.h Made a function virtual to facilitate unit testing zfsd.cc Fixed a printf format warning in ExtractEvent. Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Mon Oct 14 21:25:07 2013 (r256459) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Mon Oct 14 21:30:00 2013 (r256460) @@ -619,7 +619,7 @@ ZfsEvent::Process() const Log(LOG_INFO); - if (Value("subsystem").find("misc.fs.zfs.") == 0) { + if (Value("type").find("misc.fs.zfs.") == 0) { /* Configuration changes, resilver events, etc. */ ProcessPoolEvent(); return; @@ -721,8 +721,7 @@ ZfsEvent::ProcessPoolEvent() const caseFile->ReEvaluate(*this); } - /* XXX Needs to be changed. */ - if (Value("type") == "ESC_ZFS_vdev_remove" + if (Value("type") == "misc.fs.zfs.vdev_remove" && degradedDevice == false) { /* See if any other cases can make use of this device. */ ZfsDaemon::RequestSystemRescan(); Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Mon Oct 14 21:25:07 2013 (r256459) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Mon Oct 14 21:30:00 2013 (r256460) @@ -493,7 +493,7 @@ protected: /** Deep copy constructor. */ ZfsEvent(const ZfsEvent &src); - void ProcessPoolEvent() const; + virtual void ProcessPoolEvent() const; Guid m_poolGUID; Guid m_vdevGUID; Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 21:25:07 2013 (r256459) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 21:30:00 2013 (r256460) @@ -181,7 +181,7 @@ EventBuffer::ExtractEvent(string &eventS continue; } syslog(LOG_WARNING, "Overran event buffer\n\tm_nextEventOffset" - "=%d\n\tm_parsedLen=%d\n\tm_validLen=%d", + "=%zd\n\tm_parsedLen=%zd\n\tm_validLen=%zd", m_nextEventOffset, m_parsedLen, m_validLen); } else { /* From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 21:34:50 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0FD5E4D0; Mon, 14 Oct 2013 21:34:50 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E236B29E5; Mon, 14 Oct 2013 21:34:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ELYnHV073045; Mon, 14 Oct 2013 21:34:49 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ELYnSd073042; Mon, 14 Oct 2013 21:34:49 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142134.r9ELYnSd073042@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 21:34:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256461 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 21:34:50 -0000 Author: asomers Date: Mon Oct 14 21:34:49 2013 New Revision: 256461 URL: http://svnweb.freebsd.org/changeset/base/256461 Log: When a vdev generates IO errors, mark it as FAULTED instead of DEGRADED. Checksum errors will still be marked as DEGRADED. This matches the behavior of Illumos. I had to make a number of methods virtual to facilitate unit testing. Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/case_file.h projects/zfsd/head/cddl/sbin/zfsd/vdev.h Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:30:00 2013 (r256460) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:34:49 2013 (r256461) @@ -806,11 +806,13 @@ CaseFile::Close() void CaseFile::OnGracePeriodEnded() { + bool should_fault, should_degrade; + ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); m_events.splice(m_events.begin(), m_tentativeEvents); + should_fault = ShouldFault(); + should_degrade = ShouldDegrade(); - if (m_events.size() > ZFS_DEGRADE_IO_COUNT) { - - ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); + if (should_fault || should_degrade) { if (zpl.empty() || (VdevIterator(zpl.front()).Find(m_vdevGUID)) == NULL) { /* @@ -822,6 +824,28 @@ CaseFile::OnGracePeriodEnded() return; } + } + + /* A fault condition has priority over a degrade condition */ + if (ShouldFault()) { + /* Fault the vdev and close the case. */ + if (zpool_vdev_fault(zpl.front(), (uint64_t)m_vdevGUID, + VDEV_AUX_ERR_EXCEEDED) == 0) { + syslog(LOG_INFO, "Faulting vdev(%s/%s)", + PoolGUIDString().c_str(), + VdevGUIDString().c_str()); + Close(); + return; + } + else { + syslog(LOG_ERR, "Fault vdev(%s/%s): %s: %s\n", + PoolGUIDString().c_str(), + VdevGUIDString().c_str(), + libzfs_error_action(g_zfsHandle), + libzfs_error_description(g_zfsHandle)); + } + } + else if (ShouldDegrade()) { /* Degrade the vdev and close the case. */ if (zpool_vdev_degrade(zpl.front(), (uint64_t)m_vdevGUID, VDEV_AUX_ERR_EXCEEDED) == 0) { @@ -907,3 +931,25 @@ CaseFile::Replace(const char* vdev_type, return (true); } + +/* Does the argument event refer to a checksum error? */ +static bool IsChecksumEvent(const DevCtlEvent* const event){ + return ("ereport.fs.zfs.checksum" == event->Value("type")); +} + +/* Does the argument event refer to an IO error? */ +static bool IsIOEvent(const DevCtlEvent* const event){ + return ("ereport.fs.zfs.io" == event->Value("type")); +} + +bool +CaseFile::ShouldDegrade() const { + return (std::count_if(m_events.begin(), m_events.end(), + IsChecksumEvent) > ZFS_DEGRADE_IO_COUNT); +} + +bool +CaseFile::ShouldFault() const { + return (std::count_if(m_events.begin(), m_events.end(), + IsIOEvent) > ZFS_DEGRADE_IO_COUNT); +} Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.h Mon Oct 14 21:30:00 2013 (r256460) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.h Mon Oct 14 21:34:49 2013 (r256461) @@ -114,7 +114,7 @@ public: * * \param vdev The vdev object for which to find/create a CaseFile. * - * \return A referenc eto a valid CaseFile object. + * \return A reference to a valid CaseFile object. */ static CaseFile &Create(Vdev &vdev); @@ -173,7 +173,7 @@ public: /** * \brief Register an itimer callout for the given event, if necessary */ - void RegisterCallout(const DevCtlEvent &event); + virtual void RegisterCallout(const DevCtlEvent &event); /** * \brief Close a case if it is no longer relevant. @@ -192,6 +192,16 @@ public: */ void Log(); + /** + * \brief Whether we should degrade this vdev + */ + bool ShouldDegrade() const; + + /** + * \brief Whether we should fault this vdev + */ + bool ShouldFault() const; + protected: enum { /** @@ -228,8 +238,11 @@ protected: /** Constructor. */ CaseFile(const Vdev &vdev); - /** Destructor. */ - ~CaseFile(); + /** + * Destructor. + * Must be virtual so it can be subclassed in the unit tests + */ + virtual ~CaseFile(); /** * \brief Reload state for the vdev associated with this CaseFile. @@ -237,7 +250,7 @@ protected: * \return True if the refresh was successful. False if the system * has no record of the pool or vdev for this CaseFile. */ - bool RefreshVdevState(); + virtual bool RefreshVdevState(); /** * \brief Free all events in the m_events list. Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev.h Mon Oct 14 21:30:00 2013 (r256460) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev.h Mon Oct 14 21:34:49 2013 (r256461) @@ -96,11 +96,11 @@ public: */ Vdev(nvlist_t *vdevConfig); - Guid GUID() const; - Guid PoolGUID() const; - vdev_state State() const; - std::string Path() const; - std::string PhysicalPath() const; + virtual Guid GUID() const; + virtual Guid PoolGUID() const; + virtual vdev_state State() const; + std::string Path() const; + virtual std::string PhysicalPath() const; std::string GUIDString() const; nvlist_t *PoolConfig() const; nvlist_t *Config() const; From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 21:41:36 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DBC9F663; Mon, 14 Oct 2013 21:41:36 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AF10A2A3D; Mon, 14 Oct 2013 21:41:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ELfaZX077332; Mon, 14 Oct 2013 21:41:36 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ELfa08077330; Mon, 14 Oct 2013 21:41:36 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142141.r9ELfa08077330@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 21:41:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256462 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 21:41:36 -0000 Author: asomers Date: Mon Oct 14 21:41:36 2013 New Revision: 256462 URL: http://svnweb.freebsd.org/changeset/base/256462 Log: Make zfsd WARNS=1 safe. cddl/sbin/zfsd/zfsd.h Make Reader's destructor virtual, because it has virtual functions cddl/sbin/zfsd/Makefile Add WARNS=1 and -Wall Submitted by: will Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/Makefile projects/zfsd/head/cddl/sbin/zfsd/zfsd.h Modified: projects/zfsd/head/cddl/sbin/zfsd/Makefile ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/Makefile Mon Oct 14 21:34:49 2013 (r256461) +++ projects/zfsd/head/cddl/sbin/zfsd/Makefile Mon Oct 14 21:41:36 2013 (r256462) @@ -14,7 +14,7 @@ SRCS= callout.cc \ NO_MAN= YES -WARNS?= 0 +WARNS?= 1 INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common INCFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include @@ -30,7 +30,7 @@ INCFLAGS+= -I${.CURDIR}/../../../sys/cdd INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys -CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} +CFLAGS= -Wall -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} DPADD= ${LIBZFS} ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \ ${LIBNVPAIR} ${LIBUUTIL} Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.h Mon Oct 14 21:34:49 2013 (r256461) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.h Mon Oct 14 21:41:36 2013 (r256462) @@ -108,8 +108,12 @@ public: * \returns Amount of data that was actually read */ virtual ssize_t read(char* buf, size_t count) = 0; + + virtual ~Reader() = 0; }; +inline Reader::~Reader() {} + /*-------------------------------- FDReader -------------------------------*/ /** From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 21:50:57 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 956197E1; Mon, 14 Oct 2013 21:50:57 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 742942AAD; Mon, 14 Oct 2013 21:50:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ELov65082212; Mon, 14 Oct 2013 21:50:57 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ELovC1082211; Mon, 14 Oct 2013 21:50:57 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142150.r9ELovC1082211@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 21:50:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256463 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 21:50:57 -0000 Author: asomers Date: Mon Oct 14 21:50:56 2013 New Revision: 256463 URL: http://svnweb.freebsd.org/changeset/base/256463 Log: Fix a bug in zfsd: when a drive is experiencing a rapid storm of IO or checksum errors, zfsd will not degrade/fault it until hundreds or thousands of errors have occured. cddl/sbin/zfsd/case_file.cc RefreshVdevState() iterates through all the system's zpools, which involves the ioctls ZFS_IOC_POOL_CONFIGS and ZFS_IOC_POOL_STATS. Both of those acquire spa_namespace_lock, which may block for a long time under certain circumstances, including when the system has a storm of IO or checksum errors. This change eliminates the call to RefreshVdevState() whenever a ZFSEvent is received. Instead, RefreshVdevState() will only be called when a CaseFile is closed, if necessary. This way, zfsd won't spend too much time blocking on ioctl()s and miss reading events from devd. Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:41:36 2013 (r256462) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:50:56 2013 (r256463) @@ -298,28 +298,6 @@ CaseFile::ReEvaluate(const ZfsEvent &eve { bool consumed(false); - if (!RefreshVdevState()) { - /* - * The pool or vdev for this case file is no longer - * part of the configuration. This can happen - * if we process a device arrival notification - * before seeing the ZFS configuration change - * event. - */ - syslog(LOG_INFO, - "CaseFile::ReEvaluate(%s,%s) Pool/Vdev unconfigured. " - "Closing\n", - PoolGUIDString().c_str(), - VdevGUIDString().c_str()); - Close(); - - /* - * Since this event was not used to close this - * case, do not report it as consumed. - */ - return (/*consumed*/false); - } - if (event.Value("type") == "misc.fs.zfs.vdev_remove") { /* * The Vdev we represent has been removed from the @@ -333,6 +311,28 @@ CaseFile::ReEvaluate(const ZfsEvent &eve if (event.Value("class") == "resource.fs.zfs.removed") { bool spare_activated; + if (!RefreshVdevState()) { + /* + * The pool or vdev for this case file is no longer + * part of the configuration. This can happen + * if we process a device arrival notification + * before seeing the ZFS configuration change + * event. + */ + syslog(LOG_INFO, + "CaseFile::ReEvaluate(%s,%s) Pool/Vdev " + "unconfigured. Closing\n", + PoolGUIDString().c_str(), + VdevGUIDString().c_str()); + Close(); + + /* + * Since this event was not used to close this + * case, do not report it as consumed. + */ + return (/*consumed*/false); + } + /* * Discard any tentative I/O error events for * this case. They were most likely caused by the From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 21:53:47 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0423F903; Mon, 14 Oct 2013 21:53:47 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E107A2AC7; Mon, 14 Oct 2013 21:53:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ELrkN4083050; Mon, 14 Oct 2013 21:53:46 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ELrkVQ083049; Mon, 14 Oct 2013 21:53:46 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142153.r9ELrkVQ083049@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 21:53:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256464 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 21:53:47 -0000 Author: asomers Date: Mon Oct 14 21:53:45 2013 New Revision: 256464 URL: http://svnweb.freebsd.org/changeset/base/256464 Log: cddl/sbin/zfsd/case_file.cc Comment change. No functional change. Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:50:56 2013 (r256463) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:53:45 2013 (r256464) @@ -324,6 +324,10 @@ CaseFile::ReEvaluate(const ZfsEvent &eve "unconfigured. Closing\n", PoolGUIDString().c_str(), VdevGUIDString().c_str()); + /* + * Close the case now so we won't waste cycles in the + * system rescan + */ Close(); /* From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 21:59:33 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0E575A50; Mon, 14 Oct 2013 21:59:33 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EF1B52AF9; Mon, 14 Oct 2013 21:59:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ELxWUD084433; Mon, 14 Oct 2013 21:59:32 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ELxVvm084426; Mon, 14 Oct 2013 21:59:31 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142159.r9ELxVvm084426@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 21:59:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256465 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 21:59:33 -0000 Author: asomers Date: Mon Oct 14 21:59:31 2013 New Revision: 256465 URL: http://svnweb.freebsd.org/changeset/base/256465 Log: zfsd should activate a spare that is newly added to an already-degraded pool cddl/sbin/zfsd/case_file.cc cddl/sbin/zfsd/case_file.h cddl/sbin/zfsd/dev_ctl_event.cc When a config_sync event arrives, reevaluate all open casefiles on the same pool. cddl/sbin/zfsd/case_file.cc When evaluating a config_sync event, try to activate spares if our pool is unhealthy. This is necessary because we don't get any more specific event when a spare is added to a pool. This required adding the CaseFileReEvaluator functor and the CaseFile::ReEvaluateByGuid method. cddl/sbin/zfsd/case_file.cc When processing a statechange event, refresh the vdev state. This is necessary because we could be reevaluating an already-existing casefile that was opened before the pool became degraded. Also, always consume the event, even if we couldn't activate the spare. It's no longer necessary to queue the statechange event since we can now reevaluate CaseFiles on a config_sync event. cddl/sbin/zfsd/case_file.cc In CloseIfSolved(), don't close casefiles for DEGRADED or FAULTED vdevs since we now have the ability to fix them. cddl/sbin/zfsd/dev_ctl_event.cc cddl/sbin/zfsd/dev_ctl_event.h cddl/sbin/zfsd/zfsd.cc Redelegated responsibility for queueing events from DevCtlEvent(and its child classes) to ZfsDaemon. cddl/sbin/zfsd/zfsd.cc In the SIGINFO handler, print unconsumed events as well as saved casefiles. Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/case_file.h projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:53:45 2013 (r256464) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:59:31 2013 (r256465) @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -59,6 +60,27 @@ using std::stringstream; using std::setfill; using std::setw; +/*-------------------------- File-scoped classes ----------------------------*/ +/** + * \brief Functor that operators on STL collections of CaseFiles + * Selectively calls ReEvaluate on the casefile, based on its pool GUID. + */ +class CaseFileReEvaluator : public std::unary_function +{ +public: + CaseFileReEvaluator(Guid guid, const ZfsEvent &event) : + m_poolGUID(guid), m_event(event) {}; + void operator() (CaseFile *casefile) { + if (m_poolGUID == casefile->PoolGUID()) + casefile->ReEvaluate(m_event); + } +private: + Guid m_poolGUID; + const ZfsEvent &m_event; +}; + + + /*--------------------------------- CaseFile ---------------------------------*/ //- CaseFile Static Data ------------------------------------------------------- CaseFileList CaseFile::s_activeCases; @@ -99,6 +121,14 @@ CaseFile::Find(const string &physPath) return (NULL); } + +void +CaseFile::ReEvaluateByGuid(Guid poolGUID, const ZfsEvent &event) +{ + CaseFileReEvaluator reevaluator(poolGUID, event); + std::for_each(s_activeCases.begin(), s_activeCases.end(), reevaluator); +} + CaseFile & CaseFile::Create(Vdev &vdev) { @@ -307,6 +337,11 @@ CaseFile::ReEvaluate(const ZfsEvent &eve return (/*consumed*/true); } + else if (event.Value("type") == "misc.fs.zfs.config_sync") { + if (VdevState() < VDEV_STATE_HEALTHY) + consumed = ActivateSpare(); + } + if (event.Value("class") == "resource.fs.zfs.removed") { bool spare_activated; @@ -361,15 +396,15 @@ CaseFile::ReEvaluate(const ZfsEvent &eve */ consumed = spare_activated; } else if (event.Value("class") == "resource.fs.zfs.statechange") { + RefreshVdevState(); /* * If this vdev is DEGRADED or FAULTED, try to activate a * hotspare. Otherwise, ignore the event */ if (VdevState() == VDEV_STATE_FAULTED || VdevState() == VDEV_STATE_DEGRADED) - consumed = ActivateSpare(); - else - consumed = true; + (void) ActivateSpare(); + consumed = true; } else if (event.Value("class") == "ereport.fs.zfs.io" || event.Value("class") == "ereport.fs.zfs.checksum") { @@ -513,10 +548,31 @@ CaseFile::CloseIfSolved() * retain these cases so that any spares added in * the future can be applied to them. */ - if (VdevState() > VDEV_STATE_CANT_OPEN - && VdevState() <= VDEV_STATE_HEALTHY) { + switch (VdevState()) { + case VDEV_STATE_HEALTHY: + /* No need to keep cases for healthy vdevs */ Close(); return (true); + case VDEV_STATE_REMOVED: + case VDEV_STATE_CANT_OPEN: + /* + * Keep open. We may solve it with a newly inserted + * device. + */ + case VDEV_STATE_FAULTED: + case VDEV_STATE_DEGRADED: + /* + * Keep open. We may solve it with the future + * addition of a spare to the pool + */ + case VDEV_STATE_UNKNOWN: + case VDEV_STATE_CLOSED: + case VDEV_STATE_OFFLINE: + /* + * Keep open? This may not be the correct behavior, + * but it's what we've always done + */ + ; } /* Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.h Mon Oct 14 21:53:45 2013 (r256464) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.h Mon Oct 14 21:59:31 2013 (r256465) @@ -109,6 +109,14 @@ public: static CaseFile *Find(const string &physPath); /** + * \brief ReEvaluate all open cases whose pool guid matches the argument + * + * \param poolGUID Only reevaluate cases for this pool + * \param event Try to consume this event with the casefile + */ + static void ReEvaluateByGuid(Guid poolGUID, const ZfsEvent &event); + + /** * \brief Create or return an existing active CaseFile for the * specified vdev. * @@ -163,12 +171,13 @@ public: /** * \brief Update this CaseFile in light of the provided ZfsEvent. + * Must be virtual so it can be overridden in the unit tests * * \param event The ZfsEvent to evaluate. * * \return True if this event was consumed by this CaseFile. */ - bool ReEvaluate(const ZfsEvent &event); + virtual bool ReEvaluate(const ZfsEvent &event); /** * \brief Register an itimer callout for the given event, if necessary Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Mon Oct 14 21:53:45 2013 (r256464) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Mon Oct 14 21:59:31 2013 (r256465) @@ -248,9 +248,10 @@ DevCtlEvent::~DevCtlEvent() delete &m_nvPairs; } -void +bool DevCtlEvent::Process() const { + return (false); } timeval @@ -516,7 +517,7 @@ DevfsEvent::DeepCopy() const return (new DevfsEvent(*this)); } -void +bool DevfsEvent::Process() const { /* @@ -527,7 +528,7 @@ DevfsEvent::Process() const if (Value("type") != "CREATE" || Value("subsystem") != "CDEV" || !IsDiskDev(devName)) - return; + return (false); /* Log the event since it is of interest. */ Log(LOG_INFO); @@ -535,7 +536,7 @@ DevfsEvent::Process() const string devPath(_PATH_DEV + devName); int devFd(open(devPath.c_str(), O_RDONLY)); if (devFd == -1) - return; + return (false); /* Normalize the device name in case the DEVFS event is for a link. */ devName = fdevname(devFd); @@ -572,6 +573,7 @@ DevfsEvent::Process() const } if (devLabel != NULL) nvlist_free(devLabel); + return (false); } //- DevfsEvent Protected Methods ----------------------------------------------- @@ -602,7 +604,7 @@ ZfsEvent::DeepCopy() const return (new ZfsEvent(*this)); } -void +bool ZfsEvent::Process() const { string logstr(""); @@ -610,31 +612,33 @@ ZfsEvent::Process() const if (!Contains("class") && !Contains("type")) { syslog(LOG_ERR, "ZfsEvent::Process: Missing class or type data."); - return; + return (false); } /* On config syncs, replay any queued events first. */ - if (Value("type").find("misc.fs.zfs.config_sync") == 0) + if (Value("type").find("misc.fs.zfs.config_sync") == 0) { ZfsDaemon::ReplayUnconsumedEvents(); + CaseFile::ReEvaluateByGuid(PoolGUID(), *this); + } Log(LOG_INFO); if (Value("type").find("misc.fs.zfs.") == 0) { /* Configuration changes, resilver events, etc. */ ProcessPoolEvent(); - return; + return (false); } if (!Contains("pool_guid") || !Contains("vdev_guid")) { /* Only currently interested in Vdev related events. */ - return; + return (false); } CaseFile *caseFile(CaseFile::Find(PoolGUID(), VdevGUID())); if (caseFile != NULL) { syslog(LOG_INFO, "Evaluating existing case file\n"); caseFile->ReEvaluate(*this); - return; + return (false); } /* Skip events that can't be handled. */ @@ -645,7 +649,7 @@ ZfsEvent::Process() const msg << "No replicas available for pool " << poolGUID; msg << ", ignoring"; syslog(LOG_INFO, "%s", msg.str().c_str()); - return; + return (false); } /* @@ -655,40 +659,38 @@ ZfsEvent::Process() const ZpoolList zpl(ZpoolList::ZpoolByGUID, &poolGUID); if (zpl.empty()) { stringstream msg; - bool queued = ZfsDaemon::SaveEvent(*this); - int priority = queued ? LOG_INFO : LOG_ERR; + int priority = LOG_INFO; msg << "ZfsEvent::Process: Event for unknown pool "; msg << poolGUID << " "; - msg << (queued ? "queued" : "dropped"); + msg << "queued"; syslog(priority, "%s", msg.str().c_str()); - return; + return (true); } nvlist_t *vdevConfig = VdevIterator(zpl.front()).Find(VdevGUID()); if (vdevConfig == NULL) { stringstream msg; - bool queued = ZfsDaemon::SaveEvent(*this); - int priority = queued ? LOG_INFO : LOG_ERR; + int priority = LOG_INFO; msg << "ZfsEvent::Process: Event for unknown vdev "; msg << VdevGUID() << " "; - msg << (queued ? "queued" : "dropped"); + msg << "queued"; syslog(priority, "%s", msg.str().c_str()); - return; + return (true); } Vdev vdev(zpl.front(), vdevConfig); caseFile = &CaseFile::Create(vdev); if ( caseFile->ReEvaluate(*this) == false) { stringstream msg; - bool queued = ZfsDaemon::SaveEvent(*this); - int priority = queued ? LOG_INFO : LOG_ERR; + int priority = LOG_INFO; msg << "ZfsEvent::Process: Unconsumed event for vdev("; msg << zpool_get_name(zpl.front()) << ","; msg << vdev.GUID() << ") "; - msg << (queued ? "queued" : "dropped"); + msg << "queued"; syslog(priority, "%s", msg.str().c_str()); - return; + return (true); } + return (false); } //- ZfsEvent Protected Methods ------------------------------------------------- Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Mon Oct 14 21:53:45 2013 (r256464) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Mon Oct 14 21:59:31 2013 (r256465) @@ -283,8 +283,9 @@ public: /** * Interpret and perform any actions necessary to * consume the event. + * \return True if this event should be queued for later reevaluation */ - virtual void Process() const; + virtual bool Process() const; /** * Get the time that the event was created @@ -405,8 +406,9 @@ public: /** * Interpret and perform any actions necessary to * consume the event. + * \return True if this event should be queued for later reevaluation */ - virtual void Process() const; + virtual bool Process() const; protected: /** @@ -479,8 +481,9 @@ public: /** * Interpret and perform any actions necessary to * consume the event. + * \return True if this event should be queued for later reevaluation */ - virtual void Process() const; + virtual bool Process() const; const string &PoolName() const; Guid PoolGUID() const; Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 21:53:45 2013 (r256464) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 21:59:31 2013 (r256465) @@ -468,6 +468,12 @@ ZfsDaemon::ReplayUnconsumedEvents() if (replayed_any) syslog(LOG_INFO, "Started replaying unconsumed events"); while (event != s_unconsumedEvents.end()) { + /* + * Even if the event is unconsumed the second time around, drop + * it. By now we should've gotten a config_sync so any events + * that still can't be consumed are probably referring to vdevs + * or pools that no longer exist. + */ (*event)->Process(); delete *event; s_unconsumedEvents.erase(event++); @@ -494,7 +500,8 @@ ZfsDaemon::ProcessEvents(EventBuffer &ev while (eventBuffer.ExtractEvent(evString)) { DevCtlEvent *event(DevCtlEvent::CreateEvent(evString)); if (event != NULL) { - event->Process(); + if (event->Process()) + SaveEvent(*event); delete event; } } @@ -597,7 +604,8 @@ ZfsDaemon::RescanSystem() string evString(evStart + pp->lg_name + "\n"); event = DevCtlEvent::CreateEvent(evString); if (event != NULL) - event->Process(); + if (event->Process()) + SaveEvent(*event); delete event; } } @@ -639,8 +647,12 @@ ZfsDaemon::EventLoop() int result; if (s_logCaseFiles == true) { + DevCtlEventList::iterator + event(s_unconsumedEvents.begin()); s_logCaseFiles = false; CaseFile::LogAll(); + while (event != s_unconsumedEvents.end()) + (*event++)->Log(LOG_INFO); } Callout::ExpireCallouts(); From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 22:01:34 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C24ACB63; Mon, 14 Oct 2013 22:01:34 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AF9332B37; Mon, 14 Oct 2013 22:01:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EM1YR7087421; Mon, 14 Oct 2013 22:01:34 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EM1Y1c087420; Mon, 14 Oct 2013 22:01:34 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142201.r9EM1Y1c087420@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 22:01:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256466 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 22:01:34 -0000 Author: asomers Date: Mon Oct 14 22:01:34 2013 New Revision: 256466 URL: http://svnweb.freebsd.org/changeset/base/256466 Log: cddl/sbin/zfsd/case_file.cc Log message correction: replacements are not necessarily by physical path. Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 21:59:31 2013 (r256465) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 22:01:34 2013 (r256466) @@ -952,7 +952,7 @@ CaseFile::Replace(const char* vdev_type, if (nvlist_alloc(&nvroot, NV_UNIQUE_NAME, 0) != 0 || nvlist_alloc(&newvd, NV_UNIQUE_NAME, 0) != 0) { - syslog(LOG_ERR, "Replace vdev(%s/%s) by physical path: " + syslog(LOG_ERR, "Replace vdev(%s/%s): " "Unable to allocate configuration data.\n", poolname, VdevGUIDString().c_str()); if (nvroot != NULL) @@ -964,7 +964,7 @@ CaseFile::Replace(const char* vdev_type, || nvlist_add_string(nvroot, ZPOOL_CONFIG_TYPE, VDEV_TYPE_ROOT) != 0 || nvlist_add_nvlist_array(nvroot, ZPOOL_CONFIG_CHILDREN, &newvd, 1) != 0) { - syslog(LOG_ERR, "Replace vdev(%s/%s) by physical path: " + syslog(LOG_ERR, "Replace vdev(%s/%s): " "Unable to initialize configuration data.\n", poolname, VdevGUIDString().c_str()); nvlist_free(newvd); @@ -978,7 +978,7 @@ CaseFile::Replace(const char* vdev_type, if (zpool_vdev_attach(zhp, VdevGUIDString().c_str(), path, nvroot, /*replace*/B_TRUE) != 0) { syslog(LOG_ERR, - "Replace vdev(%s/%s) by physical path(attach): %s: %s\n", + "Replace vdev(%s/%s): %s: %s\n", poolname, VdevGUIDString().c_str(), libzfs_error_action(g_zfsHandle), libzfs_error_description(g_zfsHandle)); From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 22:58:50 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C752E661; Mon, 14 Oct 2013 22:58:50 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B31AA2E19; Mon, 14 Oct 2013 22:58:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EMwobZ015397; Mon, 14 Oct 2013 22:58:50 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EMwmYP015385; Mon, 14 Oct 2013 22:58:48 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142258.r9EMwmYP015385@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 22:58:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256469 - in projects/zfsd/head: cddl/sbin/zfsd etc/mtree lib lib/libdevctl share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 22:58:50 -0000 Author: asomers Date: Mon Oct 14 22:58:48 2013 New Revision: 256469 URL: http://svnweb.freebsd.org/changeset/base/256469 Log: Extract devctl event processing support out of zfsd and into a new library: libdevctl. etc/mtree/BSD.include.dist: Add the /usr/include/devctl directory to the base system. lib/Makefile: lib/libdevctl/Makefile: Build support for the new library. lib/libdevctl/consumer.cc: lib/libdevctl/consumer.h: cddl/sbin/zfsd/zfsd.cc: cddl/sbin/zfsd/zfsd.h: New class, DevCtl::Consumer, from functionality extracted from ZfsDaemon, which can connect to devd, parse an event stream, and invoke event handlers. lib/libdevctl/event.cc: lib/libdevctl/event.h: cddl/sbin/zfsd/dev_ctl_event.cc: cddl/sbin/zfsd/dev_ctl_event.h: Strip Zfsd specific event handling from Zfsd's event classes to create DevCtl::Event, DevCtl::DevfsEvent, and DevCtl::ZfsEvent. lib/libdevctl/event_buffer.cc: lib/libdevctl/event_buffer.h: cddl/sbin/zfsd/zfsd.cc: cddl/sbin/zfsd/zfsd.h: DevCtl::EventBuffer: buffer for incoming devctl stream used to parse/extract individual event strings. lib/libdevctl/event_factory.cc: lib/libdevctl/event_factory.h: cddl/sbin/zfsd/zfsd.cc: cddl/sbin/zfsd/zfsd.h: DevCtl::EventFactory: Method map for converting event strings to Devctl::Event objects. lib/libdevctl/exception.cc: lib/libdevctl/exception.h: cddl/sbin/zfsd/zfsd_exception.cc: cddl/sbin/zfsd/zfsd_exception.h: DevCtl::Exception and DevCtl::ParseException, the exceptions which are thrown by this library. lib/libdevctl/guid.cc: lib/libdevctl/guid.h: cddl/sbin/zfsd/guid.cc: cddl/sbin/zfsd/guid.h: DevCtl::Guid: Helper routines for dealing with 64bit GUIDs such as found in Zfs pools and vdevs. lib/libdevctl/reader.cc: lib/libdevctl/reader.h: cddl/sbin/zfsd/zfsd.cc: cddl/sbin/zfsd/zfsd.h: DevCtl::Reader class hierarchy. Used to direct a Consumer to an event stream (e.g. from devd or a local/saved file). cddl/sbin/zfsd/zfsd_event.cc: cddl/sbin/zfsd/zfsd_event.h: Zfsd specialization of DevCtl::Event types. cddl/sbin/zfsd/zfsd_exception.cc: cddl/sbin/zfsd/zfsd_exception.h: Zfsd specific exception types, now derived from DevCtl::Excpetion. cddl/sbin/zfsd/Makefile: cddl/sbin/zfsd/callout.cc: cddl/sbin/zfsd/callout.h: cddl/sbin/zfsd/case_file.cc: cddl/sbin/zfsd/case_file.h: cddl/sbin/zfsd/vdev.cc: cddl/sbin/zfsd/vdev.h: cddl/sbin/zfsd/vdev_iterator.cc: cddl/sbin/zfsd/vdev_iterator.h: cddl/sbin/zfsd/zfsd.cc: cddl/sbin/zfsd/zfsd.h: cddl/sbin/zfsd/zfsd_event.cc: cddl/sbin/zfsd/zfsd_event.h: cddl/sbin/zfsd/zfsd_exception.cc: cddl/sbin/zfsd/zfsd_exception.h: cddl/sbin/zfsd/zfsd_main.cc: cddl/sbin/zfsd/zpool_list.cc: cddl/sbin/zfsd/zpool_list.h: Miscelaneuous refactoring to support using libdevctl instead of local implementation. cddl/sbin/zfsd/Makefile: cddl/sbin/zfsd/Makefile.common: tools/regression/zfsd/Makefile: Export common build information for zfsd and its unit tests to a "Makefile.common". Submitted by: gibbs Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Added: projects/zfsd/head/cddl/sbin/zfsd/Makefile.common projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.h projects/zfsd/head/lib/libdevctl/ projects/zfsd/head/lib/libdevctl/Makefile projects/zfsd/head/lib/libdevctl/consumer.cc projects/zfsd/head/lib/libdevctl/consumer.h projects/zfsd/head/lib/libdevctl/event.cc projects/zfsd/head/lib/libdevctl/event.h projects/zfsd/head/lib/libdevctl/event_buffer.cc projects/zfsd/head/lib/libdevctl/event_buffer.h projects/zfsd/head/lib/libdevctl/event_factory.cc projects/zfsd/head/lib/libdevctl/event_factory.h projects/zfsd/head/lib/libdevctl/exception.cc projects/zfsd/head/lib/libdevctl/exception.h projects/zfsd/head/lib/libdevctl/guid.cc projects/zfsd/head/lib/libdevctl/guid.h projects/zfsd/head/lib/libdevctl/reader.cc projects/zfsd/head/lib/libdevctl/reader.h Deleted: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h projects/zfsd/head/cddl/sbin/zfsd/guid.cc projects/zfsd/head/cddl/sbin/zfsd/guid.h Modified: projects/zfsd/head/cddl/sbin/zfsd/Makefile projects/zfsd/head/cddl/sbin/zfsd/callout.cc projects/zfsd/head/cddl/sbin/zfsd/callout.h projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/case_file.h projects/zfsd/head/cddl/sbin/zfsd/vdev.cc projects/zfsd/head/cddl/sbin/zfsd/vdev.h projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.cc projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.h projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd.h projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.h projects/zfsd/head/cddl/sbin/zfsd/zfsd_main.cc projects/zfsd/head/cddl/sbin/zfsd/zpool_list.cc projects/zfsd/head/cddl/sbin/zfsd/zpool_list.h projects/zfsd/head/etc/mtree/BSD.include.dist projects/zfsd/head/lib/Makefile projects/zfsd/head/share/mk/bsd.libnames.mk Modified: projects/zfsd/head/cddl/sbin/zfsd/Makefile ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/Makefile Mon Oct 14 22:42:13 2013 (r256468) +++ projects/zfsd/head/cddl/sbin/zfsd/Makefile Mon Oct 14 22:58:48 2013 (r256469) @@ -1,44 +1,7 @@ # $FreeBSD$ -PROG_CXX= zfsd -SRCS= callout.cc \ - case_file.cc \ - dev_ctl_event.cc \ - guid.cc \ - vdev.cc \ - vdev_iterator.cc \ - zfsd.cc \ - zfsd_exception.cc \ - zpool_list.cc \ - zfsd_main.cc - -NO_MAN= YES - -WARNS?= 1 - -INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common -INCFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include -INCFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem -INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head -INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common -INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common -INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common -INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair -INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys +.include "Makefile.common" -CFLAGS= -Wall -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} - -DPADD= ${LIBZFS} ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \ - ${LIBNVPAIR} ${LIBUUTIL} -LDADD= -lzfs -lutil -lgeom -lbsdxml -lsbuf -lnvpair -luutil - -cscope: - find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \ - > ${.CURDIR}/cscope.files - cd ${.CURDIR} && cscope -buq ${INCFLAGS} +PROG_CXX= zfsd .include Added: projects/zfsd/head/cddl/sbin/zfsd/Makefile.common ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/cddl/sbin/zfsd/Makefile.common Mon Oct 14 22:58:48 2013 (r256469) @@ -0,0 +1,43 @@ +# $FreeBSD$ + +SRCS= callout.cc \ + case_file.cc \ + zfsd_event.cc \ + vdev.cc \ + vdev_iterator.cc \ + zfsd.cc \ + zfsd_exception.cc \ + zpool_list.cc \ + zfsd_main.cc + +NO_MAN= YES + +WARNS?= 3 + +# Ignore warnings about Solaris specific pragmas. +IGNORE_PRAGMA= YES + +INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common +INCFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include +INCFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem +INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head +INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common +INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common +INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common +INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair +INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs +INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common +INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs +INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys + +CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} + +DPADD= ${LIBDEVCTL} ${LIBZFS} ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \ + ${LIBNVPAIR} ${LIBUUTIL} +LDADD= -ldevctl -lzfs -lutil -lgeom -lbsdxml -lsbuf -lnvpair -luutil + +cscope: + find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \ + > ${.CURDIR}/cscope.files + cd ${.CURDIR} && cscope -buq ${INCFLAGS} Modified: projects/zfsd/head/cddl/sbin/zfsd/callout.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/callout.cc Mon Oct 14 22:42:13 2013 (r256468) +++ projects/zfsd/head/cddl/sbin/zfsd/callout.cc Mon Oct 14 22:58:48 2013 (r256469) @@ -37,10 +37,23 @@ * timer services built on top of the POSIX interval timer. */ +#include + #include #include +#include +#include +#include + +#include +#include +#include +#include +#include + #include "callout.h" +#include "vdev_iterator.h" #include "zfsd.h" #include "zfsd_exception.h" Modified: projects/zfsd/head/cddl/sbin/zfsd/callout.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/callout.h Mon Oct 14 22:42:13 2013 (r256468) +++ projects/zfsd/head/cddl/sbin/zfsd/callout.h Mon Oct 14 22:58:48 2013 (r256469) @@ -34,15 +34,17 @@ * \file callout.h * * \brief Interface for timer based callback services. + * + * Header requirements: + * + * #include + * + * #include */ #ifndef _CALLOUT_H_ #define _CALLOUT_H_ -#include - -#include - /** * \brief Type of the function callback from a Callout. */ Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 22:42:13 2013 (r256468) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 22:58:48 2013 (r256469) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2011 Spectra Logic Corporation + * Copyright (c) 2011, 2012, 2013 Spectra Logic Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,6 +38,11 @@ * across reboots. For now, this is just a log of soft errors which we * accumulate in order to mark a device as degraded. */ +#include +#include + +#include + #include #include #include @@ -46,12 +51,31 @@ #include #include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "callout.h" +#include "zfsd_event.h" #include "case_file.h" #include "vdev.h" +#include "vdev_iterator.h" #include "zfsd.h" #include "zfsd_exception.h" #include "zpool_list.h" +__FBSDID("$FreeBSD$"); + /*============================ Namespace Control =============================*/ using std::auto_ptr; using std::hex; @@ -60,26 +84,43 @@ using std::stringstream; using std::setfill; using std::setw; +using DevCtl::Event; +using DevCtl::EventBuffer; +using DevCtl::EventFactory; +using DevCtl::EventList; +using DevCtl::Guid; +using DevCtl::IstreamReader; +using DevCtl::ParseException; + /*-------------------------- File-scoped classes ----------------------------*/ /** * \brief Functor that operators on STL collections of CaseFiles + * * Selectively calls ReEvaluate on the casefile, based on its pool GUID. */ class CaseFileReEvaluator : public std::unary_function { public: - CaseFileReEvaluator(Guid guid, const ZfsEvent &event) : - m_poolGUID(guid), m_event(event) {}; - void operator() (CaseFile *casefile) { - if (m_poolGUID == casefile->PoolGUID()) - casefile->ReEvaluate(m_event); - } + CaseFileReEvaluator(Guid guid, const ZfsEvent &event); + + void operator() (CaseFile *casefile); + private: Guid m_poolGUID; - const ZfsEvent &m_event; + const ZfsEvent &m_event; }; +CaseFileReEvaluator::CaseFileReEvaluator(Guid guid, const ZfsEvent &event) + : m_poolGUID(guid), m_event(event) +{ +} +void +CaseFileReEvaluator::operator() (CaseFile *casefile) +{ + if (m_poolGUID == casefile->PoolGUID()) + casefile->ReEvaluate(m_event); +} /*--------------------------------- CaseFile ---------------------------------*/ //- CaseFile Static Data ------------------------------------------------------- @@ -88,7 +129,6 @@ const string CaseFile::s_caseFilePath = const timeval CaseFile::s_removeGracePeriod = { 60 /*sec*/, 0 /*usec*/}; //- CaseFile Static Public Methods --------------------------------------------- - CaseFile * CaseFile::Find(Guid poolGUID, Guid vdevGUID) { @@ -509,7 +549,7 @@ CaseFile::ActivateSpare() { } void -CaseFile::RegisterCallout(const DevCtlEvent &event) +CaseFile::RegisterCallout(const Event &event) { timeval now, countdown, elapsed, timestamp, zero, remaining; @@ -594,13 +634,13 @@ CaseFile::Log() zpool_state_to_name(VdevState(), VDEV_AUX_NONE)); if (m_tentativeEvents.size() != 0) { syslog(LOG_INFO, "\t=== Tentative Events ===\n"); - for (DevCtlEventList::iterator event(m_tentativeEvents.begin()); + for (EventList::iterator event(m_tentativeEvents.begin()); event != m_tentativeEvents.end(); event++) (*event)->Log(LOG_INFO); } if (m_events.size() != 0) { syslog(LOG_INFO, "\t=== Events ===\n"); - for (DevCtlEventList::iterator event(m_events.begin()); + for (EventList::iterator event(m_events.begin()); event != m_events.end(); event++) (*event)->Log(LOG_INFO); } @@ -738,7 +778,7 @@ CaseFile::~CaseFile() void CaseFile::PurgeEvents() { - for (DevCtlEventList::iterator event(m_events.begin()); + for (EventList::iterator event(m_events.begin()); event != m_events.end(); event++) delete *event; @@ -748,7 +788,7 @@ CaseFile::PurgeEvents() void CaseFile::PurgeTentativeEvents() { - for (DevCtlEventList::iterator event(m_tentativeEvents.begin()); + for (EventList::iterator event(m_tentativeEvents.begin()); event != m_tentativeEvents.end(); event++) delete *event; @@ -756,12 +796,12 @@ CaseFile::PurgeTentativeEvents() } void -CaseFile::SerializeEvList(const DevCtlEventList events, int fd, +CaseFile::SerializeEvList(const EventList events, int fd, const char* prefix) const { if (events.empty()) return; - for (DevCtlEventList::const_iterator curEvent = events.begin(); + for (EventList::const_iterator curEvent = events.begin(); curEvent != events.end(); curEvent++) { const string &eventString((*curEvent)->GetEventString()); @@ -816,7 +856,7 @@ CaseFile::DeSerialize(ifstream &caseStre * call ExtractEvent * continue */ - DevCtlEventList* destEvents; + EventList* destEvents; string tentFlag("tentative "); string line; std::stringbuf lineBuf; @@ -832,8 +872,9 @@ CaseFile::DeSerialize(ifstream &caseStre } fakeDevdSocket << line; fakeDevdSocket << '\n'; + const EventFactory &factory(ZfsDaemon::Get().GetFactory()); while (eventBuffer.ExtractEvent(evString)) { - DevCtlEvent *event(DevCtlEvent::CreateEvent(evString)); + Event *event(Event::CreateEvent(factory, evString)); if (event != NULL) { destEvents->push_back(event); RegisterCallout(*event); @@ -993,23 +1034,29 @@ CaseFile::Replace(const char* vdev_type, } /* Does the argument event refer to a checksum error? */ -static bool IsChecksumEvent(const DevCtlEvent* const event){ +static bool +IsChecksumEvent(const Event* const event) +{ return ("ereport.fs.zfs.checksum" == event->Value("type")); } /* Does the argument event refer to an IO error? */ -static bool IsIOEvent(const DevCtlEvent* const event){ +static bool +IsIOEvent(const Event* const event) +{ return ("ereport.fs.zfs.io" == event->Value("type")); } bool -CaseFile::ShouldDegrade() const { +CaseFile::ShouldDegrade() const +{ return (std::count_if(m_events.begin(), m_events.end(), IsChecksumEvent) > ZFS_DEGRADE_IO_COUNT); } bool -CaseFile::ShouldFault() const { +CaseFile::ShouldFault() const +{ return (std::count_if(m_events.begin(), m_events.end(), IsIOEvent) > ZFS_DEGRADE_IO_COUNT); } Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.h Mon Oct 14 22:42:13 2013 (r256468) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.h Mon Oct 14 22:58:48 2013 (r256469) @@ -37,18 +37,17 @@ * * CaseFile objects aggregate vdev faults that may require ZFSD action * in order to maintain the health of a ZFS pool. + * + * Header requirements: + * + * #include + * + * #include "callout.h" + * #include "zfsd_event.h" */ #ifndef _CASE_FILE_H_ #define _CASE_FILE_H_ -#include -#include - -#include - -#include "callout.h" -#include "dev_ctl_event.h" - /*=========================== Forward Declarations ===========================*/ class CaseFile; class Vdev; @@ -95,7 +94,7 @@ public: * \return If found, a pointer to a valid CaseFile object. * Otherwise NULL. */ - static CaseFile *Find(Guid poolGUID, Guid vdevGUID); + static CaseFile *Find(DevCtl::Guid poolGUID, DevCtl::Guid vdevGUID); /** * \brief Find a CaseFile object by a vdev's current/last known @@ -114,7 +113,8 @@ public: * \param poolGUID Only reevaluate cases for this pool * \param event Try to consume this event with the casefile */ - static void ReEvaluateByGuid(Guid poolGUID, const ZfsEvent &event); + static void ReEvaluateByGuid(DevCtl::Guid poolGUID, + const ZfsEvent &event); /** * \brief Create or return an existing active CaseFile for the @@ -145,8 +145,8 @@ public: */ static void PurgeAll(); - Guid PoolGUID() const; - Guid VdevGUID() const; + DevCtl::Guid PoolGUID() const; + DevCtl::Guid VdevGUID() const; vdev_state VdevState() const; const string &PoolGUIDString() const; const string &VdevGUIDString() const; @@ -171,6 +171,7 @@ public: /** * \brief Update this CaseFile in light of the provided ZfsEvent. + * * Must be virtual so it can be overridden in the unit tests * * \param event The ZfsEvent to evaluate. @@ -182,7 +183,7 @@ public: /** * \brief Register an itimer callout for the given event, if necessary */ - virtual void RegisterCallout(const DevCtlEvent &event); + virtual void RegisterCallout(const DevCtl::Event &event); /** * \brief Close a case if it is no longer relevant. @@ -289,7 +290,7 @@ protected: * \param prefix If not NULL, this prefix will be prepended to * every event in the file. */ - void SerializeEvList(const DevCtlEventList events, int fd, + void SerializeEvList(const DevCtl::EventList events, int fd, const char* prefix=NULL) const; /** @@ -327,7 +328,6 @@ protected: * \param path The file system path to the new vdev * * \return true iff the replacement was successful - * */ bool Replace(const char* vdev_type, const char* path); @@ -351,35 +351,35 @@ protected: * \brief A list of soft error events counted against the health of * a vdev. */ - DevCtlEventList m_events; + DevCtl::EventList m_events; /** * \brief A list of soft error events waiting for a grace period * expiration before being counted against the health of * a vdev. */ - DevCtlEventList m_tentativeEvents; + DevCtl::EventList m_tentativeEvents; - Guid m_poolGUID; - Guid m_vdevGUID; - vdev_state m_vdevState; - string m_poolGUIDString; - string m_vdevGUIDString; - string m_vdevPhysPath; + DevCtl::Guid m_poolGUID; + DevCtl::Guid m_vdevGUID; + vdev_state m_vdevState; + string m_poolGUIDString; + string m_vdevGUIDString; + string m_vdevPhysPath; /** * \brief Callout activated when a grace period */ - Callout m_tentativeTimer; + Callout m_tentativeTimer; }; -inline Guid +inline DevCtl::Guid CaseFile::PoolGUID() const { return (m_poolGUID); } -inline Guid +inline DevCtl::Guid CaseFile::VdevGUID() const { return (m_vdevGUID); Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Mon Oct 14 22:42:13 2013 (r256468) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Mon Oct 14 22:58:48 2013 (r256469) @@ -38,15 +38,30 @@ * Implementation of the Vdev class. */ #include +#include +#include + +#include +#include +#include #include +#include +#include +#include +#include +#include +#include + #include "vdev.h" +#include "vdev_iterator.h" #include "zfsd.h" #include "zfsd_exception.h" __FBSDID("$FreeBSD$"); /*============================ Namespace Control =============================*/ +using std::string; using std::stringstream; /*=========================== Class Implementations ==========================*/ Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev.h Mon Oct 14 22:42:13 2013 (r256468) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev.h Mon Oct 14 22:58:48 2013 (r256469) @@ -36,18 +36,25 @@ * \file vdev.h * * Definition of the Vdev class. + * + * Header requirements: + * + * #include + * + * #include */ #ifndef _VDEV_H_ #define _VDEV_H_ -#include -#include - -#include -#include +/*=========================== Forward Declarations ===========================*/ +struct zpool_handle; +typedef struct zpool_handle zpool_handle_t; -#include "guid.h" +struct nvlist; +typedef struct nvlist nvlist_t; +/*============================= Class Definitions ============================*/ +/*----------------------------------- Vdev -----------------------------------*/ /** * \brief Wrapper class for a vdev's name/value configuration list * simplifying access to commonly used vdev attributes. @@ -96,30 +103,30 @@ public: */ Vdev(nvlist_t *vdevConfig); - virtual Guid GUID() const; - virtual Guid PoolGUID() const; - virtual vdev_state State() const; - std::string Path() const; - virtual std::string PhysicalPath() const; - std::string GUIDString() const; - nvlist_t *PoolConfig() const; - nvlist_t *Config() const; + virtual DevCtl::Guid GUID() const; + virtual DevCtl::Guid PoolGUID() const; + virtual vdev_state State() const; + std::string Path() const; + virtual std::string PhysicalPath() const; + std::string GUIDString() const; + nvlist_t *PoolConfig() const; + nvlist_t *Config() const; private: - Guid m_poolGUID; - Guid m_vdevGUID; - nvlist_t *m_poolConfig; - nvlist_t *m_config; + DevCtl::Guid m_poolGUID; + DevCtl::Guid m_vdevGUID; + nvlist_t *m_poolConfig; + nvlist_t *m_config; }; //- Vdev Inline Public Methods ------------------------------------------------ -inline Guid +inline DevCtl::Guid Vdev::PoolGUID() const { return (m_poolGUID); } -inline Guid +inline DevCtl::Guid Vdev::GUID() const { return (m_vdevGUID); Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.cc Mon Oct 14 22:42:13 2013 (r256468) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.cc Mon Oct 14 22:58:48 2013 (r256469) @@ -35,17 +35,27 @@ * * Implementation of the VdevIterator class. */ +#include +#include + #include #include -#include #include +#include +#include + +#include +#include + #include "vdev.h" #include "vdev_iterator.h" -#include "zfsd.h" #include "zfsd_exception.h" +/*============================ Namespace Control =============================*/ +using DevCtl::Guid; + /*=========================== Class Implementations ==========================*/ /*------------------------------- VdevIterator -------------------------------*/ VdevIterator::VdevIterator(zpool_handle_t *pool) Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.h Mon Oct 14 22:42:13 2013 (r256468) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.h Mon Oct 14 22:58:48 2013 (r256469) @@ -34,16 +34,21 @@ * \file vdev_iterator.h * * VdevIterator class definition. + * + * Header requirements: + * + * #include */ #ifndef _VDEV_ITERATOR_H_ #define _VDEV_ITERATOR_H_ -#include +/*=========================== Forward Declarations ===========================*/ +struct zpool_handle; +typedef struct zpool_handle zpool_handle_t; -#include -#include +struct nvlist; +typedef struct nvlist nvlist_t; -/*=========================== Forward Declarations ===========================*/ class Vdev; /*============================= Class Definitions ============================*/ @@ -97,7 +102,7 @@ public: * Upon return, the VdevIterator's cursor points to the vdev just * past the returned vdev or end() if no matching vdev is found. */ - nvlist_t *Find(Guid vdevGUID); + nvlist_t *Find(DevCtl::Guid vdevGUID); /** * \brief Perform the specified operation on each leaf member of Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 22:42:13 2013 (r256468) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 22:58:48 2013 (r256469) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2011 Spectra Logic Corporation + * Copyright (c) 2011, 2012, 2013 Spectra Logic Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,242 +42,77 @@ */ #include -#include -#include #include -#include -#include -#include -#include - -#include -#include -#include +#include + #include -#include -#include -#include +#include #include -#include -#include +#include #include -#include #include -#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include #include "callout.h" +#include "zfsd_event.h" +#include "case_file.h" #include "vdev.h" +#include "vdev_iterator.h" #include "zfsd.h" #include "zfsd_exception.h" #include "zpool_list.h" __FBSDID("$FreeBSD$"); +/*================================== Macros ==================================*/ +#define NUM_ELEMENTS(x) (sizeof(x) / sizeof(*x)) + /*============================ Namespace Control =============================*/ -using std::string; -using std::stringstream; -using std::cerr; -using std::cout; -using std::endl; +using DevCtl::Event; +using DevCtl::EventBuffer; +using DevCtl::EventFactory; +using DevCtl::EventList; +using DevCtl::Guid; +using DevCtl::NVPairMap; /*================================ Global Data ===============================*/ -const char g_devdSock[] = "/var/run/devd.pipe"; int g_debug = 0; libzfs_handle_t *g_zfsHandle; -/*-------------------------------- FDReader -------------------------------*/ -//- FDReader Public Methods ---------------------------------------------------- -size_t -FDReader::in_avail() const -{ - int bytes; - if (ioctl(m_fd, FIONREAD, &bytes)) { - syslog(LOG_ERR, "ioctl FIONREAD: %s", strerror(errno)); - return (0); - } - return (bytes); -} - - -/*-------------------------------- IstreamReader ---------------------------*/ -//- IstreamReader Public Methods ---------------------------------------------- -ssize_t -IstreamReader::read(char* buf, size_t count) -{ - m_stream->read(buf, count); - if (m_stream->fail()) - return (-1); - return (m_stream->gcount()); -} - - -/*-------------------------------- EventBuffer -------------------------------*/ -//- EventBuffer Static Data ---------------------------------------------------- -/** - * NOTIFY, NOMATCH, ATTACH, DETACH. See DevCtlEvent::Type. - */ -const char EventBuffer::s_eventStartTokens[] = "!?+-"; - -/** - * Events are terminated by a newline. - */ -const char EventBuffer::s_eventEndTokens[] = "\n"; - -/** - * Key=Value pairs are terminated by whitespace. - */ -const char EventBuffer::s_keyPairSepTokens[] = " \t\n"; - -//- EventBuffer Public Methods ------------------------------------------------- -EventBuffer::EventBuffer(Reader& reader) - : m_reader(reader), - m_validLen(0), - m_parsedLen(0), - m_nextEventOffset(0), - m_synchronized(true) -{ -} - -bool -EventBuffer::ExtractEvent(string &eventString) -{ - stringstream tsField; - timeval now; - - gettimeofday(&now, NULL); - tsField << " timestamp=" << now.tv_sec; - - while (UnParsed() > 0 || Fill()) { - - /* - * If the valid data in the buffer isn't enough to hold - * a full event, try reading more. - */ - if (NextEventMaxLen() < MIN_EVENT_SIZE) { - m_parsedLen += UnParsed(); - continue; - } - - char *nextEvent(m_buf + m_nextEventOffset); - bool truncated(true); - size_t eventLen(strcspn(nextEvent, s_eventEndTokens)); - - if (!m_synchronized) { - /* Discard data until an end token is read. */ - if (nextEvent[eventLen] != '\0') - m_synchronized = true; - m_nextEventOffset += eventLen; - m_parsedLen = m_nextEventOffset; - continue; - } else if (nextEvent[eventLen] == '\0') { - - m_parsedLen += eventLen; - if (m_parsedLen < MAX_EVENT_SIZE) { - /* - * Ran out of buffer before hitting - * a full event. Fill() and try again. - */ - continue; - } - syslog(LOG_WARNING, "Overran event buffer\n\tm_nextEventOffset" - "=%zd\n\tm_parsedLen=%zd\n\tm_validLen=%zd", - m_nextEventOffset, m_parsedLen, m_validLen); - } else { - /* - * Include the normal terminator in the extracted - * event data. - */ - eventLen += 1; - truncated = false; - } - - m_nextEventOffset += eventLen; - m_parsedLen = m_nextEventOffset; - eventString.assign(nextEvent, eventLen); - - if (truncated) { - size_t fieldEnd; - - /* Break cleanly at the end of a key<=>value pair. */ - fieldEnd = eventString.find_last_of(s_keyPairSepTokens); - if (fieldEnd != string::npos) - eventString.erase(fieldEnd); - eventString += '\n'; - - m_synchronized = false; - syslog(LOG_WARNING, - "Truncated %zd characters from event.", - eventLen - fieldEnd); - } - - /* - * Add a timestamp as the final field of the event if it is - * not already present. - */ - if (eventString.find("timestamp=") == string::npos) { - size_t eventEnd(eventString.find_last_not_of('\n') + 1); - - eventString.insert(eventEnd, tsField.str()); - } - - return (true); - } - return (false); -} - -//- EventBuffer Private Methods ------------------------------------------------ -bool -EventBuffer::Fill() -{ - size_t avail; - ssize_t consumed(0); - - /* Compact the buffer. */ - if (m_nextEventOffset != 0) { - memmove(m_buf, m_buf + m_nextEventOffset, - m_validLen - m_nextEventOffset); - m_validLen -= m_nextEventOffset; - m_parsedLen -= m_nextEventOffset; - m_nextEventOffset = 0; - } - - /* Fill any empty space. */ - avail = m_reader.in_avail(); - if (avail) { - size_t want; - - want = std::min(avail, MAX_READ_SIZE - m_validLen); - consumed = m_reader.read(m_buf + m_validLen, want); - if (consumed == -1) { - if (errno == EINTR) - return (false); - else - err(1, "EventBuffer::Fill(): Read failed"); - } - } - - m_validLen += consumed; - /* Guarantee our buffer is always NUL terminated. */ - m_buf[m_validLen] = '\0'; - - return (consumed > 0); -} - /*--------------------------------- ZfsDaemon --------------------------------*/ //- ZfsDaemon Static Private Data ---------------------------------------------- -bool ZfsDaemon::s_logCaseFiles; -bool ZfsDaemon::s_terminateEventLoop; -char ZfsDaemon::s_pidFilePath[] = "/var/run/zfsd.pid"; -pidfh *ZfsDaemon::s_pidFH; -FDReader* ZfsDaemon::s_reader; -int ZfsDaemon::s_devdSockFD = -1; -int ZfsDaemon::s_signalPipeFD[2]; -bool ZfsDaemon::s_systemRescanRequested(false); -bool ZfsDaemon::s_consumingEvents(false); -DevCtlEventList ZfsDaemon::s_unconsumedEvents; +ZfsDaemon *ZfsDaemon::s_theZfsDaemon; +bool ZfsDaemon::s_logCaseFiles; +bool ZfsDaemon::s_terminateEventLoop; +char ZfsDaemon::s_pidFilePath[] = "/var/run/zfsd.pid"; +pidfh *ZfsDaemon::s_pidFH; +int ZfsDaemon::s_signalPipeFD[2]; +bool ZfsDaemon::s_systemRescanRequested(false); +EventFactory::Record ZfsDaemon::s_registryEntries[] = +{ + { Event::NOTIFY, "DEVFS", &DevfsEvent::DevfsEventBuilder }, + { Event::NOTIFY, "ZFS", &ZfsEvent::ZfsEventBuilder } +}; //- ZfsDaemon Static Public Methods -------------------------------------------- +ZfsDaemon & +ZfsDaemon::Get() +{ + return (*s_theZfsDaemon); +} + void ZfsDaemon::WakeEventLoop() { @@ -294,36 +129,40 @@ ZfsDaemon::RequestSystemRescan() void ZfsDaemon::Run() { - Init(); + ZfsDaemon daemon; while (s_terminateEventLoop == false) { try { - DisconnectFromDevd(); + daemon.DisconnectFromDevd(); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 23:06:13 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 17183911; Mon, 14 Oct 2013 23:06:13 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 039862E7D; Mon, 14 Oct 2013 23:06:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EN6C8I020213; Mon, 14 Oct 2013 23:06:12 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EN6Cj7020212; Mon, 14 Oct 2013 23:06:12 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142306.r9EN6Cj7020212@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 23:06:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256471 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 23:06:13 -0000 Author: asomers Date: Mon Oct 14 23:06:12 2013 New Revision: 256471 URL: http://svnweb.freebsd.org/changeset/base/256471 Log: Fix a bug in zfsd: If you pull two drives on a raidz2 pool with at least two available hotspares, only one will be activated. cddl/sbin/zfsd/case_file.cc CaseFile::Replace should return false when zpool_vdev_attach fails. That way, the operation will be reattempted the next time that a config_sync event arrives. Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 23:02:05 2013 (r256470) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 23:06:12 2013 (r256471) @@ -972,6 +972,7 @@ CaseFile::Replace(const char* vdev_type, nvlist_t *nvroot, *newvd; zpool_handle_t *zhp; const char* poolname; + bool retval = true; /* Figure out what pool we're working on */ ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); @@ -1023,6 +1024,7 @@ CaseFile::Replace(const char* vdev_type, poolname, VdevGUIDString().c_str(), libzfs_error_action(g_zfsHandle), libzfs_error_description(g_zfsHandle)); + retval = false; } else { syslog(LOG_INFO, "Replacing vdev(%s/%s) with %s\n", poolname, VdevGUIDString().c_str(), @@ -1030,7 +1032,7 @@ CaseFile::Replace(const char* vdev_type, } nvlist_free(nvroot); - return (true); + return (retval); } /* Does the argument event refer to a checksum error? */ From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 23:13:04 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 44B23A5B; Mon, 14 Oct 2013 23:13:04 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 327C72EDB; Mon, 14 Oct 2013 23:13:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9END4Su024415; Mon, 14 Oct 2013 23:13:04 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9END4Eg024414; Mon, 14 Oct 2013 23:13:04 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142313.r9END4Eg024414@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 23:13:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256472 - projects/zfsd/head/lib/libdevctl X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 23:13:04 -0000 Author: asomers Date: Mon Oct 14 23:13:03 2013 New Revision: 256472 URL: http://svnweb.freebsd.org/changeset/base/256472 Log: Fix a few libdevctl bugs found by inspection lib/libdevctl/consumer.cc: In Consummer::ConnectToDevd(), invoke DisconnectFromDevd() if our connect fails so that the connection to DevD is recorded as closed. This avoids fooling future invocations of ConnectToDevd() into thinking the connection is already established. In Consumer::FlushEvents(), handle in_avail() returning -1, which indicates and error. In Consumer::EventsPending(), update exception string to reflect the conversion of this class from ZfsDaemon to Consumer when it was refactored out of zfsd. Submitted by: gibbs Approved by: ken (mentor) Obtained from: Spectra Logic Corporation Modified: projects/zfsd/head/lib/libdevctl/consumer.cc Modified: projects/zfsd/head/lib/libdevctl/consumer.cc ============================================================================== --- projects/zfsd/head/lib/libdevctl/consumer.cc Mon Oct 14 23:06:12 2013 (r256471) +++ projects/zfsd/head/lib/libdevctl/consumer.cc Mon Oct 14 23:13:03 2013 (r256472) @@ -117,6 +117,7 @@ Consumer::ConnectToDevd() sLen); if (result == -1) { syslog(LOG_INFO, "Unable to connect to devd"); + DisconnectFromDevd(); return (false); } @@ -212,7 +213,7 @@ Consumer::FlushEvents() { char discardBuf[256]; - while (m_reader->in_avail()) + while (m_reader->in_avail() > 0) m_reader->read(discardBuf, sizeof(discardBuf)); } @@ -233,7 +234,7 @@ Consumer::EventsPending() err(1, "Polling for devd events failed"); if ((fds->revents & POLLERR) != 0) - throw Exception("ZfsdDaemon:EventsPending(): " + throw Exception("Consumer::EventsPending(): " "POLLERR detected on devd socket."); if ((fds->revents & POLLHUP) != 0) From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 23:15:59 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 37936B58; Mon, 14 Oct 2013 23:15:59 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 25B452EF1; Mon, 14 Oct 2013 23:15:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ENFx4W025342; Mon, 14 Oct 2013 23:15:59 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ENFwXn025341; Mon, 14 Oct 2013 23:15:59 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142315.r9ENFwXn025341@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 23:15:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256473 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 23:15:59 -0000 Author: asomers Date: Mon Oct 14 23:15:58 2013 New Revision: 256473 URL: http://svnweb.freebsd.org/changeset/base/256473 Log: Modify Zfsd to honor shutdown signals even when started during a devctl event flood. cddl/sbin/zfsd/zfsd.cc: In ZfsDaemon::Run(), catch DevCtl::Exceptions instead of one of its derived classes ZfsdExceptions. libdevctl, which contains some of the methods we call in this context, only emits DevCtl::Exceptions, and we must catch these too. In ZfsDaemon::DetectMissedEvents(), monitor s_terminateEventLoop so we are guaranteed to exit our loop if a shutdown is requested. Submitted by: gibbs Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 23:13:03 2013 (r256472) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 23:15:58 2013 (r256473) @@ -145,7 +145,7 @@ ZfsDaemon::Run() daemon.EventLoop(); - } catch (const ZfsdException &exp) { + } catch (const DevCtl::Exception &exp) { exp.Log(); } } @@ -287,7 +287,7 @@ ZfsDaemon::DetectMissedEvents() * If the system state has changed durring our * interrogation, start over. */ - } while (EventsPending()); + } while (s_terminateEventLoop == false && EventsPending()); RescanSystem(); } From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 23:21:03 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8B43EC76; Mon, 14 Oct 2013 23:21:03 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 796B12F32; Mon, 14 Oct 2013 23:21:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ENL3VI028792; Mon, 14 Oct 2013 23:21:03 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ENL2lJ028787; Mon, 14 Oct 2013 23:21:02 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142321.r9ENL2lJ028787@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 23:21:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256474 - projects/zfsd/head/lib/libdevctl X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 23:21:03 -0000 Author: asomers Date: Mon Oct 14 23:21:02 2013 New Revision: 256474 URL: http://svnweb.freebsd.org/changeset/base/256474 Log: Fix registration of a default event builder for the Consumer class. lib/libdevctl/consumer.cc: In Consumer::ConnectToDevd(), improve syslog output. lib/libdevctl/event.cc: lib/libdevctl/event.h: Implement pure virtual method in the Event class so that it can be instantiated. Provide a generic EventBuilder method that builds generic Events. This is expected to be used by consumers of this library that just need key=>value data for all events received. lib/libdevctl/event_factory.cc: In EventFactory::Build, fix segmentation violation when a default event builder is registered and no more specific event builder is found in the factory's registry. Submitted by: gibbs Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/lib/libdevctl/consumer.cc projects/zfsd/head/lib/libdevctl/event.cc projects/zfsd/head/lib/libdevctl/event.h projects/zfsd/head/lib/libdevctl/event_factory.cc Modified: projects/zfsd/head/lib/libdevctl/consumer.cc ============================================================================== --- projects/zfsd/head/lib/libdevctl/consumer.cc Mon Oct 14 23:15:58 2013 (r256473) +++ projects/zfsd/head/lib/libdevctl/consumer.cc Mon Oct 14 23:21:02 2013 (r256474) @@ -98,11 +98,12 @@ Consumer::ConnectToDevd() int sLen; int result; - syslog(LOG_INFO, "Connecting to devd"); if (m_devdSockFD != -1) { /* Already connected. */ + syslog(LOG_INFO, "%s: Already connected.", __func__); return (true); } + syslog(LOG_INFO, "%s: Connecting to devd.", __func__); memset(&devdAddr, 0, sizeof(devdAddr)); devdAddr.sun_family= AF_UNIX; Modified: projects/zfsd/head/lib/libdevctl/event.cc ============================================================================== --- projects/zfsd/head/lib/libdevctl/event.cc Mon Oct 14 23:15:58 2013 (r256473) +++ projects/zfsd/head/lib/libdevctl/event.cc Mon Oct 14 23:21:02 2013 (r256474) @@ -85,6 +85,13 @@ Event::EventTypeRecord Event::s_typeTabl //- Event Static Public Methods ------------------------------------------------ Event * +Event::EventBuilder(Event::Type type, NVPairMap &nvPairs, + const string &eventString) +{ + return (new Event(type, nvPairs, eventString)); +} + +Event * Event::CreateEvent(const EventFactory &factory, const string &eventString) { NVPairMap &nvpairs(*new NVPairMap); @@ -186,6 +193,12 @@ Event::~Event() delete &m_nvPairs; } +Event * +Event::DeepCopy() const +{ + return (new Event(*this)); +} + bool Event::Process() const { Modified: projects/zfsd/head/lib/libdevctl/event.h ============================================================================== --- projects/zfsd/head/lib/libdevctl/event.h Mon Oct 14 23:15:58 2013 (r256473) +++ projects/zfsd/head/lib/libdevctl/event.h Mon Oct 14 23:21:02 2013 (r256474) @@ -94,6 +94,9 @@ public: */ typedef Event* (BuildMethod)(Type, NVPairMap &, const std::string &); + /** Generic Event object factory. */ + static BuildMethod EventBuilder; + static Event *CreateEvent(const EventFactory &factory, const std::string &eventString); @@ -168,7 +171,7 @@ public: * Create and return a fully independent clone * of this event. */ - virtual Event *DeepCopy() const = 0; + virtual Event *DeepCopy() const; /** Destructor */ virtual ~Event(); Modified: projects/zfsd/head/lib/libdevctl/event_factory.cc ============================================================================== --- projects/zfsd/head/lib/libdevctl/event_factory.cc Mon Oct 14 23:15:58 2013 (r256473) +++ projects/zfsd/head/lib/libdevctl/event_factory.cc Mon Oct 14 23:21:02 2013 (r256474) @@ -90,7 +90,7 @@ EventFactory::Build(Event::Type type, NV if (buildMethod == NULL) return (NULL); - return ((foundMethod->second)(type, nvpairs, eventString)); + return (buildMethod(type, nvpairs, eventString)); } } // namespace DevCtl From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 23:24:54 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BB022D8E; Mon, 14 Oct 2013 23:24:54 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A992C2F4D; Mon, 14 Oct 2013 23:24:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ENOs3K030177; Mon, 14 Oct 2013 23:24:54 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ENOsde030170; Mon, 14 Oct 2013 23:24:54 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142324.r9ENOsde030170@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 23:24:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256475 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 23:24:54 -0000 Author: asomers Date: Mon Oct 14 23:24:53 2013 New Revision: 256475 URL: http://svnweb.freebsd.org/changeset/base/256475 Log: Logging changes in zfsd sbin/zfsd/zfsd.cc Log when a system rescan event request is processed. This is primarily so it can be differentiated from other system rescan events. sbin/zfsd/zfsd_event.cc Stop emitting "Searching for CaseFile by Physical Path" log. It contributes nothing to the log and occurs very frequently. Submitted by: will Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 23:21:02 2013 (r256474) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 23:24:53 2013 (r256475) @@ -345,6 +345,7 @@ ZfsDaemon::EventLoop() if (s_systemRescanRequested == true) { s_systemRescanRequested = false; + syslog(LOG_INFO, "System Rescan request processed."); RescanSystem(); } Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc Mon Oct 14 23:21:02 2013 (r256474) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc Mon Oct 14 23:24:53 2013 (r256475) @@ -195,7 +195,6 @@ DevfsEvent::Process() const "as a replace by physical path candidate.\n", devName.c_str()); } else if (havePhysPath && IsWholeDev()) { - syslog(LOG_INFO, "Searching for CaseFile by Physical Path\n"); CaseFile *caseFile(CaseFile::Find(physPath)); if (caseFile != NULL) { syslog(LOG_INFO, From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 23:31:19 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9958BF0B; Mon, 14 Oct 2013 23:31:19 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 775632FB8; Mon, 14 Oct 2013 23:31:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ENVJHV034381; Mon, 14 Oct 2013 23:31:19 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ENVIVR034376; Mon, 14 Oct 2013 23:31:18 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142331.r9ENVIVR034376@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 23:31:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256476 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 23:31:19 -0000 Author: asomers Date: Mon Oct 14 23:31:18 2013 New Revision: 256476 URL: http://svnweb.freebsd.org/changeset/base/256476 Log: Improve zfsd's spare handling. Zfsd can now: - Spare broken spares, whether a case file is created for the original drive or for the previous spare. - Avoid sparing spares that are either resilvering or healthy. This enables failover of multiple devices in a pool. It also means that zfsd doesn't require more spares than are actually needed to make a pool whole again. cddl/sbin/zfsd/vdev.h: cddl/sbin/zfsd/vdev.cc: - Add NonexistentVdev, a singleton instance of Vdev that represents a vdev that doesn't exist. Supporting this are new methods: - Vdev::Vdev(), an empty copy constructor. - Vdev::DoesNotExist(), which returns true if the vdev doesn't exist. - Add vdev tree methods of use for purposes for which VdevIterator is not appropriate: - Vdev::Children(), which returns a list of the vdev's children. - Vdev::RootVdev(), which returns the root vdev of the vdev's pool. - Vdev::Parent(), which returns the vdev's parent. This works by traversing the tree until it finds a vdev whose children include the caller object. - Add several useful vdev instance methods: - Vdev::IsAvailableSpare(), which returns whether the vdev is an unassigned and usable spare. - Vdev::Name(), which returns the vdev's name; it can be made to return a "verbose" name too (e.g. "spare" vs. "spare-1"). - Vdev::IsSpare(), Vdev::IsActiveSpare(), and Vdev::IsResilvering(). - While I'm here, refactor Vdev::Vdev(*) so that common initialization code only exists in one place. cddl/sbin/zfsd/case_file.h: cddl/sbin/zfsd/case_file.cc: - Add CaseFile::BeingReplacedBy(), which returns the device replacing the current device, if one exists. Performing this requires finding the vdev's parent and checking the state of its children. - Change CaseFile::Replace() to allow the caller to specify whether the case's vdev is being replaced by a spare. This enables Replace() to detect the appropriate device to perform the actual replace on. - Add CaseFile::CaseVdev() to obtain a Vdev for the case file, and use it in several places that perform the operation. cddl/sbin/zfsd/case_file.cc: - Improve logging for case file evaluation so that the action chosen is always logged. - While I'm here, make zpool lookups consistent and always generate a zpool_handle_t * local to the function where it's needed. cddl/sbin/zfsd/vdev.h: cddl/sbin/zfsd/zfsd_exception.cc: - Add , now required because of Vdev::Children() in vdev.h. Submitted by: will Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/case_file.h projects/zfsd/head/cddl/sbin/zfsd/vdev.cc projects/zfsd/head/cddl/sbin/zfsd/vdev.h projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 23:24:53 2013 (r256475) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 23:31:18 2013 (r256476) @@ -233,27 +233,16 @@ bool CaseFile::RefreshVdevState() { ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); - if (zpl.empty()) { - stringstream msg; - msg << "CaseFile::RefreshVdevState: Unknown pool for Vdev("; - msg << m_poolGUID << "," << m_vdevGUID << ")."; - syslog(LOG_INFO, "%s", msg.str().c_str()); - return (false); - } + zpool_handle_t *casePool(zpl.empty() ? NULL : zpl.front()); + if (casePool == NULL) + return (false); - zpool_handle_t *casePool(zpl.front()); - nvlist_t *vdevConfig = VdevIterator(casePool).Find(VdevGUID()); - if (vdevConfig == NULL) { - stringstream msg; - syslog(LOG_INFO, - "CaseFile::RefreshVdevState: Unknown Vdev(%s,%s).\n", - PoolGUIDString().c_str(), PoolGUIDString().c_str()); + Vdev vd(casePool, CaseVdev(casePool)); + if (vd.DoesNotExist()) return (false); - } - Vdev caseVdev(casePool, vdevConfig); - m_vdevState = caseVdev.State(); - m_vdevPhysPath = caseVdev.PhysicalPath(); + m_vdevState = vd.State(); + m_vdevPhysPath = vd.PhysicalPath(); return (true); } @@ -261,8 +250,9 @@ bool CaseFile::ReEvaluate(const string &devPath, const string &physPath, Vdev *vdev) { ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); + zpool_handle_t *pool(zpl.empty() ? NULL : zpl.front()); - if (zpl.empty() || !RefreshVdevState()) { + if (pool == NULL || !RefreshVdevState()) { /* * The pool or vdev for this case file is no longer * part of the configuration. This can happen @@ -283,7 +273,6 @@ CaseFile::ReEvaluate(const string &devPa */ return (/*consumed*/false); } - zpool_handle_t *pool(zpl.front()); if (VdevState() > VDEV_STATE_CANT_OPEN) { /* @@ -292,6 +281,8 @@ CaseFile::ReEvaluate(const string &devPa * use a newly inserted spare to replace a degraded * or faulted device. */ + syslog(LOG_INFO, "CaseFile::ReEvaluate(%s,%s): Pool/Vdev ignored", + PoolGUIDString().c_str(), VdevGUIDString().c_str()); return (/*consumed*/false); } @@ -360,7 +351,10 @@ CaseFile::ReEvaluate(const string &devPa return (/*consumed*/false); } - return (Replace(VDEV_TYPE_DISK, devPath.c_str())); + syslog(LOG_INFO, "CaseFile::ReEvaluate(%s/%s): Replacing with %s", + PoolGUIDString().c_str(), VdevGUIDString().c_str(), + devPath.c_str()); + return (Replace(VDEV_TYPE_DISK, devPath.c_str(), /*isspare*/false)); } bool @@ -378,6 +372,7 @@ CaseFile::ReEvaluate(const ZfsEvent &eve return (/*consumed*/true); } else if (event.Value("type") == "misc.fs.zfs.config_sync") { + RefreshVdevState(); if (VdevState() < VDEV_STATE_HEALTHY) consumed = ActivateSpare(); } @@ -460,27 +455,22 @@ CaseFile::ReEvaluate(const ZfsEvent &eve } -/* - * TODO: ensure that we don't activate a spare for a vdev that is already being - * replaced by another spare. - */ bool CaseFile::ActivateSpare() { nvlist_t *config, *nvroot; nvlist_t **spares; - zpool_handle_t *zhp; char *devPath, *vdev_type; const char *poolname; u_int nspares, i; int error; ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); - if (zpl.empty()) { + zpool_handle_t *zhp(zpl.empty() ? NULL : zpl.front()); + if (zhp == NULL) { syslog(LOG_ERR, "CaseFile::ActivateSpare: Could not find pool " "for pool_guid %"PRIu64".", (uint64_t)m_poolGUID); return (false); } - zhp = zpl.front(); poolname = zpool_get_name(zhp); config = zpool_get_config(zhp, NULL); if (config == NULL) { @@ -545,7 +535,7 @@ CaseFile::ActivateSpare() { return (false); } - return (Replace(vdev_type, devPath)); + return (Replace(vdev_type, devPath, /*isspare*/true)); } void @@ -909,13 +899,15 @@ CaseFile::OnGracePeriodEnded() { bool should_fault, should_degrade; ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); + zpool_handle_t *zhp(zpl.empty() ? NULL : zpl.front()); + m_events.splice(m_events.begin(), m_tentativeEvents); should_fault = ShouldFault(); should_degrade = ShouldDegrade(); if (should_fault || should_degrade) { - if (zpl.empty() - || (VdevIterator(zpl.front()).Find(m_vdevGUID)) == NULL) { + if (zhp == NULL + || (VdevIterator(zhp).Find(m_vdevGUID)) == NULL) { /* * Either the pool no longer exists * or this vdev is no longer a member of @@ -930,7 +922,7 @@ CaseFile::OnGracePeriodEnded() /* A fault condition has priority over a degrade condition */ if (ShouldFault()) { /* Fault the vdev and close the case. */ - if (zpool_vdev_fault(zpl.front(), (uint64_t)m_vdevGUID, + if (zpool_vdev_fault(zhp, (uint64_t)m_vdevGUID, VDEV_AUX_ERR_EXCEEDED) == 0) { syslog(LOG_INFO, "Faulting vdev(%s/%s)", PoolGUIDString().c_str(), @@ -948,7 +940,7 @@ CaseFile::OnGracePeriodEnded() } else if (ShouldDegrade()) { /* Degrade the vdev and close the case. */ - if (zpool_vdev_degrade(zpl.front(), (uint64_t)m_vdevGUID, + if (zpool_vdev_degrade(zhp, (uint64_t)m_vdevGUID, VDEV_AUX_ERR_EXCEEDED) == 0) { syslog(LOG_INFO, "Degrading vdev(%s/%s)", PoolGUIDString().c_str(), @@ -967,22 +959,86 @@ CaseFile::OnGracePeriodEnded() Serialize(); } +Vdev +CaseFile::BeingReplacedBy(zpool_handle_t *zhp) { + Vdev vd(zhp, CaseVdev(zhp)); + std::list children; + std::list::iterator children_it; + + Vdev parent(vd.Parent()); + Vdev replacing(NonexistentVdev); + + /* + * To determine whether we are being replaced by another spare that + * is still working, then make sure that it is currently spared and + * that the spare is either resilvering or healthy. If any of these + * conditions fail, then we are not being replaced by a spare. + * + * If the spare is healthy, then the case file should be closed very + * soon after this check. + */ + if (parent.DoesNotExist() + || parent.Name(zhp, /*verbose*/false) != "spare") + return (NonexistentVdev); + + children = parent.Children(); + children_it = children.begin(); + for (;children_it != children.end(); children_it++) { + Vdev child = *children_it; + + /* Skip our vdev. */ + if (child.GUID() == VdevGUID()) + continue; + /* + * Accept the first child that doesn't match our GUID, or + * any resilvering/healthy device if one exists. + */ + if (replacing.DoesNotExist() || child.IsResilvering() + || child.State() == VDEV_STATE_HEALTHY) + replacing = child; + } + + return (replacing); +} + bool -CaseFile::Replace(const char* vdev_type, const char* path) { +CaseFile::Replace(const char* vdev_type, const char* path, bool isspare) { nvlist_t *nvroot, *newvd; - zpool_handle_t *zhp; - const char* poolname; + const char *poolname; + string oldstr(VdevGUIDString()); bool retval = true; /* Figure out what pool we're working on */ ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); - if (zpl.empty()) { + zpool_handle_t *zhp(zpl.empty() ? NULL : zpl.front()); + if (zhp == NULL) { syslog(LOG_ERR, "CaseFile::Replace: could not find pool for " "pool_guid %"PRIu64".", (uint64_t)m_poolGUID); return (false); } - zhp = zpl.front(); poolname = zpool_get_name(zhp); + Vdev vd(zhp, CaseVdev(zhp)); + Vdev replaced(BeingReplacedBy(zhp)); + + if (!vd.IsSpare() && !replaced.DoesNotExist()) { + /* If we are already being replaced by a working spare, pass. */ + if (replaced.IsResilvering() + || replaced.State() == VDEV_STATE_HEALTHY) { + syslog(LOG_INFO, "CaseFile::Replace(%s->%s): already " + "replaced", VdevGUIDString().c_str(), path); + return (/*consumed*/false); + } + /* + * If we have already been replaced by a spare, but that spare + * is broken, we must spare the spare, not the original device. + */ + if (isspare) { + oldstr = replaced.GUIDString(); + syslog(LOG_INFO, "CaseFile::Replace(%s->%s): sparing " + "broken spare %s instead", VdevGUIDString().c_str(), + path, oldstr.c_str()); + } + } /* * Build a root vdev/leaf vdev configuration suitable for @@ -994,9 +1050,8 @@ CaseFile::Replace(const char* vdev_type, if (nvlist_alloc(&nvroot, NV_UNIQUE_NAME, 0) != 0 || nvlist_alloc(&newvd, NV_UNIQUE_NAME, 0) != 0) { - syslog(LOG_ERR, "Replace vdev(%s/%s): " - "Unable to allocate configuration data.\n", - poolname, VdevGUIDString().c_str()); + syslog(LOG_ERR, "Replace vdev(%s/%s): Unable to allocate " + "configuration data.", poolname, oldstr.c_str()); if (nvroot != NULL) nvlist_free(nvroot); return (false); @@ -1006,9 +1061,8 @@ CaseFile::Replace(const char* vdev_type, || nvlist_add_string(nvroot, ZPOOL_CONFIG_TYPE, VDEV_TYPE_ROOT) != 0 || nvlist_add_nvlist_array(nvroot, ZPOOL_CONFIG_CHILDREN, &newvd, 1) != 0) { - syslog(LOG_ERR, "Replace vdev(%s/%s): " - "Unable to initialize configuration data.\n", - poolname, VdevGUIDString().c_str()); + syslog(LOG_ERR, "Replace vdev(%s/%s): Unable to initialize " + "configuration data.", poolname, oldstr.c_str()); nvlist_free(newvd); nvlist_free(nvroot); return (true); @@ -1017,19 +1071,15 @@ CaseFile::Replace(const char* vdev_type, /* Data was copied when added to the root vdev. */ nvlist_free(newvd); - if (zpool_vdev_attach(zhp, VdevGUIDString().c_str(), - path, nvroot, /*replace*/B_TRUE) != 0) { - syslog(LOG_ERR, - "Replace vdev(%s/%s): %s: %s\n", - poolname, VdevGUIDString().c_str(), - libzfs_error_action(g_zfsHandle), - libzfs_error_description(g_zfsHandle)); - retval = false; - } else { + retval = (zpool_vdev_attach(zhp, oldstr.c_str(), path, nvroot, + /*replace*/B_TRUE) == 0); + if (retval) syslog(LOG_INFO, "Replacing vdev(%s/%s) with %s\n", - poolname, VdevGUIDString().c_str(), - path); - } + poolname, oldstr.c_str(), path); + else + syslog(LOG_ERR, "Replace vdev(%s/%s): %s: %s\n", + poolname, oldstr.c_str(), libzfs_error_action(g_zfsHandle), + libzfs_error_description(g_zfsHandle)); nvlist_free(nvroot); return (retval); @@ -1062,3 +1112,9 @@ CaseFile::ShouldFault() const return (std::count_if(m_events.begin(), m_events.end(), IsIOEvent) > ZFS_DEGRADE_IO_COUNT); } + +nvlist_t * +CaseFile::CaseVdev(zpool_handle_t *zhp) const +{ + return (VdevIterator(zhp).Find(VdevGUID())); +} Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.h Mon Oct 14 23:24:53 2013 (r256475) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.h Mon Oct 14 23:31:18 2013 (r256476) @@ -326,10 +326,21 @@ protected: * \param vdev_type The type of the new vdev. Usually either * VDEV_TYPE_DISK or VDEV_TYPE_FILE * \param path The file system path to the new vdev + * \param isspare Whether the new vdev is a spare * * \return true iff the replacement was successful */ - bool Replace(const char* vdev_type, const char* path); + bool Replace(const char* vdev_type, const char* path, bool isspare); + + /** + * \brief Which vdev, if any, is replacing ours. + * + * \param zhp Pool handle state from the caller context + * + * \return the vdev that is currently replacing ours, + * or NonexistentVdev if there isn't one. + */ + Vdev BeingReplacedBy(zpool_handle_t *zhp); /** * \brief All CaseFiles being tracked by ZFSD. @@ -371,6 +382,9 @@ protected: * \brief Callout activated when a grace period */ Callout m_tentativeTimer; + +private: + nvlist_t *CaseVdev(zpool_handle_t *zhp) const; }; inline DevCtl::Guid Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Mon Oct 14 23:24:53 2013 (r256475) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Mon Oct 14 23:31:18 2013 (r256476) @@ -37,6 +37,7 @@ * * Implementation of the Vdev class. */ +#include #include #include @@ -58,68 +59,76 @@ #include "vdev_iterator.h" #include "zfsd.h" #include "zfsd_exception.h" +#include "zpool_list.h" __FBSDID("$FreeBSD$"); /*============================ Namespace Control =============================*/ using std::string; using std::stringstream; +//- Special objects ----------------------------------------------------------- +Vdev NonexistentVdev; + +//- Vdev Inline Public Methods ------------------------------------------------ /*=========================== Class Implementations ==========================*/ /*----------------------------------- Vdev -----------------------------------*/ -Vdev::Vdev(zpool_handle_t *pool, nvlist_t *config) - : m_poolConfig(zpool_get_config(pool, NULL)), - m_config(config) + +/* Special constructor for NonexistentVdev. */ +Vdev::Vdev() + : m_poolConfig(NULL), + m_config(NULL) +{} + +bool +Vdev::VdevLookupPoolGuid() { - uint64_t raw_guid; - if (nvlist_lookup_uint64(m_poolConfig, ZPOOL_CONFIG_POOL_GUID, - &raw_guid) != 0) - throw ZfsdException("Unable to extract pool GUID " - "from pool handle."); - m_poolGUID = raw_guid; + uint64_t guid; + if (nvlist_lookup_uint64(m_poolConfig, ZPOOL_CONFIG_POOL_GUID, &guid)) + return (false); + m_poolGUID = guid; + return (true); +} - if (nvlist_lookup_uint64(m_config, ZPOOL_CONFIG_GUID, &raw_guid) != 0) +void +Vdev::VdevLookupGuid() +{ + uint64_t guid; + if (nvlist_lookup_uint64(m_config, ZPOOL_CONFIG_GUID, &guid) != 0) throw ZfsdException("Unable to extract vdev GUID " "from vdev config data."); - m_vdevGUID = raw_guid; + m_vdevGUID = guid; +} + +Vdev::Vdev(zpool_handle_t *pool, nvlist_t *config) + : m_poolConfig(zpool_get_config(pool, NULL)), + m_config(config) +{ + if (!VdevLookupPoolGuid()) + throw ZfsdException("Can't extract pool GUID from handle."); + VdevLookupGuid(); } Vdev::Vdev(nvlist_t *poolConfig, nvlist_t *config) : m_poolConfig(poolConfig), m_config(config) { - uint64_t raw_guid; - if (nvlist_lookup_uint64(m_poolConfig, ZPOOL_CONFIG_POOL_GUID, - &raw_guid) != 0) - throw ZfsdException("Unable to extract pool GUID " - "from pool handle."); - m_poolGUID = raw_guid; - - if (nvlist_lookup_uint64(m_config, ZPOOL_CONFIG_GUID, &raw_guid) != 0) - throw ZfsdException("Unable to extract vdev GUID " - "from vdev config data."); - m_vdevGUID = raw_guid; + if (!VdevLookupPoolGuid()) + throw ZfsdException("Can't extract pool GUID from config."); + VdevLookupGuid(); } Vdev::Vdev(nvlist_t *labelConfig) - : m_poolConfig(labelConfig) + : m_poolConfig(labelConfig), + m_config(labelConfig) { - uint64_t raw_guid; - /* * Spares do not have a Pool GUID. Tolerate its absence. * Code accessing this Vdev in a context where the Pool GUID is * required will find it invalid (as it is upon Vdev construction) * and act accordingly. */ - if (nvlist_lookup_uint64(labelConfig, ZPOOL_CONFIG_POOL_GUID, - &raw_guid) == 0) - m_poolGUID = raw_guid; - - if (nvlist_lookup_uint64(labelConfig, ZPOOL_CONFIG_GUID, - &raw_guid) != 0) - throw ZfsdException("Unable to extract vdev GUID " - "from vdev label data."); - m_vdevGUID = raw_guid; + (void) VdevLookupPoolGuid(); + VdevLookupGuid(); try { m_config = VdevIterator(labelConfig).Find(m_vdevGUID); @@ -172,6 +181,125 @@ Vdev::State() const return (VDEV_STATE_HEALTHY); } +std::list +Vdev::Children() +{ + nvlist_t **vdevChildren; + int result; + u_int numChildren; + std::list children; + + if (m_poolConfig == NULL || m_config == NULL) + return (children); + + result = nvlist_lookup_nvlist_array(m_config, + ZPOOL_CONFIG_CHILDREN, &vdevChildren, &numChildren); + if (result != 0) + return (children); + + for (u_int c = 0;c < numChildren; c++) + children.push_back(Vdev(m_poolConfig, vdevChildren[c])); + + return (children); +} + +Vdev +Vdev::RootVdev() +{ + nvlist_t *rootVdev; + + if (m_poolConfig == NULL) + return (NonexistentVdev); + + if (nvlist_lookup_nvlist(m_poolConfig, ZPOOL_CONFIG_VDEV_TREE, + &rootVdev) != 0) + return (NonexistentVdev); + return (Vdev(m_poolConfig, rootVdev)); +} + +/* + * Find our parent. This requires doing a traversal of the config; we can't + * cache it as leaf vdevs may change their pool config location (spare, + * replacing, mirror, etc). + */ +Vdev +Vdev::Parent() +{ + std::list to_examine; + std::list children; + std::list::iterator children_it; + + to_examine.push_back(RootVdev()); + for (;;) { + if (to_examine.empty()) + return (NonexistentVdev); + Vdev vd = to_examine.front(); + if (vd.DoesNotExist()) + return (NonexistentVdev); + to_examine.pop_front(); + children = vd.Children(); + children_it = children.begin(); + for (;children_it != children.end(); children_it++) { + Vdev child = *children_it; + + if (child.GUID() == GUID()) + return (vd); + to_examine.push_front(child); + } + } +} + +bool +Vdev::IsAvailableSpare() const +{ + /* If we have a pool guid, we cannot be an available spare. */ + if (PoolGUID()) + return (false); + + return (true); +} + +bool +Vdev::IsSpare() +{ + uint64_t spare; + if (nvlist_lookup_uint64(m_config, ZPOOL_CONFIG_IS_SPARE, &spare) != 0) + return (false); + return (spare != 0); +} + +bool +Vdev::IsActiveSpare() const +{ + vdev_stat_t *vs; + uint_t c; + + if (m_poolConfig == NULL) + return (false); + + (void) nvlist_lookup_uint64_array(m_config, ZPOOL_CONFIG_VDEV_STATS, + reinterpret_cast(&vs), &c); + if (vs == NULL || vs->vs_aux != VDEV_AUX_SPARED) + return (false); + return (true); +} + +bool +Vdev::IsResilvering() const +{ + pool_scan_stat_t *ps = NULL; + uint_t c; + + if (State() != VDEV_STATE_HEALTHY) + return (false); + + (void) nvlist_lookup_uint64_array(m_config, ZPOOL_CONFIG_SCAN_STATS, + reinterpret_cast(&ps), &c); + if (ps == NULL || ps->pss_func != POOL_SCAN_RESILVER) + return (false); + return (true); +} + string Vdev::GUIDString() const { @@ -182,6 +310,13 @@ Vdev::GUIDString() const } string +Vdev::Name(zpool_handle_t *zhp, bool verbose) const +{ + return (zpool_vdev_name(g_zfsHandle, zhp, m_config, + verbose ? B_TRUE : B_FALSE)); +} + +string Vdev::Path() const { char *path(NULL); Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev.h Mon Oct 14 23:24:53 2013 (r256475) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev.h Mon Oct 14 23:31:18 2013 (r256476) @@ -40,6 +40,7 @@ * Header requirements: * * #include + * #include * * #include */ @@ -103,6 +104,17 @@ public: */ Vdev(nvlist_t *vdevConfig); + /** + * \brief No-op copy constructor for nonexistent vdevs. + */ + Vdev(); + bool DoesNotExist() const; + + /** + * \brief Return a list of the vdev's children. + */ + std::list Children(); + virtual DevCtl::Guid GUID() const; virtual DevCtl::Guid PoolGUID() const; virtual vdev_state State() const; @@ -111,14 +123,26 @@ public: std::string GUIDString() const; nvlist_t *PoolConfig() const; nvlist_t *Config() const; + Vdev Parent(); + Vdev RootVdev(); + std::string Name(zpool_handle_t *, bool verbose) const; + bool IsSpare(); + bool IsAvailableSpare() const; + bool IsActiveSpare() const; + bool IsResilvering() const; private: - DevCtl::Guid m_poolGUID; - DevCtl::Guid m_vdevGUID; - nvlist_t *m_poolConfig; - nvlist_t *m_config; + void VdevLookupGuid(); + bool VdevLookupPoolGuid(); + DevCtl::Guid m_poolGUID; + DevCtl::Guid m_vdevGUID; + nvlist_t *m_poolConfig; + nvlist_t *m_config; }; +//- Special objects ----------------------------------------------------------- +extern Vdev NonexistentVdev; + //- Vdev Inline Public Methods ------------------------------------------------ inline DevCtl::Guid Vdev::PoolGUID() const @@ -144,4 +168,10 @@ Vdev::Config() const return (m_config); } +inline bool +Vdev::DoesNotExist() const +{ + return (m_config == NULL); +} + #endif /* _VDEV_H_ */ Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.cc Mon Oct 14 23:24:53 2013 (r256475) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.cc Mon Oct 14 23:31:18 2013 (r256476) @@ -41,6 +41,7 @@ #include #include +#include #include #include From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 23:36:12 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 121F3287; Mon, 14 Oct 2013 23:36:12 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F37D72012; Mon, 14 Oct 2013 23:36:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ENaBHJ035755; Mon, 14 Oct 2013 23:36:11 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ENaApY035748; Mon, 14 Oct 2013 23:36:10 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142336.r9ENaApY035748@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 23:36:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256478 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 23:36:12 -0000 Author: asomers Date: Mon Oct 14 23:36:10 2013 New Revision: 256478 URL: http://svnweb.freebsd.org/changeset/base/256478 Log: Zfsd should deactivate a spare if the original device is replaced while the system is powered off. cddl/sbin/zfsd/case_file.cc cddl/sbin/zfsd/vdev.cc cddl/sbin/zfsd/vdev.h cddl/sbin/zfsd/vdev_iterator.h cddl/sbin/zfsd/zfsd.cc cddl/sbin/zfsd/zfsd_event.cc cddl/sbin/zfsd/zfsd_event.h When zfsd receives a misc.fs.zfs.resilver_finish event, it will iterate through all spare leaf vdevs on the pool. It will detach any that appear to be unnecessary. Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/vdev.cc projects/zfsd/head/cddl/sbin/zfsd/vdev.h projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.h projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.h Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 23:32:56 2013 (r256477) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 23:36:10 2013 (r256478) @@ -66,10 +66,10 @@ #include #include "callout.h" +#include "vdev_iterator.h" #include "zfsd_event.h" #include "case_file.h" #include "vdev.h" -#include "vdev_iterator.h" #include "zfsd.h" #include "zfsd_exception.h" #include "zpool_list.h" Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Mon Oct 14 23:32:56 2013 (r256477) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Mon Oct 14 23:36:10 2013 (r256478) @@ -141,6 +141,18 @@ Vdev::Vdev(nvlist_t *labelConfig) } } +bool +Vdev::IsSpare() const +{ + uint64_t is_spare(0); + + if (m_config == NULL) + return (false); + + (void)nvlist_lookup_uint64(m_config, ZPOOL_CONFIG_IS_SPARE, &is_spare); + return (bool(is_spare)); +} + vdev_state Vdev::State() const { Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev.h Mon Oct 14 23:32:56 2013 (r256477) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev.h Mon Oct 14 23:36:10 2013 (r256478) @@ -116,6 +116,7 @@ public: std::list Children(); virtual DevCtl::Guid GUID() const; + bool IsSpare() const; virtual DevCtl::Guid PoolGUID() const; virtual vdev_state State() const; std::string Path() const; Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.h Mon Oct 14 23:32:56 2013 (r256477) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.h Mon Oct 14 23:36:10 2013 (r256478) @@ -84,8 +84,8 @@ public: void Reset(); /** - * \brief Report the vdev at this iterator's cursor and increment - * the cursor to the next pool member. + * \brief Report the leaf vdev at this iterator's cursor and increment + * the cursor to the next leaf pool member. */ nvlist_t *Next(); Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 23:32:56 2013 (r256477) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 23:36:10 2013 (r256478) @@ -66,6 +66,7 @@ #include #include "callout.h" +#include "vdev_iterator.h" #include "zfsd_event.h" #include "case_file.h" #include "vdev.h" Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc Mon Oct 14 23:32:56 2013 (r256477) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc Mon Oct 14 23:36:10 2013 (r256478) @@ -54,10 +54,10 @@ #include #include "callout.h" +#include "vdev_iterator.h" #include "zfsd_event.h" #include "case_file.h" #include "vdev.h" -#include "vdev_iterator.h" #include "zfsd.h" #include "zfsd_exception.h" #include "zpool_list.h" @@ -346,6 +346,26 @@ ZfsEvent::ZfsEvent(const ZfsEvent &src) { } +/* + * Sometimes the kernel won't detach a spare when it is no longer needed. This + * can happen for example if a drive is removed, then either the pool is + * exported or the machine is powered off, then the drive is reinserted, then + * the machine is powered on or the pool is imported. ZFSD must detach these + * spares itself. + */ +void +ZfsEvent::CleanupSpares() const +{ + Guid poolGUID(PoolGUID()); + ZpoolList zpl(ZpoolList::ZpoolByGUID, &poolGUID); + if (!zpl.empty()) { + zpool_handle_t* hdl; + + hdl = zpl.front(); + VdevIterator(hdl).Each(TryDetach, (void*)hdl); + } +} + void ZfsEvent::ProcessPoolEvent() const { @@ -359,6 +379,15 @@ ZfsEvent::ProcessPoolEvent() const caseFile->ReEvaluate(*this); } + else if (Value("type") == "misc.fs.zfs.resilver_finish") + { + /* + * It's possible to get a resilver_finish event with no + * corresponding casefile. For example, if a damaged pool were + * exported, repaired, then reimported. + */ + CleanupSpares(); + } if (Value("type") == "misc.fs.zfs.vdev_remove" && degradedDevice == false) { @@ -366,3 +395,46 @@ ZfsEvent::ProcessPoolEvent() const ZfsDaemon::RequestSystemRescan(); } } + +bool +ZfsEvent::TryDetach(Vdev &vdev, void *cbArg) +{ + /* + * Outline: + * if this device is a spare, and its parent includes one healthy, + * non-spare child, then detach this device. + */ + zpool_handle_t *hdl(static_cast(cbArg)); + + if (vdev.IsSpare()) { + std::list siblings; + std::list::iterator siblings_it; + boolean_t cleanup = B_FALSE; + + Vdev parent = vdev.Parent(); + siblings = parent.Children(); + + /* Determine whether the parent should be cleaned up */ + for (siblings_it = siblings.begin(); + siblings_it != siblings.end(); + siblings_it++) { + Vdev sibling = *siblings_it; + + if (!sibling.IsSpare() && + sibling.State() == VDEV_STATE_HEALTHY) { + cleanup = B_TRUE; + break; + } + } + + if (cleanup) { + syslog(LOG_INFO, "Detaching spare vdev %s from pool %s", + vdev.Path().c_str(), zpool_get_name(hdl)); + zpool_vdev_detach(hdl, vdev.Path().c_str()); + } + + } + + /* Always return false, because there may be other spares to detach */ + return (false); +} Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.h Mon Oct 14 23:32:56 2013 (r256477) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.h Mon Oct 14 23:36:10 2013 (r256478) @@ -140,7 +140,13 @@ protected: /** Constructor */ ZfsEvent(Type, DevCtl::NVPairMap &, const string &); + /** + * Detach any spares that are no longer needed, but were not + * automatically detached by the kernel + */ + virtual void CleanupSpares() const; virtual void ProcessPoolEvent() const; + static VdevCallback_t TryDetach; }; #endif /*_ZFSD_EVENT_H_ */ From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 23:41:56 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0BD50472; Mon, 14 Oct 2013 23:41:56 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EDACD2082; Mon, 14 Oct 2013 23:41:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ENftX1039330; Mon, 14 Oct 2013 23:41:55 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ENftFg039327; Mon, 14 Oct 2013 23:41:55 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142341.r9ENftFg039327@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 23:41:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256479 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 23:41:56 -0000 Author: asomers Date: Mon Oct 14 23:41:55 2013 New Revision: 256479 URL: http://svnweb.freebsd.org/changeset/base/256479 Log: Fix a bug in zfsd: zfsd will fail to autoreplace by physical path a drive if it had previously replaced that same drive when it belonged to a different pool. The solution is to delete case files when their pools are destroyed. A better fix would be to refactor zfsd to eliminate casefiles altogether, and use a more stateless approach. cddl/sbin/zfsd/case_file.cc cddl/sbin/zfsd/zfsd_event.cc Close a case file when its pool is destroyed. Log a warning when two open case files correspond to the same physical path. Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/case_file.h projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 23:36:10 2013 (r256478) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 23:41:55 2013 (r256479) @@ -150,15 +150,23 @@ CaseFile::Find(Guid poolGUID, Guid vdevG CaseFile * CaseFile::Find(const string &physPath) { + CaseFile *result = NULL; + for (CaseFileList::iterator curCase = s_activeCases.begin(); curCase != s_activeCases.end(); curCase++) { if ((*curCase)->PhysicalPath() != physPath) continue; - return (*curCase); + if (result != NULL) { + syslog(LOG_WARNING, "Multiple casefiles found for " + "physical path %s. " + "This is most likely a bug in zfsd", + physPath.c_str()); + } + result = *curCase; } - return (NULL); + return (result); } @@ -370,8 +378,12 @@ CaseFile::ReEvaluate(const ZfsEvent &eve Close(); return (/*consumed*/true); - } - else if (event.Value("type") == "misc.fs.zfs.config_sync") { + } else if (event.Value("type") == "misc.fs.zfs.pool_destroy") { + /* This Pool has been destroyed. Discard the case */ + Close(); + + return (/*consumed*/true); + } else if (event.Value("type") == "misc.fs.zfs.config_sync") { RefreshVdevState(); if (VdevState() < VDEV_STATE_HEALTHY) consumed = ActivateSpare(); Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.h Mon Oct 14 23:36:10 2013 (r256478) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.h Mon Oct 14 23:41:55 2013 (r256479) @@ -296,7 +296,7 @@ protected: /** * \brief Unconditionally close a CaseFile. */ - void Close(); + virtual void Close(); /** * \brief Callout callback invoked when the remove timer grace Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc Mon Oct 14 23:36:10 2013 (r256478) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc Mon Oct 14 23:41:55 2013 (r256479) @@ -195,6 +195,10 @@ DevfsEvent::Process() const "as a replace by physical path candidate.\n", devName.c_str()); } else if (havePhysPath && IsWholeDev()) { + /* + * TODO: attempt to resolve events using every casefile + * that matches this physpath + */ CaseFile *caseFile(CaseFile::Find(physPath)); if (caseFile != NULL) { syslog(LOG_INFO, @@ -371,6 +375,12 @@ ZfsEvent::ProcessPoolEvent() const { bool degradedDevice(false); + /* The pool is destroyed. Discard any open cases */ + if (Value("type") == "misc.fs.zfs.pool_destroy") { + CaseFile::ReEvaluateByGuid(PoolGUID(), *this); + return; + } + CaseFile *caseFile(CaseFile::Find(PoolGUID(), VdevGUID())); if (caseFile != NULL) { if (caseFile->VdevState() != VDEV_STATE_UNKNOWN From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 23:43:31 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 32BB2556; Mon, 14 Oct 2013 23:43:31 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 211EE2087; Mon, 14 Oct 2013 23:43:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ENhUC1039613; Mon, 14 Oct 2013 23:43:31 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ENhU4G039611; Mon, 14 Oct 2013 23:43:30 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142343.r9ENhU4G039611@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 23:43:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256480 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 23:43:31 -0000 Author: asomers Date: Mon Oct 14 23:43:30 2013 New Revision: 256480 URL: http://svnweb.freebsd.org/changeset/base/256480 Log: sbin/zfsd/Makefile.common Add -lzfs_core for zfsd, because libzfs now requires it. Submitted by: will Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/Makefile.common Modified: projects/zfsd/head/cddl/sbin/zfsd/Makefile.common ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/Makefile.common Mon Oct 14 23:41:55 2013 (r256479) +++ projects/zfsd/head/cddl/sbin/zfsd/Makefile.common Mon Oct 14 23:43:30 2013 (r256480) @@ -33,9 +33,9 @@ INCFLAGS+= -I${.CURDIR}/../../../sys/cdd CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} -DPADD= ${LIBDEVCTL} ${LIBZFS} ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \ - ${LIBNVPAIR} ${LIBUUTIL} -LDADD= -ldevctl -lzfs -lutil -lgeom -lbsdxml -lsbuf -lnvpair -luutil +DPADD= ${LIBDEVCTL} ${LIBZFS} ${LIBZFS_CORE} ${LIBUTIL} ${LIBGEOM} \ + ${LIBBSDXML} ${LIBSBUF} ${LIBNVPAIR} ${LIBUUTIL} +LDADD= -ldevctl -lzfs -lzfs_core -lutil -lgeom -lbsdxml -lsbuf -lnvpair -luutil cscope: find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \ From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 23:56:40 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E5A2576F; Mon, 14 Oct 2013 23:56:39 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C33D520F6; Mon, 14 Oct 2013 23:56:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ENud4B046199; Mon, 14 Oct 2013 23:56:39 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ENudWa046198; Mon, 14 Oct 2013 23:56:39 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142356.r9ENudWa046198@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 23:56:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256481 - projects/zfsd/head/lib/libdevctl X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 23:56:40 -0000 Author: asomers Date: Mon Oct 14 23:56:38 2013 New Revision: 256481 URL: http://svnweb.freebsd.org/changeset/base/256481 Log: Emit many more ZFS events to devctl, especially for zfs(8) commands. The intention is to make it easier for a devctl consumer (such as zfsd or the zfs worker) to receive events for commands like zfs create/snapshot/destroy/clone/promote. Instead of polling "zfs list", such consumers can now receive notifications when the requested operations complete. While I'm here, make devctl/libdevctl support key/value strings that have spaces in them. Some of the key/value pairs in these events contain strings that screw up rendering & parsing. It seems more appropriate to pass on strings as they were provided than to require all emitters to adopt a "no spaces" rule. The logging format is open to modification/tweaking. Example event logs from zfsd: [root@ntier-verde ~]# zfs create tpool/foo Aug 2 20:46:35 ntier-verde zfsd: ZFS: Notify "dsid"="40" "dsname"="tpool/foo" "history internal str"="" "history txg"="90" "internal_name"="create" "pool_guid"="83985999112536669" "pool_name"="tpool" "subsystem"="ZFS" "timestamp"="1375476395" "type"="misc.fs.zfs.pool_history" [root@ntier-verde ~]# zfs create tpool/foo/0 Aug 2 20:46:36 ntier-verde zfsd: ZFS: Notify "dsid"="47" "dsname"="tpool/foo/0" "history internal str"="" "history txg"="91" "internal_name"="create" "pool_guid"="83985999112386669" "pool_name"="tpool" "subsystem"="ZFS" "timestamp"="1375476396" "type"="misc.fs.zfs.pool_history" [root@ntier-verde ~]# zfs snapshot tpool/foo/0@0 Aug 2 20:46:41 ntier-verde zfsd: ZFS: Notify "dsid"="50" "dsname"="tpool/foo/0@0" "history internal str"="" "history txg"="92" "internal_name"="snapshot" "pool_guid"="83985991253386669" "pool_name"="tpool" "subsystem"="ZFS" "timestamp"="1375476401" "type"="misc.fs.zfs.pool_history" [root@ntier-verde ~]# zfs destroy -r tpool/foo Aug 2 20:46:46 ntier-verde zfsd: ZFS: Notify "dsid"="50" "dsname"="tpool/foo/0@0" "history internal str"="" "history txg"="94" "internal_name"="destroy" "pool_guid"="83985999253386669" "pool_name"="tpool" "subsystem"="ZFS" "timestamp"="1375476406" "type"="misc.fs.zfs.pool_history" Aug 2 20:46:46 ntier-verde zfsd: ZFS: Notify "dsid"="47" "dsname"="tpool/foo/0" "history internal str"="" "history txg"="95" "internal_name"="destroy" "pool_guid"="83985999113386669" "pool_name"="tpool" "subsystem"="ZFS" "timestamp"="1375476406" "type"="misc.fs.zfs.pool_history" Aug 2 20:46:46 ntier-verde zfsd: ZFS: Notify "dsid"="40" "dsname"="tpool/foo" "history internal str"="" "history txg"="97" "internal_name"="destroy" "pool_guid"="83985999112586669" "pool_name"="tpool" "subsystem"="ZFS" "timestamp"="1375476406" "type"="misc.fs.zfs.pool_history" lib/libdevctl/event.cc: sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c: - Add a rudimentary mechanism for serializing and deserializing spaces in strings representing keys and their values, by converting spaces to %20, and %s to %%s, and vice versa. lib/libdevctl/event.cc: - Add normalize_string(), which deserializes inbound key and value strings, acting as a substitute for string.substr(), as it is used in DevCtl::Event::ParseEventString(). - DevCtl::Event::Log(): Quote key and value strings. sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c: - Add a common routine, log_sysevent_add_string(), which performs serialization of spaces and %s in strings. - Add log_sysevent_add_elem(), which uses log_sysevent_add_string() to provide the " =" part of the string. sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c: - spa_create(): Change the "create" history log generated here to "pool create", so it can be more easily distinguished from "create", which means "filesystem create". sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c: sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h: - Add zfs_ereport_spa_history(), a new ZFS event call which allows emitting events for pool history logging. It takes a nvlist of metadata representing the history log, temporarily appends the pool name and guid, then forwards it on to ddi_log_sysevent(). The FreeBSD implementation of ddi_log_sysevent() then serializes the event and forwards the serialized string to devctl_notify(). sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c: - log_internal(): When logging internal events, once the nvlist has been fully populated with data, call zfs_ereport_spa_history(). lib/libdevctl/consumer.cc - Demote ConnectToDevd() "Already connected." syslog from INFO to DEBUG. This function gets called by the devctl ruby gem whenever it polls devctl, resulting in useless log spamming in production. Submitted by: will Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/lib/libdevctl/consumer.cc Modified: projects/zfsd/head/lib/libdevctl/consumer.cc ============================================================================== --- projects/zfsd/head/lib/libdevctl/consumer.cc Mon Oct 14 23:43:30 2013 (r256480) +++ projects/zfsd/head/lib/libdevctl/consumer.cc Mon Oct 14 23:56:38 2013 (r256481) @@ -100,7 +100,7 @@ Consumer::ConnectToDevd() if (m_devdSockFD != -1) { /* Already connected. */ - syslog(LOG_INFO, "%s: Already connected.", __func__); + syslog(LOG_DEBUG, "%s: Already connected.", __func__); return (true); } syslog(LOG_INFO, "%s: Connecting to devd.", __func__); From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 23:59:10 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 954A4AD2; Mon, 14 Oct 2013 23:59:10 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 83BD9210F; Mon, 14 Oct 2013 23:59:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ENxAhb046706; Mon, 14 Oct 2013 23:59:10 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ENxAeJ046705; Mon, 14 Oct 2013 23:59:10 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142359.r9ENxAeJ046705@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 23:59:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256484 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 23:59:10 -0000 Author: asomers Date: Mon Oct 14 23:59:10 2013 New Revision: 256484 URL: http://svnweb.freebsd.org/changeset/base/256484 Log: Reduce zfsd logging. cddl/sbin/zfsd/zfsd_event.cc: Only syslog events for which zfsd takes some action. This preserves the data necessary for diagnosis of customer issues without filling the logs with every ZFS event type the kernel may issue (e.g. scrub status). Submitted by: gibbs Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc Mon Oct 14 23:58:52 2013 (r256483) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc Mon Oct 14 23:59:10 2013 (r256484) @@ -266,8 +266,6 @@ ZfsEvent::Process() const CaseFile::ReEvaluateByGuid(PoolGUID(), *this); } - Log(LOG_INFO); - if (Value("type").find("misc.fs.zfs.") == 0) { /* Configuration changes, resilver events, etc. */ ProcessPoolEvent(); @@ -281,6 +279,7 @@ ZfsEvent::Process() const CaseFile *caseFile(CaseFile::Find(PoolGUID(), VdevGUID())); if (caseFile != NULL) { + Log(LOG_INFO); syslog(LOG_INFO, "Evaluating existing case file\n"); caseFile->ReEvaluate(*this); return (false); @@ -293,6 +292,7 @@ ZfsEvent::Process() const stringstream msg; msg << "No replicas available for pool " << poolGUID; msg << ", ignoring"; + Log(LOG_INFO); syslog(LOG_INFO, "%s", msg.str().c_str()); return (false); } @@ -308,6 +308,7 @@ ZfsEvent::Process() const msg << "ZfsEvent::Process: Event for unknown pool "; msg << poolGUID << " "; msg << "queued"; + Log(LOG_INFO); syslog(priority, "%s", msg.str().c_str()); return (true); } @@ -319,19 +320,21 @@ ZfsEvent::Process() const msg << "ZfsEvent::Process: Event for unknown vdev "; msg << VdevGUID() << " "; msg << "queued"; + Log(LOG_INFO); syslog(priority, "%s", msg.str().c_str()); return (true); } Vdev vdev(zpl.front(), vdevConfig); caseFile = &CaseFile::Create(vdev); - if ( caseFile->ReEvaluate(*this) == false) { + if (caseFile->ReEvaluate(*this) == false) { stringstream msg; int priority = LOG_INFO; msg << "ZfsEvent::Process: Unconsumed event for vdev("; msg << zpool_get_name(zpl.front()) << ","; msg << vdev.GUID() << ") "; msg << "queued"; + Log(LOG_INFO); syslog(priority, "%s", msg.str().c_str()); return (true); } @@ -377,6 +380,7 @@ ZfsEvent::ProcessPoolEvent() const /* The pool is destroyed. Discard any open cases */ if (Value("type") == "misc.fs.zfs.pool_destroy") { + Log(LOG_INFO); CaseFile::ReEvaluateByGuid(PoolGUID(), *this); return; } @@ -387,6 +391,7 @@ ZfsEvent::ProcessPoolEvent() const && caseFile->VdevState() < VDEV_STATE_HEALTHY) degradedDevice = true; + Log(LOG_INFO); caseFile->ReEvaluate(*this); } else if (Value("type") == "misc.fs.zfs.resilver_finish") @@ -396,12 +401,15 @@ ZfsEvent::ProcessPoolEvent() const * corresponding casefile. For example, if a damaged pool were * exported, repaired, then reimported. */ + Log(LOG_INFO); CleanupSpares(); } if (Value("type") == "misc.fs.zfs.vdev_remove" && degradedDevice == false) { + /* See if any other cases can make use of this device. */ + Log(LOG_INFO); ZfsDaemon::RequestSystemRescan(); } } From owner-svn-src-projects@FreeBSD.ORG Tue Oct 15 00:09:23 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3365EC83; Tue, 15 Oct 2013 00:09:23 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2180221A0; Tue, 15 Oct 2013 00:09:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9F09Mtd052898; Tue, 15 Oct 2013 00:09:23 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9F09M6f052897; Tue, 15 Oct 2013 00:09:22 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310150009.r9F09M6f052897@svn.freebsd.org> From: Alan Somers Date: Tue, 15 Oct 2013 00:09:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256485 - projects/zfsd/head/etc/rc.d X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Oct 2013 00:09:23 -0000 Author: asomers Date: Tue Oct 15 00:09:22 2013 New Revision: 256485 URL: http://svnweb.freebsd.org/changeset/base/256485 Log: etc/rc.d/zfsd Remove set_rcvar, in accordance with rev 230103. Submitted by: will Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/etc/rc.d/zfsd Modified: projects/zfsd/head/etc/rc.d/zfsd ============================================================================== --- projects/zfsd/head/etc/rc.d/zfsd Mon Oct 14 23:59:10 2013 (r256484) +++ projects/zfsd/head/etc/rc.d/zfsd Tue Oct 15 00:09:22 2013 (r256485) @@ -10,7 +10,7 @@ . /etc/rc.subr name="zfsd" -rcvar=`set_rcvar` +rcvar="zfsd_enable" command="/sbin/${name}" load_rc_config $name From owner-svn-src-projects@FreeBSD.ORG Tue Oct 15 08:17:05 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 78CF95A8; Tue, 15 Oct 2013 08:17:05 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: from mail-ea0-x235.google.com (mail-ea0-x235.google.com [IPv6:2a00:1450:4013:c01::235]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 946122BAD; Tue, 15 Oct 2013 08:17:04 +0000 (UTC) Received: by mail-ea0-f181.google.com with SMTP id d10so3927781eaj.12 for ; Tue, 15 Oct 2013 01:17:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=N4CaUN0F6Zz7Qc4ZTCGey49Y1V0WneWg5/y89hT7rNk=; b=SXrx1iEvn5rEtCUsrNuFfFTdBU6YNLGOdD6PPasQs/HjHRmx+DkZeJqjbb30EeirSO mIjhStf0+DokQpJpCB9E1iYy6/g3kiEESYvqe9ohIUiO7iT0BUIr+y+9rH2wsVFraTvf MWSmtG8w4X8W+3myLXptLLzO5ndl/Du4d2NCFhSmN7by9KroLAj2+rek5LNEN/6qtXnv p2sWCb1TnNq3as9OFoeVA9Q9vZUJxp5ed5sEn1YEKdqXALbCCrGwYQiRbgXigGF70aQh 92bAtzqS4qp6EWs2a36TML629SYWdN6f3MoXbq5fe/Q/KsRSoxV+R3oNIdVJUjeH7B7Q yotg== X-Received: by 10.14.119.196 with SMTP id n44mr34882eeh.116.1381825022925; Tue, 15 Oct 2013 01:17:02 -0700 (PDT) Received: from mavbook.mavhome.dp.ua ([46.211.77.102]) by mx.google.com with ESMTPSA id s3sm190612eeo.3.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 01:17:02 -0700 (PDT) Sender: Alexander Motin Message-ID: <525CF9FC.2000109@FreeBSD.org> Date: Tue, 15 Oct 2013 11:17:00 +0300 From: Alexander Motin User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130616 Thunderbird/17.0.6 MIME-Version: 1.0 To: John Baldwin Subject: Re: svn commit: r254846 - projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs References: <201308251121.r7PBLA3v033536@svn.freebsd.org> <521A06A2.7050807@FreeBSD.org> <201308261425.34743.jhb@freebsd.org> In-Reply-To: <201308261425.34743.jhb@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-projects@freebsd.org, Adrian Chadd , "src-committers@freebsd.org" X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Oct 2013 08:17:05 -0000 On 26.08.2013 21:25, John Baldwin wrote: > On Sunday, August 25, 2013 9:29:06 am Alexander Motin wrote: >> On 25.08.2013 15:48, Adrian Chadd wrote: >>> Surely there's a better way to check whether a thread can sleep besides >>> digging around in curthread->td_no_sleeping ? What about adding an >>> accessor macro along side THREAD_SLEEPING_OK and THREAD_NO_SLEEPING ? >> >> That sounds good to me. I was also surprised such macros are not there >> yet when found some code doing these checks just the same way as I did. > > It was never intended to be public, only as a debugging aid for assertions. :( > I had hoped that the calling code would know when it was in an ithread or not > and call different routines as needed (i.e. that the programmer would > intentionally think about the context they were in). Perhaps this is not > realistic? Are you really queueing new I/O from ithreads and/or timers? I've found potential case where it is not realistic. Requests are normally completed from the interrupt threads. Completion caller does know that it is impossible to sleep in that context. But it holds no locks, it is re-enterable, and so it allows direct completion. Request goes up the stack and at some point on the call chain this completion triggers another request to be sent down (may be even to some different device), but again directly. This new request sender knows nothing about interrupt context and the fact it can't sleep. Can you propose some other way to deal with such case other then using per-thread flag/counter? I could use separate per-thread counter, incremented during up call, but I don't see much benefits form it. If you don't want it to be system-wide accessible to not relax people too much, I could create GEOM-specific wrapper for it. -- Alexander Motin From owner-svn-src-projects@FreeBSD.ORG Tue Oct 15 18:07:30 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 57F51BB1; Tue, 15 Oct 2013 18:07:30 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4270F2C65; Tue, 15 Oct 2013 18:07:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FI7UH7000544; Tue, 15 Oct 2013 18:07:30 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FI7O3w000476; Tue, 15 Oct 2013 18:07:24 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310151807.r9FI7O3w000476@svn.freebsd.org> From: Alexander Motin Date: Tue, 15 Oct 2013 18:07:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256554 - in projects/camlock: . bin/freebsd-version cddl/contrib/opensolaris/lib/libdtrace/common cddl/contrib/opensolaris/lib/libdtrace/powerpc contrib/ipfilter etc etc/atf etc/defaul... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Oct 2013 18:07:30 -0000 Author: mav Date: Tue Oct 15 18:07:23 2013 New Revision: 256554 URL: http://svnweb.freebsd.org/changeset/base/256554 Log: MFC @ r256552 Added: projects/camlock/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu - copied unchanged from r256552, head/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu projects/camlock/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu - copied unchanged from r256552, head/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu projects/camlock/sys/dev/random/dummy_rng.c - copied unchanged from r256552, head/sys/dev/random/dummy_rng.c projects/camlock/sys/dev/random/live_entropy_sources.c - copied unchanged from r256552, head/sys/dev/random/live_entropy_sources.c projects/camlock/sys/dev/random/live_entropy_sources.h - copied unchanged from r256552, head/sys/dev/random/live_entropy_sources.h projects/camlock/sys/dev/random/rwfile.c - copied unchanged from r256552, head/sys/dev/random/rwfile.c projects/camlock/sys/dev/random/rwfile.h - copied unchanged from r256552, head/sys/dev/random/rwfile.h projects/camlock/usr.sbin/bsdconfig/share/keymap.subr - copied unchanged from r256552, head/usr.sbin/bsdconfig/share/keymap.subr projects/camlock/usr.sbin/bsdinstall/scripts/entropy - copied unchanged from r256552, head/usr.sbin/bsdinstall/scripts/entropy projects/camlock/usr.sbin/bsdinstall/scripts/zfsboot - copied unchanged from r256552, head/usr.sbin/bsdinstall/scripts/zfsboot Deleted: projects/camlock/etc/atf/ projects/camlock/lib/libyaml/libbsdyml.3 projects/camlock/share/atf/ projects/camlock/share/examples/atf/ projects/camlock/share/xml/ projects/camlock/share/xsl/ projects/camlock/sys/contrib/rdma/core_priv.h projects/camlock/sys/contrib/rdma/ib_addr.h projects/camlock/sys/contrib/rdma/ib_cache.h projects/camlock/sys/contrib/rdma/ib_cm.h projects/camlock/sys/contrib/rdma/ib_fmr_pool.h projects/camlock/sys/contrib/rdma/ib_mad.h projects/camlock/sys/contrib/rdma/ib_marshall.h projects/camlock/sys/contrib/rdma/ib_pack.h projects/camlock/sys/contrib/rdma/ib_sa.h projects/camlock/sys/contrib/rdma/ib_smi.h projects/camlock/sys/contrib/rdma/ib_umem.h projects/camlock/sys/contrib/rdma/ib_user_cm.h projects/camlock/sys/contrib/rdma/ib_user_mad.h projects/camlock/sys/contrib/rdma/ib_user_sa.h projects/camlock/sys/contrib/rdma/ib_user_verbs.h projects/camlock/sys/contrib/rdma/ib_verbs.h projects/camlock/sys/contrib/rdma/iw_cm.h projects/camlock/sys/contrib/rdma/rdma_addr.c projects/camlock/sys/contrib/rdma/rdma_cache.c projects/camlock/sys/contrib/rdma/rdma_cm.h projects/camlock/sys/contrib/rdma/rdma_cm_ib.h projects/camlock/sys/contrib/rdma/rdma_cma.c projects/camlock/sys/contrib/rdma/rdma_device.c projects/camlock/sys/contrib/rdma/rdma_iwcm.c projects/camlock/sys/contrib/rdma/rdma_user_cm.h projects/camlock/sys/contrib/rdma/rdma_verbs.c projects/camlock/sys/contrib/rdma/types.h projects/camlock/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu projects/camlock/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu projects/camlock/sys/dev/random/pseudo_rng.c projects/camlock/sys/modules/rdma/addr/ projects/camlock/sys/modules/rdma/cma/ projects/camlock/sys/modules/rdma/core/ projects/camlock/sys/modules/rdma/iwcm/ projects/camlock/usr.bin/atf/atf-config/ projects/camlock/usr.bin/atf/atf-report/ projects/camlock/usr.bin/atf/atf-run/ projects/camlock/usr.bin/atf/atf-version/ Modified: projects/camlock/Makefile.inc1 projects/camlock/ObsoleteFiles.inc projects/camlock/UPDATING projects/camlock/bin/freebsd-version/freebsd-version.sh.in projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c projects/camlock/contrib/ipfilter/ipf.h projects/camlock/etc/Makefile projects/camlock/etc/defaults/periodic.conf projects/camlock/etc/defaults/rc.conf projects/camlock/etc/ftpusers projects/camlock/etc/group projects/camlock/etc/master.passwd projects/camlock/etc/mtree/BSD.root.dist projects/camlock/etc/mtree/BSD.usr.dist projects/camlock/etc/rc.d/initrandom projects/camlock/etc/rc.d/jail projects/camlock/gnu/usr.bin/cc/cc_tools/freebsd-native.h projects/camlock/gnu/usr.bin/groff/tmac/mdoc.local projects/camlock/lib/clang/clang.build.mk projects/camlock/lib/libc/gen/getutxent.c projects/camlock/lib/libcrypt/tests/crypt_tests.c projects/camlock/lib/libyaml/Makefile projects/camlock/release/Makefile projects/camlock/sbin/camcontrol/modeedit.c projects/camlock/sbin/iscontrol/iscsi.conf.5 projects/camlock/sbin/nos-tun/nos-tun.c projects/camlock/share/Makefile projects/camlock/share/examples/Makefile projects/camlock/share/examples/kld/random_adaptor/random_adaptor_example.c projects/camlock/share/man/man4/random.4 projects/camlock/share/man/man5/Makefile projects/camlock/share/man/man5/rc.conf.5 projects/camlock/share/man/man7/Makefile projects/camlock/share/misc/bsd-family-tree projects/camlock/share/misc/committers-src.dot projects/camlock/share/mk/atf.test.mk projects/camlock/share/mk/bsd.libnames.mk projects/camlock/share/syscons/keymaps/INDEX.keymaps projects/camlock/sys/amd64/conf/GENERIC projects/camlock/sys/arm/mv/mv_localbus.c projects/camlock/sys/arm/versatile/versatile_pci.c projects/camlock/sys/boot/forth/loader.conf projects/camlock/sys/boot/i386/btx/btx/btx.S projects/camlock/sys/cam/ata/ata_all.c projects/camlock/sys/cam/ata/ata_all.h projects/camlock/sys/cam/ata/ata_da.c projects/camlock/sys/cam/ata/ata_pmp.c projects/camlock/sys/cam/cam_periph.c projects/camlock/sys/cam/cam_periph.h projects/camlock/sys/cam/cam_xpt.c projects/camlock/sys/cam/cam_xpt_periph.h projects/camlock/sys/cam/scsi/scsi_all.c projects/camlock/sys/cam/scsi/scsi_all.h projects/camlock/sys/cam/scsi/scsi_cd.c projects/camlock/sys/cam/scsi/scsi_ch.c projects/camlock/sys/cam/scsi/scsi_da.c projects/camlock/sys/cam/scsi/scsi_enc.c projects/camlock/sys/cam/scsi/scsi_pass.c projects/camlock/sys/cam/scsi/scsi_pt.c projects/camlock/sys/cam/scsi/scsi_sa.c projects/camlock/sys/cam/scsi/scsi_sg.c projects/camlock/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c projects/camlock/sys/cddl/contrib/opensolaris/uts/powerpc/sys/fasttrap_isa.h projects/camlock/sys/conf/NOTES projects/camlock/sys/conf/files projects/camlock/sys/conf/files.amd64 projects/camlock/sys/conf/files.i386 projects/camlock/sys/conf/kmod.mk projects/camlock/sys/conf/newvers.sh projects/camlock/sys/conf/options projects/camlock/sys/contrib/rdma/krping/getopt.c projects/camlock/sys/contrib/rdma/krping/krping.c projects/camlock/sys/contrib/rdma/krping/krping.h projects/camlock/sys/contrib/rdma/krping/krping_dev.c projects/camlock/sys/dev/ata/ata-all.c projects/camlock/sys/dev/ata/ata-card.c projects/camlock/sys/dev/bxe/bxe.c projects/camlock/sys/dev/bxe/bxe_stats.c projects/camlock/sys/dev/bxe/ecore_sp.h projects/camlock/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c projects/camlock/sys/dev/cxgbe/adapter.h projects/camlock/sys/dev/cxgbe/common/common.h projects/camlock/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/camlock/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt projects/camlock/sys/dev/cxgbe/firmware/t4fw_interface.h projects/camlock/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/camlock/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt projects/camlock/sys/dev/cxgbe/t4_main.c projects/camlock/sys/dev/cxgbe/t4_sge.c projects/camlock/sys/dev/cxgbe/tom/t4_cpl_io.c projects/camlock/sys/dev/etherswitch/arswitch/arswitchreg.h projects/camlock/sys/dev/glxsb/glxsb.c projects/camlock/sys/dev/hifn/hifn7751.c projects/camlock/sys/dev/hyperv/include/hyperv.h projects/camlock/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/camlock/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/camlock/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c projects/camlock/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/camlock/sys/dev/hyperv/storvsc/hv_vstorage.h projects/camlock/sys/dev/hyperv/vmbus/hv_channel.c projects/camlock/sys/dev/hyperv/vmbus/hv_hv.c projects/camlock/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c projects/camlock/sys/dev/hyperv/vmbus/hv_vmbus_priv.h projects/camlock/sys/dev/random/harvest.c projects/camlock/sys/dev/random/hash.h projects/camlock/sys/dev/random/ivy.c projects/camlock/sys/dev/random/nehemiah.c projects/camlock/sys/dev/random/random_adaptors.c projects/camlock/sys/dev/random/random_adaptors.h projects/camlock/sys/dev/random/random_harvestq.c projects/camlock/sys/dev/random/random_harvestq.h projects/camlock/sys/dev/random/randomdev.c projects/camlock/sys/dev/random/randomdev.h projects/camlock/sys/dev/random/randomdev_soft.c projects/camlock/sys/dev/random/randomdev_soft.h projects/camlock/sys/dev/random/yarrow.c projects/camlock/sys/dev/random/yarrow.h projects/camlock/sys/dev/rndtest/rndtest.c projects/camlock/sys/dev/safe/safe.c projects/camlock/sys/dev/syscons/scmouse.c projects/camlock/sys/dev/syscons/syscons.c projects/camlock/sys/dev/ubsec/ubsec.c projects/camlock/sys/dev/usb/controller/musb_otg.c projects/camlock/sys/dev/usb/controller/musb_otg.h projects/camlock/sys/dev/usb/usbdevs projects/camlock/sys/dev/usb/wlan/if_run.c projects/camlock/sys/dev/vmware/vmxnet3/if_vmx.c projects/camlock/sys/dev/vmware/vmxnet3/if_vmxvar.h projects/camlock/sys/dev/xen/blkfront/blkfront.c projects/camlock/sys/fs/devfs/devfs_vnops.c projects/camlock/sys/i386/conf/GENERIC projects/camlock/sys/kern/kern_exec.c projects/camlock/sys/kern/kern_intr.c projects/camlock/sys/kern/kern_mbuf.c projects/camlock/sys/kern/subr_bus.c projects/camlock/sys/kern/sys_generic.c projects/camlock/sys/mips/atheros/ar71xx_chip.c projects/camlock/sys/mips/atheros/ar71xx_cpudef.h projects/camlock/sys/mips/atheros/ar71xx_machdep.c projects/camlock/sys/mips/atheros/ar724x_chip.c projects/camlock/sys/mips/atheros/ar91xx_chip.c projects/camlock/sys/mips/atheros/ar933x_chip.c projects/camlock/sys/mips/atheros/ar933xreg.h projects/camlock/sys/mips/atheros/ar934x_chip.c projects/camlock/sys/mips/atheros/ar934xreg.h projects/camlock/sys/mips/cavium/octeon_rnd.c projects/camlock/sys/mips/include/asm.h projects/camlock/sys/mips/include/pcb.h projects/camlock/sys/mips/mips/bcopy.S projects/camlock/sys/mips/mips/exception.S projects/camlock/sys/mips/mips/fp.S projects/camlock/sys/mips/mips/support.S projects/camlock/sys/mips/mips/swtch.S projects/camlock/sys/modules/cxgbe/t4_firmware/Makefile projects/camlock/sys/modules/cxgbe/t5_firmware/Makefile projects/camlock/sys/modules/dtrace/Makefile projects/camlock/sys/modules/dtrace/fasttrap/Makefile projects/camlock/sys/modules/random/Makefile projects/camlock/sys/modules/rdma/Makefile projects/camlock/sys/net/if.c projects/camlock/sys/net/if_ethersubr.c projects/camlock/sys/net/if_tun.c projects/camlock/sys/net/if_var.h projects/camlock/sys/net/rtsock.c projects/camlock/sys/net80211/ieee80211_freebsd.c projects/camlock/sys/netatalk/at_control.c projects/camlock/sys/netgraph/ng_base.c projects/camlock/sys/netgraph/ng_iface.c projects/camlock/sys/netinet/in.c projects/camlock/sys/netinet/in.h projects/camlock/sys/netinet/in_var.h projects/camlock/sys/netinet/ip_input.c projects/camlock/sys/netinet/ip_output.c projects/camlock/sys/netinet6/in6.c projects/camlock/sys/netinet6/in6_var.h projects/camlock/sys/netinet6/ip6_input.c projects/camlock/sys/netinet6/ip6_output.c projects/camlock/sys/netipx/ipx.c projects/camlock/sys/netipx/ipx_if.h projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/camlock/sys/ofed/include/linux/gfp.h projects/camlock/sys/powerpc/aim/interrupt.c projects/camlock/sys/powerpc/aim/trap.c projects/camlock/sys/sys/counter.h projects/camlock/sys/sys/param.h projects/camlock/sys/sys/random.h projects/camlock/sys/sys/systm.h projects/camlock/sys/ufs/ufs/dinode.h projects/camlock/sys/vm/vm_phys.c projects/camlock/tools/build/mk/OptionalObsoleteFiles.inc projects/camlock/tools/make_libdeps.sh projects/camlock/usr.bin/atf/Makefile projects/camlock/usr.bin/atf/Makefile.inc projects/camlock/usr.bin/netstat/if.c projects/camlock/usr.bin/netstat/main.c projects/camlock/usr.bin/netstat/mbuf.c projects/camlock/usr.bin/netstat/netstat.h projects/camlock/usr.bin/netstat/route.c projects/camlock/usr.bin/rpcinfo/rpcinfo.c projects/camlock/usr.bin/systat/netcmds.c projects/camlock/usr.sbin/bhyve/pci_virtio_block.c projects/camlock/usr.sbin/bootparamd/bootparamd/main.c projects/camlock/usr.sbin/bootparamd/callbootd/callbootd.c projects/camlock/usr.sbin/bsdconfig/include/messages.subr projects/camlock/usr.sbin/bsdconfig/share/Makefile projects/camlock/usr.sbin/bsdconfig/share/device.subr projects/camlock/usr.sbin/bsdconfig/share/dialog.subr projects/camlock/usr.sbin/bsdconfig/share/strings.subr projects/camlock/usr.sbin/bsdconfig/share/variable.subr projects/camlock/usr.sbin/bsdinstall/bsdinstall projects/camlock/usr.sbin/bsdinstall/bsdinstall.8 projects/camlock/usr.sbin/bsdinstall/scripts/Makefile projects/camlock/usr.sbin/bsdinstall/scripts/auto projects/camlock/usr.sbin/bsdinstall/scripts/config projects/camlock/usr.sbin/bsdinstall/scripts/jail projects/camlock/usr.sbin/bsdinstall/scripts/keymap projects/camlock/usr.sbin/bsdinstall/scripts/netconfig projects/camlock/usr.sbin/bsdinstall/scripts/script projects/camlock/usr.sbin/bsdinstall/scripts/services projects/camlock/usr.sbin/ifmcstat/ifmcstat.c projects/camlock/usr.sbin/jail/command.c projects/camlock/usr.sbin/jail/config.c projects/camlock/usr.sbin/jail/jail.8 projects/camlock/usr.sbin/jail/jail.c projects/camlock/usr.sbin/jail/jailp.h projects/camlock/usr.sbin/pkg/Makefile projects/camlock/usr.sbin/pkg/config.c projects/camlock/usr.sbin/ypset/ypset.c Directory Properties: projects/camlock/ (props changed) projects/camlock/cddl/ (props changed) projects/camlock/cddl/contrib/opensolaris/ (props changed) projects/camlock/contrib/ipfilter/ (props changed) projects/camlock/gnu/usr.bin/cc/cc_tools/ (props changed) projects/camlock/lib/libc/ (props changed) projects/camlock/sbin/ (props changed) projects/camlock/share/man/man4/ (props changed) projects/camlock/sys/ (props changed) projects/camlock/sys/boot/ (props changed) projects/camlock/sys/cddl/contrib/opensolaris/ (props changed) projects/camlock/sys/conf/ (props changed) projects/camlock/sys/dev/hyperv/ (props changed) projects/camlock/usr.sbin/bhyve/ (props changed) projects/camlock/usr.sbin/bsdinstall/scripts/docsinstall (props changed) projects/camlock/usr.sbin/jail/ (props changed) Modified: projects/camlock/Makefile.inc1 ============================================================================== --- projects/camlock/Makefile.inc1 Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/Makefile.inc1 Tue Oct 15 18:07:23 2013 (r256554) @@ -329,7 +329,7 @@ TARGET_ABI= gnueabi .else TARGET_ABI= unknown .endif -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XFLAGS+= -target ${TARGET_TRIPLE} .endif .endif Modified: projects/camlock/ObsoleteFiles.inc ============================================================================== --- projects/camlock/ObsoleteFiles.inc Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/ObsoleteFiles.inc Tue Oct 15 18:07:23 2013 (r256554) @@ -38,8 +38,38 @@ # xargs -n1 | sort | uniq -d; # done +# 20131014: libbsdyml becomes private +OLD_FILES+=usr/lib/libbsdyml.a +OLD_FILES+=usr/lib/libbsdyml.so +OLD_LIBS+=usr/lib/libbsdyml.so.0 +OLD_FILES+=usr/lib/libbsdyml_p.a +OLD_FILES+=usr/lib32/libbsdyml.a +OLD_FILES+=usr/lib32/libbsdyml.so +OLD_LIBS+=usr/lib32/libbsdyml.so.0 +OLD_FILES+=usr/lib32/libbsdyml_p.a +OLD_FILES+=usr/share/man/man3/libbsdyml.3.gz +OLD_FILES+=usr/include/bsdyml.h +# 20131013: Removal of the ATF tools +OLD_FILES+=etc/atf/FreeBSD.conf +OLD_FILES+=etc/atf/atf-run.hooks +OLD_FILES+=etc/atf/common.conf +OLD_FILES+=usr/bin/atf-config +OLD_FILES+=usr/bin/atf-report +OLD_FILES+=usr/bin/atf-run +OLD_FILES+=usr/bin/atf-version +OLD_FILES+=usr/share/atf/atf-run.hooks +OLD_FILES+=usr/share/examples/atf/atf-run.hooks +OLD_FILES+=usr/share/examples/atf/tests-results.css +OLD_FILES+=usr/share/man/man1/atf-config.1.gz +OLD_FILES+=usr/share/man/man1/atf-report.1.gz +OLD_FILES+=usr/share/man/man1/atf-run.1.gz +OLD_FILES+=usr/share/man/man1/atf-version.1.gz +OLD_FILES+=usr/share/man/man5/atf-formats.5.gz +OLD_FILES+=usr/share/man/man7/atf.7.gz +OLD_FILES+=usr/share/xml/atf/tests-results.dtd +OLD_FILES+=usr/share/xsl/atf/tests-results.xsl # 20131009: freebsd-version moved from /libexec to /bin -OLD_FILES+=/libexec/freebsd-version +OLD_FILES+=libexec/freebsd-version # 20131001: ar and ranlib from binutils not used OLD_FILES+=usr/bin/gnu-ar OLD_FILES+=usr/bin/gnu-ranlib @@ -6093,6 +6123,13 @@ OLD_LIBS+=usr/lib/libkse.so.1 OLD_LIBS+=usr/lib/liblwres.so.3 OLD_LIBS+=usr/lib/pam_ftp.so.2 +# 20131013: Removal of the ATF tools +OLD_DIRS+=etc/atf +OLD_DIRS+=usr/share/examples/atf +OLD_DIRS+=usr/share/xml/atf +OLD_DIRS+=usr/share/xml +OLD_DIRS+=usr/share/xsl/atf +OLD_DIRS+=usr/share/xsl # 20040925: bind9 import OLD_DIRS+=usr/share/doc/bind/html OLD_DIRS+=usr/share/doc/bind/misc Modified: projects/camlock/UPDATING ============================================================================== --- projects/camlock/UPDATING Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/UPDATING Tue Oct 15 18:07:23 2013 (r256554) @@ -16,8 +16,8 @@ from older versions of FreeBSD, try WITH head, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW: - FreeBSD 10.x has many debugging features turned on, in both the kernel +NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW: + FreeBSD 11.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They also substantially impact @@ -31,6 +31,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131014: + libbsdyml has been renamed to libyaml and moved to /usr/lib/private. + This will break ports-mgmt/pkg. Rebuild the port, or upgrade to pkg + 1.1.4_8 and verify bsdyml not linked in, before running "make + delete-old-libs": + # make -C /usr/ports/ports-mgmt/pkg build deinstall install clean + or + # pkg install pkg; ldd /usr/local/sbin/pkg | grep bsdyml + 20131010: The rc.d/jail script has been updated to support jail(8) configuration file. The "jail__*" rc.conf(5) variables Modified: projects/camlock/bin/freebsd-version/freebsd-version.sh.in ============================================================================== --- projects/camlock/bin/freebsd-version/freebsd-version.sh.in Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/bin/freebsd-version/freebsd-version.sh.in Tue Oct 15 18:07:23 2013 (r256554) @@ -81,7 +81,7 @@ userland_version() { # Print a usage string and exit. # usage() { - echo "usage: $progname [-ku]\n" >&2 + echo "usage: $progname [-ku]" >&2 exit 1 } Modified: projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Tue Oct 15 18:07:23 2013 (r256554) @@ -242,8 +242,14 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION_ /* XXX */ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); #elif defined(__powerpc__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + /* + * Add 4 bytes to hit the low half of this 64-bit + * big-endian address. + */ + rel->r_offset = s->dofs_offset + + dofr[j].dofr_offset + 4; + rel->r_info = ELF32_R_INFO(count + dep->de_global, + R_PPC_REL32); #elif defined(__sparc) /* * Add 4 bytes to hit the low half of this 64-bit @@ -423,7 +429,10 @@ prepare_elf64(dtrace_hdl_t *dtp, const d #elif defined(__mips__) /* XXX */ #elif defined(__powerpc__) -/* XXX */ + rel->r_offset = s->dofs_offset + + dofr[j].dofr_offset; + rel->r_info = ELF64_R_INFO(count + dep->de_global, + R_PPC64_REL64); #elif defined(__i386) || defined(__amd64) rel->r_offset = s->dofs_offset + dofr[j].dofr_offset; @@ -824,12 +833,84 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION_ return (0); } #elif defined(__powerpc__) +/* The sentinel is 'xor r3,r3,r3'. */ +#define DT_OP_XOR_R3 0x7c631a78 + +#define DT_OP_NOP 0x60000000 +#define DT_OP_BLR 0x4e800020 + +/* This captures all forms of branching to address. */ +#define DT_IS_BRANCH(inst) ((inst & 0xfc000000) == 0x48000000) +#define DT_IS_BL(inst) (DT_IS_BRANCH(inst) && (inst & 0x01)) + /* XXX */ static int dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela, uint32_t *off) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + uint32_t *ip; + + if ((rela->r_offset & (sizeof (uint32_t) - 1)) != 0) + return (-1); + + /*LINTED*/ + ip = (uint32_t *)(p + rela->r_offset); + + /* + * We only know about some specific relocation types. + */ + if (GELF_R_TYPE(rela->r_info) != R_PPC_REL24 && + GELF_R_TYPE(rela->r_info) != R_PPC_PLTREL24) + return (-1); + + /* + * We may have already processed this object file in an earlier linker + * invocation. Check to see if the present instruction sequence matches + * the one we would install below. + */ + if (isenabled) { + if (ip[0] == DT_OP_XOR_R3) { + (*off) += sizeof (ip[0]); + return (0); + } + } else { + if (ip[0] == DT_OP_NOP) { + (*off) += sizeof (ip[0]); + return (0); + } + } + + /* + * We only expect branch to address instructions. + */ + if (!DT_IS_BRANCH(ip[0])) { + dt_dprintf("found %x instead of a branch instruction at %llx\n", + ip[0], (u_longlong_t)rela->r_offset); + return (-1); + } + + if (isenabled) { + /* + * It would necessarily indicate incorrect usage if an is- + * enabled probe were tail-called so flag that as an error. + * It's also potentially (very) tricky to handle gracefully, + * but could be done if this were a desired use scenario. + */ + if (!DT_IS_BL(ip[0])) { + dt_dprintf("tail call to is-enabled probe at %llx\n", + (u_longlong_t)rela->r_offset); + return (-1); + } + + ip[0] = DT_OP_XOR_R3; + (*off) += sizeof (ip[0]); + } else { + if (DT_IS_BL(ip[0])) + ip[0] = DT_OP_NOP; + else + ip[0] = DT_OP_BLR; + } + return (0); } Modified: projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c ============================================================================== --- projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c Tue Oct 15 18:07:23 2013 (r256554) @@ -35,14 +35,26 @@ #include #include +#include + /*ARGSUSED*/ int dt_pid_create_entry_probe(struct ps_prochandle *P, dtrace_hdl_t *dtp, fasttrap_probe_spec_t *ftp, const GElf_Sym *symp) { + ftp->ftps_type = DTFTP_ENTRY; + ftp->ftps_pc = (uintptr_t)symp->st_value; + ftp->ftps_size = (size_t)symp->st_size; + ftp->ftps_noffs = 1; + ftp->ftps_offs[0] = 0; + + if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) { + dt_dprintf("fasttrap probe creation ioctl failed: %s\n", + strerror(errno)); + return (dt_set_errno(dtp, errno)); + } - dt_dprintf("%s: unimplemented\n", __func__); - return (DT_PROC_ERR); + return (1); } int @@ -50,8 +62,74 @@ dt_pid_create_return_probe(struct ps_pro fasttrap_probe_spec_t *ftp, const GElf_Sym *symp, uint64_t *stret) { - dt_dprintf("%s: unimplemented\n", __func__); - return (DT_PROC_ERR); + uintptr_t temp; + uint32_t *text; + int i; + int srdepth = 0; + + if ((text = malloc(symp->st_size + 4)) == NULL) { + dt_dprintf("mr sparkle: malloc() failed\n"); + return (DT_PROC_ERR); + } + + if (Pread(P, text, symp->st_size, symp->st_value) != symp->st_size) { + dt_dprintf("mr sparkle: Pread() failed\n"); + free(text); + return (DT_PROC_ERR); + } + + /* + * Leave a dummy instruction in the last slot to simplify edge + * conditions. + */ + text[symp->st_size / 4] = 0; + + ftp->ftps_type = DTFTP_RETURN; + ftp->ftps_pc = symp->st_value; + ftp->ftps_size = symp->st_size; + ftp->ftps_noffs = 0; + + for (i = 0; i < symp->st_size / 4; i++) { + + if ((text[i] & 0xfc000001) != 0x48000000 && + text[i] != 0x4e800020) + continue; + + /* + * Check for a jump within this function. If it's outside this + * function then it's a tail-call, so a return point. + */ + if ((text[i] & 0xfc000000) == 0x48000000) { + temp = (text[i] & 0x03fffffc); + /* Bit 30 denotes an absolute address. */ + if (!(text[i] & 0x02)) { + temp += symp->st_value + i * 4; + } + else { + /* Sign extend the absolute address. */ + if (temp & 0x02000000) { + temp |= (UINTPTR_MAX - 0x03ffffff); + } + } + if (temp >= symp->st_value && + temp <= (symp->st_value + symp->st_size)) + continue; + } + dt_dprintf("return at offset %x\n", i * 4); + ftp->ftps_offs[ftp->ftps_noffs++] = i * 4; + } + + free(text); + if (ftp->ftps_noffs > 0) { + if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) { + dt_dprintf("fasttrap probe creation ioctl failed: %s\n", + strerror(errno)); + return (dt_set_errno(dtp, errno)); + } + } + + + return (ftp->ftps_noffs); } /*ARGSUSED*/ @@ -59,9 +137,22 @@ int dt_pid_create_offset_probe(struct ps_prochandle *P, dtrace_hdl_t *dtp, fasttrap_probe_spec_t *ftp, const GElf_Sym *symp, ulong_t off) { + if (off & 0x3) + return (DT_PROC_ALIGN); - dt_dprintf("%s: unimplemented\n", __func__); - return (DT_PROC_ERR); + ftp->ftps_type = DTFTP_OFFSETS; + ftp->ftps_pc = (uintptr_t)symp->st_value; + ftp->ftps_size = (size_t)symp->st_size; + ftp->ftps_noffs = 1; + ftp->ftps_offs[0] = off; + + if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) { + dt_dprintf("fasttrap probe creation ioctl failed: %s\n", + strerror(errno)); + return (dt_set_errno(dtp, errno)); + } + + return (1); } /*ARGSUSED*/ @@ -69,7 +160,38 @@ int dt_pid_create_glob_offset_probes(struct ps_prochandle *P, dtrace_hdl_t *dtp, fasttrap_probe_spec_t *ftp, const GElf_Sym *symp, const char *pattern) { + ulong_t i; + + ftp->ftps_type = DTFTP_OFFSETS; + ftp->ftps_pc = (uintptr_t)symp->st_value; + ftp->ftps_size = (size_t)symp->st_size; + ftp->ftps_noffs = 0; + + /* + * If we're matching against everything, just iterate through each + * instruction in the function, otherwise look for matching offset + * names by constructing the string and comparing it against the + * pattern. + */ + if (strcmp("*", pattern) == 0) { + for (i = 0; i < symp->st_size; i += 4) { + ftp->ftps_offs[ftp->ftps_noffs++] = i; + } + } else { + char name[sizeof (i) * 2 + 1]; + + for (i = 0; i < symp->st_size; i += 4) { + (void) sprintf(name, "%lx", i); + if (gmatch(name, pattern)) + ftp->ftps_offs[ftp->ftps_noffs++] = i; + } + } + + if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) { + dt_dprintf("fasttrap probe creation ioctl failed: %s\n", + strerror(errno)); + return (dt_set_errno(dtp, errno)); + } - dt_dprintf("%s: unimplemented\n", __func__); - return (DT_PROC_ERR); + return (ftp->ftps_noffs); } Modified: projects/camlock/contrib/ipfilter/ipf.h ============================================================================== --- projects/camlock/contrib/ipfilter/ipf.h Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/contrib/ipfilter/ipf.h Tue Oct 15 18:07:23 2013 (r256554) @@ -42,9 +42,10 @@ struct file; #include #include #include -#if __FreeBSD_version >= 300000 -# include -#endif + +#define _WANT_IFADDR +#include + #include #include #include Modified: projects/camlock/etc/Makefile ============================================================================== --- projects/camlock/etc/Makefile Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/etc/Makefile Tue Oct 15 18:07:23 2013 (r256554) @@ -215,9 +215,6 @@ distribution: echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ ) | ${METALOG.add} .endif -.if ${MK_ATF} != "no" - ${_+_}cd ${.CURDIR}/atf; ${MAKE} install -.endif .if ${MK_BLUETOOTH} != "no" ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install .endif Modified: projects/camlock/etc/defaults/periodic.conf ============================================================================== --- projects/camlock/etc/defaults/periodic.conf Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/etc/defaults/periodic.conf Tue Oct 15 18:07:23 2013 (r256554) @@ -190,7 +190,7 @@ weekly_noid_dirs="/" # Look here # 400.status-pkg weekly_status_pkg_enable="NO" # Find out-of-date pkgs pkg_version=pkg_version # Use this program -pkg_version_index=/usr/ports/INDEX-10 # Use this index file +pkg_version_index=/usr/ports/INDEX-11 # Use this index file # 450.status-security weekly_status_security_enable="YES" # Security check Modified: projects/camlock/etc/defaults/rc.conf ============================================================================== --- projects/camlock/etc/defaults/rc.conf Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/etc/defaults/rc.conf Tue Oct 15 18:07:23 2013 (r256554) @@ -651,6 +651,7 @@ entropy_save_num="8" # Number of entropy harvest_interrupt="YES" # Entropy device harvests interrupt randomness harvest_ethernet="YES" # Entropy device harvests ethernet randomness harvest_p_to_p="YES" # Entropy device harvests point-to-point randomness +harvest_swi="YES" # Entropy device harvests internal SWI randomness dmesg_enable="YES" # Save dmesg(8) to /var/run/dmesg.boot watchdogd_enable="NO" # Start the software watchdog daemon watchdogd_flags="" # Flags to watchdogd (if enabled) Modified: projects/camlock/etc/ftpusers ============================================================================== --- projects/camlock/etc/ftpusers Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/etc/ftpusers Tue Oct 15 18:07:23 2013 (r256554) @@ -15,7 +15,6 @@ man sshd smmsp mailnull -_atf bind unbound proxy Modified: projects/camlock/etc/group ============================================================================== --- projects/camlock/etc/group Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/etc/group Tue Oct 15 18:07:23 2013 (r256554) @@ -16,7 +16,6 @@ staff:*:20: sshd:*:22: smmsp:*:25: mailnull:*:26: -_atf:*:27: guest:*:31: bind:*:53: unbound:*:59: Modified: projects/camlock/etc/master.passwd ============================================================================== --- projects/camlock/etc/master.passwd Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/etc/master.passwd Tue Oct 15 18:07:23 2013 (r256554) @@ -13,7 +13,6 @@ man:*:9:9::0:0:Mister Man Pages:/usr/sha sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin -_atf:*:27:27::0:0:& pseudo-user:/nonexistent:/usr/sbin/nologin bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin Modified: projects/camlock/etc/mtree/BSD.root.dist ============================================================================== --- projects/camlock/etc/mtree/BSD.root.dist Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/etc/mtree/BSD.root.dist Tue Oct 15 18:07:23 2013 (r256554) @@ -24,8 +24,6 @@ etc X11 .. - atf - .. bluetooth .. defaults Modified: projects/camlock/etc/mtree/BSD.usr.dist ============================================================================== --- projects/camlock/etc/mtree/BSD.usr.dist Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/etc/mtree/BSD.usr.dist Tue Oct 15 18:07:23 2013 (r256554) @@ -299,8 +299,6 @@ .. IPv6 .. - atf - .. bhyve .. bootforth @@ -1410,14 +1408,6 @@ catalog .. .. - xml - atf - .. - .. - xsl - atf - .. - .. zoneinfo Africa .. Modified: projects/camlock/etc/rc.d/initrandom ============================================================================== --- projects/camlock/etc/rc.d/initrandom Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/etc/rc.d/initrandom Tue Oct 15 18:07:23 2013 (r256554) @@ -14,26 +14,6 @@ name="initrandom" start_cmd="initrandom_start" stop_cmd=":" -feed_dev_random() -{ - if [ -f "${1}" -a -r "${1}" -a -s "${1}" ]; then - cat "${1}" | dd of=/dev/random bs=8k 2>/dev/null - fi -} - -better_than_nothing() -{ - # XXX temporary until we can improve the entropy - # harvesting rate. - # Entropy below is not great, but better than nothing. - # This unblocks the generator at startup - # Note: commands are ordered to cause the most variance across reboots. - ( kenv; dmesg; df -ib; ps -fauxww; date; sysctl -a ) \ - | dd of=/dev/random bs=8k 2>/dev/null - /sbin/sha256 -q `sysctl -n kern.bootfile` \ - | dd of=/dev/random bs=8k 2>/dev/null -} - initrandom_start() { soft_random_generator=`sysctl kern.random 2>/dev/null` @@ -63,23 +43,15 @@ initrandom_start() else ${SYSCTL} kern.random.sys.harvest.point_to_point=0 >/dev/null fi - fi - # First pass at reseeding /dev/random. - # - case ${entropy_file} in - [Nn][Oo] | '') - ;; - *) - if [ -w /dev/random ]; then - feed_dev_random "${entropy_file}" + if checkyesno harvest_swi; then + ${SYSCTL} kern.random.sys.harvest.swi=1 >/dev/null + echo -n ' swi' + else + ${SYSCTL} kern.random.sys.harvest.swi=0 >/dev/null fi - ;; - esac - - better_than_nothing + fi - echo -n ' kickstart' fi echo '.' Modified: projects/camlock/etc/rc.d/jail ============================================================================== --- projects/camlock/etc/rc.d/jail Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/etc/rc.d/jail Tue Oct 15 18:07:23 2013 (r256554) @@ -22,7 +22,7 @@ status_cmd="jail_status" extra_commands="config console status" : ${jail_conf:=/etc/jail.conf} : ${jail_program:=/usr/sbin/jail} -: ${jail_consolecmd:=/bin/sh} +: ${jail_consolecmd:=/usr/bin/login -f root} : ${jail_jexec:=/usr/sbin/jexec} : ${jail_jls:=/usr/sbin/jls} @@ -94,7 +94,7 @@ extract_var() # parse_options() { - local _j + local _j _p _j=$1 _confwarn=0 @@ -166,7 +166,7 @@ parse_options() jail_handle_ips_option $_ip $_interface alias=0 while : ; do - eval _x=\"\$jail_${_jail}_ip_multi${alias}\" + eval _x=\"\$jail_${_j}_ip_multi${alias}\" [ -z "$_x" ] && break jail_handle_ips_option $_x $_interface @@ -208,6 +208,7 @@ parse_options() eval : \${jail_${_j}_devfs_enable:=${jail_devfs_enable:-NO}} if checkyesno jail_${_j}_devfs_enable; then echo " mount.devfs;" + eval _ruleset=\${jail_${_j}_devfs_ruleset:-${jail_devfs_ruleset}} case $_ruleset in "") ;; [0-9]*) echo " devfs_ruleset = \"$_ruleset\";" ;; @@ -217,7 +218,7 @@ parse_options() # mount(8) only accepts an integer. # This should accept a ruleset name. ;; - *) warn "devfs_ruleset must be integer." ;; + *) warn "devfs_ruleset must be an integer." ;; esac if [ -r $_fstab ]; then echo " mount.fstab = \"$_fstab\";" @@ -226,8 +227,7 @@ parse_options() eval : \${jail_${_j}_fdescfs_enable:=${jail_fdescfs_enable:-NO}} if checkyesno jail_${_j}_fdescfs_enable; then - echo " mount += " \ - "\"fdescfs ${_rootdir%/}/dev/fd fdescfs rw 0 0\";" + echo " mount.fdescfs;" fi eval : \${jail_${_j}_procfs_enable:=${jail_procfs_enable:-NO}} if checkyesno jail_${_j}_procfs_enable; then @@ -235,8 +235,6 @@ parse_options() "\"procfs ${_rootdir%/}/proc procfs rw 0 0\";" fi - echo " ${_parameters};" - eval : \${jail_${_j}_mount_enable:=${jail_mount_enable:-NO}} if checkyesno jail_${_j}_mount_enable; then echo " allow.mount;" >> $_conf @@ -244,6 +242,9 @@ parse_options() extract_var $_j set_hostname_allow allow.set_hostname YN NO extract_var $_j sysvipc_allow allow.sysvipc YN NO + for _p in $_parameters; do + echo " ${_p%\;};" + done echo "}" ) >> $_conf @@ -328,9 +329,9 @@ jail_extract_address() # jail_handle_ips_option() { - local _x _type _i _iface + local _x _type _i _defif _x=$1 - _iface=$2 + _defif=$2 if [ -z "${_x}" ]; then # No IP given. This can happen for the primary address @@ -354,7 +355,8 @@ jail_handle_ips_option() _type="" _addr="" _mask="" - jail_extract_address $_i $_iface + _iface="" + jail_extract_address $_i $_defif # make sure we got an address. case $_addr in @@ -365,10 +367,10 @@ jail_handle_ips_option() # Append address to list of addresses for the jail command. case $_type in inet) - echo " ip4.addr += \"${_addr}${_mask}\";" + echo " ip4.addr += \"${_iface}|${_addr}${_mask}\";" ;; inet6) - echo " ip6.addr += \"${_addr}${_mask}\";" + echo " ip6.addr += \"${_iface}|${_addr}${_mask}\";" need_dad_wait=1 ;; esac @@ -377,26 +379,35 @@ jail_handle_ips_option() jail_config() { + local _j + case $1 in _ALL) return ;; esac - for _jail in $@; do - if parse_options $_jail; then - echo "$_jail: parameters are in $_conf." + for _j in $@; do + _j=$(echo $_j | tr /. _) + if parse_options $_j; then + echo "$_j: parameters are in $_conf." fi done } jail_console() { + local _j _cmd + # One argument that is not _ALL. case $#:$1 in - 1:_ALL) err 3 "Specify a jail name." ;; - 1:*) ;; - *) err 3 "Specify a jail name." ;; + 0:*|1:_ALL) err 3 "Specify a jail name." ;; + 1:*) ;; + esac + _j=$(echo $1 | tr /. _) + shift + case $# in + 0) eval _cmd=\${jail_${_j}_consolecmd:-$jail_consolecmd} ;; + *) _cmd=$@ ;; esac - eval _cmd=\${jail_$1_consolecmd:-$jail_consolecmd} - $jail_jexec $1 $_cmd + $jail_jexec $_j $_cmd } jail_status() @@ -407,6 +418,8 @@ jail_status() jail_start() { + local _j _jid _jn + if [ $# = 0 ]; then return fi @@ -417,28 +430,40 @@ jail_start() command=$jail_program rc_flags=$jail_flags command_args="-f $jail_conf -c" - $command $rc_flags $command_args "*" + $jail_jls -nq | while read IN; do + _jn=$(echo $IN | tr " " "\n" | grep name=) + _jid=$(echo $IN | tr " " "\n" | grep jid=) + if $command $rc_flags $command_args ${_jn#name=}; then + echo -n " ${_jn#name=}" + echo "${_jid#jid=}" \ + > /var/run/jail_${_jn#name=}.id + fi + done echo '.' return ;; esac _tmp=`mktemp -t jail` || exit 3 - for _jail in $@; do - parse_options $_jail || continue + for _j in $@; do + _j=$(echo $_j | tr /. _) + parse_options $_j || continue eval rc_flags=\${jail_${_j}_flags:-$jail_flags} eval command=\${jail_${_j}_program:-$jail_program} if checkyesno jail_parallel_start; then - command_args="-i -f $_conf -c $_jail &" + command_args="-i -f $_conf -c $_j &" else - command_args="-i -f $_conf -c $_jail" + command_args="-i -f $_conf -c $_j" fi if $command $rc_flags $command_args \ >> $_tmp 2>&1 /var/run/jail_${_j}.id else - echo " cannot start jail \"${_hostname:-${jail}}\": " - tail +2 $_tmp + rm -f /var/run/jail_${_j}.id + echo " cannot start jail \"${_hostname:-${_j}}\": " + cat $_tmp fi rm -f $_tmp done @@ -447,6 +472,8 @@ jail_start() jail_stop() { + local _j _jn + if [ $# = 0 ]; then return fi @@ -457,16 +484,29 @@ jail_stop() command=$jail_program rc_flags=$jail_flags command_args="-f $jail_conf -r" - $command $rc_flags $command_args "*" + $jail_jls -nq | while read IN; do + _jn=$(echo $IN | tr " " "\n" | grep name=) + echo -n " ${_jn#name=}" + $command $rc_flags $command_args ${_jn#name=} + if ! $jail_jls -j ${_jn#name=} > /dev/null 2>&1; then + rm -f /var/run/jail_${_jn#name=}.id + fi + done echo '.' return ;; esac - for _jail in $@; do - parse_options $_jail || continue + for _j in $@; do + _j=$(echo $_j | tr /. _) + parse_options $_j || continue + if ! $jail_jls -j $_j > /dev/null 2>&1; then + continue + fi eval command=\${jail_${_j}_program:-$jail_program} - if $command -q -f $_conf -r $_jail; then - echo -n " ${_hostname:-${_jail}}" + echo -n " ${_hostname:-${_j}}" + $command -q -f $_conf -r $_j + if ! $jail_jls -j $_j > /dev/null 2>&1; then + rm -f /var/run/jail_${_j}.id fi done echo '.' Modified: projects/camlock/gnu/usr.bin/cc/cc_tools/freebsd-native.h ============================================================================== --- projects/camlock/gnu/usr.bin/cc/cc_tools/freebsd-native.h Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/gnu/usr.bin/cc/cc_tools/freebsd-native.h Tue Oct 15 18:07:23 2013 (r256554) @@ -7,8 +7,8 @@ #define FREEBSD_NATIVE 1 /* Fake out gcc/config/freebsd.h. */ -#define FBSD_MAJOR 10 -#define FBSD_CC_VER 1000001 /* form like __FreeBSD_version */ +#define FBSD_MAJOR 11 +#define FBSD_CC_VER 1100001 /* form like __FreeBSD_version */ #undef SYSTEM_INCLUDE_DIR /* We don't need one for now. */ #undef TOOL_INCLUDE_DIR /* We don't need one for now. */ Modified: projects/camlock/gnu/usr.bin/groff/tmac/mdoc.local ============================================================================== --- projects/camlock/gnu/usr.bin/groff/tmac/mdoc.local Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/gnu/usr.bin/groff/tmac/mdoc.local Tue Oct 15 18:07:23 2013 (r256554) @@ -45,7 +45,7 @@ .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads) . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~10.0 +.ds doc-default-operating-system FreeBSD\~11.0 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-7.4 7.4 @@ -54,6 +54,7 @@ .ds doc-operating-system-FreeBSD-9.1 9.1 .ds doc-operating-system-FreeBSD-9.2 9.2 .ds doc-operating-system-FreeBSD-10.0 10.0 +.ds doc-operating-system-FreeBSD-11.0 11.0 . .\" Definitions not (yet) in doc-syms . Modified: projects/camlock/lib/clang/clang.build.mk ============================================================================== --- projects/camlock/lib/clang/clang.build.mk Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/lib/clang/clang.build.mk Tue Oct 15 18:07:23 2013 (r256554) @@ -27,8 +27,8 @@ TARGET_ABI= gnueabi TARGET_ABI= unknown .endif -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0 -BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.0 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 +BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd11.0 CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \ -DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \ -DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\" Modified: projects/camlock/lib/libc/gen/getutxent.c ============================================================================== --- projects/camlock/lib/libc/gen/getutxent.c Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/lib/libc/gen/getutxent.c Tue Oct 15 18:07:23 2013 (r256554) @@ -122,9 +122,20 @@ getfutxent(struct futx *fu) if (udb == UTXDB_LOG) { uint16_t len; +retry: if (fread(&len, sizeof(len), 1, uf) != 1) return (-1); len = be16toh(len); + if (len == 0) { + /* + * XXX: Though zero-size records are valid in theory, + * they can never occur in practice. Zero-size records + * indicate file corruption. Seek one byte forward, to + * see if we can find a record there. + */ + ungetc('\0', uf); + goto retry; + } if (len > sizeof *fu) { /* Forward compatibility. */ if (fread(fu, sizeof(*fu), 1, uf) != 1) Modified: projects/camlock/lib/libcrypt/tests/crypt_tests.c ============================================================================== --- projects/camlock/lib/libcrypt/tests/crypt_tests.c Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/lib/libcrypt/tests/crypt_tests.c Tue Oct 15 18:07:23 2013 (r256554) @@ -43,7 +43,7 @@ ATF_TC_BODY(invalid, tc) /* * This function must not do anything except enumerate - * the test cases, else atf-run is likely to be upset. + * the test cases, per atf-c-api(3). */ ATF_TP_ADD_TCS(tp) { Modified: projects/camlock/lib/libyaml/Makefile ============================================================================== --- projects/camlock/lib/libyaml/Makefile Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/lib/libyaml/Makefile Tue Oct 15 18:07:23 2013 (r256554) @@ -2,15 +2,13 @@ LIBYAML= ${.CURDIR}/../../contrib/libyaml -LIB= bsdyml -SHLIB_MAJOR= 0 -INCS= bsdyml.h +LIB= yaml +PRIVATELIB= true +SHLIB_MAJOR= 1 SRCS= api.c dumper.c emitter.c loader.c \ parser.c reader.c scanner.c writer.c -MAN= libbsdyml.3 .PATH: ${LIBYAML}/src ${LIBYAML}/include -CLEANFILES= bsdyml.h WARNS?= 1 CFLAGS+= -I${LIBYAML}/include \ @@ -18,7 +16,4 @@ CFLAGS+= -I${LIBYAML}/include \ -I${.CURDIR} \ -DHAVE_CONFIG_H -bsdyml.h: yaml.h - cp -f ${.ALLSRC} ${.TARGET} - .include Modified: projects/camlock/release/Makefile ============================================================================== --- projects/camlock/release/Makefile Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/release/Makefile Tue Oct 15 18:07:23 2013 (r256554) @@ -122,7 +122,8 @@ system: packagesystem # Install system mkdir -p release cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \ - DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 + DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \ + WITHOUT_PROFILE=1 # Copy distfiles mkdir -p release/usr/freebsd-dist cp *.txz MANIFEST release/usr/freebsd-dist Modified: projects/camlock/sbin/camcontrol/modeedit.c ============================================================================== --- projects/camlock/sbin/camcontrol/modeedit.c Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/sbin/camcontrol/modeedit.c Tue Oct 15 18:07:23 2013 (r256554) @@ -886,12 +886,12 @@ mode_list(struct cam_device *device, int timeout, data, sizeof(data)); mh = (struct scsi_mode_header_6 *)data; - len = mh->blk_desc_len; /* Skip block descriptors. */ + len = sizeof(*mh) + mh->blk_desc_len; /* Skip block descriptors. */ /* Iterate through the pages in the reply. */ while (len < mh->data_length) { /* Locate the next mode page header. */ mph = (struct scsi_mode_page_header *) - ((intptr_t)mh + sizeof(*mh) + len); + ((intptr_t)mh + len); mph->page_code &= SMS_PAGE_CODE; nameentry = nameentry_lookup(mph->page_code); Modified: projects/camlock/sbin/iscontrol/iscsi.conf.5 ============================================================================== --- projects/camlock/sbin/iscontrol/iscsi.conf.5 Tue Oct 15 18:06:33 2013 (r256553) +++ projects/camlock/sbin/iscontrol/iscsi.conf.5 Tue Oct 15 18:07:23 2013 (r256554) @@ -24,18 +24,20 @@ .\" .\" $FreeBSD$ .\" -.Dd June 5, 2007 +.Dd October 10, 2013 .Dt ISCSI.CONF 5 .Os .Sh NAME .Nm iscsi.conf -.Nd key options to be negotiated in an iSCSI session +.Nd iSCSI initiator configuration file .Sh DESCRIPTION The file .Nm , -is read by the +is used by the +.Xr iscsictl 8 +and .Xr iscontrol 8 -program. +utilities. It contains declarations and parameter/key-options. The syntax is very simple, .D1 Li variable = value; @@ -69,9 +71,6 @@ Default is none. .It Cm DataDigest same as for HeaderDigest, but on the data part of the iSCSI PDU. (not yet tested) -.It Cm MaxConnections -is the number of simultaneous connections per session, -currently only 1. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Oct 15 19:48:01 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B31CD402; Tue, 15 Oct 2013 19:48:01 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8B5542371; Tue, 15 Oct 2013 19:48:01 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id AD85EB962; Tue, 15 Oct 2013 15:48:00 -0400 (EDT) From: John Baldwin To: Alexander Motin Subject: Re: svn commit: r254846 - projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Date: Tue, 15 Oct 2013 15:24:00 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20130906; KDE/4.5.5; amd64; ; ) References: <201308251121.r7PBLA3v033536@svn.freebsd.org> <201308261425.34743.jhb@freebsd.org> <525CF9FC.2000109@FreeBSD.org> In-Reply-To: <525CF9FC.2000109@FreeBSD.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201310151524.00731.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Tue, 15 Oct 2013 15:48:00 -0400 (EDT) Cc: svn-src-projects@freebsd.org, Adrian Chadd , "src-committers@freebsd.org" X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Oct 2013 19:48:01 -0000 On Tuesday, October 15, 2013 4:17:00 am Alexander Motin wrote: > On 26.08.2013 21:25, John Baldwin wrote: > > On Sunday, August 25, 2013 9:29:06 am Alexander Motin wrote: > >> On 25.08.2013 15:48, Adrian Chadd wrote: > >>> Surely there's a better way to check whether a thread can sleep besides > >>> digging around in curthread->td_no_sleeping ? What about adding an > >>> accessor macro along side THREAD_SLEEPING_OK and THREAD_NO_SLEEPING ? > >> > >> That sounds good to me. I was also surprised such macros are not there > >> yet when found some code doing these checks just the same way as I did. > > > > It was never intended to be public, only as a debugging aid for assertions. :( > > I had hoped that the calling code would know when it was in an ithread or not > > and call different routines as needed (i.e. that the programmer would > > intentionally think about the context they were in). Perhaps this is not > > realistic? Are you really queueing new I/O from ithreads and/or timers? > > I've found potential case where it is not realistic. Requests are > normally completed from the interrupt threads. Completion caller does > know that it is impossible to sleep in that context. But it holds no > locks, it is re-enterable, and so it allows direct completion. Request > goes up the stack and at some point on the call chain this completion > triggers another request to be sent down (may be even to some different > device), but again directly. This new request sender knows nothing about > interrupt context and the fact it can't sleep. > > Can you propose some other way to deal with such case other then using > per-thread flag/counter? I could use separate per-thread counter, > incremented during up call, but I don't see much benefits form it. If > you don't want it to be system-wide accessible to not relax people too > much, I could create GEOM-specific wrapper for it. I don't really have a better option than using it. Please at least make a wrapper macro as Adrian suggested around td_no_sleeping. -- John Baldwin From owner-svn-src-projects@FreeBSD.ORG Tue Oct 15 21:02:03 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 07F3C62E; Tue, 15 Oct 2013 21:02:03 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E93582867; Tue, 15 Oct 2013 21:02:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FL226N098804; Tue, 15 Oct 2013 21:02:02 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FL22R4098803; Tue, 15 Oct 2013 21:02:02 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310152102.r9FL22R4098803@svn.freebsd.org> From: Alexander Motin Date: Tue, 15 Oct 2013 21:02:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256559 - projects/camlock/sys/cam X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Oct 2013 21:02:03 -0000 Author: mav Date: Tue Oct 15 21:02:02 2013 New Revision: 256559 URL: http://svnweb.freebsd.org/changeset/base/256559 Log: Assert proper lock in newly MFC'ed code. Modified: projects/camlock/sys/cam/cam_xpt.c Modified: projects/camlock/sys/cam/cam_xpt.c ============================================================================== --- projects/camlock/sys/cam/cam_xpt.c Tue Oct 15 21:00:30 2013 (r256558) +++ projects/camlock/sys/cam/cam_xpt.c Tue Oct 15 21:02:02 2013 (r256559) @@ -1071,7 +1071,7 @@ xpt_denounce_periph(struct cam_periph *p { struct cam_path *path = periph->path; - mtx_assert(periph->sim->mtx, MA_OWNED); + cam_periph_assert(periph, MA_OWNED); printf("%s%d at %s%d bus %d scbus%d target %d lun %d\n", periph->periph_name, periph->unit_number, path->bus->sim->sim_name, From owner-svn-src-projects@FreeBSD.ORG Tue Oct 15 21:04:19 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 58B5D7FB; Tue, 15 Oct 2013 21:04:19 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2CB63288E; Tue, 15 Oct 2013 21:04:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FL4Jh6099689; Tue, 15 Oct 2013 21:04:19 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FL4IpR099686; Tue, 15 Oct 2013 21:04:18 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310152104.r9FL4IpR099686@svn.freebsd.org> From: Alexander Motin Date: Tue, 15 Oct 2013 21:04:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256560 - in projects/camlock/sys: cddl/contrib/opensolaris/uts/common/fs/zfs geom sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Oct 2013 21:04:19 -0000 Author: mav Date: Tue Oct 15 21:04:18 2013 New Revision: 256560 URL: http://svnweb.freebsd.org/changeset/base/256560 Log: Introduce THREAD_CAN_SLEEP() to check whether current thread is allowed to sleep by checking ((curthread)->td_no_sleeping == 0). Use that to find out whether GEOM and classes code can sleep. Previous check for one of GEOM threads was insufficient because request can be sent from other unrelated request bio_done() method called at interrupt thread, where sleeping is prohibited. Modified: projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/camlock/sys/geom/geom_io.c projects/camlock/sys/sys/proc.h Modified: projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c ============================================================================== --- projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c Tue Oct 15 21:02:02 2013 (r256559) +++ projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c Tue Oct 15 21:04:18 2013 (r256560) @@ -2261,14 +2261,14 @@ zvol_geom_start(struct bio *bp) ASSERT(zv != NULL); switch (bp->bio_cmd) { case BIO_FLUSH: - if (g_is_geom_thread(curthread)) + if (!THREAD_CAN_SLEEP()) goto enqueue; zil_commit(zv->zv_zilog, ZVOL_OBJ); g_io_deliver(bp, 0); break; case BIO_READ: case BIO_WRITE: - if (g_is_geom_thread(curthread)) + if (!THREAD_CAN_SLEEP()) goto enqueue; zvol_strategy(bp); break; Modified: projects/camlock/sys/geom/geom_io.c ============================================================================== --- projects/camlock/sys/geom/geom_io.c Tue Oct 15 21:02:02 2013 (r256559) +++ projects/camlock/sys/geom/geom_io.c Tue Oct 15 21:04:18 2013 (r256560) @@ -518,7 +518,9 @@ g_io_request(struct bio *bp, struct g_co #ifdef GET_STACK_USAGE direct = (cp->flags & G_CF_DIRECT_SEND) && (pp->flags & G_PF_DIRECT_RECEIVE) && - !g_is_geom_thread(curthread); + !g_is_geom_thread(curthread) && + (((pp->flags & G_PF_ACCEPT_UNMAPPED) == 0 && + (bp->bio_flags & BIO_UNMAPPED) != 0) || THREAD_CAN_SLEEP()); if (direct) { /* Block direct execution if less then half of stack left. */ size_t st, su; Modified: projects/camlock/sys/sys/proc.h ============================================================================== --- projects/camlock/sys/sys/proc.h Tue Oct 15 21:02:02 2013 (r256559) +++ projects/camlock/sys/sys/proc.h Tue Oct 15 21:04:18 2013 (r256560) @@ -793,6 +793,8 @@ extern pid_t pid_max; #define THREAD_SLEEPING_OK() ((curthread)->td_no_sleeping--) +#define THREAD_CAN_SLEEP() ((curthread)->td_no_sleeping == 0) + #define PIDHASH(pid) (&pidhashtbl[(pid) & pidhash]) extern LIST_HEAD(pidhashhead, proc) *pidhashtbl; extern u_long pidhash; From owner-svn-src-projects@FreeBSD.ORG Wed Oct 16 05:43:03 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id ADE1CAAB; Wed, 16 Oct 2013 05:43:03 +0000 (UTC) (envelope-from grehan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9A5D121F4; Wed, 16 Oct 2013 05:43:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9G5h36E087164; Wed, 16 Oct 2013 05:43:03 GMT (envelope-from grehan@svn.freebsd.org) Received: (from grehan@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9G5h37q087163; Wed, 16 Oct 2013 05:43:03 GMT (envelope-from grehan@svn.freebsd.org) Message-Id: <201310160543.r9G5h37q087163@svn.freebsd.org> From: Peter Grehan Date: Wed, 16 Oct 2013 05:43:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256588 - projects/bhyve_svm/sys/amd64/vmm/amd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 05:43:03 -0000 Author: grehan Date: Wed Oct 16 05:43:03 2013 New Revision: 256588 URL: http://svnweb.freebsd.org/changeset/base/256588 Log: Fix SVM handling of ASTPENDING, which manifested as a hang on console output (due to a missing interrupt). SVM does exit processing and then handles ASTPENDING which overwrites the already handled SVM exit cause and corrupts virtual machine state. For example, if the SVM exit was due to an I/O port access but the main loop detected an ASTPENDING, the exit would be processed as ASTPENDING and leave the device (e.g. emulated UART) for that I/O port in bad state. Submitted by: Anish Gupta (akgupt3@gmail.com) Reviewed by: grehan Modified: projects/bhyve_svm/sys/amd64/vmm/amd/svm.c Modified: projects/bhyve_svm/sys/amd64/vmm/amd/svm.c ============================================================================== --- projects/bhyve_svm/sys/amd64/vmm/amd/svm.c Wed Oct 16 05:02:01 2013 (r256587) +++ projects/bhyve_svm/sys/amd64/vmm/amd/svm.c Wed Oct 16 05:43:03 2013 (r256588) @@ -678,6 +678,8 @@ svm_vmexit(struct svm_softc *svm_sc, int case VMCB_EXIT_IO: vmm_stat_incr(svm_sc->vm, vcpu, VMEXIT_INOUT, 1); user = svm_handle_io(svm_sc, vcpu, vmexit); + VMM_CTR1(svm_sc->vm, vcpu, "SVM:I/O VMEXIT RIP:0x%lx\n", + state->rip); break; case VMCB_EXIT_CPUID: @@ -691,7 +693,7 @@ svm_vmexit(struct svm_softc *svm_sc, int user = 0; break; - case VMCB_EXIT_HLT: + case VMCB_EXIT_HLT: vmm_stat_incr(svm_sc->vm, vcpu, VMEXIT_HLT, 1); if (ctrl->v_irq) { /* Interrupt is pending, can't halt guest. */ @@ -709,7 +711,7 @@ svm_vmexit(struct svm_softc *svm_sc, int } break; - case VMCB_EXIT_PAUSE: + case VMCB_EXIT_PAUSE: VMM_CTR0(svm_sc->vm, vcpu, "SVM:VMEXIT pause"); vmexit->exitcode = VM_EXITCODE_PAUSE; vmm_stat_incr(svm_sc->vm, vcpu, VMEXIT_PAUSE, 1); @@ -975,7 +977,19 @@ svm_vmrun(void *arg, int vcpu, register_ /* Update Guest RIP */ state->rip = rip; + VMM_CTR1(svm_sc->vm, vcpu, "SVM:entered with RIP:0x%lx\n", + state->rip); do { + /* We are asked to give the cpu by scheduler. */ + if (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED)) { + vmexit->exitcode = VM_EXITCODE_BOGUS; + vmexit->inst_length = 0; + vmm_stat_incr(svm_sc->vm, vcpu, VMEXIT_ASTPENDING, 1); + VMM_CTR1(svm_sc->vm, vcpu, "SVM:gave up cpu, RIP:0x%lx\n", + state->rip); + break; + } + lapic_timer_tick(svm_sc->vm, vcpu); (void)svm_set_vmcb(svm_get_vmcb(svm_sc, vcpu), svm_sc->asid); @@ -1022,7 +1036,6 @@ svm_vmrun(void *arg, int vcpu, register_ wrmsr(MSR_GSBASE, (uint64_t)&__pcpu[vcpustate->lastcpu]); wrmsr(MSR_KGSBASE, (uint64_t)&__pcpu[vcpustate->lastcpu]); - /* vcpu exit with glbal interrupt disabled. */ enable_gintr(); @@ -1031,16 +1044,13 @@ svm_vmrun(void *arg, int vcpu, register_ vcpustate->loop++; vmm_stat_incr(svm_sc->vm, vcpu, VMEXIT_COUNT, 1); - /* We are asked to give the cpud by scheduler.*/ - if (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED)) { - vmexit->exitcode = VM_EXITCODE_BOGUS; - vmexit->inst_length = 0; - break; - } - /* Update RIP since we are continuing vcpu execution.*/ state->rip = vmexit->rip; + + VMM_CTR1(svm_sc->vm, vcpu, "SVM:loop RIP:0x%lx\n", state->rip); } while (!user); + VMM_CTR1(svm_sc->vm, vcpu, "SVM:exited with RIP:0x%lx\n", + state->rip); return (0); } @@ -1260,7 +1270,7 @@ svm_setcap(void *arg, int vcpu, int type ctrl = svm_get_vmcb_ctrl(svm_sc, vcpu); switch (type) { - case VM_CAP_HALT_EXIT: + case VM_CAP_HALT_EXIT: if (val) ctrl->ctrl1 |= VMCB_INTCPT_HLT; else From owner-svn-src-projects@FreeBSD.ORG Wed Oct 16 10:26:38 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D0F93ED6; Wed, 16 Oct 2013 10:26:38 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BCA50224F; Wed, 16 Oct 2013 10:26:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GAQc2O037442; Wed, 16 Oct 2013 10:26:38 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GAQZ5k037416; Wed, 16 Oct 2013 10:26:35 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310161026.r9GAQZ5k037416@svn.freebsd.org> From: Alexander Motin Date: Wed, 16 Oct 2013 10:26:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256616 - in projects/camlock: cddl/contrib/opensolaris/lib/libdtrace/common cddl/lib/libdtrace sbin/gvinum sys/amd64/vmm sys/cddl/contrib/opensolaris/uts/common/dtrace sys/cddl/contrib... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 10:26:38 -0000 Author: mav Date: Wed Oct 16 10:26:34 2013 New Revision: 256616 URL: http://svnweb.freebsd.org/changeset/base/256616 Log: MFC @ r256615 Added: projects/camlock/sys/dev/etherswitch/arswitch/arswitch_9340.c - copied unchanged from r256615, head/sys/dev/etherswitch/arswitch/arswitch_9340.c projects/camlock/sys/dev/etherswitch/arswitch/arswitch_9340.h - copied unchanged from r256615, head/sys/dev/etherswitch/arswitch/arswitch_9340.h Modified: projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/camlock/cddl/lib/libdtrace/psinfo.d projects/camlock/sbin/gvinum/gvinum.c projects/camlock/sys/amd64/vmm/vmm_dev.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/camlock/sys/cddl/dev/dtrace/dtrace_sysctl.c projects/camlock/sys/conf/files projects/camlock/sys/dev/etherswitch/arswitch/arswitch.c projects/camlock/sys/dev/etherswitch/arswitch/arswitch_vlans.c projects/camlock/sys/dev/etherswitch/arswitch/arswitchvar.h projects/camlock/sys/kern/subr_taskqueue.c projects/camlock/sys/mips/atheros/ar71xx_spi.c projects/camlock/sys/mips/atheros/if_arge.c projects/camlock/sys/mips/atheros/if_argevar.h projects/camlock/sys/mips/conf/DB120 projects/camlock/sys/mips/conf/DB120.hints projects/camlock/sys/net/flowtable.c projects/camlock/sys/net/radix.h projects/camlock/sys/netinet/sctp_constants.h projects/camlock/sys/netinet/sctp_usrreq.c projects/camlock/sys/powerpc/aim/interrupt.c projects/camlock/sys/powerpc/powermac/ata_kauai.c projects/camlock/sys/powerpc/powermac/ata_macio.c projects/camlock/sys/sys/_task.h projects/camlock/sys/sys/taskqueue.h projects/camlock/usr.bin/uname/uname.1 projects/camlock/usr.bin/uname/uname.c projects/camlock/usr.sbin/bsdinstall/scripts/zfsboot projects/camlock/usr.sbin/freebsd-update/freebsd-update.sh projects/camlock/usr.sbin/ppp/mppe.c Directory Properties: projects/camlock/ (props changed) projects/camlock/cddl/ (props changed) projects/camlock/cddl/contrib/opensolaris/ (props changed) projects/camlock/sbin/ (props changed) projects/camlock/sys/ (props changed) projects/camlock/sys/amd64/vmm/ (props changed) projects/camlock/sys/cddl/contrib/opensolaris/ (props changed) projects/camlock/sys/conf/ (props changed) Modified: projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Wed Oct 16 10:11:30 2013 (r256615) +++ projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Wed Oct 16 10:26:34 2013 (r256616) @@ -311,6 +311,10 @@ static const dt_ident_t _dtrace_globals[ &dt_idops_func, "void(@)" }, { "memref", DT_IDENT_FUNC, 0, DIF_SUBR_MEMREF, DT_ATTR_STABCMN, DT_VERS_1_1, &dt_idops_func, "uintptr_t *(void *, size_t)" }, +#if !defined(sun) +{ "memstr", DT_IDENT_FUNC, 0, DIF_SUBR_MEMSTR, DT_ATTR_STABCMN, DT_VERS_1_0, + &dt_idops_func, "string(void *, char, size_t)" }, +#endif { "min", DT_IDENT_AGGFUNC, 0, DTRACEAGG_MIN, DT_ATTR_STABCMN, DT_VERS_1_0, &dt_idops_func, "void(@)" }, { "mod", DT_IDENT_ACTFUNC, 0, DT_ACT_MOD, DT_ATTR_STABCMN, Modified: projects/camlock/cddl/lib/libdtrace/psinfo.d ============================================================================== --- projects/camlock/cddl/lib/libdtrace/psinfo.d Wed Oct 16 10:11:30 2013 (r256615) +++ projects/camlock/cddl/lib/libdtrace/psinfo.d Wed Oct 16 10:26:34 2013 (r256616) @@ -57,7 +57,8 @@ translator psinfo_t < struct proc *T > { pr_gid = T->p_ucred->cr_rgid; pr_egid = T->p_ucred->cr_groups[0]; pr_addr = 0; - pr_psargs = stringof(T->p_args->ar_args); + pr_psargs = (T->p_args->ar_args == 0) ? "" : + memstr(T->p_args->ar_args, ' ', T->p_args->ar_length); pr_arglen = T->p_args->ar_length; pr_jailid = T->p_ucred->cr_prison->pr_id; }; Modified: projects/camlock/sbin/gvinum/gvinum.c ============================================================================== --- projects/camlock/sbin/gvinum/gvinum.c Wed Oct 16 10:11:30 2013 (r256615) +++ projects/camlock/sbin/gvinum/gvinum.c Wed Oct 16 10:26:34 2013 (r256616) @@ -421,6 +421,7 @@ create_drive(char *device) const char *errstr; char *drivename, *dname; int drives, i, flags, volumes, subdisks, plexes; + int found = 0; flags = plexes = subdisks = volumes = 0; drives = 1; @@ -448,10 +449,8 @@ create_drive(char *device) errstr = gctl_issue(req); if (errstr != NULL) { warnx("error creating drive: %s", errstr); - gctl_free(req); - return (NULL); + drivename = NULL; } else { - gctl_free(req); /* XXX: This is needed because we have to make sure the drives * are created before we return. */ /* Loop until it's in the config. */ @@ -461,14 +460,18 @@ create_drive(char *device) /* If we got a different name, quit. */ if (dname == NULL) continue; - if (strcmp(dname, drivename)) { - free(dname); - return (drivename); - } + if (strcmp(dname, drivename)) + found = 1; free(dname); dname = NULL; + if (found) + break; usleep(100000); /* Sleep for 0.1s */ } + if (found == 0) { + warnx("error creating drive"); + drivename = NULL; + } } gctl_free(req); return (drivename); Modified: projects/camlock/sys/amd64/vmm/vmm_dev.c ============================================================================== --- projects/camlock/sys/amd64/vmm/vmm_dev.c Wed Oct 16 10:11:30 2013 (r256615) +++ projects/camlock/sys/amd64/vmm/vmm_dev.c Wed Oct 16 10:26:34 2013 (r256616) @@ -60,7 +60,10 @@ struct vmmdev_softc { struct vm *vm; /* vm instance cookie */ struct cdev *cdev; SLIST_ENTRY(vmmdev_softc) link; + int flags; }; +#define VSC_LINKED 0x01 + static SLIST_HEAD(, vmmdev_softc) head; static struct mtx vmmdev_mtx; @@ -104,7 +107,6 @@ vmmdev_rw(struct cdev *cdev, struct uio static char zerobuf[PAGE_SIZE]; error = 0; - mtx_lock(&vmmdev_mtx); sc = vmmdev_lookup2(cdev); if (sc == NULL) error = ENXIO; @@ -134,8 +136,6 @@ vmmdev_rw(struct cdev *cdev, struct uio vm_gpa_release(cookie); } } - - mtx_unlock(&vmmdev_mtx); return (error); } @@ -379,34 +379,28 @@ vmmdev_mmap_single(struct cdev *cdev, vm int error; struct vmmdev_softc *sc; - mtx_lock(&vmmdev_mtx); - sc = vmmdev_lookup2(cdev); if (sc != NULL && (nprot & PROT_EXEC) == 0) error = vm_get_memobj(sc->vm, *offset, size, offset, object); else error = EINVAL; - mtx_unlock(&vmmdev_mtx); - return (error); } static void -vmmdev_destroy(struct vmmdev_softc *sc, boolean_t unlink) +vmmdev_destroy(void *arg) { - /* - * XXX must stop virtual machine instances that may be still - * running and cleanup their state. - */ - if (sc->cdev) + struct vmmdev_softc *sc = arg; + + if (sc->cdev != NULL) destroy_dev(sc->cdev); - if (sc->vm) + if (sc->vm != NULL) vm_destroy(sc->vm); - if (unlink) { + if ((sc->flags & VSC_LINKED) != 0) { mtx_lock(&vmmdev_mtx); SLIST_REMOVE(&head, sc, vmmdev_softc, link); mtx_unlock(&vmmdev_mtx); @@ -421,27 +415,38 @@ sysctl_vmm_destroy(SYSCTL_HANDLER_ARGS) int error; char buf[VM_MAX_NAMELEN]; struct vmmdev_softc *sc; + struct cdev *cdev; strlcpy(buf, "beavis", sizeof(buf)); error = sysctl_handle_string(oidp, buf, sizeof(buf), req); if (error != 0 || req->newptr == NULL) return (error); - /* - * XXX TODO if any process has this device open then fail - */ - mtx_lock(&vmmdev_mtx); sc = vmmdev_lookup(buf); - if (sc == NULL) { + if (sc == NULL || sc->cdev == NULL) { mtx_unlock(&vmmdev_mtx); return (EINVAL); } - sc->cdev->si_drv1 = NULL; + /* + * The 'cdev' will be destroyed asynchronously when 'si_threadcount' + * goes down to 0 so we should not do it again in the callback. + */ + cdev = sc->cdev; + sc->cdev = NULL; mtx_unlock(&vmmdev_mtx); - vmmdev_destroy(sc, TRUE); + /* + * Schedule the 'cdev' to be destroyed: + * + * - any new operations on this 'cdev' will return an error (ENXIO). + * + * - when the 'si_threadcount' dwindles down to zero the 'cdev' will + * be destroyed and the callback will be invoked in a taskqueue + * context. + */ + destroy_dev_sched_cb(cdev, vmmdev_destroy, sc); return (0); } @@ -462,6 +467,7 @@ sysctl_vmm_create(SYSCTL_HANDLER_ARGS) { int error; struct vm *vm; + struct cdev *cdev; struct vmmdev_softc *sc, *sc2; char buf[VM_MAX_NAMELEN]; @@ -489,22 +495,28 @@ sysctl_vmm_create(SYSCTL_HANDLER_ARGS) */ mtx_lock(&vmmdev_mtx); sc2 = vmmdev_lookup(buf); - if (sc2 == NULL) + if (sc2 == NULL) { SLIST_INSERT_HEAD(&head, sc, link); + sc->flags |= VSC_LINKED; + } mtx_unlock(&vmmdev_mtx); if (sc2 != NULL) { - vmmdev_destroy(sc, FALSE); + vmmdev_destroy(sc); return (EEXIST); } - error = make_dev_p(MAKEDEV_CHECKNAME, &sc->cdev, &vmmdevsw, NULL, + error = make_dev_p(MAKEDEV_CHECKNAME, &cdev, &vmmdevsw, NULL, UID_ROOT, GID_WHEEL, 0600, "vmm/%s", buf); if (error != 0) { - vmmdev_destroy(sc, TRUE); + vmmdev_destroy(sc); return (error); } + + mtx_lock(&vmmdev_mtx); + sc->cdev = cdev; sc->cdev->si_drv1 = sc; + mtx_unlock(&vmmdev_mtx); return (0); } Modified: projects/camlock/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c ============================================================================== --- projects/camlock/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Wed Oct 16 10:11:30 2013 (r256615) +++ projects/camlock/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Wed Oct 16 10:26:34 2013 (r256616) @@ -185,6 +185,9 @@ hrtime_t dtrace_deadman_interval = NANOS hrtime_t dtrace_deadman_timeout = (hrtime_t)10 * NANOSEC; hrtime_t dtrace_deadman_user = (hrtime_t)30 * NANOSEC; hrtime_t dtrace_unregister_defunct_reap = (hrtime_t)60 * NANOSEC; +#if !defined(sun) +int dtrace_memstr_max = 4096; +#endif /* * DTrace External Variables @@ -4920,6 +4923,45 @@ inetout: regs[rd] = (uintptr_t)end + 1; break; } +#if !defined(sun) + case DIF_SUBR_MEMSTR: { + char *str = (char *)mstate->dtms_scratch_ptr; + uintptr_t mem = tupregs[0].dttk_value; + char c = tupregs[1].dttk_value; + size_t size = tupregs[2].dttk_value; + uint8_t n; + int i; + + regs[rd] = 0; + + if (size == 0) + break; + + if (!dtrace_canload(mem, size - 1, mstate, vstate)) + break; + + if (!DTRACE_INSCRATCH(mstate, size)) { + DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH); + break; + } + + if (dtrace_memstr_max != 0 && size > dtrace_memstr_max) { + *flags |= CPU_DTRACE_ILLOP; + break; + } + + for (i = 0; i < size - 1; i++) { + n = dtrace_load8(mem++); + str[i] = (n == 0) ? c : n; + } + str[size - 1] = 0; + + regs[rd] = (uintptr_t)str; + mstate->dtms_scratch_ptr += size; + break; + } +#endif + case DIF_SUBR_TYPEREF: { uintptr_t size = 4 * sizeof(uintptr_t); uintptr_t *typeref = (uintptr_t *) P2ROUNDUP(mstate->dtms_scratch_ptr, sizeof(uintptr_t)); @@ -9102,6 +9144,9 @@ dtrace_difo_validate_helper(dtrace_difo_ subr == DIF_SUBR_NTOHL || subr == DIF_SUBR_NTOHLL || subr == DIF_SUBR_MEMREF || +#if !defined(sun) + subr == DIF_SUBR_MEMSTR || +#endif subr == DIF_SUBR_TYPEREF) break; Modified: projects/camlock/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h ============================================================================== --- projects/camlock/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h Wed Oct 16 10:11:30 2013 (r256615) +++ projects/camlock/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h Wed Oct 16 10:26:34 2013 (r256616) @@ -311,8 +311,9 @@ typedef enum dtrace_probespec { #define DIF_SUBR_SX_SHARED_HELD 48 #define DIF_SUBR_SX_EXCLUSIVE_HELD 49 #define DIF_SUBR_SX_ISEXCLUSIVE 50 +#define DIF_SUBR_MEMSTR 51 -#define DIF_SUBR_MAX 50 /* max subroutine value */ +#define DIF_SUBR_MAX 51 /* max subroutine value */ typedef uint32_t dif_instr_t; Modified: projects/camlock/sys/cddl/dev/dtrace/dtrace_sysctl.c ============================================================================== --- projects/camlock/sys/cddl/dev/dtrace/dtrace_sysctl.c Wed Oct 16 10:11:30 2013 (r256615) +++ projects/camlock/sys/cddl/dev/dtrace/dtrace_sysctl.c Wed Oct 16 10:26:34 2013 (r256616) @@ -80,3 +80,5 @@ sysctl_dtrace_providers(SYSCTL_HANDLER_A SYSCTL_PROC(_debug_dtrace, OID_AUTO, providers, CTLTYPE_STRING | CTLFLAG_RD, 0, 0, sysctl_dtrace_providers, "A", ""); +SYSCTL_INT(_debug_dtrace, OID_AUTO, memstr_max, CTLFLAG_RW, &dtrace_memstr_max, + 0, "largest allowed argument to memstr(), 0 indicates no limit"); Modified: projects/camlock/sys/conf/files ============================================================================== --- projects/camlock/sys/conf/files Wed Oct 16 10:11:30 2013 (r256615) +++ projects/camlock/sys/conf/files Wed Oct 16 10:26:34 2013 (r256616) @@ -1380,6 +1380,7 @@ dev/etherswitch/arswitch/arswitch_8216.c dev/etherswitch/arswitch/arswitch_8226.c optional arswitch dev/etherswitch/arswitch/arswitch_8316.c optional arswitch dev/etherswitch/arswitch/arswitch_7240.c optional arswitch +dev/etherswitch/arswitch/arswitch_9340.c optional arswitch dev/etherswitch/arswitch/arswitch_vlans.c optional arswitch dev/etherswitch/etherswitch.c optional etherswitch dev/etherswitch/etherswitch_if.m optional etherswitch Modified: projects/camlock/sys/dev/etherswitch/arswitch/arswitch.c ============================================================================== --- projects/camlock/sys/dev/etherswitch/arswitch/arswitch.c Wed Oct 16 10:11:30 2013 (r256615) +++ projects/camlock/sys/dev/etherswitch/arswitch/arswitch.c Wed Oct 16 10:26:34 2013 (r256616) @@ -64,6 +64,7 @@ #include #include #include +#include #include "mdio_if.h" #include "miibus_if.h" @@ -93,23 +94,34 @@ arswitch_probe(device_t dev) if (ar7240_probe(dev) == 0) { chipname = "AR7240"; sc->sc_switchtype = AR8X16_SWITCH_AR7240; + sc->is_internal_switch = 1; + id = 0; + goto done; + } + + /* AR9340 probe */ + if (ar9340_probe(dev) == 0) { + chipname = "AR9340"; + sc->sc_switchtype = AR8X16_SWITCH_AR9340; + sc->is_internal_switch = 1; id = 0; goto done; } /* AR8xxx probe */ id = arswitch_readreg(dev, AR8X16_REG_MASK_CTRL); - switch ((id & AR8X16_MASK_CTRL_VER_MASK) >> - AR8X16_MASK_CTRL_VER_SHIFT) { - case 1: + switch (id & (AR8X16_MASK_CTRL_VER_MASK | AR8X16_MASK_CTRL_REV_MASK)) { + case 0x0101: chipname = "AR8216"; sc->sc_switchtype = AR8X16_SWITCH_AR8216; break; - case 2: + case 0x0201: chipname = "AR8226"; sc->sc_switchtype = AR8X16_SWITCH_AR8226; break; - case 16: + /* 0x0301 - AR8236 */ + case 0x1000: + case 0x1001: chipname = "AR8316"; sc->sc_switchtype = AR8X16_SWITCH_AR8316; break; @@ -118,8 +130,8 @@ arswitch_probe(device_t dev) } done: - DPRINTF(dev, "chipname=%s, rev=%02x\n", chipname, - id & AR8X16_MASK_CTRL_REV_MASK); + + DPRINTF(dev, "chipname=%s, id=%08x\n", chipname, id); if (chipname != NULL) { snprintf(desc, sizeof(desc), "Atheros %s Ethernet Switch", @@ -250,6 +262,8 @@ arswitch_attach(device_t dev) */ if (AR8X16_IS_SWITCH(sc, AR7240)) ar7240_attach(sc); + else if (AR8X16_IS_SWITCH(sc, AR9340)) + ar9340_attach(sc); else if (AR8X16_IS_SWITCH(sc, AR8216)) ar8216_attach(sc); else if (AR8X16_IS_SWITCH(sc, AR8226)) @@ -267,6 +281,7 @@ arswitch_attach(device_t dev) sc->phy4cpu = 1; sc->is_rgmii = 1; sc->is_gmii = 0; + sc->is_mii = 0; (void) resource_int_value(device_get_name(dev), device_get_unit(dev), "numphys", &sc->numphys); @@ -276,6 +291,8 @@ arswitch_attach(device_t dev) "is_rgmii", &sc->is_rgmii); (void) resource_int_value(device_get_name(dev), device_get_unit(dev), "is_gmii", &sc->is_gmii); + (void) resource_int_value(device_get_name(dev), device_get_unit(dev), + "is_mii", &sc->is_mii); if (sc->numphys > AR8X16_NUM_PHYS) sc->numphys = AR8X16_NUM_PHYS; @@ -284,6 +301,10 @@ arswitch_attach(device_t dev) if (arswitch_reset(dev)) return (ENXIO); + err = sc->hal.arswitch_hw_setup(sc); + if (err != 0) + return (err); + err = sc->hal.arswitch_hw_global_setup(sc); if (err != 0) return (err); @@ -303,10 +324,6 @@ arswitch_attach(device_t dev) if (err != 0) return (err); - err = sc->hal.arswitch_hw_setup(sc); - if (err != 0) - return (err); - bus_generic_probe(dev); bus_enumerate_hinted_children(dev); err = bus_generic_attach(dev); @@ -435,7 +452,7 @@ arswitch_miipollstat(struct arswitch_sof AR8X16_REG_PORT_STS(arswitch_portforphy(i))); #if 0 DPRINTF(sc->sc_dev, "p[%d]=%b\n", - arge_portforphy(i), + i, portstatus, "\20\3TXMAC\4RXMAC\5TXFLOW\6RXFLOW\7" "DUPLEX\11LINK_UP\12LINK_AUTO\13LINK_PAUSE"); Copied: projects/camlock/sys/dev/etherswitch/arswitch/arswitch_9340.c (from r256615, head/sys/dev/etherswitch/arswitch/arswitch_9340.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/camlock/sys/dev/etherswitch/arswitch/arswitch_9340.c Wed Oct 16 10:26:34 2013 (r256616, copy of r256615, head/sys/dev/etherswitch/arswitch/arswitch_9340.c) @@ -0,0 +1,203 @@ +/*- + * Copyright (c) 2011-2012 Stefan Bethke. + * Copyright (c) 2013 Adrian Chadd + * 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$ + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include /* XXX for probe */ +#include + +#include "mdio_if.h" +#include "miibus_if.h" +#include "etherswitch_if.h" + +/* + * AR9340 specific functions + */ +static int +ar9340_hw_setup(struct arswitch_softc *sc) +{ + + return (0); +} + +/* + * Initialise other global values for the AR9340. + */ +static int +ar9340_hw_global_setup(struct arswitch_softc *sc) +{ + + /* Enable CPU port; disable mirror port */ + arswitch_writereg(sc->sc_dev, AR8X16_REG_CPU_PORT, + AR8X16_CPU_PORT_EN | AR8X16_CPU_MIRROR_DIS); + + /* Setup TAG priority mapping */ + arswitch_writereg(sc->sc_dev, AR8X16_REG_TAG_PRIO, 0xfa50); + + /* Enable aging, MAC replacing */ + arswitch_writereg(sc->sc_dev, AR934X_REG_AT_CTRL, + 0x2b /* 5 min age time */ | + AR934X_AT_CTRL_AGE_EN | + AR934X_AT_CTRL_LEARN_CHANGE); + + /* Enable ARP frame acknowledge */ + arswitch_modifyreg(sc->sc_dev, AR934X_REG_QM_CTRL, + AR934X_QM_CTRL_ARP_EN, AR934X_QM_CTRL_ARP_EN); + + /* Enable Broadcast frames transmitted to the CPU */ + arswitch_modifyreg(sc->sc_dev, AR934X_REG_FLOOD_MASK, + AR934X_FLOOD_MASK_BC_DP(0), + AR934X_FLOOD_MASK_BC_DP(0)); + arswitch_modifyreg(sc->sc_dev, AR934X_REG_FLOOD_MASK, + AR934X_FLOOD_MASK_MC_DP(0), + AR934X_FLOOD_MASK_MC_DP(0)); + + /* Enable MIB counters */ + arswitch_modifyreg(sc->sc_dev, AR8X16_REG_MIB_FUNC0, + AR934X_MIB_ENABLE, AR934X_MIB_ENABLE); + + /* Setup MTU */ + arswitch_modifyreg(sc->sc_dev, AR8X16_REG_GLOBAL_CTRL, + AR7240_GLOBAL_CTRL_MTU_MASK, + SM(1536, AR7240_GLOBAL_CTRL_MTU_MASK)); + + /* Service Tag */ + arswitch_modifyreg(sc->sc_dev, AR8X16_REG_SERVICE_TAG, + AR8X16_SERVICE_TAG_MASK, 0); + + /* Settle time */ + DELAY(1000); + + /* + * Check PHY mode bits. + * + * This dictates whether the connected port is to be wired + * up via GMII or MII. I'm not sure why - this is an internal + * wiring issue. + */ + if (sc->is_gmii) { + device_printf(sc->sc_dev, "%s: GMII\n", __func__); + arswitch_modifyreg(sc->sc_dev, AR934X_REG_OPER_MODE0, + AR934X_OPER_MODE0_MAC_GMII_EN, + AR934X_OPER_MODE0_MAC_GMII_EN); + } else if (sc->is_mii) { + device_printf(sc->sc_dev, "%s: MII\n", __func__); + arswitch_modifyreg(sc->sc_dev, AR934X_REG_OPER_MODE0, + AR934X_OPER_MODE0_PHY_MII_EN, + AR934X_OPER_MODE0_PHY_MII_EN); + } else { + device_printf(sc->sc_dev, "%s: need is_gmii or is_mii set\n", + __func__); + return (ENXIO); + } + + /* + * Whether to connect PHY 4 via MII (ie a switch port) or + * treat it as a CPU port. + */ + if (sc->phy4cpu) { + device_printf(sc->sc_dev, "%s: PHY4 - CPU\n", __func__); + arswitch_modifyreg(sc->sc_dev, AR934X_REG_OPER_MODE1, + AR934X_REG_OPER_MODE1_PHY4_MII_EN, + AR934X_REG_OPER_MODE1_PHY4_MII_EN); + sc->info.es_nports = 4; + } else { + device_printf(sc->sc_dev, "%s: PHY4 - Local\n", __func__); + sc->info.es_nports = 5; + } + + /* Settle time */ + DELAY(1000); + + return (0); +} + +/* + * The AR9340 switch probes (almost) the same as the AR7240 on-chip switch. + * + * However, the support is slightly different. + * + * So instead of checking the PHY revision or mask register contents, + * we simply fall back to a hint check. + */ +int +ar9340_probe(device_t dev) +{ + int is_9340 = 0; + + if (resource_int_value(device_get_name(dev), device_get_unit(dev), + "is_9340", &is_9340) != 0) + return (ENXIO); + + if (is_9340 == 0) + return (ENXIO); + + return (0); +} + +void +ar9340_attach(struct arswitch_softc *sc) +{ + + sc->hal.arswitch_hw_setup = ar9340_hw_setup; + sc->hal.arswitch_hw_global_setup = ar9340_hw_global_setup; + + /* Set the switch vlan capabilities. */ + sc->info.es_vlan_caps = ETHERSWITCH_VLAN_DOT1Q | + ETHERSWITCH_VLAN_PORT | ETHERSWITCH_VLAN_DOUBLE_TAG; + sc->info.es_nvlangroups = AR8X16_MAX_VLANS; +} Copied: projects/camlock/sys/dev/etherswitch/arswitch/arswitch_9340.h (from r256615, head/sys/dev/etherswitch/arswitch/arswitch_9340.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/camlock/sys/dev/etherswitch/arswitch/arswitch_9340.h Wed Oct 16 10:26:34 2013 (r256616, copy of r256615, head/sys/dev/etherswitch/arswitch/arswitch_9340.h) @@ -0,0 +1,35 @@ +/*- + * Copyright (c) 2011-2012 Stefan Bethke. + * Copyright (c) 2031 Adrian Chadd + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ +#ifndef __ARSWITCH_9340_H__ +#define __ARSWITCH_9340_H__ + +extern int ar9340_probe(device_t dev); +extern void ar9340_attach(struct arswitch_softc *sc); + +#endif /* __ARSWITCH_9340_H__ */ Modified: projects/camlock/sys/dev/etherswitch/arswitch/arswitch_vlans.c ============================================================================== --- projects/camlock/sys/dev/etherswitch/arswitch/arswitch_vlans.c Wed Oct 16 10:11:30 2013 (r256615) +++ projects/camlock/sys/dev/etherswitch/arswitch/arswitch_vlans.c Wed Oct 16 10:26:34 2013 (r256616) @@ -49,6 +49,12 @@ #include "miibus_if.h" #include "etherswitch_if.h" +/* + * XXX TODO: teach about the AR933x SoC switch + * XXX TODO: teach about the AR934x SoC switch + * XXX TODO: teach about the AR8327 external switch + */ + static int arswitch_vlan_op(struct arswitch_softc *sc, uint32_t op, uint32_t vid, uint32_t data) Modified: projects/camlock/sys/dev/etherswitch/arswitch/arswitchvar.h ============================================================================== --- projects/camlock/sys/dev/etherswitch/arswitch/arswitchvar.h Wed Oct 16 10:11:30 2013 (r256615) +++ projects/camlock/sys/dev/etherswitch/arswitch/arswitchvar.h Wed Oct 16 10:26:34 2013 (r256616) @@ -34,6 +34,7 @@ typedef enum { AR8X16_SWITCH_AR8216, AR8X16_SWITCH_AR8226, AR8X16_SWITCH_AR8316, + AR8X16_SWITCH_AR9340, } ar8x16_switch_type; /* @@ -49,7 +50,9 @@ struct arswitch_softc { int numphys; /* PHYs we manage */ int is_rgmii; /* PHY mode is RGMII (XXX which PHY?) */ int is_gmii; /* PHY mode is GMII (XXX which PHY?) */ + int is_mii; /* PHY mode is MII (XXX which PHY?) */ int page; + int is_internal_switch; ar8x16_switch_type sc_switchtype; char *ifname[AR8X16_NUM_PHYS]; device_t miibus[AR8X16_NUM_PHYS]; Modified: projects/camlock/sys/kern/subr_taskqueue.c ============================================================================== --- projects/camlock/sys/kern/subr_taskqueue.c Wed Oct 16 10:11:30 2013 (r256615) +++ projects/camlock/sys/kern/subr_taskqueue.c Wed Oct 16 10:26:34 2013 (r256616) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include static MALLOC_DEFINE(M_TASKQUEUE, "taskqueue", "Task Queues"); static void *taskqueue_giant_ih; @@ -339,7 +340,9 @@ taskqueue_run_locked(struct taskqueue *q tb.tb_running = task; TQ_UNLOCK(queue); + CURVNET_SET(task->ta_vnet); task->ta_func(task->ta_context, pending); + CURVNET_RESTORE(); TQ_LOCK(queue); tb.tb_running = NULL; Modified: projects/camlock/sys/mips/atheros/ar71xx_spi.c ============================================================================== --- projects/camlock/sys/mips/atheros/ar71xx_spi.c Wed Oct 16 10:11:30 2013 (r256615) +++ projects/camlock/sys/mips/atheros/ar71xx_spi.c Wed Oct 16 10:26:34 2013 (r256616) @@ -62,8 +62,16 @@ __FBSDID("$FreeBSD$"); /* * register space access macros */ -#define SPI_WRITE(sc, reg, val) do { \ - bus_write_4(sc->sc_mem_res, (reg), (val)); \ + +#define SPI_BARRIER_WRITE(sc) bus_barrier((sc)->sc_mem_res, 0, 0, \ + BUS_SPACE_BARRIER_WRITE) +#define SPI_BARRIER_READ(sc) bus_barrier((sc)->sc_mem_res, 0, 0, \ + BUS_SPACE_BARRIER_READ) +#define SPI_BARRIER_RW(sc) bus_barrier((sc)->sc_mem_res, 0, 0, \ + BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE) + +#define SPI_WRITE(sc, reg, val) do { \ + bus_write_4(sc->sc_mem_res, (reg), (val)); \ } while (0) #define SPI_READ(sc, reg) bus_read_4(sc->sc_mem_res, (reg)) @@ -102,12 +110,30 @@ ar71xx_spi_attach(device_t dev) return (ENXIO); } - SPI_WRITE(sc, AR71XX_SPI_FS, 1); + + /* Flush out read before reading the control register */ + SPI_BARRIER_WRITE(sc); + sc->sc_reg_ctrl = SPI_READ(sc, AR71XX_SPI_CTRL); + + /* + * XXX TODO: document what the SPI control register does. + */ SPI_WRITE(sc, AR71XX_SPI_CTRL, 0x43); + + /* + * Ensure the config register write has gone out before configuring + * the chip select mask. + */ + SPI_BARRIER_WRITE(sc); SPI_WRITE(sc, AR71XX_SPI_IO_CTRL, SPI_IO_CTRL_CSMASK); + /* + * .. and ensure the write has gone out before continuing. + */ + SPI_BARRIER_WRITE(sc); + device_add_child(dev, "spibus", -1); return (bus_generic_attach(dev)); } @@ -121,7 +147,15 @@ ar71xx_spi_chip_activate(struct ar71xx_s */ ioctrl &= ~(SPI_IO_CTRL_CS0 << cs); + /* + * Make sure any other writes have gone out to the + * device before changing the chip select line; + * then ensure that it has made it out to the device + * before continuing. + */ + SPI_BARRIER_WRITE(sc); SPI_WRITE(sc, AR71XX_SPI_IO_CTRL, ioctrl); + SPI_BARRIER_WRITE(sc); } static void @@ -150,14 +184,18 @@ ar71xx_spi_txrx(struct ar71xx_spi_softc iod = ioctrl | SPI_IO_CTRL_DO; else iod = ioctrl & ~SPI_IO_CTRL_DO; + SPI_BARRIER_WRITE(sc); SPI_WRITE(sc, AR71XX_SPI_IO_CTRL, iod); + SPI_BARRIER_WRITE(sc); SPI_WRITE(sc, AR71XX_SPI_IO_CTRL, iod | SPI_IO_CTRL_CLK); } /* * Provide falling edge for connected device by clear clock bit. */ + SPI_BARRIER_WRITE(sc); SPI_WRITE(sc, AR71XX_SPI_IO_CTRL, iod); + SPI_BARRIER_WRITE(sc); rds = SPI_READ(sc, AR71XX_SPI_RDS); return (rds & 0xff); @@ -206,8 +244,25 @@ ar71xx_spi_detach(device_t dev) { struct ar71xx_spi_softc *sc = device_get_softc(dev); + /* + * Ensure any other writes to the device are finished + * before we tear down the SPI device. + */ + SPI_BARRIER_WRITE(sc); + + /* + * Restore the control register; ensure it has hit the + * hardware before continuing. + */ SPI_WRITE(sc, AR71XX_SPI_CTRL, sc->sc_reg_ctrl); + SPI_BARRIER_WRITE(sc); + + /* + * And now, put the flash back into mapped IO mode and + * ensure _that_ has completed before we finish up. + */ SPI_WRITE(sc, AR71XX_SPI_FS, 0); + SPI_BARRIER_WRITE(sc); if (sc->sc_mem_res) bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res); Modified: projects/camlock/sys/mips/atheros/if_arge.c ============================================================================== --- projects/camlock/sys/mips/atheros/if_arge.c Wed Oct 16 10:11:30 2013 (r256615) +++ projects/camlock/sys/mips/atheros/if_arge.c Wed Oct 16 10:26:34 2013 (r256616) @@ -90,6 +90,7 @@ MODULE_VERSION(arge, 1); #include "miibus_if.h" #include +#include /* XXX tsk! */ #include #include #include @@ -298,17 +299,38 @@ static void arge_reset_mac(struct arge_softc *sc) { uint32_t reg; + uint32_t reset_reg; /* Step 1. Soft-reset MAC */ ARGE_SET_BITS(sc, AR71XX_MAC_CFG1, MAC_CFG1_SOFT_RESET); DELAY(20); /* Step 2. Punt the MAC core from the central reset register */ - ar71xx_device_stop(sc->arge_mac_unit == 0 ? RST_RESET_GE0_MAC : - RST_RESET_GE1_MAC); + /* + * XXX TODO: migrate this (and other) chip specific stuff into + * a chipdef method. + */ + if (sc->arge_mac_unit == 0) { + reset_reg = RST_RESET_GE0_MAC; + } else { + reset_reg = RST_RESET_GE1_MAC; + } + + /* + * AR934x (and later) also needs the MDIO block reset. + */ + if (ar71xx_soc == AR71XX_SOC_AR9341 || + ar71xx_soc == AR71XX_SOC_AR9342 || + ar71xx_soc == AR71XX_SOC_AR9344) { + if (sc->arge_mac_unit == 0) { + reset_reg |= AR934X_RESET_GE0_MDIO; + } else { + reset_reg |= AR934X_RESET_GE1_MDIO; + } + } + ar71xx_device_stop(reset_reg); DELAY(100); - ar71xx_device_start(sc->arge_mac_unit == 0 ? RST_RESET_GE0_MAC : - RST_RESET_GE1_MAC); + ar71xx_device_start(reset_reg); /* Step 3. Reconfigure MAC block */ ARGE_WRITE(sc, AR71XX_MAC_CFG1, @@ -322,14 +344,46 @@ arge_reset_mac(struct arge_softc *sc) ARGE_WRITE(sc, AR71XX_MAC_MAX_FRAME_LEN, 1536); } +/* + * Fetch the MDIO bus clock rate. + * + * For now, the default is DIV_28 for everything + * bar AR934x, which will be DIV_42. + * + * It will definitely need updating to take into account + * the MDIO bus core clock rate and the target clock + * rate for the chip. + */ +static uint32_t +arge_fetch_mdiobus_clock_rate(struct arge_softc *sc) +{ + + switch (ar71xx_soc) { + case AR71XX_SOC_AR9341: + case AR71XX_SOC_AR9342: + case AR71XX_SOC_AR9344: + return (MAC_MII_CFG_CLOCK_DIV_42); + default: + return (MAC_MII_CFG_CLOCK_DIV_28); + } +} + static void arge_reset_miibus(struct arge_softc *sc) { + uint32_t mdio_div; - /* Reset MII bus */ - ARGE_WRITE(sc, AR71XX_MAC_MII_CFG, MAC_MII_CFG_RESET); + mdio_div = arge_fetch_mdiobus_clock_rate(sc); + + /* + * XXX AR934x and later; should we be also resetting the + * MDIO block(s) using the reset register block? + */ + + /* Reset MII bus; program in the default divisor */ + ARGE_WRITE(sc, AR71XX_MAC_MII_CFG, MAC_MII_CFG_RESET | mdio_div); DELAY(100); - ARGE_WRITE(sc, AR71XX_MAC_MII_CFG, MAC_MII_CFG_CLOCK_DIV_28); + ARGE_WRITE(sc, AR71XX_MAC_MII_CFG, mdio_div); DELAY(100); } @@ -588,9 +642,13 @@ arge_attach(device_t dev) case AR71XX_SOC_AR7242: case AR71XX_SOC_AR9330: case AR71XX_SOC_AR9331: + case AR71XX_SOC_AR9341: + case AR71XX_SOC_AR9342: + case AR71XX_SOC_AR9344: ARGE_WRITE(sc, AR71XX_MAC_FIFO_CFG1, 0x0010ffff); ARGE_WRITE(sc, AR71XX_MAC_FIFO_CFG2, 0x015500aa); break; + /* AR71xx, AR913x */ default: ARGE_WRITE(sc, AR71XX_MAC_FIFO_CFG1, 0x0fff0000); ARGE_WRITE(sc, AR71XX_MAC_FIFO_CFG2, 0x00001fff); @@ -917,12 +975,16 @@ arge_set_pll(struct arge_softc *sc, int case AR71XX_SOC_AR7242: case AR71XX_SOC_AR9330: case AR71XX_SOC_AR9331: + case AR71XX_SOC_AR9341: + case AR71XX_SOC_AR9342: + case AR71XX_SOC_AR9344: fifo_tx = 0x01f00140; break; case AR71XX_SOC_AR9130: case AR71XX_SOC_AR9132: fifo_tx = 0x00780fff; break; + /* AR71xx */ default: fifo_tx = 0x008001ff; } Modified: projects/camlock/sys/mips/atheros/if_argevar.h ============================================================================== --- projects/camlock/sys/mips/atheros/if_argevar.h Wed Oct 16 10:11:30 2013 (r256615) +++ projects/camlock/sys/mips/atheros/if_argevar.h Wed Oct 16 10:26:34 2013 (r256616) @@ -55,10 +55,17 @@ /* * register space access macros */ +#define ARGE_BARRIER_READ(sc) bus_barrier(sc->arge_res, 0, 0, \ + BUS_SPACE_BARRIER_READ) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Oct 16 11:30:48 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0F6AF3FF; Wed, 16 Oct 2013 11:30:48 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D883A25D1; Wed, 16 Oct 2013 11:30:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GBUlDm071785; Wed, 16 Oct 2013 11:30:47 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GBUlHd071784; Wed, 16 Oct 2013 11:30:47 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310161130.r9GBUlHd071784@svn.freebsd.org> From: Alexander Motin Date: Wed, 16 Oct 2013 11:30:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256619 - projects/camlock/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 11:30:48 -0000 Author: mav Date: Wed Oct 16 11:30:47 2013 New Revision: 256619 URL: http://svnweb.freebsd.org/changeset/base/256619 Log: Restore BIO_UNMAPPED and BIO_TRANSIENT_MAPPING in biodonne() when unmapping temporary mapped buffer. That fixes double unmap triggered by r256286, when biodone() called twice for the same BIO (but with different done methods). Move mapping removal before calling bio_done() method. I believe that it is very wrong to do anything to BIO after reporting completion. kib@ thinks it was done for some forgotten now case when bio_done() method needed mapped buffer. But 1) if BIO was sent as unmapped, then IMO done() should be called in the same way; 2) IMO there is no guatantee that buffer will be mapped at this point at all, for example, if all underlying stack supports unmapped I/O, so bio_done() handler can not expect that. Modified: projects/camlock/sys/kern/vfs_bio.c Modified: projects/camlock/sys/kern/vfs_bio.c ============================================================================== --- projects/camlock/sys/kern/vfs_bio.c Wed Oct 16 10:36:42 2013 (r256618) +++ projects/camlock/sys/kern/vfs_bio.c Wed Oct 16 11:30:47 2013 (r256619) @@ -3557,15 +3557,15 @@ biodone(struct bio *bp) struct mtx *mtxp; void (*done)(struct bio *); vm_offset_t start, end; - int transient; if ((bp->bio_flags & BIO_TRANSIENT_MAPPING) != 0) { + bp->bio_flags &= ~BIO_TRANSIENT_MAPPING; + bp->bio_flags |= BIO_UNMAPPED; start = trunc_page((vm_offset_t)bp->bio_data); end = round_page((vm_offset_t)bp->bio_data + bp->bio_length); - transient = 1; - } else { - transient = 0; - start = end = 0; + pmap_qremove(start, OFF_TO_IDX(end - start)); + vmem_free(transient_arena, start, end - start); + atomic_add_int(&inflight_transient_maps, -1); } done = bp->bio_done; if (done == NULL) { @@ -3578,11 +3578,6 @@ biodone(struct bio *bp) bp->bio_flags |= BIO_DONE; done(bp); } - if (transient) { - pmap_qremove(start, OFF_TO_IDX(end - start)); - vmem_free(transient_arena, start, end - start); - atomic_add_int(&inflight_transient_maps, -1); - } } /* From owner-svn-src-projects@FreeBSD.ORG Wed Oct 16 12:13:20 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9935A4C9; Wed, 16 Oct 2013 12:13:20 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8832E28BE; Wed, 16 Oct 2013 12:13:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GCDKsG094038; Wed, 16 Oct 2013 12:13:20 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GCDKeP094037; Wed, 16 Oct 2013 12:13:20 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310161213.r9GCDKeP094037@svn.freebsd.org> From: Alexander Motin Date: Wed, 16 Oct 2013 12:13:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256622 - projects/camlock/sys/cam X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 12:13:20 -0000 Author: mav Date: Wed Oct 16 12:13:20 2013 New Revision: 256622 URL: http://svnweb.freebsd.org/changeset/base/256622 Log: Prohibit sleeping in CAM completion threads. We have limited number of them same as interrupt threads. We don't want somebody carelessly blocked all CAM subsystem by arbitrary sleep. Modified: projects/camlock/sys/cam/cam_xpt.c Modified: projects/camlock/sys/cam/cam_xpt.c ============================================================================== --- projects/camlock/sys/cam/cam_xpt.c Wed Oct 16 11:53:03 2013 (r256621) +++ projects/camlock/sys/cam/cam_xpt.c Wed Oct 16 12:13:20 2013 (r256622) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -5264,6 +5265,7 @@ xpt_done_td(void *arg) STAILQ_HEAD(, ccb_hdr) doneq; STAILQ_INIT(&doneq); + THREAD_NO_SLEEPING(); mtx_lock(&queue->cam_doneq_mtx); while (1) { while (STAILQ_EMPTY(&queue->cam_doneq)) { From owner-svn-src-projects@FreeBSD.ORG Wed Oct 16 12:15:34 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3E42E5E0; Wed, 16 Oct 2013 12:15:34 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2CB4E28D3; Wed, 16 Oct 2013 12:15:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GCFYDB094503; Wed, 16 Oct 2013 12:15:34 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GCFYpY094502; Wed, 16 Oct 2013 12:15:34 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310161215.r9GCFYpY094502@svn.freebsd.org> From: Alexander Motin Date: Wed, 16 Oct 2013 12:15:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256623 - projects/camlock/sys/cam X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 12:15:34 -0000 Author: mav Date: Wed Oct 16 12:15:33 2013 New Revision: 256623 URL: http://svnweb.freebsd.org/changeset/base/256623 Log: Oops, fix for r256622: put THREAD_NO_SLEEPING() into the better place. Modified: projects/camlock/sys/cam/cam_xpt.c Modified: projects/camlock/sys/cam/cam_xpt.c ============================================================================== --- projects/camlock/sys/cam/cam_xpt.c Wed Oct 16 12:13:20 2013 (r256622) +++ projects/camlock/sys/cam/cam_xpt.c Wed Oct 16 12:15:33 2013 (r256623) @@ -5265,7 +5265,6 @@ xpt_done_td(void *arg) STAILQ_HEAD(, ccb_hdr) doneq; STAILQ_INIT(&doneq); - THREAD_NO_SLEEPING(); mtx_lock(&queue->cam_doneq_mtx); while (1) { while (STAILQ_EMPTY(&queue->cam_doneq)) { @@ -5277,11 +5276,13 @@ xpt_done_td(void *arg) STAILQ_CONCAT(&doneq, &queue->cam_doneq); mtx_unlock(&queue->cam_doneq_mtx); + THREAD_NO_SLEEPING(); while ((ccb_h = STAILQ_FIRST(&doneq)) != NULL) { STAILQ_REMOVE_HEAD(&doneq, sim_links.stqe); ccb_h->pinfo.index = CAM_UNQUEUED_INDEX; xpt_done_process(ccb_h); } + THREAD_SLEEPING_OK(); mtx_lock(&queue->cam_doneq_mtx); } From owner-svn-src-projects@FreeBSD.ORG Wed Oct 16 15:57:58 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 390BBE69; Wed, 16 Oct 2013 15:57:58 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 273602874; Wed, 16 Oct 2013 15:57:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GFvw9H011236; Wed, 16 Oct 2013 15:57:58 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GFvwGp011235; Wed, 16 Oct 2013 15:57:58 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310161557.r9GFvwGp011235@svn.freebsd.org> From: "Simon J. Gerraty" Date: Wed, 16 Oct 2013 15:57:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256630 - projects/bmake/lib/libunbound X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 15:57:58 -0000 Author: sjg Date: Wed Oct 16 15:57:57 2013 New Revision: 256630 URL: http://svnweb.freebsd.org/changeset/base/256630 Log: New dependencies Added: projects/bmake/lib/libunbound/Makefile.depend (contents, props changed) Added: projects/bmake/lib/libunbound/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libunbound/Makefile.depend Wed Oct 16 15:57:57 2013 (r256630) @@ -0,0 +1,22 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/arpa \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libthr \ + secure/lib/libcrypto \ + secure/lib/libssl \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif From owner-svn-src-projects@FreeBSD.ORG Wed Oct 16 15:58:22 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D990DF52; Wed, 16 Oct 2013 15:58:22 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C6B48287B; Wed, 16 Oct 2013 15:58:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GFwMCi011435; Wed, 16 Oct 2013 15:58:22 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GFwMto011433; Wed, 16 Oct 2013 15:58:22 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310161558.r9GFwMto011433@svn.freebsd.org> From: "Simon J. Gerraty" Date: Wed, 16 Oct 2013 15:58:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256631 - projects/bmake/usr.bin/host X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 15:58:22 -0000 Author: sjg Date: Wed Oct 16 15:58:22 2013 New Revision: 256631 URL: http://svnweb.freebsd.org/changeset/base/256631 Log: Updated dependencies Modified: projects/bmake/usr.bin/host/Makefile.depend Modified: projects/bmake/usr.bin/host/Makefile.depend ============================================================================== --- projects/bmake/usr.bin/host/Makefile.depend Wed Oct 16 15:57:57 2013 (r256630) +++ projects/bmake/usr.bin/host/Makefile.depend Wed Oct 16 15:58:22 2013 (r256631) @@ -5,19 +5,13 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,, DIRDEPS = \ gnu/lib/libgcc \ include \ - include/arpa \ include/xlocale \ lib/${CSU_DIR} \ - lib/bind/bind9 \ - lib/bind/dns \ - lib/bind/isc \ - lib/bind/isccc \ - lib/bind/isccfg \ - lib/bind/lwres \ lib/libc \ lib/libcompiler_rt \ - lib/libthr \ + lib/libldns \ secure/lib/libcrypto \ + secure/lib/libssl \ .include From owner-svn-src-projects@FreeBSD.ORG Wed Oct 16 15:58:44 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id CC684FA; Wed, 16 Oct 2013 15:58:44 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A0F2B2887; Wed, 16 Oct 2013 15:58:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GFwiX5011575; Wed, 16 Oct 2013 15:58:44 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GFwidA011574; Wed, 16 Oct 2013 15:58:44 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310161558.r9GFwidA011574@svn.freebsd.org> From: "Simon J. Gerraty" Date: Wed, 16 Oct 2013 15:58:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256632 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 15:58:44 -0000 Author: sjg Date: Wed Oct 16 15:58:44 2013 New Revision: 256632 URL: http://svnweb.freebsd.org/changeset/base/256632 Log: Avoid creating Makefile.depend Modified: projects/bmake/share/mk/Makefile Modified: projects/bmake/share/mk/Makefile ============================================================================== --- projects/bmake/share/mk/Makefile Wed Oct 16 15:58:22 2013 (r256631) +++ projects/bmake/share/mk/Makefile Wed Oct 16 15:58:44 2013 (r256632) @@ -46,4 +46,6 @@ FILESDIR= ${BINDIR}/mk FILES+= atf.test.mk .endif +UPDATE_DEPENDFILE= no + .include From owner-svn-src-projects@FreeBSD.ORG Wed Oct 16 15:59:29 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E55D72B9; Wed, 16 Oct 2013 15:59:29 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D30B8288F; Wed, 16 Oct 2013 15:59:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GFxT35011811; Wed, 16 Oct 2013 15:59:29 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GFxTxR011810; Wed, 16 Oct 2013 15:59:29 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310161559.r9GFxTxR011810@svn.freebsd.org> From: "Simon J. Gerraty" Date: Wed, 16 Oct 2013 15:59:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256633 - projects/bmake/lib/libpam/static_modules X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 15:59:30 -0000 Author: sjg Date: Wed Oct 16 15:59:29 2013 New Revision: 256633 URL: http://svnweb.freebsd.org/changeset/base/256633 Log: Make sure we can find openpam_static.c Modified: projects/bmake/lib/libpam/static_modules/Makefile Modified: projects/bmake/lib/libpam/static_modules/Makefile ============================================================================== --- projects/bmake/lib/libpam/static_modules/Makefile Wed Oct 16 15:58:44 2013 (r256632) +++ projects/bmake/lib/libpam/static_modules/Makefile Wed Oct 16 15:59:29 2013 (r256633) @@ -37,6 +37,7 @@ OPENPAM= ${.CURDIR:H:H:H}/contrib/openpam .PATH: ${OPENPAM}/lib +.PATH: ${OPENPAM}/lib/libpam all: From owner-svn-src-projects@FreeBSD.ORG Wed Oct 16 16:03:02 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0EEB03E5; Wed, 16 Oct 2013 16:03:02 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F0D6528CF; Wed, 16 Oct 2013 16:03:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GG3186015623; Wed, 16 Oct 2013 16:03:01 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GG319m015622; Wed, 16 Oct 2013 16:03:01 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310161603.r9GG319m015622@svn.freebsd.org> From: "Simon J. Gerraty" Date: Wed, 16 Oct 2013 16:03:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256634 - projects/bmake/etc X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 16:03:02 -0000 Author: sjg Date: Wed Oct 16 16:03:01 2013 New Revision: 256634 URL: http://svnweb.freebsd.org/changeset/base/256634 Log: We use distrib-dirs to populate stage tree. But that depends on up-to-date passwd and group files in /etc. If MK_INSTALL_AS_USER==yes and we are not root, filter the mtree input to avoid problems with [gu]name and [gu]id settings. Modified: projects/bmake/etc/Makefile Modified: projects/bmake/etc/Makefile ============================================================================== --- projects/bmake/etc/Makefile Wed Oct 16 15:59:29 2013 (r256633) +++ projects/bmake/etc/Makefile Wed Oct 16 16:03:01 2013 (r256634) @@ -307,6 +307,15 @@ distribution: MTREE_CMD?= mtree +.if ${MK_INSTALL_AS_USER} != "no" && ${_uid} != 0 +MTREE_FILTER= sed -e 's,(uname=)[^ ]* ,\1${BINOWN},' \ + -e 's,(gname=)[^ ]* ,\1${BINGRP},' \ + -e 's,(uid=)[^ ]* ,\1${_uid},' \ + -e 's,(gid=)[^ ]* ,\1${_gid},' +.else +MTREE_FILTER= cat +.endif + MTREES= mtree/BSD.root.dist / \ mtree/BSD.var.dist /var \ mtree/BSD.usr.dist /usr \ @@ -333,7 +342,8 @@ distrib-dirs: ${MTREES:N/*} shift; \ ${ECHO} ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} \ -f $$m -p $$d; \ - ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \ + ${MTREE_FILTER} $$m | \ + ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -p $$d; \ done; true .if defined(NO_ROOT) @set ${MTREES}; \ @@ -346,7 +356,8 @@ distrib-dirs: ${MTREES:N/*} shift; \ ${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \ "sed s#^\.#.$$d# | ${METALOG.add}" ; \ - ${MTREE_CMD:N-W} -C -f $$m -K uname,gname | sed s#^\.#.$$d# | \ + ${MTREE_FILTER} $$m | \ + ${MTREE_CMD:N-W} -C -K uname,gname | sed s#^\.#.$$d# | \ ${METALOG.add} ; \ done; true .endif From owner-svn-src-projects@FreeBSD.ORG Wed Oct 16 16:05:13 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8F33C5D6; Wed, 16 Oct 2013 16:05:13 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7CDAE28F6; Wed, 16 Oct 2013 16:05:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GG5Dkf016368; Wed, 16 Oct 2013 16:05:13 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GG5DoU016366; Wed, 16 Oct 2013 16:05:13 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310161605.r9GG5DoU016366@svn.freebsd.org> From: "Simon J. Gerraty" Date: Wed, 16 Oct 2013 16:05:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256635 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 16:05:13 -0000 Author: sjg Date: Wed Oct 16 16:05:12 2013 New Revision: 256635 URL: http://svnweb.freebsd.org/changeset/base/256635 Log: Handle the different expectations of MACHINE_ARCH b/w buildworld etc and dirdeps. Modified: projects/bmake/share/mk/local.sys.mk Modified: projects/bmake/share/mk/local.sys.mk ============================================================================== --- projects/bmake/share/mk/local.sys.mk Wed Oct 16 16:03:01 2013 (r256634) +++ projects/bmake/share/mk/local.sys.mk Wed Oct 16 16:05:12 2013 (r256635) @@ -63,7 +63,20 @@ MACHINE_ARCH_LIST.$m?= ${TARGET_ARCHES_$ MACHINE_ARCH.$m?= ${MACHINE_ARCH_LIST.$m:[1]} BOOT_MACHINE_DIR.$m ?= boot/$m .endfor -MACHINE_ARCH:= ${TARGET_ARCH:U${MACHINE_ARCH.${MACHINE}}} +.ifndef _TARGET_SPEC +.if empty(MACHINE_ARCH) +.if !empty(TARGET_ARCH) +MACHINE_ARCH= ${TARGET_ARCH} +.else +MACHINE_ARCH= ${MACHINE_ARCH.${MACHINE}} +.endif +.endif +MACHINE_ARCH?= ${MACHINE_ARCH.${MACHINE}} +MACHINE_ARCH:= ${MACHINE_ARCH} +.else +# we got here via dirdeps +MACHINE_ARCH:= ${MACHINE_ARCH.${MACHINE}} +.endif .if !defined(_TARGETS) # some things we do only once @@ -206,9 +219,10 @@ CXXFLAGS_LAST += ${CFLAGS_LAST.${COMPILE # if ld suppored sysroot, this would suffice CFLAGS_LAST+= --sysroot=${STAGE_OBJTOP} .endif -.endif LDFLAGS_LAST+= -Wl,-rpath-link,${STAGE_LIBDIR} STAGED_INCLUDE_DIR= ${STAGE_OBJTOP}/usr/include +.endif + .if ${USE_META:Uyes} == "yes" .include "meta.sys.mk" .endif From owner-svn-src-projects@FreeBSD.ORG Wed Oct 16 16:05:49 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id AD7EA6C5; Wed, 16 Oct 2013 16:05:49 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 998D228FC; Wed, 16 Oct 2013 16:05:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GG5nl7016529; Wed, 16 Oct 2013 16:05:49 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GG5nKi016528; Wed, 16 Oct 2013 16:05:49 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310161605.r9GG5nKi016528@svn.freebsd.org> From: "Simon J. Gerraty" Date: Wed, 16 Oct 2013 16:05:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256636 - projects/bmake X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 16:05:49 -0000 Author: sjg Date: Wed Oct 16 16:05:49 2013 New Revision: 256636 URL: http://svnweb.freebsd.org/changeset/base/256636 Log: Make it possible to buildworld, while producing .meta files to aid debugging. Modified: projects/bmake/Makefile Modified: projects/bmake/Makefile ============================================================================== --- projects/bmake/Makefile Wed Oct 16 16:05:12 2013 (r256635) +++ projects/bmake/Makefile Wed Oct 16 16:05:49 2013 (r256636) @@ -500,11 +500,19 @@ buildLINT: ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT .if defined(.PARSEDIR) -# this makefile does not run in meta mode +# This makefile does not run in meta mode .MAKE.MODE= normal -# make sure things we run from here don't either +# Normally the things we run from here don't either. +# Using -DWITH_META_FILES -DWITHOUT_STAGING +# we can buildworld with meta files created which are useful +# for debugging, but without any of the rest of a meta mode build. +.ifndef WITH_META_FILES WITHOUT_META_MODE= .export WITHOUT_META_MODE +.else +UPDATE_DEPENDFILE=NO +.export UPDATE_DEPENDFILE +.endif .if make(universe) # we do not want a failure of one branch abort all. From owner-svn-src-projects@FreeBSD.ORG Wed Oct 16 19:31:34 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D4E61547; Wed, 16 Oct 2013 19:31:34 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (lor.one-eyed-alien.net [69.66.77.232]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2A7F425A2; Wed, 16 Oct 2013 19:31:33 +0000 (UTC) Received: from lor.one-eyed-alien.net (localhost [127.0.0.1]) by lor.one-eyed-alien.net (8.14.7/8.14.7) with ESMTP id r9GJHKAY069014; Wed, 16 Oct 2013 14:17:20 -0500 (CDT) (envelope-from brooks@lor.one-eyed-alien.net) Received: (from brooks@localhost) by lor.one-eyed-alien.net (8.14.7/8.14.7/Submit) id r9GJHKmV069013; Wed, 16 Oct 2013 14:17:20 -0500 (CDT) (envelope-from brooks) Date: Wed, 16 Oct 2013 14:17:20 -0500 From: Brooks Davis To: "Simon J. Gerraty" Subject: Re: svn commit: r256634 - projects/bmake/etc Message-ID: <20131016191720.GB67671@lor.one-eyed-alien.net> References: <201310161603.r9GG319m015622@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="7iMSBzlTiPOCCT2k" Content-Disposition: inline In-Reply-To: <201310161603.r9GG319m015622@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 19:31:34 -0000 --7iMSBzlTiPOCCT2k Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Oct 16, 2013 at 04:03:01PM +0000, Simon J. Gerraty wrote: > Author: sjg > Date: Wed Oct 16 16:03:01 2013 > New Revision: 256634 > URL: http://svnweb.freebsd.org/changeset/base/256634 >=20 > Log: > We use distrib-dirs to populate stage tree. > But that depends on up-to-date passwd and group files in /etc. > If MK_INSTALL_AS_USER=3D=3Dyes and we are not root, filter the mtree in= put > to avoid problems with [gu]name and [gu]id settings. Why not use nmtree and its -N and -U options in the MK_INSTALL_AS_USER=3D=3Dyes case? -- Brooks --7iMSBzlTiPOCCT2k Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iD8DBQFSXuY/XY6L6fI4GtQRAiOmAJ47gbVwb6Zm4rXqSnYOBAgzkx3l4gCdFQry 2z5XLGK22J2mnN6gQOcK3aU= =mgar -----END PGP SIGNATURE----- --7iMSBzlTiPOCCT2k-- From owner-svn-src-projects@FreeBSD.ORG Thu Oct 17 09:45:05 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 47A9735A; Thu, 17 Oct 2013 09:45:05 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 268AD20EE; Thu, 17 Oct 2013 09:45:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9H9j5Wh080222; Thu, 17 Oct 2013 09:45:05 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9H9j3hm080213; Thu, 17 Oct 2013 09:45:03 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310170945.r9H9j3hm080213@svn.freebsd.org> From: Alexander Motin Date: Thu, 17 Oct 2013 09:45:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256671 - in projects/camlock/sys: cam/ctl dev/aic7xxx dev/firewire dev/isp dev/mpt X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 09:45:05 -0000 Author: mav Date: Thu Oct 17 09:45:03 2013 New Revision: 256671 URL: http://svnweb.freebsd.org/changeset/base/256671 Log: Make CTL CAM target frontend to drop periph lock while calling CTL or SIM methods. This radically reduces congestion on that lock. To make it possible, fix several target mode SIMs to not blindly clear ccb_h.flags field of ATIO CCBs. Not all CCB flags there belong to them. Modified: projects/camlock/sys/cam/ctl/scsi_ctl.c projects/camlock/sys/dev/aic7xxx/aic79xx.c projects/camlock/sys/dev/aic7xxx/aic7xxx.c projects/camlock/sys/dev/firewire/sbp_targ.c projects/camlock/sys/dev/isp/isp_freebsd.c projects/camlock/sys/dev/mpt/mpt_cam.c Modified: projects/camlock/sys/cam/ctl/scsi_ctl.c ============================================================================== --- projects/camlock/sys/cam/ctl/scsi_ctl.c Thu Oct 17 07:57:58 2013 (r256670) +++ projects/camlock/sys/cam/ctl/scsi_ctl.c Thu Oct 17 09:45:03 2013 (r256671) @@ -576,6 +576,7 @@ ctlferegister(struct cam_periph *periph, xpt_setup_ccb(&new_ccb->ccb_h, periph->path, /*priority*/ 1); new_ccb->ccb_h.func_code = XPT_ACCEPT_TARGET_IO; new_ccb->ccb_h.cbfcnp = ctlfedone; + new_ccb->ccb_h.flags |= CAM_UNLOCKED; xpt_action(new_ccb); softc->atios_sent++; status = new_ccb->ccb_h.status; @@ -611,6 +612,7 @@ ctlferegister(struct cam_periph *periph, xpt_setup_ccb(&new_ccb->ccb_h, periph->path, /*priority*/ 1); new_ccb->ccb_h.func_code = XPT_IMMEDIATE_NOTIFY; new_ccb->ccb_h.cbfcnp = ctlfedone; + new_ccb->ccb_h.flags |= CAM_UNLOCKED; xpt_action(new_ccb); softc->inots_sent++; status = new_ccb->ccb_h.status; @@ -782,7 +784,6 @@ ctlfestart(struct cam_periph *periph, un } start_ccb->ccb_h.func_code = XPT_ABORT; start_ccb->cab.abort_ccb = (union ccb *)atio; - start_ccb->ccb_h.cbfcnp = ctlfedone; /* Tell the SIM that we've aborted this ATIO */ xpt_action(start_ccb); @@ -995,6 +996,7 @@ ctlfestart(struct cam_periph *periph, un /*data_ptr*/ data_ptr, /*dxfer_len*/ dxfer_len, /*timeout*/ 5 * 1000); + start_ccb->ccb_h.flags |= CAM_UNLOCKED; start_ccb->ccb_h.ccb_atio = atio; if (((flags & CAM_SEND_STATUS) == 0) && (io != NULL)) @@ -1002,7 +1004,9 @@ ctlfestart(struct cam_periph *periph, un softc->ctios_sent++; + cam_periph_unlock(periph); xpt_action(start_ccb); + cam_periph_lock(periph); if ((atio->ccb_h.status & CAM_DEV_QFRZN) != 0) { cam_release_devq(periph->path, @@ -1139,7 +1143,10 @@ ctlfedone(struct cam_periph *periph, uni struct ctlfe_softc *bus_softc; struct ccb_accept_tio *atio = NULL; union ctl_io *io = NULL; + struct mtx *mtx; + KASSERT((done_ccb->ccb_h.flags & CAM_UNLOCKED) != 0, + ("CCB in ctlfedone() without CAM_UNLOCKED flag")); #ifdef CTLFE_DEBUG printf("%s: entered, func_code = %#x, type = %#lx\n", __func__, done_ccb->ccb_h.func_code, done_ccb->ccb_h.ccb_type); @@ -1147,6 +1154,8 @@ ctlfedone(struct cam_periph *periph, uni softc = (struct ctlfe_lun_softc *)periph->softc; bus_softc = softc->parent_softc; + mtx = cam_periph_mtx(periph); + mtx_lock(mtx); /* * If the peripheral is invalid, ATIOs and immediate notify CCBs @@ -1162,7 +1171,7 @@ ctlfedone(struct cam_periph *periph, uni case XPT_IMMEDIATE_NOTIFY: case XPT_NOTIFY_ACKNOWLEDGE: ctlfe_free_ccb(periph, done_ccb); - return; + goto out; default: break; } @@ -1200,6 +1209,7 @@ ctlfedone(struct cam_periph *periph, uni xpt_schedule(periph, /*priority*/ 1); break; } + mtx_unlock(mtx); ctl_zero_io(io); /* Save pointers on both sides */ @@ -1256,7 +1266,7 @@ ctlfedone(struct cam_periph *periph, uni #endif ctl_queue(io); - break; + return; } case XPT_CONT_TARGET_IO: { int srr = 0; @@ -1318,7 +1328,7 @@ ctlfedone(struct cam_periph *periph, uni TAILQ_INSERT_HEAD(&softc->work_queue, &atio->ccb_h, periph_links.tqe); xpt_schedule(periph, /*priority*/ 1); - return; + break; } /* @@ -1344,10 +1354,11 @@ ctlfedone(struct cam_periph *periph, uni } if (periph->flags & CAM_PERIPH_INVALID) { ctlfe_free_ccb(periph, (union ccb *)atio); - return; } else { - xpt_action((union ccb *)atio); softc->atios_sent++; + mtx_unlock(mtx); + xpt_action((union ccb *)atio); + return; } } else { struct ctlfe_lun_cmd_info *cmd_info; @@ -1463,10 +1474,12 @@ ctlfedone(struct cam_periph *periph, uni /*dxfer_len*/ dxfer_len, /*timeout*/ 5 * 1000); + csio->ccb_h.flags |= CAM_UNLOCKED; csio->resid = 0; csio->ccb_h.ccb_atio = atio; io->io_hdr.flags |= CTL_FLAG_DMA_INPROG; softc->ctios_sent++; + mtx_unlock(mtx); xpt_action((union ccb *)csio); } else { /* @@ -1475,10 +1488,12 @@ ctlfedone(struct cam_periph *periph, uni */ softc->ccbs_freed++; xpt_release_ccb(done_ccb); + mtx_unlock(mtx); /* Call the backend move done callback */ io->scsiio.be_move_done(io); } + return; } break; } @@ -1599,7 +1614,7 @@ ctlfedone(struct cam_periph *periph, uni ctl_free_io(io); ctlfe_free_ccb(periph, done_ccb); - return; + goto out; } if (send_ctl_io != 0) { ctl_queue(io); @@ -1636,12 +1651,6 @@ ctlfedone(struct cam_periph *periph, uni xpt_action(done_ccb); softc->inots_sent++; break; - case XPT_ABORT: - /* - * XPT_ABORT is an immediate CCB, we shouldn't get here. - */ - panic("%s: XPT_ABORT CCB returned!", __func__); - break; case XPT_SET_SIM_KNOB: case XPT_GET_SIM_KNOB: break; @@ -1650,6 +1659,9 @@ ctlfedone(struct cam_periph *periph, uni done_ccb->ccb_h.func_code); break; } + +out: + mtx_unlock(mtx); } static void Modified: projects/camlock/sys/dev/aic7xxx/aic79xx.c ============================================================================== --- projects/camlock/sys/dev/aic7xxx/aic79xx.c Thu Oct 17 07:57:58 2013 (r256670) +++ projects/camlock/sys/dev/aic7xxx/aic79xx.c Thu Oct 17 09:45:03 2013 (r256671) @@ -10343,9 +10343,9 @@ ahd_handle_target_cmd(struct ahd_softc * /* Tag was included */ atio->tag_action = *byte++; atio->tag_id = *byte++; - atio->ccb_h.flags = CAM_TAG_ACTION_VALID; + atio->ccb_h.flags |= CAM_TAG_ACTION_VALID; } else { - atio->ccb_h.flags = 0; + atio->ccb_h.flags &= ~CAM_TAG_ACTION_VALID; } byte++; Modified: projects/camlock/sys/dev/aic7xxx/aic7xxx.c ============================================================================== --- projects/camlock/sys/dev/aic7xxx/aic7xxx.c Thu Oct 17 07:57:58 2013 (r256670) +++ projects/camlock/sys/dev/aic7xxx/aic7xxx.c Thu Oct 17 09:45:03 2013 (r256671) @@ -7843,9 +7843,9 @@ ahc_handle_target_cmd(struct ahc_softc * /* Tag was included */ atio->tag_action = *byte++; atio->tag_id = *byte++; - atio->ccb_h.flags = CAM_TAG_ACTION_VALID; + atio->ccb_h.flags |= CAM_TAG_ACTION_VALID; } else { - atio->ccb_h.flags = 0; + atio->ccb_h.flags &= ~CAM_TAG_ACTION_VALID; } byte++; Modified: projects/camlock/sys/dev/firewire/sbp_targ.c ============================================================================== --- projects/camlock/sys/dev/firewire/sbp_targ.c Thu Oct 17 07:57:58 2013 (r256670) +++ projects/camlock/sys/dev/firewire/sbp_targ.c Thu Oct 17 09:45:03 2013 (r256671) @@ -1483,7 +1483,7 @@ sbp_targ_cmd_handler(struct fw_xfer *xfe atio->tag_id = orbi->orb_lo; atio->init_id = orbi->login->id; - atio->ccb_h.flags = CAM_TAG_ACTION_VALID; + atio->ccb_h.flags |= CAM_TAG_ACTION_VALID; bytes = (u_char *)&orb[5]; if (debug) printf("%s: %p %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", Modified: projects/camlock/sys/dev/isp/isp_freebsd.c ============================================================================== --- projects/camlock/sys/dev/isp/isp_freebsd.c Thu Oct 17 07:57:58 2013 (r256670) +++ projects/camlock/sys/dev/isp/isp_freebsd.c Thu Oct 17 09:45:03 2013 (r256671) @@ -2281,9 +2281,9 @@ isp_handle_platform_atio(ispsoftc_t *isp atiop->ccb_h.target_id = aep->at_tgt; atiop->ccb_h.target_lun = aep->at_lun; if (aep->at_flags & AT_NODISC) { - atiop->ccb_h.flags = CAM_DIS_DISCONNECT; + atiop->ccb_h.flags |= CAM_DIS_DISCONNECT; } else { - atiop->ccb_h.flags = 0; + atiop->ccb_h.flags &= ~CAM_DIS_DISCONNECT; } if (status & QLTM_SVALID) { @@ -2452,15 +2452,15 @@ isp_handle_platform_atio2(ispsoftc_t *is atiop->tag_id = atp->tag; switch (aep->at_taskflags & ATIO2_TC_ATTR_MASK) { case ATIO2_TC_ATTR_SIMPLEQ: - atiop->ccb_h.flags = CAM_TAG_ACTION_VALID; + atiop->ccb_h.flags |= CAM_TAG_ACTION_VALID; atiop->tag_action = MSG_SIMPLE_Q_TAG; break; case ATIO2_TC_ATTR_HEADOFQ: - atiop->ccb_h.flags = CAM_TAG_ACTION_VALID; + atiop->ccb_h.flags |= CAM_TAG_ACTION_VALID; atiop->tag_action = MSG_HEAD_OF_Q_TAG; break; case ATIO2_TC_ATTR_ORDERED: - atiop->ccb_h.flags = CAM_TAG_ACTION_VALID; + atiop->ccb_h.flags |= CAM_TAG_ACTION_VALID; atiop->tag_action = MSG_ORDERED_Q_TAG; break; case ATIO2_TC_ATTR_ACAQ: /* ?? */ @@ -2673,15 +2673,15 @@ isp_handle_platform_atio7(ispsoftc_t *is atiop->tag_id = atp->tag; switch (aep->at_cmnd.fcp_cmnd_task_attribute & FCP_CMND_TASK_ATTR_MASK) { case FCP_CMND_TASK_ATTR_SIMPLE: - atiop->ccb_h.flags = CAM_TAG_ACTION_VALID; + atiop->ccb_h.flags |= CAM_TAG_ACTION_VALID; atiop->tag_action = MSG_SIMPLE_Q_TAG; break; case FCP_CMND_TASK_ATTR_HEAD: - atiop->ccb_h.flags = CAM_TAG_ACTION_VALID; + atiop->ccb_h.flags |= CAM_TAG_ACTION_VALID; atiop->tag_action = MSG_HEAD_OF_Q_TAG; break; case FCP_CMND_TASK_ATTR_ORDERED: - atiop->ccb_h.flags = CAM_TAG_ACTION_VALID; + atiop->ccb_h.flags |= CAM_TAG_ACTION_VALID; atiop->tag_action = MSG_ORDERED_Q_TAG; break; default: @@ -5001,7 +5001,6 @@ isp_action(struct cam_sim *sim, union cc } ccb->ccb_h.spriv_field0 = 0; ccb->ccb_h.spriv_ptr1 = isp; - ccb->ccb_h.flags = 0; if (ccb->ccb_h.func_code == XPT_ACCEPT_TARGET_IO) { if (ccb->atio.tag_id) { Modified: projects/camlock/sys/dev/mpt/mpt_cam.c ============================================================================== --- projects/camlock/sys/dev/mpt/mpt_cam.c Thu Oct 17 07:57:58 2013 (r256670) +++ projects/camlock/sys/dev/mpt/mpt_cam.c Thu Oct 17 09:45:03 2013 (r256671) @@ -3683,7 +3683,6 @@ mpt_action(struct cam_sim *sim, union cc lun_id_t lun = ccb->ccb_h.target_lun; ccb->ccb_h.sim_priv.entries[0].field = 0; ccb->ccb_h.sim_priv.entries[1].ptr = mpt; - ccb->ccb_h.flags = 0; if (lun == CAM_LUN_WILDCARD) { if (ccb->ccb_h.target_id != CAM_TARGET_WILDCARD) { @@ -5156,7 +5155,7 @@ mpt_scsi_tgt_atio(struct mpt_softc *mpt, tgt->tag_id = atiop->tag_id; if (tag_action) { atiop->tag_action = tag_action; - atiop->ccb_h.flags = CAM_TAG_ACTION_VALID; + atiop->ccb_h.flags |= CAM_TAG_ACTION_VALID; } if (mpt->verbose >= MPT_PRT_DEBUG) { int i; From owner-svn-src-projects@FreeBSD.ORG Thu Oct 17 20:00:00 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F3AC6573; Thu, 17 Oct 2013 19:59:59 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DE2BB2E4B; Thu, 17 Oct 2013 19:59:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HJxx8A006565; Thu, 17 Oct 2013 19:59:59 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HJxqea006512; Thu, 17 Oct 2013 19:59:52 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310171959.r9HJxqea006512@svn.freebsd.org> From: "Simon J. Gerraty" Date: Thu, 17 Oct 2013 19:59:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256698 - in projects/bmake: bin/freebsd-version lib/libc++ lib/libcxxrt lib/libiconv_modules/BIG5 lib/libiconv_modules/DECHanyu lib/libiconv_modules/EUC lib/libiconv_modules/EUCTW lib/... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 20:00:00 -0000 Author: sjg Date: Thu Oct 17 19:59:51 2013 New Revision: 256698 URL: http://svnweb.freebsd.org/changeset/base/256698 Log: New/updated dependencies Added: projects/bmake/bin/freebsd-version/Makefile.depend (contents, props changed) projects/bmake/lib/libc++/Makefile.depend (contents, props changed) projects/bmake/lib/libcxxrt/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/BIG5/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/DECHanyu/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/EUC/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/EUCTW/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/GBK2K/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/HZ/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/ISO2022/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/JOHAB/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/MSKanji/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/UES/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/UTF1632/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/UTF7/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/UTF8/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/VIQR/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/ZW/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/iconv_none/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/iconv_std/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/mapper_646/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/mapper_none/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/mapper_parallel/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/mapper_serial/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/mapper_std/Makefile.depend (contents, props changed) projects/bmake/lib/libiconv_modules/mapper_zone/Makefile.depend (contents, props changed) projects/bmake/lib/libvmmapi/Makefile.depend (contents, props changed) projects/bmake/share/i18n/csmapper/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/APPLE/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/AST/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/BIG5/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/CP/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/DEC/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/EBCDIC/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/EUC/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/GB/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/GEORGIAN/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/ISO-2022/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/ISO-8859/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/ISO646/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/KAZAKH/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/KOI/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/MISC/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/TCVN/Makefile.depend (contents, props changed) projects/bmake/share/i18n/esdb/UTF/Makefile.depend (contents, props changed) Modified: projects/bmake/lib/libsmb/Makefile.depend projects/bmake/pkgs/pseudo/bin/Makefile.depend projects/bmake/pkgs/pseudo/cddl/Makefile.depend projects/bmake/pkgs/pseudo/gnu/Makefile.depend projects/bmake/pkgs/pseudo/kerberos5/Makefile.depend projects/bmake/pkgs/pseudo/lib/Makefile.depend projects/bmake/pkgs/pseudo/libexec/Makefile.depend projects/bmake/pkgs/pseudo/sbin/Makefile.depend projects/bmake/pkgs/pseudo/secure/Makefile.depend projects/bmake/pkgs/pseudo/share/Makefile.depend projects/bmake/pkgs/pseudo/the-lot/Makefile.depend projects/bmake/share/i18n/csmapper/APPLE/Makefile.depend projects/bmake/share/i18n/csmapper/AST/Makefile.depend projects/bmake/share/i18n/csmapper/BIG5/Makefile.depend projects/bmake/share/i18n/csmapper/CNS/Makefile.depend projects/bmake/share/i18n/csmapper/CP/Makefile.depend projects/bmake/share/i18n/csmapper/EBCDIC/Makefile.depend projects/bmake/share/i18n/csmapper/GB/Makefile.depend projects/bmake/share/i18n/csmapper/GEORGIAN/Makefile.depend projects/bmake/share/i18n/csmapper/ISO-8859/Makefile.depend projects/bmake/share/i18n/csmapper/ISO646/Makefile.depend projects/bmake/share/i18n/csmapper/JIS/Makefile.depend projects/bmake/share/i18n/csmapper/KAZAKH/Makefile.depend projects/bmake/share/i18n/csmapper/KOI/Makefile.depend projects/bmake/share/i18n/csmapper/KS/Makefile.depend projects/bmake/share/i18n/csmapper/MISC/Makefile.depend projects/bmake/share/i18n/csmapper/TCVN/Makefile.depend projects/bmake/usr.bin/mkcsmapper_static/Makefile.depend Added: projects/bmake/bin/freebsd-version/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/bin/freebsd-version/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,12 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libc++/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libc++/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,37 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/msun \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +cxxrt_auxhelper.o: cxxrt_auxhelper.cc +cxxrt_auxhelper.po: cxxrt_auxhelper.cc +cxxrt_dynamic_cast.o: cxxrt_dynamic_cast.cc +cxxrt_dynamic_cast.po: cxxrt_dynamic_cast.cc +cxxrt_exception.o: cxxrt_exception.cc +cxxrt_exception.po: cxxrt_exception.cc +cxxrt_guard.o: cxxrt_guard.cc +cxxrt_guard.po: cxxrt_guard.cc +cxxrt_libelftc_dem_gnu3.o: cxxrt_libelftc_dem_gnu3.c +cxxrt_libelftc_dem_gnu3.po: cxxrt_libelftc_dem_gnu3.c +cxxrt_memory.o: cxxrt_memory.cc +cxxrt_memory.po: cxxrt_memory.cc +cxxrt_stdexcept.o: cxxrt_stdexcept.cc +cxxrt_stdexcept.po: cxxrt_stdexcept.cc +cxxrt_terminate.o: cxxrt_terminate.cc +cxxrt_terminate.po: cxxrt_terminate.cc +cxxrt_typeinfo.o: cxxrt_typeinfo.cc +cxxrt_typeinfo.po: cxxrt_typeinfo.cc +.endif Added: projects/bmake/lib/libcxxrt/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libcxxrt/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,18 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/BIG5/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/BIG5/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/DECHanyu/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/DECHanyu/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/EUC/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/EUC/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/EUCTW/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/EUCTW/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/GBK2K/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/GBK2K/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/HZ/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/HZ/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/ISO2022/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/ISO2022/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/JOHAB/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/JOHAB/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/MSKanji/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/MSKanji/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/UES/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/UES/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/UTF1632/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/UTF1632/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/UTF7/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/UTF7/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/UTF8/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/UTF8/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/VIQR/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/VIQR/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/ZW/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/ZW/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/iconv_none/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/iconv_none/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/iconv_std/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/iconv_std/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/mapper_646/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/mapper_646/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/mapper_none/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/mapper_none/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/mapper_parallel/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/mapper_parallel/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/mapper_serial/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/mapper_serial/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/mapper_std/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/mapper_std/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libiconv_modules/mapper_zone/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libiconv_modules/mapper_zone/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Modified: projects/bmake/lib/libsmb/Makefile.depend ============================================================================== --- projects/bmake/lib/libsmb/Makefile.depend Thu Oct 17 19:56:50 2013 (r256697) +++ projects/bmake/lib/libsmb/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -2,9 +2,15 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/arpa \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libkiconv \ .include Added: projects/bmake/lib/libvmmapi/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libvmmapi/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -0,0 +1,19 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libutil \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Modified: projects/bmake/pkgs/pseudo/bin/Makefile.depend ============================================================================== --- projects/bmake/pkgs/pseudo/bin/Makefile.depend Thu Oct 17 19:56:50 2013 (r256697) +++ projects/bmake/pkgs/pseudo/bin/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -18,6 +18,7 @@ DIRDEPS = \ bin/echo \ bin/ed \ bin/expr \ + bin/freebsd-version \ bin/getfacl \ bin/hostname \ bin/kenv \ Modified: projects/bmake/pkgs/pseudo/cddl/Makefile.depend ============================================================================== --- projects/bmake/pkgs/pseudo/cddl/Makefile.depend Thu Oct 17 19:56:50 2013 (r256697) +++ projects/bmake/pkgs/pseudo/cddl/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -13,6 +13,7 @@ DIRDEPS = \ cddl/lib/libumem \ cddl/lib/libuutil \ cddl/lib/libzfs \ + cddl/lib/libzfs_core \ cddl/lib/libzpool \ cddl/sbin/zfs \ cddl/sbin/zpool \ Modified: projects/bmake/pkgs/pseudo/gnu/Makefile.depend ============================================================================== --- projects/bmake/pkgs/pseudo/gnu/Makefile.depend Thu Oct 17 19:56:50 2013 (r256697) +++ projects/bmake/pkgs/pseudo/gnu/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -6,24 +6,25 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,, DIRDEPS = \ gnu/lib/csu \ + gnu/lib/libdialog \ gnu/lib/libgcc \ gnu/lib/libgcov \ - gnu/lib/libdialog \ gnu/lib/libgomp \ - gnu/lib/libregex/doc \ gnu/lib/libreadline/history/doc \ gnu/lib/libreadline/readline/doc \ + gnu/lib/libregex/doc \ gnu/lib/libssp/libssp_nonshared \ gnu/lib/libstdc++ \ gnu/lib/libsupc++ \ - gnu/usr.bin/binutils/libiberty \ - gnu/usr.bin/binutils/libbfd \ - gnu/usr.bin/binutils/libopcodes \ - gnu/usr.bin/binutils/libbinutils \ gnu/usr.bin/binutils/addr2line \ gnu/usr.bin/binutils/ar \ gnu/usr.bin/binutils/as \ + gnu/usr.bin/binutils/doc \ gnu/usr.bin/binutils/ld \ + gnu/usr.bin/binutils/libbfd \ + gnu/usr.bin/binutils/libbinutils \ + gnu/usr.bin/binutils/libiberty \ + gnu/usr.bin/binutils/libopcodes \ gnu/usr.bin/binutils/nm \ gnu/usr.bin/binutils/objcopy \ gnu/usr.bin/binutils/objdump \ @@ -32,22 +33,15 @@ DIRDEPS = \ gnu/usr.bin/binutils/size \ gnu/usr.bin/binutils/strings \ gnu/usr.bin/binutils/strip \ - gnu/usr.bin/binutils/doc \ - gnu/usr.bin/cvs/lib \ - gnu/usr.bin/cvs/libdiff \ - gnu/usr.bin/cvs/cvs \ - gnu/usr.bin/cvs/contrib \ - gnu/usr.bin/cvs/cvsbug \ - gnu/usr.bin/cvs/doc \ gnu/usr.bin/dialog \ gnu/usr.bin/diff/doc \ gnu/usr.bin/diff3 \ gnu/usr.bin/gdb/doc \ - gnu/usr.bin/gdb/libgdb \ gnu/usr.bin/gdb/gdb \ + gnu/usr.bin/gdb/gdbserver \ gnu/usr.bin/gdb/gdbtui \ gnu/usr.bin/gdb/kgdb \ - gnu/usr.bin/gdb/gdbserver \ + gnu/usr.bin/gdb/libgdb \ gnu/usr.bin/gperf/doc \ gnu/usr.bin/grep/doc \ gnu/usr.bin/groff/contrib/mm \ @@ -67,15 +61,15 @@ DIRDEPS = \ gnu/usr.bin/groff/font/devps \ gnu/usr.bin/groff/font/devutf8 \ gnu/usr.bin/groff/man \ - gnu/usr.bin/groff/src/libs/libgroff \ - gnu/usr.bin/groff/src/libs/libdriver \ - gnu/usr.bin/groff/src/libs/libbib \ gnu/usr.bin/groff/src/devices/grodvi \ gnu/usr.bin/groff/src/devices/grohtml \ gnu/usr.bin/groff/src/devices/grolbp \ gnu/usr.bin/groff/src/devices/grolj4 \ gnu/usr.bin/groff/src/devices/grops \ gnu/usr.bin/groff/src/devices/grotty \ + gnu/usr.bin/groff/src/libs/libbib \ + gnu/usr.bin/groff/src/libs/libdriver \ + gnu/usr.bin/groff/src/libs/libgroff \ gnu/usr.bin/groff/src/preproc/eqn \ gnu/usr.bin/groff/src/preproc/grn \ gnu/usr.bin/groff/src/preproc/html \ @@ -97,27 +91,26 @@ DIRDEPS = \ gnu/usr.bin/groff/src/utils/pfbtops \ gnu/usr.bin/groff/src/utils/tfmtodit \ gnu/usr.bin/groff/tmac \ - gnu/usr.bin/patch \ - gnu/usr.bin/rcs/lib \ gnu/usr.bin/rcs/ci \ gnu/usr.bin/rcs/co \ gnu/usr.bin/rcs/ident \ + gnu/usr.bin/rcs/lib \ gnu/usr.bin/rcs/merge \ gnu/usr.bin/rcs/rcs \ gnu/usr.bin/rcs/rcsclean \ gnu/usr.bin/rcs/rcsdiff \ + gnu/usr.bin/rcs/rcsfreeze \ gnu/usr.bin/rcs/rcsmerge \ gnu/usr.bin/rcs/rlog \ - gnu/usr.bin/rcs/rcsfreeze \ gnu/usr.bin/sdiff \ gnu/usr.bin/send-pr/doc \ - gnu/usr.bin/texinfo/libtxi \ - gnu/usr.bin/texinfo/makeinfo \ + gnu/usr.bin/texinfo/doc \ gnu/usr.bin/texinfo/info \ gnu/usr.bin/texinfo/infokey \ gnu/usr.bin/texinfo/install-info \ + gnu/usr.bin/texinfo/libtxi \ + gnu/usr.bin/texinfo/makeinfo \ gnu/usr.bin/texinfo/texindex \ - gnu/usr.bin/texinfo/doc \ .include Modified: projects/bmake/pkgs/pseudo/kerberos5/Makefile.depend ============================================================================== --- projects/bmake/pkgs/pseudo/kerberos5/Makefile.depend Thu Oct 17 19:56:50 2013 (r256697) +++ projects/bmake/pkgs/pseudo/kerberos5/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -11,42 +11,42 @@ DIRDEPS = \ kerberos5/lib/libgssapi_ntlm \ kerberos5/lib/libgssapi_spnego \ kerberos5/lib/libhdb \ + kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ + kerberos5/lib/libheimipcs \ kerberos5/lib/libheimntlm \ + kerberos5/lib/libheimsqlite \ kerberos5/lib/libhx509 \ kerberos5/lib/libkadm5clnt \ kerberos5/lib/libkadm5srv \ kerberos5/lib/libkafs5 \ + kerberos5/lib/libkdc \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ kerberos5/lib/libsl \ kerberos5/lib/libvers \ - kerberos5/lib/libkdc \ kerberos5/lib/libwind \ - kerberos5/lib/libheimsqlite \ - kerberos5/lib/libheimbase \ - kerberos5/lib/libheimipcc \ - kerberos5/lib/libheimipcs \ kerberos5/libexec/digest-service \ - kerberos5/libexec/ipropd-master \ - kerberos5/libexec/ipropd-slave \ kerberos5/libexec/hprop \ kerberos5/libexec/hpropd \ + kerberos5/libexec/ipropd-master \ + kerberos5/libexec/ipropd-slave \ kerberos5/libexec/kadmind \ + kerberos5/libexec/kcm \ kerberos5/libexec/kdc \ kerberos5/libexec/kdigest \ kerberos5/libexec/kfd \ kerberos5/libexec/kimpersonate \ kerberos5/libexec/kpasswdd \ - kerberos5/libexec/kcm \ - kerberos5/tools/make-roken \ kerberos5/tools/asn1_compile \ + kerberos5/tools/make-roken \ kerberos5/tools/slc \ kerberos5/usr.bin/hxtool \ kerberos5/usr.bin/kadmin \ kerberos5/usr.bin/kcc \ kerberos5/usr.bin/kdestroy \ - kerberos5/usr.bin/kgetcred \ kerberos5/usr.bin/kf \ + kerberos5/usr.bin/kgetcred \ kerberos5/usr.bin/kinit \ kerberos5/usr.bin/kpasswd \ kerberos5/usr.bin/krb5-config \ Modified: projects/bmake/pkgs/pseudo/lib/Makefile.depend ============================================================================== --- projects/bmake/pkgs/pseudo/lib/Makefile.depend Thu Oct 17 19:56:50 2013 (r256697) +++ projects/bmake/pkgs/pseudo/lib/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -6,31 +6,8 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,, DIRDEPS = \ lib/${CSU_DIR} \ - lib/libc \ - lib/libbsm \ - lib/libauditd \ - lib/libcompiler_rt \ - lib/libcrypt \ - lib/libelf \ - lib/libkvm \ - lib/msun \ - lib/libmd \ - lib/ncurses/ncurses \ - lib/ncurses/form \ - lib/ncurses/menu \ - lib/ncurses/panel \ - lib/ncurses/ncursesw \ - lib/ncurses/formw \ - lib/ncurses/menuw \ - lib/ncurses/panelw \ - lib/libnetgraph \ - lib/libradius \ - lib/librpcsvc \ - lib/libsbuf \ - lib/libtacplus \ - lib/libutil \ - lib/libypclnt \ - lib/libcom_err/doc \ + lib/atf/libatf-c \ + lib/atf/libatf-c++ \ lib/libalias/libalias \ lib/libalias/modules/cuseeme \ lib/libalias/modules/dummy \ @@ -41,37 +18,73 @@ DIRDEPS = \ lib/libalias/modules/skinny \ lib/libalias/modules/smedia \ lib/libarchive \ + lib/libauditd \ lib/libbegemot \ lib/libblocksruntime \ lib/libbluetooth \ + lib/libbsm \ lib/libbsnmp/libbsnmp \ lib/libbz2 \ + lib/libc \ + lib/libc++ \ lib/libcalendar \ lib/libcam \ + lib/libcom_err/doc \ lib/libcompat \ + lib/libcompiler_rt \ + lib/libcrypt \ + lib/libcxxrt \ lib/libdevinfo \ lib/libdevstat \ - lib/libdisk \ lib/libdwarf \ lib/libedit/edit/readline \ + lib/libelf \ + lib/libexecinfo \ lib/libexpat \ lib/libfetch \ lib/libgeom \ lib/libgpib \ lib/libgssapi \ - lib/librpcsec_gss \ + lib/libiconv_modules/BIG5 \ + lib/libiconv_modules/DECHanyu \ + lib/libiconv_modules/EUC \ + lib/libiconv_modules/EUCTW \ + lib/libiconv_modules/GBK2K \ + lib/libiconv_modules/HZ \ + lib/libiconv_modules/ISO2022 \ + lib/libiconv_modules/JOHAB \ + lib/libiconv_modules/MSKanji \ + lib/libiconv_modules/UES \ + lib/libiconv_modules/UTF1632 \ + lib/libiconv_modules/UTF7 \ + lib/libiconv_modules/UTF8 \ + lib/libiconv_modules/VIQR \ + lib/libiconv_modules/ZW \ + lib/libiconv_modules/iconv_none \ + lib/libiconv_modules/iconv_std \ + lib/libiconv_modules/mapper_646 \ + lib/libiconv_modules/mapper_none \ + lib/libiconv_modules/mapper_parallel \ + lib/libiconv_modules/mapper_serial \ + lib/libiconv_modules/mapper_std \ + lib/libiconv_modules/mapper_zone \ lib/libipsec \ lib/libipx \ lib/libjail \ lib/libkiconv \ + lib/libkvm \ + lib/libldns \ lib/liblzma \ lib/libmagic \ lib/libmandoc \ + lib/libmd \ lib/libmemstat \ lib/libmilter \ lib/libmp \ + lib/libnetgraph \ lib/libngatm \ lib/libopie \ + lib/libpam/libpam \ lib/libpam/modules/pam_chroot \ lib/libpam/modules/pam_deny \ lib/libpam/modules/pam_echo \ @@ -96,40 +109,51 @@ DIRDEPS = \ lib/libpam/modules/pam_ssh \ lib/libpam/modules/pam_tacplus \ lib/libpam/modules/pam_unix \ - lib/libpam/libpam \ lib/libpcap \ lib/libpmc \ lib/libproc \ - lib/libprocstat/zfs \ + lib/libprocstat \ + lib/libradius \ + lib/librpcsec_gss \ + lib/librpcsvc \ lib/librt \ lib/librtld_db \ + lib/libsbuf \ lib/libsdp \ lib/libsm \ + lib/libsmb \ lib/libsmdb \ lib/libsmutil \ lib/libstand \ lib/libstdbuf \ lib/libstdthreads \ + lib/libtacplus \ lib/libtelnet \ lib/libthr \ lib/libthread_db \ lib/libufs \ lib/libugidfw \ lib/libulog \ - lib/libusbhid \ + lib/libunbound \ lib/libusb \ + lib/libusbhid \ + lib/libutil \ lib/libvgl \ + lib/libvmmapi \ lib/libwrap \ lib/liby \ + lib/libyaml \ + lib/libypclnt \ lib/libz \ - lib/atf/libatf-c \ - lib/atf/libatf-c++ \ - lib/bind/isc \ - lib/bind/isccc \ - lib/bind/dns \ - lib/bind/isccfg \ - lib/bind/bind9 \ - lib/bind/lwres \ + lib/msun \ + lib/ncurses/form \ + lib/ncurses/formw \ + lib/ncurses/menu \ + lib/ncurses/menuw \ + lib/ncurses/ncurses \ + lib/ncurses/ncursesw \ + lib/ncurses/panel \ + lib/ncurses/panelw \ .include Modified: projects/bmake/pkgs/pseudo/libexec/Makefile.depend ============================================================================== --- projects/bmake/pkgs/pseudo/libexec/Makefile.depend Thu Oct 17 19:56:50 2013 (r256697) +++ projects/bmake/pkgs/pseudo/libexec/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -32,8 +32,8 @@ DIRDEPS = \ libexec/talkd \ libexec/tcpd \ libexec/telnetd \ - libexec/tftpd \ libexec/tftp-proxy \ + libexec/tftpd \ libexec/ulog-helper \ libexec/ypxfr \ Modified: projects/bmake/pkgs/pseudo/sbin/Makefile.depend ============================================================================== --- projects/bmake/pkgs/pseudo/sbin/Makefile.depend Thu Oct 17 19:56:50 2013 (r256697) +++ projects/bmake/pkgs/pseudo/sbin/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -30,7 +30,6 @@ DIRDEPS = \ sbin/fsdb \ sbin/fsirand \ sbin/gbde \ - sbin/geom/core \ sbin/geom/class/cache \ sbin/geom/class/concat \ sbin/geom/class/eli \ @@ -47,6 +46,7 @@ DIRDEPS = \ sbin/geom/class/shsec \ sbin/geom/class/stripe \ sbin/geom/class/virstor \ + sbin/geom/core \ sbin/ggate/ggatec \ sbin/ggate/ggated \ sbin/ggate/ggatel \ @@ -56,7 +56,6 @@ DIRDEPS = \ sbin/hastd \ sbin/ifconfig \ sbin/init \ - sbin/ipf/libipf \ sbin/ipf/ipf \ sbin/ipf/ipfs \ sbin/ipf/ipfstat \ @@ -65,6 +64,7 @@ DIRDEPS = \ sbin/ipf/ipnat \ sbin/ipf/ippool \ sbin/ipf/ipresend \ + sbin/ipf/libipf \ sbin/ipfw \ sbin/iscontrol \ sbin/kldconfig \ Modified: projects/bmake/pkgs/pseudo/secure/Makefile.depend ============================================================================== --- projects/bmake/pkgs/pseudo/secure/Makefile.depend Thu Oct 17 19:56:50 2013 (r256697) +++ projects/bmake/pkgs/pseudo/secure/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -5,6 +5,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + secure/lib/libcrypto \ secure/lib/libcrypto/engines/lib4758cca \ secure/lib/libcrypto/engines/libaep \ secure/lib/libcrypto/engines/libatalla \ @@ -14,8 +15,8 @@ DIRDEPS = \ secure/lib/libcrypto/engines/libnuron \ secure/lib/libcrypto/engines/libsureware \ secure/lib/libcrypto/engines/libubsec \ - secure/lib/libssl \ secure/lib/libssh \ + secure/lib/libssl \ secure/libexec/sftp-server \ secure/libexec/ssh-keysign \ secure/libexec/ssh-pkcs11-helper \ Modified: projects/bmake/pkgs/pseudo/share/Makefile.depend ============================================================================== --- projects/bmake/pkgs/pseudo/share/Makefile.depend Thu Oct 17 19:56:50 2013 (r256697) +++ projects/bmake/pkgs/pseudo/share/Makefile.depend Thu Oct 17 19:59:51 2013 (r256698) @@ -5,13 +5,11 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ - share/info \ share/atf \ share/colldef \ share/dict \ share/doc/IPv6 \ share/doc/atf \ - share/doc/bind9 \ share/doc/legal/intel_ipw \ share/doc/legal/intel_iwi \ share/doc/legal/intel_iwn \ @@ -32,8 +30,6 @@ DIRDEPS = \ share/doc/papers/relengr \ share/doc/papers/sysperf \ share/doc/papers/timecounter \ - share/doc/psd/title \ - share/doc/psd/contents \ share/doc/psd/01.cacm \ share/doc/psd/02.implement \ share/doc/psd/03.iosys \ @@ -55,9 +51,8 @@ DIRDEPS = \ share/doc/psd/25.xdrrfc \ share/doc/psd/26.rpcrfc \ share/doc/psd/27.nfsrpc \ - share/doc/psd/28.cvs \ - share/doc/smm/title \ - share/doc/smm/contents \ + share/doc/psd/contents \ + share/doc/psd/title \ share/doc/smm/01.setup \ share/doc/smm/02.config \ share/doc/smm/03.fsck \ @@ -69,8 +64,8 @@ DIRDEPS = \ share/doc/smm/11.timedop \ share/doc/smm/12.timed \ share/doc/smm/18.net \ - share/doc/usd/title \ - share/doc/usd/contents \ + share/doc/smm/contents \ + share/doc/smm/title \ share/doc/usd/04.csh \ share/doc/usd/05.dc \ share/doc/usd/06.bc \ @@ -78,19 +73,57 @@ DIRDEPS = \ share/doc/usd/10.exref/exref \ share/doc/usd/10.exref/summary \ share/doc/usd/11.vitut \ + share/doc/usd/12.vi/summary \ share/doc/usd/12.vi/vi \ share/doc/usd/12.vi/viapwh \ - share/doc/usd/12.vi/summary \ share/doc/usd/13.viref \ share/doc/usd/18.msdiffs \ share/doc/usd/19.memacros \ share/doc/usd/20.meref \ share/doc/usd/21.troff \ share/doc/usd/22.trofftut \ + share/doc/usd/contents \ + share/doc/usd/title \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Thu Oct 17 20:02:00 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8E346709; Thu, 17 Oct 2013 20:02:00 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7CAF42E93; Thu, 17 Oct 2013 20:02:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HK20KP009566; Thu, 17 Oct 2013 20:02:00 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HK206P009560; Thu, 17 Oct 2013 20:02:00 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310172002.r9HK206P009560@svn.freebsd.org> From: "Simon J. Gerraty" Date: Thu, 17 Oct 2013 20:02:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256699 - in projects/bmake/usr.bin: mkcsmapper_static mkesdb_static X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 20:02:00 -0000 Author: sjg Date: Thu Oct 17 20:01:59 2013 New Revision: 256699 URL: http://svnweb.freebsd.org/changeset/base/256699 Log: Allow building these in-line The build-tools phase sets NO_WARNS If there is any other purpose (than hosttool during build) we could make this depend on MACHINE=host. Modified: projects/bmake/usr.bin/mkcsmapper_static/Makefile projects/bmake/usr.bin/mkesdb_static/Makefile Modified: projects/bmake/usr.bin/mkcsmapper_static/Makefile ============================================================================== --- projects/bmake/usr.bin/mkcsmapper_static/Makefile Thu Oct 17 19:59:51 2013 (r256698) +++ projects/bmake/usr.bin/mkcsmapper_static/Makefile Thu Oct 17 20:01:59 2013 (r256699) @@ -7,6 +7,7 @@ SRCS= citrus_bcs.c citrus_db_factory.c c citrus_lookup_factory.c citrus_pivot_factory.c NO_MAN= yes NO_SHARED= yes +NO_WARNS= yes build-tools: mkcsmapper_static Modified: projects/bmake/usr.bin/mkesdb_static/Makefile ============================================================================== --- projects/bmake/usr.bin/mkesdb_static/Makefile Thu Oct 17 19:59:51 2013 (r256698) +++ projects/bmake/usr.bin/mkesdb_static/Makefile Thu Oct 17 20:01:59 2013 (r256699) @@ -7,6 +7,7 @@ SRCS= citrus_bcs.c citrus_db_factory.c c citrus_lookup_factory.c NO_MAN= yes NO_SHARED= yes +NO_WARNS= yes build-tools: mkesdb_static From owner-svn-src-projects@FreeBSD.ORG Thu Oct 17 20:02:37 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 313AD86D; Thu, 17 Oct 2013 20:02:37 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1F0612E9F; Thu, 17 Oct 2013 20:02:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HK2aQI009839; Thu, 17 Oct 2013 20:02:36 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HK2aKD009836; Thu, 17 Oct 2013 20:02:36 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310172002.r9HK2aKD009836@svn.freebsd.org> From: "Simon J. Gerraty" Date: Thu, 17 Oct 2013 20:02:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256700 - in projects/bmake/share/i18n: csmapper esdb X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 20:02:37 -0000 Author: sjg Date: Thu Oct 17 20:02:36 2013 New Revision: 256700 URL: http://svnweb.freebsd.org/changeset/base/256700 Log: Use the tools we built for host. Modified: projects/bmake/share/i18n/csmapper/Makefile.inc projects/bmake/share/i18n/esdb/Makefile.inc Modified: projects/bmake/share/i18n/csmapper/Makefile.inc ============================================================================== --- projects/bmake/share/i18n/csmapper/Makefile.inc Thu Oct 17 20:01:59 2013 (r256699) +++ projects/bmake/share/i18n/csmapper/Makefile.inc Thu Oct 17 20:02:36 2013 (r256700) @@ -1,4 +1,9 @@ # $FreeBSD$ +.include + CSMAPPERDIR?= /usr/share/i18n/csmapper +.if ${MK_STAGING} == "yes" +MKCSMAPPER= ${STAGE_HOST_OBJTOP}/usr/bin/mkcsmapper_static +.endif MKCSMAPPER?= ${.OBJDIR}/../../../usr.bin/mkcsmapper_static/mkcsmapper_static Modified: projects/bmake/share/i18n/esdb/Makefile.inc ============================================================================== --- projects/bmake/share/i18n/esdb/Makefile.inc Thu Oct 17 20:01:59 2013 (r256699) +++ projects/bmake/share/i18n/esdb/Makefile.inc Thu Oct 17 20:02:36 2013 (r256700) @@ -1,6 +1,11 @@ # $FreeBSD$ +.include + .PATH: ${.CURDIR} ESDBDIR?= /usr/share/i18n/esdb +.if ${MK_STAGING} == "yes" +MKESDB= ${STAGE_HOST_OBJTOP}/usr/bin/mkesdb_static +.endif MKESDB?= ${.OBJDIR}/../../../usr.bin/mkesdb_static/mkesdb_static From owner-svn-src-projects@FreeBSD.ORG Thu Oct 17 20:03:24 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id AD0A297F; Thu, 17 Oct 2013 20:03:24 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 817412EAC; Thu, 17 Oct 2013 20:03:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HK3OrI010141; Thu, 17 Oct 2013 20:03:24 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HK3O0G010140; Thu, 17 Oct 2013 20:03:24 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310172003.r9HK3O0G010140@svn.freebsd.org> From: "Simon J. Gerraty" Date: Thu, 17 Oct 2013 20:03:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256701 - projects/bmake/lib/libstand X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 20:03:24 -0000 Author: sjg Date: Thu Oct 17 20:03:24 2013 New Revision: 256701 URL: http://svnweb.freebsd.org/changeset/base/256701 Log: Saver to rm first when making link to dir Modified: projects/bmake/lib/libstand/Makefile Modified: projects/bmake/lib/libstand/Makefile ============================================================================== --- projects/bmake/lib/libstand/Makefile Thu Oct 17 20:02:36 2013 (r256700) +++ projects/bmake/lib/libstand/Makefile Thu Oct 17 20:03:24 2013 (r256701) @@ -186,5 +186,6 @@ cleanmachine: rm -f machine machine: + rm -f machine ln -s ${.CURDIR}/../../sys/i386/include machine .endif From owner-svn-src-projects@FreeBSD.ORG Thu Oct 17 20:04:45 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6B051B8B; Thu, 17 Oct 2013 20:04:45 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 592DB2EC2; Thu, 17 Oct 2013 20:04:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HK4jvB010651; Thu, 17 Oct 2013 20:04:45 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HK4jvB010650; Thu, 17 Oct 2013 20:04:45 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310172004.r9HK4jvB010650@svn.freebsd.org> From: "Simon J. Gerraty" Date: Thu, 17 Oct 2013 20:04:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256702 - projects/bmake/lib/clang X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 20:04:45 -0000 Author: sjg Date: Thu Oct 17 20:04:44 2013 New Revision: 256702 URL: http://svnweb.freebsd.org/changeset/base/256702 Log: Use the tblgen etc we built for host. Modified: projects/bmake/lib/clang/clang.build.mk Modified: projects/bmake/lib/clang/clang.build.mk ============================================================================== --- projects/bmake/lib/clang/clang.build.mk Thu Oct 17 20:03:24 2013 (r256701) +++ projects/bmake/lib/clang/clang.build.mk Thu Oct 17 20:04:44 2013 (r256702) @@ -36,6 +36,10 @@ CXXFLAGS+= -fno-exceptions -fno-rtti .PATH: ${LLVM_SRCS}/${SRCDIR} +.if ${MK_STAGING} == "yes" +TBLGEN= ${STAGE_HOST_OBJTOP}/usr/bin/tblgen +CLANG_TBLGEN= ${STAGE_HOST_OBJTOP}/usr/bin/clang-tblgen +.endif TBLGEN?= tblgen CLANG_TBLGEN?= clang-tblgen From owner-svn-src-projects@FreeBSD.ORG Thu Oct 17 20:12:45 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B1A15F19; Thu, 17 Oct 2013 20:12:45 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from ch1outboundpool.messaging.microsoft.com (ch1ehsobe001.messaging.microsoft.com [216.32.181.181]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6FABA2F4F; Thu, 17 Oct 2013 20:12:45 +0000 (UTC) Received: from mail76-ch1-R.bigfish.com (10.43.68.230) by CH1EHSOBE007.bigfish.com (10.43.70.57) with Microsoft SMTP Server id 14.1.225.22; Thu, 17 Oct 2013 19:57:36 +0000 Received: from mail76-ch1 (localhost [127.0.0.1]) by mail76-ch1-R.bigfish.com (Postfix) with ESMTP id 5D7CF340536; Thu, 17 Oct 2013 19:57:36 +0000 (UTC) X-Forefront-Antispam-Report: CIP:66.129.224.50; KIP:(null); UIP:(null); IPV:NLI; H:P-EMF01-SAC.jnpr.net; RD:none; EFVD:NLI X-SpamScore: 4 X-BigFish: VPS4(zzd772h1432Izz1f42h208ch1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6h1082kzz74efjz2fh2a8h839hd25hf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h14ddh1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh1b88h1fb3h1d0ch1d2eh1d3fh1de2h1dfeh1dffh1e23h1fe8h1ff5h1155h) Received-SPF: pass (mail76-ch1: domain of juniper.net designates 66.129.224.50 as permitted sender) client-ip=66.129.224.50; envelope-from=sjg@juniper.net; helo=P-EMF01-SAC.jnpr.net ; SAC.jnpr.net ; Received: from mail76-ch1 (localhost.localdomain [127.0.0.1]) by mail76-ch1 (MessageSwitch) id 1382039854804336_310; Thu, 17 Oct 2013 19:57:34 +0000 (UTC) Received: from CH1EHSMHS013.bigfish.com (snatpool2.int.messaging.microsoft.com [10.43.68.239]) by mail76-ch1.bigfish.com (Postfix) with ESMTP id BFDF21403A5; Thu, 17 Oct 2013 19:57:34 +0000 (UTC) Received: from P-EMF01-SAC.jnpr.net (66.129.224.50) by CH1EHSMHS013.bigfish.com (10.43.70.13) with Microsoft SMTP Server (TLS) id 14.16.227.3; Thu, 17 Oct 2013 19:57:34 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF01-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Thu, 17 Oct 2013 12:57:33 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.24.29.229]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id r9HJvWL90417; Thu, 17 Oct 2013 12:57:33 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos.jnpr.net (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id B12395807E; Thu, 17 Oct 2013 12:57:32 -0700 (PDT) To: Brooks Davis Subject: Re: svn commit: r256634 - projects/bmake/etc In-Reply-To: <20131016191720.GB67671@lor.one-eyed-alien.net> References: <201310161603.r9GG319m015622@svn.freebsd.org> <20131016191720.GB67671@lor.one-eyed-alien.net> Comments: In-reply-to: Brooks Davis message dated "Wed, 16 Oct 2013 14:17:20 -0500." From: "Simon J. Gerraty" X-Mailer: MH-E 7.82+cvs; nmh 1.3; GNU Emacs 22.3.1 Date: Thu, 17 Oct 2013 12:57:32 -0700 Message-ID: <20131017195732.B12395807E@chaos.jnpr.net> MIME-Version: 1.0 Content-Type: text/plain X-OriginatorOrg: juniper.net X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 20:12:45 -0000 On Wed, 16 Oct 2013 14:17:20 -0500, Brooks Davis writes: >> We use distrib-dirs to populate stage tree. >> But that depends on up-to-date passwd and group files in /etc. >> If MK_INSTALL_AS_USER=3D=3Dyes and we are not root, filter the mtree in= >put >> to avoid problems with [gu]name and [gu]id settings. > >Why not use nmtree and its -N and -U options in the >MK_INSTALL_AS_USER=3D=3Dyes case? Will take a look - thanks From owner-svn-src-projects@FreeBSD.ORG Thu Oct 17 20:23:35 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3517F846; Thu, 17 Oct 2013 20:23:35 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1EF04200E; Thu, 17 Oct 2013 20:23:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HKNZKF021639; Thu, 17 Oct 2013 20:23:35 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HKNTqm021596; Thu, 17 Oct 2013 20:23:29 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310172023.r9HKNTqm021596@svn.freebsd.org> From: Alexander Motin Date: Thu, 17 Oct 2013 20:23:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256706 - in projects/camlock: . contrib/binutils/gas contrib/bsnmp/lib contrib/libcxxrt contrib/mtree lib/libproc lib/libvmmapi lib/libz release/picobsd/build release/picobsd/floppy.tr... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 20:23:35 -0000 Author: mav Date: Thu Oct 17 20:23:28 2013 New Revision: 256706 URL: http://svnweb.freebsd.org/changeset/base/256706 Log: MFC @ r256705 Added: projects/camlock/sys/dev/cxgbe/iw_cxgbe/ - copied from r256705, head/sys/dev/cxgbe/iw_cxgbe/ projects/camlock/sys/modules/cxgbe/iw_cxgbe/ - copied from r256705, head/sys/modules/cxgbe/iw_cxgbe/ Modified: projects/camlock/Makefile.inc1 projects/camlock/contrib/binutils/gas/dwarf2dbg.c projects/camlock/contrib/bsnmp/lib/snmp.c projects/camlock/contrib/bsnmp/lib/snmp.h projects/camlock/contrib/bsnmp/lib/snmpagent.c projects/camlock/contrib/libcxxrt/typeinfo.cc projects/camlock/contrib/mtree/compare.c projects/camlock/contrib/mtree/create.c projects/camlock/contrib/mtree/getid.c projects/camlock/contrib/mtree/spec.c projects/camlock/lib/libproc/_libproc.h projects/camlock/lib/libvmmapi/vmmapi.c projects/camlock/lib/libz/zopen.c projects/camlock/release/picobsd/build/picobsd projects/camlock/release/picobsd/floppy.tree/etc/rc1 projects/camlock/release/picobsd/floppy.tree/etc/ssh/sshd_config projects/camlock/sbin/iscontrol/fsm.c projects/camlock/sbin/route/keywords projects/camlock/sbin/route/route.8 projects/camlock/sbin/route/route.c projects/camlock/share/examples/bhyve/vmrun.sh projects/camlock/share/man/man9/rtentry.9 projects/camlock/sys/amd64/amd64/pmap.c projects/camlock/sys/amd64/include/vmm.h (contents, props changed) projects/camlock/sys/amd64/vmm/intel/vmx.c projects/camlock/sys/amd64/vmm/intel/vmx.h projects/camlock/sys/amd64/vmm/intel/vmx_controls.h projects/camlock/sys/amd64/vmm/x86.c projects/camlock/sys/arm/arm/busdma_machdep-v6.c projects/camlock/sys/arm/arm/cpufunc.c projects/camlock/sys/arm/arm/fusu.S projects/camlock/sys/arm/arm/identcpu.c projects/camlock/sys/arm/arm/locore.S projects/camlock/sys/arm/arm/machdep.c projects/camlock/sys/arm/arm/pl310.c projects/camlock/sys/arm/include/armreg.h projects/camlock/sys/dev/ath/if_ath.c projects/camlock/sys/dev/ath/if_ath_tx.c projects/camlock/sys/dev/isp/isp.c projects/camlock/sys/dev/isp/isp_freebsd.c projects/camlock/sys/dev/isp/isp_freebsd.h projects/camlock/sys/dev/isp/ispvar.h projects/camlock/sys/dev/random/ivy.c projects/camlock/sys/geom/part/g_part.c projects/camlock/sys/geom/part/g_part_apm.c projects/camlock/sys/geom/part/g_part_bsd.c projects/camlock/sys/geom/part/g_part_ebr.c projects/camlock/sys/geom/part/g_part_gpt.c projects/camlock/sys/geom/part/g_part_mbr.c projects/camlock/sys/geom/part/g_part_pc98.c projects/camlock/sys/geom/part/g_part_vtoc8.c projects/camlock/sys/kern/makesyscalls.sh projects/camlock/sys/mips/atheros/if_arge.c projects/camlock/sys/mips/atheros/if_argevar.h projects/camlock/sys/modules/cxgbe/Makefile projects/camlock/sys/net/ieee8023ad_lacp.c projects/camlock/sys/net/radix.c projects/camlock/sys/net/radix.h projects/camlock/sys/net/route.c projects/camlock/sys/ofed/drivers/net/mlx4/en_netdev.c projects/camlock/tools/build/mk/OptionalObsoleteFiles.inc projects/camlock/usr.sbin/bhyve/bhyverun.c projects/camlock/usr.sbin/bhyve/bhyverun.h projects/camlock/usr.sbin/bhyve/spinup_ap.c projects/camlock/usr.sbin/bhyvectl/bhyvectl.c projects/camlock/usr.sbin/bhyveload/bhyveload.8 projects/camlock/usr.sbin/bhyveload/bhyveload.c projects/camlock/usr.sbin/freebsd-update/freebsd-update.sh projects/camlock/usr.sbin/kldxref/kldxref.c Directory Properties: projects/camlock/ (props changed) projects/camlock/contrib/binutils/ (props changed) projects/camlock/contrib/libcxxrt/ (props changed) projects/camlock/contrib/mtree/ (props changed) projects/camlock/lib/libvmmapi/ (props changed) projects/camlock/lib/libz/ (props changed) projects/camlock/sbin/ (props changed) projects/camlock/sys/ (props changed) projects/camlock/sys/amd64/vmm/ (props changed) projects/camlock/usr.sbin/bhyve/ (props changed) projects/camlock/usr.sbin/bhyvectl/ (props changed) projects/camlock/usr.sbin/bhyveload/ (props changed) Modified: projects/camlock/Makefile.inc1 ============================================================================== --- projects/camlock/Makefile.inc1 Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/Makefile.inc1 Thu Oct 17 20:23:28 2013 (r256706) @@ -1830,7 +1830,7 @@ NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOU CPUTYPE=${XDEV_CPUTYPE} XDDIR=${XDEV_ARCH}-freebsd -XDTP=/usr/${XDDIR} +XDTP=usr/${XDDIR} CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ @@ -1843,8 +1843,8 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN} -CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN} -XDDESTDIR=${DESTDIR}${XDTP} +CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN} +XDDESTDIR=${DESTDIR}/${XDTP} .if !defined(OSREL) OSREL!= uname -r | sed -e 's/[-(].*//' .endif @@ -1924,6 +1924,7 @@ _xi-libraries: _xi-links: ${_+_}cd ${XDDESTDIR}/usr/bin; \ + mkdir -p ../../../../usr/bin; \ for i in *; do \ ln -sf ../../${XDTP}/usr/bin/$$i \ ../../../../usr/bin/${XDDIR}-$$i; \ Modified: projects/camlock/contrib/binutils/gas/dwarf2dbg.c ============================================================================== --- projects/camlock/contrib/binutils/gas/dwarf2dbg.c Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/contrib/binutils/gas/dwarf2dbg.c Thu Oct 17 20:23:28 2013 (r256706) @@ -1271,6 +1271,7 @@ out_debug_line (segT line_seg) symbolS *line_end; struct line_seg *s; enum dwarf2_format d2f; + int sizeof_initial_length; int sizeof_offset; subseg_set (line_seg, 0); @@ -1287,27 +1288,24 @@ out_debug_line (segT line_seg) d2f = DWARF2_FORMAT (); if (d2f == dwarf2_format_32bit) { - expr.X_add_number = -4; - emit_expr (&expr, 4); - sizeof_offset = 4; + sizeof_initial_length = sizeof_offset = 4; } else if (d2f == dwarf2_format_64bit) { - expr.X_add_number = -12; - out_four (-1); - emit_expr (&expr, 8); + sizeof_initial_length = 12; sizeof_offset = 8; + out_four (-1); } else if (d2f == dwarf2_format_64bit_irix) { - expr.X_add_number = -8; - emit_expr (&expr, 8); - sizeof_offset = 8; + sizeof_initial_length = sizeof_offset = 8; } else { as_fatal (_("internal error: unknown dwarf2 format")); } + expr.X_add_number = -sizeof_initial_length; + emit_expr (&expr, sizeof_offset); /* Version. */ out_two (2); @@ -1316,7 +1314,7 @@ out_debug_line (segT line_seg) expr.X_op = O_subtract; expr.X_add_symbol = prologue_end; expr.X_op_symbol = line_start; - expr.X_add_number = - (4 + 2 + 4); + expr.X_add_number = - (sizeof_initial_length + 2 + sizeof_offset); emit_expr (&expr, sizeof_offset); /* Parameters of the state machine. */ Modified: projects/camlock/contrib/bsnmp/lib/snmp.c ============================================================================== --- projects/camlock/contrib/bsnmp/lib/snmp.c Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/contrib/bsnmp/lib/snmp.c Thu Oct 17 20:23:28 2013 (r256706) @@ -288,11 +288,13 @@ parse_secparams(struct asn_buf *b, struc memset(buf, 0, 256); tb.asn_ptr = buf; tb.asn_len = 256; + u_int len; - if (asn_get_octetstring(b, buf, &tb.asn_len) != ASN_ERR_OK) { + if (asn_get_octetstring(b, buf, &len) != ASN_ERR_OK) { snmp_error("cannot parse usm header"); return (ASN_ERR_FAILED); } + tb.asn_len = len; if (asn_get_sequence(&tb, &octs_len) != ASN_ERR_OK) { snmp_error("cannot decode usm header"); @@ -864,7 +866,7 @@ snmp_fix_encoding(struct asn_buf *b, str return (SNMP_CODE_FAILED); pdu->scoped_len = b->asn_ptr - pdu->scoped_ptr; - if ((code = snmp_pdu_fix_padd(b, pdu))!= ASN_ERR_OK) + if (snmp_pdu_fix_padd(b, pdu) != ASN_ERR_OK) return (SNMP_CODE_FAILED); if (pdu->security_model != SNMP_SECMODEL_USM) @@ -997,7 +999,7 @@ snmp_pdu_encode(struct snmp_pdu *pdu, st if ((err = snmp_pdu_encode_header(resp_b, pdu)) != SNMP_CODE_OK) return (err); for (idx = 0; idx < pdu->nbindings; idx++) - if ((err = snmp_binding_encode(resp_b, &pdu->bindings[idx])) + if (snmp_binding_encode(resp_b, &pdu->bindings[idx]) != ASN_ERR_OK) return (SNMP_CODE_FAILED); Modified: projects/camlock/contrib/bsnmp/lib/snmp.h ============================================================================== --- projects/camlock/contrib/bsnmp/lib/snmp.h Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/contrib/bsnmp/lib/snmp.h Thu Oct 17 20:23:28 2013 (r256706) @@ -182,7 +182,7 @@ struct snmp_pdu { /* fixes for encoding */ size_t outer_len; - size_t scoped_len; + asn_len_t scoped_len; u_char *outer_ptr; u_char *digest_ptr; u_char *encrypted_ptr; Modified: projects/camlock/contrib/bsnmp/lib/snmpagent.c ============================================================================== --- projects/camlock/contrib/bsnmp/lib/snmpagent.c Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/contrib/bsnmp/lib/snmpagent.c Thu Oct 17 20:23:28 2013 (r256706) @@ -166,7 +166,7 @@ find_subnode(const struct snmp_value *va } static void -snmp_pdu_create_response(struct snmp_pdu *pdu, struct snmp_pdu *resp) +snmp_pdu_create_response(const struct snmp_pdu *pdu, struct snmp_pdu *resp) { memset(resp, 0, sizeof(*resp)); strcpy(resp->community, pdu->community); @@ -276,7 +276,12 @@ snmp_get(struct snmp_pdu *pdu, struct as } } - return (snmp_fix_encoding(resp_b, resp)); + if (snmp_fix_encoding(resp_b, resp) != SNMP_CODE_OK) { + snmp_debug("get: failed to encode PDU"); + return (SNMP_RET_ERR); + } + + return (SNMP_RET_OK); } static struct snmp_node * @@ -438,7 +443,13 @@ snmp_getnext(struct snmp_pdu *pdu, struc return (SNMP_RET_ERR); } } - return (snmp_fix_encoding(resp_b, resp)); + + if (snmp_fix_encoding(resp_b, resp) != SNMP_CODE_OK) { + snmp_debug("getnext: failed to encode PDU"); + return (SNMP_RET_ERR); + } + + return (SNMP_RET_OK); } enum snmp_ret @@ -537,7 +548,12 @@ snmp_getbulk(struct snmp_pdu *pdu, struc } done: - return (snmp_fix_encoding(resp_b, resp)); + if (snmp_fix_encoding(resp_b, resp) != SNMP_CODE_OK) { + snmp_debug("getnext: failed to encode PDU"); + return (SNMP_RET_ERR); + } + + return (SNMP_RET_OK); } /* @@ -952,18 +968,57 @@ enum snmp_ret snmp_make_errresp(const struct snmp_pdu *pdu, struct asn_buf *pdu_b, struct asn_buf *resp_b) { + u_char type; asn_len_t len; struct snmp_pdu resp; enum asn_err err; enum snmp_code code; - memset(&resp, 0, sizeof(resp)); + snmp_pdu_create_response(pdu, &resp); + if ((code = snmp_pdu_decode_header(pdu_b, &resp)) != SNMP_CODE_OK) return (SNMP_RET_IGN); - if (pdu_b->asn_len < len) + if (pdu->version == SNMP_V3) { + if (resp.user.priv_proto != SNMP_PRIV_NOPRIV && + (asn_get_header(pdu_b, &type, &resp.scoped_len) != ASN_ERR_OK + || type != ASN_TYPE_OCTETSTRING)) { + snmp_error("cannot decode encrypted pdu"); + return (SNMP_RET_IGN); + } + + if (asn_get_sequence(pdu_b, &len) != ASN_ERR_OK) { + snmp_error("cannot decode scoped pdu header"); + return (SNMP_RET_IGN); + } + + len = SNMP_ENGINE_ID_SIZ; + if (asn_get_octetstring(pdu_b, (u_char *)resp.context_engine, + &len) != ASN_ERR_OK) { + snmp_error("cannot decode msg context engine"); + return (SNMP_RET_IGN); + } + resp.context_engine_len = len; + len = SNMP_CONTEXT_NAME_SIZ; + if (asn_get_octetstring(pdu_b, (u_char *)resp.context_name, + &len) != ASN_ERR_OK) { + snmp_error("cannot decode msg context name"); + return (SNMP_RET_IGN); + } + resp.context_name[len] = '\0'; + } + + + if (asn_get_header(pdu_b, &type, &len) != ASN_ERR_OK) { + snmp_error("cannot get pdu header"); return (SNMP_RET_IGN); - pdu_b->asn_len = len; + } + + if ((type & ~ASN_TYPE_MASK) != + (ASN_TYPE_CONSTRUCTED | ASN_CLASS_CONTEXT)) { + snmp_error("bad pdu header tag"); + return (SNMP_RET_IGN); + } err = snmp_parse_pdus_hdr(pdu_b, &resp, &len); if (ASN_ERR_STOPPED(err)) Modified: projects/camlock/contrib/libcxxrt/typeinfo.cc ============================================================================== --- projects/camlock/contrib/libcxxrt/typeinfo.cc Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/contrib/libcxxrt/typeinfo.cc Thu Oct 17 20:23:28 2013 (r256706) @@ -35,15 +35,23 @@ type_info::~type_info() {} bool type_info::operator==(const type_info &other) const { +#ifdef LIBCXXRT_MERGED_TYPEINFO return __type_name == other.__type_name; +#else + return __type_name == other.__type_name || strcmp(__type_name, other.__type_name) == 0; +#endif } bool type_info::operator!=(const type_info &other) const { - return __type_name != other.__type_name; + return !operator==(other); } bool type_info::before(const type_info &other) const { +#ifdef LIBCXXRT_MERGED_TYPEINFO return __type_name < other.__type_name; +#else + return strcmp(__type_name, other.__type_name) < 0; +#endif } const char* type_info::name() const { Modified: projects/camlock/contrib/mtree/compare.c ============================================================================== --- projects/camlock/contrib/mtree/compare.c Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/contrib/mtree/compare.c Thu Oct 17 20:23:28 2013 (r256706) @@ -1,4 +1,4 @@ -/* $NetBSD: compare.c,v 1.55 2012/10/05 00:59:35 christos Exp $ */ +/* $NetBSD: compare.c,v 1.56 2013/09/09 23:27:43 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)compare.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: compare.c,v 1.55 2012/10/05 00:59:35 christos Exp $"); +__RCSID("$NetBSD: compare.c,v 1.56 2013/09/09 23:27:43 christos Exp $"); #endif #endif /* not lint */ @@ -47,6 +47,7 @@ __RCSID("$NetBSD: compare.c,v 1.55 2012/ #include #include +#include #include #include #include @@ -192,9 +193,9 @@ typeerr: LABEL; (s->type == F_BLOCK || s->type == F_CHAR) && s->st_rdev != p->fts_statp->st_rdev) { LABEL; - printf("%sdevice (%#llx, %#llx", - tab, (long long)s->st_rdev, - (long long)p->fts_statp->st_rdev); + printf("%sdevice (%#jx, %#jx", + tab, (uintmax_t)s->st_rdev, + (uintmax_t)p->fts_statp->st_rdev); if (uflag) { if ((unlink(p->fts_accpath) == -1) || (mknod(p->fts_accpath, @@ -283,9 +284,9 @@ typeerr: LABEL; } if (s->flags & F_SIZE && s->st_size != p->fts_statp->st_size) { LABEL; - printf("%ssize (%lld, %lld)\n", - tab, (long long)s->st_size, - (long long)p->fts_statp->st_size); + printf("%ssize (%ju, %ju)\n", + tab, (uintmax_t)s->st_size, + (uintmax_t)p->fts_statp->st_size); tab = "\t"; } /* Modified: projects/camlock/contrib/mtree/create.c ============================================================================== --- projects/camlock/contrib/mtree/create.c Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/contrib/mtree/create.c Thu Oct 17 20:23:28 2013 (r256706) @@ -1,4 +1,4 @@ -/* $NetBSD: create.c,v 1.69 2013/02/03 19:15:17 christos Exp $ */ +/* $NetBSD: create.c,v 1.71 2013/10/16 17:24:20 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: create.c,v 1.69 2013/02/03 19:15:17 christos Exp $"); +__RCSID("$NetBSD: create.c,v 1.71 2013/10/16 17:24:20 christos Exp $"); #endif #endif /* not lint */ @@ -53,6 +53,7 @@ __RCSID("$NetBSD: create.c,v 1.69 2013/0 #include #include #include +#include #include #include #include @@ -216,22 +217,22 @@ statf(int indent, FTSENT *p) p->fts_statp->st_mode & MBITS); if (keys & F_DEV && (S_ISBLK(p->fts_statp->st_mode) || S_ISCHR(p->fts_statp->st_mode))) - output(indent, &offset, "device=%#llx", - (long long)p->fts_statp->st_rdev); + output(indent, &offset, "device=%#jx", + (uintmax_t)p->fts_statp->st_rdev); if (keys & F_NLINK && p->fts_statp->st_nlink != 1) output(indent, &offset, "nlink=%u", p->fts_statp->st_nlink); if (keys & F_SIZE && - (flavor != F_NETBSD6 || S_ISREG(p->fts_statp->st_mode))) - output(indent, &offset, "size=%lld", - (long long)p->fts_statp->st_size); + (flavor == F_FREEBSD9 || S_ISREG(p->fts_statp->st_mode))) + output(indent, &offset, "size=%ju", + (uintmax_t)p->fts_statp->st_size); if (keys & F_TIME) #if defined(BSD4_4) && !defined(HAVE_NBTOOL_CONFIG_H) - output(indent, &offset, "time=%ld.%09ld", - (long)p->fts_statp->st_mtimespec.tv_sec, + output(indent, &offset, "time=%jd.%09ld", + (intmax_t)p->fts_statp->st_mtimespec.tv_sec, p->fts_statp->st_mtimespec.tv_nsec); #else - output(indent, &offset, "time=%ld.%09ld", - (long)p->fts_statp->st_mtime, (long)0); + output(indent, &offset, "time=%jd.%09ld", + (intmax_t)p->fts_statp->st_mtime, (long)0); #endif if (keys & F_CKSUM && S_ISREG(p->fts_statp->st_mode)) { if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0 || Modified: projects/camlock/contrib/mtree/getid.c ============================================================================== --- projects/camlock/contrib/mtree/getid.c Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/contrib/mtree/getid.c Thu Oct 17 20:23:28 2013 (r256706) @@ -1,4 +1,4 @@ -/* $NetBSD: getid.c,v 1.7 2008/04/28 20:24:17 martin Exp $ */ +/* $NetBSD: getid.c,v 1.8 2013/10/16 17:27:42 christos Exp $ */ /* from: NetBSD: getpwent.c,v 1.48 2000/10/03 03:22:26 enami Exp */ /* from: NetBSD: getgrent.c,v 1.41 2002/01/12 23:51:30 lukem Exp */ @@ -65,7 +65,7 @@ #endif #include -__RCSID("$NetBSD: getid.c,v 1.7 2008/04/28 20:24:17 martin Exp $"); +__RCSID("$NetBSD: getid.c,v 1.8 2013/10/16 17:27:42 christos Exp $"); #include @@ -230,6 +230,9 @@ grscan(int search, gid_t gid, const char ; continue; } + /* skip comments */ + if (pwline[0] == '#') + continue; if (grmatchline(search, gid, name)) return 1; } @@ -371,6 +374,9 @@ pwscan(int search, uid_t uid, const char ; continue; } + /* skip comments */ + if (pwline[0] == '#') + continue; if (pwmatchline(search, uid, name)) return 1; } Modified: projects/camlock/contrib/mtree/spec.c ============================================================================== --- projects/camlock/contrib/mtree/spec.c Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/contrib/mtree/spec.c Thu Oct 17 20:23:28 2013 (r256706) @@ -1,4 +1,4 @@ -/* $NetBSD: spec.c,v 1.85 2012/12/20 16:43:16 christos Exp $ */ +/* $NetBSD: spec.c,v 1.87 2013/10/16 17:26:14 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -67,7 +67,7 @@ #if 0 static char sccsid[] = "@(#)spec.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: spec.c,v 1.85 2012/12/20 16:43:16 christos Exp $"); +__RCSID("$NetBSD: spec.c,v 1.87 2013/10/16 17:26:14 christos Exp $"); #endif #endif /* not lint */ @@ -80,6 +80,7 @@ __RCSID("$NetBSD: spec.c,v 1.85 2012/12/ #include #include #include +#include #include #include #include @@ -217,6 +218,12 @@ noparent: mtree_err("no parent node"); /* * empty tree */ + /* + * Allow a bare "." root node by forcing it to + * type=dir for compatibility with FreeBSD. + */ + if (strcmp(centry->name, ".") == 0 && centry->type == 0) + centry->type = F_DIR; if (strcmp(centry->name, ".") != 0 || centry->type != F_DIR) mtree_err( @@ -350,16 +357,18 @@ dump_nodes(const char *dir, NODE *root, appendfield(pathlast, "mode=%#o", cur->st_mode); if (MATCHFLAG(F_DEV) && (cur->type == F_BLOCK || cur->type == F_CHAR)) - appendfield(pathlast, "device=%#llx", (long long)cur->st_rdev); + appendfield(pathlast, "device=%#jx", + (uintmax_t)cur->st_rdev); if (MATCHFLAG(F_NLINK)) appendfield(pathlast, "nlink=%d", cur->st_nlink); if (MATCHFLAG(F_SLINK)) appendfield(pathlast, "link=%s", vispath(cur->slink)); if (MATCHFLAG(F_SIZE)) - appendfield(pathlast, "size=%lld", (long long)cur->st_size); + appendfield(pathlast, "size=%ju", + (uintmax_t)cur->st_size); if (MATCHFLAG(F_TIME)) - appendfield(pathlast, "time=%lld.%09ld", - (long long)cur->st_mtimespec.tv_sec, + appendfield(pathlast, "time=%jd.%09ld", + (intmax_t)cur->st_mtimespec.tv_sec, cur->st_mtimespec.tv_nsec); if (MATCHFLAG(F_CKSUM)) appendfield(pathlast, "cksum=%lu", cur->cksum); Modified: projects/camlock/lib/libproc/_libproc.h ============================================================================== --- projects/camlock/lib/libproc/_libproc.h Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/lib/libproc/_libproc.h Thu Oct 17 20:23:28 2013 (r256706) @@ -49,7 +49,7 @@ struct proc_handle { }; #ifdef DEBUG -#define DPRINTF(fmt, ...) warn(fmt, __VA_ARGS__) +#define DPRINTF(...) warn(__VA_ARGS__) #else -#define DPRINTF(fmt, ...) +#define DPRINTF(...) #endif Modified: projects/camlock/lib/libvmmapi/vmmapi.c ============================================================================== --- projects/camlock/lib/libvmmapi/vmmapi.c Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/lib/libvmmapi/vmmapi.c Thu Oct 17 20:23:28 2013 (r256706) @@ -415,6 +415,7 @@ static struct { { "mtrap_exit", VM_CAP_MTRAP_EXIT }, { "pause_exit", VM_CAP_PAUSE_EXIT }, { "unrestricted_guest", VM_CAP_UNRESTRICTED_GUEST }, + { "enable_invpcid", VM_CAP_ENABLE_INVPCID }, { 0 } }; Modified: projects/camlock/lib/libz/zopen.c ============================================================================== --- projects/camlock/lib/libz/zopen.c Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/lib/libz/zopen.c Thu Oct 17 20:23:28 2013 (r256706) @@ -29,6 +29,12 @@ xgzclose(void *cookie) return gzclose(cookie); } +static fpos_t +xgzseek(void *cookie, fpos_t offset, int whence) +{ + return gzseek(cookie, (z_off_t)offset, whence); +} + FILE * zopen(const char *fname, const char *mode) { @@ -37,7 +43,7 @@ zopen(const char *fname, const char *mod return NULL; if(*mode == 'r') - return (funopen(gz, xgzread, NULL, NULL, xgzclose)); + return (funopen(gz, xgzread, NULL, xgzseek, xgzclose)); else - return (funopen(gz, NULL, xgzwrite, NULL, xgzclose)); + return (funopen(gz, NULL, xgzwrite, xgzseek, xgzclose)); } Modified: projects/camlock/release/picobsd/build/picobsd ============================================================================== --- projects/camlock/release/picobsd/build/picobsd Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/release/picobsd/build/picobsd Thu Oct 17 20:23:28 2013 (r256706) @@ -166,7 +166,13 @@ create_includes_and_libraries2() { # opt log "create_includes_and_libraries2() for ${SRC} $1" if [ ${OSVERSION} -ge 600000 ] ; then no="-DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R" # WITHOUT_CDDL=1" - no="$no -DWITHOUT_CLANG -DMALLOC_PRODUCTION" + #no="$no -DWITHOUT_CLANG -DMALLOC_PRODUCTION" + # XXX 20131001 see if clang fixes the build + export WITHOUT_CLANG=YES + export WITHOUT_ICONV=YES + export WITH_GCC=YES + export WITH_GNUCXX=YES + no="$no -DMALLOC_PRODUCTION" else no="-DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R" fi @@ -974,7 +980,13 @@ set_build_parameters() { if [ ${OSVERSION} -ge 500035 ] ; then export MAKEOBJDIRPREFIX=${l_objtree} export TARGET_ARCH=${o_arch} TARGET=${o_arch} - export WITHOUT_CLANG_IS_CC=1 + # XXX 20131001 see if CLANG fixes the build + # XXX export WITHOUT_CLANG_IS_CC=1 + export WITHOUT_CLANG=YES + export WITHOUT_ICONV=YES + export WITH_GCC=YES + export WITH_GNUCXX=YES + # XXX why change machine_arch ? #-- export MACHINE_ARCH=`uname -m` MACHINE=`uname -m` # export CWARNFLAGS="-Wextra -Wno-sign-compare -Wno-missing-field-initializers" Modified: projects/camlock/release/picobsd/floppy.tree/etc/rc1 ============================================================================== --- projects/camlock/release/picobsd/floppy.tree/etc/rc1 Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/release/picobsd/floppy.tree/etc/rc1 Thu Oct 17 20:23:28 2013 (r256706) @@ -52,8 +52,11 @@ pwd_mkdb -p ./master.passwd [ "${inetd_enable}" = "YES" -a -f /stand/inetd ] && \ { echo "Starting inetd."; inetd ${inetd_flags} ; } -[ "${sshd_enable}" = "YES" -a -f /stand/sshd ] && \ - { echo "Starting sshd..." ; sshd -f /etc/sshd_config ; } +if [ "${sshd_enable}" = "YES" -a -f /usr/sbin/sshd ] ; then + echo "Starting sshd..." + chmod 600 /etc/ssh_host*key + /usr/sbin/sshd -f /etc/sshd_config +fi echo '' cat /etc/motd Modified: projects/camlock/release/picobsd/floppy.tree/etc/ssh/sshd_config ============================================================================== --- projects/camlock/release/picobsd/floppy.tree/etc/ssh/sshd_config Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/release/picobsd/floppy.tree/etc/ssh/sshd_config Thu Oct 17 20:23:28 2013 (r256706) @@ -1,24 +1,23 @@ +# $FreeBSD$ +# minimal config for sshd on picobsd Port 22 ListenAddress 0.0.0.0 HostKey /etc/ssh_host_key -RandomSeed /etc/ssh_random_seed +#RandomSeed /etc/ssh_random_seed ServerKeyBits 768 LoginGraceTime 600 KeyRegenerationInterval 3600 PermitRootLogin yes IgnoreRhosts no StrictModes yes -QuietMode no X11Forwarding no X11DisplayOffset 10 -FascistLogging no PrintMotd yes KeepAlive yes SyslogFacility AUTH -RhostsAuthentication no RhostsRSAAuthentication yes RSAAuthentication yes -PasswordAuthentication no +PasswordAuthentication yes PermitEmptyPasswords no UseLogin no # CheckMail no Modified: projects/camlock/sbin/iscontrol/fsm.c ============================================================================== --- projects/camlock/sbin/iscontrol/fsm.c Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/sbin/iscontrol/fsm.c Thu Oct 17 20:23:28 2013 (r256706) @@ -199,6 +199,7 @@ tcpConnect(isess_t *sess) perror("connect"); switch(sv_errno) { case ECONNREFUSED: + case EHOSTUNREACH: case ENETUNREACH: case ETIMEDOUT: if((sess->flags & SESS_REDIRECT) == 0) { Modified: projects/camlock/sbin/route/keywords ============================================================================== --- projects/camlock/sbin/route/keywords Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/sbin/route/keywords Thu Oct 17 20:23:28 2013 (r256706) @@ -39,6 +39,7 @@ osi prefixlen proto1 proto2 +proto3 proxy recvpipe reject Modified: projects/camlock/sbin/route/route.8 ============================================================================== --- projects/camlock/sbin/route/route.8 Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/sbin/route/route.8 Thu Oct 17 20:23:28 2013 (r256706) @@ -28,7 +28,7 @@ .\" @(#)route.8 8.3 (Berkeley) 3/19/94 .\" $FreeBSD$ .\" -.Dd November 17, 2012 +.Dd October 17, 2013 .Dt ROUTE 8 .Os .Sh NAME @@ -301,6 +301,7 @@ by indicating the following correspondin -blackhole RTF_BLACKHOLE - silently discard pkts (during updates) -proto1 RTF_PROTO1 - set protocol specific routing flag #1 -proto2 RTF_PROTO2 - set protocol specific routing flag #2 +-proto3 RTF_PROTO3 - set protocol specific routing flag #3 .Ed .Pp The optional modifiers @@ -324,6 +325,17 @@ specify that all ensuing metrics may be .Fl lockrest meta-modifier. .Pp +Note that +.Fl expire +accepts expiration time of the route as the number of seconds since the +Epoch +.Pq see Xr time 3 . +When the first character of the number is +.Dq + +or +.Dq - , +it is interpreted as a value relative to the current time. +.Pp The optional modifier .Fl fib Ar number specifies that the command will be applied to a non-default FIB. Modified: projects/camlock/sbin/route/route.c ============================================================================== --- projects/camlock/sbin/route/route.c Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/sbin/route/route.c Thu Oct 17 20:23:28 2013 (r256706) @@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -723,6 +724,7 @@ static void set_metric(char *value, int key) { int flag = 0; + char *endptr; u_long noval, *valp = &noval; switch (key) { @@ -742,7 +744,18 @@ set_metric(char *value, int key) rt_metrics.rmx_locks |= flag; if (locking) locking = 0; - *valp = atoi(value); + errno = 0; + *valp = strtol(value, &endptr, 0); + if (errno == 0 && *endptr != '\0') + errno = EINVAL; + if (errno) + err(EX_USAGE, "%s", value); + if (flag & RTV_EXPIRE && (value[0] == '+' || value[0] == '-')) { + struct timespec ts; + + clock_gettime(CLOCK_REALTIME_FAST, &ts); + *valp += ts.tv_sec; + } } #define F_ISHOST 0x01 @@ -827,6 +840,9 @@ newroute(int argc, char **argv) case K_PROTO2: flags |= RTF_PROTO2; break; + case K_PROTO3: + flags |= RTF_PROTO3; + break; case K_PROXY: nrflags |= F_PROXY; break; @@ -1681,6 +1697,7 @@ static void print_getmsg(struct rt_msghdr *rtm, int msglen, int fib) { struct sockaddr *sp[RTAX_MAX]; + struct timespec ts; char *cp; int i; @@ -1733,15 +1750,17 @@ print_getmsg(struct rt_msghdr *rtm, int #define msec(u) (((u) + 500) / 1000) /* usec to msec */ printf("\n%9s %9s %9s %9s %9s %10s %9s\n", "recvpipe", "sendpipe", "ssthresh", "rtt,msec", "mtu ", "weight", "expire"); - printf("%8ld%c ", rtm->rtm_rmx.rmx_recvpipe, lock(RPIPE)); - printf("%8ld%c ", rtm->rtm_rmx.rmx_sendpipe, lock(SPIPE)); - printf("%8ld%c ", rtm->rtm_rmx.rmx_ssthresh, lock(SSTHRESH)); - printf("%8ld%c ", msec(rtm->rtm_rmx.rmx_rtt), lock(RTT)); - printf("%8ld%c ", rtm->rtm_rmx.rmx_mtu, lock(MTU)); - printf("%8ld%c ", rtm->rtm_rmx.rmx_weight, lock(WEIGHT)); - if (rtm->rtm_rmx.rmx_expire) - rtm->rtm_rmx.rmx_expire -= time(0); - printf("%8ld%c\n", rtm->rtm_rmx.rmx_expire, lock(EXPIRE)); + printf("%8lu%c ", rtm->rtm_rmx.rmx_recvpipe, lock(RPIPE)); + printf("%8lu%c ", rtm->rtm_rmx.rmx_sendpipe, lock(SPIPE)); + printf("%8lu%c ", rtm->rtm_rmx.rmx_ssthresh, lock(SSTHRESH)); + printf("%8lu%c ", msec(rtm->rtm_rmx.rmx_rtt), lock(RTT)); + printf("%8lu%c ", rtm->rtm_rmx.rmx_mtu, lock(MTU)); + printf("%8lu%c ", rtm->rtm_rmx.rmx_weight, lock(WEIGHT)); + if (rtm->rtm_rmx.rmx_expire > 0) + clock_gettime(CLOCK_REALTIME_FAST, &ts); + else + ts.tv_sec = 0; + printf("%8ld%c\n", rtm->rtm_rmx.rmx_expire - ts.tv_sec, lock(EXPIRE)); #undef lock #undef msec #define RTA_IGN (RTA_DST|RTA_GATEWAY|RTA_NETMASK|RTA_IFP|RTA_IFA|RTA_BRD) Modified: projects/camlock/share/examples/bhyve/vmrun.sh ============================================================================== --- projects/camlock/share/examples/bhyve/vmrun.sh Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/share/examples/bhyve/vmrun.sh Thu Oct 17 20:23:28 2013 (r256706) @@ -39,11 +39,12 @@ DEFAULT_VIRTIO_DISK="./diskdev" DEFAULT_ISOFILE="./release.iso" usage() { - echo "Usage: vmrun.sh [-hai][-g ][-m ][-d ][-I ][-t ] " + echo "Usage: vmrun.sh [-hai][-g ][-m ][-d ][-e ][-I ][-t ] " echo " -h: display this help message" echo " -a: force memory mapped local apic access" echo " -c: number of virtual cpus (default is ${DEFAULT_CPUS})" echo " -d: virtio diskdev file (default is ${DEFAULT_VIRTIO_DISK})" + echo " -e: set FreeBSD loader environment variable" echo " -g: listen for connection from kgdb at " echo " -i: force boot of the Installation CDROM image" echo " -I: Installation CDROM image location (default is ${DEFAULT_ISOFILE})" @@ -73,8 +74,9 @@ virtio_diskdev=${DEFAULT_VIRTIO_DISK} tapdev=${DEFAULT_TAPDEV} apic_opt="" gdbport=0 +env_opt="" -while getopts haic:g:I:m:d:t: c ; do +while getopts haic:e:g:I:m:d:t: c ; do case $c in h) usage @@ -85,6 +87,9 @@ while getopts haic:g:I:m:d:t: c ; do d) virtio_diskdev=${OPTARG} ;; + e) + env_opt="${env_opt} -e ${OPTARG}" + ;; g) gdbport=${OPTARG} ;; i) @@ -163,7 +168,7 @@ while [ 1 ]; do installer_opt="" fi - ${LOADER} -m ${memsize} -d ${BOOTDISK} ${vmname} + ${LOADER} -m ${memsize} -d ${BOOTDISK} ${env_opt} ${vmname} if [ $? -ne 0 ]; then break fi Modified: projects/camlock/share/man/man9/rtentry.9 ============================================================================== --- projects/camlock/share/man/man9/rtentry.9 Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/share/man/man9/rtentry.9 Thu Oct 17 20:23:28 2013 (r256706) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 11, 2008 +.Dd October 16, 2013 .Dt RTENTRY 9 .Os .Sh NAME @@ -154,8 +154,7 @@ Protocol-specific. .It Dv RTF_PRCLONING This flag is obsolete and simply ignored by facility. .It Dv RTF_PINNED -(Reserved for future use to indicate routes which are not to be -modified by a routing protocol.) +Indicates that this route is immutable to a routing protocol. .It Dv RTF_LOCAL Indicates that the destination of this route is an address configured as belonging to this system. Modified: projects/camlock/sys/amd64/amd64/pmap.c ============================================================================== --- projects/camlock/sys/amd64/amd64/pmap.c Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/sys/amd64/amd64/pmap.c Thu Oct 17 20:23:28 2013 (r256706) @@ -371,6 +371,8 @@ int pmap_pcid_enabled = 1; SYSCTL_INT(_vm_pmap, OID_AUTO, pcid_enabled, CTLFLAG_RDTUN, &pmap_pcid_enabled, 0, "Is TLB Context ID enabled ?"); int invpcid_works = 0; +SYSCTL_INT(_vm_pmap, OID_AUTO, invpcid_works, CTLFLAG_RD, &invpcid_works, 0, + "Is the invpcid instruction available ?"); static int pmap_pcid_save_cnt_proc(SYSCTL_HANDLER_ARGS) Modified: projects/camlock/sys/amd64/include/vmm.h ============================================================================== --- projects/camlock/sys/amd64/include/vmm.h Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/sys/amd64/include/vmm.h Thu Oct 17 20:23:28 2013 (r256706) @@ -223,6 +223,7 @@ enum vm_cap_type { VM_CAP_MTRAP_EXIT, VM_CAP_PAUSE_EXIT, VM_CAP_UNRESTRICTED_GUEST, + VM_CAP_ENABLE_INVPCID, VM_CAP_MAX }; Modified: projects/camlock/sys/amd64/vmm/intel/vmx.c ============================================================================== --- projects/camlock/sys/amd64/vmm/intel/vmx.c Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/sys/amd64/vmm/intel/vmx.c Thu Oct 17 20:23:28 2013 (r256706) @@ -164,6 +164,7 @@ static int cap_halt_exit; static int cap_pause_exit; static int cap_unrestricted_guest; static int cap_monitor_trap; +static int cap_invpcid; static struct unrhdr *vpid_unr; static u_int vpid_alloc_failed; @@ -660,6 +661,11 @@ vmx_init(void) PROCBASED2_UNRESTRICTED_GUEST, 0, &tmp) == 0); + cap_invpcid = (vmx_set_ctlreg(MSR_VMX_PROCBASED_CTLS2, + MSR_VMX_PROCBASED_CTLS2, PROCBASED2_ENABLE_INVPCID, 0, + &tmp) == 0); + + /* Initialize EPT */ error = ept_init(); if (error) { @@ -828,6 +834,7 @@ vmx_vminit(struct vm *vm, pmap_t pmap) vmx->cap[i].set = 0; vmx->cap[i].proc_ctls = procbased_ctls; + vmx->cap[i].proc_ctls2 = procbased_ctls2; vmx->state[i].lastcpu = -1; vmx->state[i].vpid = vpid[i]; @@ -1932,6 +1939,10 @@ vmx_getcap(void *arg, int vcpu, int type if (cap_unrestricted_guest) ret = 0; break; + case VM_CAP_ENABLE_INVPCID: + if (cap_invpcid) + ret = 0; + break; default: break; } @@ -1988,11 +1999,21 @@ vmx_setcap(void *arg, int vcpu, int type case VM_CAP_UNRESTRICTED_GUEST: if (cap_unrestricted_guest) { retval = 0; - baseval = procbased_ctls2; + pptr = &vmx->cap[vcpu].proc_ctls2; + baseval = *pptr; flag = PROCBASED2_UNRESTRICTED_GUEST; reg = VMCS_SEC_PROC_BASED_CTLS; } break; + case VM_CAP_ENABLE_INVPCID: + if (cap_invpcid) { + retval = 0; + pptr = &vmx->cap[vcpu].proc_ctls2; + baseval = *pptr; + flag = PROCBASED2_ENABLE_INVPCID; + reg = VMCS_SEC_PROC_BASED_CTLS; + } + break; default: break; } Modified: projects/camlock/sys/amd64/vmm/intel/vmx.h ============================================================================== --- projects/camlock/sys/amd64/vmm/intel/vmx.h Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/sys/amd64/vmm/intel/vmx.h Thu Oct 17 20:23:28 2013 (r256706) @@ -84,6 +84,7 @@ struct vmxctx { struct vmxcap { int set; uint32_t proc_ctls; + uint32_t proc_ctls2; }; struct vmxstate { Modified: projects/camlock/sys/amd64/vmm/intel/vmx_controls.h ============================================================================== --- projects/camlock/sys/amd64/vmm/intel/vmx_controls.h Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/sys/amd64/vmm/intel/vmx_controls.h Thu Oct 17 20:23:28 2013 (r256706) @@ -68,6 +68,7 @@ #define PROCBASED2_WBINVD_EXITING (1 << 6) #define PROCBASED2_UNRESTRICTED_GUEST (1 << 7) #define PROCBASED2_PAUSE_LOOP_EXITING (1 << 10) +#define PROCBASED2_ENABLE_INVPCID (1 << 12) /* VM Exit Controls */ #define VM_EXIT_SAVE_DEBUG_CONTROLS (1 << 2) Modified: projects/camlock/sys/amd64/vmm/x86.c ============================================================================== --- projects/camlock/sys/amd64/vmm/x86.c Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/sys/amd64/vmm/x86.c Thu Oct 17 20:23:28 2013 (r256706) @@ -53,7 +53,7 @@ int x86_emulate_cpuid(struct vm *vm, int vcpu_id, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) { - int error; + int error, enable_invpcid; unsigned int func, regs[4]; enum x2apic_state x2apic_state; @@ -202,8 +202,22 @@ x86_emulate_cpuid(struct vm *vm, int vcp regs[0] |= 0x04008000; break; - case CPUID_0000_0006: case CPUID_0000_0007: + regs[0] = 0; + regs[1] = 0; + regs[2] = 0; + regs[3] = 0; + + /* leaf 0 */ + if (*ecx == 0) { + error = vm_get_capability(vm, vcpu_id, + VM_CAP_ENABLE_INVPCID, &enable_invpcid); + if (error == 0 && enable_invpcid) + regs[1] |= CPUID_STDEXT_INVPCID; + } + break; + + case CPUID_0000_0006: case CPUID_0000_000A: case CPUID_0000_000D: /* Modified: projects/camlock/sys/arm/arm/busdma_machdep-v6.c ============================================================================== --- projects/camlock/sys/arm/arm/busdma_machdep-v6.c Thu Oct 17 20:19:15 2013 (r256705) +++ projects/camlock/sys/arm/arm/busdma_machdep-v6.c Thu Oct 17 20:23:28 2013 (r256706) @@ -425,14 +425,21 @@ bus_dma_tag_create(bus_dma_tag_t parent, if (_bus_dma_can_bounce(newtag->lowaddr, newtag->highaddr) || newtag->alignment > 1) newtag->flags |= BUS_DMA_COULD_BOUNCE; - else - maxsize = 2; /* Need at most 2 bounce pages for unaligned access on cache line boundaries */ + /* + * Any request can auto-bounce due to cacheline alignment, in addition + * to any alignment or boundary specifications in the tag, so if the + * ALLOCNOW flag is set, there's always work to do. + */ if ((flags & BUS_DMA_ALLOCNOW) != 0) { struct bounce_zone *bz; - - /* Must bounce */ - + /* + * Round size up to a full page, and add one more page because + * there can always be one more boundary crossing than the + * number of pages in a transfer. + */ + maxsize = roundup2(maxsize, PAGE_SIZE) + PAGE_SIZE; + if ((error = alloc_bounce_zone(newtag)) != 0) { free(newtag, M_DEVBUF); return (error); @@ -518,20 +525,22 @@ static int allocate_bz_and_pages(bus_dma STAILQ_INIT(&(mapp->bpages)); /* - * Attempt to add pages to our pool on a per-instance - * basis up to a sane limit. + * Attempt to add pages to our pool on a per-instance basis up to a sane + * limit. Even if the tag isn't flagged as COULD_BOUNCE due to + * alignment and boundary constraints, it could still auto-bounce due to + * cacheline alignment, which requires at most two bounce pages. */ if (dmat->flags & BUS_DMA_COULD_BOUNCE) maxpages = MAX_BPAGES; else - maxpages = 2 * bz->map_count; /* Only need at most 2 pages for buffers unaligned on cache line boundaries */ + maxpages = 2 * bz->map_count; if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0 || (bz->map_count > 0 && bz->total_bpages < maxpages)) { int pages; - pages = MAX(atop(dmat->maxsize), 1); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Oct 18 09:32:12 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B751B90B; Fri, 18 Oct 2013 09:32:12 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9ED942F96; Fri, 18 Oct 2013 09:32:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9I9WCMj042110; Fri, 18 Oct 2013 09:32:12 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9I9WBtv042103; Fri, 18 Oct 2013 09:32:11 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201310180932.r9I9WBtv042103@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 18 Oct 2013 09:32:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256726 - in projects/pf/head: . bin bin/chflags bin/dd bin/ed bin/freebsd-version bin/ls bin/pkill bin/ps bin/sh cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/dtrace... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Oct 2013 09:32:12 -0000 Author: glebius Date: Fri Oct 18 09:32:02 2013 New Revision: 256726 URL: http://svnweb.freebsd.org/changeset/base/256726 Log: Merge head r233826 through r256722. Added: projects/pf/head/bin/freebsd-version/ - copied from r256722, head/bin/freebsd-version/ projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d.out - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d.out projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d.out - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d.out projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d.out - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d.out projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d.out - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d.out projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d.out - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d.out projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.dyn.d - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.dyn.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d.out - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d.out projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_AGG.bad.d - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_AGG.bad.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.dyn.d - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.dyn.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh.out - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh.out projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh.out - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh.out projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/types/tst.const.d - copied unchanged from r256722, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/types/tst.const.d projects/pf/head/cddl/lib/libdtrace/ip.d - copied unchanged from r256722, head/cddl/lib/libdtrace/ip.d projects/pf/head/cddl/lib/libdtrace/tcp.d - copied unchanged from r256722, head/cddl/lib/libdtrace/tcp.d projects/pf/head/cddl/lib/libdtrace/udp.d - copied unchanged from r256722, head/cddl/lib/libdtrace/udp.d projects/pf/head/contrib/apr-util/crypto/apr_passwd.c - copied unchanged from r256722, head/contrib/apr-util/crypto/apr_passwd.c projects/pf/head/contrib/apr-util/crypto/crypt_blowfish.c - copied unchanged from r256722, head/contrib/apr-util/crypto/crypt_blowfish.c projects/pf/head/contrib/apr-util/crypto/crypt_blowfish.h - copied unchanged from r256722, head/contrib/apr-util/crypto/crypt_blowfish.h projects/pf/head/contrib/bmake/unit-tests/sunshcmd - copied unchanged from r256722, head/contrib/bmake/unit-tests/sunshcmd projects/pf/head/contrib/dialog/package/freebsd/ - copied from r256722, head/contrib/dialog/package/freebsd/ projects/pf/head/contrib/dialog/po/fa.po - copied unchanged from r256722, head/contrib/dialog/po/fa.po projects/pf/head/contrib/ipfilter/WhatsNew50.txt - copied unchanged from r256722, head/contrib/ipfilter/WhatsNew50.txt projects/pf/head/contrib/ipfilter/arc4random.c - copied unchanged from r256722, head/contrib/ipfilter/arc4random.c projects/pf/head/contrib/ipfilter/genmask.c - copied unchanged from r256722, head/contrib/ipfilter/genmask.c projects/pf/head/contrib/ipfilter/ip_dstlist.c - copied unchanged from r256722, head/contrib/ipfilter/ip_dstlist.c projects/pf/head/contrib/ipfilter/ip_dstlist.h - copied unchanged from r256722, head/contrib/ipfilter/ip_dstlist.h projects/pf/head/contrib/ipfilter/ip_fil_compat.c - copied unchanged from r256722, head/contrib/ipfilter/ip_fil_compat.c projects/pf/head/contrib/ipfilter/ipf_rb.h - copied unchanged from r256722, head/contrib/ipfilter/ipf_rb.h projects/pf/head/contrib/ipfilter/lib/allocmbt.c - copied unchanged from r256722, head/contrib/ipfilter/lib/allocmbt.c projects/pf/head/contrib/ipfilter/lib/assigndefined.c - copied unchanged from r256722, head/contrib/ipfilter/lib/assigndefined.c projects/pf/head/contrib/ipfilter/lib/connecttcp.c - copied unchanged from r256722, head/contrib/ipfilter/lib/connecttcp.c projects/pf/head/contrib/ipfilter/lib/dupmbt.c - copied unchanged from r256722, head/contrib/ipfilter/lib/dupmbt.c projects/pf/head/contrib/ipfilter/lib/familyname.c - copied unchanged from r256722, head/contrib/ipfilter/lib/familyname.c projects/pf/head/contrib/ipfilter/lib/findword.c - copied unchanged from r256722, head/contrib/ipfilter/lib/findword.c projects/pf/head/contrib/ipfilter/lib/freembt.c - copied unchanged from r256722, head/contrib/ipfilter/lib/freembt.c projects/pf/head/contrib/ipfilter/lib/ftov.c - copied unchanged from r256722, head/contrib/ipfilter/lib/ftov.c projects/pf/head/contrib/ipfilter/lib/geticmptype.c - copied unchanged from r256722, head/contrib/ipfilter/lib/geticmptype.c projects/pf/head/contrib/ipfilter/lib/icmptypename.c - copied unchanged from r256722, head/contrib/ipfilter/lib/icmptypename.c projects/pf/head/contrib/ipfilter/lib/icmptypes.c - copied unchanged from r256722, head/contrib/ipfilter/lib/icmptypes.c projects/pf/head/contrib/ipfilter/lib/interror.c - copied unchanged from r256722, head/contrib/ipfilter/lib/interror.c projects/pf/head/contrib/ipfilter/lib/ipf_perror.c - copied unchanged from r256722, head/contrib/ipfilter/lib/ipf_perror.c projects/pf/head/contrib/ipfilter/lib/load_dstlist.c - copied unchanged from r256722, head/contrib/ipfilter/lib/load_dstlist.c projects/pf/head/contrib/ipfilter/lib/load_dstlistnode.c - copied unchanged from r256722, head/contrib/ipfilter/lib/load_dstlistnode.c projects/pf/head/contrib/ipfilter/lib/mb_hexdump.c - copied unchanged from r256722, head/contrib/ipfilter/lib/mb_hexdump.c projects/pf/head/contrib/ipfilter/lib/msgdsize.c - copied unchanged from r256722, head/contrib/ipfilter/lib/msgdsize.c projects/pf/head/contrib/ipfilter/lib/parsefields.c - copied unchanged from r256722, head/contrib/ipfilter/lib/parsefields.c projects/pf/head/contrib/ipfilter/lib/parseipfexpr.c - copied unchanged from r256722, head/contrib/ipfilter/lib/parseipfexpr.c projects/pf/head/contrib/ipfilter/lib/parsewhoisline.c - copied unchanged from r256722, head/contrib/ipfilter/lib/parsewhoisline.c projects/pf/head/contrib/ipfilter/lib/poolio.c - copied unchanged from r256722, head/contrib/ipfilter/lib/poolio.c projects/pf/head/contrib/ipfilter/lib/prependmbt.c - copied unchanged from r256722, head/contrib/ipfilter/lib/prependmbt.c projects/pf/head/contrib/ipfilter/lib/printactiveaddr.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printactiveaddr.c projects/pf/head/contrib/ipfilter/lib/printaddr.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printaddr.c projects/pf/head/contrib/ipfilter/lib/printdstl_live.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printdstl_live.c projects/pf/head/contrib/ipfilter/lib/printdstlist.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printdstlist.c projects/pf/head/contrib/ipfilter/lib/printdstlistdata.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printdstlistdata.c projects/pf/head/contrib/ipfilter/lib/printdstlistnode.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printdstlistnode.c projects/pf/head/contrib/ipfilter/lib/printdstlistpolicy.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printdstlistpolicy.c projects/pf/head/contrib/ipfilter/lib/printfieldhdr.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printfieldhdr.c projects/pf/head/contrib/ipfilter/lib/printhost.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printhost.c projects/pf/head/contrib/ipfilter/lib/printipfexpr.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printipfexpr.c projects/pf/head/contrib/ipfilter/lib/printiphdr.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printiphdr.c projects/pf/head/contrib/ipfilter/lib/printlookup.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printlookup.c projects/pf/head/contrib/ipfilter/lib/printnataddr.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printnataddr.c projects/pf/head/contrib/ipfilter/lib/printnatfield.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printnatfield.c projects/pf/head/contrib/ipfilter/lib/printnatside.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printnatside.c projects/pf/head/contrib/ipfilter/lib/printpoolfield.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printpoolfield.c projects/pf/head/contrib/ipfilter/lib/printstatefields.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printstatefields.c projects/pf/head/contrib/ipfilter/lib/printtcpflags.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printtcpflags.c projects/pf/head/contrib/ipfilter/lib/printunit.c - copied unchanged from r256722, head/contrib/ipfilter/lib/printunit.c projects/pf/head/contrib/ipfilter/lib/save_execute.c - copied unchanged from r256722, head/contrib/ipfilter/lib/save_execute.c projects/pf/head/contrib/ipfilter/lib/save_file.c - copied unchanged from r256722, head/contrib/ipfilter/lib/save_file.c projects/pf/head/contrib/ipfilter/lib/save_nothing.c - copied unchanged from r256722, head/contrib/ipfilter/lib/save_nothing.c projects/pf/head/contrib/ipfilter/lib/save_syslog.c - copied unchanged from r256722, head/contrib/ipfilter/lib/save_syslog.c projects/pf/head/contrib/ipfilter/lib/save_v1trap.c - copied unchanged from r256722, head/contrib/ipfilter/lib/save_v1trap.c projects/pf/head/contrib/ipfilter/lib/save_v2trap.c - copied unchanged from r256722, head/contrib/ipfilter/lib/save_v2trap.c projects/pf/head/contrib/ipfilter/lib/vtof.c - copied unchanged from r256722, head/contrib/ipfilter/lib/vtof.c - copied unchanged from r256722, head/contrib/ipfilter/ml_ipl.c - copied unchanged from r256722, head/contrib/ipfilter/mlfk_ipl.c - copied unchanged from r256722, head/contrib/ipfilter/mli_ipl.c - copied unchanged from r256722, head/contrib/ipfilter/mln_ipl.c projects/pf/head/contrib/ipfilter/mln_rule.c - copied unchanged from r256722, head/contrib/ipfilter/mln_rule.c projects/pf/head/contrib/ipfilter/mlo_ipl.c - copied unchanged from r256722, head/contrib/ipfilter/mlo_ipl.c projects/pf/head/contrib/ipfilter/mlo_rule.c - copied unchanged from r256722, head/contrib/ipfilter/mlo_rule.c - copied unchanged from r256722, head/contrib/ipfilter/mls_ipl.c projects/pf/head/contrib/ipfilter/mls_rule.c - copied unchanged from r256722, head/contrib/ipfilter/mls_rule.c projects/pf/head/contrib/ipfilter/mlso_rule.c - copied unchanged from r256722, head/contrib/ipfilter/mlso_rule.c projects/pf/head/contrib/ipfilter/radix_ipf.c - copied unchanged from r256722, head/contrib/ipfilter/radix_ipf.c projects/pf/head/contrib/ipfilter/sys/ - copied from r256722, head/contrib/ipfilter/sys/ projects/pf/head/contrib/ipfilter/tools/ipfsyncd.c - copied unchanged from r256722, head/contrib/ipfilter/tools/ipfsyncd.c projects/pf/head/contrib/ldns-host/ - copied from r256722, head/contrib/ldns-host/ projects/pf/head/contrib/ldns/drill/config.h - copied unchanged from r256722, head/contrib/ldns/drill/config.h projects/pf/head/contrib/ldns/drill/drill.1 - copied unchanged from r256722, head/contrib/ldns/drill/drill.1 - copied from r256722, head/contrib/libexecinfo/ projects/pf/head/contrib/llvm/tools/lldb/ - copied from r256722, head/contrib/llvm/tools/lldb/ projects/pf/head/contrib/nvi/catalog/zh_CN.GB2312.base - copied unchanged from r256722, head/contrib/nvi/catalog/zh_CN.GB2312.base projects/pf/head/contrib/nvi/catalog/zh_CN.GB2312.owner - copied unchanged from r256722, head/contrib/nvi/catalog/zh_CN.GB2312.owner projects/pf/head/contrib/nvi/cl/extern.h - copied unchanged from r256722, head/contrib/nvi/cl/extern.h projects/pf/head/contrib/nvi/common/conv.c - copied unchanged from r256722, head/contrib/nvi/common/conv.c projects/pf/head/contrib/nvi/common/conv.h - copied unchanged from r256722, head/contrib/nvi/common/conv.h projects/pf/head/contrib/nvi/common/encoding.c - copied unchanged from r256722, head/contrib/nvi/common/encoding.c projects/pf/head/contrib/nvi/common/extern.h - copied unchanged from r256722, head/contrib/nvi/common/extern.h projects/pf/head/contrib/nvi/common/multibyte.h - copied unchanged from r256722, head/contrib/nvi/common/multibyte.h projects/pf/head/contrib/nvi/common/options_def.h - copied unchanged from r256722, head/contrib/nvi/common/options_def.h projects/pf/head/contrib/nvi/ex/ex_def.h - copied unchanged from r256722, head/contrib/nvi/ex/ex_def.h projects/pf/head/contrib/nvi/ex/extern.h - copied unchanged from r256722, head/contrib/nvi/ex/extern.h projects/pf/head/contrib/nvi/regex/ - copied from r256722, head/contrib/nvi/regex/ projects/pf/head/contrib/nvi/vi/extern.h - copied unchanged from r256722, head/contrib/nvi/vi/extern.h projects/pf/head/contrib/openpam/lib/libpam/ - copied from r256722, head/contrib/openpam/lib/libpam/ projects/pf/head/contrib/openpam/m4/ - copied from r256722, head/contrib/openpam/m4/ projects/pf/head/contrib/openpam/mkpkgng.in - copied unchanged from r256722, head/contrib/openpam/mkpkgng.in projects/pf/head/contrib/openpam/t/t_file.c - copied unchanged from r256722, head/contrib/openpam/t/t_file.c projects/pf/head/contrib/openpam/test-driver - copied unchanged from r256722, head/contrib/openpam/test-driver projects/pf/head/contrib/serf/SConstruct - copied unchanged from r256722, head/contrib/serf/SConstruct projects/pf/head/contrib/serf/auth/auth_spnego.c - copied unchanged from r256722, head/contrib/serf/auth/auth_spnego.c projects/pf/head/contrib/serf/auth/auth_spnego.h - copied unchanged from r256722, head/contrib/serf/auth/auth_spnego.h projects/pf/head/contrib/serf/auth/auth_spnego_gss.c - copied unchanged from r256722, head/contrib/serf/auth/auth_spnego_gss.c projects/pf/head/contrib/serf/auth/auth_spnego_sspi.c - copied unchanged from r256722, head/contrib/serf/auth/auth_spnego_sspi.c projects/pf/head/contrib/serf/build/check.py - copied unchanged from r256722, head/contrib/serf/build/check.py projects/pf/head/contrib/serf/build/serf.pc.in - copied unchanged from r256722, head/contrib/serf/build/serf.pc.in projects/pf/head/contrib/unbound/config.h - copied unchanged from r256722, head/contrib/unbound/config.h projects/pf/head/contrib/unbound/doc/libunbound.3 - copied unchanged from r256722, head/contrib/unbound/doc/libunbound.3 projects/pf/head/contrib/unbound/doc/unbound-anchor.8 - copied unchanged from r256722, head/contrib/unbound/doc/unbound-anchor.8 projects/pf/head/contrib/unbound/doc/unbound-checkconf.8 - copied unchanged from r256722, head/contrib/unbound/doc/unbound-checkconf.8 projects/pf/head/contrib/unbound/doc/unbound-control.8 - copied unchanged from r256722, head/contrib/unbound/doc/unbound-control.8 projects/pf/head/contrib/unbound/doc/unbound.8 - copied unchanged from r256722, head/contrib/unbound/doc/unbound.8 projects/pf/head/contrib/unbound/doc/unbound.conf.5 - copied unchanged from r256722, head/contrib/unbound/doc/unbound.conf.5 projects/pf/head/contrib/unbound/freebsd-configure.sh - copied unchanged from r256722, head/contrib/unbound/freebsd-configure.sh projects/pf/head/contrib/unbound/freebsd-sources.pl - copied unchanged from r256722, head/contrib/unbound/freebsd-sources.pl projects/pf/head/contrib/unbound/libunbound/worker.h - copied unchanged from r256722, head/contrib/unbound/libunbound/worker.h projects/pf/head/contrib/unbound/smallapp/unbound-control-setup.sh.in - copied unchanged from r256722, head/contrib/unbound/smallapp/unbound-control-setup.sh.in projects/pf/head/contrib/wpa/hostapd/hlr_auc_gw.txt - copied unchanged from r256722, head/contrib/wpa/hostapd/hlr_auc_gw.txt projects/pf/head/contrib/wpa/hostapd/hostapd.eap_user_sqlite - copied unchanged from r256722, head/contrib/wpa/hostapd/hostapd.eap_user_sqlite projects/pf/head/contrib/wpa/patches/openssl-0.9.8x-tls-extensions.patch - copied unchanged from r256722, head/contrib/wpa/patches/openssl-0.9.8x-tls-extensions.patch projects/pf/head/contrib/wpa/src/ap/eap_user_db.c - copied unchanged from r256722, head/contrib/wpa/src/ap/eap_user_db.c projects/pf/head/contrib/wpa/src/ap/gas_serv.c - copied unchanged from r256722, head/contrib/wpa/src/ap/gas_serv.c projects/pf/head/contrib/wpa/src/ap/gas_serv.h - copied unchanged from r256722, head/contrib/wpa/src/ap/gas_serv.h projects/pf/head/contrib/wpa/src/ap/hs20.c - copied unchanged from r256722, head/contrib/wpa/src/ap/hs20.c projects/pf/head/contrib/wpa/src/ap/hs20.h - copied unchanged from r256722, head/contrib/wpa/src/ap/hs20.h projects/pf/head/contrib/wpa/src/ap/ieee802_11_shared.c - copied unchanged from r256722, head/contrib/wpa/src/ap/ieee802_11_shared.c projects/pf/head/contrib/wpa/src/ap/ieee802_11_vht.c - copied unchanged from r256722, head/contrib/wpa/src/ap/ieee802_11_vht.c projects/pf/head/contrib/wpa/src/ap/p2p_hostapd.c - copied unchanged from r256722, head/contrib/wpa/src/ap/p2p_hostapd.c projects/pf/head/contrib/wpa/src/ap/p2p_hostapd.h - copied unchanged from r256722, head/contrib/wpa/src/ap/p2p_hostapd.h projects/pf/head/contrib/wpa/src/ap/vlan_util.c - copied unchanged from r256722, head/contrib/wpa/src/ap/vlan_util.c projects/pf/head/contrib/wpa/src/ap/vlan_util.h - copied unchanged from r256722, head/contrib/wpa/src/ap/vlan_util.h projects/pf/head/contrib/wpa/src/ap/wnm_ap.c - copied unchanged from r256722, head/contrib/wpa/src/ap/wnm_ap.c projects/pf/head/contrib/wpa/src/ap/wnm_ap.h - copied unchanged from r256722, head/contrib/wpa/src/ap/wnm_ap.h projects/pf/head/contrib/wpa/src/common/gas.c - copied unchanged from r256722, head/contrib/wpa/src/common/gas.c projects/pf/head/contrib/wpa/src/common/gas.h - copied unchanged from r256722, head/contrib/wpa/src/common/gas.h projects/pf/head/contrib/wpa/src/crypto/aes-ccm.c - copied unchanged from r256722, head/contrib/wpa/src/crypto/aes-ccm.c projects/pf/head/contrib/wpa/src/crypto/aes-gcm.c - copied unchanged from r256722, head/contrib/wpa/src/crypto/aes-gcm.c projects/pf/head/contrib/wpa/src/crypto/random.c - copied unchanged from r256722, head/contrib/wpa/src/crypto/random.c projects/pf/head/contrib/wpa/src/crypto/random.h - copied unchanged from r256722, head/contrib/wpa/src/crypto/random.h projects/pf/head/contrib/wpa/src/crypto/sha1-prf.c - copied unchanged from r256722, head/contrib/wpa/src/crypto/sha1-prf.c projects/pf/head/contrib/wpa/src/crypto/sha256-prf.c - copied unchanged from r256722, head/contrib/wpa/src/crypto/sha256-prf.c projects/pf/head/contrib/wpa/src/crypto/sha256-tlsprf.c - copied unchanged from r256722, head/contrib/wpa/src/crypto/sha256-tlsprf.c projects/pf/head/contrib/wpa/src/crypto/sha256_i.h - copied unchanged from r256722, head/contrib/wpa/src/crypto/sha256_i.h projects/pf/head/contrib/wpa/src/drivers/driver_bsd.c - copied unchanged from r256722, head/contrib/wpa/src/drivers/driver_bsd.c projects/pf/head/contrib/wpa/src/drivers/driver_common.c - copied unchanged from r256722, head/contrib/wpa/src/drivers/driver_common.c projects/pf/head/contrib/wpa/src/drivers/driver_privsep.c - copied unchanged from r256722, head/contrib/wpa/src/drivers/driver_privsep.c projects/pf/head/contrib/wpa/src/eap_common/eap_pwd_common.c - copied unchanged from r256722, head/contrib/wpa/src/eap_common/eap_pwd_common.c projects/pf/head/contrib/wpa/src/eap_common/eap_pwd_common.h - copied unchanged from r256722, head/contrib/wpa/src/eap_common/eap_pwd_common.h projects/pf/head/contrib/wpa/src/eap_peer/eap_pwd.c - copied unchanged from r256722, head/contrib/wpa/src/eap_peer/eap_pwd.c projects/pf/head/contrib/wpa/src/eap_server/eap_server_pwd.c - copied unchanged from r256722, head/contrib/wpa/src/eap_server/eap_server_pwd.c projects/pf/head/contrib/wpa/src/l2_packet/l2_packet_privsep.c - copied unchanged from r256722, head/contrib/wpa/src/l2_packet/l2_packet_privsep.c projects/pf/head/contrib/wpa/src/p2p/ - copied from r256722, head/contrib/wpa/src/p2p/ projects/pf/head/contrib/wpa/src/radius/radius_das.c - copied unchanged from r256722, head/contrib/wpa/src/radius/radius_das.c projects/pf/head/contrib/wpa/src/radius/radius_das.h - copied unchanged from r256722, head/contrib/wpa/src/radius/radius_das.h projects/pf/head/contrib/wpa/src/rsn_supp/tdls.c - copied unchanged from r256722, head/contrib/wpa/src/rsn_supp/tdls.c projects/pf/head/contrib/wpa/src/utils/edit.c - copied unchanged from r256722, head/contrib/wpa/src/utils/edit.c projects/pf/head/contrib/wpa/src/utils/edit.h - copied unchanged from r256722, head/contrib/wpa/src/utils/edit.h projects/pf/head/contrib/wpa/src/utils/edit_readline.c - copied unchanged from r256722, head/contrib/wpa/src/utils/edit_readline.c projects/pf/head/contrib/wpa/src/utils/edit_simple.c - copied unchanged from r256722, head/contrib/wpa/src/utils/edit_simple.c projects/pf/head/contrib/wpa/src/utils/ext_password.c - copied unchanged from r256722, head/contrib/wpa/src/utils/ext_password.c projects/pf/head/contrib/wpa/src/utils/ext_password.h - copied unchanged from r256722, head/contrib/wpa/src/utils/ext_password.h projects/pf/head/contrib/wpa/src/utils/ext_password_i.h - copied unchanged from r256722, head/contrib/wpa/src/utils/ext_password_i.h projects/pf/head/contrib/wpa/src/utils/ext_password_test.c - copied unchanged from r256722, head/contrib/wpa/src/utils/ext_password_test.c projects/pf/head/contrib/wpa/src/wps/wps_attr_parse.h - copied unchanged from r256722, head/contrib/wpa/src/wps/wps_attr_parse.h projects/pf/head/contrib/wpa/src/wps/wps_validate.c - copied unchanged from r256722, head/contrib/wpa/src/wps/wps_validate.c projects/pf/head/contrib/wpa/wpa_supplicant/README-HS20 - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/README-HS20 projects/pf/head/contrib/wpa/wpa_supplicant/README-P2P - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/README-P2P projects/pf/head/contrib/wpa/wpa_supplicant/autoscan.c - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/autoscan.c projects/pf/head/contrib/wpa/wpa_supplicant/autoscan.h - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/autoscan.h projects/pf/head/contrib/wpa/wpa_supplicant/autoscan_exponential.c - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/autoscan_exponential.c projects/pf/head/contrib/wpa/wpa_supplicant/autoscan_periodic.c - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/autoscan_periodic.c projects/pf/head/contrib/wpa/wpa_supplicant/bgscan_learn.c - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/bgscan_learn.c projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.c - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.c projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.h - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.h projects/pf/head/contrib/wpa/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in projects/pf/head/contrib/wpa/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in projects/pf/head/contrib/wpa/wpa_supplicant/examples/dbus-listen-preq.py - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/examples/dbus-listen-preq.py projects/pf/head/contrib/wpa/wpa_supplicant/examples/p2p/ - copied from r256722, head/contrib/wpa/wpa_supplicant/examples/p2p/ projects/pf/head/contrib/wpa/wpa_supplicant/examples/p2p-action-udhcp.sh - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/examples/p2p-action-udhcp.sh projects/pf/head/contrib/wpa/wpa_supplicant/examples/p2p-action.sh - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/examples/p2p-action.sh projects/pf/head/contrib/wpa/wpa_supplicant/examples/udhcpd-p2p.conf - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/examples/udhcpd-p2p.conf projects/pf/head/contrib/wpa/wpa_supplicant/examples/wps-ap-cli - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/examples/wps-ap-cli projects/pf/head/contrib/wpa/wpa_supplicant/examples/wps-nfc.py - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/examples/wps-nfc.py projects/pf/head/contrib/wpa/wpa_supplicant/gas_query.c - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/gas_query.c projects/pf/head/contrib/wpa/wpa_supplicant/gas_query.h - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/gas_query.h projects/pf/head/contrib/wpa/wpa_supplicant/hs20_supplicant.c - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/hs20_supplicant.c projects/pf/head/contrib/wpa/wpa_supplicant/hs20_supplicant.h - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/hs20_supplicant.h projects/pf/head/contrib/wpa/wpa_supplicant/interworking.c - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/interworking.c projects/pf/head/contrib/wpa/wpa_supplicant/interworking.h - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/interworking.h projects/pf/head/contrib/wpa/wpa_supplicant/nfc_pw_token.c - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/nfc_pw_token.c projects/pf/head/contrib/wpa/wpa_supplicant/offchannel.c - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/offchannel.c projects/pf/head/contrib/wpa/wpa_supplicant/offchannel.h - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/offchannel.h projects/pf/head/contrib/wpa/wpa_supplicant/p2p_supplicant.c - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/p2p_supplicant.c projects/pf/head/contrib/wpa/wpa_supplicant/p2p_supplicant.h - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/p2p_supplicant.h projects/pf/head/contrib/wpa/wpa_supplicant/utils/ - copied from r256722, head/contrib/wpa/wpa_supplicant/utils/ projects/pf/head/contrib/wpa/wpa_supplicant/wifi_display.c - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/wifi_display.c projects/pf/head/contrib/wpa/wpa_supplicant/wifi_display.h - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/wifi_display.h projects/pf/head/contrib/wpa/wpa_supplicant/wnm_sta.c - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/wnm_sta.c projects/pf/head/contrib/wpa/wpa_supplicant/wnm_sta.h - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/wnm_sta.h projects/pf/head/contrib/wpa/wpa_supplicant/wpa_supplicant_conf.mk - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/wpa_supplicant_conf.mk projects/pf/head/contrib/wpa/wpa_supplicant/wpa_supplicant_conf.sh - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/wpa_supplicant_conf.sh projects/pf/head/contrib/wpa/wpa_supplicant/wpa_supplicant_template.conf - copied unchanged from r256722, head/contrib/wpa/wpa_supplicant/wpa_supplicant_template.conf projects/pf/head/crypto/openssh/Makefile.in - copied unchanged from r256722, head/crypto/openssh/Makefile.in projects/pf/head/crypto/openssh/buildpkg.sh.in - copied unchanged from r256722, head/crypto/openssh/buildpkg.sh.in projects/pf/head/crypto/openssh/config.sub - copied unchanged from r256722, head/crypto/openssh/config.sub projects/pf/head/crypto/openssh/configure - copied unchanged from r256722, head/crypto/openssh/configure projects/pf/head/crypto/openssh/configure.ac - copied unchanged from r256722, head/crypto/openssh/configure.ac projects/pf/head/crypto/openssh/contrib/ - copied from r256722, head/crypto/openssh/contrib/ projects/pf/head/crypto/openssh/fixalgorithms - copied unchanged from r256722, head/crypto/openssh/fixalgorithms projects/pf/head/crypto/openssh/freebsd-configure.sh - copied unchanged from r256722, head/crypto/openssh/freebsd-configure.sh projects/pf/head/crypto/openssh/install-sh - copied unchanged from r256722, head/crypto/openssh/install-sh projects/pf/head/crypto/openssh/krb5_config.h - copied unchanged from r256722, head/crypto/openssh/krb5_config.h projects/pf/head/crypto/openssh/mdoc2man.awk - copied unchanged from r256722, head/crypto/openssh/mdoc2man.awk projects/pf/head/crypto/openssh/moduli.0 - copied unchanged from r256722, head/crypto/openssh/moduli.0 projects/pf/head/crypto/openssh/nchan.ms - copied unchanged from r256722, head/crypto/openssh/nchan.ms projects/pf/head/crypto/openssh/nchan2.ms - copied unchanged from r256722, head/crypto/openssh/nchan2.ms projects/pf/head/crypto/openssh/openbsd-compat/Makefile.in - copied unchanged from r256722, head/crypto/openssh/openbsd-compat/Makefile.in projects/pf/head/crypto/openssh/openbsd-compat/getopt.h - copied unchanged from r256722, head/crypto/openssh/openbsd-compat/getopt.h projects/pf/head/crypto/openssh/openbsd-compat/getopt_long.c - copied unchanged from r256722, head/crypto/openssh/openbsd-compat/getopt_long.c projects/pf/head/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c - copied unchanged from r256722, head/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c projects/pf/head/crypto/openssh/openbsd-compat/regress/ - copied from r256722, head/crypto/openssh/openbsd-compat/regress/ projects/pf/head/crypto/openssh/openbsd-compat/strnlen.c - copied unchanged from r256722, head/crypto/openssh/openbsd-compat/strnlen.c projects/pf/head/crypto/openssh/openssh.xml.in - copied unchanged from r256722, head/crypto/openssh/openssh.xml.in projects/pf/head/crypto/openssh/opensshd.init.in - copied unchanged from r256722, head/crypto/openssh/opensshd.init.in projects/pf/head/crypto/openssh/regress/ - copied from r256722, head/crypto/openssh/regress/ projects/pf/head/crypto/openssh/sandbox-seccomp-filter.c - copied unchanged from r256722, head/crypto/openssh/sandbox-seccomp-filter.c projects/pf/head/crypto/openssh/scp.0 - copied unchanged from r256722, head/crypto/openssh/scp.0 projects/pf/head/crypto/openssh/sftp-server.0 - copied unchanged from r256722, head/crypto/openssh/sftp-server.0 projects/pf/head/crypto/openssh/sftp.0 - copied unchanged from r256722, head/crypto/openssh/sftp.0 projects/pf/head/crypto/openssh/ssh-add.0 - copied unchanged from r256722, head/crypto/openssh/ssh-add.0 projects/pf/head/crypto/openssh/ssh-agent.0 - copied unchanged from r256722, head/crypto/openssh/ssh-agent.0 projects/pf/head/crypto/openssh/ssh-keygen.0 - copied unchanged from r256722, head/crypto/openssh/ssh-keygen.0 projects/pf/head/crypto/openssh/ssh-keyscan.0 - copied unchanged from r256722, head/crypto/openssh/ssh-keyscan.0 projects/pf/head/crypto/openssh/ssh-keysign.0 - copied unchanged from r256722, head/crypto/openssh/ssh-keysign.0 projects/pf/head/crypto/openssh/ssh-pkcs11-helper.0 - copied unchanged from r256722, head/crypto/openssh/ssh-pkcs11-helper.0 projects/pf/head/crypto/openssh/ssh.0 - copied unchanged from r256722, head/crypto/openssh/ssh.0 projects/pf/head/crypto/openssh/ssh_config.0 - copied unchanged from r256722, head/crypto/openssh/ssh_config.0 projects/pf/head/crypto/openssh/sshd.0 - copied unchanged from r256722, head/crypto/openssh/sshd.0 projects/pf/head/crypto/openssh/sshd_config.0 - copied unchanged from r256722, head/crypto/openssh/sshd_config.0 projects/pf/head/crypto/openssh/survey.sh.in - copied unchanged from r256722, head/crypto/openssh/survey.sh.in projects/pf/head/etc/libmap.conf - copied unchanged from r256722, head/etc/libmap.conf projects/pf/head/etc/libmap32.conf - copied unchanged from r256722, head/etc/libmap32.conf projects/pf/head/etc/periodic/monthly/450.status-security - copied unchanged from r256722, head/etc/periodic/monthly/450.status-security projects/pf/head/etc/periodic/weekly/450.status-security - copied unchanged from r256722, head/etc/periodic/weekly/450.status-security projects/pf/head/etc/rc.d/ctld - copied unchanged from r256722, head/etc/rc.d/ctld projects/pf/head/etc/rc.d/iscsictl - copied unchanged from r256722, head/etc/rc.d/iscsictl projects/pf/head/etc/rc.d/iscsid - copied unchanged from r256722, head/etc/rc.d/iscsid projects/pf/head/etc/rc.d/local_unbound - copied unchanged from r256722, head/etc/rc.d/local_unbound projects/pf/head/etc/rc.d/swap - copied unchanged from r256722, head/etc/rc.d/swap projects/pf/head/etc/rc.d/swaplate - copied unchanged from r256722, head/etc/rc.d/swaplate projects/pf/head/gnu/usr.bin/cc/include/__wmmintrin_aes.h - copied unchanged from r256722, head/gnu/usr.bin/cc/include/__wmmintrin_aes.h projects/pf/head/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h - copied unchanged from r256722, head/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h projects/pf/head/include/mk-osreldate.sh - copied unchanged from r256722, head/include/mk-osreldate.sh projects/pf/head/lib/clang/liblldb/ - copied from r256722, head/lib/clang/liblldb/ projects/pf/head/lib/clang/liblldbAPI/ - copied from r256722, head/lib/clang/liblldbAPI/ projects/pf/head/lib/clang/liblldbBreakpoint/ - copied from r256722, head/lib/clang/liblldbBreakpoint/ projects/pf/head/lib/clang/liblldbCommands/ - copied from r256722, head/lib/clang/liblldbCommands/ projects/pf/head/lib/clang/liblldbCore/ - copied from r256722, head/lib/clang/liblldbCore/ projects/pf/head/lib/clang/liblldbDataFormatters/ - copied from r256722, head/lib/clang/liblldbDataFormatters/ projects/pf/head/lib/clang/liblldbExpression/ - copied from r256722, head/lib/clang/liblldbExpression/ projects/pf/head/lib/clang/liblldbHostCommon/ - copied from r256722, head/lib/clang/liblldbHostCommon/ projects/pf/head/lib/clang/liblldbHostFreeBSD/ - copied from r256722, head/lib/clang/liblldbHostFreeBSD/ projects/pf/head/lib/clang/liblldbInterpreter/ - copied from r256722, head/lib/clang/liblldbInterpreter/ projects/pf/head/lib/clang/liblldbPluginABISysV_x86_64/ - copied from r256722, head/lib/clang/liblldbPluginABISysV_x86_64/ projects/pf/head/lib/clang/liblldbPluginCXXItaniumABI/ - copied from r256722, head/lib/clang/liblldbPluginCXXItaniumABI/ projects/pf/head/lib/clang/liblldbPluginDisassemblerLLVM/ - copied from r256722, head/lib/clang/liblldbPluginDisassemblerLLVM/ projects/pf/head/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/ - copied from r256722, head/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/ projects/pf/head/lib/clang/liblldbPluginDynamicLoaderStatic/ - copied from r256722, head/lib/clang/liblldbPluginDynamicLoaderStatic/ projects/pf/head/lib/clang/liblldbPluginInstructionARM/ - copied from r256722, head/lib/clang/liblldbPluginInstructionARM/ projects/pf/head/lib/clang/liblldbPluginObjectContainerBSDArchive/ - copied from r256722, head/lib/clang/liblldbPluginObjectContainerBSDArchive/ projects/pf/head/lib/clang/liblldbPluginObjectFileELF/ - copied from r256722, head/lib/clang/liblldbPluginObjectFileELF/ projects/pf/head/lib/clang/liblldbPluginPlatformFreeBSD/ - copied from r256722, head/lib/clang/liblldbPluginPlatformFreeBSD/ projects/pf/head/lib/clang/liblldbPluginPlatformGDB/ - copied from r256722, head/lib/clang/liblldbPluginPlatformGDB/ projects/pf/head/lib/clang/liblldbPluginProcessElfCore/ - copied from r256722, head/lib/clang/liblldbPluginProcessElfCore/ projects/pf/head/lib/clang/liblldbPluginProcessFreeBSD/ - copied from r256722, head/lib/clang/liblldbPluginProcessFreeBSD/ projects/pf/head/lib/clang/liblldbPluginProcessGDBRemote/ - copied from r256722, head/lib/clang/liblldbPluginProcessGDBRemote/ projects/pf/head/lib/clang/liblldbPluginProcessPOSIX/ - copied from r256722, head/lib/clang/liblldbPluginProcessPOSIX/ projects/pf/head/lib/clang/liblldbPluginProcessUtility/ - copied from r256722, head/lib/clang/liblldbPluginProcessUtility/ projects/pf/head/lib/clang/liblldbPluginSymbolFileDWARF/ - copied from r256722, head/lib/clang/liblldbPluginSymbolFileDWARF/ projects/pf/head/lib/clang/liblldbPluginSymbolFileSymtab/ - copied from r256722, head/lib/clang/liblldbPluginSymbolFileSymtab/ projects/pf/head/lib/clang/liblldbPluginSymbolVendorELF/ - copied from r256722, head/lib/clang/liblldbPluginSymbolVendorELF/ projects/pf/head/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/ - copied from r256722, head/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/ projects/pf/head/lib/clang/liblldbPluginUnwindAssemblyX86/ - copied from r256722, head/lib/clang/liblldbPluginUnwindAssemblyX86/ projects/pf/head/lib/clang/liblldbSymbol/ - copied from r256722, head/lib/clang/liblldbSymbol/ projects/pf/head/lib/clang/liblldbTarget/ - copied from r256722, head/lib/clang/liblldbTarget/ projects/pf/head/lib/clang/liblldbUtility/ - copied from r256722, head/lib/clang/liblldbUtility/ projects/pf/head/lib/clang/lldb.lib.mk - copied unchanged from r256722, head/lib/clang/lldb.lib.mk projects/pf/head/lib/libc++/libc++.ldscript - copied unchanged from r256722, head/lib/libc++/libc++.ldscript projects/pf/head/lib/libc/capability/ - copied from r256722, head/lib/libc/capability/ projects/pf/head/lib/libc/gen/dup3.3 - copied unchanged from r256722, head/lib/libc/gen/dup3.3 projects/pf/head/lib/libc/gen/dup3.c - copied unchanged from r256722, head/lib/libc/gen/dup3.c projects/pf/head/lib/libc/include/errlst.h - copied unchanged from r256722, head/lib/libc/include/errlst.h projects/pf/head/lib/libc/sys/procctl.2 - copied unchanged from r256722, head/lib/libc/sys/procctl.2 projects/pf/head/lib/libexecinfo/ - copied from r256722, head/lib/libexecinfo/ projects/pf/head/lib/libiconv_compat/ - copied from r256722, head/lib/libiconv_compat/ projects/pf/head/lib/libunbound/ - copied from r256722, head/lib/libunbound/ projects/pf/head/lib/libusb/libusb-0.1.pc - copied unchanged from r256722, head/lib/libusb/libusb-0.1.pc projects/pf/head/lib/libusb/libusb-1.0.pc - copied unchanged from r256722, head/lib/libusb/libusb-1.0.pc projects/pf/head/lib/libusb/libusb-2.0.pc - copied unchanged from r256722, head/lib/libusb/libusb-2.0.pc projects/pf/head/lib/msun/src/imprecise.c - copied unchanged from r256722, head/lib/msun/src/imprecise.c projects/pf/head/sbin/mount/mount.conf.8 - copied unchanged from r256722, head/sbin/mount/mount.conf.8 projects/pf/head/sbin/nvmecontrol/devlist.c - copied unchanged from r256722, head/sbin/nvmecontrol/devlist.c projects/pf/head/sbin/nvmecontrol/firmware.c - copied unchanged from r256722, head/sbin/nvmecontrol/firmware.c projects/pf/head/sbin/nvmecontrol/identify.c - copied unchanged from r256722, head/sbin/nvmecontrol/identify.c projects/pf/head/sbin/nvmecontrol/logpage.c - copied unchanged from r256722, head/sbin/nvmecontrol/logpage.c projects/pf/head/sbin/nvmecontrol/nvmecontrol.h - copied unchanged from r256722, head/sbin/nvmecontrol/nvmecontrol.h projects/pf/head/sbin/nvmecontrol/perftest.c - copied unchanged from r256722, head/sbin/nvmecontrol/perftest.c projects/pf/head/sbin/nvmecontrol/reset.c - copied unchanged from r256722, head/sbin/nvmecontrol/reset.c projects/pf/head/share/doc/legal/realtek/ - copied from r256722, head/share/doc/legal/realtek/ projects/pf/head/share/examples/kld/random_adaptor/ - copied from r256722, head/share/examples/kld/random_adaptor/ projects/pf/head/share/man/man4/cc_cdg.4 - copied unchanged from r256722, head/share/man/man4/cc_cdg.4 projects/pf/head/share/man/man4/gpio.4 - copied unchanged from r256722, head/share/man/man4/gpio.4 projects/pf/head/share/man/man4/hptnr.4 - copied unchanged from r256722, head/share/man/man4/hptnr.4 projects/pf/head/share/man/man4/procdesc.4 - copied unchanged from r256722, head/share/man/man4/procdesc.4 projects/pf/head/share/man/man4/qlxge.4 - copied unchanged from r256722, head/share/man/man4/qlxge.4 projects/pf/head/share/man/man4/rsu.4 - copied unchanged from r256722, head/share/man/man4/rsu.4 projects/pf/head/share/man/man4/rsufw.4 - copied unchanged from r256722, head/share/man/man4/rsufw.4 projects/pf/head/share/man/man4/vmx.4 - copied unchanged from r256722, head/share/man/man4/vmx.4 projects/pf/head/share/man/man9/SDT.9 - copied unchanged from r256722, head/share/man/man9/SDT.9 projects/pf/head/share/man/man9/VOP_ADVISE.9 - copied unchanged from r256722, head/share/man/man9/VOP_ADVISE.9 projects/pf/head/share/man/man9/VOP_ALLOCATE.9 - copied unchanged from r256722, head/share/man/man9/VOP_ALLOCATE.9 projects/pf/head/share/man/man9/vm_page_busy.9 - copied unchanged from r256722, head/share/man/man9/vm_page_busy.9 projects/pf/head/share/man/man9/vmem.9 - copied unchanged from r256722, head/share/man/man9/vmem.9 projects/pf/head/share/monetdef/ca_ES.UTF-8.src - copied unchanged from r256722, head/share/monetdef/ca_ES.UTF-8.src projects/pf/head/share/monetdef/de_AT.UTF-8.src - copied unchanged from r256722, head/share/monetdef/de_AT.UTF-8.src projects/pf/head/share/monetdef/de_DE.UTF-8.src - copied unchanged from r256722, head/share/monetdef/de_DE.UTF-8.src projects/pf/head/share/monetdef/el_GR.UTF-8.src - copied unchanged from r256722, head/share/monetdef/el_GR.UTF-8.src projects/pf/head/share/monetdef/es_ES.UTF-8.src - copied unchanged from r256722, head/share/monetdef/es_ES.UTF-8.src projects/pf/head/share/monetdef/fi_FI.UTF-8.src - copied unchanged from r256722, head/share/monetdef/fi_FI.UTF-8.src projects/pf/head/share/monetdef/fr_BE.UTF-8.src - copied unchanged from r256722, head/share/monetdef/fr_BE.UTF-8.src projects/pf/head/share/monetdef/fr_FR.UTF-8.src - copied unchanged from r256722, head/share/monetdef/fr_FR.UTF-8.src projects/pf/head/share/monetdef/it_IT.UTF-8.src - copied unchanged from r256722, head/share/monetdef/it_IT.UTF-8.src projects/pf/head/share/monetdef/nl_BE.UTF-8.src - copied unchanged from r256722, head/share/monetdef/nl_BE.UTF-8.src projects/pf/head/share/monetdef/nl_NL.UTF-8.src - copied unchanged from r256722, head/share/monetdef/nl_NL.UTF-8.src projects/pf/head/sys/arm/allwinner/a20/ - copied from r256722, head/sys/arm/allwinner/a20/ projects/pf/head/sys/arm/arm/generic_timer.c - copied unchanged from r256722, head/sys/arm/arm/generic_timer.c projects/pf/head/sys/arm/broadcom/bcm2835/bcm2835_gpio.h - copied unchanged from r256722, head/sys/arm/broadcom/bcm2835/bcm2835_gpio.h projects/pf/head/sys/arm/broadcom/bcm2835/std.bcm2835 - copied unchanged from r256722, head/sys/arm/broadcom/bcm2835/std.bcm2835 projects/pf/head/sys/arm/broadcom/bcm2835/std.rpi - copied unchanged from r256722, head/sys/arm/broadcom/bcm2835/std.rpi projects/pf/head/sys/arm/conf/ARNDALE - copied unchanged from r256722, head/sys/arm/conf/ARNDALE projects/pf/head/sys/arm/conf/CUBIEBOARD2 - copied unchanged from r256722, head/sys/arm/conf/CUBIEBOARD2 projects/pf/head/sys/arm/conf/DIGI-CCWMX53 - copied unchanged from r256722, head/sys/arm/conf/DIGI-CCWMX53 projects/pf/head/sys/arm/freescale/imx/files.imx51 - copied unchanged from r256722, head/sys/arm/freescale/imx/files.imx51 projects/pf/head/sys/arm/freescale/imx/files.imx53 - copied unchanged from r256722, head/sys/arm/freescale/imx/files.imx53 projects/pf/head/sys/arm/freescale/imx/imx51_machdep.c - copied unchanged from r256722, head/sys/arm/freescale/imx/imx51_machdep.c projects/pf/head/sys/arm/freescale/imx/imx53_machdep.c - copied unchanged from r256722, head/sys/arm/freescale/imx/imx53_machdep.c projects/pf/head/sys/arm/freescale/imx/std.imx51 - copied unchanged from r256722, head/sys/arm/freescale/imx/std.imx51 projects/pf/head/sys/arm/freescale/imx/std.imx53 - copied unchanged from r256722, head/sys/arm/freescale/imx/std.imx53 projects/pf/head/sys/arm/samsung/ - copied from r256722, head/sys/arm/samsung/ projects/pf/head/sys/arm/ti/am335x/am335x_usbss.c - copied unchanged from r256722, head/sys/arm/ti/am335x/am335x_usbss.c projects/pf/head/sys/arm/ti/ti_sdhci.c - copied unchanged from r256722, head/sys/arm/ti/ti_sdhci.c projects/pf/head/sys/boot/fdt/dts/bcm2835.dtsi - copied unchanged from r256722, head/sys/boot/fdt/dts/bcm2835.dtsi projects/pf/head/sys/boot/fdt/dts/cubieboard2.dts - copied unchanged from r256722, head/sys/boot/fdt/dts/cubieboard2.dts projects/pf/head/sys/boot/fdt/dts/digi-ccwmx53.dts - copied unchanged from r256722, head/sys/boot/fdt/dts/digi-ccwmx53.dts projects/pf/head/sys/boot/fdt/dts/exynos5250-arndale.dts - copied unchanged from r256722, head/sys/boot/fdt/dts/exynos5250-arndale.dts projects/pf/head/sys/boot/fdt/dts/exynos5250.dtsi - copied unchanged from r256722, head/sys/boot/fdt/dts/exynos5250.dtsi projects/pf/head/sys/boot/fdt/dts/imx53x.dtsi - copied unchanged from r256722, head/sys/boot/fdt/dts/imx53x.dtsi projects/pf/head/sys/boot/fdt/dts/rpi.dts - copied unchanged from r256722, head/sys/boot/fdt/dts/rpi.dts projects/pf/head/sys/boot/i386/gptboot/gptboot.8 - copied unchanged from r256722, head/sys/boot/i386/gptboot/gptboot.8 projects/pf/head/sys/cam/ctl/ctl_frontend_iscsi.c - copied unchanged from r256722, head/sys/cam/ctl/ctl_frontend_iscsi.c projects/pf/head/sys/cam/ctl/ctl_frontend_iscsi.h - copied unchanged from r256722, head/sys/cam/ctl/ctl_frontend_iscsi.h projects/pf/head/sys/cddl/compat/opensolaris/sys/debug_compat.h - copied unchanged from r256722, head/sys/cddl/compat/opensolaris/sys/debug_compat.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_raidz.h - copied unchanged from r256722, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_raidz.h projects/pf/head/sys/compat/freebsd32/freebsd32_capability.c - copied unchanged from r256722, head/sys/compat/freebsd32/freebsd32_capability.c projects/pf/head/sys/compat/freebsd32/freebsd32_misc.h - copied unchanged from r256722, head/sys/compat/freebsd32/freebsd32_misc.h projects/pf/head/sys/contrib/dev/drm2/ - copied from r256722, head/sys/contrib/dev/drm2/ projects/pf/head/sys/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu - copied unchanged from r256722, head/sys/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu projects/pf/head/sys/contrib/dev/iwn/iwlwifi-6000g2a-18.168.6.1.fw.uu - copied unchanged from r256722, head/sys/contrib/dev/iwn/iwlwifi-6000g2a-18.168.6.1.fw.uu projects/pf/head/sys/contrib/dev/iwn/iwnwifi-2030-18.168.6.1.fw.uu - copied unchanged from r256722, head/sys/contrib/dev/iwn/iwnwifi-2030-18.168.6.1.fw.uu projects/pf/head/sys/contrib/dev/rsu/ - copied from r256722, head/sys/contrib/dev/rsu/ projects/pf/head/sys/contrib/dev/urtwn/ - copied from r256722, head/sys/contrib/dev/urtwn/ projects/pf/head/sys/contrib/ipfilter/netinet/ip_dns_pxy.c - copied unchanged from r256722, head/sys/contrib/ipfilter/netinet/ip_dns_pxy.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_dstlist.c - copied unchanged from r256722, head/sys/contrib/ipfilter/netinet/ip_dstlist.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_dstlist.h - copied unchanged from r256722, head/sys/contrib/ipfilter/netinet/ip_dstlist.h projects/pf/head/sys/contrib/ipfilter/netinet/ip_nat6.c - copied unchanged from r256722, head/sys/contrib/ipfilter/netinet/ip_nat6.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c - copied unchanged from r256722, head/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c projects/pf/head/sys/contrib/ipfilter/netinet/ipf_rb.h - copied unchanged from r256722, head/sys/contrib/ipfilter/netinet/ipf_rb.h projects/pf/head/sys/contrib/ipfilter/netinet/radix_ipf.c - copied unchanged from r256722, head/sys/contrib/ipfilter/netinet/radix_ipf.c projects/pf/head/sys/contrib/ipfilter/netinet/radix_ipf.h - copied unchanged from r256722, head/sys/contrib/ipfilter/netinet/radix_ipf.h projects/pf/head/sys/contrib/v4l/ - copied from r256722, head/sys/contrib/v4l/ projects/pf/head/sys/crypto/aesni/aesencdec.h - copied unchanged from r256722, head/sys/crypto/aesni/aesencdec.h projects/pf/head/sys/crypto/siphash/ - copied from r256722, head/sys/crypto/siphash/ projects/pf/head/sys/dev/bxe/57710_init_values.c - copied unchanged from r256722, head/sys/dev/bxe/57710_init_values.c projects/pf/head/sys/dev/bxe/57710_int_offsets.h - copied unchanged from r256722, head/sys/dev/bxe/57710_int_offsets.h projects/pf/head/sys/dev/bxe/57711_init_values.c - copied unchanged from r256722, head/sys/dev/bxe/57711_init_values.c projects/pf/head/sys/dev/bxe/57711_int_offsets.h - copied unchanged from r256722, head/sys/dev/bxe/57711_int_offsets.h projects/pf/head/sys/dev/bxe/57712_init_values.c - copied unchanged from r256722, head/sys/dev/bxe/57712_init_values.c projects/pf/head/sys/dev/bxe/57712_int_offsets.h - copied unchanged from r256722, head/sys/dev/bxe/57712_int_offsets.h projects/pf/head/sys/dev/bxe/bxe.c - copied unchanged from r256722, head/sys/dev/bxe/bxe.c projects/pf/head/sys/dev/bxe/bxe.h - copied unchanged from r256722, head/sys/dev/bxe/bxe.h projects/pf/head/sys/dev/bxe/bxe_dcb.h - copied unchanged from r256722, head/sys/dev/bxe/bxe_dcb.h projects/pf/head/sys/dev/bxe/bxe_debug.c - copied unchanged from r256722, head/sys/dev/bxe/bxe_debug.c projects/pf/head/sys/dev/bxe/bxe_elink.c - copied unchanged from r256722, head/sys/dev/bxe/bxe_elink.c projects/pf/head/sys/dev/bxe/bxe_elink.h - copied unchanged from r256722, head/sys/dev/bxe/bxe_elink.h projects/pf/head/sys/dev/bxe/bxe_stats.c - copied unchanged from r256722, head/sys/dev/bxe/bxe_stats.c projects/pf/head/sys/dev/bxe/bxe_stats.h - copied unchanged from r256722, head/sys/dev/bxe/bxe_stats.h projects/pf/head/sys/dev/bxe/ecore_fw_defs.h - copied unchanged from r256722, head/sys/dev/bxe/ecore_fw_defs.h projects/pf/head/sys/dev/bxe/ecore_hsi.h - copied unchanged from r256722, head/sys/dev/bxe/ecore_hsi.h projects/pf/head/sys/dev/bxe/ecore_init.h - copied unchanged from r256722, head/sys/dev/bxe/ecore_init.h projects/pf/head/sys/dev/bxe/ecore_init_ops.h - copied unchanged from r256722, head/sys/dev/bxe/ecore_init_ops.h projects/pf/head/sys/dev/bxe/ecore_mfw_req.h - copied unchanged from r256722, head/sys/dev/bxe/ecore_mfw_req.h projects/pf/head/sys/dev/bxe/ecore_reg.h - copied unchanged from r256722, head/sys/dev/bxe/ecore_reg.h projects/pf/head/sys/dev/bxe/ecore_sp.c - copied unchanged from r256722, head/sys/dev/bxe/ecore_sp.c projects/pf/head/sys/dev/bxe/ecore_sp.h - copied unchanged from r256722, head/sys/dev/bxe/ecore_sp.h projects/pf/head/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu - copied unchanged from r256722, head/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu projects/pf/head/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu - copied unchanged from r256722, head/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu projects/pf/head/sys/dev/cxgbe/firmware/t5fw_cfg.txt - copied unchanged from r256722, head/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/pf/head/sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt - copied unchanged from r256722, head/sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt projects/pf/head/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt - copied unchanged from r256722, head/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt projects/pf/head/sys/dev/cxgbe/iw_cxgbe/ - copied from r256722, head/sys/dev/cxgbe/iw_cxgbe/ projects/pf/head/sys/dev/cxgbe/t4_tracer.c - copied unchanged from r256722, head/sys/dev/cxgbe/t4_tracer.c projects/pf/head/sys/dev/drm2/ati_pcigart.c - copied unchanged from r256722, head/sys/dev/drm2/ati_pcigart.c projects/pf/head/sys/dev/drm2/drm_buffer.c - copied unchanged from r256722, head/sys/dev/drm2/drm_buffer.c projects/pf/head/sys/dev/drm2/drm_buffer.h - copied unchanged from r256722, head/sys/dev/drm2/drm_buffer.h projects/pf/head/sys/dev/drm2/drm_core.h - copied unchanged from r256722, head/sys/dev/drm2/drm_core.h projects/pf/head/sys/dev/drm2/drm_dp_helper.c - copied unchanged from r256722, head/sys/dev/drm2/drm_dp_helper.c projects/pf/head/sys/dev/drm2/drm_fixed.h - copied unchanged from r256722, head/sys/dev/drm2/drm_fixed.h projects/pf/head/sys/dev/drm2/drm_os_freebsd.h - copied unchanged from r256722, head/sys/dev/drm2/drm_os_freebsd.h projects/pf/head/sys/dev/drm2/radeon/ - copied from r256722, head/sys/dev/drm2/radeon/ projects/pf/head/sys/dev/etherswitch/arswitch/arswitch_9340.c - copied unchanged from r256722, head/sys/dev/etherswitch/arswitch/arswitch_9340.c projects/pf/head/sys/dev/etherswitch/arswitch/arswitch_9340.h - copied unchanged from r256722, head/sys/dev/etherswitch/arswitch/arswitch_9340.h projects/pf/head/sys/dev/etherswitch/arswitch/arswitch_vlans.c - copied unchanged from r256722, head/sys/dev/etherswitch/arswitch/arswitch_vlans.c projects/pf/head/sys/dev/etherswitch/arswitch/arswitch_vlans.h - copied unchanged from r256722, head/sys/dev/etherswitch/arswitch/arswitch_vlans.h projects/pf/head/sys/dev/hpt27xx/hpt27xx_os_bsd.c - copied unchanged from r256722, head/sys/dev/hpt27xx/hpt27xx_os_bsd.c projects/pf/head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c - copied unchanged from r256722, head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c projects/pf/head/sys/dev/hptnr/ - copied from r256722, head/sys/dev/hptnr/ projects/pf/head/sys/dev/hwpmc/hwpmc_mpc7xxx.c - copied unchanged from r256722, head/sys/dev/hwpmc/hwpmc_mpc7xxx.c projects/pf/head/sys/dev/hwpmc/hwpmc_powerpc.h - copied unchanged from r256722, head/sys/dev/hwpmc/hwpmc_powerpc.h - copied from r256722, head/sys/dev/hyperv/ projects/pf/head/sys/dev/iscsi/icl.c - copied unchanged from r256722, head/sys/dev/iscsi/icl.c projects/pf/head/sys/dev/iscsi/icl.h - copied unchanged from r256722, head/sys/dev/iscsi/icl.h projects/pf/head/sys/dev/iscsi/icl_proxy.c - copied unchanged from r256722, head/sys/dev/iscsi/icl_proxy.c projects/pf/head/sys/dev/iscsi/iscsi.c - copied unchanged from r256722, head/sys/dev/iscsi/iscsi.c projects/pf/head/sys/dev/iscsi/iscsi.h - copied unchanged from r256722, head/sys/dev/iscsi/iscsi.h projects/pf/head/sys/dev/iscsi/iscsi_ioctl.h - copied unchanged from r256722, head/sys/dev/iscsi/iscsi_ioctl.h projects/pf/head/sys/dev/iscsi/iscsi_proto.h - copied unchanged from r256722, head/sys/dev/iscsi/iscsi_proto.h projects/pf/head/sys/dev/iscsi_initiator/ - copied from r256722, head/sys/dev/iscsi_initiator/ projects/pf/head/sys/dev/iwn/if_iwn_devid.h - copied unchanged from r256722, head/sys/dev/iwn/if_iwn_devid.h projects/pf/head/sys/dev/mbox/ - copied from r256722, head/sys/dev/mbox/ projects/pf/head/sys/dev/nvme/nvme_util.c - copied unchanged from r256722, head/sys/dev/nvme/nvme_util.c projects/pf/head/sys/dev/qlxge/ - copied from r256722, head/sys/dev/qlxge/ projects/pf/head/sys/dev/random/dummy_rng.c - copied unchanged from r256722, head/sys/dev/random/dummy_rng.c projects/pf/head/sys/dev/random/live_entropy_sources.c - copied unchanged from r256722, head/sys/dev/random/live_entropy_sources.c projects/pf/head/sys/dev/random/live_entropy_sources.h - copied unchanged from r256722, head/sys/dev/random/live_entropy_sources.h projects/pf/head/sys/dev/random/random_adaptors.c - copied unchanged from r256722, head/sys/dev/random/random_adaptors.c projects/pf/head/sys/dev/random/random_adaptors.h - copied unchanged from r256722, head/sys/dev/random/random_adaptors.h projects/pf/head/sys/dev/random/random_harvestq.c - copied unchanged from r256722, head/sys/dev/random/random_harvestq.c projects/pf/head/sys/dev/random/random_harvestq.h - copied unchanged from r256722, head/sys/dev/random/random_harvestq.h projects/pf/head/sys/dev/random/rwfile.c - copied unchanged from r256722, head/sys/dev/random/rwfile.c projects/pf/head/sys/dev/random/rwfile.h - copied unchanged from r256722, head/sys/dev/random/rwfile.h projects/pf/head/sys/dev/uart/uart_dev_ns8250.h - copied unchanged from r256722, head/sys/dev/uart/uart_dev_ns8250.h projects/pf/head/sys/dev/uart/uart_dev_ti8250.c - copied unchanged from r256722, head/sys/dev/uart/uart_dev_ti8250.c projects/pf/head/sys/dev/usb/gadget/ - copied from r256722, head/sys/dev/usb/gadget/ projects/pf/head/sys/dev/usb/wlan/if_rsu.c - copied unchanged from r256722, head/sys/dev/usb/wlan/if_rsu.c projects/pf/head/sys/dev/usb/wlan/if_rsureg.h - copied unchanged from r256722, head/sys/dev/usb/wlan/if_rsureg.h projects/pf/head/sys/dev/vmware/ - copied from r256722, head/sys/dev/vmware/ projects/pf/head/sys/dev/wi/if_wi_macio.c - copied unchanged from r256722, head/sys/dev/wi/if_wi_macio.c projects/pf/head/sys/dev/xen/timer/ - copied from r256722, head/sys/dev/xen/timer/ projects/pf/head/sys/fs/ext2fs/ext2_extents.c - copied unchanged from r256722, head/sys/fs/ext2fs/ext2_extents.c projects/pf/head/sys/fs/ext2fs/ext2_extents.h - copied unchanged from r256722, head/sys/fs/ext2fs/ext2_extents.h projects/pf/head/sys/fs/ext2fs/ext2_hash.c - copied unchanged from r256722, head/sys/fs/ext2fs/ext2_hash.c projects/pf/head/sys/fs/ext2fs/ext2_htree.c - copied unchanged from r256722, head/sys/fs/ext2fs/ext2_htree.c projects/pf/head/sys/fs/ext2fs/htree.h - copied unchanged from r256722, head/sys/fs/ext2fs/htree.h projects/pf/head/sys/kern/subr_capability.c - copied unchanged from r256722, head/sys/kern/subr_capability.c projects/pf/head/sys/kern/subr_vmem.c - copied unchanged from r256722, head/sys/kern/subr_vmem.c projects/pf/head/sys/libkern/flsll.c - copied unchanged from r256722, head/sys/libkern/flsll.c projects/pf/head/sys/mips/atheros/ar934x_chip.c - copied unchanged from r256722, head/sys/mips/atheros/ar934x_chip.c projects/pf/head/sys/mips/atheros/ar934x_chip.h - copied unchanged from r256722, head/sys/mips/atheros/ar934x_chip.h projects/pf/head/sys/mips/atheros/ar934xreg.h - copied unchanged from r256722, head/sys/mips/atheros/ar934xreg.h projects/pf/head/sys/mips/conf/AR934X_BASE - copied unchanged from r256722, head/sys/mips/conf/AR934X_BASE projects/pf/head/sys/mips/conf/AR934X_BASE.hints - copied unchanged from r256722, head/sys/mips/conf/AR934X_BASE.hints projects/pf/head/sys/mips/conf/DB120 - copied unchanged from r256722, head/sys/mips/conf/DB120 projects/pf/head/sys/mips/conf/DB120.hints - copied unchanged from r256722, head/sys/mips/conf/DB120.hints projects/pf/head/sys/mips/conf/ENH200 - copied unchanged from r256722, head/sys/mips/conf/ENH200 projects/pf/head/sys/mips/conf/ENH200.hints - copied unchanged from r256722, head/sys/mips/conf/ENH200.hints projects/pf/head/sys/mips/conf/GXEMUL32 - copied unchanged from r256722, head/sys/mips/conf/GXEMUL32 projects/pf/head/sys/mips/conf/PICOSTATION_M2HP - copied unchanged from r256722, head/sys/mips/conf/PICOSTATION_M2HP projects/pf/head/sys/mips/conf/PICOSTATION_M2HP.hints - copied unchanged from r256722, head/sys/mips/conf/PICOSTATION_M2HP.hints projects/pf/head/sys/mips/conf/WZR-300HP - copied unchanged from r256722, head/sys/mips/conf/WZR-300HP projects/pf/head/sys/mips/conf/WZR-300HP.hints - copied unchanged from r256722, head/sys/mips/conf/WZR-300HP.hints projects/pf/head/sys/mips/malta/gt_pci_bus_space.c - copied unchanged from r256722, head/sys/mips/malta/gt_pci_bus_space.c projects/pf/head/sys/mips/malta/gt_pci_bus_space.h - copied unchanged from r256722, head/sys/mips/malta/gt_pci_bus_space.h projects/pf/head/sys/mips/mips/bcopy.S - copied unchanged from r256722, head/sys/mips/mips/bcopy.S projects/pf/head/sys/modules/cc/cc_cdg/ - copied from r256722, head/sys/modules/cc/cc_cdg/ projects/pf/head/sys/modules/cxgbe/iw_cxgbe/ - copied from r256722, head/sys/modules/cxgbe/iw_cxgbe/ projects/pf/head/sys/modules/cxgbe/t5_firmware/ - copied from r256722, head/sys/modules/cxgbe/t5_firmware/ projects/pf/head/sys/modules/drm2/radeonkms/ - copied from r256722, head/sys/modules/drm2/radeonkms/ projects/pf/head/sys/modules/drm2/radeonkmsfw/ - copied from r256722, head/sys/modules/drm2/radeonkmsfw/ projects/pf/head/sys/modules/hptnr/ - copied from r256722, head/sys/modules/hptnr/ - copied from r256722, head/sys/modules/hyperv/ projects/pf/head/sys/modules/ibcore/ - copied from r256722, head/sys/modules/ibcore/ projects/pf/head/sys/modules/ipoib/ - copied from r256722, head/sys/modules/ipoib/ projects/pf/head/sys/modules/iscsi_initiator/ - copied from r256722, head/sys/modules/iscsi_initiator/ projects/pf/head/sys/modules/iwnfw/iwn2000/ - copied from r256722, head/sys/modules/iwnfw/iwn2000/ projects/pf/head/sys/modules/iwnfw/iwn2030/ - copied from r256722, head/sys/modules/iwnfw/iwn2030/ projects/pf/head/sys/modules/qlxge/ - copied from r256722, head/sys/modules/qlxge/ projects/pf/head/sys/modules/usb/g_audio/ - copied from r256722, head/sys/modules/usb/g_audio/ projects/pf/head/sys/modules/usb/g_keyboard/ - copied from r256722, head/sys/modules/usb/g_keyboard/ projects/pf/head/sys/modules/usb/g_modem/ - copied from r256722, head/sys/modules/usb/g_modem/ projects/pf/head/sys/modules/usb/g_mouse/ - copied from r256722, head/sys/modules/usb/g_mouse/ projects/pf/head/sys/modules/usb/rsu/ - copied from r256722, head/sys/modules/usb/rsu/ projects/pf/head/sys/modules/usb/rsufw/ - copied from r256722, head/sys/modules/usb/rsufw/ projects/pf/head/sys/modules/usb/runfw/ - copied from r256722, head/sys/modules/usb/runfw/ projects/pf/head/sys/modules/usb/urtwnfw/ - copied from r256722, head/sys/modules/usb/urtwnfw/ projects/pf/head/sys/modules/vmware/ - copied from r256722, head/sys/modules/vmware/ projects/pf/head/sys/netinet/cc/cc_cdg.c - copied unchanged from r256722, head/sys/netinet/cc/cc_cdg.c projects/pf/head/sys/netinet/in_kdtrace.c - copied unchanged from r256722, head/sys/netinet/in_kdtrace.c projects/pf/head/sys/netinet/in_kdtrace.h - copied unchanged from r256722, head/sys/netinet/in_kdtrace.h projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c - copied unchanged from r256722, head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c - copied unchanged from r256722, head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c - copied unchanged from r256722, head/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c - copied unchanged from r256722, head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/pf/head/sys/ofed/drivers/net/mlx4/resource_tracker.c - copied unchanged from r256722, head/sys/ofed/drivers/net/mlx4/resource_tracker.c projects/pf/head/sys/ofed/drivers/net/mlx4/sys_tune.c - copied unchanged from r256722, head/sys/ofed/drivers/net/mlx4/sys_tune.c projects/pf/head/sys/ofed/include/linux/atomic.h - copied unchanged from r256722, head/sys/ofed/include/linux/atomic.h projects/pf/head/sys/ofed/include/linux/clocksource.h - copied unchanged from r256722, head/sys/ofed/include/linux/clocksource.h projects/pf/head/sys/ofed/include/rdma/ib_pma.h - copied unchanged from r256722, head/sys/ofed/include/rdma/ib_pma.h projects/pf/head/sys/powerpc/pseries/ - copied from r256722, head/sys/powerpc/pseries/ projects/pf/head/sys/sys/_unrhdr.h - copied unchanged from r256722, head/sys/sys/_unrhdr.h projects/pf/head/sys/sys/caprights.h - copied unchanged from r256722, head/sys/sys/caprights.h projects/pf/head/sys/sys/procctl.h - copied unchanged from r256722, head/sys/sys/procctl.h projects/pf/head/sys/sys/vmem.h - copied unchanged from r256722, head/sys/sys/vmem.h - copied unchanged from r256722, head/sys/x86/include/acpica_machdep.h projects/pf/head/sys/x86/xen/ - copied from r256722, head/sys/x86/xen/ projects/pf/head/sys/xen/evtchn/evtchnvar.h - copied unchanged from r256722, head/sys/xen/evtchn/evtchnvar.h projects/pf/head/sys/xen/xen-os.h - copied unchanged from r256722, head/sys/xen/xen-os.h projects/pf/head/tools/build/options/WITHOUT_ARM_EABI - copied unchanged from r256722, head/tools/build/options/WITHOUT_ARM_EABI projects/pf/head/tools/build/options/WITHOUT_GNUCXX - copied unchanged from r256722, head/tools/build/options/WITHOUT_GNUCXX projects/pf/head/tools/build/options/WITHOUT_ICONV - copied unchanged from r256722, head/tools/build/options/WITHOUT_ICONV projects/pf/head/tools/build/options/WITHOUT_LDNS_UTILS - copied unchanged from r256722, head/tools/build/options/WITHOUT_LDNS_UTILS projects/pf/head/tools/build/options/WITHOUT_SVNLITE - copied unchanged from r256722, head/tools/build/options/WITHOUT_SVNLITE projects/pf/head/tools/build/options/WITHOUT_UNBOUND - copied unchanged from r256722, head/tools/build/options/WITHOUT_UNBOUND projects/pf/head/tools/build/options/WITH_GCC - copied unchanged from r256722, head/tools/build/options/WITH_GCC projects/pf/head/tools/build/options/WITH_GNUCXX - copied unchanged from r256722, head/tools/build/options/WITH_GNUCXX projects/pf/head/tools/build/options/WITH_LIBICONV_COMPAT - copied unchanged from r256722, head/tools/build/options/WITH_LIBICONV_COMPAT projects/pf/head/tools/build/options/WITH_LLDB - copied unchanged from r256722, head/tools/build/options/WITH_LLDB projects/pf/head/tools/build/options/WITH_PKGTOOLS - copied unchanged from r256722, head/tools/build/options/WITH_PKGTOOLS projects/pf/head/tools/build/options/WITH_SVN - copied unchanged from r256722, head/tools/build/options/WITH_SVN projects/pf/head/tools/build/options/WITH_USB_GADGET_EXAMPLES - copied unchanged from r256722, head/tools/build/options/WITH_USB_GADGET_EXAMPLES projects/pf/head/tools/regression/bin/sh/builtins/alias4.0 - copied unchanged from r256722, head/tools/regression/bin/sh/builtins/alias4.0 projects/pf/head/tools/regression/bin/sh/builtins/jobid1.0 - copied unchanged from r256722, head/tools/regression/bin/sh/builtins/jobid1.0 projects/pf/head/tools/regression/bin/sh/builtins/jobid2.0 - copied unchanged from r256722, head/tools/regression/bin/sh/builtins/jobid2.0 projects/pf/head/tools/regression/bin/sh/builtins/local4.0 - copied unchanged from r256722, head/tools/regression/bin/sh/builtins/local4.0 projects/pf/head/tools/regression/bin/sh/builtins/return8.0 - copied unchanged from r256722, head/tools/regression/bin/sh/builtins/return8.0 projects/pf/head/tools/regression/bin/sh/builtins/type3.0 - copied unchanged from r256722, head/tools/regression/bin/sh/builtins/type3.0 projects/pf/head/tools/regression/bin/sh/execution/int-cmd1.0 - copied unchanged from r256722, head/tools/regression/bin/sh/execution/int-cmd1.0 projects/pf/head/tools/regression/bin/sh/expansion/arith13.0 - copied unchanged from r256722, head/tools/regression/bin/sh/expansion/arith13.0 projects/pf/head/tools/regression/bin/sh/parser/empty-cmd1.0 - copied unchanged from r256722, head/tools/regression/bin/sh/parser/empty-cmd1.0 projects/pf/head/tools/regression/bin/sh/parser/only-redir2.0 - copied unchanged from r256722, head/tools/regression/bin/sh/parser/only-redir2.0 projects/pf/head/tools/regression/bin/sh/parser/only-redir3.0 - copied unchanged from r256722, head/tools/regression/bin/sh/parser/only-redir3.0 projects/pf/head/tools/regression/bin/sh/parser/only-redir4.0 - copied unchanged from r256722, head/tools/regression/bin/sh/parser/only-redir4.0 projects/pf/head/tools/regression/file/fcntlflags/ - copied from r256722, head/tools/regression/file/fcntlflags/ projects/pf/head/tools/regression/iscsi/ - copied from r256722, head/tools/regression/iscsi/ projects/pf/head/tools/regression/lib/libc/stdio/test-fopen.c - copied unchanged from r256722, head/tools/regression/lib/libc/stdio/test-fopen.c projects/pf/head/tools/regression/lib/libc/stdio/test-fopen.t - copied unchanged from r256722, head/tools/regression/lib/libc/stdio/test-fopen.t projects/pf/head/tools/regression/lib/libc/stdio/test-mkostemp.c - copied unchanged from r256722, head/tools/regression/lib/libc/stdio/test-mkostemp.c projects/pf/head/tools/regression/lib/libc/stdio/test-mkostemp.t - copied unchanged from r256722, head/tools/regression/lib/libc/stdio/test-mkostemp.t projects/pf/head/tools/regression/lib/libutil/test-humanize_number.c - copied unchanged from r256722, head/tools/regression/lib/libutil/test-humanize_number.c projects/pf/head/tools/regression/lib/libutil/test-humanize_number.t - copied unchanged from r256722, head/tools/regression/lib/libutil/test-humanize_number.t projects/pf/head/tools/tools/drm/ - copied from r256722, head/tools/tools/drm/ projects/pf/head/tools/tools/usbtest/ - copied from r256722, head/tools/tools/usbtest/ projects/pf/head/usr.bin/calendar/calcpp.c - copied unchanged from r256722, head/usr.bin/calendar/calcpp.c projects/pf/head/usr.bin/calendar/calendars/ru_RU.UTF-8/ - copied from r256722, head/usr.bin/calendar/calendars/ru_RU.UTF-8/ projects/pf/head/usr.bin/clang/lldb/ - copied from r256722, head/usr.bin/clang/lldb/ projects/pf/head/usr.bin/drill/ - copied from r256722, head/usr.bin/drill/ projects/pf/head/usr.bin/iscsictl/ - copied from r256722, head/usr.bin/iscsictl/ projects/pf/head/usr.bin/protect/ - copied from r256722, head/usr.bin/protect/ projects/pf/head/usr.bin/vi/catalog/ - copied from r256722, head/usr.bin/vi/catalog/ projects/pf/head/usr.sbin/bhyve/ahci.h - copied unchanged from r256722, head/usr.sbin/bhyve/ahci.h projects/pf/head/usr.sbin/bhyve/block_if.c - copied unchanged from r256722, head/usr.sbin/bhyve/block_if.c projects/pf/head/usr.sbin/bhyve/block_if.h - copied unchanged from r256722, head/usr.sbin/bhyve/block_if.h projects/pf/head/usr.sbin/bhyve/pci_ahci.c - copied unchanged from r256722, head/usr.sbin/bhyve/pci_ahci.c projects/pf/head/usr.sbin/bhyve/rtc.h - copied unchanged from r256722, head/usr.sbin/bhyve/rtc.h projects/pf/head/usr.sbin/bhyve/virtio.c - copied unchanged from r256722, head/usr.sbin/bhyve/virtio.c projects/pf/head/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh - copied unchanged from r256722, head/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh projects/pf/head/usr.sbin/bsdconfig/examples/browse_packages_http.sh - copied unchanged from r256722, head/usr.sbin/bsdconfig/examples/browse_packages_http.sh projects/pf/head/usr.sbin/bsdconfig/networking/share/services.subr - copied unchanged from r256722, head/usr.sbin/bsdconfig/networking/share/services.subr projects/pf/head/usr.sbin/bsdconfig/share/keymap.subr - copied unchanged from r256722, head/usr.sbin/bsdconfig/share/keymap.subr projects/pf/head/usr.sbin/bsdconfig/share/media/http.subr - copied unchanged from r256722, head/usr.sbin/bsdconfig/share/media/http.subr projects/pf/head/usr.sbin/bsdinstall/scripts/entropy - copied unchanged from r256722, head/usr.sbin/bsdinstall/scripts/entropy projects/pf/head/usr.sbin/bsdinstall/scripts/zfsboot - copied unchanged from r256722, head/usr.sbin/bsdinstall/scripts/zfsboot projects/pf/head/usr.sbin/ctld/ - copied from r256722, head/usr.sbin/ctld/ projects/pf/head/usr.sbin/iscsid/ - copied from r256722, head/usr.sbin/iscsid/ projects/pf/head/usr.sbin/unbound/ - copied from r256722, head/usr.sbin/unbound/ projects/pf/head/usr.sbin/wpa/wpa_priv/ - copied from r256722, head/usr.sbin/wpa/wpa_priv/ Directory Properties: projects/pf/head/contrib/ipfilter/ml_ipl.c (props changed) projects/pf/head/contrib/ipfilter/mlfk_ipl.c (props changed) projects/pf/head/contrib/ipfilter/mli_ipl.c (props changed) projects/pf/head/contrib/ipfilter/mln_ipl.c (props changed) projects/pf/head/contrib/ipfilter/mls_ipl.c (props changed) projects/pf/head/contrib/libexecinfo/ (props changed) projects/pf/head/sys/dev/hyperv/ (props changed) projects/pf/head/sys/modules/hyperv/ (props changed) projects/pf/head/sys/x86/include/acpica_machdep.h (props changed) Replaced: projects/pf/head/contrib/openpam/lib/Makefile.am - copied unchanged from r256722, head/contrib/openpam/lib/Makefile.am projects/pf/head/contrib/openpam/lib/Makefile.in - copied unchanged from r256722, head/contrib/openpam/lib/Makefile.in Deleted: projects/pf/head/bin/sh/init.h projects/pf/head/bin/sh/mkinit.c projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_DYN.bad.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/man.TestTransStability.d projects/pf/head/contrib/apr-util/aprutil.dsp projects/pf/head/contrib/apr-util/crypto/apr_crypto_nss.dsp projects/pf/head/contrib/apr-util/crypto/apr_crypto_openssl.dsp projects/pf/head/contrib/apr-util/dbd/apr_dbd_freetds.dsp projects/pf/head/contrib/apr-util/dbd/apr_dbd_mysql.dsp projects/pf/head/contrib/apr-util/dbd/apr_dbd_odbc.dsp projects/pf/head/contrib/apr-util/dbd/apr_dbd_oracle.dsp projects/pf/head/contrib/apr-util/dbd/apr_dbd_pgsql.dsp projects/pf/head/contrib/apr-util/dbd/apr_dbd_sqlite2.dsp projects/pf/head/contrib/apr-util/dbd/apr_dbd_sqlite3.dsp projects/pf/head/contrib/apr-util/dbm/apr_dbm_db.dsp projects/pf/head/contrib/apr-util/dbm/apr_dbm_gdbm.dsp projects/pf/head/contrib/apr-util/ldap/apr_ldap.dsp projects/pf/head/contrib/apr-util/libaprutil.dsp projects/pf/head/contrib/apr-util/test/testutildll.dsp projects/pf/head/contrib/apr-util/test/testutillib.dsp projects/pf/head/contrib/bind9/ projects/pf/head/contrib/dialog/samples/copifuncs/ projects/pf/head/contrib/dialog/samples/install/ projects/pf/head/contrib/ipfilter/.cvsignore projects/pf/head/contrib/ipfilter/BSD/ projects/pf/head/contrib/ipfilter/FAQ.FreeBSD projects/pf/head/contrib/ipfilter/FWTK/ projects/pf/head/contrib/ipfilter/FreeBSD/ projects/pf/head/contrib/ipfilter/FreeBSD-2.2/ projects/pf/head/contrib/ipfilter/FreeBSD-3/ projects/pf/head/contrib/ipfilter/FreeBSD-4.0/ projects/pf/head/contrib/ipfilter/IMPORTANT projects/pf/head/contrib/ipfilter/INST.FreeBSD-2.2 projects/pf/head/contrib/ipfilter/INSTALL.FreeBSD projects/pf/head/contrib/ipfilter/INSTALL.xBSD projects/pf/head/contrib/ipfilter/IPF.KANJI projects/pf/head/contrib/ipfilter/WhatsNew40.txt projects/pf/head/contrib/ipfilter/bsdinstall projects/pf/head/contrib/ipfilter/etc/ projects/pf/head/contrib/ipfilter/iplang/.cvsignore projects/pf/head/contrib/ipfilter/ipsend/.cvsignore projects/pf/head/contrib/ipfilter/ipsend/README projects/pf/head/contrib/ipfilter/ipsend/hpux.c projects/pf/head/contrib/ipfilter/ipsend/in_var.h projects/pf/head/contrib/ipfilter/ipsend/ip_var.h projects/pf/head/contrib/ipfilter/ipsend/tcpip.h projects/pf/head/contrib/ipfilter/lib/ipft_ef.c projects/pf/head/contrib/ipfilter/lib/ipft_sn.c projects/pf/head/contrib/ipfilter/lib/ipft_td.c projects/pf/head/contrib/ipfilter/net/.cvsignore projects/pf/head/contrib/ipfilter/perl/ projects/pf/head/contrib/ipfilter/radix.c projects/pf/head/contrib/ipfilter/rules/.cvsignore projects/pf/head/contrib/ipfilter/samples/.cvsignore projects/pf/head/contrib/ipfilter/test/ projects/pf/head/contrib/ipfilter/todo projects/pf/head/contrib/nvi/FAQ projects/pf/head/contrib/nvi/LAYOUT projects/pf/head/contrib/nvi/build/ projects/pf/head/contrib/nvi/catalog/dutch projects/pf/head/contrib/nvi/catalog/dutch.check projects/pf/head/contrib/nvi/catalog/english projects/pf/head/contrib/nvi/catalog/english.base projects/pf/head/contrib/nvi/catalog/english.check projects/pf/head/contrib/nvi/catalog/french projects/pf/head/contrib/nvi/catalog/french.check projects/pf/head/contrib/nvi/catalog/german projects/pf/head/contrib/nvi/catalog/german.check projects/pf/head/contrib/nvi/catalog/polish projects/pf/head/contrib/nvi/catalog/polish.check projects/pf/head/contrib/nvi/catalog/ru_RU.KOI8-R projects/pf/head/contrib/nvi/catalog/ru_RU.KOI8-R.check projects/pf/head/contrib/nvi/catalog/spanish projects/pf/head/contrib/nvi/catalog/spanish.check projects/pf/head/contrib/nvi/catalog/swedish projects/pf/head/contrib/nvi/catalog/swedish.check projects/pf/head/contrib/nvi/catalog/uk_UA.KOI8-U projects/pf/head/contrib/nvi/cl/cl_bsd.c projects/pf/head/contrib/nvi/clib/ projects/pf/head/contrib/nvi/common/api.c projects/pf/head/contrib/nvi/ex/ex_perl.c projects/pf/head/contrib/nvi/ex/ex_tcl.c projects/pf/head/contrib/nvi/include/ projects/pf/head/contrib/nvi/ip/ projects/pf/head/contrib/nvi/ip_cl/ projects/pf/head/contrib/nvi/perl_api/ projects/pf/head/contrib/nvi/perl_scripts/ projects/pf/head/contrib/nvi/tcl_api/ projects/pf/head/contrib/nvi/tcl_scripts/ projects/pf/head/contrib/nvi/tk/ projects/pf/head/contrib/openbsm/m4/lt~obsolete.m4 projects/pf/head/contrib/openpam/FREEBSD-vendor projects/pf/head/contrib/openpam/lib/openpam_borrow_cred.c projects/pf/head/contrib/openpam/lib/openpam_check_owner_perms.c projects/pf/head/contrib/openpam/lib/openpam_configure.c projects/pf/head/contrib/openpam/lib/openpam_constants.c projects/pf/head/contrib/openpam/lib/openpam_constants.h projects/pf/head/contrib/openpam/lib/openpam_ctype.h projects/pf/head/contrib/openpam/lib/openpam_debug.h projects/pf/head/contrib/openpam/lib/openpam_dispatch.c projects/pf/head/contrib/openpam/lib/openpam_dynamic.c projects/pf/head/contrib/openpam/lib/openpam_features.c projects/pf/head/contrib/openpam/lib/openpam_features.h projects/pf/head/contrib/openpam/lib/openpam_findenv.c projects/pf/head/contrib/openpam/lib/openpam_free_data.c projects/pf/head/contrib/openpam/lib/openpam_free_envlist.c projects/pf/head/contrib/openpam/lib/openpam_get_feature.c projects/pf/head/contrib/openpam/lib/openpam_get_option.c projects/pf/head/contrib/openpam/lib/openpam_impl.h projects/pf/head/contrib/openpam/lib/openpam_load.c projects/pf/head/contrib/openpam/lib/openpam_log.c projects/pf/head/contrib/openpam/lib/openpam_nullconv.c projects/pf/head/contrib/openpam/lib/openpam_readline.c projects/pf/head/contrib/openpam/lib/openpam_readlinev.c projects/pf/head/contrib/openpam/lib/openpam_readword.c projects/pf/head/contrib/openpam/lib/openpam_restore_cred.c projects/pf/head/contrib/openpam/lib/openpam_set_feature.c projects/pf/head/contrib/openpam/lib/openpam_set_option.c projects/pf/head/contrib/openpam/lib/openpam_static.c projects/pf/head/contrib/openpam/lib/openpam_straddch.c projects/pf/head/contrib/openpam/lib/openpam_strlcat.h projects/pf/head/contrib/openpam/lib/openpam_strlcmp.h projects/pf/head/contrib/openpam/lib/openpam_strlcpy.h projects/pf/head/contrib/openpam/lib/openpam_subst.c projects/pf/head/contrib/openpam/lib/openpam_ttyconv.c projects/pf/head/contrib/openpam/lib/pam_acct_mgmt.c projects/pf/head/contrib/openpam/lib/pam_authenticate.c projects/pf/head/contrib/openpam/lib/pam_authenticate_secondary.c projects/pf/head/contrib/openpam/lib/pam_chauthtok.c projects/pf/head/contrib/openpam/lib/pam_close_session.c projects/pf/head/contrib/openpam/lib/pam_end.c projects/pf/head/contrib/openpam/lib/pam_error.c projects/pf/head/contrib/openpam/lib/pam_get_authtok.c projects/pf/head/contrib/openpam/lib/pam_get_data.c projects/pf/head/contrib/openpam/lib/pam_get_item.c projects/pf/head/contrib/openpam/lib/pam_get_mapped_authtok.c projects/pf/head/contrib/openpam/lib/pam_get_mapped_username.c projects/pf/head/contrib/openpam/lib/pam_get_user.c projects/pf/head/contrib/openpam/lib/pam_getenv.c projects/pf/head/contrib/openpam/lib/pam_getenvlist.c projects/pf/head/contrib/openpam/lib/pam_info.c projects/pf/head/contrib/openpam/lib/pam_open_session.c projects/pf/head/contrib/openpam/lib/pam_prompt.c projects/pf/head/contrib/openpam/lib/pam_putenv.c projects/pf/head/contrib/openpam/lib/pam_set_data.c projects/pf/head/contrib/openpam/lib/pam_set_item.c projects/pf/head/contrib/openpam/lib/pam_set_mapped_authtok.c projects/pf/head/contrib/openpam/lib/pam_set_mapped_username.c projects/pf/head/contrib/openpam/lib/pam_setcred.c projects/pf/head/contrib/openpam/lib/pam_setenv.c projects/pf/head/contrib/openpam/lib/pam_sm_acct_mgmt.c projects/pf/head/contrib/openpam/lib/pam_sm_authenticate.c projects/pf/head/contrib/openpam/lib/pam_sm_authenticate_secondary.c projects/pf/head/contrib/openpam/lib/pam_sm_chauthtok.c projects/pf/head/contrib/openpam/lib/pam_sm_close_session.c projects/pf/head/contrib/openpam/lib/pam_sm_get_mapped_authtok.c projects/pf/head/contrib/openpam/lib/pam_sm_get_mapped_username.c projects/pf/head/contrib/openpam/lib/pam_sm_open_session.c projects/pf/head/contrib/openpam/lib/pam_sm_set_mapped_authtok.c projects/pf/head/contrib/openpam/lib/pam_sm_set_mapped_username.c projects/pf/head/contrib/openpam/lib/pam_sm_setcred.c projects/pf/head/contrib/openpam/lib/pam_start.c projects/pf/head/contrib/openpam/lib/pam_strerror.c projects/pf/head/contrib/openpam/lib/pam_verror.c projects/pf/head/contrib/openpam/lib/pam_vinfo.c projects/pf/head/contrib/openpam/lib/pam_vprompt.c projects/pf/head/contrib/serf/Makefile.in projects/pf/head/contrib/serf/auth/auth_kerb.c projects/pf/head/contrib/serf/auth/auth_kerb.h projects/pf/head/contrib/serf/auth/auth_kerb_gss.c projects/pf/head/contrib/serf/auth/auth_kerb_sspi.c projects/pf/head/contrib/serf/build/apr_common.m4 projects/pf/head/contrib/serf/build/config.guess projects/pf/head/contrib/serf/build/config.sub projects/pf/head/contrib/serf/build/find_apr.m4 projects/pf/head/contrib/serf/build/find_apu.m4 projects/pf/head/contrib/serf/build/get-version.sh projects/pf/head/contrib/serf/build/install.sh projects/pf/head/contrib/serf/build/serf.def projects/pf/head/contrib/serf/buildconf projects/pf/head/contrib/serf/config.layout projects/pf/head/contrib/serf/configure projects/pf/head/contrib/serf/configure.in projects/pf/head/contrib/serf/serf.mak projects/pf/head/contrib/serf/serf.pc.in projects/pf/head/contrib/serf/serfmake projects/pf/head/contrib/smbfs/mount_smbfs/Makefile projects/pf/head/contrib/wpa/hostapd/.gitignore projects/pf/head/contrib/wpa/hostapd/Makefile projects/pf/head/contrib/wpa/src/Makefile projects/pf/head/contrib/wpa/src/ap/Makefile projects/pf/head/contrib/wpa/src/common/Makefile projects/pf/head/contrib/wpa/src/crypto/.gitignore projects/pf/head/contrib/wpa/src/crypto/Makefile projects/pf/head/contrib/wpa/src/crypto/md5-non-fips.c projects/pf/head/contrib/wpa/src/drivers/.gitignore projects/pf/head/contrib/wpa/src/drivers/Makefile projects/pf/head/contrib/wpa/src/drivers/driver_ndiswrapper.c projects/pf/head/contrib/wpa/src/drivers/drivers.mak projects/pf/head/contrib/wpa/src/eap_common/Makefile projects/pf/head/contrib/wpa/src/eap_peer/Makefile projects/pf/head/contrib/wpa/src/eap_server/Makefile projects/pf/head/contrib/wpa/src/eapol_auth/Makefile projects/pf/head/contrib/wpa/src/eapol_supp/Makefile projects/pf/head/contrib/wpa/src/l2_packet/Makefile projects/pf/head/contrib/wpa/src/lib.rules projects/pf/head/contrib/wpa/src/radius/.gitignore projects/pf/head/contrib/wpa/src/radius/Makefile projects/pf/head/contrib/wpa/src/rsn_supp/Makefile projects/pf/head/contrib/wpa/src/tls/.gitignore projects/pf/head/contrib/wpa/src/tls/Makefile projects/pf/head/contrib/wpa/src/utils/.gitignore projects/pf/head/contrib/wpa/src/utils/Makefile projects/pf/head/contrib/wpa/src/wps/Makefile projects/pf/head/contrib/wpa/src/wps/wps_nfc.c projects/pf/head/contrib/wpa/src/wps/wps_nfc_pn531.c projects/pf/head/contrib/wpa/src/wps/wps_ufd.c projects/pf/head/contrib/wpa/wpa_supplicant/.gitignore projects/pf/head/contrib/wpa/wpa_supplicant/Makefile projects/pf/head/contrib/wpa/wpa_supplicant/dbus/.gitignore projects/pf/head/contrib/wpa/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service projects/pf/head/contrib/wpa/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service projects/pf/head/contrib/wpa/wpa_supplicant/doc/ projects/pf/head/contrib/wpa/wpa_supplicant/mlme.c projects/pf/head/contrib/wpa/wpa_supplicant/mlme.h projects/pf/head/contrib/wpa/wpa_supplicant/wpa_supplicant.nsi projects/pf/head/crypto/openssh/openbsd-compat/getopt.c projects/pf/head/etc/atf/ projects/pf/head/etc/mtree/BIND.chroot.dist projects/pf/head/etc/mtree/BIND.include.dist projects/pf/head/etc/rc.d/encswap projects/pf/head/etc/rc.d/swap1 projects/pf/head/gnu/usr.bin/binutils/ar/Makefile projects/pf/head/gnu/usr.bin/binutils/ar/ar.1 projects/pf/head/gnu/usr.bin/binutils/ranlib/Makefile projects/pf/head/gnu/usr.bin/binutils/ranlib/ranlib.1 projects/pf/head/gnu/usr.bin/patch/ projects/pf/head/lib/bind/ projects/pf/head/lib/libpam/libpam/pam_std_option.c projects/pf/head/lib/libyaml/libbsdyml.3 projects/pf/head/share/atf/ projects/pf/head/share/doc/bind9/ projects/pf/head/share/examples/atf/ projects/pf/head/share/man/man9/vm_page_io.9 projects/pf/head/share/man/man9/vm_page_sleep_if_busy.9 projects/pf/head/share/man/man9/vm_page_wakeup.9 projects/pf/head/share/xml/ projects/pf/head/share/xsl/ projects/pf/head/sys/amd64/conf/XENHVM projects/pf/head/sys/arm/freescale/imx/imx.files projects/pf/head/sys/arm/freescale/imx/imx_machdep.c projects/pf/head/sys/arm/freescale/imx/std.imx projects/pf/head/sys/boot/fdt/dts/bcm2835-rpi-b.dts projects/pf/head/sys/compat/linux/linux_videodev.h projects/pf/head/sys/compat/linux/linux_videodev2.h projects/pf/head/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.3.fw.uu projects/pf/head/sys/contrib/ipfilter/netinet/QNX_OCL.txt projects/pf/head/sys/contrib/rdma/core_priv.h projects/pf/head/sys/contrib/rdma/ib_addr.h projects/pf/head/sys/contrib/rdma/ib_cache.h projects/pf/head/sys/contrib/rdma/ib_cm.h projects/pf/head/sys/contrib/rdma/ib_fmr_pool.h projects/pf/head/sys/contrib/rdma/ib_mad.h projects/pf/head/sys/contrib/rdma/ib_marshall.h projects/pf/head/sys/contrib/rdma/ib_pack.h projects/pf/head/sys/contrib/rdma/ib_sa.h projects/pf/head/sys/contrib/rdma/ib_smi.h projects/pf/head/sys/contrib/rdma/ib_umem.h projects/pf/head/sys/contrib/rdma/ib_user_cm.h projects/pf/head/sys/contrib/rdma/ib_user_mad.h projects/pf/head/sys/contrib/rdma/ib_user_sa.h projects/pf/head/sys/contrib/rdma/ib_user_verbs.h projects/pf/head/sys/contrib/rdma/ib_verbs.h projects/pf/head/sys/contrib/rdma/iw_cm.h projects/pf/head/sys/contrib/rdma/rdma_addr.c projects/pf/head/sys/contrib/rdma/rdma_cache.c projects/pf/head/sys/contrib/rdma/rdma_cm.h projects/pf/head/sys/contrib/rdma/rdma_cm_ib.h projects/pf/head/sys/contrib/rdma/rdma_cma.c projects/pf/head/sys/contrib/rdma/rdma_device.c projects/pf/head/sys/contrib/rdma/rdma_iwcm.c projects/pf/head/sys/contrib/rdma/rdma_user_cm.h projects/pf/head/sys/contrib/rdma/rdma_verbs.c projects/pf/head/sys/contrib/rdma/types.h projects/pf/head/sys/crypto/aesni/aesencdec_amd64.S projects/pf/head/sys/crypto/aesni/aesencdec_i386.S projects/pf/head/sys/dev/bxe/bxe_debug.h projects/pf/head/sys/dev/bxe/bxe_fw_defs.h projects/pf/head/sys/dev/bxe/bxe_hsi.h projects/pf/head/sys/dev/bxe/bxe_include.h projects/pf/head/sys/dev/bxe/bxe_init.h projects/pf/head/sys/dev/bxe/bxe_init_values_e1.h projects/pf/head/sys/dev/bxe/bxe_init_values_e1h.h projects/pf/head/sys/dev/bxe/bxe_link.c projects/pf/head/sys/dev/bxe/bxe_link.h projects/pf/head/sys/dev/bxe/bxe_reg.h projects/pf/head/sys/dev/bxe/bxe_self_test.h projects/pf/head/sys/dev/bxe/dump_e1.h projects/pf/head/sys/dev/bxe/dump_e1h.h projects/pf/head/sys/dev/bxe/hw_dump_reg_st.h projects/pf/head/sys/dev/bxe/if_bxe.c projects/pf/head/sys/dev/bxe/if_bxe.h projects/pf/head/sys/dev/cxgbe/firmware/t4fw-1.8.4.0.bin.uu projects/pf/head/sys/dev/hpt27xx/os_bsd.c projects/pf/head/sys/dev/hpt27xx/osm_bsd.c projects/pf/head/sys/dev/iscsi/initiator/ projects/pf/head/sys/dev/random/probe.c projects/pf/head/sys/dev/xen/xenpci/evtchn.c projects/pf/head/sys/i386/conf/XENHVM projects/pf/head/sys/i386/include/xen/xen_clock_util.h projects/pf/head/sys/i386/xen/xen_clock_util.c projects/pf/head/sys/i386/xen/xen_rtc.c projects/pf/head/sys/kern/uipc_cow.c projects/pf/head/sys/modules/iscsi/initiator/ projects/pf/head/sys/modules/rdma/addr/ projects/pf/head/sys/modules/rdma/cma/ projects/pf/head/sys/modules/rdma/core/ projects/pf/head/sys/modules/rdma/iwcm/ projects/pf/head/sys/modules/runfw/ projects/pf/head/sys/xen/evtchn/evtchn.c projects/pf/head/tools/build/options/WITHOUT_BIND projects/pf/head/tools/build/options/WITHOUT_BIND_DNSSEC projects/pf/head/tools/build/options/WITHOUT_BIND_ETC projects/pf/head/tools/build/options/WITHOUT_BIND_LIBS_LWRES projects/pf/head/tools/build/options/WITHOUT_BIND_MTREE projects/pf/head/tools/build/options/WITHOUT_BIND_NAMED projects/pf/head/tools/build/options/WITHOUT_BIND_UTILS projects/pf/head/tools/build/options/WITHOUT_PKGTOOLS projects/pf/head/tools/build/options/WITH_ARM_EABI projects/pf/head/tools/build/options/WITH_BIND_IDN projects/pf/head/tools/build/options/WITH_BIND_LARGE_FILE projects/pf/head/tools/build/options/WITH_BIND_LIBS projects/pf/head/tools/build/options/WITH_BIND_SIGCHASE projects/pf/head/tools/build/options/WITH_BIND_XML projects/pf/head/tools/build/options/WITH_BSDCONFIG projects/pf/head/tools/build/options/WITH_BSD_PATCH projects/pf/head/tools/build/options/WITH_ICONV projects/pf/head/tools/build/options/WITH_LDNS_UTILS projects/pf/head/usr.bin/atf/atf-config/ projects/pf/head/usr.bin/atf/atf-report/ projects/pf/head/usr.bin/atf/atf-run/ projects/pf/head/usr.bin/atf/atf-version/ projects/pf/head/usr.bin/dig/ projects/pf/head/usr.bin/nslookup/ projects/pf/head/usr.bin/nsupdate/ projects/pf/head/usr.bin/systat/mbufs.c projects/pf/head/usr.bin/vi/port.h projects/pf/head/usr.sbin/arpaname/ projects/pf/head/usr.sbin/ddns-confgen/ projects/pf/head/usr.sbin/dnssec-dsfromkey/ projects/pf/head/usr.sbin/dnssec-keyfromlabel/ projects/pf/head/usr.sbin/dnssec-keygen/ projects/pf/head/usr.sbin/dnssec-revoke/ projects/pf/head/usr.sbin/dnssec-settime/ projects/pf/head/usr.sbin/dnssec-signzone/ projects/pf/head/usr.sbin/genrandom/ projects/pf/head/usr.sbin/isc-hmac-fixup/ projects/pf/head/usr.sbin/named/ projects/pf/head/usr.sbin/named-checkconf/ projects/pf/head/usr.sbin/named-checkzone/ projects/pf/head/usr.sbin/named-journalprint/ projects/pf/head/usr.sbin/nsec3hash/ projects/pf/head/usr.sbin/rndc/ projects/pf/head/usr.sbin/rndc-confgen/ projects/pf/head/usr.sbin/wpa/hostapd/driver_freebsd.c projects/pf/head/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c Modified: projects/pf/head/LOCKS projects/pf/head/MAINTAINERS (contents, props changed) projects/pf/head/Makefile projects/pf/head/Makefile.inc1 projects/pf/head/ObsoleteFiles.inc projects/pf/head/UPDATING projects/pf/head/bin/Makefile projects/pf/head/bin/chflags/chflags.1 projects/pf/head/bin/dd/dd.1 projects/pf/head/bin/ed/re.c projects/pf/head/bin/ls/ls.1 projects/pf/head/bin/pkill/pkill.1 projects/pf/head/bin/pkill/pkill.c projects/pf/head/bin/ps/keyword.c projects/pf/head/bin/ps/ps.1 projects/pf/head/bin/sh/Makefile projects/pf/head/bin/sh/TOUR projects/pf/head/bin/sh/alias.c projects/pf/head/bin/sh/arith_yylex.c projects/pf/head/bin/sh/eval.c projects/pf/head/bin/sh/eval.h projects/pf/head/bin/sh/exec.c projects/pf/head/bin/sh/input.c projects/pf/head/bin/sh/input.h projects/pf/head/bin/sh/jobs.c projects/pf/head/bin/sh/jobs.h projects/pf/head/bin/sh/main.c projects/pf/head/bin/sh/output.c projects/pf/head/bin/sh/parser.c projects/pf/head/bin/sh/parser.h projects/pf/head/bin/sh/redir.c projects/pf/head/bin/sh/sh.1 projects/pf/head/bin/sh/shell.h projects/pf/head/bin/sh/trap.c projects/pf/head/bin/sh/trap.h projects/pf/head/bin/sh/var.c projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.copyin.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d projects/pf/head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/pf/head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/pf/head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/pf/head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/pf/head/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/pf/head/cddl/contrib/opensolaris/common/ctf/ctf_create.c projects/pf/head/cddl/contrib/opensolaris/common/ctf/ctf_error.c projects/pf/head/cddl/contrib/opensolaris/common/ctf/ctf_impl.h projects/pf/head/cddl/contrib/opensolaris/common/ctf/ctf_open.c projects/pf/head/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c projects/pf/head/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c projects/pf/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/pf/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/pf/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c projects/pf/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/pf/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c projects/pf/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c projects/pf/head/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c projects/pf/head/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h projects/pf/head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c projects/pf/head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h projects/pf/head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c projects/pf/head/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h projects/pf/head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c projects/pf/head/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c projects/pf/head/cddl/lib/libdtrace/Makefile projects/pf/head/cddl/lib/libdtrace/psinfo.d projects/pf/head/cddl/lib/libzpool/Makefile projects/pf/head/cddl/usr.bin/ztest/Makefile projects/pf/head/cddl/usr.sbin/zdb/Makefile projects/pf/head/contrib/apr-util/CHANGES projects/pf/head/contrib/apr-util/Makefile.win projects/pf/head/contrib/apr-util/NWGNUmakefile projects/pf/head/contrib/apr-util/apr-util.spec projects/pf/head/contrib/apr-util/buckets/apr_brigade.c projects/pf/head/contrib/apr-util/buckets/apr_buckets_alloc.c projects/pf/head/contrib/apr-util/build-outputs.mk projects/pf/head/contrib/apr-util/build.conf projects/pf/head/contrib/apr-util/configure projects/pf/head/contrib/apr-util/configure.in projects/pf/head/contrib/apr-util/crypto/apr_crypto.c projects/pf/head/contrib/apr-util/crypto/apr_crypto_nss.c projects/pf/head/contrib/apr-util/crypto/apr_crypto_openssl.c projects/pf/head/contrib/apr-util/crypto/apr_md5.c projects/pf/head/contrib/apr-util/dbd/NWGNUdbdmysql projects/pf/head/contrib/apr-util/dbd/apr_dbd_freetds.c projects/pf/head/contrib/apr-util/dbd/apr_dbd_mysql.c projects/pf/head/contrib/apr-util/dbd/apr_dbd_pgsql.c projects/pf/head/contrib/apr-util/dbd/apr_dbd_sqlite2.c projects/pf/head/contrib/apr-util/hooks/apr_hooks.c projects/pf/head/contrib/apr-util/include/apr_base64.h projects/pf/head/contrib/apr-util/include/apr_buckets.h projects/pf/head/contrib/apr-util/include/apr_md5.h projects/pf/head/contrib/apr-util/include/apr_queue.h projects/pf/head/contrib/apr-util/include/apu.h.in projects/pf/head/contrib/apr-util/include/apu_version.h projects/pf/head/contrib/apr-util/include/private/apr_crypto_internal.h projects/pf/head/contrib/apr-util/memcache/apr_memcache.c projects/pf/head/contrib/apr-util/misc/apr_thread_pool.c projects/pf/head/contrib/apr-util/test/Makefile.in projects/pf/head/contrib/apr-util/test/Makefile.win projects/pf/head/contrib/apr-util/test/NWGNUmakefile projects/pf/head/contrib/apr-util/test/testbuckets.c projects/pf/head/contrib/apr-util/test/testmd5.c projects/pf/head/contrib/apr-util/test/testmemcache.c projects/pf/head/contrib/apr-util/test/testpass.c projects/pf/head/contrib/apr-util/test/testuri.c projects/pf/head/contrib/apr-util/test/testutil.c projects/pf/head/contrib/apr-util/test/testutil.h projects/pf/head/contrib/apr-util/uri/apr_uri.c projects/pf/head/contrib/apr/CHANGES projects/pf/head/contrib/apr/Makefile.win projects/pf/head/contrib/apr/apr.spec projects/pf/head/contrib/apr/atomic/unix/ia32.c projects/pf/head/contrib/apr/atomic/unix/ppc.c projects/pf/head/contrib/apr/atomic/unix/s390.c projects/pf/head/contrib/apr/configure projects/pf/head/contrib/apr/docs/pool-design.html projects/pf/head/contrib/apr/file_io/unix/seek.c projects/pf/head/contrib/apr/include/apr.hw projects/pf/head/contrib/apr/include/apr_allocator.h projects/pf/head/contrib/apr/include/apr_general.h projects/pf/head/contrib/apr/include/apr_network_io.h projects/pf/head/contrib/apr/include/apr_pools.h projects/pf/head/contrib/apr/include/apr_strings.h projects/pf/head/contrib/apr/include/apr_thread_proc.h projects/pf/head/contrib/apr/include/apr_version.h projects/pf/head/contrib/apr/libapr.rc projects/pf/head/contrib/apr/network_io/unix/multicast.c projects/pf/head/contrib/apr/network_io/unix/sendrecv.c projects/pf/head/contrib/apr/network_io/unix/sockaddr.c projects/pf/head/contrib/apr/network_io/unix/sockopt.c projects/pf/head/contrib/apr/random/unix/sha2.c projects/pf/head/contrib/apr/random/unix/sha2.h projects/pf/head/contrib/apr/random/unix/sha2_glue.c projects/pf/head/contrib/apr/tables/apr_tables.c projects/pf/head/contrib/apr/threadproc/unix/thread.c projects/pf/head/contrib/binutils/bfd/elflink.c projects/pf/head/contrib/binutils/bfd/elfxx-mips.c projects/pf/head/contrib/binutils/binutils/readelf.c projects/pf/head/contrib/binutils/gas/config/tc-arm.c projects/pf/head/contrib/binutils/gas/config/tc-i386.c projects/pf/head/contrib/binutils/gas/dwarf2dbg.c projects/pf/head/contrib/binutils/include/elf/common.h projects/pf/head/contrib/binutils/ld/ldmain.c projects/pf/head/contrib/binutils/opcodes/i386-dis.c projects/pf/head/contrib/binutils/opcodes/i386-opc.h projects/pf/head/contrib/binutils/opcodes/i386-opc.tbl projects/pf/head/contrib/binutils/opcodes/i386-tbl.h projects/pf/head/contrib/bmake/ChangeLog projects/pf/head/contrib/bmake/FILES projects/pf/head/contrib/bmake/Makefile projects/pf/head/contrib/bmake/bmake.1 projects/pf/head/contrib/bmake/bmake.cat1 projects/pf/head/contrib/bmake/compat.c projects/pf/head/contrib/bmake/configure projects/pf/head/contrib/bmake/configure.in projects/pf/head/contrib/bmake/job.c projects/pf/head/contrib/bmake/job.h projects/pf/head/contrib/bmake/main.c projects/pf/head/contrib/bmake/make.1 projects/pf/head/contrib/bmake/make.h projects/pf/head/contrib/bmake/meta.c projects/pf/head/contrib/bmake/mk/ChangeLog projects/pf/head/contrib/bmake/mk/gendirdeps.mk projects/pf/head/contrib/bmake/mk/init.mk projects/pf/head/contrib/bmake/mk/install-mk projects/pf/head/contrib/bmake/mk/lib.mk projects/pf/head/contrib/bmake/mk/libs.mk projects/pf/head/contrib/bmake/mk/meta2deps.py projects/pf/head/contrib/bmake/mk/own.mk projects/pf/head/contrib/bmake/mk/prog.mk projects/pf/head/contrib/bmake/mk/progs.mk projects/pf/head/contrib/bmake/parse.c projects/pf/head/contrib/bmake/unit-tests/Makefile.in projects/pf/head/contrib/bmake/unit-tests/test.exp projects/pf/head/contrib/bmake/var.c projects/pf/head/contrib/bsnmp/lib/snmp.c projects/pf/head/contrib/bsnmp/lib/snmp.h projects/pf/head/contrib/bsnmp/lib/snmpagent.c projects/pf/head/contrib/dialog/CHANGES projects/pf/head/contrib/dialog/VERSION projects/pf/head/contrib/dialog/aclocal.m4 projects/pf/head/contrib/dialog/arrows.c projects/pf/head/contrib/dialog/buildlist.c projects/pf/head/contrib/dialog/checklist.c projects/pf/head/contrib/dialog/config.guess projects/pf/head/contrib/dialog/config.sub projects/pf/head/contrib/dialog/configure projects/pf/head/contrib/dialog/configure.in projects/pf/head/contrib/dialog/dialog.1 projects/pf/head/contrib/dialog/dialog.3 projects/pf/head/contrib/dialog/dialog.c projects/pf/head/contrib/dialog/dialog.h projects/pf/head/contrib/dialog/formbox.c projects/pf/head/contrib/dialog/guage.c projects/pf/head/contrib/dialog/inputstr.c projects/pf/head/contrib/dialog/makefile.in projects/pf/head/contrib/dialog/menubox.c projects/pf/head/contrib/dialog/mixedform.c projects/pf/head/contrib/dialog/package/debian/changelog projects/pf/head/contrib/dialog/package/debian/copyright projects/pf/head/contrib/dialog/package/dialog.spec projects/pf/head/contrib/dialog/po/lt.po projects/pf/head/contrib/dialog/samples/inputbox6-utf8 projects/pf/head/contrib/dialog/samples/report-tempfile projects/pf/head/contrib/dialog/treeview.c projects/pf/head/contrib/dialog/util.c projects/pf/head/contrib/gcc/ChangeLog.gcc43 projects/pf/head/contrib/gcc/config.gcc projects/pf/head/contrib/gcc/config/arm/ieee754-df.S projects/pf/head/contrib/gcc/config/arm/libunwind.S projects/pf/head/contrib/gcc/config/arm/unwind-arm.c projects/pf/head/contrib/gcc/config/arm/unwind-arm.h projects/pf/head/contrib/gcc/config/i386/i386.c projects/pf/head/contrib/gcc/config/i386/i386.h projects/pf/head/contrib/gcc/config/i386/i386.opt projects/pf/head/contrib/gcc/doc/extend.texi projects/pf/head/contrib/gcc/doc/invoke.texi projects/pf/head/contrib/gcc/gthr-posix95.h projects/pf/head/contrib/gcc/opth-gen.awk projects/pf/head/contrib/gcc/opts.c projects/pf/head/contrib/gcc/unwind-dw2.c projects/pf/head/contrib/gcclibs/libcpp/expr.c projects/pf/head/contrib/gcclibs/libcpp/include/cpplib.h projects/pf/head/contrib/ipfilter/BNF projects/pf/head/contrib/ipfilter/HISTORY projects/pf/head/contrib/ipfilter/Makefile projects/pf/head/contrib/ipfilter/NAT.FreeBSD projects/pf/head/contrib/ipfilter/ip_fil.c projects/pf/head/contrib/ipfilter/ipf.h projects/pf/head/contrib/ipfilter/iplang/Makefile projects/pf/head/contrib/ipfilter/iplang/iplang.h projects/pf/head/contrib/ipfilter/iplang/iplang.tst projects/pf/head/contrib/ipfilter/iplang/iplang_l.l projects/pf/head/contrib/ipfilter/iplang/iplang_y.y projects/pf/head/contrib/ipfilter/ipmon.h projects/pf/head/contrib/ipfilter/ipsd/Makefile projects/pf/head/contrib/ipfilter/ipsd/ipsd.c projects/pf/head/contrib/ipfilter/ipsd/ipsdr.c projects/pf/head/contrib/ipfilter/ipsd/linux.h projects/pf/head/contrib/ipfilter/ipsd/sbpf.c projects/pf/head/contrib/ipfilter/ipsd/sdlpi.c projects/pf/head/contrib/ipfilter/ipsd/slinux.c projects/pf/head/contrib/ipfilter/ipsd/snit.c projects/pf/head/contrib/ipfilter/ipsend/44arp.c projects/pf/head/contrib/ipfilter/ipsend/Makefile projects/pf/head/contrib/ipfilter/ipsend/arp.c projects/pf/head/contrib/ipfilter/ipsend/dlcommon.c projects/pf/head/contrib/ipfilter/ipsend/ip.c projects/pf/head/contrib/ipfilter/ipsend/ipresend.c projects/pf/head/contrib/ipfilter/ipsend/ipsend.5 projects/pf/head/contrib/ipfilter/ipsend/ipsend.c projects/pf/head/contrib/ipfilter/ipsend/ipsend.h projects/pf/head/contrib/ipfilter/ipsend/ipsopt.c projects/pf/head/contrib/ipfilter/ipsend/iptest.c projects/pf/head/contrib/ipfilter/ipsend/iptests.c projects/pf/head/contrib/ipfilter/ipsend/larp.c projects/pf/head/contrib/ipfilter/ipsend/linux.h projects/pf/head/contrib/ipfilter/ipsend/lsock.c projects/pf/head/contrib/ipfilter/ipsend/resend.c projects/pf/head/contrib/ipfilter/ipsend/sbpf.c projects/pf/head/contrib/ipfilter/ipsend/sdlpi.c projects/pf/head/contrib/ipfilter/ipsend/sirix.c projects/pf/head/contrib/ipfilter/ipsend/slinux.c projects/pf/head/contrib/ipfilter/ipsend/snit.c projects/pf/head/contrib/ipfilter/ipsend/sock.c projects/pf/head/contrib/ipfilter/ipt.h projects/pf/head/contrib/ipfilter/kmem.h projects/pf/head/contrib/ipfilter/l4check/Makefile projects/pf/head/contrib/ipfilter/l4check/l4check.c projects/pf/head/contrib/ipfilter/lib/Makefile projects/pf/head/contrib/ipfilter/lib/addicmp.c projects/pf/head/contrib/ipfilter/lib/addipopt.c projects/pf/head/contrib/ipfilter/lib/alist_free.c projects/pf/head/contrib/ipfilter/lib/alist_new.c projects/pf/head/contrib/ipfilter/lib/bcopywrap.c projects/pf/head/contrib/ipfilter/lib/binprint.c projects/pf/head/contrib/ipfilter/lib/buildopts.c projects/pf/head/contrib/ipfilter/lib/checkrev.c projects/pf/head/contrib/ipfilter/lib/count4bits.c projects/pf/head/contrib/ipfilter/lib/count6bits.c projects/pf/head/contrib/ipfilter/lib/debug.c projects/pf/head/contrib/ipfilter/lib/facpri.c projects/pf/head/contrib/ipfilter/lib/facpri.h projects/pf/head/contrib/ipfilter/lib/fill6bits.c projects/pf/head/contrib/ipfilter/lib/flags.c projects/pf/head/contrib/ipfilter/lib/gethost.c projects/pf/head/contrib/ipfilter/lib/getifname.c projects/pf/head/contrib/ipfilter/lib/getnattype.c projects/pf/head/contrib/ipfilter/lib/getport.c projects/pf/head/contrib/ipfilter/lib/getportproto.c projects/pf/head/contrib/ipfilter/lib/getproto.c projects/pf/head/contrib/ipfilter/lib/getsumd.c projects/pf/head/contrib/ipfilter/lib/hostname.c projects/pf/head/contrib/ipfilter/lib/icmpcode.c projects/pf/head/contrib/ipfilter/lib/initparse.c projects/pf/head/contrib/ipfilter/lib/ionames.c projects/pf/head/contrib/ipfilter/lib/ipf_dotuning.c projects/pf/head/contrib/ipfilter/lib/ipft_hx.c projects/pf/head/contrib/ipfilter/lib/ipft_pc.c projects/pf/head/contrib/ipfilter/lib/ipft_tx.c projects/pf/head/contrib/ipfilter/lib/ipoptsec.c projects/pf/head/contrib/ipfilter/lib/kmem.c projects/pf/head/contrib/ipfilter/lib/kmem.h projects/pf/head/contrib/ipfilter/lib/kmemcpywrap.c projects/pf/head/contrib/ipfilter/lib/kvatoname.c projects/pf/head/contrib/ipfilter/lib/load_file.c projects/pf/head/contrib/ipfilter/lib/load_hash.c projects/pf/head/contrib/ipfilter/lib/load_hashnode.c projects/pf/head/contrib/ipfilter/lib/load_http.c projects/pf/head/contrib/ipfilter/lib/load_pool.c projects/pf/head/contrib/ipfilter/lib/load_poolnode.c projects/pf/head/contrib/ipfilter/lib/load_url.c projects/pf/head/contrib/ipfilter/lib/mutex_emul.c projects/pf/head/contrib/ipfilter/lib/nametokva.c projects/pf/head/contrib/ipfilter/lib/nat_setgroupmap.c projects/pf/head/contrib/ipfilter/lib/ntomask.c projects/pf/head/contrib/ipfilter/lib/optname.c projects/pf/head/contrib/ipfilter/lib/optprint.c projects/pf/head/contrib/ipfilter/lib/optprintv6.c projects/pf/head/contrib/ipfilter/lib/optvalue.c projects/pf/head/contrib/ipfilter/lib/portname.c projects/pf/head/contrib/ipfilter/lib/print_toif.c projects/pf/head/contrib/ipfilter/lib/printactivenat.c projects/pf/head/contrib/ipfilter/lib/printaps.c projects/pf/head/contrib/ipfilter/lib/printbuf.c projects/pf/head/contrib/ipfilter/lib/printfr.c projects/pf/head/contrib/ipfilter/lib/printfraginfo.c projects/pf/head/contrib/ipfilter/lib/printhash.c projects/pf/head/contrib/ipfilter/lib/printhash_live.c projects/pf/head/contrib/ipfilter/lib/printhashdata.c projects/pf/head/contrib/ipfilter/lib/printhashnode.c projects/pf/head/contrib/ipfilter/lib/printhostmap.c projects/pf/head/contrib/ipfilter/lib/printhostmask.c projects/pf/head/contrib/ipfilter/lib/printifname.c projects/pf/head/contrib/ipfilter/lib/printip.c projects/pf/head/contrib/ipfilter/lib/printlog.c projects/pf/head/contrib/ipfilter/lib/printmask.c projects/pf/head/contrib/ipfilter/lib/printnat.c projects/pf/head/contrib/ipfilter/lib/printpacket.c projects/pf/head/contrib/ipfilter/lib/printpacket6.c projects/pf/head/contrib/ipfilter/lib/printpool.c projects/pf/head/contrib/ipfilter/lib/printpool_live.c projects/pf/head/contrib/ipfilter/lib/printpooldata.c projects/pf/head/contrib/ipfilter/lib/printpoolnode.c projects/pf/head/contrib/ipfilter/lib/printportcmp.c projects/pf/head/contrib/ipfilter/lib/printproto.c projects/pf/head/contrib/ipfilter/lib/printsbuf.c projects/pf/head/contrib/ipfilter/lib/printstate.c projects/pf/head/contrib/ipfilter/lib/printtqtable.c projects/pf/head/contrib/ipfilter/lib/printtunable.c projects/pf/head/contrib/ipfilter/lib/remove_hash.c projects/pf/head/contrib/ipfilter/lib/remove_hashnode.c projects/pf/head/contrib/ipfilter/lib/remove_pool.c projects/pf/head/contrib/ipfilter/lib/remove_poolnode.c projects/pf/head/contrib/ipfilter/lib/resetlexer.c projects/pf/head/contrib/ipfilter/lib/rwlock_emul.c projects/pf/head/contrib/ipfilter/lib/tcpflags.c projects/pf/head/contrib/ipfilter/lib/tcpoptnames.c projects/pf/head/contrib/ipfilter/lib/v6ionames.c projects/pf/head/contrib/ipfilter/lib/v6optvalue.c projects/pf/head/contrib/ipfilter/lib/var.c projects/pf/head/contrib/ipfilter/lib/verbose.c projects/pf/head/contrib/ipfilter/man/Makefile projects/pf/head/contrib/ipfilter/man/ipf.4 projects/pf/head/contrib/ipfilter/man/ipf.5 projects/pf/head/contrib/ipfilter/man/ipfilter.4 projects/pf/head/contrib/ipfilter/man/ipfilter.4.mandoc projects/pf/head/contrib/ipfilter/man/ipfstat.8 projects/pf/head/contrib/ipfilter/man/ipftest.1 projects/pf/head/contrib/ipfilter/man/ipmon.5 projects/pf/head/contrib/ipfilter/man/ipnat.4 projects/pf/head/contrib/ipfilter/man/ipnat.5 projects/pf/head/contrib/ipfilter/man/ipnat.8 projects/pf/head/contrib/ipfilter/man/ippool.5 projects/pf/head/contrib/ipfilter/man/ippool.8 projects/pf/head/contrib/ipfilter/md5.c projects/pf/head/contrib/ipfilter/mkfilters projects/pf/head/contrib/ipfilter/mlf_ipl.c projects/pf/head/contrib/ipfilter/mlf_rule.c projects/pf/head/contrib/ipfilter/mlfk_rule.c projects/pf/head/contrib/ipfilter/mlh_rule.c (contents, props changed) projects/pf/head/contrib/ipfilter/opts.h projects/pf/head/contrib/ipfilter/pcap-ipf.h projects/pf/head/contrib/ipfilter/radix_ipf.h projects/pf/head/contrib/ipfilter/rules/BASIC_1.FW projects/pf/head/contrib/ipfilter/rules/BASIC_2.FW projects/pf/head/contrib/ipfilter/rules/firewall projects/pf/head/contrib/ipfilter/rules/ipmon.conf projects/pf/head/contrib/ipfilter/rules/server projects/pf/head/contrib/ipfilter/samples/proxy.c projects/pf/head/contrib/ipfilter/samples/relay.c projects/pf/head/contrib/ipfilter/snoop.h projects/pf/head/contrib/ipfilter/tools/BNF.ipf projects/pf/head/contrib/ipfilter/tools/Makefile projects/pf/head/contrib/ipfilter/tools/ipf.c projects/pf/head/contrib/ipfilter/tools/ipf_y.y projects/pf/head/contrib/ipfilter/tools/ipfcomp.c projects/pf/head/contrib/ipfilter/tools/ipfs.c projects/pf/head/contrib/ipfilter/tools/ipfstat.c projects/pf/head/contrib/ipfilter/tools/ipftest.c projects/pf/head/contrib/ipfilter/tools/ipmon.c projects/pf/head/contrib/ipfilter/tools/ipmon_y.y projects/pf/head/contrib/ipfilter/tools/ipnat.c projects/pf/head/contrib/ipfilter/tools/ipnat_y.y projects/pf/head/contrib/ipfilter/tools/ippool.c projects/pf/head/contrib/ipfilter/tools/ippool_y.y projects/pf/head/contrib/ipfilter/tools/ipscan_y.y projects/pf/head/contrib/ipfilter/tools/ipsyncm.c projects/pf/head/contrib/ipfilter/tools/ipsyncs.c projects/pf/head/contrib/ipfilter/tools/lex_var.h projects/pf/head/contrib/ipfilter/tools/lexer.c projects/pf/head/contrib/ipfilter/tools/lexer.h projects/pf/head/contrib/ldns/ldns/dnssec_verify.h projects/pf/head/contrib/ldns/ldns/util.h projects/pf/head/contrib/libc++/include/__bit_reference projects/pf/head/contrib/libc++/include/__config projects/pf/head/contrib/libc++/include/__functional_base projects/pf/head/contrib/libc++/include/__hash_table projects/pf/head/contrib/libc++/include/__locale projects/pf/head/contrib/libc++/include/__split_buffer projects/pf/head/contrib/libc++/include/__std_stream projects/pf/head/contrib/libc++/include/__tree projects/pf/head/contrib/libc++/include/algorithm projects/pf/head/contrib/libc++/include/atomic projects/pf/head/contrib/libc++/include/deque projects/pf/head/contrib/libc++/include/forward_list projects/pf/head/contrib/libc++/include/functional projects/pf/head/contrib/libc++/include/future projects/pf/head/contrib/libc++/include/istream projects/pf/head/contrib/libc++/include/iterator projects/pf/head/contrib/libc++/include/list projects/pf/head/contrib/libc++/include/locale projects/pf/head/contrib/libc++/include/map projects/pf/head/contrib/libc++/include/memory projects/pf/head/contrib/libc++/include/random projects/pf/head/contrib/libc++/include/regex projects/pf/head/contrib/libc++/include/string projects/pf/head/contrib/libc++/include/type_traits projects/pf/head/contrib/libc++/include/unordered_map projects/pf/head/contrib/libc++/include/utility projects/pf/head/contrib/libc++/include/vector projects/pf/head/contrib/libc++/src/debug.cpp projects/pf/head/contrib/libc++/src/hash.cpp projects/pf/head/contrib/libc++/src/iostream.cpp projects/pf/head/contrib/libc++/src/locale.cpp projects/pf/head/contrib/libc++/src/stdexcept.cpp projects/pf/head/contrib/libc++/src/string.cpp projects/pf/head/contrib/libc++/src/thread.cpp projects/pf/head/contrib/libcxxrt/atomic.h projects/pf/head/contrib/libcxxrt/auxhelper.cc projects/pf/head/contrib/libcxxrt/cxxabi.h projects/pf/head/contrib/libcxxrt/dwarf_eh.h projects/pf/head/contrib/libcxxrt/exception.cc projects/pf/head/contrib/libcxxrt/guard.cc projects/pf/head/contrib/libcxxrt/libelftc_dem_gnu3.c projects/pf/head/contrib/libcxxrt/memory.cc projects/pf/head/contrib/libcxxrt/typeinfo.cc projects/pf/head/contrib/libcxxrt/unwind-itanium.h projects/pf/head/contrib/libstdc++/include/c_std/std_cmath.h projects/pf/head/contrib/libstdc++/libsupc++/unwind-cxx.h projects/pf/head/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h projects/pf/head/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h projects/pf/head/contrib/llvm/include/llvm/IR/CallingConv.h projects/pf/head/contrib/llvm/include/llvm/MC/MCInstPrinter.h projects/pf/head/contrib/llvm/lib/AsmParser/LLLexer.cpp projects/pf/head/contrib/llvm/lib/AsmParser/LLParser.cpp projects/pf/head/contrib/llvm/lib/AsmParser/LLToken.h projects/pf/head/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp projects/pf/head/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp projects/pf/head/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp projects/pf/head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp projects/pf/head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp projects/pf/head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp projects/pf/head/contrib/llvm/lib/IR/AsmWriter.cpp projects/pf/head/contrib/llvm/lib/MC/MCInstPrinter.cpp projects/pf/head/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp projects/pf/head/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h projects/pf/head/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp projects/pf/head/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp projects/pf/head/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp projects/pf/head/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp projects/pf/head/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp projects/pf/head/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp projects/pf/head/contrib/llvm/lib/Target/R600/AMDILISelDAGToDAG.cpp projects/pf/head/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp projects/pf/head/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp projects/pf/head/contrib/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp projects/pf/head/contrib/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp projects/pf/head/contrib/llvm/lib/Target/X86/X86CallingConv.td projects/pf/head/contrib/llvm/lib/Target/X86/X86FastISel.cpp projects/pf/head/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp projects/pf/head/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp projects/pf/head/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/pf/head/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp projects/pf/head/contrib/llvm/lib/Target/X86/X86Subtarget.h projects/pf/head/contrib/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp projects/pf/head/contrib/llvm/tools/clang/include/clang-c/Index.h projects/pf/head/contrib/llvm/tools/clang/include/clang/AST/Type.h projects/pf/head/contrib/llvm/tools/clang/include/clang/Basic/Attr.td projects/pf/head/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h projects/pf/head/contrib/llvm/tools/clang/lib/AST/DumpXML.cpp projects/pf/head/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp projects/pf/head/contrib/llvm/tools/clang/lib/AST/Type.cpp projects/pf/head/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp projects/pf/head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp projects/pf/head/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp projects/pf/head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp projects/pf/head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h projects/pf/head/contrib/llvm/tools/clang/lib/Headers/cpuid.h projects/pf/head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp projects/pf/head/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp projects/pf/head/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp projects/pf/head/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp projects/pf/head/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp projects/pf/head/contrib/mtree/compare.c projects/pf/head/contrib/mtree/create.c projects/pf/head/contrib/mtree/getid.c projects/pf/head/contrib/mtree/spec.c projects/pf/head/contrib/nvi/LICENSE projects/pf/head/contrib/nvi/README projects/pf/head/contrib/nvi/catalog/Makefile projects/pf/head/contrib/nvi/catalog/README projects/pf/head/contrib/nvi/catalog/dump.c projects/pf/head/contrib/nvi/catalog/dutch.base (contents, props changed) projects/pf/head/contrib/nvi/catalog/french.base (contents, props changed) projects/pf/head/contrib/nvi/catalog/german.base (contents, props changed) projects/pf/head/contrib/nvi/catalog/german.owner projects/pf/head/contrib/nvi/catalog/polish.base (contents, props changed) projects/pf/head/contrib/nvi/catalog/ru_RU.KOI8-R.base (contents, props changed) projects/pf/head/contrib/nvi/catalog/ru_RU.KOI8-R.owner projects/pf/head/contrib/nvi/catalog/spanish.base (contents, props changed) projects/pf/head/contrib/nvi/catalog/swedish.base (contents, props changed) projects/pf/head/contrib/nvi/catalog/uk_UA.KOI8-U.base (contents, props changed) projects/pf/head/contrib/nvi/cl/README.signal projects/pf/head/contrib/nvi/cl/cl.h projects/pf/head/contrib/nvi/cl/cl_funcs.c projects/pf/head/contrib/nvi/cl/cl_main.c projects/pf/head/contrib/nvi/cl/cl_read.c projects/pf/head/contrib/nvi/cl/cl_screen.c projects/pf/head/contrib/nvi/cl/cl_term.c projects/pf/head/contrib/nvi/common/args.h projects/pf/head/contrib/nvi/common/common.h projects/pf/head/contrib/nvi/common/cut.c projects/pf/head/contrib/nvi/common/cut.h projects/pf/head/contrib/nvi/common/delete.c projects/pf/head/contrib/nvi/common/exf.c projects/pf/head/contrib/nvi/common/exf.h projects/pf/head/contrib/nvi/common/gs.h projects/pf/head/contrib/nvi/common/key.c projects/pf/head/contrib/nvi/common/key.h projects/pf/head/contrib/nvi/common/line.c projects/pf/head/contrib/nvi/common/log.c projects/pf/head/contrib/nvi/common/main.c projects/pf/head/contrib/nvi/common/mark.c projects/pf/head/contrib/nvi/common/mark.h projects/pf/head/contrib/nvi/common/mem.h projects/pf/head/contrib/nvi/common/msg.c projects/pf/head/contrib/nvi/common/msg.h projects/pf/head/contrib/nvi/common/options.c projects/pf/head/contrib/nvi/common/options.h projects/pf/head/contrib/nvi/common/options_f.c projects/pf/head/contrib/nvi/common/put.c projects/pf/head/contrib/nvi/common/recover.c projects/pf/head/contrib/nvi/common/screen.c projects/pf/head/contrib/nvi/common/screen.h projects/pf/head/contrib/nvi/common/search.c projects/pf/head/contrib/nvi/common/seq.c projects/pf/head/contrib/nvi/common/seq.h projects/pf/head/contrib/nvi/common/util.c projects/pf/head/contrib/nvi/common/util.h projects/pf/head/contrib/nvi/docs/USD.doc/vi.man/vi.1 projects/pf/head/contrib/nvi/ex/ex.c projects/pf/head/contrib/nvi/ex/ex.h projects/pf/head/contrib/nvi/ex/ex_abbrev.c projects/pf/head/contrib/nvi/ex/ex_append.c projects/pf/head/contrib/nvi/ex/ex_args.c projects/pf/head/contrib/nvi/ex/ex_argv.c projects/pf/head/contrib/nvi/ex/ex_at.c projects/pf/head/contrib/nvi/ex/ex_bang.c projects/pf/head/contrib/nvi/ex/ex_cd.c projects/pf/head/contrib/nvi/ex/ex_cmd.c projects/pf/head/contrib/nvi/ex/ex_cscope.c projects/pf/head/contrib/nvi/ex/ex_delete.c projects/pf/head/contrib/nvi/ex/ex_display.c projects/pf/head/contrib/nvi/ex/ex_edit.c projects/pf/head/contrib/nvi/ex/ex_equal.c projects/pf/head/contrib/nvi/ex/ex_file.c projects/pf/head/contrib/nvi/ex/ex_filter.c projects/pf/head/contrib/nvi/ex/ex_global.c projects/pf/head/contrib/nvi/ex/ex_init.c projects/pf/head/contrib/nvi/ex/ex_join.c projects/pf/head/contrib/nvi/ex/ex_map.c projects/pf/head/contrib/nvi/ex/ex_mark.c projects/pf/head/contrib/nvi/ex/ex_mkexrc.c projects/pf/head/contrib/nvi/ex/ex_move.c projects/pf/head/contrib/nvi/ex/ex_open.c projects/pf/head/contrib/nvi/ex/ex_preserve.c projects/pf/head/contrib/nvi/ex/ex_print.c projects/pf/head/contrib/nvi/ex/ex_put.c projects/pf/head/contrib/nvi/ex/ex_quit.c projects/pf/head/contrib/nvi/ex/ex_read.c projects/pf/head/contrib/nvi/ex/ex_screen.c projects/pf/head/contrib/nvi/ex/ex_script.c projects/pf/head/contrib/nvi/ex/ex_set.c projects/pf/head/contrib/nvi/ex/ex_shell.c projects/pf/head/contrib/nvi/ex/ex_shift.c projects/pf/head/contrib/nvi/ex/ex_source.c projects/pf/head/contrib/nvi/ex/ex_stop.c projects/pf/head/contrib/nvi/ex/ex_subst.c projects/pf/head/contrib/nvi/ex/ex_tag.c projects/pf/head/contrib/nvi/ex/ex_txt.c projects/pf/head/contrib/nvi/ex/ex_undo.c projects/pf/head/contrib/nvi/ex/ex_usage.c projects/pf/head/contrib/nvi/ex/ex_util.c projects/pf/head/contrib/nvi/ex/ex_version.c projects/pf/head/contrib/nvi/ex/ex_visual.c projects/pf/head/contrib/nvi/ex/ex_write.c projects/pf/head/contrib/nvi/ex/ex_yank.c projects/pf/head/contrib/nvi/ex/ex_z.c projects/pf/head/contrib/nvi/ex/script.h projects/pf/head/contrib/nvi/ex/tag.h projects/pf/head/contrib/nvi/ex/version.h projects/pf/head/contrib/nvi/vi/getc.c projects/pf/head/contrib/nvi/vi/v_at.c projects/pf/head/contrib/nvi/vi/v_ch.c projects/pf/head/contrib/nvi/vi/v_cmd.c projects/pf/head/contrib/nvi/vi/v_delete.c projects/pf/head/contrib/nvi/vi/v_ex.c projects/pf/head/contrib/nvi/vi/v_increment.c projects/pf/head/contrib/nvi/vi/v_init.c projects/pf/head/contrib/nvi/vi/v_itxt.c projects/pf/head/contrib/nvi/vi/v_left.c projects/pf/head/contrib/nvi/vi/v_mark.c projects/pf/head/contrib/nvi/vi/v_match.c projects/pf/head/contrib/nvi/vi/v_paragraph.c projects/pf/head/contrib/nvi/vi/v_put.c projects/pf/head/contrib/nvi/vi/v_redraw.c projects/pf/head/contrib/nvi/vi/v_replace.c projects/pf/head/contrib/nvi/vi/v_right.c projects/pf/head/contrib/nvi/vi/v_screen.c projects/pf/head/contrib/nvi/vi/v_scroll.c projects/pf/head/contrib/nvi/vi/v_search.c projects/pf/head/contrib/nvi/vi/v_section.c projects/pf/head/contrib/nvi/vi/v_sentence.c projects/pf/head/contrib/nvi/vi/v_status.c projects/pf/head/contrib/nvi/vi/v_txt.c projects/pf/head/contrib/nvi/vi/v_ulcase.c projects/pf/head/contrib/nvi/vi/v_undo.c projects/pf/head/contrib/nvi/vi/v_util.c projects/pf/head/contrib/nvi/vi/v_word.c projects/pf/head/contrib/nvi/vi/v_xchar.c projects/pf/head/contrib/nvi/vi/v_yank.c projects/pf/head/contrib/nvi/vi/v_z.c projects/pf/head/contrib/nvi/vi/v_zexit.c projects/pf/head/contrib/nvi/vi/vi.c projects/pf/head/contrib/nvi/vi/vi.h projects/pf/head/contrib/nvi/vi/vs_line.c projects/pf/head/contrib/nvi/vi/vs_msg.c projects/pf/head/contrib/nvi/vi/vs_refresh.c projects/pf/head/contrib/nvi/vi/vs_relative.c projects/pf/head/contrib/nvi/vi/vs_smap.c projects/pf/head/contrib/nvi/vi/vs_split.c projects/pf/head/contrib/ofed/libsdp/src/linux/sdp_inet.h projects/pf/head/contrib/ofed/management/infiniband-diags/src/sminfo.c projects/pf/head/contrib/ofed/management/opensm/opensm/osm_console.c projects/pf/head/contrib/ofed/management/opensm/opensm/osm_subnet.c projects/pf/head/contrib/openpam/CREDITS projects/pf/head/contrib/openpam/HISTORY projects/pf/head/contrib/openpam/INSTALL projects/pf/head/contrib/openpam/LICENSE projects/pf/head/contrib/openpam/Makefile.am projects/pf/head/contrib/openpam/Makefile.in projects/pf/head/contrib/openpam/README projects/pf/head/contrib/openpam/RELNOTES projects/pf/head/contrib/openpam/TODO projects/pf/head/contrib/openpam/aclocal.m4 projects/pf/head/contrib/openpam/autogen.sh projects/pf/head/contrib/openpam/bin/Makefile.am projects/pf/head/contrib/openpam/bin/Makefile.in projects/pf/head/contrib/openpam/bin/openpam_dump_policy/Makefile.am projects/pf/head/contrib/openpam/bin/openpam_dump_policy/Makefile.in projects/pf/head/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c projects/pf/head/contrib/openpam/bin/pamtest/Makefile.am projects/pf/head/contrib/openpam/bin/pamtest/Makefile.in projects/pf/head/contrib/openpam/bin/pamtest/pamtest.1 projects/pf/head/contrib/openpam/bin/pamtest/pamtest.c projects/pf/head/contrib/openpam/bin/su/Makefile.am projects/pf/head/contrib/openpam/bin/su/Makefile.in projects/pf/head/contrib/openpam/bin/su/su.1 projects/pf/head/contrib/openpam/bin/su/su.c projects/pf/head/contrib/openpam/compile projects/pf/head/contrib/openpam/config.guess projects/pf/head/contrib/openpam/config.h.in projects/pf/head/contrib/openpam/config.sub projects/pf/head/contrib/openpam/configure projects/pf/head/contrib/openpam/configure.ac projects/pf/head/contrib/openpam/depcomp projects/pf/head/contrib/openpam/doc/Makefile.am projects/pf/head/contrib/openpam/doc/Makefile.in projects/pf/head/contrib/openpam/doc/man/Makefile.am projects/pf/head/contrib/openpam/doc/man/Makefile.in projects/pf/head/contrib/openpam/doc/man/openpam.3 projects/pf/head/contrib/openpam/doc/man/openpam.man projects/pf/head/contrib/openpam/doc/man/openpam_borrow_cred.3 projects/pf/head/contrib/openpam/doc/man/openpam_free_data.3 projects/pf/head/contrib/openpam/doc/man/openpam_free_envlist.3 projects/pf/head/contrib/openpam/doc/man/openpam_get_feature.3 projects/pf/head/contrib/openpam/doc/man/openpam_get_option.3 projects/pf/head/contrib/openpam/doc/man/openpam_log.3 projects/pf/head/contrib/openpam/doc/man/openpam_nullconv.3 projects/pf/head/contrib/openpam/doc/man/openpam_readline.3 projects/pf/head/contrib/openpam/doc/man/openpam_readlinev.3 projects/pf/head/contrib/openpam/doc/man/openpam_readword.3 projects/pf/head/contrib/openpam/doc/man/openpam_restore_cred.3 projects/pf/head/contrib/openpam/doc/man/openpam_set_feature.3 projects/pf/head/contrib/openpam/doc/man/openpam_set_option.3 projects/pf/head/contrib/openpam/doc/man/openpam_straddch.3 projects/pf/head/contrib/openpam/doc/man/openpam_subst.3 projects/pf/head/contrib/openpam/doc/man/openpam_ttyconv.3 projects/pf/head/contrib/openpam/doc/man/pam.3 projects/pf/head/contrib/openpam/doc/man/pam.conf.5 projects/pf/head/contrib/openpam/doc/man/pam.man projects/pf/head/contrib/openpam/doc/man/pam_acct_mgmt.3 projects/pf/head/contrib/openpam/doc/man/pam_authenticate.3 projects/pf/head/contrib/openpam/doc/man/pam_chauthtok.3 projects/pf/head/contrib/openpam/doc/man/pam_close_session.3 projects/pf/head/contrib/openpam/doc/man/pam_conv.3 projects/pf/head/contrib/openpam/doc/man/pam_end.3 projects/pf/head/contrib/openpam/doc/man/pam_error.3 projects/pf/head/contrib/openpam/doc/man/pam_get_authtok.3 projects/pf/head/contrib/openpam/doc/man/pam_get_data.3 projects/pf/head/contrib/openpam/doc/man/pam_get_item.3 projects/pf/head/contrib/openpam/doc/man/pam_get_user.3 projects/pf/head/contrib/openpam/doc/man/pam_getenv.3 projects/pf/head/contrib/openpam/doc/man/pam_getenvlist.3 projects/pf/head/contrib/openpam/doc/man/pam_info.3 projects/pf/head/contrib/openpam/doc/man/pam_open_session.3 projects/pf/head/contrib/openpam/doc/man/pam_prompt.3 projects/pf/head/contrib/openpam/doc/man/pam_putenv.3 projects/pf/head/contrib/openpam/doc/man/pam_set_data.3 projects/pf/head/contrib/openpam/doc/man/pam_set_item.3 projects/pf/head/contrib/openpam/doc/man/pam_setcred.3 projects/pf/head/contrib/openpam/doc/man/pam_setenv.3 projects/pf/head/contrib/openpam/doc/man/pam_sm_acct_mgmt.3 projects/pf/head/contrib/openpam/doc/man/pam_sm_authenticate.3 projects/pf/head/contrib/openpam/doc/man/pam_sm_chauthtok.3 projects/pf/head/contrib/openpam/doc/man/pam_sm_close_session.3 projects/pf/head/contrib/openpam/doc/man/pam_sm_open_session.3 projects/pf/head/contrib/openpam/doc/man/pam_sm_setcred.3 projects/pf/head/contrib/openpam/doc/man/pam_start.3 projects/pf/head/contrib/openpam/doc/man/pam_strerror.3 projects/pf/head/contrib/openpam/doc/man/pam_verror.3 projects/pf/head/contrib/openpam/doc/man/pam_vinfo.3 projects/pf/head/contrib/openpam/doc/man/pam_vprompt.3 projects/pf/head/contrib/openpam/include/Makefile.am projects/pf/head/contrib/openpam/include/Makefile.in projects/pf/head/contrib/openpam/include/security/Makefile.am projects/pf/head/contrib/openpam/include/security/Makefile.in projects/pf/head/contrib/openpam/include/security/openpam.h projects/pf/head/contrib/openpam/include/security/openpam_attr.h projects/pf/head/contrib/openpam/include/security/openpam_version.h projects/pf/head/contrib/openpam/include/security/pam_appl.h projects/pf/head/contrib/openpam/include/security/pam_constants.h projects/pf/head/contrib/openpam/include/security/pam_modules.h projects/pf/head/contrib/openpam/include/security/pam_types.h projects/pf/head/contrib/openpam/install-sh projects/pf/head/contrib/openpam/misc/gendoc.pl projects/pf/head/contrib/openpam/missing projects/pf/head/contrib/openpam/modules/Makefile.am projects/pf/head/contrib/openpam/modules/Makefile.in projects/pf/head/contrib/openpam/modules/pam_deny/Makefile.am projects/pf/head/contrib/openpam/modules/pam_deny/Makefile.in projects/pf/head/contrib/openpam/modules/pam_deny/pam_deny.c projects/pf/head/contrib/openpam/modules/pam_permit/Makefile.am projects/pf/head/contrib/openpam/modules/pam_permit/Makefile.in projects/pf/head/contrib/openpam/modules/pam_permit/pam_permit.c projects/pf/head/contrib/openpam/modules/pam_unix/Makefile.am projects/pf/head/contrib/openpam/modules/pam_unix/Makefile.in projects/pf/head/contrib/openpam/modules/pam_unix/pam_unix.c projects/pf/head/contrib/openpam/pamgdb.in projects/pf/head/contrib/openpam/t/Makefile.am projects/pf/head/contrib/openpam/t/Makefile.in projects/pf/head/contrib/openpam/t/t.h projects/pf/head/contrib/openpam/t/t_main.c projects/pf/head/contrib/openpam/t/t_openpam_readlinev.c projects/pf/head/contrib/openpam/t/t_openpam_readword.c projects/pf/head/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c projects/pf/head/contrib/sendmail/include/sm/os/sm_os_freebsd.h projects/pf/head/contrib/serf/CHANGES projects/pf/head/contrib/serf/README projects/pf/head/contrib/serf/auth/auth.c projects/pf/head/contrib/serf/auth/auth.h projects/pf/head/contrib/serf/auth/auth_basic.c projects/pf/head/contrib/serf/auth/auth_digest.c projects/pf/head/contrib/serf/buckets/aggregate_buckets.c projects/pf/head/contrib/serf/buckets/buckets.c projects/pf/head/contrib/serf/buckets/dechunk_buckets.c projects/pf/head/contrib/serf/buckets/headers_buckets.c projects/pf/head/contrib/serf/buckets/limit_buckets.c projects/pf/head/contrib/serf/buckets/request_buckets.c projects/pf/head/contrib/serf/buckets/response_buckets.c projects/pf/head/contrib/serf/buckets/simple_buckets.c projects/pf/head/contrib/serf/buckets/ssl_buckets.c projects/pf/head/contrib/serf/build/gen_def.py projects/pf/head/contrib/serf/context.c projects/pf/head/contrib/serf/incoming.c projects/pf/head/contrib/serf/outgoing.c projects/pf/head/contrib/serf/serf.h projects/pf/head/contrib/serf/serf_bucket_types.h projects/pf/head/contrib/serf/serf_bucket_util.h projects/pf/head/contrib/serf/serf_private.h projects/pf/head/contrib/serf/ssltunnel.c projects/pf/head/contrib/subversion/CHANGES projects/pf/head/contrib/subversion/Makefile.in projects/pf/head/contrib/subversion/build-outputs.mk projects/pf/head/contrib/subversion/configure projects/pf/head/contrib/subversion/configure.ac projects/pf/head/contrib/subversion/get-deps.sh projects/pf/head/contrib/subversion/subversion/include/private/svn_client_private.h projects/pf/head/contrib/subversion/subversion/include/private/svn_io_private.h projects/pf/head/contrib/subversion/subversion/include/private/svn_ra_private.h projects/pf/head/contrib/subversion/subversion/include/svn_version.h projects/pf/head/contrib/subversion/subversion/libsvn_client/client.h projects/pf/head/contrib/subversion/subversion/libsvn_client/commit.c projects/pf/head/contrib/subversion/subversion/libsvn_client/copy.c projects/pf/head/contrib/subversion/subversion/libsvn_client/diff.c projects/pf/head/contrib/subversion/subversion/libsvn_client/diff_local.c projects/pf/head/contrib/subversion/subversion/libsvn_client/log.c projects/pf/head/contrib/subversion/subversion/libsvn_client/merge.c projects/pf/head/contrib/subversion/subversion/libsvn_client/mergeinfo.c projects/pf/head/contrib/subversion/subversion/libsvn_client/ra.c projects/pf/head/contrib/subversion/subversion/libsvn_client/switch.c projects/pf/head/contrib/subversion/subversion/libsvn_delta/compat.c projects/pf/head/contrib/subversion/subversion/libsvn_fs_base/bdb/env.c projects/pf/head/contrib/subversion/subversion/libsvn_fs_base/tree.c projects/pf/head/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c projects/pf/head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h projects/pf/head/contrib/subversion/subversion/libsvn_fs_fs/tree.c projects/pf/head/contrib/subversion/subversion/libsvn_ra/ra_loader.c projects/pf/head/contrib/subversion/subversion/libsvn_ra/util.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/blame.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/commit.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/getdate.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/getlocations.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/getlocationsegments.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/getlocks.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/inherited_props.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/log.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/mergeinfo.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/options.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/property.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/replay.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/serf.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/update.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/util.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_serf/xml.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_svn/client.c projects/pf/head/contrib/subversion/subversion/libsvn_ra_svn/protocol projects/pf/head/contrib/subversion/subversion/libsvn_repos/fs-wrap.c projects/pf/head/contrib/subversion/subversion/libsvn_subr/config_file.c projects/pf/head/contrib/subversion/subversion/libsvn_subr/gpg_agent.c projects/pf/head/contrib/subversion/subversion/libsvn_subr/internal_statements.h projects/pf/head/contrib/subversion/subversion/libsvn_subr/io.c projects/pf/head/contrib/subversion/subversion/libsvn_subr/named_atomic.c projects/pf/head/contrib/subversion/subversion/libsvn_subr/sqlite.c projects/pf/head/contrib/subversion/subversion/libsvn_subr/stream.c projects/pf/head/contrib/subversion/subversion/libsvn_subr/subst.c projects/pf/head/contrib/subversion/subversion/libsvn_subr/utf.c projects/pf/head/contrib/subversion/subversion/libsvn_wc/adm_ops.c projects/pf/head/contrib/subversion/subversion/libsvn_wc/crop.c projects/pf/head/contrib/subversion/subversion/libsvn_wc/externals.c projects/pf/head/contrib/subversion/subversion/libsvn_wc/update_editor.c projects/pf/head/contrib/subversion/subversion/libsvn_wc/upgrade.c projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc-checks.h projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc-metadata.h projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc-queries.h projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc-queries.sql projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc_db.c projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc_db.h projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c projects/pf/head/contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c projects/pf/head/contrib/subversion/subversion/libsvn_wc/workqueue.c projects/pf/head/contrib/subversion/subversion/svn/cl.h projects/pf/head/contrib/subversion/subversion/svn/conflict-callbacks.c projects/pf/head/contrib/subversion/subversion/svn/file-merge.c projects/pf/head/contrib/subversion/subversion/svn/merge-cmd.c projects/pf/head/contrib/subversion/subversion/svn/mergeinfo-cmd.c projects/pf/head/contrib/subversion/subversion/svn/svn.c projects/pf/head/contrib/subversion/subversion/svn/util.c projects/pf/head/contrib/subversion/subversion/svnadmin/svnadmin.c projects/pf/head/contrib/subversion/subversion/svnlook/svnlook.c projects/pf/head/contrib/subversion/subversion/svnserve/serve.c projects/pf/head/contrib/subversion/win-tests.py projects/pf/head/contrib/tcpdump/tcpdump.c projects/pf/head/contrib/tzdata/africa projects/pf/head/contrib/tzdata/asia projects/pf/head/contrib/tzdata/australasia projects/pf/head/contrib/tzdata/europe projects/pf/head/contrib/tzdata/southamerica projects/pf/head/contrib/tzdata/zone.tab projects/pf/head/contrib/unbound/config.h.in projects/pf/head/contrib/unbound/configure projects/pf/head/contrib/unbound/configure.ac projects/pf/head/contrib/unbound/daemon/cachedump.c projects/pf/head/contrib/unbound/daemon/remote.c projects/pf/head/contrib/unbound/daemon/remote.h projects/pf/head/contrib/unbound/daemon/unbound.c projects/pf/head/contrib/unbound/daemon/worker.c projects/pf/head/contrib/unbound/daemon/worker.h projects/pf/head/contrib/unbound/libunbound/context.c projects/pf/head/contrib/unbound/libunbound/context.h projects/pf/head/contrib/unbound/libunbound/libunbound.c projects/pf/head/contrib/unbound/libunbound/libworker.c projects/pf/head/contrib/unbound/libunbound/libworker.h projects/pf/head/contrib/unbound/libunbound/unbound.h projects/pf/head/contrib/unbound/smallapp/unbound-anchor.c projects/pf/head/contrib/unbound/smallapp/unbound-control-setup.sh projects/pf/head/contrib/unbound/smallapp/worker_cb.c projects/pf/head/contrib/unbound/util/config_file.c projects/pf/head/contrib/unbound/util/config_file.h projects/pf/head/contrib/unbound/util/configlexer.c projects/pf/head/contrib/unbound/util/configparser.c projects/pf/head/contrib/unbound/util/configparser.h projects/pf/head/contrib/unbound/util/fptr_wlist.c projects/pf/head/contrib/wpa/COPYING projects/pf/head/contrib/wpa/README projects/pf/head/contrib/wpa/hostapd/ChangeLog projects/pf/head/contrib/wpa/hostapd/README projects/pf/head/contrib/wpa/hostapd/README-WPS projects/pf/head/contrib/wpa/hostapd/config_file.c (contents, props changed) projects/pf/head/contrib/wpa/hostapd/config_file.h (contents, props changed) projects/pf/head/contrib/wpa/hostapd/ctrl_iface.c (contents, props changed) projects/pf/head/contrib/wpa/hostapd/ctrl_iface.h (contents, props changed) projects/pf/head/contrib/wpa/hostapd/defconfig projects/pf/head/contrib/wpa/hostapd/dump_state.c (contents, props changed) projects/pf/head/contrib/wpa/hostapd/dump_state.h (contents, props changed) projects/pf/head/contrib/wpa/hostapd/eap_register.c (contents, props changed) projects/pf/head/contrib/wpa/hostapd/eap_register.h (contents, props changed) projects/pf/head/contrib/wpa/hostapd/hlr_auc_gw.c (contents, props changed) projects/pf/head/contrib/wpa/hostapd/hostapd.conf (contents, props changed) projects/pf/head/contrib/wpa/hostapd/hostapd.eap_user projects/pf/head/contrib/wpa/hostapd/hostapd_cli.c (contents, props changed) projects/pf/head/contrib/wpa/hostapd/main.c (contents, props changed) projects/pf/head/contrib/wpa/hostapd/nt_password_hash.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/accounting.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/accounting.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ap_config.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ap_config.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ap_drv_ops.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ap_drv_ops.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ap_list.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ap_list.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ap_mlme.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ap_mlme.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/authsrv.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/authsrv.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/beacon.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/beacon.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ctrl_iface_ap.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ctrl_iface_ap.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/drv_callbacks.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/hostapd.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/hostapd.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/hw_features.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/hw_features.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/iapp.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/iapp.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ieee802_11.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ieee802_11.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ieee802_11_auth.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ieee802_11_auth.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ieee802_11_ht.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ieee802_1x.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/ieee802_1x.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/peerkey_auth.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/pmksa_cache_auth.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/pmksa_cache_auth.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/preauth_auth.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/preauth_auth.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/sta_info.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/sta_info.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/tkip_countermeasures.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/tkip_countermeasures.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/utils.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/vlan_init.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/wmm.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/wpa_auth.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/wpa_auth.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/wpa_auth_ft.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/wpa_auth_glue.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/wpa_auth_glue.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/wpa_auth_i.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/wpa_auth_ie.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/wpa_auth_ie.h (contents, props changed) projects/pf/head/contrib/wpa/src/ap/wps_hostapd.c (contents, props changed) projects/pf/head/contrib/wpa/src/ap/wps_hostapd.h (contents, props changed) projects/pf/head/contrib/wpa/src/common/defs.h projects/pf/head/contrib/wpa/src/common/eapol_common.h projects/pf/head/contrib/wpa/src/common/ieee802_11_common.c projects/pf/head/contrib/wpa/src/common/ieee802_11_common.h projects/pf/head/contrib/wpa/src/common/ieee802_11_defs.h projects/pf/head/contrib/wpa/src/common/privsep_commands.h projects/pf/head/contrib/wpa/src/common/version.h projects/pf/head/contrib/wpa/src/common/wpa_common.c projects/pf/head/contrib/wpa/src/common/wpa_common.h projects/pf/head/contrib/wpa/src/common/wpa_ctrl.c projects/pf/head/contrib/wpa/src/common/wpa_ctrl.h projects/pf/head/contrib/wpa/src/crypto/aes-cbc.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/aes-ctr.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/aes-eax.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/aes-encblock.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/aes-internal-dec.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/aes-internal-enc.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/aes-internal.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/aes-omac1.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/aes-unwrap.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/aes-wrap.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/aes.h projects/pf/head/contrib/wpa/src/crypto/aes_i.h (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/aes_wrap.h projects/pf/head/contrib/wpa/src/crypto/crypto.h projects/pf/head/contrib/wpa/src/crypto/crypto_cryptoapi.c projects/pf/head/contrib/wpa/src/crypto/crypto_gnutls.c projects/pf/head/contrib/wpa/src/crypto/crypto_internal-cipher.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/crypto_internal-modexp.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/crypto_internal-rsa.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/crypto_internal.c projects/pf/head/contrib/wpa/src/crypto/crypto_libtomcrypt.c projects/pf/head/contrib/wpa/src/crypto/crypto_none.c projects/pf/head/contrib/wpa/src/crypto/crypto_nss.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/crypto_openssl.c projects/pf/head/contrib/wpa/src/crypto/des-internal.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/des_i.h (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/dh_group5.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/dh_group5.h (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/dh_groups.c projects/pf/head/contrib/wpa/src/crypto/dh_groups.h projects/pf/head/contrib/wpa/src/crypto/fips_prf_cryptoapi.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/fips_prf_gnutls.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/fips_prf_internal.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/fips_prf_nss.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/fips_prf_openssl.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/md4-internal.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/md5-internal.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/md5.c projects/pf/head/contrib/wpa/src/crypto/md5.h projects/pf/head/contrib/wpa/src/crypto/md5_i.h (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/milenage.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/milenage.h (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/ms_funcs.c projects/pf/head/contrib/wpa/src/crypto/ms_funcs.h projects/pf/head/contrib/wpa/src/crypto/rc4.c projects/pf/head/contrib/wpa/src/crypto/sha1-internal.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/sha1-pbkdf2.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/sha1-tlsprf.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/sha1-tprf.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/sha1.c projects/pf/head/contrib/wpa/src/crypto/sha1.h projects/pf/head/contrib/wpa/src/crypto/sha1_i.h (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/sha256-internal.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/sha256.c projects/pf/head/contrib/wpa/src/crypto/sha256.h projects/pf/head/contrib/wpa/src/crypto/tls.h projects/pf/head/contrib/wpa/src/crypto/tls_gnutls.c projects/pf/head/contrib/wpa/src/crypto/tls_internal.c projects/pf/head/contrib/wpa/src/crypto/tls_none.c projects/pf/head/contrib/wpa/src/crypto/tls_nss.c (contents, props changed) projects/pf/head/contrib/wpa/src/crypto/tls_openssl.c projects/pf/head/contrib/wpa/src/crypto/tls_schannel.c projects/pf/head/contrib/wpa/src/drivers/driver.h projects/pf/head/contrib/wpa/src/drivers/driver_ndis.c projects/pf/head/contrib/wpa/src/drivers/driver_ndis.h projects/pf/head/contrib/wpa/src/drivers/driver_ndis_.c projects/pf/head/contrib/wpa/src/drivers/driver_wired.c projects/pf/head/contrib/wpa/src/drivers/drivers.c projects/pf/head/contrib/wpa/src/drivers/ndis_events.c projects/pf/head/contrib/wpa/src/eap_common/chap.c projects/pf/head/contrib/wpa/src/eap_common/chap.h projects/pf/head/contrib/wpa/src/eap_common/eap_common.c projects/pf/head/contrib/wpa/src/eap_common/eap_common.h projects/pf/head/contrib/wpa/src/eap_common/eap_defs.h projects/pf/head/contrib/wpa/src/eap_common/eap_fast_common.c projects/pf/head/contrib/wpa/src/eap_common/eap_fast_common.h projects/pf/head/contrib/wpa/src/eap_common/eap_gpsk_common.c projects/pf/head/contrib/wpa/src/eap_common/eap_gpsk_common.h projects/pf/head/contrib/wpa/src/eap_common/eap_ikev2_common.c projects/pf/head/contrib/wpa/src/eap_common/eap_ikev2_common.h projects/pf/head/contrib/wpa/src/eap_common/eap_pax_common.c projects/pf/head/contrib/wpa/src/eap_common/eap_pax_common.h projects/pf/head/contrib/wpa/src/eap_common/eap_peap_common.c projects/pf/head/contrib/wpa/src/eap_common/eap_peap_common.h projects/pf/head/contrib/wpa/src/eap_common/eap_psk_common.c projects/pf/head/contrib/wpa/src/eap_common/eap_psk_common.h projects/pf/head/contrib/wpa/src/eap_common/eap_sake_common.c projects/pf/head/contrib/wpa/src/eap_common/eap_sake_common.h projects/pf/head/contrib/wpa/src/eap_common/eap_sim_common.c projects/pf/head/contrib/wpa/src/eap_common/eap_sim_common.h projects/pf/head/contrib/wpa/src/eap_common/eap_tlv_common.h projects/pf/head/contrib/wpa/src/eap_common/eap_ttls.h projects/pf/head/contrib/wpa/src/eap_common/eap_wsc_common.c projects/pf/head/contrib/wpa/src/eap_common/eap_wsc_common.h projects/pf/head/contrib/wpa/src/eap_common/ikev2_common.c projects/pf/head/contrib/wpa/src/eap_common/ikev2_common.h projects/pf/head/contrib/wpa/src/eap_peer/eap.c projects/pf/head/contrib/wpa/src/eap_peer/eap.h projects/pf/head/contrib/wpa/src/eap_peer/eap_aka.c projects/pf/head/contrib/wpa/src/eap_peer/eap_config.h projects/pf/head/contrib/wpa/src/eap_peer/eap_fast.c projects/pf/head/contrib/wpa/src/eap_peer/eap_fast_pac.c projects/pf/head/contrib/wpa/src/eap_peer/eap_fast_pac.h projects/pf/head/contrib/wpa/src/eap_peer/eap_gpsk.c projects/pf/head/contrib/wpa/src/eap_peer/eap_gtc.c projects/pf/head/contrib/wpa/src/eap_peer/eap_i.h projects/pf/head/contrib/wpa/src/eap_peer/eap_ikev2.c projects/pf/head/contrib/wpa/src/eap_peer/eap_leap.c projects/pf/head/contrib/wpa/src/eap_peer/eap_md5.c projects/pf/head/contrib/wpa/src/eap_peer/eap_methods.c projects/pf/head/contrib/wpa/src/eap_peer/eap_methods.h projects/pf/head/contrib/wpa/src/eap_peer/eap_mschapv2.c projects/pf/head/contrib/wpa/src/eap_peer/eap_otp.c projects/pf/head/contrib/wpa/src/eap_peer/eap_pax.c projects/pf/head/contrib/wpa/src/eap_peer/eap_peap.c projects/pf/head/contrib/wpa/src/eap_peer/eap_psk.c projects/pf/head/contrib/wpa/src/eap_peer/eap_sake.c projects/pf/head/contrib/wpa/src/eap_peer/eap_sim.c projects/pf/head/contrib/wpa/src/eap_peer/eap_tls.c projects/pf/head/contrib/wpa/src/eap_peer/eap_tls_common.c projects/pf/head/contrib/wpa/src/eap_peer/eap_tls_common.h projects/pf/head/contrib/wpa/src/eap_peer/eap_tnc.c projects/pf/head/contrib/wpa/src/eap_peer/eap_ttls.c projects/pf/head/contrib/wpa/src/eap_peer/eap_vendor_test.c projects/pf/head/contrib/wpa/src/eap_peer/eap_wsc.c projects/pf/head/contrib/wpa/src/eap_peer/ikev2.c projects/pf/head/contrib/wpa/src/eap_peer/ikev2.h projects/pf/head/contrib/wpa/src/eap_peer/mschapv2.c projects/pf/head/contrib/wpa/src/eap_peer/mschapv2.h projects/pf/head/contrib/wpa/src/eap_peer/tncc.c projects/pf/head/contrib/wpa/src/eap_peer/tncc.h projects/pf/head/contrib/wpa/src/eap_server/eap.h projects/pf/head/contrib/wpa/src/eap_server/eap_i.h projects/pf/head/contrib/wpa/src/eap_server/eap_methods.h projects/pf/head/contrib/wpa/src/eap_server/eap_server.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_aka.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_fast.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_gpsk.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_gtc.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_identity.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_ikev2.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_md5.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_methods.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_mschapv2.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_pax.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_peap.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_psk.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_sake.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_sim.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_tls.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_tls_common.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_tnc.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_ttls.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_vendor_test.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_server_wsc.c (contents, props changed) projects/pf/head/contrib/wpa/src/eap_server/eap_sim_db.c projects/pf/head/contrib/wpa/src/eap_server/eap_sim_db.h projects/pf/head/contrib/wpa/src/eap_server/eap_tls_common.h projects/pf/head/contrib/wpa/src/eap_server/ikev2.c projects/pf/head/contrib/wpa/src/eap_server/ikev2.h projects/pf/head/contrib/wpa/src/eap_server/tncs.c projects/pf/head/contrib/wpa/src/eap_server/tncs.h projects/pf/head/contrib/wpa/src/eapol_auth/eapol_auth_dump.c (contents, props changed) projects/pf/head/contrib/wpa/src/eapol_auth/eapol_auth_sm.c (contents, props changed) projects/pf/head/contrib/wpa/src/eapol_auth/eapol_auth_sm.h (contents, props changed) projects/pf/head/contrib/wpa/src/eapol_auth/eapol_auth_sm_i.h (contents, props changed) projects/pf/head/contrib/wpa/src/eapol_supp/eapol_supp_sm.c projects/pf/head/contrib/wpa/src/eapol_supp/eapol_supp_sm.h projects/pf/head/contrib/wpa/src/l2_packet/l2_packet.h projects/pf/head/contrib/wpa/src/l2_packet/l2_packet_freebsd.c projects/pf/head/contrib/wpa/src/l2_packet/l2_packet_ndis.c projects/pf/head/contrib/wpa/src/l2_packet/l2_packet_none.c projects/pf/head/contrib/wpa/src/radius/radius.c projects/pf/head/contrib/wpa/src/radius/radius.h projects/pf/head/contrib/wpa/src/radius/radius_client.c projects/pf/head/contrib/wpa/src/radius/radius_client.h projects/pf/head/contrib/wpa/src/radius/radius_server.c projects/pf/head/contrib/wpa/src/radius/radius_server.h projects/pf/head/contrib/wpa/src/rsn_supp/peerkey.c projects/pf/head/contrib/wpa/src/rsn_supp/peerkey.h projects/pf/head/contrib/wpa/src/rsn_supp/pmksa_cache.c projects/pf/head/contrib/wpa/src/rsn_supp/pmksa_cache.h projects/pf/head/contrib/wpa/src/rsn_supp/preauth.c projects/pf/head/contrib/wpa/src/rsn_supp/preauth.h projects/pf/head/contrib/wpa/src/rsn_supp/wpa.c projects/pf/head/contrib/wpa/src/rsn_supp/wpa.h projects/pf/head/contrib/wpa/src/rsn_supp/wpa_ft.c projects/pf/head/contrib/wpa/src/rsn_supp/wpa_i.h projects/pf/head/contrib/wpa/src/rsn_supp/wpa_ie.c projects/pf/head/contrib/wpa/src/rsn_supp/wpa_ie.h projects/pf/head/contrib/wpa/src/tls/asn1.c projects/pf/head/contrib/wpa/src/tls/asn1.h projects/pf/head/contrib/wpa/src/tls/bignum.c projects/pf/head/contrib/wpa/src/tls/bignum.h projects/pf/head/contrib/wpa/src/tls/libtommath.c projects/pf/head/contrib/wpa/src/tls/pkcs1.c (contents, props changed) projects/pf/head/contrib/wpa/src/tls/pkcs1.h (contents, props changed) projects/pf/head/contrib/wpa/src/tls/pkcs5.c (contents, props changed) projects/pf/head/contrib/wpa/src/tls/pkcs5.h (contents, props changed) projects/pf/head/contrib/wpa/src/tls/pkcs8.c (contents, props changed) projects/pf/head/contrib/wpa/src/tls/pkcs8.h (contents, props changed) projects/pf/head/contrib/wpa/src/tls/rsa.c projects/pf/head/contrib/wpa/src/tls/rsa.h projects/pf/head/contrib/wpa/src/tls/tlsv1_client.c projects/pf/head/contrib/wpa/src/tls/tlsv1_client.h projects/pf/head/contrib/wpa/src/tls/tlsv1_client_i.h projects/pf/head/contrib/wpa/src/tls/tlsv1_client_read.c projects/pf/head/contrib/wpa/src/tls/tlsv1_client_write.c projects/pf/head/contrib/wpa/src/tls/tlsv1_common.c projects/pf/head/contrib/wpa/src/tls/tlsv1_common.h projects/pf/head/contrib/wpa/src/tls/tlsv1_cred.c projects/pf/head/contrib/wpa/src/tls/tlsv1_cred.h projects/pf/head/contrib/wpa/src/tls/tlsv1_record.c projects/pf/head/contrib/wpa/src/tls/tlsv1_record.h projects/pf/head/contrib/wpa/src/tls/tlsv1_server.c projects/pf/head/contrib/wpa/src/tls/tlsv1_server.h projects/pf/head/contrib/wpa/src/tls/tlsv1_server_i.h projects/pf/head/contrib/wpa/src/tls/tlsv1_server_read.c projects/pf/head/contrib/wpa/src/tls/tlsv1_server_write.c projects/pf/head/contrib/wpa/src/tls/x509v3.c projects/pf/head/contrib/wpa/src/tls/x509v3.h projects/pf/head/contrib/wpa/src/utils/base64.c projects/pf/head/contrib/wpa/src/utils/base64.h projects/pf/head/contrib/wpa/src/utils/build_config.h projects/pf/head/contrib/wpa/src/utils/common.c projects/pf/head/contrib/wpa/src/utils/common.h projects/pf/head/contrib/wpa/src/utils/eloop.c projects/pf/head/contrib/wpa/src/utils/eloop.h projects/pf/head/contrib/wpa/src/utils/eloop_none.c projects/pf/head/contrib/wpa/src/utils/eloop_win.c projects/pf/head/contrib/wpa/src/utils/includes.h projects/pf/head/contrib/wpa/src/utils/ip_addr.c projects/pf/head/contrib/wpa/src/utils/ip_addr.h projects/pf/head/contrib/wpa/src/utils/list.h (contents, props changed) projects/pf/head/contrib/wpa/src/utils/os.h projects/pf/head/contrib/wpa/src/utils/os_internal.c projects/pf/head/contrib/wpa/src/utils/os_none.c projects/pf/head/contrib/wpa/src/utils/os_unix.c projects/pf/head/contrib/wpa/src/utils/os_win32.c projects/pf/head/contrib/wpa/src/utils/pcsc_funcs.c projects/pf/head/contrib/wpa/src/utils/pcsc_funcs.h projects/pf/head/contrib/wpa/src/utils/radiotap.h (contents, props changed) projects/pf/head/contrib/wpa/src/utils/radiotap_iter.h (contents, props changed) projects/pf/head/contrib/wpa/src/utils/state_machine.h projects/pf/head/contrib/wpa/src/utils/trace.c (contents, props changed) projects/pf/head/contrib/wpa/src/utils/trace.h (contents, props changed) projects/pf/head/contrib/wpa/src/utils/uuid.c projects/pf/head/contrib/wpa/src/utils/uuid.h projects/pf/head/contrib/wpa/src/utils/wpa_debug.c projects/pf/head/contrib/wpa/src/utils/wpa_debug.h projects/pf/head/contrib/wpa/src/utils/wpabuf.c projects/pf/head/contrib/wpa/src/utils/wpabuf.h projects/pf/head/contrib/wpa/src/wps/http_client.c (contents, props changed) projects/pf/head/contrib/wpa/src/wps/http_client.h (contents, props changed) projects/pf/head/contrib/wpa/src/wps/http_server.c (contents, props changed) projects/pf/head/contrib/wpa/src/wps/http_server.h (contents, props changed) projects/pf/head/contrib/wpa/src/wps/httpread.c projects/pf/head/contrib/wpa/src/wps/httpread.h projects/pf/head/contrib/wpa/src/wps/ndef.c (contents, props changed) projects/pf/head/contrib/wpa/src/wps/upnp_xml.c (contents, props changed) projects/pf/head/contrib/wpa/src/wps/upnp_xml.h (contents, props changed) projects/pf/head/contrib/wpa/src/wps/wps.c projects/pf/head/contrib/wpa/src/wps/wps.h projects/pf/head/contrib/wpa/src/wps/wps_attr_build.c projects/pf/head/contrib/wpa/src/wps/wps_attr_parse.c projects/pf/head/contrib/wpa/src/wps/wps_attr_process.c projects/pf/head/contrib/wpa/src/wps/wps_common.c projects/pf/head/contrib/wpa/src/wps/wps_defs.h projects/pf/head/contrib/wpa/src/wps/wps_dev_attr.c projects/pf/head/contrib/wpa/src/wps/wps_dev_attr.h projects/pf/head/contrib/wpa/src/wps/wps_enrollee.c projects/pf/head/contrib/wpa/src/wps/wps_er.c (contents, props changed) projects/pf/head/contrib/wpa/src/wps/wps_er.h (contents, props changed) projects/pf/head/contrib/wpa/src/wps/wps_er_ssdp.c (contents, props changed) projects/pf/head/contrib/wpa/src/wps/wps_i.h projects/pf/head/contrib/wpa/src/wps/wps_registrar.c projects/pf/head/contrib/wpa/src/wps/wps_upnp.c projects/pf/head/contrib/wpa/src/wps/wps_upnp.h projects/pf/head/contrib/wpa/src/wps/wps_upnp_ap.c (contents, props changed) projects/pf/head/contrib/wpa/src/wps/wps_upnp_event.c projects/pf/head/contrib/wpa/src/wps/wps_upnp_i.h projects/pf/head/contrib/wpa/src/wps/wps_upnp_ssdp.c projects/pf/head/contrib/wpa/src/wps/wps_upnp_web.c projects/pf/head/contrib/wpa/wpa_supplicant/ChangeLog projects/pf/head/contrib/wpa/wpa_supplicant/README projects/pf/head/contrib/wpa/wpa_supplicant/README-WPS projects/pf/head/contrib/wpa/wpa_supplicant/ap.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/ap.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/bgscan.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/bgscan.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/bgscan_simple.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/blacklist.c projects/pf/head/contrib/wpa/wpa_supplicant/blacklist.h projects/pf/head/contrib/wpa/wpa_supplicant/bss.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/bss.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/config.c projects/pf/head/contrib/wpa/wpa_supplicant/config.h projects/pf/head/contrib/wpa/wpa_supplicant/config_file.c projects/pf/head/contrib/wpa/wpa_supplicant/config_none.c projects/pf/head/contrib/wpa/wpa_supplicant/config_ssid.h projects/pf/head/contrib/wpa/wpa_supplicant/ctrl_iface.c projects/pf/head/contrib/wpa/wpa_supplicant/ctrl_iface.h projects/pf/head/contrib/wpa/wpa_supplicant/ctrl_iface_named_pipe.c projects/pf/head/contrib/wpa/wpa_supplicant/ctrl_iface_udp.c projects/pf/head/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c projects/pf/head/contrib/wpa/wpa_supplicant/dbus/Makefile (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_common.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_common.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_common_i.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_dict_helpers.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_dict_helpers.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_new.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_new.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_wps.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_new_introspect.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_old.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_old.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers_wps.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/defconfig projects/pf/head/contrib/wpa/wpa_supplicant/driver_i.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/eap_register.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/eapol_test.c projects/pf/head/contrib/wpa/wpa_supplicant/events.c projects/pf/head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-signals.py (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/ibss_rsn.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/ibss_rsn.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/main.c projects/pf/head/contrib/wpa/wpa_supplicant/main_none.c projects/pf/head/contrib/wpa/wpa_supplicant/notify.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/notify.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/preauth_test.c projects/pf/head/contrib/wpa/wpa_supplicant/scan.c projects/pf/head/contrib/wpa/wpa_supplicant/scan.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/sme.c (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/sme.h (contents, props changed) projects/pf/head/contrib/wpa/wpa_supplicant/tests/test_eap_sim_common.c projects/pf/head/contrib/wpa/wpa_supplicant/tests/test_wpa.c projects/pf/head/contrib/wpa/wpa_supplicant/wpa_cli.c projects/pf/head/contrib/wpa/wpa_supplicant/wpa_passphrase.c projects/pf/head/contrib/wpa/wpa_supplicant/wpa_priv.c projects/pf/head/contrib/wpa/wpa_supplicant/wpa_supplicant.c projects/pf/head/contrib/wpa/wpa_supplicant/wpa_supplicant.conf projects/pf/head/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h projects/pf/head/contrib/wpa/wpa_supplicant/wpas_glue.c projects/pf/head/contrib/wpa/wpa_supplicant/wpas_glue.h projects/pf/head/contrib/wpa/wpa_supplicant/wps_supplicant.c projects/pf/head/contrib/wpa/wpa_supplicant/wps_supplicant.h projects/pf/head/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h projects/pf/head/crypto/openssh/ChangeLog projects/pf/head/crypto/openssh/FREEBSD-upgrade projects/pf/head/crypto/openssh/README projects/pf/head/crypto/openssh/aclocal.m4 projects/pf/head/crypto/openssh/addrmatch.c projects/pf/head/crypto/openssh/auth-chall.c projects/pf/head/crypto/openssh/auth-krb5.c projects/pf/head/crypto/openssh/auth-options.c projects/pf/head/crypto/openssh/auth-pam.c projects/pf/head/crypto/openssh/auth-rsa.c projects/pf/head/crypto/openssh/auth.c projects/pf/head/crypto/openssh/auth.h projects/pf/head/crypto/openssh/auth1.c projects/pf/head/crypto/openssh/auth2-chall.c projects/pf/head/crypto/openssh/auth2-gss.c projects/pf/head/crypto/openssh/auth2-hostbased.c projects/pf/head/crypto/openssh/auth2-jpake.c projects/pf/head/crypto/openssh/auth2-kbdint.c projects/pf/head/crypto/openssh/auth2-passwd.c projects/pf/head/crypto/openssh/auth2-pubkey.c projects/pf/head/crypto/openssh/auth2.c projects/pf/head/crypto/openssh/authfd.c projects/pf/head/crypto/openssh/authfile.c projects/pf/head/crypto/openssh/bufaux.c projects/pf/head/crypto/openssh/bufbn.c projects/pf/head/crypto/openssh/bufec.c projects/pf/head/crypto/openssh/buffer.c projects/pf/head/crypto/openssh/buffer.h projects/pf/head/crypto/openssh/canohost.c projects/pf/head/crypto/openssh/channels.c projects/pf/head/crypto/openssh/channels.h projects/pf/head/crypto/openssh/cipher-3des1.c projects/pf/head/crypto/openssh/cipher-aes.c projects/pf/head/crypto/openssh/cipher-ctr.c projects/pf/head/crypto/openssh/cipher.c projects/pf/head/crypto/openssh/cipher.h projects/pf/head/crypto/openssh/clientloop.c projects/pf/head/crypto/openssh/clientloop.h projects/pf/head/crypto/openssh/compat.c projects/pf/head/crypto/openssh/config.guess projects/pf/head/crypto/openssh/config.h projects/pf/head/crypto/openssh/config.h.in projects/pf/head/crypto/openssh/defines.h projects/pf/head/crypto/openssh/dh.c projects/pf/head/crypto/openssh/dns.c projects/pf/head/crypto/openssh/groupaccess.c projects/pf/head/crypto/openssh/gss-genr.c projects/pf/head/crypto/openssh/gss-serv-krb5.c projects/pf/head/crypto/openssh/gss-serv.c projects/pf/head/crypto/openssh/hostfile.c projects/pf/head/crypto/openssh/hostfile.h projects/pf/head/crypto/openssh/includes.h projects/pf/head/crypto/openssh/jpake.c projects/pf/head/crypto/openssh/kex.c projects/pf/head/crypto/openssh/kex.h projects/pf/head/crypto/openssh/kexdhc.c projects/pf/head/crypto/openssh/kexdhs.c projects/pf/head/crypto/openssh/kexecdh.c projects/pf/head/crypto/openssh/kexecdhc.c projects/pf/head/crypto/openssh/kexecdhs.c projects/pf/head/crypto/openssh/kexgexc.c projects/pf/head/crypto/openssh/kexgexs.c projects/pf/head/crypto/openssh/key.c projects/pf/head/crypto/openssh/key.h projects/pf/head/crypto/openssh/krl.c projects/pf/head/crypto/openssh/log.c projects/pf/head/crypto/openssh/log.h projects/pf/head/crypto/openssh/loginrec.c projects/pf/head/crypto/openssh/mac.c projects/pf/head/crypto/openssh/mac.h projects/pf/head/crypto/openssh/match.c projects/pf/head/crypto/openssh/misc.c projects/pf/head/crypto/openssh/misc.h projects/pf/head/crypto/openssh/moduli.c projects/pf/head/crypto/openssh/monitor.c projects/pf/head/crypto/openssh/monitor_mm.c projects/pf/head/crypto/openssh/monitor_wrap.c projects/pf/head/crypto/openssh/mux.c projects/pf/head/crypto/openssh/myproposal.h projects/pf/head/crypto/openssh/openbsd-compat/bsd-cygwin_util.c projects/pf/head/crypto/openssh/openbsd-compat/bsd-cygwin_util.h projects/pf/head/crypto/openssh/openbsd-compat/bsd-misc.h projects/pf/head/crypto/openssh/openbsd-compat/openbsd-compat.h projects/pf/head/crypto/openssh/openbsd-compat/port-aix.c projects/pf/head/crypto/openssh/openbsd-compat/port-linux.c projects/pf/head/crypto/openssh/openbsd-compat/xcrypt.c projects/pf/head/crypto/openssh/packet.c projects/pf/head/crypto/openssh/packet.h projects/pf/head/crypto/openssh/pathnames.h projects/pf/head/crypto/openssh/progressmeter.c projects/pf/head/crypto/openssh/readconf.c projects/pf/head/crypto/openssh/readconf.h projects/pf/head/crypto/openssh/readpass.c projects/pf/head/crypto/openssh/roaming_client.c projects/pf/head/crypto/openssh/roaming_common.c projects/pf/head/crypto/openssh/rsa.c projects/pf/head/crypto/openssh/sandbox-systrace.c projects/pf/head/crypto/openssh/schnorr.c projects/pf/head/crypto/openssh/scp.1 projects/pf/head/crypto/openssh/scp.c projects/pf/head/crypto/openssh/servconf.c projects/pf/head/crypto/openssh/servconf.h projects/pf/head/crypto/openssh/serverloop.c projects/pf/head/crypto/openssh/session.c projects/pf/head/crypto/openssh/sftp-client.c projects/pf/head/crypto/openssh/sftp-client.h projects/pf/head/crypto/openssh/sftp-common.c projects/pf/head/crypto/openssh/sftp-glob.c projects/pf/head/crypto/openssh/sftp-server.8 projects/pf/head/crypto/openssh/sftp-server.c projects/pf/head/crypto/openssh/sftp.1 projects/pf/head/crypto/openssh/sftp.c projects/pf/head/crypto/openssh/ssh-add.c projects/pf/head/crypto/openssh/ssh-agent.c projects/pf/head/crypto/openssh/ssh-dss.c projects/pf/head/crypto/openssh/ssh-ecdsa.c projects/pf/head/crypto/openssh/ssh-gss.h projects/pf/head/crypto/openssh/ssh-keygen.1 projects/pf/head/crypto/openssh/ssh-keygen.c projects/pf/head/crypto/openssh/ssh-keyscan.1 projects/pf/head/crypto/openssh/ssh-keyscan.c projects/pf/head/crypto/openssh/ssh-keysign.8 projects/pf/head/crypto/openssh/ssh-keysign.c projects/pf/head/crypto/openssh/ssh-pkcs11-client.c projects/pf/head/crypto/openssh/ssh-pkcs11-helper.8 projects/pf/head/crypto/openssh/ssh-pkcs11-helper.c projects/pf/head/crypto/openssh/ssh-pkcs11.c projects/pf/head/crypto/openssh/ssh-rsa.c projects/pf/head/crypto/openssh/ssh.1 projects/pf/head/crypto/openssh/ssh.c projects/pf/head/crypto/openssh/ssh_config projects/pf/head/crypto/openssh/ssh_config.5 projects/pf/head/crypto/openssh/ssh_namespace.h projects/pf/head/crypto/openssh/sshconnect.c projects/pf/head/crypto/openssh/sshconnect1.c projects/pf/head/crypto/openssh/sshconnect2.c projects/pf/head/crypto/openssh/sshd.8 projects/pf/head/crypto/openssh/sshd.c projects/pf/head/crypto/openssh/sshd_config projects/pf/head/crypto/openssh/sshd_config.5 projects/pf/head/crypto/openssh/sshlogin.c projects/pf/head/crypto/openssh/sshlogin.h projects/pf/head/crypto/openssh/uidswap.c projects/pf/head/crypto/openssh/umac.c projects/pf/head/crypto/openssh/umac.h projects/pf/head/crypto/openssh/umac128.c projects/pf/head/crypto/openssh/uuencode.c projects/pf/head/crypto/openssh/version.h projects/pf/head/crypto/openssh/xmalloc.c projects/pf/head/crypto/openssh/xmalloc.h projects/pf/head/crypto/openssl/ssl/s3_cbc.c projects/pf/head/etc/Makefile projects/pf/head/etc/defaults/periodic.conf projects/pf/head/etc/defaults/rc.conf projects/pf/head/etc/devd/usb.conf projects/pf/head/etc/ftpusers projects/pf/head/etc/group projects/pf/head/etc/master.passwd projects/pf/head/etc/mtree/BSD.include.dist projects/pf/head/etc/mtree/BSD.root.dist projects/pf/head/etc/mtree/BSD.usr.dist projects/pf/head/etc/mtree/BSD.var.dist projects/pf/head/etc/mtree/Makefile projects/pf/head/etc/namedb/named.conf projects/pf/head/etc/network.subr projects/pf/head/etc/newsyslog.conf projects/pf/head/etc/periodic/daily/450.status-security projects/pf/head/etc/periodic/daily/Makefile projects/pf/head/etc/periodic/monthly/Makefile projects/pf/head/etc/periodic/security/100.chksetuid projects/pf/head/etc/periodic/security/110.neggrpperm projects/pf/head/etc/periodic/security/200.chkmounts projects/pf/head/etc/periodic/security/300.chkuid0 projects/pf/head/etc/periodic/security/400.passwdless projects/pf/head/etc/periodic/security/410.logincheck projects/pf/head/etc/periodic/security/460.chkportsum projects/pf/head/etc/periodic/security/500.ipfwdenied projects/pf/head/etc/periodic/security/510.ipfdenied projects/pf/head/etc/periodic/security/520.pfdenied projects/pf/head/etc/periodic/security/550.ipfwlimit projects/pf/head/etc/periodic/security/610.ipf6denied projects/pf/head/etc/periodic/security/700.kernelmsg projects/pf/head/etc/periodic/security/800.loginfail projects/pf/head/etc/periodic/security/900.tcpwrap projects/pf/head/etc/periodic/security/security.functions projects/pf/head/etc/periodic/weekly/Makefile projects/pf/head/etc/portsnap.conf projects/pf/head/etc/rc.d/Makefile projects/pf/head/etc/rc.d/NETWORKING projects/pf/head/etc/rc.d/addswap projects/pf/head/etc/rc.d/bsnmpd projects/pf/head/etc/rc.d/fsck projects/pf/head/etc/rc.d/hostapd projects/pf/head/etc/rc.d/initrandom projects/pf/head/etc/rc.d/ipfilter projects/pf/head/etc/rc.d/ipfs projects/pf/head/etc/rc.d/ipmon projects/pf/head/etc/rc.d/jail projects/pf/head/etc/rc.d/mdconfig projects/pf/head/etc/rc.d/netif projects/pf/head/etc/rc.d/pfsync projects/pf/head/etc/rc.d/routing projects/pf/head/etc/rc.d/savecore projects/pf/head/etc/rc.d/sendmail projects/pf/head/etc/rc.d/sshd projects/pf/head/etc/rc.d/zfs projects/pf/head/etc/rc.resume projects/pf/head/etc/rc.subr projects/pf/head/etc/syslog.conf projects/pf/head/games/fortune/datfiles/freebsd-tips projects/pf/head/gnu/lib/Makefile projects/pf/head/gnu/lib/libdialog/Makefile projects/pf/head/gnu/lib/libdialog/dlg_config.h projects/pf/head/gnu/lib/libstdc++/Makefile projects/pf/head/gnu/lib/libstdc++/config.h projects/pf/head/gnu/lib/libsupc++/Makefile projects/pf/head/gnu/usr.bin/Makefile projects/pf/head/gnu/usr.bin/binutils/Makefile projects/pf/head/gnu/usr.bin/cc/Makefile projects/pf/head/gnu/usr.bin/cc/cc_tools/freebsd-native.h projects/pf/head/gnu/usr.bin/cc/include/Makefile projects/pf/head/gnu/usr.bin/grep/grep.c projects/pf/head/gnu/usr.bin/groff/tmac/mdoc.local projects/pf/head/include/Makefile projects/pf/head/include/dirent.h projects/pf/head/include/gssapi/gssapi.h projects/pf/head/include/iconv.h projects/pf/head/include/paths.h projects/pf/head/include/stdlib.h projects/pf/head/include/unistd.h projects/pf/head/kerberos5/Makefile.inc projects/pf/head/kerberos5/lib/libheimipcc/Makefile projects/pf/head/kerberos5/lib/libheimipcs/Makefile projects/pf/head/kerberos5/lib/libkrb5/Makefile projects/pf/head/kerberos5/libexec/digest-service/Makefile projects/pf/head/kerberos5/libexec/kcm/Makefile projects/pf/head/lib/Makefile projects/pf/head/lib/clang/Makefile projects/pf/head/lib/clang/clang.build.mk projects/pf/head/lib/clang/libllvmmc/Makefile projects/pf/head/lib/clang/libllvmsupport/Makefile projects/pf/head/lib/clang/libllvmx86disassembler/Makefile projects/pf/head/lib/csu/arm/crt1.c projects/pf/head/lib/csu/common/notes.h projects/pf/head/lib/libarchive/Makefile projects/pf/head/lib/libc++/Makefile projects/pf/head/lib/libc/Makefile projects/pf/head/lib/libc/amd64/sys/setlogin.S projects/pf/head/lib/libc/arm/_fpmath.h projects/pf/head/lib/libc/arm/arith.h projects/pf/head/lib/libc/arm/gen/sigsetjmp.S projects/pf/head/lib/libc/arm/softfloat/arm-gcc.h projects/pf/head/lib/libc/db/btree/bt_open.c projects/pf/head/lib/libc/db/hash/hash.c projects/pf/head/lib/libc/db/hash/hash_page.c projects/pf/head/lib/libc/gen/Makefile.inc projects/pf/head/lib/libc/gen/Symbol.map projects/pf/head/lib/libc/gen/closedir.c projects/pf/head/lib/libc/gen/directory.3 projects/pf/head/lib/libc/gen/errlst.c projects/pf/head/lib/libc/gen/fnmatch.c projects/pf/head/lib/libc/gen/getlogin.c projects/pf/head/lib/libc/gen/getutxent.c projects/pf/head/lib/libc/gen/lockf.3 projects/pf/head/lib/libc/gen/siginterrupt.c projects/pf/head/lib/libc/gen/signal.3 projects/pf/head/lib/libc/gen/signal.c projects/pf/head/lib/libc/gen/strtofflags.c projects/pf/head/lib/libc/gen/sysctl.3 projects/pf/head/lib/libc/gen/wordexp.c projects/pf/head/lib/libc/gmon/gmon.c projects/pf/head/lib/libc/i386/sys/setlogin.S projects/pf/head/lib/libc/iconv/Symbol.map projects/pf/head/lib/libc/iconv/citrus_csmapper.c projects/pf/head/lib/libc/iconv/citrus_iconv.c projects/pf/head/lib/libc/iconv/citrus_iconv.h projects/pf/head/lib/libc/iconv/citrus_iconv_local.h projects/pf/head/lib/libc/iconv/citrus_lock.h projects/pf/head/lib/libc/iconv/citrus_mapper.c projects/pf/head/lib/libc/iconv/citrus_none.c projects/pf/head/lib/libc/iconv/citrus_stdenc.h projects/pf/head/lib/libc/iconv/citrus_stdenc_local.h projects/pf/head/lib/libc/iconv/citrus_stdenc_template.h projects/pf/head/lib/libc/iconv/iconv.c projects/pf/head/lib/libc/include/compat.h projects/pf/head/lib/libc/include/libc_private.h projects/pf/head/lib/libc/locale/cXXrtomb_iconv.h projects/pf/head/lib/libc/locale/mbrtocXX_iconv.h projects/pf/head/lib/libc/net/ether_addr.c projects/pf/head/lib/libc/net/eui64.c projects/pf/head/lib/libc/net/getaddrinfo.3 projects/pf/head/lib/libc/net/getaddrinfo.c projects/pf/head/lib/libc/net/gethostbyht.c projects/pf/head/lib/libc/net/gethostbyname.3 projects/pf/head/lib/libc/net/getnameinfo.3 projects/pf/head/lib/libc/net/getnetbyht.c projects/pf/head/lib/libc/net/getprotoent.c projects/pf/head/lib/libc/net/getservent.c projects/pf/head/lib/libc/net/hesiod.c projects/pf/head/lib/libc/net/if_nametoindex.c projects/pf/head/lib/libc/net/name6.c projects/pf/head/lib/libc/net/nscachedcli.c projects/pf/head/lib/libc/net/nsdispatch.c projects/pf/head/lib/libc/net/rcmd.c projects/pf/head/lib/libc/net/sctp_sys_calls.c projects/pf/head/lib/libc/posix1e/mac.c projects/pf/head/lib/libc/resolv/res_init.c projects/pf/head/lib/libc/resolv/res_query.c projects/pf/head/lib/libc/resolv/res_send.c projects/pf/head/lib/libc/sparc64/gen/makecontext.c projects/pf/head/lib/libc/sparc64/gen/signalcontext.c projects/pf/head/lib/libc/stdio/Makefile.inc projects/pf/head/lib/libc/stdio/Symbol.map projects/pf/head/lib/libc/stdio/flags.c projects/pf/head/lib/libc/stdio/fwrite.c projects/pf/head/lib/libc/stdio/mktemp.3 projects/pf/head/lib/libc/stdio/mktemp.c projects/pf/head/lib/libc/stdio/xprintf_errno.c projects/pf/head/lib/libc/stdlib/getenv.c projects/pf/head/lib/libc/stdlib/rand.c projects/pf/head/lib/libc/stdlib/strtonum.3 projects/pf/head/lib/libc/stdlib/system.c projects/pf/head/lib/libc/string/strerror.c projects/pf/head/lib/libc/sys/Makefile.inc projects/pf/head/lib/libc/sys/Symbol.map projects/pf/head/lib/libc/sys/accept.2 projects/pf/head/lib/libc/sys/cap_ioctls_limit.2 projects/pf/head/lib/libc/sys/chflags.2 projects/pf/head/lib/libc/sys/close.2 projects/pf/head/lib/libc/sys/dup.2 projects/pf/head/lib/libc/sys/ioctl.2 projects/pf/head/lib/libc/sys/kqueue.2 projects/pf/head/lib/libc/sys/mmap.2 projects/pf/head/lib/libc/sys/pdfork.2 projects/pf/head/lib/libc/sys/pselect.2 projects/pf/head/lib/libc/sys/ptrace.2 projects/pf/head/lib/libc/sys/read.2 projects/pf/head/lib/libc/sys/sigaction.2 projects/pf/head/lib/libc/sys/sigpending.2 projects/pf/head/lib/libc/sys/sigreturn.2 projects/pf/head/lib/libc/sys/sigsuspend.2 projects/pf/head/lib/libc/sys/sigwait.2 projects/pf/head/lib/libc/sys/socketpair.2 projects/pf/head/lib/libc/sys/wait.2 projects/pf/head/lib/libc/sys/write.2 projects/pf/head/lib/libcompiler_rt/Makefile projects/pf/head/lib/libcrypt/tests/crypt_tests.c projects/pf/head/lib/libdwarf/dwarf_init.c projects/pf/head/lib/libdwarf/dwarf_loc.c projects/pf/head/lib/libedit/readline.c projects/pf/head/lib/libelf/libelf_data.c projects/pf/head/lib/libfetch/common.c projects/pf/head/lib/libfetch/common.h projects/pf/head/lib/libfetch/fetch.3 projects/pf/head/lib/libfetch/fetch.c projects/pf/head/lib/libfetch/http.c projects/pf/head/lib/libgeom/geom_xml2tree.c projects/pf/head/lib/libgeom/libgeom.h projects/pf/head/lib/libiconv_modules/BIG5/citrus_big5.c projects/pf/head/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c projects/pf/head/lib/libiconv_modules/EUC/citrus_euc.c projects/pf/head/lib/libiconv_modules/EUCTW/citrus_euctw.c projects/pf/head/lib/libiconv_modules/GBK2K/citrus_gbk2k.c projects/pf/head/lib/libiconv_modules/HZ/citrus_hz.c projects/pf/head/lib/libiconv_modules/ISO2022/citrus_iso2022.c projects/pf/head/lib/libiconv_modules/JOHAB/citrus_johab.c projects/pf/head/lib/libiconv_modules/MSKanji/citrus_mskanji.c projects/pf/head/lib/libiconv_modules/Makefile.inc projects/pf/head/lib/libiconv_modules/UES/citrus_ues.c projects/pf/head/lib/libiconv_modules/UTF1632/citrus_utf1632.c projects/pf/head/lib/libiconv_modules/UTF7/citrus_utf7.c projects/pf/head/lib/libiconv_modules/UTF8/citrus_utf8.c projects/pf/head/lib/libiconv_modules/VIQR/citrus_viqr.c projects/pf/head/lib/libiconv_modules/ZW/citrus_zw.c projects/pf/head/lib/libiconv_modules/iconv_none/citrus_iconv_none.c projects/pf/head/lib/libiconv_modules/iconv_std/citrus_iconv_std.c projects/pf/head/lib/libkiconv/xlat16_iconv.c projects/pf/head/lib/libkvm/Makefile projects/pf/head/lib/libkvm/kvm.h projects/pf/head/lib/libldns/Makefile projects/pf/head/lib/libpam/libpam/Makefile projects/pf/head/lib/libpam/modules/pam_passwdqc/Makefile projects/pf/head/lib/libpam/modules/pam_ssh/Makefile projects/pf/head/lib/libproc/_libproc.h projects/pf/head/lib/libproc/proc_sym.c projects/pf/head/lib/libprocstat/Makefile projects/pf/head/lib/libprocstat/common_kvm.h projects/pf/head/lib/libprocstat/libprocstat.c projects/pf/head/lib/libprocstat/libprocstat.h projects/pf/head/lib/librt/sigev_thread.c projects/pf/head/lib/libstand/nfs.c projects/pf/head/lib/libstand/tftp.c projects/pf/head/lib/libthread_db/arch/arm/libpthread_md.c projects/pf/head/lib/libthread_db/arch/sparc64/libpthread_md.c projects/pf/head/lib/libusb/Makefile projects/pf/head/lib/libusb/libusb20.c projects/pf/head/lib/libusb/libusb20_ugen20.c projects/pf/head/lib/libusb/libusb_global_linux.h projects/pf/head/lib/libutil/expand_number.c projects/pf/head/lib/libutil/humanize_number.3 projects/pf/head/lib/libutil/humanize_number.c projects/pf/head/lib/libutil/login_auth.c projects/pf/head/lib/libutil/login_cap.c projects/pf/head/lib/libutil/login_times.c projects/pf/head/lib/libutil/pidfile.c projects/pf/head/lib/libutil/quotafile.c projects/pf/head/lib/libutil/uucplock.c projects/pf/head/lib/libvmmapi/vmmapi.c projects/pf/head/lib/libvmmapi/vmmapi.h projects/pf/head/lib/libyaml/Makefile projects/pf/head/lib/libz/zopen.c projects/pf/head/lib/msun/Makefile projects/pf/head/lib/msun/Symbol.map projects/pf/head/lib/msun/src/math.h projects/pf/head/lib/msun/src/math_private.h projects/pf/head/lib/msun/src/s_erf.c projects/pf/head/lib/msun/src/s_erff.c projects/pf/head/lib/msun/src/s_fma.c projects/pf/head/lib/msun/src/s_fmal.c projects/pf/head/libexec/rtld-elf/libmap.c projects/pf/head/libexec/rtld-elf/libmap.h projects/pf/head/libexec/rtld-elf/rtld.c projects/pf/head/libexec/rtld-elf/rtld.h projects/pf/head/release/Makefile projects/pf/head/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/pf/head/release/ia64/mkisoimages.sh projects/pf/head/release/picobsd/build/picobsd projects/pf/head/release/picobsd/floppy.tree/etc/rc1 projects/pf/head/release/picobsd/floppy.tree/etc/ssh/sshd_config projects/pf/head/release/powerpc/mkisoimages.sh projects/pf/head/release/release.conf.sample projects/pf/head/release/release.sh projects/pf/head/release/scripts/mm-mtree.sh projects/pf/head/release/sparc64/mkisoimages.sh projects/pf/head/rescue/rescue/Makefile projects/pf/head/sbin/bsdlabel/bsdlabel.8 projects/pf/head/sbin/camcontrol/camcontrol.8 projects/pf/head/sbin/camcontrol/camcontrol.c projects/pf/head/sbin/camcontrol/fwdownload.c projects/pf/head/sbin/camcontrol/modeedit.c projects/pf/head/sbin/ccdconfig/ccdconfig.8 projects/pf/head/sbin/devd/devd.8 projects/pf/head/sbin/devd/devd.cc projects/pf/head/sbin/devfs/devfs.8 projects/pf/head/sbin/dhclient/bpf.c projects/pf/head/sbin/dhclient/clparse.c projects/pf/head/sbin/dhclient/dhclient.c projects/pf/head/sbin/dhclient/dhcpd.h projects/pf/head/sbin/dhclient/packet.c projects/pf/head/sbin/dhclient/privsep.c projects/pf/head/sbin/dhclient/privsep.h projects/pf/head/sbin/etherswitchcfg/etherswitchcfg.8 projects/pf/head/sbin/etherswitchcfg/etherswitchcfg.c projects/pf/head/sbin/fdisk/fdisk.8 projects/pf/head/sbin/fdisk_pc98/fdisk.c projects/pf/head/sbin/fsck_ffs/fsck.h projects/pf/head/sbin/fsck_ffs/fsck_ffs.8 projects/pf/head/sbin/fsck_ffs/fsutil.c projects/pf/head/sbin/fsck_ffs/main.c projects/pf/head/sbin/gbde/gbde.8 projects/pf/head/sbin/geom/class/eli/geli.8 projects/pf/head/sbin/geom/class/part/gpart.8 projects/pf/head/sbin/geom/class/shsec/gshsec.8 projects/pf/head/sbin/geom/class/virstor/gvirstor.8 projects/pf/head/sbin/gvinum/gvinum.8 projects/pf/head/sbin/gvinum/gvinum.c projects/pf/head/sbin/hastctl/hastctl.c projects/pf/head/sbin/hastd/control.c projects/pf/head/sbin/hastd/hast.h projects/pf/head/sbin/hastd/hastd.8 projects/pf/head/sbin/hastd/primary.c projects/pf/head/sbin/hastd/refcnt.h projects/pf/head/sbin/hastd/secondary.c projects/pf/head/sbin/hastd/subr.c projects/pf/head/sbin/ifconfig/af_nd6.c projects/pf/head/sbin/init/init.c projects/pf/head/sbin/ipf/ipf/Makefile projects/pf/head/sbin/ipf/ipftest/Makefile projects/pf/head/sbin/ipf/libipf/Makefile projects/pf/head/sbin/ipfw/ipfw.8 projects/pf/head/sbin/iscontrol/auth_subr.c projects/pf/head/sbin/iscontrol/config.c projects/pf/head/sbin/iscontrol/fsm.c projects/pf/head/sbin/iscontrol/iscontrol.8 projects/pf/head/sbin/iscontrol/iscontrol.c projects/pf/head/sbin/iscontrol/iscsi.conf.5 projects/pf/head/sbin/iscontrol/login.c projects/pf/head/sbin/iscontrol/misc.c projects/pf/head/sbin/iscontrol/pdu.c projects/pf/head/sbin/mdconfig/mdconfig.8 projects/pf/head/sbin/mdconfig/mdconfig.c projects/pf/head/sbin/mount/Makefile (contents, props changed) projects/pf/head/sbin/mount/mount.8 projects/pf/head/sbin/mount/mount.c projects/pf/head/sbin/mount_msdosfs/mount_msdosfs.8 projects/pf/head/sbin/mount_nfs/mount_nfs.8 projects/pf/head/sbin/newfs/newfs.8 projects/pf/head/sbin/newfs_msdos/newfs_msdos.8 projects/pf/head/sbin/newfs_msdos/newfs_msdos.c projects/pf/head/sbin/newfs_nandfs/newfs_nandfs.8 projects/pf/head/sbin/nos-tun/nos-tun.c projects/pf/head/sbin/nvmecontrol/Makefile projects/pf/head/sbin/nvmecontrol/nvmecontrol.8 projects/pf/head/sbin/nvmecontrol/nvmecontrol.c projects/pf/head/sbin/reboot/boot_i386.8 projects/pf/head/sbin/recoverdisk/recoverdisk.1 projects/pf/head/sbin/route/Makefile projects/pf/head/sbin/route/keywords projects/pf/head/sbin/route/route.8 projects/pf/head/sbin/route/route.c projects/pf/head/sbin/swapon/swapon.8 projects/pf/head/sbin/swapon/swapon.c projects/pf/head/secure/lib/libssh/Makefile projects/pf/head/secure/libexec/sftp-server/Makefile projects/pf/head/secure/libexec/ssh-keysign/Makefile projects/pf/head/secure/libexec/ssh-pkcs11-helper/Makefile projects/pf/head/secure/usr.bin/bdes/bdes.1 projects/pf/head/secure/usr.bin/scp/Makefile projects/pf/head/secure/usr.bin/sftp/Makefile projects/pf/head/secure/usr.bin/ssh-add/Makefile projects/pf/head/secure/usr.bin/ssh-agent/Makefile projects/pf/head/secure/usr.bin/ssh-keygen/Makefile projects/pf/head/secure/usr.bin/ssh-keyscan/Makefile projects/pf/head/secure/usr.bin/ssh/Makefile projects/pf/head/secure/usr.sbin/sshd/Makefile projects/pf/head/share/Makefile projects/pf/head/share/doc/Makefile projects/pf/head/share/doc/legal/Makefile projects/pf/head/share/examples/Makefile projects/pf/head/share/examples/bhyve/vmrun.sh projects/pf/head/share/examples/etc/README.examples projects/pf/head/share/examples/etc/make.conf projects/pf/head/share/examples/kld/Makefile projects/pf/head/share/examples/kld/syscall/test/call.c projects/pf/head/share/examples/scsi_target/scsi_target.c projects/pf/head/share/i18n/csmapper/Makefile projects/pf/head/share/i18n/esdb/Makefile projects/pf/head/share/man/man4/Makefile projects/pf/head/share/man/man4/altera_avgen.4 projects/pf/head/share/man/man4/altq.4 projects/pf/head/share/man/man4/ath_hal.4 projects/pf/head/share/man/man4/axe.4 projects/pf/head/share/man/man4/bridge.4 projects/pf/head/share/man/man4/bxe.4 projects/pf/head/share/man/man4/capsicum.4 projects/pf/head/share/man/man4/cd.4 projects/pf/head/share/man/man4/ciss.4 projects/pf/head/share/man/man4/ctl.4 projects/pf/head/share/man/man4/ddb.4 projects/pf/head/share/man/man4/geom.4 projects/pf/head/share/man/man4/geom_linux_lvm.4 projects/pf/head/share/man/man4/hptiop.4 projects/pf/head/share/man/man4/mfi.4 projects/pf/head/share/man/man4/netgraph.4 projects/pf/head/share/man/man4/netmap.4 projects/pf/head/share/man/man4/ntb.4 projects/pf/head/share/man/man4/nvd.4 projects/pf/head/share/man/man4/nvme.4 projects/pf/head/share/man/man4/oce.4 projects/pf/head/share/man/man4/psm.4 projects/pf/head/share/man/man4/random.4 projects/pf/head/share/man/man4/sa.4 projects/pf/head/share/man/man4/sysmouse.4 projects/pf/head/share/man/man4/udav.4 projects/pf/head/share/man/man4/urtwn.4 projects/pf/head/share/man/man4/usb_quirk.4 projects/pf/head/share/man/man4/virtio.4 projects/pf/head/share/man/man4/virtio_balloon.4 projects/pf/head/share/man/man4/virtio_blk.4 projects/pf/head/share/man/man4/virtio_scsi.4 projects/pf/head/share/man/man4/vlan.4 projects/pf/head/share/man/man4/vtnet.4 projects/pf/head/share/man/man5/Makefile projects/pf/head/share/man/man5/ext2fs.5 projects/pf/head/share/man/man5/fstab.5 projects/pf/head/share/man/man5/libmap.conf.5 projects/pf/head/share/man/man5/msdosfs.5 projects/pf/head/share/man/man5/periodic.conf.5 projects/pf/head/share/man/man5/rc.conf.5 projects/pf/head/share/man/man5/reiserfs.5 projects/pf/head/share/man/man5/src.conf.5 projects/pf/head/share/man/man7/Makefile projects/pf/head/share/man/man7/ports.7 projects/pf/head/share/man/man7/release.7 projects/pf/head/share/man/man8/picobsd.8 projects/pf/head/share/man/man8/rc.8 projects/pf/head/share/man/man8/rc.subr.8 projects/pf/head/share/man/man9/EVENTHANDLER.9 projects/pf/head/share/man/man9/Makefile projects/pf/head/share/man/man9/VOP_FSYNC.9 projects/pf/head/share/man/man9/VOP_GETPAGES.9 projects/pf/head/share/man/man9/atomic.9 projects/pf/head/share/man/man9/bus_dma.9 projects/pf/head/share/man/man9/firmware.9 projects/pf/head/share/man/man9/hhook.9 projects/pf/head/share/man/man9/lock.9 projects/pf/head/share/man/man9/locking.9 projects/pf/head/share/man/man9/microuptime.9 projects/pf/head/share/man/man9/mutex.9 projects/pf/head/share/man/man9/netisr.9 projects/pf/head/share/man/man9/pfil.9 projects/pf/head/share/man/man9/rmlock.9 projects/pf/head/share/man/man9/rtentry.9 projects/pf/head/share/man/man9/rwlock.9 projects/pf/head/share/man/man9/sleep.9 projects/pf/head/share/man/man9/sysctl.9 projects/pf/head/share/man/man9/sysctl_add_oid.9 projects/pf/head/share/man/man9/timeout.9 projects/pf/head/share/man/man9/vm_map_find.9 projects/pf/head/share/man/man9/vm_page_alloc.9 projects/pf/head/share/man/man9/vm_page_grab.9 projects/pf/head/share/man/man9/vnode.9 projects/pf/head/share/misc/bsd-family-tree projects/pf/head/share/misc/committers-ports.dot projects/pf/head/share/misc/committers-src.dot projects/pf/head/share/mk/atf.test.mk projects/pf/head/share/mk/bsd.lib.mk projects/pf/head/share/mk/bsd.libnames.mk projects/pf/head/share/mk/bsd.own.mk projects/pf/head/share/mk/bsd.prog.mk projects/pf/head/share/mk/sys.mk projects/pf/head/share/monetdef/Makefile projects/pf/head/share/syscons/keymaps/INDEX.keymaps projects/pf/head/sys/amd64/amd64/apic_vector.S projects/pf/head/sys/amd64/amd64/cpu_switch.S projects/pf/head/sys/amd64/amd64/db_disasm.c projects/pf/head/sys/amd64/amd64/genassym.c projects/pf/head/sys/amd64/amd64/identcpu.c projects/pf/head/sys/amd64/amd64/initcpu.c projects/pf/head/sys/amd64/amd64/machdep.c projects/pf/head/sys/amd64/amd64/minidump_machdep.c projects/pf/head/sys/amd64/amd64/mp_machdep.c projects/pf/head/sys/amd64/amd64/pmap.c projects/pf/head/sys/amd64/amd64/sys_machdep.c projects/pf/head/sys/amd64/amd64/trap.c projects/pf/head/sys/amd64/amd64/vm_machdep.c projects/pf/head/sys/amd64/conf/GENERIC projects/pf/head/sys/amd64/conf/NOTES projects/pf/head/sys/amd64/include/acpica_machdep.h projects/pf/head/sys/amd64/include/apicvar.h projects/pf/head/sys/amd64/include/asm.h projects/pf/head/sys/amd64/include/atomic.h projects/pf/head/sys/amd64/include/counter.h projects/pf/head/sys/amd64/include/cpu.h projects/pf/head/sys/amd64/include/cpufunc.h projects/pf/head/sys/amd64/include/intr_machdep.h projects/pf/head/sys/amd64/include/md_var.h projects/pf/head/sys/amd64/include/pcpu.h projects/pf/head/sys/amd64/include/pmap.h projects/pf/head/sys/amd64/include/sf_buf.h projects/pf/head/sys/amd64/include/smp.h projects/pf/head/sys/amd64/include/vmm.h (contents, props changed) projects/pf/head/sys/amd64/include/vmm_dev.h (contents, props changed) projects/pf/head/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/pf/head/sys/amd64/include/vmparam.h projects/pf/head/sys/amd64/include/xen/hypercall.h projects/pf/head/sys/amd64/include/xen/xen-os.h projects/pf/head/sys/amd64/linux32/linux32_machdep.c projects/pf/head/sys/amd64/linux32/linux32_proto.h projects/pf/head/sys/amd64/linux32/linux32_syscall.h projects/pf/head/sys/amd64/linux32/linux32_syscalls.c projects/pf/head/sys/amd64/linux32/linux32_sysent.c projects/pf/head/sys/amd64/vmm/amd/amdv.c projects/pf/head/sys/amd64/vmm/intel/ept.c projects/pf/head/sys/amd64/vmm/intel/ept.h projects/pf/head/sys/amd64/vmm/intel/vmcs.c projects/pf/head/sys/amd64/vmm/intel/vmcs.h projects/pf/head/sys/amd64/vmm/intel/vmx.c projects/pf/head/sys/amd64/vmm/intel/vmx.h projects/pf/head/sys/amd64/vmm/intel/vmx_controls.h projects/pf/head/sys/amd64/vmm/intel/vmx_genassym.c projects/pf/head/sys/amd64/vmm/intel/vmx_support.S projects/pf/head/sys/amd64/vmm/intel/vtd.c projects/pf/head/sys/amd64/vmm/io/ppt.c projects/pf/head/sys/amd64/vmm/io/ppt.h projects/pf/head/sys/amd64/vmm/vmm.c projects/pf/head/sys/amd64/vmm/vmm_dev.c projects/pf/head/sys/amd64/vmm/vmm_instruction_emul.c projects/pf/head/sys/amd64/vmm/vmm_mem.c projects/pf/head/sys/amd64/vmm/vmm_mem.h projects/pf/head/sys/amd64/vmm/vmm_msr.c projects/pf/head/sys/amd64/vmm/x86.c projects/pf/head/sys/amd64/vmm/x86.h projects/pf/head/sys/arm/allwinner/common.c projects/pf/head/sys/arm/allwinner/files.a10 projects/pf/head/sys/arm/allwinner/timer.c projects/pf/head/sys/arm/arm/bus_space_generic.c projects/pf/head/sys/arm/arm/busdma_machdep-v6.c projects/pf/head/sys/arm/arm/busdma_machdep.c projects/pf/head/sys/arm/arm/cpufunc.c projects/pf/head/sys/arm/arm/cpufunc_asm_armv7.S projects/pf/head/sys/arm/arm/db_trace.c projects/pf/head/sys/arm/arm/elf_trampoline.c projects/pf/head/sys/arm/arm/exception.S projects/pf/head/sys/arm/arm/fusu.S projects/pf/head/sys/arm/arm/genassym.c projects/pf/head/sys/arm/arm/gic.c projects/pf/head/sys/arm/arm/identcpu.c projects/pf/head/sys/arm/arm/irq_dispatch.S projects/pf/head/sys/arm/arm/locore.S projects/pf/head/sys/arm/arm/machdep.c projects/pf/head/sys/arm/arm/mp_machdep.c projects/pf/head/sys/arm/arm/mpcore_timer.c projects/pf/head/sys/arm/arm/pl310.c projects/pf/head/sys/arm/arm/pmap-v6.c projects/pf/head/sys/arm/arm/pmap.c projects/pf/head/sys/arm/arm/stdatomic.c projects/pf/head/sys/arm/arm/swtch.S projects/pf/head/sys/arm/arm/sys_machdep.c projects/pf/head/sys/arm/arm/trap.c projects/pf/head/sys/arm/arm/undefined.c projects/pf/head/sys/arm/arm/vfp.c projects/pf/head/sys/arm/arm/vm_machdep.c projects/pf/head/sys/arm/at91/at91.c projects/pf/head/sys/arm/broadcom/bcm2835/bcm2835_fb.c projects/pf/head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/pf/head/sys/arm/broadcom/bcm2835/bcm2835_mbox.c projects/pf/head/sys/arm/broadcom/bcm2835/bcm2835_mbox.h projects/pf/head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/pf/head/sys/arm/broadcom/bcm2835/bcm2835_systimer.c projects/pf/head/sys/arm/broadcom/bcm2835/files.bcm2835 projects/pf/head/sys/arm/conf/ARMADAXP projects/pf/head/sys/arm/conf/BEAGLEBONE projects/pf/head/sys/arm/conf/CUBIEBOARD projects/pf/head/sys/arm/conf/EFIKA_MX projects/pf/head/sys/arm/conf/PANDABOARD projects/pf/head/sys/arm/conf/RPI-B projects/pf/head/sys/arm/conf/VERSATILEPB projects/pf/head/sys/arm/conf/ZEDBOARD projects/pf/head/sys/arm/freescale/imx/console.c projects/pf/head/sys/arm/freescale/imx/imx51_ccm.c projects/pf/head/sys/arm/freescale/imx/imx51_gpio.c projects/pf/head/sys/arm/freescale/imx/imx51_iomux.c projects/pf/head/sys/arm/freescale/imx/imx_gpt.c projects/pf/head/sys/arm/freescale/imx/imx_gptreg.h projects/pf/head/sys/arm/freescale/imx/imx_wdog.c projects/pf/head/sys/arm/include/armreg.h projects/pf/head/sys/arm/include/asmacros.h projects/pf/head/sys/arm/include/atomic.h projects/pf/head/sys/arm/include/counter.h projects/pf/head/sys/arm/include/fp.h projects/pf/head/sys/arm/include/frame.h projects/pf/head/sys/arm/include/ieee.h projects/pf/head/sys/arm/include/intr.h projects/pf/head/sys/arm/include/kdb.h projects/pf/head/sys/arm/include/param.h projects/pf/head/sys/arm/include/pcb.h projects/pf/head/sys/arm/include/pcpu.h projects/pf/head/sys/arm/include/pmap.h projects/pf/head/sys/arm/include/pte.h projects/pf/head/sys/arm/include/sf_buf.h projects/pf/head/sys/arm/include/smp.h projects/pf/head/sys/arm/include/vmparam.h projects/pf/head/sys/arm/mv/armadaxp/armadaxp_mp.c projects/pf/head/sys/arm/mv/mv_localbus.c projects/pf/head/sys/arm/s3c2xx0/s3c2xx0_space.c projects/pf/head/sys/arm/s3c2xx0/uart_bus_s3c2410.c projects/pf/head/sys/arm/s3c2xx0/uart_cpu_s3c2410.c projects/pf/head/sys/arm/ti/am335x/am335x_lcd.c projects/pf/head/sys/arm/ti/am335x/am335x_pmic.c projects/pf/head/sys/arm/ti/am335x/am335x_prcm.c projects/pf/head/sys/arm/ti/am335x/am335x_pwm.c projects/pf/head/sys/arm/ti/am335x/files.am335x projects/pf/head/sys/arm/ti/files.ti projects/pf/head/sys/arm/ti/omap4/omap4_prcm_clks.c projects/pf/head/sys/arm/ti/ti_mmchs.c projects/pf/head/sys/arm/ti/ti_mmchs.h projects/pf/head/sys/arm/ti/ti_prcm.h projects/pf/head/sys/arm/ti/ti_scm.c projects/pf/head/sys/arm/versatile/versatile_pci.c projects/pf/head/sys/arm/versatile/versatile_sic.c projects/pf/head/sys/arm/xscale/i80321/ep80219_machdep.c projects/pf/head/sys/arm/xscale/i80321/i80321_space.c projects/pf/head/sys/arm/xscale/i80321/iq31244_machdep.c projects/pf/head/sys/arm/xscale/i8134x/crb_machdep.c projects/pf/head/sys/arm/xscale/i8134x/i81342_space.c projects/pf/head/sys/arm/xscale/ixp425/avila_machdep.c projects/pf/head/sys/arm/xscale/ixp425/ixp425_pci_space.c projects/pf/head/sys/arm/xscale/pxa/pxa_machdep.c projects/pf/head/sys/boot/arm/ixp425/boot2/Makefile projects/pf/head/sys/boot/arm/uboot/Makefile projects/pf/head/sys/boot/common/loader.8 projects/pf/head/sys/boot/common/part.c projects/pf/head/sys/boot/fdt/dts/am335x-evm.dts projects/pf/head/sys/boot/fdt/dts/am335x.dtsi projects/pf/head/sys/boot/fdt/dts/beaglebone-black.dts projects/pf/head/sys/boot/fdt/dts/beaglebone.dts projects/pf/head/sys/boot/fdt/dts/pandaboard.dts projects/pf/head/sys/boot/ficl/loader.c projects/pf/head/sys/boot/forth/beastie.4th projects/pf/head/sys/boot/forth/color.4th projects/pf/head/sys/boot/forth/color.4th.8 projects/pf/head/sys/boot/forth/loader.conf projects/pf/head/sys/boot/forth/loader.conf.5 projects/pf/head/sys/boot/forth/loader.rc projects/pf/head/sys/boot/forth/menu.4th projects/pf/head/sys/boot/forth/menu.4th.8 projects/pf/head/sys/boot/forth/menu.rc projects/pf/head/sys/boot/forth/version.4th projects/pf/head/sys/boot/forth/version.4th.8 projects/pf/head/sys/boot/i386/btx/btx/btx.S projects/pf/head/sys/boot/i386/efi/Makefile projects/pf/head/sys/boot/i386/gptboot/Makefile projects/pf/head/sys/boot/i386/libi386/biosacpi.c projects/pf/head/sys/boot/pc98/boot2/boot2.c projects/pf/head/sys/boot/pc98/libpc98/biosdisk.c projects/pf/head/sys/boot/powerpc/boot1.chrp/Makefile projects/pf/head/sys/boot/userboot/libstand/Makefile projects/pf/head/sys/boot/userboot/test/Makefile projects/pf/head/sys/boot/userboot/userboot/Makefile projects/pf/head/sys/bsm/audit_kevents.h projects/pf/head/sys/bsm/audit_record.h projects/pf/head/sys/cam/ata/ata_all.c projects/pf/head/sys/cam/ata/ata_all.h projects/pf/head/sys/cam/ata/ata_da.c projects/pf/head/sys/cam/ata/ata_pmp.c projects/pf/head/sys/cam/cam.h projects/pf/head/sys/cam/cam_ccb.h projects/pf/head/sys/cam/cam_compat.c projects/pf/head/sys/cam/cam_compat.h projects/pf/head/sys/cam/cam_debug.h projects/pf/head/sys/cam/cam_periph.c projects/pf/head/sys/cam/cam_periph.h projects/pf/head/sys/cam/cam_queue.c projects/pf/head/sys/cam/cam_queue.h projects/pf/head/sys/cam/cam_xpt.c projects/pf/head/sys/cam/cam_xpt.h projects/pf/head/sys/cam/cam_xpt_internal.h projects/pf/head/sys/cam/cam_xpt_periph.h projects/pf/head/sys/cam/ctl/ctl.c projects/pf/head/sys/cam/ctl/ctl.h projects/pf/head/sys/cam/ctl/ctl_backend.h projects/pf/head/sys/cam/ctl/ctl_backend_block.c projects/pf/head/sys/cam/ctl/ctl_backend_ramdisk.c projects/pf/head/sys/cam/ctl/ctl_frontend.h projects/pf/head/sys/cam/ctl/ctl_frontend_internal.c projects/pf/head/sys/cam/ctl/ctl_io.h projects/pf/head/sys/cam/ctl/ctl_ioctl.h projects/pf/head/sys/cam/ctl/scsi_ctl.c projects/pf/head/sys/cam/scsi/scsi_all.c projects/pf/head/sys/cam/scsi/scsi_all.h projects/pf/head/sys/cam/scsi/scsi_cd.c projects/pf/head/sys/cam/scsi/scsi_ch.c projects/pf/head/sys/cam/scsi/scsi_da.c projects/pf/head/sys/cam/scsi/scsi_da.h projects/pf/head/sys/cam/scsi/scsi_enc.c projects/pf/head/sys/cam/scsi/scsi_enc_ses.c projects/pf/head/sys/cam/scsi/scsi_pass.c projects/pf/head/sys/cam/scsi/scsi_pt.c projects/pf/head/sys/cam/scsi/scsi_sa.c projects/pf/head/sys/cam/scsi/scsi_sg.c projects/pf/head/sys/cam/scsi/scsi_targ_bh.c projects/pf/head/sys/cam/scsi/scsi_target.c projects/pf/head/sys/cam/scsi/scsi_xpt.c projects/pf/head/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c projects/pf/head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c projects/pf/head/sys/cddl/compat/opensolaris/sys/file.h projects/pf/head/sys/cddl/compat/opensolaris/sys/kcondvar.h projects/pf/head/sys/cddl/compat/opensolaris/sys/kmem.h projects/pf/head/sys/cddl/compat/opensolaris/sys/mutex.h projects/pf/head/sys/cddl/compat/opensolaris/sys/rwlock.h projects/pf/head/sys/cddl/compat/opensolaris/sys/time.h projects/pf/head/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/pf/head/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/pf/head/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_destroy.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/pf/head/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c projects/pf/head/sys/cddl/contrib/opensolaris/uts/powerpc/sys/fasttrap_isa.h projects/pf/head/sys/cddl/dev/dtmalloc/dtmalloc.c projects/pf/head/sys/cddl/dev/dtrace/amd64/dis_tables.c projects/pf/head/sys/cddl/dev/dtrace/amd64/dis_tables.h projects/pf/head/sys/cddl/dev/dtrace/dtrace_clone.c projects/pf/head/sys/cddl/dev/dtrace/dtrace_ioctl.c projects/pf/head/sys/cddl/dev/dtrace/dtrace_load.c projects/pf/head/sys/cddl/dev/dtrace/dtrace_sysctl.c projects/pf/head/sys/cddl/dev/dtrace/dtrace_unload.c projects/pf/head/sys/cddl/dev/dtrace/i386/dis_tables.c projects/pf/head/sys/cddl/dev/dtrace/i386/dis_tables.h projects/pf/head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S projects/pf/head/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c projects/pf/head/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c projects/pf/head/sys/cddl/dev/fbt/fbt.c projects/pf/head/sys/cddl/dev/fbt/fbt_powerpc.c projects/pf/head/sys/cddl/dev/sdt/sdt.c projects/pf/head/sys/compat/freebsd32/freebsd32.h projects/pf/head/sys/compat/freebsd32/freebsd32_ioctl.c projects/pf/head/sys/compat/freebsd32/freebsd32_misc.c projects/pf/head/sys/compat/freebsd32/freebsd32_proto.h projects/pf/head/sys/compat/freebsd32/freebsd32_signal.h projects/pf/head/sys/compat/freebsd32/freebsd32_syscall.h projects/pf/head/sys/compat/freebsd32/freebsd32_syscalls.c projects/pf/head/sys/compat/freebsd32/freebsd32_sysent.c projects/pf/head/sys/compat/freebsd32/freebsd32_systrace_args.c projects/pf/head/sys/compat/freebsd32/syscalls.master projects/pf/head/sys/compat/linux/linux_dtrace.h projects/pf/head/sys/compat/linux/linux_file.c projects/pf/head/sys/compat/linux/linux_futex.c projects/pf/head/sys/compat/linux/linux_ioctl.c projects/pf/head/sys/compat/linux/linux_ioctl.h projects/pf/head/sys/compat/linux/linux_misc.c projects/pf/head/sys/compat/linux/linux_socket.c projects/pf/head/sys/compat/linux/linux_uid16.c projects/pf/head/sys/compat/ndis/kern_ndis.c projects/pf/head/sys/compat/ndis/ndis_var.h projects/pf/head/sys/compat/ndis/subr_ntoskrnl.c projects/pf/head/sys/compat/svr4/imgact_svr4.c projects/pf/head/sys/compat/svr4/svr4_fcntl.c projects/pf/head/sys/compat/svr4/svr4_filio.c projects/pf/head/sys/compat/svr4/svr4_ioctl.c projects/pf/head/sys/compat/svr4/svr4_misc.c projects/pf/head/sys/compat/svr4/svr4_stream.c projects/pf/head/sys/conf/Makefile.amd64 projects/pf/head/sys/conf/Makefile.arm projects/pf/head/sys/conf/NOTES projects/pf/head/sys/conf/WITHOUT_SOURCELESS_HOST projects/pf/head/sys/conf/WITHOUT_SOURCELESS_UCODE projects/pf/head/sys/conf/files projects/pf/head/sys/conf/files.amd64 projects/pf/head/sys/conf/files.arm projects/pf/head/sys/conf/files.i386 projects/pf/head/sys/conf/files.ia64 projects/pf/head/sys/conf/files.mips projects/pf/head/sys/conf/files.pc98 projects/pf/head/sys/conf/files.powerpc projects/pf/head/sys/conf/files.sparc64 projects/pf/head/sys/conf/kern.post.mk projects/pf/head/sys/conf/kern.pre.mk projects/pf/head/sys/conf/kmod.mk projects/pf/head/sys/conf/newvers.sh projects/pf/head/sys/conf/options projects/pf/head/sys/conf/options.amd64 projects/pf/head/sys/conf/options.arm projects/pf/head/sys/conf/options.i386 projects/pf/head/sys/conf/options.mips projects/pf/head/sys/conf/options.powerpc projects/pf/head/sys/contrib/dev/acpica/acpica_prep.sh projects/pf/head/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/pf/head/sys/contrib/dev/acpica/common/adisasm.c projects/pf/head/sys/contrib/dev/acpica/common/adwalk.c projects/pf/head/sys/contrib/dev/acpica/common/dmextern.c projects/pf/head/sys/contrib/dev/acpica/common/dmrestag.c projects/pf/head/sys/contrib/dev/acpica/common/dmtable.c projects/pf/head/sys/contrib/dev/acpica/common/dmtbdump.c projects/pf/head/sys/contrib/dev/acpica/common/dmtbinfo.c projects/pf/head/sys/contrib/dev/acpica/common/getopt.c projects/pf/head/sys/contrib/dev/acpica/compiler/aslcompile.c projects/pf/head/sys/contrib/dev/acpica/compiler/aslglobal.h projects/pf/head/sys/contrib/dev/acpica/compiler/aslload.c projects/pf/head/sys/contrib/dev/acpica/compiler/aslmain.c projects/pf/head/sys/contrib/dev/acpica/compiler/aslmessages.h projects/pf/head/sys/contrib/dev/acpica/compiler/asloffset.c projects/pf/head/sys/contrib/dev/acpica/compiler/asloperands.c projects/pf/head/sys/contrib/dev/acpica/compiler/asloptions.c projects/pf/head/sys/contrib/dev/acpica/compiler/asltree.c projects/pf/head/sys/contrib/dev/acpica/compiler/aslutils.c projects/pf/head/sys/contrib/dev/acpica/compiler/dtcompile.c projects/pf/head/sys/contrib/dev/acpica/compiler/dtfield.c projects/pf/head/sys/contrib/dev/acpica/compiler/dtio.c projects/pf/head/sys/contrib/dev/acpica/compiler/dttable.c projects/pf/head/sys/contrib/dev/acpica/compiler/dttemplate.c projects/pf/head/sys/contrib/dev/acpica/compiler/dttemplate.h projects/pf/head/sys/contrib/dev/acpica/compiler/dtutils.c projects/pf/head/sys/contrib/dev/acpica/compiler/preprocess.h projects/pf/head/sys/contrib/dev/acpica/compiler/prscan.c projects/pf/head/sys/contrib/dev/acpica/components/debugger/dbcmds.c projects/pf/head/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/pf/head/sys/contrib/dev/acpica/components/debugger/dbfileio.c projects/pf/head/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/pf/head/sys/contrib/dev/acpica/components/debugger/dbnames.c projects/pf/head/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c projects/pf/head/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/pf/head/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c projects/pf/head/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c projects/pf/head/sys/contrib/dev/acpica/components/events/evgpeinit.c projects/pf/head/sys/contrib/dev/acpica/components/events/evgpeutil.c projects/pf/head/sys/contrib/dev/acpica/components/events/evmisc.c projects/pf/head/sys/contrib/dev/acpica/components/events/evregion.c projects/pf/head/sys/contrib/dev/acpica/components/events/evsci.c projects/pf/head/sys/contrib/dev/acpica/components/events/evxface.c projects/pf/head/sys/contrib/dev/acpica/components/executer/exdump.c projects/pf/head/sys/contrib/dev/acpica/components/executer/exoparg1.c projects/pf/head/sys/contrib/dev/acpica/components/hardware/hwtimer.c projects/pf/head/sys/contrib/dev/acpica/components/hardware/hwxface.c projects/pf/head/sys/contrib/dev/acpica/components/namespace/nsaccess.c projects/pf/head/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/pf/head/sys/contrib/dev/acpica/components/namespace/nspredef.c projects/pf/head/sys/contrib/dev/acpica/components/namespace/nsrepair2.c projects/pf/head/sys/contrib/dev/acpica/components/namespace/nswalk.c projects/pf/head/sys/contrib/dev/acpica/components/namespace/nsxfeval.c projects/pf/head/sys/contrib/dev/acpica/components/namespace/nsxfname.c projects/pf/head/sys/contrib/dev/acpica/components/resources/rsdump.c projects/pf/head/sys/contrib/dev/acpica/components/resources/rsutils.c projects/pf/head/sys/contrib/dev/acpica/components/tables/tbfadt.c projects/pf/head/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/pf/head/sys/contrib/dev/acpica/components/tables/tbprint.c projects/pf/head/sys/contrib/dev/acpica/components/tables/tbxfroot.c projects/pf/head/sys/contrib/dev/acpica/components/utilities/utdebug.c projects/pf/head/sys/contrib/dev/acpica/components/utilities/uteval.c projects/pf/head/sys/contrib/dev/acpica/components/utilities/utglobal.c projects/pf/head/sys/contrib/dev/acpica/components/utilities/utosi.c projects/pf/head/sys/contrib/dev/acpica/components/utilities/utstring.c projects/pf/head/sys/contrib/dev/acpica/components/utilities/utxface.c projects/pf/head/sys/contrib/dev/acpica/include/acdebug.h projects/pf/head/sys/contrib/dev/acpica/include/acdisasm.h projects/pf/head/sys/contrib/dev/acpica/include/acevents.h projects/pf/head/sys/contrib/dev/acpica/include/acexcep.h projects/pf/head/sys/contrib/dev/acpica/include/acglobal.h projects/pf/head/sys/contrib/dev/acpica/include/aclocal.h projects/pf/head/sys/contrib/dev/acpica/include/acnamesp.h projects/pf/head/sys/contrib/dev/acpica/include/acpiosxf.h projects/pf/head/sys/contrib/dev/acpica/include/acpixf.h projects/pf/head/sys/contrib/dev/acpica/include/actables.h projects/pf/head/sys/contrib/dev/acpica/include/actypes.h projects/pf/head/sys/contrib/dev/acpica/include/acutils.h projects/pf/head/sys/contrib/dev/acpica/include/platform/acfreebsd.h projects/pf/head/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c projects/pf/head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c projects/pf/head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/pf/head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h projects/pf/head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_radio.c projects/pf/head/sys/contrib/dev/run/rt2870.fw.uu projects/pf/head/sys/contrib/ipfilter/netinet/fil.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_auth.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_auth.h projects/pf/head/sys/contrib/ipfilter/netinet/ip_compat.h projects/pf/head/sys/contrib/ipfilter/netinet/ip_fil.h projects/pf/head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) projects/pf/head/sys/contrib/ipfilter/netinet/ip_frag.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_frag.h projects/pf/head/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_htable.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_htable.h projects/pf/head/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_irc_pxy.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_log.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_lookup.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_lookup.h projects/pf/head/sys/contrib/ipfilter/netinet/ip_nat.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_nat.h projects/pf/head/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_pool.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_pool.h projects/pf/head/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_proxy.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_proxy.h projects/pf/head/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c (contents, props changed) projects/pf/head/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_rules.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_scan.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_scan.h projects/pf/head/sys/contrib/ipfilter/netinet/ip_state.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_state.h projects/pf/head/sys/contrib/ipfilter/netinet/ip_sync.c projects/pf/head/sys/contrib/ipfilter/netinet/ip_sync.h projects/pf/head/sys/contrib/ipfilter/netinet/ipl.h projects/pf/head/sys/contrib/ipfilter/netinet/mlfk_ipl.c projects/pf/head/sys/contrib/rdma/krping/getopt.c projects/pf/head/sys/contrib/rdma/krping/krping.c projects/pf/head/sys/contrib/rdma/krping/krping.h projects/pf/head/sys/contrib/rdma/krping/krping_dev.c projects/pf/head/sys/crypto/aesni/aeskeys_amd64.S projects/pf/head/sys/crypto/aesni/aesni.c projects/pf/head/sys/crypto/aesni/aesni.h projects/pf/head/sys/crypto/aesni/aesni_wrap.c projects/pf/head/sys/crypto/sha2/sha2.c projects/pf/head/sys/crypto/sha2/sha2.h projects/pf/head/sys/dev/aac/aac_linux.c projects/pf/head/sys/dev/aac/aac_pci.c projects/pf/head/sys/dev/aac/aacvar.h projects/pf/head/sys/dev/aacraid/aacraid_linux.c projects/pf/head/sys/dev/aacraid/aacraid_pci.c projects/pf/head/sys/dev/acpi_support/atk0110.c projects/pf/head/sys/dev/acpica/Osd/OsdSynch.c projects/pf/head/sys/dev/acpica/acpi_pcib.c projects/pf/head/sys/dev/acpica/acpi_pcib_acpi.c projects/pf/head/sys/dev/acpica/acpi_resource.c projects/pf/head/sys/dev/acpica/acpi_thermal.c projects/pf/head/sys/dev/acpica/acpi_timer.c projects/pf/head/sys/dev/adb/adb_mouse.c projects/pf/head/sys/dev/advansys/adw_pci.c projects/pf/head/sys/dev/ae/if_ae.c projects/pf/head/sys/dev/ae/if_aereg.h projects/pf/head/sys/dev/agp/agp.c projects/pf/head/sys/dev/agp/agp_i810.c projects/pf/head/sys/dev/ahci/ahci.c projects/pf/head/sys/dev/ahci/ahci.h projects/pf/head/sys/dev/aic7xxx/ahc_pci.c projects/pf/head/sys/dev/aic7xxx/ahd_pci.c projects/pf/head/sys/dev/aic7xxx/aic7xxx_pci.c projects/pf/head/sys/dev/amdtemp/amdtemp.c projects/pf/head/sys/dev/amr/amr_linux.c projects/pf/head/sys/dev/amr/amr_pci.c projects/pf/head/sys/dev/an/if_an_pci.c projects/pf/head/sys/dev/arcmsr/arcmsr.c projects/pf/head/sys/dev/arcmsr/arcmsr.h projects/pf/head/sys/dev/asr/asr.c projects/pf/head/sys/dev/ata/ata-all.c projects/pf/head/sys/dev/ata/ata-card.c projects/pf/head/sys/dev/ata/ata-pci.c projects/pf/head/sys/dev/ata/ata-pci.h projects/pf/head/sys/dev/ata/chipsets/ata-intel.c projects/pf/head/sys/dev/ata/chipsets/ata-promise.c projects/pf/head/sys/dev/ath/ath_hal/ah.c projects/pf/head/sys/dev/ath/ath_hal/ah_internal.h projects/pf/head/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/pf/head/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c projects/pf/head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/pf/head/sys/dev/ath/if_ath.c projects/pf/head/sys/dev/ath/if_ath_ahb.c projects/pf/head/sys/dev/ath/if_ath_rx_edma.c projects/pf/head/sys/dev/ath/if_ath_tx.c projects/pf/head/sys/dev/atkbdc/psm.c projects/pf/head/sys/dev/bce/if_bce.c projects/pf/head/sys/dev/bce/if_bcereg.h projects/pf/head/sys/dev/bge/if_bge.c projects/pf/head/sys/dev/bge/if_bgereg.h projects/pf/head/sys/dev/bktr/bktr_core.c projects/pf/head/sys/dev/bktr/bktr_os.c projects/pf/head/sys/dev/buslogic/bt_pci.c projects/pf/head/sys/dev/bwi/bwimac.c projects/pf/head/sys/dev/cas/if_cas.c projects/pf/head/sys/dev/cfi/cfi_bus_nexus.c projects/pf/head/sys/dev/cfi/cfi_core.c projects/pf/head/sys/dev/cfi/cfi_dev.c projects/pf/head/sys/dev/cfi/cfi_disk.c projects/pf/head/sys/dev/cfi/cfi_reg.h projects/pf/head/sys/dev/cfi/cfi_var.h projects/pf/head/sys/dev/ciss/ciss.c projects/pf/head/sys/dev/cpuctl/cpuctl.c projects/pf/head/sys/dev/cxgb/cxgb_sge.c projects/pf/head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c projects/pf/head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/pf/head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c projects/pf/head/sys/dev/cxgbe/adapter.h projects/pf/head/sys/dev/cxgbe/common/common.h projects/pf/head/sys/dev/cxgbe/common/t4_hw.c projects/pf/head/sys/dev/cxgbe/common/t4_hw.h projects/pf/head/sys/dev/cxgbe/common/t4_msg.h projects/pf/head/sys/dev/cxgbe/common/t4_regs_values.h projects/pf/head/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/pf/head/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt projects/pf/head/sys/dev/cxgbe/firmware/t4fw_interface.h projects/pf/head/sys/dev/cxgbe/offload.h projects/pf/head/sys/dev/cxgbe/osdep.h projects/pf/head/sys/dev/cxgbe/t4_ioctl.h projects/pf/head/sys/dev/cxgbe/t4_main.c projects/pf/head/sys/dev/cxgbe/t4_sge.c projects/pf/head/sys/dev/cxgbe/tom/t4_connect.c projects/pf/head/sys/dev/cxgbe/tom/t4_cpl_io.c projects/pf/head/sys/dev/cxgbe/tom/t4_listen.c projects/pf/head/sys/dev/cxgbe/tom/t4_tom.c projects/pf/head/sys/dev/cxgbe/tom/t4_tom.h projects/pf/head/sys/dev/dpt/dpt_pci.c projects/pf/head/sys/dev/drm/drm_scatter.c projects/pf/head/sys/dev/drm2/drmP.h projects/pf/head/sys/dev/drm2/drm_atomic.h projects/pf/head/sys/dev/drm2/drm_context.c projects/pf/head/sys/dev/drm2/drm_crtc.c projects/pf/head/sys/dev/drm2/drm_crtc.h projects/pf/head/sys/dev/drm2/drm_crtc_helper.h projects/pf/head/sys/dev/drm2/drm_dp_helper.h projects/pf/head/sys/dev/drm2/drm_dp_iic_helper.c projects/pf/head/sys/dev/drm2/drm_drv.c projects/pf/head/sys/dev/drm2/drm_edid.c projects/pf/head/sys/dev/drm2/drm_gem.c projects/pf/head/sys/dev/drm2/drm_gem_names.c projects/pf/head/sys/dev/drm2/drm_ioctl.c projects/pf/head/sys/dev/drm2/drm_irq.c projects/pf/head/sys/dev/drm2/drm_linux_list.h projects/pf/head/sys/dev/drm2/drm_pci.c projects/pf/head/sys/dev/drm2/drm_pciids.h projects/pf/head/sys/dev/drm2/drm_scatter.c projects/pf/head/sys/dev/drm2/drm_sysctl.c projects/pf/head/sys/dev/drm2/i915/i915_gem.c projects/pf/head/sys/dev/drm2/i915/i915_gem_execbuffer.c projects/pf/head/sys/dev/drm2/i915/intel_crt.c projects/pf/head/sys/dev/drm2/i915/intel_display.c projects/pf/head/sys/dev/drm2/i915/intel_dp.c projects/pf/head/sys/dev/drm2/i915/intel_drv.h projects/pf/head/sys/dev/drm2/i915/intel_hdmi.c projects/pf/head/sys/dev/drm2/i915/intel_lvds.c projects/pf/head/sys/dev/drm2/i915/intel_panel.c projects/pf/head/sys/dev/drm2/i915/intel_ringbuffer.c projects/pf/head/sys/dev/drm2/i915/intel_sdvo.c projects/pf/head/sys/dev/drm2/i915/intel_tv.c projects/pf/head/sys/dev/drm2/ttm/ttm_bo.c projects/pf/head/sys/dev/drm2/ttm/ttm_bo_driver.h projects/pf/head/sys/dev/drm2/ttm/ttm_bo_util.c projects/pf/head/sys/dev/drm2/ttm/ttm_bo_vm.c projects/pf/head/sys/dev/drm2/ttm/ttm_execbuf_util.c projects/pf/head/sys/dev/drm2/ttm/ttm_page_alloc.c projects/pf/head/sys/dev/drm2/ttm/ttm_tt.c projects/pf/head/sys/dev/e1000/e1000_80003es2lan.c projects/pf/head/sys/dev/e1000/e1000_80003es2lan.h projects/pf/head/sys/dev/e1000/e1000_82571.c projects/pf/head/sys/dev/e1000/e1000_82575.c projects/pf/head/sys/dev/e1000/e1000_82575.h projects/pf/head/sys/dev/e1000/e1000_api.c projects/pf/head/sys/dev/e1000/e1000_defines.h projects/pf/head/sys/dev/e1000/e1000_hw.h projects/pf/head/sys/dev/e1000/e1000_i210.c projects/pf/head/sys/dev/e1000/e1000_i210.h projects/pf/head/sys/dev/e1000/e1000_ich8lan.c projects/pf/head/sys/dev/e1000/e1000_ich8lan.h projects/pf/head/sys/dev/e1000/e1000_mac.c projects/pf/head/sys/dev/e1000/e1000_osdep.h projects/pf/head/sys/dev/e1000/e1000_phy.c projects/pf/head/sys/dev/e1000/e1000_phy.h projects/pf/head/sys/dev/e1000/e1000_regs.h projects/pf/head/sys/dev/e1000/e1000_vf.h projects/pf/head/sys/dev/e1000/if_em.c projects/pf/head/sys/dev/e1000/if_igb.c projects/pf/head/sys/dev/e1000/if_igb.h projects/pf/head/sys/dev/e1000/if_lem.c projects/pf/head/sys/dev/etherswitch/arswitch/arswitch.c projects/pf/head/sys/dev/etherswitch/arswitch/arswitch_7240.c projects/pf/head/sys/dev/etherswitch/arswitch/arswitch_8216.c projects/pf/head/sys/dev/etherswitch/arswitch/arswitch_8226.c projects/pf/head/sys/dev/etherswitch/arswitch/arswitch_8316.c projects/pf/head/sys/dev/etherswitch/arswitch/arswitch_phy.c projects/pf/head/sys/dev/etherswitch/arswitch/arswitch_reg.c projects/pf/head/sys/dev/etherswitch/arswitch/arswitch_reg.h projects/pf/head/sys/dev/etherswitch/arswitch/arswitchreg.h projects/pf/head/sys/dev/etherswitch/arswitch/arswitchvar.h projects/pf/head/sys/dev/etherswitch/etherswitch.h projects/pf/head/sys/dev/etherswitch/ip17x/ip175c.c projects/pf/head/sys/dev/etherswitch/ip17x/ip175d.c projects/pf/head/sys/dev/etherswitch/ip17x/ip17x_vlans.c projects/pf/head/sys/dev/etherswitch/rtl8366/rtl8366rb.c projects/pf/head/sys/dev/fatm/if_fatm.c projects/pf/head/sys/dev/fb/vesa.c projects/pf/head/sys/dev/fdc/fdc.c projects/pf/head/sys/dev/filemon/filemon.c projects/pf/head/sys/dev/filemon/filemon_wrapper.c projects/pf/head/sys/dev/firewire/fwdev.c projects/pf/head/sys/dev/firewire/fwohci_pci.c projects/pf/head/sys/dev/firewire/sbp.c projects/pf/head/sys/dev/flash/mx25l.c projects/pf/head/sys/dev/fxp/if_fxp.c projects/pf/head/sys/dev/glxsb/glxsb.c projects/pf/head/sys/dev/gpio/gpiobus.c projects/pf/head/sys/dev/gxemul/cons/gxemul_cons.c projects/pf/head/sys/dev/gxemul/disk/gxemul_disk.c projects/pf/head/sys/dev/gxemul/disk/gxemul_diskreg.h projects/pf/head/sys/dev/gxemul/ether/gxreg.h projects/pf/head/sys/dev/hatm/if_hatm.c projects/pf/head/sys/dev/hatm/if_hatm_intr.c projects/pf/head/sys/dev/hifn/hifn7751.c projects/pf/head/sys/dev/hme/if_hme.c projects/pf/head/sys/dev/hpt27xx/hpt27xx_config.c projects/pf/head/sys/dev/hpt27xx/os_bsd.h projects/pf/head/sys/dev/hptiop/hptiop.c projects/pf/head/sys/dev/hptiop/hptiop.h projects/pf/head/sys/dev/hptmv/entry.c projects/pf/head/sys/dev/hptmv/osbsd.h projects/pf/head/sys/dev/hptrr/hptrr_osm_bsd.c projects/pf/head/sys/dev/hptrr/os_bsd.h projects/pf/head/sys/dev/hwpmc/hwpmc_core.c projects/pf/head/sys/dev/hwpmc/hwpmc_logging.c projects/pf/head/sys/dev/hwpmc/hwpmc_mod.c projects/pf/head/sys/dev/hwpmc/hwpmc_powerpc.c projects/pf/head/sys/dev/hwpmc/pmc_events.h projects/pf/head/sys/dev/ichsmb/ichsmb_pci.c projects/pf/head/sys/dev/ichwd/ichwd.c projects/pf/head/sys/dev/ichwd/ichwd.h projects/pf/head/sys/dev/if_ndis/if_ndis.c projects/pf/head/sys/dev/iicbus/if_ic.c projects/pf/head/sys/dev/iir/iir.c projects/pf/head/sys/dev/iir/iir.h projects/pf/head/sys/dev/iir/iir_ctrl.c projects/pf/head/sys/dev/iir/iir_pci.c projects/pf/head/sys/dev/ipmi/ipmi_isa.c projects/pf/head/sys/dev/ipmi/ipmi_linux.c projects/pf/head/sys/dev/ipmi/ipmivars.h projects/pf/head/sys/dev/ips/ips_pci.c projects/pf/head/sys/dev/isci/isci.c projects/pf/head/sys/dev/isci/isci_io_request.c projects/pf/head/sys/dev/isci/isci_sysctl.c projects/pf/head/sys/dev/isci/isci_task_request.c projects/pf/head/sys/dev/isci/scil/sati_passthrough.c projects/pf/head/sys/dev/isp/isp.c projects/pf/head/sys/dev/isp/isp_freebsd.c projects/pf/head/sys/dev/isp/isp_freebsd.h projects/pf/head/sys/dev/isp/isp_pci.c projects/pf/head/sys/dev/isp/ispreg.h projects/pf/head/sys/dev/isp/ispvar.h projects/pf/head/sys/dev/iwn/if_iwn.c projects/pf/head/sys/dev/iwn/if_iwnreg.h projects/pf/head/sys/dev/iwn/if_iwnvar.h projects/pf/head/sys/dev/ixgb/if_ixgb.c projects/pf/head/sys/dev/ixgb/ixgb_ids.h projects/pf/head/sys/dev/ixgbe/ixgbe.c projects/pf/head/sys/dev/ixgbe/ixv.c projects/pf/head/sys/dev/jme/if_jme.c projects/pf/head/sys/dev/lge/if_lge.c projects/pf/head/sys/dev/lmc/if_lmc.c projects/pf/head/sys/dev/md/md.c projects/pf/head/sys/dev/mem/memdev.c projects/pf/head/sys/dev/mfi/mfi.c projects/pf/head/sys/dev/mfi/mfi_cam.c projects/pf/head/sys/dev/mfi/mfi_linux.c projects/pf/head/sys/dev/mfi/mfi_pci.c projects/pf/head/sys/dev/mfi/mfi_syspd.c projects/pf/head/sys/dev/mfi/mfireg.h projects/pf/head/sys/dev/mge/if_mge.c projects/pf/head/sys/dev/mii/brgphy.c projects/pf/head/sys/dev/mii/miidevs projects/pf/head/sys/dev/mly/mly.c projects/pf/head/sys/dev/mmc/mmc.c projects/pf/head/sys/dev/mmc/mmcsd.c projects/pf/head/sys/dev/mn/if_mn.c projects/pf/head/sys/dev/mps/mps.c projects/pf/head/sys/dev/mps/mps_config.c projects/pf/head/sys/dev/mps/mps_mapping.c projects/pf/head/sys/dev/mps/mps_pci.c projects/pf/head/sys/dev/mps/mps_sas.c projects/pf/head/sys/dev/mps/mps_sas.h projects/pf/head/sys/dev/mps/mps_sas_lsi.c projects/pf/head/sys/dev/mps/mps_table.c projects/pf/head/sys/dev/mps/mps_user.c projects/pf/head/sys/dev/mps/mpsvar.h projects/pf/head/sys/dev/mpt/mpt_cam.c projects/pf/head/sys/dev/mpt/mpt_pci.c projects/pf/head/sys/dev/mwl/if_mwl.c projects/pf/head/sys/dev/mwl/if_mwl_pci.c projects/pf/head/sys/dev/mxge/if_mxge.c projects/pf/head/sys/dev/netmap/if_igb_netmap.h projects/pf/head/sys/dev/nfe/if_nfe.c projects/pf/head/sys/dev/ntb/if_ntb/if_ntb.c projects/pf/head/sys/dev/ntb/ntb_hw/ntb_hw.c projects/pf/head/sys/dev/ntb/ntb_hw/ntb_hw.h projects/pf/head/sys/dev/ntb/ntb_hw/ntb_regs.h projects/pf/head/sys/dev/nvd/nvd.c projects/pf/head/sys/dev/nvme/nvme.c projects/pf/head/sys/dev/nvme/nvme.h projects/pf/head/sys/dev/nvme/nvme_ctrlr.c projects/pf/head/sys/dev/nvme/nvme_ctrlr_cmd.c projects/pf/head/sys/dev/nvme/nvme_ns.c projects/pf/head/sys/dev/nvme/nvme_ns_cmd.c projects/pf/head/sys/dev/nvme/nvme_private.h projects/pf/head/sys/dev/nvme/nvme_qpair.c projects/pf/head/sys/dev/nvme/nvme_sysctl.c projects/pf/head/sys/dev/nvme/nvme_test.c projects/pf/head/sys/dev/oce/oce_hw.c projects/pf/head/sys/dev/oce/oce_hw.h projects/pf/head/sys/dev/oce/oce_if.c projects/pf/head/sys/dev/oce/oce_if.h projects/pf/head/sys/dev/oce/oce_mbox.c projects/pf/head/sys/dev/oce/oce_queue.c projects/pf/head/sys/dev/oce/oce_sysctl.c projects/pf/head/sys/dev/oce/oce_util.c projects/pf/head/sys/dev/ofw/ofw_bus_subr.c projects/pf/head/sys/dev/ofw/ofw_console.c projects/pf/head/sys/dev/ofw/openfirm.c projects/pf/head/sys/dev/ofw/openfirm.h projects/pf/head/sys/dev/patm/if_patm.c projects/pf/head/sys/dev/patm/if_patm_tx.c projects/pf/head/sys/dev/pccbb/pccbb_pci.c projects/pf/head/sys/dev/pci/fixup_pci.c projects/pf/head/sys/dev/pci/pci.c projects/pf/head/sys/dev/pci/pci_pci.c projects/pf/head/sys/dev/pci/pci_private.h projects/pf/head/sys/dev/pci/pcib_private.h projects/pf/head/sys/dev/pci/pcivar.h projects/pf/head/sys/dev/pci/vga_pci.c projects/pf/head/sys/dev/ppbus/if_plip.c projects/pf/head/sys/dev/pst/pst-pci.c projects/pf/head/sys/dev/qlxgb/qla_hw.c projects/pf/head/sys/dev/qlxgbe/ql_misc.c projects/pf/head/sys/dev/qlxgbe/ql_os.c projects/pf/head/sys/dev/ral/rt2560.c projects/pf/head/sys/dev/ral/rt2661.c projects/pf/head/sys/dev/ral/rt2860.c projects/pf/head/sys/dev/random/harvest.c projects/pf/head/sys/dev/random/hash.c projects/pf/head/sys/dev/random/hash.h projects/pf/head/sys/dev/random/ivy.c projects/pf/head/sys/dev/random/nehemiah.c projects/pf/head/sys/dev/random/randomdev.c projects/pf/head/sys/dev/random/randomdev.h projects/pf/head/sys/dev/random/randomdev_soft.c projects/pf/head/sys/dev/random/randomdev_soft.h projects/pf/head/sys/dev/random/yarrow.c projects/pf/head/sys/dev/random/yarrow.h projects/pf/head/sys/dev/re/if_re.c projects/pf/head/sys/dev/rndtest/rndtest.c projects/pf/head/sys/dev/rp/rp_pci.c projects/pf/head/sys/dev/safe/safe.c projects/pf/head/sys/dev/scc/scc_bfe.h projects/pf/head/sys/dev/scc/scc_bfe_ebus.c projects/pf/head/sys/dev/scc/scc_bfe_macio.c projects/pf/head/sys/dev/scc/scc_bfe_quicc.c projects/pf/head/sys/dev/scc/scc_bfe_sbus.c projects/pf/head/sys/dev/scc/scc_core.c projects/pf/head/sys/dev/scc/scc_dev_quicc.c projects/pf/head/sys/dev/scc/scc_dev_sab82532.c projects/pf/head/sys/dev/scc/scc_dev_z8530.c projects/pf/head/sys/dev/sdhci/sdhci.c projects/pf/head/sys/dev/sdhci/sdhci.h projects/pf/head/sys/dev/sfxge/sfxge_rx.c projects/pf/head/sys/dev/sound/pci/als4000.c projects/pf/head/sys/dev/sound/pci/aureal.c projects/pf/head/sys/dev/sound/pci/cmi.c projects/pf/head/sys/dev/sound/pci/cs4281.c projects/pf/head/sys/dev/sound/pci/csa.c projects/pf/head/sys/dev/sound/pci/ds1.c projects/pf/head/sys/dev/sound/pci/emu10k1.c projects/pf/head/sys/dev/sound/pci/emu10kx.c projects/pf/head/sys/dev/sound/pci/envy24.c projects/pf/head/sys/dev/sound/pci/envy24ht.c projects/pf/head/sys/dev/sound/pci/es137x.c projects/pf/head/sys/dev/sound/pci/fm801.c projects/pf/head/sys/dev/sound/pci/hda/hdaa_patches.c projects/pf/head/sys/dev/sound/pci/hda/hdac.h projects/pf/head/sys/dev/sound/pci/hdspe.c projects/pf/head/sys/dev/sound/pci/maestro.c projects/pf/head/sys/dev/sound/pci/maestro3.c projects/pf/head/sys/dev/sound/pci/neomagic.c projects/pf/head/sys/dev/sound/pci/solo.c projects/pf/head/sys/dev/sound/pci/t4dwave.c projects/pf/head/sys/dev/sound/pci/via82c686.c projects/pf/head/sys/dev/sound/pci/vibes.c projects/pf/head/sys/dev/stge/if_stge.c projects/pf/head/sys/dev/streams/streams.c projects/pf/head/sys/dev/sym/sym_hipd.c projects/pf/head/sys/dev/syscons/scmouse.c projects/pf/head/sys/dev/syscons/syscons.c projects/pf/head/sys/dev/tdfx/tdfx_linux.c projects/pf/head/sys/dev/tdfx/tdfx_pci.c projects/pf/head/sys/dev/ti/if_ti.c projects/pf/head/sys/dev/twa/tw_osl_freebsd.c projects/pf/head/sys/dev/tws/tws.c projects/pf/head/sys/dev/tws/tws_cam.c projects/pf/head/sys/dev/uart/uart.h projects/pf/head/sys/dev/uart/uart_bus_fdt.c projects/pf/head/sys/dev/uart/uart_bus_pci.c projects/pf/head/sys/dev/uart/uart_core.c projects/pf/head/sys/dev/uart/uart_cpu_fdt.c projects/pf/head/sys/dev/uart/uart_dev_ns8250.c projects/pf/head/sys/dev/uart/uart_subr.c projects/pf/head/sys/dev/ubsec/ubsec.c projects/pf/head/sys/dev/usb/controller/dwc_otg.c projects/pf/head/sys/dev/usb/controller/ehci.c projects/pf/head/sys/dev/usb/controller/ehci_pci.c projects/pf/head/sys/dev/usb/controller/musb_otg.c projects/pf/head/sys/dev/usb/controller/musb_otg.h projects/pf/head/sys/dev/usb/controller/musb_otg_atmelarm.c projects/pf/head/sys/dev/usb/controller/ohci_pci.c projects/pf/head/sys/dev/usb/controller/xhci.c projects/pf/head/sys/dev/usb/controller/xhci.h projects/pf/head/sys/dev/usb/controller/xhci_pci.c projects/pf/head/sys/dev/usb/input/ukbd.c projects/pf/head/sys/dev/usb/net/if_axe.c projects/pf/head/sys/dev/usb/net/if_ipheth.c projects/pf/head/sys/dev/usb/net/if_udav.c projects/pf/head/sys/dev/usb/net/if_usie.c projects/pf/head/sys/dev/usb/net/uhso.c projects/pf/head/sys/dev/usb/quirk/usb_quirk.c projects/pf/head/sys/dev/usb/serial/u3g.c projects/pf/head/sys/dev/usb/serial/uftdi.c projects/pf/head/sys/dev/usb/serial/umcs.h projects/pf/head/sys/dev/usb/storage/umass.c projects/pf/head/sys/dev/usb/usb_compat_linux.c projects/pf/head/sys/dev/usb/usb_hub.c projects/pf/head/sys/dev/usb/usb_ioctl.h projects/pf/head/sys/dev/usb/usb_pf.c projects/pf/head/sys/dev/usb/usb_request.c projects/pf/head/sys/dev/usb/usbdevs projects/pf/head/sys/dev/usb/wlan/if_rumvar.h projects/pf/head/sys/dev/usb/wlan/if_run.c projects/pf/head/sys/dev/usb/wlan/if_runreg.h projects/pf/head/sys/dev/usb/wlan/if_runvar.h projects/pf/head/sys/dev/usb/wlan/if_uathvar.h projects/pf/head/sys/dev/usb/wlan/if_upgtvar.h projects/pf/head/sys/dev/usb/wlan/if_uralvar.h projects/pf/head/sys/dev/usb/wlan/if_urtwn.c projects/pf/head/sys/dev/usb/wlan/if_urtwnreg.h projects/pf/head/sys/dev/usb/wlan/if_urtwvar.h projects/pf/head/sys/dev/usb/wlan/if_zydreg.h projects/pf/head/sys/dev/virtio/balloon/virtio_balloon.c projects/pf/head/sys/dev/virtio/block/virtio_blk.c projects/pf/head/sys/dev/virtio/block/virtio_blk.h projects/pf/head/sys/dev/virtio/network/if_vtnet.c projects/pf/head/sys/dev/virtio/network/if_vtnetvar.h projects/pf/head/sys/dev/virtio/network/virtio_net.h projects/pf/head/sys/dev/virtio/pci/virtio_pci.c projects/pf/head/sys/dev/virtio/scsi/virtio_scsi.c projects/pf/head/sys/dev/virtio/scsi/virtio_scsivar.h projects/pf/head/sys/dev/virtio/virtio.c projects/pf/head/sys/dev/virtio/virtio.h projects/pf/head/sys/dev/virtio/virtio_bus_if.m projects/pf/head/sys/dev/virtio/virtio_if.m projects/pf/head/sys/dev/virtio/virtqueue.c projects/pf/head/sys/dev/virtio/virtqueue.h projects/pf/head/sys/dev/vkbd/vkbd.c projects/pf/head/sys/dev/watchdog/watchdog.c projects/pf/head/sys/dev/wb/if_wb.c projects/pf/head/sys/dev/wi/if_wi.c projects/pf/head/sys/dev/wi/if_wi_pci.c projects/pf/head/sys/dev/xen/balloon/balloon.c projects/pf/head/sys/dev/xen/blkback/blkback.c projects/pf/head/sys/dev/xen/blkfront/blkfront.c projects/pf/head/sys/dev/xen/blkfront/block.h projects/pf/head/sys/dev/xen/console/console.c projects/pf/head/sys/dev/xen/console/xencons_ring.c projects/pf/head/sys/dev/xen/control/control.c projects/pf/head/sys/dev/xen/netback/netback.c projects/pf/head/sys/dev/xen/netfront/netfront.c projects/pf/head/sys/dev/xen/xenpci/xenpci.c projects/pf/head/sys/dev/xen/xenpci/xenpcivar.h projects/pf/head/sys/fs/cd9660/cd9660_vfsops.c projects/pf/head/sys/fs/cd9660/iso.h projects/pf/head/sys/fs/devfs/devfs_rule.c projects/pf/head/sys/fs/devfs/devfs_vnops.c projects/pf/head/sys/fs/ext2fs/ext2_alloc.c projects/pf/head/sys/fs/ext2fs/ext2_balloc.c projects/pf/head/sys/fs/ext2fs/ext2_bmap.c projects/pf/head/sys/fs/ext2fs/ext2_dinode.h projects/pf/head/sys/fs/ext2fs/ext2_dir.h projects/pf/head/sys/fs/ext2fs/ext2_extern.h projects/pf/head/sys/fs/ext2fs/ext2_inode.c projects/pf/head/sys/fs/ext2fs/ext2_inode_cnv.c projects/pf/head/sys/fs/ext2fs/ext2_lookup.c projects/pf/head/sys/fs/ext2fs/ext2_subr.c projects/pf/head/sys/fs/ext2fs/ext2_vfsops.c projects/pf/head/sys/fs/ext2fs/ext2_vnops.c projects/pf/head/sys/fs/ext2fs/ext2fs.h projects/pf/head/sys/fs/ext2fs/fs.h projects/pf/head/sys/fs/ext2fs/inode.h projects/pf/head/sys/fs/fdescfs/fdesc_vnops.c projects/pf/head/sys/fs/fuse/fuse_vfsops.c projects/pf/head/sys/fs/fuse/fuse_vnops.c projects/pf/head/sys/fs/msdosfs/msdosfs_denode.c projects/pf/head/sys/fs/msdosfs/msdosfs_vnops.c projects/pf/head/sys/fs/nfs/nfs.h projects/pf/head/sys/fs/nfs/nfs_commonkrpc.c projects/pf/head/sys/fs/nfs/nfs_commonsubs.c projects/pf/head/sys/fs/nfs/nfsport.h projects/pf/head/sys/fs/nfs/nfsrvcache.h projects/pf/head/sys/fs/nfsclient/nfs_clbio.c projects/pf/head/sys/fs/nfsclient/nfs_clkrpc.c projects/pf/head/sys/fs/nfsclient/nfs_clport.c projects/pf/head/sys/fs/nfsclient/nfs_clstate.c projects/pf/head/sys/fs/nfsclient/nfs_clvfsops.c projects/pf/head/sys/fs/nfsclient/nfs_clvnops.c projects/pf/head/sys/fs/nfsserver/nfs_nfsdcache.c projects/pf/head/sys/fs/nfsserver/nfs_nfsdport.c projects/pf/head/sys/fs/nullfs/null_vnops.c projects/pf/head/sys/fs/smbfs/smbfs_node.c projects/pf/head/sys/fs/smbfs/smbfs_smb.c projects/pf/head/sys/fs/smbfs/smbfs_vfsops.c projects/pf/head/sys/fs/smbfs/smbfs_vnops.c projects/pf/head/sys/fs/tmpfs/tmpfs.h projects/pf/head/sys/fs/tmpfs/tmpfs_subr.c projects/pf/head/sys/fs/tmpfs/tmpfs_vfsops.c projects/pf/head/sys/fs/tmpfs/tmpfs_vnops.c projects/pf/head/sys/gdb/gdb_cons.c projects/pf/head/sys/geom/eli/g_eli.c projects/pf/head/sys/geom/geom_dev.c projects/pf/head/sys/geom/geom_disk.c projects/pf/head/sys/geom/geom_disk.h projects/pf/head/sys/geom/geom_int.h projects/pf/head/sys/geom/geom_io.c projects/pf/head/sys/geom/geom_kern.c projects/pf/head/sys/geom/geom_pc98.c projects/pf/head/sys/geom/geom_subr.c projects/pf/head/sys/geom/journal/g_journal.c projects/pf/head/sys/geom/mirror/g_mirror.c projects/pf/head/sys/geom/part/g_part.c projects/pf/head/sys/geom/part/g_part_apm.c projects/pf/head/sys/geom/part/g_part_bsd.c projects/pf/head/sys/geom/part/g_part_ebr.c projects/pf/head/sys/geom/part/g_part_gpt.c projects/pf/head/sys/geom/part/g_part_ldm.c projects/pf/head/sys/geom/part/g_part_mbr.c projects/pf/head/sys/geom/part/g_part_pc98.c projects/pf/head/sys/geom/part/g_part_vtoc8.c projects/pf/head/sys/geom/raid/g_raid.c projects/pf/head/sys/geom/raid/g_raid.h projects/pf/head/sys/geom/raid/g_raid_ctl.c projects/pf/head/sys/geom/raid/tr_concat.c projects/pf/head/sys/geom/raid/tr_raid0.c projects/pf/head/sys/geom/raid/tr_raid1.c projects/pf/head/sys/geom/raid/tr_raid1e.c projects/pf/head/sys/geom/raid/tr_raid5.c projects/pf/head/sys/geom/zero/g_zero.c projects/pf/head/sys/i386/conf/GENERIC projects/pf/head/sys/i386/conf/NOTES projects/pf/head/sys/i386/conf/PAE projects/pf/head/sys/i386/conf/XEN projects/pf/head/sys/i386/i386/apic_vector.s projects/pf/head/sys/i386/i386/genassym.c projects/pf/head/sys/i386/i386/identcpu.c projects/pf/head/sys/i386/i386/initcpu.c projects/pf/head/sys/i386/i386/machdep.c projects/pf/head/sys/i386/i386/mp_machdep.c projects/pf/head/sys/i386/i386/pmap.c projects/pf/head/sys/i386/i386/support.s projects/pf/head/sys/i386/i386/symbols.raw projects/pf/head/sys/i386/i386/sys_machdep.c projects/pf/head/sys/i386/i386/uio_machdep.c projects/pf/head/sys/i386/i386/vm_machdep.c projects/pf/head/sys/i386/ibcs2/ibcs2_fcntl.c projects/pf/head/sys/i386/ibcs2/ibcs2_ioctl.c projects/pf/head/sys/i386/ibcs2/ibcs2_misc.c projects/pf/head/sys/i386/ibcs2/ibcs2_sysvec.c projects/pf/head/sys/i386/ibcs2/imgact_coff.c projects/pf/head/sys/i386/include/acpica_machdep.h projects/pf/head/sys/i386/include/apicvar.h projects/pf/head/sys/i386/include/asm.h projects/pf/head/sys/i386/include/atomic.h projects/pf/head/sys/i386/include/counter.h projects/pf/head/sys/i386/include/cpu.h projects/pf/head/sys/i386/include/intr_machdep.h projects/pf/head/sys/i386/include/md_var.h projects/pf/head/sys/i386/include/pcpu.h projects/pf/head/sys/i386/include/pmap.h projects/pf/head/sys/i386/include/sf_buf.h projects/pf/head/sys/i386/include/smp.h projects/pf/head/sys/i386/include/xen/xen-os.h projects/pf/head/sys/i386/include/xen/xenfunc.h projects/pf/head/sys/i386/include/xen/xenvar.h projects/pf/head/sys/i386/isa/npx.c projects/pf/head/sys/i386/linux/imgact_linux.c projects/pf/head/sys/i386/linux/linux_machdep.c projects/pf/head/sys/i386/linux/linux_proto.h projects/pf/head/sys/i386/linux/linux_syscall.h projects/pf/head/sys/i386/linux/linux_syscalls.c projects/pf/head/sys/i386/linux/linux_sysent.c projects/pf/head/sys/i386/pci/pci_cfgreg.c projects/pf/head/sys/i386/xen/clock.c projects/pf/head/sys/i386/xen/exception.s projects/pf/head/sys/i386/xen/locore.s projects/pf/head/sys/i386/xen/mp_machdep.c projects/pf/head/sys/i386/xen/mptable.c projects/pf/head/sys/i386/xen/pmap.c projects/pf/head/sys/i386/xen/xen_machdep.c projects/pf/head/sys/ia64/conf/GENERIC projects/pf/head/sys/ia64/ia32/ia32_signal.c projects/pf/head/sys/ia64/ia64/mca.c projects/pf/head/sys/ia64/ia64/mp_machdep.c projects/pf/head/sys/ia64/ia64/pmap.c projects/pf/head/sys/ia64/ia64/vm_machdep.c projects/pf/head/sys/ia64/include/acpica_machdep.h projects/pf/head/sys/ia64/include/counter.h projects/pf/head/sys/ia64/include/sf_buf.h projects/pf/head/sys/ia64/pci/pci_cfgreg.c projects/pf/head/sys/kern/Make.tags.inc projects/pf/head/sys/kern/capabilities.conf projects/pf/head/sys/kern/imgact_elf.c projects/pf/head/sys/kern/imgact_gzip.c projects/pf/head/sys/kern/init_main.c projects/pf/head/sys/kern/init_sysent.c projects/pf/head/sys/kern/kern_acct.c projects/pf/head/sys/kern/kern_clock.c projects/pf/head/sys/kern/kern_condvar.c projects/pf/head/sys/kern/kern_cpuset.c projects/pf/head/sys/kern/kern_descrip.c projects/pf/head/sys/kern/kern_event.c projects/pf/head/sys/kern/kern_exec.c projects/pf/head/sys/kern/kern_exit.c projects/pf/head/sys/kern/kern_fork.c projects/pf/head/sys/kern/kern_intr.c projects/pf/head/sys/kern/kern_jail.c projects/pf/head/sys/kern/kern_kthread.c projects/pf/head/sys/kern/kern_ktrace.c projects/pf/head/sys/kern/kern_linker.c projects/pf/head/sys/kern/kern_lock.c projects/pf/head/sys/kern/kern_malloc.c projects/pf/head/sys/kern/kern_mbuf.c projects/pf/head/sys/kern/kern_mutex.c projects/pf/head/sys/kern/kern_ntptime.c projects/pf/head/sys/kern/kern_physio.c projects/pf/head/sys/kern/kern_poll.c projects/pf/head/sys/kern/kern_priv.c projects/pf/head/sys/kern/kern_proc.c projects/pf/head/sys/kern/kern_rangelock.c projects/pf/head/sys/kern/kern_rmlock.c projects/pf/head/sys/kern/kern_rwlock.c projects/pf/head/sys/kern/kern_sdt.c projects/pf/head/sys/kern/kern_sharedpage.c projects/pf/head/sys/kern/kern_sig.c projects/pf/head/sys/kern/kern_sx.c projects/pf/head/sys/kern/kern_synch.c projects/pf/head/sys/kern/kern_sysctl.c projects/pf/head/sys/kern/kern_time.c projects/pf/head/sys/kern/kern_timeout.c projects/pf/head/sys/kern/kern_uuid.c projects/pf/head/sys/kern/link_elf.c projects/pf/head/sys/kern/link_elf_obj.c projects/pf/head/sys/kern/makesyscalls.sh projects/pf/head/sys/kern/sched_4bsd.c projects/pf/head/sys/kern/sched_ule.c projects/pf/head/sys/kern/subr_bus.c projects/pf/head/sys/kern/subr_busdma_bufalloc.c projects/pf/head/sys/kern/subr_counter.c projects/pf/head/sys/kern/subr_devstat.c projects/pf/head/sys/kern/subr_lock.c projects/pf/head/sys/kern/subr_mbpool.c projects/pf/head/sys/kern/subr_prf.c projects/pf/head/sys/kern/subr_sbuf.c projects/pf/head/sys/kern/subr_smp.c projects/pf/head/sys/kern/subr_taskqueue.c projects/pf/head/sys/kern/subr_uio.c projects/pf/head/sys/kern/subr_unit.c projects/pf/head/sys/kern/subr_witness.c projects/pf/head/sys/kern/sys_capability.c projects/pf/head/sys/kern/sys_generic.c projects/pf/head/sys/kern/sys_pipe.c projects/pf/head/sys/kern/sys_procdesc.c projects/pf/head/sys/kern/sys_process.c projects/pf/head/sys/kern/sys_socket.c projects/pf/head/sys/kern/syscalls.c projects/pf/head/sys/kern/syscalls.master projects/pf/head/sys/kern/systrace_args.c projects/pf/head/sys/kern/sysv_shm.c projects/pf/head/sys/kern/tty.c projects/pf/head/sys/kern/tty_pts.c projects/pf/head/sys/kern/uipc_debug.c projects/pf/head/sys/kern/uipc_mbuf.c projects/pf/head/sys/kern/uipc_mqueue.c projects/pf/head/sys/kern/uipc_sem.c projects/pf/head/sys/kern/uipc_shm.c projects/pf/head/sys/kern/uipc_sockbuf.c projects/pf/head/sys/kern/uipc_socket.c projects/pf/head/sys/kern/uipc_syscalls.c projects/pf/head/sys/kern/uipc_usrreq.c projects/pf/head/sys/kern/vfs_acl.c projects/pf/head/sys/kern/vfs_aio.c projects/pf/head/sys/kern/vfs_bio.c projects/pf/head/sys/kern/vfs_cache.c projects/pf/head/sys/kern/vfs_cluster.c projects/pf/head/sys/kern/vfs_extattr.c projects/pf/head/sys/kern/vfs_lookup.c projects/pf/head/sys/kern/vfs_mount.c projects/pf/head/sys/kern/vfs_mountroot.c projects/pf/head/sys/kern/vfs_subr.c projects/pf/head/sys/kern/vfs_syscalls.c projects/pf/head/sys/kern/vfs_vnops.c projects/pf/head/sys/kgssapi/gss_impl.c projects/pf/head/sys/libkern/arm/aeabi_unwind.c projects/pf/head/sys/libkern/ashldi3.c projects/pf/head/sys/mips/atheros/apb.c projects/pf/head/sys/mips/atheros/ar71xx_chip.c projects/pf/head/sys/mips/atheros/ar71xx_cpudef.h projects/pf/head/sys/mips/atheros/ar71xx_gpio.c projects/pf/head/sys/mips/atheros/ar71xx_gpiovar.h projects/pf/head/sys/mips/atheros/ar71xx_machdep.c projects/pf/head/sys/mips/atheros/ar71xx_setup.c projects/pf/head/sys/mips/atheros/ar71xx_setup.h projects/pf/head/sys/mips/atheros/ar71xx_spi.c projects/pf/head/sys/mips/atheros/ar71xxreg.h projects/pf/head/sys/mips/atheros/ar724x_chip.c projects/pf/head/sys/mips/atheros/ar91xx_chip.c projects/pf/head/sys/mips/atheros/ar933x_chip.c projects/pf/head/sys/mips/atheros/ar933xreg.h projects/pf/head/sys/mips/atheros/files.ar71xx projects/pf/head/sys/mips/atheros/if_arge.c projects/pf/head/sys/mips/atheros/if_argevar.h projects/pf/head/sys/mips/atheros/uart_bus_ar71xx.c projects/pf/head/sys/mips/atheros/uart_bus_ar933x.c projects/pf/head/sys/mips/atheros/uart_cpu_ar71xx.c projects/pf/head/sys/mips/atheros/uart_cpu_ar933x.c projects/pf/head/sys/mips/cavium/octeon_rnd.c projects/pf/head/sys/mips/cavium/std.octeon1 projects/pf/head/sys/mips/conf/AP93.hints projects/pf/head/sys/mips/conf/AR933X_BASE projects/pf/head/sys/mips/conf/AR933X_BASE.hints projects/pf/head/sys/mips/conf/CARAMBOLA2.hints projects/pf/head/sys/mips/conf/DIR-825 projects/pf/head/sys/mips/conf/DIR-825.hints projects/pf/head/sys/mips/conf/MALTA projects/pf/head/sys/mips/conf/MALTA64 projects/pf/head/sys/mips/conf/ROUTERSTATION.hints projects/pf/head/sys/mips/conf/TP-WN1043ND projects/pf/head/sys/mips/gxemul/mpreg.h projects/pf/head/sys/mips/include/_stdint.h projects/pf/head/sys/mips/include/asm.h projects/pf/head/sys/mips/include/atomic.h projects/pf/head/sys/mips/include/counter.h projects/pf/head/sys/mips/include/cpuregs.h projects/pf/head/sys/mips/include/elf.h projects/pf/head/sys/mips/include/pcb.h projects/pf/head/sys/mips/include/sf_buf.h projects/pf/head/sys/mips/malta/files.malta projects/pf/head/sys/mips/malta/gt_pci.c projects/pf/head/sys/mips/malta/malta_machdep.c projects/pf/head/sys/mips/malta/yamon.c projects/pf/head/sys/mips/mips/bus_space_generic.c projects/pf/head/sys/mips/mips/elf_trampoline.c projects/pf/head/sys/mips/mips/exception.S projects/pf/head/sys/mips/mips/fp.S projects/pf/head/sys/mips/mips/mp_machdep.c projects/pf/head/sys/mips/mips/pmap.c projects/pf/head/sys/mips/mips/support.S projects/pf/head/sys/mips/mips/swtch.S projects/pf/head/sys/mips/mips/tlb.c projects/pf/head/sys/mips/mips/uio_machdep.c projects/pf/head/sys/mips/mips/vm_machdep.c projects/pf/head/sys/mips/nlm/board.c projects/pf/head/sys/mips/nlm/board.h projects/pf/head/sys/mips/nlm/board_cpld.c projects/pf/head/sys/mips/nlm/dev/net/nae.c projects/pf/head/sys/mips/nlm/dev/net/xaui.c projects/pf/head/sys/mips/nlm/dev/net/xlpge.c projects/pf/head/sys/mips/nlm/dev/net/xlpge.h projects/pf/head/sys/mips/nlm/dev/sec/nlmrsa.c projects/pf/head/sys/mips/nlm/dev/sec/nlmrsalib.h projects/pf/head/sys/mips/nlm/hal/nae.h projects/pf/head/sys/mips/nlm/hal/nlm_hal.c projects/pf/head/sys/mips/nlm/hal/sys.h projects/pf/head/sys/mips/sibyte/sb_zbpci.c projects/pf/head/sys/modules/Makefile projects/pf/head/sys/modules/aesni/Makefile projects/pf/head/sys/modules/bxe/Makefile projects/pf/head/sys/modules/cam/Makefile projects/pf/head/sys/modules/cc/Makefile projects/pf/head/sys/modules/ctl/Makefile projects/pf/head/sys/modules/cxgb/cxgb/Makefile projects/pf/head/sys/modules/cxgbe/Makefile projects/pf/head/sys/modules/cxgbe/if_cxgbe/Makefile projects/pf/head/sys/modules/cxgbe/t4_firmware/Makefile projects/pf/head/sys/modules/cyclic/Makefile projects/pf/head/sys/modules/drm2/Makefile projects/pf/head/sys/modules/drm2/drm2/Makefile projects/pf/head/sys/modules/dtrace/Makefile projects/pf/head/sys/modules/dtrace/dtio/Makefile projects/pf/head/sys/modules/dtrace/dtmalloc/Makefile projects/pf/head/sys/modules/dtrace/dtnfscl/Makefile projects/pf/head/sys/modules/dtrace/dtnfsclient/Makefile projects/pf/head/sys/modules/dtrace/dtrace/Makefile projects/pf/head/sys/modules/dtrace/dtrace_test/Makefile projects/pf/head/sys/modules/dtrace/dtraceall/Makefile projects/pf/head/sys/modules/dtrace/fasttrap/Makefile projects/pf/head/sys/modules/dtrace/fbt/Makefile projects/pf/head/sys/modules/dtrace/lockstat/Makefile projects/pf/head/sys/modules/dtrace/profile/Makefile projects/pf/head/sys/modules/dtrace/prototype/Makefile projects/pf/head/sys/modules/dtrace/sdt/Makefile projects/pf/head/sys/modules/dtrace/systrace/Makefile projects/pf/head/sys/modules/dtrace/systrace_freebsd32/Makefile projects/pf/head/sys/modules/dtrace/systrace_linux32/Makefile projects/pf/head/sys/modules/em/Makefile projects/pf/head/sys/modules/ext2fs/Makefile projects/pf/head/sys/modules/hpt27xx/Makefile projects/pf/head/sys/modules/hwpmc/Makefile projects/pf/head/sys/modules/igb/Makefile projects/pf/head/sys/modules/ip6_mroute_mod/Makefile projects/pf/head/sys/modules/ipfilter/Makefile projects/pf/head/sys/modules/iscsi/Makefile projects/pf/head/sys/modules/iwn/Makefile projects/pf/head/sys/modules/iwnfw/Makefile projects/pf/head/sys/modules/iwnfw/iwn6000g2a/Makefile projects/pf/head/sys/modules/linux/Makefile projects/pf/head/sys/modules/mlx4/Makefile projects/pf/head/sys/modules/mlx4ib/Makefile projects/pf/head/sys/modules/nvme/Makefile projects/pf/head/sys/modules/opensolaris/Makefile projects/pf/head/sys/modules/random/Makefile projects/pf/head/sys/modules/rdma/Makefile projects/pf/head/sys/modules/send/Makefile projects/pf/head/sys/modules/sfxge/Makefile projects/pf/head/sys/modules/ti/Makefile projects/pf/head/sys/modules/usb/Makefile projects/pf/head/sys/modules/virtio/network/Makefile projects/pf/head/sys/modules/vmm/Makefile projects/pf/head/sys/modules/wi/Makefile projects/pf/head/sys/modules/zfs/Makefile projects/pf/head/sys/net/flowtable.c projects/pf/head/sys/net/ieee8023ad_lacp.c projects/pf/head/sys/net/ieee8023ad_lacp.h projects/pf/head/sys/net/if.c projects/pf/head/sys/net/if.h projects/pf/head/sys/net/if_arp.h projects/pf/head/sys/net/if_bridge.c projects/pf/head/sys/net/if_enc.c projects/pf/head/sys/net/if_ethersubr.c projects/pf/head/sys/net/if_fddisubr.c projects/pf/head/sys/net/if_gif.c projects/pf/head/sys/net/if_gre.c projects/pf/head/sys/net/if_iso88025subr.c projects/pf/head/sys/net/if_lagg.c projects/pf/head/sys/net/if_lagg.h projects/pf/head/sys/net/if_llatbl.h projects/pf/head/sys/net/if_pfsync.h projects/pf/head/sys/net/if_spppsubr.c projects/pf/head/sys/net/if_tap.c projects/pf/head/sys/net/if_tun.c projects/pf/head/sys/net/if_var.h projects/pf/head/sys/net/netisr.c projects/pf/head/sys/net/pfil.c projects/pf/head/sys/net/pfil.h projects/pf/head/sys/net/radix.c projects/pf/head/sys/net/radix.h projects/pf/head/sys/net/route.c projects/pf/head/sys/net/route.h projects/pf/head/sys/net/rtsock.c projects/pf/head/sys/net/vnet.h projects/pf/head/sys/net80211/ieee80211.c projects/pf/head/sys/net80211/ieee80211.h projects/pf/head/sys/net80211/ieee80211_action.c projects/pf/head/sys/net80211/ieee80211_amrr.c projects/pf/head/sys/net80211/ieee80211_freebsd.c projects/pf/head/sys/net80211/ieee80211_freebsd.h projects/pf/head/sys/net80211/ieee80211_hostap.c projects/pf/head/sys/net80211/ieee80211_hwmp.c projects/pf/head/sys/net80211/ieee80211_input.c projects/pf/head/sys/net80211/ieee80211_ioctl.c projects/pf/head/sys/net80211/ieee80211_mesh.c projects/pf/head/sys/net80211/ieee80211_node.c projects/pf/head/sys/net80211/ieee80211_output.c projects/pf/head/sys/net80211/ieee80211_phy.c projects/pf/head/sys/net80211/ieee80211_phy.h projects/pf/head/sys/net80211/ieee80211_power.c projects/pf/head/sys/net80211/ieee80211_proto.c projects/pf/head/sys/net80211/ieee80211_proto.h projects/pf/head/sys/net80211/ieee80211_scan_sta.c projects/pf/head/sys/net80211/ieee80211_superg.c projects/pf/head/sys/net80211/ieee80211_tdma.c projects/pf/head/sys/net80211/ieee80211_var.h projects/pf/head/sys/net80211/ieee80211_wds.c projects/pf/head/sys/netatalk/at_control.c projects/pf/head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c projects/pf/head/sys/netgraph/bluetooth/socket/ng_btsocket.c projects/pf/head/sys/netgraph/netflow/ng_netflow.h projects/pf/head/sys/netgraph/ng_base.c projects/pf/head/sys/netgraph/ng_iface.c projects/pf/head/sys/netgraph/ng_pppoe.c projects/pf/head/sys/netgraph/ng_pppoe.h projects/pf/head/sys/netinet/icmp6.h projects/pf/head/sys/netinet/icmp_var.h projects/pf/head/sys/netinet/if_ether.c projects/pf/head/sys/netinet/igmp.c projects/pf/head/sys/netinet/igmp_var.h projects/pf/head/sys/netinet/in.c projects/pf/head/sys/netinet/in.h projects/pf/head/sys/netinet/in_mcast.c projects/pf/head/sys/netinet/in_pcb.c projects/pf/head/sys/netinet/in_pcb.h projects/pf/head/sys/netinet/in_var.h projects/pf/head/sys/netinet/ip_carp.c projects/pf/head/sys/netinet/ip_carp.h projects/pf/head/sys/netinet/ip_fastfwd.c projects/pf/head/sys/netinet/ip_icmp.c projects/pf/head/sys/netinet/ip_input.c projects/pf/head/sys/netinet/ip_mroute.c projects/pf/head/sys/netinet/ip_mroute.h projects/pf/head/sys/netinet/ip_output.c projects/pf/head/sys/netinet/ip_var.h projects/pf/head/sys/netinet/pim_var.h projects/pf/head/sys/netinet/sctp.h projects/pf/head/sys/netinet/sctp_asconf.c projects/pf/head/sys/netinet/sctp_auth.c projects/pf/head/sys/netinet/sctp_auth.h projects/pf/head/sys/netinet/sctp_constants.h projects/pf/head/sys/netinet/sctp_dtrace_define.h projects/pf/head/sys/netinet/sctp_indata.c projects/pf/head/sys/netinet/sctp_indata.h projects/pf/head/sys/netinet/sctp_input.c projects/pf/head/sys/netinet/sctp_os_bsd.h projects/pf/head/sys/netinet/sctp_output.c projects/pf/head/sys/netinet/sctp_pcb.c projects/pf/head/sys/netinet/sctp_pcb.h projects/pf/head/sys/netinet/sctp_structs.h projects/pf/head/sys/netinet/sctp_sysctl.c projects/pf/head/sys/netinet/sctp_sysctl.h projects/pf/head/sys/netinet/sctp_timer.c projects/pf/head/sys/netinet/sctp_uio.h projects/pf/head/sys/netinet/sctp_usrreq.c projects/pf/head/sys/netinet/sctputil.c projects/pf/head/sys/netinet/tcp_input.c projects/pf/head/sys/netinet/tcp_lro.c projects/pf/head/sys/netinet/tcp_lro.h projects/pf/head/sys/netinet/tcp_output.c projects/pf/head/sys/netinet/tcp_subr.c projects/pf/head/sys/netinet/tcp_syncache.c projects/pf/head/sys/netinet/tcp_syncache.h projects/pf/head/sys/netinet/tcp_usrreq.c projects/pf/head/sys/netinet/tcp_var.h projects/pf/head/sys/netinet/udp_usrreq.c projects/pf/head/sys/netinet/udp_var.h projects/pf/head/sys/netinet6/frag6.c projects/pf/head/sys/netinet6/icmp6.c projects/pf/head/sys/netinet6/in6.c projects/pf/head/sys/netinet6/in6.h projects/pf/head/sys/netinet6/in6_ifattach.c projects/pf/head/sys/netinet6/in6_mcast.c projects/pf/head/sys/netinet6/in6_pcb.c projects/pf/head/sys/netinet6/in6_proto.c projects/pf/head/sys/netinet6/in6_var.h projects/pf/head/sys/netinet6/ip6_forward.c projects/pf/head/sys/netinet6/ip6_id.c projects/pf/head/sys/netinet6/ip6_input.c projects/pf/head/sys/netinet6/ip6_mroute.c projects/pf/head/sys/netinet6/ip6_mroute.h projects/pf/head/sys/netinet6/ip6_output.c projects/pf/head/sys/netinet6/ip6_var.h projects/pf/head/sys/netinet6/mld6.c projects/pf/head/sys/netinet6/nd6.c projects/pf/head/sys/netinet6/nd6_rtr.c projects/pf/head/sys/netinet6/pim6_var.h projects/pf/head/sys/netinet6/raw_ip6.c projects/pf/head/sys/netinet6/raw_ip6.h projects/pf/head/sys/netinet6/sctp6_usrreq.c projects/pf/head/sys/netinet6/send.c projects/pf/head/sys/netinet6/udp6_usrreq.c projects/pf/head/sys/netipsec/ah_var.h projects/pf/head/sys/netipsec/esp_var.h projects/pf/head/sys/netipsec/ipcomp_var.h projects/pf/head/sys/netipsec/ipip_var.h projects/pf/head/sys/netipsec/ipsec.c projects/pf/head/sys/netipsec/ipsec.h projects/pf/head/sys/netipsec/ipsec6.h projects/pf/head/sys/netipsec/ipsec_input.c projects/pf/head/sys/netipsec/ipsec_mbuf.c projects/pf/head/sys/netipsec/ipsec_output.c projects/pf/head/sys/netipsec/key.c projects/pf/head/sys/netipsec/key_var.h projects/pf/head/sys/netipsec/keysock.c projects/pf/head/sys/netipsec/keysock.h projects/pf/head/sys/netipsec/xform_ah.c projects/pf/head/sys/netipsec/xform_esp.c projects/pf/head/sys/netipsec/xform_ipcomp.c projects/pf/head/sys/netipsec/xform_ipip.c projects/pf/head/sys/netipx/ipx.c projects/pf/head/sys/netipx/ipx_if.h projects/pf/head/sys/netnatm/natm.c projects/pf/head/sys/netpfil/ipfw/ip_dummynet.c projects/pf/head/sys/netpfil/ipfw/ip_fw2.c projects/pf/head/sys/netpfil/ipfw/ip_fw_log.c projects/pf/head/sys/netpfil/ipfw/ip_fw_nat.c projects/pf/head/sys/netpfil/ipfw/ip_fw_private.h projects/pf/head/sys/netpfil/pf/if_pfsync.c projects/pf/head/sys/netpfil/pf/pf.c projects/pf/head/sys/netpfil/pf/pf_lb.c projects/pf/head/sys/netsmb/smb_conn.c projects/pf/head/sys/netsmb/smb_dev.c projects/pf/head/sys/nfs/bootp_subr.c projects/pf/head/sys/nfsclient/nfs_subs.c projects/pf/head/sys/nfsclient/nfs_vnops.c projects/pf/head/sys/nfsserver/nfs_srvkrpc.c projects/pf/head/sys/nlm/nlm_prot_impl.c projects/pf/head/sys/ofed/drivers/infiniband/core/addr.c projects/pf/head/sys/ofed/drivers/infiniband/core/cma.c projects/pf/head/sys/ofed/drivers/infiniband/core/core_priv.h projects/pf/head/sys/ofed/drivers/infiniband/core/device.c projects/pf/head/sys/ofed/drivers/infiniband/core/sa_query.c projects/pf/head/sys/ofed/drivers/infiniband/core/sysfs.c projects/pf/head/sys/ofed/drivers/infiniband/core/ucm.c projects/pf/head/sys/ofed/drivers/infiniband/core/umem.c projects/pf/head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/pf/head/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/pf/head/sys/ofed/drivers/infiniband/core/verbs.c projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/Kconfig projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/Makefile projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/cq.c projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/srq.c projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/user.h projects/pf/head/sys/ofed/drivers/infiniband/hw/mlx4/wc.c projects/pf/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c projects/pf/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c projects/pf/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c projects/pf/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/pf/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/pf/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/pf/head/sys/ofed/drivers/net/mlx4/Makefile projects/pf/head/sys/ofed/drivers/net/mlx4/alloc.c projects/pf/head/sys/ofed/drivers/net/mlx4/catas.c projects/pf/head/sys/ofed/drivers/net/mlx4/cmd.c projects/pf/head/sys/ofed/drivers/net/mlx4/cq.c projects/pf/head/sys/ofed/drivers/net/mlx4/en_cq.c projects/pf/head/sys/ofed/drivers/net/mlx4/en_frag.c projects/pf/head/sys/ofed/drivers/net/mlx4/en_main.c projects/pf/head/sys/ofed/drivers/net/mlx4/en_netdev.c projects/pf/head/sys/ofed/drivers/net/mlx4/en_port.c projects/pf/head/sys/ofed/drivers/net/mlx4/en_port.h projects/pf/head/sys/ofed/drivers/net/mlx4/en_rx.c projects/pf/head/sys/ofed/drivers/net/mlx4/en_tx.c projects/pf/head/sys/ofed/drivers/net/mlx4/eq.c projects/pf/head/sys/ofed/drivers/net/mlx4/fw.c projects/pf/head/sys/ofed/drivers/net/mlx4/fw.h projects/pf/head/sys/ofed/drivers/net/mlx4/icm.c projects/pf/head/sys/ofed/drivers/net/mlx4/icm.h projects/pf/head/sys/ofed/drivers/net/mlx4/intf.c projects/pf/head/sys/ofed/drivers/net/mlx4/main.c projects/pf/head/sys/ofed/drivers/net/mlx4/mcg.c projects/pf/head/sys/ofed/drivers/net/mlx4/mlx4.h projects/pf/head/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/pf/head/sys/ofed/drivers/net/mlx4/mr.c projects/pf/head/sys/ofed/drivers/net/mlx4/pd.c projects/pf/head/sys/ofed/drivers/net/mlx4/port.c projects/pf/head/sys/ofed/drivers/net/mlx4/profile.c projects/pf/head/sys/ofed/drivers/net/mlx4/qp.c projects/pf/head/sys/ofed/drivers/net/mlx4/reset.c projects/pf/head/sys/ofed/drivers/net/mlx4/sense.c projects/pf/head/sys/ofed/drivers/net/mlx4/srq.c projects/pf/head/sys/ofed/include/asm/atomic.h projects/pf/head/sys/ofed/include/asm/byteorder.h projects/pf/head/sys/ofed/include/linux/bitops.h projects/pf/head/sys/ofed/include/linux/compat.h projects/pf/head/sys/ofed/include/linux/device.h projects/pf/head/sys/ofed/include/linux/dma-mapping.h projects/pf/head/sys/ofed/include/linux/file.h projects/pf/head/sys/ofed/include/linux/gfp.h projects/pf/head/sys/ofed/include/linux/idr.h projects/pf/head/sys/ofed/include/linux/if_ether.h projects/pf/head/sys/ofed/include/linux/in6.h projects/pf/head/sys/ofed/include/linux/kernel.h projects/pf/head/sys/ofed/include/linux/linux_compat.c projects/pf/head/sys/ofed/include/linux/list.h projects/pf/head/sys/ofed/include/linux/log2.h projects/pf/head/sys/ofed/include/linux/mlx4/cmd.h projects/pf/head/sys/ofed/include/linux/mlx4/cq.h projects/pf/head/sys/ofed/include/linux/mlx4/device.h projects/pf/head/sys/ofed/include/linux/mlx4/driver.h projects/pf/head/sys/ofed/include/linux/mlx4/qp.h projects/pf/head/sys/ofed/include/linux/mlx4/srq.h projects/pf/head/sys/ofed/include/linux/module.h projects/pf/head/sys/ofed/include/linux/moduleparam.h projects/pf/head/sys/ofed/include/linux/net.h projects/pf/head/sys/ofed/include/linux/page.h projects/pf/head/sys/ofed/include/linux/pci.h projects/pf/head/sys/ofed/include/linux/sysfs.h projects/pf/head/sys/ofed/include/linux/types.h projects/pf/head/sys/ofed/include/linux/workqueue.h projects/pf/head/sys/ofed/include/rdma/ib_cm.h projects/pf/head/sys/ofed/include/rdma/ib_mad.h projects/pf/head/sys/ofed/include/rdma/ib_sa.h projects/pf/head/sys/ofed/include/rdma/ib_umem.h projects/pf/head/sys/ofed/include/rdma/ib_user_verbs.h projects/pf/head/sys/ofed/include/rdma/ib_verbs.h projects/pf/head/sys/ofed/include/rdma/sdp_socket.h projects/pf/head/sys/opencrypto/cryptodev.c projects/pf/head/sys/pc98/conf/GENERIC projects/pf/head/sys/pc98/pc98/machdep.c projects/pf/head/sys/pci/ncr.c projects/pf/head/sys/powerpc/aim/interrupt.c projects/pf/head/sys/powerpc/aim/mmu_oea.c projects/pf/head/sys/powerpc/aim/mmu_oea64.c projects/pf/head/sys/powerpc/aim/mmu_oea64.h projects/pf/head/sys/powerpc/aim/nexus.c projects/pf/head/sys/powerpc/aim/trap.c projects/pf/head/sys/powerpc/aim/vm_machdep.c projects/pf/head/sys/powerpc/booke/pmap.c projects/pf/head/sys/powerpc/booke/vm_machdep.c projects/pf/head/sys/powerpc/conf/DEFAULTS projects/pf/head/sys/powerpc/conf/GENERIC projects/pf/head/sys/powerpc/conf/GENERIC64 projects/pf/head/sys/powerpc/include/_stdint.h projects/pf/head/sys/powerpc/include/counter.h projects/pf/head/sys/powerpc/include/frame.h projects/pf/head/sys/powerpc/include/ofw_machdep.h projects/pf/head/sys/powerpc/include/param.h projects/pf/head/sys/powerpc/include/platform.h projects/pf/head/sys/powerpc/include/pmc_mdep.h projects/pf/head/sys/powerpc/include/proc.h projects/pf/head/sys/powerpc/include/pte.h projects/pf/head/sys/powerpc/include/sf_buf.h projects/pf/head/sys/powerpc/include/spr.h projects/pf/head/sys/powerpc/ofw/ofw_cpu.c projects/pf/head/sys/powerpc/ofw/ofw_machdep.c projects/pf/head/sys/powerpc/ofw/ofw_pcibus.c projects/pf/head/sys/powerpc/ofw/ofw_real.c projects/pf/head/sys/powerpc/ofw/ofw_syscons.c projects/pf/head/sys/powerpc/ofw/ofw_syscons.h projects/pf/head/sys/powerpc/ofw/rtas.c projects/pf/head/sys/powerpc/powermac/ata_kauai.c projects/pf/head/sys/powerpc/powermac/ata_macio.c projects/pf/head/sys/powerpc/powermac/atibl.c projects/pf/head/sys/powerpc/powermac/kiic.c projects/pf/head/sys/powerpc/powermac/macio.c projects/pf/head/sys/powerpc/powermac/maciovar.h projects/pf/head/sys/powerpc/powermac/nvbl.c projects/pf/head/sys/powerpc/powermac/platform_powermac.c projects/pf/head/sys/powerpc/powerpc/busdma_machdep.c projects/pf/head/sys/powerpc/powerpc/cpu.c projects/pf/head/sys/powerpc/powerpc/intr_machdep.c projects/pf/head/sys/powerpc/powerpc/mmu_if.m projects/pf/head/sys/powerpc/powerpc/mp_machdep.c projects/pf/head/sys/powerpc/powerpc/platform.c projects/pf/head/sys/powerpc/powerpc/platform_if.m projects/pf/head/sys/powerpc/powerpc/pmap_dispatch.c projects/pf/head/sys/powerpc/powerpc/uio_machdep.c projects/pf/head/sys/powerpc/ps3/ps3cdrom.c projects/pf/head/sys/powerpc/wii/wii_ipcreg.h projects/pf/head/sys/rpc/clnt_dg.c projects/pf/head/sys/rpc/rpcsec_gss.h projects/pf/head/sys/rpc/rpcsec_gss/rpcsec_gss.c projects/pf/head/sys/security/audit/audit.c projects/pf/head/sys/security/audit/audit.h projects/pf/head/sys/security/audit/audit_arg.c projects/pf/head/sys/security/audit/audit_bsm.c projects/pf/head/sys/security/audit/audit_bsm_klib.c projects/pf/head/sys/security/audit/audit_pipe.c projects/pf/head/sys/security/audit/audit_private.h projects/pf/head/sys/security/audit/bsm_token.c projects/pf/head/sys/security/mac/mac_framework.c projects/pf/head/sys/security/mac/mac_framework.h projects/pf/head/sys/security/mac/mac_internal.h projects/pf/head/sys/security/mac/mac_policy.h projects/pf/head/sys/security/mac/mac_posix_shm.c projects/pf/head/sys/security/mac/mac_syscalls.c projects/pf/head/sys/security/mac/mac_vfs.c projects/pf/head/sys/security/mac_biba/mac_biba.c projects/pf/head/sys/security/mac_mls/mac_mls.c projects/pf/head/sys/security/mac_stub/mac_stub.c projects/pf/head/sys/security/mac_test/mac_test.c projects/pf/head/sys/sparc64/conf/GENERIC projects/pf/head/sys/sparc64/include/atomic.h projects/pf/head/sys/sparc64/include/counter.h projects/pf/head/sys/sparc64/include/pmap.h projects/pf/head/sys/sparc64/include/proc.h projects/pf/head/sys/sparc64/include/sf_buf.h projects/pf/head/sys/sparc64/include/ucontext.h projects/pf/head/sys/sparc64/sparc64/bus_machdep.c projects/pf/head/sys/sparc64/sparc64/genassym.c projects/pf/head/sys/sparc64/sparc64/machdep.c projects/pf/head/sys/sparc64/sparc64/mem.c projects/pf/head/sys/sparc64/sparc64/mp_machdep.c projects/pf/head/sys/sparc64/sparc64/pmap.c projects/pf/head/sys/sparc64/sparc64/sys_machdep.c projects/pf/head/sys/sparc64/sparc64/uio_machdep.c projects/pf/head/sys/sparc64/sparc64/vm_machdep.c projects/pf/head/sys/sys/_rmlock.h projects/pf/head/sys/sys/_task.h projects/pf/head/sys/sys/_types.h projects/pf/head/sys/sys/bitset.h projects/pf/head/sys/sys/buf.h projects/pf/head/sys/sys/bus.h projects/pf/head/sys/sys/callout.h projects/pf/head/sys/sys/capability.h projects/pf/head/sys/sys/conf.h projects/pf/head/sys/sys/counter.h projects/pf/head/sys/sys/cpuset.h projects/pf/head/sys/sys/devicestat.h projects/pf/head/sys/sys/diskpc98.h projects/pf/head/sys/sys/elf_common.h projects/pf/head/sys/sys/event.h projects/pf/head/sys/sys/eventhandler.h projects/pf/head/sys/sys/eventvar.h projects/pf/head/sys/sys/fcntl.h projects/pf/head/sys/sys/file.h projects/pf/head/sys/sys/filedesc.h projects/pf/head/sys/sys/jail.h projects/pf/head/sys/sys/kernel.h projects/pf/head/sys/sys/ktrace.h projects/pf/head/sys/sys/libkern.h projects/pf/head/sys/sys/linker.h projects/pf/head/sys/sys/lock.h projects/pf/head/sys/sys/lockmgr.h projects/pf/head/sys/sys/malloc.h projects/pf/head/sys/sys/mbpool.h projects/pf/head/sys/sys/mbuf.h projects/pf/head/sys/sys/mman.h projects/pf/head/sys/sys/mount.h projects/pf/head/sys/sys/mouse.h projects/pf/head/sys/sys/namei.h projects/pf/head/sys/sys/param.h projects/pf/head/sys/sys/pmckern.h projects/pf/head/sys/sys/priv.h projects/pf/head/sys/sys/proc.h projects/pf/head/sys/sys/procdesc.h projects/pf/head/sys/sys/random.h projects/pf/head/sys/sys/rangelock.h projects/pf/head/sys/sys/rmlock.h projects/pf/head/sys/sys/sched.h projects/pf/head/sys/sys/sdt.h projects/pf/head/sys/sys/sf_buf.h projects/pf/head/sys/sys/smp.h projects/pf/head/sys/sys/sockbuf.h projects/pf/head/sys/sys/socket.h projects/pf/head/sys/sys/socketvar.h projects/pf/head/sys/sys/stat.h projects/pf/head/sys/sys/stdatomic.h projects/pf/head/sys/sys/syscall.h projects/pf/head/sys/sys/syscall.mk projects/pf/head/sys/sys/syscallsubr.h projects/pf/head/sys/sys/sysctl.h projects/pf/head/sys/sys/sysproto.h projects/pf/head/sys/sys/systm.h projects/pf/head/sys/sys/taskqueue.h projects/pf/head/sys/sys/time.h projects/pf/head/sys/sys/timetc.h projects/pf/head/sys/sys/types.h projects/pf/head/sys/sys/uio.h projects/pf/head/sys/sys/user.h projects/pf/head/sys/sys/uuid.h projects/pf/head/sys/sys/vmmeter.h projects/pf/head/sys/sys/vnode.h projects/pf/head/sys/sys/wait.h projects/pf/head/sys/ufs/ffs/ffs_alloc.c projects/pf/head/sys/ufs/ffs/ffs_balloc.c projects/pf/head/sys/ufs/ffs/ffs_snapshot.c projects/pf/head/sys/ufs/ffs/ffs_softdep.c projects/pf/head/sys/ufs/ffs/ffs_suspend.c projects/pf/head/sys/ufs/ffs/ffs_vfsops.c projects/pf/head/sys/ufs/ufs/dinode.h projects/pf/head/sys/ufs/ufs/inode.h projects/pf/head/sys/ufs/ufs/ufs_dirhash.c projects/pf/head/sys/ufs/ufs/ufs_extattr.c projects/pf/head/sys/ufs/ufs/ufs_vnops.c projects/pf/head/sys/vm/_vm_radix.h projects/pf/head/sys/vm/device_pager.c projects/pf/head/sys/vm/memguard.c projects/pf/head/sys/vm/memguard.h projects/pf/head/sys/vm/phys_pager.c projects/pf/head/sys/vm/pmap.h projects/pf/head/sys/vm/sg_pager.c projects/pf/head/sys/vm/swap_pager.c projects/pf/head/sys/vm/uma.h projects/pf/head/sys/vm/uma_core.c projects/pf/head/sys/vm/uma_dbg.c projects/pf/head/sys/vm/uma_int.h projects/pf/head/sys/vm/vm.h projects/pf/head/sys/vm/vm_extern.h projects/pf/head/sys/vm/vm_fault.c projects/pf/head/sys/vm/vm_glue.c projects/pf/head/sys/vm/vm_init.c projects/pf/head/sys/vm/vm_kern.c projects/pf/head/sys/vm/vm_kern.h projects/pf/head/sys/vm/vm_map.c projects/pf/head/sys/vm/vm_map.h projects/pf/head/sys/vm/vm_mmap.c projects/pf/head/sys/vm/vm_object.c projects/pf/head/sys/vm/vm_object.h projects/pf/head/sys/vm/vm_page.c projects/pf/head/sys/vm/vm_page.h projects/pf/head/sys/vm/vm_pageout.c projects/pf/head/sys/vm/vm_pager.c projects/pf/head/sys/vm/vm_pager.h projects/pf/head/sys/vm/vm_param.h projects/pf/head/sys/vm/vm_phys.c projects/pf/head/sys/vm/vm_phys.h projects/pf/head/sys/vm/vm_radix.c projects/pf/head/sys/vm/vm_radix.h projects/pf/head/sys/vm/vm_reserv.c projects/pf/head/sys/vm/vm_zeroidle.c projects/pf/head/sys/vm/vnode_pager.c projects/pf/head/sys/x86/acpica/acpi_wakeup.c projects/pf/head/sys/x86/acpica/madt.c projects/pf/head/sys/x86/acpica/srat.c projects/pf/head/sys/x86/include/segments.h projects/pf/head/sys/x86/include/specialreg.h projects/pf/head/sys/x86/include/stdarg.h projects/pf/head/sys/x86/isa/atpic.c projects/pf/head/sys/x86/isa/clock.c projects/pf/head/sys/x86/x86/busdma_machdep.c projects/pf/head/sys/x86/x86/intr_machdep.c projects/pf/head/sys/x86/x86/io_apic.c projects/pf/head/sys/x86/x86/local_apic.c projects/pf/head/sys/xen/evtchn.h projects/pf/head/sys/xen/evtchn/evtchn_dev.c projects/pf/head/sys/xen/features.c projects/pf/head/sys/xen/gnttab.c projects/pf/head/sys/xen/gnttab.h projects/pf/head/sys/xen/hvm.h projects/pf/head/sys/xen/interface/event_channel.h projects/pf/head/sys/xen/xen_intr.h projects/pf/head/sys/xen/xenbus/xenbus.c projects/pf/head/sys/xen/xenbus/xenbus_if.m projects/pf/head/sys/xen/xenbus/xenbusb_front.c projects/pf/head/sys/xen/xenbus/xenbusvar.h projects/pf/head/sys/xen/xenstore/xenstore.c projects/pf/head/sys/xen/xenstore/xenstore_dev.c projects/pf/head/sys/xen/xenstore/xenstorevar.h projects/pf/head/tools/build/mk/OptionalObsoleteFiles.inc projects/pf/head/tools/build/options/WITHOUT_BINUTILS projects/pf/head/tools/build/options/WITHOUT_GCC projects/pf/head/tools/build/options/WITHOUT_LDNS projects/pf/head/tools/build/options/makeman projects/pf/head/tools/make_libdeps.sh projects/pf/head/tools/regression/aio/aiop/aiop.c projects/pf/head/tools/regression/aio/aiotest/aiotest.c projects/pf/head/tools/regression/file/dup/dup.c projects/pf/head/tools/regression/lib/libc/gen/test-fnmatch.c projects/pf/head/tools/regression/lib/libc/gen/test-fpclassify.c projects/pf/head/tools/regression/lib/libc/gen/test-ftw.c projects/pf/head/tools/regression/lib/libc/gen/test-wordexp.c projects/pf/head/tools/regression/lib/libc/stdio/Makefile projects/pf/head/tools/regression/lib/libc/stdio/test-fmemopen.t projects/pf/head/tools/regression/lib/libc/stdio/test-open_memstream.t projects/pf/head/tools/regression/lib/libc/stdio/test-open_wmemstream.t projects/pf/head/tools/regression/lib/libutil/Makefile projects/pf/head/tools/regression/priv/Makefile projects/pf/head/tools/regression/pthread/cv_cancel1/cv_cancel1.c projects/pf/head/tools/regression/sbin/dhclient/Makefile projects/pf/head/tools/regression/sockets/sendfile/sendfile.c projects/pf/head/tools/test/posixshm/shm_test.c projects/pf/head/tools/tools/README projects/pf/head/tools/tools/ath/Makefile.inc projects/pf/head/tools/tools/bootparttest/bootparttest.c projects/pf/head/tools/tools/bus_autoconf/bus_load_file.c projects/pf/head/tools/tools/crypto/ipsecstats.c projects/pf/head/tools/tools/cxgbetool/cxgbetool.c projects/pf/head/tools/tools/ifinfo/ifinfo.c projects/pf/head/tools/tools/net80211/wlanstats/Makefile projects/pf/head/tools/tools/sysbuild/sysbuild.sh projects/pf/head/tools/tools/sysdoc/sysdoc.sh projects/pf/head/tools/tools/sysdoc/tunables.mdoc projects/pf/head/tools/tools/zfsboottest/Makefile projects/pf/head/tools/tools/zfsboottest/zfsboottest.c projects/pf/head/tools/tools/zfsboottest/zfsboottest.sh projects/pf/head/usr.bin/Makefile projects/pf/head/usr.bin/Makefile.amd64 projects/pf/head/usr.bin/Makefile.i386 projects/pf/head/usr.bin/Makefile.ia64 projects/pf/head/usr.bin/Makefile.powerpc projects/pf/head/usr.bin/Makefile.sparc64 projects/pf/head/usr.bin/atf/Makefile projects/pf/head/usr.bin/atf/Makefile.inc projects/pf/head/usr.bin/bmake/Makefile projects/pf/head/usr.bin/bmake/config.h projects/pf/head/usr.bin/bmake/unit-tests/Makefile projects/pf/head/usr.bin/brandelf/brandelf.1 projects/pf/head/usr.bin/calendar/Makefile (contents, props changed) projects/pf/head/usr.bin/calendar/calendar.1 (contents, props changed) projects/pf/head/usr.bin/calendar/calendar.h (contents, props changed) projects/pf/head/usr.bin/calendar/calendars/calendar.dutch projects/pf/head/usr.bin/calendar/calendars/calendar.freebsd projects/pf/head/usr.bin/calendar/io.c (contents, props changed) projects/pf/head/usr.bin/calendar/pathnames.h (contents, props changed) projects/pf/head/usr.bin/clang/Makefile projects/pf/head/usr.bin/dtc/dtc.1 projects/pf/head/usr.bin/dtc/dtc.cc projects/pf/head/usr.bin/dtc/fdt.cc projects/pf/head/usr.bin/dtc/fdt.hh projects/pf/head/usr.bin/dtc/input_buffer.cc projects/pf/head/usr.bin/fetch/fetch.1 projects/pf/head/usr.bin/fetch/fetch.c projects/pf/head/usr.bin/find/function.c projects/pf/head/usr.bin/grep/regex/tre-fastmatch.c projects/pf/head/usr.bin/host/Makefile projects/pf/head/usr.bin/iconv/iconv.c projects/pf/head/usr.bin/kdump/kdump.c projects/pf/head/usr.bin/kdump/mksubr projects/pf/head/usr.bin/killall/killall.1 projects/pf/head/usr.bin/killall/killall.c projects/pf/head/usr.bin/ldd/ldd.c projects/pf/head/usr.bin/mail/popen.c projects/pf/head/usr.bin/make/job.c projects/pf/head/usr.bin/mkcsmapper/lex.l projects/pf/head/usr.bin/mkesdb/lex.l projects/pf/head/usr.bin/netstat/if.c projects/pf/head/usr.bin/netstat/inet.c projects/pf/head/usr.bin/netstat/inet6.c projects/pf/head/usr.bin/netstat/ipsec.c projects/pf/head/usr.bin/netstat/main.c projects/pf/head/usr.bin/netstat/mbuf.c projects/pf/head/usr.bin/netstat/mroute.c projects/pf/head/usr.bin/netstat/netstat.1 projects/pf/head/usr.bin/netstat/netstat.h projects/pf/head/usr.bin/netstat/pfkey.c projects/pf/head/usr.bin/netstat/route.c projects/pf/head/usr.bin/patch/Makefile projects/pf/head/usr.bin/patch/patch.c projects/pf/head/usr.bin/patch/pch.c projects/pf/head/usr.bin/patch/util.c projects/pf/head/usr.bin/procstat/procstat.1 projects/pf/head/usr.bin/procstat/procstat_files.c projects/pf/head/usr.bin/rpcinfo/rpcinfo.c projects/pf/head/usr.bin/rwho/rwho.c projects/pf/head/usr.bin/script/script.1 projects/pf/head/usr.bin/sed/main.c projects/pf/head/usr.bin/su/su.1 projects/pf/head/usr.bin/su/su.c projects/pf/head/usr.bin/svn/Makefile.inc projects/pf/head/usr.bin/svn/lib/libapr/apr.h projects/pf/head/usr.bin/svn/lib/libapr/apr_private.h projects/pf/head/usr.bin/svn/lib/libapr_util/Makefile projects/pf/head/usr.bin/svn/lib/libapr_util/apr_ldap.h projects/pf/head/usr.bin/svn/lib/libapr_util/apu.h projects/pf/head/usr.bin/svn/lib/libapr_util/apu_config.h projects/pf/head/usr.bin/svn/lib/libserf/Makefile projects/pf/head/usr.bin/svn/svn_private_config.h projects/pf/head/usr.bin/systat/Makefile projects/pf/head/usr.bin/systat/cmdtab.c projects/pf/head/usr.bin/systat/extern.h projects/pf/head/usr.bin/systat/netcmds.c projects/pf/head/usr.bin/systat/systat.1 projects/pf/head/usr.bin/truss/syscall.h projects/pf/head/usr.bin/truss/syscalls.c projects/pf/head/usr.bin/uname/uname.1 projects/pf/head/usr.bin/uname/uname.c projects/pf/head/usr.bin/uniq/uniq.c projects/pf/head/usr.bin/vi/Makefile projects/pf/head/usr.bin/vi/config.h projects/pf/head/usr.bin/vi/pathnames.h projects/pf/head/usr.sbin/Makefile projects/pf/head/usr.sbin/Makefile.amd64 projects/pf/head/usr.sbin/Makefile.i386 projects/pf/head/usr.sbin/Makefile.ia64 projects/pf/head/usr.sbin/Makefile.powerpc projects/pf/head/usr.sbin/Makefile.sparc64 projects/pf/head/usr.sbin/acpi/acpidb/acpidb.c projects/pf/head/usr.sbin/acpi/acpidump/acpi.c projects/pf/head/usr.sbin/arp/arp.c projects/pf/head/usr.sbin/authpf/Makefile projects/pf/head/usr.sbin/bhyve/Makefile projects/pf/head/usr.sbin/bhyve/acpi.c projects/pf/head/usr.sbin/bhyve/atpic.c projects/pf/head/usr.sbin/bhyve/bhyverun.c projects/pf/head/usr.sbin/bhyve/bhyverun.h projects/pf/head/usr.sbin/bhyve/dbgport.h projects/pf/head/usr.sbin/bhyve/ioapic.c projects/pf/head/usr.sbin/bhyve/mevent.c projects/pf/head/usr.sbin/bhyve/mevent.h projects/pf/head/usr.sbin/bhyve/mevent_test.c projects/pf/head/usr.sbin/bhyve/mptbl.c projects/pf/head/usr.sbin/bhyve/pci_emul.c projects/pf/head/usr.sbin/bhyve/pci_emul.h projects/pf/head/usr.sbin/bhyve/pci_hostbridge.c projects/pf/head/usr.sbin/bhyve/pci_virtio_block.c projects/pf/head/usr.sbin/bhyve/pci_virtio_net.c projects/pf/head/usr.sbin/bhyve/pit_8254.c projects/pf/head/usr.sbin/bhyve/rtc.c projects/pf/head/usr.sbin/bhyve/spinup_ap.c projects/pf/head/usr.sbin/bhyve/virtio.h projects/pf/head/usr.sbin/bhyvectl/Makefile projects/pf/head/usr.sbin/bhyvectl/bhyvectl.c projects/pf/head/usr.sbin/bhyveload/Makefile projects/pf/head/usr.sbin/bhyveload/bhyveload.8 projects/pf/head/usr.sbin/bhyveload/bhyveload.c projects/pf/head/usr.sbin/boot0cfg/boot0cfg.8 projects/pf/head/usr.sbin/boot98cfg/boot98cfg.c projects/pf/head/usr.sbin/bootparamd/bootparamd/main.c projects/pf/head/usr.sbin/bootparamd/callbootd/callbootd.c projects/pf/head/usr.sbin/bsdconfig/USAGE projects/pf/head/usr.sbin/bsdconfig/bsdconfig projects/pf/head/usr.sbin/bsdconfig/bsdconfig.8 projects/pf/head/usr.sbin/bsdconfig/console/USAGE projects/pf/head/usr.sbin/bsdconfig/console/console projects/pf/head/usr.sbin/bsdconfig/console/font projects/pf/head/usr.sbin/bsdconfig/console/keymap projects/pf/head/usr.sbin/bsdconfig/console/repeat projects/pf/head/usr.sbin/bsdconfig/console/saver projects/pf/head/usr.sbin/bsdconfig/console/screenmap projects/pf/head/usr.sbin/bsdconfig/console/ttys projects/pf/head/usr.sbin/bsdconfig/diskmgmt/USAGE projects/pf/head/usr.sbin/bsdconfig/diskmgmt/diskmgmt projects/pf/head/usr.sbin/bsdconfig/docsinstall/USAGE projects/pf/head/usr.sbin/bsdconfig/docsinstall/docsinstall projects/pf/head/usr.sbin/bsdconfig/dot/USAGE projects/pf/head/usr.sbin/bsdconfig/dot/dot projects/pf/head/usr.sbin/bsdconfig/examples/Makefile projects/pf/head/usr.sbin/bsdconfig/include/media.hlp projects/pf/head/usr.sbin/bsdconfig/include/messages.subr projects/pf/head/usr.sbin/bsdconfig/mouse/USAGE projects/pf/head/usr.sbin/bsdconfig/mouse/disable projects/pf/head/usr.sbin/bsdconfig/mouse/enable projects/pf/head/usr.sbin/bsdconfig/mouse/flags projects/pf/head/usr.sbin/bsdconfig/mouse/mouse projects/pf/head/usr.sbin/bsdconfig/mouse/port projects/pf/head/usr.sbin/bsdconfig/mouse/type projects/pf/head/usr.sbin/bsdconfig/networking/USAGE projects/pf/head/usr.sbin/bsdconfig/networking/defaultrouter projects/pf/head/usr.sbin/bsdconfig/networking/devices projects/pf/head/usr.sbin/bsdconfig/networking/hostname projects/pf/head/usr.sbin/bsdconfig/networking/include/messages.subr projects/pf/head/usr.sbin/bsdconfig/networking/nameservers projects/pf/head/usr.sbin/bsdconfig/networking/networking projects/pf/head/usr.sbin/bsdconfig/networking/share/Makefile projects/pf/head/usr.sbin/bsdconfig/networking/share/common.subr projects/pf/head/usr.sbin/bsdconfig/networking/share/device.subr projects/pf/head/usr.sbin/bsdconfig/networking/share/hostname.subr projects/pf/head/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/pf/head/usr.sbin/bsdconfig/networking/share/media.subr projects/pf/head/usr.sbin/bsdconfig/networking/share/netmask.subr projects/pf/head/usr.sbin/bsdconfig/networking/share/resolv.subr projects/pf/head/usr.sbin/bsdconfig/networking/share/routing.subr projects/pf/head/usr.sbin/bsdconfig/packages/USAGE projects/pf/head/usr.sbin/bsdconfig/packages/packages projects/pf/head/usr.sbin/bsdconfig/password/USAGE projects/pf/head/usr.sbin/bsdconfig/password/password projects/pf/head/usr.sbin/bsdconfig/password/share/password.subr projects/pf/head/usr.sbin/bsdconfig/security/USAGE projects/pf/head/usr.sbin/bsdconfig/security/include/messages.subr projects/pf/head/usr.sbin/bsdconfig/security/kern_securelevel projects/pf/head/usr.sbin/bsdconfig/security/security projects/pf/head/usr.sbin/bsdconfig/share/Makefile projects/pf/head/usr.sbin/bsdconfig/share/common.subr projects/pf/head/usr.sbin/bsdconfig/share/device.subr projects/pf/head/usr.sbin/bsdconfig/share/dialog.subr projects/pf/head/usr.sbin/bsdconfig/share/media/Makefile projects/pf/head/usr.sbin/bsdconfig/share/media/any.subr projects/pf/head/usr.sbin/bsdconfig/share/media/cdrom.subr projects/pf/head/usr.sbin/bsdconfig/share/media/common.subr projects/pf/head/usr.sbin/bsdconfig/share/media/directory.subr projects/pf/head/usr.sbin/bsdconfig/share/media/dos.subr projects/pf/head/usr.sbin/bsdconfig/share/media/floppy.subr projects/pf/head/usr.sbin/bsdconfig/share/media/ftp.subr projects/pf/head/usr.sbin/bsdconfig/share/media/httpproxy.subr projects/pf/head/usr.sbin/bsdconfig/share/media/network.subr projects/pf/head/usr.sbin/bsdconfig/share/media/nfs.subr projects/pf/head/usr.sbin/bsdconfig/share/media/options.subr projects/pf/head/usr.sbin/bsdconfig/share/media/tcpip.subr projects/pf/head/usr.sbin/bsdconfig/share/media/ufs.subr projects/pf/head/usr.sbin/bsdconfig/share/media/usb.subr projects/pf/head/usr.sbin/bsdconfig/share/mustberoot.subr projects/pf/head/usr.sbin/bsdconfig/share/packages/categories.subr projects/pf/head/usr.sbin/bsdconfig/share/packages/index.subr projects/pf/head/usr.sbin/bsdconfig/share/packages/packages.subr projects/pf/head/usr.sbin/bsdconfig/share/script.subr projects/pf/head/usr.sbin/bsdconfig/share/strings.subr projects/pf/head/usr.sbin/bsdconfig/share/struct.subr projects/pf/head/usr.sbin/bsdconfig/share/sysrc.subr projects/pf/head/usr.sbin/bsdconfig/share/variable.subr projects/pf/head/usr.sbin/bsdconfig/startup/USAGE projects/pf/head/usr.sbin/bsdconfig/startup/misc projects/pf/head/usr.sbin/bsdconfig/startup/rcadd projects/pf/head/usr.sbin/bsdconfig/startup/rcconf projects/pf/head/usr.sbin/bsdconfig/startup/rcdelete projects/pf/head/usr.sbin/bsdconfig/startup/rcedit projects/pf/head/usr.sbin/bsdconfig/startup/rcvar projects/pf/head/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/pf/head/usr.sbin/bsdconfig/startup/share/rcedit.subr projects/pf/head/usr.sbin/bsdconfig/startup/share/rcvar.subr projects/pf/head/usr.sbin/bsdconfig/startup/startup projects/pf/head/usr.sbin/bsdconfig/timezone/USAGE projects/pf/head/usr.sbin/bsdconfig/timezone/share/continents.subr projects/pf/head/usr.sbin/bsdconfig/timezone/share/countries.subr projects/pf/head/usr.sbin/bsdconfig/timezone/share/iso3166.subr projects/pf/head/usr.sbin/bsdconfig/timezone/share/menus.subr projects/pf/head/usr.sbin/bsdconfig/timezone/share/zones.subr projects/pf/head/usr.sbin/bsdconfig/timezone/timezone projects/pf/head/usr.sbin/bsdconfig/ttys/USAGE projects/pf/head/usr.sbin/bsdconfig/ttys/ttys projects/pf/head/usr.sbin/bsdconfig/usermgmt/USAGE projects/pf/head/usr.sbin/bsdconfig/usermgmt/groupadd projects/pf/head/usr.sbin/bsdconfig/usermgmt/groupdel projects/pf/head/usr.sbin/bsdconfig/usermgmt/groupedit projects/pf/head/usr.sbin/bsdconfig/usermgmt/groupinput projects/pf/head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr projects/pf/head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr projects/pf/head/usr.sbin/bsdconfig/usermgmt/useradd projects/pf/head/usr.sbin/bsdconfig/usermgmt/userdel projects/pf/head/usr.sbin/bsdconfig/usermgmt/useredit projects/pf/head/usr.sbin/bsdconfig/usermgmt/userinput projects/pf/head/usr.sbin/bsdconfig/usermgmt/usermgmt projects/pf/head/usr.sbin/bsdinstall/bsdinstall projects/pf/head/usr.sbin/bsdinstall/bsdinstall.8 projects/pf/head/usr.sbin/bsdinstall/partedit/gpart_ops.c projects/pf/head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c projects/pf/head/usr.sbin/bsdinstall/scripts/Makefile projects/pf/head/usr.sbin/bsdinstall/scripts/auto projects/pf/head/usr.sbin/bsdinstall/scripts/config projects/pf/head/usr.sbin/bsdinstall/scripts/jail projects/pf/head/usr.sbin/bsdinstall/scripts/keymap projects/pf/head/usr.sbin/bsdinstall/scripts/mirrorselect projects/pf/head/usr.sbin/bsdinstall/scripts/netconfig projects/pf/head/usr.sbin/bsdinstall/scripts/script projects/pf/head/usr.sbin/bsdinstall/scripts/services projects/pf/head/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt projects/pf/head/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c projects/pf/head/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def projects/pf/head/usr.sbin/crashinfo/crashinfo.sh projects/pf/head/usr.sbin/ctladm/ctladm.8 projects/pf/head/usr.sbin/ctladm/ctladm.c projects/pf/head/usr.sbin/daemon/daemon.8 projects/pf/head/usr.sbin/daemon/daemon.c projects/pf/head/usr.sbin/freebsd-update/freebsd-update.sh projects/pf/head/usr.sbin/gpioctl/gpioctl.8 projects/pf/head/usr.sbin/gpioctl/gpioctl.c projects/pf/head/usr.sbin/gssd/gssd.8 projects/pf/head/usr.sbin/gssd/gssd.c projects/pf/head/usr.sbin/ifmcstat/ifmcstat.c projects/pf/head/usr.sbin/jail/command.c projects/pf/head/usr.sbin/jail/config.c projects/pf/head/usr.sbin/jail/jail.8 projects/pf/head/usr.sbin/jail/jail.c projects/pf/head/usr.sbin/jail/jailp.h projects/pf/head/usr.sbin/kldxref/kldxref.c projects/pf/head/usr.sbin/makefs/cd9660.c projects/pf/head/usr.sbin/makefs/cd9660/iso9660_rrip.c projects/pf/head/usr.sbin/makefs/ffs/ufs_bswap.h projects/pf/head/usr.sbin/makefs/makefs.8 projects/pf/head/usr.sbin/makefs/makefs.c projects/pf/head/usr.sbin/mergemaster/mergemaster.8 projects/pf/head/usr.sbin/mergemaster/mergemaster.sh projects/pf/head/usr.sbin/mfiutil/mfi_drive.c projects/pf/head/usr.sbin/mfiutil/mfiutil.8 projects/pf/head/usr.sbin/mfiutil/mfiutil.c projects/pf/head/usr.sbin/mtree/create.c projects/pf/head/usr.sbin/ndp/ndp.c projects/pf/head/usr.sbin/newsyslog/newsyslog.c projects/pf/head/usr.sbin/nfsd/nfsv4.4 projects/pf/head/usr.sbin/ntp/config.h projects/pf/head/usr.sbin/ntp/libparse/Makefile projects/pf/head/usr.sbin/nvram/nvram.c projects/pf/head/usr.sbin/pciconf/cap.c projects/pf/head/usr.sbin/periodic/periodic.sh projects/pf/head/usr.sbin/pkg/Makefile projects/pf/head/usr.sbin/pkg/config.c projects/pf/head/usr.sbin/pkg/elf_tables.h projects/pf/head/usr.sbin/pkg_install/add/extract.c projects/pf/head/usr.sbin/pkg_install/add/main.c projects/pf/head/usr.sbin/pkg_install/create/pl.c projects/pf/head/usr.sbin/pkg_install/lib/exec.c projects/pf/head/usr.sbin/portsnap/portsnap/portsnap.sh projects/pf/head/usr.sbin/powerd/powerd.8 projects/pf/head/usr.sbin/powerd/powerd.c projects/pf/head/usr.sbin/ppp/defs.c projects/pf/head/usr.sbin/ppp/defs.h projects/pf/head/usr.sbin/ppp/mppe.c projects/pf/head/usr.sbin/pw/pw_user.c projects/pf/head/usr.sbin/rtadvctl/rtadvctl.c projects/pf/head/usr.sbin/rtadvd/config.c projects/pf/head/usr.sbin/rtadvd/if.c projects/pf/head/usr.sbin/rtadvd/rrenum.c projects/pf/head/usr.sbin/rtadvd/rtadvd.c projects/pf/head/usr.sbin/rtadvd/rtadvd.h projects/pf/head/usr.sbin/rtadvd/timer.c projects/pf/head/usr.sbin/rtadvd/timer.h projects/pf/head/usr.sbin/rtadvd/timer_subr.c projects/pf/head/usr.sbin/rtadvd/timer_subr.h projects/pf/head/usr.sbin/rtsold/dump.c projects/pf/head/usr.sbin/rtsold/if.c projects/pf/head/usr.sbin/rtsold/probe.c projects/pf/head/usr.sbin/rtsold/rtsock.c projects/pf/head/usr.sbin/rtsold/rtsol.c projects/pf/head/usr.sbin/rtsold/rtsold.c projects/pf/head/usr.sbin/rtsold/rtsold.h projects/pf/head/usr.sbin/rwhod/rwhod.c projects/pf/head/usr.sbin/setfib/setfib.1 projects/pf/head/usr.sbin/sysrc/sysrc projects/pf/head/usr.sbin/sysrc/sysrc.8 projects/pf/head/usr.sbin/watch/watch.c projects/pf/head/usr.sbin/watchdogd/watchdogd.8 projects/pf/head/usr.sbin/watchdogd/watchdogd.c projects/pf/head/usr.sbin/wpa/Makefile.crypto projects/pf/head/usr.sbin/wpa/Makefile.inc projects/pf/head/usr.sbin/wpa/hostapd/Makefile projects/pf/head/usr.sbin/wpa/hostapd_cli/Makefile projects/pf/head/usr.sbin/wpa/wpa_cli/Makefile projects/pf/head/usr.sbin/wpa/wpa_passphrase/Makefile projects/pf/head/usr.sbin/wpa/wpa_supplicant/Makefile projects/pf/head/usr.sbin/ypserv/yp_access.c projects/pf/head/usr.sbin/ypserv/yp_dnslookup.c projects/pf/head/usr.sbin/ypserv/yp_main.c projects/pf/head/usr.sbin/ypset/ypset.c Directory Properties: projects/pf/head/ (props changed) projects/pf/head/cddl/ (props changed) projects/pf/head/cddl/contrib/opensolaris/ (props changed) projects/pf/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) projects/pf/head/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/pf/head/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/pf/head/contrib/apr/ (props changed) projects/pf/head/contrib/apr-util/ (props changed) projects/pf/head/contrib/binutils/ (props changed) projects/pf/head/contrib/bmake/ (props changed) projects/pf/head/contrib/dialog/ (props changed) projects/pf/head/contrib/gcc/ (props changed) projects/pf/head/contrib/ipfilter/ (props changed) projects/pf/head/contrib/ldns/ (props changed) projects/pf/head/contrib/libc++/ (props changed) projects/pf/head/contrib/libcxxrt/ (props changed) projects/pf/head/contrib/libstdc++/ (props changed) projects/pf/head/contrib/llvm/ (props changed) projects/pf/head/contrib/llvm/tools/clang/ (props changed) projects/pf/head/contrib/mtree/ (props changed) projects/pf/head/contrib/nvi/ (props changed) projects/pf/head/contrib/openbsm/ (props changed) projects/pf/head/contrib/openpam/ (props changed) projects/pf/head/contrib/sendmail/ (props changed) projects/pf/head/contrib/serf/ (props changed) projects/pf/head/contrib/subversion/ (props changed) projects/pf/head/contrib/tcpdump/ (props changed) projects/pf/head/contrib/tzdata/ (props changed) projects/pf/head/contrib/unbound/ (props changed) projects/pf/head/contrib/unbound/validator/val_secalgo.c (props changed) projects/pf/head/contrib/unbound/validator/val_secalgo.h (props changed) projects/pf/head/contrib/wpa/ (props changed) projects/pf/head/contrib/wpa/hostapd/eap_testing.txt (props changed) projects/pf/head/contrib/wpa/hostapd/hostapd.8 (props changed) projects/pf/head/contrib/wpa/hostapd/hostapd_cli.1 (props changed) projects/pf/head/contrib/wpa/hostapd/logwatch/hostapd.conf (props changed) projects/pf/head/contrib/wpa/hostapd/wired.conf (props changed) projects/pf/head/contrib/wpa/src/ap/vlan_init.h (props changed) projects/pf/head/contrib/wpa/src/ap/wmm.h (props changed) projects/pf/head/contrib/wpa/src/utils/radiotap.c (props changed) projects/pf/head/contrib/wpa/src/wps/http.h (props changed) projects/pf/head/contrib/wpa/wpa_supplicant/dbus/dbus-wpa_supplicant.conf (props changed) projects/pf/head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-getall.py (props changed) projects/pf/head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-wps.py (props changed) projects/pf/head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new.py (props changed) projects/pf/head/crypto/heimdal/ (props changed) projects/pf/head/crypto/openssh/ (props changed) projects/pf/head/crypto/openssl/ (props changed) projects/pf/head/gnu/lib/ (props changed) projects/pf/head/gnu/usr.bin/binutils/ (props changed) projects/pf/head/gnu/usr.bin/cc/cc_tools/ (props changed) projects/pf/head/lib/libc/ (props changed) projects/pf/head/lib/libutil/ (props changed) projects/pf/head/lib/libvmmapi/ (props changed) projects/pf/head/lib/libz/ (props changed) projects/pf/head/sbin/ (props changed) projects/pf/head/sbin/ipfw/ (props changed) projects/pf/head/share/examples/kld/random_adaptor/random_adaptor_example.c (props changed) projects/pf/head/share/man/man4/ (props changed) projects/pf/head/sys/ (props changed) projects/pf/head/sys/amd64/include/xen/ (props changed) projects/pf/head/sys/amd64/vmm/ (props changed) projects/pf/head/sys/boot/ (props changed) projects/pf/head/sys/boot/i386/efi/ (props changed) projects/pf/head/sys/boot/powerpc/boot1.chrp/ (props changed) projects/pf/head/sys/cddl/contrib/opensolaris/ (props changed) projects/pf/head/sys/conf/ (props changed) projects/pf/head/sys/contrib/dev/acpica/ (props changed) projects/pf/head/sys/contrib/dev/acpica/common/ (props changed) projects/pf/head/sys/contrib/dev/acpica/compiler/ (props changed) projects/pf/head/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/pf/head/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/pf/head/sys/contrib/dev/acpica/components/dispatcher/ (props changed) projects/pf/head/sys/contrib/dev/acpica/components/events/ (props changed) projects/pf/head/sys/contrib/dev/acpica/components/executer/ (props changed) projects/pf/head/sys/contrib/dev/acpica/components/hardware/ (props changed) projects/pf/head/sys/contrib/dev/acpica/components/namespace/ (props changed) projects/pf/head/sys/contrib/dev/acpica/components/parser/ (props changed) projects/pf/head/sys/contrib/dev/acpica/components/resources/ (props changed) projects/pf/head/sys/contrib/dev/acpica/components/tables/ (props changed) projects/pf/head/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/pf/head/sys/contrib/dev/acpica/include/ (props changed) projects/pf/head/sys/contrib/dev/acpica/os_specific/ (props changed) projects/pf/head/sys/contrib/ipfilter/ (props changed) projects/pf/head/sys/modules/vmm/ (props changed) projects/pf/head/usr.bin/calendar/ (props changed) projects/pf/head/usr.bin/procstat/ (props changed) projects/pf/head/usr.sbin/bhyve/ (props changed) projects/pf/head/usr.sbin/bhyvectl/ (props changed) projects/pf/head/usr.sbin/bhyveload/ (props changed) projects/pf/head/usr.sbin/bsdinstall/scripts/docsinstall (props changed) projects/pf/head/usr.sbin/jail/ (props changed) projects/pf/head/usr.sbin/rtadvctl/ (props changed) projects/pf/head/usr.sbin/rtadvd/ (props changed) projects/pf/head/usr.sbin/rtsold/ (props changed) Modified: projects/pf/head/LOCKS ============================================================================== --- projects/pf/head/LOCKS Fri Oct 18 09:17:35 2013 (r256725) +++ projects/pf/head/LOCKS Fri Oct 18 09:32:02 2013 (r256726) @@ -12,3 +12,7 @@ releng/5.* Requires Security Officer app releng/6.* Requires Security Officer approval. releng/7.* Requires Security Officer approval. releng/8.* Requires Security Officer approval. +head/sys/dev/random Requires Security Officer approval. +head/sys/libkern/arc4random.c Requires Security Officer approval. +stable/*/sys/dev/random Requires Security Officer approval. +stable/*/sys/libkern/arc4random.c Requires Security Officer approval. Modified: projects/pf/head/MAINTAINERS ============================================================================== --- projects/pf/head/MAINTAINERS Fri Oct 18 09:17:35 2013 (r256725) +++ projects/pf/head/MAINTAINERS Fri Oct 18 09:32:02 2013 (r256726) @@ -128,3 +128,6 @@ sysdoc trhodes Pre-commit review prefe sh(1) jilles Pre-commit review requested. This also applies to kill(1), printf(1) and test(1) which are compiled in as builtins. +nvme(4) jimharris Pre-commit review requested. +nvd(4) jimharris Pre-commit review requested. +nvmecontrol(8) jimharris Pre-commit review requested. Modified: projects/pf/head/Makefile ============================================================================== --- projects/pf/head/Makefile Fri Oct 18 09:17:35 2013 (r256725) +++ projects/pf/head/Makefile Fri Oct 18 09:32:02 2013 (r256726) @@ -32,6 +32,12 @@ # targets - Print a list of supported TARGET/TARGET_ARCH pairs # for world and kernel targets. # toolchains - Build a toolchain for all world and kernel targets. +# +# "quick" way to test all kernel builds: +# _jflag=`sysctl -n hw.ncpu` +# _jflag=$(($_jflag * 2)) +# [ $_jflag -gt 12 ] && _jflag=12 +# make universe -DMAKE_JUST_KERNELS JFLAG=-j${_jflag} # # This makefile is simple by design. The FreeBSD make automatically reads # the /usr/share/mk/sys.mk unless the -m argument is specified on the @@ -124,11 +130,34 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ (in make.conf(5)) or command-line variable. .endif -MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE} -BINMAKE= \ - `if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \ + +# We often need to use the tree's version of make to build it. +# Choices add to complexity though. +# We cannot blindly use a make which may not be the one we want +# so be exlicit - until all choice is removed. +.if !defined(WITHOUT_BMAKE) +WANT_MAKE= bmake +.else +WANT_MAKE= fmake +.endif +MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE} +.if defined(.PARSEDIR) +HAVE_MAKE= bmake +.else +HAVE_MAKE= fmake +.endif +.if exists(${MYMAKE}) +SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk +.elif ${WANT_MAKE} != ${HAVE_MAKE} || ${WANT_MAKE} != "bmake" +# It may not exist yet but we may cause it to. +# In the case of fmake, upgrade_checks may cause a newer version to be built. +SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \ -m ${.CURDIR}/share/mk -_MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} +.else +SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk +.endif + +_MAKE= PATH=${PATH} ${SUB_MAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) @@ -213,6 +242,7 @@ cleanworld: # skip this for -n to avoid changing previous behavior of # 'make -n buildworld' etc. ${TGTS}: .MAKE +tinderbox toolchains kernel-toolchains: .MAKE .endif ${TGTS}: @@ -285,11 +315,13 @@ kernel: buildkernel installkernel # Perform a few tests to determine if the installed tools are adequate # for building the world. # +# Note: if we ever need to care about the version of bmake, simply testing +# MAKE_VERSION against a required version should suffice. +# upgrade_checks: -.if !defined(.PARSEDIR) -.if !defined(WITHOUT_BMAKE) - (cd ${.CURDIR} && ${MAKE} bmake) -.else +.if ${HAVE_MAKE} != ${WANT_MAKE} + @(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,}) +.elif ${WANT_MAKE} == "fmake" @if ! (cd ${.CURDIR}/tools/build/make_check && \ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ @@ -297,20 +329,19 @@ upgrade_checks: (cd ${.CURDIR} && ${MAKE} make); \ fi .endif -.endif # # Upgrade make(1) to the current version using the installed # headers, libraries and tools. Also, allow the location of # the system bsdmake-like utility to be overridden. # -MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ +MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" MMAKE= ${MMAKEENV} ${MAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ - -DNO_CPU_CFLAGS -DNO_WERROR + -DNO_CPU_CFLAGS -DNO_WERROR DESTDIR= PROGNAME=${MYMAKE:T} make bmake: .PHONY @echo @@ -321,16 +352,18 @@ make bmake: .PHONY ${MMAKE} obj && \ ${MMAKE} depend && \ ${MMAKE} all && \ - ${MMAKE} install DESTDIR=${MAKEPATH} BINDIR= + ${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= + +tinderbox toolchains kernel-toolchains: upgrade_checks tinderbox: - @cd ${.CURDIR} && ${MAKE} DOING_TINDERBOX=YES universe + @cd ${.CURDIR} && ${SUB_MAKE} DOING_TINDERBOX=YES universe toolchains: - @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=toolchain universe + @cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=toolchain universe kernel-toolchains: - @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=kernel-toolchain universe + @cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe # # universe @@ -341,7 +374,7 @@ kernel-toolchains: # .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 -TARGET_ARCHES_arm?= arm armeb armv6 armv6eb +TARGET_ARCHES_arm?= arm armeb armv6 TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 TARGET_ARCHES_powerpc?= powerpc powerpc64 TARGET_ARCHES_pc98?= i386 @@ -371,7 +404,8 @@ MAKEFAIL=tee -a ${FAILFILE} MAKEFAIL=cat .endif -universe: universe_prologue upgrade_checks +universe_prologue: upgrade_checks +universe: universe_prologue universe_prologue: @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @@ -381,17 +415,17 @@ universe_prologue: .endif .for target in ${TARGETS} universe: universe_${target} -.ORDER: universe_prologue upgrade_checks universe_${target} universe_epilogue +universe_epilogue: universe_${target} universe_${target}: universe_${target}_prologue -universe_${target}_prologue: +universe_${target}_prologue: universe_prologue @echo ">> ${target} started on `LC_ALL=C date`" .if !defined(MAKE_JUST_KERNELS) .for target_arch in ${TARGET_ARCHES_${target}} universe_${target}: universe_${target}_${target_arch} -universe_${target}_${target_arch}: universe_${target}_prologue +universe_${target}_${target_arch}: universe_${target}_prologue .MAKE @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`" @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ - ${MAKE} ${JFLAG} ${UNIVERSE_TARGET} \ + ${SUB_MAKE} ${JFLAG} ${UNIVERSE_TARGET} \ TARGET=${target} \ TARGET_ARCH=${target_arch} \ > _.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \ @@ -409,14 +443,14 @@ universe_${target}_kernels: universe_${t .endfor .endif universe_${target}: universe_${target}_kernels -universe_${target}_kernels: universe_${target}_prologue +universe_${target}_kernels: universe_${target}_prologue .MAKE .if exists(${KERNSRCDIR}/${target}/conf/NOTES) @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \ - ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ + ${SUB_MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ (echo "${target} 'make LINT' failed," \ "check _.${target}.makeLINT for details"| ${MAKEFAIL})) .endif - @cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \ + @cd ${.CURDIR} && ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \ universe_kernels .endif @echo ">> ${target} completed on `LC_ALL=C date`" @@ -437,9 +471,9 @@ TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR} .error "Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old." .endif universe_kernconfs: universe_kernconf_${TARGET}_${kernel} -universe_kernconf_${TARGET}_${kernel}: +universe_kernconf_${TARGET}_${kernel}: .MAKE @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ - ${MAKE} ${JFLAG} buildkernel \ + ${SUB_MAKE} ${JFLAG} buildkernel \ TARGET=${TARGET} \ TARGET_ARCH=${TARGET_ARCH_${kernel}} \ KERNCONF=${kernel} \ @@ -464,3 +498,11 @@ universe_epilogue: buildLINT: ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT + +.if defined(.PARSEDIR) +.if make(universe) +# we do not want a failure of one branch abort all. +MAKE_JOB_ERROR_TOKEN= no +.export MAKE_JOB_ERROR_TOKEN +.endif +.endif Modified: projects/pf/head/Makefile.inc1 ============================================================================== --- projects/pf/head/Makefile.inc1 Fri Oct 18 09:17:35 2013 (r256725) +++ projects/pf/head/Makefile.inc1 Fri Oct 18 09:32:02 2013 (r256726) @@ -132,7 +132,7 @@ VERSION!= uname -srp VERSION+= ${OSRELDATE} .endif -KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm armv6eb/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 +KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -265,7 +265,7 @@ WMAKEENV= ${CROSSENV} \ PATH=${TMPPATH} # make hierarchy -HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} +HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE:Q} .if defined(NO_ROOT) HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT .endif @@ -329,7 +329,7 @@ TARGET_ABI= gnueabi .else TARGET_ABI= unknown .endif -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XFLAGS+= -target ${TARGET_TRIPLE} .endif .endif @@ -382,6 +382,7 @@ LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTR PATH=${TMPPATH} \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 \ + LIBPRIVATEDIR=/usr/lib32/private \ COMPILER_TYPE=${WMAKE_COMPILER_TYPE} LIB32WMAKEFLAGS+= \ CC="${XCC} ${LIB32FLAGS}" \ @@ -394,7 +395,7 @@ LIB32WMAKEFLAGS+= \ -DNO_LINT LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \ - -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML + -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \ ${IMAKE_INSTALL} .endif @@ -484,10 +485,6 @@ _worldtmp: mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${WORLDTMP}/usr/lib >/dev/null .endif -.if ${MK_BIND_LIBS} != "no" - mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \ - -p ${WORLDTMP}/usr/include >/dev/null -.endif .for _mtree in ${LOCAL_MTREE} mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null .endfor @@ -675,8 +672,9 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_inc # # Checks to be sure system is ready for installworld/installkernel. # -installcheck: -installcheck_UGID: +installcheck: _installcheck_world _installcheck_kernel +_installcheck_world: +_installcheck_kernel: # # Require DESTDIR to be set if installing for a different architecture or @@ -685,8 +683,9 @@ installcheck_UGID: .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} || \ defined(DB_FROM_SRC) .if !make(distributeworld) -installcheck: installcheck_DESTDIR -installcheck_DESTDIR: +_installcheck_world: __installcheck_DESTDIR +_installcheck_kernel: __installcheck_DESTDIR +__installcheck_DESTDIR: .if !defined(DESTDIR) || empty(DESTDIR) @echo "ERROR: Please set DESTDIR!"; \ false @@ -708,7 +707,12 @@ CHECK_GIDS+= smmsp CHECK_UIDS+= proxy CHECK_GIDS+= proxy authpf .endif -installcheck_UGID: +.if ${MK_UNBOUND} != "no" +CHECK_UIDS+= unbound +CHECK_GIDS+= unbound +.endif +_installcheck_world: __installcheck_UGID +__installcheck_UGID: .for uid in ${CHECK_UIDS} @if ! `id -u ${uid} >/dev/null 2>&1`; then \ echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \ @@ -763,7 +767,7 @@ EXTRA_DISTRIBUTIONS+= lib32 MTREE_MAGIC?= mtree 2.0 -distributeworld installworld: installcheck installcheck_UGID +distributeworld installworld: _installcheck_world mkdir -p ${INSTALLTMP} progs=$$(for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ @@ -814,7 +818,7 @@ distributeworld installworld: installche cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \ DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \ - LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs + LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs .endif ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ ${IMAKEENV} rm -rf ${INSTALLTMP} @@ -833,6 +837,18 @@ distributeworld installworld: installche awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \ ${DESTDIR}/${DISTDIR}/${dist}.meta .endfor +.if ${MK_DEBUG_FILES} != "no" +. for dist in base ${EXTRA_DISTRIBUTIONS} + @# For each file that exists in this dist, print the corresponding + @# line from the METALOG. This relies on the fact that + @# a line containing only the filename will sort immediatly before + @# the relevant mtree line. + cd ${DESTDIR}/${DISTDIR}; \ + find ./${dist}/usr/lib/debug | sort -u ${METALOG} - | \ + awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \ + ${DESTDIR}/${DISTDIR}/${dist}.debug.meta +. endfor +.endif .endif .endif @@ -841,13 +857,29 @@ packageworld: .if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ + --exclude usr/lib/debug \ @${DESTDIR}/${DISTDIR}/${dist}.meta .else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz . + tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ + --exclude usr/lib/debug . .endif .endfor +.if ${MK_DEBUG_FILES} != "no" +. 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 +. else + ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ + tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \ + usr/lib/debug +. endif +. endfor +.endif + # # reinstall # @@ -860,7 +892,7 @@ reinstall: @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \ - LOCAL_MTREE=${LOCAL_MTREE} hierarchy + LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy @echo @echo "--------------------------------------------------------------" @echo ">>> Installing everything" @@ -1013,7 +1045,7 @@ buildkernel: # Install the kernel defined by INSTALLKERNEL # installkernel installkernel.debug \ -reinstallkernel reinstallkernel.debug: installcheck +reinstallkernel reinstallkernel.debug: _installcheck_kernel .if empty(INSTALLKERNEL) @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \ false @@ -1053,9 +1085,11 @@ distributekernel distributekernel.debug: KERNEL=${INSTKERNNAME}.${_kernel} \ DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \ ${.TARGET:S/distributekernel/install/} +.if defined(NO_ROOT) sed -e 's|^./kernel|.|' \ ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \ ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta +.endif .endfor packagekernel: @@ -1131,11 +1165,11 @@ legacy: .endif .for _tool in tools/build ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ - ${MAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install .endfor @@ -1237,7 +1271,7 @@ _kerberos5_bootstrap_tools= \ # Please document (add comment) why something is in 'bootstrap-tools'. # Try to bound the building of the bootstrap-tool to just the # FreeBSD versions that need the tool built at this stage of the build. -bootstrap-tools: +bootstrap-tools: .MAKE .for _tool in \ ${_clang_tblgen} \ ${_kerberos5_bootstrap_tools} \ @@ -1264,10 +1298,10 @@ bootstrap-tools: ${_crunch} \ ${_nmtree} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ - ${MAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install .endfor @@ -1290,7 +1324,7 @@ _gcc_tools= gnu/usr.bin/cc/cc_tools _rescue= rescue/rescue .endif -build-tools: +build-tools: .MAKE .for _tool in \ bin/csh \ bin/sh \ @@ -1303,18 +1337,19 @@ build-tools: usr.bin/awk \ lib/libmagic \ usr.bin/mkesdb_static \ - usr.bin/mkcsmapper_static + usr.bin/mkcsmapper_static \ + usr.bin/vi/catalog ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ ${MAKE} DIRPRFX=${_tool}/ build-tools .endfor .for _tool in \ ${_gcc_tools} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ ${MAKE} DIRPRFX=${_tool}/ all .endfor @@ -1352,7 +1387,7 @@ _cc= gnu/usr.bin/cc .endif .endif -cross-tools: +cross-tools: .MAKE .for _tool in \ ${_clang_libs} \ ${_clang} \ @@ -1363,10 +1398,10 @@ cross-tools: ${_crunchide} \ ${_kgzip} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ - ${MAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install .endfor @@ -1383,12 +1418,12 @@ hierarchy hier: # interdependencies (__L) are built automatically by the # ${.CURDIR}/tools/make_libdeps.sh script. # -libraries: - cd ${.CURDIR}; \ - ${MAKE} -f Makefile.inc1 _prereq_libs; \ - ${MAKE} -f Makefile.inc1 _startup_libs; \ - ${MAKE} -f Makefile.inc1 _prebuild_libs; \ - ${MAKE} -f Makefile.inc1 _generic_libs; +libraries: .MAKE + cd ${.CURDIR} && \ + ${MAKE} -f Makefile.inc1 _prereq_libs && \ + ${MAKE} -f Makefile.inc1 _startup_libs && \ + ${MAKE} -f Makefile.inc1 _prebuild_libs && \ + ${MAKE} -f Makefile.inc1 _generic_libs # # static libgcc.a prerequisite for shared libc @@ -1440,8 +1475,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ ${_cddl_lib_libzfs_core} \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ - ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} + ${_secure_lib_libcrypto} ${_lib_libldns} \ + ${_secure_lib_libssh} ${_secure_lib_libssl} .if ${MK_ATF} != "no" _lib_atf_libatf_c= lib/atf/libatf-c @@ -1477,9 +1512,16 @@ cddl/lib/libzfs_core__L: cddl/lib/libnvp _secure_lib_libcrypto= secure/lib/libcrypto _secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L +.if ${MK_LDNS} != "no" +_lib_libldns= lib/libldns +lib/libldns__L: secure/lib/libcrypto__L +.endif .if ${MK_OPENSSH} != "no" _secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L +.if ${MK_LDNS} != "no" +secure/lib/libssh__L: lib/libldns__L +.endif .if ${MK_KERBEROS_SUPPORT} != "no" secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ @@ -1542,25 +1584,25 @@ lib/libradius__L: lib/libmd__L .endif .for _lib in ${_prereq_libs} -${_lib}__PL: .PHONY +${_lib}__PL: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_lib}; \ - ${MAKE} DIRPRFX=${_lib}/ obj; \ - ${MAKE} DIRPRFX=${_lib}/ depend; \ - ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \ + cd ${.CURDIR}/${_lib} && \ + ${MAKE} DIRPRFX=${_lib}/ obj && \ + ${MAKE} DIRPRFX=${_lib}/ depend && \ + ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \ ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install .endif .endfor .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} -${_lib}__L: .PHONY +${_lib}__L: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_lib}; \ - ${MAKE} DIRPRFX=${_lib}/ obj; \ - ${MAKE} DIRPRFX=${_lib}/ depend; \ - ${MAKE} DIRPRFX=${_lib}/ all; \ + cd ${.CURDIR}/${_lib} && \ + ${MAKE} DIRPRFX=${_lib}/ obj && \ + ${MAKE} DIRPRFX=${_lib}/ depend && \ + ${MAKE} DIRPRFX=${_lib}/ all && \ ${MAKE} DIRPRFX=${_lib}/ install .endif .endfor @@ -1568,12 +1610,12 @@ ${_lib}__L: .PHONY # libpam is special: we need to build static PAM modules before # static PAM library, and dynamic PAM library before dynamic PAM # modules. -lib/libpam__L: .PHONY +lib/libpam__L: .PHONY .MAKE ${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \ - cd ${.CURDIR}/lib/libpam; \ - ${MAKE} DIRPRFX=lib/libpam/ obj; \ - ${MAKE} DIRPRFX=lib/libpam/ depend; \ - ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ + cd ${.CURDIR}/lib/libpam && \ + ${MAKE} DIRPRFX=lib/libpam/ obj && \ + ${MAKE} DIRPRFX=lib/libpam/ depend && \ + ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all && \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install _prereq_libs: ${_prereq_libs:S/$/__PL/} @@ -1583,8 +1625,8 @@ _generic_libs: ${_generic_libs:S/$/__L/} .for __target in all clean cleandepend cleandir depend includes obj .for entry in ${SUBDIR} -${entry}.${__target}__D: .PHONY - ${_+_}@if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \ +${entry}.${__target}__D: .PHONY .MAKE + ${_+_}@set -e; if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \ ${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH} (${__target})"; \ edir=${entry}.${MACHINE_ARCH}; \ cd ${.CURDIR}/$${edir}; \ @@ -1696,7 +1738,7 @@ check-old-libs: delete-old-dirs: @echo ">>> Removing old directories" @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_DIRS | xargs -n1 | \ + -V OLD_DIRS | xargs -n1 | sort -r | \ while read dir; do \ if [ -d "${DESTDIR}/$${dir}" ]; then \ rmdir -v "${DESTDIR}/$${dir}" || true; \ @@ -1788,7 +1830,7 @@ NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOU CPUTYPE=${XDEV_CPUTYPE} XDDIR=${XDEV_ARCH}-freebsd -XDTP=/usr/${XDDIR} +XDTP=usr/${XDDIR} CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ @@ -1801,8 +1843,8 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN} -CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN} -XDDESTDIR=${DESTDIR}${XDTP} +CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN} +XDDESTDIR=${DESTDIR}/${XDTP} .if !defined(OSREL) OSREL!= uname -r | sed -e 's/[-(].*//' .endif @@ -1822,10 +1864,10 @@ _xb-bootstrap-tools: .for _tool in \ ${_clang_tblgen} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${CDMAKE} DIRPRFX=${_tool}/ obj; \ - ${CDMAKE} DIRPRFX=${_tool}/ depend; \ - ${CDMAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${CDMAKE} DIRPRFX=${_tool}/ obj && \ + ${CDMAKE} DIRPRFX=${_tool}/ depend && \ + ${CDMAKE} DIRPRFX=${_tool}/ all && \ ${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install .endfor @@ -1841,9 +1883,9 @@ _xb-cross-tools: ${_clang_libs} \ ${_clang} ${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \ - cd ${.CURDIR}/${_tool}; \ - ${CDMAKE} DIRPRFX=${_tool}/ obj; \ - ${CDMAKE} DIRPRFX=${_tool}/ depend; \ + cd ${.CURDIR}/${_tool} && \ + ${CDMAKE} DIRPRFX=${_tool}/ obj && \ + ${CDMAKE} DIRPRFX=${_tool}/ depend && \ ${CDMAKE} DIRPRFX=${_tool}/ all .endfor @@ -1882,6 +1924,7 @@ _xi-libraries: _xi-links: ${_+_}cd ${XDDESTDIR}/usr/bin; \ + mkdir -p ../../../../usr/bin; \ for i in *; do \ ln -sf ../../${XDTP}/usr/bin/$$i \ ../../../../usr/bin/${XDDIR}-$$i; \ Modified: projects/pf/head/ObsoleteFiles.inc ============================================================================== --- projects/pf/head/ObsoleteFiles.inc Fri Oct 18 09:17:35 2013 (r256725) +++ projects/pf/head/ObsoleteFiles.inc Fri Oct 18 09:32:02 2013 (r256726) @@ -38,7 +38,302 @@ # xargs -n1 | sort | uniq -d; # done -# 20130616: vfs_mounted.9 removed +# 20131014: libbsdyml becomes private +OLD_FILES+=usr/lib/libbsdyml.a +OLD_FILES+=usr/lib/libbsdyml.so +OLD_LIBS+=usr/lib/libbsdyml.so.0 +OLD_FILES+=usr/lib/libbsdyml_p.a +OLD_FILES+=usr/lib32/libbsdyml.a +OLD_FILES+=usr/lib32/libbsdyml.so +OLD_LIBS+=usr/lib32/libbsdyml.so.0 +OLD_FILES+=usr/lib32/libbsdyml_p.a +OLD_FILES+=usr/share/man/man3/libbsdyml.3.gz +OLD_FILES+=usr/include/bsdyml.h +# 20131013: Removal of the ATF tools +OLD_FILES+=etc/atf/FreeBSD.conf +OLD_FILES+=etc/atf/atf-run.hooks +OLD_FILES+=etc/atf/common.conf +OLD_FILES+=usr/bin/atf-config +OLD_FILES+=usr/bin/atf-report +OLD_FILES+=usr/bin/atf-run +OLD_FILES+=usr/bin/atf-version +OLD_FILES+=usr/share/atf/atf-run.hooks +OLD_FILES+=usr/share/examples/atf/atf-run.hooks +OLD_FILES+=usr/share/examples/atf/tests-results.css +OLD_FILES+=usr/share/man/man1/atf-config.1.gz +OLD_FILES+=usr/share/man/man1/atf-report.1.gz +OLD_FILES+=usr/share/man/man1/atf-run.1.gz +OLD_FILES+=usr/share/man/man1/atf-version.1.gz +OLD_FILES+=usr/share/man/man5/atf-formats.5.gz +OLD_FILES+=usr/share/man/man7/atf.7.gz +OLD_FILES+=usr/share/xml/atf/tests-results.dtd +OLD_FILES+=usr/share/xsl/atf/tests-results.xsl +# 20131009: freebsd-version moved from /libexec to /bin +OLD_FILES+=libexec/freebsd-version +# 20131001: ar and ranlib from binutils not used +OLD_FILES+=usr/bin/gnu-ar +OLD_FILES+=usr/bin/gnu-ranlib +OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz +OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz +# 20130930: BIND removed from base +OLD_FILES+=etc/namedb +OLD_FILES+=etc/periodic/daily/470.status-named +OLD_FILES+=usr/bin/dig +OLD_FILES+=usr/bin/nslookup +OLD_FILES+=usr/bin/nsupdate +OLD_DIRS+=usr/include/lwres +OLD_FILES+=usr/include/lwres/context.h +OLD_FILES+=usr/include/lwres/int.h +OLD_FILES+=usr/include/lwres/ipv6.h +OLD_FILES+=usr/include/lwres/lang.h +OLD_FILES+=usr/include/lwres/list.h +OLD_FILES+=usr/include/lwres/lwbuffer.h +OLD_FILES+=usr/include/lwres/lwpacket.h +OLD_FILES+=usr/include/lwres/lwres.h +OLD_FILES+=usr/include/lwres/net.h +OLD_FILES+=usr/include/lwres/netdb.h +OLD_FILES+=usr/include/lwres/platform.h +OLD_FILES+=usr/include/lwres/result.h +OLD_FILES+=usr/include/lwres/version.h +OLD_FILES+=usr/lib/liblwres.a +OLD_FILES+=usr/lib/liblwres.so +OLD_LIBS+=usr/lib/liblwres.so.50 +OLD_FILES+=usr/lib/liblwres_p.a +OLD_FILES+=usr/sbin/arpaname +OLD_FILES+=usr/sbin/ddns-confgen +OLD_FILES+=usr/sbin/dnssec-dsfromkey +OLD_FILES+=usr/sbin/dnssec-keyfromlabel +OLD_FILES+=usr/sbin/dnssec-keygen +OLD_FILES+=usr/sbin/dnssec-revoke +OLD_FILES+=usr/sbin/dnssec-settime +OLD_FILES+=usr/sbin/dnssec-signzone +OLD_FILES+=usr/sbin/genrandom +OLD_FILES+=usr/sbin/isc-hmac-fixup +OLD_FILES+=usr/sbin/lwresd +OLD_FILES+=usr/sbin/named +OLD_FILES+=usr/sbin/named-checkconf +OLD_FILES+=usr/sbin/named-checkzone +OLD_FILES+=usr/sbin/named-compilezone +OLD_FILES+=usr/sbin/named-journalprint +OLD_FILES+=usr/sbin/named.reconfig +OLD_FILES+=usr/sbin/named.reload +OLD_FILES+=usr/sbin/nsec3hash +OLD_FILES+=usr/sbin/rndc +OLD_FILES+=usr/sbin/rndc-confgen +OLD_DIRS+=usr/share/doc/bind9 +OLD_FILES+=usr/share/doc/bind9/CHANGES +OLD_FILES+=usr/share/doc/bind9/COPYRIGHT +OLD_FILES+=usr/share/doc/bind9/FAQ +OLD_FILES+=usr/share/doc/bind9/HISTORY +OLD_FILES+=usr/share/doc/bind9/README +OLD_DIRS+=usr/share/doc/bind9/arm +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch01.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch02.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch03.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch04.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch05.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch06.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch07.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch08.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch09.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch10.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.pdf +OLD_FILES+=usr/share/doc/bind9/arm/man.arpaname.html +OLD_FILES+=usr/share/doc/bind9/arm/man.ddns-confgen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dig.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-dsfromkey.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keyfromlabel.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keygen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-revoke.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-settime.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-signzone.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-verify.html +OLD_FILES+=usr/share/doc/bind9/arm/man.genrandom.html +OLD_FILES+=usr/share/doc/bind9/arm/man.host.html +OLD_FILES+=usr/share/doc/bind9/arm/man.isc-hmac-fixup.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkconf.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkzone.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-journalprint.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named.html +OLD_FILES+=usr/share/doc/bind9/arm/man.nsec3hash.html +OLD_FILES+=usr/share/doc/bind9/arm/man.nsupdate.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc-confgen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.conf.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.html +OLD_DIRS+=usr/share/doc/bind9/misc +OLD_FILES+=usr/share/doc/bind9/misc/dnssec +OLD_FILES+=usr/share/doc/bind9/misc/format-options.pl +OLD_FILES+=usr/share/doc/bind9/misc/ipv6 +OLD_FILES+=usr/share/doc/bind9/misc/migration +OLD_FILES+=usr/share/doc/bind9/misc/migration-4to9 +OLD_FILES+=usr/share/doc/bind9/misc/options +OLD_FILES+=usr/share/doc/bind9/misc/rfc-compliance +OLD_FILES+=usr/share/doc/bind9/misc/roadmap +OLD_FILES+=usr/share/doc/bind9/misc/sdb +OLD_FILES+=usr/share/doc/bind9/misc/sort-options.pl +OLD_FILES+=usr/share/man/man1/arpaname.1.gz +OLD_FILES+=usr/share/man/man1/dig.1.gz +OLD_FILES+=usr/share/man/man1/nslookup.1.gz +OLD_FILES+=usr/share/man/man1/nsupdate.1.gz +OLD_FILES+=usr/share/man/man3/lwres.3.gz +OLD_FILES+=usr/share/man/man3/lwres_addr_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_add.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_back.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_clear.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_first.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_forward.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint16.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint32.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint8.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_init.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_invalidate.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint16.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint32.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint8.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_subtract.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_clear.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_get.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_init.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_print.3.gz +OLD_FILES+=usr/share/man/man3/lwres_config.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_allocmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_create.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_destroy.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_freemem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_initserial.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_nextserial.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_sendrecv.3.gz +OLD_FILES+=usr/share/man/man3/lwres_endhostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_endhostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_freeaddrinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_freehostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabn.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gai_strerror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getaddrinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getaddrsbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname2.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnode.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnodebyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnodebyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getnamebyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getnameinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getrrsetbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnba.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_herror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_hstrerror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_inetntop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_lwpacket_parseheader.3.gz +OLD_FILES+=usr/share/man/man3/lwres_lwpacket_renderheader.3.gz +OLD_FILES+=usr/share/man/man3/lwres_net_ntop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_packet.3.gz +OLD_FILES+=usr/share/man/man3/lwres_resutil.3.gz +OLD_FILES+=usr/share/man/man3/lwres_sethostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_sethostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_string_parse.3.gz +OLD_FILES+=usr/share/man/man5/named.conf.5.gz +OLD_FILES+=usr/share/man/man5/rndc.conf.5.gz +OLD_FILES+=usr/share/man/man8/ddns-confgen.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-dsfromkey.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-keyfromlabel.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz +OLD_FILES+=usr/share/man/man8/genrandom.8.gz +OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz +OLD_FILES+=usr/share/man/man8/lwresd.8.gz +OLD_FILES+=usr/share/man/man8/named-checkconf.8.gz +OLD_FILES+=usr/share/man/man8/named-checkzone.8.gz +OLD_FILES+=usr/share/man/man8/named-compilezone.8.gz +OLD_FILES+=usr/share/man/man8/named-journalprint.8.gz +OLD_FILES+=usr/share/man/man8/named.8.gz +OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz +OLD_FILES+=usr/share/man/man8/named.reload.8.gz +OLD_FILES+=usr/share/man/man8/nsec3hash.8.gz +OLD_FILES+=usr/share/man/man8/rndc-confgen.8.gz +OLD_FILES+=usr/share/man/man8/rndc.8.gz +OLD_DIRS+=var/named/dev +OLD_DIRS+=var/named/etc +OLD_DIRS+=var/named/etc/namedb +OLD_FILES+=var/named/etc/namedb/PROTO.localhost-v6.rev +OLD_FILES+=var/named/etc/namedb/PROTO.localhost.rev +OLD_DIRS+=var/named/etc/namedb/dynamic +OLD_FILES+=var/named/etc/namedb/make-localhost +OLD_DIRS+=var/named/etc/namedb/master +OLD_FILES+=var/named/etc/namedb/master/empty.db +OLD_FILES+=var/named/etc/namedb/master/localhost-forward.db +OLD_FILES+=var/named/etc/namedb/master/localhost-reverse.db +#OLD_FILES+=var/named/etc/namedb/named.conf # intentionally left out +OLD_FILES+=var/named/etc/namedb/named.root +OLD_DIRS+=var/named/etc/namedb/slave +OLD_DIRS+=var/named/var +OLD_DIRS+=var/named/var/dump +OLD_DIRS+=var/named/var/log +OLD_DIRS+=var/named/var/run +OLD_DIRS+=var/named/var/run/named +OLD_DIRS+=var/named/var/stats +OLD_DIRS+=var/run/named +# 20130908: libssh becomes private +OLD_FILES+=usr/lib/libssh.a +OLD_FILES+=usr/lib/libssh.so +OLD_LIBS+=usr/lib/libssh.so.5 +OLD_FILES+=usr/lib/libssh_p.a +OLD_FILES+=usr/lib32/libssh.a +OLD_FILES+=usr/lib32/libssh.so +OLD_LIBS+=usr/lib32/libssh.so.5 +OLD_FILES+=usr/lib32/libssh_p.a +# 20130903: gnupatch is no more +OLD_FILES+=usr/bin/gnupatch +OLD_FILES+=usr/share/man/man1/gnupatch.1.gz +# 20130829: bsdpatch is patch unconditionally +OLD_FILES+=usr/bin/bsdpatch +OLD_FILES+=usr/share/man/man1/bsdpatch.1.gz +# 20130822: bind 9.9.3-P2 import +OLD_LIBS+=usr/lib/liblwres.so.80 +# 20130814: vm_page_busy(9) +OLD_FILES+=usr/share/man/man9/vm_page_flash.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_io.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_io_finish.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_io_start.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_wakeup.9.gz +# 20130710: libkvm version bump +OLD_LIBS+=lib/libkvm.so.5 +OLD_LIBS+=usr/lib32/libkvm.so.5 +# 20130623: dialog update from 1.1 to 1.2 +OLD_LIBS+=usr/lib/libdialog.so.7 +OLD_LIBS+=usr/lib32/libdialog.so.7 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Oct 18 17:35:53 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4A4FA718; Fri, 18 Oct 2013 17:35:53 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1D68D231A; Fri, 18 Oct 2013 17:35:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9IHZq2q099863; Fri, 18 Oct 2013 17:35:52 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IHZqqp099850; Fri, 18 Oct 2013 17:35:52 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310181735.r9IHZqqp099850@svn.freebsd.org> From: Alan Somers Date: Fri, 18 Oct 2013 17:35:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256749 - in projects/zfsd/head: cddl/sbin/zfsd lib/libdevctl X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Oct 2013 17:35:53 -0000 Author: asomers Date: Fri Oct 18 17:35:51 2013 New Revision: 256749 URL: http://svnweb.freebsd.org/changeset/base/256749 Log: cddl/sbin/zfsd/callout.cc lib/libdevctl/consumer.cc lib/libdevctl/event.cc lib/libdevctl/event_factory.cc Include headers that are implicitly included by gcc and libstdc++ but must be explicitly included when using clang and libc++. Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/callout.cc projects/zfsd/head/lib/libdevctl/consumer.cc projects/zfsd/head/lib/libdevctl/event.cc projects/zfsd/head/lib/libdevctl/event_factory.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/callout.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/callout.cc Fri Oct 18 17:21:47 2013 (r256748) +++ projects/zfsd/head/cddl/sbin/zfsd/callout.cc Fri Oct 18 17:35:51 2013 (r256749) @@ -42,6 +42,7 @@ #include #include +#include #include #include #include Modified: projects/zfsd/head/lib/libdevctl/consumer.cc ============================================================================== --- projects/zfsd/head/lib/libdevctl/consumer.cc Fri Oct 18 17:21:47 2013 (r256748) +++ projects/zfsd/head/lib/libdevctl/consumer.cc Fri Oct 18 17:35:51 2013 (r256749) @@ -37,11 +37,13 @@ #include #include #include +#include #include #include #include #include +#include #include #include Modified: projects/zfsd/head/lib/libdevctl/event.cc ============================================================================== --- projects/zfsd/head/lib/libdevctl/event.cc Fri Oct 18 17:21:47 2013 (r256748) +++ projects/zfsd/head/lib/libdevctl/event.cc Fri Oct 18 17:35:51 2013 (r256749) @@ -44,6 +44,7 @@ #include #include #include +#include #include #include Modified: projects/zfsd/head/lib/libdevctl/event_factory.cc ============================================================================== --- projects/zfsd/head/lib/libdevctl/event_factory.cc Fri Oct 18 17:21:47 2013 (r256748) +++ projects/zfsd/head/lib/libdevctl/event_factory.cc Fri Oct 18 17:35:51 2013 (r256749) @@ -34,6 +34,7 @@ * \file event_factory.cc */ #include +#include #include #include From owner-svn-src-projects@FreeBSD.ORG Fri Oct 18 17:43:50 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3CF53AE1; Fri, 18 Oct 2013 17:43:50 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 28E9223B2; Fri, 18 Oct 2013 17:43:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9IHhobn004287; Fri, 18 Oct 2013 17:43:50 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IHhmsE004278; Fri, 18 Oct 2013 17:43:48 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310181743.r9IHhmsE004278@svn.freebsd.org> From: Alan Somers Date: Fri, 18 Oct 2013 17:43:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256751 - in projects/zfsd/head/cddl/sbin/zfsd: . tests X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Oct 2013 17:43:50 -0000 Author: asomers Date: Fri Oct 18 17:43:48 2013 New Revision: 256751 URL: http://svnweb.freebsd.org/changeset/base/256751 Log: Add the zfsd unit tests. They require googletest and googlemock from ports. cddl/sbin/zfsd/tests cddl/sbin/zfsd/tests/libmocks.c cddl/sbin/zfsd/tests/zfsd_unittest.cc cddl/sbin/zfsd/tests/libmocks.h cddl/sbin/zfsd/tests/Makefile Add the zfsd unit tests. cddl/sbin/zfsd/tests/zfsd_unittest.supp Add a valgrind suppression file. cddl/sbin/zfsd/tests/zfsd_test.sh An ATF test program that runs the unit tests cddl/sbin/zfsd/Makefile.common Modify Makefile.common so that it can be used either to build zfsd or zfsd's unit tests. cddl/sbin/zfsd/Makefile Don't descend into the tests directory if googletest and googlemock are not installed, even if MK_TESTS=yes Submitted by: asomers Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Added: projects/zfsd/head/cddl/sbin/zfsd/tests/ projects/zfsd/head/cddl/sbin/zfsd/tests/Makefile projects/zfsd/head/cddl/sbin/zfsd/tests/libmocks.c projects/zfsd/head/cddl/sbin/zfsd/tests/libmocks.h projects/zfsd/head/cddl/sbin/zfsd/tests/zfsd_test.sh projects/zfsd/head/cddl/sbin/zfsd/tests/zfsd_unittest.cc projects/zfsd/head/cddl/sbin/zfsd/tests/zfsd_unittest.supp Modified: projects/zfsd/head/cddl/sbin/zfsd/Makefile projects/zfsd/head/cddl/sbin/zfsd/Makefile.common Modified: projects/zfsd/head/cddl/sbin/zfsd/Makefile ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/Makefile Fri Oct 18 17:38:57 2013 (r256750) +++ projects/zfsd/head/cddl/sbin/zfsd/Makefile Fri Oct 18 17:43:48 2013 (r256751) @@ -1,7 +1,15 @@ # $FreeBSD$ +SRCDIR=${.CURDIR}/../../.. .include "Makefile.common" PROG_CXX= zfsd .include + +# Check for the existence of the googletest and googlemock header files, which +# come from ports. Don't compile the tests without them. +.if exists(${LOCALBASE}/include/gtest/gtest.h) && exists(${LOCALBASE}/include/gmock/gmock.h) +.else +SUBDIR= +.endif Modified: projects/zfsd/head/cddl/sbin/zfsd/Makefile.common ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/Makefile.common Fri Oct 18 17:38:57 2013 (r256750) +++ projects/zfsd/head/cddl/sbin/zfsd/Makefile.common Fri Oct 18 17:43:48 2013 (r256751) @@ -17,19 +17,19 @@ WARNS?= 3 # Ignore warnings about Solaris specific pragmas. IGNORE_PRAGMA= YES -INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common -INCFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include -INCFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem -INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head -INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common -INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common -INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common -INCFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair -INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -INCFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys +INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzpool/common +INCFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/include +INCFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/lib/libumem +INCFLAGS+= -I${SRCDIR}/sys/cddl/compat/opensolaris +INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/head +INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libuutil/common +INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libumem/common +INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs/common +INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libnvpair +INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/common/zfs +INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common +INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} Added: projects/zfsd/head/cddl/sbin/zfsd/tests/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/cddl/sbin/zfsd/tests/Makefile Fri Oct 18 17:43:48 2013 (r256751) @@ -0,0 +1,83 @@ +# $FreeBSD$ + +SRCDIR=${.CURDIR}/../../../.. +.include "${.CURDIR}/../Makefile.common" +.PATH: ${.CURDIR}/.. + +PROG_CXX= zfsd_unittest +SRCS:= ${SRCS:Nzfsd_main.cc} +SRCS+= libmocks.c zfsd_unittest.cc +CLEANFILES+= *.gcno *.gcda *.info +CLEANDIRS+= lcov-report + +# Use #include in test programs. +INCFLAGS+= -I ${.CURDIR}/../.. + +.if defined(DESTDIR) +INCFLAGS+= -I ${DESTDIR}/usr/include +LIBRARY_PATH= ${DESTDIR}/lib:${DESTDIR}/usr/lib +LDFLAGS+= -L ${DESTDIR}/lib -L ${DESTDIR}/usr/lib +.elif defined(WORLDTMP) +INCFLAGS+= -I ${WORLDTMP}/usr/include +LIBRARY_PATH= ${WORLDTMP}/lib:${WORLDTMP}/usr/lib +LDFLAGS+= -L ${WORLDTMP}/lib -L ${WORLDTMP}/usr/lib +.else +LIBRARY_PATH= +.endif +ZFSD_UNITTEST= env LD_LIBRARY_PATH=${LIBRARY_PATH} ./zfsd_unittest + +# Extra tools +LCOV= lcov + +# Googletest options +LOCALBASE?= /usr/local +INCFLAGS+= -I ${LOCALBASE}/include -D_THREAD_SAFE -pthread +LDFLAGS+= -L ${LOCALBASE}/lib -D_THREAD_SAFE -pthread +LDADD+= ${LOCALBASE}/lib/libgtest.a + +# GoogleMock options +LDADD+= ${LOCALBASE}/lib/libgmock.a ${LOCALBASE}/lib/libgmock_main.a + +# Googlemock fails if we don't have this line +# https://groups.google.com/forum/#!msg/googletestframework/h8ixEPCFm0o/amwfu4xGJb0J +CFLAGS+= -DGTEST_HAS_PTHREAD + +# GCOV options +CFLAGS+= -fprofile-arcs -ftest-coverage +LDADD+= -lgcov + +all: tests + +# Install the tests +TESTSBASE?= /usr/tests +TESTSDIR= ${TESTSBASE}/zfsd +# TODO: Convert from an ATF SH test to a Kyua plain test +# Long term TODO: Convert to a Kyua googletest test +TESTS_SH+= zfsd_test +BINDIR= ${TESTSDIR} + +# Install the gcov annotation files too +FILESDIR= ${TESTSDIR} +GCNOS= ${SRCS:C/.c+$/.gcno/} +${GCNOS}: ${SRCS:C/.c+$/.o/} +FILES= ${GCNOS} + + +# Run the tests and produce the coverage report +EXCLUDE_PATTERNS='/usr/include/*' '${LOCALBASE}/include/*' +EXCLUDE_PATTERNS+= '*/cddl/compat/opensolaris/include/*' +EXCLUDE_PATTERNS+= '*/tools/regression/zfsd/*' +.PHONY: tests +tests: zfsd_unittest + ${ZFSD_UNITTEST} --gmock_verbose=error + +.PHONY: lcov +lcov: zfsd_unittest + ${LCOV} -z -d . -f && \ + ${ZFSD_UNITTEST} --gmock_verbose=error + ${LCOV} -f -d . -c -o default.info && \ + ${LCOV} -r default.info $(EXCLUDE_PATTERNS) -o trimmed.info && \ + mkdir -p lcov-report && \ + genhtml -o lcov-report trimmed.info + +.include Added: projects/zfsd/head/cddl/sbin/zfsd/tests/libmocks.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/cddl/sbin/zfsd/tests/libmocks.c Fri Oct 18 17:43:48 2013 (r256751) @@ -0,0 +1,24 @@ +#include +#include +#include "libmocks.h" + +/* + * This file mocks shared library functions that are used by zfsd. Every + * function present will be used for all tests in all test suites instead of the + * normal function. + */ + +int syslog_last_priority; +char syslog_last_message[4096]; +void syslog(int priority, const char* message, ...) { + va_list ap; + + syslog_last_priority = priority; + va_start(ap, message); + vsnprintf(syslog_last_message, 4096, message, ap); + va_end(ap); +} + +int zpool_iter(libzfs_handle_t* handle, zpool_iter_f iter, void* arg) { + return (0); +} Added: projects/zfsd/head/cddl/sbin/zfsd/tests/libmocks.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/cddl/sbin/zfsd/tests/libmocks.h Fri Oct 18 17:43:48 2013 (r256751) @@ -0,0 +1,24 @@ +#ifndef _LIBMOCKS_H_ +#define _LIBMOCKS_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +struct libzfs_handle; +typedef struct libzfs_handle libzfs_handle_t; +struct zpool_handle; +typedef struct zpool_handle zpool_handle_t; +typedef int (*zpool_iter_f)(zpool_handle_t *, void *); + +void syslog(int priority, const char* message, ...); +int zpool_iter(libzfs_handle_t*, zpool_iter_f, void*); + +extern int syslog_last_priority; +extern char syslog_last_message[4096]; + +#ifdef __cplusplus +} +#endif + +#endif Added: projects/zfsd/head/cddl/sbin/zfsd/tests/zfsd_test.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/cddl/sbin/zfsd/tests/zfsd_test.sh Fri Oct 18 17:43:48 2013 (r256751) @@ -0,0 +1,52 @@ +# Copyright (c) 2013 Spectra Logic Corporation +# 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, +# without modification. +# 2. Redistributions in binary form must reproduce at minimum a disclaimer +# substantially similar to the "NO WARRANTY" disclaimer below +# ("Disclaimer") and any redistribution must be conditioned upon +# including a substantially similar Disclaimer requirement for further +# binary redistribution. +# +# NO WARRANTY +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES. +# +# Authors: Alan Somers (Spectra Logic Corporation) +# +# $FreeBSD$ + +# +# Test Case: zfsd_unittest +# TODO: get coverage in cleanup +# +atf_test_case zfsd_unittest +zfsd_unittest_head() +{ + atf_set "descr" "Run zfsd unit tests" +} + + +zfsd_unittest_body() +{ + atf_check -s exit:0 -o ignore -e ignore $(atf_get_srcdir)/zfsd_unittest +} + +atf_init_test_cases() +{ + atf_add_test_case zfsd_unittest +} Added: projects/zfsd/head/cddl/sbin/zfsd/tests/zfsd_unittest.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/cddl/sbin/zfsd/tests/zfsd_unittest.cc Fri Oct 18 17:43:48 2013 (r256751) @@ -0,0 +1,778 @@ +/*- + * Copyright (c) 2012, 2013 Spectra Logic Corporation + * 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, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES. + * + * Authors: Alan Somers (Spectra Logic Corporation) + */ +#include + +#include +#include + +#include +#include + +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "libmocks.h" + +__FBSDID("$FreeBSD$"); + +/*================================== Macros ==================================*/ +#define NUM_ELEMENTS(x) (sizeof(x) / sizeof(*x)) + +/*============================ Namespace Control =============================*/ +using std::string; +using std::stringstream; + +using DevCtl::Event; +using DevCtl::EventBuffer; +using DevCtl::EventFactory; +using DevCtl::EventList; +using DevCtl::Guid; +using DevCtl::NVPairMap; + +/* redefine zpool_handle here because libzfs_impl.h is not includable */ +struct zpool_handle +{ + libzfs_handle_t *zpool_hdl; + zpool_handle_t *zpool_next; + char zpool_name[ZPOOL_MAXNAMELEN]; + int zpool_state; + size_t zpool_config_size; + nvlist_t *zpool_config; + nvlist_t *zpool_old_config; + nvlist_t *zpool_props; + diskaddr_t zpool_start_block; +}; + +class MockZfsEvent : public ZfsEvent +{ +public: + MockZfsEvent(Event::Type, NVPairMap&, const string&); + virtual ~MockZfsEvent() {} + + static BuildMethod MockZfsEventBuilder; + + MOCK_CONST_METHOD0(ProcessPoolEvent, void()); + + static EventFactory::Record s_buildRecords[]; +}; + +EventFactory::Record MockZfsEvent::s_buildRecords[] = +{ + { Event::NOTIFY, "ZFS", &MockZfsEvent::MockZfsEventBuilder } +}; + +MockZfsEvent::MockZfsEvent(Event::Type type, NVPairMap& map, + const string& str) + : ZfsEvent(type, map, str) +{ +} + +Event * +MockZfsEvent::MockZfsEventBuilder(Event::Type type, + NVPairMap &nvpairs, + const string &eventString) +{ + return (new MockZfsEvent(type, nvpairs, eventString)); +} + +/* + * A dummy Vdev class used for testing other classes + */ +class MockVdev : public Vdev +{ +public: + MockVdev(nvlist_t *vdevConfig); + virtual ~MockVdev() {} + + MOCK_CONST_METHOD0(GUID, Guid()); + MOCK_CONST_METHOD0(PoolGUID, Guid()); + MOCK_CONST_METHOD0(State, vdev_state()); + MOCK_CONST_METHOD0(PhysicalPath, string()); +}; + +MockVdev::MockVdev(nvlist_t *vdevConfig) + : Vdev(vdevConfig) +{ +} + +/* + * A CaseFile class with side effects removed, for testing + */ +class TestableCaseFile : public CaseFile +{ +public: + static TestableCaseFile &Create(Vdev &vdev); + TestableCaseFile(Vdev &vdev); + virtual ~TestableCaseFile() {} + + MOCK_METHOD0(Close, void()); + MOCK_METHOD1(RegisterCallout, void(const Event &event)); + MOCK_METHOD0(RefreshVdevState, bool()); + MOCK_METHOD1(ReEvaluate, bool(const ZfsEvent &event)); + + bool RealReEvaluate(const ZfsEvent &event) + { + return (CaseFile::ReEvaluate(event)); + } + + /* + * This splices the event lists, a procedure that would normally be done + * by OnGracePeriodEnded, but we don't necessarily call that in the + * unit tests + */ + void SpliceEvents(); + + /* + * Used by some of our expectations. CaseFile does not publicize this + */ + static int getActiveCases() + { + return (s_activeCases.size()); + } +}; + +TestableCaseFile::TestableCaseFile(Vdev &vdev) + : CaseFile(vdev) +{ +} + +TestableCaseFile & +TestableCaseFile::Create(Vdev &vdev) +{ + TestableCaseFile *newCase; + newCase = new TestableCaseFile(vdev); + return (*newCase); +} + +void +TestableCaseFile::SpliceEvents() +{ + m_events.splice(m_events.begin(), m_tentativeEvents); +} + + +/* + * Test class ZfsdException + */ +class ZfsdExceptionTest : public ::testing::Test +{ +protected: + virtual void SetUp() + { + ASSERT_EQ(0, nvlist_alloc(&poolConfig, NV_UNIQUE_NAME, 0)); + ASSERT_EQ(0, nvlist_add_string(poolConfig, + ZPOOL_CONFIG_POOL_NAME, "unit_test_pool")); + ASSERT_EQ(0, nvlist_add_uint64(poolConfig, + ZPOOL_CONFIG_POOL_GUID, 0x1234)); + + ASSERT_EQ(0, nvlist_alloc(&vdevConfig, NV_UNIQUE_NAME, 0)); + ASSERT_EQ(0, nvlist_add_uint64(vdevConfig, + ZPOOL_CONFIG_GUID, 0x5678)); + bzero(&poolHandle, sizeof(poolHandle)); + poolHandle.zpool_config = poolConfig; + } + + virtual void TearDown() + { + nvlist_free(poolConfig); + nvlist_free(vdevConfig); + } + + nvlist_t *poolConfig; + nvlist_t *vdevConfig; + zpool_handle_t poolHandle; +}; + +TEST_F(ZfsdExceptionTest, StringConstructorNull) +{ + ZfsdException ze(""); + EXPECT_STREQ("", ze.GetString().c_str()); +} + +TEST_F(ZfsdExceptionTest, StringConstructorFormatted) +{ + ZfsdException ze(" %d %s", 55, "hello world"); + EXPECT_STREQ(" 55 hello world", ze.GetString().c_str()); +} + +TEST_F(ZfsdExceptionTest, LogSimple) +{ + ZfsdException ze("unit test w/o vdev or pool"); + ze.Log(); + EXPECT_EQ(LOG_ERR, syslog_last_priority); + EXPECT_STREQ("unit test w/o vdev or pool\n", syslog_last_message); +} + +TEST_F(ZfsdExceptionTest, Pool) +{ + const char msg[] = "Exception with pool name"; + char expected[4096]; + sprintf(expected, "Pool unit_test_pool: %s\n", msg); + ZfsdException ze(poolConfig, msg); + ze.Log(); + EXPECT_STREQ(expected, syslog_last_message); +} + +TEST_F(ZfsdExceptionTest, PoolHandle) +{ + const char msg[] = "Exception with pool handle"; + char expected[4096]; + sprintf(expected, "Pool unit_test_pool: %s\n", msg); + ZfsdException ze(&poolHandle, msg); + ze.Log(); + EXPECT_STREQ(expected, syslog_last_message); +} + +/* + * Test class Vdev + */ +class VdevTest : public ::testing::Test +{ +protected: + virtual void SetUp() + { + ASSERT_EQ(0, nvlist_alloc(&m_poolConfig, NV_UNIQUE_NAME, 0)); + ASSERT_EQ(0, nvlist_add_uint64(m_poolConfig, + ZPOOL_CONFIG_POOL_GUID, + 0x1234)); + + ASSERT_EQ(0, nvlist_alloc(&m_vdevConfig, NV_UNIQUE_NAME, 0)); + ASSERT_EQ(0, nvlist_add_uint64(m_vdevConfig, ZPOOL_CONFIG_GUID, + 0x5678)); + } + + virtual void TearDown() + { + nvlist_free(m_poolConfig); + nvlist_free(m_vdevConfig); + } + + nvlist_t *m_poolConfig; + nvlist_t *m_vdevConfig; +}; + + +TEST_F(VdevTest, StateFromConfig) +{ + vdev_stat_t vs; + + vs.vs_state = VDEV_STATE_OFFLINE; + + ASSERT_EQ(0, nvlist_add_uint64_array(m_vdevConfig, + ZPOOL_CONFIG_VDEV_STATS, + (uint64_t*)&vs, + sizeof(vs) / sizeof(uint64_t))); + + Vdev vdev(m_poolConfig, m_vdevConfig); + + EXPECT_EQ(VDEV_STATE_OFFLINE, vdev.State()); +} + +TEST_F(VdevTest, StateFaulted) +{ + ASSERT_EQ(0, nvlist_add_uint64(m_vdevConfig, ZPOOL_CONFIG_FAULTED, 1)); + + Vdev vdev(m_poolConfig, m_vdevConfig); + + EXPECT_EQ(VDEV_STATE_FAULTED, vdev.State()); +} + +/* + * Test that we can construct a Vdev from the label information that is stored + * on an available spare drive + */ +TEST_F(VdevTest, ConstructAvailSpare) +{ + nvlist_t *labelConfig; + + ASSERT_EQ(0, nvlist_alloc(&labelConfig, NV_UNIQUE_NAME, 0)); + ASSERT_EQ(0, nvlist_add_uint64(labelConfig, ZPOOL_CONFIG_GUID, + 1948339428197961030)); + ASSERT_EQ(0, nvlist_add_uint64(labelConfig, ZPOOL_CONFIG_POOL_STATE, + POOL_STATE_SPARE)); + + EXPECT_NO_THROW(Vdev vdev(labelConfig)); + + nvlist_free(labelConfig); +} + +/* Available spares will always show the HEALTHY state */ +TEST_F(VdevTest, AvailSpareState) { + nvlist_t *labelConfig; + + ASSERT_EQ(0, nvlist_alloc(&labelConfig, NV_UNIQUE_NAME, 0)); + ASSERT_EQ(0, nvlist_add_uint64(labelConfig, ZPOOL_CONFIG_GUID, + 1948339428197961030)); + ASSERT_EQ(0, nvlist_add_uint64(labelConfig, ZPOOL_CONFIG_POOL_STATE, + POOL_STATE_SPARE)); + + Vdev vdev(labelConfig); + EXPECT_EQ(VDEV_STATE_HEALTHY, vdev.State()); + + nvlist_free(labelConfig); +} + +/* Test the Vdev::IsSpare method */ +TEST_F(VdevTest, IsSpare) { + Vdev* vdev; + + vdev = new Vdev(m_poolConfig, m_vdevConfig); + EXPECT_EQ(false, vdev->IsSpare()); + delete vdev; + + + ASSERT_EQ(0, nvlist_add_uint64(m_vdevConfig, ZPOOL_CONFIG_IS_SPARE, 1)); + vdev = new Vdev(m_poolConfig, m_vdevConfig); + EXPECT_EQ(true, vdev->IsSpare()); + delete vdev; +} + +/* + * Test class ZFSEvent + */ +class ZfsEventTest : public ::testing::Test +{ +protected: + virtual void SetUp() + { + m_eventFactory = new EventFactory(); + m_eventFactory->UpdateRegistry(MockZfsEvent::s_buildRecords, + NUM_ELEMENTS(MockZfsEvent::s_buildRecords)); + + m_event = NULL; + } + + virtual void TearDown() + { + delete m_eventFactory; + delete m_event; + } + + EventFactory *m_eventFactory; + Event *m_event; +}; + +TEST_F(ZfsEventTest, ProcessPoolEventGetsCalled) +{ + string evString("!system=ZFS " + "subsystem=ZFS " + "type=misc.fs.zfs.vdev_remove " + "pool_name=foo " + "pool_guid=9756779504028057996 " + "vdev_guid=1631193447431603339 " + "vdev_path=/dev/da1 " + "timestamp=1348871594"); + m_event = Event::CreateEvent(*m_eventFactory, evString); + MockZfsEvent *mock_event = static_cast(m_event); + + EXPECT_CALL(*mock_event, ProcessPoolEvent()).Times(1); + mock_event->Process(); +} + +/* + * Test class CaseFile + */ + +class CaseFileTest : public ::testing::Test +{ +protected: + virtual void SetUp() + { + m_eventFactory = new EventFactory(); + m_eventFactory->UpdateRegistry(MockZfsEvent::s_buildRecords, + NUM_ELEMENTS(MockZfsEvent::s_buildRecords)); + + m_event = NULL; + + nvlist_alloc(&m_vdevConfig, NV_UNIQUE_NAME, 0); + ASSERT_EQ(0, nvlist_add_uint64(m_vdevConfig, + ZPOOL_CONFIG_GUID, 0xbeef)); + m_vdev = new MockVdev(m_vdevConfig); + ON_CALL(*m_vdev, GUID()) + .WillByDefault(::testing::Return(Guid(123))); + ON_CALL(*m_vdev, PoolGUID()) + .WillByDefault(::testing::Return(Guid(456))); + ON_CALL(*m_vdev, State()) + .WillByDefault(::testing::Return(VDEV_STATE_HEALTHY)); + m_caseFile = &TestableCaseFile::Create(*m_vdev); + ON_CALL(*m_caseFile, ReEvaluate(::testing::_)) + .WillByDefault(::testing::Invoke(m_caseFile, &TestableCaseFile::RealReEvaluate)); + return; + } + + virtual void TearDown() + { + delete m_caseFile; + nvlist_free(m_vdevConfig); + delete m_vdev; + delete m_event; + delete m_eventFactory; + } + + nvlist_t *m_vdevConfig; + MockVdev *m_vdev; + TestableCaseFile *m_caseFile; + Event *m_event; + EventFactory *m_eventFactory; +}; + +/* + * A Vdev with no events should not be degraded or faulted + */ +TEST_F(CaseFileTest, HealthyVdev) +{ + EXPECT_FALSE(m_caseFile->ShouldDegrade()); + EXPECT_FALSE(m_caseFile->ShouldFault()); +} + +/* + * A Vdev with only one event should not be degraded or faulted + * For performance reasons, RefreshVdevState should not be called. + */ +TEST_F(CaseFileTest, HealthyishVdev) +{ + string evString("!system=ZFS " + "class=ereport.fs.zfs.io " + "ena=12091638756982918145 " + "parent_guid=13237004955564865395 " + "parent_type=raidz " + "pool=testpool.4415 " + "pool_context=0 " + "pool_failmode=wait " + "pool_guid=456 " + "subsystem=ZFS " + "timestamp=1348867914 " + "type=ereport.fs.zfs.io " + "vdev_guid=123 " + "vdev_path=/dev/da400 " + "vdev_type=disk " + "zio_blkid=622 " + "zio_err=1 " + "zio_level=-2 " + "zio_object=0 " + "zio_objset=37 " + "zio_offset=25598976 " + "zio_size=1024"); + m_event = Event::CreateEvent(*m_eventFactory, evString); + ZfsEvent *zfs_event = static_cast(m_event); + + EXPECT_CALL(*m_caseFile, RefreshVdevState()) + .Times(::testing::Exactly(0)); + EXPECT_TRUE(m_caseFile->ReEvaluate(*zfs_event)); + EXPECT_FALSE(m_caseFile->ShouldDegrade()); + EXPECT_FALSE(m_caseFile->ShouldFault()); +} + +/* The case file should be closed when its pool is destroyed */ +TEST_F(CaseFileTest, PoolDestroy) +{ + string evString("!system=ZFS " + "pool_name=testpool.4415 " + "pool_guid=456 " + "subsystem=ZFS " + "timestamp=1348867914 " + "type=misc.fs.zfs.pool_destroy "); + m_event = Event::CreateEvent(*m_eventFactory, evString); + ZfsEvent *zfs_event = static_cast(m_event); + EXPECT_CALL(*m_caseFile, Close()); + EXPECT_TRUE(m_caseFile->ReEvaluate(*zfs_event)); +} + +/* + * A Vdev with a very large number of IO errors should fault + * For performance reasons, RefreshVdevState should be called at most once + */ +TEST_F(CaseFileTest, VeryManyIOErrors) +{ + EXPECT_CALL(*m_caseFile, RefreshVdevState()) + .Times(::testing::AtMost(1)) + .WillRepeatedly(::testing::Return(true)); + + for(int i=0; i<100; i++) { + stringstream evStringStream; + evStringStream << + "!system=ZFS " + "class=ereport.fs.zfs.io " + "ena=12091638756982918145 " + "parent_guid=13237004955564865395 " + "parent_type=raidz " + "pool=testpool.4415 " + "pool_context=0 " + "pool_failmode=wait " + "pool_guid=456 " + "subsystem=ZFS " + "timestamp="; + evStringStream << i << " "; + evStringStream << + "type=ereport.fs.zfs.io " + "vdev_guid=123 " + "vdev_path=/dev/da400 " + "vdev_type=disk " + "zio_blkid=622 " + "zio_err=1 " + "zio_level=-2 " + "zio_object=0 " + "zio_objset=37 " + "zio_offset=25598976 " + "zio_size=1024"; + Event *event(Event::CreateEvent(*m_eventFactory, + evStringStream.str())); + ZfsEvent *zfs_event = static_cast(event); + EXPECT_TRUE(m_caseFile->ReEvaluate(*zfs_event)); + delete event; + } + + m_caseFile->SpliceEvents(); + EXPECT_FALSE(m_caseFile->ShouldDegrade()); + EXPECT_TRUE(m_caseFile->ShouldFault()); +} + +/* + * A Vdev with a very large number of checksum errors should degrade + * For performance reasons, RefreshVdevState should be called at most once + */ +TEST_F(CaseFileTest, VeryManyChecksumErrors) +{ + EXPECT_CALL(*m_caseFile, RefreshVdevState()) + .Times(::testing::AtMost(1)) + .WillRepeatedly(::testing::Return(true)); + + for(int i=0; i<100; i++) { + stringstream evStringStream; + evStringStream << + "!system=ZFS " + "bad_cleared_bits=03000000000000803f50b00000000000 " + "bad_range_clears=0000000e " + "bad_range_sets=00000000 " + "bad_ranges=0000000000000010 " + "bad_ranges_min_gap=8 " + "bad_set_bits=00000000000000000000000000000000 " + "class=ereport.fs.zfs.checksum " + "ena=12272856582652437505 " + "parent_guid=5838204195352909894 " + "parent_type=raidz pool=testpool.7640 " + "pool_context=0 " + "pool_failmode=wait " + "pool_guid=456 " + "subsystem=ZFS timestamp="; + evStringStream << i << " "; + evStringStream << + "type=ereport.fs.zfs.checksum " + "vdev_guid=123 " + "vdev_path=/mnt/tmp/file1.7702 " + "vdev_type=file " + "zio_blkid=0 " + "zio_err=0 " + "zio_level=0 " + "zio_object=3 " + "zio_objset=0 " + "zio_offset=16896 " + "zio_size=512"; + Event *event(Event::CreateEvent(*m_eventFactory, + evStringStream.str())); + ZfsEvent *zfs_event = static_cast(event); + EXPECT_TRUE(m_caseFile->ReEvaluate(*zfs_event)); + delete event; + } + + m_caseFile->SpliceEvents(); + EXPECT_TRUE(m_caseFile->ShouldDegrade()); + EXPECT_FALSE(m_caseFile->ShouldFault()); +} + +/* + * Test CaseFile::ReEvaluateByGuid + */ +class ReEvaluateByGuidTest : public ::testing::Test +{ +protected: + virtual void SetUp() + { + m_eventFactory = new EventFactory(); + m_eventFactory->UpdateRegistry(MockZfsEvent::s_buildRecords, + NUM_ELEMENTS(MockZfsEvent::s_buildRecords)); + m_event = Event::CreateEvent(*m_eventFactory, s_evString); + nvlist_alloc(&m_vdevConfig, NV_UNIQUE_NAME, 0); + ASSERT_EQ(0, nvlist_add_uint64(m_vdevConfig, + ZPOOL_CONFIG_GUID, 0xbeef)); + m_vdev456 = new ::testing::NiceMock(m_vdevConfig); + m_vdev789 = new ::testing::NiceMock(m_vdevConfig); + ON_CALL(*m_vdev456, GUID()) + .WillByDefault(::testing::Return(Guid(123))); + ON_CALL(*m_vdev456, PoolGUID()) + .WillByDefault(::testing::Return(Guid(456))); + ON_CALL(*m_vdev456, State()) + .WillByDefault(::testing::Return(VDEV_STATE_HEALTHY)); + ON_CALL(*m_vdev789, GUID()) + .WillByDefault(::testing::Return(Guid(123))); + ON_CALL(*m_vdev789, PoolGUID()) + .WillByDefault(::testing::Return(Guid(789))); + ON_CALL(*m_vdev789, State()) + .WillByDefault(::testing::Return(VDEV_STATE_HEALTHY)); + m_caseFile456 = NULL; + m_caseFile789 = NULL; + return; + } + + virtual void TearDown() + { + delete m_caseFile456; + delete m_caseFile789; + nvlist_free(m_vdevConfig); + delete m_vdev456; + delete m_vdev789; + delete m_event; + delete m_eventFactory; + } + + static string s_evString; + nvlist_t *m_vdevConfig; + ::testing::NiceMock *m_vdev456; + ::testing::NiceMock *m_vdev789; + TestableCaseFile *m_caseFile456; + TestableCaseFile *m_caseFile789; + Event *m_event; + EventFactory *m_eventFactory; +}; + +string ReEvaluateByGuidTest::s_evString( + "!system=ZFS " + "pool_guid=16271873792808333580 " + "pool_name=foo " + "subsystem=ZFS " + "timestamp=1360620391 " + "type=misc.fs.zfs.config_sync"); + + +/* + * Test the ReEvaluateByGuid method on an empty list of casefiles. + * We must create one event, even though it never gets used, because it will + * be passed by reference to ReEvaluateByGuid + */ +TEST_F(ReEvaluateByGuidTest, ReEvaluateByGuid_empty) +{ + ZfsEvent *zfs_event = static_cast(m_event); + + EXPECT_EQ(0, TestableCaseFile::getActiveCases()); + CaseFile::ReEvaluateByGuid(Guid(456), *zfs_event); + EXPECT_EQ(0, TestableCaseFile::getActiveCases()); +} + +/* + * Test the ReEvaluateByGuid method on a list of CaseFiles that contains only + * one CaseFile, which doesn't match the criteria + */ +TEST_F(ReEvaluateByGuidTest, ReEvaluateByGuid_oneFalse) +{ + m_caseFile456 = &TestableCaseFile::Create(*m_vdev456); + ZfsEvent *zfs_event = static_cast(m_event); + + EXPECT_EQ(1, TestableCaseFile::getActiveCases()); + EXPECT_CALL(*m_caseFile456, ReEvaluate(::testing::_)) + .Times(::testing::Exactly(0)); + CaseFile::ReEvaluateByGuid(Guid(789), *zfs_event); + EXPECT_EQ(1, TestableCaseFile::getActiveCases()); +} + +/* + * Test the ReEvaluateByGuid method on a list of CaseFiles that contains only + * one CaseFile, which does match the criteria + */ +TEST_F(ReEvaluateByGuidTest, ReEvaluateByGuid_oneTrue) +{ + m_caseFile456 = &TestableCaseFile::Create(*m_vdev456); + ZfsEvent *zfs_event = static_cast(m_event); + + EXPECT_EQ(1, TestableCaseFile::getActiveCases()); + EXPECT_CALL(*m_caseFile456, ReEvaluate(::testing::_)) + .Times(::testing::Exactly(1)) + .WillRepeatedly(::testing::Return(false)); + CaseFile::ReEvaluateByGuid(Guid(456), *zfs_event); + EXPECT_EQ(1, TestableCaseFile::getActiveCases()); +} + +/* + * Test the ReEvaluateByGuid method on a long list of CaseFiles that contains a + * few cases which meet the criteria + */ +TEST_F(ReEvaluateByGuidTest, ReEvaluateByGuid_five) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***