From owner-svn-src-user@FreeBSD.ORG Mon Mar 25 22:40:38 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E4881A6A; Mon, 25 Mar 2013 22:40:38 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C813875C; Mon, 25 Mar 2013 22:40:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2PMecn3095875; Mon, 25 Mar 2013 22:40:38 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2PMecxK095874; Mon, 25 Mar 2013 22:40:38 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201303252240.r2PMecxK095874@svn.freebsd.org> From: Attilio Rao Date: Mon, 25 Mar 2013 22:40:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248709 - user/attilio/vmobj-readlock/sys/vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Mar 2013 22:40:39 -0000 Author: attilio Date: Mon Mar 25 22:40:38 2013 New Revision: 248709 URL: http://svnweb.freebsd.org/changeset/base/248709 Log: Make the obj->bcount protected by the swhash_mtx mutex. This way few swapper specific functions can now get object lock in read mode. Where the most notable case is swap_pager_freespace(). Sponsored by: EMC / Isilon storage division Modified: user/attilio/vmobj-readlock/sys/vm/swap_pager.c Modified: user/attilio/vmobj-readlock/sys/vm/swap_pager.c ============================================================================== --- user/attilio/vmobj-readlock/sys/vm/swap_pager.c Mon Mar 25 20:38:09 2013 (r248708) +++ user/attilio/vmobj-readlock/sys/vm/swap_pager.c Mon Mar 25 22:40:38 2013 (r248709) @@ -827,7 +827,7 @@ void swap_pager_freespace(vm_object_t object, vm_pindex_t start, vm_size_t size) { - VM_OBJECT_ASSERT_WLOCKED(object); + VM_OBJECT_ASSERT_LOCKED(object); swp_pager_meta_free(object, start, size); } @@ -999,7 +999,7 @@ swap_pager_haspage(vm_object_t object, v { daddr_t blk0; - VM_OBJECT_ASSERT_WLOCKED(object); + VM_OBJECT_ASSERT_LOCKED(object); /* * do we have good backing store at the requested index ? */ @@ -1070,7 +1070,7 @@ static void swap_pager_unswapped(vm_page_t m) { - VM_OBJECT_ASSERT_WLOCKED(m->object); + VM_OBJECT_ASSERT_LOCKED(m->object); swp_pager_meta_ctl(m->object, m->pindex, SWM_FREE); } @@ -1924,7 +1924,7 @@ static void swp_pager_meta_free(vm_object_t object, vm_pindex_t index, daddr_t count) { - VM_OBJECT_ASSERT_WLOCKED(object); + VM_OBJECT_ASSERT_LOCKED(object); if (object->type != OBJT_SWAP) return; @@ -1970,15 +1970,15 @@ swp_pager_meta_free_all(vm_object_t obje { daddr_t index = 0; - VM_OBJECT_ASSERT_WLOCKED(object); + VM_OBJECT_ASSERT_LOCKED(object); if (object->type != OBJT_SWAP) return; + mtx_lock(&swhash_mtx); while (object->un_pager.swp.swp_bcount) { struct swblock **pswap; struct swblock *swap; - mtx_lock(&swhash_mtx); pswap = swp_pager_hash(object, index); if ((swap = *pswap) != NULL) { int i; @@ -1996,9 +1996,9 @@ swp_pager_meta_free_all(vm_object_t obje uma_zfree(swap_zone, swap); --object->un_pager.swp.swp_bcount; } - mtx_unlock(&swhash_mtx); index += SWAP_META_PAGES; } + mtx_unlock(&swhash_mtx); } /* @@ -2029,7 +2029,7 @@ swp_pager_meta_ctl(vm_object_t object, v daddr_t r1; int idx; - VM_OBJECT_ASSERT_WLOCKED(object); + VM_OBJECT_ASSERT_LOCKED(object); /* * The meta data only exists of the object is OBJT_SWAP * and even then might not be allocated yet. @@ -2484,14 +2484,16 @@ vmspace_swap_count(struct vmspace *vmspa for (cur = map->header.next; cur != &map->header; cur = cur->next) { if ((cur->eflags & MAP_ENTRY_IS_SUB_MAP) == 0 && (object = cur->object.vm_object) != NULL) { - VM_OBJECT_WLOCK(object); + VM_OBJECT_RLOCK(object); + mtx_lock(&swhash_mtx); if (object->type == OBJT_SWAP && object->un_pager.swp.swp_bcount != 0) { n = (cur->end - cur->start) / PAGE_SIZE; count += object->un_pager.swp.swp_bcount * SWAP_META_PAGES * n / object->size + 1; } - VM_OBJECT_WUNLOCK(object); + mtx_unlock(&swhash_mtx); + VM_OBJECT_RUNLOCK(object); } } return (count); From owner-svn-src-user@FreeBSD.ORG Mon Mar 25 23:22:44 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id AD6BC174; Mon, 25 Mar 2013 23:22:44 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9C615953; Mon, 25 Mar 2013 23:22:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2PNMiah010093; Mon, 25 Mar 2013 23:22:44 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2PNMfMv010074; Mon, 25 Mar 2013 23:22:41 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201303252322.r2PNMfMv010074@svn.freebsd.org> From: Attilio Rao Date: Mon, 25 Mar 2013 23:22:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248710 - in user/attilio/vmcontention: . bin/ed bin/sh cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem cddl/contr... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Mar 2013 23:22:44 -0000 Author: attilio Date: Mon Mar 25 23:22:40 2013 New Revision: 248710 URL: http://svnweb.freebsd.org/changeset/base/248710 Log: MFC Added: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d - copied unchanged from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.toupper.d - copied unchanged from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.toupper.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolower.d - copied unchanged from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolower.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolowertoomany.d - copied unchanged from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolowertoomany.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.toupper.d - copied unchanged from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.toupper.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.touppertoomany.d - copied unchanged from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.touppertoomany.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d - copied unchanged from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d.out - copied unchanged from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d.out user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.tolower.d - copied unchanged from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.tolower.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.toupper.d - copied unchanged from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.toupper.d - copied from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_ARGS.d - copied unchanged from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_ARGS.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_DYNSIZE.d - copied unchanged from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_DYNSIZE.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d - copied unchanged from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d.out - copied unchanged from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d.out user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c - copied unchanged from r248709, head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c user/attilio/vmcontention/tools/tools/ath/athalq/ar9300_ds.c - copied unchanged from r248709, head/tools/tools/ath/athalq/ar9300_ds.c user/attilio/vmcontention/tools/tools/ath/athalq/ar9300_ds.h - copied unchanged from r248709, head/tools/tools/ath/athalq/ar9300_ds.h user/attilio/vmcontention/tools/tools/shlib-compat/ - copied from r248709, head/tools/tools/shlib-compat/ Directory Properties: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) Deleted: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_PROTO_LEN.toomany.d Modified: user/attilio/vmcontention/ObsoleteFiles.inc user/attilio/vmcontention/bin/ed/cbc.c user/attilio/vmcontention/bin/sh/sh.1 user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h user/attilio/vmcontention/cddl/lib/libdtrace/Makefile user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write.c user/attilio/vmcontention/crypto/openssh/FREEBSD-upgrade user/attilio/vmcontention/lib/libc/stdtime/Makefile.inc user/attilio/vmcontention/lib/libdwarf/dwarf_die.c user/attilio/vmcontention/sbin/fsck_ffs/fsutil.c user/attilio/vmcontention/sbin/fsdb/fsdb.c user/attilio/vmcontention/sbin/geom/class/eli/geli.8 user/attilio/vmcontention/share/man/man9/taskqueue.9 user/attilio/vmcontention/sys/arm/arm/busdma_machdep-v6.c user/attilio/vmcontention/sys/cam/ata/ata_all.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h user/attilio/vmcontention/sys/cddl/dev/fbt/fbt.c user/attilio/vmcontention/sys/conf/files user/attilio/vmcontention/sys/dev/ahci/ahci.c user/attilio/vmcontention/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h user/attilio/vmcontention/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c user/attilio/vmcontention/sys/dev/ath/if_ath.c user/attilio/vmcontention/sys/dev/ath/if_ath_beacon.c user/attilio/vmcontention/sys/dev/ath/if_ath_beacon.h user/attilio/vmcontention/sys/dev/ath/if_ath_misc.h user/attilio/vmcontention/sys/dev/ath/if_ath_sysctl.c user/attilio/vmcontention/sys/dev/ath/if_ath_tdma.c user/attilio/vmcontention/sys/dev/ath/if_ath_tx.c user/attilio/vmcontention/sys/dev/ath/if_ath_tx_edma.c user/attilio/vmcontention/sys/dev/ath/if_athvar.h user/attilio/vmcontention/sys/dev/drm2/ttm/ttm_bo_util.c user/attilio/vmcontention/sys/dev/drm2/ttm/ttm_bo_vm.c user/attilio/vmcontention/sys/dev/drm2/ttm/ttm_memory.c user/attilio/vmcontention/sys/dev/ipmi/ipmi_kcs.c user/attilio/vmcontention/sys/dev/ipmi/ipmi_smic.c user/attilio/vmcontention/sys/dev/mmc/mmc.c user/attilio/vmcontention/sys/dev/mmc/mmcsd.c user/attilio/vmcontention/sys/geom/geom_dev.c user/attilio/vmcontention/sys/geom/geom_disk.c user/attilio/vmcontention/sys/geom/geom_event.c user/attilio/vmcontention/sys/geom/geom_int.h user/attilio/vmcontention/sys/geom/geom_subr.c user/attilio/vmcontention/sys/geom/multipath/g_multipath.c user/attilio/vmcontention/sys/kern/kern_timeout.c user/attilio/vmcontention/sys/kern/subr_taskqueue.c user/attilio/vmcontention/sys/kern/vfs_mountroot.c user/attilio/vmcontention/sys/netpfil/ipfw/ip_fw_sockopt.c user/attilio/vmcontention/sys/sys/bio.h user/attilio/vmcontention/sys/sys/taskqueue.h user/attilio/vmcontention/sys/vm/vm_radix.c user/attilio/vmcontention/tools/tools/ath/athstats/athstats.c user/attilio/vmcontention/usr.bin/systat/vmstat.c user/attilio/vmcontention/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/cddl/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/contrib/libarchive/ (props changed) user/attilio/vmcontention/contrib/libarchive/libarchive/ (props changed) user/attilio/vmcontention/crypto/openssh/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/lib/libc/stdtime/ (props changed) user/attilio/vmcontention/sbin/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/sys/conf/ (props changed) Modified: user/attilio/vmcontention/ObsoleteFiles.inc ============================================================================== --- user/attilio/vmcontention/ObsoleteFiles.inc Mon Mar 25 22:40:38 2013 (r248709) +++ user/attilio/vmcontention/ObsoleteFiles.inc Mon Mar 25 23:22:40 2013 (r248710) @@ -38,7 +38,11 @@ # xargs -n1 | sort | uniq -d; # done +# 20130316: vinum.4 removed OLD_FILES+=usr/share/man/man4/vinum.4.gz +# 20130312: fortunes-o removed +OLD_FILES+=usr/share/games/fortune/fortunes-o +OLD_FILES+=usr/share/games/fortune/fortunes-o.dat # 20130311: Ports are no more available via cvsup OLD_FILES+=usr/share/examples/cvsup/ports-supfile OLD_FILES+=usr/share/examples/cvsup/refuse Modified: user/attilio/vmcontention/bin/ed/cbc.c ============================================================================== --- user/attilio/vmcontention/bin/ed/cbc.c Mon Mar 25 22:40:38 2013 (r248709) +++ user/attilio/vmcontention/bin/ed/cbc.c Mon Mar 25 23:22:40 2013 (r248710) @@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$"); #ifdef DES static DES_cblock ivec; /* initialization vector */ static DES_cblock pvec; /* padding vector */ -#endif static char bits[] = { /* used to extract bits from a char */ '\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001' @@ -79,13 +78,12 @@ static char bits[] = { /* used to extr static int pflag; /* 1 to preserve parity bits */ -#ifdef DES static DES_key_schedule schedule; /* expanded DES key */ -#endif static unsigned char des_buf[8];/* shared buffer for get_des_char/put_des_char */ static int des_ct = 0; /* count for get_des_char/put_des_char */ static int des_n = 0; /* index for put_des_char/get_des_char */ +#endif /* init_des_cipher: initialize DES */ void Modified: user/attilio/vmcontention/bin/sh/sh.1 ============================================================================== --- user/attilio/vmcontention/bin/sh/sh.1 Mon Mar 25 22:40:38 2013 (r248709) +++ user/attilio/vmcontention/bin/sh/sh.1 Mon Mar 25 23:22:40 2013 (r248710) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd January 22, 2013 +.Dd March 24, 2013 .Dt SH 1 .Os .Sh NAME @@ -1061,6 +1061,9 @@ A subshell environment may be implemente If job control is enabled in an interactive shell, commands grouped in parentheses can be suspended and continued as a unit. .Pp +For compatibility with other shells, +two open parentheses in sequence should be separated by whitespace. +.Pp The second form never forks another shell, so it is slightly more efficient. Grouping commands together this way allows the user to @@ -1618,6 +1621,16 @@ and .Ic times returns information about the same process if they are the only command in a command substitution. +.Pp +If a command substitution of the +.Li $( +form begins with a subshell, +the +.Li $( +and +.Li ( +must be separated by whitespace +to avoid ambiguity with arithmetic expansion. .Ss Arithmetic Expansion Arithmetic expansion provides a mechanism for evaluating an arithmetic expression and substituting its value. Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d (from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d Mon Mar 25 23:22:40 2013 (r248710, copy of r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d) @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + trace(tolower(2152006)); + exit(1); +} Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.toupper.d (from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.toupper.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.toupper.d Mon Mar 25 23:22:40 2013 (r248710, copy of r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.toupper.d) @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + trace(toupper(timestamp)); + exit(1); +} Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolower.d (from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolower.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolower.d Mon Mar 25 23:22:40 2013 (r248710, copy of r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolower.d) @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + trace(tolower()); + exit(1); +} Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolowertoomany.d (from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolowertoomany.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolowertoomany.d Mon Mar 25 23:22:40 2013 (r248710, copy of r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolowertoomany.d) @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + trace(tolower("dory", "eel", "roughy")); + exit(1); +} Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.toupper.d (from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.toupper.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.toupper.d Mon Mar 25 23:22:40 2013 (r248710, copy of r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.toupper.d) @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + trace(toupper()); + exit(1); +} Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.touppertoomany.d (from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.touppertoomany.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.touppertoomany.d Mon Mar 25 23:22:40 2013 (r248710, copy of r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.touppertoomany.d) @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + trace(tolower("haino", "tylo")); + exit(1); +} Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d (from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d Mon Mar 25 23:22:40 2013 (r248710, copy of r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d) @@ -0,0 +1,80 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +#pragma D option quiet + +int64_t val[int]; + +BEGIN +{ + base = -2; + i = 0; + val[i++] = -10; + val[i++] = -1; + val[i++] = 0; + val[i++] = 10; + val[i++] = 100; + val[i++] = 1000; + val[i++] = (1LL << 62); + maxval = i; + i = 0; +} + +tick-1ms +/i < maxval/ +{ + printf("base %2d of %20d: ", base, val[i]); +} + +tick-1ms +/i < maxval/ +{ + printf(" %s\n", lltostr(val[i], base)); +} + +ERROR +{ + printf(" \n"); +} + +tick-1ms +/i < maxval/ +{ + i++; +} + +tick-1ms +/i == maxval/ +{ + i = 0; + base++; +} + +tick-1ms +/base > 40/ +{ + exit(0); +} + Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d.out (from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d.out Mon Mar 25 23:22:40 2013 (r248710, copy of r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d.out) @@ -0,0 +1,302 @@ +base -2 of -10: +base -2 of -1: +base -2 of 0: +base -2 of 10: +base -2 of 100: +base -2 of 1000: +base -2 of 4611686018427387904: +base -1 of -10: +base -1 of -1: +base -1 of 0: +base -1 of 10: +base -1 of 100: +base -1 of 1000: +base -1 of 4611686018427387904: +base 0 of -10: +base 0 of -1: +base 0 of 0: +base 0 of 10: +base 0 of 100: +base 0 of 1000: +base 0 of 4611686018427387904: +base 1 of -10: +base 1 of -1: +base 1 of 0: +base 1 of 10: +base 1 of 100: +base 1 of 1000: +base 1 of 4611686018427387904: +base 2 of -10: 1111111111111111111111111111111111111111111111111111111111110110 +base 2 of -1: 1111111111111111111111111111111111111111111111111111111111111111 +base 2 of 0: 0 +base 2 of 10: 1010 +base 2 of 100: 1100100 +base 2 of 1000: 1111101000 +base 2 of 4611686018427387904: 100000000000000000000000000000000000000000000000000000000000000 +base 3 of -10: 11112220022122120101211020120210210211120 +base 3 of -1: 11112220022122120101211020120210210211220 +base 3 of 0: 0 +base 3 of 10: 101 +base 3 of 100: 10201 +base 3 of 1000: 1101001 +base 3 of 4611686018427387904: 1010201120122220002201001122110012110111 +base 4 of -10: 33333333333333333333333333333312 +base 4 of -1: 33333333333333333333333333333333 +base 4 of 0: 0 +base 4 of 10: 22 +base 4 of 100: 1210 +base 4 of 1000: 33220 +base 4 of 4611686018427387904: 10000000000000000000000000000000 +base 5 of -10: 2214220303114400424121122411 +base 5 of -1: 2214220303114400424121122430 +base 5 of 0: 0 +base 5 of 10: 20 +base 5 of 100: 400 +base 5 of 1000: 13000 +base 5 of 4611686018427387904: 302141200402211214402403104 +base 6 of -10: 3520522010102100444244410 +base 6 of -1: 3520522010102100444244423 +base 6 of 0: 0 +base 6 of 10: 14 +base 6 of 100: 244 +base 6 of 1000: 4344 +base 6 of 4611686018427387904: 550120301313313111041104 +base 7 of -10: 45012021522523134134556 +base 7 of -1: 45012021522523134134601 +base 7 of 0: 0 +base 7 of 10: 13 +base 7 of 100: 202 +base 7 of 1000: 2626 +base 7 of 4611686018427387904: 11154003640456024361134 +base 8 of -10: 01777777777777777777766 +base 8 of -1: 01777777777777777777777 +base 8 of 0: 0 +base 8 of 10: 012 +base 8 of 100: 0144 +base 8 of 1000: 01750 +base 8 of 4611686018427387904: 0400000000000000000000 +base 9 of -10: 145808576354216723746 +base 9 of -1: 145808576354216723756 +base 9 of 0: 0 +base 9 of 10: 11 +base 9 of 100: 121 +base 9 of 1000: 1331 +base 9 of 4611686018427387904: 33646586081048405414 +base 10 of -10: -10 +base 10 of -1: -1 +base 10 of 0: 0 +base 10 of 10: 10 +base 10 of 100: 100 +base 10 of 1000: 1000 +base 10 of 4611686018427387904: 4611686018427387904 +base 11 of -10: 335500516a429071276 +base 11 of -1: 335500516a429071284 +base 11 of 0: 0 +base 11 of 10: a +base 11 of 100: 91 +base 11 of 1000: 82a +base 11 of 4611686018427387904: 9140013181078458a4 +base 12 of -10: 839365134a2a240706 +base 12 of -1: 839365134a2a240713 +base 12 of 0: 0 +base 12 of 10: a +base 12 of 100: 84 +base 12 of 1000: 6b4 +base 12 of 4611686018427387904: 20b3a733a268670194 +base 13 of -10: 219505a9511a867b66 +base 13 of -1: 219505a9511a867b72 +base 13 of 0: 0 +base 13 of 10: a +base 13 of 100: 79 +base 13 of 1000: 5bc +base 13 of 4611686018427387904: 6c1349246a2881c84 +base 14 of -10: 8681049adb03db166 +base 14 of -1: 8681049adb03db171 +base 14 of 0: 0 +base 14 of 10: a +base 14 of 100: 72 +base 14 of 1000: 516 +base 14 of 4611686018427387904: 219038263637dd3c4 +base 15 of -10: 2c1d56b648c6cd106 +base 15 of -1: 2c1d56b648c6cd110 +base 15 of 0: 0 +base 15 of 10: a +base 15 of 100: 6a +base 15 of 1000: 46a +base 15 of 4611686018427387904: a7e8ce189a933404 +base 16 of -10: 0xfffffffffffffff6 +base 16 of -1: 0xffffffffffffffff +base 16 of 0: 0x0 +base 16 of 10: 0xa +base 16 of 100: 0x64 +base 16 of 1000: 0x3e8 +base 16 of 4611686018427387904: 0x4000000000000000 +base 17 of -10: 67979g60f5428008 +base 17 of -1: 67979g60f5428010 +base 17 of 0: 0 +base 17 of 10: a +base 17 of 100: 5f +base 17 of 1000: 37e +base 17 of 4611686018427387904: 1a6a6ca03e10a88d +base 18 of -10: 2d3fgb0b9cg4bd26 +base 18 of -1: 2d3fgb0b9cg4bd2f +base 18 of 0: 0 +base 18 of 10: a +base 18 of 100: 5a +base 18 of 1000: 31a +base 18 of 4611686018427387904: c588bdbfgd12ge4 +base 19 of -10: 141c8786h1ccaag7 +base 19 of -1: 141c8786h1ccaagg +base 19 of 0: 0 +base 19 of 10: a +base 19 of 100: 55 +base 19 of 1000: 2ec +base 19 of 4611686018427387904: 5ecbb6fi9h7ggi9 +base 20 of -10: b53bjh07be4dj06 +base 20 of -1: b53bjh07be4dj0f +base 20 of 0: 0 +base 20 of 10: a +base 20 of 100: 50 +base 20 of 1000: 2a0 +base 20 of 4611686018427387904: 2g5hjj51hib39f4 +base 21 of -10: 5e8g4ggg7g56di6 +base 21 of -1: 5e8g4ggg7g56dif +base 21 of 0: 0 +base 21 of 10: a +base 21 of 100: 4g +base 21 of 1000: 25d +base 21 of 4611686018427387904: 18hjgjjjhebh8f4 +base 22 of -10: 2l4lf104353j8k6 +base 22 of -1: 2l4lf104353j8kf +base 22 of 0: 0 +base 22 of 10: a +base 22 of 100: 4c +base 22 of 1000: 21a +base 22 of 4611686018427387904: g6g95gc0hha7g4 +base 23 of -10: 1ddh88h2782i50j +base 23 of -1: 1ddh88h2782i515 +base 23 of 0: 0 +base 23 of 10: a +base 23 of 100: 48 +base 23 of 1000: 1kb +base 23 of 4611686018427387904: 93a22467dc4chd +base 24 of -10: l12ee5fn0ji1i6 +base 24 of -1: l12ee5fn0ji1if +base 24 of 0: 0 +base 24 of 10: a +base 24 of 100: 44 +base 24 of 1000: 1hg +base 24 of 4611686018427387904: 566ffd9ni4mcag +base 25 of -10: c9c336o0mlb7e6 +base 25 of -1: c9c336o0mlb7ef +base 25 of 0: 0 +base 25 of 10: a +base 25 of 100: 40 +base 25 of 1000: 1f0 +base 25 of 4611686018427387904: 32970kc6bo2kg4 +base 26 of -10: 7b7n2pcniokcg6 +base 26 of -1: 7b7n2pcniokcgf +base 26 of 0: 0 +base 26 of 10: a +base 26 of 100: 3m +base 26 of 1000: 1cc +base 26 of 4611686018427387904: 1m8c769io65344 +base 27 of -10: 4eo8hfam6fllmf +base 27 of -1: 4eo8hfam6fllmo +base 27 of 0: 0 +base 27 of 10: a +base 27 of 100: 3j +base 27 of 1000: 1a1 +base 27 of 4611686018427387904: 13jfho2j1hc5cd +base 28 of -10: 2nc6j26l66rho6 +base 28 of -1: 2nc6j26l66rhof +base 28 of 0: 0 +base 28 of 10: a +base 28 of 100: 3g +base 28 of 1000: 17k +base 28 of 4611686018427387904: jo1ilfj8fkpd4 +base 29 of -10: 1n3rsh11f098re +base 29 of -1: 1n3rsh11f098rn +base 29 of 0: 0 +base 29 of 10: a +base 29 of 100: 3d +base 29 of 1000: 15e +base 29 of 4611686018427387904: d0slim0b029e6 +base 30 of -10: 14l9lkmo30o406 +base 30 of -1: 14l9lkmo30o40f +base 30 of 0: 0 +base 30 of 10: a +base 30 of 100: 3a +base 30 of 1000: 13a +base 30 of 4611686018427387904: 8k9rrkl0ml104 +base 31 of -10: nd075ib45k866 +base 31 of -1: nd075ib45k86f +base 31 of 0: 0 +base 31 of 10: a +base 31 of 100: 37 +base 31 of 1000: 118 +base 31 of 4611686018427387904: 5qfh94i8okhh4 +base 32 of -10: fvvvvvvvvvvvm +base 32 of -1: fvvvvvvvvvvvv +base 32 of 0: 0 +base 32 of 10: a +base 32 of 100: 34 +base 32 of 1000: v8 +base 32 of 4611686018427387904: 4000000000000 +base 33 of -10: b1w8p7j5q9r66 +base 33 of -1: b1w8p7j5q9r6f +base 33 of 0: 0 +base 33 of 10: a +base 33 of 100: 31 +base 33 of 1000: ua +base 33 of 4611686018427387904: 2p826a4q6ivi4 +base 34 of -10: 7orp63sh4dph8 +base 34 of -1: 7orp63sh4dphh +base 34 of 0: 0 +base 34 of 10: a +base 34 of 100: 2w +base 34 of 1000: te +base 34 of 4611686018427387904: 1vnvr0wl9ketu +base 35 of -10: 5g24a25twkwf6 +base 35 of -1: 5g24a25twkwff +base 35 of 0: 0 +base 35 of 10: a +base 35 of 100: 2u +base 35 of 1000: sk +base 35 of 4611686018427387904: 1cqrb9a7gvgu4 +base 36 of -10: 3w5e11264sgs6 +base 36 of -1: 3w5e11264sgsf +base 36 of 0: 0 +base 36 of 10: a +base 36 of 100: 2s +base 36 of 1000: rs +base 36 of 4611686018427387904: z1ci99jj7474 +base 37 of -10: +base 37 of -1: +base 37 of 0: +base 37 of 10: +base 37 of 100: +base 37 of 1000: +base 37 of 4611686018427387904: +base 38 of -10: +base 38 of -1: +base 38 of 0: +base 38 of 10: +base 38 of 100: +base 38 of 1000: +base 38 of 4611686018427387904: +base 39 of -10: +base 39 of -1: +base 39 of 0: +base 39 of 10: +base 39 of 100: +base 39 of 1000: +base 39 of 4611686018427387904: +base 40 of -10: +base 40 of -1: +base 40 of 0: +base 40 of 10: +base 40 of 100: +base 40 of 1000: +base 40 of 4611686018427387904: + Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.tolower.d (from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.tolower.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.tolower.d Mon Mar 25 23:22:40 2013 (r248710, copy of r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.tolower.d) @@ -0,0 +1,66 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +#pragma D option quiet + +BEGIN +{ + i = 0; + + input[i] = "ahi"; + expected[i++] = "ahi"; + + input[i] = "MaHi!"; + expected[i++] = "mahi!"; + + input[i] = " Nase-5"; + expected[i++] = " nase-5"; + + input[i] = "!@#$%"; + expected[i++] = "!@#$%"; + + i = 0; +} + +tick-1ms +/input[i] != NULL && (this->out = tolower(input[i])) != expected[i]/ +{ + printf("expected tolower(\"%s\") to be \"%s\"; found \"%s\"\n", + input[i], expected[i], this->out); + exit(1); +} + +tick-1ms +/input[i] != NULL/ +{ + printf("tolower(\"%s\") is \"%s\", as expected\n", + input[i], expected[i]); +} + +tick-1ms +/input[i++] == NULL/ +{ + exit(0); +} Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.toupper.d (from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.toupper.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.toupper.d Mon Mar 25 23:22:40 2013 (r248710, copy of r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.toupper.d) @@ -0,0 +1,66 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +#pragma D option quiet + +BEGIN +{ + i = 0; + + input[i] = "ahi"; + expected[i++] = "AHI"; + + input[i] = "MaHi!"; + expected[i++] = "MAHI!"; + + input[i] = " dace-9"; + expected[i++] = " DACE-9"; + + input[i] = "!@#$%"; + expected[i++] = "!@#$%"; + + i = 0; +} + +tick-1ms +/input[i] != NULL && (this->out = toupper(input[i])) != expected[i]/ +{ + printf("expected toupper(\"%s\") to be \"%s\"; found \"%s\"\n", + input[i], expected[i], this->out); + exit(1); +} + +tick-1ms +/input[i] != NULL/ +{ + printf("toupper(\"%s\") is \"%s\", as expected\n", + input[i], expected[i]); +} + +tick-1ms +/input[i++] == NULL/ +{ + exit(0); +} Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_ARGS.d (from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_ARGS.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_ARGS.d Mon Mar 25 23:22:40 2013 (r248710, copy of r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_ARGS.d) @@ -0,0 +1,29 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + tracemem(`dtrace_zero, 256, 0, "fishpong"); +} Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_DYNSIZE.d (from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_DYNSIZE.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_DYNSIZE.d Mon Mar 25 23:22:40 2013 (r248710, copy of r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_DYNSIZE.d) @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + tracemem(`dtrace_zero, 256, "fishpong"); + exit(0); +} Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d (from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d Mon Mar 25 23:22:40 2013 (r248710, copy of r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d) @@ -0,0 +1,45 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +#pragma D option quiet + +BEGIN +{ + i = -10; +} + +tick-10ms +/i++ < 150/ +{ + printf("%d:", i); + tracemem(`dtrace_zero, 128, i); + printf("\n"); +} + +tick-10ms +/i >= 150/ +{ + exit(0); +} Copied: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d.out (from r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d.out Mon Mar 25 23:22:40 2013 (r248710, copy of r248709, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d.out) @@ -0,0 +1,1313 @@ +-9: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +-8: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +-7: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +-6: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +-5: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +-4: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +-3: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +-2: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Mon Mar 25 23:38:05 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 381364F1; Mon, 25 Mar 2013 23:38:05 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 276629DA; Mon, 25 Mar 2013 23:38:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2PNc5Ph013810; Mon, 25 Mar 2013 23:38:05 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2PNc1KB013791; Mon, 25 Mar 2013 23:38:01 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201303252338.r2PNc1KB013791@svn.freebsd.org> From: Attilio Rao Date: Mon, 25 Mar 2013 23:38:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248711 - in user/attilio/vmobj-readlock: . bin/ed bin/sh cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem cddl/con... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Mar 2013 23:38:05 -0000 Author: attilio Date: Mon Mar 25 23:38:01 2013 New Revision: 248711 URL: http://svnweb.freebsd.org/changeset/base/248711 Log: Merge from vmcontention Added: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d - copied unchanged from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.toupper.d - copied unchanged from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.toupper.d user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolower.d - copied unchanged from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolower.d user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolowertoomany.d - copied unchanged from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolowertoomany.d user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.toupper.d - copied unchanged from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.toupper.d user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.touppertoomany.d - copied unchanged from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.touppertoomany.d user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d - copied unchanged from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d.out - copied unchanged from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d.out user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.tolower.d - copied unchanged from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.tolower.d user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.toupper.d - copied unchanged from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.toupper.d - copied from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_ARGS.d - copied unchanged from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_ARGS.d user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_DYNSIZE.d - copied unchanged from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_DYNSIZE.d user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d - copied unchanged from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d.out - copied unchanged from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d.out user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c - copied unchanged from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c user/attilio/vmobj-readlock/tools/tools/ath/athalq/ar9300_ds.c - copied unchanged from r248710, user/attilio/vmcontention/tools/tools/ath/athalq/ar9300_ds.c user/attilio/vmobj-readlock/tools/tools/ath/athalq/ar9300_ds.h - copied unchanged from r248710, user/attilio/vmcontention/tools/tools/ath/athalq/ar9300_ds.h user/attilio/vmobj-readlock/tools/tools/shlib-compat/ - copied from r248710, user/attilio/vmcontention/tools/tools/shlib-compat/ Directory Properties: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) Deleted: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_PROTO_LEN.toomany.d Modified: user/attilio/vmobj-readlock/ObsoleteFiles.inc user/attilio/vmobj-readlock/bin/ed/cbc.c user/attilio/vmobj-readlock/bin/sh/sh.1 user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c user/attilio/vmobj-readlock/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h user/attilio/vmobj-readlock/cddl/lib/libdtrace/Makefile user/attilio/vmobj-readlock/contrib/libarchive/libarchive/archive_write.c user/attilio/vmobj-readlock/crypto/openssh/FREEBSD-upgrade user/attilio/vmobj-readlock/lib/libc/stdtime/Makefile.inc user/attilio/vmobj-readlock/lib/libdwarf/dwarf_die.c user/attilio/vmobj-readlock/sbin/fsck_ffs/fsutil.c user/attilio/vmobj-readlock/sbin/fsdb/fsdb.c user/attilio/vmobj-readlock/sbin/geom/class/eli/geli.8 user/attilio/vmobj-readlock/share/man/man9/taskqueue.9 user/attilio/vmobj-readlock/sys/arm/arm/busdma_machdep-v6.c user/attilio/vmobj-readlock/sys/cam/ata/ata_all.c user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h user/attilio/vmobj-readlock/sys/cddl/dev/fbt/fbt.c user/attilio/vmobj-readlock/sys/conf/files user/attilio/vmobj-readlock/sys/dev/ahci/ahci.c user/attilio/vmobj-readlock/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h user/attilio/vmobj-readlock/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h user/attilio/vmobj-readlock/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c user/attilio/vmobj-readlock/sys/dev/ath/if_ath.c user/attilio/vmobj-readlock/sys/dev/ath/if_ath_beacon.c user/attilio/vmobj-readlock/sys/dev/ath/if_ath_beacon.h user/attilio/vmobj-readlock/sys/dev/ath/if_ath_misc.h user/attilio/vmobj-readlock/sys/dev/ath/if_ath_sysctl.c user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tdma.c user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tx.c user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tx_edma.c user/attilio/vmobj-readlock/sys/dev/ath/if_athvar.h user/attilio/vmobj-readlock/sys/dev/drm2/ttm/ttm_bo_util.c user/attilio/vmobj-readlock/sys/dev/drm2/ttm/ttm_bo_vm.c user/attilio/vmobj-readlock/sys/dev/drm2/ttm/ttm_memory.c user/attilio/vmobj-readlock/sys/dev/ipmi/ipmi_kcs.c user/attilio/vmobj-readlock/sys/dev/ipmi/ipmi_smic.c user/attilio/vmobj-readlock/sys/dev/mmc/mmc.c user/attilio/vmobj-readlock/sys/dev/mmc/mmcsd.c user/attilio/vmobj-readlock/sys/geom/geom_dev.c user/attilio/vmobj-readlock/sys/geom/geom_disk.c user/attilio/vmobj-readlock/sys/geom/geom_event.c user/attilio/vmobj-readlock/sys/geom/geom_int.h user/attilio/vmobj-readlock/sys/geom/geom_subr.c user/attilio/vmobj-readlock/sys/geom/multipath/g_multipath.c user/attilio/vmobj-readlock/sys/kern/kern_timeout.c user/attilio/vmobj-readlock/sys/kern/subr_taskqueue.c user/attilio/vmobj-readlock/sys/kern/vfs_mountroot.c user/attilio/vmobj-readlock/sys/netpfil/ipfw/ip_fw_sockopt.c user/attilio/vmobj-readlock/sys/sys/bio.h user/attilio/vmobj-readlock/sys/sys/taskqueue.h user/attilio/vmobj-readlock/sys/vm/vm_radix.c user/attilio/vmobj-readlock/tools/tools/ath/athstats/athstats.c user/attilio/vmobj-readlock/usr.bin/systat/vmstat.c user/attilio/vmobj-readlock/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c Directory Properties: user/attilio/vmobj-readlock/ (props changed) user/attilio/vmobj-readlock/cddl/ (props changed) user/attilio/vmobj-readlock/cddl/contrib/opensolaris/ (props changed) user/attilio/vmobj-readlock/contrib/libarchive/ (props changed) user/attilio/vmobj-readlock/contrib/libarchive/libarchive/ (props changed) user/attilio/vmobj-readlock/crypto/openssh/ (props changed) user/attilio/vmobj-readlock/lib/libc/ (props changed) user/attilio/vmobj-readlock/lib/libc/stdtime/ (props changed) user/attilio/vmobj-readlock/sbin/ (props changed) user/attilio/vmobj-readlock/sys/ (props changed) user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/ (props changed) user/attilio/vmobj-readlock/sys/conf/ (props changed) Modified: user/attilio/vmobj-readlock/ObsoleteFiles.inc ============================================================================== --- user/attilio/vmobj-readlock/ObsoleteFiles.inc Mon Mar 25 23:22:40 2013 (r248710) +++ user/attilio/vmobj-readlock/ObsoleteFiles.inc Mon Mar 25 23:38:01 2013 (r248711) @@ -38,7 +38,11 @@ # xargs -n1 | sort | uniq -d; # done +# 20130316: vinum.4 removed OLD_FILES+=usr/share/man/man4/vinum.4.gz +# 20130312: fortunes-o removed +OLD_FILES+=usr/share/games/fortune/fortunes-o +OLD_FILES+=usr/share/games/fortune/fortunes-o.dat # 20130311: Ports are no more available via cvsup OLD_FILES+=usr/share/examples/cvsup/ports-supfile OLD_FILES+=usr/share/examples/cvsup/refuse Modified: user/attilio/vmobj-readlock/bin/ed/cbc.c ============================================================================== --- user/attilio/vmobj-readlock/bin/ed/cbc.c Mon Mar 25 23:22:40 2013 (r248710) +++ user/attilio/vmobj-readlock/bin/ed/cbc.c Mon Mar 25 23:38:01 2013 (r248711) @@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$"); #ifdef DES static DES_cblock ivec; /* initialization vector */ static DES_cblock pvec; /* padding vector */ -#endif static char bits[] = { /* used to extract bits from a char */ '\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001' @@ -79,13 +78,12 @@ static char bits[] = { /* used to extr static int pflag; /* 1 to preserve parity bits */ -#ifdef DES static DES_key_schedule schedule; /* expanded DES key */ -#endif static unsigned char des_buf[8];/* shared buffer for get_des_char/put_des_char */ static int des_ct = 0; /* count for get_des_char/put_des_char */ static int des_n = 0; /* index for put_des_char/get_des_char */ +#endif /* init_des_cipher: initialize DES */ void Modified: user/attilio/vmobj-readlock/bin/sh/sh.1 ============================================================================== --- user/attilio/vmobj-readlock/bin/sh/sh.1 Mon Mar 25 23:22:40 2013 (r248710) +++ user/attilio/vmobj-readlock/bin/sh/sh.1 Mon Mar 25 23:38:01 2013 (r248711) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd January 22, 2013 +.Dd March 24, 2013 .Dt SH 1 .Os .Sh NAME @@ -1061,6 +1061,9 @@ A subshell environment may be implemente If job control is enabled in an interactive shell, commands grouped in parentheses can be suspended and continued as a unit. .Pp +For compatibility with other shells, +two open parentheses in sequence should be separated by whitespace. +.Pp The second form never forks another shell, so it is slightly more efficient. Grouping commands together this way allows the user to @@ -1618,6 +1621,16 @@ and .Ic times returns information about the same process if they are the only command in a command substitution. +.Pp +If a command substitution of the +.Li $( +form begins with a subshell, +the +.Li $( +and +.Li ( +must be separated by whitespace +to avoid ambiguity with arithmetic expansion. .Ss Arithmetic Expansion Arithmetic expansion provides a mechanism for evaluating an arithmetic expression and substituting its value. Copied: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d (from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d Mon Mar 25 23:38:01 2013 (r248711, copy of r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d) @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + trace(tolower(2152006)); + exit(1); +} Copied: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.toupper.d (from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.toupper.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.toupper.d Mon Mar 25 23:38:01 2013 (r248711, copy of r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.toupper.d) @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + trace(toupper(timestamp)); + exit(1); +} Copied: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolower.d (from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolower.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolower.d Mon Mar 25 23:38:01 2013 (r248711, copy of r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolower.d) @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + trace(tolower()); + exit(1); +} Copied: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolowertoomany.d (from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolowertoomany.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolowertoomany.d Mon Mar 25 23:38:01 2013 (r248711, copy of r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolowertoomany.d) @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + trace(tolower("dory", "eel", "roughy")); + exit(1); +} Copied: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.toupper.d (from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.toupper.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.toupper.d Mon Mar 25 23:38:01 2013 (r248711, copy of r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.toupper.d) @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + trace(toupper()); + exit(1); +} Copied: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.touppertoomany.d (from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.touppertoomany.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.touppertoomany.d Mon Mar 25 23:38:01 2013 (r248711, copy of r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.touppertoomany.d) @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + trace(tolower("haino", "tylo")); + exit(1); +} Copied: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d (from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d Mon Mar 25 23:38:01 2013 (r248711, copy of r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d) @@ -0,0 +1,80 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +#pragma D option quiet + +int64_t val[int]; + +BEGIN +{ + base = -2; + i = 0; + val[i++] = -10; + val[i++] = -1; + val[i++] = 0; + val[i++] = 10; + val[i++] = 100; + val[i++] = 1000; + val[i++] = (1LL << 62); + maxval = i; + i = 0; +} + +tick-1ms +/i < maxval/ +{ + printf("base %2d of %20d: ", base, val[i]); +} + +tick-1ms +/i < maxval/ +{ + printf(" %s\n", lltostr(val[i], base)); +} + +ERROR +{ + printf(" \n"); +} + +tick-1ms +/i < maxval/ +{ + i++; +} + +tick-1ms +/i == maxval/ +{ + i = 0; + base++; +} + +tick-1ms +/base > 40/ +{ + exit(0); +} + Copied: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d.out (from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d.out Mon Mar 25 23:38:01 2013 (r248711, copy of r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d.out) @@ -0,0 +1,302 @@ +base -2 of -10: +base -2 of -1: +base -2 of 0: +base -2 of 10: +base -2 of 100: +base -2 of 1000: +base -2 of 4611686018427387904: +base -1 of -10: +base -1 of -1: +base -1 of 0: +base -1 of 10: +base -1 of 100: +base -1 of 1000: +base -1 of 4611686018427387904: +base 0 of -10: +base 0 of -1: +base 0 of 0: +base 0 of 10: +base 0 of 100: +base 0 of 1000: +base 0 of 4611686018427387904: +base 1 of -10: +base 1 of -1: +base 1 of 0: +base 1 of 10: +base 1 of 100: +base 1 of 1000: +base 1 of 4611686018427387904: +base 2 of -10: 1111111111111111111111111111111111111111111111111111111111110110 +base 2 of -1: 1111111111111111111111111111111111111111111111111111111111111111 +base 2 of 0: 0 +base 2 of 10: 1010 +base 2 of 100: 1100100 +base 2 of 1000: 1111101000 +base 2 of 4611686018427387904: 100000000000000000000000000000000000000000000000000000000000000 +base 3 of -10: 11112220022122120101211020120210210211120 +base 3 of -1: 11112220022122120101211020120210210211220 +base 3 of 0: 0 +base 3 of 10: 101 +base 3 of 100: 10201 +base 3 of 1000: 1101001 +base 3 of 4611686018427387904: 1010201120122220002201001122110012110111 +base 4 of -10: 33333333333333333333333333333312 +base 4 of -1: 33333333333333333333333333333333 +base 4 of 0: 0 +base 4 of 10: 22 +base 4 of 100: 1210 +base 4 of 1000: 33220 +base 4 of 4611686018427387904: 10000000000000000000000000000000 +base 5 of -10: 2214220303114400424121122411 +base 5 of -1: 2214220303114400424121122430 +base 5 of 0: 0 +base 5 of 10: 20 +base 5 of 100: 400 +base 5 of 1000: 13000 +base 5 of 4611686018427387904: 302141200402211214402403104 +base 6 of -10: 3520522010102100444244410 +base 6 of -1: 3520522010102100444244423 +base 6 of 0: 0 +base 6 of 10: 14 +base 6 of 100: 244 +base 6 of 1000: 4344 +base 6 of 4611686018427387904: 550120301313313111041104 +base 7 of -10: 45012021522523134134556 +base 7 of -1: 45012021522523134134601 +base 7 of 0: 0 +base 7 of 10: 13 +base 7 of 100: 202 +base 7 of 1000: 2626 +base 7 of 4611686018427387904: 11154003640456024361134 +base 8 of -10: 01777777777777777777766 +base 8 of -1: 01777777777777777777777 +base 8 of 0: 0 +base 8 of 10: 012 +base 8 of 100: 0144 +base 8 of 1000: 01750 +base 8 of 4611686018427387904: 0400000000000000000000 +base 9 of -10: 145808576354216723746 +base 9 of -1: 145808576354216723756 +base 9 of 0: 0 +base 9 of 10: 11 +base 9 of 100: 121 +base 9 of 1000: 1331 +base 9 of 4611686018427387904: 33646586081048405414 +base 10 of -10: -10 +base 10 of -1: -1 +base 10 of 0: 0 +base 10 of 10: 10 +base 10 of 100: 100 +base 10 of 1000: 1000 +base 10 of 4611686018427387904: 4611686018427387904 +base 11 of -10: 335500516a429071276 +base 11 of -1: 335500516a429071284 +base 11 of 0: 0 +base 11 of 10: a +base 11 of 100: 91 +base 11 of 1000: 82a +base 11 of 4611686018427387904: 9140013181078458a4 +base 12 of -10: 839365134a2a240706 +base 12 of -1: 839365134a2a240713 +base 12 of 0: 0 +base 12 of 10: a +base 12 of 100: 84 +base 12 of 1000: 6b4 +base 12 of 4611686018427387904: 20b3a733a268670194 +base 13 of -10: 219505a9511a867b66 +base 13 of -1: 219505a9511a867b72 +base 13 of 0: 0 +base 13 of 10: a +base 13 of 100: 79 +base 13 of 1000: 5bc +base 13 of 4611686018427387904: 6c1349246a2881c84 +base 14 of -10: 8681049adb03db166 +base 14 of -1: 8681049adb03db171 +base 14 of 0: 0 +base 14 of 10: a +base 14 of 100: 72 +base 14 of 1000: 516 +base 14 of 4611686018427387904: 219038263637dd3c4 +base 15 of -10: 2c1d56b648c6cd106 +base 15 of -1: 2c1d56b648c6cd110 +base 15 of 0: 0 +base 15 of 10: a +base 15 of 100: 6a +base 15 of 1000: 46a +base 15 of 4611686018427387904: a7e8ce189a933404 +base 16 of -10: 0xfffffffffffffff6 +base 16 of -1: 0xffffffffffffffff +base 16 of 0: 0x0 +base 16 of 10: 0xa +base 16 of 100: 0x64 +base 16 of 1000: 0x3e8 +base 16 of 4611686018427387904: 0x4000000000000000 +base 17 of -10: 67979g60f5428008 +base 17 of -1: 67979g60f5428010 +base 17 of 0: 0 +base 17 of 10: a +base 17 of 100: 5f +base 17 of 1000: 37e +base 17 of 4611686018427387904: 1a6a6ca03e10a88d +base 18 of -10: 2d3fgb0b9cg4bd26 +base 18 of -1: 2d3fgb0b9cg4bd2f +base 18 of 0: 0 +base 18 of 10: a +base 18 of 100: 5a +base 18 of 1000: 31a +base 18 of 4611686018427387904: c588bdbfgd12ge4 +base 19 of -10: 141c8786h1ccaag7 +base 19 of -1: 141c8786h1ccaagg +base 19 of 0: 0 +base 19 of 10: a +base 19 of 100: 55 +base 19 of 1000: 2ec +base 19 of 4611686018427387904: 5ecbb6fi9h7ggi9 +base 20 of -10: b53bjh07be4dj06 +base 20 of -1: b53bjh07be4dj0f +base 20 of 0: 0 +base 20 of 10: a +base 20 of 100: 50 +base 20 of 1000: 2a0 +base 20 of 4611686018427387904: 2g5hjj51hib39f4 +base 21 of -10: 5e8g4ggg7g56di6 +base 21 of -1: 5e8g4ggg7g56dif +base 21 of 0: 0 +base 21 of 10: a +base 21 of 100: 4g +base 21 of 1000: 25d +base 21 of 4611686018427387904: 18hjgjjjhebh8f4 +base 22 of -10: 2l4lf104353j8k6 +base 22 of -1: 2l4lf104353j8kf +base 22 of 0: 0 +base 22 of 10: a +base 22 of 100: 4c +base 22 of 1000: 21a +base 22 of 4611686018427387904: g6g95gc0hha7g4 +base 23 of -10: 1ddh88h2782i50j +base 23 of -1: 1ddh88h2782i515 +base 23 of 0: 0 +base 23 of 10: a +base 23 of 100: 48 +base 23 of 1000: 1kb +base 23 of 4611686018427387904: 93a22467dc4chd +base 24 of -10: l12ee5fn0ji1i6 +base 24 of -1: l12ee5fn0ji1if +base 24 of 0: 0 +base 24 of 10: a +base 24 of 100: 44 +base 24 of 1000: 1hg +base 24 of 4611686018427387904: 566ffd9ni4mcag +base 25 of -10: c9c336o0mlb7e6 +base 25 of -1: c9c336o0mlb7ef +base 25 of 0: 0 +base 25 of 10: a +base 25 of 100: 40 +base 25 of 1000: 1f0 +base 25 of 4611686018427387904: 32970kc6bo2kg4 +base 26 of -10: 7b7n2pcniokcg6 +base 26 of -1: 7b7n2pcniokcgf +base 26 of 0: 0 +base 26 of 10: a +base 26 of 100: 3m +base 26 of 1000: 1cc +base 26 of 4611686018427387904: 1m8c769io65344 +base 27 of -10: 4eo8hfam6fllmf +base 27 of -1: 4eo8hfam6fllmo +base 27 of 0: 0 +base 27 of 10: a +base 27 of 100: 3j +base 27 of 1000: 1a1 +base 27 of 4611686018427387904: 13jfho2j1hc5cd +base 28 of -10: 2nc6j26l66rho6 +base 28 of -1: 2nc6j26l66rhof +base 28 of 0: 0 +base 28 of 10: a +base 28 of 100: 3g +base 28 of 1000: 17k +base 28 of 4611686018427387904: jo1ilfj8fkpd4 +base 29 of -10: 1n3rsh11f098re +base 29 of -1: 1n3rsh11f098rn +base 29 of 0: 0 +base 29 of 10: a +base 29 of 100: 3d +base 29 of 1000: 15e +base 29 of 4611686018427387904: d0slim0b029e6 +base 30 of -10: 14l9lkmo30o406 +base 30 of -1: 14l9lkmo30o40f +base 30 of 0: 0 +base 30 of 10: a +base 30 of 100: 3a +base 30 of 1000: 13a +base 30 of 4611686018427387904: 8k9rrkl0ml104 +base 31 of -10: nd075ib45k866 +base 31 of -1: nd075ib45k86f +base 31 of 0: 0 +base 31 of 10: a +base 31 of 100: 37 +base 31 of 1000: 118 +base 31 of 4611686018427387904: 5qfh94i8okhh4 +base 32 of -10: fvvvvvvvvvvvm +base 32 of -1: fvvvvvvvvvvvv +base 32 of 0: 0 +base 32 of 10: a +base 32 of 100: 34 +base 32 of 1000: v8 +base 32 of 4611686018427387904: 4000000000000 +base 33 of -10: b1w8p7j5q9r66 +base 33 of -1: b1w8p7j5q9r6f +base 33 of 0: 0 +base 33 of 10: a +base 33 of 100: 31 +base 33 of 1000: ua +base 33 of 4611686018427387904: 2p826a4q6ivi4 +base 34 of -10: 7orp63sh4dph8 +base 34 of -1: 7orp63sh4dphh +base 34 of 0: 0 +base 34 of 10: a +base 34 of 100: 2w +base 34 of 1000: te +base 34 of 4611686018427387904: 1vnvr0wl9ketu +base 35 of -10: 5g24a25twkwf6 +base 35 of -1: 5g24a25twkwff +base 35 of 0: 0 +base 35 of 10: a +base 35 of 100: 2u +base 35 of 1000: sk +base 35 of 4611686018427387904: 1cqrb9a7gvgu4 +base 36 of -10: 3w5e11264sgs6 +base 36 of -1: 3w5e11264sgsf +base 36 of 0: 0 +base 36 of 10: a +base 36 of 100: 2s +base 36 of 1000: rs +base 36 of 4611686018427387904: z1ci99jj7474 +base 37 of -10: +base 37 of -1: +base 37 of 0: +base 37 of 10: +base 37 of 100: +base 37 of 1000: +base 37 of 4611686018427387904: +base 38 of -10: +base 38 of -1: +base 38 of 0: +base 38 of 10: +base 38 of 100: +base 38 of 1000: +base 38 of 4611686018427387904: +base 39 of -10: +base 39 of -1: +base 39 of 0: +base 39 of 10: +base 39 of 100: +base 39 of 1000: +base 39 of 4611686018427387904: +base 40 of -10: +base 40 of -1: +base 40 of 0: +base 40 of 10: +base 40 of 100: +base 40 of 1000: +base 40 of 4611686018427387904: + Copied: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.tolower.d (from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.tolower.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.tolower.d Mon Mar 25 23:38:01 2013 (r248711, copy of r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.tolower.d) @@ -0,0 +1,66 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +#pragma D option quiet + +BEGIN +{ + i = 0; + + input[i] = "ahi"; + expected[i++] = "ahi"; + + input[i] = "MaHi!"; + expected[i++] = "mahi!"; + + input[i] = " Nase-5"; + expected[i++] = " nase-5"; + + input[i] = "!@#$%"; + expected[i++] = "!@#$%"; + + i = 0; +} + +tick-1ms +/input[i] != NULL && (this->out = tolower(input[i])) != expected[i]/ +{ + printf("expected tolower(\"%s\") to be \"%s\"; found \"%s\"\n", + input[i], expected[i], this->out); + exit(1); +} + +tick-1ms +/input[i] != NULL/ +{ + printf("tolower(\"%s\") is \"%s\", as expected\n", + input[i], expected[i]); +} + +tick-1ms +/input[i++] == NULL/ +{ + exit(0); +} Copied: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.toupper.d (from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.toupper.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.toupper.d Mon Mar 25 23:38:01 2013 (r248711, copy of r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.toupper.d) @@ -0,0 +1,66 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +#pragma D option quiet + +BEGIN +{ + i = 0; + + input[i] = "ahi"; + expected[i++] = "AHI"; + + input[i] = "MaHi!"; + expected[i++] = "MAHI!"; + + input[i] = " dace-9"; + expected[i++] = " DACE-9"; + + input[i] = "!@#$%"; + expected[i++] = "!@#$%"; + + i = 0; +} + +tick-1ms +/input[i] != NULL && (this->out = toupper(input[i])) != expected[i]/ +{ + printf("expected toupper(\"%s\") to be \"%s\"; found \"%s\"\n", + input[i], expected[i], this->out); + exit(1); +} + +tick-1ms +/input[i] != NULL/ +{ + printf("toupper(\"%s\") is \"%s\", as expected\n", + input[i], expected[i]); +} + +tick-1ms +/input[i++] == NULL/ +{ + exit(0); +} Copied: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_ARGS.d (from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_ARGS.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_ARGS.d Mon Mar 25 23:38:01 2013 (r248711, copy of r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_ARGS.d) @@ -0,0 +1,29 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + tracemem(`dtrace_zero, 256, 0, "fishpong"); +} Copied: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_DYNSIZE.d (from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_DYNSIZE.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_DYNSIZE.d Mon Mar 25 23:38:01 2013 (r248711, copy of r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_DYNSIZE.d) @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +BEGIN +{ + tracemem(`dtrace_zero, 256, "fishpong"); + exit(0); +} Copied: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d (from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d Mon Mar 25 23:38:01 2013 (r248711, copy of r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d) @@ -0,0 +1,45 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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 + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent, Inc. All rights reserved. + */ + +#pragma D option quiet + +BEGIN +{ + i = -10; +} + +tick-10ms +/i++ < 150/ +{ + printf("%d:", i); + tracemem(`dtrace_zero, 128, i); + printf("\n"); +} + +tick-10ms +/i >= 150/ +{ + exit(0); +} Copied: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d.out (from r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d.out Mon Mar 25 23:38:01 2013 (r248711, copy of r248710, user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d.out) @@ -0,0 +1,1313 @@ +-9: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +-8: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +-7: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +-6: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +-5: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +-4: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +-3: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +-2: + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef + 0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Tue Mar 26 14:36:11 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E007CBCE; Tue, 26 Mar 2013 14:36:11 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D2C7D110; Tue, 26 Mar 2013 14:36:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2QEaBbx089387; Tue, 26 Mar 2013 14:36:11 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2QEaBlv089386; Tue, 26 Mar 2013 14:36:11 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201303261436.r2QEaBlv089386@svn.freebsd.org> From: Andre Oppermann Date: Tue, 26 Mar 2013 14:36:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248726 - user/andre/tcp-ao/sys/netinet X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Mar 2013 14:36:11 -0000 Author: andre Date: Tue Mar 26 14:36:11 2013 New Revision: 248726 URL: http://svnweb.freebsd.org/changeset/base/248726 Log: Switch from the vectored key setting approach to one key operation per setsockopt(). It is much simpler for applications using TCP-AO to implement and has only a negligible overhead. Sponsored by: Juniper Networks Modified: user/andre/tcp-ao/sys/netinet/tcp_ao.h Modified: user/andre/tcp-ao/sys/netinet/tcp_ao.h ============================================================================== --- user/andre/tcp-ao/sys/netinet/tcp_ao.h Tue Mar 26 14:08:14 2013 (r248725) +++ user/andre/tcp-ao/sys/netinet/tcp_ao.h Tue Mar 26 14:36:11 2013 (r248726) @@ -44,7 +44,7 @@ * * On a connect all keys except those belonging to that peer are removed. * - * If a key that is changed that is in active use, packet loss may result. + * If a key that is in active use is changed, packet loss may result. * * Keys are not shared between sockets. Adding and removing keys has to be * done on each socket where the peer address applies. This is not much @@ -53,14 +53,11 @@ * Since applications tend to pass the key string unmodified it may be better * to specify the socket interface to be in base64 instead of an array of * uint8_t. That would allow a human readable string to represent more bit - * variance per byte. + * variance per byte, though the overall entropy doesn't change for a given + * key length. * - * Configured keys on a socket can be retrieved as follows: - * getsockopt(so, IPPROTO_TCP, TCP_AO, tcp_ao_sopt, sizeof(*tcp_ao_sopt)); - * - * All configured peers and key indexs are returned in the supplied vector. - * If the vector is too small the result is truncated. The number of keys - * is returned in tao_keycnt. No actual keys are returned or exposed. + * The active key index on a connected socket can be retrieved as follows: + * getsockopt(so, IPPROTO_TCP, TCP_AO, int, sizeof(int)); * * This interface may continue to evolve as the implementation matures and * handling experience is gained. These structs should be moved to tcp.h @@ -69,48 +66,36 @@ /* * TCP-AO key interface struct passed to setsockopt(). - */ -struct tcp_ao_sopt { - int tao_flags; /* flags for this operation */ - int tao_keycnt; /* number of keys in vector */ - struct tcp_ao_key *tao_keyv; /* pointer to key vector */ -}; - -/* - * Flags for the tao_flags field. - */ -#define TAO_SOPT_REPLACE 0x00000001 /* replace full set */ - -/* * Per peer structures referenced from tcp_ao_sopt. * The commands normally apply to a particular keyidx and peer combination. */ -struct tcp_ao_key { - uint8_t taok_cmd; /* command, add, remove key */ - uint8_t taok_flags; /* flags for key */ - uint8_t taok_algo; /* MAC algorithm */ - uint8_t taok_keyidx; /* key index per peer */ - int taok_keylen; /* length of key */ - uint8_t *taok_key; /* key string */ - struct sockaddr *taok_peer; /* this key applies to ... */ +struct tcp_ao_ssopt { + uint16_t tao_cmd; /* command, add, remove key */ + uint16_t tao_flags; /* flags */ + uint8_t tao_keyidx; /* key index per peer */ + uint8_t tao_algo; /* MAC algorithm */ + struct sockaddr_storage + tao_peer; /* this key applies to ... */ + uint8_t tao_key[]; /* key string */ }; /* - * Commands for the taok_cmd field. + * Commands for the tao_cmd field. */ -#define TAOK_CMD_ADD 1 /* add or replace key */ -#define TAOK_CMD_DELETE 2 /* delete key keyidx|peer */ -#define TAOK_CMD_DELETEALL 3 /* delete all idx for peer */ +#define TAO_CMD_ADD 1 /* add or replace key */ +#define TAO_CMD_DELIDX 2 /* delete keyidx|peer */ +#define TAO_CMD_DELPEER 3 /* delete all idx for peer */ +#define TAO_CMD_FLUSH 4 /* delete all keys */ /* - * Flags for the taok_flags field. + * Flags for the tao_flags field. */ -#define TAOK_FLAGS_ACTIVE 0x01 /* active key index for SYN */ +#define TAO_FLAGS_ACTIVE 0x0001 /* active key index for SYN */ /* - * MAC and KDF pairs for keys. + * MAC and KDF pairs for the tao_algo field. */ -#define TAOK_ALGO_MD5SIG 1 /* legacy compatibility */ -#define TAOK_ALGO_HMAC-SHA-1-96 2 /* RFC5926, Section 2.2 */ -#define TAOK_ALGO_AES-128-CMAC-96 3 /* RFC5926, Section 2.2 */ +#define TAO_ALGO_MD5SIG 1 /* legacy compatibility */ +#define TAO_ALGO_HMAC-SHA-1-96 2 /* RFC5926, Section 2.2 */ +#define TAO_ALGO_AES-128-CMAC-96 3 /* RFC5926, Section 2.2 */ From owner-svn-src-user@FreeBSD.ORG Tue Mar 26 16:38:04 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7BC59130; Tue, 26 Mar 2013 16:38:04 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6D477A5B; Tue, 26 Mar 2013 16:38:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2QGc4Ks027710; Tue, 26 Mar 2013 16:38:04 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2QGc4ID027708; Tue, 26 Mar 2013 16:38:04 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <201303261638.r2QGc4ID027708@svn.freebsd.org> From: Dmitry Chagin Date: Tue, 26 Mar 2013 16:38:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248727 - in user/dchagin/lemul/sys: amd64/linux32 i386/linux X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Mar 2013 16:38:04 -0000 Author: dchagin Date: Tue Mar 26 16:38:03 2013 New Revision: 248727 URL: http://svnweb.freebsd.org/changeset/base/248727 Log: Calculate the %rip value rather than hard coding numbers. Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_locore.s user/dchagin/lemul/sys/i386/linux/linux_locore.s Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_locore.s ============================================================================== --- user/dchagin/lemul/sys/amd64/linux32/linux32_locore.s Tue Mar 26 14:36:11 2013 (r248726) +++ user/dchagin/lemul/sys/amd64/linux32/linux32_locore.s Tue Mar 26 16:38:03 2013 (r248727) @@ -17,7 +17,7 @@ NON_GPROF_ENTRY(linux32_sigcode) call .getip0 .getip0: popl %eax - add $11, %eax + add $.startsigcode-.getip0, %eax /* ret address */ push %eax jmp *LINUX_SIGF_HANDLER(%ebx) .startsigcode: @@ -34,7 +34,7 @@ NON_GPROF_ENTRY(linux32_rt_sigcode) call .getip1 .getip1: popl %eax - add $11, %eax + add $.startrtsigcode-.getip1, %eax /* ret address */ push %eax jmp *LINUX_RT_SIGF_HANDLER(%edi) .startrtsigcode: Modified: user/dchagin/lemul/sys/i386/linux/linux_locore.s ============================================================================== --- user/dchagin/lemul/sys/i386/linux/linux_locore.s Tue Mar 26 14:36:11 2013 (r248726) +++ user/dchagin/lemul/sys/i386/linux/linux_locore.s Tue Mar 26 16:38:03 2013 (r248727) @@ -16,7 +16,7 @@ NON_GPROF_ENTRY(linux_sigcode) call .getip0 .getip0: popl %eax - add $11, %eax + add $.startsigcode-.getip0, %eax /* ret address */ push %eax jmp *LINUX_SIGF_HANDLER(%ebx) .startsigcode: @@ -33,7 +33,7 @@ NON_GPROF_ENTRY(linux_rt_sigcode) call .getip1 .getip1: popl %eax - add $11, %eax + add $.startrtsigcode-.getip1, %eax /* ret address */ push %eax jmp *LINUX_RT_SIGF_HANDLER(%edi) .startrtsigcode: From owner-svn-src-user@FreeBSD.ORG Wed Mar 27 11:31:44 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 651661EB; Wed, 27 Mar 2013 11:31:44 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5597F151; Wed, 27 Mar 2013 11:31:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2RBVi33077535; Wed, 27 Mar 2013 11:31:44 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2RBVePQ077504; Wed, 27 Mar 2013 11:31:40 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201303271131.r2RBVePQ077504@svn.freebsd.org> From: Attilio Rao Date: Wed, 27 Mar 2013 11:31:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248791 - in user/attilio/vmcontention: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers contrib/bind9 lib/bind lib/bind/dns lib/bind/dns/dns lib/libc/sys lib/libpmc sbin/nv... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Mar 2013 11:31:44 -0000 Author: attilio Date: Wed Mar 27 11:31:39 2013 New Revision: 248791 URL: http://svnweb.freebsd.org/changeset/base/248791 Log: MFC Added: user/attilio/vmcontention/sys/mips/atheros/ar933x_chip.c - copied unchanged from r248790, head/sys/mips/atheros/ar933x_chip.c user/attilio/vmcontention/sys/mips/atheros/ar933x_chip.h - copied unchanged from r248790, head/sys/mips/atheros/ar933x_chip.h user/attilio/vmcontention/sys/mips/atheros/ar933x_uart.h - copied unchanged from r248790, head/sys/mips/atheros/ar933x_uart.h user/attilio/vmcontention/sys/mips/atheros/ar933xreg.h - copied unchanged from r248790, head/sys/mips/atheros/ar933xreg.h Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d user/attilio/vmcontention/contrib/bind9/CHANGES user/attilio/vmcontention/contrib/bind9/config.h.in user/attilio/vmcontention/contrib/bind9/configure.in user/attilio/vmcontention/contrib/bind9/version user/attilio/vmcontention/lib/bind/config.h user/attilio/vmcontention/lib/bind/dns/code.h user/attilio/vmcontention/lib/bind/dns/dns/enumclass.h user/attilio/vmcontention/lib/bind/dns/dns/enumtype.h user/attilio/vmcontention/lib/bind/dns/dns/rdatastruct.h user/attilio/vmcontention/lib/libc/sys/accept.2 user/attilio/vmcontention/lib/libpmc/pmc.sandybridgexeon.3 user/attilio/vmcontention/sbin/nvmecontrol/nvmecontrol.8 user/attilio/vmcontention/sbin/nvmecontrol/nvmecontrol.c user/attilio/vmcontention/share/mk/bsd.own.mk user/attilio/vmcontention/share/mk/bsd.prog.mk user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/attilio/vmcontention/sys/dev/ath/if_ath.c user/attilio/vmcontention/sys/dev/ath/if_ath_beacon.c user/attilio/vmcontention/sys/dev/ath/if_ath_misc.h user/attilio/vmcontention/sys/dev/ath/if_ath_tx.c user/attilio/vmcontention/sys/dev/ath/if_ath_tx_edma.c user/attilio/vmcontention/sys/dev/ath/if_athvar.h user/attilio/vmcontention/sys/dev/isci/isci_controller.c user/attilio/vmcontention/sys/dev/isci/isci_io_request.c user/attilio/vmcontention/sys/dev/nvd/nvd.c user/attilio/vmcontention/sys/dev/nvme/nvme.c user/attilio/vmcontention/sys/dev/nvme/nvme.h user/attilio/vmcontention/sys/dev/nvme/nvme_ctrlr.c user/attilio/vmcontention/sys/dev/nvme/nvme_ctrlr_cmd.c user/attilio/vmcontention/sys/dev/nvme/nvme_ns.c user/attilio/vmcontention/sys/dev/nvme/nvme_ns_cmd.c user/attilio/vmcontention/sys/dev/nvme/nvme_private.h user/attilio/vmcontention/sys/dev/nvme/nvme_qpair.c user/attilio/vmcontention/sys/dev/nvme/nvme_sysctl.c user/attilio/vmcontention/sys/dev/nvme/nvme_test.c user/attilio/vmcontention/sys/dev/nvme/nvme_uio.c user/attilio/vmcontention/sys/dev/sound/pci/hda/hdaa_patches.c user/attilio/vmcontention/sys/geom/gate/g_gate.c user/attilio/vmcontention/sys/geom/geom_dev.c user/attilio/vmcontention/sys/geom/geom_slice.c user/attilio/vmcontention/sys/geom/nop/g_nop.c user/attilio/vmcontention/sys/geom/raid/tr_raid1e.c user/attilio/vmcontention/sys/i386/include/param.h user/attilio/vmcontention/sys/kern/kern_physio.c user/attilio/vmcontention/sys/kern/vfs_bio.c user/attilio/vmcontention/sys/mips/atheros/ar71xx_chip.c user/attilio/vmcontention/sys/mips/atheros/ar71xx_cpudef.h user/attilio/vmcontention/sys/mips/atheros/ar724x_chip.c user/attilio/vmcontention/sys/mips/atheros/ar91xx_chip.c user/attilio/vmcontention/sys/netgraph/netflow/netflow.c user/attilio/vmcontention/sys/netgraph/netflow/ng_netflow.c user/attilio/vmcontention/sys/sys/conf.h user/attilio/vmcontention/sys/vm/vm_radix.c user/attilio/vmcontention/usr.sbin/config/main.c user/attilio/vmcontention/usr.sbin/newsyslog/newsyslog.c user/attilio/vmcontention/usr.sbin/watchdogd/watchdogd.8 user/attilio/vmcontention/usr.sbin/watchdogd/watchdogd.c Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/cddl/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/contrib/bind9/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/sbin/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/cddl/contrib/opensolaris/ (props changed) Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d Wed Mar 27 11:31:39 2013 (r248791) @@ -24,7 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ /* * ASSERTION: @@ -32,44 +34,51 @@ * a runtime error. * * SECTION: Pointers and Arrays/Generic Pointers - * - * NOTES: - * This test doesn't apply to x86; for the time being, we're working - * around this with the preprocessor. */ #pragma D option quiet -int array[3]; -uintptr_t uptr; +#if defined(__i386) || defined(__amd64) +#define __x86 1 +#endif + +int array[2]; +char *ptr; int *p; int *q; int *r; BEGIN { -#ifdef __i386 + array[0] = 0x12345678; + array[1] = 0xabcdefff; + + ptr = (char *) &array[0]; + + p = (int *) (ptr); + q = (int *) (ptr + 2); + r = (int *) (ptr + 3); + + printf("*p: 0x%x\n", *p); + printf("*q: 0x%x\n", *q); + printf("*r: 0x%x\n", *r); + + /* + * On x86, the above unaligned memory accesses are allowed and should + * not result in the ERROR probe firing. + */ +#ifdef __x86 exit(1); #else - array[0] = 20; - array[1] = 40; - array[2] = 80; - - uptr = (uintptr_t) &array[0]; - - p = (int *) (uptr); - q = (int *) (uptr + 2); - r = (int *) (uptr + 3); - - printf("array[0]: %d\t*p: %d\n", array[0], *p); - printf("array[1]: %d\t*q: %d\n", array[1], *q); - printf("array[2]: %d\t*r: %d\n", array[2], *r); - exit(0); #endif } ERROR { +#ifdef __x86 + exit(0); +#else exit(1); +#endif } Modified: user/attilio/vmcontention/contrib/bind9/CHANGES ============================================================================== --- user/attilio/vmcontention/contrib/bind9/CHANGES Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/contrib/bind9/CHANGES Wed Mar 27 11:31:39 2013 (r248791) @@ -1,3 +1,10 @@ + --- 9.8.4-P2 released --- + +3516. [security] Removed the check for regex.h in configure in order + to disable regex syntax checking, as it exposes + BIND to a critical flaw in libregex on some + platforms. [RT #32688] + --- 9.8.4-P1 released --- 3407. [security] Named could die on specific queries with dns64 enabled. Modified: user/attilio/vmcontention/contrib/bind9/config.h.in ============================================================================== --- user/attilio/vmcontention/contrib/bind9/config.h.in Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/contrib/bind9/config.h.in Wed Mar 27 11:31:39 2013 (r248791) @@ -286,9 +286,6 @@ int sigwait(const unsigned int *set, int /* Define if your OpenSSL version supports GOST. */ #undef HAVE_OPENSSL_GOST -/* Define to 1 if you have the header file. */ -#undef HAVE_REGEX_H - /* Define to 1 if you have the `setegid' function. */ #undef HAVE_SETEGID Modified: user/attilio/vmcontention/contrib/bind9/configure.in ============================================================================== --- user/attilio/vmcontention/contrib/bind9/configure.in Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/contrib/bind9/configure.in Wed Mar 27 11:31:39 2013 (r248791) @@ -298,7 +298,7 @@ esac AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h regex.h sys/time.h unistd.h sys/sockio.h sys/select.h sys/param.h sys/sysctl.h net/if6.h,,, +AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h sys/sockio.h sys/select.h sys/param.h sys/sysctl.h net/if6.h,,, [$ac_includes_default #ifdef HAVE_SYS_PARAM_H # include Modified: user/attilio/vmcontention/contrib/bind9/version ============================================================================== --- user/attilio/vmcontention/contrib/bind9/version Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/contrib/bind9/version Wed Mar 27 11:31:39 2013 (r248791) @@ -7,4 +7,4 @@ MAJORVER=9 MINORVER=8 PATCHVER=4 RELEASETYPE=-P -RELEASEVER=1 +RELEASEVER=2 Modified: user/attilio/vmcontention/lib/bind/config.h ============================================================================== --- user/attilio/vmcontention/lib/bind/config.h Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/lib/bind/config.h Wed Mar 27 11:31:39 2013 (r248791) @@ -286,9 +286,6 @@ int sigwait(const unsigned int *set, int /* Define if your OpenSSL version supports GOST. */ /* #undef HAVE_OPENSSL_GOST */ -/* Define to 1 if you have the header file. */ -#define HAVE_REGEX_H 1 - /* Define to 1 if you have the `setegid' function. */ #define HAVE_SETEGID 1 Modified: user/attilio/vmcontention/lib/bind/dns/code.h ============================================================================== --- user/attilio/vmcontention/lib/bind/dns/code.h Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/lib/bind/dns/code.h Wed Mar 27 11:31:39 2013 (r248791) @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any Modified: user/attilio/vmcontention/lib/bind/dns/dns/enumclass.h ============================================================================== --- user/attilio/vmcontention/lib/bind/dns/dns/enumclass.h Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/lib/bind/dns/dns/enumclass.h Wed Mar 27 11:31:39 2013 (r248791) @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any Modified: user/attilio/vmcontention/lib/bind/dns/dns/enumtype.h ============================================================================== --- user/attilio/vmcontention/lib/bind/dns/dns/enumtype.h Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/lib/bind/dns/dns/enumtype.h Wed Mar 27 11:31:39 2013 (r248791) @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any Modified: user/attilio/vmcontention/lib/bind/dns/dns/rdatastruct.h ============================================================================== --- user/attilio/vmcontention/lib/bind/dns/dns/rdatastruct.h Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/lib/bind/dns/dns/rdatastruct.h Wed Mar 27 11:31:39 2013 (r248791) @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any Modified: user/attilio/vmcontention/lib/libc/sys/accept.2 ============================================================================== --- user/attilio/vmcontention/lib/libc/sys/accept.2 Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/lib/libc/sys/accept.2 Wed Mar 27 11:31:39 2013 (r248791) @@ -28,7 +28,7 @@ .\" @(#)accept.2 8.2 (Berkeley) 12/11/93 .\" $FreeBSD$ .\" -.Dd December 11, 1993 +.Dd March 26, 2013 .Dt ACCEPT 2 .Os .Sh NAME @@ -57,7 +57,13 @@ queue of pending connections, creates a and allocates a new file descriptor for the socket which inherits the state of the .Dv O_NONBLOCK -property from the original socket +and +.Dv O_ASYNC +properties and the destination of +.Dv SIGIO +and +.Dv SIGURG +signals from the original socket .Fa s . .Pp If no pending connections are @@ -129,7 +135,11 @@ to pre-process incoming connections. .Pp Portable programs should not rely on the .Dv O_NONBLOCK -property being inherited. +and +.Dv O_ASYNC +properties and the signal destination being inherited, +but should set them explicitly using +.Xr fcntl 2 . .Sh RETURN VALUES The call returns \-1 on error. If it succeeds, it returns a non-negative Modified: user/attilio/vmcontention/lib/libpmc/pmc.sandybridgexeon.3 ============================================================================== --- user/attilio/vmcontention/lib/libpmc/pmc.sandybridgexeon.3 Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/lib/libpmc/pmc.sandybridgexeon.3 Wed Mar 27 11:31:39 2013 (r248791) @@ -219,7 +219,7 @@ L1D. .It Li MISALIGN_MEM_REF.STORES .Pq Event 05H , Umask 02H Speculative cache-line split Store- address uops -dispatchedto L1D. +dispatched to L1D. .It Li LD_BLOCKS_PARTIAL.ADDRESS_ALIAS .Pq Event 07H , Umask 01H False dependencies in MOB due to partial compare on Modified: user/attilio/vmcontention/sbin/nvmecontrol/nvmecontrol.8 ============================================================================== --- user/attilio/vmcontention/sbin/nvmecontrol/nvmecontrol.8 Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/sbin/nvmecontrol/nvmecontrol.8 Wed Mar 27 11:31:39 2013 (r248791) @@ -33,7 +33,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 17, 2012 +.Dd March 26, 2013 .Dt NVMECONTROL 8 .Os .Sh NAME @@ -54,7 +54,10 @@ .Op Fl p .Aq Fl s Ar size_in_bytes .Aq Fl t Ar time_in_sec -.Aq device id +.Aq namespace id +.Nm +.Ic reset +.Aq controller id .Sh DESCRIPTION NVM Express (NVMe) is a storage protocol standard, for SSDs and other high-speed storage devices over PCI Express. @@ -62,6 +65,7 @@ high-speed storage devices over PCI Expr .Dl nvmecontrol devlist .Pp Display a list of NVMe controllers and namespaces along with their device nodes. +.Pp .Dl nvmecontrol identify nvme0 .Pp Display a human-readable summary of the nvme0 IDENTIFY_CONTROLLER data. @@ -76,6 +80,10 @@ Display a hexadecimal dump of the nvme0 Run a performance test on nvme0ns1 using 32 kernel threads for 30 seconds. Each thread will issue a single 512 byte read command. Results are printed to stdout when 30 seconds expires. +.Pp +.Dl nvmecontrol reset nvme0 +.Pp +Perform a controller-level reset of the nvme0 controller. .Sh AUTHORS .An -nosplit .Nm Modified: user/attilio/vmcontention/sbin/nvmecontrol/nvmecontrol.c ============================================================================== --- user/attilio/vmcontention/sbin/nvmecontrol/nvmecontrol.c Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/sbin/nvmecontrol/nvmecontrol.c Wed Mar 27 11:31:39 2013 (r248791) @@ -56,6 +56,9 @@ __FBSDID("$FreeBSD$"); " <-i intr|wait> [-f refthread] [-p]\n" \ " \n" +#define RESET_USAGE \ +" nvmecontrol reset \n" + static void perftest_usage(void); static void @@ -64,6 +67,7 @@ usage(void) fprintf(stderr, "usage:\n"); fprintf(stderr, DEVLIST_USAGE); fprintf(stderr, IDENTIFY_USAGE); + fprintf(stderr, RESET_USAGE); fprintf(stderr, PERFTEST_USAGE); exit(EX_USAGE); } @@ -241,13 +245,15 @@ devlist(int argc, char *argv[]) fd = open(path, O_RDWR); if (fd < 0) { - printf("Could not open %s.\n", path); + printf("Could not open %s. errno=%d (%s)\n", path, + errno, strerror(errno)); exit_code = EX_NOPERM; continue; } - if (ioctl(fd, NVME_IDENTIFY_CONTROLLER, &cdata) == -1) { - printf("ioctl to %s failed.\n", path); + if (ioctl(fd, NVME_IDENTIFY_CONTROLLER, &cdata) < 0) { + printf("Identify request to %s failed. errno=%d (%s)\n", + path, errno, strerror(errno)); exit_code = EX_IOERR; continue; } @@ -260,12 +266,15 @@ devlist(int argc, char *argv[]) fd = open(path, O_RDWR); if (fd < 0) { - printf("Could not open %s.\n", path); + printf("Could not open %s. errno=%d (%s)\n", + path, errno, strerror(errno)); exit_code = EX_NOPERM; continue; } - if (ioctl(fd, NVME_IDENTIFY_NAMESPACE, &nsdata) == -1) { - printf("ioctl to %s failed.\n", path); + if (ioctl(fd, NVME_IDENTIFY_NAMESPACE, &nsdata) < 0) { + printf("Identify request to %s failed. " + "errno=%d (%s)\n", path, errno, + strerror(errno)); exit_code = EX_IOERR; continue; } @@ -307,19 +316,22 @@ identify_ctrlr(int argc, char *argv[]) sprintf(path, "/dev/%s", argv[optind]); - if (stat(path, &devstat) != 0) { - printf("Invalid device node '%s'.\n", path); + if (stat(path, &devstat) < 0) { + printf("Invalid device node %s. errno=%d (%s)\n", path, errno, + strerror(errno)); exit(EX_IOERR); } fd = open(path, O_RDWR); if (fd < 0) { - printf("Could not open %s.\n", path); + printf("Could not open %s. errno=%d (%s)\n", path, errno, + strerror(errno)); exit(EX_NOPERM); } - if (ioctl(fd, NVME_IDENTIFY_CONTROLLER, &cdata) == -1) { - printf("ioctl to %s failed.\n", path); + if (ioctl(fd, NVME_IDENTIFY_CONTROLLER, &cdata) < 0) { + printf("Identify request to %s failed. errno=%d (%s)\n", path, + errno, strerror(errno)); exit(EX_IOERR); } @@ -366,19 +378,22 @@ identify_ns(int argc, char *argv[]) sprintf(path, "/dev/%s", argv[optind]); - if (stat(path, &devstat) != 0) { - printf("Invalid device node '%s'.\n", path); + if (stat(path, &devstat) < 0) { + printf("Invalid device node %s. errno=%d (%s)\n", path, errno, + strerror(errno)); exit(EX_IOERR); } fd = open(path, O_RDWR); if (fd < 0) { - printf("Could not open %s.\n", path); + printf("Could not open %s. errno=%d (%s)\n", path, errno, + strerror(errno)); exit(EX_NOPERM); } - if (ioctl(fd, NVME_IDENTIFY_NAMESPACE, &nsdata) == -1) { - printf("ioctl to %s failed.\n", path); + if (ioctl(fd, NVME_IDENTIFY_NAMESPACE, &nsdata) < 0) { + printf("Identify request to %s failed. errno=%d (%s)\n", path, + errno, strerror(errno)); exit(EX_IOERR); } @@ -475,7 +490,7 @@ perftest(int argc, char *argv[]) char path[64]; u_long ioctl_cmd = NVME_IO_TEST; bool nflag, oflag, sflag, tflag; - int err, perthread = 0; + int perthread = 0; nflag = oflag = sflag = tflag = false; name = NULL; @@ -565,14 +580,14 @@ perftest(int argc, char *argv[]) fd = open(path, O_RDWR); if (fd < 0) { - fprintf(stderr, "%s not valid device.\n", path); + fprintf(stderr, "%s not valid device. errno=%d (%s)\n", path, + errno, strerror(errno)); perftest_usage(); } - err = ioctl(fd, ioctl_cmd, &io_test); - - if (err) { - fprintf(stderr, "NVME_IO_TEST returned %d\n", errno); + if (ioctl(fd, ioctl_cmd, &io_test) < 0) { + fprintf(stderr, "NVME_IO_TEST failed. errno=%d (%s)\n", errno, + strerror(errno)); exit(EX_IOERR); } @@ -580,6 +595,44 @@ perftest(int argc, char *argv[]) exit(EX_OK); } +static void +reset_ctrlr(int argc, char *argv[]) +{ + struct stat devstat; + char path[64]; + int ch, fd; + + while ((ch = getopt(argc, argv, "")) != -1) { + switch ((char)ch) { + default: + usage(); + } + } + + sprintf(path, "/dev/%s", argv[optind]); + + if (stat(path, &devstat) < 0) { + printf("Invalid device node %s. errno=%d (%s)\n", path, errno, + strerror(errno)); + exit(EX_IOERR); + } + + fd = open(path, O_RDWR); + if (fd < 0) { + printf("Could not open %s. errno=%d (%s)\n", path, errno, + strerror(errno)); + exit(EX_NOPERM); + } + + if (ioctl(fd, NVME_RESET_CONTROLLER) < 0) { + printf("Reset request to %s failed. errno=%d (%s)\n", path, + errno, strerror(errno)); + exit(EX_IOERR); + } + + exit(EX_OK); +} + int main(int argc, char *argv[]) { @@ -593,6 +646,8 @@ main(int argc, char *argv[]) identify(argc-1, &argv[1]); else if (strcmp(argv[1], "perftest") == 0) perftest(argc-1, &argv[1]); + else if (strcmp(argv[1], "reset") == 0) + reset_ctrlr(argc-1, &argv[1]); usage(); Modified: user/attilio/vmcontention/share/mk/bsd.own.mk ============================================================================== --- user/attilio/vmcontention/share/mk/bsd.own.mk Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/share/mk/bsd.own.mk Wed Mar 27 11:31:39 2013 (r248791) @@ -117,7 +117,7 @@ ____: .if !defined(_WITHOUT_SRCCONF) SRCCONF?= /etc/src.conf -.if exists(${SRCCONF}) +.if exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf" .include "${SRCCONF}" .endif .endif Modified: user/attilio/vmcontention/share/mk/bsd.prog.mk ============================================================================== --- user/attilio/vmcontention/share/mk/bsd.prog.mk Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/share/mk/bsd.prog.mk Wed Mar 27 11:31:39 2013 (r248791) @@ -41,6 +41,7 @@ PROG= ${PROG_CXX} .endif .if defined(PROG) +PROGNAME?= ${PROG} .if defined(SRCS) OBJS+= ${SRCS:N*.h:R:S/$/.o/g} @@ -73,7 +74,7 @@ SRCS= ${PROG}.c # - the name of the object gets put into the executable symbol table instead of # the name of a variable temporary object. # - it's useful to keep objects around for crunching. -OBJS= ${PROG}.o +OBJS+= ${PROG}.o .if target(beforelinking) beforelinking: ${OBJS} @@ -153,13 +154,8 @@ realinstall: _proginstall .ORDER: beforeinstall _proginstall _proginstall: .if defined(PROG) -.if defined(PROGNAME) ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} -.else - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR} -.endif .endif .endif # !target(realinstall) Modified: user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c ============================================================================== --- user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Wed Mar 27 11:31:39 2013 (r248791) @@ -443,7 +443,7 @@ static kmutex_t dtrace_errlock; #define DTRACE_STORE(type, tomax, offset, what) \ *((type *)((uintptr_t)(tomax) + (uintptr_t)offset)) = (type)(what); -#ifndef __i386 +#ifndef __x86 #define DTRACE_ALIGNCHECK(addr, size, flags) \ if (addr & (size - 1)) { \ *flags |= CPU_DTRACE_BADALIGN; \ Modified: user/attilio/vmcontention/sys/dev/ath/if_ath.c ============================================================================== --- user/attilio/vmcontention/sys/dev/ath/if_ath.c Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/sys/dev/ath/if_ath.c Wed Mar 27 11:31:39 2013 (r248791) @@ -2474,6 +2474,7 @@ _ath_getbuf_locked(struct ath_softc *sc, /* XXX TODO: should do this at buffer list initialisation */ /* XXX (then, ensure the buffer has the right flag set) */ + bf->bf_flags = 0; if (btype == ATH_BUFTYPE_MGMT) bf->bf_flags |= ATH_BUF_MGMT; else @@ -2530,7 +2531,7 @@ ath_buf_clone(struct ath_softc *sc, cons /* Copy basics */ tbf->bf_next = NULL; tbf->bf_nseg = bf->bf_nseg; - tbf->bf_flags = bf->bf_flags & ~ATH_BUF_BUSY; + tbf->bf_flags = bf->bf_flags & ATH_BUF_FLAGS_CLONE; tbf->bf_status = bf->bf_status; tbf->bf_m = bf->bf_m; /* @@ -3410,6 +3411,7 @@ ath_txq_init(struct ath_softc *sc, struc txq->axq_softc = sc; TAILQ_INIT(&txq->axq_q); TAILQ_INIT(&txq->axq_tidq); + TAILQ_INIT(&txq->fifo.axq_q); ATH_TXQ_LOCK_INIT(sc, txq); } @@ -4169,7 +4171,7 @@ ath_returnbuf_head(struct ath_softc *sc, /* * Free the holding buffer if it exists */ -static void +void ath_txq_freeholdingbuf(struct ath_softc *sc, struct ath_txq *txq) { ATH_TXBUF_LOCK_ASSERT(sc); @@ -4283,6 +4285,61 @@ ath_tx_freebuf(struct ath_softc *sc, str */ } +static struct ath_buf * +ath_tx_draintxq_get_one(struct ath_softc *sc, struct ath_txq *txq) +{ + struct ath_buf *bf; + + ATH_TXQ_LOCK_ASSERT(txq); + + /* + * Drain the FIFO queue first, then if it's + * empty, move to the normal frame queue. + */ + bf = TAILQ_FIRST(&txq->fifo.axq_q); + if (bf != NULL) { + /* + * Is it the last buffer in this set? + * Decrement the FIFO counter. + */ + if (bf->bf_flags & ATH_BUF_FIFOEND) { + if (txq->axq_fifo_depth == 0) { + device_printf(sc->sc_dev, + "%s: Q%d: fifo_depth=0, fifo.axq_depth=%d?\n", + __func__, + txq->axq_qnum, + txq->fifo.axq_depth); + } else + txq->axq_fifo_depth--; + } + ATH_TXQ_REMOVE(&txq->fifo, bf, bf_list); + return (bf); + } + + /* + * Debugging! + */ + if (txq->axq_fifo_depth != 0 || txq->fifo.axq_depth != 0) { + device_printf(sc->sc_dev, + "%s: Q%d: fifo_depth=%d, fifo.axq_depth=%d\n", + __func__, + txq->axq_qnum, + txq->axq_fifo_depth, + txq->fifo.axq_depth); + } + + /* + * Now drain the pending queue. + */ + bf = TAILQ_FIRST(&txq->axq_q); + if (bf == NULL) { + txq->axq_link = NULL; + return (NULL); + } + ATH_TXQ_REMOVE(txq, bf, bf_list); + return (bf); +} + void ath_tx_draintxq(struct ath_softc *sc, struct ath_txq *txq) { @@ -4298,24 +4355,11 @@ ath_tx_draintxq(struct ath_softc *sc, st */ for (ix = 0;; ix++) { ATH_TXQ_LOCK(txq); - bf = TAILQ_FIRST(&txq->axq_q); + bf = ath_tx_draintxq_get_one(sc, txq); if (bf == NULL) { - txq->axq_link = NULL; - /* - * There's currently no flag that indicates - * a buffer is on the FIFO. So until that - * occurs, just clear the FIFO counter here. - * - * Yes, this means that if something in parallel - * is pushing things onto this TXQ and pushing - * _that_ into the hardware, things will get - * very fruity very quickly. - */ - txq->axq_fifo_depth = 0; ATH_TXQ_UNLOCK(txq); break; } - ATH_TXQ_REMOVE(txq, bf, bf_list); if (bf->bf_state.bfs_aggr) txq->axq_aggr_depth--; #ifdef ATH_DEBUG Modified: user/attilio/vmcontention/sys/dev/ath/if_ath_beacon.c ============================================================================== --- user/attilio/vmcontention/sys/dev/ath/if_ath_beacon.c Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/sys/dev/ath/if_ath_beacon.c Wed Mar 27 11:31:39 2013 (r248791) @@ -474,6 +474,10 @@ ath_beacon_proc(void *arg, int pending) vap = sc->sc_bslot[slot]; if (vap != NULL && vap->iv_state >= IEEE80211_S_RUN) { bf = ath_beacon_generate(sc, vap); + /* + * XXX TODO: this should use settxdesclinkptr() + * otherwise it won't work for EDMA chipsets! + */ if (bf != NULL) { /* XXX should do this using the ds */ *bflink = bf->bf_daddr; @@ -482,6 +486,10 @@ ath_beacon_proc(void *arg, int pending) } } } + /* + * XXX TODO: this should use settxdesclinkptr() + * otherwise it won't work for EDMA chipsets! + */ *bflink = 0; /* terminate list */ } @@ -540,17 +548,99 @@ ath_beacon_proc(void *arg, int pending) } } -/* - * Start CABQ transmission - this assumes that all frames are prepped - * and ready in the CABQ. - * - * XXX TODO: methodize this; for the EDMA case it should only push - * into the hardware if the FIFO isn't full _AND_ then it should - * tag the final buffer in the queue as ATH_BUF_FIFOEND so the FIFO - * depth is correctly accounted for. - */ -void -ath_beacon_cabq_start(struct ath_softc *sc) +static void +ath_beacon_cabq_start_edma(struct ath_softc *sc) +{ + struct ath_buf *bf, *bf_last; + struct ath_txq *cabq = sc->sc_cabq; +#if 0 + struct ath_buf *bfi; + int i = 0; +#endif + + ATH_TXQ_LOCK_ASSERT(cabq); + + if (TAILQ_EMPTY(&cabq->axq_q)) + return; + bf = TAILQ_FIRST(&cabq->axq_q); + bf_last = TAILQ_LAST(&cabq->axq_q, axq_q_s); + + /* + * This is a dirty, dirty hack to push the contents of + * the cabq staging queue into the FIFO. + * + * This ideally should live in the EDMA code file + * and only push things into the CABQ if there's a FIFO + * slot. + * + * We can't treat this like a normal TX queue because + * in the case of multi-VAP traffic, we may have to flush + * the CABQ each new (staggered) beacon that goes out. + * But for non-staggered beacons, we could in theory + * handle multicast traffic for all VAPs in one FIFO + * push. Just keep all of this in mind if you're wondering + * how to correctly/better handle multi-VAP CABQ traffic + * with EDMA. + */ + + /* + * Is the CABQ FIFO free? If not, complain loudly and + * don't queue anything. Maybe we'll flush the CABQ + * traffic, maybe we won't. But that'll happen next + * beacon interval. + */ + if (cabq->axq_fifo_depth >= HAL_TXFIFO_DEPTH) { + device_printf(sc->sc_dev, + "%s: Q%d: CAB FIFO queue=%d?\n", + __func__, + cabq->axq_qnum, + cabq->axq_fifo_depth); + return; + } + + /* + * Ok, so here's the gymnastics reqiured to make this + * all sensible. + */ + + /* + * Tag the first/last buffer appropriately. + */ + bf->bf_flags |= ATH_BUF_FIFOPTR; + bf_last->bf_flags |= ATH_BUF_FIFOEND; + +#if 0 + i = 0; + TAILQ_FOREACH(bfi, &cabq->axq_q, bf_list) { + ath_printtxbuf(sc, bf, cabq->axq_qnum, i, 0); + i++; + } +#endif + + /* + * We now need to push this set of frames onto the tail + * of the FIFO queue. We don't adjust the aggregate + * count, only the queue depth counter(s). + * We also need to blank the link pointer now. + */ + TAILQ_CONCAT(&cabq->fifo.axq_q, &cabq->axq_q, bf_list); + cabq->axq_link = NULL; + cabq->fifo.axq_depth += cabq->axq_depth; + cabq->axq_depth = 0; + + /* Bump FIFO queue */ + cabq->axq_fifo_depth++; + + /* Push the first entry into the hardware */ + ath_hal_puttxbuf(sc->sc_ah, cabq->axq_qnum, bf->bf_daddr); + + /* NB: gated by beacon so safe to start here */ + ath_hal_txstart(sc->sc_ah, cabq->axq_qnum); + +} + +static void +ath_beacon_cabq_start_legacy(struct ath_softc *sc) { struct ath_buf *bf; struct ath_txq *cabq = sc->sc_cabq; @@ -567,6 +657,26 @@ ath_beacon_cabq_start(struct ath_softc * ath_hal_txstart(sc->sc_ah, cabq->axq_qnum); } +/* + * Start CABQ transmission - this assumes that all frames are prepped + * and ready in the CABQ. + */ +void +ath_beacon_cabq_start(struct ath_softc *sc) +{ + struct ath_txq *cabq = sc->sc_cabq; + + ATH_TXQ_LOCK_ASSERT(cabq); + + if (TAILQ_EMPTY(&cabq->axq_q)) + return; + + if (sc->sc_isedma) + ath_beacon_cabq_start_edma(sc); + else + ath_beacon_cabq_start_legacy(sc); +} + struct ath_buf * ath_beacon_generate(struct ath_softc *sc, struct ieee80211vap *vap) { @@ -632,29 +742,33 @@ ath_beacon_generate(struct ath_softc *sc /* NB: only at DTIM */ ATH_TXQ_LOCK(&avp->av_mcastq); if (nmcastq) { - struct ath_buf *bfm; + struct ath_buf *bfm, *bfc_last; /* * Move frames from the s/w mcast q to the h/w cab q. * - * XXX TODO: This should be methodized - the EDMA - * CABQ setup code may look different! - * * XXX TODO: if we chain together multiple VAPs * worth of CABQ traffic, should we keep the * MORE data bit set on the last frame of each * intermediary VAP (ie, only clear the MORE * bit of the last frame on the last vap?) - * - * XXX TODO: once we append this, what happens - * to cabq->axq_link? It'll point at the avp - * mcastq link pointer, so things should be OK. - * Just double-check this is what actually happens. */ bfm = TAILQ_FIRST(&avp->av_mcastq.axq_q); ATH_TXQ_LOCK(cabq); - if (cabq->axq_link != NULL) - *cabq->axq_link = bfm->bf_daddr; + + /* + * If there's already a frame on the CABQ, we + * need to link to the end of the last frame. + * We can't use axq_link here because + * EDMA descriptors require some recalculation + * (checksum) to occur. + */ + bfc_last = ATH_TXQ_LAST(cabq, axq_q_s); + if (bfc_last != NULL) { + ath_hal_settxdesclink(sc->sc_ah, + bfc_last->bf_lastds, + bfm->bf_daddr); + } ath_txqmove(cabq, &avp->av_mcastq); ATH_TXQ_UNLOCK(cabq); /* Modified: user/attilio/vmcontention/sys/dev/ath/if_ath_misc.h ============================================================================== --- user/attilio/vmcontention/sys/dev/ath/if_ath_misc.h Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/sys/dev/ath/if_ath_misc.h Wed Mar 27 11:31:39 2013 (r248791) @@ -77,6 +77,8 @@ extern int ath_hal_gethangstate(struct a extern void ath_tx_freebuf(struct ath_softc *sc, struct ath_buf *bf, int status); +extern void ath_txq_freeholdingbuf(struct ath_softc *sc, + struct ath_txq *txq); extern void ath_txqmove(struct ath_txq *dst, struct ath_txq *src); Modified: user/attilio/vmcontention/sys/dev/ath/if_ath_tx.c ============================================================================== --- user/attilio/vmcontention/sys/dev/ath/if_ath_tx.c Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/sys/dev/ath/if_ath_tx.c Wed Mar 27 11:31:39 2013 (r248791) @@ -704,21 +704,22 @@ ath_tx_handoff_mcast(struct ath_softc *s ("%s: busy status 0x%x", __func__, bf->bf_flags)); ATH_TXQ_LOCK(txq); - if (txq->axq_link != NULL) { - struct ath_buf *last = ATH_TXQ_LAST(txq, axq_q_s); + if (ATH_TXQ_LAST(txq, axq_q_s) != NULL) { + struct ath_buf *bf_last = ATH_TXQ_LAST(txq, axq_q_s); struct ieee80211_frame *wh; /* mark previous frame */ - wh = mtod(last->bf_m, struct ieee80211_frame *); + wh = mtod(bf_last->bf_m, struct ieee80211_frame *); wh->i_fc[1] |= IEEE80211_FC1_MORE_DATA; - bus_dmamap_sync(sc->sc_dmat, last->bf_dmamap, + bus_dmamap_sync(sc->sc_dmat, bf_last->bf_dmamap, BUS_DMASYNC_PREWRITE); /* link descriptor */ - *txq->axq_link = bf->bf_daddr; + ath_hal_settxdesclink(sc->sc_ah, + bf_last->bf_lastds, + bf->bf_daddr); } ATH_TXQ_INSERT_TAIL(txq, bf, bf_list); - ath_hal_gettxdesclinkptr(sc->sc_ah, bf->bf_lastds, &txq->axq_link); ATH_TXQ_UNLOCK(txq); } @@ -1815,7 +1816,8 @@ ath_tx_start(struct ath_softc *sc, struc * XXX duplicated in ath_raw_xmit(). */ if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { - if (sc->sc_cabq->axq_depth > sc->sc_txq_mcastq_maxdepth) { + if (sc->sc_cabq->axq_depth + sc->sc_cabq->fifo.axq_depth + > sc->sc_txq_mcastq_maxdepth) { sc->sc_stats.ast_tx_mcastq_overflow++; r = ENOBUFS; } @@ -2218,7 +2220,8 @@ ath_raw_xmit(struct ieee80211_node *ni, * XXX duplicated in ath_tx_start(). */ if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { - if (sc->sc_cabq->axq_depth > sc->sc_txq_mcastq_maxdepth) { + if (sc->sc_cabq->axq_depth + sc->sc_cabq->fifo.axq_depth + > sc->sc_txq_mcastq_maxdepth) { sc->sc_stats.ast_tx_mcastq_overflow++; error = ENOBUFS; } @@ -2844,7 +2847,7 @@ ath_tx_swq(struct ath_softc *sc, struct * * Otherwise, schedule the TID. */ - if (txq->axq_depth < sc->sc_hwq_limit) { + if (txq->axq_depth + txq->fifo.axq_depth < sc->sc_hwq_limit) { bf = ATH_TID_FIRST(atid); ATH_TID_REMOVE(atid, bf, bf_list); @@ -2868,7 +2871,7 @@ ath_tx_swq(struct ath_softc *sc, struct ath_tx_tid_sched(sc, atid); } - } else if (txq->axq_depth < sc->sc_hwq_limit) { + } else if (txq->axq_depth + txq->fifo.axq_depth < sc->sc_hwq_limit) { /* AMPDU not running, attempt direct dispatch */ DPRINTF(sc, ATH_DEBUG_SW_TX, "%s: xmit_normal\n", __func__); /* See if clrdmask needs to be set */ Modified: user/attilio/vmcontention/sys/dev/ath/if_ath_tx_edma.c ============================================================================== --- user/attilio/vmcontention/sys/dev/ath/if_ath_tx_edma.c Wed Mar 27 10:56:15 2013 (r248790) +++ user/attilio/vmcontention/sys/dev/ath/if_ath_tx_edma.c Wed Mar 27 11:31:39 2013 (r248791) @@ -136,19 +136,65 @@ MALLOC_DECLARE(M_ATHDEV); static void ath_edma_tx_processq(struct ath_softc *sc, int dosched); +/* + * Push some frames into the TX FIFO if we have space. + */ static void ath_edma_tx_fifo_fill(struct ath_softc *sc, struct ath_txq *txq) { - struct ath_buf *bf; + struct ath_buf *bf, *bf_last; int i = 0; ATH_TXQ_LOCK_ASSERT(txq); - DPRINTF(sc, ATH_DEBUG_TX_PROC, "%s: called\n", __func__); + DPRINTF(sc, ATH_DEBUG_TX_PROC, "%s: Q%d: called\n", + __func__, + txq->axq_qnum); TAILQ_FOREACH(bf, &txq->axq_q, bf_list) { if (txq->axq_fifo_depth >= HAL_TXFIFO_DEPTH) break; + + /* + * We have space in the FIFO - so let's push a frame + * into it. + */ + + /* + * Remove it from the normal list + */ + ATH_TXQ_REMOVE(txq, bf, bf_list); + + /* + * XXX for now, we only dequeue a frame at a time, so + * that's only one buffer. Later on when we just + * push this staging _list_ into the queue, we'll + * set bf_last to the end pointer in the list. + */ + bf_last = bf; + DPRINTF(sc, ATH_DEBUG_TX_PROC, + "%s: Q%d: depth=%d; pushing %p->%p\n", + __func__, + txq->axq_qnum, + txq->axq_fifo_depth, + bf, + bf_last); + + /* + * Append it to the FIFO staging list + */ + ATH_TXQ_INSERT_TAIL(&txq->fifo, bf, bf_list); + + /* + * Set fifo start / fifo end flags appropriately *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Wed Mar 27 11:42:41 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9E3A66AE; Wed, 27 Mar 2013 11:42:41 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8E80C1F3; Wed, 27 Mar 2013 11:42:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2RBgf64080621; Wed, 27 Mar 2013 11:42:41 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2RBgbMK080590; Wed, 27 Mar 2013 11:42:37 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201303271142.r2RBgbMK080590@svn.freebsd.org> From: Attilio Rao Date: Wed, 27 Mar 2013 11:42:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248793 - in user/attilio/vmobj-readlock: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers contrib/bind9 lib/bind lib/bind/dns lib/bind/dns/dns lib/libc/sys lib/libpmc sbin/... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Mar 2013 11:42:41 -0000 Author: attilio Date: Wed Mar 27 11:42:36 2013 New Revision: 248793 URL: http://svnweb.freebsd.org/changeset/base/248793 Log: Merge from vmcontention Added: user/attilio/vmobj-readlock/sys/mips/atheros/ar933x_chip.c - copied unchanged from r248792, user/attilio/vmcontention/sys/mips/atheros/ar933x_chip.c user/attilio/vmobj-readlock/sys/mips/atheros/ar933x_chip.h - copied unchanged from r248792, user/attilio/vmcontention/sys/mips/atheros/ar933x_chip.h user/attilio/vmobj-readlock/sys/mips/atheros/ar933x_uart.h - copied unchanged from r248792, user/attilio/vmcontention/sys/mips/atheros/ar933x_uart.h user/attilio/vmobj-readlock/sys/mips/atheros/ar933xreg.h - copied unchanged from r248792, user/attilio/vmcontention/sys/mips/atheros/ar933xreg.h Modified: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d user/attilio/vmobj-readlock/contrib/bind9/CHANGES user/attilio/vmobj-readlock/contrib/bind9/config.h.in user/attilio/vmobj-readlock/contrib/bind9/configure.in user/attilio/vmobj-readlock/contrib/bind9/version user/attilio/vmobj-readlock/lib/bind/config.h user/attilio/vmobj-readlock/lib/bind/dns/code.h user/attilio/vmobj-readlock/lib/bind/dns/dns/enumclass.h user/attilio/vmobj-readlock/lib/bind/dns/dns/enumtype.h user/attilio/vmobj-readlock/lib/bind/dns/dns/rdatastruct.h user/attilio/vmobj-readlock/lib/libc/sys/accept.2 user/attilio/vmobj-readlock/lib/libpmc/pmc.sandybridgexeon.3 user/attilio/vmobj-readlock/sbin/nvmecontrol/nvmecontrol.8 user/attilio/vmobj-readlock/sbin/nvmecontrol/nvmecontrol.c user/attilio/vmobj-readlock/share/mk/bsd.own.mk user/attilio/vmobj-readlock/share/mk/bsd.prog.mk user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/attilio/vmobj-readlock/sys/dev/ath/if_ath.c user/attilio/vmobj-readlock/sys/dev/ath/if_ath_beacon.c user/attilio/vmobj-readlock/sys/dev/ath/if_ath_misc.h user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tx.c user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tx_edma.c user/attilio/vmobj-readlock/sys/dev/ath/if_athvar.h user/attilio/vmobj-readlock/sys/dev/isci/isci_controller.c user/attilio/vmobj-readlock/sys/dev/isci/isci_io_request.c user/attilio/vmobj-readlock/sys/dev/nvd/nvd.c user/attilio/vmobj-readlock/sys/dev/nvme/nvme.c user/attilio/vmobj-readlock/sys/dev/nvme/nvme.h user/attilio/vmobj-readlock/sys/dev/nvme/nvme_ctrlr.c user/attilio/vmobj-readlock/sys/dev/nvme/nvme_ctrlr_cmd.c user/attilio/vmobj-readlock/sys/dev/nvme/nvme_ns.c user/attilio/vmobj-readlock/sys/dev/nvme/nvme_ns_cmd.c user/attilio/vmobj-readlock/sys/dev/nvme/nvme_private.h user/attilio/vmobj-readlock/sys/dev/nvme/nvme_qpair.c user/attilio/vmobj-readlock/sys/dev/nvme/nvme_sysctl.c user/attilio/vmobj-readlock/sys/dev/nvme/nvme_test.c user/attilio/vmobj-readlock/sys/dev/nvme/nvme_uio.c user/attilio/vmobj-readlock/sys/dev/sound/pci/hda/hdaa_patches.c user/attilio/vmobj-readlock/sys/geom/gate/g_gate.c user/attilio/vmobj-readlock/sys/geom/geom_dev.c user/attilio/vmobj-readlock/sys/geom/geom_slice.c user/attilio/vmobj-readlock/sys/geom/nop/g_nop.c user/attilio/vmobj-readlock/sys/geom/raid/tr_raid1e.c user/attilio/vmobj-readlock/sys/i386/include/param.h user/attilio/vmobj-readlock/sys/kern/kern_physio.c user/attilio/vmobj-readlock/sys/kern/vfs_bio.c user/attilio/vmobj-readlock/sys/mips/atheros/ar71xx_chip.c user/attilio/vmobj-readlock/sys/mips/atheros/ar71xx_cpudef.h user/attilio/vmobj-readlock/sys/mips/atheros/ar724x_chip.c user/attilio/vmobj-readlock/sys/mips/atheros/ar91xx_chip.c user/attilio/vmobj-readlock/sys/netgraph/netflow/netflow.c user/attilio/vmobj-readlock/sys/netgraph/netflow/ng_netflow.c user/attilio/vmobj-readlock/sys/sys/conf.h user/attilio/vmobj-readlock/sys/vm/vm_radix.c user/attilio/vmobj-readlock/usr.sbin/config/main.c user/attilio/vmobj-readlock/usr.sbin/newsyslog/newsyslog.c user/attilio/vmobj-readlock/usr.sbin/watchdogd/watchdogd.8 user/attilio/vmobj-readlock/usr.sbin/watchdogd/watchdogd.c Directory Properties: user/attilio/vmobj-readlock/ (props changed) user/attilio/vmobj-readlock/cddl/ (props changed) user/attilio/vmobj-readlock/cddl/contrib/opensolaris/ (props changed) user/attilio/vmobj-readlock/contrib/bind9/ (props changed) user/attilio/vmobj-readlock/lib/libc/ (props changed) user/attilio/vmobj-readlock/sbin/ (props changed) user/attilio/vmobj-readlock/sys/ (props changed) user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/ (props changed) Modified: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d ============================================================================== --- user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d Wed Mar 27 11:42:36 2013 (r248793) @@ -24,7 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ /* * ASSERTION: @@ -32,44 +34,51 @@ * a runtime error. * * SECTION: Pointers and Arrays/Generic Pointers - * - * NOTES: - * This test doesn't apply to x86; for the time being, we're working - * around this with the preprocessor. */ #pragma D option quiet -int array[3]; -uintptr_t uptr; +#if defined(__i386) || defined(__amd64) +#define __x86 1 +#endif + +int array[2]; +char *ptr; int *p; int *q; int *r; BEGIN { -#ifdef __i386 + array[0] = 0x12345678; + array[1] = 0xabcdefff; + + ptr = (char *) &array[0]; + + p = (int *) (ptr); + q = (int *) (ptr + 2); + r = (int *) (ptr + 3); + + printf("*p: 0x%x\n", *p); + printf("*q: 0x%x\n", *q); + printf("*r: 0x%x\n", *r); + + /* + * On x86, the above unaligned memory accesses are allowed and should + * not result in the ERROR probe firing. + */ +#ifdef __x86 exit(1); #else - array[0] = 20; - array[1] = 40; - array[2] = 80; - - uptr = (uintptr_t) &array[0]; - - p = (int *) (uptr); - q = (int *) (uptr + 2); - r = (int *) (uptr + 3); - - printf("array[0]: %d\t*p: %d\n", array[0], *p); - printf("array[1]: %d\t*q: %d\n", array[1], *q); - printf("array[2]: %d\t*r: %d\n", array[2], *r); - exit(0); #endif } ERROR { +#ifdef __x86 + exit(0); +#else exit(1); +#endif } Modified: user/attilio/vmobj-readlock/contrib/bind9/CHANGES ============================================================================== --- user/attilio/vmobj-readlock/contrib/bind9/CHANGES Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/contrib/bind9/CHANGES Wed Mar 27 11:42:36 2013 (r248793) @@ -1,3 +1,10 @@ + --- 9.8.4-P2 released --- + +3516. [security] Removed the check for regex.h in configure in order + to disable regex syntax checking, as it exposes + BIND to a critical flaw in libregex on some + platforms. [RT #32688] + --- 9.8.4-P1 released --- 3407. [security] Named could die on specific queries with dns64 enabled. Modified: user/attilio/vmobj-readlock/contrib/bind9/config.h.in ============================================================================== --- user/attilio/vmobj-readlock/contrib/bind9/config.h.in Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/contrib/bind9/config.h.in Wed Mar 27 11:42:36 2013 (r248793) @@ -286,9 +286,6 @@ int sigwait(const unsigned int *set, int /* Define if your OpenSSL version supports GOST. */ #undef HAVE_OPENSSL_GOST -/* Define to 1 if you have the header file. */ -#undef HAVE_REGEX_H - /* Define to 1 if you have the `setegid' function. */ #undef HAVE_SETEGID Modified: user/attilio/vmobj-readlock/contrib/bind9/configure.in ============================================================================== --- user/attilio/vmobj-readlock/contrib/bind9/configure.in Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/contrib/bind9/configure.in Wed Mar 27 11:42:36 2013 (r248793) @@ -298,7 +298,7 @@ esac AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h regex.h sys/time.h unistd.h sys/sockio.h sys/select.h sys/param.h sys/sysctl.h net/if6.h,,, +AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h sys/sockio.h sys/select.h sys/param.h sys/sysctl.h net/if6.h,,, [$ac_includes_default #ifdef HAVE_SYS_PARAM_H # include Modified: user/attilio/vmobj-readlock/contrib/bind9/version ============================================================================== --- user/attilio/vmobj-readlock/contrib/bind9/version Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/contrib/bind9/version Wed Mar 27 11:42:36 2013 (r248793) @@ -7,4 +7,4 @@ MAJORVER=9 MINORVER=8 PATCHVER=4 RELEASETYPE=-P -RELEASEVER=1 +RELEASEVER=2 Modified: user/attilio/vmobj-readlock/lib/bind/config.h ============================================================================== --- user/attilio/vmobj-readlock/lib/bind/config.h Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/lib/bind/config.h Wed Mar 27 11:42:36 2013 (r248793) @@ -286,9 +286,6 @@ int sigwait(const unsigned int *set, int /* Define if your OpenSSL version supports GOST. */ /* #undef HAVE_OPENSSL_GOST */ -/* Define to 1 if you have the header file. */ -#define HAVE_REGEX_H 1 - /* Define to 1 if you have the `setegid' function. */ #define HAVE_SETEGID 1 Modified: user/attilio/vmobj-readlock/lib/bind/dns/code.h ============================================================================== --- user/attilio/vmobj-readlock/lib/bind/dns/code.h Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/lib/bind/dns/code.h Wed Mar 27 11:42:36 2013 (r248793) @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any Modified: user/attilio/vmobj-readlock/lib/bind/dns/dns/enumclass.h ============================================================================== --- user/attilio/vmobj-readlock/lib/bind/dns/dns/enumclass.h Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/lib/bind/dns/dns/enumclass.h Wed Mar 27 11:42:36 2013 (r248793) @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any Modified: user/attilio/vmobj-readlock/lib/bind/dns/dns/enumtype.h ============================================================================== --- user/attilio/vmobj-readlock/lib/bind/dns/dns/enumtype.h Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/lib/bind/dns/dns/enumtype.h Wed Mar 27 11:42:36 2013 (r248793) @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any Modified: user/attilio/vmobj-readlock/lib/bind/dns/dns/rdatastruct.h ============================================================================== --- user/attilio/vmobj-readlock/lib/bind/dns/dns/rdatastruct.h Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/lib/bind/dns/dns/rdatastruct.h Wed Mar 27 11:42:36 2013 (r248793) @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any Modified: user/attilio/vmobj-readlock/lib/libc/sys/accept.2 ============================================================================== --- user/attilio/vmobj-readlock/lib/libc/sys/accept.2 Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/lib/libc/sys/accept.2 Wed Mar 27 11:42:36 2013 (r248793) @@ -28,7 +28,7 @@ .\" @(#)accept.2 8.2 (Berkeley) 12/11/93 .\" $FreeBSD$ .\" -.Dd December 11, 1993 +.Dd March 26, 2013 .Dt ACCEPT 2 .Os .Sh NAME @@ -57,7 +57,13 @@ queue of pending connections, creates a and allocates a new file descriptor for the socket which inherits the state of the .Dv O_NONBLOCK -property from the original socket +and +.Dv O_ASYNC +properties and the destination of +.Dv SIGIO +and +.Dv SIGURG +signals from the original socket .Fa s . .Pp If no pending connections are @@ -129,7 +135,11 @@ to pre-process incoming connections. .Pp Portable programs should not rely on the .Dv O_NONBLOCK -property being inherited. +and +.Dv O_ASYNC +properties and the signal destination being inherited, +but should set them explicitly using +.Xr fcntl 2 . .Sh RETURN VALUES The call returns \-1 on error. If it succeeds, it returns a non-negative Modified: user/attilio/vmobj-readlock/lib/libpmc/pmc.sandybridgexeon.3 ============================================================================== --- user/attilio/vmobj-readlock/lib/libpmc/pmc.sandybridgexeon.3 Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/lib/libpmc/pmc.sandybridgexeon.3 Wed Mar 27 11:42:36 2013 (r248793) @@ -219,7 +219,7 @@ L1D. .It Li MISALIGN_MEM_REF.STORES .Pq Event 05H , Umask 02H Speculative cache-line split Store- address uops -dispatchedto L1D. +dispatched to L1D. .It Li LD_BLOCKS_PARTIAL.ADDRESS_ALIAS .Pq Event 07H , Umask 01H False dependencies in MOB due to partial compare on Modified: user/attilio/vmobj-readlock/sbin/nvmecontrol/nvmecontrol.8 ============================================================================== --- user/attilio/vmobj-readlock/sbin/nvmecontrol/nvmecontrol.8 Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/sbin/nvmecontrol/nvmecontrol.8 Wed Mar 27 11:42:36 2013 (r248793) @@ -33,7 +33,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 17, 2012 +.Dd March 26, 2013 .Dt NVMECONTROL 8 .Os .Sh NAME @@ -54,7 +54,10 @@ .Op Fl p .Aq Fl s Ar size_in_bytes .Aq Fl t Ar time_in_sec -.Aq device id +.Aq namespace id +.Nm +.Ic reset +.Aq controller id .Sh DESCRIPTION NVM Express (NVMe) is a storage protocol standard, for SSDs and other high-speed storage devices over PCI Express. @@ -62,6 +65,7 @@ high-speed storage devices over PCI Expr .Dl nvmecontrol devlist .Pp Display a list of NVMe controllers and namespaces along with their device nodes. +.Pp .Dl nvmecontrol identify nvme0 .Pp Display a human-readable summary of the nvme0 IDENTIFY_CONTROLLER data. @@ -76,6 +80,10 @@ Display a hexadecimal dump of the nvme0 Run a performance test on nvme0ns1 using 32 kernel threads for 30 seconds. Each thread will issue a single 512 byte read command. Results are printed to stdout when 30 seconds expires. +.Pp +.Dl nvmecontrol reset nvme0 +.Pp +Perform a controller-level reset of the nvme0 controller. .Sh AUTHORS .An -nosplit .Nm Modified: user/attilio/vmobj-readlock/sbin/nvmecontrol/nvmecontrol.c ============================================================================== --- user/attilio/vmobj-readlock/sbin/nvmecontrol/nvmecontrol.c Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/sbin/nvmecontrol/nvmecontrol.c Wed Mar 27 11:42:36 2013 (r248793) @@ -56,6 +56,9 @@ __FBSDID("$FreeBSD$"); " <-i intr|wait> [-f refthread] [-p]\n" \ " \n" +#define RESET_USAGE \ +" nvmecontrol reset \n" + static void perftest_usage(void); static void @@ -64,6 +67,7 @@ usage(void) fprintf(stderr, "usage:\n"); fprintf(stderr, DEVLIST_USAGE); fprintf(stderr, IDENTIFY_USAGE); + fprintf(stderr, RESET_USAGE); fprintf(stderr, PERFTEST_USAGE); exit(EX_USAGE); } @@ -241,13 +245,15 @@ devlist(int argc, char *argv[]) fd = open(path, O_RDWR); if (fd < 0) { - printf("Could not open %s.\n", path); + printf("Could not open %s. errno=%d (%s)\n", path, + errno, strerror(errno)); exit_code = EX_NOPERM; continue; } - if (ioctl(fd, NVME_IDENTIFY_CONTROLLER, &cdata) == -1) { - printf("ioctl to %s failed.\n", path); + if (ioctl(fd, NVME_IDENTIFY_CONTROLLER, &cdata) < 0) { + printf("Identify request to %s failed. errno=%d (%s)\n", + path, errno, strerror(errno)); exit_code = EX_IOERR; continue; } @@ -260,12 +266,15 @@ devlist(int argc, char *argv[]) fd = open(path, O_RDWR); if (fd < 0) { - printf("Could not open %s.\n", path); + printf("Could not open %s. errno=%d (%s)\n", + path, errno, strerror(errno)); exit_code = EX_NOPERM; continue; } - if (ioctl(fd, NVME_IDENTIFY_NAMESPACE, &nsdata) == -1) { - printf("ioctl to %s failed.\n", path); + if (ioctl(fd, NVME_IDENTIFY_NAMESPACE, &nsdata) < 0) { + printf("Identify request to %s failed. " + "errno=%d (%s)\n", path, errno, + strerror(errno)); exit_code = EX_IOERR; continue; } @@ -307,19 +316,22 @@ identify_ctrlr(int argc, char *argv[]) sprintf(path, "/dev/%s", argv[optind]); - if (stat(path, &devstat) != 0) { - printf("Invalid device node '%s'.\n", path); + if (stat(path, &devstat) < 0) { + printf("Invalid device node %s. errno=%d (%s)\n", path, errno, + strerror(errno)); exit(EX_IOERR); } fd = open(path, O_RDWR); if (fd < 0) { - printf("Could not open %s.\n", path); + printf("Could not open %s. errno=%d (%s)\n", path, errno, + strerror(errno)); exit(EX_NOPERM); } - if (ioctl(fd, NVME_IDENTIFY_CONTROLLER, &cdata) == -1) { - printf("ioctl to %s failed.\n", path); + if (ioctl(fd, NVME_IDENTIFY_CONTROLLER, &cdata) < 0) { + printf("Identify request to %s failed. errno=%d (%s)\n", path, + errno, strerror(errno)); exit(EX_IOERR); } @@ -366,19 +378,22 @@ identify_ns(int argc, char *argv[]) sprintf(path, "/dev/%s", argv[optind]); - if (stat(path, &devstat) != 0) { - printf("Invalid device node '%s'.\n", path); + if (stat(path, &devstat) < 0) { + printf("Invalid device node %s. errno=%d (%s)\n", path, errno, + strerror(errno)); exit(EX_IOERR); } fd = open(path, O_RDWR); if (fd < 0) { - printf("Could not open %s.\n", path); + printf("Could not open %s. errno=%d (%s)\n", path, errno, + strerror(errno)); exit(EX_NOPERM); } - if (ioctl(fd, NVME_IDENTIFY_NAMESPACE, &nsdata) == -1) { - printf("ioctl to %s failed.\n", path); + if (ioctl(fd, NVME_IDENTIFY_NAMESPACE, &nsdata) < 0) { + printf("Identify request to %s failed. errno=%d (%s)\n", path, + errno, strerror(errno)); exit(EX_IOERR); } @@ -475,7 +490,7 @@ perftest(int argc, char *argv[]) char path[64]; u_long ioctl_cmd = NVME_IO_TEST; bool nflag, oflag, sflag, tflag; - int err, perthread = 0; + int perthread = 0; nflag = oflag = sflag = tflag = false; name = NULL; @@ -565,14 +580,14 @@ perftest(int argc, char *argv[]) fd = open(path, O_RDWR); if (fd < 0) { - fprintf(stderr, "%s not valid device.\n", path); + fprintf(stderr, "%s not valid device. errno=%d (%s)\n", path, + errno, strerror(errno)); perftest_usage(); } - err = ioctl(fd, ioctl_cmd, &io_test); - - if (err) { - fprintf(stderr, "NVME_IO_TEST returned %d\n", errno); + if (ioctl(fd, ioctl_cmd, &io_test) < 0) { + fprintf(stderr, "NVME_IO_TEST failed. errno=%d (%s)\n", errno, + strerror(errno)); exit(EX_IOERR); } @@ -580,6 +595,44 @@ perftest(int argc, char *argv[]) exit(EX_OK); } +static void +reset_ctrlr(int argc, char *argv[]) +{ + struct stat devstat; + char path[64]; + int ch, fd; + + while ((ch = getopt(argc, argv, "")) != -1) { + switch ((char)ch) { + default: + usage(); + } + } + + sprintf(path, "/dev/%s", argv[optind]); + + if (stat(path, &devstat) < 0) { + printf("Invalid device node %s. errno=%d (%s)\n", path, errno, + strerror(errno)); + exit(EX_IOERR); + } + + fd = open(path, O_RDWR); + if (fd < 0) { + printf("Could not open %s. errno=%d (%s)\n", path, errno, + strerror(errno)); + exit(EX_NOPERM); + } + + if (ioctl(fd, NVME_RESET_CONTROLLER) < 0) { + printf("Reset request to %s failed. errno=%d (%s)\n", path, + errno, strerror(errno)); + exit(EX_IOERR); + } + + exit(EX_OK); +} + int main(int argc, char *argv[]) { @@ -593,6 +646,8 @@ main(int argc, char *argv[]) identify(argc-1, &argv[1]); else if (strcmp(argv[1], "perftest") == 0) perftest(argc-1, &argv[1]); + else if (strcmp(argv[1], "reset") == 0) + reset_ctrlr(argc-1, &argv[1]); usage(); Modified: user/attilio/vmobj-readlock/share/mk/bsd.own.mk ============================================================================== --- user/attilio/vmobj-readlock/share/mk/bsd.own.mk Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/share/mk/bsd.own.mk Wed Mar 27 11:42:36 2013 (r248793) @@ -117,7 +117,7 @@ ____: .if !defined(_WITHOUT_SRCCONF) SRCCONF?= /etc/src.conf -.if exists(${SRCCONF}) +.if exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf" .include "${SRCCONF}" .endif .endif Modified: user/attilio/vmobj-readlock/share/mk/bsd.prog.mk ============================================================================== --- user/attilio/vmobj-readlock/share/mk/bsd.prog.mk Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/share/mk/bsd.prog.mk Wed Mar 27 11:42:36 2013 (r248793) @@ -41,6 +41,7 @@ PROG= ${PROG_CXX} .endif .if defined(PROG) +PROGNAME?= ${PROG} .if defined(SRCS) OBJS+= ${SRCS:N*.h:R:S/$/.o/g} @@ -73,7 +74,7 @@ SRCS= ${PROG}.c # - the name of the object gets put into the executable symbol table instead of # the name of a variable temporary object. # - it's useful to keep objects around for crunching. -OBJS= ${PROG}.o +OBJS+= ${PROG}.o .if target(beforelinking) beforelinking: ${OBJS} @@ -153,13 +154,8 @@ realinstall: _proginstall .ORDER: beforeinstall _proginstall _proginstall: .if defined(PROG) -.if defined(PROGNAME) ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} -.else - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR} -.endif .endif .endif # !target(realinstall) Modified: user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c ============================================================================== --- user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Wed Mar 27 11:42:36 2013 (r248793) @@ -443,7 +443,7 @@ static kmutex_t dtrace_errlock; #define DTRACE_STORE(type, tomax, offset, what) \ *((type *)((uintptr_t)(tomax) + (uintptr_t)offset)) = (type)(what); -#ifndef __i386 +#ifndef __x86 #define DTRACE_ALIGNCHECK(addr, size, flags) \ if (addr & (size - 1)) { \ *flags |= CPU_DTRACE_BADALIGN; \ Modified: user/attilio/vmobj-readlock/sys/dev/ath/if_ath.c ============================================================================== --- user/attilio/vmobj-readlock/sys/dev/ath/if_ath.c Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/sys/dev/ath/if_ath.c Wed Mar 27 11:42:36 2013 (r248793) @@ -2474,6 +2474,7 @@ _ath_getbuf_locked(struct ath_softc *sc, /* XXX TODO: should do this at buffer list initialisation */ /* XXX (then, ensure the buffer has the right flag set) */ + bf->bf_flags = 0; if (btype == ATH_BUFTYPE_MGMT) bf->bf_flags |= ATH_BUF_MGMT; else @@ -2530,7 +2531,7 @@ ath_buf_clone(struct ath_softc *sc, cons /* Copy basics */ tbf->bf_next = NULL; tbf->bf_nseg = bf->bf_nseg; - tbf->bf_flags = bf->bf_flags & ~ATH_BUF_BUSY; + tbf->bf_flags = bf->bf_flags & ATH_BUF_FLAGS_CLONE; tbf->bf_status = bf->bf_status; tbf->bf_m = bf->bf_m; /* @@ -3410,6 +3411,7 @@ ath_txq_init(struct ath_softc *sc, struc txq->axq_softc = sc; TAILQ_INIT(&txq->axq_q); TAILQ_INIT(&txq->axq_tidq); + TAILQ_INIT(&txq->fifo.axq_q); ATH_TXQ_LOCK_INIT(sc, txq); } @@ -4169,7 +4171,7 @@ ath_returnbuf_head(struct ath_softc *sc, /* * Free the holding buffer if it exists */ -static void +void ath_txq_freeholdingbuf(struct ath_softc *sc, struct ath_txq *txq) { ATH_TXBUF_LOCK_ASSERT(sc); @@ -4283,6 +4285,61 @@ ath_tx_freebuf(struct ath_softc *sc, str */ } +static struct ath_buf * +ath_tx_draintxq_get_one(struct ath_softc *sc, struct ath_txq *txq) +{ + struct ath_buf *bf; + + ATH_TXQ_LOCK_ASSERT(txq); + + /* + * Drain the FIFO queue first, then if it's + * empty, move to the normal frame queue. + */ + bf = TAILQ_FIRST(&txq->fifo.axq_q); + if (bf != NULL) { + /* + * Is it the last buffer in this set? + * Decrement the FIFO counter. + */ + if (bf->bf_flags & ATH_BUF_FIFOEND) { + if (txq->axq_fifo_depth == 0) { + device_printf(sc->sc_dev, + "%s: Q%d: fifo_depth=0, fifo.axq_depth=%d?\n", + __func__, + txq->axq_qnum, + txq->fifo.axq_depth); + } else + txq->axq_fifo_depth--; + } + ATH_TXQ_REMOVE(&txq->fifo, bf, bf_list); + return (bf); + } + + /* + * Debugging! + */ + if (txq->axq_fifo_depth != 0 || txq->fifo.axq_depth != 0) { + device_printf(sc->sc_dev, + "%s: Q%d: fifo_depth=%d, fifo.axq_depth=%d\n", + __func__, + txq->axq_qnum, + txq->axq_fifo_depth, + txq->fifo.axq_depth); + } + + /* + * Now drain the pending queue. + */ + bf = TAILQ_FIRST(&txq->axq_q); + if (bf == NULL) { + txq->axq_link = NULL; + return (NULL); + } + ATH_TXQ_REMOVE(txq, bf, bf_list); + return (bf); +} + void ath_tx_draintxq(struct ath_softc *sc, struct ath_txq *txq) { @@ -4298,24 +4355,11 @@ ath_tx_draintxq(struct ath_softc *sc, st */ for (ix = 0;; ix++) { ATH_TXQ_LOCK(txq); - bf = TAILQ_FIRST(&txq->axq_q); + bf = ath_tx_draintxq_get_one(sc, txq); if (bf == NULL) { - txq->axq_link = NULL; - /* - * There's currently no flag that indicates - * a buffer is on the FIFO. So until that - * occurs, just clear the FIFO counter here. - * - * Yes, this means that if something in parallel - * is pushing things onto this TXQ and pushing - * _that_ into the hardware, things will get - * very fruity very quickly. - */ - txq->axq_fifo_depth = 0; ATH_TXQ_UNLOCK(txq); break; } - ATH_TXQ_REMOVE(txq, bf, bf_list); if (bf->bf_state.bfs_aggr) txq->axq_aggr_depth--; #ifdef ATH_DEBUG Modified: user/attilio/vmobj-readlock/sys/dev/ath/if_ath_beacon.c ============================================================================== --- user/attilio/vmobj-readlock/sys/dev/ath/if_ath_beacon.c Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/sys/dev/ath/if_ath_beacon.c Wed Mar 27 11:42:36 2013 (r248793) @@ -474,6 +474,10 @@ ath_beacon_proc(void *arg, int pending) vap = sc->sc_bslot[slot]; if (vap != NULL && vap->iv_state >= IEEE80211_S_RUN) { bf = ath_beacon_generate(sc, vap); + /* + * XXX TODO: this should use settxdesclinkptr() + * otherwise it won't work for EDMA chipsets! + */ if (bf != NULL) { /* XXX should do this using the ds */ *bflink = bf->bf_daddr; @@ -482,6 +486,10 @@ ath_beacon_proc(void *arg, int pending) } } } + /* + * XXX TODO: this should use settxdesclinkptr() + * otherwise it won't work for EDMA chipsets! + */ *bflink = 0; /* terminate list */ } @@ -540,17 +548,99 @@ ath_beacon_proc(void *arg, int pending) } } -/* - * Start CABQ transmission - this assumes that all frames are prepped - * and ready in the CABQ. - * - * XXX TODO: methodize this; for the EDMA case it should only push - * into the hardware if the FIFO isn't full _AND_ then it should - * tag the final buffer in the queue as ATH_BUF_FIFOEND so the FIFO - * depth is correctly accounted for. - */ -void -ath_beacon_cabq_start(struct ath_softc *sc) +static void +ath_beacon_cabq_start_edma(struct ath_softc *sc) +{ + struct ath_buf *bf, *bf_last; + struct ath_txq *cabq = sc->sc_cabq; +#if 0 + struct ath_buf *bfi; + int i = 0; +#endif + + ATH_TXQ_LOCK_ASSERT(cabq); + + if (TAILQ_EMPTY(&cabq->axq_q)) + return; + bf = TAILQ_FIRST(&cabq->axq_q); + bf_last = TAILQ_LAST(&cabq->axq_q, axq_q_s); + + /* + * This is a dirty, dirty hack to push the contents of + * the cabq staging queue into the FIFO. + * + * This ideally should live in the EDMA code file + * and only push things into the CABQ if there's a FIFO + * slot. + * + * We can't treat this like a normal TX queue because + * in the case of multi-VAP traffic, we may have to flush + * the CABQ each new (staggered) beacon that goes out. + * But for non-staggered beacons, we could in theory + * handle multicast traffic for all VAPs in one FIFO + * push. Just keep all of this in mind if you're wondering + * how to correctly/better handle multi-VAP CABQ traffic + * with EDMA. + */ + + /* + * Is the CABQ FIFO free? If not, complain loudly and + * don't queue anything. Maybe we'll flush the CABQ + * traffic, maybe we won't. But that'll happen next + * beacon interval. + */ + if (cabq->axq_fifo_depth >= HAL_TXFIFO_DEPTH) { + device_printf(sc->sc_dev, + "%s: Q%d: CAB FIFO queue=%d?\n", + __func__, + cabq->axq_qnum, + cabq->axq_fifo_depth); + return; + } + + /* + * Ok, so here's the gymnastics reqiured to make this + * all sensible. + */ + + /* + * Tag the first/last buffer appropriately. + */ + bf->bf_flags |= ATH_BUF_FIFOPTR; + bf_last->bf_flags |= ATH_BUF_FIFOEND; + +#if 0 + i = 0; + TAILQ_FOREACH(bfi, &cabq->axq_q, bf_list) { + ath_printtxbuf(sc, bf, cabq->axq_qnum, i, 0); + i++; + } +#endif + + /* + * We now need to push this set of frames onto the tail + * of the FIFO queue. We don't adjust the aggregate + * count, only the queue depth counter(s). + * We also need to blank the link pointer now. + */ + TAILQ_CONCAT(&cabq->fifo.axq_q, &cabq->axq_q, bf_list); + cabq->axq_link = NULL; + cabq->fifo.axq_depth += cabq->axq_depth; + cabq->axq_depth = 0; + + /* Bump FIFO queue */ + cabq->axq_fifo_depth++; + + /* Push the first entry into the hardware */ + ath_hal_puttxbuf(sc->sc_ah, cabq->axq_qnum, bf->bf_daddr); + + /* NB: gated by beacon so safe to start here */ + ath_hal_txstart(sc->sc_ah, cabq->axq_qnum); + +} + +static void +ath_beacon_cabq_start_legacy(struct ath_softc *sc) { struct ath_buf *bf; struct ath_txq *cabq = sc->sc_cabq; @@ -567,6 +657,26 @@ ath_beacon_cabq_start(struct ath_softc * ath_hal_txstart(sc->sc_ah, cabq->axq_qnum); } +/* + * Start CABQ transmission - this assumes that all frames are prepped + * and ready in the CABQ. + */ +void +ath_beacon_cabq_start(struct ath_softc *sc) +{ + struct ath_txq *cabq = sc->sc_cabq; + + ATH_TXQ_LOCK_ASSERT(cabq); + + if (TAILQ_EMPTY(&cabq->axq_q)) + return; + + if (sc->sc_isedma) + ath_beacon_cabq_start_edma(sc); + else + ath_beacon_cabq_start_legacy(sc); +} + struct ath_buf * ath_beacon_generate(struct ath_softc *sc, struct ieee80211vap *vap) { @@ -632,29 +742,33 @@ ath_beacon_generate(struct ath_softc *sc /* NB: only at DTIM */ ATH_TXQ_LOCK(&avp->av_mcastq); if (nmcastq) { - struct ath_buf *bfm; + struct ath_buf *bfm, *bfc_last; /* * Move frames from the s/w mcast q to the h/w cab q. * - * XXX TODO: This should be methodized - the EDMA - * CABQ setup code may look different! - * * XXX TODO: if we chain together multiple VAPs * worth of CABQ traffic, should we keep the * MORE data bit set on the last frame of each * intermediary VAP (ie, only clear the MORE * bit of the last frame on the last vap?) - * - * XXX TODO: once we append this, what happens - * to cabq->axq_link? It'll point at the avp - * mcastq link pointer, so things should be OK. - * Just double-check this is what actually happens. */ bfm = TAILQ_FIRST(&avp->av_mcastq.axq_q); ATH_TXQ_LOCK(cabq); - if (cabq->axq_link != NULL) - *cabq->axq_link = bfm->bf_daddr; + + /* + * If there's already a frame on the CABQ, we + * need to link to the end of the last frame. + * We can't use axq_link here because + * EDMA descriptors require some recalculation + * (checksum) to occur. + */ + bfc_last = ATH_TXQ_LAST(cabq, axq_q_s); + if (bfc_last != NULL) { + ath_hal_settxdesclink(sc->sc_ah, + bfc_last->bf_lastds, + bfm->bf_daddr); + } ath_txqmove(cabq, &avp->av_mcastq); ATH_TXQ_UNLOCK(cabq); /* Modified: user/attilio/vmobj-readlock/sys/dev/ath/if_ath_misc.h ============================================================================== --- user/attilio/vmobj-readlock/sys/dev/ath/if_ath_misc.h Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/sys/dev/ath/if_ath_misc.h Wed Mar 27 11:42:36 2013 (r248793) @@ -77,6 +77,8 @@ extern int ath_hal_gethangstate(struct a extern void ath_tx_freebuf(struct ath_softc *sc, struct ath_buf *bf, int status); +extern void ath_txq_freeholdingbuf(struct ath_softc *sc, + struct ath_txq *txq); extern void ath_txqmove(struct ath_txq *dst, struct ath_txq *src); Modified: user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tx.c ============================================================================== --- user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tx.c Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tx.c Wed Mar 27 11:42:36 2013 (r248793) @@ -704,21 +704,22 @@ ath_tx_handoff_mcast(struct ath_softc *s ("%s: busy status 0x%x", __func__, bf->bf_flags)); ATH_TXQ_LOCK(txq); - if (txq->axq_link != NULL) { - struct ath_buf *last = ATH_TXQ_LAST(txq, axq_q_s); + if (ATH_TXQ_LAST(txq, axq_q_s) != NULL) { + struct ath_buf *bf_last = ATH_TXQ_LAST(txq, axq_q_s); struct ieee80211_frame *wh; /* mark previous frame */ - wh = mtod(last->bf_m, struct ieee80211_frame *); + wh = mtod(bf_last->bf_m, struct ieee80211_frame *); wh->i_fc[1] |= IEEE80211_FC1_MORE_DATA; - bus_dmamap_sync(sc->sc_dmat, last->bf_dmamap, + bus_dmamap_sync(sc->sc_dmat, bf_last->bf_dmamap, BUS_DMASYNC_PREWRITE); /* link descriptor */ - *txq->axq_link = bf->bf_daddr; + ath_hal_settxdesclink(sc->sc_ah, + bf_last->bf_lastds, + bf->bf_daddr); } ATH_TXQ_INSERT_TAIL(txq, bf, bf_list); - ath_hal_gettxdesclinkptr(sc->sc_ah, bf->bf_lastds, &txq->axq_link); ATH_TXQ_UNLOCK(txq); } @@ -1815,7 +1816,8 @@ ath_tx_start(struct ath_softc *sc, struc * XXX duplicated in ath_raw_xmit(). */ if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { - if (sc->sc_cabq->axq_depth > sc->sc_txq_mcastq_maxdepth) { + if (sc->sc_cabq->axq_depth + sc->sc_cabq->fifo.axq_depth + > sc->sc_txq_mcastq_maxdepth) { sc->sc_stats.ast_tx_mcastq_overflow++; r = ENOBUFS; } @@ -2218,7 +2220,8 @@ ath_raw_xmit(struct ieee80211_node *ni, * XXX duplicated in ath_tx_start(). */ if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { - if (sc->sc_cabq->axq_depth > sc->sc_txq_mcastq_maxdepth) { + if (sc->sc_cabq->axq_depth + sc->sc_cabq->fifo.axq_depth + > sc->sc_txq_mcastq_maxdepth) { sc->sc_stats.ast_tx_mcastq_overflow++; error = ENOBUFS; } @@ -2844,7 +2847,7 @@ ath_tx_swq(struct ath_softc *sc, struct * * Otherwise, schedule the TID. */ - if (txq->axq_depth < sc->sc_hwq_limit) { + if (txq->axq_depth + txq->fifo.axq_depth < sc->sc_hwq_limit) { bf = ATH_TID_FIRST(atid); ATH_TID_REMOVE(atid, bf, bf_list); @@ -2868,7 +2871,7 @@ ath_tx_swq(struct ath_softc *sc, struct ath_tx_tid_sched(sc, atid); } - } else if (txq->axq_depth < sc->sc_hwq_limit) { + } else if (txq->axq_depth + txq->fifo.axq_depth < sc->sc_hwq_limit) { /* AMPDU not running, attempt direct dispatch */ DPRINTF(sc, ATH_DEBUG_SW_TX, "%s: xmit_normal\n", __func__); /* See if clrdmask needs to be set */ Modified: user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tx_edma.c ============================================================================== --- user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tx_edma.c Wed Mar 27 11:34:27 2013 (r248792) +++ user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tx_edma.c Wed Mar 27 11:42:36 2013 (r248793) @@ -136,19 +136,65 @@ MALLOC_DECLARE(M_ATHDEV); static void ath_edma_tx_processq(struct ath_softc *sc, int dosched); +/* + * Push some frames into the TX FIFO if we have space. + */ static void ath_edma_tx_fifo_fill(struct ath_softc *sc, struct ath_txq *txq) { - struct ath_buf *bf; + struct ath_buf *bf, *bf_last; int i = 0; ATH_TXQ_LOCK_ASSERT(txq); - DPRINTF(sc, ATH_DEBUG_TX_PROC, "%s: called\n", __func__); + DPRINTF(sc, ATH_DEBUG_TX_PROC, "%s: Q%d: called\n", + __func__, + txq->axq_qnum); TAILQ_FOREACH(bf, &txq->axq_q, bf_list) { if (txq->axq_fifo_depth >= HAL_TXFIFO_DEPTH) break; + + /* + * We have space in the FIFO - so let's push a frame + * into it. + */ + + /* + * Remove it from the normal list + */ + ATH_TXQ_REMOVE(txq, bf, bf_list); + + /* + * XXX for now, we only dequeue a frame at a time, so + * that's only one buffer. Later on when we just + * push this staging _list_ into the queue, we'll + * set bf_last to the end pointer in the list. + */ + bf_last = bf; + DPRINTF(sc, ATH_DEBUG_TX_PROC, + "%s: Q%d: depth=%d; pushing %p->%p\n", + __func__, + txq->axq_qnum, + txq->axq_fifo_depth, + bf, + bf_last); + + /* + * Append it to the FIFO staging list + */ + ATH_TXQ_INSERT_TAIL(&txq->fifo, bf, bf_list); + + /* + * Set fifo start / fifo end flags appropriately *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Thu Mar 28 17:06:09 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 48EEEB11; Thu, 28 Mar 2013 17:06:09 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2CB6A6CC; Thu, 28 Mar 2013 17:06:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2SH69v0025853; Thu, 28 Mar 2013 17:06:09 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2SH68FP025847; Thu, 28 Mar 2013 17:06:08 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201303281706.r2SH68FP025847@svn.freebsd.org> From: Andre Oppermann Date: Thu, 28 Mar 2013 17:06:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248837 - user/andre/tcp-ao/sys/netinet X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2013 17:06:09 -0000 Author: andre Date: Thu Mar 28 17:06:08 2013 New Revision: 248837 URL: http://svnweb.freebsd.org/changeset/base/248837 Log: Add peer and key handling for listen and connected sockets as well as the setsockopt() key interface. When TCP-AO is activated on a TCP socket a tcp_ao control block is allocated and attached to the tcpcb. An arbitrary number of peer addresses and keys can be added. On accepting of a new incoming connection only the peers keys are copied to the new socket. On outbound connecting sockets only the keys for the peer address will be kept. Some parts are not fully implemented yet and other may change again. Sponsored by: Juniper Networks Modified: user/andre/tcp-ao/sys/netinet/tcp_ao.c user/andre/tcp-ao/sys/netinet/tcp_ao.h user/andre/tcp-ao/sys/netinet/tcp_usrreq.c user/andre/tcp-ao/sys/netinet/tcp_var.h Modified: user/andre/tcp-ao/sys/netinet/tcp_ao.c ============================================================================== --- user/andre/tcp-ao/sys/netinet/tcp_ao.c Thu Mar 28 17:04:59 2013 (r248836) +++ user/andre/tcp-ao/sys/netinet/tcp_ao.c Thu Mar 28 17:06:08 2013 (r248837) @@ -55,6 +55,260 @@ * The code below is skeleton code and not functional yet. */ +MALLOC_DEFINE(M_TCPAO, "tcp_ao", "TCP-AO peer and key structures"); + +int +tcp_ao_ctl(struct tcpcb *tp, struct tcp_ao_sopt *tao, int tao_len) +{ + srtuct tcp_ao_cb *c; + struct tcp_ao_peer *p; + struct tcp_ao_key *k; + int error; + + switch (tao->tao_peer.sa_family) { + case AF_INET: + if (tao->tao_peer.sa_len != sizeof(struct sockaddr_in)) + error = EINVAL; + break; + case AF_INET6: + if (tao->tao_peer.sa_len != sizeof(struct sockaddr_in6)) + error = EINVAL; + break; + default: + error = EINVAL; + } + if (error) + goto out; + + c = tp->t_ao; + + switch (tao->tao_cmd) { + case TAO_CMD_ADD: + switch (tao->tao_algo) { + case TAO_ALGO_MD5SIG: + case TAO_ALGO_HMAC-SHA-1-96: + case TAO_ALGO_AES-128-CMAC-96: + break; + default: + error = EINVAL; + goto out; + } + + /* Insert or overwrite */ + if ((p = tcp_ao_peer_add(c, tao)) == NULL) { + error = EINVAL; + break; + } + if (tp->t_state > TCPS_LISTEN && + p->tap_activekey == tao->tao_keyidx) { + error = EINVAL; + break; + } + if ((k = tcp_ao_key_add(p, tao, taolen - sizeof(*tao)) == NULL) { + error = EINVAL; + } + break; + + case TAO_CMD_DELIDX: + /* Can't remove active index */ + if ((p = tcp_ao_peer_find(c, tao)) == NULL) { + error = EINVAL; + break; + } + if (tp->t_state > TCPS_LISTEN && + p->tap_activekey == tao->tao_keyidx) { + error = EINVAL; + break; + } + if (tcp_ao_key_del(p, tao->tao_keyidx) != 0) { + error = ENOENT; + } + break; + + case TAO_CMD_DELPEER: + if (tp->t_state > TCPS_LISTEN) + break; + + if ((p = tcp_ao_peer_find(c, tao)) == NULL) { + error = EINVAL; + break; + } + tcp_ao_peer_del(c, p); + break; + + case TAO_CMD_FLUSH: + if (tp->t_state > TCPS_LISTEN) + break; + + tcp_ao_peer_flush(c); + break; + + default: + error = EINVAL; + goto out; + } + +out: + return (error); +} + +struct tcp_ao_peer * +tcp_ao_peer_find(struct tcp_ao_cb *tac, struct sockaddr *sa) +{ + struct tcp_ao_peer *p; + + LIST_FOREACH(p, tac->tac_peers, tap_entry) { + if (p->tap_peer.sa_family == sa->sa_family && + !bcmp(p->tap_peer.sa_data, sa->sa_data, + min(p->tap_peer.sa.len, sa->sa_len))) + return (p); + } + return (NULL); +} + +struct tcp_ao_peer * +tcp_ao_peer_add(struct tcp_ao_cb *tac, struct tcp_ao_sopt *tao) +{ + struct tcp_ao_peer *p; + + if ((p = tcp_ao_peer_find(tac, tao->tao_peer)) == NULL) { + if ((p = malloc(sizeof(*p), M_TCPAO, M_NOWAIT)) == NULL) + return (p); + p->tap_flags = 0; + bcopy(tao->tao_peer, p->tac_peer, tao->tao_peer.sa_len); + SLIST_INIT(&p->tak_keys); + } + + LIST_INSERT_HEAD(&tap->tap_peers, p); + return (p); +} + +int +tcp_ao_peer_del(struct tcp_ao_cb *tac, struct tcp_ao_peer *tap) +{ + + tcp_ao_key_flush(tap); + LIST_REMOVE(tap, tap_list); + free(tap, M_TCPAO); + return (0); +} + +void +tcp_ao_peer_flush(struct tcp_ao_cb *tac) +{ + struct tcp_ao_peer *p, *p2; + + SLIST_FOREACH_SAFE(p, tac->tac_peers, entries, p2) { + tcp_ao_key_flush(p); + free(p, M_TCPAO); + } + LIST_INIT(&tac->tac_peers); +} + +struct tcp_ao_key * +tcp_ao_key_find(struct tcp_ao_peer *tap, uint8_t idx) +{ + struct tcp_ao_key *k; + + SLIST_FOREACH(k, &tap->tap_keys, entry) { + if (k->keyidx == idx) + return (k); + } + return (NULL); +} + +struct tcp_ao_key * +tcp_ao_key_add(struct tcp_ao_peer *tap, struct tcp_so_sopt *tao, uint8_t keylen) +{ + struct tcp_ao_key *k; + + if ((k = tcp_ao_key_find(tap, tao->tao_keyidx)) != NULL) { + SLIST_REMOVE(&tap->tap_keys, k, entry, entry); + free(k, M_TCPAO); + } + if ((k = malloc(sizeof(*k) + keylen, M_TCPAO, M_NOWAIT)) == NULL) + return (k); + + k->keyidx = tao->tao_keyidx; + k->keyflags = 0; + k->keyalgo = tao->tao_keyalgo; + k->keylen = keylen; + bcopy(tao->tao_key, k->key, k->keylen); + + SLIST_INSERT_HEAD(&tap->tap_keys, k); + return (k); +} + +int +struct tcp_ao_key_del(struct tcp_ao_peer *tap, uint8_t keyidx) +{ + struct tcp_ao_key *k, *k2; + + SLIST_FOREACH_SAFE(k, &tap->tap_keys, entries, k2) { + if (k->keyidx == keyidx) { + SLIST_REMOVE(&tap->tap_keys, entries, entries); + free(k, M_TCPAO); + return (0); + } + } + return (ENOENT); +} + +void +tcp_ao_key_flush(struct tcp_ao_peer *tap) +{ + struct tcp_ao_key *k, *k2; + + SLIST_FOREACH_SAFE(k, &tap->tap_keys, entries, k2) + free(k, M_TCPAO); + SLIST_INIT(&tap->tap_keys); +} + +int +tcp_ao_peer_clone(struct tcpcb *tp1, struct tcpcb *tp2, struct sockaddr *sa) +{ + struct tcp_ao_peer *p1, *p2; + struct tcp_ao_key *k1, *k2; + + if ((p1 = tcp_ao_peer_find(tp1->t_ao, sa)) == NULL) + return (0); + + if (tcp_ao_cb_alloc(tp2) != 0) + return (ENOMEM); + + bcopy(p1, p2, malloc(sizeof(*p2)); + SLIST_INIT(&p2->tak_keys); + SLIST_FOREACH(k1, &p1->tap_keys, entry) { + if ((k2 = malloc(sizeof(*k2) + k1->keylen, M_TCPAO, M_NOWAIT)) == NULL) + return (ENOMEM); + bcopy(k1, k2, k1->keylen); + SLIST_INSERT_HEAD(&p2->tap_keys, k2); + } + return (0); +} + +struct tcp_ao_cb * +tcp_ao_cb_alloc(void) +{ + struct tcp_ao_cb *c; + + if ((c = malloc(sizeof(*c), M_TCPAO, M_ZERO|M_NOWAIT)) == NULL) + return (NULL); + LIST_INIT(&c->tac_peers); + return (c); +} + +void +tcp_ao_cb_free(struct tcpcb *tp) +{ + struct tcp_ao_cb *c; + + c = tp->t_ao; + tp->t_ao = NULL; + tcp_ao_peer_flush(c); + free(c, M_TCPAO); +} + /* * There two types of key derivation in TCP-AO. * One is to create the session key from the imported master key. Modified: user/andre/tcp-ao/sys/netinet/tcp_ao.h ============================================================================== --- user/andre/tcp-ao/sys/netinet/tcp_ao.h Thu Mar 28 17:04:59 2013 (r248836) +++ user/andre/tcp-ao/sys/netinet/tcp_ao.h Thu Mar 28 17:06:08 2013 (r248837) @@ -64,20 +64,23 @@ * once stable. */ +MALLOC_DECLARE(M_TCPAO); + /* * TCP-AO key interface struct passed to setsockopt(). * Per peer structures referenced from tcp_ao_sopt. * The commands normally apply to a particular keyidx and peer combination. */ -struct tcp_ao_ssopt { +struct tcp_ao_sopt { uint16_t tao_cmd; /* command, add, remove key */ uint16_t tao_flags; /* flags */ uint8_t tao_keyidx; /* key index per peer */ uint8_t tao_algo; /* MAC algorithm */ struct sockaddr_storage tao_peer; /* this key applies to ... */ - uint8_t tao_key[]; /* key string */ + uint8_t tao_key[]; /* base64 key string */ }; +#define TAO_KEY_MAXLEN 128 /* base64 encoded */ /* * Commands for the tao_cmd field. @@ -99,3 +102,37 @@ struct tcp_ao_ssopt { #define TAO_ALGO_HMAC-SHA-1-96 2 /* RFC5926, Section 2.2 */ #define TAO_ALGO_AES-128-CMAC-96 3 /* RFC5926, Section 2.2 */ +/* + * In kernel storage of the key information. + */ +struct tcp_ao_cb { + int tac_algo; + union { + uint8_t md5[MD5_DIGEST_LENGTH]; + uint8_t hmac[SHA1_DIGEST_LENGTH]; + uint8_t cmac[AES_CMAC_LENGTH]; + } tac_skey, tac_rkey; + LIST_HEAD(tac_peer, tcp_ao_peer) tac_peers; +}; + +struct tcp_ao_peer { + LIST_ENTRY(tcp_ao_peer) tap_entry; + uint16_t tap_flags; + union { + sockaddr sa; + sockaddr_in sin4; + sockaddr_in6 sin6; + } tap_peer; + uint8_t tap_activekey; + SLIST_HEAD() tap_keys; +}; + +struct tcp_ao_key { + SLIST_ENTRY(tcp_ao_key) entry; + uint8_t keyidx; + uint8_t keyflags; + uint8_t keyalgo; + uint8_t keylen; + uint8_t key[]; /* after base64_decode */ +}; + Modified: user/andre/tcp-ao/sys/netinet/tcp_usrreq.c ============================================================================== --- user/andre/tcp-ao/sys/netinet/tcp_usrreq.c Thu Mar 28 17:04:59 2013 (r248836) +++ user/andre/tcp-ao/sys/netinet/tcp_usrreq.c Thu Mar 28 17:06:08 2013 (r248837) @@ -1308,6 +1308,7 @@ tcp_ctloutput(struct socket *so, struct u_int ui; struct inpcb *inp; struct tcpcb *tp; + void *x; struct tcp_info ti; char buf[TCP_CA_NAME_MAX]; struct cc_algo *algo; @@ -1357,6 +1358,21 @@ tcp_ctloutput(struct socket *so, struct tp->t_flags &= ~TF_SIGNATURE; goto unlock_and_done; #endif /* TCP_SIGNATURE */ + case TCP_AO: + INP_WUNLOCK(inp); + if (sopt->sopt_valsize <= sizeof(struct tcp_ao_sopt) + + TAO_KEY_MAXLEN) + return (EINVAL); + if ((x = malloc(sopt->sopt_valsize, M_TEMP, M_WAITOK)) == NULL) + return (ENOMEM); + error = sooptcopyin(sopt, x, sopt->sopt_valsize, + sizeof(struct tcp_ao_sopt)); + if (error) + return (error); + + INP_WLOCK_RECHECK(inp); + error = tcp_ao_ctl(tp, x, sopt->sopt_valsize); + goto unlock_and_done; case TCP_NODELAY: case TCP_NOOPT: @@ -1552,7 +1568,11 @@ unlock_and_done: error = sooptcopyout(sopt, &optval, sizeof optval); break; #endif - + case TCO_AO: + optval = (tp->t_flags & TF_AO) ? 1 : 0; + INP_WUNLOCK(inp); + error = sooptcopyout(sopt, &optval, sizeof optval); + break; case TCP_NODELAY: optval = tp->t_flags & TF_NODELAY; INP_WUNLOCK(inp); Modified: user/andre/tcp-ao/sys/netinet/tcp_var.h ============================================================================== --- user/andre/tcp-ao/sys/netinet/tcp_var.h Thu Mar 28 17:04:59 2013 (r248836) +++ user/andre/tcp-ao/sys/netinet/tcp_var.h Thu Mar 28 17:06:08 2013 (r248837) @@ -208,8 +208,10 @@ struct tcpcb { u_int t_keepintvl; /* interval between keepalives */ u_int t_keepcnt; /* number of keepalives before close */ + struct tcp_ao_inp *t_ao; /* TCP-AO control functions */ + uint32_t t_ispare[8]; /* 5 UTO, 3 TBD */ - void *t_pspare2[4]; /* 4 TBD */ + void *t_pspare2[3]; /* 3 TBD */ uint64_t _pad[6]; /* 6 TBD (1-2 CC/RTT?) */ }; From owner-svn-src-user@FreeBSD.ORG Thu Mar 28 20:27:08 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 98F9BA08; Thu, 28 Mar 2013 20:27:08 +0000 (UTC) (envelope-from ray@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 87A7913D; Thu, 28 Mar 2013 20:27:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2SKR8Ls088438; Thu, 28 Mar 2013 20:27:08 GMT (envelope-from ray@svn.freebsd.org) Received: (from ray@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2SKR3tw088406; Thu, 28 Mar 2013 20:27:03 GMT (envelope-from ray@svn.freebsd.org) Message-Id: <201303282027.r2SKR3tw088406@svn.freebsd.org> From: Aleksandr Rybalko Date: Thu, 28 Mar 2013 20:27:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248847 - in user/ed/newcons: . bin/chflags bin/cp bin/ed bin/ls bin/mkdir bin/mv bin/ps bin/rm bin/rmdir bin/sh bin/test cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cm... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2013 20:27:08 -0000 Author: ray Date: Thu Mar 28 20:27:01 2013 New Revision: 248847 URL: http://svnweb.freebsd.org/changeset/base/248847 Log: MFC@r248830 Approved by: ed (project owner) Added: user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d - copied unchanged from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.toupper.d - copied unchanged from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.toupper.d user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolower.d - copied unchanged from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolower.d user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolowertoomany.d - copied unchanged from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolowertoomany.d user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.toupper.d - copied unchanged from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.toupper.d user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.touppertoomany.d - copied unchanged from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.touppertoomany.d user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d - copied unchanged from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d.out - copied unchanged from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d.out user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.tolower.d - copied unchanged from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.tolower.d user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.toupper.d - copied unchanged from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.toupper.d - copied from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_ARGS.d - copied unchanged from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_ARGS.d user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_DYNSIZE.d - copied unchanged from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_DYNSIZE.d user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d - copied unchanged from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d.out - copied unchanged from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d.out user/ed/newcons/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c - copied unchanged from r248830, head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c user/ed/newcons/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c - copied unchanged from r248830, head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c user/ed/newcons/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.h - copied unchanged from r248830, head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.h user/ed/newcons/cddl/contrib/opensolaris/lib/libzfs_core/ - copied from r248830, head/cddl/contrib/opensolaris/lib/libzfs_core/ user/ed/newcons/cddl/lib/libzfs_core/ - copied from r248830, head/cddl/lib/libzfs_core/ user/ed/newcons/contrib/expat/FREEBSD-Xlist - copied unchanged from r248830, head/contrib/expat/FREEBSD-Xlist user/ed/newcons/contrib/libarchive/cpio/test/test_extract.cpio.Z.uu - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract.cpio.Z.uu user/ed/newcons/contrib/libarchive/cpio/test/test_extract.cpio.bz2.uu - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract.cpio.bz2.uu user/ed/newcons/contrib/libarchive/cpio/test/test_extract.cpio.grz.uu - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract.cpio.grz.uu user/ed/newcons/contrib/libarchive/cpio/test/test_extract.cpio.gz.uu - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract.cpio.gz.uu user/ed/newcons/contrib/libarchive/cpio/test/test_extract.cpio.lrz.uu - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract.cpio.lrz.uu user/ed/newcons/contrib/libarchive/cpio/test/test_extract.cpio.lz.uu - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract.cpio.lz.uu user/ed/newcons/contrib/libarchive/cpio/test/test_extract.cpio.lzma.uu - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract.cpio.lzma.uu user/ed/newcons/contrib/libarchive/cpio/test/test_extract.cpio.lzo.uu - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract.cpio.lzo.uu user/ed/newcons/contrib/libarchive/cpio/test/test_extract.cpio.xz.uu - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract.cpio.xz.uu user/ed/newcons/contrib/libarchive/cpio/test/test_extract_cpio_Z.c - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract_cpio_Z.c user/ed/newcons/contrib/libarchive/cpio/test/test_extract_cpio_bz2.c - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract_cpio_bz2.c user/ed/newcons/contrib/libarchive/cpio/test/test_extract_cpio_grz.c - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract_cpio_grz.c user/ed/newcons/contrib/libarchive/cpio/test/test_extract_cpio_gz.c - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract_cpio_gz.c user/ed/newcons/contrib/libarchive/cpio/test/test_extract_cpio_lrz.c - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract_cpio_lrz.c user/ed/newcons/contrib/libarchive/cpio/test/test_extract_cpio_lz.c - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract_cpio_lz.c user/ed/newcons/contrib/libarchive/cpio/test/test_extract_cpio_lzma.c - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract_cpio_lzma.c user/ed/newcons/contrib/libarchive/cpio/test/test_extract_cpio_lzo.c - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract_cpio_lzo.c user/ed/newcons/contrib/libarchive/cpio/test/test_extract_cpio_xz.c - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_extract_cpio_xz.c user/ed/newcons/contrib/libarchive/cpio/test/test_option_b64encode.c - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_option_b64encode.c user/ed/newcons/contrib/libarchive/cpio/test/test_option_grzip.c - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_option_grzip.c user/ed/newcons/contrib/libarchive/cpio/test/test_option_lrzip.c - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_option_lrzip.c user/ed/newcons/contrib/libarchive/cpio/test/test_option_lzop.c - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_option_lzop.c user/ed/newcons/contrib/libarchive/cpio/test/test_option_uuencode.c - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_option_uuencode.c user/ed/newcons/contrib/libarchive/cpio/test/test_option_xz.c - copied unchanged from r248830, head/contrib/libarchive/cpio/test/test_option_xz.c user/ed/newcons/contrib/libarchive/libarchive/archive_cmdline.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/archive_cmdline.c user/ed/newcons/contrib/libarchive/libarchive/archive_cmdline_private.h - copied unchanged from r248830, head/contrib/libarchive/libarchive/archive_cmdline_private.h user/ed/newcons/contrib/libarchive/libarchive/archive_read_append_filter.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/archive_read_append_filter.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_set_format.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/archive_read_set_format.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_filter_grzip.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/archive_read_support_filter_grzip.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_filter_lrzip.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/archive_read_support_filter_lrzip.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_filter_lzop.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/archive_read_support_filter_lzop.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_add_filter_b64encode.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/archive_write_add_filter_b64encode.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_add_filter_by_name.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/archive_write_add_filter_by_name.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_add_filter_grzip.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/archive_write_add_filter_grzip.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_add_filter_lrzip.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/archive_write_add_filter_lrzip.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_add_filter_lzop.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/archive_write_add_filter_lzop.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_add_filter_uuencode.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/archive_write_add_filter_uuencode.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_set_format_v7tar.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/archive_write_set_format_v7tar.c user/ed/newcons/contrib/libarchive/libarchive/filter_fork_posix.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/filter_fork_posix.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_cmdline.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_archive_cmdline.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_read_multiple_data_objects.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_archive_read_multiple_data_objects.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_write_add_filter_by_name.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_archive_write_add_filter_by_name.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_write_set_format_by_name.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_archive_write_set_format_by_name.c user/ed/newcons/contrib/libarchive/libarchive/test/test_compat_lzop.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_compat_lzop.c user/ed/newcons/contrib/libarchive/libarchive/test/test_compat_lzop_1.tar.lzo.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_compat_lzop_1.tar.lzo.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_compat_lzop_2.tar.lzo.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_compat_lzop_2.tar.lzo.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_compat_lzop_3.tar.lzo.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_compat_lzop_3.tar.lzo.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_compat_uudecode.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_compat_uudecode.c user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part1.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part1.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part2.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part2.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part3.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part3.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part4.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part4.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part5.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part5.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part6.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part6.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_filter_grzip.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_filter_grzip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_filter_grzip.tar.grz.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_filter_grzip.tar.grz.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_filter_lrzip.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_filter_lrzip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_filter_lrzip.tar.lrz.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_filter_lrzip.tar.lrz.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_filter_lzop.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_filter_lzop.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_filter_lzop.tar.lzo.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_filter_lzop.tar.lzo.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_filter_lzop_multiple_parts.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_filter_lzop_multiple_parts.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_filter_lzop_multiple_parts.tar.lzo.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_filter_lzop_multiple_parts.tar.lzo.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_filter_program.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_filter_program.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_filter_program_signature.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_filter_program_signature.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_filter_uudecode.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_filter_uudecode.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_mtree_nomagic2.mtree.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_format_mtree_nomagic2.mtree.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_mtree_nomagic3.mtree.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_format_mtree_nomagic3.mtree.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored_1.zip.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored_1.zip.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored_2.zip.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored_2.zip.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_zip_mac_metadata.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_format_zip_mac_metadata.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_zip_mac_metadata.zip.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_format_zip_mac_metadata.zip.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_zip_sfx.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_format_zip_sfx.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_zip_sfx.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_format_zip_sfx.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_aa.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_aa.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ab.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ab.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ac.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ac.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ad.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ad.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ae.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ae.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_set_format.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_set_format.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_splitted_rar_aa.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_splitted_rar_aa.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_splitted_rar_ab.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_splitted_rar_ab.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_splitted_rar_ac.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_splitted_rar_ac.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_read_splitted_rar_ad.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_read_splitted_rar_ad.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_aa.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_aa.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_ab.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_ab.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_ac.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_ac.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_write_disk_appledouble.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_disk_appledouble.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_disk_appledouble.cpio.gz.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_disk_appledouble.cpio.gz.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_write_disk_hfs_compression.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_disk_hfs_compression.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_disk_hfs_compression.tgz.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_disk_hfs_compression.tgz.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_write_disk_mac_metadata.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_disk_mac_metadata.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_disk_mac_metadata.tar.gz.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_disk_mac_metadata.tar.gz.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_write_disk_no_hfs_compression.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_disk_no_hfs_compression.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_disk_no_hfs_compression.tgz.uu - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_disk_no_hfs_compression.tgz.uu user/ed/newcons/contrib/libarchive/libarchive/test/test_write_filter_b64encode.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_filter_b64encode.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_filter_bzip2.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_filter_bzip2.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_filter_compress.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_filter_compress.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_filter_gzip.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_filter_gzip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_filter_gzip_timestamp.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_filter_gzip_timestamp.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_filter_lrzip.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_filter_lrzip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_filter_lzip.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_filter_lzip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_filter_lzma.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_filter_lzma.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_filter_lzop.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_filter_lzop.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_filter_program.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_filter_program.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_filter_uuencode.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_filter_uuencode.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_filter_xz.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_filter_xz.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_7zip_empty.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_format_7zip_empty.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_7zip_large.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_format_7zip_large.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_mtree_absolute_path.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_format_mtree_absolute_path.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_mtree_classic.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_format_mtree_classic.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_mtree_classic_indent.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_format_mtree_classic_indent.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_mtree_no_separator.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_format_mtree_no_separator.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_mtree_quoted_filename.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_format_mtree_quoted_filename.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_tar_v7tar.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_format_tar_v7tar.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_zip_set_compression_store.c - copied unchanged from r248830, head/contrib/libarchive/libarchive/test/test_write_zip_set_compression_store.c user/ed/newcons/contrib/libarchive/tar/creation_set.c - copied unchanged from r248830, head/contrib/libarchive/tar/creation_set.c user/ed/newcons/contrib/libarchive/tar/test/test_extract.tar.Z.uu - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract.tar.Z.uu user/ed/newcons/contrib/libarchive/tar/test/test_extract.tar.bz2.uu - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract.tar.bz2.uu user/ed/newcons/contrib/libarchive/tar/test/test_extract.tar.grz.uu - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract.tar.grz.uu user/ed/newcons/contrib/libarchive/tar/test/test_extract.tar.gz.uu - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract.tar.gz.uu user/ed/newcons/contrib/libarchive/tar/test/test_extract.tar.lrz.uu - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract.tar.lrz.uu user/ed/newcons/contrib/libarchive/tar/test/test_extract.tar.lz.uu - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract.tar.lz.uu user/ed/newcons/contrib/libarchive/tar/test/test_extract.tar.lzma.uu - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract.tar.lzma.uu user/ed/newcons/contrib/libarchive/tar/test/test_extract.tar.lzo.uu - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract.tar.lzo.uu user/ed/newcons/contrib/libarchive/tar/test/test_extract.tar.xz.uu - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract.tar.xz.uu user/ed/newcons/contrib/libarchive/tar/test/test_extract_tar_Z.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract_tar_Z.c user/ed/newcons/contrib/libarchive/tar/test/test_extract_tar_bz2.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract_tar_bz2.c user/ed/newcons/contrib/libarchive/tar/test/test_extract_tar_grz.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract_tar_grz.c user/ed/newcons/contrib/libarchive/tar/test/test_extract_tar_gz.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract_tar_gz.c user/ed/newcons/contrib/libarchive/tar/test/test_extract_tar_lrz.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract_tar_lrz.c user/ed/newcons/contrib/libarchive/tar/test/test_extract_tar_lz.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract_tar_lz.c user/ed/newcons/contrib/libarchive/tar/test/test_extract_tar_lzma.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract_tar_lzma.c user/ed/newcons/contrib/libarchive/tar/test/test_extract_tar_lzo.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract_tar_lzo.c user/ed/newcons/contrib/libarchive/tar/test/test_extract_tar_xz.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_extract_tar_xz.c user/ed/newcons/contrib/libarchive/tar/test/test_option_a.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_option_a.c user/ed/newcons/contrib/libarchive/tar/test/test_option_b64encode.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_option_b64encode.c user/ed/newcons/contrib/libarchive/tar/test/test_option_grzip.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_option_grzip.c user/ed/newcons/contrib/libarchive/tar/test/test_option_j.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_option_j.c user/ed/newcons/contrib/libarchive/tar/test/test_option_lrzip.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_option_lrzip.c user/ed/newcons/contrib/libarchive/tar/test/test_option_lzma.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_option_lzma.c user/ed/newcons/contrib/libarchive/tar/test/test_option_lzop.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_option_lzop.c user/ed/newcons/contrib/libarchive/tar/test/test_option_older_than.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_option_older_than.c user/ed/newcons/contrib/libarchive/tar/test/test_option_uuencode.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_option_uuencode.c user/ed/newcons/contrib/libarchive/tar/test/test_option_xz.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_option_xz.c user/ed/newcons/contrib/libarchive/tar/test/test_option_z.c - copied unchanged from r248830, head/contrib/libarchive/tar/test/test_option_z.c user/ed/newcons/contrib/libarchive/test_utils/ - copied from r248830, head/contrib/libarchive/test_utils/ user/ed/newcons/contrib/libyaml/ - copied from r248830, head/contrib/libyaml/ user/ed/newcons/contrib/unvis/ - copied from r248830, head/contrib/unvis/ user/ed/newcons/contrib/vis/ - copied from r248830, head/contrib/vis/ user/ed/newcons/crypto/openssh/PROTOCOL.krl - copied unchanged from r248830, head/crypto/openssh/PROTOCOL.krl user/ed/newcons/crypto/openssh/krl.c - copied unchanged from r248830, head/crypto/openssh/krl.c user/ed/newcons/crypto/openssh/krl.h - copied unchanged from r248830, head/crypto/openssh/krl.h user/ed/newcons/crypto/openssh/openbsd-compat/bsd-setres_id.c - copied unchanged from r248830, head/crypto/openssh/openbsd-compat/bsd-setres_id.c user/ed/newcons/crypto/openssh/openbsd-compat/bsd-setres_id.h - copied unchanged from r248830, head/crypto/openssh/openbsd-compat/bsd-setres_id.h user/ed/newcons/crypto/openssh/openbsd-compat/strtoull.c - copied unchanged from r248830, head/crypto/openssh/openbsd-compat/strtoull.c user/ed/newcons/crypto/openssh/scard/ - copied from r248830, head/crypto/openssh/scard/ user/ed/newcons/crypto/openssh/umac128.c - copied unchanged from r248830, head/crypto/openssh/umac128.c user/ed/newcons/lib/libc/gen/cap_sandboxed.3 - copied unchanged from r248830, head/lib/libc/gen/cap_sandboxed.3 user/ed/newcons/lib/libc/gen/cap_sandboxed.c - copied unchanged from r248830, head/lib/libc/gen/cap_sandboxed.c user/ed/newcons/lib/libc/stdio/open_memstream.3 - copied unchanged from r248830, head/lib/libc/stdio/open_memstream.3 user/ed/newcons/lib/libc/stdio/open_memstream.c - copied unchanged from r248830, head/lib/libc/stdio/open_memstream.c user/ed/newcons/lib/libc/stdio/open_wmemstream.c - copied unchanged from r248830, head/lib/libc/stdio/open_wmemstream.c user/ed/newcons/lib/libc/sys/bindat.2 - copied unchanged from r248830, head/lib/libc/sys/bindat.2 user/ed/newcons/lib/libc/sys/cap_fcntls_limit.2 - copied unchanged from r248830, head/lib/libc/sys/cap_fcntls_limit.2 user/ed/newcons/lib/libc/sys/cap_ioctls_limit.2 - copied unchanged from r248830, head/lib/libc/sys/cap_ioctls_limit.2 user/ed/newcons/lib/libc/sys/cap_rights_limit.2 - copied unchanged from r248830, head/lib/libc/sys/cap_rights_limit.2 user/ed/newcons/lib/libc/sys/connectat.2 - copied unchanged from r248830, head/lib/libc/sys/connectat.2 user/ed/newcons/lib/libusb/libusb_global_linux.h - copied unchanged from r248830, head/lib/libusb/libusb_global_linux.h user/ed/newcons/lib/libyaml/ - copied from r248830, head/lib/libyaml/ user/ed/newcons/share/examples/bhyve/ - copied from r248830, head/share/examples/bhyve/ user/ed/newcons/sys/arm/broadcom/bcm2835/bcm2835_dma.c - copied unchanged from r248830, head/sys/arm/broadcom/bcm2835/bcm2835_dma.c user/ed/newcons/sys/arm/broadcom/bcm2835/bcm2835_dma.h - copied unchanged from r248830, head/sys/arm/broadcom/bcm2835/bcm2835_dma.h user/ed/newcons/sys/arm/conf/EFIKA_MX - copied unchanged from r248830, head/sys/arm/conf/EFIKA_MX user/ed/newcons/sys/arm/freescale/ - copied from r248830, head/sys/arm/freescale/ user/ed/newcons/sys/boot/fdt/dts/efikamx.dts - copied unchanged from r248830, head/sys/boot/fdt/dts/efikamx.dts user/ed/newcons/sys/boot/fdt/dts/imx51x.dtsi - copied unchanged from r248830, head/sys/boot/fdt/dts/imx51x.dtsi user/ed/newcons/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c - copied unchanged from r248830, head/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c user/ed/newcons/sys/cddl/compat/opensolaris/sys/freebsd_rwlock.h - copied unchanged from r248830, head/sys/cddl/compat/opensolaris/sys/freebsd_rwlock.h user/ed/newcons/sys/cddl/compat/opensolaris/sys/vm.h - copied unchanged from r248830, head/sys/cddl/compat/opensolaris/sys/vm.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c - copied unchanged from r248830, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c - copied unchanged from r248830, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h - copied unchanged from r248830, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_destroy.h - copied unchanged from r248830, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_destroy.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_userhold.h - copied unchanged from r248830, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_userhold.h user/ed/newcons/sys/cddl/dev/fbt/fbt_powerpc.c - copied unchanged from r248830, head/sys/cddl/dev/fbt/fbt_powerpc.c user/ed/newcons/sys/dev/ata/chipsets/ata-fsl.c - copied unchanged from r248830, head/sys/dev/ata/chipsets/ata-fsl.c user/ed/newcons/sys/dev/cxgbe/firmware/t4fw-1.8.4.0.bin.uu - copied unchanged from r248830, head/sys/dev/cxgbe/firmware/t4fw-1.8.4.0.bin.uu user/ed/newcons/sys/dev/drm2/drm_global.c - copied unchanged from r248830, head/sys/dev/drm2/drm_global.c user/ed/newcons/sys/dev/drm2/drm_global.h - copied unchanged from r248830, head/sys/dev/drm2/drm_global.h user/ed/newcons/sys/dev/drm2/ttm/ - copied from r248830, head/sys/dev/drm2/ttm/ user/ed/newcons/sys/dev/uart/uart_dev_imx.c - copied unchanged from r248830, head/sys/dev/uart/uart_dev_imx.c user/ed/newcons/sys/dev/uart/uart_dev_imx5xx.h - copied unchanged from r248830, head/sys/dev/uart/uart_dev_imx5xx.h user/ed/newcons/sys/dev/usb/controller/ehci_imx.c - copied unchanged from r248830, head/sys/dev/usb/controller/ehci_imx.c user/ed/newcons/sys/libkern/arm/aeabi_unwind.c - copied unchanged from r248830, head/sys/libkern/arm/aeabi_unwind.c user/ed/newcons/sys/libkern/arm/memcpy.S - copied unchanged from r248830, head/sys/libkern/arm/memcpy.S user/ed/newcons/sys/libkern/arm/memset.S - copied unchanged from r248830, head/sys/libkern/arm/memset.S user/ed/newcons/sys/mips/atheros/ar933x_chip.c - copied unchanged from r248830, head/sys/mips/atheros/ar933x_chip.c user/ed/newcons/sys/mips/atheros/ar933x_chip.h - copied unchanged from r248830, head/sys/mips/atheros/ar933x_chip.h user/ed/newcons/sys/mips/atheros/ar933x_uart.h - copied unchanged from r248830, head/sys/mips/atheros/ar933x_uart.h user/ed/newcons/sys/mips/atheros/ar933xreg.h - copied unchanged from r248830, head/sys/mips/atheros/ar933xreg.h user/ed/newcons/sys/vm/_vm_radix.h - copied unchanged from r248830, head/sys/vm/_vm_radix.h user/ed/newcons/sys/vm/vm_radix.c - copied unchanged from r248830, head/sys/vm/vm_radix.c user/ed/newcons/sys/vm/vm_radix.h - copied unchanged from r248830, head/sys/vm/vm_radix.h user/ed/newcons/sys/x86/include/elf.h - copied unchanged from r248830, head/sys/x86/include/elf.h user/ed/newcons/sys/x86/include/frame.h - copied unchanged from r248830, head/sys/x86/include/frame.h user/ed/newcons/sys/x86/include/sigframe.h - copied unchanged from r248830, head/sys/x86/include/sigframe.h user/ed/newcons/sys/x86/include/signal.h - copied unchanged from r248830, head/sys/x86/include/signal.h user/ed/newcons/sys/x86/include/ucontext.h - copied unchanged from r248830, head/sys/x86/include/ucontext.h user/ed/newcons/tools/regression/bin/sh/builtins/read6.0 - copied unchanged from r248830, head/tools/regression/bin/sh/builtins/read6.0 user/ed/newcons/tools/regression/bin/sh/builtins/trap12.0 - copied unchanged from r248830, head/tools/regression/bin/sh/builtins/trap12.0 user/ed/newcons/tools/regression/bin/sh/builtins/wait4.0 - copied unchanged from r248830, head/tools/regression/bin/sh/builtins/wait4.0 user/ed/newcons/tools/regression/bin/sh/builtins/wait5.0 - copied unchanged from r248830, head/tools/regression/bin/sh/builtins/wait5.0 user/ed/newcons/tools/regression/bin/sh/builtins/wait6.0 - copied unchanged from r248830, head/tools/regression/bin/sh/builtins/wait6.0 user/ed/newcons/tools/regression/bin/sh/builtins/wait7.0 - copied unchanged from r248830, head/tools/regression/bin/sh/builtins/wait7.0 user/ed/newcons/tools/regression/capsicum/ - copied from r248830, head/tools/regression/capsicum/ user/ed/newcons/tools/regression/lib/libc/stdio/test-open_memstream.c - copied unchanged from r248830, head/tools/regression/lib/libc/stdio/test-open_memstream.c user/ed/newcons/tools/regression/lib/libc/stdio/test-open_memstream.t - copied unchanged from r248830, head/tools/regression/lib/libc/stdio/test-open_memstream.t user/ed/newcons/tools/regression/lib/libc/stdio/test-open_wmemstream.c - copied unchanged from r248830, head/tools/regression/lib/libc/stdio/test-open_wmemstream.c user/ed/newcons/tools/regression/lib/libc/stdio/test-open_wmemstream.t - copied unchanged from r248830, head/tools/regression/lib/libc/stdio/test-open_wmemstream.t user/ed/newcons/tools/tools/ath/athalq/ar9300_ds.c - copied unchanged from r248830, head/tools/tools/ath/athalq/ar9300_ds.c user/ed/newcons/tools/tools/ath/athalq/ar9300_ds.h - copied unchanged from r248830, head/tools/tools/ath/athalq/ar9300_ds.h user/ed/newcons/tools/tools/shlib-compat/ - copied from r248830, head/tools/tools/shlib-compat/ user/ed/newcons/usr.bin/truss/arm-fbsd.c - copied unchanged from r248830, head/usr.bin/truss/arm-fbsd.c user/ed/newcons/usr.sbin/bsdconfig/include/media.hlp - copied unchanged from r248830, head/usr.sbin/bsdconfig/include/media.hlp user/ed/newcons/usr.sbin/bsdconfig/include/network_device.hlp - copied unchanged from r248830, head/usr.sbin/bsdconfig/include/network_device.hlp user/ed/newcons/usr.sbin/bsdconfig/include/options.hlp - copied unchanged from r248830, head/usr.sbin/bsdconfig/include/options.hlp user/ed/newcons/usr.sbin/bsdconfig/include/tcp.hlp - copied unchanged from r248830, head/usr.sbin/bsdconfig/include/tcp.hlp user/ed/newcons/usr.sbin/bsdconfig/share/device.subr - copied unchanged from r248830, head/usr.sbin/bsdconfig/share/device.subr user/ed/newcons/usr.sbin/bsdconfig/share/media/ - copied from r248830, head/usr.sbin/bsdconfig/share/media/ user/ed/newcons/usr.sbin/bsdconfig/share/struct.subr - copied unchanged from r248830, head/usr.sbin/bsdconfig/share/struct.subr user/ed/newcons/usr.sbin/pkg/config.c - copied unchanged from r248830, head/usr.sbin/pkg/config.c user/ed/newcons/usr.sbin/pkg/config.h - copied unchanged from r248830, head/usr.sbin/pkg/config.h Directory Properties: user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) Deleted: user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_PROTO_LEN.toomany.d user/ed/newcons/contrib/expat/FREEBSD-upgrade user/ed/newcons/contrib/expat/configure user/ed/newcons/contrib/expat/doc/valid-xhtml10.png user/ed/newcons/contrib/expat/lib/winconfig.h user/ed/newcons/contrib/expat/tests/benchmark/benchmark.dsp user/ed/newcons/contrib/expat/tests/benchmark/benchmark.dsw user/ed/newcons/contrib/libarchive/libarchive/filter_fork.c user/ed/newcons/contrib/libarchive/libarchive/test/test_acl_freebsd.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_compress_program.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_uu.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_compress.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_compress_bzip2.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_compress_gzip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_compress_lzip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_compress_lzma.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_compress_program.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_compress_xz.c user/ed/newcons/crypto/openssh/acss.c user/ed/newcons/crypto/openssh/acss.h user/ed/newcons/crypto/openssh/cipher-acss.c user/ed/newcons/games/fortune/datfiles/fortunes-o.fake user/ed/newcons/games/fortune/datfiles/fortunes-o.real user/ed/newcons/games/fortune/datfiles/fortunes-o.sp.ok user/ed/newcons/lib/libc/sys/cap_new.2 user/ed/newcons/lib/libncp/ user/ed/newcons/lib/libprocstat/ntfs.c user/ed/newcons/lib/libprocstat/nwfs.c user/ed/newcons/sbin/mount_ext2fs/ user/ed/newcons/sbin/mount_hpfs/ user/ed/newcons/sbin/mount_ntfs/ user/ed/newcons/sbin/mount_reiserfs/ user/ed/newcons/sbin/mount_std/ user/ed/newcons/share/examples/cvsup/ports-supfile user/ed/newcons/share/examples/cvsup/refuse user/ed/newcons/share/examples/cvsup/refuse.README user/ed/newcons/share/examples/nwclient/ user/ed/newcons/share/examples/portal/ user/ed/newcons/share/man/man4/coda.4 user/ed/newcons/share/man/man4/vinum.4 user/ed/newcons/share/man/man5/xfs.5 user/ed/newcons/sys/dev/cxgbe/firmware/t4fw-1.6.2.0.bin.uu user/ed/newcons/sys/dev/mxge/mxge_lro.c user/ed/newcons/sys/fs/coda/ user/ed/newcons/sys/fs/hpfs/ user/ed/newcons/sys/fs/ntfs/ user/ed/newcons/sys/fs/nwfs/ user/ed/newcons/sys/fs/portalfs/ user/ed/newcons/sys/gnu/fs/xfs/ user/ed/newcons/sys/modules/coda/ user/ed/newcons/sys/modules/coda5/ user/ed/newcons/sys/modules/hpfs/ user/ed/newcons/sys/modules/ncp/ user/ed/newcons/sys/modules/ntfs/ user/ed/newcons/sys/modules/ntfs_iconv/ user/ed/newcons/sys/modules/nwfs/ user/ed/newcons/sys/modules/portalfs/ user/ed/newcons/sys/modules/xfs/ user/ed/newcons/sys/netncp/ user/ed/newcons/usr.bin/ncplist/ user/ed/newcons/usr.bin/ncplogin/ user/ed/newcons/usr.bin/unvis/unvis.1 user/ed/newcons/usr.bin/unvis/unvis.c user/ed/newcons/usr.bin/vis/extern.h user/ed/newcons/usr.bin/vis/foldit.c user/ed/newcons/usr.bin/vis/vis.1 user/ed/newcons/usr.bin/vis/vis.c user/ed/newcons/usr.sbin/bsdconfig/networking/include/tcp.hlp user/ed/newcons/usr.sbin/mount_nwfs/ user/ed/newcons/usr.sbin/mount_portalfs/ Modified: user/ed/newcons/MAINTAINERS (contents, props changed) user/ed/newcons/Makefile.inc1 user/ed/newcons/ObsoleteFiles.inc user/ed/newcons/UPDATING user/ed/newcons/bin/chflags/chflags.c user/ed/newcons/bin/cp/cp.1 user/ed/newcons/bin/ed/cbc.c user/ed/newcons/bin/ls/ls.1 user/ed/newcons/bin/mkdir/mkdir.1 user/ed/newcons/bin/mv/mv.1 user/ed/newcons/bin/mv/mv.c user/ed/newcons/bin/ps/ps.1 user/ed/newcons/bin/rm/rm.1 user/ed/newcons/bin/rmdir/rmdir.1 user/ed/newcons/bin/sh/eval.c user/ed/newcons/bin/sh/jobs.c user/ed/newcons/bin/sh/main.c user/ed/newcons/bin/sh/sh.1 user/ed/newcons/bin/sh/trap.c user/ed/newcons/bin/sh/trap.h user/ed/newcons/bin/test/test.1 user/ed/newcons/bin/test/test.c user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d user/ed/newcons/cddl/contrib/opensolaris/cmd/zdb/zdb.c user/ed/newcons/cddl/contrib/opensolaris/cmd/zfs/zfs.8 user/ed/newcons/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/ed/newcons/cddl/contrib/opensolaris/cmd/zhack/zhack.c user/ed/newcons/cddl/contrib/opensolaris/cmd/zinject/translate.c user/ed/newcons/cddl/contrib/opensolaris/cmd/zinject/zinject.c user/ed/newcons/cddl/contrib/opensolaris/cmd/zpool/zpool.8 user/ed/newcons/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c user/ed/newcons/cddl/contrib/opensolaris/cmd/ztest/ztest.c user/ed/newcons/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c user/ed/newcons/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c user/ed/newcons/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c user/ed/newcons/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h user/ed/newcons/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h user/ed/newcons/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c user/ed/newcons/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c user/ed/newcons/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c user/ed/newcons/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h user/ed/newcons/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h user/ed/newcons/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c user/ed/newcons/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h user/ed/newcons/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c user/ed/newcons/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c user/ed/newcons/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c user/ed/newcons/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c user/ed/newcons/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c user/ed/newcons/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h user/ed/newcons/cddl/contrib/opensolaris/tools/ctf/cvt/output.c user/ed/newcons/cddl/lib/Makefile user/ed/newcons/cddl/lib/libdtrace/Makefile user/ed/newcons/cddl/lib/libzfs/Makefile user/ed/newcons/cddl/sbin/zfs/Makefile user/ed/newcons/cddl/sbin/zpool/Makefile user/ed/newcons/cddl/usr.bin/zinject/Makefile user/ed/newcons/cddl/usr.bin/ztest/Makefile user/ed/newcons/cddl/usr.sbin/zdb/Makefile user/ed/newcons/cddl/usr.sbin/zhack/Makefile user/ed/newcons/contrib/bind9/CHANGES user/ed/newcons/contrib/bind9/config.h.in user/ed/newcons/contrib/bind9/configure.in user/ed/newcons/contrib/bind9/version user/ed/newcons/contrib/binutils/bfd/dwarf2.c user/ed/newcons/contrib/binutils/binutils/dwarf.c user/ed/newcons/contrib/binutils/gas/config/tc-arm.c user/ed/newcons/contrib/binutils/opcodes/i386-opc.h user/ed/newcons/contrib/expat/Changes (contents, props changed) user/ed/newcons/contrib/expat/MANIFEST (contents, props changed) user/ed/newcons/contrib/expat/Makefile.in (contents, props changed) user/ed/newcons/contrib/expat/README (contents, props changed) user/ed/newcons/contrib/expat/configure.in (contents, props changed) user/ed/newcons/contrib/expat/doc/reference.html (contents, props changed) user/ed/newcons/contrib/expat/doc/xmlwf.sgml (contents, props changed) user/ed/newcons/contrib/expat/expat_config.h.in (contents, props changed) user/ed/newcons/contrib/expat/lib/expat.h (contents, props changed) user/ed/newcons/contrib/expat/lib/xmlparse.c (contents, props changed) user/ed/newcons/contrib/expat/lib/xmlrole.c (contents, props changed) user/ed/newcons/contrib/expat/lib/xmltok.c (contents, props changed) user/ed/newcons/contrib/expat/lib/xmltok_impl.c (contents, props changed) user/ed/newcons/contrib/expat/tests/README.txt (contents, props changed) user/ed/newcons/contrib/expat/tests/minicheck.h user/ed/newcons/contrib/expat/tests/runtests.c (contents, props changed) user/ed/newcons/contrib/expat/tests/xmltest.sh (contents, props changed) user/ed/newcons/contrib/expat/xmlwf/readfilemap.c (contents, props changed) user/ed/newcons/contrib/expat/xmlwf/xmlwf.c (contents, props changed) user/ed/newcons/contrib/libarchive/NEWS user/ed/newcons/contrib/libarchive/README user/ed/newcons/contrib/libarchive/cpio/bsdcpio.1 user/ed/newcons/contrib/libarchive/cpio/cmdline.c user/ed/newcons/contrib/libarchive/cpio/cpio.c user/ed/newcons/contrib/libarchive/cpio/cpio.h user/ed/newcons/contrib/libarchive/cpio/test/main.c user/ed/newcons/contrib/libarchive/cpio/test/test.h user/ed/newcons/contrib/libarchive/cpio/test/test_basic.c user/ed/newcons/contrib/libarchive/cpio/test/test_format_newc.c user/ed/newcons/contrib/libarchive/cpio/test/test_option_y.c user/ed/newcons/contrib/libarchive/cpio/test/test_option_z.c user/ed/newcons/contrib/libarchive/libarchive/archive.h user/ed/newcons/contrib/libarchive/libarchive/archive_crypto.c user/ed/newcons/contrib/libarchive/libarchive/archive_entry.c user/ed/newcons/contrib/libarchive/libarchive/archive_entry.h user/ed/newcons/contrib/libarchive/libarchive/archive_entry_link_resolver.c user/ed/newcons/contrib/libarchive/libarchive/archive_match.c user/ed/newcons/contrib/libarchive/libarchive/archive_options.c user/ed/newcons/contrib/libarchive/libarchive/archive_ppmd7.c user/ed/newcons/contrib/libarchive/libarchive/archive_private.h user/ed/newcons/contrib/libarchive/libarchive/archive_rb.c user/ed/newcons/contrib/libarchive/libarchive/archive_read.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_disk_posix.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_extract.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_open_fd.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_open_file.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_open_filename.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_private.h user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_filter_all.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_filter_bzip2.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_filter_compress.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_filter_gzip.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_filter_program.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_filter_rpm.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_filter_uu.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_filter_xz.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_format_7zip.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_format_ar.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_format_cab.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_format_cpio.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_format_empty.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_format_lha.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_format_mtree.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_format_rar.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_format_raw.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_format_tar.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_format_xar.c user/ed/newcons/contrib/libarchive/libarchive/archive_read_support_format_zip.c user/ed/newcons/contrib/libarchive/libarchive/archive_string.c user/ed/newcons/contrib/libarchive/libarchive/archive_util.c user/ed/newcons/contrib/libarchive/libarchive/archive_virtual.c user/ed/newcons/contrib/libarchive/libarchive/archive_write.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_add_filter.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_add_filter_bzip2.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_add_filter_compress.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_add_filter_gzip.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_add_filter_program.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_add_filter_xz.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_disk_acl.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_disk_posix.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_free.3 user/ed/newcons/contrib/libarchive/libarchive/archive_write_open_filename.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_private.h user/ed/newcons/contrib/libarchive/libarchive/archive_write_set_format_7zip.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_set_format_ar.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_set_format_by_name.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_set_format_mtree.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_set_format_pax.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_set_format_xar.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_set_format_zip.c user/ed/newcons/contrib/libarchive/libarchive/archive_write_set_options.c user/ed/newcons/contrib/libarchive/libarchive/filter_fork.h user/ed/newcons/contrib/libarchive/libarchive/libarchive-formats.5 user/ed/newcons/contrib/libarchive/libarchive/test/main.c user/ed/newcons/contrib/libarchive/libarchive/test/test.h user/ed/newcons/contrib/libarchive/libarchive/test/test_acl_freebsd_nfs4.c user/ed/newcons/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c user/ed/newcons/contrib/libarchive/libarchive/test/test_acl_nfs4.c user/ed/newcons/contrib/libarchive/libarchive/test/test_acl_pax.c user/ed/newcons/contrib/libarchive/libarchive/test/test_acl_posix1e.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_clear_error.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_read_close_twice.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_fd.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_filename.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_read_set_filter_option.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_read_set_format_option.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_read_set_option.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_read_set_options.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_set_error.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_write_set_filter_option.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_write_set_format_option.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_write_set_option.c user/ed/newcons/contrib/libarchive/libarchive/test/test_archive_write_set_options.c user/ed/newcons/contrib/libarchive/libarchive/test/test_compat_bzip2.c user/ed/newcons/contrib/libarchive/libarchive/test/test_compat_cpio.c user/ed/newcons/contrib/libarchive/libarchive/test/test_compat_gtar.c user/ed/newcons/contrib/libarchive/libarchive/test/test_compat_gzip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_compat_lzip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_compat_lzma.c user/ed/newcons/contrib/libarchive/libarchive/test/test_compat_mac.c user/ed/newcons/contrib/libarchive/libarchive/test/test_compat_tar_hardlink.c user/ed/newcons/contrib/libarchive/libarchive/test/test_compat_xz.c user/ed/newcons/contrib/libarchive/libarchive/test/test_compat_zip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_empty_write.c user/ed/newcons/contrib/libarchive/libarchive/test/test_entry.c user/ed/newcons/contrib/libarchive/libarchive/test/test_filter_count.c user/ed/newcons/contrib/libarchive/libarchive/test/test_fuzz.c user/ed/newcons/contrib/libarchive/libarchive/test/test_open_failure.c user/ed/newcons/contrib/libarchive/libarchive/test/test_open_fd.c user/ed/newcons/contrib/libarchive/libarchive/test/test_open_file.c user/ed/newcons/contrib/libarchive/libarchive/test/test_open_filename.c user/ed/newcons/contrib/libarchive/libarchive/test/test_pax_filename_encoding.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_data_large.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_disk.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_extract.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_7zip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_ar.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cab.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cab_filename.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cpio_afio.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cpio_bin.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_Z.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_bz2.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_gz.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_lzip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_lzma.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_xz.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cpio_filename.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cpio_odc.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4c_Z.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_empty.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_gtar_gz.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_gtar_lzma.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_iso_Z.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_iso_xorriso.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_isojoliet_bz2.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_isojoliet_long.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_isojoliet_rr.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_isojoliet_versioned.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_isorr_bz2.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_isorr_ce.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_isorr_new_bz2.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_isorr_rr_moved.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_isozisofs_bz2.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_lha.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_lha_filename.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_mtree.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_pax_bz2.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_rar.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_tar.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_tbz.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_tgz.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_tlz.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_txz.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_tz.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_xar.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_zip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_format_zip_filename.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_pax_truncated.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_truncated.c user/ed/newcons/contrib/libarchive/libarchive/test/test_read_truncated_filter.c user/ed/newcons/contrib/libarchive/libarchive/test/test_sparse_basic.c user/ed/newcons/contrib/libarchive/libarchive/test/test_tar_filenames.c user/ed/newcons/contrib/libarchive/libarchive/test/test_ustar_filenames.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_disk_sparse.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_7zip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_ar.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_cpio.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_cpio_empty.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_cpio_newc.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_cpio_odc.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_gnutar.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_iso9660.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_iso9660_boot.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_iso9660_empty.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_iso9660_filename.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_iso9660_zisofs.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_mtree.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_mtree_fflags.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_pax.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_shar_empty.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_tar.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_tar_empty.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_tar_sparse.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_tar_ustar.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_xar.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_xar_empty.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_zip.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_zip_empty.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_format_zip_no_compression.c user/ed/newcons/contrib/libarchive/libarchive/test/test_write_open_memory.c user/ed/newcons/contrib/libarchive/tar/bsdtar.1 user/ed/newcons/contrib/libarchive/tar/bsdtar.c user/ed/newcons/contrib/libarchive/tar/bsdtar.h user/ed/newcons/contrib/libarchive/tar/cmdline.c user/ed/newcons/contrib/libarchive/tar/read.c user/ed/newcons/contrib/libarchive/tar/subst.c user/ed/newcons/contrib/libarchive/tar/test/main.c user/ed/newcons/contrib/libarchive/tar/test/test.h user/ed/newcons/contrib/libarchive/tar/test/test_copy.c user/ed/newcons/contrib/libarchive/tar/test/test_option_newer_than.c user/ed/newcons/contrib/libarchive/tar/test/test_option_r.c user/ed/newcons/contrib/libarchive/tar/test/test_stdio.c user/ed/newcons/contrib/libarchive/tar/util.c user/ed/newcons/contrib/libarchive/tar/write.c user/ed/newcons/contrib/libc-vis/unvis.3 user/ed/newcons/contrib/libc-vis/unvis.c user/ed/newcons/contrib/libc-vis/vis.3 user/ed/newcons/contrib/libc-vis/vis.c user/ed/newcons/contrib/libc-vis/vis.h user/ed/newcons/contrib/llvm/lib/Target/X86/X86InstrCompiler.td user/ed/newcons/contrib/llvm/tools/clang/lib/Driver/Tools.cpp user/ed/newcons/contrib/llvm/tools/clang/lib/Driver/Tools.h user/ed/newcons/contrib/openbsm/bin/auditdistd/sender.c user/ed/newcons/contrib/openbsm/etc/audit_event user/ed/newcons/contrib/openpam/doc/man/openpam_straddch.3 user/ed/newcons/contrib/openpam/lib/openpam_readline.c user/ed/newcons/contrib/openpam/lib/openpam_readword.c user/ed/newcons/contrib/tzdata/africa user/ed/newcons/contrib/tzdata/antarctica user/ed/newcons/contrib/tzdata/asia user/ed/newcons/contrib/tzdata/australasia user/ed/newcons/contrib/tzdata/europe user/ed/newcons/contrib/tzdata/northamerica user/ed/newcons/contrib/tzdata/southamerica user/ed/newcons/contrib/tzdata/zone.tab user/ed/newcons/crypto/openssh/ChangeLog user/ed/newcons/crypto/openssh/INSTALL user/ed/newcons/crypto/openssh/PROTOCOL user/ed/newcons/crypto/openssh/PROTOCOL.agent user/ed/newcons/crypto/openssh/README user/ed/newcons/crypto/openssh/auth-options.c user/ed/newcons/crypto/openssh/auth-rsa.c user/ed/newcons/crypto/openssh/auth.c user/ed/newcons/crypto/openssh/auth.h user/ed/newcons/crypto/openssh/auth1.c user/ed/newcons/crypto/openssh/auth2-chall.c user/ed/newcons/crypto/openssh/auth2-gss.c user/ed/newcons/crypto/openssh/auth2-jpake.c user/ed/newcons/crypto/openssh/auth2-pubkey.c user/ed/newcons/crypto/openssh/auth2.c user/ed/newcons/crypto/openssh/authfile.c user/ed/newcons/crypto/openssh/channels.c user/ed/newcons/crypto/openssh/cipher-aes.c user/ed/newcons/crypto/openssh/cipher-ctr.c user/ed/newcons/crypto/openssh/cipher.c user/ed/newcons/crypto/openssh/cipher.h user/ed/newcons/crypto/openssh/clientloop.c user/ed/newcons/crypto/openssh/clientloop.h user/ed/newcons/crypto/openssh/compat.c user/ed/newcons/crypto/openssh/config.h user/ed/newcons/crypto/openssh/config.h.in user/ed/newcons/crypto/openssh/defines.h user/ed/newcons/crypto/openssh/includes.h user/ed/newcons/crypto/openssh/kex.c user/ed/newcons/crypto/openssh/kex.h user/ed/newcons/crypto/openssh/key.c user/ed/newcons/crypto/openssh/key.h user/ed/newcons/crypto/openssh/log.c user/ed/newcons/crypto/openssh/log.h user/ed/newcons/crypto/openssh/loginrec.c user/ed/newcons/crypto/openssh/mac.c user/ed/newcons/crypto/openssh/moduli user/ed/newcons/crypto/openssh/moduli.5 user/ed/newcons/crypto/openssh/monitor.c user/ed/newcons/crypto/openssh/monitor.h user/ed/newcons/crypto/openssh/monitor_wrap.c user/ed/newcons/crypto/openssh/mux.c user/ed/newcons/crypto/openssh/myproposal.h user/ed/newcons/crypto/openssh/openbsd-compat/bsd-misc.c user/ed/newcons/crypto/openssh/openbsd-compat/bsd-misc.h user/ed/newcons/crypto/openssh/openbsd-compat/openbsd-compat.h user/ed/newcons/crypto/openssh/openbsd-compat/openssl-compat.h user/ed/newcons/crypto/openssh/openbsd-compat/sys-queue.h user/ed/newcons/crypto/openssh/openbsd-compat/sys-tree.h user/ed/newcons/crypto/openssh/openbsd-compat/vis.c user/ed/newcons/crypto/openssh/openbsd-compat/vis.h user/ed/newcons/crypto/openssh/packet.c user/ed/newcons/crypto/openssh/platform.c user/ed/newcons/crypto/openssh/platform.h user/ed/newcons/crypto/openssh/scp.1 user/ed/newcons/crypto/openssh/scp.c user/ed/newcons/crypto/openssh/servconf.c user/ed/newcons/crypto/openssh/servconf.h user/ed/newcons/crypto/openssh/serverloop.c user/ed/newcons/crypto/openssh/session.c user/ed/newcons/crypto/openssh/sftp-server.8 user/ed/newcons/crypto/openssh/sftp-server.c user/ed/newcons/crypto/openssh/sftp.1 user/ed/newcons/crypto/openssh/sftp.c user/ed/newcons/crypto/openssh/ssh-add.1 user/ed/newcons/crypto/openssh/ssh-add.c user/ed/newcons/crypto/openssh/ssh-gss.h user/ed/newcons/crypto/openssh/ssh-keygen.1 user/ed/newcons/crypto/openssh/ssh-keygen.c user/ed/newcons/crypto/openssh/ssh-keyscan.1 user/ed/newcons/crypto/openssh/ssh.1 user/ed/newcons/crypto/openssh/ssh_config user/ed/newcons/crypto/openssh/ssh_config.5 user/ed/newcons/crypto/openssh/ssh_namespace.h user/ed/newcons/crypto/openssh/sshconnect.c user/ed/newcons/crypto/openssh/sshconnect2.c user/ed/newcons/crypto/openssh/sshd.8 user/ed/newcons/crypto/openssh/sshd.c user/ed/newcons/crypto/openssh/sshd_config user/ed/newcons/crypto/openssh/sshd_config.5 user/ed/newcons/crypto/openssh/uidswap.c user/ed/newcons/crypto/openssh/umac.c user/ed/newcons/crypto/openssh/umac.h user/ed/newcons/crypto/openssh/version.h user/ed/newcons/etc/Makefile user/ed/newcons/etc/devd.conf user/ed/newcons/etc/mtree/BSD.include.dist user/ed/newcons/etc/mtree/BSD.usr.dist user/ed/newcons/etc/portsnap.conf user/ed/newcons/etc/rc.d/rtadvd user/ed/newcons/etc/rc.d/savecore user/ed/newcons/etc/rc.d/sysctl user/ed/newcons/etc/rc.subr user/ed/newcons/games/fortune/datfiles/Makefile user/ed/newcons/games/fortune/datfiles/freebsd-tips user/ed/newcons/gnu/lib/libgcc/Makefile user/ed/newcons/gnu/lib/libsupc++/Makefile user/ed/newcons/include/stdio.h user/ed/newcons/include/wchar.h user/ed/newcons/lib/Makefile user/ed/newcons/lib/bind/config.h user/ed/newcons/lib/bind/dns/code.h user/ed/newcons/lib/bind/dns/dns/enumclass.h user/ed/newcons/lib/bind/dns/dns/enumtype.h user/ed/newcons/lib/bind/dns/dns/rdatastruct.h user/ed/newcons/lib/libarchive/Makefile user/ed/newcons/lib/libarchive/config_freebsd.h user/ed/newcons/lib/libarchive/test/Makefile user/ed/newcons/lib/libc/gen/Makefile.inc user/ed/newcons/lib/libc/gen/Symbol.map user/ed/newcons/lib/libc/gen/getcontext.3 user/ed/newcons/lib/libc/gen/opendir.c user/ed/newcons/lib/libc/include/compat.h user/ed/newcons/lib/libc/locale/btowc.3 user/ed/newcons/lib/libc/locale/isblank.3 user/ed/newcons/lib/libc/net/nscachedcli.c user/ed/newcons/lib/libc/regex/regcomp.c user/ed/newcons/lib/libc/rpc/clnt_vc.c user/ed/newcons/lib/libc/stdio/Makefile.inc user/ed/newcons/lib/libc/stdio/Symbol.map user/ed/newcons/lib/libc/stdlib/bsearch.3 user/ed/newcons/lib/libc/stdlib/qsort.3 user/ed/newcons/lib/libc/stdlib/realpath.3 user/ed/newcons/lib/libc/stdtime/Makefile.inc user/ed/newcons/lib/libc/string/Makefile.inc user/ed/newcons/lib/libc/sys/Makefile.inc user/ed/newcons/lib/libc/sys/Symbol.map user/ed/newcons/lib/libc/sys/accept.2 user/ed/newcons/lib/libc/sys/cap_enter.2 user/ed/newcons/lib/libc/sys/chflags.2 user/ed/newcons/lib/libc/sys/dup.2 user/ed/newcons/lib/libc/sys/mlock.2 user/ed/newcons/lib/libc/sys/posix_openpt.2 user/ed/newcons/lib/libc/sys/recv.2 user/ed/newcons/lib/libc/sys/socket.2 user/ed/newcons/lib/libc/sys/socketpair.2 user/ed/newcons/lib/libdwarf/dwarf_die.c user/ed/newcons/lib/libelf/elf_update.c user/ed/newcons/lib/libexpat/expat_config.h user/ed/newcons/lib/libexpat/libbsdxml.3 user/ed/newcons/lib/libipsec/test-policy.c user/ed/newcons/lib/libkiconv/kiconv.3 user/ed/newcons/lib/libnetgraph/msg.c user/ed/newcons/lib/libpmc/pmc.sandybridgexeon.3 user/ed/newcons/lib/libpmc/pmc.soft.3 user/ed/newcons/lib/libprocstat/libprocstat.c user/ed/newcons/lib/libprocstat/libprocstat.h user/ed/newcons/lib/libstand/Makefile user/ed/newcons/lib/libstand/nandfs.c user/ed/newcons/lib/libusb/Makefile user/ed/newcons/lib/libusb/libusb.h user/ed/newcons/lib/libusb/libusb01.c user/ed/newcons/lib/libusb/libusb10.c user/ed/newcons/lib/libusb/libusb10.h user/ed/newcons/lib/libusb/libusb10_desc.c user/ed/newcons/lib/libusb/libusb10_io.c user/ed/newcons/lib/libusb/libusb20.c user/ed/newcons/lib/libusb/libusb20.h user/ed/newcons/lib/libusb/libusb20_desc.c user/ed/newcons/lib/libusb/libusb20_desc.h user/ed/newcons/lib/libusb/libusb20_ugen20.c user/ed/newcons/lib/libusb/usb.h user/ed/newcons/lib/libutil/gr_util.c user/ed/newcons/lib/libutil/kinfo_getproc.3 user/ed/newcons/lib/libutil/libutil.h user/ed/newcons/lib/libutil/pidfile.c user/ed/newcons/lib/libvmmapi/vmmapi.c user/ed/newcons/lib/libvmmapi/vmmapi.h user/ed/newcons/libexec/rtld-elf/map_object.c user/ed/newcons/rescue/rescue/Makefile user/ed/newcons/sbin/ccdconfig/ccdconfig.8 user/ed/newcons/sbin/devd/devd.cc user/ed/newcons/sbin/devd/devd.conf.5 user/ed/newcons/sbin/devd/devd.hh user/ed/newcons/sbin/dumpfs/dumpfs.c user/ed/newcons/sbin/ffsinfo/ffsinfo.8 user/ed/newcons/sbin/fsck_ffs/dir.c user/ed/newcons/sbin/fsck_ffs/ea.c user/ed/newcons/sbin/fsck_ffs/fsck.h user/ed/newcons/sbin/fsck_ffs/fsutil.c user/ed/newcons/sbin/fsck_ffs/inode.c user/ed/newcons/sbin/fsck_ffs/main.c user/ed/newcons/sbin/fsck_ffs/pass1.c user/ed/newcons/sbin/fsck_ffs/pass5.c user/ed/newcons/sbin/fsck_ffs/setup.c user/ed/newcons/sbin/fsck_ffs/suj.c user/ed/newcons/sbin/fsdb/fsdb.c user/ed/newcons/sbin/fsdb/fsdbutil.c user/ed/newcons/sbin/geom/class/concat/gconcat.8 user/ed/newcons/sbin/geom/class/eli/geli.8 user/ed/newcons/sbin/geom/class/eli/geom_eli.c user/ed/newcons/sbin/geom/class/mirror/gmirror.8 user/ed/newcons/sbin/geom/class/part/gpart.8 user/ed/newcons/sbin/geom/class/raid/graid.8 user/ed/newcons/sbin/geom/class/stripe/gstripe.8 user/ed/newcons/sbin/gvinum/gvinum.8 user/ed/newcons/sbin/hastctl/hastctl.8 user/ed/newcons/sbin/hastctl/hastctl.c user/ed/newcons/sbin/hastd/control.c user/ed/newcons/sbin/hastd/hast.h user/ed/newcons/sbin/hastd/hastd.8 user/ed/newcons/sbin/hastd/primary.c user/ed/newcons/sbin/hastd/secondary.c user/ed/newcons/sbin/hastd/subr.c user/ed/newcons/sbin/ipfw/ipfw.8 user/ed/newcons/sbin/ipfw/ipfw2.c user/ed/newcons/sbin/ipfw/ipfw2.h user/ed/newcons/sbin/ipfw/ipv6.c user/ed/newcons/sbin/ldconfig/ldconfig.8 user/ed/newcons/sbin/ldconfig/ldconfig.c user/ed/newcons/sbin/mount_cd9660/mount_cd9660.8 user/ed/newcons/sbin/mount_cd9660/mount_cd9660.c user/ed/newcons/sbin/mount_msdosfs/mount_msdosfs.c user/ed/newcons/sbin/mount_nfs/mount_nfs.c user/ed/newcons/sbin/mount_nullfs/mount_nullfs.c user/ed/newcons/sbin/mount_udf/Makefile user/ed/newcons/sbin/mount_udf/mount_udf.c user/ed/newcons/sbin/mount_unionfs/mount_unionfs.c user/ed/newcons/sbin/newfs/mkfs.c user/ed/newcons/sbin/newfs/newfs.8 user/ed/newcons/sbin/newfs/newfs.c user/ed/newcons/sbin/newfs/newfs.h user/ed/newcons/sbin/nvmecontrol/nvmecontrol.8 user/ed/newcons/sbin/nvmecontrol/nvmecontrol.c user/ed/newcons/sbin/reboot/boot_i386.8 user/ed/newcons/sbin/recoverdisk/recoverdisk.c user/ed/newcons/sbin/shutdown/shutdown.8 user/ed/newcons/sbin/tunefs/tunefs.8 user/ed/newcons/sbin/tunefs/tunefs.c user/ed/newcons/secure/lib/libssh/Makefile user/ed/newcons/secure/libexec/ssh-keysign/Makefile user/ed/newcons/share/examples/Makefile user/ed/newcons/share/examples/cvsup/README user/ed/newcons/share/examples/cvsup/cvs-supfile user/ed/newcons/share/examples/cvsup/stable-supfile user/ed/newcons/share/examples/etc/make.conf user/ed/newcons/share/man/man4/Makefile user/ed/newcons/share/man/man4/arcmsr.4 user/ed/newcons/share/man/man4/carp.4 user/ed/newcons/share/man/man4/cas.4 user/ed/newcons/share/man/man4/ccd.4 user/ed/newcons/share/man/man4/cxgbe.4 user/ed/newcons/share/man/man4/eventtimers.4 user/ed/newcons/share/man/man4/geom.4 user/ed/newcons/share/man/man4/iwn.4 user/ed/newcons/share/man/man4/mvs.4 user/ed/newcons/share/man/man4/ng_nat.4 user/ed/newcons/share/man/man4/psm.4 user/ed/newcons/share/man/man4/sge.4 user/ed/newcons/share/man/man4/udp.4 user/ed/newcons/share/man/man4/unix.4 user/ed/newcons/share/man/man4/zyd.4 user/ed/newcons/share/man/man5/make.conf.5 user/ed/newcons/share/man/man7/development.7 user/ed/newcons/share/man/man7/ports.7 user/ed/newcons/share/man/man9/Makefile user/ed/newcons/share/man/man9/VFS_SET.9 user/ed/newcons/share/man/man9/condvar.9 user/ed/newcons/share/man/man9/eventtimers.9 user/ed/newcons/share/man/man9/sleep.9 user/ed/newcons/share/man/man9/sleepqueue.9 user/ed/newcons/share/man/man9/taskqueue.9 user/ed/newcons/share/man/man9/timeout.9 user/ed/newcons/share/man/man9/zone.9 user/ed/newcons/share/misc/bsd-family-tree user/ed/newcons/share/misc/committers-ports.dot user/ed/newcons/share/misc/organization.dot user/ed/newcons/share/mk/bsd.compiler.mk user/ed/newcons/share/mk/bsd.lib.mk user/ed/newcons/share/mk/bsd.libnames.mk user/ed/newcons/share/mk/bsd.own.mk user/ed/newcons/share/mk/bsd.prog.mk user/ed/newcons/sys/Makefile user/ed/newcons/sys/amd64/amd64/machdep.c user/ed/newcons/sys/amd64/amd64/pmap.c user/ed/newcons/sys/amd64/conf/GENERIC user/ed/newcons/sys/amd64/conf/NOTES user/ed/newcons/sys/amd64/include/elf.h user/ed/newcons/sys/amd64/include/frame.h user/ed/newcons/sys/amd64/include/pmap.h user/ed/newcons/sys/amd64/include/sigframe.h user/ed/newcons/sys/amd64/include/signal.h user/ed/newcons/sys/amd64/include/ucontext.h user/ed/newcons/sys/amd64/vmm/intel/vmx.c user/ed/newcons/sys/amd64/vmm/vmm.c user/ed/newcons/sys/amd64/vmm/vmm_stat.c user/ed/newcons/sys/amd64/vmm/vmm_stat.h user/ed/newcons/sys/arm/allwinner/files.a10 user/ed/newcons/sys/arm/allwinner/timer.c user/ed/newcons/sys/arm/arm/bcopy_page.S user/ed/newcons/sys/arm/arm/bcopyinout.S user/ed/newcons/sys/arm/arm/bcopyinout_xscale.S user/ed/newcons/sys/arm/arm/blockio.S user/ed/newcons/sys/arm/arm/bus_space_asm_generic.S user/ed/newcons/sys/arm/arm/busdma_machdep-v6.c user/ed/newcons/sys/arm/arm/copystr.S user/ed/newcons/sys/arm/arm/cpufunc_asm.S user/ed/newcons/sys/arm/arm/cpufunc_asm_arm10.S user/ed/newcons/sys/arm/arm/cpufunc_asm_arm11.S user/ed/newcons/sys/arm/arm/cpufunc_asm_arm11x6.S user/ed/newcons/sys/arm/arm/cpufunc_asm_arm7tdmi.S user/ed/newcons/sys/arm/arm/cpufunc_asm_arm8.S user/ed/newcons/sys/arm/arm/cpufunc_asm_arm9.S user/ed/newcons/sys/arm/arm/cpufunc_asm_armv4.S user/ed/newcons/sys/arm/arm/cpufunc_asm_armv5.S user/ed/newcons/sys/arm/arm/cpufunc_asm_armv5_ec.S user/ed/newcons/sys/arm/arm/cpufunc_asm_armv6.S user/ed/newcons/sys/arm/arm/cpufunc_asm_armv7.S user/ed/newcons/sys/arm/arm/cpufunc_asm_fa526.S user/ed/newcons/sys/arm/arm/cpufunc_asm_ixp12x0.S user/ed/newcons/sys/arm/arm/cpufunc_asm_pj4b.S user/ed/newcons/sys/arm/arm/cpufunc_asm_sa1.S user/ed/newcons/sys/arm/arm/cpufunc_asm_sa11x0.S user/ed/newcons/sys/arm/arm/cpufunc_asm_sheeva.S user/ed/newcons/sys/arm/arm/cpufunc_asm_xscale.S user/ed/newcons/sys/arm/arm/cpufunc_asm_xscale_c3.S user/ed/newcons/sys/arm/arm/db_trace.c user/ed/newcons/sys/arm/arm/disassem.c user/ed/newcons/sys/arm/arm/elf_trampoline.c user/ed/newcons/sys/arm/arm/exception.S user/ed/newcons/sys/arm/arm/fiq_subr.S user/ed/newcons/sys/arm/arm/fusu.S user/ed/newcons/sys/arm/arm/in_cksum_arm.S user/ed/newcons/sys/arm/arm/irq_dispatch.S user/ed/newcons/sys/arm/arm/locore.S user/ed/newcons/sys/arm/arm/machdep.c user/ed/newcons/sys/arm/arm/mp_machdep.c user/ed/newcons/sys/arm/arm/mpcore_timer.c user/ed/newcons/sys/arm/arm/pmap-v6.c user/ed/newcons/sys/arm/arm/pmap.c user/ed/newcons/sys/arm/arm/setcpsr.S user/ed/newcons/sys/arm/arm/support.S user/ed/newcons/sys/arm/arm/swtch.S user/ed/newcons/sys/arm/arm/vfp.c user/ed/newcons/sys/arm/arm/vm_machdep.c user/ed/newcons/sys/arm/at91/at91_machdep.c user/ed/newcons/sys/arm/at91/if_ate.c user/ed/newcons/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c user/ed/newcons/sys/arm/broadcom/bcm2835/bcm2835_systimer.c user/ed/newcons/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h user/ed/newcons/sys/arm/broadcom/bcm2835/files.bcm2835 user/ed/newcons/sys/arm/conf/CUBIEBOARD user/ed/newcons/sys/arm/conf/RPI-B user/ed/newcons/sys/arm/econa/econa_machdep.c user/ed/newcons/sys/arm/include/asm.h user/ed/newcons/sys/arm/include/bus.h user/ed/newcons/sys/arm/include/frame.h user/ed/newcons/sys/arm/include/param.h user/ed/newcons/sys/arm/include/pmap.h user/ed/newcons/sys/arm/include/signal.h user/ed/newcons/sys/arm/include/vfp.h user/ed/newcons/sys/arm/include/vmparam.h user/ed/newcons/sys/arm/lpc/lpc_timer.c user/ed/newcons/sys/arm/mv/timer.c user/ed/newcons/sys/arm/s3c2xx0/s3c24x0_machdep.c user/ed/newcons/sys/arm/sa11x0/assabet_machdep.c user/ed/newcons/sys/arm/ti/am335x/am335x_dmtimer.c user/ed/newcons/sys/arm/ti/cpsw/if_cpsw.c user/ed/newcons/sys/arm/ti/ti_gpio.c user/ed/newcons/sys/arm/ti/ti_mmchs.c user/ed/newcons/sys/arm/versatile/sp804.c user/ed/newcons/sys/arm/xscale/i80321/ep80219_machdep.c user/ed/newcons/sys/arm/xscale/i80321/iq31244_machdep.c user/ed/newcons/sys/arm/xscale/i8134x/crb_machdep.c user/ed/newcons/sys/arm/xscale/ixp425/avila_machdep.c user/ed/newcons/sys/arm/xscale/pxa/pxa_machdep.c user/ed/newcons/sys/boot/common/bootstrap.h user/ed/newcons/sys/boot/common/load_elf.c user/ed/newcons/sys/boot/common/module.c user/ed/newcons/sys/boot/fdt/dts/bcm2835-rpi-b.dts user/ed/newcons/sys/boot/fdt/dts/cubieboard.dts user/ed/newcons/sys/boot/fdt/fdt_loader_cmd.c user/ed/newcons/sys/boot/uboot/lib/elf_freebsd.c user/ed/newcons/sys/boot/userboot/userboot/elf32_freebsd.c user/ed/newcons/sys/bsm/audit_kevents.h user/ed/newcons/sys/cam/ata/ata_all.c user/ed/newcons/sys/cam/ata/ata_da.c user/ed/newcons/sys/cam/ata/ata_pmp.c user/ed/newcons/sys/cam/cam_ccb.h user/ed/newcons/sys/cam/cam_periph.c user/ed/newcons/sys/cam/cam_sim.c user/ed/newcons/sys/cam/ctl/ctl.c user/ed/newcons/sys/cam/scsi/scsi_all.c user/ed/newcons/sys/cam/scsi/scsi_all.h user/ed/newcons/sys/cam/scsi/scsi_cd.c user/ed/newcons/sys/cam/scsi/scsi_da.c user/ed/newcons/sys/cddl/compat/opensolaris/sys/cred.h user/ed/newcons/sys/cddl/compat/opensolaris/sys/file.h user/ed/newcons/sys/cddl/compat/opensolaris/sys/kcondvar.h user/ed/newcons/sys/cddl/compat/opensolaris/sys/sig.h user/ed/newcons/sys/cddl/compat/opensolaris/sys/time.h user/ed/newcons/sys/cddl/compat/opensolaris/sys/vnode.h user/ed/newcons/sys/cddl/contrib/opensolaris/common/nvpair/fnvpair.c user/ed/newcons/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c user/ed/newcons/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h user/ed/newcons/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c user/ed/newcons/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h user/ed/newcons/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c user/ed/newcons/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/Makefile.files user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/trim_map.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c user/ed/newcons/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S user/ed/newcons/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c user/ed/newcons/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c user/ed/newcons/sys/cddl/dev/fbt/fbt.c user/ed/newcons/sys/compat/freebsd32/freebsd32_proto.h user/ed/newcons/sys/compat/freebsd32/freebsd32_syscall.h user/ed/newcons/sys/compat/freebsd32/freebsd32_syscalls.c user/ed/newcons/sys/compat/freebsd32/freebsd32_sysent.c user/ed/newcons/sys/compat/freebsd32/freebsd32_systrace_args.c user/ed/newcons/sys/compat/freebsd32/syscalls.master user/ed/newcons/sys/compat/linprocfs/linprocfs.c user/ed/newcons/sys/compat/linux/linux_file.c user/ed/newcons/sys/compat/linux/linux_socket.c user/ed/newcons/sys/compat/ndis/kern_ndis.c user/ed/newcons/sys/compat/svr4/svr4_fcntl.c user/ed/newcons/sys/compat/svr4/svr4_filio.c user/ed/newcons/sys/compat/svr4/svr4_misc.c user/ed/newcons/sys/compat/svr4/svr4_stream.c user/ed/newcons/sys/conf/Makefile.arm user/ed/newcons/sys/conf/NOTES user/ed/newcons/sys/conf/files user/ed/newcons/sys/conf/files.amd64 user/ed/newcons/sys/conf/files.arm user/ed/newcons/sys/conf/files.i386 user/ed/newcons/sys/conf/ldscript.arm user/ed/newcons/sys/conf/options user/ed/newcons/sys/conf/options.sparc64 user/ed/newcons/sys/contrib/altq/altq/altq_hfsc.c user/ed/newcons/sys/contrib/altq/altq/altq_hfsc.h user/ed/newcons/sys/crypto/aesni/aesni_wrap.c user/ed/newcons/sys/dev/aac/aac.c user/ed/newcons/sys/dev/aac/aac_cam.c user/ed/newcons/sys/dev/aac/aac_disk.c user/ed/newcons/sys/dev/aac/aac_pci.c user/ed/newcons/sys/dev/aac/aac_tables.h user/ed/newcons/sys/dev/aac/aacvar.h user/ed/newcons/sys/dev/acpica/acpi_cpu.c user/ed/newcons/sys/dev/acpica/acpi_hpet.c user/ed/newcons/sys/dev/acpica/acpi_powerres.c user/ed/newcons/sys/dev/agp/agp.c user/ed/newcons/sys/dev/agp/agp_i810.c user/ed/newcons/sys/dev/ahci/ahci.c user/ed/newcons/sys/dev/arcmsr/arcmsr.c user/ed/newcons/sys/dev/arcmsr/arcmsr.h user/ed/newcons/sys/dev/ata/ata-all.c user/ed/newcons/sys/dev/ata/ata-all.h user/ed/newcons/sys/dev/ata/ata-dma.c user/ed/newcons/sys/dev/ath/ath_hal/ah.c user/ed/newcons/sys/dev/ath/ath_hal/ah.h user/ed/newcons/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h user/ed/newcons/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h user/ed/newcons/sys/dev/ath/ath_hal/ar5210/ar5210.h user/ed/newcons/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c user/ed/newcons/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c user/ed/newcons/sys/dev/ath/ath_hal/ar5211/ar5211.h user/ed/newcons/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c user/ed/newcons/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c user/ed/newcons/sys/dev/ath/ath_hal/ar5212/ar5212.h user/ed/newcons/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c user/ed/newcons/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416.h user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416reg.h user/ed/newcons/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c user/ed/newcons/sys/dev/ath/ath_rate/sample/sample.c user/ed/newcons/sys/dev/ath/if_ath.c user/ed/newcons/sys/dev/ath/if_ath_beacon.c user/ed/newcons/sys/dev/ath/if_ath_beacon.h user/ed/newcons/sys/dev/ath/if_ath_misc.h user/ed/newcons/sys/dev/ath/if_ath_rx.c user/ed/newcons/sys/dev/ath/if_ath_rx_edma.c user/ed/newcons/sys/dev/ath/if_ath_sysctl.c user/ed/newcons/sys/dev/ath/if_ath_tdma.c user/ed/newcons/sys/dev/ath/if_ath_tx.c user/ed/newcons/sys/dev/ath/if_ath_tx.h user/ed/newcons/sys/dev/ath/if_ath_tx_edma.c user/ed/newcons/sys/dev/ath/if_ath_tx_ht.c user/ed/newcons/sys/dev/ath/if_athioctl.h user/ed/newcons/sys/dev/ath/if_athrate.h user/ed/newcons/sys/dev/ath/if_athvar.h user/ed/newcons/sys/dev/atkbdc/psm.c user/ed/newcons/sys/dev/bce/if_bce.c user/ed/newcons/sys/dev/bce/if_bcereg.h user/ed/newcons/sys/dev/bge/if_bge.c user/ed/newcons/sys/dev/cas/if_cas.c user/ed/newcons/sys/dev/ciss/ciss.c user/ed/newcons/sys/dev/cpufreq/ichss.c user/ed/newcons/sys/dev/cxgbe/adapter.h user/ed/newcons/sys/dev/cxgbe/common/common.h user/ed/newcons/sys/dev/cxgbe/common/t4_hw.c user/ed/newcons/sys/dev/cxgbe/common/t4_hw.h user/ed/newcons/sys/dev/cxgbe/common/t4_msg.h user/ed/newcons/sys/dev/cxgbe/firmware/t4fw_interface.h user/ed/newcons/sys/dev/cxgbe/t4_main.c user/ed/newcons/sys/dev/cxgbe/t4_sge.c user/ed/newcons/sys/dev/drm/drmP.h user/ed/newcons/sys/dev/drm2/drmP.h user/ed/newcons/sys/dev/drm2/drm_drv.c user/ed/newcons/sys/dev/drm2/drm_fb_helper.c user/ed/newcons/sys/dev/drm2/drm_gem.c user/ed/newcons/sys/dev/drm2/drm_mm.c user/ed/newcons/sys/dev/drm2/drm_mm.h user/ed/newcons/sys/dev/drm2/i915/i915_gem.c user/ed/newcons/sys/dev/e1000/e1000_82571.c user/ed/newcons/sys/dev/e1000/e1000_82575.c user/ed/newcons/sys/dev/e1000/e1000_82575.h user/ed/newcons/sys/dev/e1000/e1000_api.c user/ed/newcons/sys/dev/e1000/e1000_api.h user/ed/newcons/sys/dev/e1000/e1000_defines.h user/ed/newcons/sys/dev/e1000/e1000_hw.h user/ed/newcons/sys/dev/e1000/e1000_i210.c user/ed/newcons/sys/dev/e1000/e1000_i210.h user/ed/newcons/sys/dev/e1000/e1000_ich8lan.c user/ed/newcons/sys/dev/e1000/e1000_ich8lan.h user/ed/newcons/sys/dev/e1000/e1000_mac.c user/ed/newcons/sys/dev/e1000/e1000_mac.h user/ed/newcons/sys/dev/e1000/e1000_manage.c user/ed/newcons/sys/dev/e1000/e1000_nvm.c user/ed/newcons/sys/dev/e1000/e1000_nvm.h user/ed/newcons/sys/dev/e1000/e1000_osdep.h user/ed/newcons/sys/dev/e1000/e1000_phy.c user/ed/newcons/sys/dev/e1000/e1000_phy.h user/ed/newcons/sys/dev/e1000/e1000_regs.h user/ed/newcons/sys/dev/e1000/if_em.c user/ed/newcons/sys/dev/e1000/if_igb.c user/ed/newcons/sys/dev/e1000/if_lem.c user/ed/newcons/sys/dev/fb/vesa.c user/ed/newcons/sys/dev/fdt/fdt_common.c user/ed/newcons/sys/dev/fdt/fdt_common.h user/ed/newcons/sys/dev/fdt/fdtbus.c user/ed/newcons/sys/dev/fdt/simplebus.c user/ed/newcons/sys/dev/firewire/sbp.c user/ed/newcons/sys/dev/hwpmc/hwpmc_mod.c user/ed/newcons/sys/dev/hwpmc/hwpmc_soft.c user/ed/newcons/sys/dev/ic/ns16550.h user/ed/newcons/sys/dev/ichwd/ichwd.c user/ed/newcons/sys/dev/ipmi/ipmi_kcs.c user/ed/newcons/sys/dev/ipmi/ipmi_smic.c user/ed/newcons/sys/dev/isci/isci_controller.c user/ed/newcons/sys/dev/isci/isci_io_request.c user/ed/newcons/sys/dev/iscsi/initiator/isc_soc.c user/ed/newcons/sys/dev/iscsi/initiator/iscsi.c user/ed/newcons/sys/dev/isp/isp.c user/ed/newcons/sys/dev/isp/isp_freebsd.c user/ed/newcons/sys/dev/ixgbe/LICENSE user/ed/newcons/sys/dev/ixgbe/ixgbe.c user/ed/newcons/sys/dev/ixgbe/ixgbe_82598.c user/ed/newcons/sys/dev/ixgbe/ixgbe_82599.c user/ed/newcons/sys/dev/ixgbe/ixgbe_82599.h user/ed/newcons/sys/dev/ixgbe/ixgbe_api.c user/ed/newcons/sys/dev/ixgbe/ixgbe_api.h user/ed/newcons/sys/dev/ixgbe/ixgbe_common.c user/ed/newcons/sys/dev/ixgbe/ixgbe_common.h user/ed/newcons/sys/dev/ixgbe/ixgbe_mbx.h user/ed/newcons/sys/dev/ixgbe/ixgbe_osdep.h user/ed/newcons/sys/dev/ixgbe/ixgbe_phy.c user/ed/newcons/sys/dev/ixgbe/ixgbe_phy.h user/ed/newcons/sys/dev/ixgbe/ixgbe_type.h user/ed/newcons/sys/dev/ixgbe/ixgbe_vf.c user/ed/newcons/sys/dev/ixgbe/ixgbe_vf.h user/ed/newcons/sys/dev/ixgbe/ixgbe_x540.c user/ed/newcons/sys/dev/ixgbe/ixgbe_x540.h user/ed/newcons/sys/dev/ixgbe/ixv.c user/ed/newcons/sys/dev/mcd/mcd.c user/ed/newcons/sys/dev/md/md.c user/ed/newcons/sys/dev/mfi/mfi.c user/ed/newcons/sys/dev/mfi/mfi_cam.c user/ed/newcons/sys/dev/mfi/mfi_debug.c user/ed/newcons/sys/dev/mfi/mfi_disk.c user/ed/newcons/sys/dev/mfi/mfi_tbolt.c user/ed/newcons/sys/dev/mfi/mfireg.h user/ed/newcons/sys/dev/mfi/mfivar.h user/ed/newcons/sys/dev/mii/rgephy.c user/ed/newcons/sys/dev/mii/rgephyreg.h user/ed/newcons/sys/dev/mmc/mmc.c user/ed/newcons/sys/dev/mmc/mmcsd.c user/ed/newcons/sys/dev/mps/mps.c user/ed/newcons/sys/dev/mps/mps_sas.c user/ed/newcons/sys/dev/msk/if_msk.c user/ed/newcons/sys/dev/mxge/if_mxge.c user/ed/newcons/sys/dev/mxge/if_mxge_var.h user/ed/newcons/sys/dev/netmap/netmap.c user/ed/newcons/sys/dev/nvd/nvd.c user/ed/newcons/sys/dev/nvme/nvme.c user/ed/newcons/sys/dev/nvme/nvme.h user/ed/newcons/sys/dev/nvme/nvme_ctrlr.c user/ed/newcons/sys/dev/nvme/nvme_ctrlr_cmd.c user/ed/newcons/sys/dev/nvme/nvme_ns.c user/ed/newcons/sys/dev/nvme/nvme_ns_cmd.c user/ed/newcons/sys/dev/nvme/nvme_private.h user/ed/newcons/sys/dev/nvme/nvme_qpair.c user/ed/newcons/sys/dev/nvme/nvme_sysctl.c user/ed/newcons/sys/dev/nvme/nvme_test.c user/ed/newcons/sys/dev/nvme/nvme_uio.c user/ed/newcons/sys/dev/oce/oce_hw.c user/ed/newcons/sys/dev/oce/oce_hw.h user/ed/newcons/sys/dev/oce/oce_if.c user/ed/newcons/sys/dev/oce/oce_if.h user/ed/newcons/sys/dev/oce/oce_mbox.c user/ed/newcons/sys/dev/oce/oce_queue.c user/ed/newcons/sys/dev/oce/oce_sysctl.c user/ed/newcons/sys/dev/oce/oce_util.c user/ed/newcons/sys/dev/pci/pci.c user/ed/newcons/sys/dev/ppc/ppc.c user/ed/newcons/sys/dev/ppc/ppc_isa.c user/ed/newcons/sys/dev/puc/pucdata.c user/ed/newcons/sys/dev/random/randomdev_soft.c user/ed/newcons/sys/dev/re/if_re.c user/ed/newcons/sys/dev/sdhci/sdhci.c user/ed/newcons/sys/dev/sdhci/sdhci.h user/ed/newcons/sys/dev/sdhci/sdhci_if.m user/ed/newcons/sys/dev/si/si.c user/ed/newcons/sys/dev/siis/siis.c user/ed/newcons/sys/dev/sis/if_sis.c user/ed/newcons/sys/dev/sis/if_sisreg.h user/ed/newcons/sys/dev/sound/pci/hda/hdaa_patches.c user/ed/newcons/sys/dev/sound/pci/hda/hdac.h user/ed/newcons/sys/dev/sound/pci/hda/hdacc.c user/ed/newcons/sys/dev/sound/pcm/dsp.c user/ed/newcons/sys/dev/sound/pcm/sndstat.c user/ed/newcons/sys/dev/sym/sym_hipd.c user/ed/newcons/sys/dev/syscons/syscons.c user/ed/newcons/sys/dev/syscons/syscons.h user/ed/newcons/sys/dev/twa/tw_osl_cam.c user/ed/newcons/sys/dev/twa/tw_osl_freebsd.c user/ed/newcons/sys/dev/tws/tws_hdm.c user/ed/newcons/sys/dev/uart/uart.h user/ed/newcons/sys/dev/uart/uart_bus_fdt.c user/ed/newcons/sys/dev/uart/uart_dev_ns8250.c user/ed/newcons/sys/dev/usb/controller/xhci.c user/ed/newcons/sys/dev/usb/serial/u3g.c user/ed/newcons/sys/dev/usb/serial/uftdi.c user/ed/newcons/sys/dev/usb/usb_device.c user/ed/newcons/sys/dev/usb/usb_pf.c user/ed/newcons/sys/dev/usb/usb_request.c user/ed/newcons/sys/dev/usb/usbdevs user/ed/newcons/sys/dev/usb/wlan/if_rum.c user/ed/newcons/sys/dev/usb/wlan/if_run.c user/ed/newcons/sys/dev/virtio/block/virtio_blk.c user/ed/newcons/sys/dev/watchdog/watchdog.c user/ed/newcons/sys/fs/cd9660/cd9660_vnops.c user/ed/newcons/sys/fs/ext2fs/ext2_balloc.c user/ed/newcons/sys/fs/ext2fs/ext2_vnops.c user/ed/newcons/sys/fs/fdescfs/fdesc_vfsops.c user/ed/newcons/sys/fs/fdescfs/fdesc_vnops.c user/ed/newcons/sys/fs/fuse/fuse_io.c user/ed/newcons/sys/fs/fuse/fuse_vnops.c user/ed/newcons/sys/fs/msdosfs/msdosfs_vnops.c user/ed/newcons/sys/fs/nfs/nfs_commonkrpc.c user/ed/newcons/sys/fs/nfs/nfsdport.h user/ed/newcons/sys/fs/nfs/nfsport.h user/ed/newcons/sys/fs/nfsclient/nfs_clbio.c user/ed/newcons/sys/fs/nfsclient/nfs_clnode.c user/ed/newcons/sys/fs/nfsclient/nfs_clport.c user/ed/newcons/sys/fs/nfsclient/nfs_clstate.c user/ed/newcons/sys/fs/nfsclient/nfs_clvfsops.c user/ed/newcons/sys/fs/nfsclient/nfs_clvnops.c user/ed/newcons/sys/fs/nfsserver/nfs_nfsdport.c user/ed/newcons/sys/fs/nullfs/null_vfsops.c user/ed/newcons/sys/fs/procfs/procfs_map.c user/ed/newcons/sys/fs/smbfs/smbfs_smb.c user/ed/newcons/sys/fs/smbfs/smbfs_vnops.c user/ed/newcons/sys/fs/tmpfs/tmpfs.h user/ed/newcons/sys/fs/tmpfs/tmpfs_subr.c user/ed/newcons/sys/fs/tmpfs/tmpfs_vnops.c user/ed/newcons/sys/fs/udf/udf_vnops.c user/ed/newcons/sys/geom/gate/g_gate.c user/ed/newcons/sys/geom/geom.h user/ed/newcons/sys/geom/geom_dev.c user/ed/newcons/sys/geom/geom_disk.c user/ed/newcons/sys/geom/geom_disk.h user/ed/newcons/sys/geom/geom_event.c user/ed/newcons/sys/geom/geom_int.h user/ed/newcons/sys/geom/geom_io.c user/ed/newcons/sys/geom/geom_slice.c user/ed/newcons/sys/geom/geom_subr.c user/ed/newcons/sys/geom/geom_vfs.c user/ed/newcons/sys/geom/label/g_label_ntfs.c user/ed/newcons/sys/geom/multipath/g_multipath.c user/ed/newcons/sys/geom/nop/g_nop.c user/ed/newcons/sys/geom/part/g_part.c user/ed/newcons/sys/geom/part/g_part.h user/ed/newcons/sys/geom/part/g_part_mbr.c user/ed/newcons/sys/geom/raid/g_raid.c user/ed/newcons/sys/geom/raid/md_ddf.c user/ed/newcons/sys/geom/raid/tr_raid1e.c user/ed/newcons/sys/i386/conf/GENERIC user/ed/newcons/sys/i386/conf/NOTES user/ed/newcons/sys/i386/i386/machdep.c user/ed/newcons/sys/i386/i386/pmap.c user/ed/newcons/sys/i386/ibcs2/ibcs2_misc.c user/ed/newcons/sys/i386/include/elf.h user/ed/newcons/sys/i386/include/frame.h user/ed/newcons/sys/i386/include/param.h user/ed/newcons/sys/i386/include/pmap.h user/ed/newcons/sys/i386/include/sigframe.h user/ed/newcons/sys/i386/include/signal.h user/ed/newcons/sys/i386/include/ucontext.h user/ed/newcons/sys/i386/isa/pmtimer.c user/ed/newcons/sys/i386/xen/clock.c user/ed/newcons/sys/i386/xen/pmap.c user/ed/newcons/sys/ia64/conf/GENERIC user/ed/newcons/sys/ia64/ia64/clock.c user/ed/newcons/sys/ia64/ia64/machdep.c user/ed/newcons/sys/ia64/ia64/pmap.c user/ed/newcons/sys/ia64/include/vmparam.h user/ed/newcons/sys/kern/capabilities.conf user/ed/newcons/sys/kern/imgact_elf.c user/ed/newcons/sys/kern/init_sysent.c user/ed/newcons/sys/kern/kern_clock.c user/ed/newcons/sys/kern/kern_clocksource.c user/ed/newcons/sys/kern/kern_condvar.c user/ed/newcons/sys/kern/kern_descrip.c user/ed/newcons/sys/kern/kern_et.c user/ed/newcons/sys/kern/kern_event.c user/ed/newcons/sys/kern/kern_exec.c user/ed/newcons/sys/kern/kern_exit.c user/ed/newcons/sys/kern/kern_fork.c user/ed/newcons/sys/kern/kern_intr.c user/ed/newcons/sys/kern/kern_physio.c user/ed/newcons/sys/kern/kern_proc.c user/ed/newcons/sys/kern/kern_racct.c user/ed/newcons/sys/kern/kern_resource.c user/ed/newcons/sys/kern/kern_sharedpage.c user/ed/newcons/sys/kern/kern_shutdown.c user/ed/newcons/sys/kern/kern_sig.c user/ed/newcons/sys/kern/kern_synch.c user/ed/newcons/sys/kern/kern_sysctl.c user/ed/newcons/sys/kern/kern_tc.c user/ed/newcons/sys/kern/kern_thread.c user/ed/newcons/sys/kern/kern_time.c user/ed/newcons/sys/kern/kern_timeout.c user/ed/newcons/sys/kern/kern_umtx.c user/ed/newcons/sys/kern/subr_bus_dma.c user/ed/newcons/sys/kern/subr_log.c user/ed/newcons/sys/kern/subr_param.c user/ed/newcons/sys/kern/subr_sleepqueue.c user/ed/newcons/sys/kern/subr_taskqueue.c user/ed/newcons/sys/kern/subr_trap.c user/ed/newcons/sys/kern/subr_uio.c user/ed/newcons/sys/kern/subr_witness.c user/ed/newcons/sys/kern/sys_capability.c user/ed/newcons/sys/kern/sys_generic.c user/ed/newcons/sys/kern/sys_process.c user/ed/newcons/sys/kern/syscalls.c user/ed/newcons/sys/kern/syscalls.master user/ed/newcons/sys/kern/systrace_args.c user/ed/newcons/sys/kern/sysv_shm.c user/ed/newcons/sys/kern/tty.c user/ed/newcons/sys/kern/tty_pts.c user/ed/newcons/sys/kern/uipc_domain.c user/ed/newcons/sys/kern/uipc_mbuf.c user/ed/newcons/sys/kern/uipc_mqueue.c user/ed/newcons/sys/kern/uipc_sem.c user/ed/newcons/sys/kern/uipc_shm.c user/ed/newcons/sys/kern/uipc_sockbuf.c user/ed/newcons/sys/kern/uipc_socket.c user/ed/newcons/sys/kern/uipc_syscalls.c user/ed/newcons/sys/kern/uipc_usrreq.c user/ed/newcons/sys/kern/vfs_aio.c user/ed/newcons/sys/kern/vfs_bio.c user/ed/newcons/sys/kern/vfs_cache.c user/ed/newcons/sys/kern/vfs_cluster.c user/ed/newcons/sys/kern/vfs_default.c user/ed/newcons/sys/kern/vfs_export.c user/ed/newcons/sys/kern/vfs_init.c user/ed/newcons/sys/kern/vfs_lookup.c user/ed/newcons/sys/kern/vfs_mount.c user/ed/newcons/sys/kern/vfs_mountroot.c user/ed/newcons/sys/kern/vfs_subr.c user/ed/newcons/sys/kern/vfs_syscalls.c user/ed/newcons/sys/kern/vfs_vnops.c user/ed/newcons/sys/libkern/arm/divsi3.S user/ed/newcons/sys/libkern/arm/ffs.S user/ed/newcons/sys/libkern/arm/ldivmod.S user/ed/newcons/sys/mips/adm5120/adm5120_machdep.c user/ed/newcons/sys/mips/alchemy/alchemy_machdep.c user/ed/newcons/sys/mips/atheros/ar71xx_chip.c user/ed/newcons/sys/mips/atheros/ar71xx_cpudef.h user/ed/newcons/sys/mips/atheros/ar724x_chip.c user/ed/newcons/sys/mips/atheros/ar91xx_chip.c user/ed/newcons/sys/mips/beri/beri_machdep.c user/ed/newcons/sys/mips/cavium/octeon_machdep.c user/ed/newcons/sys/mips/gxemul/gxemul_machdep.c user/ed/newcons/sys/mips/idt/idt_machdep.c user/ed/newcons/sys/mips/malta/malta_machdep.c user/ed/newcons/sys/mips/mips/machdep.c user/ed/newcons/sys/mips/mips/pmap.c user/ed/newcons/sys/mips/mips/tick.c user/ed/newcons/sys/mips/nlm/tick.c user/ed/newcons/sys/mips/rmi/tick.c user/ed/newcons/sys/mips/rt305x/rt305x_machdep.c user/ed/newcons/sys/mips/sentry5/s5_machdep.c user/ed/newcons/sys/mips/sibyte/sb_machdep.c user/ed/newcons/sys/modules/ath/Makefile user/ed/newcons/sys/modules/cxgbe/firmware/Makefile user/ed/newcons/sys/modules/drm2/drm2/Makefile user/ed/newcons/sys/modules/dtrace/Makefile user/ed/newcons/sys/modules/dtrace/dtraceall/dtraceall.c user/ed/newcons/sys/modules/dtrace/fbt/Makefile user/ed/newcons/sys/modules/ixgbe/Makefile user/ed/newcons/sys/modules/mqueue/Makefile user/ed/newcons/sys/modules/mxge/mxge/Makefile user/ed/newcons/sys/modules/uart/Makefile user/ed/newcons/sys/modules/zfs/Makefile user/ed/newcons/sys/net/bpf.c user/ed/newcons/sys/net/bridgestp.c user/ed/newcons/sys/net/if.c user/ed/newcons/sys/net/if_arcsubr.c user/ed/newcons/sys/net/if_bridge.c user/ed/newcons/sys/net/if_gre.c user/ed/newcons/sys/net/if_lagg.c user/ed/newcons/sys/net/if_lagg.h user/ed/newcons/sys/net/pfil.c user/ed/newcons/sys/net/pfil.h user/ed/newcons/sys/net/route.c user/ed/newcons/sys/net/route.h user/ed/newcons/sys/net/rtsock.c user/ed/newcons/sys/net80211/ieee80211.c user/ed/newcons/sys/net80211/ieee80211_freebsd.c user/ed/newcons/sys/net80211/ieee80211_freebsd.h user/ed/newcons/sys/net80211/ieee80211_hostap.c user/ed/newcons/sys/net80211/ieee80211_ht.c user/ed/newcons/sys/net80211/ieee80211_hwmp.c user/ed/newcons/sys/net80211/ieee80211_mesh.c user/ed/newcons/sys/net80211/ieee80211_output.c user/ed/newcons/sys/net80211/ieee80211_power.c user/ed/newcons/sys/net80211/ieee80211_proto.h user/ed/newcons/sys/net80211/ieee80211_superg.c user/ed/newcons/sys/net80211/ieee80211_var.h user/ed/newcons/sys/net80211/ieee80211_wds.c user/ed/newcons/sys/netgraph/netflow/netflow.c user/ed/newcons/sys/netgraph/netflow/ng_netflow.c user/ed/newcons/sys/netgraph/ng_nat.c user/ed/newcons/sys/netgraph/ng_nat.h user/ed/newcons/sys/netinet/igmp.c user/ed/newcons/sys/netinet/ip_carp.c user/ed/newcons/sys/netinet/ip_fw.h user/ed/newcons/sys/netinet/ip_input.c user/ed/newcons/sys/netinet/ip_mroute.c user/ed/newcons/sys/netinet/ip_options.c user/ed/newcons/sys/netinet/ip_output.c user/ed/newcons/sys/netinet/libalias/alias.c user/ed/newcons/sys/netinet/libalias/alias_db.c user/ed/newcons/sys/netinet/sctputil.c user/ed/newcons/sys/netinet/siftr.c user/ed/newcons/sys/netinet/tcp_lro.c user/ed/newcons/sys/netinet/tcp_output.c user/ed/newcons/sys/netinet/tcp_subr.c user/ed/newcons/sys/netinet/tcp_timer.c user/ed/newcons/sys/netinet6/icmp6.c user/ed/newcons/sys/netinet6/in6_proto.c user/ed/newcons/sys/netinet6/ip6_input.c user/ed/newcons/sys/netinet6/ip6_mroute.c user/ed/newcons/sys/netinet6/ip6_output.c user/ed/newcons/sys/netinet6/mld6.c user/ed/newcons/sys/netinet6/nd6.c user/ed/newcons/sys/netinet6/nd6_nbr.c user/ed/newcons/sys/netinet6/raw_ip6.c user/ed/newcons/sys/netipsec/key.c user/ed/newcons/sys/netpfil/ipfw/ip_fw2.c user/ed/newcons/sys/netpfil/ipfw/ip_fw_dynamic.c user/ed/newcons/sys/netpfil/ipfw/ip_fw_log.c user/ed/newcons/sys/netpfil/ipfw/ip_fw_private.h user/ed/newcons/sys/netpfil/ipfw/ip_fw_sockopt.c user/ed/newcons/sys/netpfil/pf/if_pfsync.c user/ed/newcons/sys/netpfil/pf/pf.c user/ed/newcons/sys/netsmb/smb_dev.c user/ed/newcons/sys/nfs/krpc_subr.c user/ed/newcons/sys/nfs/nfs_common.c user/ed/newcons/sys/nfsclient/nfs_bio.c user/ed/newcons/sys/nfsclient/nfs_krpc.c user/ed/newcons/sys/nfsclient/nfs_subs.c user/ed/newcons/sys/nfsclient/nfs_vfsops.c user/ed/newcons/sys/nfsclient/nfs_vnops.c user/ed/newcons/sys/nfsclient/nfsm_subs.h user/ed/newcons/sys/nfsclient/nfsmount.h user/ed/newcons/sys/nfsserver/nfs_serv.c user/ed/newcons/sys/nfsserver/nfs_srvkrpc.c user/ed/newcons/sys/ofed/drivers/infiniband/core/umem.c user/ed/newcons/sys/ofed/include/linux/file.h user/ed/newcons/sys/ofed/include/linux/linux_compat.c user/ed/newcons/sys/ofed/include/linux/timer.h user/ed/newcons/sys/opencrypto/xform.c user/ed/newcons/sys/pc98/pc98/machdep.c user/ed/newcons/sys/pci/ncr.c user/ed/newcons/sys/powerpc/aim/clock.c user/ed/newcons/sys/powerpc/aim/machdep.c user/ed/newcons/sys/powerpc/aim/mmu_oea.c user/ed/newcons/sys/powerpc/aim/mmu_oea64.c user/ed/newcons/sys/powerpc/aim/moea64_native.c user/ed/newcons/sys/powerpc/aim/trap.c user/ed/newcons/sys/powerpc/aim/trap_subr32.S user/ed/newcons/sys/powerpc/aim/trap_subr64.S user/ed/newcons/sys/powerpc/booke/clock.c user/ed/newcons/sys/powerpc/booke/machdep.c user/ed/newcons/sys/powerpc/booke/pmap.c user/ed/newcons/sys/powerpc/include/vmparam.h user/ed/newcons/sys/powerpc/powerpc/cpu.c user/ed/newcons/sys/powerpc/powerpc/mmu_if.m user/ed/newcons/sys/powerpc/powerpc/pmap_dispatch.c user/ed/newcons/sys/powerpc/ps3/mmu_ps3.c user/ed/newcons/sys/powerpc/ps3/platform_ps3.c user/ed/newcons/sys/powerpc/wii/platform_wii.c user/ed/newcons/sys/rpc/clnt_dg.c user/ed/newcons/sys/rpc/clnt_rc.c user/ed/newcons/sys/rpc/clnt_vc.c user/ed/newcons/sys/rpc/rpc_generic.c user/ed/newcons/sys/rpc/rpcm_subs.h user/ed/newcons/sys/rpc/svc.c user/ed/newcons/sys/rpc/svc_dg.c user/ed/newcons/sys/rpc/svc_vc.c user/ed/newcons/sys/security/audit/audit.h user/ed/newcons/sys/security/audit/audit_arg.c user/ed/newcons/sys/security/audit/audit_bsm.c user/ed/newcons/sys/security/audit/audit_private.h user/ed/newcons/sys/security/mac/mac_process.c user/ed/newcons/sys/sparc64/conf/GENERIC user/ed/newcons/sys/sparc64/pci/ofw_pcib.c user/ed/newcons/sys/sparc64/pci/psycho.c user/ed/newcons/sys/sparc64/pci/sbbc.c user/ed/newcons/sys/sparc64/sbus/sbus.c user/ed/newcons/sys/sparc64/sparc64/machdep.c user/ed/newcons/sys/sparc64/sparc64/pmap.c user/ed/newcons/sys/sparc64/sparc64/tick.c user/ed/newcons/sys/sparc64/sparc64/tsb.c user/ed/newcons/sys/sys/_callout.h user/ed/newcons/sys/sys/bio.h user/ed/newcons/sys/sys/buf.h user/ed/newcons/sys/sys/callout.h user/ed/newcons/sys/sys/capability.h user/ed/newcons/sys/sys/condvar.h user/ed/newcons/sys/sys/conf.h user/ed/newcons/sys/sys/diskmbr.h user/ed/newcons/sys/sys/domain.h user/ed/newcons/sys/sys/file.h user/ed/newcons/sys/sys/filedesc.h user/ed/newcons/sys/sys/mbuf.h user/ed/newcons/sys/sys/mount.h user/ed/newcons/sys/sys/mouse.h user/ed/newcons/sys/sys/mutex.h user/ed/newcons/sys/sys/namei.h user/ed/newcons/sys/sys/param.h user/ed/newcons/sys/sys/pmckern.h user/ed/newcons/sys/sys/proc.h user/ed/newcons/sys/sys/protosw.h user/ed/newcons/sys/sys/rmlock.h user/ed/newcons/sys/sys/rwlock.h user/ed/newcons/sys/sys/signalvar.h user/ed/newcons/sys/sys/sleepqueue.h user/ed/newcons/sys/sys/socket.h user/ed/newcons/sys/sys/socketvar.h user/ed/newcons/sys/sys/stat.h user/ed/newcons/sys/sys/sx.h user/ed/newcons/sys/sys/syscall.h user/ed/newcons/sys/sys/syscall.mk user/ed/newcons/sys/sys/sysproto.h user/ed/newcons/sys/sys/systm.h user/ed/newcons/sys/sys/taskqueue.h user/ed/newcons/sys/sys/time.h user/ed/newcons/sys/sys/timeet.h user/ed/newcons/sys/sys/types.h user/ed/newcons/sys/sys/user.h user/ed/newcons/sys/sys/vnode.h user/ed/newcons/sys/sys/watchdog.h user/ed/newcons/sys/tools/vnode_if.awk user/ed/newcons/sys/ufs/ffs/ffs_alloc.c user/ed/newcons/sys/ufs/ffs/ffs_balloc.c user/ed/newcons/sys/ufs/ffs/ffs_rawread.c user/ed/newcons/sys/ufs/ffs/ffs_softdep.c user/ed/newcons/sys/ufs/ffs/ffs_vfsops.c user/ed/newcons/sys/ufs/ffs/ffs_vnops.c user/ed/newcons/sys/ufs/ffs/fs.h user/ed/newcons/sys/ufs/ufs/ufs_extern.h user/ed/newcons/sys/ufs/ufs/ufs_lookup.c user/ed/newcons/sys/ufs/ufs/ufs_quota.c user/ed/newcons/sys/ufs/ufs/ufs_vnops.c user/ed/newcons/sys/vm/default_pager.c user/ed/newcons/sys/vm/device_pager.c user/ed/newcons/sys/vm/phys_pager.c user/ed/newcons/sys/vm/pmap.h user/ed/newcons/sys/vm/sg_pager.c user/ed/newcons/sys/vm/swap_pager.c user/ed/newcons/sys/vm/swap_pager.h user/ed/newcons/sys/vm/uma.h user/ed/newcons/sys/vm/uma_core.c user/ed/newcons/sys/vm/uma_int.h user/ed/newcons/sys/vm/vm.h user/ed/newcons/sys/vm/vm_fault.c user/ed/newcons/sys/vm/vm_glue.c user/ed/newcons/sys/vm/vm_init.c user/ed/newcons/sys/vm/vm_kern.c user/ed/newcons/sys/vm/vm_map.c user/ed/newcons/sys/vm/vm_meter.c user/ed/newcons/sys/vm/vm_mmap.c user/ed/newcons/sys/vm/vm_object.c user/ed/newcons/sys/vm/vm_object.h user/ed/newcons/sys/vm/vm_page.c user/ed/newcons/sys/vm/vm_page.h user/ed/newcons/sys/vm/vm_pageout.c user/ed/newcons/sys/vm/vm_pager.c user/ed/newcons/sys/vm/vm_pager.h user/ed/newcons/sys/vm/vm_reserv.c user/ed/newcons/sys/vm/vnode_pager.c user/ed/newcons/sys/x86/isa/atrtc.c user/ed/newcons/sys/x86/isa/clock.c user/ed/newcons/sys/x86/x86/local_apic.c user/ed/newcons/sys/xdr/xdr_mbuf.c user/ed/newcons/tools/make_libdeps.sh user/ed/newcons/tools/regression/bin/test/regress.sh user/ed/newcons/tools/regression/lib/libc/stdio/Makefile user/ed/newcons/tools/regression/pjdfstest/Makefile user/ed/newcons/tools/regression/pjdfstest/pjdfstest.c user/ed/newcons/tools/regression/pjdfstest/tests/misc.sh user/ed/newcons/tools/regression/security/cap_test/cap_test_capabilities.c user/ed/newcons/tools/regression/security/cap_test/cap_test_relative.c user/ed/newcons/tools/test/iconv/tablegen/cmp.sh user/ed/newcons/tools/tools/ath/athstats/athstats.c user/ed/newcons/tools/tools/cxgbetool/cxgbetool.c user/ed/newcons/tools/tools/netrate/netreceive/Makefile user/ed/newcons/tools/tools/tinybsd/conf/firewall/TINYBSD user/ed/newcons/usr.bin/Makefile.arm user/ed/newcons/usr.bin/ar/Makefile user/ed/newcons/usr.bin/ar/acpyacc.y user/ed/newcons/usr.bin/ar/read.c user/ed/newcons/usr.bin/ar/write.c user/ed/newcons/usr.bin/c89/c89.c user/ed/newcons/usr.bin/c99/c99.c user/ed/newcons/usr.bin/calendar/calendars/calendar.birthday user/ed/newcons/usr.bin/cpio/Makefile user/ed/newcons/usr.bin/cpio/test/Makefile user/ed/newcons/usr.bin/dc/dc.c user/ed/newcons/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg user/ed/newcons/usr.bin/find/extern.h user/ed/newcons/usr.bin/find/find.1 user/ed/newcons/usr.bin/find/find.h user/ed/newcons/usr.bin/find/function.c user/ed/newcons/usr.bin/find/option.c user/ed/newcons/usr.bin/grep/regex/tre-fastmatch.c user/ed/newcons/usr.bin/head/head.1 user/ed/newcons/usr.bin/hexdump/conv.c user/ed/newcons/usr.bin/kdump/kdump.c user/ed/newcons/usr.bin/kdump/mksubr user/ed/newcons/usr.bin/netstat/netstat.1 user/ed/newcons/usr.bin/procstat/procstat_files.c user/ed/newcons/usr.bin/renice/renice.8 user/ed/newcons/usr.bin/script/script.1 user/ed/newcons/usr.bin/systat/ifcmds.c user/ed/newcons/usr.bin/systat/ifstat.c user/ed/newcons/usr.bin/systat/systat.1 user/ed/newcons/usr.bin/systat/vmstat.c user/ed/newcons/usr.bin/tail/tail.1 user/ed/newcons/usr.bin/tar/Makefile user/ed/newcons/usr.bin/tar/test/Makefile user/ed/newcons/usr.bin/top/machine.c user/ed/newcons/usr.bin/truss/extern.h user/ed/newcons/usr.bin/truss/main.c user/ed/newcons/usr.bin/unifdef/unifdefall.sh user/ed/newcons/usr.bin/unvis/Makefile user/ed/newcons/usr.bin/unzip/unzip.c user/ed/newcons/usr.bin/vis/Makefile user/ed/newcons/usr.sbin/ac/ac.8 user/ed/newcons/usr.sbin/bhyve/acpi.c user/ed/newcons/usr.sbin/bhyve/bhyverun.c user/ed/newcons/usr.sbin/bhyve/bhyverun.h user/ed/newcons/usr.sbin/bhyve/mem.c user/ed/newcons/usr.sbin/bhyve/mem.h user/ed/newcons/usr.sbin/bhyve/mptbl.c user/ed/newcons/usr.sbin/bhyve/pci_emul.c user/ed/newcons/usr.sbin/bhyve/pci_emul.h user/ed/newcons/usr.sbin/bhyve/pci_passthru.c user/ed/newcons/usr.sbin/bhyve/pci_virtio_block.c user/ed/newcons/usr.sbin/bhyve/pci_virtio_net.c user/ed/newcons/usr.sbin/bhyve/virtio.h user/ed/newcons/usr.sbin/bhyvectl/bhyvectl.c user/ed/newcons/usr.sbin/bhyveload/bhyveload.8 user/ed/newcons/usr.sbin/bhyveload/bhyveload.c user/ed/newcons/usr.sbin/bsdconfig/include/Makefile user/ed/newcons/usr.sbin/bsdconfig/include/messages.subr user/ed/newcons/usr.sbin/bsdconfig/networking/devices user/ed/newcons/usr.sbin/bsdconfig/networking/include/Makefile user/ed/newcons/usr.sbin/bsdconfig/networking/share/common.subr user/ed/newcons/usr.sbin/bsdconfig/networking/share/device.subr user/ed/newcons/usr.sbin/bsdconfig/networking/share/hostname.subr user/ed/newcons/usr.sbin/bsdconfig/networking/share/ipaddr.subr user/ed/newcons/usr.sbin/bsdconfig/networking/share/netmask.subr user/ed/newcons/usr.sbin/bsdconfig/networking/share/resolv.subr user/ed/newcons/usr.sbin/bsdconfig/networking/share/routing.subr user/ed/newcons/usr.sbin/bsdconfig/share/Makefile user/ed/newcons/usr.sbin/bsdconfig/share/common.subr user/ed/newcons/usr.sbin/bsdconfig/share/script.subr user/ed/newcons/usr.sbin/bsdconfig/share/strings.subr user/ed/newcons/usr.sbin/bsdconfig/share/variable.subr user/ed/newcons/usr.sbin/bsdconfig/startup/rcvar user/ed/newcons/usr.sbin/bsdinstall/distextract/distextract.c user/ed/newcons/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c user/ed/newcons/usr.sbin/config/main.c user/ed/newcons/usr.sbin/extattr/rmextattr.c user/ed/newcons/usr.sbin/makefs/makefs.8 user/ed/newcons/usr.sbin/makefs/makefs.c user/ed/newcons/usr.sbin/makefs/makefs.h user/ed/newcons/usr.sbin/makefs/mtree.c user/ed/newcons/usr.sbin/makefs/walk.c user/ed/newcons/usr.sbin/moused/moused.c user/ed/newcons/usr.sbin/newsyslog/newsyslog.c user/ed/newcons/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh user/ed/newcons/usr.sbin/pc-sysinstall/backend/functions-disk.sh user/ed/newcons/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh user/ed/newcons/usr.sbin/pc-sysinstall/backend/functions-installpackages.sh user/ed/newcons/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh user/ed/newcons/usr.sbin/pc-sysinstall/backend/functions-newfs.sh user/ed/newcons/usr.sbin/pc-sysinstall/backend/functions-packages.sh user/ed/newcons/usr.sbin/pc-sysinstall/backend/functions-parse.sh user/ed/newcons/usr.sbin/pc-sysinstall/backend/functions.sh user/ed/newcons/usr.sbin/pc-sysinstall/backend/parseconfig.sh user/ed/newcons/usr.sbin/pc-sysinstall/conf/pc-sysinstall.conf user/ed/newcons/usr.sbin/pc-sysinstall/examples/README user/ed/newcons/usr.sbin/pkg/Makefile user/ed/newcons/usr.sbin/pkg/pkg.c user/ed/newcons/usr.sbin/rtadvd/rtadvd.8 user/ed/newcons/usr.sbin/rtadvd/rtadvd.c user/ed/newcons/usr.sbin/tzsetup/tzsetup.c user/ed/newcons/usr.sbin/usbconfig/usbconfig.c user/ed/newcons/usr.sbin/watchdogd/watchdogd.8 user/ed/newcons/usr.sbin/watchdogd/watchdogd.c Directory Properties: user/ed/newcons/ (props changed) user/ed/newcons/cddl/ (props changed) user/ed/newcons/cddl/contrib/opensolaris/ (props changed) user/ed/newcons/cddl/contrib/opensolaris/cmd/zfs/ (props changed) user/ed/newcons/cddl/contrib/opensolaris/lib/libzfs/ (props changed) user/ed/newcons/contrib/bind9/ (props changed) user/ed/newcons/contrib/binutils/ (props changed) user/ed/newcons/contrib/expat/ (props changed) user/ed/newcons/contrib/expat/COPYING (props changed) user/ed/newcons/contrib/expat/doc/style.css (props changed) user/ed/newcons/contrib/expat/doc/xmlwf.1 (props changed) user/ed/newcons/contrib/expat/examples/elements.c (props changed) user/ed/newcons/contrib/expat/examples/outline.c (props changed) user/ed/newcons/contrib/expat/lib/ascii.h (props changed) user/ed/newcons/contrib/expat/lib/asciitab.h (props changed) user/ed/newcons/contrib/expat/lib/iasciitab.h (props changed) user/ed/newcons/contrib/expat/lib/internal.h (props changed) user/ed/newcons/contrib/expat/lib/latin1tab.h (props changed) user/ed/newcons/contrib/expat/lib/nametab.h (props changed) user/ed/newcons/contrib/expat/lib/utf8tab.h (props changed) user/ed/newcons/contrib/expat/lib/xmlrole.h (props changed) user/ed/newcons/contrib/expat/lib/xmltok.h (props changed) user/ed/newcons/contrib/expat/lib/xmltok_impl.h (props changed) user/ed/newcons/contrib/expat/lib/xmltok_ns.c (props changed) user/ed/newcons/contrib/expat/tests/chardata.c (props changed) user/ed/newcons/contrib/expat/tests/chardata.h (props changed) user/ed/newcons/contrib/expat/xmlwf/codepage.c (props changed) user/ed/newcons/contrib/expat/xmlwf/codepage.h (props changed) user/ed/newcons/contrib/expat/xmlwf/ct.c (props changed) user/ed/newcons/contrib/expat/xmlwf/filemap.h (props changed) user/ed/newcons/contrib/expat/xmlwf/unixfilemap.c (props changed) user/ed/newcons/contrib/expat/xmlwf/win32filemap.c (props changed) user/ed/newcons/contrib/expat/xmlwf/xmlfile.c (props changed) user/ed/newcons/contrib/expat/xmlwf/xmlfile.h (props changed) user/ed/newcons/contrib/expat/xmlwf/xmlmime.c (props changed) user/ed/newcons/contrib/expat/xmlwf/xmlmime.h (props changed) user/ed/newcons/contrib/expat/xmlwf/xmltchar.h (props changed) user/ed/newcons/contrib/expat/xmlwf/xmlurl.h (props changed) user/ed/newcons/contrib/expat/xmlwf/xmlwin32url.cxx (props changed) user/ed/newcons/contrib/libarchive/ (props changed) user/ed/newcons/contrib/libarchive/cpio/ (props changed) user/ed/newcons/contrib/libarchive/libarchive/ (props changed) user/ed/newcons/contrib/libarchive/tar/ (props changed) user/ed/newcons/contrib/libc-vis/ (props changed) user/ed/newcons/contrib/llvm/ (props changed) user/ed/newcons/contrib/llvm/tools/clang/ (props changed) user/ed/newcons/contrib/openbsm/ (props changed) user/ed/newcons/contrib/openpam/ (props changed) user/ed/newcons/contrib/tzdata/ (props changed) user/ed/newcons/crypto/openssh/ (props changed) user/ed/newcons/gnu/lib/ (props changed) user/ed/newcons/lib/libc/ (props changed) user/ed/newcons/lib/libc/stdtime/ (props changed) user/ed/newcons/lib/libutil/ (props changed) user/ed/newcons/lib/libvmmapi/ (props changed) user/ed/newcons/sbin/ (props changed) user/ed/newcons/sbin/ipfw/ (props changed) user/ed/newcons/share/man/man4/ (props changed) user/ed/newcons/sys/ (props changed) user/ed/newcons/sys/amd64/vmm/ (props changed) user/ed/newcons/sys/boot/ (props changed) user/ed/newcons/sys/cddl/contrib/opensolaris/ (props changed) user/ed/newcons/sys/conf/ (props changed) user/ed/newcons/usr.bin/calendar/ (props changed) user/ed/newcons/usr.bin/procstat/ (props changed) user/ed/newcons/usr.sbin/bhyve/ (props changed) user/ed/newcons/usr.sbin/bhyvectl/ (props changed) user/ed/newcons/usr.sbin/bhyveload/ (props changed) user/ed/newcons/usr.sbin/rtadvd/ (props changed) Modified: user/ed/newcons/MAINTAINERS ============================================================================== --- user/ed/newcons/MAINTAINERS Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/MAINTAINERS Thu Mar 28 20:27:01 2013 (r248847) @@ -30,7 +30,8 @@ contrib/openbsm rwatson Pre-commit revie sys/security/audit rwatson Pre-commit review requested. ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. -NEWCARD imp Pre-commit review requested. +PC Card imp Pre-commit review requested. +CardBus imp Pre-commit review requested. pci bus imp,jhb Pre-commit review requested. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. @@ -124,3 +125,6 @@ isci(4) jimharris Pre-commit review req cmx daniel@roe.ch Pre-commit review preferred. filemon obrien Pre-commit review preferred. sysdoc trhodes Pre-commit review preferred. +sh(1) jilles Pre-commit review requested. This also applies + to kill(1), printf(1) and test(1) which are + compiled in as builtins. Modified: user/ed/newcons/Makefile.inc1 ============================================================================== --- user/ed/newcons/Makefile.inc1 Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/Makefile.inc1 Thu Mar 28 20:27:01 2013 (r248847) @@ -1132,7 +1132,8 @@ _lex= usr.bin/lex .endif .if ${BOOTSTRAPPING} < 1000013 -_yacc= usr.bin/yacc +_yacc= lib/liby \ + usr.bin/yacc .endif .if ${BOOTSTRAPPING} < 1000026 @@ -1388,6 +1389,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ ${_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} @@ -1416,7 +1418,9 @@ lib/libopie__L lib/libtacplus__L: lib/li .if ${MK_CDDL} != "no" _cddl_lib_libumem= cddl/lib/libumem _cddl_lib_libnvpair= cddl/lib/libnvpair +_cddl_lib_libzfs_core= cddl/lib/libzfs_core _cddl_lib= cddl/lib +cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L .endif .if ${MK_CRYPT} != "no" @@ -1815,6 +1819,6 @@ _xi-links: ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \ done .else -xdev xdev-buil xdev-install: +xdev xdev-build xdev-install: @echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target" .endif Modified: user/ed/newcons/ObsoleteFiles.inc ============================================================================== --- user/ed/newcons/ObsoleteFiles.inc Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/ObsoleteFiles.inc Thu Mar 28 20:27:01 2013 (r248847) @@ -38,6 +38,85 @@ # xargs -n1 | sort | uniq -d; # done +# 20130316: vinum.4 removed +OLD_FILES+=usr/share/man/man4/vinum.4.gz +# 20130312: fortunes-o removed +OLD_FILES+=usr/share/games/fortune/fortunes-o +OLD_FILES+=usr/share/games/fortune/fortunes-o.dat +# 20130311: Ports are no more available via cvsup +OLD_FILES+=usr/share/examples/cvsup/ports-supfile +OLD_FILES+=usr/share/examples/cvsup/refuse +OLD_FILES+=usr/share/examples/cvsup/refuse.README +# 20130309: NWFS and NCP supports removed +OLD_FILES+=usr/bin/ncplist +OLD_FILES+=usr/bin/ncplogin +OLD_FILES+=usr/bin/ncplogout +OLD_FILES+=usr/include/fs/nwfs/nwfs.h +OLD_FILES+=usr/include/fs/nwfs/nwfs_mount.h +OLD_FILES+=usr/include/fs/nwfs/nwfs_node.h +OLD_FILES+=usr/include/fs/nwfs/nwfs_subr.h +OLD_DIRS+=usr/include/fs/nwfs +OLD_FILES+=usr/include/netncp/ncp.h +OLD_FILES+=usr/include/netncp/ncp_cfg.h +OLD_FILES+=usr/include/netncp/ncp_conn.h +OLD_FILES+=usr/include/netncp/ncp_file.h +OLD_FILES+=usr/include/netncp/ncp_lib.h +OLD_FILES+=usr/include/netncp/ncp_ncp.h +OLD_FILES+=usr/include/netncp/ncp_nls.h +OLD_FILES+=usr/include/netncp/ncp_rcfile.h +OLD_FILES+=usr/include/netncp/ncp_rq.h +OLD_FILES+=usr/include/netncp/ncp_sock.h +OLD_FILES+=usr/include/netncp/ncp_subr.h +OLD_FILES+=usr/include/netncp/ncp_user.h +OLD_FILES+=usr/include/netncp/ncpio.h +OLD_FILES+=usr/include/netncp/nwerror.h +OLD_DIRS+=usr/include/netncp +OLD_FILES+=usr/lib/libncp.a +OLD_FILES+=usr/lib/libncp.so +OLD_LIBS+=usr/lib/libncp.so.4 +OLD_FILES+=usr/lib/libncp_p.a +OLD_FILES+=usr/lib32/libncp.a +OLD_FILES+=usr/lib32/libncp.so +OLD_LIBS+=usr/lib32/libncp.so.4 +OLD_FILES+=usr/lib32/libncp_p.a +OLD_FILES+=usr/sbin/mount_nwfs +OLD_FILES+=usr/share/examples/nwclient/dot.nwfsrc +OLD_FILES+=usr/share/examples/nwclient/nwfs.sh.sample +OLD_DIRS+=usr/share/examples/nwclient +OLD_FILES+=usr/share/man/man1/ncplist.1.gz +OLD_FILES+=usr/share/man/man1/ncplogin.1.gz +OLD_FILES+=usr/share/man/man1/ncplogout.1.gz +OLD_FILES+=usr/share/man/man8/mount_nwfs.8.gz +# 20130302: NTFS support removed +OLD_FILES+=rescue/mount_ntfs +OLD_FILES+=sbin/mount_ntfs +OLD_FILES+=usr/include/fs/ntfs/ntfs.h +OLD_FILES+=usr/include/fs/ntfs/ntfs_compr.h +OLD_FILES+=usr/include/fs/ntfs/ntfs_ihash.h +OLD_FILES+=usr/include/fs/ntfs/ntfs_inode.h +OLD_FILES+=usr/include/fs/ntfs/ntfs_subr.h +OLD_FILES+=usr/include/fs/ntfs/ntfs_vfsops.h +OLD_FILES+=usr/include/fs/ntfs/ntfsmount.h +OLD_DIRS+=usr/include/fs/ntfs +OLD_FILES+=usr/share/man/man8/mount_ntfs.8.gz +# 20130302: PORTALFS support removed +OLD_FILES+=usr/include/fs/portalfs/portal.h +OLD_DIRS+=usr/include/fs/portalfs +OLD_FILES+=usr/sbin/mount_portalfs +OLD_FILES+=usr/share/examples/portal/README +OLD_FILES+=usr/share/examples/portal/portal.conf +OLD_DIRS+=usr/share/examples/portal +OLD_FILES+=usr/share/man/man8/mount_portalfs.8.gz +# 20130302: CODAFS support removed +OLD_FILES+=usr/share/man/man4/coda.4.gz +# 20130302: XFS support removed +OLD_FILES+=usr/share/man/man5/xfs.5.gz +# 20130302: Capsicum overhaul +OLD_FILES+=usr/share/man/man2/cap_getrights.2.gz +OLD_FILES+=usr/share/man/man2/cap_new.2.gz +# 20130213: OpenSSL 1.0.1e import +OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_verifyrecover.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_verifyrecover_init.3.gz # 20130116: removed long unused directories for .1aout section manpages OLD_FILES+=usr/share/man/en.ISO8859-1/man1aout OLD_FILES+=usr/share/man/en.UTF-8/man1aout @@ -58,9 +137,10 @@ OLD_DIRS+=var/remote # 20121114: zpool-features manual page moved from section 5 to 7 OLD_FILES+=usr/share/man/man5/zpool-features.5.gz # 20121022: remove harp, hfa and idt man page -OLD_FILES+=share/man/man4/harp.4 -OLD_FILES+=share/man/man4/hfa.4 -OLD_FILES+=share/man/man4/idt.4 +OLD_FILES+=usr/share/man/man4/harp.4.gz +OLD_FILES+=usr/share/man/man4/hfa.4.gz +OLD_FILES+=usr/share/man/man4/idt.4.gz +OLD_FILES+=usr/share/man/man4/if_idt.4.gz # 20121022: VFS_LOCK_GIANT elimination OLD_FILES+=usr/share/man/man9/VFS_LOCK_GIANT.9.gz OLD_FILES+=usr/share/man/man9/VFS_UNLOCK_GIANT.9.gz Modified: user/ed/newcons/UPDATING ============================================================================== --- user/ed/newcons/UPDATING Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/UPDATING Thu Mar 28 20:27:01 2013 (r248847) @@ -26,6 +26,37 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130308: + CTL_DISABLE has also been added to the sparc64 GENERIC (for further + information, see the respective 20130304 entry). + +20130304: + Recent commits to callout(9) changed the size of struct callout, + so the KBI is probably heavily disturbed. Also, some functions + in callout(9)/sleep(9)/sleepqueue(9)/condvar(9) KPIs were replaced + by macros. Every kernel module using it won't load, so rebuild + is requested. + + The ctl device has been re-enabled in GENERIC for i386 and amd64, + but does not initialize by default (because of the new CTL_DISABLE + option) to save memory. To re-enable it, remove the CTL_DISABLE + option from the kernel config file or set kern.cam.ctl.disable=0 + in /boot/loader.conf. + +20130301: + The ctl device has been disabled in GENERIC for i386 and amd64. + This was done due to the extra memory being allocated at system + initialisation time by the ctl driver which was only used if + a CAM target device was created. This makes a FreeBSD system + unusable on 128MB or less of RAM. + +20130208: + A new compression method (lz4) has been merged to -HEAD. Please + refer to zpool-features(7) for more information. + + Please refer to the "ZFS notes" section of this file for information + on upgrading boot ZFS pools. + 20130129: A BSD-licensed patch(1) variant has been added and is installed as bsdpatch, being the GNU version the default patch. @@ -39,8 +70,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 unlikely event that -M was the last option on the command line and the command line contained at least two files and a target directory the first file will have logs appended to it. The -M - option served little practical purpose in the last decade so it's - used expected to be extremely rare. + option served little practical purpose in the last decade so its + use is expected to be extremely rare. 20121223: After switching to Clang as the default compiler some users of ZFS Modified: user/ed/newcons/bin/chflags/chflags.c ============================================================================== --- user/ed/newcons/bin/chflags/chflags.c Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/chflags/chflags.c Thu Mar 28 20:27:01 2013 (r248847) @@ -117,11 +117,7 @@ main(int argc, char *argv[]) } else fts_options = hflag ? FTS_PHYSICAL : FTS_LOGICAL; - /* XXX: Why don't chflags and lchflags have compatible prototypes? */ - if (hflag) - change_flags = (int (*)(const char *, unsigned long))lchflags; - else - change_flags = chflags; + change_flags = hflag ? lchflags : chflags; flags = *argv; if (*flags >= '0' && *flags <= '7') { Modified: user/ed/newcons/bin/cp/cp.1 ============================================================================== --- user/ed/newcons/bin/cp/cp.1 Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/cp/cp.1 Thu Mar 28 20:27:01 2013 (r248847) @@ -32,7 +32,7 @@ .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd September 4, 2012 +.Dd March 15, 2013 .Dt CP 1 .Os .Sh NAME @@ -251,6 +251,27 @@ signal, the current input and output fil will be written to the standard output. .Sh EXIT STATUS .Ex -std +.Sh EXAMPLES +Make a copy of file +.Pa foo +named +.Pa bar : +.Pp +.Dl $ cp foo bar +.Pp +Copy a group of files to the +.Pa /tmp +directory: +.Pp +.Dl $ cp *.txt /tmp +.Pp +Copy the directory +.Pa junk +and all of its contents (including any subdirectories) to the +.Pa /tmp +directory: +.Pp +.Dl $ cp -R junk /tmp .Sh COMPATIBILITY Historic versions of the .Nm Modified: user/ed/newcons/bin/ed/cbc.c ============================================================================== --- user/ed/newcons/bin/ed/cbc.c Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/ed/cbc.c Thu Mar 28 20:27:01 2013 (r248847) @@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$"); #ifdef DES static DES_cblock ivec; /* initialization vector */ static DES_cblock pvec; /* padding vector */ -#endif static char bits[] = { /* used to extract bits from a char */ '\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001' @@ -79,13 +78,12 @@ static char bits[] = { /* used to extr static int pflag; /* 1 to preserve parity bits */ -#ifdef DES static DES_key_schedule schedule; /* expanded DES key */ -#endif static unsigned char des_buf[8];/* shared buffer for get_des_char/put_des_char */ static int des_ct = 0; /* count for get_des_char/put_des_char */ static int des_n = 0; /* index for put_des_char/get_des_char */ +#endif /* init_des_cipher: initialize DES */ void Modified: user/ed/newcons/bin/ls/ls.1 ============================================================================== --- user/ed/newcons/bin/ls/ls.1 Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/ls/ls.1 Thu Mar 28 20:27:01 2013 (r248847) @@ -32,7 +32,7 @@ .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 .\" $FreeBSD$ .\" -.Dd November 8, 2012 +.Dd March 15, 2013 .Dt LS 1 .Os .Sh NAME @@ -718,6 +718,24 @@ for more information. .El .Sh EXIT STATUS .Ex -std +.Sh EXAMPLES +List the contents of the current working directory in long format: +.Pp +.Dl $ ls -l +.Pp +In addition to listing the contents of the current working directory in +long format, show inode numbers, file flags (see +.Xr chflags 1 ) , +and suffix each filename with a symbol representing its file type: +.Pp +.Dl $ ls -lioF +.Pp +List the files in +.Pa /var/log , +sorting the output such that the mostly recently modified entries are +printed first: +.Pp +.Dl $ ls -lt /var/log .Sh COMPATIBILITY The group field is now automatically included in the long listing for files in order to be compatible with the Modified: user/ed/newcons/bin/mkdir/mkdir.1 ============================================================================== --- user/ed/newcons/bin/mkdir/mkdir.1 Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/mkdir/mkdir.1 Thu Mar 28 20:27:01 2013 (r248847) @@ -32,7 +32,7 @@ .\" @(#)mkdir.1 8.2 (Berkeley) 1/25/94 .\" $FreeBSD$ .\" -.Dd January 25, 1994 +.Dd March 15, 2013 .Dt MKDIR 1 .Os .Sh NAME @@ -87,6 +87,23 @@ Be verbose when creating directories, li The user must have write permission in the parent directory. .Sh EXIT STATUS .Ex -std +.Sh EXAMPLES +Create a directory named +.Pa foobar : +.Pp +.Dl $ mkdir foobar +.Pp +Create a directory named +.Pa foobar +and set its file mode to 700: +.Pp +.Dl $ mkdir -m 700 foobar +.Pp +Create a directory named +.Pa cow/horse/monkey , +creating any non-existent intermediate directories as necessary: +.Pp +.Dl $ mkdir -p cow/horse/monkey .Sh COMPATIBILITY The .Fl v Modified: user/ed/newcons/bin/mv/mv.1 ============================================================================== --- user/ed/newcons/bin/mv/mv.1 Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/mv/mv.1 Thu Mar 28 20:27:01 2013 (r248847) @@ -32,7 +32,7 @@ .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 .\" $FreeBSD$ .\" -.Dd August 28, 2012 +.Dd March 15, 2013 .Dt MV 1 .Os .Sh NAME @@ -155,6 +155,16 @@ rm -rf source_file .Ed .Sh EXIT STATUS .Ex -std +.Sh EXAMPLES +Rename file +.Pa foo +to +.Pa bar , +overwriting +.Pa bar +if it already exists: +.Pp +.Dl $ mv -f foo bar .Sh COMPATIBILITY The .Fl h , Modified: user/ed/newcons/bin/mv/mv.c ============================================================================== --- user/ed/newcons/bin/mv/mv.c Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/mv/mv.c Thu Mar 28 20:27:01 2013 (r248847) @@ -337,7 +337,7 @@ err: if (unlink(to)) * on a file that we copied, i.e., that we didn't create.) */ errno = 0; - if (fchflags(to_fd, (u_long)sbp->st_flags)) + if (fchflags(to_fd, sbp->st_flags)) if (errno != EOPNOTSUPP || sbp->st_flags != 0) warn("%s: set flags (was: 0%07o)", to, sbp->st_flags); Modified: user/ed/newcons/bin/ps/ps.1 ============================================================================== --- user/ed/newcons/bin/ps/ps.1 Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/ps/ps.1 Thu Mar 28 20:27:01 2013 (r248847) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd February 7, 2013 +.Dd March 15, 2013 .Dt PS 1 .Os .Sh NAME @@ -689,6 +689,10 @@ attempts to automatically determine the .It Pa /boot/kernel/kernel default system namelist .El +.Sh EXAMPLES +Display information on all system processes: +.Pp +.Dl $ ps -auxw .Sh SEE ALSO .Xr kill 1 , .Xr pgrep 1 , Modified: user/ed/newcons/bin/rm/rm.1 ============================================================================== --- user/ed/newcons/bin/rm/rm.1 Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/rm/rm.1 Thu Mar 28 20:27:01 2013 (r248847) @@ -32,7 +32,7 @@ .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 .\" $FreeBSD$ .\" -.Dd October 31, 2010 +.Dd March 15, 2013 .Dt RM 1 .Os .Sh NAME @@ -193,6 +193,19 @@ When is specified with .Fl f the file will be overwritten and removed even if it has hard links. +.Sh EXAMPLES +Recursively remove all files contained within the +.Pa foobar +directory hierarchy: +.Pp +.Dl $ rm -rf foobar +.Pp +Either of these commands will remove the file +.Pa -f : +.Bd -literal -offset indent +$ rm -- -f +$ rm ./-f +.Ed .Sh COMPATIBILITY The .Nm Modified: user/ed/newcons/bin/rmdir/rmdir.1 ============================================================================== --- user/ed/newcons/bin/rmdir/rmdir.1 Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/rmdir/rmdir.1 Thu Mar 28 20:27:01 2013 (r248847) @@ -32,7 +32,7 @@ .\" @(#)rmdir.1 8.1 (Berkeley) 5/31/93 .\" $FreeBSD$ .\" -.Dd March 21, 2004 +.Dd March 15, 2013 .Dt RMDIR 1 .Os .Sh NAME @@ -86,6 +86,18 @@ successfully. .It Li >0 An error occurred. .El +.Sh EXAMPLES +Remove the directory +.Pa foobar , +if it is empty: +.Pp +.Dl $ rmdir foobar +.Pp +Remove all directories up to and including +.Pa cow , +stopping at the first non-empty directory (if any): +.Pp +.Dl $ rmdir -p cow/horse/monkey .Sh SEE ALSO .Xr rm 1 .Sh STANDARDS Modified: user/ed/newcons/bin/sh/eval.c ============================================================================== --- user/ed/newcons/bin/sh/eval.c Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/sh/eval.c Thu Mar 28 20:27:01 2013 (r248847) @@ -301,7 +301,7 @@ evaltree(union node *n, int flags) } while (n != NULL); out: popstackmark(&smark); - if (pendingsigs) + if (pendingsig) dotrap(); if (eflag && exitstatus != 0 && do_etest) exitshell(exitstatus); Modified: user/ed/newcons/bin/sh/jobs.c ============================================================================== --- user/ed/newcons/bin/sh/jobs.c Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/sh/jobs.c Thu Mar 28 20:27:01 2013 (r248847) @@ -458,14 +458,15 @@ freejob(struct job *jp) int -waitcmd(int argc, char **argv) +waitcmd(int argc __unused, char **argv __unused) { struct job *job; int status, retval; struct job *jp; - if (argc > 1) { - job = getjob(argv[1]); + nextopt(""); + if (*argptr != NULL) { + job = getjob(*argptr); } else { job = NULL; } @@ -521,7 +522,7 @@ waitcmd(int argc, char **argv) } while (dowait(DOWAIT_BLOCK | DOWAIT_SIG, (struct job *)NULL) != -1); in_waitcmd--; - return 0; + return pendingsig + 128; } Modified: user/ed/newcons/bin/sh/main.c ============================================================================== --- user/ed/newcons/bin/sh/main.c Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/sh/main.c Thu Mar 28 20:27:01 2013 (r248847) @@ -196,7 +196,7 @@ cmdloop(int top) TRACE(("cmdloop(%d) called\n", top)); setstackmark(&smark); for (;;) { - if (pendingsigs) + if (pendingsig) dotrap(); inter = 0; if (iflag && top) { Modified: user/ed/newcons/bin/sh/sh.1 ============================================================================== --- user/ed/newcons/bin/sh/sh.1 Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/sh/sh.1 Thu Mar 28 20:27:01 2013 (r248847) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd January 22, 2013 +.Dd March 24, 2013 .Dt SH 1 .Os .Sh NAME @@ -1061,6 +1061,9 @@ A subshell environment may be implemente If job control is enabled in an interactive shell, commands grouped in parentheses can be suspended and continued as a unit. .Pp +For compatibility with other shells, +two open parentheses in sequence should be separated by whitespace. +.Pp The second form never forks another shell, so it is slightly more efficient. Grouping commands together this way allows the user to @@ -1618,6 +1621,16 @@ and .Ic times returns information about the same process if they are the only command in a command substitution. +.Pp +If a command substitution of the +.Li $( +form begins with a subshell, +the +.Li $( +and +.Li ( +must be separated by whitespace +to avoid ambiguity with arithmetic expansion. .Ss Arithmetic Expansion Arithmetic expansion provides a mechanism for evaluating an arithmetic expression and substituting its value. Modified: user/ed/newcons/bin/sh/trap.c ============================================================================== --- user/ed/newcons/bin/sh/trap.c Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/sh/trap.c Thu Mar 28 20:27:01 2013 (r248847) @@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$"); MKINIT char sigmode[NSIG]; /* current value of signal */ -int pendingsigs; /* indicates some signal received */ +volatile sig_atomic_t pendingsig; /* indicates some signal received */ int in_dotrap; /* do we execute in a trap handler? */ static char *volatile trap[NSIG]; /* trap handler commands */ static volatile sig_atomic_t gotsig[NSIG]; @@ -388,22 +388,25 @@ onsig(int signo) return; } - if (signo != SIGCHLD || !ignore_sigchld) - gotsig[signo] = 1; - pendingsigs++; - /* If we are currently in a wait builtin, prepare to break it */ - if ((signo == SIGINT || signo == SIGQUIT) && in_waitcmd != 0) - breakwaitcmd = 1; - /* - * If a trap is set, not ignored and not the null command, we need - * to make sure traps are executed even when a child blocks signals. - */ - if (Tflag && - trap[signo] != NULL && - ! (trap[signo][0] == '\0') && - ! (trap[signo][0] == ':' && trap[signo][1] == '\0')) + if ((signo == SIGINT || signo == SIGQUIT) && in_waitcmd != 0) { breakwaitcmd = 1; + pendingsig = signo; + } + + if (trap[signo] != NULL && trap[signo][0] != '\0' && + (signo != SIGCHLD || !ignore_sigchld)) { + gotsig[signo] = 1; + pendingsig = signo; + + /* + * If a trap is set, not ignored and not the null command, we + * need to make sure traps are executed even when a child + * blocks signals. + */ + if (Tflag && !(trap[signo][0] == ':' && trap[signo][1] == '\0')) + breakwaitcmd = 1; + } #ifndef NO_HISTORY if (signo == SIGWINCH) @@ -424,7 +427,7 @@ dotrap(void) in_dotrap++; for (;;) { - pendingsigs = 0; + pendingsig = 0; for (i = 1; i < NSIG; i++) { if (gotsig[i]) { gotsig[i] = 0; @@ -452,7 +455,6 @@ dotrap(void) last_trapsig = i; savestatus = exitstatus; evalstring(trap[i], 0); - exitstatus = savestatus; /* * If such a command was not @@ -461,9 +463,11 @@ dotrap(void) * trap action to have an effect * outside of it. */ - if (prev_evalskip != 0) { + if (evalskip == 0 || + prev_evalskip != 0) { evalskip = prev_evalskip; skipcount = prev_skipcount; + exitstatus = savestatus; } if (i == SIGCHLD) Modified: user/ed/newcons/bin/sh/trap.h ============================================================================== --- user/ed/newcons/bin/sh/trap.h Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/sh/trap.h Thu Mar 28 20:27:01 2013 (r248847) @@ -33,7 +33,7 @@ * $FreeBSD$ */ -extern int pendingsigs; +extern volatile sig_atomic_t pendingsig; extern int in_dotrap; extern volatile sig_atomic_t gotwinch; Modified: user/ed/newcons/bin/test/test.1 ============================================================================== --- user/ed/newcons/bin/test/test.1 Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/test/test.1 Thu Mar 28 20:27:01 2013 (r248847) @@ -169,15 +169,65 @@ True if .Ar file exists and is a socket. .It Ar file1 Fl nt Ar file2 -True if +True if both +.Ar file1 +and +.Ar file2 +exist and +.Ar file1 +is newer than +.Ar file2 . +.It Ar file1 Fl nt Ns Ar X Ns Ar Y Ar file2 +True if both +.Ar file1 +and +.Ar file2 +exist and .Ar file1 -exists and is newer than +has a more recent last access time +.Pq Ar X Ns = Ns Cm a , +inode creation time +.Pq Ar X Ns = Ns Cm b , +change time +.Pq Ar X Ns = Ns Cm c , +or modification time +.Pq Ar X Ns = Ns Cm m +than the last access time +.Pq Ar Y Ns = Ns Cm a , +inode creation time +.Pq Ar Y Ns = Ns Cm b , +change time +.Pq Ar Y Ns = Ns Cm c , +or modification time +.Pq Ar Y Ns = Ns Cm m +of .Ar file2 . +Note that +.Ic -ntmm +is equivalent to +.Ic -nt . .It Ar file1 Fl ot Ar file2 -True if +True if both +.Ar file1 +and +.Ar file2 +exist and .Ar file1 -exists and is older than +is older than .Ar file2 . +Note that +.Ar file1 +.Ic -ot +.Ar file2 +is equivalent to +.Ar file2 +.Ic -nt +.Ar file1 +.It Ar file1 Fl ot Ns Ar X Ns Ar Y Ar file2 +Equivalent to +.Ar file2 +.Ic -nt Ns Ar Y Ns Ar X +.Ar file1 . .It Ar file1 Fl ef Ar file2 True if .Ar file1 Modified: user/ed/newcons/bin/test/test.c ============================================================================== --- user/ed/newcons/bin/test/test.c Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/bin/test/test.c Thu Mar 28 20:27:01 2013 (r248847) @@ -63,7 +63,7 @@ error(const char *msg, ...) "-u"|"-g"|"-k"|"-s"|"-t"|"-z"|"-n"|"-o"|"-O"|"-G"|"-L"|"-S"; binary-operator ::= "="|"!="|"-eq"|"-ne"|"-ge"|"-gt"|"-le"|"-lt"| - "-nt"|"-ot"|"-ef"; + "-nt"|"-nt[abcm][abcm]"|"-ot"|"-ot[abcm][abcm])"|"-ef"; operand ::= */ @@ -85,8 +85,38 @@ enum token { FILSUID, FILSGID, FILSTCK, - FILNT, - FILOT, + FILNTAA, + FILNTAB, + FILNTAC, + FILNTAM, + FILNTBA, + FILNTBB, + FILNTBC, + FILNTBM, + FILNTCA, + FILNTCB, + FILNTCC, + FILNTCM, + FILNTMA, + FILNTMB, + FILNTMC, + FILNTMM, + FILOTAA, + FILOTAB, + FILOTAC, + FILOTAM, + FILOTBA, + FILOTBB, + FILOTBC, + FILOTBM, + FILOTCA, + FILOTCB, + FILOTCC, + FILOTCM, + FILOTMA, + FILOTMB, + FILOTMC, + FILOTMM, FILEQ, FILUID, FILGID, @@ -118,9 +148,16 @@ enum token_types { PAREN }; +enum time_types { + ATIME, + BTIME, + CTIME, + MTIME +}; + static struct t_op { - char op_text[4]; - short op_num, op_type; + char op_text[6]; + char op_num, op_type; } const ops [] = { {"-r", FILRD, UNOP}, {"-w", FILWR, UNOP}, @@ -154,8 +191,40 @@ static struct t_op { {"-gt", INTGT, BINOP}, {"-le", INTLE, BINOP}, {"-lt", INTLT, BINOP}, - {"-nt", FILNT, BINOP}, - {"-ot", FILOT, BINOP}, + {"-nt", FILNTMM, BINOP}, + {"-ntaa", FILNTAA, BINOP}, + {"-ntab", FILNTAB, BINOP}, + {"-ntac", FILNTAC, BINOP}, + {"-ntam", FILNTAM, BINOP}, + {"-ntba", FILNTBA, BINOP}, + {"-ntbb", FILNTBB, BINOP}, + {"-ntbc", FILNTBC, BINOP}, + {"-ntbm", FILNTBM, BINOP}, + {"-ntca", FILNTCA, BINOP}, + {"-ntcb", FILNTCB, BINOP}, + {"-ntcc", FILNTCC, BINOP}, + {"-ntcm", FILNTCM, BINOP}, + {"-ntma", FILNTMA, BINOP}, + {"-ntmb", FILNTMB, BINOP}, + {"-ntmc", FILNTMC, BINOP}, + {"-ntmm", FILNTMM, BINOP}, + {"-ot", FILOTMM, BINOP}, + {"-otaa", FILOTAA, BINOP}, + {"-otab", FILOTBB, BINOP}, + {"-otac", FILOTAC, BINOP}, + {"-otam", FILOTAM, BINOP}, + {"-otba", FILOTBA, BINOP}, + {"-otbb", FILOTBB, BINOP}, + {"-otbc", FILOTBC, BINOP}, + {"-otbm", FILOTBM, BINOP}, + {"-otca", FILOTCA, BINOP}, + {"-otcb", FILOTCB, BINOP}, + {"-otcc", FILOTCC, BINOP}, + {"-otcm", FILOTCM, BINOP}, + {"-otma", FILOTMA, BINOP}, + {"-otmb", FILOTMB, BINOP}, + {"-otmc", FILOTMC, BINOP}, + {"-otmm", FILOTMM, BINOP}, {"-ef", FILEQ, BINOP}, {"!", UNOT, BUNOP}, {"-a", BAND, BBINOP}, @@ -180,10 +249,10 @@ static int intcmp(const char *, const ch static int isunopoperand(void); static int islparenoperand(void); static int isrparenoperand(void); -static int newerf(const char *, const char *); +static int newerf(const char *, const char *, enum time_types, + enum time_types); static int nexpr(enum token); static int oexpr(enum token); -static int olderf(const char *, const char *); static int primary(enum token); static void syntax(const char *, const char *); static enum token t_lex(char *); @@ -353,10 +422,70 @@ binop(void) return intcmp(opnd1, opnd2) <= 0; case INTLT: return intcmp(opnd1, opnd2) < 0; - case FILNT: - return newerf (opnd1, opnd2); - case FILOT: - return olderf (opnd1, opnd2); + case FILNTAA: + return newerf(opnd1, opnd2, ATIME, ATIME); + case FILNTAB: + return newerf(opnd1, opnd2, ATIME, BTIME); + case FILNTAC: + return newerf(opnd1, opnd2, ATIME, CTIME); + case FILNTAM: + return newerf(opnd1, opnd2, ATIME, MTIME); + case FILNTBA: + return newerf(opnd1, opnd2, BTIME, ATIME); + case FILNTBB: + return newerf(opnd1, opnd2, BTIME, BTIME); + case FILNTBC: + return newerf(opnd1, opnd2, BTIME, CTIME); + case FILNTBM: + return newerf(opnd1, opnd2, BTIME, MTIME); + case FILNTCA: + return newerf(opnd1, opnd2, CTIME, ATIME); + case FILNTCB: + return newerf(opnd1, opnd2, CTIME, BTIME); + case FILNTCC: + return newerf(opnd1, opnd2, CTIME, CTIME); + case FILNTCM: + return newerf(opnd1, opnd2, CTIME, MTIME); + case FILNTMA: + return newerf(opnd1, opnd2, MTIME, ATIME); + case FILNTMB: + return newerf(opnd1, opnd2, MTIME, BTIME); + case FILNTMC: + return newerf(opnd1, opnd2, MTIME, CTIME); + case FILNTMM: + return newerf(opnd1, opnd2, MTIME, MTIME); + case FILOTAA: + return newerf(opnd2, opnd1, ATIME, ATIME); + case FILOTAB: + return newerf(opnd2, opnd1, BTIME, ATIME); + case FILOTAC: + return newerf(opnd2, opnd1, CTIME, ATIME); + case FILOTAM: + return newerf(opnd2, opnd1, MTIME, ATIME); + case FILOTBA: + return newerf(opnd2, opnd1, ATIME, BTIME); + case FILOTBB: + return newerf(opnd2, opnd1, BTIME, BTIME); + case FILOTBC: + return newerf(opnd2, opnd1, CTIME, BTIME); + case FILOTBM: + return newerf(opnd2, opnd1, MTIME, BTIME); + case FILOTCA: + return newerf(opnd2, opnd1, ATIME, CTIME); + case FILOTCB: + return newerf(opnd2, opnd1, BTIME, CTIME); + case FILOTCC: + return newerf(opnd2, opnd1, CTIME, CTIME); + case FILOTCM: + return newerf(opnd2, opnd1, MTIME, CTIME); + case FILOTMA: + return newerf(opnd2, opnd1, ATIME, MTIME); + case FILOTMB: + return newerf(opnd2, opnd1, BTIME, MTIME); + case FILOTMC: + return newerf(opnd2, opnd1, CTIME, MTIME); + case FILOTMM: + return newerf(opnd2, opnd1, MTIME, MTIME); case FILEQ: return equalf (opnd1, opnd2); default: @@ -570,25 +699,34 @@ intcmp (const char *s1, const char *s2) } static int -newerf (const char *f1, const char *f2) +newerf (const char *f1, const char *f2, enum time_types t1, enum time_types t2) { struct stat b1, b2; + struct timespec *ts1, *ts2; if (stat(f1, &b1) != 0 || stat(f2, &b2) != 0) return 0; - if (b1.st_mtim.tv_sec > b2.st_mtim.tv_sec) + switch (t1) { + case ATIME: ts1 = &b1.st_atim; break; + case BTIME: ts1 = &b1.st_birthtim; break; + case CTIME: ts1 = &b1.st_ctim; break; + default: ts1 = &b1.st_mtim; break; + } + + switch (t2) { + case ATIME: ts2 = &b2.st_atim; break; + case BTIME: ts2 = &b2.st_birthtim; break; + case CTIME: ts2 = &b2.st_ctim; break; + default: ts2 = &b2.st_mtim; break; + } + + if (ts1->tv_sec > ts2->tv_sec) return 1; - if (b1.st_mtim.tv_sec < b2.st_mtim.tv_sec) + if (ts1->tv_sec < ts2->tv_sec) return 0; - return (b1.st_mtim.tv_nsec > b2.st_mtim.tv_nsec); -} - -static int -olderf (const char *f1, const char *f2) -{ - return (newerf(f2, f1)); + return (ts1->tv_nsec > ts2->tv_nsec); } static int Modified: user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c ============================================================================== --- user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Thu Mar 28 20:22:43 2013 (r248846) +++ user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Thu Mar 28 20:27:01 2013 (r248847) @@ -195,6 +195,13 @@ fatal(const char *fmt, ...) verror(fmt, ap); va_end(ap); + /* + * Close the DTrace handle to ensure that any controlled processes are + * correctly restored and continued. + */ + if (g_dtp) + dtrace_close(g_dtp); + exit(E_ERROR); } Copied: user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d (from r248830, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Fri Mar 29 03:45:59 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 56D3C9AE; Fri, 29 Mar 2013 03:45:59 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 483A593E; Fri, 29 Mar 2013 03:45:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2T3jx05027549; Fri, 29 Mar 2013 03:45:59 GMT (envelope-from bryanv@svn.freebsd.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2T3jxqn027548; Fri, 29 Mar 2013 03:45:59 GMT (envelope-from bryanv@svn.freebsd.org) Message-Id: <201303290345.r2T3jxqn027548@svn.freebsd.org> From: Bryan Venteicher Date: Fri, 29 Mar 2013 03:45:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248863 - user/attilio/membarclean/dev/virtio X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2013 03:45:59 -0000 Author: bryanv Date: Fri Mar 29 03:45:58 2013 New Revision: 248863 URL: http://svnweb.freebsd.org/changeset/base/248863 Log: Revert what is left of r240427 Ease the work of this branch by changing the write membar into just a membar. Modified: user/attilio/membarclean/dev/virtio/virtqueue.c Modified: user/attilio/membarclean/dev/virtio/virtqueue.c ============================================================================== --- user/attilio/membarclean/dev/virtio/virtqueue.c Fri Mar 29 02:14:57 2013 (r248862) +++ user/attilio/membarclean/dev/virtio/virtqueue.c Fri Mar 29 03:45:58 2013 (r248863) @@ -622,7 +622,7 @@ vq_ring_update_avail(struct virtqueue *v avail_idx = vq->vq_ring.avail->idx & (vq->vq_nentries - 1); vq->vq_ring.avail->ring[avail_idx] = desc_idx; - wmb(); + mb(); vq->vq_ring.avail->idx++; /* Keep pending count until virtqueue_notify(). */ From owner-svn-src-user@FreeBSD.ORG Fri Mar 29 07:58:25 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1C1F4EDF; Fri, 29 Mar 2013 07:58:25 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0C04CC2; Fri, 29 Mar 2013 07:58:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2T7wPCp000554; Fri, 29 Mar 2013 07:58:25 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2T7wMVQ000537; Fri, 29 Mar 2013 07:58:22 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201303290758.r2T7wMVQ000537@svn.freebsd.org> From: Attilio Rao Date: Fri, 29 Mar 2013 07:58:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248869 - in user/attilio/vmcontention: . cddl/contrib/opensolaris/lib/libdtrace/common contrib/binutils/bfd contrib/binutils/binutils etc gnu/usr.bin/gdb/kgdb lib/libc/locale lib/libpm... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2013 07:58:25 -0000 Author: attilio Date: Fri Mar 29 07:58:22 2013 New Revision: 248869 URL: http://svnweb.freebsd.org/changeset/base/248869 Log: MFC Added: user/attilio/vmcontention/lib/libpmc/pmc.haswell.3 - copied unchanged from r248868, head/lib/libpmc/pmc.haswell.3 user/attilio/vmcontention/lib/libpmc/pmc.haswelluc.3 - copied unchanged from r248868, head/lib/libpmc/pmc.haswelluc.3 user/attilio/vmcontention/sys/mips/atheros/uart_bus_ar933x.c - copied unchanged from r248868, head/sys/mips/atheros/uart_bus_ar933x.c user/attilio/vmcontention/sys/mips/atheros/uart_cpu_ar933x.c - copied unchanged from r248868, head/sys/mips/atheros/uart_cpu_ar933x.c user/attilio/vmcontention/sys/mips/atheros/uart_dev_ar933x.c - copied unchanged from r248868, head/sys/mips/atheros/uart_dev_ar933x.c user/attilio/vmcontention/sys/mips/atheros/uart_dev_ar933x.h - copied unchanged from r248868, head/sys/mips/atheros/uart_dev_ar933x.h user/attilio/vmcontention/sys/mips/conf/AP121 - copied unchanged from r248868, head/sys/mips/conf/AP121 user/attilio/vmcontention/sys/mips/conf/AP121.hints - copied unchanged from r248868, head/sys/mips/conf/AP121.hints user/attilio/vmcontention/sys/mips/conf/AR933X_BASE - copied unchanged from r248868, head/sys/mips/conf/AR933X_BASE user/attilio/vmcontention/sys/mips/conf/AR933X_BASE.hints - copied unchanged from r248868, head/sys/mips/conf/AR933X_BASE.hints user/attilio/vmcontention/usr.bin/unifdef/unifdef.h - copied unchanged from r248868, head/usr.bin/unifdef/unifdef.h Modified: user/attilio/vmcontention/MAINTAINERS (contents, props changed) user/attilio/vmcontention/Makefile.inc1 user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c user/attilio/vmcontention/contrib/binutils/bfd/dwarf2.c user/attilio/vmcontention/contrib/binutils/binutils/dwarf.c user/attilio/vmcontention/etc/rc.subr user/attilio/vmcontention/gnu/usr.bin/gdb/kgdb/kld.c user/attilio/vmcontention/lib/libc/locale/btowc.3 user/attilio/vmcontention/lib/libc/locale/isblank.3 user/attilio/vmcontention/lib/libpmc/Makefile user/attilio/vmcontention/lib/libpmc/libpmc.c user/attilio/vmcontention/release/doc/en_US.ISO8859-1/hardware/article.xml user/attilio/vmcontention/share/examples/bhyve/vmrun.sh user/attilio/vmcontention/share/misc/committers-ports.dot user/attilio/vmcontention/share/mk/bsd.lib.mk user/attilio/vmcontention/share/mk/bsd.own.mk user/attilio/vmcontention/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) user/attilio/vmcontention/sys/amd64/vmm/vmm_instruction_emul.c user/attilio/vmcontention/sys/cam/ata/ata_da.c user/attilio/vmcontention/sys/cam/cam_periph.h user/attilio/vmcontention/sys/cam/cam_sim.c user/attilio/vmcontention/sys/cam/scsi/scsi_da.c user/attilio/vmcontention/sys/dev/ciss/ciss.c user/attilio/vmcontention/sys/dev/fb/vesa.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_core.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_intel.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_uncore.c user/attilio/vmcontention/sys/dev/hwpmc/pmc_events.h user/attilio/vmcontention/sys/dev/mps/mps_sas.c user/attilio/vmcontention/sys/dev/nvme/nvme_ctrlr.c user/attilio/vmcontention/sys/dev/nvme/nvme_ns.c user/attilio/vmcontention/sys/kern/kern_physio.c user/attilio/vmcontention/sys/kern/subr_bus_dma.c user/attilio/vmcontention/sys/kern/uipc_syscalls.c user/attilio/vmcontention/sys/kern/vfs_aio.c user/attilio/vmcontention/sys/kern/vfs_bio.c user/attilio/vmcontention/sys/mips/atheros/ar71xx_machdep.c user/attilio/vmcontention/sys/mips/atheros/ar71xx_setup.c user/attilio/vmcontention/sys/mips/atheros/ar933x_chip.c user/attilio/vmcontention/sys/mips/atheros/ar933x_uart.h user/attilio/vmcontention/sys/mips/atheros/files.ar71xx user/attilio/vmcontention/sys/net/if_bridge.c user/attilio/vmcontention/sys/sys/conf.h user/attilio/vmcontention/sys/sys/pmc.h user/attilio/vmcontention/sys/vm/vm_mmap.c user/attilio/vmcontention/tools/tools/tinybsd/conf/firewall/TINYBSD user/attilio/vmcontention/usr.bin/unifdef/unifdef.1 user/attilio/vmcontention/usr.bin/unifdef/unifdef.c user/attilio/vmcontention/usr.bin/unifdef/unifdefall.sh user/attilio/vmcontention/usr.sbin/jail/command.c user/attilio/vmcontention/usr.sbin/jail/config.c user/attilio/vmcontention/usr.sbin/jail/jailp.h Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/cddl/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/contrib/binutils/ (props changed) user/attilio/vmcontention/gnu/usr.bin/gdb/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/amd64/vmm/ (props changed) user/attilio/vmcontention/usr.sbin/jail/ (props changed) Modified: user/attilio/vmcontention/MAINTAINERS ============================================================================== --- user/attilio/vmcontention/MAINTAINERS Fri Mar 29 07:50:47 2013 (r248868) +++ user/attilio/vmcontention/MAINTAINERS Fri Mar 29 07:58:22 2013 (r248869) @@ -30,7 +30,8 @@ contrib/openbsm rwatson Pre-commit revie sys/security/audit rwatson Pre-commit review requested. ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. -NEWCARD imp Pre-commit review requested. +PC Card imp Pre-commit review requested. +CardBus imp Pre-commit review requested. pci bus imp,jhb Pre-commit review requested. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. Modified: user/attilio/vmcontention/Makefile.inc1 ============================================================================== --- user/attilio/vmcontention/Makefile.inc1 Fri Mar 29 07:50:47 2013 (r248868) +++ user/attilio/vmcontention/Makefile.inc1 Fri Mar 29 07:58:22 2013 (r248869) @@ -1819,6 +1819,6 @@ _xi-links: ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \ done .else -xdev xdev-buil xdev-install: +xdev xdev-build xdev-install: @echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target" .endif Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c Fri Mar 29 07:50:47 2013 (r248868) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c Fri Mar 29 07:58:22 2013 (r248869) @@ -241,6 +241,8 @@ dt_pragma_depends(const char *prname, dt int found; dt_lib_depend_t *dld; char lib[MAXPATHLEN]; + size_t plen; + char *provs, *cpy, *tok; if (cnp == NULL || nnp == NULL || cnp->dn_kind != DT_NODE_IDENT || nnp->dn_kind != DT_NODE_IDENT) { @@ -248,9 +250,31 @@ dt_pragma_depends(const char *prname, dt " \n", prname); } - if (strcmp(cnp->dn_string, "provider") == 0) - found = dt_provider_lookup(dtp, nnp->dn_string) != NULL; - else if (strcmp(cnp->dn_string, "module") == 0) { + if (strcmp(cnp->dn_string, "provider") == 0) { + /* + * First try to get the provider list using the + * debug.dtrace.providers sysctl, since that'll work even if + * we're not running as root. + */ + provs = NULL; + if (sysctlbyname("debug.dtrace.providers", NULL, &plen, NULL, 0) || + ((provs = dt_alloc(dtp, plen)) == NULL) || + sysctlbyname("debug.dtrace.providers", provs, &plen, NULL, 0)) + found = dt_provider_lookup(dtp, nnp->dn_string) != NULL; + else { + found = B_FALSE; + for (cpy = provs; (tok = strsep(&cpy, " ")) != NULL; ) + if (strcmp(tok, nnp->dn_string) == 0) { + found = B_TRUE; + break; + } + if (found == B_FALSE) + found = dt_provider_lookup(dtp, + nnp->dn_string) != NULL; + } + if (provs != NULL) + dt_free(dtp, provs); + } else if (strcmp(cnp->dn_string, "module") == 0) { dt_module_t *mp = dt_module_lookup_by_name(dtp, nnp->dn_string); found = mp != NULL && dt_module_getctf(dtp, mp) != NULL; } else if (strcmp(cnp->dn_string, "library") == 0) { Modified: user/attilio/vmcontention/contrib/binutils/bfd/dwarf2.c ============================================================================== --- user/attilio/vmcontention/contrib/binutils/bfd/dwarf2.c Fri Mar 29 07:50:47 2013 (r248868) +++ user/attilio/vmcontention/contrib/binutils/bfd/dwarf2.c Fri Mar 29 07:58:22 2013 (r248869) @@ -633,6 +633,9 @@ read_attribute_value (struct attribute * attr->u.val = read_1_byte (abfd, info_ptr); info_ptr += 1; break; + case DW_FORM_flag_present: + attr->u.val = 1; + break; case DW_FORM_sdata: attr->u.sval = read_signed_leb128 (abfd, info_ptr, &bytes_read); info_ptr += bytes_read; Modified: user/attilio/vmcontention/contrib/binutils/binutils/dwarf.c ============================================================================== --- user/attilio/vmcontention/contrib/binutils/binutils/dwarf.c Fri Mar 29 07:50:47 2013 (r248868) +++ user/attilio/vmcontention/contrib/binutils/binutils/dwarf.c Fri Mar 29 07:58:22 2013 (r248869) @@ -557,6 +557,7 @@ get_FORM_name (unsigned long form) case DW_FORM_ref8: return "DW_FORM_ref8"; case DW_FORM_ref_udata: return "DW_FORM_ref_udata"; case DW_FORM_indirect: return "DW_FORM_indirect"; + case DW_FORM_flag_present: return "DW_FORM_flag_present"; default: { static char buffer[100]; @@ -969,6 +970,10 @@ read_and_display_attr_value (unsigned lo data += offset_size; break; + case DW_FORM_flag_present: + uvalue = 1; + break; + case DW_FORM_ref1: case DW_FORM_flag: case DW_FORM_data1: @@ -1030,6 +1035,7 @@ read_and_display_attr_value (unsigned lo printf (" %#lx", uvalue); break; + case DW_FORM_flag_present: case DW_FORM_flag: case DW_FORM_data1: case DW_FORM_data2: Modified: user/attilio/vmcontention/etc/rc.subr ============================================================================== --- user/attilio/vmcontention/etc/rc.subr Fri Mar 29 07:50:47 2013 (r248868) +++ user/attilio/vmcontention/etc/rc.subr Fri Mar 29 07:58:22 2013 (r248869) @@ -1285,7 +1285,7 @@ make_symlink() # devfs_rulesets_from_file() { - local file _err _me + local file _err _me _opts file="$1" _me="devfs_rulesets_from_file" _err=0 @@ -1298,6 +1298,11 @@ devfs_rulesets_from_file() debug "$_me: no such file ($file)" return 0 fi + + # Disable globbing so that the rule patterns are not expanded + # by accident with matching filesystem entries. + _opts=$-; set -f + debug "reading rulesets from file ($file)" { while read line do @@ -1344,6 +1349,7 @@ devfs_rulesets_from_file() break fi done } < $file + case $_opts in *f*) ;; *) set +f ;; esac return $_err } Modified: user/attilio/vmcontention/gnu/usr.bin/gdb/kgdb/kld.c ============================================================================== --- user/attilio/vmcontention/gnu/usr.bin/gdb/kgdb/kld.c Fri Mar 29 07:50:47 2013 (r248868) +++ user/attilio/vmcontention/gnu/usr.bin/gdb/kgdb/kld.c Fri Mar 29 07:58:22 2013 (r248869) @@ -78,6 +78,7 @@ kld_ok (char *path) */ static const char *kld_suffixes[] = { ".debug", + ".symbols", "", NULL }; @@ -382,7 +383,10 @@ kld_current_sos (void) * Try to read the pathname (if it exists) and store * it in so_name. */ - if (off_pathname != 0) { + if (find_kld_path(new->so_original_name, new->so_name, + sizeof(new->so_name))) { + /* we found the kld */; + } else if (off_pathname != 0) { target_read_string(read_pointer(kld + off_pathname), &path, sizeof(new->so_name), &error); if (error != 0) { Modified: user/attilio/vmcontention/lib/libc/locale/btowc.3 ============================================================================== --- user/attilio/vmcontention/lib/libc/locale/btowc.3 Fri Mar 29 07:50:47 2013 (r248868) +++ user/attilio/vmcontention/lib/libc/locale/btowc.3 Fri Mar 29 07:58:22 2013 (r248869) @@ -42,9 +42,9 @@ .In wchar.h .In xlocale.h .Ft wint_t -.Fn btowc "int c" +.Fn btowc_l "int c" "locale_t loc" .Ft int -.Fn wctob "wint_t c" +.Fn wctob_l "wint_t c" "locale_t loc" .Sh DESCRIPTION The .Fn btowc Modified: user/attilio/vmcontention/lib/libc/locale/isblank.3 ============================================================================== --- user/attilio/vmcontention/lib/libc/locale/isblank.3 Fri Mar 29 07:50:47 2013 (r248868) +++ user/attilio/vmcontention/lib/libc/locale/isblank.3 Fri Mar 29 07:58:22 2013 (r248869) @@ -41,7 +41,7 @@ .Ft int .Fn isblank "int c" .Ft int -.Fn isblank "int c" "locale_t loc" +.Fn isblank_l "int c" "locale_t loc" .Sh DESCRIPTION The .Fn isblank Modified: user/attilio/vmcontention/lib/libpmc/Makefile ============================================================================== --- user/attilio/vmcontention/lib/libpmc/Makefile Fri Mar 29 07:50:47 2013 (r248868) +++ user/attilio/vmcontention/lib/libpmc/Makefile Fri Mar 29 07:58:22 2013 (r248869) @@ -27,6 +27,8 @@ MAN+= pmc.soft.3 MAN+= pmc.atom.3 MAN+= pmc.core.3 MAN+= pmc.core2.3 +MAN+= pmc.haswell.3 +MAN+= pmc.haswelluc.3 MAN+= pmc.iaf.3 MAN+= pmc.ivybridge.3 MAN+= pmc.ivybridgexeon.3 Modified: user/attilio/vmcontention/lib/libpmc/libpmc.c ============================================================================== --- user/attilio/vmcontention/lib/libpmc/libpmc.c Fri Mar 29 07:50:47 2013 (r248868) +++ user/attilio/vmcontention/lib/libpmc/libpmc.c Fri Mar 29 07:58:22 2013 (r248869) @@ -183,6 +183,11 @@ static const struct pmc_event_descr core __PMC_EV_ALIAS_COREI7() }; +static const struct pmc_event_descr haswell_event_table[] = +{ + __PMC_EV_ALIAS_HASWELL() +}; + static const struct pmc_event_descr ivybridge_event_table[] = { __PMC_EV_ALIAS_IVYBRIDGE() @@ -213,6 +218,11 @@ static const struct pmc_event_descr core __PMC_EV_ALIAS_COREI7UC() }; +static const struct pmc_event_descr haswelluc_event_table[] = +{ + __PMC_EV_ALIAS_HASWELLUC() +}; + static const struct pmc_event_descr sandybridgeuc_event_table[] = { __PMC_EV_ALIAS_SANDYBRIDGEUC() @@ -237,6 +247,7 @@ PMC_MDEP_TABLE(atom, IAP, PMC_CLASS_SOFT PMC_MDEP_TABLE(core, IAP, PMC_CLASS_SOFT, PMC_CLASS_TSC); PMC_MDEP_TABLE(core2, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC); PMC_MDEP_TABLE(corei7, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP); +PMC_MDEP_TABLE(haswell, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP); PMC_MDEP_TABLE(ivybridge, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC); PMC_MDEP_TABLE(ivybridge_xeon, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC); PMC_MDEP_TABLE(sandybridge, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP); @@ -277,6 +288,7 @@ PMC_CLASS_TABLE_DESC(atom, IAP, atom, ia PMC_CLASS_TABLE_DESC(core, IAP, core, iap); PMC_CLASS_TABLE_DESC(core2, IAP, core2, iap); PMC_CLASS_TABLE_DESC(corei7, IAP, corei7, iap); +PMC_CLASS_TABLE_DESC(haswell, IAP, haswell, iap); PMC_CLASS_TABLE_DESC(ivybridge, IAP, ivybridge, iap); PMC_CLASS_TABLE_DESC(ivybridge_xeon, IAP, ivybridge_xeon, iap); PMC_CLASS_TABLE_DESC(sandybridge, IAP, sandybridge, iap); @@ -284,6 +296,7 @@ PMC_CLASS_TABLE_DESC(sandybridge_xeon, I PMC_CLASS_TABLE_DESC(westmere, IAP, westmere, iap); PMC_CLASS_TABLE_DESC(ucf, UCF, ucf, ucf); PMC_CLASS_TABLE_DESC(corei7uc, UCP, corei7uc, ucp); +PMC_CLASS_TABLE_DESC(haswelluc, UCP, haswelluc, ucp); PMC_CLASS_TABLE_DESC(sandybridgeuc, UCP, sandybridgeuc, ucp); PMC_CLASS_TABLE_DESC(westmereuc, UCP, westmereuc, ucp); #endif @@ -582,6 +595,8 @@ static struct pmc_event_alias core2_alia #define atom_aliases_without_iaf core2_aliases_without_iaf #define corei7_aliases core2_aliases #define corei7_aliases_without_iaf core2_aliases_without_iaf +#define haswell_aliases core2_aliases +#define haswell_aliases_without_iaf core2_aliases_without_iaf #define ivybridge_aliases core2_aliases #define ivybridge_aliases_without_iaf core2_aliases_without_iaf #define ivybridge_xeon_aliases core2_aliases @@ -740,6 +755,31 @@ static struct pmc_masks iap_rsp_mask_sb_ NULLMASK }; +static struct pmc_masks iap_rsp_mask_haswell[] = { + PMCMASK(REQ_DMND_DATA_RD, (1ULL << 0)), + PMCMASK(REQ_DMND_RFO, (1ULL << 1)), + PMCMASK(REQ_DMND_IFETCH, (1ULL << 2)), + PMCMASK(REQ_PF_DATA_RD, (1ULL << 4)), + PMCMASK(REQ_PF_RFO, (1ULL << 5)), + PMCMASK(REQ_PF_IFETCH, (1ULL << 6)), + PMCMASK(REQ_OTHER, (1ULL << 15)), + PMCMASK(RES_ANY, (1ULL << 16)), + PMCMASK(RES_SUPPLIER_SUPP, (1ULL << 17)), + PMCMASK(RES_SUPPLIER_LLC_HITM, (1ULL << 18)), + PMCMASK(RES_SUPPLIER_LLC_HITE, (1ULL << 19)), + PMCMASK(RES_SUPPLIER_LLC_HITS, (1ULL << 20)), + PMCMASK(RES_SUPPLIER_LLC_HITF, (1ULL << 21)), + PMCMASK(RES_SUPPLIER_LOCAL, (1ULL << 22)), + PMCMASK(RES_SNOOP_SNP_NONE, (1ULL << 31)), + PMCMASK(RES_SNOOP_SNP_NO_NEEDED,(1ULL << 32)), + PMCMASK(RES_SNOOP_SNP_MISS, (1ULL << 33)), + PMCMASK(RES_SNOOP_HIT_NO_FWD, (1ULL << 34)), + PMCMASK(RES_SNOOP_HIT_FWD, (1ULL << 35)), + PMCMASK(RES_SNOOP_HITM, (1ULL << 36)), + PMCMASK(RES_NON_DRAM, (1ULL << 37)), + NULLMASK +}; + static int iap_allocate_pmc(enum pmc_event pe, char *ctrspec, struct pmc_op_pmcallocate *pmc_config) @@ -822,6 +862,11 @@ iap_allocate_pmc(enum pmc_event pe, char n = pmc_parse_mask(iap_rsp_mask_sb_sbx_ib, p, &rsp); } else return (-1); + } else if (cpu_info.pm_cputype == PMC_CPU_INTEL_HASWELL) { + if (KWPREFIXMATCH(p, IAP_KW_RSP "=")) { + n = pmc_parse_mask(iap_rsp_mask_haswell, p, &rsp); + } else + return (-1); } else return (-1); @@ -2690,6 +2735,10 @@ pmc_event_names_of_class(enum pmc_class ev = corei7_event_table; count = PMC_EVENT_TABLE_SIZE(corei7); break; + case PMC_CPU_INTEL_HASWELL: + ev = haswell_event_table; + count = PMC_EVENT_TABLE_SIZE(haswell); + break; case PMC_CPU_INTEL_IVYBRIDGE: ev = ivybridge_event_table; count = PMC_EVENT_TABLE_SIZE(ivybridge); @@ -2727,6 +2776,10 @@ pmc_event_names_of_class(enum pmc_class ev = corei7uc_event_table; count = PMC_EVENT_TABLE_SIZE(corei7uc); break; + case PMC_CPU_INTEL_HASWELL: + ev = haswelluc_event_table; + count = PMC_EVENT_TABLE_SIZE(haswelluc); + break; case PMC_CPU_INTEL_SANDYBRIDGE: ev = sandybridgeuc_event_table; count = PMC_EVENT_TABLE_SIZE(sandybridgeuc); @@ -2994,6 +3047,11 @@ pmc_init(void) pmc_class_table[n++] = &corei7uc_class_table_descr; PMC_MDEP_INIT_INTEL_V2(corei7); break; + case PMC_CPU_INTEL_HASWELL: + pmc_class_table[n++] = &ucf_class_table_descr; + pmc_class_table[n++] = &haswelluc_class_table_descr; + PMC_MDEP_INIT_INTEL_V2(haswell); + break; case PMC_CPU_INTEL_IVYBRIDGE: PMC_MDEP_INIT_INTEL_V2(ivybridge); break; @@ -3138,6 +3196,10 @@ _pmc_name_of_event(enum pmc_event pe, en ev = corei7_event_table; evfence = corei7_event_table + PMC_EVENT_TABLE_SIZE(corei7); break; + case PMC_CPU_INTEL_HASWELL: + ev = haswell_event_table; + evfence = haswell_event_table + PMC_EVENT_TABLE_SIZE(haswell); + break; case PMC_CPU_INTEL_IVYBRIDGE: ev = ivybridge_event_table; evfence = ivybridge_event_table + PMC_EVENT_TABLE_SIZE(ivybridge); Copied: user/attilio/vmcontention/lib/libpmc/pmc.haswell.3 (from r248868, head/lib/libpmc/pmc.haswell.3) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/lib/libpmc/pmc.haswell.3 Fri Mar 29 07:58:22 2013 (r248869, copy of r248868, head/lib/libpmc/pmc.haswell.3) @@ -0,0 +1,975 @@ +.\" Copyright (c) 2013 Hiren Panchasara +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd March 22, 2013 +.Dt PMC.HASWELL 3 +.Os +.Sh NAME +.Nm pmc.haswell +.Nd measurement events for +.Tn Intel +.Tn Haswsell +family CPUs +.Sh LIBRARY +.Lb libpmc +.Sh SYNOPSIS +.In pmc.h +.Sh DESCRIPTION +.Tn Intel +.Tn "Haswell" +CPUs contain PMCs conforming to version 2 of the +.Tn Intel +performance measurement architecture. +These CPUs may contain up to two classes of PMCs: +.Bl -tag -width "Li PMC_CLASS_IAP" +.It Li PMC_CLASS_IAF +Fixed-function counters that count only one hardware event per counter. +.It Li PMC_CLASS_IAP +Programmable counters that may be configured to count one of a defined +set of hardware events. +.El +.Pp +The number of PMCs available in each class and their widths need to be +determined at run time by calling +.Xr pmc_cpuinfo 3 . +.Pp +Intel Haswell PMCs are documented in +.Rs +.%B "Intel(R) 64 and IA-32 Architectures Software Developer's Manual" +.%T "Combined Volumes: 1, 2A, 2B, 2C, 3A, 3B and 3C" +.%N "Order Number: 325462-045US" +.%D January 2013 +.%Q "Intel Corporation" +.Re +.Ss HASWELL FIXED FUNCTION PMCS +These PMCs and their supported events are documented in +.Xr pmc.iaf 3 . +.Ss HASWELL PROGRAMMABLE PMCS +The programmable PMCs support the following capabilities: +.Bl -column "PMC_CAP_INTERRUPT" "Support" +.It Em Capability Ta Em Support +.It PMC_CAP_CASCADE Ta \&No +.It PMC_CAP_EDGE Ta Yes +.It PMC_CAP_INTERRUPT Ta Yes +.It PMC_CAP_INVERT Ta Yes +.It PMC_CAP_READ Ta Yes +.It PMC_CAP_PRECISE Ta \&No +.It PMC_CAP_SYSTEM Ta Yes +.It PMC_CAP_TAGGING Ta \&No +.It PMC_CAP_THRESHOLD Ta Yes +.It PMC_CAP_USER Ta Yes +.It PMC_CAP_WRITE Ta Yes +.El +.Ss Event Qualifiers +Event specifiers for these PMCs support the following common +qualifiers: +.Bl -tag -width indent +.It Li rsp= Ns Ar value +Configure the Off-core Response bits. +.Bl -tag -width indent +.It Li DMND_DATA_RD +Counts the number of demand and DCU prefetch data reads of full +and partial cachelines as well as demand data page table entry +cacheline reads. Does not count L2 data read prefetches or +instruction fetches. +.It Li REQ_DMND_RFO +Counts the number of demand and DCU prefetch reads for ownership (RFO) +requests generated by a write to data cacheline. Does not count L2 RFO +prefetches. +.It Li REQ_DMND_IFETCH +Counts the number of demand and DCU prefetch instruction cacheline reads. +Does not count L2 code read prefetches. +.It Li REQ_WB +Counts the number of writeback (modified to exclusive) transactions. +.It Li REQ_PF_DATA_RD +Counts the number of data cacheline reads generated by L2 prefetchers. +.It Li REQ_PF_RFO +Counts the number of RFO requests generated by L2 prefetchers. +.It Li REQ_PF_IFETCH +Counts the number of code reads generated by L2 prefetchers. +.It Li REQ_PF_LLC_DATA_RD +L2 prefetcher to L3 for loads. +.It Li REQ_PF_LLC_RFO +RFO requests generated by L2 prefetcher +.It Li REQ_PF_LLC_IFETCH +L2 prefetcher to L3 for instruction fetches. +.It Li REQ_BUS_LOCKS +Bus lock and split lock requests. +.It Li REQ_STRM_ST +Streaming store requests. +.It Li REQ_OTHER +Any other request that crosses IDI, including I/O. +.It Li RES_ANY +Catch all value for any response types. +.It Li RES_SUPPLIER_NO_SUPP +No Supplier Information available. +.It Li RES_SUPPLIER_LLC_HITM +M-state initial lookup stat in L3. +.It Li RES_SUPPLIER_LLC_HITE +E-state. +.It Li RES_SUPPLIER_LLC_HITS +S-state. +.It Li RES_SUPPLIER_LLC_HITF +F-state. +.It Li RES_SUPPLIER_LOCAL +Local DRAM Controller. +.It Li RES_SNOOP_SNP_NONE +No details on snoop-related information. +.It Li RES_SNOOP_SNP_NO_NEEDED +No snoop was needed to satisfy the request. +.It Li RES_SNOOP_SNP_MISS +A snoop was needed and it missed all snooped caches: +-For LLC Hit, ReslHitl was returned by all cores +-For LLC Miss, Rspl was returned by all sockets and data was returned from +DRAM. +.It Li RES_SNOOP_HIT_NO_FWD +A snoop was needed and it hits in at least one snooped cache. Hit denotes a +cache-line was valid before snoop effect. This includes: +-Snoop Hit w/ Invalidation (LLC Hit, RFO) +-Snoop Hit, Left Shared (LLC Hit/Miss, IFetch/Data_RD) +-Snoop Hit w/ Invalidation and No Forward (LLC Miss, RFO Hit S) +In the LLC Miss case, data is returned from DRAM. +.It Li RES_SNOOP_HIT_FWD +A snoop was needed and data was forwarded from a remote socket. +This includes: +-Snoop Forward Clean, Left Shared (LLC Hit/Miss, IFetch/Data_RD/RFT). +.It Li RES_SNOOP_HITM +A snoop was needed and it HitM-ed in local or remote cache. HitM denotes a +cache-line was in modified state before effect as a results of snoop. This +includes: +-Snoop HitM w/ WB (LLC miss, IFetch/Data_RD) +-Snoop Forward Modified w/ Invalidation (LLC Hit/Miss, RFO) +-Snoop MtoS (LLC Hit, IFetch/Data_RD). +.It Li RES_NON_DRAM +Target was non-DRAM system address. This includes MMIO transactions. +.El +.It Li cmask= Ns Ar value +Configure the PMC to increment only if the number of configured +events measured in a cycle is greater than or equal to +.Ar value . +.It Li edge +Configure the PMC to count the number of de-asserted to asserted +transitions of the conditions expressed by the other qualifiers. +If specified, the counter will increment only once whenever a +condition becomes true, irrespective of the number of clocks during +which the condition remains true. +.It Li inv +Invert the sense of comparison when the +.Dq Li cmask +qualifier is present, making the counter increment when the number of +events per cycle is less than the value specified by the +.Dq Li cmask +qualifier. +.It Li os +Configure the PMC to count events happening at processor privilege +level 0. +.It Li usr +Configure the PMC to count events occurring at privilege levels 1, 2 +or 3. +.El +.Pp +If neither of the +.Dq Li os +or +.Dq Li usr +qualifiers are specified, the default is to enable both. +.Ss Event Specifiers (Programmable PMCs) +Haswell programmable PMCs support the following events: +.Bl -tag -width indent +.It Li LD_BLOCKS.STORE_FORWARD +.Pq Event 03H , Umask 02H +Loads blocked by overlapping with store buffer that +cannot be forwarded. +.It Li MISALIGN_MEM_REF.LOADS +.Pq Event 05H , Umask 01H +Speculative cache-line split load uops dispatched to +L1D. +.It Li MISALIGN_MEM_REF.STORES +.Pq Event 05H , Umask 02H +Speculative cache-line split Store-address uops +dispatched to L1D. +.It Li LD_BLOCKS_PARTIAL.ADDRESS_ALIAS +.Pq Event 07H , Umask 01H +False dependencies in MOB due to partial compare +on address. +.It Li DTLB_LOAD_MISSES.MISS_CAUSES_A_WALK +.Pq Event 08H , Umask 01H +Misses in all TLB levels that cause a page walk of any +page size. +.It Li DTLB_LOAD_MISSES.WALK_COMPLETED_4K +.Pq Event 08H , Umask 02H +Completed page walks due to demand load misses +that caused 4K page walks in any TLB levels. +.It Li DTLB_LOAD_MISSES.WALK_COMPLETED_2M_4K +.Pq Event 08H , Umask 02H +Completed page walks due to demand load misses +that caused 2M/4M page walks in any TLB levels. +.It Li DTLB_LOAD_MISSES.WALK_COMPLETED +.Pq Event 08H , Umask 0EH +Completed page walks in any TLB of any page size +due to demand load misses +.It Li DTLB_LOAD_MISSES.WALK_DURATION +.Pq Event 08H , Umask 10H +Cycle PMH is busy with a walk. +.It Li DTLB_LOAD_MISSES.STLB_HIT_4K +.Pq Event 08H , Umask 20H +Load misses that missed DTLB but hit STLB (4K). +.It Li DTLB_LOAD_MISSES.STLB_HIT_2M +.Pq Event 08H , Umask 40H +Load misses that missed DTLB but hit STLB (2M). +.It Li DTLB_LOAD_MISSES.STLB_HIT +.Pq Event 08H , Umask 60H +Number of cache load STLB hits. No page walk. +.It Li DTLB_LOAD_MISSES.PDE_CACHE_MISS +.Pq Event 08H , Umask 80H +DTLB demand load misses with low part of linear-to- +physical address translation missed +.It Li INT_MISC.RECOVERY_CYCLES +.Pq Event 0DH , Umask 03H +Cycles waiting to recover after Machine Clears +except JEClear. Set Cmask= 1. +.It Li UOPS_ISSUED.ANY +.Pq Event 0EH , Umask 01H +ncrements each cycle the # of Uops issued by the +RAT to RS. +Set Cmask = 1, Inv = 1, Any= 1to count stalled cycles +of this core. +.It Li UOPS_ISSUED.FLAGS_MERGE +.Pq Event 0EH , Umask 10H +Number of flags-merge uops allocated. Such uops +adds delay. +.It Li UOPS_ISSUED.SLOW_LEA +.Pq Event 0EH , Umask 20H +Number of slow LEA or similar uops allocated. Such +uop has 3 sources (e.g. 2 sources + immediate) +regardless if as a result of LEA instruction or not. +.It Li UOPS_ISSUED.SiNGLE_MUL +.Pq Event 0EH , Umask 40H +Number of multiply packed/scalar single precision +uops allocated. +.It Li L2_RQSTS.DEMAND_DATA_RD_MISS +.Pq Event 24H , Umask 21H +Demand Data Read requests that missed L2, no +rejects. +.It Li L2_RQSTS.DEMAND_DATA_RD_HIT +.Pq Event 24H , Umask 41H +Demand Data Read requests that hit L2 cache. +.It Li L2_RQSTS.ALL_DEMAND_DATA_RD +.Pq Event 24H , Umask E1H +Counts any demand and L1 HW prefetch data load +requests to L2. +.It Li L2_RQSTS.RFO_HIT +.Pq Event 24H , Umask 42H +Counts the number of store RFO requests that hit +the L2 cache. +.It Li L2_RQSTS.RFO_MISS +.Pq Event 24H , Umask 22H +Counts the number of store RFO requests that miss +the L2 cache. +.It Li L2_RQSTS.ALL_RFO +.Pq Event 24H , Umask E2H +Counts all L2 store RFO requests. +.It Li L2_RQSTS.CODE_RD_HIT +.Pq Event 24H , Umask 44H +Number of instruction fetches that hit the L2 cache. +.It Li L2_RQSTS.CODE_RD_MISS +.Pq Event 24H , Umask 24H +Number of instruction fetches that missed the L2 +cache. +.It Li L2_RQSTS.ALL_DEMAND_MISS +.Pq Event 24H , Umask 27H +Demand requests that miss L2 cache. +.It Li L2_RQSTS.ALL_DEMAND_REFERENCES +.Pq Event 24H , Umask E7H +Demand requests to L2 cache. +.It Li L2_RQSTS.ALL_CODE_RD +.Pq Event 24H , Umask E4H +Counts all L2 code requests. +.It Li L2_RQSTS.L2_PF_HIT +.Pq Event 24H , Umask 50H +Counts all L2 HW prefetcher requests that hit L2. +.It Li L2_RQSTS.L2_PF_MISS +.Pq Event 24H , Umask 30H +Counts all L2 HW prefetcher requests that missed +L2. +.It Li L2_RQSTS.ALL_PF +.Pq Event 24H , Umask F8H +Counts all L2 HW prefetcher requests. +.It Li L2_RQSTS.MISS +.Pq Event 24H , Umask 3FH +All requests that missed L2. +.It Li L2_RQSTS.REFERENCES +.Pq Event 24H , Umask FFH +All requests to L2 cache. +.It Li L2_DEMAND_RQSTS.WB_HIT +.Pq Event 27H , Umask 50H +Not rejected writebacks that hit L2 cache +.It Li LONGEST_LAT_CACHE.REFERENCE +.Pq Event 2EH , Umask 4FH +This event counts requests originating from the core +that reference a cache line in the last level cache. +.It Li LONGEST_LAT_CACHE.MISS +.Pq Event 2EH , Umask 41H +This event counts each cache miss condition for +references to the last level cache. +.It Li CPU_CLK_UNHALTED.THREAD_P +.Pq Event 3CH , Umask 00H +Counts the number of thread cycles while the thread +is not in a halt state. The thread enters the halt state +when it is running the HLT instruction. The core +frequency may change from time to time due to +power or thermal throttling. +.It Li CPU_CLK_THREAD_UNHALTED.REF_XCLK +.Pq Event 3CH , Umask 01H +Increments at the frequency of XCLK (100 MHz) +when not halted. +.It Li L1D_PEND_MISS.PENDING +.Pq Event 48H , Umask 01H +Increments the number of outstanding L1D misses +every cycle. Set Cmaks = 1 and Edge =1 to count +occurrences. +.It Li DTLB_STORE_MISSES.MISS_CAUSES_A_WALK +.Pq Event 49H , Umask 01H +Miss in all TLB levels causes an page walk of any +page size (4K/2M/4M/1G). +.It Li DTLB_STORE_MISSES.WALK_COMPLETED_4K +.Pq Event 49H , Umask 02H +Completed page walks due to store misses in one or +more TLB levels of 4K page structure. +.It Li DTLB_STORE_MISSES.WALK_COMPLETED_2M_4M +.Pq Event 49H , Umask 04H +Completed page walks due to store misses in one or +more TLB levels of 2M/4M page structure. +.It Li DTLB_STORE_MISSES.WALK_COMPLETED +.Pq Event 49H , Umask 0EH +Completed page walks due to store miss in any TLB +levels of any page size (4K/2M/4M/1G). +.It Li DTLB_STORE_MISSES.WALK_DURATION +.Pq Event 49H , Umask 10H +Cycles PMH is busy with this walk. +.It Li DTLB_STORE_MISSES.STLB_HIT_4K +.Pq Event 49H , Umask 20H +Store misses that missed DTLB but hit STLB (4K). +.It Li DTLB_STORE_MISSES.STLB_HIT_2M +.Pq Event 49H , Umask 40H +Store misses that missed DTLB but hit STLB (2M). +.It Li DTLB_STORE_MISSES.STLB_HIT +.Pq Event 49H , Umask 60H +Store operations that miss the first TLB level but hit +the second and do not cause page walks. +.It Li DTLB_STORE_MISSES.PDE_CACHE_MISS +.Pq Event 49H , Umask 80H +DTLB store misses with low part of linear-to-physical +address translation missed. +.It Li LOAD_HIT_PRE.SW_PF +.Pq Event 4CH , Umask 01H +Non-SW-prefetch load dispatches that hit fill buffer +allocated for S/W prefetch. +.It Li LOAD_HIT_PRE.HW_PF +.Pq Event 4CH , Umask 02H +Non-SW-prefetch load dispatches that hit fill buffer +allocated for H/W prefetch. +.It Li L1D.REPLACEMENT +.Pq Event 51H , Umask 01H +Counts the number of lines brought into the L1 data +cache. +.It Li MOVE_ELIMINATION.INT_NOT_ELIMINATED +.Pq Event 58H , Umask 04H +Number of integer Move Elimination candidate uops +that were not eliminated. +.It Li MOVE_ELIMINATION.SMID_NOT_ELIMINATED +.Pq Event 58H , Umask 08H +Number of SIMD Move Elimination candidate uops +that were not eliminated. +.It Li MOVE_ELIMINATION.INT_ELIMINATED +.Pq Event 58H , Umask 01H +Unhalted core cycles when the thread is in ring 0. +.It Li MOVE_ELIMINATION.SMID_ELIMINATED +.Pq Event 58H , Umask 02H +Number of SIMD Move Elimination candidate uops +that were eliminated. +.It Li CPL_CYCLES.RING0 +.Pq Event 5CH , Umask 02H +Unhalted core cycles when the thread is in ring 0. +.It Li CPL_CYCLES.RING123 +.Pq Event 5CH , Umask 01H +Unhalted core cycles when the thread is not in ring 0. +.It Li RS_EVENTS.EMPTY_CYCLES +.Pq Event 5EH , Umask 01H +Cycles the RS is empty for the thread. +.It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD +.Pq Event 60H , Umask 01H +Offcore outstanding Demand Data Read transactions +in SQ to uncore. Set Cmask=1 to count cycles. +.It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_CORE_RD +.Pq Event 60H , Umask 02H +Offcore outstanding Demand code Read transactions +in SQ to uncore. Set Cmask=1 to count cycles. +.It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO +.Pq Event 60H , Umask 04H +Offcore outstanding RFO store transactions in SQ to +uncore. Set Cmask=1 to count cycles. +.It Li OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD +.Pq Event 60H , Umask 08H +Offcore outstanding cacheable data read +transactions in SQ to uncore. Set Cmask=1 to count +cycles. +.It Li LOCK_CYCLES.SPLIT_LOCK_UC_LOCK_DURATION +.Pq Event 63H , Umask 01H +Cycles in which the L1D and L2 are locked, due to a +UC lock or split lock. +.It Li LOCK_CYCLES.CACHE_LOCK_DURATION +.Pq Event 63H , Umask 02H +Cycles in which the L1D is locked. +.It Li IDQ.EMPTY +.Pq Event 79H , Umask 02H +Counts cycles the IDQ is empty. +.It Li IDQ.MITE_UOPS +.Pq Event 79H , Umask 04H +Increment each cycle # of uops delivered to IDQ from +MITE path. +Set Cmask = 1 to count cycles. +.It Li IDQ.DSB_UOPS +.Pq Event 79H , Umask 08H +Increment each cycle. # of uops delivered to IDQ +from DSB path. +Set Cmask = 1 to count cycles. +.It Li IDQ.MS_DSB_UOPS +.Pq Event 79H , Umask 10H +Increment each cycle # of uops delivered to IDQ +when MS_busy by DSB. Set Cmask = 1 to count +cycles. Add Edge=1 to count # of delivery. +.It Li IDQ.MS_MITE_UOPS +.Pq Event 79H , Umask 20H +ncrement each cycle # of uops delivered to IDQ +when MS_busy by MITE. Set Cmask = 1 to count +cycles. +.It Li IDQ.MS_UOPS +.Pq Event 79H , Umask 30H +Increment each cycle # of uops delivered to IDQ from +MS by either DSB or MITE. Set Cmask = 1 to count +cycles. +.It Li IDQ.ALL_DSB_CYCLES_ANY_UOPS +.Pq Event 79H , Umask 18H +Counts cycles DSB is delivered at least one uops. Set +Cmask = 1. +.It Li IDQ.ALL_DSB_CYCLES_4_UOPS +.Pq Event 79H , Umask 18H +Counts cycles DSB is delivered four uops. Set Cmask +=4. +.It Li IDQ.ALL_MITE_CYCLES_ANY_UOPS +.Pq Event 79H , Umask 24H +Counts cycles MITE is delivered at least one uops. Set +Cmask = 1. +.It Li IDQ.ALL_MITE_CYCLES_4_UOPS +.Pq Event 79H , Umask 24H +Counts cycles MITE is delivered four uops. Set Cmask +=4. +.It Li IDQ.MITE_ALL_UOPS +.Pq Event 79H , Umask 3CH +# of uops delivered to IDQ from any path. +.It Li ICACHE.MISSES +.Pq Event 80H , Umask 02H +Number of Instruction Cache, Streaming Buffer and +Victim Cache Misses. Includes UC accesses. +.It Li ITLB_MISSES.MISS_CAUSES_A_WALK +.Pq Event 85H , Umask 01H +Misses in ITLB that causes a page walk of any page +size. +.It Li ITLB_MISSES.WALK_COMPLETED_4K +.Pq Event 85H , Umask 02H +Completed page walks due to misses in ITLB 4K page +entries. +.It Li TLB_MISSES.WALK_COMPLETED_2M_4M +.Pq Event 85H , Umask 04H +Completed page walks due to misses in ITLB 2M/4M +page entries. +.It Li ITLB_MISSES.WALK_COMPLETED +.Pq Event 85H , Umask 0EH +Completed page walks in ITLB of any page size. +.It Li ITLB_MISSES.WALK_DURATION +.Pq Event 85H , Umask 10H +Cycle PMH is busy with a walk. +.It Li ITLB_MISSES.STLB_HIT_4K +.Pq Event 85H , Umask 20H +ITLB misses that hit STLB (4K). +.It Li ITLB_MISSES.STLB_HIT_2M +.Pq Event 85H , Umask 40H +ITLB misses that hit STLB (2K). +.It Li ITLB_MISSES.STLB_HIT +.Pq Event 85H , Umask 60H +TLB misses that hit STLB. No page walk. +.It Li ILD_STALL.LCP +.Pq Event 87H , Umask 01H +Stalls caused by changing prefix length of the +instruction. +.It Li ILD_STALL.IQ_FULL +.Pq Event 87H , Umask 04H +Stall cycles due to IQ is full. +.It Li BR_INST_EXEC.COND +.Pq Event 88H , Umask 01H +Qualify conditional near branch instructions +executed, but not necessarily retired. +.It Li BR_INST_EXEC.DIRECT_JMP +.Pq Event 88H , Umask 02H +Qualify all unconditional near branch instructions +excluding calls and indirect branches. +.It Li BR_INST_EXEC.INDIRECT_JMP_NON_CALL_RET +.Pq Event 88H , Umask 04H +Qualify executed indirect near branch instructions +that are not calls nor returns. +.It Li BR_INST_EXEC.RETURN_NEAR +.Pq Event 88H , Umask 08H +Qualify indirect near branches that have a return +mnemonic. +.It Li BR_INST_EXEC.DIRECT_NEAR_CALL +.Pq Event 88H , Umask 10H +Qualify unconditional near call branch instructions, +excluding non call branch, executed. +.It Li BR_INST_EXEC.INDIRECT_NEAR_CALL +.Pq Event 88H , Umask 20H +Qualify indirect near calls, including both register and +memory indirect, executed. +.It Li BR_INST_EXEC.NONTAKEN +.Pq Event 88H , Umask 40H +Qualify non-taken near branches executed. +.It Li BR_INST_EXEC.TAKEN +.Pq Event 88H , Umask 80H +Qualify taken near branches executed. Must combine +with 01H,02H, 04H, 08H, 10H, 20H. +.It Li BR_INST_EXEC.ALL_BRANCHES +.Pq Event 88H , Umask FFH +Counts all near executed branches (not necessarily +retired). +.It Li BR_MISP_EXEC.COND +.Pq Event 89H , Umask 01H +Qualify conditional near branch instructions +mispredicted. +.It Li BR_MISP_EXEC.INDIRECT_JMP_NON_CALL_RET +.Pq Event 89H , Umask 04H +Qualify mispredicted indirect near branch +instructions that are not calls nor returns. +.It Li BR_MISP_EXEC.RETURN_NEAR +.Pq Event 89H , Umask 08H +Qualify mispredicted indirect near branches that +have a return mnemonic. +.It Li BR_MISP_EXEC.DIRECT_NEAR_CALL +.Pq Event 89H , Umask 10H +Qualify mispredicted unconditional near call branch +instructions, excluding non call branch, executed. +.It Li BR_MISP_EXEC.INDIRECT_NEAR_CALL +.Pq Event 89H , Umask 20H +Qualify mispredicted indirect near calls, including +both register and memory indirect, executed. +.It Li BR_MISP_EXEC.NONTAKEN +.Pq Event 89H , Umask 40H +Qualify mispredicted non-taken near branches +executed. +.It Li BR_MISP_EXEC.TAKEN +.Pq Event 89H , Umask 80H +Qualify mispredicted taken near branches executed. +Must combine with 01H,02H, 04H, 08H, 10H, 20H. +.It Li BR_MISP_EXEC.ALL_BRANCHES +.Pq Event 89H , Umask FFH +Counts all near executed branches (not necessarily +retired). +.It Li IDQ_UOPS_NOT_DELIVERED.CORE +.Pq Event 9CH , Umask 01H +Count number of non-delivered uops to RAT per +thread. +.It Li UOPS_EXECUTED_PORT.PORT_0 +.Pq Event A1H , Umask 01H +Cycles which a Uop is dispatched on port 0 in this +thread. +.It Li UOPS_EXECUTED_PORT.PORT_1 +.Pq Event A1H , Umask 02H +Cycles which a Uop is dispatched on port 1 in this +thread. +.It Li UOPS_EXECUTED_PORT.PORT_2 +.Pq Event A1H , Umask 04H +Cycles which a Uop is dispatched on port 2 in this +thread. +.It Li UOPS_EXECUTED_PORT.PORT_3 +.Pq Event A1H , Umask 08H +Cycles which a Uop is dispatched on port 3 in this +thread. +.It Li UOPS_EXECUTED_PORT.PORT_4 +.Pq Event A1H , Umask 10H +Cycles which a Uop is dispatched on port 4 in this +thread. +.It Li UOPS_EXECUTED_PORT.PORT_5 +.Pq Event A1H , Umask 20H +Cycles which a Uop is dispatched on port 5 in this +thread. +.It Li UOPS_EXECUTED_PORT.PORT_6 +.Pq Event A1H , Umask 40H +Cycles which a Uop is dispatched on port 6 in this +thread. +.It Li UOPS_EXECUTED_PORT.PORT_7 +.Pq Event A1H , Umask 80H +Cycles which a Uop is dispatched on port 7 in this +thread. +.It Li RESOURCE_STALLS.ANY +.Pq Event A2H , Umask 01H +Cycles Allocation is stalled due to Resource Related +reason. +.It Li RESOURCE_STALLS.RS +.Pq Event A2H , Umask 04H +Cycles stalled due to no eligible RS entry available. +.It Li RESOURCE_STALLS.SB +.Pq Event A2H , Umask 08H +Cycles stalled due to no store buffers available (not +including draining form sync). +.It Li RESOURCE_STALLS.ROB +.Pq Event A2H , Umask 10H +Cycles stalled due to re-order buffer full. +.It Li CYCLE_ACTIVITY.CYCLES_L2_PENDING +.Pq Event A3H , Umask 01H +Cycles with pending L2 miss loads. Set Cmask=2 to *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Fri Mar 29 08:49:29 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0D0A937D; Fri, 29 Mar 2013 08:49:29 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E55C62FF; Fri, 29 Mar 2013 08:49:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2T8nSdO015806; Fri, 29 Mar 2013 08:49:28 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2T8nS0b015799; Fri, 29 Mar 2013 08:49:28 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201303290849.r2T8nS0b015799@svn.freebsd.org> From: Attilio Rao Date: Fri, 29 Mar 2013 08:49:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248873 - in user/attilio/vmcontention: bin/sh lib/libpmc sys/cam/ata sys/cam/scsi X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2013 08:49:29 -0000 Author: attilio Date: Fri Mar 29 08:49:27 2013 New Revision: 248873 URL: http://svnweb.freebsd.org/changeset/base/248873 Log: MFC Modified: user/attilio/vmcontention/bin/sh/sh.1 user/attilio/vmcontention/lib/libpmc/pmc.haswell.3 user/attilio/vmcontention/lib/libpmc/pmc.haswelluc.3 user/attilio/vmcontention/sys/cam/ata/ata_da.c user/attilio/vmcontention/sys/cam/scsi/scsi_da.c Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/sys/ (props changed) Modified: user/attilio/vmcontention/bin/sh/sh.1 ============================================================================== --- user/attilio/vmcontention/bin/sh/sh.1 Fri Mar 29 08:33:18 2013 (r248872) +++ user/attilio/vmcontention/bin/sh/sh.1 Fri Mar 29 08:49:27 2013 (r248873) @@ -1628,7 +1628,7 @@ form begins with a subshell, the .Li $( and -.Li ( +.Li (\& must be separated by whitespace to avoid ambiguity with arithmetic expansion. .Ss Arithmetic Expansion Modified: user/attilio/vmcontention/lib/libpmc/pmc.haswell.3 ============================================================================== --- user/attilio/vmcontention/lib/libpmc/pmc.haswell.3 Fri Mar 29 08:33:18 2013 (r248872) +++ user/attilio/vmcontention/lib/libpmc/pmc.haswell.3 Fri Mar 29 08:49:27 2013 (r248873) @@ -201,60 +201,60 @@ Haswell programmable PMCs support the fo .Bl -tag -width indent .It Li LD_BLOCKS.STORE_FORWARD .Pq Event 03H , Umask 02H -Loads blocked by overlapping with store buffer that -cannot be forwarded. +Loads blocked by overlapping with store buffer that +cannot be forwarded. .It Li MISALIGN_MEM_REF.LOADS .Pq Event 05H , Umask 01H -Speculative cache-line split load uops dispatched to -L1D. +Speculative cache-line split load uops dispatched to +L1D. .It Li MISALIGN_MEM_REF.STORES .Pq Event 05H , Umask 02H -Speculative cache-line split Store-address uops -dispatched to L1D. +Speculative cache-line split Store-address uops +dispatched to L1D. .It Li LD_BLOCKS_PARTIAL.ADDRESS_ALIAS .Pq Event 07H , Umask 01H -False dependencies in MOB due to partial compare -on address. +False dependencies in MOB due to partial compare +on address. .It Li DTLB_LOAD_MISSES.MISS_CAUSES_A_WALK .Pq Event 08H , Umask 01H -Misses in all TLB levels that cause a page walk of any -page size. +Misses in all TLB levels that cause a page walk of any +page size. .It Li DTLB_LOAD_MISSES.WALK_COMPLETED_4K .Pq Event 08H , Umask 02H -Completed page walks due to demand load misses -that caused 4K page walks in any TLB levels. +Completed page walks due to demand load misses +that caused 4K page walks in any TLB levels. .It Li DTLB_LOAD_MISSES.WALK_COMPLETED_2M_4K .Pq Event 08H , Umask 02H -Completed page walks due to demand load misses -that caused 2M/4M page walks in any TLB levels. +Completed page walks due to demand load misses +that caused 2M/4M page walks in any TLB levels. .It Li DTLB_LOAD_MISSES.WALK_COMPLETED .Pq Event 08H , Umask 0EH -Completed page walks in any TLB of any page size -due to demand load misses +Completed page walks in any TLB of any page size +due to demand load misses .It Li DTLB_LOAD_MISSES.WALK_DURATION .Pq Event 08H , Umask 10H -Cycle PMH is busy with a walk. +Cycle PMH is busy with a walk. .It Li DTLB_LOAD_MISSES.STLB_HIT_4K .Pq Event 08H , Umask 20H -Load misses that missed DTLB but hit STLB (4K). +Load misses that missed DTLB but hit STLB (4K). .It Li DTLB_LOAD_MISSES.STLB_HIT_2M .Pq Event 08H , Umask 40H -Load misses that missed DTLB but hit STLB (2M). +Load misses that missed DTLB but hit STLB (2M). .It Li DTLB_LOAD_MISSES.STLB_HIT .Pq Event 08H , Umask 60H Number of cache load STLB hits. No page walk. .It Li DTLB_LOAD_MISSES.PDE_CACHE_MISS .Pq Event 08H , Umask 80H -DTLB demand load misses with low part of linear-to- -physical address translation missed +DTLB demand load misses with low part of linear-to- +physical address translation missed .It Li INT_MISC.RECOVERY_CYCLES .Pq Event 0DH , Umask 03H -Cycles waiting to recover after Machine Clears -except JEClear. Set Cmask= 1. +Cycles waiting to recover after Machine Clears +except JEClear. Set Cmask= 1. .It Li UOPS_ISSUED.ANY .Pq Event 0EH , Umask 01H -ncrements each cycle the # of Uops issued by the -RAT to RS. +ncrements each cycle the # of Uops issued by the +RAT to RS. Set Cmask = 1, Inv = 1, Any= 1to count stalled cycles of this core. .It Li UOPS_ISSUED.FLAGS_MERGE @@ -278,7 +278,7 @@ rejects. .Pq Event 24H , Umask 41H Demand Data Read requests that hit L2 cache. .It Li L2_RQSTS.ALL_DEMAND_DATA_RD -.Pq Event 24H , Umask E1H +.Pq Event 24H , Umask E1H Counts any demand and L1 HW prefetch data load requests to L2. .It Li L2_RQSTS.RFO_HIT @@ -348,9 +348,9 @@ Increments at the frequency of XCLK (100 when not halted. .It Li L1D_PEND_MISS.PENDING .Pq Event 48H , Umask 01H -Increments the number of outstanding L1D misses -every cycle. Set Cmaks = 1 and Edge =1 to count -occurrences. +Increments the number of outstanding L1D misses +every cycle. Set Cmaks = 1 and Edge =1 to count +occurrences. .It Li DTLB_STORE_MISSES.MISS_CAUSES_A_WALK .Pq Event 49H , Umask 01H Miss in all TLB levels causes an page walk of any @@ -422,15 +422,15 @@ Unhalted core cycles when the thread is Cycles the RS is empty for the thread. .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD .Pq Event 60H , Umask 01H -Offcore outstanding Demand Data Read transactions +Offcore outstanding Demand Data Read transactions in SQ to uncore. Set Cmask=1 to count cycles. .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_CORE_RD .Pq Event 60H , Umask 02H -Offcore outstanding Demand code Read transactions +Offcore outstanding Demand code Read transactions in SQ to uncore. Set Cmask=1 to count cycles. .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO .Pq Event 60H , Umask 04H -Offcore outstanding RFO store transactions in SQ to +Offcore outstanding RFO store transactions in SQ to uncore. Set Cmask=1 to count cycles. .It Li OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD .Pq Event 60H , Umask 08H @@ -449,7 +449,7 @@ Cycles in which the L1D is locked. Counts cycles the IDQ is empty. .It Li IDQ.MITE_UOPS .Pq Event 79H , Umask 04H -Increment each cycle # of uops delivered to IDQ from +Increment each cycle # of uops delivered to IDQ from MITE path. Set Cmask = 1 to count cycles. .It Li IDQ.DSB_UOPS @@ -459,14 +459,14 @@ from DSB path. Set Cmask = 1 to count cycles. .It Li IDQ.MS_DSB_UOPS .Pq Event 79H , Umask 10H -Increment each cycle # of uops delivered to IDQ -when MS_busy by DSB. Set Cmask = 1 to count -cycles. Add Edge=1 to count # of delivery. +Increment each cycle # of uops delivered to IDQ +when MS_busy by DSB. Set Cmask = 1 to count +cycles. Add Edge=1 to count # of delivery. .It Li IDQ.MS_MITE_UOPS .Pq Event 79H , Umask 20H -ncrement each cycle # of uops delivered to IDQ -when MS_busy by MITE. Set Cmask = 1 to count -cycles. +ncrement each cycle # of uops delivered to IDQ +when MS_busy by MITE. Set Cmask = 1 to count +cycles. .It Li IDQ.MS_UOPS .Pq Event 79H , Umask 30H Increment each cycle # of uops delivered to IDQ from @@ -474,163 +474,163 @@ MS by either DSB or MITE. Set Cmask = 1 cycles. .It Li IDQ.ALL_DSB_CYCLES_ANY_UOPS .Pq Event 79H , Umask 18H -Counts cycles DSB is delivered at least one uops. Set -Cmask = 1. +Counts cycles DSB is delivered at least one uops. Set +Cmask = 1. .It Li IDQ.ALL_DSB_CYCLES_4_UOPS .Pq Event 79H , Umask 18H -Counts cycles DSB is delivered four uops. Set Cmask +Counts cycles DSB is delivered four uops. Set Cmask =4. .It Li IDQ.ALL_MITE_CYCLES_ANY_UOPS .Pq Event 79H , Umask 24H -Counts cycles MITE is delivered at least one uops. Set -Cmask = 1. +Counts cycles MITE is delivered at least one uops. Set +Cmask = 1. .It Li IDQ.ALL_MITE_CYCLES_4_UOPS .Pq Event 79H , Umask 24H -Counts cycles MITE is delivered four uops. Set Cmask +Counts cycles MITE is delivered four uops. Set Cmask =4. .It Li IDQ.MITE_ALL_UOPS .Pq Event 79H , Umask 3CH -# of uops delivered to IDQ from any path. +# of uops delivered to IDQ from any path. .It Li ICACHE.MISSES .Pq Event 80H , Umask 02H -Number of Instruction Cache, Streaming Buffer and -Victim Cache Misses. Includes UC accesses. +Number of Instruction Cache, Streaming Buffer and +Victim Cache Misses. Includes UC accesses. .It Li ITLB_MISSES.MISS_CAUSES_A_WALK .Pq Event 85H , Umask 01H -Misses in ITLB that causes a page walk of any page -size. +Misses in ITLB that causes a page walk of any page +size. .It Li ITLB_MISSES.WALK_COMPLETED_4K .Pq Event 85H , Umask 02H -Completed page walks due to misses in ITLB 4K page -entries. +Completed page walks due to misses in ITLB 4K page +entries. .It Li TLB_MISSES.WALK_COMPLETED_2M_4M .Pq Event 85H , Umask 04H -Completed page walks due to misses in ITLB 2M/4M +Completed page walks due to misses in ITLB 2M/4M page entries. .It Li ITLB_MISSES.WALK_COMPLETED .Pq Event 85H , Umask 0EH -Completed page walks in ITLB of any page size. +Completed page walks in ITLB of any page size. .It Li ITLB_MISSES.WALK_DURATION .Pq Event 85H , Umask 10H -Cycle PMH is busy with a walk. +Cycle PMH is busy with a walk. .It Li ITLB_MISSES.STLB_HIT_4K .Pq Event 85H , Umask 20H -ITLB misses that hit STLB (4K). +ITLB misses that hit STLB (4K). .It Li ITLB_MISSES.STLB_HIT_2M .Pq Event 85H , Umask 40H -ITLB misses that hit STLB (2K). +ITLB misses that hit STLB (2K). .It Li ITLB_MISSES.STLB_HIT .Pq Event 85H , Umask 60H -TLB misses that hit STLB. No page walk. +TLB misses that hit STLB. No page walk. .It Li ILD_STALL.LCP .Pq Event 87H , Umask 01H -Stalls caused by changing prefix length of the +Stalls caused by changing prefix length of the instruction. .It Li ILD_STALL.IQ_FULL .Pq Event 87H , Umask 04H -Stall cycles due to IQ is full. +Stall cycles due to IQ is full. .It Li BR_INST_EXEC.COND .Pq Event 88H , Umask 01H -Qualify conditional near branch instructions -executed, but not necessarily retired. +Qualify conditional near branch instructions +executed, but not necessarily retired. .It Li BR_INST_EXEC.DIRECT_JMP .Pq Event 88H , Umask 02H -Qualify all unconditional near branch instructions -excluding calls and indirect branches. +Qualify all unconditional near branch instructions +excluding calls and indirect branches. .It Li BR_INST_EXEC.INDIRECT_JMP_NON_CALL_RET .Pq Event 88H , Umask 04H -Qualify executed indirect near branch instructions -that are not calls nor returns. +Qualify executed indirect near branch instructions +that are not calls nor returns. .It Li BR_INST_EXEC.RETURN_NEAR .Pq Event 88H , Umask 08H -Qualify indirect near branches that have a return -mnemonic. +Qualify indirect near branches that have a return +mnemonic. .It Li BR_INST_EXEC.DIRECT_NEAR_CALL .Pq Event 88H , Umask 10H -Qualify unconditional near call branch instructions, -excluding non call branch, executed. +Qualify unconditional near call branch instructions, +excluding non call branch, executed. .It Li BR_INST_EXEC.INDIRECT_NEAR_CALL .Pq Event 88H , Umask 20H Qualify indirect near calls, including both register and memory indirect, executed. .It Li BR_INST_EXEC.NONTAKEN .Pq Event 88H , Umask 40H -Qualify non-taken near branches executed. +Qualify non-taken near branches executed. .It Li BR_INST_EXEC.TAKEN .Pq Event 88H , Umask 80H -Qualify taken near branches executed. Must combine -with 01H,02H, 04H, 08H, 10H, 20H. +Qualify taken near branches executed. Must combine +with 01H,02H, 04H, 08H, 10H, 20H. .It Li BR_INST_EXEC.ALL_BRANCHES .Pq Event 88H , Umask FFH -Counts all near executed branches (not necessarily -retired). +Counts all near executed branches (not necessarily +retired). .It Li BR_MISP_EXEC.COND .Pq Event 89H , Umask 01H -Qualify conditional near branch instructions -mispredicted. +Qualify conditional near branch instructions +mispredicted. .It Li BR_MISP_EXEC.INDIRECT_JMP_NON_CALL_RET .Pq Event 89H , Umask 04H -Qualify mispredicted indirect near branch -instructions that are not calls nor returns. +Qualify mispredicted indirect near branch +instructions that are not calls nor returns. .It Li BR_MISP_EXEC.RETURN_NEAR .Pq Event 89H , Umask 08H -Qualify mispredicted indirect near branches that -have a return mnemonic. +Qualify mispredicted indirect near branches that +have a return mnemonic. .It Li BR_MISP_EXEC.DIRECT_NEAR_CALL .Pq Event 89H , Umask 10H -Qualify mispredicted unconditional near call branch -instructions, excluding non call branch, executed. +Qualify mispredicted unconditional near call branch +instructions, excluding non call branch, executed. .It Li BR_MISP_EXEC.INDIRECT_NEAR_CALL .Pq Event 89H , Umask 20H -Qualify mispredicted indirect near calls, including -both register and memory indirect, executed. +Qualify mispredicted indirect near calls, including +both register and memory indirect, executed. .It Li BR_MISP_EXEC.NONTAKEN .Pq Event 89H , Umask 40H -Qualify mispredicted non-taken near branches +Qualify mispredicted non-taken near branches executed. .It Li BR_MISP_EXEC.TAKEN .Pq Event 89H , Umask 80H -Qualify mispredicted taken near branches executed. -Must combine with 01H,02H, 04H, 08H, 10H, 20H. +Qualify mispredicted taken near branches executed. +Must combine with 01H,02H, 04H, 08H, 10H, 20H. .It Li BR_MISP_EXEC.ALL_BRANCHES .Pq Event 89H , Umask FFH -Counts all near executed branches (not necessarily -retired). +Counts all near executed branches (not necessarily +retired). .It Li IDQ_UOPS_NOT_DELIVERED.CORE .Pq Event 9CH , Umask 01H -Count number of non-delivered uops to RAT per -thread. +Count number of non-delivered uops to RAT per +thread. .It Li UOPS_EXECUTED_PORT.PORT_0 .Pq Event A1H , Umask 01H -Cycles which a Uop is dispatched on port 0 in this -thread. +Cycles which a Uop is dispatched on port 0 in this +thread. .It Li UOPS_EXECUTED_PORT.PORT_1 .Pq Event A1H , Umask 02H -Cycles which a Uop is dispatched on port 1 in this +Cycles which a Uop is dispatched on port 1 in this thread. .It Li UOPS_EXECUTED_PORT.PORT_2 .Pq Event A1H , Umask 04H -Cycles which a Uop is dispatched on port 2 in this +Cycles which a Uop is dispatched on port 2 in this thread. .It Li UOPS_EXECUTED_PORT.PORT_3 .Pq Event A1H , Umask 08H -Cycles which a Uop is dispatched on port 3 in this +Cycles which a Uop is dispatched on port 3 in this thread. .It Li UOPS_EXECUTED_PORT.PORT_4 .Pq Event A1H , Umask 10H -Cycles which a Uop is dispatched on port 4 in this +Cycles which a Uop is dispatched on port 4 in this thread. .It Li UOPS_EXECUTED_PORT.PORT_5 .Pq Event A1H , Umask 20H -Cycles which a Uop is dispatched on port 5 in this +Cycles which a Uop is dispatched on port 5 in this thread. .It Li UOPS_EXECUTED_PORT.PORT_6 .Pq Event A1H , Umask 40H -Cycles which a Uop is dispatched on port 6 in this +Cycles which a Uop is dispatched on port 6 in this thread. .It Li UOPS_EXECUTED_PORT.PORT_7 .Pq Event A1H , Umask 80H -Cycles which a Uop is dispatched on port 7 in this +Cycles which a Uop is dispatched on port 7 in this thread. .It Li RESOURCE_STALLS.ANY .Pq Event A2H , Umask 01H @@ -673,7 +673,7 @@ Demand data read requests sent to uncore Demand code read requests sent to uncore. .It Li OFFCORE_REQUESTS.DEMAND_RFO .Pq Event B0H , Umask 04H -Demand RFO read requests sent to uncore, including +Demand RFO read requests sent to uncore, including regular RFOs, locks, ItoM. .It Li OFFCORE_REQUESTS.ALL_DATA_RD .Pq Event B0H , Umask 08H @@ -723,66 +723,66 @@ DTLB flush attempts of the thread-specif Count number of STLB flush attempts. .It Li INST_RETIRED.ANY_P .Pq Event C0H , Umask 00H -Number of instructions at retirement. +Number of instructions at retirement. .It Li INST_RETIRED.ALL .Pq Event C0H , Umask 01H -Precise instruction retired event with HW to reduce -effect of PEBS shadow in IP distribution. +Precise instruction retired event with HW to reduce +effect of PEBS shadow in IP distribution. .It Li OTHER_ASSISTS.AVX_TO_SSE .Pq Event C1H , Umask 08H -Number of transitions from AVX-256 to legacy SSE -when penalty applicable. +Number of transitions from AVX-256 to legacy SSE +when penalty applicable. .It Li OTHER_ASSISTS.SSE_TO_AVX .Pq Event C1H , Umask 10H -Number of transitions from SSE to AVX-256 when -penalty applicable. +Number of transitions from SSE to AVX-256 when +penalty applicable. .It Li OTHER_ASSISTS.ANY_WB_ASSIST .Pq Event C1H , Umask 40H -Number of microcode assists invoked by HW upon -uop writeback. +Number of microcode assists invoked by HW upon +uop writeback. .It Li UOPS_RETIRED.ALL .Pq Event C2H , Umask 01H -Counts the number of micro-ops retired, Use -cmask=1 and invert to count active cycles or stalled -cycles. +Counts the number of micro-ops retired, Use +cmask=1 and invert to count active cycles or stalled +cycles. .It Li UOPS_RETIRED.RETIRE_SLOTS .Pq Event C2H , Umask 02H -Counts the number of retirement slots used each +Counts the number of retirement slots used each cycle. .It Li MACHINE_CLEARS.MEMORY_ORDERING .Pq Event C3H , Umask 02H -Counts the number of machine clears due to memory -order conflicts. +Counts the number of machine clears due to memory +order conflicts. .It Li MACHINE_CLEARS.SMC .Pq Event C3H , Umask 04H -Number of self-modifying-code machine clears +Number of self-modifying-code machine clears detected. .It Li MACHINE_CLEARS.MASKMOV .Pq Event C3H , Umask 20H -Counts the number of executed AVX masked load -operations that refer to an illegal address range with -the mask bits set to 0. +Counts the number of executed AVX masked load +operations that refer to an illegal address range with +the mask bits set to 0. .It Li BR_INST_RETIRED.ALL_BRANCHES .Pq Event C4H , Umask 00H -Branch instructions at retirement. +Branch instructions at retirement. .It Li BR_INST_RETIRED.CONDITIONAL .Pq Event C4H , Umask 01H Counts the number of conditional branch instructions Supports PEBS retired. .It Li BR_INST_RETIRED.NEAR_CALL .Pq Event C4H , Umask 02H -Direct and indirect near call instructions retired. +Direct and indirect near call instructions retired. .It Li BR_INST_RETIRED.ALL_BRANCHES .Pq Event C4H , Umask 04H -Counts the number of branch instructions retired. +Counts the number of branch instructions retired. .It Li BR_INST_RETIRED.NEAR_RETURN .Pq Event C4H , Umask 08H -Counts the number of near return instructions -retired. +Counts the number of near return instructions +retired. .It Li BR_INST_RETIRED.NOT_TAKEN .Pq Event C4H , Umask 10H -Counts the number of not taken branch instructions -retired. +Counts the number of not taken branch instructions +retired. It Li BR_INST_RETIRED.NEAR_TAKEN .Pq Event C4H , Umask 20H Number of near taken branches retired. @@ -847,10 +847,10 @@ Qualify any retired memory uops. Must co umask 01H, 02H, to produce counts. .It Li MEM_LOAD_UOPS_RETIRED.L1_HIT .Pq Event D1H , Umask 01H -Retired load uops with L1 cache hits as data sources. +Retired load uops with L1 cache hits as data sources. .It Li MEM_LOAD_UOPS_RETIRED.L2_HIT .Pq Event D1H , Umask 02H -Retired load uops with L2 cache hits as data sources. +Retired load uops with L2 cache hits as data sources. .It Li MEM_LOAD_UOPS_RETIRED.LLC_HIT .Pq Event D1H , Umask 04H Retired load uops with LLC cache hits as data @@ -870,64 +870,64 @@ Retired load uops which data sources wer and cross-core snoop missed in on-pkg core cache. .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT .Pq Event D2H , Umask 02H -Retired load uops which data sources were LLC and -cross-core snoop hits in on-pkg core cache. +Retired load uops which data sources were LLC and +cross-core snoop hits in on-pkg core cache. .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM .Pq Event D2H , Umask 04H -Retired load uops which data sources were HitM -responses from shared LLC. +Retired load uops which data sources were HitM +responses from shared LLC. .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_NONE .Pq Event D2H , Umask 08H -Retired load uops which data sources were hits in -LLC without snoops required. +Retired load uops which data sources were hits in +LLC without snoops required. .It Li MEM_LOAD_UOPS_LLC_MISS_RETIRED.LOCAL_DRAM .Pq Event D3H , Umask 01H -Retired load uops which data sources missed LLC but +Retired load uops which data sources missed LLC but serviced from local dram. .It Li BACLEARS.ANY .Pq Event E6H , Umask 1FH -Number of front end re-steers due to BPU -misprediction. +Number of front end re-steers due to BPU +misprediction. .It Li L2_TRANS.DEMAND_DATA_RD .Pq Event F0H , Umask 01H -Demand Data Read requests that access L2 cache. +Demand Data Read requests that access L2 cache. .It Li L2_TRANS.RFO .Pq Event F0H , Umask 02H -RFO requests that access L2 cache. +RFO requests that access L2 cache. .It Li L2_TRANS.CODE_RD .Pq Event F0H , Umask 04H -L2 cache accesses when fetching instructions. +L2 cache accesses when fetching instructions. .It Li L2_TRANS.ALL_PF .Pq Event F0H , Umask 08H -Any MLC or LLC HW prefetch accessing L2, including -rejects. +Any MLC or LLC HW prefetch accessing L2, including +rejects. .It Li L2_TRANS.L1D_WB .Pq Event F0H , Umask 10H -L1D writebacks that access L2 cache. +L1D writebacks that access L2 cache. .It Li L2_TRANS.L2_FILL .Pq Event F0H , Umask 20H -L2 fill requests that access L2 cache. +L2 fill requests that access L2 cache. .It Li L2_TRANS.L2_WB .Pq Event F0H , Umask 40H -L2 writebacks that access L2 cache. +L2 writebacks that access L2 cache. .It Li L2_TRANS.ALL_REQUESTS .Pq Event F0H , Umask 80H -Transactions accessing L2 pipe. +Transactions accessing L2 pipe. .It Li L2_LINES_IN.I .Pq Event F1H , Umask 01H -L2 cache lines in I state filling L2. +L2 cache lines in I state filling L2. .It Li L2_LINES_IN.S .Pq Event F1H , Umask 02H -L2 cache lines in S state filling L2. +L2 cache lines in S state filling L2. .It Li L2_LINES_IN.E .Pq Event F1H , Umask 04H -L2 cache lines in E state filling L2. +L2 cache lines in E state filling L2. .It Li L2_LINES_IN.ALL .Pq Event F1H , Umask 07H -L2 cache lines filling L2. +L2 cache lines filling L2. .It Li L2_LINES_OUT.DEMAND_CLEAN .Pq Event F2H , Umask 05H -Clean L2 cache lines evicted by demand. +Clean L2 cache lines evicted by demand. .It Li L2_LINES_OUT.DEMAND_DIRTY .Pq Event F2H , Umask 06H Dirty L2 cache lines evicted by demand. Modified: user/attilio/vmcontention/lib/libpmc/pmc.haswelluc.3 ============================================================================== --- user/attilio/vmcontention/lib/libpmc/pmc.haswelluc.3 Fri Mar 29 08:33:18 2013 (r248872) +++ user/attilio/vmcontention/lib/libpmc/pmc.haswelluc.3 Fri Mar 29 08:49:27 2013 (r248873) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2013 Hiren Panchasara +.\" Copyright (c) 2013 Hiren Panchasara .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -141,7 +141,7 @@ Filter on cross-core snoops initiated by to LLC eviction. .It Li UNC_CBO_CACHE_LOOKUP.M .Pq Event 34H , Umask 01H -LLC lookup request that access cache and found line in +LLC lookup request that access cache and found line in M-state. .It Li UNC_CBO_CACHE_LOOKUP.ES .Pq Event 34H , Umask 06H @@ -231,7 +231,7 @@ The library was written by .An "Joseph Koshy" .Aq jkoshy@FreeBSD.org . -The support for the Haswell +The support for the Haswell microarchitecture was added by .An "Hiren Panchasara" .Aq hiren.panchasara@gmail.com . Modified: user/attilio/vmcontention/sys/cam/ata/ata_da.c ============================================================================== --- user/attilio/vmcontention/sys/cam/ata/ata_da.c Fri Mar 29 08:33:18 2013 (r248872) +++ user/attilio/vmcontention/sys/cam/ata/ata_da.c Fri Mar 29 08:49:27 2013 (r248873) @@ -1833,11 +1833,10 @@ adaflush(void) { struct cam_periph *periph; struct ada_softc *softc; + union ccb *ccb; int error; CAM_PERIPH_FOREACH(periph, &adadriver) { - union ccb ccb; - /* If we paniced with lock held - not recurse here. */ if (cam_periph_owned(periph)) continue; @@ -1853,10 +1852,8 @@ adaflush(void) continue; } - xpt_setup_ccb(&ccb.ccb_h, periph->path, CAM_PRIORITY_NORMAL); - - ccb.ccb_h.ccb_state = ADA_CCB_DUMP; - cam_fill_ataio(&ccb.ataio, + ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL); + cam_fill_ataio(&ccb->ataio, 0, adadone, CAM_DIR_NONE, @@ -1864,18 +1861,14 @@ adaflush(void) NULL, 0, ada_default_timeout*1000); - if (softc->flags & ADA_FLAG_CAN_48BIT) - ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE48, 0, 0, 0); + ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE48, 0, 0, 0); else - ata_28bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0); - xpt_polled_action(&ccb); + ata_28bit_cmd(&ccb->ataio, ATA_FLUSHCACHE, 0, 0, 0); - error = cam_periph_error(&ccb, - 0, SF_NO_RECOVERY | SF_NO_RETRY, NULL); - if ((ccb.ccb_h.status & CAM_DEV_QFRZN) != 0) - cam_release_devq(ccb.ccb_h.path, /*relsim_flags*/0, - /*reduction*/0, /*timeout*/0, /*getcount_only*/0); + error = cam_periph_runccb(ccb, adaerror, /*cam_flags*/0, + /*sense_flags*/ SF_NO_RECOVERY | SF_NO_RETRY, + softc->disk->d_devstat); if (error != 0) xpt_print(periph->path, "Synchronize cache failed\n"); cam_periph_unlock(periph); @@ -1887,11 +1880,10 @@ adaspindown(uint8_t cmd, int flags) { struct cam_periph *periph; struct ada_softc *softc; + union ccb *ccb; int error; CAM_PERIPH_FOREACH(periph, &adadriver) { - union ccb ccb; - /* If we paniced with lock held - not recurse here. */ if (cam_periph_owned(periph)) continue; @@ -1908,10 +1900,8 @@ adaspindown(uint8_t cmd, int flags) if (bootverbose) xpt_print(periph->path, "spin-down\n"); - xpt_setup_ccb(&ccb.ccb_h, periph->path, CAM_PRIORITY_NORMAL); - - ccb.ccb_h.ccb_state = ADA_CCB_DUMP; - cam_fill_ataio(&ccb.ataio, + ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL); + cam_fill_ataio(&ccb->ataio, 0, adadone, CAM_DIR_NONE | flags, @@ -1919,15 +1909,11 @@ adaspindown(uint8_t cmd, int flags) NULL, 0, ada_default_timeout*1000); + ata_28bit_cmd(&ccb->ataio, cmd, 0, 0, 0); - ata_28bit_cmd(&ccb.ataio, cmd, 0, 0, 0); - xpt_polled_action(&ccb); - - error = cam_periph_error(&ccb, - 0, SF_NO_RECOVERY | SF_NO_RETRY, NULL); - if ((ccb.ccb_h.status & CAM_DEV_QFRZN) != 0) - cam_release_devq(ccb.ccb_h.path, /*relsim_flags*/0, - /*reduction*/0, /*timeout*/0, /*getcount_only*/0); + error = cam_periph_runccb(ccb, adaerror, /*cam_flags*/0, + /*sense_flags*/ SF_NO_RECOVERY | SF_NO_RETRY, + softc->disk->d_devstat); if (error != 0) xpt_print(periph->path, "Spin-down disk failed\n"); cam_periph_unlock(periph); Modified: user/attilio/vmcontention/sys/cam/scsi/scsi_da.c ============================================================================== --- user/attilio/vmcontention/sys/cam/scsi/scsi_da.c Fri Mar 29 08:33:18 2013 (r248872) +++ user/attilio/vmcontention/sys/cam/scsi/scsi_da.c Fri Mar 29 08:49:27 2013 (r248873) @@ -2846,11 +2846,10 @@ dashutdown(void * arg, int howto) { struct cam_periph *periph; struct da_softc *softc; + union ccb *ccb; int error; CAM_PERIPH_FOREACH(periph, &dadriver) { - union ccb ccb; - cam_periph_lock(periph); softc = (struct da_softc *)periph->softc; @@ -2864,10 +2863,8 @@ dashutdown(void * arg, int howto) continue; } - xpt_setup_ccb(&ccb.ccb_h, periph->path, CAM_PRIORITY_NORMAL); - - ccb.ccb_h.ccb_state = DA_CCB_DUMP; - scsi_synchronize_cache(&ccb.csio, + ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL); + scsi_synchronize_cache(&ccb->csio, /*retries*/0, /*cbfcnp*/dadone, MSG_SIMPLE_Q_TAG, @@ -2876,13 +2873,9 @@ dashutdown(void * arg, int howto) SSD_FULL_SIZE, 60 * 60 * 1000); - xpt_polled_action(&ccb); - - error = cam_periph_error(&ccb, - 0, SF_NO_RECOVERY | SF_NO_RETRY | SF_QUIET_IR, NULL); - if ((ccb.ccb_h.status & CAM_DEV_QFRZN) != 0) - cam_release_devq(ccb.ccb_h.path, /*relsim_flags*/0, - /*reduction*/0, /*timeout*/0, /*getcount_only*/0); + error = cam_periph_runccb(ccb, daerror, /*cam_flags*/0, + /*sense_flags*/ SF_NO_RECOVERY | SF_NO_RETRY | SF_QUIET_IR, + softc->disk->d_devstat); if (error != 0) xpt_print(periph->path, "Synchronize cache failed\n"); cam_periph_unlock(periph); From owner-svn-src-user@FreeBSD.ORG Fri Mar 29 11:53:58 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 475CCC36; Fri, 29 Mar 2013 11:53:58 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3A86EDB5; Fri, 29 Mar 2013 11:53:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2TBrwJJ070959; Fri, 29 Mar 2013 11:53:58 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2TBrwM7070958; Fri, 29 Mar 2013 11:53:58 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201303291153.r2TBrwM7070958@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Fri, 29 Mar 2013 11:53:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248875 - user/des/tinderbox X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2013 11:53:58 -0000 Author: des Date: Fri Mar 29 11:53:57 2013 New Revision: 248875 URL: http://svnweb.freebsd.org/changeset/base/248875 Log: Update and correct the documentation of the --branch option. Modified: user/des/tinderbox/tinderbox.1 Modified: user/des/tinderbox/tinderbox.1 ============================================================================== --- user/des/tinderbox/tinderbox.1 Fri Mar 29 11:53:20 2013 (r248874) +++ user/des/tinderbox/tinderbox.1 Fri Mar 29 11:53:57 2013 (r248875) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 5, 2012 +.Dd March 29, 2013 .Dt TINDERBOX 1 .Os .Sh NAME @@ -53,21 +53,26 @@ The default value is whatever the host s .Xr uname 1 reports. .It Fl -branch Ns = Ns Ar BRANCH -The branch to specify to +The branch to check out from +.Xr svn 1 , .Xr cvs 1 or .Xr cvsup 1 when updating the source tree. -Ignored when using -.Xr svn 1 . -The default is to use -.Fl A -instead, to get the head. -Specifying -.Va HEAD -as the argument to -.Fl -branch -is equivalent to leaving it unspecified. +The default is to check out HEAD. +When using +.Xr svn 1 , +.Xr cvs 1 Ns -style +branch names are translated to +.Xr svn 1 +paths; for instance, +.Dv RELENG_9 +becomes +.Pa stable/9 +and +.Dv RELENG_9_1 +becomes +.Pa releng/9.1 . .It Fl -cvsup Ns = Ns Ar NAME The name of the .Xr cvsup 1 From owner-svn-src-user@FreeBSD.ORG Fri Mar 29 11:58:44 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id BFB44E08; Fri, 29 Mar 2013 11:58:44 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A3AE4DFB; Fri, 29 Mar 2013 11:58:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2TBwiep071650; Fri, 29 Mar 2013 11:58:44 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2TBwg9j071639; Fri, 29 Mar 2013 11:58:42 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201303291158.r2TBwg9j071639@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Fri, 29 Mar 2013 11:58:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248876 - user/des/tinderbox/etc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2013 11:58:44 -0000 Author: des Date: Fri Mar 29 11:58:42 2013 New Revision: 248876 URL: http://svnweb.freebsd.org/changeset/base/248876 Log: Switch all branches to the single-source model. Remove 9.1 from the FreeBSD 9 lineup. Add 8.4 to the FreeBSD 8 lineup. Retire FreeBSD 4, 5 and 6. Added: user/des/tinderbox/etc/freebsd7-build.rc (contents, props changed) user/des/tinderbox/etc/freebsd7-update.rc (contents, props changed) user/des/tinderbox/etc/freebsd8-build.rc (contents, props changed) user/des/tinderbox/etc/freebsd8-update.rc (contents, props changed) user/des/tinderbox/etc/freebsd9-build.rc (contents, props changed) user/des/tinderbox/etc/freebsd9-update.rc (contents, props changed) - copied unchanged from r248868, user/des/tinderbox/etc/head-ss-build.rc - copied unchanged from r248868, user/des/tinderbox/etc/head-ss-update.rc Directory Properties: user/des/tinderbox/etc/head-build.rc (props changed) user/des/tinderbox/etc/head-update.rc (props changed) Deleted: user/des/tinderbox/etc/head-ss-build.rc user/des/tinderbox/etc/head-ss-update.rc user/des/tinderbox/etc/head.rc user/des/tinderbox/etc/releng_4.rc user/des/tinderbox/etc/releng_5.rc user/des/tinderbox/etc/releng_6.rc user/des/tinderbox/etc/releng_7.rc user/des/tinderbox/etc/releng_8.rc user/des/tinderbox/etc/releng_9.rc user/des/tinderbox/etc/update_head.rc user/des/tinderbox/etc/update_releng_4.rc user/des/tinderbox/etc/update_releng_5.rc user/des/tinderbox/etc/update_releng_6.rc user/des/tinderbox/etc/update_releng_7.rc user/des/tinderbox/etc/update_releng_8.rc user/des/tinderbox/etc/update_releng_9.rc Modified: user/des/tinderbox/etc/Makefile Directory Properties: user/des/tinderbox/etc/default.rc (props changed) Modified: user/des/tinderbox/etc/Makefile ============================================================================== --- user/des/tinderbox/etc/Makefile Fri Mar 29 11:53:57 2013 (r248875) +++ user/des/tinderbox/etc/Makefile Fri Mar 29 11:58:42 2013 (r248876) @@ -2,14 +2,9 @@ ETCFILES = ETCFILES += default.rc -ETCFILES += releng_4.rc update_releng_4.rc -ETCFILES += releng_5.rc update_releng_5.rc -ETCFILES += releng_6.rc update_releng_6.rc -ETCFILES += releng_7.rc update_releng_7.rc -ETCFILES += releng_8.rc update_releng_8.rc -ETCFILES += releng_9.rc update_releng_9.rc -ETCFILES += head.rc update_head.rc -ETCFILES += head-ss-update.rc head-ss-build.rc +ETCFILES += head-update.rc head-build.rc +ETCFILES += freebsd8-update.rc freebsd8-build.rc +ETCFILES += freebsd9-update.rc freebsd9-build.rc ETCDIR ?= ${HOME}/etc ETCOWN ?= ${USER} ETCGRP ?= ${USER} Added: user/des/tinderbox/etc/freebsd7-build.rc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/tinderbox/etc/freebsd7-build.rc Fri Mar 29 11:58:42 2013 (r248876) @@ -0,0 +1,11 @@ +# +# FreeBSD 7 tinderbox setup, shared source - build stage +# +# $FreeBSD$ +# + +branches = RELENG_7 +platforms = amd64, i386, i386/pc98, ia64, powerpc, sparc64 +targets = precleanobj, version, world, lint, kernels, postcleanobj +srcdir = %%SANDBOX%%/%%BRANCH%%/src +recipient += , <%%arch%%@freebsd.org> Added: user/des/tinderbox/etc/freebsd7-update.rc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/tinderbox/etc/freebsd7-update.rc Fri Mar 29 11:58:42 2013 (r248876) @@ -0,0 +1,12 @@ +# +# FreeBSD 7 tinderbox setup, shared source - update stage +# +# $FreeBSD$ +# + +branches = RELENG_7 +platforms = none +srcdir = %%SANDBOX%%/%%BRANCH%%/src +targets = update, version +recipient += +subject = [%%COMMENT%%] source tree update failure Added: user/des/tinderbox/etc/freebsd8-build.rc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/tinderbox/etc/freebsd8-build.rc Fri Mar 29 11:58:42 2013 (r248876) @@ -0,0 +1,11 @@ +# +# FreeBSD 8 tinderbox setup, shared source - build stage +# +# $FreeBSD$ +# + +branches = RELENG_8, RELENG_8_4 +platforms = amd64, arm, i386, i386/pc98, ia64, mips, powerpc, sparc64 +targets = precleanobj, version, world, lint, kernels, postcleanobj +srcdir = %%SANDBOX%%/%%BRANCH%%/src +recipient += , <%%arch%%@freebsd.org> Added: user/des/tinderbox/etc/freebsd8-update.rc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/tinderbox/etc/freebsd8-update.rc Fri Mar 29 11:58:42 2013 (r248876) @@ -0,0 +1,12 @@ +# +# FreeBSD 8 tinderbox setup, shared source - update stage +# +# $FreeBSD$ +# + +branches = RELENG_8, RELENG_8_4 +platforms = none +srcdir = %%SANDBOX%%/%%BRANCH%%/src +targets = update, version +recipient += +subject = [%%COMMENT%%] source tree update failure Added: user/des/tinderbox/etc/freebsd9-build.rc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/tinderbox/etc/freebsd9-build.rc Fri Mar 29 11:58:42 2013 (r248876) @@ -0,0 +1,11 @@ +# +# FreeBSD 9 tinderbox setup, shared source - build stage +# +# $FreeBSD$ +# + +branches = RELENG_9 +platforms = amd64, arm, i386, i386/pc98, ia64, mips, powerpc, powerpc64/powerpc, sparc64 +targets = precleanobj, version, world, lint, kernels, postcleanobj +srcdir = %%SANDBOX%%/%%BRANCH%%/src +recipient += , <%%arch%%@freebsd.org> Added: user/des/tinderbox/etc/freebsd9-update.rc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/tinderbox/etc/freebsd9-update.rc Fri Mar 29 11:58:42 2013 (r248876) @@ -0,0 +1,12 @@ +# +# FreeBSD 9 tinderbox setup, shared source - update stage +# +# $FreeBSD$ +# + +branches = RELENG_9 +platforms = none +srcdir = %%SANDBOX%%/%%BRANCH%%/src +targets = update, version +recipient += +subject = [%%COMMENT%%] source tree update failure Copied: user/des/tinderbox/etc/head-build.rc (from r248868, user/des/tinderbox/etc/head-ss-build.rc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/tinderbox/etc/head-build.rc Fri Mar 29 11:58:42 2013 (r248876, copy of r248868, user/des/tinderbox/etc/head-ss-build.rc) @@ -0,0 +1,11 @@ +# +# HEAD tinderbox setup, shared source - build stage +# +# $FreeBSD$ +# + +branches = HEAD +platforms = amd64, arm, armv6/arm, i386, i386/pc98, ia64, mips, mips64/mips, powerpc, powerpc64/powerpc, sparc64 +targets = precleanobj, version, world, lint, kernels, postcleanobj +srcdir = %%SANDBOX%%/%%BRANCH%%/src +recipient += , <%%arch%%@freebsd.org> Copied: user/des/tinderbox/etc/head-update.rc (from r248868, user/des/tinderbox/etc/head-ss-update.rc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/tinderbox/etc/head-update.rc Fri Mar 29 11:58:42 2013 (r248876, copy of r248868, user/des/tinderbox/etc/head-ss-update.rc) @@ -0,0 +1,12 @@ +# +# HEAD tinderbox setup, shared source - update stage +# +# $FreeBSD$ +# + +branches = HEAD +platforms = none +srcdir = %%SANDBOX%%/%%BRANCH%%/src +targets = update, version +recipient += +subject = [%%COMMENT%%] source tree update failure From owner-svn-src-user@FreeBSD.ORG Fri Mar 29 12:02:24 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 100D6219; Fri, 29 Mar 2013 12:02:24 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 031E0E72; Fri, 29 Mar 2013 12:02:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2TC2NRD073835; Fri, 29 Mar 2013 12:02:23 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2TC2NW1073834; Fri, 29 Mar 2013 12:02:23 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201303291202.r2TC2NW1073834@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Fri, 29 Mar 2013 12:02:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248877 - user/des/tinderbox/etc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2013 12:02:24 -0000 Author: des Date: Fri Mar 29 12:02:23 2013 New Revision: 248877 URL: http://svnweb.freebsd.org/changeset/base/248877 Log: Forgot to add FreeBSD 7 to the Makefile. Modified: user/des/tinderbox/etc/Makefile Modified: user/des/tinderbox/etc/Makefile ============================================================================== --- user/des/tinderbox/etc/Makefile Fri Mar 29 11:58:42 2013 (r248876) +++ user/des/tinderbox/etc/Makefile Fri Mar 29 12:02:23 2013 (r248877) @@ -2,9 +2,10 @@ ETCFILES = ETCFILES += default.rc -ETCFILES += head-update.rc head-build.rc +ETCFILES += freebsd7-update.rc freebsd7-build.rc ETCFILES += freebsd8-update.rc freebsd8-build.rc ETCFILES += freebsd9-update.rc freebsd9-build.rc +ETCFILES += head-update.rc head-build.rc ETCDIR ?= ${HOME}/etc ETCOWN ?= ${USER} ETCGRP ?= ${USER} From owner-svn-src-user@FreeBSD.ORG Fri Mar 29 22:01:17 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B34B123B; Fri, 29 Mar 2013 22:01:17 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A620BD24; Fri, 29 Mar 2013 22:01:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2TM1H6v055416; Fri, 29 Mar 2013 22:01:17 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2TM1HxV055415; Fri, 29 Mar 2013 22:01:17 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201303292201.r2TM1HxV055415@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Fri, 29 Mar 2013 22:01:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248920 - user/des/tinderbox/www X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2013 22:01:17 -0000 Author: des Date: Fri Mar 29 22:01:17 2013 New Revision: 248920 URL: http://svnweb.freebsd.org/changeset/base/248920 Log: Prettify config and branch names. Modified: user/des/tinderbox/www/index.cgi Modified: user/des/tinderbox/www/index.cgi ============================================================================== --- user/des/tinderbox/www/index.cgi Fri Mar 29 21:26:33 2013 (r248919) +++ user/des/tinderbox/www/index.cgi Fri Mar 29 22:01:17 2013 (r248920) @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw #- -# Copyright (c) 2003-2012 Dag-Erling Smørgrav +# Copyright (c) 2003-2013 Dag-Erling Smørgrav # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -84,8 +84,10 @@ sub do_config($) { my %branches = %{$CONFIGS{$config}}; + my $prettyconfig = $config; + $prettyconfig =~ s/^(.*?)-build$/$1/; print " - $config + $prettyconfig "; foreach my $arch (sort(keys(%ARCHES))) { foreach my $machine (sort(keys(%{$ARCHES{$arch}}))) { @@ -101,8 +103,12 @@ sub do_config($) { my $now = time(); foreach my $branch (sort(inverse_branch_sort keys(%branches))) { + my $prettybranch = $branch; + $prettybranch =~ s@^HEAD$@/head@; + $prettybranch =~ s@^RELENG_(\d+)_(\d+)$@/releng/$1.$2@; + $prettybranch =~ s@^RELENG_(\d+)$@/stable/$1@; print " - $branch + $prettybranch "; foreach my $arch (sort(keys(%ARCHES))) { foreach my $machine (sort(keys(%{$ARCHES{$arch}}))) { From owner-svn-src-user@FreeBSD.ORG Fri Mar 29 22:05:27 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0BC3237A; Fri, 29 Mar 2013 22:05:27 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DA07BD39; Fri, 29 Mar 2013 22:05:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2TM5QP1055992; Fri, 29 Mar 2013 22:05:26 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2TM5QVf055988; Fri, 29 Mar 2013 22:05:26 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201303292205.r2TM5QVf055988@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Fri, 29 Mar 2013 22:05:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248921 - user/des/tinderbox/www X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2013 22:05:27 -0000 Author: des Date: Fri Mar 29 22:05:26 2013 New Revision: 248921 URL: http://svnweb.freebsd.org/changeset/base/248921 Log: Ignore log files. Modified: Directory Properties: user/des/tinderbox/www/ (props changed)