From owner-p4-projects@FreeBSD.ORG Sun Jan 27 02:19:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0365E16A46D; Sun, 27 Jan 2008 02:19:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B64616A46C for ; Sun, 27 Jan 2008 02:19:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7A16E13C448 for ; Sun, 27 Jan 2008 02:19:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0R2JfhY000785 for ; Sun, 27 Jan 2008 02:19:41 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0R2JdEg000782 for perforce@freebsd.org; Sun, 27 Jan 2008 02:19:39 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 27 Jan 2008 02:19:39 GMT Message-Id: <200801270219.m0R2JdEg000782@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134176 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 02:19:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=134176 Change 134176 by kmacy@kmacy:storage:toehead on 2008/01/27 02:19:16 IFC 134174 Affected files ... .. //depot/projects/toehead/LOCKS#2 integrate .. //depot/projects/toehead/MAINTAINERS#2 integrate .. //depot/projects/toehead/Makefile.inc1#4 integrate .. //depot/projects/toehead/ObsoleteFiles.inc#3 integrate .. //depot/projects/toehead/UPDATING#3 integrate .. //depot/projects/toehead/etc/defaults/rc.conf#4 integrate .. //depot/projects/toehead/etc/devd.conf#2 integrate .. //depot/projects/toehead/etc/netstart#2 integrate .. //depot/projects/toehead/etc/rc#2 integrate .. //depot/projects/toehead/etc/rc.d/hostid#2 integrate .. //depot/projects/toehead/etc/rc.d/ipfw#2 integrate .. //depot/projects/toehead/etc/rc.d/kerberos#2 integrate .. //depot/projects/toehead/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/toehead/etc/rc.d/netif#2 integrate .. //depot/projects/toehead/etc/rc.d/ppp#2 integrate .. //depot/projects/toehead/etc/rc.subr#2 integrate .. //depot/projects/toehead/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kld.c#1 branch .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/trgt.c#3 integrate .. //depot/projects/toehead/include/fts.h#2 integrate .. //depot/projects/toehead/lib/libarchive/Makefile#3 integrate .. //depot/projects/toehead/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/toehead/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/toehead/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate .. //depot/projects/toehead/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/toehead/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/toehead/lib/libc/gen/fts-compat.c#2 integrate .. //depot/projects/toehead/lib/libc/gen/fts-compat.h#2 integrate .. //depot/projects/toehead/lib/libc/gen/fts.3#2 integrate .. //depot/projects/toehead/lib/libc/gen/fts.c#2 integrate .. //depot/projects/toehead/lib/libc/locale/Makefile.inc#2 integrate .. //depot/projects/toehead/lib/libc/locale/ascii.c#1 branch .. //depot/projects/toehead/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/toehead/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/toehead/lib/libc/sys/flock.2#2 integrate .. //depot/projects/toehead/lib/libfetch/ftp.c#4 integrate .. //depot/projects/toehead/lib/msun/src/k_cos.c#2 integrate .. //depot/projects/toehead/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/toehead/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/toehead/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/toehead/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/toehead/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/toehead/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/toehead/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/toehead/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/toehead/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/toehead/sbin/natd/natd.8#4 integrate .. //depot/projects/toehead/sbin/quotacheck/Makefile#2 integrate .. //depot/projects/toehead/sbin/quotacheck/preen.c#2 integrate .. //depot/projects/toehead/sbin/quotacheck/quotacheck.8#2 integrate .. //depot/projects/toehead/sbin/quotacheck/quotacheck.c#3 integrate .. //depot/projects/toehead/sbin/quotacheck/quotacheck.h#1 branch .. //depot/projects/toehead/share/man/man4/Makefile#4 integrate .. //depot/projects/toehead/share/man/man4/coda.4#1 branch .. //depot/projects/toehead/share/man/man4/dcons.4#2 integrate .. //depot/projects/toehead/share/man/man4/oldcard.4#2 delete .. //depot/projects/toehead/share/man/man4/puc.4#2 integrate .. //depot/projects/toehead/share/man/man4/sched_4bsd.4#2 integrate .. //depot/projects/toehead/share/man/man4/sched_ule.4#2 integrate .. //depot/projects/toehead/share/man/man4/syncache.4#3 integrate .. //depot/projects/toehead/share/man/man4/xl.4#2 integrate .. //depot/projects/toehead/share/man/man5/fstab.5#2 integrate .. //depot/projects/toehead/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/toehead/share/man/man7/ports.7#4 integrate .. //depot/projects/toehead/share/man/man9/BUF_ISLOCKED.9#1 branch .. //depot/projects/toehead/share/man/man9/BUF_RECURSED.9#1 branch .. //depot/projects/toehead/share/man/man9/BUF_REFCNT.9#2 delete .. //depot/projects/toehead/share/man/man9/Makefile#2 integrate .. //depot/projects/toehead/share/man/man9/lock.9#3 integrate .. //depot/projects/toehead/share/mk/bsd.own.mk#5 integrate .. //depot/projects/toehead/share/mklocale/la_LN.US-ASCII.src#2 integrate .. //depot/projects/toehead/sys/Makefile#2 integrate .. //depot/projects/toehead/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/toehead/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/toehead/sys/conf/files#6 integrate .. //depot/projects/toehead/sys/conf/options#4 integrate .. //depot/projects/toehead/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/toehead/sys/ddb/db_capture.c#2 integrate .. //depot/projects/toehead/sys/dev/amr/amr.c#3 integrate .. //depot/projects/toehead/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/toehead/sys/dev/amr/amrvar.h#3 integrate .. //depot/projects/toehead/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/toehead/sys/dev/mii/miidevs#2 integrate .. //depot/projects/toehead/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/toehead/sys/dev/mii/nsphyter.c#1 branch .. //depot/projects/toehead/sys/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/toehead/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/toehead/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/toehead/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/toehead/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/toehead/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/toehead/sys/dev/usb/uark.c#2 integrate .. //depot/projects/toehead/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/toehead/sys/dev/usb/uftdireg.h#2 integrate .. //depot/projects/toehead/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/toehead/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/toehead/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/toehead/sys/fs/hpfs/hpfs_subr.h#3 integrate .. //depot/projects/toehead/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/toehead/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/toehead/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/toehead/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/toehead/sys/fs/nwfs/nwfs_node.c#3 integrate .. //depot/projects/toehead/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/toehead/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/toehead/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/toehead/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/toehead/sys/gnu/fs/reiserfs/reiserfs_inode.c#3 integrate .. //depot/projects/toehead/sys/kern/kern_jail.c#3 integrate .. //depot/projects/toehead/sys/kern/kern_lock.c#3 integrate .. //depot/projects/toehead/sys/kern/sched_ule.c#5 integrate .. //depot/projects/toehead/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/toehead/sys/kern/tty_pty.c#3 integrate .. //depot/projects/toehead/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/toehead/sys/kern/vfs_default.c#3 integrate .. //depot/projects/toehead/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/toehead/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/toehead/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/toehead/sys/modules/mii/Makefile#2 integrate .. //depot/projects/toehead/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/toehead/sys/netgraph/ng_pred1.c#2 integrate .. //depot/projects/toehead/sys/netinet/in.c#2 integrate .. //depot/projects/toehead/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/toehead/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/toehead/sys/netinet/ip_options.c#2 integrate .. //depot/projects/toehead/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/toehead/sys/netinet6/in6.c#4 integrate .. //depot/projects/toehead/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/toehead/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/toehead/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/toehead/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/toehead/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/toehead/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/toehead/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/toehead/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/toehead/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/toehead/sys/sys/buf.h#4 integrate .. //depot/projects/toehead/sys/sys/event.h#2 integrate .. //depot/projects/toehead/sys/sys/lockmgr.h#4 integrate .. //depot/projects/toehead/sys/sys/param.h#4 integrate .. //depot/projects/toehead/sys/sys/priv.h#3 integrate .. //depot/projects/toehead/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/toehead/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/toehead/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/toehead/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/toehead/tools/sched/schedgraph.py#3 integrate .. //depot/projects/toehead/usr.bin/fstat/Makefile#2 integrate .. //depot/projects/toehead/usr.bin/fstat/zfs/Makefile#2 integrate .. //depot/projects/toehead/usr.bin/mklocale/mklocale.1#2 integrate .. //depot/projects/toehead/usr.bin/mklocale/yacc.y#2 integrate .. //depot/projects/toehead/usr.bin/tar/bsdtar.1#3 integrate .. //depot/projects/toehead/usr.bin/tar/bsdtar.c#3 integrate .. //depot/projects/toehead/usr.bin/xargs/xargs.1#2 integrate .. //depot/projects/toehead/usr.sbin/iostat/iostat.c#4 integrate .. //depot/projects/toehead/usr.sbin/pw/pw.8#2 integrate .. //depot/projects/toehead/usr.sbin/setfmac/setfmac.c#2 integrate .. //depot/projects/toehead/usr.sbin/sysinstall/menus.c#3 integrate Differences ... ==== //depot/projects/toehead/LOCKS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/LOCKS,v 1.3 2006/01/13 06:51:43 ru Exp $ +$FreeBSD: src/LOCKS,v 1.4 2008/01/24 22:07:03 cperciva Exp $ This file documents formal review/approval requirements that have been approved by core. @@ -10,3 +10,4 @@ src/* RELENG_4_* Requires Security Officer approval. src/* RELENG_5_* Requires Security Officer approval. src/* RELENG_6_* Requires Security Officer approval. +src/* RELENG_7_* Requires Security Officer approval. ==== //depot/projects/toehead/MAINTAINERS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.145 2007/05/23 21:47:19 jfv Exp $ +$FreeBSD: src/MAINTAINERS,v 1.146 2008/01/26 21:58:52 brueffer Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -33,7 +33,6 @@ ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. NEWCARD imp Pre-commit review requested. -OLDCARD 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. ==== //depot/projects/toehead/Makefile.inc1#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.593 2008/01/21 18:44:54 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.596 2008/01/23 22:21:36 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -841,6 +841,10 @@ # legacy: Build compatibility shims for the next three targets # legacy: +.if ${BOOTSTRAPPING} < 600034 && ${BOOTSTRAPPING} != 0 + @echo "ERROR: Source upgrades from versions prior to 6.0 not supported."; \ + false +.endif .for _tool in tools/build ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ @@ -876,24 +880,23 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale +.endif + bootstrap-tools: .for _tool in \ + ${_mklocale} \ ${_strfile} \ ${_gperf} \ ${_groff} \ - ${_texinfo} \ - ${_cap_mkdb} \ - ${_colldef} \ - ${_gencat} \ usr.bin/lorder \ usr.bin/makewhatis \ - ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ - ${_crunchgen} \ - ${_pwd_mkdb} + ${_crunchgen} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/toehead/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.125 2008/01/11 13:41:31 jhb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.127 2008/01/26 20:23:25 brueffer Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080126: oldcard.4 removal +OLD_FILES+=usr/share/man/man4/card.4.gz +OLD_FILES+=usr/share/man/man4/oldcard.4.gz +# 20080122: Removed from the tree +OLD_FILES+=usr/share/man/man9/BUF_REFCNT.9.gz # 20080108: Moved to section 2 OLD_FILES+=usr/share/man/man3/shm_open.3.gz OLD_FILES+=usr/share/man/man3/shm_unlink.3.gz ==== //depot/projects/toehead/UPDATING#3 (text+ko) ==== @@ -19,15 +19,27 @@ related kernel options, INVARIANTS, malloc debugging flags in userland, and various verbose features in the kernel. Many developers choose to disable these features on build machines - to maximize performance. + to maximize performance. (To disable malloc debugging, run + ln -s aj /etc/malloc.conf.) + +20080126: + The fts(3) structures have been changed to use adequate + integer types for their members and so to be able to cope + with huge file trees. The old fts(3) ABI is preserved + through symbol versioning in libc, so third-party binaries + using fts(3) should still work, although they will not take + advantage of the extended types. At the same time, some + third-party software might fail to build after this change + due to unportable assumptions made in its source code about + fts(3) structure members. Such software should be fixed + by its vendor or, in the worst case, in the ports tree. + FreeBSD_version 800015 marks this change for the unlikely + case that a portable fix is impossible. -20080121: +20080123: To upgrade to -current after this date, you must be running - FreeBSD after the RELENG_6 branch point. This means any of the - 6.x releases are supported and should work. Upgrading to current + FreeBSD not older than 6.0-RELEASE. Upgrading to -current from 5.x now requires a stop over at RELENG_6 or RELENG_7 systems. - FreeBSD_version must be 600029 or higher, although this isn't - enforced in the Makefile at this time. 20071128: The ADAPTIVE_GIANT kernel option has been retired because its @@ -957,4 +969,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.514 2008/01/21 22:04:37 imp Exp $ +$FreeBSD: src/UPDATING,v 1.517 2008/01/26 17:09:39 yar Exp $ ==== //depot/projects/toehead/etc/defaults/rc.conf#4 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.323 2008/01/21 04:41:18 rafan Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.324 2008/01/25 05:23:01 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -239,7 +239,7 @@ # kerberos5_server_enable="NO" # Run a kerberos 5 master server (or NO). kerberos5_server="/usr/libexec/kdc" # path to kerberos 5 KDC -kerberos5_server_flags="" # Additional flags to the kerberos 5 server +kerberos5_server_flags="--detach" # Additional flags to the kerberos 5 server kadmind5_server_enable="NO" # Run kadmind (or NO) kadmind5_server="/usr/libexec/kadmind" # path to kerberos 5 admin daemon kpasswdd_server_enable="NO" # Run kpasswdd (or NO) ==== //depot/projects/toehead/etc/devd.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.38 2007/06/21 22:50:36 njl Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.39 2008/01/26 13:50:38 mtm Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -53,7 +53,7 @@ match "system" "IFNET"; match "type" "LINK_UP"; media-type "ethernet"; - action "/etc/rc.d/dhclient start $subsystem"; + action "/etc/rc.d/dhclient quietstart $subsystem"; }; # @@ -73,7 +73,7 @@ match "system" "IFNET"; match "type" "LINK_UP"; media-type "802.11"; - action "/etc/rc.d/dhclient start $subsystem"; + action "/etc/rc.d/dhclient quietstart $subsystem"; }; # An entry like this might be in a different file, but is included here @@ -91,11 +91,11 @@ # When a USB Bluetooth dongle appears activate it attach 100 { device-name "ubt[0-9]+"; - action "/etc/rc.d/bluetooth start $device-name"; + action "/etc/rc.d/bluetooth quietstart $device-name"; }; detach 100 { device-name "ubt[0-9]+"; - action "/etc/rc.d/bluetooth stop $device-name"; + action "/etc/rc.d/bluetooth quietstop $device-name"; }; # When a USB keyboard arrives, attach it as the console keyboard. @@ -112,7 +112,7 @@ # stops automatically (actually it bombs :) when the device disappears. attach 100 { device-name "ums[0-9]+"; - action "/etc/rc.d/moused start $device-name"; + action "/etc/rc.d/moused quietstart $device-name"; }; # Firmware download into the ActiveWire board. After the firmware download is ==== //depot/projects/toehead/etc/netstart#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/netstart,v 1.67 2006/05/30 02:10:01 brooks Exp $ +# $FreeBSD: src/etc/netstart,v 1.68 2008/01/26 13:37:48 mtm Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -37,29 +37,31 @@ . /etc/rc.subr load_rc_config 'XXX' -/etc/rc.d/devd start -/etc/rc.d/hostname start -/etc/rc.d/ipmon start -/etc/rc.d/ipfilter start -/etc/rc.d/ipnat start -/etc/rc.d/ipfs start -/etc/rc.d/sppp start -# /etc/rc.d/atm1 start -# . /etc/rc.d/atm2.sh start -# . /etc/rc.d/atm3.sh start -/etc/rc.d/netif start -/etc/rc.d/ipsec start -/etc/rc.d/dhclient start -/etc/rc.d/isdnd start -/etc/rc.d/ppp start -/etc/rc.d/ipfw start -/etc/rc.d/ip6fw start -/etc/rc.d/network_ipv6 start -/etc/rc.d/routing start -/etc/rc.d/mroute6d start -/etc/rc.d/route6d start -/etc/rc.d/mrouted start -/etc/rc.d/routed start -/etc/rc.d/nisdomain start +_start=quietstart + +/etc/rc.d/devd ${_start} +/etc/rc.d/hostname ${_start} +/etc/rc.d/ipmon ${_start} +/etc/rc.d/ipfilter ${_start} +/etc/rc.d/ipnat ${_start} +/etc/rc.d/ipfs ${_start} +/etc/rc.d/sppp ${_start} +# /etc/rc.d/atm1 ${_start} +# . /etc/rc.d/atm2.sh ${_start} +# . /etc/rc.d/atm3.sh ${_start} +/etc/rc.d/netif ${_start} +/etc/rc.d/ipsec ${_start} +/etc/rc.d/dhclient ${_start} +/etc/rc.d/isdnd ${_start} +/etc/rc.d/ppp ${_start} +/etc/rc.d/ipfw ${_start} +/etc/rc.d/ip6fw ${_start} +/etc/rc.d/network_ipv6 ${_start} +/etc/rc.d/routing ${_start} +/etc/rc.d/mroute6d ${_start} +/etc/rc.d/route6d ${_start} +/etc/rc.d/mrouted ${_start} +/etc/rc.d/routed ${_start} +/etc/rc.d/nisdomain ${_start} exit 0 ==== //depot/projects/toehead/etc/rc#2 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.340 2007/04/02 22:53:06 des Exp $ +# $FreeBSD: src/etc/rc,v 1.341 2008/01/26 11:22:11 mtm Exp $ # # System startup script run by init on autoboot @@ -56,7 +56,7 @@ rc_fast=yes # run_rc_command(): do fast booting else autoboot=no - _boot="start" + _boot="quietstart" fi dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null` ==== //depot/projects/toehead/etc/rc.d/hostid#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/hostid,v 1.7 2007/05/22 13:53:59 rse Exp $ +# $FreeBSD: src/etc/rc.d/hostid,v 1.8 2008/01/24 07:04:12 ru Exp $ # # PROVIDE: hostid @@ -56,7 +56,7 @@ hostid_hardware() { - uuid=`kenv smbios.system.uuid 2>/dev/null` + uuid=`kenv -q smbios.system.uuid` x="[0-9a-f]" y=$x$x$x$x case "${uuid}" in ==== //depot/projects/toehead/etc/rc.d/ipfw#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.15 2007/04/02 15:38:53 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.16 2008/01/26 14:02:19 mtm Exp $ # # PROVIDE: ipfw @@ -24,7 +24,7 @@ if [ -r "${firewall_script}" ]; then if [ -f /etc/rc.d/natd ] ; then - /etc/rc.d/natd start + /etc/rc.d/natd quietstart fi /bin/sh "${firewall_script}" echo 'Firewall rules loaded.' @@ -52,7 +52,7 @@ # ${SYSCTL_W} net.inet.ip.fw.enable=0 if [ -f /etc/rc.d/natd ] ; then - /etc/rc.d/natd stop + /etc/rc.d/natd quietstop fi } ==== //depot/projects/toehead/etc/rc.d/kerberos#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/kerberos,v 1.7 2007/10/19 08:59:59 mtm Exp $ +# $FreeBSD: src/etc/rc.d/kerberos,v 1.8 2008/01/25 05:23:01 mtm Exp $ # # PROVIDE: kerberos @@ -10,7 +10,6 @@ name="kerberos5" rcvar="kerberos5_server_enable" -command_args="--detach" load_rc_config $name command="${kerberos5_server}" ==== //depot/projects/toehead/etc/rc.d/mountcritremote#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.17 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.18 2008/01/26 14:02:19 mtm Exp $ # # PROVIDE: mountcritremote @@ -65,7 +65,7 @@ done # Cleanup /var again just in case it's a network mount. - /etc/rc.d/cleanvar reload + /etc/rc.d/cleanvar quietreload rm -f /var/run/clean_var /var/spool/lock/clean_var } ==== //depot/projects/toehead/etc/rc.d/netif#2 (text+ko) ==== @@ -22,7 +22,7 @@ # (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: src/etc/rc.d/netif,v 1.24 2007/07/25 18:08:01 jhb Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.25 2008/01/26 11:22:12 mtm Exp $ # # PROVIDE: netif @@ -72,7 +72,7 @@ if [ -f /etc/rc.d/ipfilter ] ; then # Resync ipfilter - /etc/rc.d/ipfilter resync + /etc/rc.d/ipfilter quietresync fi if [ -f /etc/rc.d/bridge -a -n "$cmdifn" ] ; then /etc/rc.d/bridge start $cmdifn ==== //depot/projects/toehead/etc/rc.d/ppp#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.15 2007/10/18 17:10:40 emax Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.16 2008/01/26 14:02:19 mtm Exp $ # # PROVIDE: ppp @@ -82,8 +82,8 @@ { # Re-Sync ipfilter and pf so they pick up any new network interfaces # - /etc/rc.d/ipfilter resync - /etc/rc.d/pf resync + /etc/rc.d/ipfilter quietresync + /etc/rc.d/pf quietresync } ppp_stop_profile() { ==== //depot/projects/toehead/etc/rc.subr#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.77 2007/10/09 07:20:44 dougb Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.80 2008/01/26 11:22:11 mtm Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -377,9 +377,10 @@ # If argument has a given prefix, then change the operation as follows: # Prefix Operation # ------ --------- -# fast Skip the pid check, and set rc_fast=yes +# fast Skip the pid check, and set rc_fast=yes, rc_quiet=yes # force Set ${rcvar} to YES, and set rc_force=yes # one Set ${rcvar} to YES +# quiet Don't output some diagnostics, and set rc_quiet=yes # # The following globals are used: # @@ -522,6 +523,8 @@ # # rc_force Not empty if "force" was provided (q.v.) # +# rc_quiet Not empty if "quiet" was provided +# # run_rc_command() { @@ -542,6 +545,7 @@ fast*) # "fast" prefix; don't check pid rc_arg=${rc_arg#fast} rc_fast=yes + rc_quiet=yes ;; force*) # "force prefix; always run rc_force=yes @@ -558,6 +562,11 @@ eval ${rcvar}=YES fi ;; + quiet*) # "quiet" prefix; omit some messages + _rc_prefix=quiet + rc_arg=${rc_arg#${_rc_prefix}} + rc_quiet=yes + ;; esac eval _override_command=\$${name}_program @@ -606,6 +615,12 @@ # if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then if ! checkyesno ${rcvar}; then + if [ -n "${rc_quiet}" ]; then + return 0 + fi + echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to " + echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' " + echo "instead of '${rc_arg}'." return 0 fi fi ==== //depot/projects/toehead/gnu/lib/csu/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.27 2007/10/13 05:50:43 ru Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.28 2008/01/24 07:43:09 ru Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -31,7 +31,7 @@ TGTOBJS= crtsavres.o SRCS+= crtsavres.asm .endif -.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_ARCH} == "sparc64" TGTOBJS= crtfastmath.o SRCS+= crtfastmath.c .endif ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/kgdb/Makefile,v 1.6 2005/02/20 23:06:03 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/kgdb/Makefile,v 1.7 2008/01/24 19:11:13 jhb Exp $ PROG= kgdb${GDB_SUFFIX} -SRCS= main.c kthr.c trgt.c trgt_${TARGET_ARCH}.c +SRCS= main.c kld.c kthr.c trgt.c trgt_${TARGET_ARCH}.c WARNS?= 2 BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kgdb.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (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: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.7 2008/01/17 21:43:12 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.8 2008/01/24 19:11:13 jhb Exp $ */ #ifndef _KGDB_H_ @@ -47,6 +47,7 @@ extern struct kthr *curkthr; +void kgdb_add_kld_cmd(char *, int); void kgdb_target(void); void kgdb_trgt_fetch_registers(int); void kgdb_trgt_store_registers(int); ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/trgt.c#3 (text+ko) ==== @@ -25,16 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.6 2008/01/17 21:43:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.7 2008/01/24 19:11:13 jhb Exp $"); #include #include -#include #include #include -#include #include -#include #include #include @@ -43,9 +40,6 @@ #include #include #include -#include -#include -#include #include "kgdb.h" @@ -205,268 +199,6 @@ kgdb_switch_to_thread(thr); } -static int -kld_ok (char *path) -{ - struct stat sb; - - if (stat(path, &sb) == 0 && S_ISREG(sb.st_mode)) - return (1); - return (0); -} - -/* - * Look for a matching file in the following order: - * - filename + ".symbols" (e.g. foo.ko.symbols) - * - filename + ".debug" (e.g. foo.ko.debug) - * - filename (e.g. foo.ko) - * - dirname(kernel) + filename + ".symbols" (e.g. /boot/kernel/foo.ko.symbols) - * - dirname(kernel) + filename + ".debug" (e.g. /boot/kernel/foo.ko.debug) - * - dirname(kernel) + filename (e.g. /boot/kernel/foo.ko) - * - iterate over each path in the module path looking for: - * - dir + filename + ".symbols" (e.g. /boot/modules/foo.ko.symbols) - * - dir + filename + ".debug" (e.g. /boot/modules/foo.ko.debug) - * - dir + filename (e.g. /boot/modules/foo.ko) - */ -static int -find_kld_path (char *filename, char *path, size_t path_size) -{ - CORE_ADDR module_path_addr; - char module_path[PATH_MAX]; - char *kernel_dir, *module_dir, *cp; - - snprintf(path, path_size, "%s.symbols", filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s.debug", filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s", filename); - if (kld_ok(path)) - return (1); - kernel_dir = dirname(kernel); - if (kernel_dir != NULL) { - snprintf(path, path_size, "%s/%s.symbols", kernel_dir, - filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s/%s.debug", kernel_dir, filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s/%s", kernel_dir, filename); - if (kld_ok(path)) - return (1); - } - module_path_addr = kgdb_parse("linker_path"); - if (module_path_addr != 0 && - kvm_read(kvm, module_path_addr, module_path, sizeof(module_path)) == - sizeof(module_path)) { - module_path[PATH_MAX - 1] = '\0'; - cp = module_path; - while ((module_dir = strsep(&cp, ";")) != NULL) { - snprintf(path, path_size, "%s/%s.symbols", module_dir, - filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s/%s.debug", module_dir, - filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s/%s", module_dir, - filename); - if (kld_ok(path)) - return (1); - } - } - return (0); -} - -/* - * Read a kernel pointer given a KVA in 'address'. - */ -static CORE_ADDR -read_pointer (CORE_ADDR address) -{ - union { - uint32_t d32; - uint64_t d64; - } val; - - switch (TARGET_PTR_BIT) { - case 32: - if (kvm_read(kvm, address, &val.d32, sizeof(val.d32)) != - sizeof(val.d32)) - return (0); - return (val.d32); - case 64: - if (kvm_read(kvm, address, &val.d64, sizeof(val.d64)) != - sizeof(val.d64)) - return (0); - return (val.d64); - default: - return (0); - } -} - -/* - * Try to find this kld in the kernel linker's list of linker files. - */ -static int -find_kld_address (char *arg, CORE_ADDR *address) -{ - CORE_ADDR kld, filename_addr; - CORE_ADDR off_address, off_filename, off_next; - char kld_filename[PATH_MAX]; - char *filename; - size_t filelen; - - /* Compute offsets of relevant members in struct linker_file. */ - off_address = kgdb_parse("&((struct linker_file *)0)->address"); - off_filename = kgdb_parse("&((struct linker_file *)0)->filename"); - off_next = kgdb_parse("&((struct linker_file *)0)->link.tqe_next"); - if (off_address == 0 || off_filename == 0 || off_next == 0) - return (0); - - filename = basename(arg); - filelen = strlen(filename) + 1; - kld = kgdb_parse("linker_files.tqh_first"); - while (kld != 0) { - /* Try to read this linker file's filename. */ - filename_addr = read_pointer(kld + off_filename); - if (filename_addr == 0) - goto next_kld; - if (kvm_read(kvm, filename_addr, kld_filename, filelen) != - filelen) - goto next_kld; - - /* Compare this kld's filename against our passed in name. */ - if (kld_filename[filelen - 1] != '\0') - goto next_kld; - if (strcmp(kld_filename, filename) != 0) - goto next_kld; - - /* - * We found a match, use its address as the base - * address if we can read it. - */ - *address = read_pointer(kld + off_address); - if (*address == 0) - return (0); - return (1); - - next_kld: - kld = read_pointer(kld + off_next); - } - return (0); -} - -static void -add_section(struct section_addr_info *section_addrs, int *sect_indexp, - char *name, CORE_ADDR address) -{ - int sect_index; - - sect_index = *sect_indexp; - section_addrs->other[sect_index].name = name; - section_addrs->other[sect_index].addr = address; - printf_unfiltered("\t%s_addr = %s\n", name, - local_hex_string(address)); - sect_index++; - *sect_indexp = sect_index; -} - -static void -kgdb_add_kld_cmd (char *arg, int from_tty) -{ - struct section_addr_info *section_addrs; - struct cleanup *cleanup; - char path[PATH_MAX]; - asection *sect; - CORE_ADDR base_addr; - bfd *bfd; - CORE_ADDR text_addr, data_addr, bss_addr, rodata_addr; - int sect_count, sect_index; - - if (!find_kld_path(arg, path, sizeof(path))) { - error("unable to locate kld"); - return; - } - - if (!find_kld_address(arg, &base_addr)) { - error("unable to find kld in kernel"); - return; - } - - /* Open the kld and find the offsets of the various sections. */ - bfd = bfd_openr(path, gnutarget); - if (bfd == NULL) { - error("\"%s\": can't open: %s", path, - bfd_errmsg(bfd_get_error())); - return; - } - cleanup = make_cleanup_bfd_close(bfd); - - if (!bfd_check_format(bfd, bfd_object)) { - do_cleanups(cleanup); - error("\%s\": not an object file", path); - return; - } - - data_addr = bss_addr = rodata_addr = 0; - sect = bfd_get_section_by_name (bfd, ".text"); - if (sect == NULL) { - do_cleanups(cleanup); - error("\"%s\": can't find text section", path); - return; - } - text_addr = bfd_get_section_vma(bfd, sect); - sect_count = 1; - - /* Save the offsets of relevant sections. */ - sect = bfd_get_section_by_name (bfd, ".data"); - if (sect != NULL) { - data_addr = bfd_get_section_vma(bfd, sect); - sect_count++; - } - - sect = bfd_get_section_by_name (bfd, ".bss"); - if (sect != NULL) { - bss_addr = bfd_get_section_vma(bfd, sect); - sect_count++; - } - - sect = bfd_get_section_by_name (bfd, ".rodata"); - if (sect != NULL) { - rodata_addr = bfd_get_section_vma(bfd, sect); - sect_count++; - } - - do_cleanups(cleanup); - - printf_unfiltered("add symbol table from file \"%s\" at\n", path); - - /* Build a section table for symbol_file_add(). */ - section_addrs = alloc_section_addr_info(sect_count); - cleanup = make_cleanup(xfree, section_addrs); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 27 02:40:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1612F16A421; Sun, 27 Jan 2008 02:40:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE40E16A417 for ; Sun, 27 Jan 2008 02:40:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BD5AF13C447 for ; Sun, 27 Jan 2008 02:40:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0R2e2HU001668 for ; Sun, 27 Jan 2008 02:40:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0R2e2It001660 for perforce@freebsd.org; Sun, 27 Jan 2008 02:40:02 GMT (envelope-from jb@freebsd.org) Date: Sun, 27 Jan 2008 02:40:02 GMT Message-Id: <200801270240.m0R2e2It001660@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134177 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 02:40:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=134177 Change 134177 by jb@jb_freebsd1 on 2008/01/27 02:39:11 IFopensolaris Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#5 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#6 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/debug.h#9 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/string_table.h#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#7 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#6 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cpuvar.h#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#12 integrate Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#3 (text+ko) ==== @@ -20,7 +20,7 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -38,7 +38,13 @@ * */ +struct foo { + int a:1; + int b:3; +}; + BEGIN { - trace(offsetof(tcp_t, tcp_hwcksum)); + trace(offsetof(struct foo, b)); + exit(0); } ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/debug.h#9 (text) ==== @@ -786,7 +786,7 @@ const char *, int); extern void Dbg_syms_ar_title(Lm_list *, const char *, int); extern void Dbg_syms_created(Lm_list *, const char *); -extern void Dbg_syms_discarded(Lm_list *, Sym_desc *, Is_desc *); +extern void Dbg_syms_discarded(Lm_list *, Sym_desc *); extern void Dbg_syms_dlsym(Rt_map *, const char *, const char *, int); extern void Dbg_syms_dup_sort_addr(Lm_list *, const char *, const char *, const char *, Addr); ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/string_table.h#3 (text) ==== @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -29,109 +28,33 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include #include -#include -#include #ifdef __cplusplus extern "C" { #endif -typedef struct str_hash Str_hash; -typedef struct str_tbl Str_tbl; -typedef struct str_master Str_master; - - /* - * The Stringlist is the list of 'input strings' - * associatied with the AVL nodes Stringelem. + * Exported, opaque string table handle. */ -typedef struct stringlist { - const char *sl_string; - struct stringlist *sl_next; -} Stringlist; +typedef struct str_tbl Str_tbl; /* - * Nodes for the initial AVL tree which contains all of - * the input strings. The AVL tree is indexed off of - * the length of the strings. This permits later traversal - * of all of the strings based off of their string length. - */ -typedef struct { - avl_node_t se_avlnode; - Stringlist *se_strlist; - uint_t se_stlen; -} Stringelem; - - -/* - * Pointer to the Master string, other strings may be suffixes - * of this string. + * Exported string table functions. */ -struct str_master { - const char *sm_str; /* pointer to master string */ - Str_master *sm_next; /* used for tracking master strings */ - uint_t sm_stlen; /* length of master string */ - uint_t sm_hashval; /* hashval of master string */ - uint_t sm_stoff; /* offset into destination strtab */ -}; - - -/* - * Represents a individual string that was input into - * the String hash table. The string may either be a - * suffix of another string or a master string. - */ -struct str_hash { - uint_t hi_stlen; /* string length */ - uint_t hi_refcnt; /* # of references to str */ - uint_t hi_hashval; /* hash for string */ - Str_master *hi_mstr; /* pointer to master string */ - Str_hash *hi_next; /* next entry in hash bckt */ -}; - -/* - * Controlling data structure for a String Table - */ -struct str_tbl { - avl_tree_t *st_strtree; /* avl tree of initial strs */ - char *st_strbuf; /* string buffer */ - Str_hash **st_hashbcks; /* hash buckets */ - Str_master *st_mstrlist; /* list of all master strings */ - uint_t st_fullstringsize; /* uncompressed table size */ - uint_t st_nextoff; /* next available string */ - uint_t st_stringsize; /* compressed size */ - uint_t st_stringcnt; /* # of strings */ - uint_t st_hbckcnt; /* # of buckets in hashlist */ - uint_t st_flags; -}; - -#define FLG_STTAB_COOKED 0x00000001 /* offset has been assigned */ -#define FLG_STTAB_COMPRESS 0x00000002 /* build compressed str tab */ - -/* - * starting value for use with string hashing functions - * inside of string_table.c - */ -#define HASHSEED 5381 - -/* - * Flags for st_new - */ -#define FLG_STNEW_COMPRESS 0x00000001 /* build compressed str tab */ - -/* - * exported string_table.c functions - */ extern int st_delstring(Str_tbl *, const char *); extern void st_destroy(Str_tbl *); extern uint_t st_getstrtab_sz(Str_tbl *); extern const char *st_getstrbuf(Str_tbl *); extern int st_insert(Str_tbl *, const char *); +extern Str_tbl *st_new(uint_t); extern int st_setstrbuf(Str_tbl *, char *, uint_t); extern int st_setstring(Str_tbl *, const char *, uint_t *); -extern Str_tbl *st_new(uint_t); + +/* + * Exported flags values for st_new(). + */ +#define FLG_STNEW_COMPRESS 0x01 /* compressed string table */ #ifdef __cplusplus } ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#7 (text) ==== @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,8 +19,8 @@ * CDDL HEADER END */ /* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. * * sgsmsg generates several message files from an input template file. Messages * are constructed for use with gettext(3i) - the default - or catgets(3c). The @@ -67,7 +66,6 @@ * the data array being built in msg.c. The index into this array * becomes the `message' identifier created in the msg.h file. */ - #pragma ident "%Z%%M% %I% %E% SMI" #include @@ -81,7 +79,7 @@ #include #include -#include +#include <_string_table.h> /* * Define any error message strings. @@ -151,14 +149,13 @@ (void) fprintf(stderr, Errmsg_nmem, strerror(errno)); exit(1); } - if (stp == 0) { - /* - * Initialize string table - */ - if ((stp = st_new(FLG_STNEW_COMPRESS)) == 0) { - (void) fprintf(stderr, Errmsg_stnw, strerror(errno)); - exit(1); - } + + /* + * Initialize the string table. + */ + if ((stp == 0) && ((stp = st_new(FLG_STNEW_COMPRESS)) == NULL)) { + (void) fprintf(stderr, Errmsg_stnw, strerror(errno)); + exit(1); } @@ -314,45 +311,51 @@ return (0); } - /* * Dump contents of String Table to standard out */ static void -dump_stringtab(Str_tbl *dump_stp) +dump_stringtab(Str_tbl *stp) { - uint_t i; + uint_t cnt; - if ((dump_stp->st_flags & FLG_STTAB_COMPRESS) == 0) { - (void) printf("uncompressed strings: %d\n", - dump_stp->st_fullstringsize); + if ((stp->st_flags & FLG_STTAB_COMPRESS) == 0) { + (void) printf("string table full size: %d: uncompressed\n", + stp->st_fullstrsize); return; } + (void) printf("string table full size: %d compressed down to: %d\n\n", + stp->st_fullstrsize, stp->st_strsize); + (void) printf("string table compression information [%d buckets]:\n", + stp->st_hbckcnt); + + for (cnt = 0; cnt < stp->st_hbckcnt; cnt++) { + Str_hash *sthash = stp->st_hashbcks[cnt]; + + if (sthash == 0) + continue; + + (void) printf(" bucket: [%d]\n", cnt); + + while (sthash) { + uint_t stroff = sthash->hi_mstr->sm_strlen - + sthash->hi_strlen; - for (i = 0; i < dump_stp->st_hbckcnt; i++) { - Str_hash *sthash; - (void) printf("Bucket: [%3d]\n", i); - for (sthash = dump_stp->st_hashbcks[i]; sthash; - sthash = sthash->hi_next) { - uint_t stroff; - stroff = sthash->hi_mstr->sm_stlen - sthash->hi_stlen; if (stroff == 0) { - (void) printf(" %2d %s \n", - sthash->hi_refcnt, - sthash->hi_mstr->sm_str); + (void) printf(" [%d]: '%s' \n", + sthash->hi_refcnt, sthash->hi_mstr->sm_str); } else { - const char *str; - str = &sthash->hi_mstr->sm_str[stroff]; - (void) printf(" %2d %s -> %s\n", - sthash->hi_refcnt, - str, sthash->hi_mstr->sm_str); + (void) printf(" [%d]: '%s' \n", sthash->hi_refcnt, + &sthash->hi_mstr->sm_str[stroff], + sthash->hi_mstr->sm_str); } + sthash = sthash->hi_next; } } - (void) printf("fullstringsize: %d compressed: %d\n", - dump_stp->st_fullstringsize, dump_stp->st_stringsize); } + /* * Initialize the message definition header file stream. */ @@ -520,7 +523,6 @@ return (0); } - /* * The entire messaging file has been scanned - and all strings have been * inserted into the string_table. We can now walk the message queue @@ -553,7 +555,7 @@ return (1); } if (fddefs && fprintf(fddefs, "#define\t%s_SIZE\t%d\n", - msg->ms_defn, (int) strlen(msg->ms_message)) < 0) { + msg->ms_defn, strlen(msg->ms_message)) < 0) { (void) fprintf(stderr, Errmsg_wrte, fldefs, strerror(errno)); return (1); @@ -631,7 +633,7 @@ } static int -file(void) +file() { char buffer[LINE_MAX], * token; uint_t bufsize; @@ -647,9 +649,8 @@ line = 1; while ((token = fgets(buffer, LINE_MAX, fddesc)) != NULL) { - char defn[PATH_MAX], * _defn; - const char *str; - int len = 0; + char defn[PATH_MAX], * _defn, * str; + int len; switch (*token) { case '#': @@ -901,6 +902,7 @@ * unless an escape character is found * terminate the data string with a 0. */ + /* BEGIN CSTYLED */ if (*token == '"') { if (fdlint && (fprintf(fdlint, "%c", *token) < 0)) { @@ -926,6 +928,7 @@ _token = '\0'; } else _token = *token; + /* END CSTYLED */ } if (fdmsgs && (prtmsgs == 1) && @@ -942,7 +945,7 @@ return (1); } - if (len >= (int) bufsize) { + if (len >= bufsize) { bufsize += LINE_MAX; if ((token_buffer = realloc( token_buffer, bufsize)) == 0) { @@ -1188,7 +1191,6 @@ if (vflag) dump_stringtab(stp); - /* * Close up everything and go home. */ ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#6 (text) ==== @@ -20,47 +20,42 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include +#include <_string_table.h> #include -#include #include #include - - /* - * This file provides the interfaces to build a Str_tbl suitable - * for use by either the sgsmsg system or a standard ELF - * SHT_STRTAB. + * This file provides the interfaces to build a Str_tbl suitable for use by + * either the sgsmsg message system, or a standard ELF string table (SHT_STRTAB) + * as created by ld(1). * - * There are two modes which can be used when constructing a - * string table: + * There are two modes which can be used when constructing a string table: * * st_new(0) * standard string table - no compression. This is the - * traditional method and fast + * traditional, fast method. * - * st_new(FLG_STNEW_COMPRESS) - * build a compressed string table which both - * eliminates duplicate strings and permits - * strings with common suffixes (atexit vs. exit) to - * overlap in the table. This provides space - * savings for many string tables. + * st_new(FLG_STTAB_COMPRESS) + * builds a compressed string table which both eliminates + * duplicate strings, and permits strings with common suffixes + * (atexit vs. exit) to overlap in the table. This provides space + * savings for many string tables. Although more work than the + * traditional method, the algorithms used are designed to scale + * and keep any overhead at a minimum. * - * These string tables are now built with a common interface in a - * two-pass manner, the first pass it to find all of the strings - * required for the string-table and to calculate the size that - * will be required for the final string table. + * These string tables are built with a common interface in a two-pass manner. + * The first pass finds all of the strings required for the string-table and + * calculates the size required for the final string table. * - * The second pass allocates the string table and populates the - * strings into the table and returns the offsets the strings - * have been assigned. + * The second pass allocates the string table, populates the strings into the + * table and returns the offsets the strings have been assigned. * * The calling sequence to build and populate a string table is: * @@ -72,7 +67,6 @@ * * st_delstring(st?); // remove string previously * // inserted - * * st_insert(stN); * * st_getstrtab_sz(); // freezes strtab and computes @@ -114,219 +108,234 @@ * The above method will find all suffixes of a given string given * that the strings are inserted from shortest to longest. That is * why this is a two phase method, we first collect all of the - * strings and store them based off of their length in a nice AVL tree. + * strings and store them based off of their length in an AVL tree. * Once all of the strings have been submitted we then start the * hash table build by traversing the AVL tree in order and * inserting the strings from shortest to longest as described * above. - * */ /* LINTLIBRARY */ - static int -strlen_compare(const void *elem1, const void *elem2) +avl_len_compare(const void *n1, const void *n2) { - uint_t l1, l2; - l1 = ((const Stringelem *)elem1)->se_stlen; - l2 = ((const Stringelem *)elem2)->se_stlen; + uint_t len1, len2; + + len1 = ((LenNode *)n1)->ln_strlen; + len2 = ((LenNode *)n2)->ln_strlen; - if (l1 == l2) + if (len1 == len2) return (0); - if (l2 < l1) + if (len2 < len1) return (1); + return (-1); +} + +static int +avl_str_compare(const void *n1, const void *n2) +{ + const char *str1, *str2; + int rc; + + str1 = ((StrNode *)n1)->sn_str; + str2 = ((StrNode *)n2)->sn_str; - return (-1); + rc = strcmp(str1, str2); + if (rc > 0) + return (1); + if (rc < 0) + return (-1); + return (0); } /* - * Return a initialized Str_tbl - returns NULL on failure. + * Return an initialized Str_tbl - returns NULL on failure. * - * stflags: - * - * FLG_STNEW_COMPRESS - build a compressed string table - * + * flags: + * FLG_STTAB_COMPRESS - build a compressed string table */ Str_tbl * -st_new(uint_t stflags) +st_new(uint_t flags) { Str_tbl *stp; - if ((stp = calloc(sizeof (Str_tbl), 1)) == 0) - return (0); + if ((stp = calloc(sizeof (Str_tbl), 1)) == NULL) + return (NULL); /* * Start with a leading '\0' - it's tradition. */ - stp->st_stringsize = stp->st_fullstringsize = stp->st_nextoff = 1; + stp->st_strsize = stp->st_fullstrsize = stp->st_nextoff = 1; /* - * Do we compress this string table + * Do we compress this string table? */ - if ((stflags & FLG_STNEW_COMPRESS) == 0) + stp->st_flags = flags; + if ((stp->st_flags & FLG_STTAB_COMPRESS) == 0) return (stp); - stp->st_flags |= FLG_STTAB_COMPRESS; - if ((stp->st_strtree = calloc(sizeof (avl_tree_t), 1)) == 0) { - return (0); - } + if ((stp->st_lentree = calloc(sizeof (avl_tree_t), 1)) == NULL) + return (NULL); - avl_create(stp->st_strtree, &strlen_compare, sizeof (Stringelem), - SGSOFFSETOF(Stringelem, se_avlnode)); + avl_create(stp->st_lentree, &avl_len_compare, sizeof (LenNode), + SGSOFFSETOF(LenNode, ln_avlnode)); return (stp); } /* - * Tear down a String_Table structure. + * Insert a new string into the Str_tbl. There are two AVL trees used. + * + * . The first LenNode AVL tree maintains a tree of nodes based on string + * sizes. + * . Each LenNode maintains a StrNode AVL tree for each string. Large + * applications have been known to contribute thousands of strings of + * the same size. Should strings need to be removed (-z ignore), then + * the string AVL tree makes this removal efficient and scalable. */ -void -st_destroy(Str_tbl *stp) +int +st_insert(Str_tbl *stp, const char *str) { - Str_hash *sthash, *psthash; - Str_master *mstr, *pmstr; - uint_t i; + uint_t len; + StrNode *snp, sn = { 0 }; + LenNode *lnp, ln = { 0 }; + avl_index_t where; /* - * cleanup the master strings + * String table can't have been cooked */ - for (mstr = stp->st_mstrlist, pmstr = 0; mstr; - mstr = mstr->sm_next) { - if (pmstr) - free(pmstr); - pmstr = mstr; - } - if (pmstr) - free(pmstr); - - if (stp->st_hashbcks) { - for (i = 0; i < stp->st_hbckcnt; i++) { - for (sthash = stp->st_hashbcks[i], psthash = 0; - sthash; sthash = sthash->hi_next) { - if (psthash) - free(psthash); - psthash = sthash; - } - if (psthash) - free(psthash); - } - free(stp->st_hashbcks); - } - free(stp); -} - - - + assert((stp->st_flags & FLG_STTAB_COOKED) == 0); -/* - * Remove a previously inserted string from the Str_tbl - */ -int -st_delstring(Str_tbl *stp, const char *str) -{ - uint_t stlen; - Stringelem qstelem; - Stringelem *stelem; - Stringlist *stlist, *pstlist; - /* - * String table can't have been cooked + * Null strings always point to the head of the string + * table - no reason to keep searching. */ - assert((stp->st_flags & FLG_STTAB_COOKED) == 0); + if ((len = (uint_t)strlen(str)) == 0) + return (0); - stlen = (uint_t)strlen(str); - stp->st_fullstringsize -= stlen + 1; + stp->st_fullstrsize += len + 1; + stp->st_strcnt++; if ((stp->st_flags & FLG_STTAB_COMPRESS) == 0) return (0); - qstelem.se_stlen = stlen; - if ((stelem = avl_find(stp->st_strtree, &qstelem, 0)) == NULL) { - /* - * no strings of this length recorded, let alone - * this specific string - someone goofed. - */ - return (-1); - } + /* + * From the controlling string table, determine which LenNode AVL node + * provides for this string length. If the node doesn't exist, insert + * a new node to represent this string length. + */ + ln.ln_strlen = len; + if ((lnp = avl_find(stp->st_lentree, &ln, &where)) == NULL) { + if ((lnp = calloc(sizeof (LenNode), 1)) == NULL) + return (-1); + lnp->ln_strlen = len; + avl_insert(stp->st_lentree, lnp, where); - pstlist = 0; - for (stlist = stelem->se_strlist; stlist; stlist = stlist->sl_next) { - if (strcmp(str, stlist->sl_string) == 0) - break; - pstlist = stlist; - } + if ((lnp->ln_strtree = calloc(sizeof (avl_tree_t), 1)) == NULL) + return (0); - if (stlist == 0) { - /* - * string was not found - */ - return (-1); + avl_create(lnp->ln_strtree, &avl_str_compare, sizeof (StrNode), + SGSOFFSETOF(StrNode, sn_avlnode)); } - if (pstlist == 0) { - /* - * String is first on list. - */ - stelem->se_strlist = stlist->sl_next; - } else { - /* - * remove string from list. - */ - pstlist->sl_next = stlist->sl_next; + /* + * From the string length AVL node determine whether a StrNode AVL node + * provides this string. If the node doesn't exist, insert a new node + * to represent this string. + */ + sn.sn_str = str; + if ((snp = avl_find(lnp->ln_strtree, &sn, &where)) == NULL) { + if ((snp = calloc(sizeof (StrNode), 1)) == NULL) + return (-1); + snp->sn_str = str; + avl_insert(lnp->ln_strtree, snp, where); } + snp->sn_refcnt++; - free(stlist); return (0); } - /* - * Insert a new string into the Str_tbl + * Remove a previously inserted string from the Str_tbl. */ int -st_insert(Str_tbl *stp, const char *str) +st_delstring(Str_tbl *stp, const char *str) { - uint_t stlen; - Stringelem qstelem; - Stringelem *stelem; - Stringlist *strlist; - avl_index_t where; + uint_t len; + LenNode *lnp, ln = { 0 }; + StrNode *snp, sn = { 0 }; /* * String table can't have been cooked */ assert((stp->st_flags & FLG_STTAB_COOKED) == 0); - stlen = (uint_t)strlen(str); - /* - * Null strings always point to the head of the string - * table - no reason to keep searching. - */ - if (stlen == 0) - return (0); - stp->st_fullstringsize += stlen + 1; - stp->st_stringcnt++; + len = (uint_t)strlen(str); + stp->st_fullstrsize -= len + 1; if ((stp->st_flags & FLG_STTAB_COMPRESS) == 0) return (0); - qstelem.se_stlen = strlen(str); - if ((stelem = avl_find(stp->st_strtree, &qstelem, - &where)) == NULL) { - if ((stelem = calloc(sizeof (Stringelem), 1)) == 0) - return (-1); - stelem->se_stlen = qstelem.se_stlen; - avl_insert(stp->st_strtree, stelem, where); + /* + * Determine which LenNode AVL node provides for this string length. + */ + ln.ln_strlen = len; + if ((lnp = avl_find(stp->st_lentree, &ln, 0)) != NULL) { + sn.sn_str = str; + if ((snp = avl_find(lnp->ln_strtree, &sn, 0)) != NULL) { + /* + * Reduce the reference count, and if zero remove the + * node. + */ + if (--snp->sn_refcnt == 0) + avl_remove(lnp->ln_strtree, snp); + return (0); + } } - if ((strlist = malloc(sizeof (Stringlist))) == 0) - return (-1); + + /* + * No strings of this length, or no string itself - someone goofed. + */ + return (-1); +} + +/* + * Tear down a String_Table structure. + */ +void +st_destroy(Str_tbl *stp) +{ + Str_hash *sthash, *psthash; + Str_master *mstr, *pmstr; + uint_t i; - strlist->sl_string = str; - strlist->sl_next = stelem->se_strlist; - stelem->se_strlist = strlist; + /* + * cleanup the master strings + */ + for (mstr = stp->st_mstrlist, pmstr = 0; mstr; + mstr = mstr->sm_next) { + if (pmstr) + free(pmstr); + pmstr = mstr; + } + if (pmstr) + free(pmstr); - return (0); + if (stp->st_hashbcks) { + for (i = 0; i < stp->st_hbckcnt; i++) { + for (sthash = stp->st_hashbcks[i], psthash = 0; + sthash; sthash = sthash->hi_next) { + if (psthash) + free(psthash); + psthash = sthash; + } + if (psthash) + free(psthash); + } + free(stp->st_hashbcks); + } + free(stp); } @@ -369,7 +378,7 @@ /* * Have we overflowed our assigned buffer? */ - if ((_stoff + stlen) > stp->st_fullstringsize) + if ((_stoff + stlen) > stp->st_fullstrsize) return (-1); memcpy(stp->st_strbuf + _stoff, str, stlen); *stoff = _stoff; @@ -378,26 +387,25 @@ } /* - * Calculate reverse hash for string + * Calculate reverse hash for string. */ hashval = HASHSEED; for (i = stlen; i >= 0; i--) { hashval = ((hashval << 5) + hashval) + - str[i]; /* h = ((h * 33) + c) */ + str[i]; /* h = ((h * 33) + c) */ } for (sthash = stp->st_hashbcks[hashval % stp->st_hbckcnt]; sthash; sthash = sthash->hi_next) { - if (sthash->hi_hashval == hashval) { - const char *hstr; + const char *hstr; + + if (sthash->hi_hashval != hashval) + continue; - hstr = &sthash->hi_mstr->sm_str[ - sthash->hi_mstr->sm_stlen - - sthash->hi_stlen]; - if (strcmp(str, hstr) == 0) { - break; - } - } + hstr = &sthash->hi_mstr->sm_str[sthash->hi_mstr->sm_strlen - + sthash->hi_strlen]; + if (strcmp(str, hstr) == 0) + break; } /* @@ -410,29 +418,33 @@ * Has this string been copied into the string table? */ mstr = sthash->hi_mstr; - if (mstr->sm_stoff == 0) { - uint_t mstlen = mstr->sm_stlen + 1; - mstr->sm_stoff = stp->st_nextoff; + if (mstr->sm_stroff == 0) { + uint_t mstrlen = mstr->sm_strlen + 1; + + mstr->sm_stroff = stp->st_nextoff; + /* * Have we overflowed our assigned buffer? */ - if ((mstr->sm_stoff + mstlen) > stp->st_fullstringsize) + if ((mstr->sm_stroff + mstrlen) > stp->st_fullstrsize) return (-1); - memcpy(stp->st_strbuf + mstr->sm_stoff, mstr->sm_str, - mstlen); - stp->st_nextoff += mstlen; + + (void) memcpy(stp->st_strbuf + mstr->sm_stroff, + mstr->sm_str, mstrlen); + stp->st_nextoff += mstrlen; } + /* - * Calculate offset of (sub)string + * Calculate offset of (sub)string. */ - *stoff = mstr->sm_stoff + mstr->sm_stlen - sthash->hi_stlen; + *stoff = mstr->sm_stroff + mstr->sm_strlen - sthash->hi_strlen; return (0); } static int -st_hash_insert(Str_tbl *stp, const char *str, uint_t stlen) +st_hash_insert(Str_tbl *stp, const char *str, uint_t len) { int i; uint_t hashval = HASHSEED; @@ -451,51 +463,48 @@ * any suffixes already exist in the tree as we generate * the hash. */ - for (i = stlen; i >= 0; i--) { + for (i = len; i >= 0; i--) { + hashval = ((hashval << 5) + hashval) + + str[i]; /* h = ((h * 33) + c) */ - hashval = ((hashval << 5) + hashval) + - str[i]; /* h = ((h * 33) + c) */ for (sthash = hashbcks[hashval % bckcnt]; sthash; sthash = sthash->hi_next) { + const char *hstr; + Str_master *_mstr; - if (sthash->hi_hashval == hashval) { - const char *hstr; - Str_master *_mstr; + if (sthash->hi_hashval != hashval) + continue; + + _mstr = sthash->hi_mstr; + hstr = &_mstr->sm_str[_mstr->sm_strlen - + sthash->hi_strlen]; + + if (strcmp(&str[i], hstr)) + continue; - _mstr = sthash->hi_mstr; - hstr = &_mstr->sm_str[_mstr->sm_stlen - - sthash->hi_stlen]; - if (strcmp(&str[i], hstr) == 0) { - if (i == 0) { - /* - * Entry already in table, - * increment refcnt and get - * out. - */ - sthash->hi_refcnt++; - return (0); - } else { - /* - * If this 'suffix' is - * presently a 'master' string, - * then take over it's record. - */ - if (sthash->hi_stlen == >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 27 02:54:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECAD116A419; Sun, 27 Jan 2008 02:54:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99E4D16A473 for ; Sun, 27 Jan 2008 02:54:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 719A413C442 for ; Sun, 27 Jan 2008 02:54:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0R2sKHr002230 for ; Sun, 27 Jan 2008 02:54:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0R2sKkf002227 for perforce@freebsd.org; Sun, 27 Jan 2008 02:54:20 GMT (envelope-from jb@freebsd.org) Date: Sun, 27 Jan 2008 02:54:20 GMT Message-Id: <200801270254.m0R2sKkf002227@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134178 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 02:54:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=134178 Change 134178 by jb@jb_freebsd1 on 2008/01/27 02:54:14 IFopensolaris Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/_string_table.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 27 04:49:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 621B816A421; Sun, 27 Jan 2008 04:49:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D594C16A41A for ; Sun, 27 Jan 2008 04:49:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C246E13C448 for ; Sun, 27 Jan 2008 04:49:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0R4nL98020423 for ; Sun, 27 Jan 2008 04:49:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0R4nLpW020420 for perforce@freebsd.org; Sun, 27 Jan 2008 04:49:21 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 27 Jan 2008 04:49:21 GMT Message-Id: <200801270449.m0R4nLpW020420@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134181 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 04:49:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=134181 Change 134181 by kmacy@kmacy:storage:toehead on 2008/01/27 04:49:19 IFC 134180 bring cxgb_sge.c fix for DISABLE_MBUF_IOVEC Affected files ... .. //depot/projects/toehead/share/man/man9/style.9#3 integrate .. //depot/projects/toehead/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#2 integrate .. //depot/projects/toehead/sys/netinet/tcp_ofld.c#2 delete .. //depot/projects/toehead/sys/netinet/tcp_ofld.h#5 delete .. //depot/projects/toehead/sys/netinet/toedev.h#3 integrate Differences ... ==== //depot/projects/toehead/share/man/man9/style.9#3 (text+ko) ==== @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)style 1.14 (Berkeley) 4/28/95 -.\" $FreeBSD: src/share/man/man9/style.9,v 1.124 2008/01/05 21:39:21 grog Exp $ +.\" $FreeBSD: src/share/man/man9/style.9,v 1.125 2008/01/27 03:58:22 obrien Exp $ .\" .Dd February 10, 2005 .Dt STYLE 9 @@ -46,7 +46,7 @@ * Style guide for FreeBSD. Based on the CSRG's KNF (Kernel Normal Form). * * @(#)style 1.14 (Berkeley) 4/28/95 - * $FreeBSD: src/share/man/man9/style.9,v 1.124 2008/01/05 21:39:21 grog Exp $ + * $FreeBSD: src/share/man/man9/style.9,v 1.125 2008/01/27 03:58:22 obrien Exp $ */ /* @@ -111,7 +111,7 @@ #endif #include -__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.124 2008/01/05 21:39:21 grog Exp $"); +__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.125 2008/01/27 03:58:22 obrien Exp $"); .Ed .Pp Leave another blank line before the header files. @@ -852,3 +852,7 @@ desire of the .Fx project. +.Pa src/admin/style/style +is a codification by the CSRG of the programming style of Ken Thompson and +Dennis Ritchie in +.At v6 . ==== //depot/projects/toehead/sys/dev/cxgb/cxgb_sge.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_sge.c,v 1.47 2008/01/19 22:47:43 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_sge.c,v 1.48 2008/01/27 04:37:02 kmacy Exp $"); #include #include @@ -292,18 +292,6 @@ * * Return a packet containing the immediate data of the given response. */ -#ifdef DISABLE_MBUF_IOVEC -static __inline int -get_imm_packet(adapter_t *sc, const struct rsp_desc *resp, struct t3_mbuf_hdr *mh) -{ - struct mbuf *m = mh->m_head; - - memcpy(mtod(m, uint8_t *), resp->imm_data, IMMED_PKT_SIZE); - m->m_pkthdr.len = m->m_len = len; - return (0); -} - -#else static int get_imm_packet(adapter_t *sc, const struct rsp_desc *resp, struct mbuf *m, void *cl, uint32_t flags) { @@ -313,7 +301,6 @@ return (0); } -#endif static __inline u_int flits_to_desc(u_int n) @@ -2501,10 +2488,10 @@ uint32_t len = G_RSPD_LEN(len_cq); uint32_t flags = ntohl(r->flags); uint8_t sopeop = G_RSPD_SOP_EOP(flags); - struct mbuf *m; - uint32_t *ref; + caddr_t cl; + struct mbuf *m, *m0; int ret = 0; - + prefetch(sd->rxsd_cl); fl->credits--; @@ -2517,20 +2504,20 @@ memcpy(cl, sd->data, len); recycle_rx_buf(adap, fl, fl->cidx); m = m0; + m0->m_len = len; } else { skip_recycle: - int flags = 0; + bus_dmamap_unload(fl->entry_tag, sd->map); cl = sd->rxsd_cl; m = m0 = (struct mbuf *)cl; - m0->m_len = len; if ((sopeop == RSPQ_SOP_EOP) || (sopeop == RSPQ_SOP)) flags = M_PKTHDR; init_cluster_mbuf(cl, flags, fl->type, fl->zone); + m0->m_len = len; } - switch(sopeop) { case RSPQ_SOP_EOP: DBG(DBG_RX, ("get_packet: SOP-EOP m %p\n", m)); @@ -2541,7 +2528,7 @@ case RSPQ_NSOP_NEOP: DBG(DBG_RX, ("get_packet: NO_SOP-NO_EOP m %p\n", m)); if (mh->mh_tail == NULL) { - printf("discarding intermediate descriptor entry\n"); + log(LOG_ERR, "discarding intermediate descriptor entry\n"); m_freem(m); break; } @@ -2738,41 +2725,26 @@ } else if (flags & F_RSPD_IMM_DATA_VALID) { struct mbuf *m = NULL; - -#ifdef DISABLE_MBUF_IOVEC - DPRINTF("IMM DATA VALID opcode=0x%x rspq->cidx=%d\n", - r->rss_hdr.opcode, rspq->cidx); - - m = rspq->rspq_mh.mh_head = m_gethdr(M_DONTWAIT, MT_DATA); - if (m == NULL) { - rspq->next_holdoff = NOMEM_INTR_DELAY; - budget_left--; - break; - } - get_imm_packet(adap, r, &rspq->rspq_mh); - eop = 1; -#else DPRINTF("IMM DATA VALID opcode=0x%x rspq->cidx=%d\n", r->rss_hdr.opcode, rspq->cidx); - if (rspq->rspq_mbuf == NULL) - rspq->rspq_mbuf = m_gethdr(M_DONTWAIT, MT_DATA); + if (rspq->rspq_mh.mh_head == NULL) + rspq->rspq_mh.mh_head = m_gethdr(M_DONTWAIT, MT_DATA); else m = m_gethdr(M_DONTWAIT, MT_DATA); /* * XXX revisit me */ - if (rspq->rspq_mbuf == NULL && m == NULL) { + if (rspq->rspq_mh.mh_head == NULL && m == NULL) { rspq->next_holdoff = NOMEM_INTR_DELAY; budget_left--; break; } - get_imm_packet(adap, r, rspq->rspq_mbuf, m, flags); + get_imm_packet(adap, r, rspq->rspq_mh.mh_head, m, flags); eop = 1; rspq->imm_data++; -#endif } else if (r->len_cq) { int drop_thresh = eth ? SGE_RX_DROP_THRES : 0; ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#2 (text+ko) ==== @@ -25,12 +25,15 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_tcp.h,v 1.1 2007/12/17 08:17:50 kmacy Exp $ + * $FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_tcp.h,v 1.2 2008/01/27 04:39:38 kmacy Exp $ */ #ifndef CXGB_TCP_H_ #define CXGB_TCP_H_ - +#ifdef TCP_USRREQS_OVERLOAD struct tcpcb *cxgb_tcp_drop(struct tcpcb *tp, int errno); +#else +#define cxgb_tcp_drop tcp_drop +#endif void cxgb_tcp_ctlinput(int cmd, struct sockaddr *sa, void *vip); struct tcpcb *cxgb_tcp_close(struct tcpcb *tp); ==== //depot/projects/toehead/sys/netinet/toedev.h#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Jan 27 04:50:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4891516A46C; Sun, 27 Jan 2008 04:50:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E07016A468 for ; Sun, 27 Jan 2008 04:50:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EE6C613C509 for ; Sun, 27 Jan 2008 04:50:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0R4oMDs020526 for ; Sun, 27 Jan 2008 04:50:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0R4oMuk020523 for perforce@freebsd.org; Sun, 27 Jan 2008 04:50:22 GMT (envelope-from jb@freebsd.org) Date: Sun, 27 Jan 2008 04:50:22 GMT Message-Id: <200801270450.m0R4oMuk020523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134182 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 04:50:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=134182 Change 134182 by jb@jb_freebsd1 on 2008/01/27 04:50:17 The recent IFopensolaris integrated a new test. We got it. This Makefile tried to run it. We failed. Oops. Add it to the list we ignore. Heh. Affected files ... .. //depot/projects/dtrace/src/tools/test/dtrace/Makefile#22 edit Differences ... ==== //depot/projects/dtrace/src/tools/test/dtrace/Makefile#22 (text+ko) ==== @@ -48,6 +48,8 @@ ${TESTSRCDIR}/tst/common/misc/tst.include.ksh \ ${TESTSRCDIR}/tst/common/misc/tst.roch.d \ ${TESTSRCDIR}/tst/common/misc/tst.schrock.ksh \ + ${TESTSRCDIR}/tst/common/nfs/tst.call.c \ + ${TESTSRCDIR}/tst/common/nfs/tst.call.d \ ${TESTSRCDIR}/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d \ ${TESTSRCDIR}/tst/common/pid/err.D_PDESC_ZERO.badlib.d \ ${TESTSRCDIR}/tst/common/pid/err.D_PDESC_ZERO.badproc1.d \ From owner-p4-projects@FreeBSD.ORG Sun Jan 27 04:52:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3149D16A469; Sun, 27 Jan 2008 04:52:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BACA416A468 for ; Sun, 27 Jan 2008 04:52:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A7C5913C45D for ; Sun, 27 Jan 2008 04:52:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0R4qPvd020620 for ; Sun, 27 Jan 2008 04:52:25 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0R4qP4F020617 for perforce@freebsd.org; Sun, 27 Jan 2008 04:52:25 GMT (envelope-from jb@freebsd.org) Date: Sun, 27 Jan 2008 04:52:25 GMT Message-Id: <200801270452.m0R4qP4F020617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134183 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 04:52:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=134183 Change 134183 by jb@jb_freebsd1 on 2008/01/27 04:51:24 Use a mtx rather than an sx lock. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_sdt.c#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_sdt.c#7 (text+ko) ==== @@ -39,8 +39,8 @@ #include #include #include +#include #include -#include #include /* @@ -51,7 +51,8 @@ /* * Mutex to serialise access to the SDT provider list. */ -static struct sx sdt_sx; +static struct mtx sdt_mtx; +MTX_SYSINIT(&sdt_mtx, "Statically Defined Tracing", NULL, MTX_DEF); /* * Hook for the DTrace probe function. The 'sdt' provider will set this @@ -79,13 +80,13 @@ { struct sdt_provider *prov = arg; - sx_xlock(&sdt_sx); + mtx_lock(&sdt_mtx); TAILQ_INSERT_TAIL(&sdt_provider_list, prov, prov_entry); TAILQ_INIT(&prov->probe_list); - sx_xunlock(&sdt_sx); + mtx_unlock(&sdt_mtx); } /* @@ -96,11 +97,11 @@ { struct sdt_provider *prov = arg; - sx_xlock(&sdt_sx); + mtx_lock(&sdt_mtx); TAILQ_REMOVE(&sdt_provider_list, prov, prov_entry); - sx_xunlock(&sdt_sx); + mtx_unlock(&sdt_mtx); } /* @@ -120,7 +121,7 @@ return; } - sx_xlock(&sdt_sx); + mtx_lock(&sdt_mtx); TAILQ_INSERT_TAIL(&probe->prov->probe_list, probe, probe_entry); @@ -128,7 +129,7 @@ probe->state = SDT_INIT; - sx_xunlock(&sdt_sx); + mtx_unlock(&sdt_mtx); } /* @@ -139,14 +140,14 @@ { struct sdt_probe *probe = arg; - sx_xlock(&sdt_sx); + mtx_lock(&sdt_mtx); if (probe->state == SDT_INIT) { TAILQ_REMOVE(&probe->prov->probe_list, probe, probe_entry); probe->state = SDT_UNINIT; } - sx_xunlock(&sdt_sx); + mtx_unlock(&sdt_mtx); } /* @@ -157,13 +158,13 @@ { struct sdt_argtype *argtype = arg; - sx_xlock(&sdt_sx); + mtx_lock(&sdt_mtx); TAILQ_INSERT_TAIL(&argtype->probe->argtype_list, argtype, argtype_entry); argtype->probe->n_args++; - sx_xunlock(&sdt_sx); + mtx_unlock(&sdt_mtx); } /* @@ -174,17 +175,17 @@ { struct sdt_argtype *argtype = arg; - sx_xlock(&sdt_sx); + mtx_lock(&sdt_mtx); TAILQ_REMOVE(&argtype->probe->argtype_list, argtype, argtype_entry); - sx_xunlock(&sdt_sx); + mtx_unlock(&sdt_mtx); } static void sdt_init(void *arg) { - sx_init(&sdt_sx, "Statically Defined Tracing"); + sx_init(&sdt_mtx, "Statically Defined Tracing"); TAILQ_INIT(&sdt_provider_list); } @@ -194,7 +195,7 @@ static void sdt_uninit(void *arg) { - sx_destroy(&sdt_sx); + sx_destroy(&sdt_mtx); } SYSUNINIT(sdt, SI_SUB_KDTRACE, SI_ORDER_FIRST, sdt_uninit, NULL); @@ -208,14 +209,14 @@ int error = 0; struct sdt_provider *prov; - sx_xlock(&sdt_sx); + mtx_lock(&sdt_mtx); TAILQ_FOREACH(prov, &sdt_provider_list, prov_entry) { if ((error = callback_func(prov, arg)) != 0) break; } - sx_xunlock(&sdt_sx); + mtx_unlock(&sdt_mtx); return (error); } @@ -231,9 +232,9 @@ int locked; struct sdt_probe *probe; - locked = sx_xlocked(&sdt_sx); + locked = mtx_locked(&sdt_mtx); if (!locked) - sx_xlock(&sdt_sx); + mtx_lock(&sdt_mtx); TAILQ_FOREACH(probe, &prov->probe_list, probe_entry) { if ((error = callback_func(probe, arg)) != 0) @@ -241,7 +242,7 @@ } if (!locked) - sx_xunlock(&sdt_sx); + mtx_unlock(&sdt_mtx); return (error); } @@ -257,9 +258,9 @@ int locked; struct sdt_argtype *argtype; - locked = sx_xlocked(&sdt_sx); + locked = mtx_locked(&sdt_mtx); if (!locked) - sx_xlock(&sdt_sx); + mtx_lock(&sdt_mtx); TAILQ_FOREACH(argtype, &probe->argtype_list, argtype_entry) { if ((error = callback_func(argtype, arg)) != 0) @@ -267,7 +268,7 @@ } if (!locked) - sx_xunlock(&sdt_sx); + mtx_unlock(&sdt_mtx); return (error); } From owner-p4-projects@FreeBSD.ORG Sun Jan 27 07:16:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED95016A41B; Sun, 27 Jan 2008 07:16:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A28516A419 for ; Sun, 27 Jan 2008 07:16:56 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 597ED13C447 for ; Sun, 27 Jan 2008 07:16:56 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0R7Gt4Q031866 for ; Sun, 27 Jan 2008 07:16:56 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0R7Gtdp031863 for perforce@freebsd.org; Sun, 27 Jan 2008 07:16:55 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 27 Jan 2008 07:16:55 GMT Message-Id: <200801270716.m0R7Gtdp031863@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 07:16:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=134185 Change 134185 by kmacy@kmacy:storage:toehead on 2008/01/27 07:16:32 remove superfluous use of timeo in t3_soreceive disable MBUF_IOVEC on receive Affected files ... .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#8 edit .. //depot/projects/toehead/sys/modules/cxgb/cxgb/Makefile#4 edit Differences ... ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#8 (text+ko) ==== @@ -517,7 +517,6 @@ uint32_t offset; int err, flags, avail, len, buffers_freed = 0, copied = 0; int target; /* Read at least this many bytes */ - long timeo; int user_ddp_ok, user_ddp_pending = 0; struct ddp_state *p; struct inpcb *inp = sotoinpcb(so); @@ -532,19 +531,18 @@ len = uio->uio_resid; m = so->so_rcv.sb_mb; target = (flags & MSG_WAITALL) ? min(len, so->so_rcv.sb_hiwat) : so->so_rcv.sb_lowat; - timeo = so->so_rcv.sb_timeo; p = &toep->tp_ddp_state; user_ddp_ok = p->ubuf_ddp_ready; p->cancel_ubuf = 0; /* - * XXX check timeo/signal/urgent + * XXX check urgent */ if (m) goto got_mbuf; /* empty receive queue */ - if (copied >= target && /* !sk->sk_backlog.tail && */ + if (copied >= target && (so->so_rcv.sb_mb == NULL) && !user_ddp_pending) goto done; @@ -628,21 +626,21 @@ * data. Either stop short of urgent data or skip it if it's * first and we are not delivering urgent data inline. */ - if (unlikely(tp->urg_data)) { - u32 urg_offset = tp->urg_seq - tp->copied_seq; + if (__predict_false(toep->tp_urg_data)) { + uint32_t urg_offset = tp->rcv_up - tp->copied_seq; if (urg_offset < avail) { if (urg_offset) { /* stop short of the urgent data */ avail = urg_offset; - } else if (!sock_flag(sk, SOCK_URGINLINE)) { + } else if ((so->so_options & SO_OOBINLINE) == 0) { /* First byte is urgent, skip */ - tp->copied_seq++; + toep->tp_copied_seq++; offset++; avail--; if (!avail) goto skip_copy; - } + } } } #endif @@ -657,9 +655,7 @@ /* * XXX */ -#ifdef notyet - uio->uio_iovlen > p->kbuf[0]->length && -#endif + uio->uio_iov->iov_len > p->kbuf[0]->dgl_length && p->ubuf_ddp_ready) { user_ddp_pending = !t3_overlay_ubuf(so, uio, (so->so_state & SS_NBIO), flags, 1, 1); @@ -795,6 +791,8 @@ if ((uio->uio_resid > zcopy_thres) && (uio->uio_iovcnt == 1) && ((so->so_state & SS_NBIO) == 0) && zcopy_enabled) { + printf("uio_resid=%d zcopy_thres=%d\n", + uio->uio_resid, zcopy_thres); rv = t3_soreceive(so, flagsp, uio); if (rv != EAGAIN) return (rv); ==== //depot/projects/toehead/sys/modules/cxgb/cxgb/Makefile#4 (text+ko) ==== @@ -12,7 +12,7 @@ SRCS+= cxgb_multiq.c CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -DDEFAULT_JUMBO -I${CXGB} -DSMP -#CFLAGS+= -DDISABLE_MBUF_IOVEC +CFLAGS+= -DDISABLE_MBUF_IOVEC #CFLAGS+= -DIFNET_MULTIQUEUE #CFLAGS+= -DINVARIANT_SUPPORT -DINVARIANTS #CFLAGS+= -DWITNESS From owner-p4-projects@FreeBSD.ORG Sun Jan 27 13:46:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F310D16A419; Sun, 27 Jan 2008 13:46:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B812316A417 for ; Sun, 27 Jan 2008 13:46:40 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A6A2B13C458 for ; Sun, 27 Jan 2008 13:46:40 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RDkeeB082990 for ; Sun, 27 Jan 2008 13:46:40 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RDkeC8082987 for perforce@freebsd.org; Sun, 27 Jan 2008 13:46:40 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 27 Jan 2008 13:46:40 GMT Message-Id: <200801271346.m0RDkeC8082987@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 134192 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 13:46:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=134192 Change 134192 by hselasky@hselasky_laptop001 on 2008/01/27 13:46:33 Bugfix. Only extend segments if we are multi segmented which is defined by the physical memory alignment being equal to 1. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#87 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#96 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#87 (text+ko) ==== @@ -2318,7 +2318,7 @@ * XXX so we need to extend the last segment if we are * XXX unaligned and cross the segment boundary! */ - if (ext_seg) { + if (ext_seg && pc->ismultiseg) { (pg + 1)->physaddr = pg->physaddr + USB_PAGE_SIZE; } if (xfer) { @@ -2381,6 +2381,7 @@ pc->page_offset_end = size; pc->map = map; pc->tag = tag; + pc->ismultiseg = (align == 1); /* load memory into DMA */ if (bus_dmamap_load @@ -2635,7 +2636,7 @@ * XXX so we need to extend the last segment if we are * XXX unaligned and cross the segment boundary! */ - if (ext_seg) { + if (ext_seg && pc->ismultiseg) { (pg + 1)->physaddr = pg->physaddr + USB_PAGE_SIZE; } if (xfer) { @@ -2722,6 +2723,7 @@ pc->page_offset_end = size; pc->map = map; pc->tag = tag; + pc->ismultiseg = (align == 1); usbd_pc_alloc_mem_cb(pc, utag->p_seg, seg_count, 0); ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#96 (text+ko) ==== @@ -262,6 +262,7 @@ uint32_t page_offset_buf; uint32_t page_offset_end; uint8_t isread:1; + uint8_t ismultiseg:1; /* set if we can have multiple segments */ }; struct usbd_setup_params { From owner-p4-projects@FreeBSD.ORG Sun Jan 27 14:17:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5BE716A469; Sun, 27 Jan 2008 14:17:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6AE7916A421 for ; Sun, 27 Jan 2008 14:17:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5800013C4CC for ; Sun, 27 Jan 2008 14:17:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0REHCBk087043 for ; Sun, 27 Jan 2008 14:17:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0REHCU9087040 for perforce@freebsd.org; Sun, 27 Jan 2008 14:17:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 27 Jan 2008 14:17:12 GMT Message-Id: <200801271417.m0REHCU9087040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134193 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 14:17:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=134193 Change 134193 by rwatson@rwatson_freebsd_capabilities on 2008/01/27 14:16:17 Add stubs for forthcoming execve-by-file descriptor (fexec) system call. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/include/unistd.h#2 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Symbol.map#5 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#10 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#10 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#6 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#10 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#10 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#10 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#10 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/include/unistd.h#2 (text+ko) ==== @@ -335,6 +335,9 @@ int execv(const char *, char * const *); int execve(const char *, char * const *, char * const *); int execvp(const char *, char * const *); +#ifdef __BSD_VISIBLE +int fexecve(int, char * const *, char * const *); +#endif pid_t fork(void); long fpathconf(int, int); char *getcwd(char *, size_t); ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Symbol.map#5 (text) ==== @@ -969,4 +969,5 @@ cap_new; cap_getrights; cap_enter; + fexec; }; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#4 (text+ko) ==== @@ -5,7 +5,7 @@ # - sys_exit() and close() are very important. # - Sorted alphabeetically, please keep it that way. # -# $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#3 $ +# $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#4 $ # __acl_aclcheck_fd __acl_delete_fd @@ -69,6 +69,7 @@ # scoped. # fcntl +fexec flock fork fpathconf ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#10 (text+ko) ==== @@ -517,4 +517,5 @@ { AS(cap_getrights_args), (sy_call_t *)cap_getrights, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 485 = cap_getrights */ { 0, (sy_call_t *)cap_enter, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 486 = cap_enter */ { AS(cap_getmode_args), (sy_call_t *)cap_getmode, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 487 = cap_getmode */ + { AS(fexecve_args), (sy_call_t *)fexecve, AUE_NULL, NULL, 0, 0, 0 }, /* 488 = fexecve */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#2 (text+ko) ==== @@ -221,6 +221,27 @@ #endif } +#ifndef _SYS_SYSPROTO_H_ +struct fexecve_args { + int fd; + char **argv; + char **envv; +}; +#endif +int +fexecve(td, uap) + struct thread *td; + struct fexecve_args /* { + int fd; + char **argv; + char **envv; + } */ *uap; +{ + + /* XXXRW: Real work to be done here. */ + return (ENOSYS); +} + /* * XXX: kern_execve has the astonishing property of not always returning to * the caller. If sufficiently bad things happen during the call to ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#10 (text+ko) ==== @@ -495,4 +495,5 @@ "cap_getrights", /* 485 = cap_getrights */ "cap_enter", /* 486 = cap_enter */ "cap_getmode", /* 487 = cap_getmode */ + "fexecve", /* 488 = fexecve */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#6 (text+ko) ==== @@ -855,5 +855,7 @@ u_int64_t *rightsp); } 486 AUE_NULL STD { int cap_enter(void); } 487 AUE_NULL STD { int cap_getmode(u_int *modep); } +488 AUE_NULL STD { int fexecve(int fd, char **argv, \ + char **envv); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#10 (text+ko) ==== @@ -2915,6 +2915,15 @@ *n_args = 1; break; } + /* fexecve */ + case 488: { + struct fexecve_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->argv; /* char ** */ + uarg[2] = (intptr_t) p->envv; /* char ** */ + *n_args = 3; + break; + } default: *n_args = 0; break; ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#10 (text+ko) ==== @@ -407,4 +407,5 @@ #define SYS_cap_getrights 485 #define SYS_cap_enter 486 #define SYS_cap_getmode 487 -#define SYS_MAXSYSCALL 488 +#define SYS_fexecve 488 +#define SYS_MAXSYSCALL 489 ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#10 (text+ko) ==== @@ -355,4 +355,5 @@ cap_new.o \ cap_getrights.o \ cap_enter.o \ - cap_getmode.o + cap_getmode.o \ + fexecve.o ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#10 (text+ko) ==== @@ -1542,6 +1542,11 @@ struct cap_getmode_args { char modep_l_[PADL_(u_int *)]; u_int * modep; char modep_r_[PADR_(u_int *)]; }; +struct fexecve_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char argv_l_[PADL_(char **)]; char ** argv; char argv_r_[PADR_(char **)]; + char envv_l_[PADL_(char **)]; char ** envv; char envv_r_[PADR_(char **)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1887,6 +1892,7 @@ int cap_getrights(struct thread *, struct cap_getrights_args *); int cap_enter(struct thread *, struct cap_enter_args *); int cap_getmode(struct thread *, struct cap_getmode_args *); +int fexecve(struct thread *, struct fexecve_args *); #ifdef COMPAT_43 @@ -2457,6 +2463,7 @@ #define SYS_AUE_cap_getrights AUE_NULL #define SYS_AUE_cap_enter AUE_NULL #define SYS_AUE_cap_getmode AUE_NULL +#define SYS_AUE_fexecve AUE_NULL #undef PAD_ #undef PADL_ From owner-p4-projects@FreeBSD.ORG Sun Jan 27 14:29:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B85616A46E; Sun, 27 Jan 2008 14:29:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 30E6216A46C for ; Sun, 27 Jan 2008 14:29:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0757613C448 for ; Sun, 27 Jan 2008 14:29:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RETOeF087623 for ; Sun, 27 Jan 2008 14:29:24 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RETOl3087620 for perforce@freebsd.org; Sun, 27 Jan 2008 14:29:24 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 27 Jan 2008 14:29:24 GMT Message-Id: <200801271429.m0RETOl3087620@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 134194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 14:29:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=134194 Change 134194 by hselasky@hselasky_laptop001 on 2008/01/27 14:28:57 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#97 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#97 (text+ko) ==== @@ -262,7 +262,8 @@ uint32_t page_offset_buf; uint32_t page_offset_end; uint8_t isread:1; - uint8_t ismultiseg:1; /* set if we can have multiple segments */ + uint8_t ismultiseg:1; /* set if we can have multiple + * segments */ }; struct usbd_setup_params { From owner-p4-projects@FreeBSD.ORG Sun Jan 27 14:44:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6DD816A46C; Sun, 27 Jan 2008 14:44:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63F4C16A421 for ; Sun, 27 Jan 2008 14:44:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 534D413C45B for ; Sun, 27 Jan 2008 14:44:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0REifgo088419 for ; Sun, 27 Jan 2008 14:44:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0REifwu088416 for perforce@freebsd.org; Sun, 27 Jan 2008 14:44:41 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 27 Jan 2008 14:44:41 GMT Message-Id: <200801271444.m0REifwu088416@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 134197 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 14:44:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=134197 Change 134197 by hselasky@hselasky_laptop001 on 2008/01/27 14:43:58 Bugfix. When we load memory into DMA it is also multi segment. "usbd_get_page()" should compute the physical address based on the offset and the first "usbd_page" alone when "ismultiseg" is false. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#88 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#88 (text+ko) ==== @@ -2050,12 +2050,18 @@ page = pc->page_start; + if (pc->ismultiseg) { + page += (offset / USB_PAGE_SIZE); offset %= USB_PAGE_SIZE; res->length = USB_PAGE_SIZE - offset; res->physaddr = page->physaddr + offset; + } else { + res->length = 0 - 1; + res->physaddr = page->physaddr + offset; + } if (!pc->buffer) { /* Case 1b - Non Kernel Virtual Address */ @@ -2440,6 +2446,7 @@ /* setup page cache */ pc->page_offset_buf = 0; pc->page_offset_end = size; + pc->ismultiseg = 1; if (size > 0) { @@ -2792,6 +2799,7 @@ /* setup page cache */ pc->page_offset_buf = 0; pc->page_offset_end = size; + pc->ismultiseg = 1; if (size > 0) { From owner-p4-projects@FreeBSD.ORG Sun Jan 27 14:44:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8491116A50A; Sun, 27 Jan 2008 14:44:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8902216A468 for ; Sun, 27 Jan 2008 14:44:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 785B113C46E for ; Sun, 27 Jan 2008 14:44:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0REiftj088425 for ; Sun, 27 Jan 2008 14:44:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0REifJS088422 for perforce@freebsd.org; Sun, 27 Jan 2008 14:44:41 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 27 Jan 2008 14:44:41 GMT Message-Id: <200801271444.m0REifJS088422@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 134198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 14:44:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=134198 Change 134198 by hselasky@hselasky_laptop001 on 2008/01/27 14:44:25 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#89 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#89 (text+ko) ==== @@ -2052,12 +2052,12 @@ if (pc->ismultiseg) { - page += (offset / USB_PAGE_SIZE); + page += (offset / USB_PAGE_SIZE); - offset %= USB_PAGE_SIZE; + offset %= USB_PAGE_SIZE; - res->length = USB_PAGE_SIZE - offset; - res->physaddr = page->physaddr + offset; + res->length = USB_PAGE_SIZE - offset; + res->physaddr = page->physaddr + offset; } else { res->length = 0 - 1; res->physaddr = page->physaddr + offset; From owner-p4-projects@FreeBSD.ORG Sun Jan 27 15:45:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6C1016A420; Sun, 27 Jan 2008 15:45:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9BF0616A41A for ; Sun, 27 Jan 2008 15:45:47 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 89DE113C4EB for ; Sun, 27 Jan 2008 15:45:47 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RFjlaB000376 for ; Sun, 27 Jan 2008 15:45:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RFjlkP000373 for perforce@freebsd.org; Sun, 27 Jan 2008 15:45:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 27 Jan 2008 15:45:47 GMT Message-Id: <200801271545.m0RFjlkP000373@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134201 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 15:45:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=134201 Change 134201 by rwatson@rwatson_freebsd_capabilities on 2008/01/27 15:45:28 Import rdivacky's fexecve() code from linux_at branch. Requires some further tweaking to build/work in this branch. Submitted by: rdivacky (thanks!) Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#3 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/imgact.h#2 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#3 (text+ko) ==== @@ -189,6 +189,27 @@ } #ifndef _SYS_SYSPROTO_H_ +struct fexecve_args { + int fd; + char **argv; + char **envv; +} +#endif +int +fexecve(struct thread *td, struct fexecve_args *uap) +{ + int error; + struct image_args args; + + error = exec_copyin_args(&args, NULL, UIO_SYSSPACE, + uap->argv, uap->envv); + args.fd = uap->fd; + if (error == 0) + error = kern_execve(td, &args, NULL); + return (error); +} + +#ifndef _SYS_SYSPROTO_H_ struct __mac_execve_args { char *fname; char **argv; @@ -221,27 +242,6 @@ #endif } -#ifndef _SYS_SYSPROTO_H_ -struct fexecve_args { - int fd; - char **argv; - char **envv; -}; -#endif -int -fexecve(td, uap) - struct thread *td; - struct fexecve_args /* { - int fd; - char **argv; - char **envv; - } */ *uap; -{ - - /* XXXRW: Real work to be done here. */ - return (ENOSYS); -} - /* * XXX: kern_execve has the astonishing property of not always returning to * the caller. If sufficiently bad things happen during the call to @@ -305,7 +305,7 @@ struct ucred *newcred = NULL, *oldcred; struct uidinfo *euip; register_t *stack_base; - int error, len, i; + int error, len = 0, i; struct image_params image_params, *imgp; struct vattr attr; int (*img_first)(struct image_params *); @@ -315,7 +315,7 @@ struct vnode *tracevp = NULL; struct ucred *tracecred = NULL; #endif - struct vnode *textvp = NULL; + struct vnode *textvp = NULL, *binvp = NULL; int credential_changing; int vfslocked; int textset; @@ -376,17 +376,29 @@ * XXXAUDIT: It would be desirable to also audit the name of the * interpreter if this is an interpreted binary. */ - ndp = &nd; - NDINIT(ndp, LOOKUP, ISOPEN | LOCKLEAF | FOLLOW | SAVENAME | MPSAFE | - AUDITVNODE1, UIO_SYSSPACE, args->fname, td); + if (args->fname != NULL) { + ndp = &nd; + NDINIT(ndp, LOOKUP, ISOPEN | LOCKLEAF | FOLLOW | SAVENAME + | MPSAFE | AUDITVNODE1, UIO_SYSSPACE, args->fname, td); + } interpret: - error = namei(ndp); - if (error) - goto exec_fail; + if (args->fname != NULL) { + error = namei(ndp); + if (error) + goto exec_fail; - vfslocked = NDHASGIANT(ndp); - imgp->vp = ndp->ni_vp; + vfslocked = NDHASGIANT(ndp); + binvp = ndp->ni_vp; + imgp->vp = binvp; + } else { + error = fgetvp_exec(td, args->fd, &binvp); + if (error) + goto exec_fail; + vfslocked = VFS_LOCK_GIANT(binvp->v_mount); + vn_lock(binvp, LK_EXCLUSIVE | LK_RETRY); + imgp->vp = binvp; + } /* * Check file permissions (also 'opens' file) @@ -459,12 +471,13 @@ */ imgp->vp->v_vflag &= ~VV_TEXT; /* free name buffer and old vnode */ - NDFREE(ndp, NDF_ONLY_PNBUF); + if (args->fname != NULL) + NDFREE(ndp, NDF_ONLY_PNBUF); #ifdef MAC interplabel = mac_vnode_label_alloc(); - mac_vnode_copy_label(ndp->ni_vp->v_label, interplabel); + mac_vnode_copy_label(binvp->v_label, interplabel); #endif - vput(ndp->ni_vp); + vput(binvp); vm_object_deallocate(imgp->object); imgp->object = NULL; VFS_UNLOCK_GIANT(vfslocked); @@ -472,6 +485,7 @@ /* set new name to that of the interpreter */ NDINIT(ndp, LOOKUP, LOCKLEAF | FOLLOW | SAVENAME | MPSAFE, UIO_SYSSPACE, imgp->interpreter_name, td); + args->fname = imgp->interpreter_name; goto interpret; } @@ -512,12 +526,12 @@ } /* close files on exec */ - VOP_UNLOCK(imgp->vp, 0); + VOP_UNLOCK(imgp->vp, 0, td); fdcloseexec(td); vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY); /* Get a reference to the vnode prior to locking the proc */ - VREF(ndp->ni_vp); + VREF(binvp); /* * For security and other reasons, signal handlers cannot @@ -543,8 +557,26 @@ execsigs(p); /* name this process - nameiexec(p, ndp) */ - len = min(ndp->ni_cnd.cn_namelen,MAXCOMLEN); - bcopy(ndp->ni_cnd.cn_nameptr, p->p_comm, len); + if (args->fname) { + len = min(ndp->ni_cnd.cn_namelen,MAXCOMLEN); + bcopy(ndp->ni_cnd.cn_nameptr, p->p_comm, len); + } else { + char *freepath; + char *fullpath = NULL; + + error = vn_fullpath(td, binvp, &fullpath, &freepath); + if (error == 0) { + len = min(strlen(fullpath), MAXCOMLEN); + bcopy(fullpath, p->p_comm, len); + if (freepath) + free(freepath, M_TEMP); + } else { + static const char proc_title[] = "fexecved process"; + len = sizeof(proc_title); + bcopy(proc_title, p->p_comm, len); + } + error = 0; + } p->p_comm[len] = 0; bcopy(p->p_comm, td->td_name, sizeof(td->td_name)); @@ -612,7 +644,7 @@ */ PROC_UNLOCK(p); setugidsafety(td); - VOP_UNLOCK(imgp->vp, 0); + VOP_UNLOCK(imgp->vp, 0, td); error = fdcheckstd(td); vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY); if (error != 0) @@ -674,7 +706,7 @@ * to locking the proc lock. */ textvp = p->p_textvp; - p->p_textvp = ndp->ni_vp; + p->p_textvp = binvp; /* * Notify others that we exec'd, and clear the P_INEXEC flag @@ -746,7 +778,7 @@ crfree(oldcred); else crfree(newcred); - VOP_UNLOCK(imgp->vp, 0); + VOP_UNLOCK(imgp->vp, 0, td); /* * Handle deferred decrement of ref counts. */ @@ -757,8 +789,8 @@ vrele(textvp); VFS_UNLOCK_GIANT(tvfslocked); } - if (ndp->ni_vp && error != 0) - vrele(ndp->ni_vp); + if (binvp && error != 0) + vrele(binvp); #ifdef KTRACE if (tracevp != NULL) { int tvfslocked; @@ -787,7 +819,8 @@ exec_unmap_first_page(imgp); if (imgp->vp != NULL) { - NDFREE(ndp, NDF_ONLY_PNBUF); + if (args->fname) + NDFREE(ndp, NDF_ONLY_PNBUF); vput(imgp->vp); } @@ -1018,11 +1051,14 @@ /* * Copy the file name. */ - error = (segflg == UIO_SYSSPACE) ? - copystr(fname, args->fname, PATH_MAX, &length) : - copyinstr(fname, args->fname, PATH_MAX, &length); - if (error != 0) - goto err_exit; + if (fname != NULL) { + error = (segflg == UIO_SYSSPACE) ? + copystr(fname, args->fname, PATH_MAX, &length) : + copyinstr(fname, args->fname, PATH_MAX, &length); + if (error != 0) + goto err_exit; + } else + args->fname = NULL; /* * extract arguments first ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/imgact.h#2 (text+ko) ==== @@ -45,6 +45,7 @@ int stringspace; /* space left in arg & env buffer */ int argc; /* count of argument strings */ int envc; /* count of environment strings */ + int fd; /* file descriptor of the executable */ }; struct image_params { From owner-p4-projects@FreeBSD.ORG Sun Jan 27 15:51:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A0AB16A421; Sun, 27 Jan 2008 15:51:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F316916A41A for ; Sun, 27 Jan 2008 15:51:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E15F213C4DD for ; Sun, 27 Jan 2008 15:51:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RFprsI000642 for ; Sun, 27 Jan 2008 15:51:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RFpr3Z000639 for perforce@freebsd.org; Sun, 27 Jan 2008 15:51:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 27 Jan 2008 15:51:53 GMT Message-Id: <200801271551.m0RFpr3Z000639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134202 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 15:51:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=134202 Change 134202 by rwatson@rwatson_freebsd_capabilities on 2008/01/27 15:50:53 Add CAP_FEXECVE to authorize use of a capability for fexecve(). Use fgetvp_read() rather than fgetvp_exec(), as there is no FEXEC in this branch (and probably won't be). Require CAP_READ | CAP_FEXECVE but possibly this should just be CAP_FEXECVE. Update for VOP_UNLOCK() prototype change. len doesn't need to be initialized on declaration [anymore]. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#9 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#4 (text+ko) ==== @@ -305,7 +305,7 @@ struct ucred *newcred = NULL, *oldcred; struct uidinfo *euip; register_t *stack_base; - int error, len = 0, i; + int error, len, i; struct image_params image_params, *imgp; struct vattr attr; int (*img_first)(struct image_params *); @@ -392,7 +392,9 @@ binvp = ndp->ni_vp; imgp->vp = binvp; } else { - error = fgetvp_exec(td, args->fd, &binvp); + /* XXXRW: Possibly should just be CAP_FEXECVE? */ + error = fgetvp_read(td, args->fd, CAP_READ | CAP_FEXECVE, + &binvp); if (error) goto exec_fail; vfslocked = VFS_LOCK_GIANT(binvp->v_mount); @@ -526,7 +528,7 @@ } /* close files on exec */ - VOP_UNLOCK(imgp->vp, 0, td); + VOP_UNLOCK(imgp->vp, 0); fdcloseexec(td); vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY); @@ -644,7 +646,7 @@ */ PROC_UNLOCK(p); setugidsafety(td); - VOP_UNLOCK(imgp->vp, 0, td); + VOP_UNLOCK(imgp->vp, 0); error = fdcheckstd(td); vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY); if (error != 0) @@ -778,7 +780,7 @@ crfree(oldcred); else crfree(newcred); - VOP_UNLOCK(imgp->vp, 0, td); + VOP_UNLOCK(imgp->vp, 0); /* * Handle deferred decrement of ref counts. */ ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#8 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#9 $ */ /* @@ -62,7 +62,7 @@ #define CAP_GETDIRENTRIES 0x0000000000020000ULL /* getdirentries */ #define CAP_FSTATFS 0x0000000000040000ULL /* fstatfs */ #define CAP_REVOKE 0x0000000000080000ULL /* revoke */ -#define _CAP_UNUSED1 0x0000000000100000ULL +#define CAP_FEXECVE 0x0000000000100000ULL /* fexecve */ #define CAP_FPATHCONF 0x0000000000200000ULL /* fpathconf */ #define CAP_FUTIMES 0x0000000000400000ULL /* futimes */ #define CAP_AIO 0x0000000000800000ULL /* aio_* */ @@ -84,7 +84,7 @@ #define CAP_LISTEN 0x0000008000000000ULL /* listen */ #define CAP_SHUTDOWN 0x0000010000000000ULL /* shutdown */ #define CAP_PEELOFF 0x0000020000000000ULL /* sctp_peeloff */ -#define CAP_MASK_VALID 0x000003ffffe7ffffULL +#define CAP_MASK_VALID 0x000003ffffffffffULL /* * Notes: From owner-p4-projects@FreeBSD.ORG Sun Jan 27 15:54:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5802116A420; Sun, 27 Jan 2008 15:54:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1DAD316A419 for ; Sun, 27 Jan 2008 15:54:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0C78713C455 for ; Sun, 27 Jan 2008 15:54:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RFsvWB000794 for ; Sun, 27 Jan 2008 15:54:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RFsv3P000790 for perforce@freebsd.org; Sun, 27 Jan 2008 15:54:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 27 Jan 2008 15:54:57 GMT Message-Id: <200801271554.m0RFsv3P000790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134203 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 15:54:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=134203 Change 134203 by rwatson@rwatson_freebsd_capabilities on 2008/01/27 15:54:17 In capabilities mode, don't allow the use of interpreters. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#5 (text+ko) ==== @@ -384,6 +384,18 @@ interpret: if (args->fname != NULL) { + /* + * While capability mode can't reach this point via direct + * path arguments to execve(), we also don't allow + * interpreters to be used in capability mode (for now). + * Catch indirect lookups and return a permissions error. + * + * XXXRW: Is this the right error? + */ + if (td->td_ucred->cr_flags & CRED_FLAG_CAPMODE) { + error = EPERM; + goto exec_fail; + } error = namei(ndp); if (error) goto exec_fail; From owner-p4-projects@FreeBSD.ORG Sun Jan 27 15:59:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4322516A41B; Sun, 27 Jan 2008 15:59:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0851716A418 for ; Sun, 27 Jan 2008 15:59:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EB67413C468 for ; Sun, 27 Jan 2008 15:59:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RFx2kc001020 for ; Sun, 27 Jan 2008 15:59:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RFx2wp001017 for perforce@freebsd.org; Sun, 27 Jan 2008 15:59:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 27 Jan 2008 15:59:02 GMT Message-Id: <200801271559.m0RFx2wp001017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134204 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 15:59:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=134204 Change 134204 by rwatson@rwatson_freebsd_capabilities on 2008/01/27 15:58:19 binvp should always be initialized as part of the normal run path, so don't NULL up front in order to catch the future introduction of cases where it isn't. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#6 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#6 (text+ko) ==== @@ -315,7 +315,7 @@ struct vnode *tracevp = NULL; struct ucred *tracecred = NULL; #endif - struct vnode *textvp = NULL, *binvp = NULL; + struct vnode *textvp = NULL, *binvp; int credential_changing; int vfslocked; int textset; From owner-p4-projects@FreeBSD.ORG Sun Jan 27 16:13:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1D7B16A46B; Sun, 27 Jan 2008 16:13:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9607816A418 for ; Sun, 27 Jan 2008 16:13:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 85C2313C458 for ; Sun, 27 Jan 2008 16:13:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RGDKT0003759 for ; Sun, 27 Jan 2008 16:13:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RGDKxB003611 for perforce@freebsd.org; Sun, 27 Jan 2008 16:13:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 27 Jan 2008 16:13:20 GMT Message-Id: <200801271613.m0RGDKxB003611@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 134207 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 16:13:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=134207 Change 134207 by hselasky@hselasky_laptop001 on 2008/01/27 16:12:28 Fix for large contiguous segment allocations. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#90 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#90 (text+ko) ==== @@ -2242,7 +2242,8 @@ /* maxsize */ size, /* nsegments */ (align == 1) ? (2 + (size / USB_PAGE_SIZE)) : 1, - /* maxsegsz */ USB_PAGE_SIZE, + /* maxsegsz */ (align == 1) ? + USB_PAGE_SIZE : size, /* flags */ 0, /* lock */ NULL, /* */ NULL, From owner-p4-projects@FreeBSD.ORG Sun Jan 27 16:44:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 250A816A41B; Sun, 27 Jan 2008 16:44:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DEB9D16A41A for ; Sun, 27 Jan 2008 16:44:54 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B6AFB13C45A for ; Sun, 27 Jan 2008 16:44:54 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RGispP008832 for ; Sun, 27 Jan 2008 16:44:54 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RGis8N008829 for perforce@freebsd.org; Sun, 27 Jan 2008 16:44:54 GMT (envelope-from csjp@freebsd.org) Date: Sun, 27 Jan 2008 16:44:54 GMT Message-Id: <200801271644.m0RGis8N008829@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134211 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 16:44:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=134211 Change 134211 by csjp@csjp_xor on 2008/01/27 16:44:00 Add BIOCROTZBUF to the list of ioctls and document it. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#39 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#39 (text+ko) ==== @@ -924,6 +924,7 @@ * BIOCACKZBUF Acknowledge reading zero-copy buffers. * BIOCGETZMAX Get maximum zero-copy buffer size. * BIOCGETZNEXT Get next ready zero-copy buffer location + * BIOCROTZBUF Force rotation of zero-copy buffer */ /* ARGSUSED */ static int From owner-p4-projects@FreeBSD.ORG Sun Jan 27 17:06:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 617A016A420; Sun, 27 Jan 2008 17:06:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 26FA516A41A for ; Sun, 27 Jan 2008 17:06:17 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F1EA013C4CE for ; Sun, 27 Jan 2008 17:06:16 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RH6G2k022252 for ; Sun, 27 Jan 2008 17:06:16 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RH6G06022249 for perforce@freebsd.org; Sun, 27 Jan 2008 17:06:16 GMT (envelope-from csjp@freebsd.org) Date: Sun, 27 Jan 2008 17:06:16 GMT Message-Id: <200801271706.m0RH6G06022249@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134212 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 17:06:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=134212 Change 134212 by csjp@csjp_xor on 2008/01/27 17:05:19 Make sure we allow manual buffer rotation while the peer is locked. Otherwise bad things can happen. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#40 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#40 (text+ko) ==== @@ -964,6 +964,7 @@ case TIOCGPGRP: case BIOCACKZBUF: case BIOCGETZBUF: + case BIOCROTZBUF: break; default: return (EPERM); From owner-p4-projects@FreeBSD.ORG Sun Jan 27 17:14:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EE7E16A468; Sun, 27 Jan 2008 17:14:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E81F216A420 for ; Sun, 27 Jan 2008 17:14:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BED9B13C447 for ; Sun, 27 Jan 2008 17:14:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RHEP50023431 for ; Sun, 27 Jan 2008 17:14:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RHEPiF023424 for perforce@freebsd.org; Sun, 27 Jan 2008 17:14:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 27 Jan 2008 17:14:25 GMT Message-Id: <200801271714.m0RHEPiF023424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134214 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 17:14:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=134214 Change 134214 by rwatson@rwatson_freebsd_capabilities on 2008/01/27 17:13:26 More consistently spell fexecve() correctly. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Symbol.map#6 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#11 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#11 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#11 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#11 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#11 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#11 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Symbol.map#6 (text) ==== @@ -969,5 +969,5 @@ cap_new; cap_getrights; cap_enter; - fexec; + fexecve; }; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#11 (text+ko) ==== @@ -517,5 +517,5 @@ { AS(cap_getrights_args), (sy_call_t *)cap_getrights, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 485 = cap_getrights */ { 0, (sy_call_t *)cap_enter, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 486 = cap_enter */ { AS(cap_getmode_args), (sy_call_t *)cap_getmode, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 487 = cap_getmode */ - { AS(fexecve_args), (sy_call_t *)fexecve, AUE_NULL, NULL, 0, 0, 0 }, /* 488 = fexecve */ + { AS(fexecve_args), (sy_call_t *)fexecve, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 488 = fexecve */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#11 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#11 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#11 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#11 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#11 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Jan 27 18:11:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B32A616A41B; Sun, 27 Jan 2008 18:11:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7840216A419 for ; Sun, 27 Jan 2008 18:11:25 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 67D6713C45A for ; Sun, 27 Jan 2008 18:11:25 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RIBPb0027026 for ; Sun, 27 Jan 2008 18:11:25 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RIBPdY027023 for perforce@freebsd.org; Sun, 27 Jan 2008 18:11:25 GMT (envelope-from csjp@freebsd.org) Date: Sun, 27 Jan 2008 18:11:25 GMT Message-Id: <200801271811.m0RIBPdY027023@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134217 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 18:11:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=134217 Change 134217 by csjp@csjp_xor on 2008/01/27 18:11:13 Clean up BIOCACKZBUF, BIOCGETZBUF, and BIOCGETZNEXT. When zerocopy bpf was early in development, we buffer management system was driven by system calls. Now, the buffer management occurs using the zero copy buffers and a memory barrier on integer arithemetic. - Clean up ioctl commands - Re-number the ioctl commands - Garbage collect any KPIs that faciliated the old buffer management systems Discussed with: rwatson Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#41 edit .. //depot/projects/zcopybpf/src/sys/net/bpf.h#20 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#28 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#11 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#41 (text+ko) ==== @@ -272,33 +272,6 @@ } static int -bpf_ioctl_ackzbuf(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) -{ - - if (d->bd_bufmode != BPF_BUFMODE_ZBUF) - return (EOPNOTSUPP); - return (bpf_zerocopy_ioctl_ackzbuf(td, d, bz)); -} - -static int -bpf_ioctl_getzbuf(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) -{ - - if (d->bd_bufmode != BPF_BUFMODE_ZBUF) - return (EOPNOTSUPP); - return (bpf_zerocopy_ioctl_getzbuf(td, d, bz)); -} - -static int -bpf_ioctl_getznext(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) -{ - - if (d->bd_bufmode != BPF_BUFMODE_ZBUF) - return (EOPNOTSUPP); - return (bpf_zerocopy_ioctl_getznext(td, d, bz)); -} - -static int bpf_ioctl_getzmax(struct thread *td, struct bpf_d *d, size_t *i) { @@ -919,11 +892,8 @@ * BIOCSDIRECTION Set packet direction flag * BIOCLOCK Set "locked" flag * BIOCFEEDBACK Set packet feedback mode. - * BIOCGETZBUF Query current zero-copy buffer locations. * BIOCSETZBUF Set current zero-copy buffer locations. - * BIOCACKZBUF Acknowledge reading zero-copy buffers. * BIOCGETZMAX Get maximum zero-copy buffer size. - * BIOCGETZNEXT Get next ready zero-copy buffer location * BIOCROTZBUF Force rotation of zero-copy buffer */ /* ARGSUSED */ @@ -962,8 +932,6 @@ case BIOCSRTIMEOUT: case BIOCIMMEDIATE: case TIOCGPGRP: - case BIOCACKZBUF: - case BIOCGETZBUF: case BIOCROTZBUF: break; default: @@ -1291,18 +1259,9 @@ BPFD_UNLOCK(d); break; - case BIOCACKZBUF: - return (bpf_ioctl_ackzbuf(td, d, (struct bpf_zbuf *)addr)); - - case BIOCGETZBUF: - return (bpf_ioctl_getzbuf(td, d, (struct bpf_zbuf *)addr)); - case BIOCGETZMAX: return (bpf_ioctl_getzmax(td, d, (size_t *)addr)); - case BIOCGETZNEXT: - return (bpf_ioctl_getznext(td, d, (struct bpf_zbuf *)addr)); - case BIOCSETZBUF: return (bpf_ioctl_setzbuf(td, d, (struct bpf_zbuf *)addr)); ==== //depot/projects/zcopybpf/src/sys/net/bpf.h#20 (text+ko) ==== @@ -106,13 +106,11 @@ #define BPF_BUFMODE_DEFAULT BPF_BUFMODE_BUFFER /* Default. */ /* - * Struct used by BIOCACKZBUF, BIOCGETZNEXT, BIOCGETZBUF, BIOCSETZBUF: + * Struct used by BIOCSETZBUF, BIOCROTZBUF: * describes up to two zero-copy buffer as used by BPF. * - * BIOCACKZBUF Acknowledge read of stored zero-copy buffer (rotate). - * BIOCGETZBUF Query current zero-copy buffer locations. - * BIOCGETZNEXT Query next stored buffer, if available. * BIOCSETZBUF Set current zero-copy buffer locations (once only). + * BIOCROTZBUF Force rotation of zero-copy buffer(s) * * Pointers may be set to NULL to indicate a buffer is not configure, should * be freed, or is not being acknowledged. @@ -152,13 +150,10 @@ #define BIOCGETBUFMODE _IOR('B', 124, u_int) #define BIOCSETBUFMODE _IOW('B', 125, u_int) -#define BIOCACKZBUF _IOW('B', 126, struct bpf_zbuf) -#define BIOCGETZBUF _IOR('B', 127, struct bpf_zbuf) -#define BIOCGETZMAX _IOR('B', 128, size_t) -#define BIOCGETZNEXT _IOR('B', 129, struct bpf_zbuf) -#define BIOCROTZBUF _IOR('B', 130, struct bpf_zbuf) -#define BIOCSETZBUF _IOW('B', 131, struct bpf_zbuf) -#define BIOCFEEDBACK _IOW('B', 132, u_int) +#define BIOCGETZMAX _IOR('B', 126, size_t) +#define BIOCROTZBUF _IOR('B', 127, struct bpf_zbuf) +#define BIOCSETZBUF _IOW('B', 128, struct bpf_zbuf) +#define BIOCFEEDBACK _IOW('B', 129, u_int) /* Packet directions */ enum bpf_direction { ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#28 (text+ko) ==== @@ -397,79 +397,6 @@ } /* - * Acknowledge reading the buffer without performing read(). We accept an - * argument primarily so that we can validate that user space has the right - * idea, helping to catch application bugs faster if the application's sense - * of buffer rotation differs from the kernel's (or for that matter, kernel - * bugs). - */ -int -bpf_zerocopy_ioctl_ackzbuf(struct thread *td, struct bpf_d *d, - struct bpf_zbuf *bz) -{ - struct zbuf *zb; - - KASSERT(d->bd_bufmode == BPF_BUFMODE_ZBUF, - ("bpf_zerocopy_ioctl_ackzbuf: not in zbuf mode")); - - BPFD_LOCK(d); - if (d->bd_hbuf == NULL) { - BPFD_UNLOCK(d); - return (EINVAL); - } - zb = (struct zbuf *)d->bd_hbuf; - if (bz->bz_bufa != (void *)zb->zb_uaddr) { - BPFD_UNLOCK(d); - return (EINVAL); - } - zb->zb_header->bzh_user_gen = zb->zb_header->bzh_kernel_gen; - d->bd_fbuf = d->bd_hbuf; - d->bd_hbuf = NULL; - d->bd_hlen = 0; - BPFD_UNLOCK(d); - return (0); -} - -/* - * Ioctl to retrieve zbuf settings. Note that the user address pointers are - * copied versions of those originally submitted via the setzbuf ioctl--if - * user space has remapped the buffers, then they may be inconsistent. User - * applications must be aware that these are in effect buffer names, not - * pointers, if they play such games with their address space. Pointers are - * returned in arbitrary order, which may vary by ioctl. - */ -int -bpf_zerocopy_ioctl_getzbuf(struct thread *td, struct bpf_d *d, - struct bpf_zbuf *bz) -{ - struct zbuf *zb; - - KASSERT(d->bd_bufmode == BPF_BUFMODE_ZBUF, - ("bpf_zerocopy_ioctl_getzbuf: not in zbuf mode")); - - bzero(bz, sizeof(*bz)); - BPFD_LOCK(d); - if (d->bd_hbuf != NULL) { - zb = (struct zbuf *)d->bd_hbuf; - bz->bz_bufa = (void *)zb->zb_uaddr; - bz->bz_buflen = zb->zb_size; - zb = (struct zbuf *)d->bd_sbuf; - bz->bz_bufb = (void *)zb->zb_uaddr; - } else if (d->bd_sbuf != NULL) { - zb = (struct zbuf *)d->bd_sbuf; - bz->bz_bufa = (void *)zb->zb_uaddr; - bz->bz_buflen = zb->zb_size; - zb = (struct zbuf *)d->bd_fbuf; - bz->bz_bufb = (void *)zb->zb_uaddr; - } else { - bz->bz_bufa = bz->bz_bufb = NULL; - bz->bz_buflen = 0; - } - BPFD_UNLOCK(d); - return (0); -} - -/* * Ioctl to return the maximum buffer size. */ int @@ -483,39 +410,6 @@ return (0); } -/* - * Ioctl to return the next completed buffer to read, if any. In immediate - * mode, this may force a buffer rotation if there is stored data but no held - * data, in similar style to calling bpfread() on an immediate mode - * descriptor. - */ -int -bpf_zerocopy_ioctl_getznext(struct thread *td, struct bpf_d *d, - struct bpf_zbuf *bz) -{ - struct zbuf *zb; - - KASSERT(d->bd_bufmode == BPF_BUFMODE_ZBUF, - ("bpf_zerocopy_ioctl_getznext: not in zbuf mode")); - - /* - * If in immediate mode, there's no holder buffer, but there is - * stored packet data, rotate so that the stored buffer is now the - * held buffer. - */ - BPFD_LOCK(d); - if (d->bd_immediate && d->bd_hbuf == NULL && d->bd_slen != 0) - ROTATE_BUFFERS(d); - bzero(bz, sizeof(*bz)); - if (d->bd_hbuf != NULL) { - zb = (struct zbuf *)d->bd_hbuf; - bz->bz_bufa = (void *)zb->zb_uaddr; - bz->bz_buflen = d->bd_hlen; - } - BPFD_UNLOCK(d); - return (0); -} - int bpf_zerocopy_ioctl_rotzbuf(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#11 (text+ko) ==== @@ -43,14 +43,8 @@ void bpf_zerocopy_bufheld(struct bpf_d *); int bpf_zerocopy_canfreebuf(struct bpf_d *); void bpf_zerocopy_free(struct bpf_d *d); -int bpf_zerocopy_ioctl_ackzbuf(struct thread *td, struct bpf_d *d, - struct bpf_zbuf *bz); -int bpf_zerocopy_ioctl_getzbuf(struct thread *td, struct bpf_d *d, - struct bpf_zbuf *bz); int bpf_zerocopy_ioctl_getzmax(struct thread *td, struct bpf_d *d, size_t *i); -int bpf_zerocopy_ioctl_getznext(struct thread *td, struct bpf_d *d, - struct bpf_zbuf *bz); int bpf_zerocopy_ioctl_rotzbuf(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz); int bpf_zerocopy_ioctl_setzbuf(struct thread *td, struct bpf_d *d, From owner-p4-projects@FreeBSD.ORG Sun Jan 27 18:15:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4D1D16A421; Sun, 27 Jan 2008 18:15:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A9B916A418 for ; Sun, 27 Jan 2008 18:15:31 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7B27813C469 for ; Sun, 27 Jan 2008 18:15:31 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RIFVch028114 for ; Sun, 27 Jan 2008 18:15:31 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RIFVbx028111 for perforce@freebsd.org; Sun, 27 Jan 2008 18:15:31 GMT (envelope-from csjp@freebsd.org) Date: Sun, 27 Jan 2008 18:15:31 GMT Message-Id: <200801271815.m0RIFVbx028111@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134218 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 18:15:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=134218 Change 134218 by csjp@csjp_xor on 2008/01/27 18:15:13 Remove reference to BIOCGETZBUF, it's not required anymore. Affected files ... .. //depot/projects/zcopybpf/src/share/man/man4/bpf.4#8 edit Differences ... ==== //depot/projects/zcopybpf/src/share/man/man4/bpf.4#8 (text+ko) ==== @@ -530,10 +530,9 @@ buffered read mode, and .Dv BPF_BUFMODE_ZBUF , zero-copy buffer mode. -.It Dv BIOCGETZBUF .It Dv BIOCSETZBUF .Pq Li struct bpf_zbuf -Get or set the current zero-copy buffer locations; buffer locations may be +Set the current zero-copy buffer locations; buffer locations may be set only once zero-copy buffer mode has been selected, and prior to attaching to an interface. Buffers must be of identical size, page-aligned, and an integer multiple of From owner-p4-projects@FreeBSD.ORG Sun Jan 27 18:17:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F71516A41B; Sun, 27 Jan 2008 18:17:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0490D16A419 for ; Sun, 27 Jan 2008 18:17:34 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D0B4213C465 for ; Sun, 27 Jan 2008 18:17:33 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RIHXDB028297 for ; Sun, 27 Jan 2008 18:17:33 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RIHXa4028294 for perforce@freebsd.org; Sun, 27 Jan 2008 18:17:33 GMT (envelope-from csjp@freebsd.org) Date: Sun, 27 Jan 2008 18:17:33 GMT Message-Id: <200801271817.m0RIHXa4028294@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134219 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 18:17:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=134219 Change 134219 by csjp@csjp_xor on 2008/01/27 18:17:04 Add BIOCSETBUFMODE and BIOCGETBUFMODE to the ioctl comments. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#42 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#42 (text+ko) ==== @@ -895,6 +895,8 @@ * BIOCSETZBUF Set current zero-copy buffer locations. * BIOCGETZMAX Get maximum zero-copy buffer size. * BIOCROTZBUF Force rotation of zero-copy buffer + * BIOCSETBUFMODE Set buffer mode. + * BIOCGETBUFMODE Get current buffer mode. */ /* ARGSUSED */ static int From owner-p4-projects@FreeBSD.ORG Sun Jan 27 18:22:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A277B16A419; Sun, 27 Jan 2008 18:22:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65CA816A479 for ; Sun, 27 Jan 2008 18:22:41 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5466613C4D9 for ; Sun, 27 Jan 2008 18:22:41 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RIMfbS028560 for ; Sun, 27 Jan 2008 18:22:41 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RIMdH1028556 for perforce@freebsd.org; Sun, 27 Jan 2008 18:22:39 GMT (envelope-from csjp@freebsd.org) Date: Sun, 27 Jan 2008 18:22:39 GMT Message-Id: <200801271822.m0RIMdH1028556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134222 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 18:22:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=134222 Change 134222 by csjp@csjp_xor on 2008/01/27 18:22:31 IFC Affected files ... .. //depot/projects/zcopybpf/src/sys/Makefile#6 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/kmem.h#4 integrate .. //depot/projects/zcopybpf/src/sys/conf/files#18 integrate .. //depot/projects/zcopybpf/src/sys/conf/options#14 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#7 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_capture.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/amr/amrvar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_sge.c#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/amphy.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/miidevs#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/nsphy.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/nsphyter.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/if_mxge_var.h#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/sf/if_sf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sf/if_sfreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sf/starfire_rx.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/sf/starfire_tx.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ehci.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_udav.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uark.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uftdireg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/cd9660/cd9660_vfsops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_vnops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/fifofs/fifo_vnops.c#9 integrate .. //depot/projects/zcopybpf/src/sys/fs/hpfs/hpfs_subr.h#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/hpfs/hpfs_vfsops.c#7 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_denode.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/fs/nwfs/nwfs_node.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/smbfs/smbfs_node.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/udf/udf_vfsops.c#7 integrate .. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_subr.c#7 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/init_sysent.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_jail.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_lock.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_ule.c#14 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_bus.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/syscalls.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/syscalls.master#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/systrace_args.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty_pty.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_aio.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_default.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_mount.c#13 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/zcopybpf/src/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/modules/mii/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/modules/sf/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_ppp.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_pred1.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_options.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_usrreq.c#12 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_var.h#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/raw_ip6.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netncp/ncp_conn.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/zcopybpf/src/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_node.c#3 integrate .. //depot/projects/zcopybpf/src/sys/pci/amdsmb.c#2 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_sf.c#4 delete .. //depot/projects/zcopybpf/src/sys/pci/if_sfreg.h#2 delete .. //depot/projects/zcopybpf/src/sys/pci/nfsmb.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/zcopybpf/src/sys/sys/buf.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/bus.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/event.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/lockmgr.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/param.h#13 integrate .. //depot/projects/zcopybpf/src/sys/sys/priv.h#9 integrate .. //depot/projects/zcopybpf/src/sys/sys/syscall.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/syscall.mk#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/sysproto.h#5 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_snapshot.c#7 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ufs/ufs_extattr.c#4 integrate Differences ... ==== //depot/projects/zcopybpf/src/sys/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.45 2007/07/12 21:04:55 rwatson Exp $ +# $FreeBSD: src/sys/Makefile,v 1.46 2008/01/23 08:50:34 maxim Exp $ .include @@ -8,11 +8,11 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= bsm cam compat conf contrib crypto ddb dev fs geom gnu \ +CSCOPEDIRS= boot bsm cam compat conf contrib crypto ddb dev fs gdb geom gnu \ i4b isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ - netsmb nfs nfsclient nfs4client rpc pccard pci security sys \ - ufs vm ${ARCHDIR} + netsmb nfs nfs4client nfsclient nfsserver opencrypto pccard \ + pci rpc security sys ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.80 2008/01/08 22:01:25 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.81 2008/01/20 23:44:24 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.95 2008/01/20 23:43:06 rwatson Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.78 2008/01/08 22:01:25 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.79 2008/01/20 23:44:24 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.95 2008/01/20 23:43:06 rwatson Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.69 2008/01/08 22:01:25 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.70 2008/01/20 23:44:24 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.95 2008/01/20 23:43:06 rwatson Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.79 2008/01/08 22:01:25 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.80 2008/01/20 23:44:24 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.95 2008/01/20 23:43:06 rwatson Exp */ #include "opt_compat.h" @@ -521,6 +521,6 @@ { AS(freebsd32_truncate_args), (sy_call_t *)freebsd32_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 479 = freebsd32_truncate */ { AS(freebsd32_ftruncate_args), (sy_call_t *)freebsd32_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 480 = freebsd32_ftruncate */ { AS(thr_kill2_args), (sy_call_t *)thr_kill2, AUE_KILL, NULL, 0, 0 }, /* 481 = thr_kill2 */ - { AS(shm_open_args), (sy_call_t *)shm_open, AUE_NULL, NULL, 0, 0 }, /* 482 = shm_open */ - { AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_NULL, NULL, 0, 0 }, /* 483 = shm_unlink */ + { AS(shm_open_args), (sy_call_t *)shm_open, AUE_SHMOPEN, NULL, 0, 0 }, /* 482 = shm_open */ + { AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_SHMUNLINK, NULL, 0, 0 }, /* 483 = shm_unlink */ }; ==== //depot/projects/zcopybpf/src/sys/compat/freebsd32/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.95 2008/01/20 23:43:06 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -796,6 +796,6 @@ 480 AUE_FTRUNCATE STD { int freebsd32_ftruncate(int fd, \ u_int32_t lengthlo, u_int32_t lengthhi); } 481 AUE_KILL NOPROTO { int thr_kill2(pid_t pid, long id, int sig); } -482 AUE_NULL NOPROTO { int shm_open(const char *path, int flags, \ +482 AUE_SHMOPEN NOPROTO { int shm_open(const char *path, int flags, \ mode_t mode); } -483 AUE_NULL NOPROTO { int shm_unlink(const char *path); } +483 AUE_SHMUNLINK NOPROTO { int shm_unlink(const char *path); } ==== //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kmem.c,v 1.2 2007/04/10 02:35:56 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kmem.c,v 1.3 2008/01/24 11:21:54 pjd Exp $"); #include #include @@ -108,18 +108,18 @@ free(buf, M_SOLARIS); } -u_long +uint64_t kmem_size(void) { - return ((u_long)vm_kmem_size); + return ((uint64_t)vm_kmem_size); } -u_long +uint64_t kmem_used(void) { - return ((u_long)kmem_map->size); + return ((uint64_t)kmem_map->size); } static int ==== //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/kmem.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/kmem.h,v 1.3 2007/11/28 21:48:25 jb Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/kmem.h,v 1.4 2008/01/24 11:21:54 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_KMEM_H_ @@ -56,8 +56,8 @@ void *zfs_kmem_alloc(size_t size, int kmflags); void zfs_kmem_free(void *buf, size_t size); -u_long kmem_size(void); -u_long kmem_used(void); +uint64_t kmem_size(void); +uint64_t kmem_used(void); kmem_cache_t *kmem_cache_create(char *name, size_t bufsize, size_t align, int (*constructor)(void *, void *, int), void (*destructor)(void *, void *), void (*reclaim)(void *) __unused, void *private, vmem_t *vmp, int cflags); ==== //depot/projects/zcopybpf/src/sys/conf/files#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1264 2008/01/15 20:34:47 gallatin Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1266 2008/01/27 01:10:41 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -798,6 +798,7 @@ dev/mii/mlphy.c optional miibus | mlphy dev/mii/nsgphy.c optional miibus | nsgphy dev/mii/nsphy.c optional miibus | nsphy +dev/mii/nsphyter.c optional miibus | nsphyter dev/mii/pnaphy.c optional miibus | pnaphy dev/mii/qsphy.c optional miibus | qsphy dev/mii/rgephy.c optional miibus | rgephy @@ -937,6 +938,7 @@ dev/scc/scc_dev_z8530.c optional scc dev/scd/scd.c optional scd isa dev/scd/scd_isa.c optional scd isa +dev/sf/if_sf.c optional sf pci dev/si/si.c optional si dev/si/si2_z280.c optional si dev/si/si3_t225.c optional si @@ -2022,7 +2024,6 @@ pci/if_mn.c optional mn pci pci/if_pcn.c optional pcn pci pci/if_rl.c optional rl pci -pci/if_sf.c optional sf pci pci/if_sis.c optional sis pci pci/if_ste.c optional ste pci pci/if_tl.c optional tl pci ==== //depot/projects/zcopybpf/src/sys/conf/options#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.615 2008/01/07 21:40:09 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.616 2008/01/26 22:32:23 rwatson Exp $ # # On the handling of kernel options # @@ -48,6 +48,8 @@ # Debugging options. DDB +DDB_CAPTURE_DEFAULTBUFSIZE opt_ddb.h +DDB_CAPTURE_MAXBUFSIZE opt_ddb.h DDB_NUMSYM opt_ddb.h GDB KDB opt_global.h ==== //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#7 (text+ko) ==== @@ -1439,7 +1439,7 @@ return (1); #endif #else - if (kmem_used() > (kmem_size() * 4) / 5) + if (kmem_used() > (kmem_size() * 3) / 4) return (1); #endif @@ -2729,7 +2729,7 @@ arc_c_max = (arc_c * 8) - (1<<30); else arc_c_max = arc_c_min; - arc_c_max = MAX(arc_c * 6, arc_c_max); + arc_c_max = MAX(arc_c * 5, arc_c_max); #ifdef _KERNEL /* * Allow the tunables to override our calculations if they are @@ -2800,11 +2800,12 @@ arc_dead = FALSE; #ifdef _KERNEL - /* Warn about ZFS memory requirements. */ + /* Warn about ZFS memory and address space requirements. */ if (((uint64_t)physmem * PAGESIZE) < (256 + 128 + 64) * (1 << 20)) { printf("ZFS WARNING: Recommended minimum RAM size is 512MB; " "expect unstable behavior.\n"); - } else if (kmem_size() < 512 * (1 << 20)) { + } + if (kmem_size() < 512 * (1 << 20)) { printf("ZFS WARNING: Recommended minimum kmem_size is 512MB; " "expect unstable behavior.\n"); printf(" Consider tuning vm.kmem_size and " ==== //depot/projects/zcopybpf/src/sys/ddb/db_capture.c#2 (text+ko) ==== @@ -30,7 +30,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.2 2007/12/26 11:32:32 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.5 2008/01/26 23:02:14 rwatson Exp $"); + +#include "opt_ddb.h" #include #include @@ -52,16 +54,24 @@ * kernel dumper routines without restarting the kernel, which is undesirable * in the midst of debugging. Instead, we maintain a large static global * buffer that we fill from DDB's output routines. + * + * We enforce an invariant at runtime that buffer sizes are even multiples of + * the textdump block size, which is a design choice that we might want to + * reconsider. */ -static MALLOC_DEFINE(M_DB_CAPTURE, "db_capture", "DDB capture buffer"); +static MALLOC_DEFINE(M_DDB_CAPTURE, "ddb_capture", "DDB capture buffer"); -#define DB_CAPTURE_DEFAULTBUFSIZE 48*1024 -#define DB_CAPTURE_MAXBUFSIZE 512*1024 -#define DB_CAPTURE_FILENAME "ddb.txt" /* Captured DDB output. */ +#ifndef DDB_CAPTURE_DEFAULTBUFSIZE +#define DDB_CAPTURE_DEFAULTBUFSIZE 48*1024 +#endif +#ifndef DDB_CAPTURE_MAXBUFSIZE +#define DDB_CAPTURE_MAXBUFSIZE 5*1024*1024 +#endif +#define DDB_CAPTURE_FILENAME "ddb.txt" /* Captured DDB output. */ static char *db_capture_buf; -static u_int db_capture_bufsize = DB_CAPTURE_DEFAULTBUFSIZE; -static u_int db_capture_maxbufsize = DB_CAPTURE_MAXBUFSIZE; /* Read-only. */ +static u_int db_capture_bufsize = DDB_CAPTURE_DEFAULTBUFSIZE; +static u_int db_capture_maxbufsize = DDB_CAPTURE_MAXBUFSIZE; /* Read-only. */ static u_int db_capture_bufoff; /* Next location to write in buffer. */ static u_int db_capture_bufpadding; /* Amount of zero padding. */ static int db_capture_inpager; /* Suspend capture in pager. */ @@ -81,26 +91,21 @@ "Maximum value for debug.ddb.capture.bufsize"); /* - * Various compile-time assertions: defaults must be even multiples of - * textdump block size. We also perform run-time checking of - * user-configurable values. + * Boot-time allocation of the DDB capture buffer, if any. Force all buffer + * sizes, including the maximum size, to be rounded to block sizes. */ -CTASSERT(DB_CAPTURE_DEFAULTBUFSIZE % TEXTDUMP_BLOCKSIZE == 0); -CTASSERT(DB_CAPTURE_MAXBUFSIZE % TEXTDUMP_BLOCKSIZE == 0); - -/* - * Boot-time allocation of the DDB capture buffer, if any. - */ static void db_capture_sysinit(__unused void *dummy) { TUNABLE_INT_FETCH("debug.ddb.capture.bufsize", &db_capture_bufsize); + db_capture_maxbufsize = roundup(db_capture_maxbufsize, + TEXTDUMP_BLOCKSIZE); db_capture_bufsize = roundup(db_capture_bufsize, TEXTDUMP_BLOCKSIZE); - if (db_capture_bufsize > DB_CAPTURE_MAXBUFSIZE) - db_capture_bufsize = DB_CAPTURE_MAXBUFSIZE; + if (db_capture_bufsize > db_capture_maxbufsize) + db_capture_bufsize = db_capture_maxbufsize; if (db_capture_bufsize != 0) - db_capture_buf = malloc(db_capture_bufsize, M_DB_CAPTURE, + db_capture_buf = malloc(db_capture_bufsize, M_DDB_CAPTURE, M_WAITOK); } SYSINIT(db_capture, SI_SUB_DDB_SERVICES, SI_ORDER_ANY, db_capture_sysinit, @@ -121,7 +126,7 @@ if (error || req->newptr == NULL) return (error); size = roundup(size, TEXTDUMP_BLOCKSIZE); - if (size > DB_CAPTURE_MAXBUFSIZE) + if (size > db_capture_maxbufsize) return (EINVAL); sx_xlock(&db_capture_sx); if (size != 0) { @@ -129,7 +134,7 @@ * Potentially the buffer is quite large, so if we can't * allocate it, fail rather than waiting. */ - buf = malloc(size, M_DB_CAPTURE, M_NOWAIT); + buf = malloc(size, M_DDB_CAPTURE, M_NOWAIT); if (buf == NULL) { sx_xunlock(&db_capture_sx); return (ENOMEM); @@ -142,7 +147,7 @@ if (db_capture_buf != NULL && buf != NULL) bcopy(db_capture_buf, buf, len); if (db_capture_buf != NULL) - free(db_capture_buf, M_DB_CAPTURE); + free(db_capture_buf, M_DDB_CAPTURE); db_capture_bufoff = len; db_capture_buf = buf; db_capture_bufsize = size; @@ -150,7 +155,7 @@ KASSERT(db_capture_bufoff <= db_capture_bufsize, ("sysctl_debug_ddb_capture_bufsize: bufoff > bufsize")); - KASSERT(db_capture_bufsize <= DB_CAPTURE_MAXBUFSIZE, + KASSERT(db_capture_bufsize <= db_capture_maxbufsize, ("sysctl_debug_ddb_capture_maxbufsize: bufsize > maxbufsize")); return (0); @@ -297,7 +302,7 @@ return; db_capture_zeropad(); - textdump_mkustar(textdump_block_buffer, DB_CAPTURE_FILENAME, + textdump_mkustar(textdump_block_buffer, DDB_CAPTURE_FILENAME, db_capture_bufoff); (void)textdump_writenextblock(di, textdump_block_buffer); for (offset = 0; offset < db_capture_bufoff + db_capture_bufpadding; ==== //depot/projects/zcopybpf/src/sys/dev/acpica/acpi.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.243 2007/10/09 07:48:07 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.244 2008/01/27 16:11:04 iwasaki Exp $"); #include "opt_acpi.h" #include @@ -2195,6 +2195,12 @@ } } + /* If devd(8) is not running, immediately enter the sleep state. */ + if (devctl_process_running() == FALSE) { + ACPI_UNLOCK(acpi); + return (ACPI_FAILURE(acpi_EnterSleepState(sc, sc->acpi_next_sstate))); + } + /* Now notify devd(8) also. */ acpi_UserNotify("Suspend", ACPI_ROOT_OBJECT, state); ==== //depot/projects/zcopybpf/src/sys/dev/amr/amr.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.84 2007/12/12 05:55:03 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.85 2008/01/24 07:26:53 scottl Exp $"); /* * Driver for the AMI MegaRaid family of controllers. @@ -139,10 +139,11 @@ static int amr_mapcmd(struct amr_command *ac); static void amr_unmapcmd(struct amr_command *ac); static int amr_start(struct amr_command *ac); -static void amr_complete(void *context, int pending); +static void amr_complete(void *context, ac_qhead_t *head); static void amr_setup_sg(void *arg, bus_dma_segment_t *segs, int nsegments, int error); static void amr_setup_data(void *arg, bus_dma_segment_t *segs, int nsegments, int error); static void amr_setup_ccb(void *arg, bus_dma_segment_t *segs, int nsegments, int error); +static void amr_abort_load(struct amr_command *ac); /* * Status monitoring @@ -207,10 +208,9 @@ /* * Initialise per-controller queues. */ - TAILQ_INIT(&sc->amr_completed); - TAILQ_INIT(&sc->amr_freecmds); + amr_init_qhead(&sc->amr_freecmds); + amr_init_qhead(&sc->amr_ready); TAILQ_INIT(&sc->amr_cmd_clusters); - TAILQ_INIT(&sc->amr_ready); bioq_init(&sc->amr_bioq); debug(2, "queue init done"); @@ -236,6 +236,11 @@ #endif /* + * Allocate initial commands. + */ + amr_alloccmd_cluster(sc); + + /* * Quiz controller for features and limits. */ if (amr_query_controller(sc)) @@ -244,6 +249,12 @@ debug(2, "controller query complete"); /* + * preallocate the remaining commands. + */ + while (sc->amr_nextslot < sc->amr_maxio) + amr_alloccmd_cluster(sc); + + /* * Setup sysctls. */ amr_init_sysctl(sc); @@ -357,6 +368,18 @@ SYSCTL_CHILDREN(device_get_sysctl_tree(sc->amr_dev)), OID_AUTO, "allow_volume_configure", CTLFLAG_RW, &sc->amr_allow_vol_config, 0, ""); + SYSCTL_ADD_INT(device_get_sysctl_ctx(sc->amr_dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(sc->amr_dev)), + OID_AUTO, "nextslot", CTLFLAG_RD, &sc->amr_nextslot, 0, + ""); + SYSCTL_ADD_INT(device_get_sysctl_ctx(sc->amr_dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(sc->amr_dev)), + OID_AUTO, "busyslots", CTLFLAG_RD, &sc->amr_busyslots, 0, + ""); + SYSCTL_ADD_INT(device_get_sysctl_ctx(sc->amr_dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(sc->amr_dev)), + OID_AUTO, "maxio", CTLFLAG_RD, &sc->amr_maxio, 0, + ""); } @@ -646,8 +669,18 @@ error = ENOIOCTL; break; } else { - if (len) - dp = malloc(len, M_AMR, M_WAITOK | M_ZERO); + /* + * Bug-for-bug compatibility with Linux! + * Some apps will send commands with inlen and outlen set to 0, + * even though they expect data to be transfered to them from the + * card. Linux accidentally allows this by allocating a 4KB + * buffer for the transfer anyways, but it then throws it away + * without copying it back to the app. + */ + if (!len) + len = 4096; + + dp = malloc(len, M_AMR, M_WAITOK | M_ZERO); if (ali.inlen) { error = copyin((void *)(uintptr_t)mb->mb_physaddr, dp, len); @@ -793,8 +826,7 @@ if (sc == NULL) return (ENOENT); - return (amr_linux_ioctl_int(sc->amr_dev_t, cmd, - addr, 0, td)); + return (amr_linux_ioctl_int(sc->amr_dev_t, cmd, addr, 0, td)); } default: debug(1, "unknown ioctl 0x%lx", cmd); @@ -956,13 +988,6 @@ int ldrv; int status; - /* - * If we haven't found the real limit yet, let us have a couple of commands in - * order to be able to probe. - */ - if (sc->amr_maxio == 0) - sc->amr_maxio = 2; - /* * Greater than 10 byte cdb support */ @@ -1278,7 +1303,7 @@ int driveno; int cmd; - *acp = NULL; + ac = NULL; error = 0; /* get a command */ @@ -1340,6 +1365,7 @@ /* we fill in the s/g related data when the command is mapped */ + *acp = ac; return(error); } @@ -1411,6 +1437,12 @@ struct amr_softc *sc = ac->ac_sc; int mb_channel; + if (err) { + device_printf(sc->amr_dev, "error %d in %s", err, __FUNCTION__); + ac->ac_status = AMR_STATUS_ABORTED; + return; + } + amr_setup_sg(arg, segs, nsegs, err); /* for AMR_CMD_CONFIG Read/Write the s/g count goes elsewhere */ @@ -1565,9 +1597,6 @@ debug_called(3); - if (error) - printf("amr_setup_sg: error %d\n", error); - /* get base address of s/g table */ sg = ac->ac_sg.sg32; sg64 = ac->ac_sg.sg64; @@ -1610,6 +1639,12 @@ struct amr_softc *sc = ac->ac_sc; int mb_channel; + if (err) { + device_printf(sc->amr_dev, "error %d in %s", err, __FUNCTION__); + amr_abort_load(ac); + return; + } + amr_setup_sg(arg, segs, nsegs, err); /* for AMR_CMD_CONFIG Read/Write the s/g count goes elsewhere */ @@ -1640,6 +1675,12 @@ struct amr_passthrough *ap = &ac->ac_ccb->ccb_pthru; struct amr_ext_passthrough *aep = &ac->ac_ccb->ccb_epthru; + if (err) { + device_printf(sc->amr_dev, "error %d in %s", err, __FUNCTION__); + amr_abort_load(ac); + return; + } + /* Set up the mailbox portion of the command to point at the ccb */ ac->ac_mailbox.mb_nsgelem = 0; ac->ac_mailbox.mb_physaddr = ac->ac_ccb_busaddr; @@ -1729,6 +1770,23 @@ } } +static void +amr_abort_load(struct amr_command *ac) +{ + ac_qhead_t head; + struct amr_softc *sc = ac->ac_sc; + + mtx_assert(&sc->amr_list_lock, MA_OWNED); + + ac->ac_status = AMR_STATUS_ABORTED; + amr_init_qhead(&head); + amr_enqueue_completed(ac, &head); + + mtx_unlock(&sc->amr_list_lock); + amr_complete(sc, &head); + mtx_lock(&sc->amr_list_lock); +} + /******************************************************************************** * Take a command and give it to the controller, returns 0 if successful, or * EBUSY if the command should be retried later. @@ -1774,6 +1832,7 @@ int amr_done(struct amr_softc *sc) { + ac_qhead_t head; struct amr_command *ac; struct amr_mailbox mbox; int i, idx, result; @@ -1782,6 +1841,7 @@ /* See if there's anything for us to do */ result = 0; + amr_init_qhead(&head); /* loop collecting completed commands */ for (;;) { @@ -1803,7 +1863,7 @@ /* save status for later use */ ac->ac_status = mbox.mb_status; - amr_enqueue_completed(ac); + amr_enqueue_completed(ac, &head); debug(3, "completed command with status %x", mbox.mb_status); } else { device_printf(sc->amr_dev, "bad slot %d completed\n", idx); @@ -1814,7 +1874,7 @@ } /* handle completion and timeouts */ - amr_complete(sc, 0); + amr_complete(sc, &head); return(result); } @@ -1824,7 +1884,7 @@ */ static void -amr_complete(void *context, int pending) +amr_complete(void *context, ac_qhead_t *head) { struct amr_softc *sc = (struct amr_softc *)context; struct amr_command *ac; @@ -1833,7 +1893,7 @@ /* pull completed commands off the queue */ for (;;) { - ac = amr_dequeue_completed(sc); + ac = amr_dequeue_completed(sc, head); if (ac == NULL) break; @@ -1894,10 +1954,6 @@ ac = amr_dequeue_free(sc); if (ac == NULL) { - amr_alloccmd_cluster(sc); - ac = amr_dequeue_free(sc); - } - if (ac == NULL) { sc->amr_state |= AMR_STATE_QUEUE_FRZN; return(NULL); } @@ -1909,6 +1965,7 @@ ac->ac_bio = NULL; ac->ac_data = NULL; ac->ac_complete = NULL; + ac->ac_retries = 0; ac->ac_tag = NULL; ac->ac_datamap = NULL; return(ac); @@ -1935,12 +1992,21 @@ struct amr_command *ac; int i, nextslot; + /* + * If we haven't found the real limit yet, let us have a couple of + * commands in order to be able to probe. + */ + if (sc->amr_maxio == 0) + sc->amr_maxio = 2; + if (sc->amr_nextslot > sc->amr_maxio) return; acc = malloc(AMR_CMD_CLUSTERSIZE, M_AMR, M_NOWAIT | M_ZERO); if (acc != NULL) { nextslot = sc->amr_nextslot; + mtx_lock(&sc->amr_list_lock); TAILQ_INSERT_TAIL(&sc->amr_cmd_clusters, acc, acc_link); + mtx_unlock(&sc->amr_list_lock); for (i = 0; i < AMR_CMD_CLUSTERCOUNT; i++) { ac = &acc->acc_command[i]; ac->ac_sc = sc; @@ -1989,6 +2055,8 @@ int i; for (i = 0; i < AMR_CMD_CLUSTERCOUNT; i++) { + if (acc->acc_command[i].ac_sc == NULL) + break; bus_dmamap_destroy(sc->amr_buffer_dmat, acc->acc_command[i].ac_dmamap); if (AMR_IS_SG64(sc)) bus_dmamap_destroy(sc->amr_buffer64_dmat, acc->acc_command[i].ac_dma64map); @@ -2009,6 +2077,8 @@ amr_quartz_submit_command(struct amr_command *ac) { struct amr_softc *sc = ac->ac_sc; + static struct timeval lastfail; + static int curfail; int i = 0; mtx_lock(&sc->amr_hw_lock); @@ -2016,6 +2086,12 @@ DELAY(1); if (sc->amr_mailbox->mb_busy) { mtx_unlock(&sc->amr_hw_lock); + if (ac->ac_retries++ > 1000) { + if (ppsratecheck(&lastfail, &curfail, 1)) + device_printf(sc->amr_dev, "Too many retries on command %p. " + "Controller is likely dead\n", ac); + ac->ac_retries = 0; + } return (EBUSY); } @@ -2040,10 +2116,18 @@ amr_std_submit_command(struct amr_command *ac) { struct amr_softc *sc = ac->ac_sc; + static struct timeval lastfail; + static int curfail; mtx_lock(&sc->amr_hw_lock); if (AMR_SGET_MBSTAT(sc) & AMR_SMBOX_BUSYFLAG) { mtx_unlock(&sc->amr_hw_lock); + if (ac->ac_retries++ > 1000) { + if (ppsratecheck(&lastfail, &curfail, 1)) + device_printf(sc->amr_dev, "Too many retries on command %p. " + "Controller is likely dead\n", ac); + ac->ac_retries = 0; + } return (EBUSY); } ==== //depot/projects/zcopybpf/src/sys/dev/amr/amrreg.h#2 (text+ko) ==== @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/sys/dev/amr/amrreg.h,v 1.10 2006/01/13 23:50:21 jkim Exp $ + * $FreeBSD: src/sys/dev/amr/amrreg.h,v 1.11 2008/01/24 07:26:53 scottl Exp $ */ /******************************************************************************** @@ -126,6 +126,7 @@ #define AMR_CONFIG_READ_NVRAM_CONFIG 0x04 #define AMR_CONFIG_WRITE_NVRAM_CONFIG 0x0d +#define AMR_CONFIG_ENQ3_SOLICITED_NOTIFY 0x01 #define AMR_CONFIG_PRODUCT_INFO 0x0e #define AMR_CONFIG_ENQ3 0x0f #define AMR_CONFIG_ENQ3_SOLICITED_NOTIFY 0x01 @@ -141,6 +142,14 @@ #define OP_DEL_LOGDRV 0x1C /* + * Command for random deletion of logical drives + */ +#define FC_DEL_LOGDRV 0xA4 +#define OP_SUP_DEL_LOGDRV 0x2A +#define OP_GET_LDID_MAP 0x18 +#define OP_DEL_LOGDRV 0x1C + +/* * Command results */ #define AMR_STATUS_SUCCESS 0x00 ==== //depot/projects/zcopybpf/src/sys/dev/amr/amrvar.h#3 (text+ko) ==== @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.34 2007/12/12 05:55:03 scottl Exp $ + * $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.35 2008/01/24 07:26:53 scottl Exp $ */ #include @@ -100,6 +100,9 @@ #define AMR_CMD_CLUSTERSIZE (16 * 1024) +typedef STAILQ_HEAD(, amr_command) ac_qhead_t; +typedef STAILQ_ENTRY(amr_command) ac_link_t; + union amr_ccb { struct amr_passthrough ccb_pthru; struct amr_ext_passthrough ccb_epthru; @@ -111,7 +114,7 @@ */ struct amr_command { - TAILQ_ENTRY(amr_command) ac_link; + ac_link_t ac_link; struct amr_softc *ac_sc; u_int8_t ac_slot; @@ -134,6 +137,7 @@ #define AMR_CMD_BUSY (1<<7) #define AMR_CMD_SG64 (1<<8) #define AC_IS_SG64(ac) ((ac)->ac_flags & AMR_CMD_SG64) + u_int ac_retries; struct bio *ac_bio; void (* ac_complete)(struct amr_command *ac); @@ -219,11 +223,10 @@ /* per-controller queues */ struct bio_queue_head amr_bioq; /* pending I/O with no commands */ - TAILQ_HEAD(,amr_command) amr_ready; /* commands ready to be submitted */ + ac_qhead_t amr_ready; /* commands ready to be submitted */ struct amr_command *amr_busycmd[AMR_MAXCMD]; int amr_busyslots; - TAILQ_HEAD(,amr_command) amr_completed; - TAILQ_HEAD(,amr_command) amr_freecmds; + ac_qhead_t amr_freecmds; TAILQ_HEAD(,amr_command_cluster) amr_cmd_clusters; /* CAM attachments for passthrough */ @@ -320,17 +323,24 @@ } static __inline void +amr_init_qhead(ac_qhead_t *head) +{ + + STAILQ_INIT(head); +} + +static __inline void amr_enqueue_ready(struct amr_command *ac) { - TAILQ_INSERT_TAIL(&ac->ac_sc->amr_ready, ac, ac_link); + STAILQ_INSERT_TAIL(&ac->ac_sc->amr_ready, ac, ac_link); } static __inline void amr_requeue_ready(struct amr_command *ac) { - TAILQ_INSERT_HEAD(&ac->ac_sc->amr_ready, ac, ac_link); + STAILQ_INSERT_HEAD(&ac->ac_sc->amr_ready, ac, ac_link); } static __inline struct amr_command * @@ -338,25 +348,25 @@ { struct amr_command *ac; - if ((ac = TAILQ_FIRST(&sc->amr_ready)) != NULL) - TAILQ_REMOVE(&sc->amr_ready, ac, ac_link); + if ((ac = STAILQ_FIRST(&sc->amr_ready)) != NULL) + STAILQ_REMOVE_HEAD(&sc->amr_ready, ac_link); return(ac); } static __inline void >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 27 19:02:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD2E716A41B; Sun, 27 Jan 2008 19:02:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6909016A417 for ; Sun, 27 Jan 2008 19:02:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5785C13C45D for ; Sun, 27 Jan 2008 19:02:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RJ2Qt5029990 for ; Sun, 27 Jan 2008 19:02:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RJ2McA029987 for perforce@freebsd.org; Sun, 27 Jan 2008 19:02:22 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 19:02:22 GMT Message-Id: <200801271902.m0RJ2McA029987@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134223 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 19:02:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=134223 Change 134223 by sam@sam_ebb on 2008/01/27 19:01:40 IFC @ 134222 Affected files ... .. //depot/projects/vap/LOCKS#3 integrate .. //depot/projects/vap/MAINTAINERS#3 integrate .. //depot/projects/vap/Makefile.inc1#4 integrate .. //depot/projects/vap/ObsoleteFiles.inc#4 integrate .. //depot/projects/vap/UPDATING#3 integrate .. //depot/projects/vap/contrib/gdb/FREEBSD-diffs#1 branch .. //depot/projects/vap/contrib/top/display.c#3 integrate .. //depot/projects/vap/contrib/top/layout.h#3 integrate .. //depot/projects/vap/contrib/top/machine.h#3 integrate .. //depot/projects/vap/contrib/top/top.c#4 integrate .. //depot/projects/vap/contrib/top/top.h#3 integrate .. //depot/projects/vap/etc/defaults/rc.conf#4 integrate .. //depot/projects/vap/etc/devd.conf#3 integrate .. //depot/projects/vap/etc/netstart#3 integrate .. //depot/projects/vap/etc/rc#3 integrate .. //depot/projects/vap/etc/rc.d/hostid#3 integrate .. //depot/projects/vap/etc/rc.d/ipfw#3 integrate .. //depot/projects/vap/etc/rc.d/kerberos#3 integrate .. //depot/projects/vap/etc/rc.d/mountcritremote#4 integrate .. //depot/projects/vap/etc/rc.d/netif#3 integrate .. //depot/projects/vap/etc/rc.d/ppp#3 integrate .. //depot/projects/vap/etc/rc.firewall#4 integrate .. //depot/projects/vap/etc/rc.subr#3 integrate .. //depot/projects/vap/gnu/lib/csu/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/cvs/Makefile#4 integrate .. //depot/projects/vap/gnu/usr.bin/cvs/contrib/Makefile#4 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kld.c#1 branch .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/main.c#3 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/trgt.c#3 integrate .. //depot/projects/vap/include/fts.h#3 integrate .. //depot/projects/vap/include/unistd.h#4 integrate .. //depot/projects/vap/lib/libarchive/Makefile#4 integrate .. //depot/projects/vap/lib/libarchive/archive_read_extract.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_write_set_format_cpio_newc.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk_hardlink.c#1 branch .. //depot/projects/vap/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate .. //depot/projects/vap/lib/libc/amd64/_fpmath.h#3 integrate .. //depot/projects/vap/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/vap/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/vap/lib/libc/gen/fts-compat.c#3 integrate .. //depot/projects/vap/lib/libc/gen/fts-compat.h#3 integrate .. //depot/projects/vap/lib/libc/gen/fts.3#3 integrate .. //depot/projects/vap/lib/libc/gen/fts.c#3 integrate .. //depot/projects/vap/lib/libc/i386/_fpmath.h#3 integrate .. //depot/projects/vap/lib/libc/ia64/_fpmath.h#3 integrate .. //depot/projects/vap/lib/libc/locale/Makefile.inc#3 integrate .. //depot/projects/vap/lib/libc/locale/ascii.c#1 branch .. //depot/projects/vap/lib/libc/locale/mblocal.h#3 integrate .. //depot/projects/vap/lib/libc/locale/setrunelocale.c#3 integrate .. //depot/projects/vap/lib/libc/sparc64/_fpmath.h#3 integrate .. //depot/projects/vap/lib/libc/stdlib/grantpt.c#4 integrate .. //depot/projects/vap/lib/libc/sys/access.2#4 integrate .. //depot/projects/vap/lib/libc/sys/flock.2#3 integrate .. //depot/projects/vap/lib/libfetch/ftp.c#4 integrate .. //depot/projects/vap/lib/libthr/Makefile#3 integrate .. //depot/projects/vap/lib/msun/Makefile#4 integrate .. //depot/projects/vap/lib/msun/Symbol.map#4 integrate .. //depot/projects/vap/lib/msun/ld128/s_exp2l.c#1 branch .. //depot/projects/vap/lib/msun/ld80/s_exp2l.c#1 branch .. //depot/projects/vap/lib/msun/man/exp.3#3 integrate .. //depot/projects/vap/lib/msun/man/log.3#1 branch .. //depot/projects/vap/lib/msun/src/e_expf.c#3 integrate .. //depot/projects/vap/lib/msun/src/k_cos.c#3 integrate .. //depot/projects/vap/lib/msun/src/k_rem_pio2.c#3 integrate .. //depot/projects/vap/lib/msun/src/k_rem_pio2f.c#3 delete .. //depot/projects/vap/lib/msun/src/math.h#4 integrate .. //depot/projects/vap/lib/msun/src/math_private.h#4 integrate .. //depot/projects/vap/lib/msun/src/s_exp2.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_exp2f.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_log1p.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_log1pf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_rint.c#4 integrate .. //depot/projects/vap/lib/msun/src/s_rintf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_rintl.c#2 integrate .. //depot/projects/vap/release/amd64/boot_crunch.conf#3 integrate .. //depot/projects/vap/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/vap/release/fixit.profile#4 integrate .. //depot/projects/vap/release/i386/boot_crunch.conf#3 integrate .. //depot/projects/vap/release/ia64/boot_crunch.conf#3 integrate .. //depot/projects/vap/release/pc98/boot_crunch.conf#3 integrate .. //depot/projects/vap/release/powerpc/boot_crunch.conf#3 integrate .. //depot/projects/vap/release/sparc64/boot_crunch.conf#3 integrate .. //depot/projects/vap/release/sun4v/boot_crunch.conf#3 integrate .. //depot/projects/vap/sbin/dhclient/dhclient-script#3 integrate .. //depot/projects/vap/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/vap/sbin/natd/natd.8#4 integrate .. //depot/projects/vap/sbin/quotacheck/Makefile#3 integrate .. //depot/projects/vap/sbin/quotacheck/preen.c#3 integrate .. //depot/projects/vap/sbin/quotacheck/quotacheck.8#3 integrate .. //depot/projects/vap/sbin/quotacheck/quotacheck.c#4 integrate .. //depot/projects/vap/sbin/quotacheck/quotacheck.h#1 branch .. //depot/projects/vap/share/man/man4/Makefile#4 integrate .. //depot/projects/vap/share/man/man4/axe.4#3 integrate .. //depot/projects/vap/share/man/man4/coda.4#1 branch .. //depot/projects/vap/share/man/man4/dcons.4#3 integrate .. //depot/projects/vap/share/man/man4/ed.4#4 integrate .. //depot/projects/vap/share/man/man4/mfi.4#3 integrate .. //depot/projects/vap/share/man/man4/oldcard.4#3 delete .. //depot/projects/vap/share/man/man4/pcib.4#2 integrate .. //depot/projects/vap/share/man/man4/puc.4#3 integrate .. //depot/projects/vap/share/man/man4/sched_4bsd.4#3 integrate .. //depot/projects/vap/share/man/man4/sched_ule.4#3 integrate .. //depot/projects/vap/share/man/man4/sf.4#3 integrate .. //depot/projects/vap/share/man/man4/syncache.4#4 integrate .. //depot/projects/vap/share/man/man4/vlan.4#3 integrate .. //depot/projects/vap/share/man/man4/xl.4#3 integrate .. //depot/projects/vap/share/man/man5/fstab.5#3 integrate .. //depot/projects/vap/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/vap/share/man/man5/src.conf.5#4 integrate .. //depot/projects/vap/share/man/man7/clocks.7#3 integrate .. //depot/projects/vap/share/man/man7/ports.7#4 integrate .. //depot/projects/vap/share/man/man9/BUF_ISLOCKED.9#1 branch .. //depot/projects/vap/share/man/man9/BUF_RECURSED.9#1 branch .. //depot/projects/vap/share/man/man9/BUF_REFCNT.9#3 delete .. //depot/projects/vap/share/man/man9/Makefile#3 integrate .. //depot/projects/vap/share/man/man9/VOP_LOCK.9#4 integrate .. //depot/projects/vap/share/man/man9/lock.9#4 integrate .. //depot/projects/vap/share/man/man9/style.9#4 integrate .. //depot/projects/vap/share/misc/bsd-family-tree#4 integrate .. //depot/projects/vap/share/misc/pci_vendors#3 integrate .. //depot/projects/vap/share/mk/bsd.own.mk#4 integrate .. //depot/projects/vap/share/mklocale/la_LN.US-ASCII.src#3 integrate .. //depot/projects/vap/share/zoneinfo/leapseconds#3 integrate .. //depot/projects/vap/sys/Makefile#6 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/vap/sys/amd64/include/_types.h#6 integrate .. //depot/projects/vap/sys/amd64/include/float.h#3 integrate .. //depot/projects/vap/sys/amd64/isa/clock.c#6 integrate .. //depot/projects/vap/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/vap/sys/boot/forth/loader.conf.5#5 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/vap/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/vap/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 integrate .. //depot/projects/vap/sys/compat/opensolaris/sys/kmem.h#3 integrate .. //depot/projects/vap/sys/conf/files#12 integrate .. //depot/projects/vap/sys/conf/options#9 integrate .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/vap/sys/crypto/rijndael/rijndael-api.c#3 integrate .. //depot/projects/vap/sys/crypto/rijndael/test00.c#3 integrate .. //depot/projects/vap/sys/ddb/db_capture.c#2 integrate .. //depot/projects/vap/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/vap/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/vap/sys/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/vap/sys/dev/amr/amr.c#7 integrate .. //depot/projects/vap/sys/dev/amr/amrreg.h#6 integrate .. //depot/projects/vap/sys/dev/amr/amrvar.h#7 integrate .. //depot/projects/vap/sys/dev/an/if_an.c#6 integrate .. //depot/projects/vap/sys/dev/an/if_an_pci.c#6 integrate .. //depot/projects/vap/sys/dev/an/if_anreg.h#5 integrate .. //depot/projects/vap/sys/dev/ath/if_ath.c#21 edit .. //depot/projects/vap/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/vap/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/mvec.h#4 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#2 integrate .. //depot/projects/vap/sys/dev/drm/drm_drv.c#5 integrate .. //depot/projects/vap/sys/dev/gem/if_gem.c#6 integrate .. //depot/projects/vap/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/vap/sys/dev/mii/amphy.c#5 integrate .. //depot/projects/vap/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/vap/sys/dev/mii/miidevs#5 integrate .. //depot/projects/vap/sys/dev/mii/nsphy.c#5 integrate .. //depot/projects/vap/sys/dev/mii/nsphyter.c#1 branch .. //depot/projects/vap/sys/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/vap/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/vap/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/vap/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/vap/sys/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/vap/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/vap/sys/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/vap/sys/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/vap/sys/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/vap/sys/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/vap/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/vap/sys/dev/pci/pci_user.c#7 integrate .. //depot/projects/vap/sys/dev/re/if_re.c#7 integrate .. //depot/projects/vap/sys/dev/sf/if_sf.c#1 branch .. //depot/projects/vap/sys/dev/sf/if_sfreg.h#1 branch .. //depot/projects/vap/sys/dev/sf/starfire_rx.h#1 branch .. //depot/projects/vap/sys/dev/sf/starfire_tx.h#1 branch .. //depot/projects/vap/sys/dev/stge/if_stge.c#4 integrate .. //depot/projects/vap/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/vap/sys/dev/usb/ehci.c#7 integrate .. //depot/projects/vap/sys/dev/usb/if_udav.c#7 integrate .. //depot/projects/vap/sys/dev/usb/uark.c#3 integrate .. //depot/projects/vap/sys/dev/usb/uftdi.c#6 integrate .. //depot/projects/vap/sys/dev/usb/uftdireg.h#3 integrate .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#5 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/vap/sys/fs/coda/cnode.h#3 integrate .. //depot/projects/vap/sys/fs/coda/coda_namecache.h#3 integrate .. //depot/projects/vap/sys/fs/coda/coda_psdev.c#3 integrate .. //depot/projects/vap/sys/fs/coda/coda_vfsops.c#4 integrate .. //depot/projects/vap/sys/fs/coda/coda_vnops.c#4 integrate .. //depot/projects/vap/sys/fs/fifofs/fifo_vnops.c#7 integrate .. //depot/projects/vap/sys/fs/hpfs/hpfs_subr.h#4 integrate .. //depot/projects/vap/sys/fs/hpfs/hpfs_vfsops.c#7 integrate .. //depot/projects/vap/sys/fs/msdosfs/msdosfs_denode.c#6 integrate .. //depot/projects/vap/sys/fs/ntfs/ntfs_subr.c#7 integrate .. //depot/projects/vap/sys/fs/nullfs/null_vnops.c#7 integrate .. //depot/projects/vap/sys/fs/nwfs/nwfs_node.c#7 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_node.c#7 integrate .. //depot/projects/vap/sys/fs/udf/udf_vfsops.c#7 integrate .. //depot/projects/vap/sys/fs/unionfs/union_subr.c#7 integrate .. //depot/projects/vap/sys/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/vap/sys/gnu/fs/reiserfs/reiserfs_inode.c#4 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#3 integrate .. //depot/projects/vap/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/vap/sys/i386/isa/clock.c#6 integrate .. //depot/projects/vap/sys/kern/genassym.sh#3 integrate .. //depot/projects/vap/sys/kern/init_sysent.c#7 integrate .. //depot/projects/vap/sys/kern/kern_cpu.c#5 integrate .. //depot/projects/vap/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/vap/sys/kern/kern_jail.c#7 integrate .. //depot/projects/vap/sys/kern/kern_lock.c#7 integrate .. //depot/projects/vap/sys/kern/kern_mib.c#7 integrate .. //depot/projects/vap/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/vap/sys/kern/kern_shutdown.c#7 integrate .. //depot/projects/vap/sys/kern/kern_time.c#6 integrate .. //depot/projects/vap/sys/kern/sched_ule.c#7 integrate .. //depot/projects/vap/sys/kern/subr_bus.c#7 integrate .. //depot/projects/vap/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/vap/sys/kern/syscalls.c#7 integrate .. //depot/projects/vap/sys/kern/syscalls.master#7 integrate .. //depot/projects/vap/sys/kern/systrace_args.c#4 integrate .. //depot/projects/vap/sys/kern/tty_pty.c#6 integrate .. //depot/projects/vap/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/vap/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/vap/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/vap/sys/kern/vfs_aio.c#7 integrate .. //depot/projects/vap/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/vap/sys/kern/vfs_default.c#7 integrate .. //depot/projects/vap/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/vap/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/vap/sys/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/projects/vap/sys/modules/mii/Makefile#5 integrate .. //depot/projects/vap/sys/modules/mxge/Makefile#3 integrate .. //depot/projects/vap/sys/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch .. //depot/projects/vap/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch .. //depot/projects/vap/sys/modules/sf/Makefile#5 integrate .. //depot/projects/vap/sys/net/if_bridge.c#4 integrate .. //depot/projects/vap/sys/netgraph/netflow/netflow.c#6 integrate .. //depot/projects/vap/sys/netgraph/netflow/ng_netflow.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_ppp.c#5 integrate .. //depot/projects/vap/sys/netgraph/ng_pred1.c#3 integrate .. //depot/projects/vap/sys/netinet/in.c#6 integrate .. //depot/projects/vap/sys/netinet/ip_fw.h#6 integrate .. //depot/projects/vap/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/vap/sys/netinet/ip_options.c#3 integrate .. //depot/projects/vap/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/vap/sys/netinet6/in6.c#7 integrate .. //depot/projects/vap/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/vap/sys/netinet6/ip6_output.c#7 integrate .. //depot/projects/vap/sys/netinet6/ip6_var.h#6 integrate .. //depot/projects/vap/sys/netinet6/raw_ip6.c#7 integrate .. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/vap/sys/netncp/ncp_conn.c#5 integrate .. //depot/projects/vap/sys/netsmb/smb_conn.c#5 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_idmap.c#3 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/vap/sys/nfsclient/nfs_node.c#6 integrate .. //depot/projects/vap/sys/nfsclient/nfs_subs.c#7 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/vap/sys/nfsserver/nfs_srvsubs.c#7 integrate .. //depot/projects/vap/sys/pci/amdsmb.c#3 integrate .. //depot/projects/vap/sys/pci/if_sf.c#6 delete .. //depot/projects/vap/sys/pci/if_sfreg.h#5 delete .. //depot/projects/vap/sys/pci/nfsmb.c#3 integrate .. //depot/projects/vap/sys/powerpc/powermac/ata_kauai.c#6 integrate .. //depot/projects/vap/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/vap/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/vap/sys/sys/buf.h#7 integrate .. //depot/projects/vap/sys/sys/bus.h#6 integrate .. //depot/projects/vap/sys/sys/event.h#6 integrate .. //depot/projects/vap/sys/sys/lockmgr.h#7 integrate .. //depot/projects/vap/sys/sys/mbuf.h#7 integrate .. //depot/projects/vap/sys/sys/param.h#7 integrate .. //depot/projects/vap/sys/sys/priv.h#4 integrate .. //depot/projects/vap/sys/sys/signal.h#5 integrate .. //depot/projects/vap/sys/sys/syscall.h#7 integrate .. //depot/projects/vap/sys/sys/syscall.mk#7 integrate .. //depot/projects/vap/sys/sys/sysproto.h#7 integrate .. //depot/projects/vap/sys/sys/time.h#6 integrate .. //depot/projects/vap/sys/sys/user.h#7 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_snapshot.c#7 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_extattr.c#7 integrate .. //depot/projects/vap/tools/build/Makefile#3 integrate .. //depot/projects/vap/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate .. //depot/projects/vap/tools/build/options/WITHOUT_FORTRAN#3 delete .. //depot/projects/vap/tools/regression/lib/msun/Makefile#4 integrate .. //depot/projects/vap/tools/regression/lib/msun/test-exponential.c#1 branch .. //depot/projects/vap/tools/regression/lib/msun/test-exponential.t#1 branch .. //depot/projects/vap/tools/regression/posixshm/Makefile#1 branch .. //depot/projects/vap/tools/regression/posixshm/posixshm.c#1 branch .. //depot/projects/vap/tools/regression/posixshm/posixshm.t#1 branch .. //depot/projects/vap/tools/regression/posixshm/test.c#1 branch .. //depot/projects/vap/tools/regression/posixshm/test.h#1 branch .. //depot/projects/vap/tools/sched/schedgraph.py#4 integrate .. //depot/projects/vap/tools/tools/aac/aac_checkq.c#3 integrate .. //depot/projects/vap/usr.bin/fstat/Makefile#3 integrate .. //depot/projects/vap/usr.bin/fstat/zfs/Makefile#3 integrate .. //depot/projects/vap/usr.bin/mklocale/mklocale.1#3 integrate .. //depot/projects/vap/usr.bin/mklocale/yacc.y#3 integrate .. //depot/projects/vap/usr.bin/mt/mt.1#3 integrate .. //depot/projects/vap/usr.bin/procstat/procstat_files.c#2 integrate .. //depot/projects/vap/usr.bin/systat/cmds.c#3 integrate .. //depot/projects/vap/usr.bin/systat/convtbl.c#3 integrate .. //depot/projects/vap/usr.bin/systat/devs.c#3 integrate .. //depot/projects/vap/usr.bin/systat/fetch.c#3 integrate .. //depot/projects/vap/usr.bin/systat/icmp.c#3 integrate .. //depot/projects/vap/usr.bin/systat/icmp6.c#3 integrate .. //depot/projects/vap/usr.bin/systat/iostat.c#3 integrate .. //depot/projects/vap/usr.bin/systat/ip.c#3 integrate .. //depot/projects/vap/usr.bin/systat/ip6.c#3 integrate .. //depot/projects/vap/usr.bin/systat/keyboard.c#3 integrate .. //depot/projects/vap/usr.bin/systat/main.c#3 integrate .. //depot/projects/vap/usr.bin/systat/mbufs.c#3 integrate .. //depot/projects/vap/usr.bin/systat/netcmds.c#3 integrate .. //depot/projects/vap/usr.bin/systat/netstat.c#3 integrate .. //depot/projects/vap/usr.bin/systat/pigs.c#3 integrate .. //depot/projects/vap/usr.bin/systat/swap.c#3 integrate .. //depot/projects/vap/usr.bin/systat/tcp.c#3 integrate .. //depot/projects/vap/usr.bin/systat/vmstat.c#3 integrate .. //depot/projects/vap/usr.bin/tar/bsdtar.1#4 integrate .. //depot/projects/vap/usr.bin/tar/bsdtar.c#4 integrate .. //depot/projects/vap/usr.bin/top/machine.c#4 integrate .. //depot/projects/vap/usr.bin/vmstat/vmstat.c#4 integrate .. //depot/projects/vap/usr.bin/xargs/xargs.1#3 integrate .. //depot/projects/vap/usr.sbin/adduser/adduser.8#3 integrate .. //depot/projects/vap/usr.sbin/adduser/adduser.sh#3 integrate .. //depot/projects/vap/usr.sbin/iostat/iostat.c#4 integrate .. //depot/projects/vap/usr.sbin/pw/pw.8#3 integrate .. //depot/projects/vap/usr.sbin/setfmac/setfmac.c#3 integrate .. //depot/projects/vap/usr.sbin/sysinstall/menus.c#4 integrate Differences ... ==== //depot/projects/vap/LOCKS#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/LOCKS,v 1.3 2006/01/13 06:51:43 ru Exp $ +$FreeBSD: src/LOCKS,v 1.4 2008/01/24 22:07:03 cperciva Exp $ This file documents formal review/approval requirements that have been approved by core. @@ -10,3 +10,4 @@ src/* RELENG_4_* Requires Security Officer approval. src/* RELENG_5_* Requires Security Officer approval. src/* RELENG_6_* Requires Security Officer approval. +src/* RELENG_7_* Requires Security Officer approval. ==== //depot/projects/vap/MAINTAINERS#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.145 2007/05/23 21:47:19 jfv Exp $ +$FreeBSD: src/MAINTAINERS,v 1.146 2008/01/26 21:58:52 brueffer Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -33,7 +33,6 @@ ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. NEWCARD imp Pre-commit review requested. -OLDCARD 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. ==== //depot/projects/vap/Makefile.inc1#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.596 2008/01/23 22:21:36 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -227,7 +227,7 @@ # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - -DWITHOUT_FORTRAN -DWITHOUT_GDB + -DWITHOUT_GDB # world stage WMAKEENV= ${CROSSENV} \ @@ -841,8 +841,8 @@ # legacy: Build compatibility shims for the next three targets # legacy: -.if ${BOOTSTRAPPING} < 503000 - @echo "ERROR: Source upgrades from versions prior to 5.3 not supported."; \ +.if ${BOOTSTRAPPING} < 600034 && ${BOOTSTRAPPING} != 0 + @echo "ERROR: Source upgrades from versions prior to 6.0 not supported."; \ false .endif .for _tool in tools/build @@ -871,26 +871,6 @@ .endif .endif -.if ${BOOTSTRAPPING} < 600029 -_texinfo= gnu/usr.bin/texinfo -.endif - -.if ${BOOTSTRAPPING} < 600015 -_cap_mkdb= usr.bin/cap_mkdb -.endif - -.if ${BOOTSTRAPPING} < 600018 -_colldef= usr.bin/colldef -.endif - -.if ${BOOTSTRAPPING} < 600017 -_gencat= usr.bin/gencat -.endif - -.if ${BOOTSTRAPPING} < 600016 -_mklocale= usr.bin/mklocale -.endif - .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -900,28 +880,23 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 600020 -_pwd_mkdb= usr.sbin/pwd_mkdb +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale .endif bootstrap-tools: .for _tool in \ + ${_mklocale} \ ${_strfile} \ ${_gperf} \ ${_groff} \ - ${_texinfo} \ - ${_cap_mkdb} \ - ${_colldef} \ - ${_gencat} \ usr.bin/lorder \ usr.bin/makewhatis \ - ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ - ${_crunchgen} \ - ${_pwd_mkdb} + ${_crunchgen} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/vap/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.125 2008/01/11 13:41:31 jhb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.127 2008/01/26 20:23:25 brueffer Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080126: oldcard.4 removal +OLD_FILES+=usr/share/man/man4/card.4.gz +OLD_FILES+=usr/share/man/man4/oldcard.4.gz +# 20080122: Removed from the tree +OLD_FILES+=usr/share/man/man9/BUF_REFCNT.9.gz # 20080108: Moved to section 2 OLD_FILES+=usr/share/man/man3/shm_open.3.gz OLD_FILES+=usr/share/man/man3/shm_unlink.3.gz ==== //depot/projects/vap/UPDATING#3 (text+ko) ==== @@ -19,7 +19,27 @@ related kernel options, INVARIANTS, malloc debugging flags in userland, and various verbose features in the kernel. Many developers choose to disable these features on build machines - to maximize performance. + to maximize performance. (To disable malloc debugging, run + ln -s aj /etc/malloc.conf.) + +20080126: + The fts(3) structures have been changed to use adequate + integer types for their members and so to be able to cope + with huge file trees. The old fts(3) ABI is preserved + through symbol versioning in libc, so third-party binaries + using fts(3) should still work, although they will not take + advantage of the extended types. At the same time, some + third-party software might fail to build after this change + due to unportable assumptions made in its source code about + fts(3) structure members. Such software should be fixed + by its vendor or, in the worst case, in the ports tree. + FreeBSD_version 800015 marks this change for the unlikely + case that a portable fix is impossible. + +20080123: + To upgrade to -current after this date, you must be running + FreeBSD not older than 6.0-RELEASE. Upgrading to -current + from 5.x now requires a stop over at RELENG_6 or RELENG_7 systems. 20071128: The ADAPTIVE_GIANT kernel option has been retired because its @@ -949,4 +969,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.513 2007/11/28 13:04:11 matteo Exp $ +$FreeBSD: src/UPDATING,v 1.517 2008/01/26 17:09:39 yar Exp $ ==== //depot/projects/vap/contrib/top/display.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/display.c,v 1.9 2005/05/19 13:34:19 keramida Exp $ + * $FreeBSD: src/contrib/top/display.c,v 1.10 2008/01/18 01:43:13 peter Exp $ */ /* @@ -78,8 +78,10 @@ static int *lmemory; static int *lswap; +static int num_cpus; static int *cpustate_columns; static int cpustate_total_length; +static int cpustates_column; static enum { OFF, ON, ERASE } header_status = ON; @@ -87,6 +89,29 @@ static void summary_format(); static void line_update(); +int x_lastpid = 10; +int y_lastpid = 0; +int x_loadave = 33; +int x_loadave_nompid = 15; +int y_loadave = 0; +int x_procstate = 0; +int y_procstate = 1; +int x_brkdn = 15; +int y_brkdn = 1; +int x_mem = 5; +int y_mem = 3; +int x_swap = 6; +int y_swap = 4; +int y_message = 5; +int x_header = 0; +int y_header = 6; +int x_idlecursor = 0; +int y_idlecursor = 5; +int y_procs = 7; + +int y_cpustates = 2; +int Header_lines = 7; + int display_resize() { @@ -138,6 +163,12 @@ /* call resize to do the dirty work */ lines = display_resize(); + num_cpus = statics->ncpus; + cpustates_column = 5; /* CPU: */ + if (num_cpus != 1) + cpustates_column += 2; /* CPU 0: */ + for (i = num_cpus; i > 9; i /= 10) + cpustates_column++; /* only do the rest if we need to */ if (lines > -1) @@ -153,7 +184,7 @@ num_swap = string_count(swap_names); lswap = (int *)malloc(num_swap * sizeof(int)); num_cpustates = string_count(cpustate_names); - lcpustates = (int *)malloc(num_cpustates * sizeof(int)); + lcpustates = (int *)malloc(num_cpustates * sizeof(int) * num_cpus); cpustate_columns = (int *)malloc(num_cpustates * sizeof(int)); memory_names = statics->memory_names; @@ -365,14 +396,13 @@ } } +#ifdef no_more /* * *_cpustates(states, names) - print the cpu state percentages * * Assumptions: cursor is on the PREVIOUS line */ -static int cpustates_column; - /* cpustates_tag() calculates the correct tag to use to label the line */ char *cpustates_tag() @@ -398,6 +428,7 @@ cpustates_column = strlen(use); return(use); } +#endif i_cpustates(states) @@ -406,11 +437,18 @@ { register int i = 0; register int value; - register char **names = cpustate_names; + register char **names; register char *thisname; + int cpu; + +for (cpu = 0; cpu < num_cpus; cpu++) { + names = cpustate_names; /* print tag and bump lastline */ - printf("\n%s", cpustates_tag()); + if (num_cpus == 1) + printf("\nCPU: "); + else + printf("\nCPU %d: ", cpu); lastline++; /* now walk thru the names and print the line */ @@ -423,14 +461,15 @@ /* if percentage is >= 1000, print it as 100% */ printf((value >= 1000 ? "%s%4.0f%% %s" : "%s%4.1f%% %s"), - i++ == 0 ? "" : ", ", + (i++ % num_cpustates) == 0 ? "" : ", ", ((float)value)/10., thisname); } } +} /* copy over values into "last" array */ - memcpy(lcpustates, states, num_cpustates * sizeof(int)); + memcpy(lcpustates, states, num_cpustates * sizeof(int) * num_cpus); } u_cpustates(states) @@ -439,14 +478,18 @@ { register int value; - register char **names = cpustate_names; + register char **names; register char *thisname; register int *lp; register int *colp; + int cpu; + +for (cpu = 0; cpu < num_cpus; cpu++) { + names = cpustate_names; - Move_to(cpustates_column, y_cpustates); - lastline = y_cpustates; - lp = lcpustates; + Move_to(cpustates_column, y_cpustates + cpu); + lastline = y_cpustates + cpu; + lp = lcpustates + (cpu * num_cpustates); colp = cpustate_columns; /* we could be much more optimal about this */ @@ -458,8 +501,8 @@ if (*lp != *states) { /* yes, move and change */ - Move_to(cpustates_column + *colp, y_cpustates); - lastline = y_cpustates; + Move_to(cpustates_column + *colp, y_cpustates + cpu); + lastline = y_cpustates + cpu; /* retrieve value and remember it */ value = *states; @@ -479,30 +522,39 @@ colp++; } } +} z_cpustates() { register int i = 0; - register char **names = cpustate_names; + register char **names; register char *thisname; register int *lp; + int cpu; + +for (cpu = 0; cpu < num_cpus; cpu++) { + names = cpustate_names; /* show tag and bump lastline */ - printf("\n%s", cpustates_tag()); + if (num_cpus == 1) + printf("\nCPU: "); + else + printf("\nCPU %d: ", cpu); lastline++; while ((thisname = *names++) != NULL) { if (*thisname != '\0') { - printf("%s %% %s", i++ == 0 ? "" : ", ", thisname); + printf("%s %% %s", (i++ % num_cpustates) == 0 ? "" : ", ", thisname); } } +} /* fill the "last" array with all -1s, to insure correct updating */ lp = lcpustates; - i = num_cpustates; + i = num_cpustates * num_cpus; while (--i >= 0) { *lp++ = -1; ==== //depot/projects/vap/contrib/top/layout.h#3 (text+ko) ==== @@ -4,26 +4,28 @@ * This file defines the locations on tne screen for various parts of the * display. These definitions are used by the routines in "display.c" for * cursor addressing. + * + * $FreeBSD: src/contrib/top/layout.h,v 1.3 2008/01/18 01:43:13 peter Exp $ */ -#define x_lastpid 10 -#define y_lastpid 0 -#define x_loadave 33 -#define x_loadave_nompid 15 -#define y_loadave 0 -#define x_procstate 0 -#define y_procstate 1 -#define x_brkdn 15 -#define y_brkdn 1 -#define x_mem 5 -#define y_mem 3 -#define x_swap 6 -#define y_swap 4 -#define y_message 5 -#define x_header 0 -#define y_header 6 -#define x_idlecursor 0 -#define y_idlecursor 5 -#define y_procs 7 +extern int x_lastpid; /* 10 */ +extern int y_lastpid; /* 0 */ +extern int x_loadave; /* 33 */ +extern int x_loadave_nompid; /* 15 */ +extern int y_loadave; /* 0 */ +extern int x_procstate; /* 0 */ +extern int y_procstate; /* 1 */ +extern int x_brkdn; /* 15 */ +extern int y_brkdn; /* 1 */ +extern int x_mem; /* 5 */ +extern int y_mem; /* 3 */ +extern int x_swap; /* 6 */ +extern int y_swap; /* 4 */ +extern int y_message; /* 5 */ +extern int x_header; /* 0 */ +extern int y_header; /* 6 */ +extern int x_idlecursor; /* 0 */ +extern int y_idlecursor; /* 5 */ +extern int y_procs; /* 7 */ -#define y_cpustates 2 +extern int y_cpustates; /* 2 */ ==== //depot/projects/vap/contrib/top/machine.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.9 2007/05/04 15:42:58 rafan Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.10 2008/01/18 01:43:13 peter Exp $ */ /* @@ -20,6 +20,7 @@ #ifdef ORDER char **order_names; #endif + int ncpus; }; /* @@ -43,6 +44,8 @@ int *memory; int *swap; struct timeval boottime; + unsigned long cpumask; /* bitfield of cpu states represented */ + int ncpus; }; /* cpu_states is an array of percentages * 10. For example, ==== //depot/projects/vap/contrib/top/top.c#4 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.24 2008/01/09 18:06:24 obrien Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.25 2008/01/18 01:43:13 peter Exp $ */ /* @@ -66,6 +66,7 @@ extern int overstrike; static int fmt_flags = 0; +int pcpu_stats = No; /* signal handling routines */ sigret_t leave(); @@ -282,7 +283,7 @@ optind = 1; } - while ((i = getopt(ac, av, "CSIHabijnquvs:d:U:m:o:t")) != EOF) + while ((i = getopt(ac, av, "CSIHPabijnpquvs:d:U:m:o:t")) != EOF) { switch(i) { @@ -407,6 +408,14 @@ ps.jail = !ps.jail; break; + case 'P': + pcpu_stats = Yes; + break; + + case 'p': + pcpu_stats = No; + break; + default: fprintf(stderr, "Top version %s\n" ==== //depot/projects/vap/contrib/top/top.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/top.h,v 1.4 2007/04/14 10:16:51 stas Exp $ + * $FreeBSD: src/contrib/top/top.h,v 1.5 2008/01/18 01:43:13 peter Exp $ */ /* * Top - a top users display for Berkeley Unix @@ -11,7 +11,7 @@ #define VERSION 3 /* Number of lines of header information on the standard screen */ -#define Header_lines 7 +extern int Header_lines; /* 7 */ /* Maximum number of columns allowed for display */ #define MAX_COLS 128 @@ -45,3 +45,5 @@ #define FMT_SHOWARGS 0x00000001 extern enum displaymodes displaymode; + +extern int pcpu_stats; ==== //depot/projects/vap/etc/defaults/rc.conf#4 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.322 2008/01/12 20:52:30 maxim Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.326 2008/01/27 15:15:11 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -119,6 +119,10 @@ firewall_nologports="135-139,445 1026,1027 1433,1434" # List of TCP/UDP ports # for which denied incoming packets are not # logged. +firewall_nat_enable="NO" # Enable kernel NAT (if firewall_enable == YES) +firewall_nat_interface="" # Public interface or IPaddress to use +firewall_nat_flags="" # Additional configuration parameters +dummynet_enable="NO" # Load the dummynet(4) module ip_portrange_first="NO" # Set first dynamically allocated port ip_portrange_last="NO" # Set last dynamically allocated port ike_enable="NO" # Enable IKE daemon (usually racoon or isakmpd) @@ -236,7 +240,7 @@ # kerberos5_server_enable="NO" # Run a kerberos 5 master server (or NO). kerberos5_server="/usr/libexec/kdc" # path to kerberos 5 KDC -kerberos5_server_flags="" # Additional flags to the kerberos 5 server +kerberos5_server_flags="--detach" # Additional flags to the kerberos 5 server kadmind5_server_enable="NO" # Run kadmind (or NO) kadmind5_server="/usr/libexec/kadmind" # path to kerberos 5 admin daemon kpasswdd_server_enable="NO" # Run kpasswdd (or NO) @@ -557,7 +561,7 @@ watchdogd_enable="NO" # Start the software watchdog daemon devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules" # Files containing # devfs(8) rules. -devfs_system_ruleset="" # The name of a ruleset to apply to /dev +devfs_system_ruleset="" # The name (NOT number) of a ruleset to apply to /dev devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to # apply (must be mounted already, i.e. fstab(5)) performance_cx_lowest="HIGH" # Online CPU idle state ==== //depot/projects/vap/etc/devd.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.38 2007/06/21 22:50:36 njl Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.39 2008/01/26 13:50:38 mtm Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -53,7 +53,7 @@ match "system" "IFNET"; match "type" "LINK_UP"; media-type "ethernet"; - action "/etc/rc.d/dhclient start $subsystem"; + action "/etc/rc.d/dhclient quietstart $subsystem"; }; # @@ -73,7 +73,7 @@ match "system" "IFNET"; match "type" "LINK_UP"; media-type "802.11"; - action "/etc/rc.d/dhclient start $subsystem"; + action "/etc/rc.d/dhclient quietstart $subsystem"; }; # An entry like this might be in a different file, but is included here @@ -91,11 +91,11 @@ # When a USB Bluetooth dongle appears activate it attach 100 { device-name "ubt[0-9]+"; - action "/etc/rc.d/bluetooth start $device-name"; + action "/etc/rc.d/bluetooth quietstart $device-name"; }; detach 100 { device-name "ubt[0-9]+"; - action "/etc/rc.d/bluetooth stop $device-name"; + action "/etc/rc.d/bluetooth quietstop $device-name"; }; # When a USB keyboard arrives, attach it as the console keyboard. @@ -112,7 +112,7 @@ # stops automatically (actually it bombs :) when the device disappears. attach 100 { device-name "ums[0-9]+"; - action "/etc/rc.d/moused start $device-name"; + action "/etc/rc.d/moused quietstart $device-name"; }; # Firmware download into the ActiveWire board. After the firmware download is ==== //depot/projects/vap/etc/netstart#3 (text+ko) ==== @@ -24,7 +24,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 27 19:06:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BB9E16A421; Sun, 27 Jan 2008 19:06:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD2AD16A419 for ; Sun, 27 Jan 2008 19:06:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ADE8413C478 for ; Sun, 27 Jan 2008 19:06:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RJ6Uk9031344 for ; Sun, 27 Jan 2008 19:06:30 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RJ6UMh031341 for perforce@freebsd.org; Sun, 27 Jan 2008 19:06:30 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 19:06:30 GMT Message-Id: <200801271906.m0RJ6UMh031341@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 19:06:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=134224 Change 134224 by sam@sam_ebb on 2008/01/27 19:06:00 don't cache iv_bss as it changes after calling ieee80211_create_ibss Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#5 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#5 (text+ko) ==== @@ -116,7 +116,6 @@ hostap_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { struct ieee80211com *ic = vap->iv_ic; - struct ieee80211_node *ni; enum ieee80211_state ostate; IEEE80211_LOCK_ASSERT(ic); @@ -128,7 +127,6 @@ vap->iv_state = nstate; /* state transition */ if (ostate != IEEE80211_S_SCAN) ieee80211_cancel_scan(vap); /* background scan */ - ni = vap->iv_bss; /* NB: no reference held */ switch (nstate) { case IEEE80211_S_INIT: switch (ostate) { @@ -248,10 +246,11 @@ case IEEE80211_S_CSA: #ifdef IEEE80211_DEBUG if (ieee80211_msg_debug(vap)) { + struct ieee80211_node *ni = vap->iv_bss; ieee80211_note(vap, "synchronized with %s ssid ", ether_sprintf(ni->ni_bssid)); - ieee80211_print_essid(vap->iv_bss->ni_essid, + ieee80211_print_essid(ni->ni_essid, ni->ni_esslen); /* XXX MCS/HT */ printf(" channel %d start %uMb\n", @@ -273,7 +272,7 @@ } else if (vap->iv_auth->ia_detach != NULL) { vap->iv_auth->ia_detach(vap); } - ieee80211_node_authorize(ni); + ieee80211_node_authorize(vap->iv_bss); break; default: break; From owner-p4-projects@FreeBSD.ORG Sun Jan 27 19:08:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E749816A41B; Sun, 27 Jan 2008 19:08:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94B3116A417 for ; Sun, 27 Jan 2008 19:08:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 84F3E13C46B for ; Sun, 27 Jan 2008 19:08:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RJ8XEh031475 for ; Sun, 27 Jan 2008 19:08:33 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RJ8XtS031464 for perforce@freebsd.org; Sun, 27 Jan 2008 19:08:33 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 19:08:33 GMT Message-Id: <200801271908.m0RJ8XtS031464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 19:08:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=134226 Change 134226 by sam@sam_ebb on 2008/01/27 19:08:32 add a public function ieee80211_node_deauth to drop a station associated to an ap vap; useful for drivers that need to drop a station for various reasons Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#6 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.c#20 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#13 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#6 (text+ko) ==== @@ -1505,8 +1505,7 @@ return 1; bad: - IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DEAUTH, reason); - ieee80211_node_leave(ni); + ieee80211_node_deauth(ni, reason); return 0; } ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#20 (text+ko) ==== @@ -721,6 +721,20 @@ ieee80211_notify_node_leave(ni); } +/* + * Send a deauthenticate frame and drop the station. + */ +void +ieee80211_node_deauth(struct ieee80211_node *ni, int reason) +{ + /* NB: bump the refcnt to be sure temporay nodes are not reclaimed */ + ieee80211_ref_node(ni); + if (ni->ni_associd != 0) + IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DEAUTH, reason); + ieee80211_node_leave(ni); + ieee80211_free_node(ni); +} + static struct ieee80211_node * node_alloc(struct ieee80211_node_table *nt) { ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#13 (text+ko) ==== @@ -275,6 +275,7 @@ int ieee80211_sta_join(struct ieee80211vap *, const struct ieee80211_scan_entry *); void ieee80211_sta_leave(struct ieee80211_node *); +void ieee80211_node_deauth(struct ieee80211_node *, int); int ieee80211_ies_init(struct ieee80211_ies *, const uint8_t *, int); void ieee80211_ies_cleanup(struct ieee80211_ies *); From owner-p4-projects@FreeBSD.ORG Sun Jan 27 19:11:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AD0B16A468; Sun, 27 Jan 2008 19:11:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4D0116A417 for ; Sun, 27 Jan 2008 19:11:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B5B5713C44B for ; Sun, 27 Jan 2008 19:11:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RJBbF9031660 for ; Sun, 27 Jan 2008 19:11:37 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RJBbOB031657 for perforce@freebsd.org; Sun, 27 Jan 2008 19:11:37 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 19:11:37 GMT Message-Id: <200801271911.m0RJBbOB031657@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134227 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 19:11:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=134227 Change 134227 by sam@sam_ebb on 2008/01/27 19:11:05 provide unique errno's for error cases of MLME assoc Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#22 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#22 (text+ko) ==== @@ -1354,8 +1354,11 @@ lookup.esslen = ssid_len; lookup.essid = ssid; ieee80211_scan_iterate(vap, mlmelookup, &lookup); - return (lookup.se == NULL || !ieee80211_sta_join(vap, lookup.se) ? - EINVAL : 0); + if (lookup.se == NULL) + return ENOENT; + if (!ieee80211_sta_join(vap, lookup.se)) + return EIO; /* XXX unique but could be better */ + return 0; } static int From owner-p4-projects@FreeBSD.ORG Sun Jan 27 19:24:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 485B016A41B; Sun, 27 Jan 2008 19:24:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D69616A418 for ; Sun, 27 Jan 2008 19:24:52 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F0EF113C45A for ; Sun, 27 Jan 2008 19:24:51 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RJOpsm033129 for ; Sun, 27 Jan 2008 19:24:51 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RJOpfv033126 for perforce@freebsd.org; Sun, 27 Jan 2008 19:24:51 GMT (envelope-from thompsa@freebsd.org) Date: Sun, 27 Jan 2008 19:24:51 GMT Message-Id: <200801271924.m0RJOpfv033126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134229 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 19:24:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=134229 Change 134229 by thompsa@thompsa_peeps on 2008/01/27 19:24:13 Create a branch to store geom_lvm before I lose it. Affected files ... .. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#6 edit .. //depot/user/thompsa/glvm/sys/geom/bde/g_bde.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/bde/g_bde.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/bde/g_bde_crypt.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/bde/g_bde_lock.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/bde/g_bde_work.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/cache/g_cache.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/cache/g_cache.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/concat/g_concat.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/concat/g_concat.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/eli/g_eli.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/eli/g_eli.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/eli/g_eli_crypto.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/eli/g_eli_ctl.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/eli/g_eli_key.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/eli/pkcs5v2.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/eli/pkcs5v2.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/gate/g_gate.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/gate/g_gate.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_aes.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_bsd.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_bsd_enc.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_ccd.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_ctl.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_ctl.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_dev.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_disk.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_disk.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_dump.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_event.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_fox.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_int.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_io.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_kern.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_mbr.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_mbr_enc.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_pc98.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_pc98_enc.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_slice.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_slice.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_subr.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_sunlabel.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_sunlabel_enc.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_vfs.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_vfs.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/geom_vol_ffs.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/journal/g_journal.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/journal/g_journal.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/journal/g_journal_ufs.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/label/g_label.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/label/g_label.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/label/g_label_ext2fs.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/label/g_label_iso9660.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/label/g_label_msdosfs.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/label/g_label_ntfs.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/label/g_label_reiserfs.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/label/g_label_ufs.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/mirror/g_mirror.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/mirror/g_mirror.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/mirror/g_mirror_ctl.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/multipath/g_multipath.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/multipath/g_multipath.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/nop/g_nop.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/nop/g_nop.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/notes#1 branch .. //depot/user/thompsa/glvm/sys/geom/part/g_part.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/part/g_part.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/part/g_part_apm.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/part/g_part_bsd.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/part/g_part_gpt.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/part/g_part_if.m#1 branch .. //depot/user/thompsa/glvm/sys/geom/part/g_part_mbr.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/raid3/g_raid3.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/raid3/g_raid3.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/raid3/g_raid3_ctl.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/shsec/g_shsec.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/shsec/g_shsec.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/stripe/g_stripe.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/stripe/g_stripe.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/uzip/g_uzip.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum_drive.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum_init.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum_list.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum_move.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum_plex.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum_raid5.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum_raid5.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum_rename.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum_rm.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum_share.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum_share.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum_state.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum_subr.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum_var.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/vinum/geom_vinum_volume.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/virstor/binstream.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/virstor/binstream.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/virstor/g_virstor.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/virstor/g_virstor.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/virstor/g_virstor_md.c#1 branch .. //depot/user/thompsa/glvm/sys/geom/virstor/g_virstor_md.h#1 branch .. //depot/user/thompsa/glvm/sys/geom/zero/g_zero.c#1 branch .. //depot/user/thompsa/rstp/sys/net/bridgestp.c#137 edit .. //depot/user/thompsa/rstp/sys/net/bridgestp.h#77 edit .. //depot/user/thompsa/rstp/sys/net/if_bridge.c#55 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#6 (text+ko) ==== ==== //depot/user/thompsa/rstp/sys/net/bridgestp.c#137 (text+ko) ==== ==== //depot/user/thompsa/rstp/sys/net/bridgestp.h#77 (text+ko) ==== ==== //depot/user/thompsa/rstp/sys/net/if_bridge.c#55 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Jan 27 19:25:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D20D16A469; Sun, 27 Jan 2008 19:25:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42DDF16A419 for ; Sun, 27 Jan 2008 19:25:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3071F13C4CE for ; Sun, 27 Jan 2008 19:25:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RJPrOn033195 for ; Sun, 27 Jan 2008 19:25:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RJPrku033192 for perforce@freebsd.org; Sun, 27 Jan 2008 19:25:53 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 19:25:53 GMT Message-Id: <200801271925.m0RJPrku033192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 19:25:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=134230 Change 134230 by sam@sam_ebb on 2008/01/27 19:25:41 o change ieee80211_node_set_chan api to take an explicit channel instead of using ic_bsschan and remove hack to fallback to ic_curchan if the bss channel has not been set yet o promote it to a public api Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_node.c#21 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#14 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#21 (text+ko) ==== @@ -200,17 +200,14 @@ * Set/change the channel. The rate set is also updated as * to insure a consistent view by drivers. */ -static void -ieee80211_node_set_chan(struct ieee80211com *ic, struct ieee80211_node *ni) +void +ieee80211_node_set_chan(struct ieee80211_node *ni, + struct ieee80211_channel *chan) { - struct ieee80211_channel *chan = ic->ic_bsschan; + struct ieee80211com *ic = ni->ni_ic; + + KASSERT(chan != IEEE80211_CHAN_ANYC, ("no channel")); -#if 0 - KASSERT(chan != IEEE80211_CHAN_ANYC, ("bss channel not setup")); -#else - if (chan == IEEE80211_CHAN_ANYC) /* XXX while scanning */ - chan = ic->ic_curchan; -#endif ni->ni_chan = chan; if (IEEE80211_IS_CHAN_HT(chan)) { /* @@ -288,7 +285,7 @@ IEEE80211_IS_CHAN_CACDONE(ic->ic_bsschan)) ieee80211_dfs_cac_clear(ic, ic->ic_bsschan); ic->ic_bsschan = chan; - ieee80211_node_set_chan(ic, ni); + ieee80211_node_set_chan(ni, chan); ic->ic_curmode = ieee80211_chan2mode(chan); /* * Do mode-specific setup. @@ -987,20 +984,20 @@ IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, "%s %p<%s>\n", __func__, ni, ether_sprintf(macaddr)); + ni->ni_table = NULL; /* NB: pedantic */ + ni->ni_ic = ic; /* NB: needed to set channel */ + ni->ni_vap = vap; + IEEE80211_ADDR_COPY(ni->ni_macaddr, macaddr); IEEE80211_ADDR_COPY(ni->ni_bssid, vap->iv_bss->ni_bssid); ieee80211_node_initref(ni); /* mark referenced */ /* NB: required by ieee80211_fix_rate */ - ieee80211_node_set_chan(ic, ni); + ieee80211_node_set_chan(ni, ic->ic_bsschan); ni->ni_txpower = vap->iv_bss->ni_txpower; ieee80211_crypto_resetkey(vap, &ni->ni_ucastkey, IEEE80211_KEYIX_NONE); /* XXX optimize away */ IEEE80211_NODE_SAVEQ_INIT(ni, "unknown"); - - ni->ni_table = NULL; /* NB: pedantic */ - ni->ni_ic = ic; - ni->ni_vap = vap; } else { /* XXX msg */ vap->iv_stats.is_rx_nodealloc++; @@ -1024,7 +1021,7 @@ ni->ni_txpower = vap->iv_bss->ni_txpower; ni->ni_vlan = vap->iv_bss->ni_vlan; /* XXX?? */ IEEE80211_ADDR_COPY(ni->ni_bssid, vap->iv_bss->ni_bssid); - ieee80211_node_set_chan(ic, ni); + ieee80211_node_set_chan(ni, ic->ic_bsschan); } return ni; } ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#14 (text+ko) ==== @@ -266,6 +266,8 @@ void ieee80211_node_authorize(struct ieee80211_node *); void ieee80211_node_unauthorize(struct ieee80211_node *); +void ieee80211_node_set_chan(struct ieee80211_node *, + struct ieee80211_channel *); void ieee80211_create_ibss(struct ieee80211vap*, struct ieee80211_channel *); void ieee80211_reset_bss(struct ieee80211vap *); void ieee80211_sync_curchan(struct ieee80211com *); From owner-p4-projects@FreeBSD.ORG Sun Jan 27 19:26:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F5FC16A498; Sun, 27 Jan 2008 19:26:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B7B0C16A41B for ; Sun, 27 Jan 2008 19:26:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9071513C47E for ; Sun, 27 Jan 2008 19:26:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RJQsW6033285 for ; Sun, 27 Jan 2008 19:26:54 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RJQsXC033282 for perforce@freebsd.org; Sun, 27 Jan 2008 19:26:54 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 19:26:54 GMT Message-Id: <200801271926.m0RJQsXC033282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134232 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 19:26:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=134232 Change 134232 by sam@sam_ebb on 2008/01/27 19:26:50 add comment about iv_bss being clobbered by call Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#7 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#7 (text+ko) ==== @@ -233,6 +233,7 @@ ieee80211_create_ibss(vap, ieee80211_ht_adjust_channel(ic, ic->ic_curchan, vap->iv_flags_ext)); + /* NB: iv_bss is changed on return */ break; case IEEE80211_S_CAC: /* From owner-p4-projects@FreeBSD.ORG Sun Jan 27 20:24:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C051A16A419; Sun, 27 Jan 2008 20:24:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 53B6016A41B for ; Sun, 27 Jan 2008 20:24:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 43BEE13C45A for ; Sun, 27 Jan 2008 20:24:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RKOswX037695 for ; Sun, 27 Jan 2008 20:24:54 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RKOrJP037692 for perforce@freebsd.org; Sun, 27 Jan 2008 20:24:53 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 20:24:53 GMT Message-Id: <200801272024.m0RKOrJP037692@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 20:24:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=134234 Change 134234 by sam@sam_ebb on 2008/01/27 20:24:31 Add support for mixed ht/legacy ap vaps: o ic_bsschan now holds the promoted bss channel shared by all ap vaps and iv_bss->ni_chan now holds the bss channel for all ap vaps; adjust references appropriaately o adjust bss channel on CSA state change for ap vaps o don't do direct channel change of WDS vaps; it is now necessary to go through the state machine to adjust the bss node's channel o promote htchanflags to ieee80211_htchanflags for use in per-opmode code when handling channel changes o move legacy wds setup work to new ieee80211_node_create_wds routine o make ieee80211_setcurchan set ic_bsschan and remove set from callers o encapsulate idiomatic ioctl code Note: drivers need adjusting only if they support HT operation; for legacy operation you can still safely reference ic_bsschan Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#8 edit .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#6 edit .. //depot/projects/vap/sys/net80211/ieee80211_ht.h#5 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#23 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.c#22 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#15 edit .. //depot/projects/vap/sys/net80211/ieee80211_output.c#25 edit .. //depot/projects/vap/sys/net80211/ieee80211_proto.c#19 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#24 edit .. //depot/projects/vap/sys/net80211/ieee80211_wds.c#4 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#8 (text+ko) ==== @@ -242,9 +242,18 @@ * clear the CAC timer as it's already expired. */ /* fall thru... */ + case IEEE80211_S_CSA: + /* + * Update bss node channel to reflect where + * we landed after CSA. + */ + ieee80211_node_set_chan(vap->iv_bss, + ieee80211_ht_adjust_channel(ic, ic->ic_curchan, + ieee80211_htchanflags(vap->iv_bss->ni_chan))); + /* XXX bypass debug msgs */ + break; case IEEE80211_S_SCAN: case IEEE80211_S_RUN: - case IEEE80211_S_CSA: #ifdef IEEE80211_DEBUG if (ieee80211_msg_debug(vap)) { struct ieee80211_node *ni = vap->iv_bss; @@ -2044,7 +2053,8 @@ /* * Do HT rate set handling and setup HT node state. */ - if (IEEE80211_IS_CHAN_HT(ic->ic_bsschan) && htcap != NULL) { + ni->ni_chan = vap->iv_bss->ni_chan; + if (IEEE80211_IS_CHAN_HT(ni->ni_chan) && htcap != NULL) { rate = ieee80211_setup_htrates(ni, htcap, IEEE80211_F_DOFMCS | IEEE80211_F_DONEGO | IEEE80211_F_DOBRS); @@ -2089,7 +2099,6 @@ ni->ni_rstamp = rstamp; ni->ni_intval = lintval; ni->ni_capinfo = capinfo; - ni->ni_chan = ic->ic_bsschan; ni->ni_fhdwell = vap->iv_bss->ni_fhdwell; ni->ni_fhindex = vap->iv_bss->ni_fhindex; /* ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#6 (text+ko) ==== @@ -859,7 +859,7 @@ * for the extension channel). */ ni->ni_chan = ieee80211_ht_adjust_channel(ni->ni_ic, - ni->ni_chan, vap->iv_flags_ext); + ni->ni_chan, ieee80211_htchanflags(ni->ni_chan)); ni->ni_htcap = 0; if (vap->iv_flags_ext & IEEE80211_FEXT_SHORTGI20) @@ -1762,9 +1762,9 @@ IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, "send HT txchwidth: width %d", - IEEE80211_IS_CHAN_HT40(ic->ic_bsschan) ? 40 : 20 + IEEE80211_IS_CHAN_HT40(ni->ni_chan) ? 40 : 20 ); - *frm++ = IEEE80211_IS_CHAN_HT40(ic->ic_bsschan) ? + *frm++ = IEEE80211_IS_CHAN_HT40(ni->ni_chan) ? IEEE80211_A_HT_TXCHWIDTH_2040 : IEEE80211_A_HT_TXCHWIDTH_20; break; @@ -1823,7 +1823,6 @@ frm += 2; \ } while (0) struct ieee80211vap *vap = ni->ni_vap; - struct ieee80211com *ic = ni->ni_ic; uint16_t caps; int rxmax, density; @@ -1848,7 +1847,7 @@ density = MS(ni->ni_htparam, IEEE80211_HTCAP_MPDUDENSITY); } else { /* override 20/40 use based on current channel */ - if (IEEE80211_IS_CHAN_HT40(ic->ic_bsschan)) + if (IEEE80211_IS_CHAN_HT40(ni->ni_chan)) caps |= IEEE80211_HTCAP_CHWIDTH40; else caps &= ~IEEE80211_HTCAP_CHWIDTH40; @@ -1942,20 +1941,21 @@ struct ieee80211_beacon_offsets *bo) { #define PROTMODE (IEEE80211_HTINFO_OPMODE|IEEE80211_HTINFO_NONHT_PRESENT) + const struct ieee80211_channel *bsschan = vap->iv_bss->ni_chan; struct ieee80211com *ic = vap->iv_ic; struct ieee80211_ie_htinfo *ht = (struct ieee80211_ie_htinfo *) bo->bo_htinfo; /* XXX only update on channel change */ - ht->hi_ctrlchannel = ieee80211_chan2ieee(ic, ic->ic_bsschan); + ht->hi_ctrlchannel = ieee80211_chan2ieee(ic, bsschan); ht->hi_byte1 = IEEE80211_HTINFO_RIFSMODE_PROH; - if (IEEE80211_IS_CHAN_HT40U(ic->ic_bsschan)) + if (IEEE80211_IS_CHAN_HT40U(bsschan)) ht->hi_byte1 |= IEEE80211_HTINFO_2NDCHAN_ABOVE; - else if (IEEE80211_IS_CHAN_HT40D(ic->ic_bsschan)) + else if (IEEE80211_IS_CHAN_HT40D(bsschan)) ht->hi_byte1 |= IEEE80211_HTINFO_2NDCHAN_BELOW; else ht->hi_byte1 |= IEEE80211_HTINFO_2NDCHAN_NONE; - if (IEEE80211_IS_CHAN_HT40(ic->ic_bsschan)) + if (IEEE80211_IS_CHAN_HT40(bsschan)) ht->hi_byte1 |= IEEE80211_HTINFO_TXWIDTH_2040; /* protection mode */ @@ -1981,16 +1981,16 @@ memset(frm, 0, sizeof(struct ieee80211_ie_htinfo) - 2); /* primary/control channel center */ - *frm++ = ieee80211_chan2ieee(ic, ic->ic_bsschan); + *frm++ = ieee80211_chan2ieee(ic, ni->ni_chan); frm[0] = IEEE80211_HTINFO_RIFSMODE_PROH; - if (IEEE80211_IS_CHAN_HT40U(ic->ic_bsschan)) + if (IEEE80211_IS_CHAN_HT40U(ni->ni_chan)) frm[0] |= IEEE80211_HTINFO_2NDCHAN_ABOVE; - else if (IEEE80211_IS_CHAN_HT40D(ic->ic_bsschan)) + else if (IEEE80211_IS_CHAN_HT40D(ni->ni_chan)) frm[0] |= IEEE80211_HTINFO_2NDCHAN_BELOW; else frm[0] |= IEEE80211_HTINFO_2NDCHAN_NONE; - if (IEEE80211_IS_CHAN_HT40(ic->ic_bsschan)) + if (IEEE80211_IS_CHAN_HT40(ni->ni_chan)) frm[0] |= IEEE80211_HTINFO_TXWIDTH_2040; frm[1] = ic->ic_curhtprotmode; ==== //depot/projects/vap/sys/net80211/ieee80211_ht.h#5 (text+ko) ==== @@ -99,6 +99,7 @@ void ieee80211_recv_bar(struct ieee80211_node *, struct mbuf *); void ieee80211_ht_node_init(struct ieee80211_node *, const uint8_t *); void ieee80211_ht_node_cleanup(struct ieee80211_node *); + struct ieee80211_channel *ieee80211_ht_adjust_channel(struct ieee80211com *, struct ieee80211_channel *, int); void ieee80211_ht_wds_init(struct ieee80211_node *); ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#23 (text+ko) ==== @@ -592,17 +592,11 @@ /* * vap's may have different operating channels when HT is * in use. When in RUN state report the vap-specific channel. - * Otherwise return curchan. Note that vap's that beacon use - * ic_bsschan while other vap's use ni_chan. This won't - * work for multiple ap's and must be fixed. + * Otherwise return curchan. */ - if (vap->iv_state == IEEE80211_S_RUN) { - if (vap->iv_opmode == IEEE80211_M_WDS || - vap->iv_opmode == IEEE80211_M_STA) - c = vap->iv_bss->ni_chan; - else - c = ic->ic_bsschan; - } else + if (vap->iv_state == IEEE80211_S_RUN) + c = vap->iv_bss->ni_chan; + else c = ic->ic_curchan; return copyout(c, ireq->i_data, sizeof(*c)); } @@ -1730,22 +1724,21 @@ if (IEEE80211_IS_CHAN_NOADHOC(c)) return EINVAL; } - if (vap->iv_state == IEEE80211_S_RUN && c == ic->ic_bsschan) + if (vap->iv_state == IEEE80211_S_RUN && + vap->iv_bss->ni_chan == c) return 0; /* NB: nothing to do */ } vap->iv_des_chan = c; error = 0; - if ((vap->iv_opmode == IEEE80211_M_MONITOR || - vap->iv_opmode == IEEE80211_M_WDS) && + if (vap->iv_opmode == IEEE80211_M_MONITOR && vap->iv_des_chan != IEEE80211_CHAN_ANYC) { /* - * Monitor and wds modes can switch directly. + * Monitor mode can switch directly. */ - ic->ic_curchan = vap->iv_des_chan; - /* XXX ieee80211_setcurchan? */ - if (vap->iv_state == IEEE80211_S_RUN) - ic->ic_set_channel(ic); + ieee80211_setcurchan(ic, vap->iv_des_chan); + vap->iv_bss->ni_chan = ic->ic_curchan; + /* XXX kick other vap's to follow */ } else { /* * Need to go through the state machine in case we @@ -2390,6 +2383,22 @@ } static int +isvap11g(const struct ieee80211vap *vap) +{ + const struct ieee80211_node *bss = vap->iv_bss; + return bss->ni_chan != IEEE80211_CHAN_ANYC && + IEEE80211_IS_CHAN_ANYG(bss->ni_chan); +} + +static int +isvapht(const struct ieee80211vap *vap) +{ + const struct ieee80211_node *bss = vap->iv_bss; + return bss->ni_chan != IEEE80211_CHAN_ANYC && + IEEE80211_IS_CHAN_HT(bss->ni_chan); +} + +static int ieee80211_ioctl_set80211(struct ieee80211vap *vap, u_long cmd, struct ieee80211req *ireq) { static const uint8_t zerobssid[IEEE80211_ADDR_LEN]; @@ -2754,8 +2763,7 @@ else vap->iv_flags &= ~IEEE80211_F_PUREG; /* NB: reset only if we're operating on an 11g channel */ - if (ic->ic_bsschan != IEEE80211_CHAN_ANYC && - IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan)) + if (isvap11g(vap)) error = ENETRESET; break; case IEEE80211_IOC_FF: @@ -2859,8 +2867,7 @@ else vap->iv_flags_ext &= ~IEEE80211_FEXT_AMPDU_RX; /* NB: reset only if we're operating on an 11n channel */ - if (ic->ic_bsschan != IEEE80211_CHAN_ANYC && - IEEE80211_IS_CHAN_HT(ic->ic_bsschan)) + if (isvapht(vap)) error = ERESTART; /* XXX ENETRESET? */ break; case IEEE80211_IOC_AMPDU_LIMIT: @@ -2892,8 +2899,7 @@ else vap->iv_flags_ext &= ~IEEE80211_FEXT_AMSDU_RX; /* NB: reset only if we're operating on an 11n channel */ - if (ic->ic_bsschan != IEEE80211_CHAN_ANYC && - IEEE80211_IS_CHAN_HT(ic->ic_bsschan)) + if (isvapht(vap)) error = ERESTART; /* XXX ENETRESET? */ break; case IEEE80211_IOC_AMSDU_LIMIT: @@ -2908,8 +2914,7 @@ } else vap->iv_flags_ext &= ~IEEE80211_FEXT_PUREN; /* NB: reset only if we're operating on an 11n channel */ - if (ic->ic_bsschan != IEEE80211_CHAN_ANYC && - IEEE80211_IS_CHAN_HT(ic->ic_bsschan)) + if (isvapht(vap)) error = ERESTART; /* XXX ENETRESET? */ break; case IEEE80211_IOC_DOTH: @@ -2941,8 +2946,7 @@ } else vap->iv_flags_ext &= ~IEEE80211_FEXT_HTCOMPAT; /* NB: reset only if we're operating on an 11n channel */ - if (ic->ic_bsschan != IEEE80211_CHAN_ANYC && - IEEE80211_IS_CHAN_HT(ic->ic_bsschan)) + if (isvapht(vap)) error = ERESTART; /* XXX ENETRESET? */ break; case IEEE80211_IOC_DWDS: @@ -3014,8 +3018,7 @@ ic->ic_htprotmode = ireq->i_val ? IEEE80211_PROT_RTSCTS : IEEE80211_PROT_NONE; /* NB: if not operating in 11n this can wait */ - if (ic->ic_bsschan != IEEE80211_CHAN_ANYC && - IEEE80211_IS_CHAN_HT(ic->ic_bsschan)) + if (isvapht(vap)) error = ERESTART; break; default: ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#22 (text+ko) ==== @@ -504,20 +504,8 @@ } /* - * Calculate HT channel promotion flags for a channel. - */ -static __inline int -htchanflags(const struct ieee80211_channel *c) -{ - return IEEE80211_IS_CHAN_HT40(c) ? - IEEE80211_FEXT_HT | IEEE80211_FEXT_USEHT40 : - IEEE80211_IS_CHAN_HT(c) ? IEEE80211_FEXT_HT : 0; -} - -/* * Calculate HT channel promotion flags for all vaps. - * This assumes ic_bsschan and ni_chan have been setup - * for each vap. + * This assumes ni_chan have been setup for each vap. */ static int gethtadjustflags(struct ieee80211com *ic) @@ -534,11 +522,9 @@ case IEEE80211_M_WDS: case IEEE80211_M_STA: case IEEE80211_M_AHDEMO: - flags |= htchanflags(vap->iv_bss->ni_chan); - break; case IEEE80211_M_HOSTAP: case IEEE80211_M_IBSS: - flags |= htchanflags(ic->ic_bsschan); + flags |= ieee80211_htchanflags(vap->iv_bss->ni_chan); break; default: break; @@ -577,13 +563,13 @@ /* * Check for channel promotion required to support the * set of running vap's. This assumes we are called - * after ic_bsschan and ni_chan are setup for each vap. + * after ni_chan is setup for each vap. */ /* NB: this assumes IEEE80211_FEXT_USEHT40 > IEEE80211_FEXT_HT */ - if (flags > htchanflags(c)) + if (flags > ieee80211_htchanflags(c)) c = ieee80211_ht_adjust_channel(ic, c, flags); } - ic->ic_curchan = c; + ic->ic_bsschan = ic->ic_curchan = c; ic->ic_curmode = ieee80211_chan2mode(ic->ic_curchan); ic->ic_set_channel(ic); } @@ -624,8 +610,6 @@ ieee80211_fix_rate(vap->iv_bss, &vap->iv_bss->ni_rates, IEEE80211_F_DODEL | IEEE80211_F_JOIN); - /* NB: ic_bsschan may not equal ic_curchan due to HT promotion */ - ic->ic_bsschan = selbs->ni_chan; ieee80211_setcurchan(ic, selbs->ni_chan); /* * Set the erp state (mostly the slot time) to deal with @@ -992,7 +976,7 @@ IEEE80211_ADDR_COPY(ni->ni_bssid, vap->iv_bss->ni_bssid); ieee80211_node_initref(ni); /* mark referenced */ /* NB: required by ieee80211_fix_rate */ - ieee80211_node_set_chan(ni, ic->ic_bsschan); + ieee80211_node_set_chan(ni, vap->iv_bss->ni_chan); ni->ni_txpower = vap->iv_bss->ni_txpower; ieee80211_crypto_resetkey(vap, &ni->ni_ucastkey, IEEE80211_KEYIX_NONE); @@ -1021,7 +1005,69 @@ ni->ni_txpower = vap->iv_bss->ni_txpower; ni->ni_vlan = vap->iv_bss->ni_vlan; /* XXX?? */ IEEE80211_ADDR_COPY(ni->ni_bssid, vap->iv_bss->ni_bssid); - ieee80211_node_set_chan(ni, ic->ic_bsschan); + ieee80211_node_set_chan(ni, vap->iv_bss->ni_chan); + } + return ni; +} + +/* + * Create a bss node for a legacy WDS vap. The far end does + * not associate so we just create create a new node and + * simulate an association. The caller is responsible for + * installing the node as the bss node and handling any further + * setup work like authorizing the port. + */ +struct ieee80211_node * +ieee80211_node_create_wds(struct ieee80211vap *vap, + const uint8_t bssid[IEEE80211_ADDR_LEN], struct ieee80211_channel *chan) +{ + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_node *ni; + + /* XXX check if node already in sta table? */ + ni = ieee80211_alloc_node(&ic->ic_sta, vap, bssid); + if (ni != NULL) { + ni->ni_wdsvap = vap; + IEEE80211_ADDR_COPY(ni->ni_bssid, bssid); + /* + * Inherit any manually configured settings. + */ + ni->ni_authmode = vap->iv_bss->ni_authmode; + ni->ni_txpower = vap->iv_bss->ni_txpower; + ni->ni_vlan = vap->iv_bss->ni_vlan; + ieee80211_node_set_chan(ni, chan); + /* NB: propagate ssid so available to WPA supplicant */ + ni->ni_esslen = vap->iv_des_ssid[0].len; + memcpy(ni->ni_essid, vap->iv_des_ssid[0].ssid, ni->ni_esslen); + /* NB: no associd for peer */ + /* + * There are no management frames to use to + * discover neighbor capabilities, so blindly + * propagate the local configuration. + */ + if (vap->iv_flags & IEEE80211_F_WME) + ni->ni_flags |= IEEE80211_NODE_QOS; + if (vap->iv_flags & IEEE80211_F_FF) + ni->ni_flags |= IEEE80211_NODE_FF; + if ((ic->ic_htcaps & IEEE80211_HTC_HT) && + (vap->iv_flags_ext & IEEE80211_FEXT_HT)) { + /* + * Device is HT-capable and HT is enabled for + * the vap; setup HT operation. On return + * ni_chan will be adjusted to an HT channel. + */ + ieee80211_ht_wds_init(ni); + } else { + struct ieee80211_channel *c = ni->ni_chan; + /* + * Force a legacy channel to be used. + */ + c = ieee80211_find_channel(ic, + c->ic_freq, c->ic_flags &~ IEEE80211_CHAN_HT); + KASSERT(c != NULL, ("no legacy channel, %u/%x", + ni->ni_chan->ic_freq, ni->ni_chan->ic_flags)); + ni->ni_chan = c; + } } return ni; } ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#15 (text+ko) ==== @@ -313,6 +313,9 @@ const uint8_t macaddr[IEEE80211_ADDR_LEN]); struct ieee80211_node *ieee80211_dup_bss(struct ieee80211vap *, const uint8_t macaddr[IEEE80211_ADDR_LEN]); +struct ieee80211_node *ieee80211_node_create_wds(struct ieee80211vap *, + const uint8_t bssid[IEEE80211_ADDR_LEN], + struct ieee80211_channel *); #ifdef IEEE80211_DEBUG_REFCNT void ieee80211_free_node_debug(struct ieee80211_node *, const char *func, int line); ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#25 (text+ko) ==== @@ -1492,14 +1492,15 @@ * Add an 11h Power Constraint element to a frame. */ static uint8_t * -ieee80211_add_powerconstraint(uint8_t *frm, struct ieee80211com *ic) +ieee80211_add_powerconstraint(uint8_t *frm, struct ieee80211vap *vap) { - int8_t limit = ic->ic_txpowlimit / 2; + const struct ieee80211_channel *c = vap->iv_bss->ni_chan; + /* XXX per-vap tx power limit? */ + int8_t limit = vap->iv_ic->ic_txpowlimit / 2; frm[0] = IEEE80211_ELEMID_PWRCNSTR; frm[1] = 1; - frm[2] = ic->ic_bsschan->ic_maxregpower > limit ? - ic->ic_bsschan->ic_maxregpower - limit : 0; + frm[2] = c->ic_maxregpower > limit ? c->ic_maxregpower - limit : 0; return frm + 3; } @@ -1507,12 +1508,12 @@ * Add an 11h Power Capability element to a frame. */ static uint8_t * -ieee80211_add_powercapability(uint8_t *frm, struct ieee80211com *ic) +ieee80211_add_powercapability(uint8_t *frm, const struct ieee80211_channel *c) { frm[0] = IEEE80211_ELEMID_PWRCAP; frm[1] = 2; - frm[2] = ic->ic_bsschan->ic_minpower; - frm[3] = ic->ic_bsschan->ic_maxpower; + frm[2] = c->ic_minpower; + frm[3] = c->ic_maxpower; return frm + 4; } @@ -1692,6 +1693,7 @@ #define senderr(_x, _v) do { ic->ic_stats._v++; ret = _x; goto bad; } while (0) struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; + struct ieee80211_node *bss = vap->iv_bss; const struct ieee80211_rateset *rs; struct mbuf *m; uint8_t *frm; @@ -1767,31 +1769,30 @@ memset(frm, 0, 8); /* timestamp should be filled later */ frm += 8; - *(uint16_t *)frm = htole16(vap->iv_bss->ni_intval); + *(uint16_t *)frm = htole16(bss->ni_intval); frm += 2; - capinfo = getcapinfo(vap, ic->ic_curchan); + capinfo = getcapinfo(vap, bss->ni_chan); *(uint16_t *)frm = htole16(capinfo); frm += 2; - frm = ieee80211_add_ssid(frm, vap->iv_bss->ni_essid, - vap->iv_bss->ni_esslen); - rs = ieee80211_get_suprates(ic, ic->ic_curchan); + frm = ieee80211_add_ssid(frm, bss->ni_essid, bss->ni_esslen); + rs = ieee80211_get_suprates(ic, bss->ni_chan); frm = ieee80211_add_rates(frm, rs); - if (IEEE80211_IS_CHAN_FHSS(ic->ic_curchan)) { + if (IEEE80211_IS_CHAN_FHSS(bss->ni_chan)) { *frm++ = IEEE80211_ELEMID_FHPARMS; *frm++ = 5; *frm++ = ni->ni_fhdwell & 0x00ff; *frm++ = (ni->ni_fhdwell >> 8) & 0x00ff; *frm++ = IEEE80211_FH_CHANSET( - ieee80211_chan2ieee(ic, ic->ic_curchan)); + ieee80211_chan2ieee(ic, bss->ni_chan)); *frm++ = IEEE80211_FH_CHANPAT( - ieee80211_chan2ieee(ic, ic->ic_curchan)); + ieee80211_chan2ieee(ic, bss->ni_chan)); *frm++ = ni->ni_fhindex; } else { *frm++ = IEEE80211_ELEMID_DSPARMS; *frm++ = 1; - *frm++ = ieee80211_chan2ieee(ic, ic->ic_curchan); + *frm++ = ieee80211_chan2ieee(ic, bss->ni_chan); } if (vap->iv_opmode == IEEE80211_M_IBSS) { @@ -1807,12 +1808,12 @@ /* XXX else complain? */ } if (vap->iv_flags & IEEE80211_F_DOTH) { - if (IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan)) - frm = ieee80211_add_powerconstraint(frm, ic); + if (IEEE80211_IS_CHAN_5GHZ(bss->ni_chan)) + frm = ieee80211_add_powerconstraint(frm, vap); if (ic->ic_flags & IEEE80211_F_CSAPENDING) frm = ieee80211_add_csa(frm, vap); } - if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan)) + if (IEEE80211_IS_CHAN_ANYG(bss->ni_chan)) frm = ieee80211_add_erp(frm, ic); frm = ieee80211_add_xrates(frm, rs); /* @@ -1821,10 +1822,10 @@ * a token in arg to us. Could expand this to be * any legacy client for stuff like HT ie's. */ - if (IEEE80211_IS_CHAN_HT(ic->ic_bsschan) && + if (IEEE80211_IS_CHAN_HT(bss->ni_chan) && arg != IEEE80211_SEND_LEGACY_11B) { - frm = ieee80211_add_htcap(frm, ni); - frm = ieee80211_add_htinfo(frm, ni); + frm = ieee80211_add_htcap(frm, bss); + frm = ieee80211_add_htinfo(frm, bss); } if (vap->iv_flags & IEEE80211_F_WPA1) { if (vap->iv_wpa_ie != NULL) @@ -1833,11 +1834,11 @@ } if (vap->iv_flags & IEEE80211_F_WME) frm = ieee80211_add_wme_param(frm, &ic->ic_wme); - if (IEEE80211_IS_CHAN_HT(ic->ic_bsschan) && + if (IEEE80211_IS_CHAN_HT(bss->ni_chan) && (vap->iv_flags_ext & IEEE80211_FEXT_HTCOMPAT) && arg != IEEE80211_SEND_LEGACY_11B) { - frm = ieee80211_add_htcap_vendor(frm, ni); - frm = ieee80211_add_htinfo_vendor(frm, ni); + frm = ieee80211_add_htcap_vendor(frm, bss); + frm = ieee80211_add_htinfo_vendor(frm, bss); } if (ni->ni_ies.ath_ie != NULL) frm = ieee80211_add_ath(frm, ni->ni_ath_flags, @@ -1864,7 +1865,7 @@ is_shared_key = has_challenge || arg >= IEEE80211_AUTH_SHARED_RESPONSE || (arg == IEEE80211_AUTH_SHARED_REQUEST && - vap->iv_bss->ni_authmode == IEEE80211_AUTH_SHARED); + bss->ni_authmode == IEEE80211_AUTH_SHARED); m = ieee80211_getmgtframe(&frm, ic->ic_headroom + sizeof(struct ieee80211_frame), @@ -1986,14 +1987,13 @@ *(uint16_t *)frm = htole16(capinfo); frm += 2; - KASSERT(vap->iv_bss->ni_intval != 0, - ("beacon interval is zero!")); + KASSERT(bss->ni_intval != 0, ("beacon interval is zero!")); *(uint16_t *)frm = htole16(howmany(ic->ic_lintval, - vap->iv_bss->ni_intval)); + bss->ni_intval)); frm += 2; if (type == IEEE80211_FC0_SUBTYPE_REASSOC_REQ) { - IEEE80211_ADDR_COPY(frm, vap->iv_bss->ni_bssid); + IEEE80211_ADDR_COPY(frm, bss->ni_bssid); frm += IEEE80211_ADDR_LEN; } @@ -2006,7 +2006,8 @@ } frm = ieee80211_add_xrates(frm, &ni->ni_rates); if (capinfo & IEEE80211_CAPINFO_SPECTRUM_MGMT) { - frm = ieee80211_add_powercapability(frm, ic); + frm = ieee80211_add_powercapability(frm, + ic->ic_curchan); frm = ieee80211_add_supportedchannels(frm, ic); } if ((vap->iv_flags_ext & IEEE80211_FEXT_HT) && @@ -2074,7 +2075,7 @@ if (m == NULL) senderr(ENOMEM, is_tx_nobuf); - capinfo = getcapinfo(vap, ic->ic_curchan); + capinfo = getcapinfo(vap, bss->ni_chan); *(uint16_t *)frm = htole16(capinfo); frm += 2; @@ -2222,7 +2223,7 @@ frm += 8; *(uint16_t *)frm = htole16(ni->ni_intval); frm += 2; - capinfo = getcapinfo(vap, ic->ic_bsschan); + capinfo = getcapinfo(vap, ni->ni_chan); bo->bo_caps = (uint16_t *)frm; *(uint16_t *)frm = htole16(capinfo); frm += 2; @@ -2234,10 +2235,10 @@ } else *frm++ = 0; frm = ieee80211_add_rates(frm, rs); - if (!IEEE80211_IS_CHAN_FHSS(ic->ic_bsschan)) { + if (!IEEE80211_IS_CHAN_FHSS(ni->ni_chan)) { *frm++ = IEEE80211_ELEMID_DSPARMS; *frm++ = 1; - *frm++ = ieee80211_chan2ieee(ic, ic->ic_bsschan); + *frm++ = ieee80211_chan2ieee(ic, ni->ni_chan); } if (ic->ic_flags & IEEE80211_F_PCF) { bo->bo_cfp = frm; @@ -2270,19 +2271,19 @@ /* XXX else complain */ } if (vap->iv_flags & IEEE80211_F_DOTH) { - if (IEEE80211_IS_CHAN_5GHZ(ic->ic_bsschan)) - frm = ieee80211_add_powerconstraint(frm, ic); + if (IEEE80211_IS_CHAN_5GHZ(ni->ni_chan)) + frm = ieee80211_add_powerconstraint(frm, vap); bo->bo_csa = frm; if (ic->ic_flags & IEEE80211_F_CSAPENDING) frm = ieee80211_add_csa(frm, vap); } else bo->bo_csa = frm; - if (IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan)) { + if (IEEE80211_IS_CHAN_ANYG(ni->ni_chan)) { bo->bo_erp = frm; frm = ieee80211_add_erp(frm, ic); } frm = ieee80211_add_xrates(frm, rs); - if (IEEE80211_IS_CHAN_HT(ic->ic_bsschan)) { + if (IEEE80211_IS_CHAN_HT(ni->ni_chan)) { frm = ieee80211_add_htcap(frm, ni); bo->bo_htinfo = frm; frm = ieee80211_add_htinfo(frm, ni); @@ -2296,7 +2297,7 @@ bo->bo_wme = frm; frm = ieee80211_add_wme_param(frm, &ic->ic_wme); } - if (IEEE80211_IS_CHAN_HT(ic->ic_bsschan) && + if (IEEE80211_IS_CHAN_HT(ni->ni_chan) && (vap->iv_flags_ext & IEEE80211_FEXT_HTCOMPAT)) { frm = ieee80211_add_htcap_vendor(frm, ni); frm = ieee80211_add_htinfo_vendor(frm, ni); @@ -2425,7 +2426,7 @@ vap->iv_csa_count = 0; /* * Effect channel change before reconstructing the beacon - * frame contents as many places reference ic_bsschan. + * frame contents as many places reference ni_chan. */ if (ic->ic_csa_newchan != NULL) ieee80211_csa_completeswitch(ic); @@ -2443,7 +2444,7 @@ } /* XXX faster to recalculate entirely or just changes? */ - capinfo = getcapinfo(vap, ic->ic_bsschan); + capinfo = getcapinfo(vap, ni->ni_chan); *bo->bo_caps = htole16(capinfo); if (vap->iv_flags & IEEE80211_F_WME) { ==== //depot/projects/vap/sys/net80211/ieee80211_proto.c#19 (text+ko) ==== @@ -1356,7 +1356,6 @@ KASSERT(ic->ic_flags & IEEE80211_F_CSAPENDING, ("csa not pending")); - ic->ic_bsschan = ic->ic_csa_newchan; ieee80211_setcurchan(ic, ic->ic_csa_newchan); ic->ic_csa_newchan = NULL; ic->ic_flags &= ~IEEE80211_F_CSAPENDING; ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#24 (text+ko) ==== @@ -607,6 +607,18 @@ } /* + * Calculate HT channel promotion flags for a channel. + * XXX belongs in ieee80211_ht.h but needs IEEE80211_FEXT_* + */ +static __inline int +ieee80211_htchanflags(const struct ieee80211_channel *c) +{ + return IEEE80211_IS_CHAN_HT40(c) ? + IEEE80211_FEXT_HT | IEEE80211_FEXT_USEHT40 : + IEEE80211_IS_CHAN_HT(c) ? IEEE80211_FEXT_HT : 0; +} + +/* * Debugging facilities compiled in when IEEE80211_DEBUG is defined. * * The intent is that any problem in the net80211 layer can be ==== //depot/projects/vap/sys/net80211/ieee80211_wds.c#4 (text+ko) ==== @@ -171,50 +171,13 @@ * authorize the port for traffic to flow. * XXX check if node already in sta table? */ - ni = ieee80211_dup_bss(vap, vap->iv_des_bssid); + ni = ieee80211_node_create_wds(vap, vap->iv_des_bssid, chan); if (ni != NULL) { - ni->ni_wdsvap = vap; - /* NB: ieee80211_dup_bss installs the vap's bssid */ - IEEE80211_ADDR_COPY(ni->ni_bssid, vap->iv_des_bssid); - /* NB: propagate ssid so available to WPA supplicant */ - ni->ni_esslen = vap->iv_des_ssid[0].len; - memcpy(ni->ni_essid, vap->iv_des_ssid[0].ssid, - ni->ni_esslen); - /* NB: no associd for peer */ - obss = vap->iv_bss; vap->iv_bss = ieee80211_ref_node(ni); ni->ni_flags |= IEEE80211_NODE_AREF; if (obss != NULL) ieee80211_free_node(obss); - /* - * There are no management frames to use to - * discover neighbor capabilities, so blindly - * propagate the local configuration. - */ - if (vap->iv_flags & IEEE80211_F_WME) - ni->ni_flags |= IEEE80211_NODE_QOS; - if (vap->iv_flags & IEEE80211_F_FF) - ni->ni_flags |= IEEE80211_NODE_FF; - if ((ic->ic_htcaps & IEEE80211_HTC_HT) && - (vap->iv_flags_ext & IEEE80211_FEXT_HT)) { - /* - * Device is HT-capable and HT is enabled for - * the vap; setup HT operation. On return - * ni_chan will be adjusted to an HT channel. - */ - ieee80211_ht_wds_init(ni); - } else { - struct ieee80211_channel *c = ni->ni_chan; - /* - * Force a legacy channel to be used. - */ - c = ieee80211_find_channel(ic, - c->ic_freq, c->ic_flags &~ IEEE80211_CHAN_HT); - KASSERT(c != NULL, ("no legacy channel, %u/%x", - ni->ni_chan->ic_freq, ni->ni_chan->ic_flags)); - ni->ni_chan = c; - } /* give driver a chance to setup state like ni_txrate */ if (ic->ic_newassoc != NULL) ic->ic_newassoc(ni, 1); From owner-p4-projects@FreeBSD.ORG Sun Jan 27 20:30:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83E7116A469; Sun, 27 Jan 2008 20:30:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47E5816A421 for ; Sun, 27 Jan 2008 20:30:00 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 38F3B13C47E for ; Sun, 27 Jan 2008 20:30:00 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RKU0tR038087 for ; Sun, 27 Jan 2008 20:30:00 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RKU049038084 for perforce@freebsd.org; Sun, 27 Jan 2008 20:30:00 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 20:30:00 GMT Message-Id: <200801272030.m0RKU049038084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134235 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 20:30:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=134235 Change 134235 by sam@sam_ebb on 2008/01/27 20:29:58 fix handling of DWDS vaps when remote ap goes away (e.g. on channel change); we usually cannot re-create the vap state because the peer ap is not present; reflect this through the error code returned by wds_newstate, drivers must check the return status and do the right thing Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_wds.c#5 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_wds.c#5 (text+ko) ==== @@ -95,7 +95,7 @@ vap->iv_opdetach = wds_vdetach; } -static void +static int ieee80211_create_wds(struct ieee80211vap *vap, struct ieee80211_channel *chan) { struct ieee80211com *ic = vap->iv_ic; @@ -214,6 +214,7 @@ ieee80211_input(ni, m, rssi, noise, ni->ni_rstamp); } } + return (ni == NULL ? ENOENT : 0); } /* @@ -390,6 +391,7 @@ struct ieee80211com *ic = vap->iv_ic; struct ieee80211_node *ni; enum ieee80211_state ostate; + int error; IEEE80211_LOCK_ASSERT(ic); @@ -403,6 +405,7 @@ ni = vap->iv_bss; /* NB: no reference held */ if (vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS) callout_stop(&vap->iv_swbmiss); + error = 0; switch (nstate) { case IEEE80211_S_INIT: switch (ostate) { @@ -432,13 +435,13 @@ * Already have a channel; bypass the scan * and startup immediately. */ - ieee80211_create_wds(vap, ic->ic_curchan); + error = ieee80211_create_wds(vap, ic->ic_curchan); } break; default: break; } - return 0; + return error; } /* From owner-p4-projects@FreeBSD.ORG Sun Jan 27 20:35:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B23416A420; Sun, 27 Jan 2008 20:35:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BCA9416A41A for ; Sun, 27 Jan 2008 20:35:05 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ADB6713C447 for ; Sun, 27 Jan 2008 20:35:05 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RKZ5T1038408 for ; Sun, 27 Jan 2008 20:35:05 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RKZ5iA038405 for perforce@freebsd.org; Sun, 27 Jan 2008 20:35:05 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 20:35:05 GMT Message-Id: <200801272035.m0RKZ5iA038405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 20:35:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=134237 Change 134237 by sam@sam_ebb on 2008/01/27 20:34:54 change get IEEE80211_IOC_AMPDU_DENSITY and IEEE80211_IOC_AMPDU_LIMIT to return the negotiated value when in RUN state so ifconfig displays the current setting for sta vaps MFP4 after: 1 week Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#24 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#24 (text+ko) ==== @@ -718,6 +718,7 @@ ieee80211_ioctl_get80211(struct ieee80211vap *vap, u_long cmd, struct ieee80211req *ireq) { +#define MS(_v, _f) (((_v) & _f) >> _f##_S) struct ieee80211com *ic = vap->iv_ic; u_int kid, len; uint8_t tmpkey[IEEE80211_KEYBUF_SIZE]; @@ -953,11 +954,18 @@ case IEEE80211_IOC_AMPDU_LIMIT: if (vap->iv_opmode == IEEE80211_M_HOSTAP) ireq->i_val = vap->iv_ampdu_rxmax; + else if (vap->iv_state == IEEE80211_S_RUN) + ireq->i_val = MS(vap->iv_bss->ni_htparam, + IEEE80211_HTCAP_MAXRXAMPDU); else ireq->i_val = vap->iv_ampdu_limit; break; case IEEE80211_IOC_AMPDU_DENSITY: - ireq->i_val = vap->iv_ampdu_density; + if (vap->iv_state == IEEE80211_S_RUN) + ireq->i_val = MS(vap->iv_bss->ni_htparam, + IEEE80211_HTCAP_MPDUDENSITY); + else + ireq->i_val = vap->iv_ampdu_density; break; case IEEE80211_IOC_AMSDU: ireq->i_val = 0; @@ -1027,6 +1035,7 @@ break; } return error; +#undef MS } static int From owner-p4-projects@FreeBSD.ORG Sun Jan 27 20:39:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F4DB16A421; Sun, 27 Jan 2008 20:39:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C7C316A41B for ; Sun, 27 Jan 2008 20:39:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1215213C465 for ; Sun, 27 Jan 2008 20:39:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RKd93f038595 for ; Sun, 27 Jan 2008 20:39:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RKd9NT038592 for perforce@freebsd.org; Sun, 27 Jan 2008 20:39:09 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 20:39:09 GMT Message-Id: <200801272039.m0RKd9NT038592@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134238 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 20:39:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=134238 Change 134238 by sam@sam_ebb on 2008/01/27 20:38:25 Reclaim old bss directly when re-joining a bss (or similar); the old bss node has refcnt 2 (1 for the sta table and 1 for the old ref in ivs_bss) but we were only free'ing the iv_bss reference. We need to explicitly purge the sta table reference; do this with a new ieee80211_node_reclaim routine. Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_node.c#23 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#23 (text+ko) ==== @@ -82,6 +82,7 @@ int inact, int keymaxix); static void ieee80211_node_table_reset(struct ieee80211_node_table *, struct ieee80211vap *); +static void ieee80211_node_reclaim(struct ieee80211_node *); static void ieee80211_node_table_cleanup(struct ieee80211_node_table *nt); static void ieee80211_erp_timeout(struct ieee80211com *); @@ -600,7 +601,8 @@ vap->iv_bss = selbs; /* NB: caller assumed to bump refcnt */ if (obss != NULL) { copy_bss(selbs, obss); - ieee80211_free_node(obss); + ieee80211_node_reclaim(obss); + obss = NULL; /* NB: guard against later use */ } /* @@ -1544,6 +1546,65 @@ } /* + * Reclaim a (bss) node. Decrement the refcnt and reclaim + * the node if the only other reference to it is in the sta + * table. This is effectively ieee80211_free_node followed + * by node_reclaim when the refcnt is 1 (after the free). + */ +static void +ieee80211_node_reclaim(struct ieee80211_node *ni) +{ + struct ieee80211_node_table *nt = ni->ni_table; + + KASSERT(nt != NULL, ("reclaim node not in table")); + +#ifdef IEEE80211_DEBUG_REFCNT + IEEE80211_DPRINTF(ni->ni_vap, IEEE80211_MSG_NODE, + "%s (%s:%u) %p<%s> refcnt %d\n", __func__, func, line, ni, + ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)-1); +#endif + IEEE80211_NODE_LOCK(nt); + if (ieee80211_node_dectestref(ni)) { + /* + * Last reference, reclaim state. + */ + _ieee80211_free_node(ni); + nt = NULL; + } else if (ieee80211_node_refcnt(ni) == 1 && + nt->nt_keyixmap != NULL) { + ieee80211_keyix keyix; + /* + * Check for a last reference in the key mapping table. + */ + keyix = ni->ni_ucastkey.wk_rxkeyix; + if (keyix < nt->nt_keyixmax && + nt->nt_keyixmap[keyix] == ni) { + IEEE80211_DPRINTF(ni->ni_vap, + IEEE80211_MSG_NODE, + "%s: %p<%s> clear key map entry", __func__, + ni, ether_sprintf(ni->ni_macaddr)); + nt->nt_keyixmap[keyix] = NULL; + ieee80211_node_decref(ni); /* XXX needed? */ + _ieee80211_free_node(ni); + nt = NULL; + } + } + if (nt != NULL && ieee80211_node_refcnt(ni) == 1) { + /* + * Last reference is in the sta table; complete + * the reclaim. This handles bss nodes being + * recycled: the node has two references, one for + * iv_bss and one for the table. After dropping + * the iv_bss ref above we need to reclaim the sta + * table reference. + */ + ieee80211_node_decref(ni); /* NB: be pendantic */ + _ieee80211_free_node(ni); + } + IEEE80211_NODE_UNLOCK(nt); +} + +/* * Node table support. */ From owner-p4-projects@FreeBSD.ORG Sun Jan 27 21:00:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 465D916A47C; Sun, 27 Jan 2008 21:00:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01C7E16A46E for ; Sun, 27 Jan 2008 21:00:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D87A213C4E3 for ; Sun, 27 Jan 2008 21:00:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RL0fSb049660 for ; Sun, 27 Jan 2008 21:00:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RL0fCR049657 for perforce@freebsd.org; Sun, 27 Jan 2008 21:00:41 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 21:00:41 GMT Message-Id: <200801272100.m0RL0fCR049657@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134240 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 21:00:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=134240 Change 134240 by sam@sam_ebb on 2008/01/27 21:00:39 Add ieee80211_find_vap_node to lookup a station by (address+vap) and use it anywhere that a sta vap might be involved. This is needed to support multiple sta vaps associated to the same ap. While here use the new function to replace equivalent inline code. Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#9 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#25 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.c#24 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#16 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#9 (text+ko) ==== @@ -332,11 +332,10 @@ * sending it will not work; just let it be delivered * normally. */ - struct ieee80211_node *sta = ieee80211_find_node( - &vap->iv_ic->ic_sta, eh->ether_dhost); + struct ieee80211_node *sta = ieee80211_find_vap_node( + &vap->iv_ic->ic_sta, vap, eh->ether_dhost); if (sta != NULL) { - if (sta->ni_vap == vap && - ieee80211_node_is_authorized(sta)) { + if (ieee80211_node_is_authorized(sta)) { /* * Beware of sending to ourself; this * needs to happen via the normal ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#25 (text+ko) ==== @@ -88,7 +88,7 @@ return error; kid = ik.ik_keyix; if (kid == IEEE80211_KEYIX_NONE) { - ni = ieee80211_find_node(&ic->ic_sta, ik.ik_macaddr); + ni = ieee80211_find_vap_node(&ic->ic_sta, vap, ik.ik_macaddr); if (ni == NULL) return ENOENT; wk = &ni->ni_ucastkey; @@ -163,7 +163,7 @@ error = copyin(ireq->i_data, wpaie.wpa_macaddr, IEEE80211_ADDR_LEN); if (error != 0) return error; - ni = ieee80211_find_node(&vap->iv_ic->ic_sta, wpaie.wpa_macaddr); + ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap, wpaie.wpa_macaddr); if (ni == NULL) return ENOENT; memset(wpaie.wpa_ie, 0, sizeof(wpaie.wpa_ie)); @@ -212,7 +212,7 @@ error = copyin(ireq->i_data, macaddr, IEEE80211_ADDR_LEN); if (error != 0) return error; - ni = ieee80211_find_node(&vap->iv_ic->ic_sta, macaddr); + ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap, macaddr); if (ni == NULL) return ENOENT; if (ireq->i_len > sizeof(struct ieee80211req_sta_stats)) @@ -487,7 +487,7 @@ if (IEEE80211_ADDR_EQ(macaddr, vap->iv_ifp->if_broadcastaddr)) { ni = NULL; } else { - ni = ieee80211_find_node(&vap->iv_ic->ic_sta, macaddr); + ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap, macaddr); if (ni == NULL) return ENOENT; } @@ -506,7 +506,7 @@ error = copyin(ireq->i_data, &txpow, sizeof(txpow)); if (error != 0) return error; - ni = ieee80211_find_node(&vap->iv_ic->ic_sta, txpow.it_macaddr); + ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap, txpow.it_macaddr); if (ni == NULL) return ENOENT; txpow.it_txpow = ni->ni_txpower; @@ -1068,7 +1068,7 @@ return EADDRNOTAVAIL; } } else { - ni = ieee80211_find_node(&vap->iv_ic->ic_sta, + ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap, ik.ik_macaddr); if (ni == NULL) return ENOENT; @@ -1134,7 +1134,7 @@ return EADDRNOTAVAIL; } } else { - ni = ieee80211_find_node(&vap->iv_ic->ic_sta, + ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap, dk.idk_macaddr); if (ni == NULL) return ENOENT; @@ -1254,7 +1254,7 @@ break; } IEEE80211_NODE_LOCK(&ic->ic_sta); - ni = ieee80211_find_node(&ic->ic_sta, mac); + ni = ieee80211_find_vap_node(&ic->ic_sta, vap, mac); if (ni != NULL) { IEEE80211_NOTE(vap, IEEE80211_MSG_IOCTL | IEEE80211_MSG_AUTH, @@ -1275,7 +1275,7 @@ break; } IEEE80211_NODE_LOCK(&ic->ic_sta); - ni = ieee80211_find_node(&ic->ic_sta, mac); + ni = ieee80211_find_vap_node(&ic->ic_sta, vap, mac); if (ni != NULL) { if (reason == IEEE80211_STATUS_SUCCESS) { IEEE80211_SEND_MGMT(ni, @@ -1506,7 +1506,7 @@ error = copyin(ireq->i_data, macaddr, IEEE80211_ADDR_LEN); if (error != 0) return error; - ni = ieee80211_find_node(&vap->iv_ic->ic_sta, macaddr); + ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap, macaddr); if (ni == NULL) return ENOENT; /* XXX require ni_vap == vap? */ @@ -1527,7 +1527,7 @@ error = copyin(ireq->i_data, &txpow, sizeof(txpow)); if (error != 0) return error; - ni = ieee80211_find_node(&vap->iv_ic->ic_sta, txpow.it_macaddr); + ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap, txpow.it_macaddr); if (ni == NULL) return ENOENT; ni->ni_txpower = txpow.it_txpow; ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#24 (text+ko) ==== @@ -200,6 +200,7 @@ /* * Set/change the channel. The rate set is also updated as * to insure a consistent view by drivers. + * XXX should be private but hostap needs it to deal with CSA */ void ieee80211_node_set_chan(struct ieee80211_node *ni, @@ -1122,6 +1123,59 @@ return ni; } +struct ieee80211_node * +#ifdef IEEE80211_DEBUG_REFCNT +ieee80211_find_vap_node_locked_debug(struct ieee80211_node_table *nt, + const struct ieee80211vap *vap, + const uint8_t macaddr[IEEE80211_ADDR_LEN], const char *func, int line) +#else +ieee80211_find_vap_node_locked(struct ieee80211_node_table *nt, + const struct ieee80211vap *vap, + const uint8_t macaddr[IEEE80211_ADDR_LEN]) +#endif +{ + struct ieee80211_node *ni; + int hash; + + IEEE80211_NODE_LOCK_ASSERT(nt); + + hash = IEEE80211_NODE_HASH(macaddr); + LIST_FOREACH(ni, &nt->nt_hash[hash], ni_hash) { + if (ni->ni_vap == vap && + IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr)) { + ieee80211_ref_node(ni); /* mark referenced */ +#ifdef IEEE80211_DEBUG_REFCNT + IEEE80211_DPRINTF(ni->ni_vap, IEEE80211_MSG_NODE, + "%s (%s:%u) %p<%s> refcnt %d\n", __func__, + func, line, + ni, ether_sprintf(ni->ni_macaddr), + ieee80211_node_refcnt(ni)); +#endif + return ni; + } + } + return NULL; +} + +struct ieee80211_node * +#ifdef IEEE80211_DEBUG_REFCNT +ieee80211_find_vap_node_debug(struct ieee80211_node_table *nt, + const struct ieee80211vap *vap, + const uint8_t macaddr[IEEE80211_ADDR_LEN], const char *func, int line) +#else +ieee80211_find_vap_node(struct ieee80211_node_table *nt, + const struct ieee80211vap *vap, + const uint8_t macaddr[IEEE80211_ADDR_LEN]) +#endif +{ + struct ieee80211_node *ni; + + IEEE80211_NODE_LOCK(nt); + ni = ieee80211_find_vap_node_locked(nt, vap, macaddr); + IEEE80211_NODE_UNLOCK(nt); + return ni; +} + /* * Fake up a node; this handles node discovery in adhoc mode. * Note that for the driver's benefit we we treat this like ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#16 (text+ko) ==== @@ -326,6 +326,16 @@ struct ieee80211_node *ieee80211_find_node_debug(struct ieee80211_node_table *, const uint8_t macaddr[IEEE80211_ADDR_LEN], const char *func, int line); +struct ieee80211_node *ieee80211_find_vap_node_locked_debug( + struct ieee80211_node_table *, + const struct ieee80211vap *vap, + const uint8_t macaddr[IEEE80211_ADDR_LEN], + const char *func, int line); +struct ieee80211_node *ieee80211_find_vap_node_debug( + struct ieee80211_node_table *, + const struct ieee80211vap *vap, + const uint8_t macaddr[IEEE80211_ADDR_LEN], + const char *func, int line); struct ieee80211_node * ieee80211_find_rxnode_debug(struct ieee80211com *, const struct ieee80211_frame_min *, const char *func, int line); @@ -342,6 +352,10 @@ ieee80211_find_node_locked_debug(nt, mac, __func__, __LINE__) #define ieee80211_find_node(nt, mac) \ ieee80211_find_node_debug(nt, mac, __func__, __LINE__) +#define ieee80211_find_vap_node_locked(nt, vap, mac) \ + ieee80211_find_vap_node_locked_debug(nt, vap, mac, __func__, __LINE__) +#define ieee80211_find_vap_node(nt, vap, mac) \ + ieee80211_find_vap_node_debug(nt, vap, mac, __func__, __LINE__) #define ieee80211_find_rxnode(ic, wh) \ ieee80211_find_rxnode_debug(ic, wh, __func__, __LINE__) #define ieee80211_find_rxnode_withkey(ic, wh, keyix) \ @@ -354,6 +368,12 @@ const uint8_t macaddr[IEEE80211_ADDR_LEN]); struct ieee80211_node *ieee80211_find_node(struct ieee80211_node_table *, const uint8_t macaddr[IEEE80211_ADDR_LEN]); +struct ieee80211_node *ieee80211_find_vap_node_locked( + struct ieee80211_node_table *, const struct ieee80211vap *, + const uint8_t macaddr[IEEE80211_ADDR_LEN]); +struct ieee80211_node *ieee80211_find_vap_node( + struct ieee80211_node_table *, const struct ieee80211vap *, + const uint8_t macaddr[IEEE80211_ADDR_LEN]); struct ieee80211_node * ieee80211_find_rxnode(struct ieee80211com *, const struct ieee80211_frame_min *); struct ieee80211_node * ieee80211_find_rxnode_withkey(struct ieee80211com *, From owner-p4-projects@FreeBSD.ORG Sun Jan 27 21:03:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7184716A41B; Sun, 27 Jan 2008 21:03:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36EB216A418 for ; Sun, 27 Jan 2008 21:03:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 25C7813C459 for ; Sun, 27 Jan 2008 21:03:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RL3j3V050899 for ; Sun, 27 Jan 2008 21:03:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RL3iOF050896 for perforce@freebsd.org; Sun, 27 Jan 2008 21:03:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 27 Jan 2008 21:03:44 GMT Message-Id: <200801272103.m0RL3iOF050896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134241 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 21:03:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=134241 Change 134241 by rwatson@rwatson_freebsd_capabilities on 2008/01/27 21:02:52 Use vn_fullpath(9) to generate p_comm when we first extract the vnode in fexecve(), rather than while the process lock is being held later. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#7 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#7 (text+ko) ==== @@ -319,6 +319,7 @@ int credential_changing; int vfslocked; int textset; + char pcomm[MAXCOMLEN + 1]; #ifdef MAC struct label *interplabel = NULL; int will_transition; @@ -404,6 +405,9 @@ binvp = ndp->ni_vp; imgp->vp = binvp; } else { + char *freepath = NULL; + char *fullpath = NULL; + /* XXXRW: Possibly should just be CAP_FEXECVE? */ error = fgetvp_read(td, args->fd, CAP_READ | CAP_FEXECVE, &binvp); @@ -412,6 +416,16 @@ vfslocked = VFS_LOCK_GIANT(binvp->v_mount); vn_lock(binvp, LK_EXCLUSIVE | LK_RETRY); imgp->vp = binvp; + + error = vn_fullpath(td, binvp, &fullpath, &freepath); + if (error == 0) { + strlcpy(pcomm, fullpath, sizeof(pcomm)); + if (freepath) + free(freepath, M_TEMP); + } else { + strlcpy(pcomm, "fexecve process", sizeof(pcomm)); + error = 0; + } } /* @@ -572,24 +586,11 @@ /* name this process - nameiexec(p, ndp) */ if (args->fname) { - len = min(ndp->ni_cnd.cn_namelen,MAXCOMLEN); + len = min(ndp->ni_cnd.cn_namelen, MAXCOMLEN); bcopy(ndp->ni_cnd.cn_nameptr, p->p_comm, len); } else { - char *freepath; - char *fullpath = NULL; - - error = vn_fullpath(td, binvp, &fullpath, &freepath); - if (error == 0) { - len = min(strlen(fullpath), MAXCOMLEN); - bcopy(fullpath, p->p_comm, len); - if (freepath) - free(freepath, M_TEMP); - } else { - static const char proc_title[] = "fexecved process"; - len = sizeof(proc_title); - bcopy(proc_title, p->p_comm, len); - } - error = 0; + len = strlen(pcomm); + bcopy(pcomm, p->p_comm, len); } p->p_comm[len] = 0; bcopy(p->p_comm, td->td_name, sizeof(td->td_name)); From owner-p4-projects@FreeBSD.ORG Sun Jan 27 21:16:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B040D16A419; Sun, 27 Jan 2008 21:16:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75EE316A420 for ; Sun, 27 Jan 2008 21:16:59 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4F74C13C457 for ; Sun, 27 Jan 2008 21:16:59 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RLGxv0052260 for ; Sun, 27 Jan 2008 21:16:59 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RLGxMj052257 for perforce@freebsd.org; Sun, 27 Jan 2008 21:16:59 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 21:16:59 GMT Message-Id: <200801272116.m0RLGxMj052257@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134242 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 21:17:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=134242 Change 134242 by sam@sam_ebb on 2008/01/27 21:16:02 bring in phy code Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_phy.c#1 branch .. //depot/projects/vap/sys/net80211/ieee80211_phy.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 27 21:29:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75F7816A46C; Sun, 27 Jan 2008 21:29:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2397516A468 for ; Sun, 27 Jan 2008 21:29:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 14F8613C45D for ; Sun, 27 Jan 2008 21:29:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RLTBEk052689 for ; Sun, 27 Jan 2008 21:29:11 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RLTBrw052686 for perforce@freebsd.org; Sun, 27 Jan 2008 21:29:11 GMT (envelope-from imp@freebsd.org) Date: Sun, 27 Jan 2008 21:29:11 GMT Message-Id: <200801272129.m0RLTBrw052686@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 21:29:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=134243 Change 134243 by imp@imp_paco-paco on 2008/01/27 21:29:02 Eliminate mips_cpu_switch. No need for the indirection here. It almost guarnatees a cache miss and requires more pages in the critical path. This makes the call to cpu_switch direct. We still don't use the lock passed in... Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pm_machdep.c#5 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/swtch.S#9 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#8 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/pm_machdep.c#5 (text+ko) ==== @@ -478,8 +478,12 @@ td->td_frame->sp = ((register_t) stack) & ~(sizeof(__int64_t) - 1); td->td_frame->pc = entry & ~3; td->td_frame->t9 = entry & ~3; /* abicall req */ - td->td_frame->sr = SR_KSU_USER | SR_EXL | SR_INT_ENAB; - td->td_frame->sr |= idle_mask & ALL_INT_MASK; +#if 0 +// td->td_frame->sr = SR_KSU_USER | SR_EXL | SR_INT_ENAB; +//? td->td_frame->sr |= idle_mask & ALL_INT_MASK; +#else + td->td_frame->sr = SR_KSU_USER | SR_EXL;// mips2 also did COP_0_BIT +#endif /* * FREEBSD_DEVELOPERS_FIXME: * Setup any other CPU-Specific registers (Not MIPS Standard) @@ -531,10 +535,3 @@ td->td_md.md_ss_addr = 0; return 0; } - -void -cpu_switch(struct thread *old, struct thread *new, struct mtx * new_lock) -{ - - func_3args_asmmacro(&mips_cpu_switch, old, new, new_lock); -} ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/swtch.S#9 (text+ko) ==== @@ -274,10 +274,10 @@ /* *XXX Fixme: should be written to new interface that requires lock * storage. We fake it for now. - * mips_cpu_switch(struct thread *old, struct thread *new); + * cpu_switch(struct thread *old, struct thread *new); * Find the highest priority process and resume it. */ -NON_LEAF(mips_cpu_switch, STAND_FRAME_SIZE, ra) +NON_LEAF(cpu_switch, STAND_FRAME_SIZE, ra) mfc0 t0, COP_0_STATUS_REG # t0 = saved status register nop nop @@ -405,7 +405,7 @@ j ra nop -END(mips_cpu_switch) +END(cpu_switch) KSEG0TEXT_END; /*---------------------------------------------------------------------------- ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#8 (text+ko) ==== @@ -1339,8 +1339,8 @@ subr = (unsigned) MipsKernTLBInvalidException; else if (pcBetween(MipsUserTLBInvalidException, MipsTLBMissException)) subr = (unsigned) MipsUserTLBInvalidException; - else if (pcBetween(mips_cpu_switch, MipsSwitchFPState)) - subr = (unsigned) mips_cpu_switch; + else if (pcBetween(cpu_switch, MipsSwitchFPState)) + subr = (unsigned) cpu_switch; else if (pcBetween(_locore, _locoreEnd)) { subr = (unsigned) _locore; ra = 0; @@ -1528,7 +1528,7 @@ Name(MipsUserGenException), Name(MipsKernIntr), Name(MipsUserIntr), - Name(mips_cpu_switch), + Name(cpu_switch), {0, 0} }; From owner-p4-projects@FreeBSD.ORG Sun Jan 27 21:45:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E09B016A468; Sun, 27 Jan 2008 21:45:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CB9016A41B for ; Sun, 27 Jan 2008 21:45:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D0B613C468 for ; Sun, 27 Jan 2008 21:45:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RLjTvZ053793 for ; Sun, 27 Jan 2008 21:45:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RLjSqd053790 for perforce@freebsd.org; Sun, 27 Jan 2008 21:45:28 GMT (envelope-from jb@freebsd.org) Date: Sun, 27 Jan 2008 21:45:28 GMT Message-Id: <200801272145.m0RLjSqd053790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 21:45:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=134244 Change 134244 by jb@jb_freebsd1 on 2008/01/27 21:45:22 It seems I need an sx lock to be able to check if it locked. It's an internal lock here, so the lock consistency is determined by the code in this file only. Specify SX_NOWITNESS to avoid the bogis LOR reports that WITNESS outputs when internal locks like this are obtained when there are various other locks already obtained. This lock has no bearing on the order that other locks are obtained. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_sdt.c#8 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_sdt.c#8 (text+ko) ==== @@ -39,8 +39,8 @@ #include #include #include -#include #include +#include #include /* @@ -51,8 +51,7 @@ /* * Mutex to serialise access to the SDT provider list. */ -static struct mtx sdt_mtx; -MTX_SYSINIT(&sdt_mtx, "Statically Defined Tracing", NULL, MTX_DEF); +static struct sx sdt_sx; /* * Hook for the DTrace probe function. The 'sdt' provider will set this @@ -80,13 +79,13 @@ { struct sdt_provider *prov = arg; - mtx_lock(&sdt_mtx); + sx_xlock(&sdt_sx); TAILQ_INSERT_TAIL(&sdt_provider_list, prov, prov_entry); TAILQ_INIT(&prov->probe_list); - mtx_unlock(&sdt_mtx); + sx_xunlock(&sdt_sx); } /* @@ -97,11 +96,11 @@ { struct sdt_provider *prov = arg; - mtx_lock(&sdt_mtx); + sx_xlock(&sdt_sx); TAILQ_REMOVE(&sdt_provider_list, prov, prov_entry); - mtx_unlock(&sdt_mtx); + sx_xunlock(&sdt_sx); } /* @@ -121,7 +120,7 @@ return; } - mtx_lock(&sdt_mtx); + sx_xlock(&sdt_sx); TAILQ_INSERT_TAIL(&probe->prov->probe_list, probe, probe_entry); @@ -129,7 +128,7 @@ probe->state = SDT_INIT; - mtx_unlock(&sdt_mtx); + sx_xunlock(&sdt_sx); } /* @@ -140,14 +139,14 @@ { struct sdt_probe *probe = arg; - mtx_lock(&sdt_mtx); + sx_xlock(&sdt_sx); if (probe->state == SDT_INIT) { TAILQ_REMOVE(&probe->prov->probe_list, probe, probe_entry); probe->state = SDT_UNINIT; } - mtx_unlock(&sdt_mtx); + sx_xunlock(&sdt_sx); } /* @@ -158,13 +157,13 @@ { struct sdt_argtype *argtype = arg; - mtx_lock(&sdt_mtx); + sx_xlock(&sdt_sx); TAILQ_INSERT_TAIL(&argtype->probe->argtype_list, argtype, argtype_entry); argtype->probe->n_args++; - mtx_unlock(&sdt_mtx); + sx_xunlock(&sdt_sx); } /* @@ -175,17 +174,17 @@ { struct sdt_argtype *argtype = arg; - mtx_lock(&sdt_mtx); + sx_xlock(&sdt_sx); TAILQ_REMOVE(&argtype->probe->argtype_list, argtype, argtype_entry); - mtx_unlock(&sdt_mtx); + sx_xunlock(&sdt_sx); } static void sdt_init(void *arg) { - sx_init(&sdt_mtx, "Statically Defined Tracing"); + sx_init_flags(&sdt_sx, "Statically Defined Tracing", SX_NOWITNESS); TAILQ_INIT(&sdt_provider_list); } @@ -195,7 +194,7 @@ static void sdt_uninit(void *arg) { - sx_destroy(&sdt_mtx); + sx_destroy(&sdt_sx); } SYSUNINIT(sdt, SI_SUB_KDTRACE, SI_ORDER_FIRST, sdt_uninit, NULL); @@ -209,14 +208,14 @@ int error = 0; struct sdt_provider *prov; - mtx_lock(&sdt_mtx); + sx_xlock(&sdt_sx); TAILQ_FOREACH(prov, &sdt_provider_list, prov_entry) { if ((error = callback_func(prov, arg)) != 0) break; } - mtx_unlock(&sdt_mtx); + sx_xunlock(&sdt_sx); return (error); } @@ -232,9 +231,9 @@ int locked; struct sdt_probe *probe; - locked = mtx_locked(&sdt_mtx); + locked = sx_xlocked(&sdt_sx); if (!locked) - mtx_lock(&sdt_mtx); + sx_xlock(&sdt_sx); TAILQ_FOREACH(probe, &prov->probe_list, probe_entry) { if ((error = callback_func(probe, arg)) != 0) @@ -242,7 +241,7 @@ } if (!locked) - mtx_unlock(&sdt_mtx); + sx_xunlock(&sdt_sx); return (error); } @@ -258,9 +257,9 @@ int locked; struct sdt_argtype *argtype; - locked = mtx_locked(&sdt_mtx); + locked = sx_xlocked(&sdt_sx); if (!locked) - mtx_lock(&sdt_mtx); + sx_xlock(&sdt_sx); TAILQ_FOREACH(argtype, &probe->argtype_list, argtype_entry) { if ((error = callback_func(argtype, arg)) != 0) @@ -268,7 +267,7 @@ } if (!locked) - mtx_unlock(&sdt_mtx); + sx_xunlock(&sdt_sx); return (error); } From owner-p4-projects@FreeBSD.ORG Sun Jan 27 21:48:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E494C16A41B; Sun, 27 Jan 2008 21:48:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91DB116A418 for ; Sun, 27 Jan 2008 21:48:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8342013C43E for ; Sun, 27 Jan 2008 21:48:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RLmWlK053922 for ; Sun, 27 Jan 2008 21:48:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RLmWdF053919 for perforce@freebsd.org; Sun, 27 Jan 2008 21:48:32 GMT (envelope-from jb@freebsd.org) Date: Sun, 27 Jan 2008 21:48:32 GMT Message-Id: <200801272148.m0RLmWdF053919@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134245 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 21:48:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=134245 Change 134245 by jb@jb_freebsd1 on 2008/01/27 21:47:41 The linker lock here is private to code in this file. It is never a problem with it being locked when any other combination of locks are already obtained or even if *no* other locks are obtained. Use SX_NOWITNESS to avoid bogus LOR reports. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_linker.c#27 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_linker.c#27 (text+ko) ==== @@ -157,7 +157,7 @@ linker_init(void *arg) { - sx_init(&kld_sx, "kernel linker"); + sx_init_flags(&kld_sx, "kernel linker", SX_NOWITNESS); TAILQ_INIT(&classes); TAILQ_INIT(&linker_files); } From owner-p4-projects@FreeBSD.ORG Sun Jan 27 21:48:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EC9616A532; Sun, 27 Jan 2008 21:48:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDF4216A419 for ; Sun, 27 Jan 2008 21:48:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BE56D13C442 for ; Sun, 27 Jan 2008 21:48:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RLmWeU053929 for ; Sun, 27 Jan 2008 21:48:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RLmW5N053925 for perforce@freebsd.org; Sun, 27 Jan 2008 21:48:32 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 21:48:32 GMT Message-Id: <200801272148.m0RLmW5N053925@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134246 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 21:48:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=134246 Change 134246 by sam@sam_ebb on 2008/01/27 21:48:08 Revamp according to my original code: o expose rate table so we can inline routines o use SYSINT to setup rate tables o eliminate dependence on channel; change api's to ues rate tables (drivers should cache this on channel change) While here also move/expose dfly stuff (especially for bwi). Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_phy.c#2 edit .. //depot/projects/vap/sys/net80211/ieee80211_phy.h#2 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_phy.c#2 (text+ko) ==== @@ -45,31 +45,6 @@ #include #ifdef notyet -/* - * Contention window (slots). - */ -#define IEEE80211_CW_MAX 1023 /* aCWmax */ -#define IEEE80211_CW_MIN_0 31 /* DS/CCK aCWmin, ERP aCWmin(0) */ -#define IEEE80211_CW_MIN_1 15 /* OFDM aCWmin, ERP aCWmin(1) */ - -/* - * SIFS (microseconds). - */ -#define IEEE80211_DUR_SIFS 10 /* DS/CCK/ERP SIFS */ -#define IEEE80211_DUR_OFDM_SIFS 16 /* OFDM SIFS */ - -/* - * Slot time (microseconds). - */ -#define IEEE80211_DUR_SLOT 20 /* DS/CCK slottime, ERP long slottime */ -#define IEEE80211_DUR_SHSLOT 9 /* ERP short slottime */ -#define IEEE80211_DUR_OFDM_SLOT 9 /* OFDM slottime */ - -/* - * DIFS (microseconds). - */ -#define IEEE80211_DUR_DIFS(sifs, slot) ((sifs) + 2 * (slot)) - struct ieee80211_ds_plcp_hdr { uint8_t i_signal; uint8_t i_service; @@ -79,29 +54,6 @@ #endif /* notyet */ -struct ieee80211_rate_table { - int rateCount; /* NB: for proper padding */ - uint8_t rateCodeToIndex[256]; /* back mapping */ - struct { - uint8_t phy; /* CCK/OFDM/TURBO */ - uint32_t rateKbps; /* transfer rate in kbs */ - uint8_t shortPreamble; /* mask for enabling short - * preamble in CCK rate code */ - uint8_t dot11Rate; /* value for supported rates - * info element of MLME */ - uint8_t ctlRateIndex; /* index of next lower basic - * rate; used for dur. calcs */ - uint16_t lpAckDuration; /* long preamble ACK dur. */ - uint16_t spAckDuration; /* short preamble ACK dur. */ - } info[32]; -}; - -#ifdef notyet -uint8_t ieee80211_plcp2rate(uint8_t, int); -uint8_t ieee80211_ack_rate(const struct ieee80211_rate_table *, - uint8_t rate); -#endif /* notyet */ - /* shorthands to compact tables for readability */ #define OFDM IEEE80211_T_OFDM #define CCK IEEE80211_T_CCK @@ -233,36 +185,6 @@ #undef TURBO #undef XR -static void ieee80211_setup_ratetable(struct ieee80211_rate_table *); -static uint16_t ieee80211_compute_dur(const struct ieee80211_rate_table *, - uint32_t, uint16_t, int); - -/* Setup all rate tables */ -void -ieee80211_phy_init(void) -{ - static struct ieee80211_rate_table * const ratetables[] = { - &ieee80211_half_table, - &ieee80211_quarter_table, - &ieee80211_11a_table, - &ieee80211_11g_table, - &ieee80211_turbog_table, - &ieee80211_turboa_table, - &ieee80211_turboa_table, - &ieee80211_11a_table, - &ieee80211_11g_table, - &ieee80211_11b_table - }; - int i; - -#define N(arr) (int)(sizeof(arr) / sizeof(arr[0])) - - for (i = 0; i < N(ratetables); ++i) - ieee80211_setup_ratetable(ratetables[i]); - -#undef N -} - /* * Setup a rate table's reverse lookup table and fill in * ack durations. The reverse lookup tables are assumed @@ -307,9 +229,9 @@ * current rate, so control rate's reverse lookup entry * has been installed and following call is safe. */ - rt->info[i].lpAckDuration = ieee80211_compute_dur(rt, + rt->info[i].lpAckDuration = ieee80211_compute_duration(rt, WLAN_CTRL_FRAME_SIZE, ctl_rate, 0); - rt->info[i].spAckDuration = ieee80211_compute_dur(rt, + rt->info[i].spAckDuration = ieee80211_compute_duration(rt, WLAN_CTRL_FRAME_SIZE, ctl_rate, IEEE80211_F_SHPREAMBLE); } @@ -317,8 +239,34 @@ #undef N } -void -ieee80211_set_ratetable(struct ieee80211_channel *c) +/* Setup all rate tables */ +static void +ieee80211_phy_init(void) +{ +#define N(arr) (int)(sizeof(arr) / sizeof(arr[0])) + static struct ieee80211_rate_table * const ratetables[] = { + &ieee80211_half_table, + &ieee80211_quarter_table, + &ieee80211_11a_table, + &ieee80211_11g_table, + &ieee80211_turbog_table, + &ieee80211_turboa_table, + &ieee80211_turboa_table, + &ieee80211_11a_table, + &ieee80211_11g_table, + &ieee80211_11b_table + }; + int i; + + for (i = 0; i < N(ratetables); ++i) + ieee80211_setup_ratetable(ratetables[i]); + +#undef N +} +SYSINIT(wlan_phy, SI_SUB_DRIVERS, SI_ORDER_FIRST, ieee80211_phy_init, NULL); + +const struct ieee80211_rate_table * +ieee80211_get_ratetable(struct ieee80211_channel *c) { const struct ieee80211_rate_table *rt; @@ -348,13 +296,11 @@ panic("%s: no rate table for channel; freq %u flags 0x%x\n", __func__, c->ic_freq, c->ic_flags); } - c->ic_rt = rt; + return rt; } -#ifdef notyet - /* - * Covert PLCP signal/rate field to net80211 rate (.5Mbits/s) + * Covert PLCP signal/rate field to 802.11 rate (.5Mbits/s) */ uint8_t ieee80211_plcp2rate(uint8_t plcp, int ofdm) @@ -392,65 +338,14 @@ return 0; } -uint8_t -ieee80211_ack_rate(const struct ieee80211_rate_table *rt, uint8_t rate) -{ - uint8_t cix = rt->info[rt->rateCodeToIndex[rate]].ctlRateIndex; - return rt->info[cix].dot11Rate; -} - -#endif /* notyet */ - -enum ieee80211_phytype -ieee80211_rate2phytype(const struct ieee80211_channel *c, uint8_t rate) -{ - const struct ieee80211_rate_table *rt = c->ic_rt; - uint8_t rix = rt->rateCodeToIndex[rate]; - - KASSERT(rix != (uint8_t)-1, ("rate %d has no info", rate)); - return rt->info[rix].phy; -} - -/* - * Calculate duration field for - * o non-fragment data frames - * o management frames - * sent using rate, phy and short preamble setting. - */ -uint16_t -ieee80211_ack_duration(const struct ieee80211_channel *c, - uint8_t rate, int flags) -{ - const struct ieee80211_rate_table *rt = c->ic_rt; - uint8_t rix = rt->rateCodeToIndex[rate]; - - KASSERT(rix != (uint8_t)-1, ("rate %d has no info", rate)); - if (flags & IEEE80211_F_SHPREAMBLE) { - KASSERT(rt->info[rix].spAckDuration != 0, - ("shpreamble ack dur is not computed!\n")); - return rt->info[rix].spAckDuration; - } else { - KASSERT(rt->info[rix].lpAckDuration != 0, - ("lgpreamble ack dur is not computed!\n")); - return rt->info[rix].lpAckDuration; - } -} - -uint16_t -ieee80211_compute_duration(const struct ieee80211_channel *c, - uint32_t frameLen, uint16_t rate, int flags) -{ - return ieee80211_compute_dur(c->ic_rt, frameLen, rate, flags); -} - /* * Compute the time to transmit a frame of length frameLen bytes * using the specified rate, phy, and short preamble setting. * SIFS is included. */ -static uint16_t -ieee80211_compute_dur(const struct ieee80211_rate_table *rt, - uint32_t frameLen, uint16_t rate, int flags) +uint16_t +ieee80211_compute_duration(const struct ieee80211_rate_table *rt, + uint32_t frameLen, uint16_t rate, int isShortPreamble) { uint8_t rix = rt->rateCodeToIndex[rate]; uint32_t bitsPerSymbol, numBits, numSymbols, phyTime, txTime; @@ -467,8 +362,7 @@ #define CCK_PREAMBLE_BITS 144 #define CCK_PLCP_BITS 48 phyTime = CCK_PREAMBLE_BITS + CCK_PLCP_BITS; - if ((flags & IEEE80211_F_SHPREAMBLE) && - rt->info[rix].shortPreamble) + if (isShortPreamble && rt->info[rix].shortPreamble) phyTime >>= 1; numBits = frameLen << 3; txTime = CCK_SIFS_TIME + phyTime ==== //depot/projects/vap/sys/net80211/ieee80211_phy.h#2 (text+ko) ==== @@ -29,20 +29,109 @@ #define _NET80211_IEEE80211_PHY_H_ #ifdef _KERNEL +/* + * IEEE 802.11 PHY-related definitions. + */ + +/* + * Contention window (slots). + */ +#define IEEE80211_CW_MAX 1023 /* aCWmax */ +#define IEEE80211_CW_MIN_0 31 /* DS/CCK aCWmin, ERP aCWmin(0) */ +#define IEEE80211_CW_MIN_1 15 /* OFDM aCWmin, ERP aCWmin(1) */ + +/* + * SIFS (microseconds). + */ +#define IEEE80211_DUR_SIFS 10 /* DS/CCK/ERP SIFS */ +#define IEEE80211_DUR_OFDM_SIFS 16 /* OFDM SIFS */ + +/* + * Slot time (microseconds). + */ +#define IEEE80211_DUR_SLOT 20 /* DS/CCK slottime, ERP long slottime */ +#define IEEE80211_DUR_SHSLOT 9 /* ERP short slottime */ +#define IEEE80211_DUR_OFDM_SLOT 9 /* OFDM slottime */ + +/* + * DIFS (microseconds). + */ +#define IEEE80211_DUR_DIFS(sifs, slot) ((sifs) + 2 * (slot)) struct ieee80211_channel; -/* Initialization functions */ -void ieee80211_phy_init(void); -void ieee80211_set_ratetable(struct ieee80211_channel *); +struct ieee80211_rate_table { + int rateCount; /* NB: for proper padding */ + uint8_t rateCodeToIndex[256]; /* back mapping */ + struct { + uint8_t phy; /* CCK/OFDM/TURBO */ + uint32_t rateKbps; /* transfer rate in kbs */ + uint8_t shortPreamble; /* mask for enabling short + * preamble in CCK rate code */ + uint8_t dot11Rate; /* value for supported rates + * info element of MLME */ + uint8_t ctlRateIndex; /* index of next lower basic + * rate; used for dur. calcs */ + uint16_t lpAckDuration; /* long preamble ACK dur. */ + uint16_t spAckDuration; /* short preamble ACK dur. */ + } info[32]; +}; + +const struct ieee80211_rate_table *ieee80211_get_ratetable( + struct ieee80211_channel *); + +static __inline__ uint8_t +ieee80211_ack_rate(const struct ieee80211_rate_table *rt, uint8_t rate) +{ + uint8_t cix = rt->info[rt->rateCodeToIndex[rate]].ctlRateIndex; + KASSERT(cix != (uint8_t)-1, ("rate %d has no info", rate)); + return rt->info[cix].dot11Rate; +} + +static __inline__ enum ieee80211_phytype +ieee80211_rate2phytype(const struct ieee80211_rate_table *rt, uint8_t rate) +{ + uint8_t rix = rt->rateCodeToIndex[rate]; + KASSERT(rix != (uint8_t)-1, ("rate %d has no info", rate)); + return rt->info[rix].phy; +} + +/* + * Calculate ACK field for + * o non-fragment data frames + * o management frames + * sent using rate, phy and short preamble setting. + */ +static __inline__ uint16_t +ieee80211_ack_duration(const struct ieee80211_rate_table *rt, + uint8_t rate, int isShortPreamble) +{ + uint8_t rix = rt->rateCodeToIndex[rate]; -uint16_t ieee80211_ack_duration(const struct ieee80211_channel *, - uint8_t, int); -uint16_t ieee80211_compute_duration(const struct ieee80211_channel *, - uint32_t, uint16_t, int); -enum ieee80211_phytype ieee80211_rate2phytype( - const struct ieee80211_channel *, uint8_t); + KASSERT(rix != (uint8_t)-1, ("rate %d has no info", rate)); + if (isShortPreamble) { + KASSERT(rt->info[rix].spAckDuration != 0, + ("shpreamble ack dur is not computed!\n")); + return rt->info[rix].spAckDuration; + } else { + KASSERT(rt->info[rix].lpAckDuration != 0, + ("lgpreamble ack dur is not computed!\n")); + return rt->info[rix].lpAckDuration; + } +} +/* + * Compute the time to transmit a frame of length frameLen bytes + * using the specified 802.11 rate code, phy, and short preamble + * setting. + * + * NB: SIFS is included. + */ +uint16_t ieee80211_compute_duration(const struct ieee80211_rate_table *, + uint32_t frameLen, uint16_t rate, int isShortPreamble); +/* + * Covert PLCP signal/rate field to 802.11 rate code (.5Mbits/s) + */ +uint8_t ieee80211_plcp2rate(uint8_t, int); #endif /* _KERNEL */ - #endif /* !_NET80211_IEEE80211_PHY_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Jan 27 21:48:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A487B16A536; Sun, 27 Jan 2008 21:48:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E95B16A4A9 for ; Sun, 27 Jan 2008 21:48:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E291013C447 for ; Sun, 27 Jan 2008 21:48:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RLmWuS053935 for ; Sun, 27 Jan 2008 21:48:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RLmWvB053932 for perforce@freebsd.org; Sun, 27 Jan 2008 21:48:32 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 21:48:32 GMT Message-Id: <200801272148.m0RLmWvB053932@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134247 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 21:48:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=134247 Change 134247 by sam@sam_ebb on 2008/01/27 21:48:27 include ieee80211_phy.c Affected files ... .. //depot/projects/vap/sys/modules/wlan/Makefile#7 edit Differences ... ==== //depot/projects/vap/sys/modules/wlan/Makefile#7 (text+ko) ==== @@ -5,7 +5,7 @@ KMOD= wlan SRCS= ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c ieee80211_dfs.c \ ieee80211_freebsd.c ieee80211_input.c ieee80211_ioctl.c \ - ieee80211_node.c ieee80211_output.c ieee80211_power.c \ + ieee80211_node.c ieee80211_output.c ieee80211_phy.c ieee80211_power.c \ ieee80211_proto.c ieee80211_scan.c ieee80211_regdomain.c \ ieee80211_ht.c \ ieee80211_adhoc.c ieee80211_hostap.c ieee80211_monitor.c \ From owner-p4-projects@FreeBSD.ORG Sun Jan 27 21:54:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E26AF16A420; Sun, 27 Jan 2008 21:54:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A7B5C16A468 for ; Sun, 27 Jan 2008 21:54:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8072F13C461 for ; Sun, 27 Jan 2008 21:54:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RLsdw1054268 for ; Sun, 27 Jan 2008 21:54:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RLsdqU054265 for perforce@freebsd.org; Sun, 27 Jan 2008 21:54:39 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 21:54:39 GMT Message-Id: <200801272154.m0RLsdqU054265@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134248 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 21:54:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=134248 Change 134248 by sam@sam_ebb on 2008/01/27 21:54:16 add ieee80211_phy.c Affected files ... .. //depot/projects/vap/sys/conf/files#13 edit Differences ... ==== //depot/projects/vap/sys/conf/files#13 (text+ko) ==== @@ -1675,6 +1675,7 @@ net80211/ieee80211_monitor.c optional wlan net80211/ieee80211_node.c optional wlan net80211/ieee80211_output.c optional wlan +net80211/ieee80211_phy.c optional wlan net80211/ieee80211_power.c optional wlan net80211/ieee80211_proto.c optional wlan net80211/ieee80211_regdomain.c optional wlan From owner-p4-projects@FreeBSD.ORG Sun Jan 27 22:21:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C3BD16A420; Sun, 27 Jan 2008 22:21:07 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BDC716A417 for ; Sun, 27 Jan 2008 22:21:07 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F13B313C461 for ; Sun, 27 Jan 2008 22:21:06 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RML6e0058235 for ; Sun, 27 Jan 2008 22:21:06 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RML6C6058232 for perforce@freebsd.org; Sun, 27 Jan 2008 22:21:06 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 27 Jan 2008 22:21:06 GMT Message-Id: <200801272221.m0RML6C6058232@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 134249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 22:21:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=134249 Change 134249 by gonzo@gonzo_jeeves on 2008/01/27 22:20:12 o Initialize td_kstack_pages for thread0 that is used in td_pcb calculation below. Without it td_pcb point at really wrong memory location and bad things like memory corruption happen. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#19 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#19 (text+ko) ==== @@ -264,6 +264,7 @@ { proc_linkup(&proc0, &thread0); thread0.td_kstack = kstack0; + thread0.td_kstack_pages = KSTACK_PAGES; /* Initialize pcpu info of cpu-zero */ #ifdef SMP pcpu_init(&__pcpu[0], 0, sizeof(struct pcpu)); From owner-p4-projects@FreeBSD.ORG Sun Jan 27 22:25:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9564816A41B; Sun, 27 Jan 2008 22:25:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4118D16A418 for ; Sun, 27 Jan 2008 22:25:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3087213C43E for ; Sun, 27 Jan 2008 22:25:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RMPHAG058516 for ; Sun, 27 Jan 2008 22:25:17 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RMPBp9058512 for perforce@freebsd.org; Sun, 27 Jan 2008 22:25:11 GMT (envelope-from jb@freebsd.org) Date: Sun, 27 Jan 2008 22:25:11 GMT Message-Id: <200801272225.m0RMPBp9058512@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 22:25:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=134251 Change 134251 by jb@jb_freebsd1 on 2008/01/27 22:24:37 IFdtrace Affected files ... .. //depot/projects/opensolaris/src/cddl/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/Makefile.inc#1 branch .. //depot/projects/opensolaris/src/cddl/lib/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/lib/Makefile.inc#1 branch .. //depot/projects/opensolaris/src/cddl/lib/drti/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/lib/libctf/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/errno.d#1 branch .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/net.d#1 branch .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/nfs.d#1 branch .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/psinfo.d#1 branch .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/sched.d#1 branch .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/signal.d#1 branch .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/unistd.d#1 branch .. //depot/projects/opensolaris/src/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/sbin/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/opensolaris/src/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/usr.bin/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/opensolaris/src/cddl/usr.bin/ctfconvert/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/usr.bin/ctfdump/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/usr.bin/ctfmerge/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/usr.bin/sgsmsg/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/opensolaris/src/cddl/usr.sbin/dtrace/Makefile#1 branch .. //depot/projects/opensolaris/src/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/include/dtrace.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/include/libproc.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/opensolaris/src/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/dtrace.c#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/Makefile#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/32/Makefile#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/64/Makefile#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.misc.d#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.rootvp.d#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/i386/Makefile#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/sparc/Makefile#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/include/_string_table.h#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/include/debug.h#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/include/string_table.h#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zpool/zpool_util.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zpool/zpool_util.h#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/head/stdio_ext.h#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/head/synch.h#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/head/thread.h#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/drti.c#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_buf.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_decl.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dtrace.h#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libzpool/common/util.c#2 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#3 integrate .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/dump/dump.c#3 integrate .. //depot/projects/opensolaris/src/sys/cddl/cyclic/amd64/cyclic_machdep.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/cyclic/cyclic.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/cyclic/cyclic_test.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/cyclic/i386/cyclic_machdep.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/amd64/dis_tables.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/amd64/dis_tables.h#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/amd64/instr_size.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_anon.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_cddl.h#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_clone.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_debug.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_hacks.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_load.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_modevent.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_test.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_unload.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/dtrace_vtime.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/i386/dis_tables.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/i386/dis_tables.h#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/i386/dtrace_asm.S#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/dtrace/i386/instr_size.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/fbt/fbt.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/profile/profile.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/prototype.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/sdt/sdt.c#1 branch .. //depot/projects/opensolaris/src/sys/cddl/dev/systrace/systrace.c#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris.c#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_cmn_err.c#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/cpuvar_defs.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/cyclic_impl.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/feature_tests.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/sema.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/opensolaris/src/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#2 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/avl.h#2 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#2 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#2 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/debug.h#3 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#3 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#3 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/fasttrap_impl.h#1 branch .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/note.h#2 integrate .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#3 delete .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#3 delete .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#2 integrate Differences ... ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/dtrace.c#3 (text) ==== @@ -202,7 +202,7 @@ static void dfatal(const char *fmt, ...) { -#if !defined(sun) +#if !defined(sun) && defined(NEED_ERRLOC) char *p_errfile = NULL; int errline = 0; #endif @@ -223,7 +223,7 @@ (void) fprintf(stderr, "%s\n", dtrace_errmsg(g_dtp, dtrace_errno(g_dtp))); } -#if !defined(sun) +#if !defined(sun) && defined(NEED_ERRLOC) dt_get_errloc(g_dtp, &p_errfile, &errline); if (p_errfile != NULL) printf("File '%s', line %d\n", p_errfile, errline); @@ -235,12 +235,6 @@ */ dtrace_close(g_dtp); - /* - * Close the DTrace handle to ensure that any controlled processes are - * correctly restored and continued. - */ - dtrace_close(g_dtp); - exit(E_ERROR); } @@ -1202,8 +1196,8 @@ g_ofp = stdout; int done = 0, mode = 0; - int err, i; - char c, *p, **v; + int err, i, c; + char *p, **v; struct ps_prochandle *P; pid_t pid; @@ -1230,7 +1224,7 @@ * options into g_argv[], and abort if any invalid options are found. */ for (optind = 1; optind < argc; optind++) { - while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) { + while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) { switch (c) { case '3': if (strcmp(optarg, "2") != 0) { @@ -1413,7 +1407,7 @@ * this time; these will compiled as part of the fourth processing pass. */ for (optind = 1; optind < argc; optind++) { - while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) { + while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) { switch (c) { case 'a': if (dtrace_setopt(g_dtp, "grabanon", 0) != 0) @@ -1570,7 +1564,7 @@ * may been affected by any library options set by the second pass. */ for (optind = 1; optind < argc; optind++) { - while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) { + while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) { switch (c) { case 'c': if ((v = make_argv(optarg)) == NULL) @@ -1835,6 +1829,11 @@ if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN) (void) sigaction(SIGTERM, &act, NULL); +#if !defined(sun) + if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN) + (void) sigaction(SIGUSR1, &act, NULL); +#endif + /* * Now that tracing is active and we are ready to consume trace data, * continue any grabbed or created processes, setting them running ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#2 (text+ko) ==== @@ -1,4 +1,4 @@ -#!/usr/perl5/bin/perl +#!/usr/local/bin/perl # # CDDL HEADER START # ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#2 (text+ko) ==== @@ -1,4 +1,4 @@ -#!/usr/perl5/bin/perl +#!/usr/local/bin/perl # # CDDL HEADER START # @@ -44,7 +44,7 @@ $dtrace_path = '/usr/sbin/dtrace'; @dtrace_argv = (); -$ksh_path = '/usr/bin/ksh'; +$ksh_path = '/bin/sh'; @files = (); %exceptions = (); @@ -268,7 +268,7 @@ # Ensure that $PATH contains a cc(1) so that we can execute the # test programs that require compilation of C code. # -$ENV{'PATH'} = $ENV{'PATH'} . ':/ws/onnv-tools/SUNWspro/SS11/bin'; +#$ENV{'PATH'} = $ENV{'PATH'} . ':/ws/onnv-tools/SUNWspro/SS11/bin'; if ($opt_b) { logmsg("badioctl'ing ... "); @@ -418,7 +418,7 @@ } $fullname = "$dir/$name"; - $exe = "$dir/$base.exe"; + $exe = "./$base.exe"; $exe_pid = -1; if ($opt_a && ($status != 0 || $tag != 0 || $droptag != 0 || ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#2 (text+ko) ==== @@ -62,6 +62,7 @@ -$(RM) $(CSRCS:%.c=%.exe) $(CSRCS:%.c=%.o) -$(RM) $(SSRCS:%.s=%.exe) $(SSRCS:%.s=%.o) -$(RM) $(DSRCS:%.d=%.o) + -$(RM) $(CLOBBERFILES) install: $(ROOT_TSTS) $(ROOT_EXES) ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#2 (text+ko) ==== @@ -29,6 +29,11 @@ include $(SRC)/Makefile.master include ../Makefile.com +SNOOPDIR = $(SRC)/cmd/cmd-inet/usr.sbin/snoop +SNOOPOBJS = nfs4_xdr.o +SNOOPSRCS = ${SNOOPOBJS:%.o=%.c} +CLOBBERFILES += nfs/$(SNOOPOBJS) + fasttrap/tst.fasttrap.exe := LDLIBS += -ldtrace fasttrap/tst.stack.exe := LDLIBS += -ldtrace @@ -41,6 +46,13 @@ GCC = $(ONBLD_TOOLS)/bin/$(MACH)/cw -_gcc +nfs/%.o: $(SNOOPDIR)/%.c + $(COMPILE.c) -o $@ $< -I$(SNOOPDIR) + $(POST_PROCESS_O) +nfs/tst.call.exe: nfs/tst.call.o nfs/$(SNOOPOBJS) + $(LINK.c) -o $@ nfs/tst.call.o nfs/$(SNOOPOBJS) $(LDLIBS) -lnsl + $(POST_PROCESS) ; $(STRIP_STABS) + pid/tst.gcc.exe: pid/tst.gcc.c $(GCC) -o pid/tst.gcc.exe pid/tst.gcc.c $(LDFLAGS) $(POST_PROCESS) ; $(STRIP_STABS) ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#2 (text+ko) ==== @@ -40,3 +40,8 @@ x[123] = `kmem_flags; x[456] = *`rootvp; } + +ERROR +{ + exit(1); +} ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#2 (text+ko) ==== @@ -40,3 +40,8 @@ self->x[123] = `kmem_flags; self->x[456] = *`rootvp; } + +ERROR +{ + exit(1); +} ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#2 (text+ko) ==== @@ -53,3 +53,8 @@ printf("address of process = %u\n", curpsinfo->pr_addr); exit (0); } + +ERROR +{ + exit(1); +} ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#2 (text+ko) ==== @@ -49,3 +49,8 @@ printf("address of process = %u\n", curpsinfo->pr_addr); exit (0); } + +ERROR +{ + exit(1); +} ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#2 (text+ko) ==== @@ -46,7 +46,7 @@ dtrace=$1 $dtrace -qZm wassup'{printf("Iamkool");}' \ --qm unix'{printf("I am done"); exit(0);}' +-qm BEGIN'{printf("I am done"); exit(0);}' status=$? ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#2 (text+ko) ==== @@ -20,7 +20,7 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -38,7 +38,13 @@ * */ +struct foo { + int a:1; + int b:3; +}; + BEGIN { - trace(offsetof(tcp_t, tcp_hwcksum)); + trace(offsetof(struct foo, b)); + exit(0); } ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#2 (text+ko) ==== @@ -36,7 +36,7 @@ { $dtrace -s /dev/stdin <pr_ppid == $child && pid == $child/ + /args[0]->p_pptr->p_pid == $child && pid == $child/ { exit(0); } @@ -46,7 +46,7 @@ sleeper() { while true; do - /usr/bin/sleep 1 + /bin/sleep 1 done } ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#2 (text+ko) ==== @@ -36,12 +36,12 @@ { $dtrace -s /dev/stdin <pr_ppid == $child && args[0] == "/usr/bin/sleep"/ + /curpsinfo->pr_ppid == $child && args[0] == "/bin/sleep"/ { self->exec = 1; } - proc:::exec-success + proc:::exec_success /self->exec/ { exit(0); @@ -52,7 +52,7 @@ sleeper() { while true; do - /usr/bin/sleep 1 + /bin/sleep 1 done } ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#2 (text+ko) ==== @@ -42,7 +42,7 @@ self->exec = 1; } - proc:::exec-failure + proc:::exec_failure /self->exec && args[0] == ENOENT/ { exit(0); @@ -53,7 +53,7 @@ sleeper() { while true; do - /usr/bin/sleep 1 + /bin/sleep 1 $badexec done } ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#2 (text+ko) ==== @@ -45,7 +45,7 @@ self->exec = 1; } - proc:::exec-failure + proc:::exec_failure /self->exec/ { exit(0); @@ -56,7 +56,7 @@ sleeper() { while true; do - /usr/bin/sleep 1 + /bin/sleep 1 $badexec done } ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#2 (text+ko) ==== @@ -43,18 +43,16 @@ $dtrace -s /dev/stdin <pr_ppid == $child && - curpsinfo->pr_psargs == "$longsleep" && args[0] == CLD_DUMPED/ + execargs == "$longsleep" && args[0] == CLD_DUMPED/ { exit(0); } proc:::exit /curpsinfo->pr_ppid == $child && - curpsinfo->pr_psargs == "$longsleep" && args[0] != CLD_DUMPED/ + execargs == "$longsleep" && args[0] != CLD_DUMPED/ { - printf("Child process could not dump core. Check coreadm(1M)"); - printf(" settings; either per-process or global core dumps "); - printf("must be enabled for this test to work properly."); + printf("Child process could did dump core."); exit(1); } EOF @@ -62,13 +60,12 @@ sleeper() { - /usr/bin/coreadm -p $corefile while true; do $longsleep & - /usr/bin/sleep 1 + /bin/sleep 1 kill -SEGV $! done - /usr/bin/rm -f $corefile + /bin/rm -f $corefile } if [ $# != 1 ]; then @@ -77,8 +74,8 @@ fi dtrace=$1 -longsleep="/usr/bin/sleep 10000" -corefile=/tmp/core.$$ +longsleep="/bin/sleep 10000" +corefile=/tmp/sleep.core sleeper & child=$! @@ -86,10 +83,10 @@ script status=$? -pstop $child -pkill -P $child +#pstop $child +#pkill -P $child kill $child -prun $child +#prun $child -/usr/bin/rm -f $corefile +/bin/rm -f $corefile exit $status ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#2 (text+ko) ==== @@ -46,7 +46,7 @@ sleeper() { while true; do - /usr/bin/sleep 1 + /bin/sleep 1 done } ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#2 (text+ko) ==== @@ -33,6 +33,8 @@ #include #include +#define NANOSEC 1000000000 + int main(int argc, char **argv) { @@ -41,6 +43,7 @@ sigset_t set; timer_t tid; char *cmd = argv[0]; + int sig; ev.sigev_notify = SIGEV_SIGNAL; ev.sigev_signo = SIGUSR1; @@ -66,9 +69,9 @@ exit(EXIT_FAILURE); } - for (;;) { - (void) sigwait(&set); - } + do { + (void) sigwait(&set, &sig); + } while(sig != SIGUSR1); /*NOTREACHED*/ return (0); ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#2 (text+ko) ==== @@ -28,13 +28,13 @@ #pragma D option destructive -proc:::signal-send -/pid == 0 && args[1]->pr_pid == $1 && args[2] == SIGUSR1/ +proc:::signal_send +/args[1]->p_pid == $1 && args[2] == SIGUSR1/ { sent = 1; } -proc:::signal-clear +proc:::signal_clear /pid == $1 && args[0] == SIGUSR1 && sent/ { exit(0); ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#2 (text+ko) ==== @@ -54,7 +54,7 @@ timeout = timestamp + 500000000; } -syscall::rexit:entry +syscall::exit:entry { exit(0); } ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#2 (text+ko) ==== @@ -28,6 +28,7 @@ #include #include +#include static void handle(int sig) ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#2 (text+ko) ==== @@ -54,7 +54,7 @@ timeout = timestamp + 500000000; } -syscall::rexit:entry +syscall::exit:entry { exit(0); } ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#2 (text+ko) ==== @@ -28,6 +28,7 @@ #include #include +#include static void handle(int sig) ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#2 (text+ko) ==== @@ -54,7 +54,7 @@ timeout = timestamp + 500000000; } -syscall::rexit:entry +syscall::exit:entry { exit(0); } ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.misc.d#2 (text+ko) ==== @@ -61,3 +61,8 @@ { exit(0); } + +ERROR +{ + exit(1); +} ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.rootvp.d#2 (text+ko) ==== @@ -52,3 +52,8 @@ { exit(0); } + +ERROR +{ + exit(1); +} ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/include/debug.h#2 (text) ==== @@ -786,7 +786,7 @@ const char *, int); extern void Dbg_syms_ar_title(Lm_list *, const char *, int); extern void Dbg_syms_created(Lm_list *, const char *); -extern void Dbg_syms_discarded(Lm_list *, Sym_desc *, Is_desc *); +extern void Dbg_syms_discarded(Lm_list *, Sym_desc *); extern void Dbg_syms_dlsym(Rt_map *, const char *, const char *, int); extern void Dbg_syms_dup_sort_addr(Lm_list *, const char *, const char *, const char *, Addr); ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/include/string_table.h#2 (text) ==== @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -29,109 +28,33 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include #include -#include -#include #ifdef __cplusplus extern "C" { #endif -typedef struct str_hash Str_hash; -typedef struct str_tbl Str_tbl; -typedef struct str_master Str_master; - - /* - * The Stringlist is the list of 'input strings' - * associatied with the AVL nodes Stringelem. + * Exported, opaque string table handle. */ -typedef struct stringlist { - const char *sl_string; - struct stringlist *sl_next; -} Stringlist; +typedef struct str_tbl Str_tbl; /* - * Nodes for the initial AVL tree which contains all of - * the input strings. The AVL tree is indexed off of - * the length of the strings. This permits later traversal - * of all of the strings based off of their string length. - */ -typedef struct { - avl_node_t se_avlnode; - Stringlist *se_strlist; - uint_t se_stlen; -} Stringelem; - - -/* - * Pointer to the Master string, other strings may be suffixes - * of this string. + * Exported string table functions. */ -struct str_master { - const char *sm_str; /* pointer to master string */ - Str_master *sm_next; /* used for tracking master strings */ - uint_t sm_stlen; /* length of master string */ - uint_t sm_hashval; /* hashval of master string */ - uint_t sm_stoff; /* offset into destination strtab */ -}; - - -/* - * Represents a individual string that was input into - * the String hash table. The string may either be a - * suffix of another string or a master string. - */ -struct str_hash { - uint_t hi_stlen; /* string length */ - uint_t hi_refcnt; /* # of references to str */ - uint_t hi_hashval; /* hash for string */ - Str_master *hi_mstr; /* pointer to master string */ - Str_hash *hi_next; /* next entry in hash bckt */ -}; - -/* - * Controlling data structure for a String Table - */ -struct str_tbl { - avl_tree_t *st_strtree; /* avl tree of initial strs */ - char *st_strbuf; /* string buffer */ - Str_hash **st_hashbcks; /* hash buckets */ - Str_master *st_mstrlist; /* list of all master strings */ - uint_t st_fullstringsize; /* uncompressed table size */ - uint_t st_nextoff; /* next available string */ - uint_t st_stringsize; /* compressed size */ - uint_t st_stringcnt; /* # of strings */ - uint_t st_hbckcnt; /* # of buckets in hashlist */ - uint_t st_flags; -}; - -#define FLG_STTAB_COOKED 0x00000001 /* offset has been assigned */ -#define FLG_STTAB_COMPRESS 0x00000002 /* build compressed str tab */ - -/* - * starting value for use with string hashing functions - * inside of string_table.c - */ -#define HASHSEED 5381 - -/* - * Flags for st_new - */ -#define FLG_STNEW_COMPRESS 0x00000001 /* build compressed str tab */ - -/* - * exported string_table.c functions - */ extern int st_delstring(Str_tbl *, const char *); extern void st_destroy(Str_tbl *); extern uint_t st_getstrtab_sz(Str_tbl *); extern const char *st_getstrbuf(Str_tbl *); extern int st_insert(Str_tbl *, const char *); +extern Str_tbl *st_new(uint_t); extern int st_setstrbuf(Str_tbl *, char *, uint_t); extern int st_setstring(Str_tbl *, const char *, uint_t *); -extern Str_tbl *st_new(uint_t); + +/* + * Exported flags values for st_new(). + */ +#define FLG_STNEW_COMPRESS 0x01 /* compressed string table */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 27 22:41:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EAD416A46B; Sun, 27 Jan 2008 22:41:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 057DA16A474 for ; Sun, 27 Jan 2008 22:41:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D32A413C4DB for ; Sun, 27 Jan 2008 22:41:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RMfYZI059191 for ; Sun, 27 Jan 2008 22:41:34 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RMfYvH059188 for perforce@freebsd.org; Sun, 27 Jan 2008 22:41:34 GMT (envelope-from jb@freebsd.org) Date: Sun, 27 Jan 2008 22:41:34 GMT Message-Id: <200801272241.m0RMfYvH059188@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134252 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 22:41:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=134252 Change 134252 by jb@jb_freebsd1 on 2008/01/27 22:40:56 WIP Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/fasttrap/fasttrap.c#5 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 27 22:50:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00D7516A418; Sun, 27 Jan 2008 22:50:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1E8716A41B for ; Sun, 27 Jan 2008 22:50:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 92A7213C447 for ; Sun, 27 Jan 2008 22:50:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RMoigA059648 for ; Sun, 27 Jan 2008 22:50:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RMoi8M059645 for perforce@freebsd.org; Sun, 27 Jan 2008 22:50:44 GMT (envelope-from imp@freebsd.org) Date: Sun, 27 Jan 2008 22:50:44 GMT Message-Id: <200801272250.m0RMoi8M059645@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134254 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 22:50:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=134254 Change 134254 by imp@imp_paco-paco on 2008/01/27 22:50:12 Cut over to using mips2-based interrupt handling stuff exclusively rather than the mixed mips2 and jmips which couldn't have worked. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/conf/files.mips#11 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/clock.c#5 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#8 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/interrupt.c#6 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/intr_machdep.c#2 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#11 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/conf/files.mips#11 (text+ko) ==== @@ -46,7 +46,7 @@ mips/mips/elf_machdep.c standard mips/mips/exception.S standard mips/mips/gdb_machdep.c standard -mips/mips/interrupt.c standard +#mips/mips/interrupt.c standard mips/mips/mainbus.c standard mips/mips/pmap.c standard mips/mips/trap.c standard ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/clock.c#5 (text+ko) ==== @@ -183,7 +183,7 @@ * Registers or an on-chip external clock. Set the appropirate * bit-number in idle_mask */ - idle_mask |= CR_INT_CLOCK; +// idle_mask |= CR_INT_CLOCK; /* * The counter register acts like timer which is incremented as ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#8 (text+ko) ==== @@ -565,7 +565,7 @@ */ la gp, _C_LABEL(_gp) addu a0, sp, STAND_ARG_SIZE - la k0, _C_LABEL(mips_interrupt) + la k0, _C_LABEL(cpu_intr) jalr k0 sw a3, STAND_RA_OFFSET + KERN_REG_SIZE(sp) /* @@ -649,7 +649,7 @@ /* * Call the interrupt handler. */ - la k0, _C_LABEL(mips_interrupt) + la k0, _C_LABEL(cpu_intr) jalr k0 sw a3, STAND_RA_OFFSET(sp) # for debugging ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/interrupt.c#6 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD$ */ +#define DEBUG_INTR /*- * Copyright (c) 2001 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -150,15 +151,14 @@ pending = trapframe->cause & CR_IPEND & trapframe->sr; #ifdef DEBUG_INTR - printf("mips_interrupt(1): trapframe->cause = %x, pending = %x, ipending = %x, pcpl =%x, trapframe->ic = %x\n", - trapframe->cause, pending, ipending, pcpl, trapframe->ic); + printf("mips_interrupt(1): trapframe->cause = %x, pending = %x\n", + trapframe->cause, pending); #endif cause = pending; #ifdef DEBUG_INTR - printf("mips_interrupt(2): cause = %x, ipending = %x, pcpl = %x\n", - cause, ipending, pcpl); + printf("mips_interrupt(2): cause = %x\n", cause); #endif /* * generic clock intr handler to cover clockintr() and rtcintr(). @@ -204,9 +204,9 @@ * Reenable all non served hardware levels. */ #ifdef DEBUG_INTR - printf("3 sr = %x, cause = %x, spl = %x, ipending = %x\n", + printf("3 sr = %x, cause = %x, spl = %x\n", trapframe->sr, cause, - (trapframe->sr & ~cause & SR_INT_MASK) | SR_INT_ENAB, ipending); + (trapframe->sr & ~cause & SR_INT_MASK) | SR_INT_ENAB); #endif if (pending & SOFT_INT_MASK_0) { ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/intr_machdep.c#2 (text+ko) ==== @@ -60,6 +60,7 @@ struct intr_event *event; int error; + printf("Establish HARD IRQ %d: filt %p handler %p arg %p\n", irq, filt, handler, arg); if (irq < 0 || irq > NHARD_IRQS) panic("%s called for unknown hard intr %d", __func__, irq); @@ -96,6 +97,7 @@ struct intr_event *event; int error; + printf("Establish SOFT IRQ %d: filt %p handler %p arg %p\n", irq, filt, handler, arg); if (irq < 0 || irq > NSOFT_IRQS) panic("%s called for unknown hard intr %d", __func__, irq); ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#11 (text+ko) ==== @@ -302,7 +302,8 @@ pcb2->pcb_context.val[1] = (register_t)td; pcb2->pcb_context.val[2] = (register_t)td->td_frame; /* Dont set IE bit in SR. sched lock release will take care of it */ - pcb2->pcb_context.val[11] = (ALL_INT_MASK & idle_mask); +/* idle_mask is jmips pcb2->pcb_context.val[11] = (ALL_INT_MASK & idle_mask); */ + pcb2->pcb_context.val[11] = 0; /* * FREEBSD_DEVELOPERS_FIXME: @@ -346,7 +347,8 @@ tf->a0 = (register_t)arg; tf->sr = SR_KSU_USER | SR_EXL; - tf->sr |= (ALL_INT_MASK & idle_mask) | SR_INT_ENAB; +/* tf->sr |= (ALL_INT_MASK & idle_mask) | SR_INT_ENAB; */ + /**XXX the above may now be wrong -- mips2 implements this as panic */ /* * FREEBSD_DEVELOPERS_FIXME: * Setup any other CPU-Specific registers (Not MIPS Standard) From owner-p4-projects@FreeBSD.ORG Sun Jan 27 23:00:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A42316A418; Sun, 27 Jan 2008 23:00:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A978916A41B for ; Sun, 27 Jan 2008 23:00:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 98C4613C45A for ; Sun, 27 Jan 2008 23:00:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RN0Ars059988 for ; Sun, 27 Jan 2008 23:00:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RMxshC059917 for perforce@freebsd.org; Sun, 27 Jan 2008 22:59:54 GMT (envelope-from jb@freebsd.org) Date: Sun, 27 Jan 2008 22:59:54 GMT Message-Id: <200801272259.m0RMxshC059917@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134255 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 23:00:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=134255 Change 134255 by jb@jb_freebsd1 on 2008/01/27 22:59:44 IF7 Affected files ... .. //depot/projects/dtrace7/src/COPYRIGHT#2 integrate .. //depot/projects/dtrace7/src/Makefile.inc1#3 integrate .. //depot/projects/dtrace7/src/bin/mv/mv.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/dtrace7/src/contrib/gcc/fold-const.c#2 integrate .. //depot/projects/dtrace7/src/contrib/gcc/gthr-posix.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/CREDITS#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/HISTORY#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/INSTALL#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/LICENSE#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/MANIFEST#2 delete .. //depot/projects/dtrace7/src/contrib/openpam/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/README#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/aclocal.m4#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/autogen.sh#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/bin/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/bin/su/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/bin/su/su.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/compile#1 branch .. //depot/projects/dtrace7/src/contrib/openpam/config.h.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/configure#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/configure.ac#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/configure.in#2 delete .. //depot/projects/dtrace7/src/contrib/openpam/depcomp#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/openpam_attr.h#1 branch .. //depot/projects/dtrace7/src/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/pam_modules.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/install-sh#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_findenv.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_free_envlist.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_get_option.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_load.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_log.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_nullconv.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_set_option.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_static.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_ttyconv.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_acct_mgmt.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_authenticate.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_authenticate_secondary.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_chauthtok.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_close_session.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_end.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_error.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_get_authtok.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_get_data.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_get_item.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_get_mapped_authtok.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_get_mapped_username.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_get_user.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_getenv.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_getenvlist.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_info.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_open_session.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_prompt.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_putenv.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_set_data.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_set_item.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_set_mapped_authtok.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_set_mapped_username.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_setcred.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_setenv.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_acct_mgmt.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_authenticate.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_authenticate_secondary.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_chauthtok.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_close_session.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_get_mapped_username.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_open_session.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_set_mapped_username.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_setcred.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_start.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_strerror.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_verror.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_vinfo.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/ltconfig#2 delete .. //depot/projects/dtrace7/src/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/misc/gendoc.pl#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/missing#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/mkinstalldirs#2 delete .. //depot/projects/dtrace7/src/contrib/openpam/modules/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_permit/pam_permit.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/stamp-h.in#2 delete .. //depot/projects/dtrace7/src/etc/defaults/periodic.conf#3 integrate .. //depot/projects/dtrace7/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/dtrace7/src/etc/gss/mech#2 integrate .. //depot/projects/dtrace7/src/etc/namedb/named.conf#2 integrate .. //depot/projects/dtrace7/src/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/hostapd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ldconfig#2 integrate .. //depot/projects/dtrace7/src/etc/rc.firewall#2 integrate .. //depot/projects/dtrace7/src/etc/rc.firewall6#2 integrate .. //depot/projects/dtrace7/src/lib/libc/gdtoa/_ldtoa.c#2 integrate .. //depot/projects/dtrace7/src/lib/libc/gen/sem_open.3#2 integrate .. //depot/projects/dtrace7/src/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/dtrace7/src/lib/libc/stdlib/grantpt.c#3 integrate .. //depot/projects/dtrace7/src/lib/libc/stdlib/heapsort.c#2 integrate .. //depot/projects/dtrace7/src/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/Makefile#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/common.c#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/common.h#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/fetch.3#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/fetch.c#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/file.c#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/ftp.c#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/http.c#2 integrate .. //depot/projects/dtrace7/src/lib/libpam/libpam/Makefile#2 integrate .. //depot/projects/dtrace7/src/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/dtrace7/src/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate .. //depot/projects/dtrace7/src/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate .. //depot/projects/dtrace7/src/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/dtrace7/src/lib/libstand/Makefile#2 integrate .. //depot/projects/dtrace7/src/lib/libutil/pty.3#2 integrate .. //depot/projects/dtrace7/src/lib/libutil/pty.c#4 integrate .. //depot/projects/dtrace7/src/release/Makefile#4 integrate .. //depot/projects/dtrace7/src/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate .. //depot/projects/dtrace7/src/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/dtrace7/src/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/dtrace7/src/release/doc/zh_CN.GB2312/hardware/article.sgml#2 integrate .. //depot/projects/dtrace7/src/release/doc/zh_CN.GB2312/relnotes/article.sgml#2 integrate .. //depot/projects/dtrace7/src/release/fixit.profile#3 integrate .. //depot/projects/dtrace7/src/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/dtrace7/src/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/dtrace7/src/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/dtrace7/src/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/dtrace7/src/release/scripts/package-split.py#2 integrate .. //depot/projects/dtrace7/src/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/dtrace7/src/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/dtrace7/src/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/dtrace7/src/sbin/gpt/Makefile#2 integrate .. //depot/projects/dtrace7/src/sbin/gpt/add.c#2 integrate .. //depot/projects/dtrace7/src/sbin/gpt/boot.c#1 branch .. //depot/projects/dtrace7/src/sbin/gpt/gpt.8#2 integrate .. //depot/projects/dtrace7/src/sbin/gpt/gpt.c#2 integrate .. //depot/projects/dtrace7/src/sbin/gpt/gpt.h#2 integrate .. //depot/projects/dtrace7/src/sbin/gpt/show.c#2 integrate .. //depot/projects/dtrace7/src/sbin/growfs/growfs.c#2 integrate .. //depot/projects/dtrace7/src/sbin/mount_ntfs/mount_ntfs.8#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/Makefile#3 integrate .. //depot/projects/dtrace7/src/share/man/man4/coda.4#1 branch .. //depot/projects/dtrace7/src/share/man/man4/edsc.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/hptrr.4#1 branch .. //depot/projects/dtrace7/src/share/man/man4/ipmi.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/lagg.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/mxge.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/snd_envy24.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/syncache.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/wpi.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/dtrace7/src/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/dtrace7/src/share/man/man5/src.conf.5#2 integrate .. //depot/projects/dtrace7/src/share/man/man7/ports.7#2 integrate .. //depot/projects/dtrace7/src/share/man/man9/mbuf_tags.9#2 integrate .. //depot/projects/dtrace7/src/share/misc/bsd-family-tree#2 integrate .. //depot/projects/dtrace7/src/share/misc/iso3166#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.own.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/sys.mk#4 integrate .. //depot/projects/dtrace7/src/share/zoneinfo/asia#2 integrate .. //depot/projects/dtrace7/src/share/zoneinfo/backward#2 integrate .. //depot/projects/dtrace7/src/share/zoneinfo/europe#2 integrate .. //depot/projects/dtrace7/src/share/zoneinfo/northamerica#2 integrate .. //depot/projects/dtrace7/src/share/zoneinfo/southamerica#2 integrate .. //depot/projects/dtrace7/src/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/dtrace7/src/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/support.S#2 integrate .. //depot/projects/dtrace7/src/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/dtrace7/src/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/dtrace7/src/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/dtrace7/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/dtrace7/src/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/dtrace7/src/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/dtrace7/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/dtrace7/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/dtrace7/src/sys/conf/files.amd64#3 integrate .. //depot/projects/dtrace7/src/sys/conf/files.i386#3 integrate .. //depot/projects/dtrace7/src/sys/conf/newvers.sh#4 integrate .. //depot/projects/dtrace7/src/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/dtrace7/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/array.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/him.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/hptintf.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/ldm.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/list.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/osm.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/dtrace7/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/dtrace7/src/sys/fs/coda/cnode.h#2 integrate .. //depot/projects/dtrace7/src/sys/fs/coda/coda_namecache.h#2 integrate .. //depot/projects/dtrace7/src/sys/fs/coda/coda_psdev.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/dtrace7/src/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/dtrace7/src/sys/geom/part/g_part.c#2 integrate .. //depot/projects/dtrace7/src/sys/geom/part/g_part.h#2 integrate .. //depot/projects/dtrace7/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/dtrace7/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/dtrace7/src/sys/i386/conf/PAE#2 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/dtrace7/src/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/dtrace7/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_kse.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_module.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_proc.c#5 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_thread.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/sched_ule.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/tty.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/tty_pty.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/dtrace7/src/sys/modules/Makefile#3 integrate .. //depot/projects/dtrace7/src/sys/modules/geom/Makefile#2 integrate .. //depot/projects/dtrace7/src/sys/modules/hptrr/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/net/if_bridge.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/if_enc.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/if_lagg.c#3 integrate .. //depot/projects/dtrace7/src/sys/net/route.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/route.h#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/dtrace7/src/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/dtrace7/src/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/dtrace7/src/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/pci/amdsmb.c#2 integrate .. //depot/projects/dtrace7/src/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/dtrace7/src/sys/pci/nfsmb.c#2 integrate .. //depot/projects/dtrace7/src/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/dtrace7/src/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/dtrace7/src/sys/sys/copyright.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/gpt.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/param.h#4 integrate .. //depot/projects/dtrace7/src/sys/sys/proc.h#4 integrate .. //depot/projects/dtrace7/src/sys/sys/signal.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/signalvar.h#2 integrate .. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/dtrace7/src/sys/vm/pmap.h#2 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_extern.h#2 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_glue.c#2 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_kern.c#2 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_map.c#2 integrate .. //depot/projects/dtrace7/src/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate .. //depot/projects/dtrace7/src/tools/build/options/WITHOUT_FORTRAN#2 delete .. //depot/projects/dtrace7/src/usr.bin/fetch/fetch.1#2 integrate .. //depot/projects/dtrace7/src/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/netstat/inet.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/systat/ifstat.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/inetd/inetd.8#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/iostat/iostat.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/mergemaster/mergemaster.sh#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/mtree/verify.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/version/pkg_version.1#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/ppp/auth.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pw/pw.8#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/dist.c#3 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/dist.h#3 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/index.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/main.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/menus.c#3 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/sysinstall.h#2 integrate Differences ... ==== //depot/projects/dtrace7/src/COPYRIGHT#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/COPYRIGHT,v 1.8 2006/12/31 16:34:16 delphij Exp $ +# $FreeBSD: src/COPYRIGHT,v 1.8.2.1 2008/01/01 09:35:58 imp Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (C) 1992-2007 The FreeBSD Project. All rights reserved. +Copyright (C) 1992-2008 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/dtrace7/src/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.588.2.2 2007/10/11 12:34:40 kensmith Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.588.2.3 2008/01/21 18:49:04 brueffer Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -229,7 +229,7 @@ # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - -DWITHOUT_FORTRAN -DWITHOUT_GDB + -DWITHOUT_GDB # world stage WMAKEENV= ${CROSSENV} \ ==== //depot/projects/dtrace7/src/bin/mv/mv.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.46 2005/09/05 04:36:08 csjp Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.46.2.1 2008/01/27 07:38:39 dds Exp $"); #include #include @@ -65,6 +65,9 @@ #include #include +/* Exit code for a failed exec. */ +#define EXEC_FAILED 127 + int fflg, iflg, nflg, vflg; int copy(char *, char *); @@ -198,6 +201,11 @@ } } } + /* + * Rename on FreeBSD will fail with EISDIR and ENOTDIR, before failing + * with EXDEV. Therefore, copy() doesn't have to perform the checks + * specified in the Step 3 of the POSIX mv specification. + */ if (!rename(from, to)) { if (vflg) printf("%s -> %s\n", from, to); @@ -219,7 +227,7 @@ if (!S_ISLNK(sb.st_mode)) { /* Can't mv(1) a mount point. */ if (realpath(from, path) == NULL) { - warnx("cannot resolve %s: %s", from, path); + warn("cannot resolve %s: %s", from, path); return (1); } if (!statfs(path, &sfs) && @@ -252,9 +260,9 @@ struct timeval tval[2]; static u_int blen; static char *bp; + acl_t acl; mode_t oldmode; int nread, from_fd, to_fd; - acl_t acl; if ((from_fd = open(from, O_RDONLY, 0)) < 0) { warn("%s", from); @@ -305,7 +313,7 @@ } /* * POSIX 1003.2c states that if _POSIX_ACL_EXTENDED is in effect - * for dest_file, then it's ACLs shall reflect the ACLs of the + * for dest_file, then its ACLs shall reflect the ACLs of the * source_file. */ if (fpathconf(to_fd, _PC_ACL_EXTENDED) == 1 && @@ -355,43 +363,76 @@ int copy(char *from, char *to) { + struct stat sb; int pid, status; - if ((pid = fork()) == 0) { + if (lstat(to, &sb) == 0) { + /* Destination path exists. */ + if (S_ISDIR(sb.st_mode)) { + if (rmdir(to) != 0) { + warn("rmdir %s", to); + return (1); + } + } else { + if (unlink(to) != 0) { + warn("unlink %s", to); + return (1); + } + } + } else if (errno != ENOENT) { + warn("%s", to); + return (1); + } + + /* Copy source to destination. */ + if (!(pid = vfork())) { execl(_PATH_CP, "mv", vflg ? "-PRpv" : "-PRp", "--", from, to, (char *)NULL); - warn("%s", _PATH_CP); - _exit(1); + _exit(EXEC_FAILED); } if (waitpid(pid, &status, 0) == -1) { - warn("%s: waitpid", _PATH_CP); + warn("%s %s %s: waitpid", _PATH_CP, from, to); return (1); } if (!WIFEXITED(status)) { - warnx("%s: did not terminate normally", _PATH_CP); + warnx("%s %s %s: did not terminate normally", + _PATH_CP, from, to); return (1); } - if (WEXITSTATUS(status)) { - warnx("%s: terminated with %d (non-zero) status", - _PATH_CP, WEXITSTATUS(status)); + switch (WEXITSTATUS(status)) { + case 0: + break; + case EXEC_FAILED: + warnx("%s %s %s: exec failed", _PATH_CP, from, to); + return (1); + default: + warnx("%s %s %s: terminated with %d (non-zero) status", + _PATH_CP, from, to, WEXITSTATUS(status)); return (1); } + + /* Delete the source. */ if (!(pid = vfork())) { execl(_PATH_RM, "mv", "-rf", "--", from, (char *)NULL); - warn("%s", _PATH_RM); - _exit(1); + _exit(EXEC_FAILED); } if (waitpid(pid, &status, 0) == -1) { - warn("%s: waitpid", _PATH_RM); + warn("%s %s: waitpid", _PATH_RM, from); return (1); } if (!WIFEXITED(status)) { - warnx("%s: did not terminate normally", _PATH_RM); + warnx("%s %s: did not terminate normally", _PATH_RM, from); return (1); } - if (WEXITSTATUS(status)) { - warnx("%s: terminated with %d (non-zero) status", - _PATH_RM, WEXITSTATUS(status)); + switch (WEXITSTATUS(status)) { + case 0: + break; + case EXEC_FAILED: + warnx("%s %s: exec failed", _PATH_RM, from); + return (1); + default: + warnx("%s %s: terminated with %d (non-zero) status", + _PATH_RM, from, WEXITSTATUS(status)); return (1); } return (0); ==== //depot/projects/dtrace7/src/contrib/cvs/src/parseinfo.c#2 (text+ko) ==== @@ -5,7 +5,7 @@ * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS source distribution. * - * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.3 2004/04/15 01:17:27 peter Exp $ + * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.3.18.1 2008/01/07 09:02:02 peter Exp $ */ #include "cvs.h" @@ -429,6 +429,16 @@ else if (strcmp (p, "stat") == 0) RereadLogAfterVerify = LOGMSG_REREAD_STAT; } + else if (strcmp(line, "LocalKeyword") == 0) + { + /* Recognize cvs-1.12-style keyword control rather than erroring out. */ + RCS_setlocalid(p); + } + else if (strcmp(line, "KeywordExpand") == 0) + { + /* Recognize cvs-1.12-style keyword control rather than erroring out. */ + RCS_setincexc(p); + } else { /* We may be dealing with a keyword which was added in a ==== //depot/projects/dtrace7/src/contrib/gcc/fold-const.c#2 (text+ko) ==== @@ -5661,6 +5661,9 @@ } break; } + /* If the constant is negative, we cannot simplify this. */ + if (tree_int_cst_sgn (c) == -1) + break; /* FALLTHROUGH */ case NEGATE_EXPR: if ((t1 = extract_muldiv (op0, c, code, wide_type, strict_overflow_p)) ==== //depot/projects/dtrace7/src/contrib/gcc/gthr-posix.h#2 (text+ko) ==== @@ -152,9 +152,12 @@ it is passed so we cannot pretend that the interface is active if -pthreads is not specified. On Solaris 2.5.1, the interface is not exposed at all so we need to play the usual game with weak symbols. On Solaris 10 and up, a - working interface is always exposed. */ + working interface is always exposed. On FreeBSD 6 and later, libc also + exposes a dummy POSIX threads interface, similar to what Solaris 2.6 up + to 9 does. FreeBSD >= 700014 even provides a pthread_cancel stub in libc, + which means the alternate __gthread_active_p below cannot be used there. */ -#if defined(__sun) && defined(__svr4__) +#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__)) static volatile int __gthread_active = -1; @@ -197,7 +200,7 @@ return __gthread_active_latest_value != 0; } -#else /* not Solaris */ +#else /* neither FreeBSD nor Solaris */ static inline int __gthread_active_p (void) @@ -207,7 +210,7 @@ return __gthread_active_ptr != 0; } -#endif /* Solaris */ +#endif /* FreeBSD or Solaris */ #else /* not SUPPORTS_WEAK */ ==== //depot/projects/dtrace7/src/contrib/openpam/CREDITS#2 (text) ==== @@ -14,6 +14,7 @@ Andrew Morgan Brian Fundakowski Feldman Christos Zoulas + Daniel Richard G. Darren J. Moffat Dmitry V. Levin Emmanuel Dreyfus @@ -24,11 +25,13 @@ Hubert Feyrer Mark Murray Mike Petullo + Mikhail Teterin Mikko Työläjärvi Robert Watson Ruslan Ermilov Solar Designer Takanori Saneto + Wojciech A. Koszek Yar Tikhiy -$P4: //depot/projects/openpam/CREDITS#12 $ +$Id: CREDITS 400 2007-10-24 15:04:23Z des $ ==== //depot/projects/dtrace7/src/contrib/openpam/HISTORY#2 (text) ==== @@ -1,4 +1,27 @@ -OpenPAM Figwort 2005-06-16 +OpenPAM Hydrangea 2007-12-21 + + - ENHANCE: when compiling with GCC, mark up API functions with GCC + attributes where appropriate. + + - BUGFIX: fixed numerous warnings uncovered by GCC 4. + + - ENHANCE: building the documentation is now optional. + + - ENHANCE: corrected a number of mistakes and style issues in the + build system. + + - ENHANCE: API function arguments are now const where appropriate, to + match corresponding changes in the Solaris PAM and Linux-PAM APIs. + + - ENHANCE: corrected a number of C namespace violations. + + - ENHANCE: the module cache has been removed, allowing long-lived + applications to pick up module changes. This also allows multiple + threads to use PAM simultaneously (as long as they use separate PAM + contexts), since the module cache was the only part of OpenPAM that + was not thread-safe. +============================================================================ +OpenPAM Figwort 2005-06-16 - BUGFIX: Correct several small signedness and initialization bugs discovered during review by the NetBSD team. @@ -304,4 +327,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#24 $ +$Id: HISTORY 409 2007-12-21 11:38:50Z des $ ==== //depot/projects/dtrace7/src/contrib/openpam/INSTALL#2 (text) ==== @@ -16,23 +16,29 @@ Use the "configure" shell script to configure OpenPAM for your system. Options include: + --enable-debug + Turn debugging on by default. + --with-modules-dir=DIR Indicates the directory where PAM modules will be installed. This option should not be used if you intend to install PAM modules in the system library directory. - --with-pam-su - Builds the sample PAM application. + --without-doc + Skips the documentation. --with-pam-unix Builds the sample PAM module. + --with-su + Builds the sample su(1) implementation. + For more information about configuration options, use the --help option. A typical invocation might look like this: - # ./configure --with-pam-su --with-pam-unix + # ./configure --with-pam-unix --with-su 3. COMPILATION @@ -49,4 +55,4 @@ # make install -$P4: //depot/projects/openpam/INSTALL#4 $ +$Id: INSTALL 388 2006-04-12 10:31:52Z des $ ==== //depot/projects/dtrace7/src/contrib/openpam/LICENSE#2 (text) ==== @@ -1,5 +1,6 @@ Copyright (c) 2002-2003 Networks Associates Technology, Inc. +Copyright (c) 2004-2007 Dag-Erling Smørgrav All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,4 +32,4 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$P4: //depot/projects/openpam/LICENSE#6 $ +$Id: LICENSE 408 2007-12-21 11:36:24Z des $ ==== //depot/projects/dtrace7/src/contrib/openpam/Makefile.am#2 (text) ==== @@ -1,5 +1,17 @@ -# $P4: //depot/projects/openpam/Makefile.am#3 $ +# $Id: Makefile.am 395 2007-06-03 20:26:18Z des $ + +SUBDIRS = lib bin modules include -SUBDIRS = lib bin modules doc include +if WITH_DOC +SUBDIRS += doc +endif -EXTRA_DIST = CREDITS HISTORY INSTALL LICENSE MANIFEST README RELNOTES +EXTRA_DIST = \ + CREDITS \ + HISTORY \ + INSTALL \ + LICENSE \ + README \ + RELNOTES \ + autogen.sh \ + misc/gendoc.pl ==== //depot/projects/dtrace7/src/contrib/openpam/Makefile.in#2 (text) ==== @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,7 +14,7 @@ @SET_MAKE@ -# $P4: //depot/projects/openpam/Makefile.am#3 $ +# $Id: Makefile.am 395 2007-06-03 20:26:18Z des $ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -38,6 +38,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@WITH_DOC_TRUE@am__append_1 = doc DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure INSTALL compile config.guess \ @@ -49,7 +50,7 @@ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno -mkinstalldirs = $(mkdir_p) +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = SOURCES = @@ -62,7 +63,7 @@ uninstall-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = lib bin modules include doc DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -105,6 +106,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -127,20 +129,20 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -WITH_PAM_SU_FALSE = @WITH_PAM_SU_FALSE@ -WITH_PAM_SU_TRUE = @WITH_PAM_SU_TRUE@ +WITH_DOC_FALSE = @WITH_DOC_FALSE@ +WITH_DOC_TRUE = @WITH_DOC_TRUE@ WITH_PAM_UNIX_FALSE = @WITH_PAM_UNIX_FALSE@ WITH_PAM_UNIX_TRUE = @WITH_PAM_UNIX_TRUE@ -ac_ct_AR = @ac_ct_AR@ +WITH_SU_FALSE = @WITH_SU_FALSE@ +WITH_SU_TRUE = @WITH_SU_TRUE@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -148,6 +150,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -155,23 +159,30 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -180,8 +191,17 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -SUBDIRS = lib bin modules doc include -EXTRA_DIST = CREDITS HISTORY INSTALL LICENSE MANIFEST README RELNOTES +SUBDIRS = lib bin modules include $(am__append_1) +EXTRA_DIST = \ + CREDITS \ + HISTORY \ + INSTALL \ + LICENSE \ + README \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 27 23:09:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6CAA16A41A; Sun, 27 Jan 2008 23:09:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8AD2116A418 for ; Sun, 27 Jan 2008 23:09:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7A16D13C447 for ; Sun, 27 Jan 2008 23:09:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RN9Xil061475 for ; Sun, 27 Jan 2008 23:09:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RN9JQG061472 for perforce@freebsd.org; Sun, 27 Jan 2008 23:09:19 GMT (envelope-from jb@freebsd.org) Date: Sun, 27 Jan 2008 23:09:19 GMT Message-Id: <200801272309.m0RN9JQG061472@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134256 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 23:09:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=134256 Change 134256 by jb@jb_freebsd1 on 2008/01/27 23:09:06 IF6 Affected files ... .. //depot/projects/dtrace6/src/COPYRIGHT#2 integrate .. //depot/projects/dtrace6/src/ObsoleteFiles.inc#2 integrate .. //depot/projects/dtrace6/src/bin/mv/mv.c#2 integrate .. //depot/projects/dtrace6/src/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/dtrace6/src/contrib/file/ChangeLog#2 integrate .. //depot/projects/dtrace6/src/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/dtrace6/src/contrib/file/LEGAL.NOTICE#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Localstuff#2 integrate .. //depot/projects/dtrace6/src/contrib/file/MAINT#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/amigaos#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/animation#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/apple#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/archive#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/audio#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/basis#1 branch .. //depot/projects/dtrace6/src/contrib/file/Magdir/bflt#1 branch .. //depot/projects/dtrace6/src/contrib/file/Magdir/bout#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/btsnoop#1 branch .. //depot/projects/dtrace6/src/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/c64#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/cad#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/cafebabe#1 branch .. //depot/projects/dtrace6/src/contrib/file/Magdir/commands#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/compress#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/console#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/cracklib#1 branch .. //depot/projects/dtrace6/src/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/database#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/diff#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/digital#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/dump#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/editors#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/elf#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/flash#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/iff#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/images#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/java#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/linux#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/mach#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/maple#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/mime#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/mips#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/mup#1 branch .. //depot/projects/dtrace6/src/contrib/file/Magdir/ncr#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/os2#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/os400#1 branch .. //depot/projects/dtrace6/src/contrib/file/Magdir/perl#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/printer#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/psion#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/python#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/revision#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/riff#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/scientific#1 branch .. //depot/projects/dtrace6/src/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/sql#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/sun#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/sysex#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/tex#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/tgif#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/unicode#1 branch .. //depot/projects/dtrace6/src/contrib/file/Magdir/varied.out#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/vmware#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/xwindows#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Makefile.am#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/file/README#2 integrate .. //depot/projects/dtrace6/src/contrib/file/aclocal.m4#2 integrate .. //depot/projects/dtrace6/src/contrib/file/apprentice.c#2 integrate .. //depot/projects/dtrace6/src/contrib/file/apptype.c#2 integrate .. //depot/projects/dtrace6/src/contrib/file/ascmagic.c#2 integrate .. //depot/projects/dtrace6/src/contrib/file/compress.c#2 integrate .. //depot/projects/dtrace6/src/contrib/file/config.h.in#2 integrate .. //depot/projects/dtrace6/src/contrib/file/configure#2 integrate .. //depot/projects/dtrace6/src/contrib/file/configure.in#2 integrate .. //depot/projects/dtrace6/src/contrib/file/file.c#2 integrate .. //depot/projects/dtrace6/src/contrib/file/file.h#2 integrate .. //depot/projects/dtrace6/src/contrib/file/file.man#2 integrate .. //depot/projects/dtrace6/src/contrib/file/fsmagic.c#2 integrate .. //depot/projects/dtrace6/src/contrib/file/funcs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/file/install-sh#2 integrate .. //depot/projects/dtrace6/src/contrib/file/is_tar.c#2 integrate .. //depot/projects/dtrace6/src/contrib/file/libmagic.man#2 integrate .. //depot/projects/dtrace6/src/contrib/file/magic.c#2 integrate .. //depot/projects/dtrace6/src/contrib/file/magic.h#2 integrate .. //depot/projects/dtrace6/src/contrib/file/magic.man#2 integrate .. //depot/projects/dtrace6/src/contrib/file/magic.mime#2 integrate .. //depot/projects/dtrace6/src/contrib/file/magic2mime#2 integrate .. //depot/projects/dtrace6/src/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/dtrace6/src/contrib/file/names.h#2 integrate .. //depot/projects/dtrace6/src/contrib/file/patchlevel.h#2 integrate .. //depot/projects/dtrace6/src/contrib/file/print.c#2 integrate .. //depot/projects/dtrace6/src/contrib/file/readelf.c#2 integrate .. //depot/projects/dtrace6/src/contrib/file/readelf.h#2 integrate .. //depot/projects/dtrace6/src/contrib/file/softmagic.c#2 integrate .. //depot/projects/dtrace6/src/contrib/file/tar.h#2 integrate .. //depot/projects/dtrace6/src/contrib/file/test.c#2 integrate .. //depot/projects/dtrace6/src/etc/defaults/periodic.conf#3 integrate .. //depot/projects/dtrace6/src/etc/defaults/rc.conf#3 integrate .. //depot/projects/dtrace6/src/etc/namedb/named.conf#2 integrate .. //depot/projects/dtrace6/src/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ldconfig#3 integrate .. //depot/projects/dtrace6/src/etc/rc.firewall#2 integrate .. //depot/projects/dtrace6/src/etc/rc.firewall6#2 integrate .. //depot/projects/dtrace6/src/lib/libc/gen/sem_open.3#2 integrate .. //depot/projects/dtrace6/src/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/stdlib/grantpt.c#2 integrate .. //depot/projects/dtrace6/src/lib/libfetch/Makefile#2 integrate .. //depot/projects/dtrace6/src/lib/libfetch/common.c#2 integrate .. //depot/projects/dtrace6/src/lib/libfetch/common.h#2 integrate .. //depot/projects/dtrace6/src/lib/libfetch/fetch.3#2 integrate .. //depot/projects/dtrace6/src/lib/libfetch/fetch.c#2 integrate .. //depot/projects/dtrace6/src/lib/libfetch/file.c#2 integrate .. //depot/projects/dtrace6/src/lib/libfetch/ftp.c#2 integrate .. //depot/projects/dtrace6/src/lib/libfetch/http.c#2 integrate .. //depot/projects/dtrace6/src/lib/libmagic/Makefile#2 integrate .. //depot/projects/dtrace6/src/lib/libmagic/config.h#2 integrate .. //depot/projects/dtrace6/src/lib/libstand/Makefile#3 integrate .. //depot/projects/dtrace6/src/lib/libstand/bzipfs.c#2 integrate .. //depot/projects/dtrace6/src/lib/libstand/gzipfs.c#2 integrate .. //depot/projects/dtrace6/src/lib/libutil/pty.3#2 integrate .. //depot/projects/dtrace6/src/lib/libutil/pty.c#3 integrate .. //depot/projects/dtrace6/src/release/Makefile#3 integrate .. //depot/projects/dtrace6/src/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#6 integrate .. //depot/projects/dtrace6/src/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/dtrace6/src/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/dtrace6/src/release/fixit.profile#3 integrate .. //depot/projects/dtrace6/src/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/dtrace6/src/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/dtrace6/src/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/dtrace6/src/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/dtrace6/src/release/scripts/package-split.py#3 integrate .. //depot/projects/dtrace6/src/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/dtrace6/src/sbin/gpt/Makefile#2 integrate .. //depot/projects/dtrace6/src/sbin/gpt/add.c#2 integrate .. //depot/projects/dtrace6/src/sbin/gpt/boot.c#1 branch .. //depot/projects/dtrace6/src/sbin/gpt/gpt.8#2 integrate .. //depot/projects/dtrace6/src/sbin/gpt/gpt.c#3 integrate .. //depot/projects/dtrace6/src/sbin/gpt/gpt.h#2 integrate .. //depot/projects/dtrace6/src/sbin/gpt/show.c#2 integrate .. //depot/projects/dtrace6/src/sbin/mount_ntfs/mount_ntfs.8#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/Makefile#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/coretemp.4#1 branch .. //depot/projects/dtrace6/src/share/man/man4/edsc.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/hptrr.4#1 branch .. //depot/projects/dtrace6/src/share/man/man4/ipmi.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/lagg.4#3 integrate .. //depot/projects/dtrace6/src/share/man/man4/mxge.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/snd_envy24.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/dtrace6/src/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/dtrace6/src/share/man/man7/ports.7#2 integrate .. //depot/projects/dtrace6/src/share/man/man9/Makefile#2 integrate .. //depot/projects/dtrace6/src/share/man/man9/mbuf_tags.9#2 integrate .. //depot/projects/dtrace6/src/share/man/man9/sleep.9#2 integrate .. //depot/projects/dtrace6/src/share/misc/bsd-family-tree#2 integrate .. //depot/projects/dtrace6/src/share/misc/iso3166#2 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/asia#3 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/backward#2 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/europe#2 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/northamerica#2 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/southamerica#3 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/dtrace6/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/dtrace6/src/sys/arm/arm/support.S#2 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/dtrace6/src/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/dtrace6/src/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/dtrace6/src/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/dtrace6/src/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/dtrace6/src/sys/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/dtrace6/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/dtrace6/src/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/dtrace6/src/sys/conf/files.amd64#4 integrate .. //depot/projects/dtrace6/src/sys/conf/files.i386#4 integrate .. //depot/projects/dtrace6/src/sys/conf/newvers.sh#3 integrate .. //depot/projects/dtrace6/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/dtrace6/src/sys/dev/hptrr/array.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/hptrr/him.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/hptrr/hptintf.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/dtrace6/src/sys/dev/hptrr/ldm.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/hptrr/list.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/hptrr/osm.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/dtrace6/src/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/dtrace6/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/dtrace6/src/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/dtrace6/src/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/dtrace6/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/dtrace6/src/sys/i386/conf/PAE#2 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_module.c#2 integrate .. //depot/projects/dtrace6/src/sys/modules/Makefile#4 integrate .. //depot/projects/dtrace6/src/sys/modules/hptrr/Makefile#1 branch .. //depot/projects/dtrace6/src/sys/net/if_bridge.c#3 integrate .. //depot/projects/dtrace6/src/sys/net/if_enc.c#2 integrate .. //depot/projects/dtrace6/src/sys/net/if_lagg.c#4 integrate .. //depot/projects/dtrace6/src/sys/net/route.c#3 integrate .. //depot/projects/dtrace6/src/sys/net/route.h#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/dtrace6/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/dtrace6/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/dtrace6/src/sys/netinet/tcp.h#2 integrate .. //depot/projects/dtrace6/src/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/dtrace6/src/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/dtrace6/src/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/dtrace6/src/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/dtrace6/src/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/dtrace6/src/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/dtrace6/src/sys/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/dtrace6/src/sys/sys/copyright.h#2 integrate .. //depot/projects/dtrace6/src/sys/sys/gpt.h#2 integrate .. //depot/projects/dtrace6/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/dtrace6/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/dtrace6/src/usr.bin/fetch/fetch.1#2 integrate .. //depot/projects/dtrace6/src/usr.bin/file/config.h#2 integrate .. //depot/projects/dtrace6/src/usr.bin/file/file.1#2 integrate .. //depot/projects/dtrace6/src/usr.bin/file/magic.5#2 integrate .. //depot/projects/dtrace6/src/usr.bin/netstat/inet.c#3 integrate .. //depot/projects/dtrace6/src/usr.bin/split/split.1#2 integrate .. //depot/projects/dtrace6/src/usr.bin/systat/ifstat.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/inetd/inetd.8#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/iostat/iostat.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/mergemaster/mergemaster.sh#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/ntp/Makefile#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/ntp/doc/Makefile#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/pw/pw.8#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/sysinstall/dist.c#4 integrate .. //depot/projects/dtrace6/src/usr.sbin/sysinstall/dist.h#4 integrate .. //depot/projects/dtrace6/src/usr.sbin/sysinstall/index.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/sysinstall/main.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/sysinstall/menus.c#4 integrate Differences ... ==== //depot/projects/dtrace6/src/COPYRIGHT#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/COPYRIGHT,v 1.6.2.2 2006/12/31 16:35:28 delphij Exp $ +# $FreeBSD: src/COPYRIGHT,v 1.6.2.3 2007/12/31 22:12:07 delphij Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (C) 1992-2007 The FreeBSD Project. All rights reserved. +Copyright (C) 1992-2008 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/dtrace6/src/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.25.2.20 2007/07/21 00:01:09 truckman Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.25.2.21 2007/12/19 17:08:34 obrien Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -553,7 +553,6 @@ OLD_FILES+=usr/lib/libpam_ssh_p.a OLD_FILES+=usr/bin/help OLD_FILES+=usr/bin/sccs -OLD_FILES+=usr/bin/gdbserver OLD_FILES+=usr/bin/ssh-keysign OLD_FILES+=usr/sbin/gifconfig OLD_FILES+=usr/sbin/prefix ==== //depot/projects/dtrace6/src/bin/mv/mv.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.45.2.1 2005/11/12 21:21:46 csjp Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.45.2.2 2008/01/27 07:37:01 dds Exp $"); #include #include @@ -65,6 +65,9 @@ #include #include +/* Exit code for a failed exec. */ +#define EXEC_FAILED 127 + int fflg, iflg, nflg, vflg; int copy(char *, char *); @@ -198,6 +201,11 @@ } } } + /* + * Rename on FreeBSD will fail with EISDIR and ENOTDIR, before failing + * with EXDEV. Therefore, copy() doesn't have to perform the checks + * specified in the Step 3 of the POSIX mv specification. + */ if (!rename(from, to)) { if (vflg) printf("%s -> %s\n", from, to); @@ -219,7 +227,7 @@ if (!S_ISLNK(sb.st_mode)) { /* Can't mv(1) a mount point. */ if (realpath(from, path) == NULL) { - warnx("cannot resolve %s: %s", from, path); + warn("cannot resolve %s: %s", from, path); return (1); } if (!statfs(path, &sfs) && @@ -252,9 +260,9 @@ struct timeval tval[2]; static u_int blen; static char *bp; + acl_t acl; mode_t oldmode; int nread, from_fd, to_fd; - acl_t acl; if ((from_fd = open(from, O_RDONLY, 0)) < 0) { warn("%s", from); @@ -305,7 +313,7 @@ } /* * POSIX 1003.2c states that if _POSIX_ACL_EXTENDED is in effect - * for dest_file, then it's ACLs shall reflect the ACLs of the + * for dest_file, then its ACLs shall reflect the ACLs of the * source_file. */ if (fpathconf(to_fd, _PC_ACL_EXTENDED) == 1 && @@ -355,43 +363,76 @@ int copy(char *from, char *to) { + struct stat sb; int pid, status; - if ((pid = fork()) == 0) { + if (lstat(to, &sb) == 0) { + /* Destination path exists. */ + if (S_ISDIR(sb.st_mode)) { + if (rmdir(to) != 0) { + warn("rmdir %s", to); + return (1); + } + } else { + if (unlink(to) != 0) { + warn("unlink %s", to); + return (1); + } + } + } else if (errno != ENOENT) { + warn("%s", to); + return (1); + } + + /* Copy source to destination. */ + if (!(pid = vfork())) { execl(_PATH_CP, "mv", vflg ? "-PRpv" : "-PRp", "--", from, to, (char *)NULL); - warn("%s", _PATH_CP); - _exit(1); + _exit(EXEC_FAILED); } if (waitpid(pid, &status, 0) == -1) { - warn("%s: waitpid", _PATH_CP); + warn("%s %s %s: waitpid", _PATH_CP, from, to); return (1); } if (!WIFEXITED(status)) { - warnx("%s: did not terminate normally", _PATH_CP); + warnx("%s %s %s: did not terminate normally", + _PATH_CP, from, to); return (1); } - if (WEXITSTATUS(status)) { - warnx("%s: terminated with %d (non-zero) status", - _PATH_CP, WEXITSTATUS(status)); + switch (WEXITSTATUS(status)) { + case 0: + break; + case EXEC_FAILED: + warnx("%s %s %s: exec failed", _PATH_CP, from, to); + return (1); + default: + warnx("%s %s %s: terminated with %d (non-zero) status", + _PATH_CP, from, to, WEXITSTATUS(status)); return (1); } + + /* Delete the source. */ if (!(pid = vfork())) { execl(_PATH_RM, "mv", "-rf", "--", from, (char *)NULL); - warn("%s", _PATH_RM); - _exit(1); + _exit(EXEC_FAILED); } if (waitpid(pid, &status, 0) == -1) { - warn("%s: waitpid", _PATH_RM); + warn("%s %s: waitpid", _PATH_RM, from); return (1); } if (!WIFEXITED(status)) { - warnx("%s: did not terminate normally", _PATH_RM); + warnx("%s %s: did not terminate normally", _PATH_RM, from); return (1); } - if (WEXITSTATUS(status)) { - warnx("%s: terminated with %d (non-zero) status", - _PATH_RM, WEXITSTATUS(status)); + switch (WEXITSTATUS(status)) { + case 0: + break; + case EXEC_FAILED: + warnx("%s %s: exec failed", _PATH_RM, from); + return (1); + default: + warnx("%s %s: terminated with %d (non-zero) status", + _PATH_RM, from, WEXITSTATUS(status)); return (1); } return (0); ==== //depot/projects/dtrace6/src/contrib/cvs/src/parseinfo.c#2 (text+ko) ==== @@ -5,7 +5,7 @@ * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS source distribution. * - * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.3 2004/04/15 01:17:27 peter Exp $ + * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.3.8.1 2008/01/07 09:08:04 peter Exp $ */ #include "cvs.h" @@ -429,6 +429,16 @@ else if (strcmp (p, "stat") == 0) RereadLogAfterVerify = LOGMSG_REREAD_STAT; } + else if (strcmp(line, "LocalKeyword") == 0) + { + /* Recognize cvs-1.12-style keyword control rather than erroring out. */ + RCS_setlocalid(p); + } + else if (strcmp(line, "KeywordExpand") == 0) + { + /* Recognize cvs-1.12-style keyword control rather than erroring out. */ + RCS_setincexc(p); + } else { /* We may be dealing with a keyword which was added in a ==== //depot/projects/dtrace6/src/contrib/file/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,293 @@ +2007-05-24 10:00 Christos Zoulas + + * Fix another integer overflow (Colin Percival) + +2007-03-26 13:58 Christos Zoulas + + * make sure that all of struct magic_set is initialized appropriately + (Brett) + +2007-03-25 17:44 Christos Zoulas + + * reset left bytes in the buffer (Dmitry V. Levin) + + * compilation failed with COMPILE_ONLY and ENABLE_CONDITIONALS + (Peter Avalos) + +2007-03-15 10:51 Christos Zoulas + + * fix fortran and nroff reversed tests (Dmitry V. Levin) + + * fix exclude option (Dmitry V. Levin) + +2007-02-08 17:30 Christos Zoulas + + * fix integer underflow in file_printf which can lead to + to exploitable heap overflow (Jean-Sebastien Guay-Lero) + +2007-02-05 11:35 Christos Zoulas + + * make socket/pipe reading more robust + +2007-01-25 16:01 Christos Zoulas + + * Centralize all the tests in file_buffer. + + * Add exclude flag. + +2007-01-18 05:29 Anon Ymous + + * Move the "type" detection code from parse() into its own table + driven routine. This avoids maintaining multiple lists in + file.h. + + * Add an optional conditional field (ust before the type field). + This code is wrapped in "#ifdef ENABLE_CONDITIONALS" as it is + likely to go away. + +2007-01-16 23:24 Anon Ymous + + * Fix an initialization bug in check_mem(). + +2007-01-16 14:58 Anon Ymous + + * Add a "default" type to print a message if nothing previously + matched at that level or since the last default at that + level. This is useful for setting up switch-like statements. + It can also be used to do if/else constructions without a + redundant second test. + + * Fix the "x" special case test so that one can test for that + string with "=x". + + * Allow "search" to search the entire buffer if the "/N" + search count is missing. + + * Make "regex" work! It now starts its search at the + specified offset and takes an (optional) "/N" line count to + specify the search range; otherwise it searches to the end + of the file. The match is now grabbed correctly for format + strings and the offset set to the end of the match. + + * Add a "/s" flag to "regex" and "search" to set the offset to + the start of the match. By default the offset is set to the + end of the match, as it is with other tests. This is mostly + useful for "regex". + + * Make "search", "string" and "pstring" use the same + file_strncmp() routine so that they support the same flags; + "bestring16" and "lestring16" call the same routine, but + with flags = 0. Also add a "/C" flag (in analogy to "/c") + to ignore the case on uppercase (lowercase) characters in + the test string. + + * Strict adherence to C style string escapes. A warnings are + printed when compiling. Note: previously "\a" was + incorrectly translated to 'a' instead of an (i.e., + BELL, typically 0x07). + + * Make this compile with "-Wall -Wextra" and all the warning + flags used with WARNS=4 in the NetBSD source. Also make it + pass lint. + + * Many "cleanups" and hopefully not too many new bugs! + +2007-01-16 14:56 Anon Ymous + + * make several more files compile with gcc warnings + on and also make them pass lint. + +2007-01-16 14:54 Anon Ymous + + * fix a puts()/putc() usage goof in file.c + + * make file.c compile with gcc warnings and pass lint + +2006-12-11 16:49 Christos Zoulas + + * fix byteswapping issue + + * report the number of bytes we tried to + allocate when allocation fails + + * add a few missed cases in the strength routine + +2006-12-08 16:32 Christos Zoulas + + * store and print the line number of the magic + entry for debugging. + + * if the magic entry did not print anything, + don't treat it as a match + + * change the magic strength algorithm to take + into account the relationship op. + + * fix a bug in search where we could accidentally + return a match. + + * propagate the error return from match to + file_softmagic. + +2006-11-25 13:35 Christos Zoulas + + * Don't store the current offset in the magic + struct, because it needs to be restored and + it was not done properly all the time. Bug + found by: Arkadiusz Miskiewicz + + * Fix problem in the '\0' separator; and don't + print it as an additional separator; print + it as the only separator. + +2006-11-17 10:51 Christos Zoulas + + * Added a -0 option to print a '\0' separator + Etienne Buira + +2006-10-31 15:14 Christos Zoulas + + * Check offset before copying (Mike Frysinger) + + * merge duplicated code + + * add quad date support + + * make sure that we nul terminate desc (Ryoji Kanai) + + * don't process elf notes multiple times + + * allow -z to report empty compressed files + + * use calloc to initialize the ascii buffers (Jos van den Oever) + +2006-06-08 11:11 Christos Zoulas + + * QNX fixes (Mike Gorchak) + + * Add quad support. + + * FIFO checks (Dr. Werner Fink) + + * Linux ELF fixes (Dr. Werner Fink) + + * Magic format checks (Dr. Werner Fink) + + * Magic format function improvent (Karl Chen) + +2006-05-03 11:11 Christos Zoulas + + * Pick up some elf changes and some constant fixes from SUSE + + * Identify gnu tar vs. posix tar + + * When keep going, don't print spurious newlines (Radek Vokál) + +2006-04-01 12:02 Christos Zoulas + + * Use calloc instead of malloc (Mike Frysinger) + + * Fix configure script to detect wctypes.h (Mike Frysinger) + +2006-03-02 16:06 Christos Zoulas + + * Print empty if the file is (Mike Frysinger) + + * Don't try to read past the end of the buffer (Mike Frysinger) + + * Sort magic entries by strength [experimental] + +2005-11-29 13:26 Christos Zoulas + + * Use iswprint() to convert the output string. + (Bastien Nocera) + +2005-10-31 8:54 Christos Zoulas + + * Fix regression where the core info was not completely processed + (Radek Vokál) + +2005-10-20 11:15 Christos Zoulas + + * Middle Endian magic (Diomidis Spinellis) + +2005-10-17 11:15 Christos Zoulas + + * Open with O_BINARY for CYGWIN (Corinna Vinschen) + + * Don't close stdin (Arkadiusz Miskiewicz) + + * Look for note sections in non executables. + +2005-09-20 13:33 Christos Zoulas + + * Don't print SVR4 Style in core files multiple times + (Radek Vokál) + +2005-08-27 04:09 Christos Zoulas + + * Cygwin changes Corinna Vinschen + +2005-08-18 09:53 Christos Zoulas + + * Remove erroreous mention of /etc/magic in the file man page + This is gentoo bug 101639. (Mike Frysinger) + + * Cross-compile support and detection (Mike Frysinger) + +2005-08-12 10:17 Christos Zoulas + + * Add -h flag and dereference symlinks if POSIXLY_CORRECT + is set. + +2005-07-29 13:57 Christos Zoulas + + * Avoid search and regex buffer overflows (Kelledin) + +2005-07-12 11:48 Christos Zoulas + + * Provide stub implementations for {v,}nsprintf() for older + OS's that don't have them. + * Change mbstate_t autoconf detection macro from AC_MBSTATE_T + to AC_TYPE_MBSTATE_T. + +2005-06-25 11:48 Christos Zoulas + + * Dynamically allocate the string buffers and make the + default read size 256K. + +2005-06-01 00:00 Joerg Sonnenberger + + * Dragonfly ELF note support + +2005-03-14 00:00 Giuliano Bertoletti + + * Avoid NULL pointer dereference in time conversion. + +2005-03-06 00:00 Joerg Walter + + * Add indirect magic offset support, and search mode. + +2005-01-12 00:00 Stepan Kasal + + * src/ascmagic.c (file_ascmagic): Fix three bugs about text files: + If a CRLF text file happens to have CR at offset HOWMANY - 1 + (currently 0xffff), it should not be counted as CR line + terminator. + If a line has length exactly MAXLINELEN, it should not yet be + treated as a ``very long line'', as MAXLINELEN is ``longest sane + line length''. + With CRLF, the line length was not computed correctly, and even + lines of length MAXLINELEN - 1 were treated as ``very long''. + +2004-12-07 14:15 Christos Zoulas + + * bzip2 needs a lot of input buffer space on some files + before it can begin uncompressing. This makes file -z + fail on some bz2 files. Fix it by giving it a copy of + the file descriptor to read as much as it wants if we + have access to it. + 2004-11-24 12:39 Christos Zoulas * Stack smash fix, and ELF more conservative reading. ==== //depot/projects/dtrace6/src/contrib/file/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,13 +1,24 @@ # ex:ts=8 -$FreeBSD: src/contrib/file/FREEBSD-upgrade,v 1.4 2002/09/16 06:02:55 obrien Exp $ +$FreeBSD: src/contrib/file/FREEBSD-upgrade,v 1.4.14.1 2008/01/24 15:47:29 rafan Exp $ Christos Zoulas `file' originals can be found at: ftp://ftp.astron.com/pub/file/ Imported by: - cvs import -m "Virgin import of Christos Zoulas's FILE 3.39." \ - src/contrib/file ZOULAS file_3_39 + mv magic/* . + rmdir magic + mv -i src/* . + rm -rf src + mv -i doc/* . + rm -rf doc + rm -rf python + rm -f lt* + rm -f missing depcomp + rm -f config.{guess,sub} + + cvs import -m "Virgin import of Christos Zoulas's FILE 4.21." \ + src/contrib/file ZOULAS file_4_21 Never make local changes to ZOULAS `file'. Christos is very willing to ==== //depot/projects/dtrace6/src/contrib/file/LEGAL.NOTICE#2 (text+ko) ==== @@ -1,7 +1,7 @@ -$Id: LEGAL.NOTICE,v 1.14 2004/09/11 19:15:56 christos Exp $ +$File: LEGAL.NOTICE,v 1.15 2006/05/03 18:48:33 christos Exp $ Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995. Software written by Ian F. Darwin and others; -maintained 1994-2004 Christos Zoulas. +maintained 1994- Christos Zoulas. This software is not subject to any export provision of the United States Department of Commerce, and may be exported to any country or planet. ==== //depot/projects/dtrace6/src/contrib/file/Localstuff#2 (text+ko) ==== @@ -2,6 +2,6 @@ #------------------------------------------------------------------------------ # Localstuff: file(1) magic for locally observed files # -# $Id: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $ +# $File: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $ # Add any locally observed files here. Remember: # text if readable, executable if runnable binary, data if unreadable. ==== //depot/projects/dtrace6/src/contrib/file/MAINT#2 (text+ko) ==== @@ -1,33 +1,45 @@ -$Id: MAINT,v 1.5 2003/03/23 04:36:37 christos Exp $ +$File: MAINT,v 1.9 2007/01/19 21:15:27 christos Exp $ Maintenance notes: I am continuing to maintain the file command. I welcome your help, but to make my life easier I'd like to request the following: -- Don't change the version numbers! +- Do not distribute changed versions. -If your changes are extensive, I will have to work hard to -integrate them into my version. If you check it into SCCS locally, -the version numbers will likely be kept. IF you check it into RCS -or CVS locally, please use -k to keep the version numbers, and -please use branch deltas (1.21.1, 1.21.2, ...). If you don't do -this, I will likely be unable to use your changes; life's just too -short. +People trying to be helpful occasionally put up their hacked versions +of the file command for anonymous FTP, and people all over the +world get copies of the hacked versions. Within a day or two I am +getting email from around the world asking me why "my" file command +won't compile!!! Needless to say this detracts from the limited +time I have available to work on the actual software. Therefore I +ask you again to please NOT distribute your changed version. If +you need to make changes, please add a patch file next to the +distribution tar, and a README file that clearly explains what you +are trying to fix. -- Do not distribute changed versions. +Thank you for your assistance and cooperation. -People trying to be helpful occasionally put up their hacked versions -of the file command for FTP, then the "archie" server finds and publishes -the hacked version, and people all over the world get copies of it. -Within a day or two I am getting email from around the world -asking me why "my" file command won't compile!!! Needless to say this -detracts from the limited time I have available to work on the actual -software. Therefore I ask you again to please NOT distribute -your changed version. +Code Overview +This is a rough idea of the control flow from the main program: -Thank you for your assistance and cooperation. +file.c main() +file.c process (called for each file) + printf file name +magic.c magic_file() +fsmagic.c file_fsmagic() + (handles statbuf modes for DEV) + (handles statbuf modes for executable &c. + reads data from file. +funcs.c: file_buffer() +compress.c file_zmagic() +is_tar.c file_is_tar() +softmagic.c file_softmagic() + match() - looks for match against main magic database +ascmagic.c file_ascmagic() +readelf.c file_tryelf() + "unknown" Christos Zoulas christos@astron.com ==== //depot/projects/dtrace6/src/contrib/file/Magdir/adventure#2 (text+ko) ==== @@ -12,27 +12,38 @@ 0 beshort 0x0206 ALAN game data >2 byte <10 version 2.6%d -# Conflicts with too much other stuff! -# Infocom -# (Note: to avoid false matches Z-machine version 1 and 2 are not -# recognized since only the oldest Zork I and II used them. Similarly -# there are 4 Infocom games that use version 4 that are not recognized.) -#0 byte 3 Infocom game data (Z-machine 3, -#>2 beshort <0x7fff Release %3d, -#>26 beshort >0 Size %d*2 -#>18 string >\0 Serial %.6s) -#0 byte 5 Infocom game data (Z-machine 5, -#>2 beshort <0x7fff Release %3d, -#>26 beshort >0 Size %d*4 -#>18 string >\0 Serial %.6s) -#0 byte 6 Infocom game data (Z-machine 6, -#>2 beshort <0x7fff Release %3d, -#>26 beshort >0 Size %d*8 -#>18 string >\0 Serial %.6s) -#0 byte 8 Infocom game data (Z-machine 8, -#>2 beshort <0x7fff Release %3d, -#>26 beshort >0 Size %d*8 -#>18 string >\0 Serial %.6s) + +# Infocom (see z-machine) +#------------------------------------------------------------------------------ +# Z-machine: file(1) magic for Z-machine binaries. +# +# This will match ${TEX_BASE}/texmf/omega/ocp/char2uni/inbig5.ocp which +# appears to be a version-0 Z-machine binary. +# +# The (false match) message is to correct that behavior. Perhaps it is +# not needed. +# +16 belong&0xfe00f0f0 0x3030 Infocom game data +>0 ubyte 0 (false match) +>0 ubyte >0 (Z-machine %d, +>>2 ubeshort x Release %d / +>>18 string >\0 Serial %.6s) + +#------------------------------------------------------------------------------ +# Glulx: file(1) magic for Glulx binaries. +# +# I haven't checked for false matches yet. +# +0 string Glul Glulx game data +>4 beshort x (Version %d +>>6 byte x \b.%d +>>8 byte x \b.%d) +>36 string Info Compiled by Inform + + + +# For Quetzal and blorb magic see iff + # TADS (Text Adventure Development System) # All files are machine-independent (games compile to byte-code) and are tagged @@ -61,3 +72,4 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 27 23:12:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42B3716A469; Sun, 27 Jan 2008 23:12:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E403916A417 for ; Sun, 27 Jan 2008 23:12:36 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D5C6013C45B for ; Sun, 27 Jan 2008 23:12:36 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RNCaJ6061795 for ; Sun, 27 Jan 2008 23:12:36 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RNCalE061792 for perforce@freebsd.org; Sun, 27 Jan 2008 23:12:36 GMT (envelope-from imp@freebsd.org) Date: Sun, 27 Jan 2008 23:12:36 GMT Message-Id: <200801272312.m0RNCalE061792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134257 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 23:12:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=134257 Change 134257 by imp@imp_paco-paco on 2008/01/27 23:12:21 ugly hack Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/intr_machdep.c#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/intr_machdep.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -134,6 +135,13 @@ cause &= ~MIPS_INT_MASK; mips_wr_cause(cause); +#if 0 + if (intr & CR_INT_CLOCK) { + clockintr(intr, tf); + intr &= ~CR_INT_CLOCK; + } +#endif + while ((i = fls(intr)) != 0) { intr &= ~(1 << (i - 1)); switch (i) { @@ -154,8 +162,11 @@ if (!event || TAILQ_EMPTY(&event->ie_handlers)) { - printf("stray %s interrupt %d\n", - hard ? "hard" : "soft", i); + if (i == 5) + clockintr(intr, tf); + else + printf("stray %s interrupt %d\n", + hard ? "hard" : "soft", i); continue; } From owner-p4-projects@FreeBSD.ORG Sun Jan 27 23:17:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 107D416A421; Sun, 27 Jan 2008 23:17:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C633B16A419 for ; Sun, 27 Jan 2008 23:17:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ADA4A13C455 for ; Sun, 27 Jan 2008 23:17:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RNHgpr062830 for ; Sun, 27 Jan 2008 23:17:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RNHgee062827 for perforce@freebsd.org; Sun, 27 Jan 2008 23:17:42 GMT (envelope-from jb@freebsd.org) Date: Sun, 27 Jan 2008 23:17:42 GMT Message-Id: <200801272317.m0RNHgee062827@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134258 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 23:17:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=134258 Change 134258 by jb@jb_freebsd1 on 2008/01/27 23:17:00 OK, I tried it. What a lot of grief. Attempting to integrate both DTrace and ZFS from //depot/vendor/sun/opensolaris is frightening. This staging project can be consigned to the bit bucket and obliterated from the planet. Affected files ... .. //depot/doc/obliterate#16 edit .. //depot/projects/opensolaris/src/cddl/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/Makefile.inc#2 delete .. //depot/projects/opensolaris/src/cddl/lib/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/lib/Makefile.inc#2 delete .. //depot/projects/opensolaris/src/cddl/lib/drti/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/lib/libavl/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/lib/libctf/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/errno.d#2 delete .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/net.d#2 delete .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/nfs.d#2 delete .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/psinfo.d#2 delete .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/sched.d#2 delete .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/signal.d#2 delete .. //depot/projects/opensolaris/src/cddl/lib/libdtrace/unistd.d#2 delete .. //depot/projects/opensolaris/src/cddl/lib/libnvpair/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/lib/libumem/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/lib/libuutil/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/lib/libzfs/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/lib/libzpool/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/sbin/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/sbin/Makefile.inc#2 delete .. //depot/projects/opensolaris/src/cddl/sbin/zfs/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/sbin/zpool/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/usr.bin/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/usr.bin/Makefile.inc#2 delete .. //depot/projects/opensolaris/src/cddl/usr.bin/ctfconvert/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/usr.bin/ctfdump/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/usr.bin/ctfmerge/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/usr.bin/sgsmsg/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/usr.bin/ztest/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/usr.sbin/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/usr.sbin/Makefile.inc#2 delete .. //depot/projects/opensolaris/src/cddl/usr.sbin/dtrace/Makefile#2 delete .. //depot/projects/opensolaris/src/cddl/usr.sbin/zdb/Makefile#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/include/alloca.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/include/devid.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/include/dtrace.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/include/fcntl.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/include/fsshare.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/include/libintl.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/include/libproc.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/include/mnttab.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/include/priv.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/include/solaris.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/include/stdio.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/include/stdlib.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/include/strings.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/include/unistd.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/include/zone.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/lib/libumem/umem.c#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/lib/libumem/umem.h#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/misc/deviceid.c#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/misc/fsshare.c#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/misc/mkdirp.c#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/misc/mnttab.c#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/misc/zmount.c#2 delete .. //depot/projects/opensolaris/src/compat/opensolaris/misc/zone.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/dtrace.c#4 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/README#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.circlibdep.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.invalidlibdep.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdep.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepfullyconnected.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#3 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d.out#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#2 delete .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d.out#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 27 23:54:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 997E316A418; Sun, 27 Jan 2008 23:54:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F7D916A468 for ; Sun, 27 Jan 2008 23:54:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DCFDA13C46A for ; Sun, 27 Jan 2008 23:54:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RNsMRq064626 for ; Sun, 27 Jan 2008 23:54:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RNsMUv064623 for perforce@freebsd.org; Sun, 27 Jan 2008 23:54:22 GMT (envelope-from sam@freebsd.org) Date: Sun, 27 Jan 2008 23:54:22 GMT Message-Id: <200801272354.m0RNsMUv064623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134259 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 23:54:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=134259 Change 134259 by sam@sam_ebb on 2008/01/27 23:53:24 silence compiler complaint when built w/o IEEE80211_DEBUG Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#4 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#4 (text+ko) ==== @@ -99,7 +99,9 @@ static int adhoc_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { +#ifdef IEEE80211_DEBUG struct ieee80211com *ic = vap->iv_ic; +#endif struct ieee80211_node *ni; enum ieee80211_state ostate; From owner-p4-projects@FreeBSD.ORG Mon Jan 28 00:08:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4313416A468; Mon, 28 Jan 2008 00:08:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 089FB16A419 for ; Mon, 28 Jan 2008 00:08:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED49013C45D for ; Mon, 28 Jan 2008 00:08:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0S08bpn066756 for ; Mon, 28 Jan 2008 00:08:37 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0S08bBZ066753 for perforce@freebsd.org; Mon, 28 Jan 2008 00:08:37 GMT (envelope-from sam@freebsd.org) Date: Mon, 28 Jan 2008 00:08:37 GMT Message-Id: <200801280008.m0S08bBZ066753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 00:08:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=134261 Change 134261 by sam@sam_ebb on 2008/01/28 00:08:13 rt2560_reset is wrong; channel changes happen through a different callback and returning ENETRESET when we cannot handle the request is wrong and screws up ioctls Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560.c#8 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560.c#8 (text) ==== @@ -132,7 +132,6 @@ struct ieee80211_node *); static void rt2560_start(struct ifnet *); static void rt2560_watchdog(void *); -static int rt2560_reset(struct ieee80211vap *); static int rt2560_ioctl(struct ifnet *, u_long, caddr_t); static void rt2560_bbp_write(struct rt2560_softc *, uint8_t, uint8_t); @@ -387,7 +386,6 @@ /* enable s/w bmiss handling for sta mode */ ieee80211_vap_setup(ic, vap, name, unit, opmode, flags | IEEE80211_CLONE_NOBEACONS, bssid, mac); - vap->iv_reset = rt2560_reset; /* override state transition machine */ rvp->ral_newstate = vap->iv_newstate; @@ -2066,25 +2064,6 @@ } } -/* - * This function allows for fast channel switching in monitor mode (used by - * net-mgmt/kismet). In IBSS mode, we must explicitly reset the interface to - * generate a new beacon frame. - */ -static int -rt2560_reset(struct ieee80211vap *vap) -{ - struct ieee80211com *ic = vap->iv_ic; - struct rt2560_softc *sc = ic->ic_ifp->if_softc; - - if (vap->iv_opmode != IEEE80211_M_MONITOR) - return ENETRESET; - - rt2560_set_chan(sc, ic->ic_curchan); - - return 0; -} - static int rt2560_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { From owner-p4-projects@FreeBSD.ORG Mon Jan 28 00:09:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA56816A46C; Mon, 28 Jan 2008 00:09:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8660A16A41B for ; Mon, 28 Jan 2008 00:09:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7613613C4F6 for ; Mon, 28 Jan 2008 00:09:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0S09daM066799 for ; Mon, 28 Jan 2008 00:09:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0S09d3K066795 for perforce@freebsd.org; Mon, 28 Jan 2008 00:09:39 GMT (envelope-from sam@freebsd.org) Date: Mon, 28 Jan 2008 00:09:39 GMT Message-Id: <200801280009.m0S09d3K066795@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134262 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 00:09:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=134262 Change 134262 by sam@sam_ebb on 2008/01/28 00:09:07 convert as an example of how to use the phy routines Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560.c#9 edit .. //depot/projects/vap/sys/dev/ral/rt2560var.h#5 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560.c#9 (text) ==== @@ -52,6 +52,7 @@ #include #include +#include #include #include @@ -113,11 +114,9 @@ static void rt2560_beacon_expire(struct rt2560_softc *); static void rt2560_wakeup_expire(struct rt2560_softc *); static uint8_t rt2560_rxrate(struct rt2560_rx_desc *); -static int rt2560_ack_rate(struct ieee80211com *, int); static void rt2560_scan_start(struct ieee80211com *); static void rt2560_scan_end(struct ieee80211com *); static void rt2560_set_channel(struct ieee80211com *); -static uint16_t rt2560_txtime(int, int, uint32_t); static uint8_t rt2560_plcp_signal(int); static void rt2560_setup_tx_desc(struct rt2560_softc *, struct rt2560_tx_desc *, uint32_t, int, int, int, @@ -1395,12 +1394,6 @@ RAL_UNLOCK(sc); } -/* quickly determine if a given rate is CCK or OFDM */ -#define RAL_RATE_IS_OFDM(rate) ((rate) >= 12 && (rate) != 22) - -#define RAL_ACK_SIZE 14 /* 10 + 4(FCS) */ -#define RAL_CTS_SIZE 14 /* 10 + 4(FCS) */ - #define RAL_SIFS 10 /* us */ #define RT2560_TXRX_TURNAROUND 10 /* us */ @@ -1436,66 +1429,6 @@ return 2; /* should not get there */ } -/* - * Return the expected ack rate for a frame transmitted at rate `rate'. - * XXX: this should depend on the destination node basic rate set. - */ -static int -rt2560_ack_rate(struct ieee80211com *ic, int rate) -{ - switch (rate) { - /* CCK rates */ - case 2: - return 2; - case 4: - case 11: - case 22: - return (ic->ic_curmode == IEEE80211_MODE_11B) ? 4 : rate; - - /* OFDM rates */ - case 12: - case 18: - return 12; - case 24: - case 36: - return 24; - case 48: - case 72: - case 96: - case 108: - return 48; - } - - /* default to 1Mbps */ - return 2; -} - -/* - * Compute the duration (in us) needed to transmit `len' bytes at rate `rate'. - * The function automatically determines the operating mode depending on the - * given rate. `flags' indicates whether short preamble is in use or not. - */ -static uint16_t -rt2560_txtime(int len, int rate, uint32_t flags) -{ - uint16_t txtime; - - if (RAL_RATE_IS_OFDM(rate)) { - /* IEEE Std 802.11a-1999, pp. 37 */ - txtime = (8 + 4 * len + 3 + rate - 1) / rate; - txtime = 16 + 4 + 4 * txtime + 6; - } else { - /* IEEE Std 802.11b-1999, pp. 28 */ - txtime = (16 * len + rate - 1) / rate; - if (rate != 2 && (flags & IEEE80211_F_SHPREAMBLE)) - txtime += 72 + 24; - else - txtime += 144 + 48; - } - - return txtime; -} - static uint8_t rt2560_plcp_signal(int rate) { @@ -1545,7 +1478,7 @@ desc->plcp_service = 4; len += IEEE80211_CRC_LEN; - if (RAL_RATE_IS_OFDM(rate)) { + if (ieee80211_rate2phytype(sc->sc_currates, rate) == IEEE80211_T_OFDM) { desc->flags |= htole32(RT2560_TX_OFDM); plcp_length = len & 0xfff; @@ -1678,8 +1611,8 @@ if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2560_TX_ACK; - dur = rt2560_txtime(RAL_ACK_SIZE, rate, ic->ic_flags) + - RAL_SIFS; + dur = ieee80211_ack_duration(sc->sc_currates, + rate, ic->ic_flags & IEEE80211_F_SHPREAMBLE); *(uint16_t *)wh->i_dur = htole16(dur); /* tell hardware to add timestamp for probe responses */ @@ -1864,16 +1797,18 @@ m0->m_pkthdr.len > vap->iv_rtsthreshold) { struct mbuf *m; uint16_t dur; - int rtsrate, ackrate; + int rtsrate; - rtsrate = IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan) ? 12 : 2; - ackrate = rt2560_ack_rate(ic, rate); + rtsrate = ieee80211_ack_rate(sc->sc_currates, rate); + dur = ieee80211_compute_duration(sc->sc_currates, + m0->m_pkthdr.len + IEEE80211_CRC_LEN, + rate, ic->ic_flags & IEEE80211_F_SHPREAMBLE); + /* NB: assumes ACK and CTS are the same size */ + dur += ieee80211_ack_duration(sc->sc_currates, + rtsrate, ic->ic_flags & IEEE80211_F_SHPREAMBLE); + dur += ieee80211_ack_duration(sc->sc_currates, + rate, ic->ic_flags & IEEE80211_F_SHPREAMBLE); - dur = rt2560_txtime(m0->m_pkthdr.len + 4, rate, ic->ic_flags) + - rt2560_txtime(RAL_CTS_SIZE, rtsrate, ic->ic_flags) + - rt2560_txtime(RAL_ACK_SIZE, ackrate, ic->ic_flags) + - 3 * RAL_SIFS; - m = rt2560_get_rts(sc, wh, dur); desc = &sc->txq.desc[sc->txq.cur_encrypt]; @@ -1979,8 +1914,8 @@ if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2560_TX_ACK; - dur = rt2560_txtime(RAL_ACK_SIZE, rt2560_ack_rate(ic, rate), - ic->ic_flags) + RAL_SIFS; + dur = ieee80211_ack_duration(sc->sc_currates, + rate, ic->ic_flags & IEEE80211_F_SHPREAMBLE); *(uint16_t *)wh->i_dur = htole16(dur); } @@ -2165,8 +2100,9 @@ u_int i, chan; chan = ieee80211_chan2ieee(ic, c); - if (chan == 0 || chan == IEEE80211_CHAN_ANY) - return; + KASSERT(chan != 0 && chan != IEEE80211_CHAN_ANY, ("chan 0x%x", chan)); + + sc->sc_currates = ieee80211_get_ratetable(c); if (IEEE80211_IS_CHAN_2GHZ(c)) power = min(sc->txpow[chan - 1], 31); ==== //depot/projects/vap/sys/dev/ral/rt2560var.h#5 (text) ==== @@ -120,6 +120,8 @@ int sc_tx_timer; int sc_invalid; + + const struct ieee80211_rate_table *sc_currates; /* * The same in both up to here * ------------------------------------------------ From owner-p4-projects@FreeBSD.ORG Mon Jan 28 00:22:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C168216A418; Mon, 28 Jan 2008 00:22:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C84216A468 for ; Mon, 28 Jan 2008 00:22:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5BFEE13C442 for ; Mon, 28 Jan 2008 00:22:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0S0M3Hd068300 for ; Mon, 28 Jan 2008 00:22:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0S0LtO5068280 for perforce@freebsd.org; Mon, 28 Jan 2008 00:21:55 GMT (envelope-from jb@freebsd.org) Date: Mon, 28 Jan 2008 00:21:55 GMT Message-Id: <200801280021.m0S0LtO5068280@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134263 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 00:22:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=134263 Change 134263 by jb@jb_freebsd1 on 2008/01/28 00:21:44 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/Makefile.inc1#4 integrate .. //depot/projects/dtrace7/src/cddl/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/Makefile.inc#4 integrate .. //depot/projects/dtrace7/src/cddl/lib/Makefile#3 integrate .. //depot/projects/dtrace7/src/cddl/lib/Makefile.inc#2 integrate .. //depot/projects/dtrace7/src/cddl/lib/drti/Makefile#1 branch .. //depot/projects/dtrace7/src/cddl/lib/libavl/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/lib/libctf/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/lib/libdtrace/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/lib/libdtrace/errno.d#2 integrate .. //depot/projects/dtrace7/src/cddl/lib/libdtrace/net.d#1 branch .. //depot/projects/dtrace7/src/cddl/lib/libdtrace/nfs.d#1 branch .. //depot/projects/dtrace7/src/cddl/lib/libdtrace/psinfo.d#2 integrate .. //depot/projects/dtrace7/src/cddl/lib/libdtrace/sched.d#1 branch .. //depot/projects/dtrace7/src/cddl/lib/libdtrace/signal.d#1 branch .. //depot/projects/dtrace7/src/cddl/lib/libdtrace/unistd.d#1 branch .. //depot/projects/dtrace7/src/cddl/lib/libnvpair/Makefile#3 integrate .. //depot/projects/dtrace7/src/cddl/lib/libproc/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/lib/libproc/Pcontrol.c#2 delete .. //depot/projects/dtrace7/src/cddl/lib/libproc/Pcontrol.h#2 delete .. //depot/projects/dtrace7/src/cddl/lib/libproc/Psymtab.c#2 delete .. //depot/projects/dtrace7/src/cddl/lib/libproc/Putil.c#2 delete .. //depot/projects/dtrace7/src/cddl/lib/libproc/Putil.h#2 delete .. //depot/projects/dtrace7/src/cddl/lib/libproc/libproc.h#2 delete .. //depot/projects/dtrace7/src/cddl/lib/libumem/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/lib/libuutil/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/sbin/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/sbin/Makefile.inc#2 integrate .. //depot/projects/dtrace7/src/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/test/dtrace/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/dtrace7/src/cddl/usr.bin/Makefile.inc#2 integrate .. //depot/projects/dtrace7/src/cddl/usr.bin/ctfconvert/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/usr.bin/ctfdump/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/usr.bin/ctfmerge/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/usr.bin/sgsmsg/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/dtrace7/src/cddl/usr.sbin/Makefile.inc#2 integrate .. //depot/projects/dtrace7/src/cddl/usr.sbin/dtrace/Makefile#2 integrate .. //depot/projects/dtrace7/src/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/include/alloca.h#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/include/devid.h#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/include/dtrace.h#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/include/fcntl.h#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/include/fsshare.h#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/include/libintl.h#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/include/libproc.h#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/include/mnttab.h#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/include/priv.h#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/include/solaris.h#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/include/stdio.h#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/include/stdlib.h#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/include/strings.h#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/include/unistd.h#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/include/zone.h#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/lib/libumem/umem.c#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/lib/libumem/umem.h#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/misc/deviceid.c#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/misc/fsshare.c#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/misc/mkdirp.c#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/misc/mnttab.c#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/misc/zmount.c#2 integrate .. //depot/projects/dtrace7/src/compat/opensolaris/misc/zone.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/OPENSOLARIS.LICENSE#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/dtrace.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/Makefile#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/32/Makefile#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/64/Makefile#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.misc.d#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.rootvp.d#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/i386/Makefile#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/sparc/Makefile#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/sgs/include/_string_table.h#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/sgs/include/debug.h#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/sgs/include/string_table.h#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zdb/zdb.8#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zdb/zdb.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zdb/zdb_il.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs.8#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs_main.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool.8#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_main.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_util.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_util.h#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/head/stdio_ext.h#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/head/synch.h#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/head/thread.h#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/drti.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_buf.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_decl.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/kernel.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/taskq.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/util.c#3 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/tools/ctf/dump/dump.c#2 integrate .. //depot/projects/dtrace7/src/lib/libdwarf/_libdwarf.h#2 integrate .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_attrval.c#2 integrate .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_die.c#2 integrate .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_finish.c#2 integrate .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_init.c#2 integrate .. //depot/projects/dtrace7/src/share/mk/Makefile#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.README#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.compat.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.dep.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.doc.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.endian.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.files.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.incs.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.info.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.init.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.kmod.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.lib.mk#3 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.links.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.man.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.nls.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.obj.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.own.mk#3 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.pkg.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.port.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.port.options.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.port.post.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.port.pre.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.port.subdir.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.prog.mk#3 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.snmpmod.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.subdir.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.symver.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/sys.mk#5 integrate .. //depot/projects/dtrace7/src/share/mk/version_gen.awk#2 integrate .. //depot/projects/dtrace7/src/sys/cddl/cyclic/amd64/cyclic_machdep.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/cyclic/cyclic.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/cyclic/cyclic_test.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/cyclic/i386/cyclic_machdep.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/amd64/dis_tables.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/amd64/dis_tables.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/amd64/instr_size.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_anon.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_cddl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_clone.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_debug.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_hacks.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_load.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_modevent.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_test.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_unload.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_vtime.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/i386/dis_tables.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/i386/dis_tables.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/i386/dtrace_asm.S#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/i386/instr_size.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/fasttrap/fasttrap.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/fbt/fbt.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/profile/profile.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/prototype.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/sdt/sdt.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/dev/systrace/systrace.c#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris.c#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_cmn_err.c#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_string.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_zone.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/rpc/xdr.h#3 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/acl.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/atomic.h#3 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/byteorder.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/callb.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cmn_err.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cpuvar_defs.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cred.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cyclic_impl.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/debug.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/dirent.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/dkio.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/feature_tests.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kcondvar.h#3 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kmem.h#3 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kobj.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kstat.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/lock.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/misc.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mntent.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mnttab.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mount.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/policy.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/random.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/sema.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/string.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/sunddi.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/sysmacros.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/systm.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/taskq.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/taskq_impl.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/time.h#3 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/uio.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/varargs.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/zone.h#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/avl.h#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/cyclic_impl.h#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/debug.h#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/fasttrap_impl.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/note.h#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#3 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#3 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#3 integrate .. //depot/projects/dtrace7/src/sys/modules/cyclic/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/cyclic_test/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/dtrace/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/dtrace/Makefile.inc#1 branch .. //depot/projects/dtrace7/src/sys/modules/dtrace/dtrace/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/dtrace/dtrace_test/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/dtrace/dtraceall/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/dtrace/dtraceall/dtraceall.c#1 branch .. //depot/projects/dtrace7/src/sys/modules/dtrace/fasttrap/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/dtrace/fbt/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/dtrace/profile/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/dtrace/prototype/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/dtrace/sdt/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/dtrace/systrace/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/opensolaris/Makefile#1 branch Differences ... ==== //depot/projects/dtrace7/src/Makefile.inc1#4 (text+ko) ==== @@ -1,5 +1,4 @@ -# -# $FreeBSD: src/Makefile.inc1,v 1.588.2.3 2008/01/21 18:49:04 brueffer Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.596 2008/01/23 22:21:36 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -167,7 +166,14 @@ STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} +# +# Avoid running mktemp(1) unless actually needed. +# It may not be functional, e.g., due to new ABI +# when in the middle of installing over this system. +# +.if make(distributeworld) || make(installworld) INSTALLTMP!= /usr/bin/mktemp -d -u -t install +.endif # # Building a world goes through the following stages @@ -209,6 +215,7 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${BPATH}:${PATH} \ WORLDTMP=${WORLDTMP} \ + VERSION="${VERSION}" \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ @@ -234,6 +241,7 @@ # world stage WMAKEENV= ${CROSSENV} \ _SHLIBDIRPREFIX=${WORLDTMP} \ + VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} .if ${MK_CDDL} == "no" || defined(NO_CTF) @@ -258,6 +266,7 @@ # Yes, the flags are redundant. LIB32WMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ _SHLIBDIRPREFIX=${LIB32TMP} \ + VERSION="${VERSION}" \ MACHINE=i386 \ MACHINE_ARCH=i386 \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -277,14 +286,16 @@ .endif # install stage +IMAKEENV= ${CROSSENV} +IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 .if empty(.MAKEFLAGS:M-n) -IMAKEENV= ${CROSSENV} \ - PATH=${STRICTTMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \ + LD_LIBRARY_PATH=${INSTALLTMP} \ + PATH_LOCALE=${INSTALLTMP}/locale +IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh .else -IMAKEENV= ${CROSSENV} \ - PATH=${TMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP} .endif -IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 # kernel stage KMAKEENV= ${WMAKEENV} @@ -470,10 +481,15 @@ distribute32 install32: .if make(distribute32) mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32 # XXX add to mtree + mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32/dtrace # XXX add to mtree .else mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree + mkdir -p ${DESTDIR}/usr/lib32/dtrace # XXX add to mtree .endif cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} +.if ${MK_CDDL} != "no" + cd ${.CURDIR}/cddl/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} +.endif cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .if ${MK_CRYPT} != "no" cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} @@ -576,6 +592,14 @@ .endfor # +# Required install tools to be saved in a scratch dir for safety. +# +ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ + date echo egrep find grep install-info \ + ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + test true uname wc zic + +# # distributeworld # # Distributes everything compiled by a `buildworld'. @@ -586,14 +610,28 @@ # distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} - for prog in [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep install-info \ - ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc zic; do \ - cp `which $$prog` ${INSTALLTMP}; \ - done - ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} - rm -rf ${INSTALLTMP} + progs=$$(for prog in ${ITOOLS}; do \ + if progpath=`which $$prog`; then \ + echo $$progpath; \ + else \ + echo "Required tool $$prog not found in PATH." >&2; \ + exit 1; \ + fi; \ + done); \ + libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \ + while read line; do \ + set -- $$line; \ + if [ "$$2 $$3" != "not found" ]; then \ + echo $$2; \ + else \ + echo "Required library $$1 not found." >&2; \ + exit 1; \ + fi; \ + done); \ + cp $$libs $$progs ${INSTALLTMP} + cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale + ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ + ${IMAKEENV} rm -rf ${INSTALLTMP} # # reinstall @@ -822,8 +860,8 @@ # legacy: Build compatibility shims for the next three targets # legacy: -.if ${BOOTSTRAPPING} < 503000 - @echo "ERROR: Source upgrades from versions prior to 5.3 not supported."; \ +.if ${BOOTSTRAPPING} < 600034 && ${BOOTSTRAPPING} != 0 + @echo "ERROR: Source upgrades from versions prior to 6.0 not supported."; \ false .endif .for _tool in tools/build @@ -852,26 +890,6 @@ .endif .endif -.if ${BOOTSTRAPPING} < 600029 -_texinfo= gnu/usr.bin/texinfo -.endif - -.if ${BOOTSTRAPPING} < 600015 -_cap_mkdb= usr.bin/cap_mkdb -.endif - -.if ${BOOTSTRAPPING} < 600018 -_colldef= usr.bin/colldef -.endif - -.if ${BOOTSTRAPPING} < 600017 -_gencat= usr.bin/gencat -.endif - -.if ${BOOTSTRAPPING} < 600016 -_mklocale= usr.bin/mklocale -.endif - .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -881,8 +899,8 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 600020 -_pwd_mkdb= usr.sbin/pwd_mkdb +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale .endif .if ${MK_CDDL} != "no" @@ -892,23 +910,18 @@ bootstrap-tools: .for _tool in \ + ${_mklocale} \ ${_dtrace_tools} \ ${_strfile} \ ${_gperf} \ ${_groff} \ - ${_texinfo} \ - ${_cap_mkdb} \ - ${_colldef} \ - ${_gencat} \ usr.bin/lorder \ usr.bin/makewhatis \ - ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ - ${_crunchgen} \ - ${_pwd_mkdb} + ${_crunchgen} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -1038,15 +1051,16 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ - lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ - ${_lib_libgssapi} ${_lib_libipx} \ + lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \ + lib/libexpat \ + ${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_default_thread_lib} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} + ${_secure_lib_libssl} lib/libdwarf lib/libproc .if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no" _default_thread_lib= lib/${DEFAULT_THREAD_LIB} ==== //depot/projects/dtrace7/src/cddl/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/Makefile.inc#4 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/lib/Makefile#3 (text+ko) ==== @@ -2,11 +2,11 @@ .include -SUBDIR= libavl \ +SUBDIR= drti \ + libavl \ libctf \ libdtrace \ libnvpair \ - libproc \ libumem \ libuutil \ ${_libzfs} \ ==== //depot/projects/dtrace7/src/cddl/lib/Makefile.inc#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/lib/libavl/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/lib/libctf/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/lib/libdtrace/Makefile#2 (text+ko) ==== @@ -46,22 +46,21 @@ dt_xlator.c \ gmatch.c -DSRCS= errno.d \ - psinfo.d +DSRCS= errno.d \ + psinfo.d \ + signal.d \ + unistd.d .PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libgen/common CFLAGS+= -I${.OBJDIR} \ - -I${.CURDIR}/../libproc \ -I${.CURDIR}/../../../sys/compat/opensolaris \ -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ - -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ - -I${OPENSOLARIS_SYS_DISTDIR}/compat + -I${OPENSOLARIS_SYS_DISTDIR}/uts/common #CFLAGS+= -DYYDEBUG @@ -69,6 +68,9 @@ CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel .elif ${MACHINE_ARCH} == "sparc64" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc +.else +# temporary hack +CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel .endif LFLAGS+=-l ==== //depot/projects/dtrace7/src/cddl/lib/libdtrace/errno.d#2 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * Portions Copyright 2006 John Birrell jb@freebsd.org + * Portions Copyright 2006-2008 John Birrell jb@freebsd.org * * $FreeBSD$ */ @@ -28,5 +28,201 @@ * Use is subject to license terms. */ -inline int errno = curthread->td_errno; -#pragma D binding "1.0" errno +inline int EPERM = 1; +#pragma D binding "1.0" EPERM +inline int ENOENT = 2; +#pragma D binding "1.0" ENOENT +inline int ESRCH = 3; +#pragma D binding "1.0" ESRCH +inline int EINTR = 4; +#pragma D binding "1.0" EINTR +inline int EIO = 5; +#pragma D binding "1.0" EIO +inline int ENXIO = 6; +#pragma D binding "1.0" ENXIO +inline int E2BIG = 7; +#pragma D binding "1.0" E2BIG +inline int ENOEXEC = 8; +#pragma D binding "1.0" ENOEXEC +inline int EBADF = 9; +#pragma D binding "1.0" EBADF +inline int ECHILD = 10; +#pragma D binding "1.0" ECHILD +inline int EDEADLK = 11; +#pragma D binding "1.0" EDEADLK +inline int ENOMEM = 12; +#pragma D binding "1.0" ENOMEM +inline int EACCES = 13; +#pragma D binding "1.0" EACCES +inline int EFAULT = 14; +#pragma D binding "1.0" EFAULT +inline int ENOTBLK = 15; +#pragma D binding "1.0" ENOTBLK +inline int EBUSY = 16; +#pragma D binding "1.0" EBUSY +inline int EEXIST = 17; +#pragma D binding "1.0" EEXIST +inline int EXDEV = 18; +#pragma D binding "1.0" EXDEV +inline int ENODEV = 19; +#pragma D binding "1.0" ENODEV +inline int ENOTDIR = 20; +#pragma D binding "1.0" ENOTDIR +inline int EISDIR = 21; +#pragma D binding "1.0" EISDIR +inline int EINVAL = 22; +#pragma D binding "1.0" EINVAL +inline int ENFILE = 23; +#pragma D binding "1.0" ENFILE +inline int EMFILE = 24; +#pragma D binding "1.0" EMFILE +inline int ENOTTY = 25; +#pragma D binding "1.0" ENOTTY +inline int ETXTBSY = 26; +#pragma D binding "1.0" ETXTBSY +inline int EFBIG = 27; +#pragma D binding "1.0" EFBIG +inline int ENOSPC = 28; +#pragma D binding "1.0" ENOSPC +inline int ESPIPE = 29; +#pragma D binding "1.0" ESPIPE +inline int EROFS = 30; +#pragma D binding "1.0" EROFS +inline int EMLINK = 31; +#pragma D binding "1.0" EMLINK +inline int EPIPE = 32; +#pragma D binding "1.0" EPIPE +inline int EDOM = 33; +#pragma D binding "1.0" EDOM +inline int ERANGE = 34; +#pragma D binding "1.0" ERANGE +inline int EAGAIN = 35; +#pragma D binding "1.0" EAGAIN +inline int EWOULDBLOCK = EAGAIN; +#pragma D binding "1.0" EWOULDBLOCK +inline int EINPROGRESS = 36; +#pragma D binding "1.0" EINPROGRESS +inline int EALREADY = 37; +#pragma D binding "1.0" EALREADY +inline int ENOTSOCK = 38; +#pragma D binding "1.0" ENOTSOCK +inline int EDESTADDRREQ = 39; +#pragma D binding "1.0" EDESTADDRREQ +inline int EMSGSIZE = 40; +#pragma D binding "1.0" EMSGSIZE +inline int EPROTOTYPE = 41; +#pragma D binding "1.0" EPROTOTYPE +inline int ENOPROTOOPT = 42; +#pragma D binding "1.0" ENOPROTOOPT +inline int EPROTONOSUPPORT = 43; +#pragma D binding "1.0" EPROTONOSUPPORT +inline int ESOCKTNOSUPPORT = 44; +#pragma D binding "1.0" ESOCKTNOSUPPORT +inline int EOPNOTSUPP = 45; +#pragma D binding "1.0" EOPNOTSUPP +inline int ENOTSUP = EOPNOTSUPP; +#pragma D binding "1.0" ENOTSUP +inline int EPFNOSUPPORT = 46; +#pragma D binding "1.0" EPFNOSUPPORT +inline int EAFNOSUPPORT = 47; +#pragma D binding "1.0" EAFNOSUPPORT +inline int EADDRINUSE = 48; +#pragma D binding "1.0" EADDRINUSE +inline int EADDRNOTAVAIL = 49; +#pragma D binding "1.0" EADDRNOTAVAIL +inline int ENETDOWN = 50; +#pragma D binding "1.0" ENETDOWN +inline int ENETUNREACH = 51; +#pragma D binding "1.0" ENETUNREACH +inline int ENETRESET = 52; +#pragma D binding "1.0" ENETRESET +inline int ECONNABORTED = 53; +#pragma D binding "1.0" ECONNABORTED +inline int ECONNRESET = 54; +#pragma D binding "1.0" ECONNRESET +inline int ENOBUFS = 55; +#pragma D binding "1.0" ENOBUFS +inline int EISCONN = 56; +#pragma D binding "1.0" EISCONN +inline int ENOTCONN = 57; +#pragma D binding "1.0" ENOTCONN +inline int ESHUTDOWN = 58; +#pragma D binding "1.0" ESHUTDOWN +inline int ETOOMANYREFS = 59; +#pragma D binding "1.0" ETOOMANYREFS +inline int ETIMEDOUT = 60; +#pragma D binding "1.0" ETIMEDOUT +inline int ECONNREFUSED = 61; +#pragma D binding "1.0" ECONNREFUSED +inline int ELOOP = 62; +#pragma D binding "1.0" ELOOP +inline int ENAMETOOLONG = 63; +#pragma D binding "1.0" ENAMETOOLONG +inline int EHOSTDOWN = 64; +#pragma D binding "1.0" EHOSTDOWN +inline int EHOSTUNREACH = 65; +#pragma D binding "1.0" EHOSTUNREACH +inline int ENOTEMPTY = 66; +#pragma D binding "1.0" ENOTEMPTY +inline int EPROCLIM = 67; +#pragma D binding "1.0" EPROCLIM +inline int EUSERS = 68; +#pragma D binding "1.0" EUSERS +inline int EDQUOT = 69; +#pragma D binding "1.0" EDQUOT +inline int ESTALE = 70; +#pragma D binding "1.0" ESTALE +inline int EREMOTE = 71; +#pragma D binding "1.0" EREMOTE +inline int EBADRPC = 72; +#pragma D binding "1.0" EBADRPC +inline int ERPCMISMATCH = 73; +#pragma D binding "1.0" ERPCMISMATCH +inline int EPROGUNAVAIL = 74; +#pragma D binding "1.0" EPROGUNAVAIL +inline int EPROGMISMATCH = 75; +#pragma D binding "1.0" EPROGMISMATCH +inline int EPROCUNAVAIL = 76; +#pragma D binding "1.0" EPROCUNAVAIL +inline int ENOLCK = 77; +#pragma D binding "1.0" ENOLCK +inline int ENOSYS = 78; +#pragma D binding "1.0" ENOSYS +inline int EFTYPE = 79; +#pragma D binding "1.0" EFTYPE +inline int EAUTH = 80; +#pragma D binding "1.0" EAUTH +inline int ENEEDAUTH = 81; +#pragma D binding "1.0" ENEEDAUTH +inline int EIDRM = 82; +#pragma D binding "1.0" EIDRM +inline int ENOMSG = 83; +#pragma D binding "1.0" ENOMSG +inline int EOVERFLOW = 84; +#pragma D binding "1.0" EOVERFLOW +inline int ECANCELED = 85; +#pragma D binding "1.0" ECANCELED +inline int EILSEQ = 86; +#pragma D binding "1.0" EILSEQ +inline int ENOATTR = 87; +#pragma D binding "1.0" ENOATTR +inline int EDOOFUS = 88; +#pragma D binding "1.0" EDOOFUS +inline int EBADMSG = 89; +#pragma D binding "1.0" EBADMSG +inline int EMULTIHOP = 90; +#pragma D binding "1.0" EMULTIHOP +inline int ENOLINK = 91; +#pragma D binding "1.0" ENOLINK +inline int EPROTO = 92; +#pragma D binding "1.0" EPROTO +inline int ELAST = 92; +#pragma D binding "1.0" ELAST +inline int ERESTART = -1; +#pragma D binding "1.0" ERESTART +inline int EJUSTRETURN = -2; +#pragma D binding "1.0" EJUSTRETURN +inline int ENOIOCTL = -3; +#pragma D binding "1.0" ENOIOCTL +inline int EDIRIOCTL = -4; +#pragma D binding "1.0" EDIRIOCTL ==== //depot/projects/dtrace7/src/cddl/lib/libdtrace/psinfo.d#2 (text+ko) ==== @@ -40,6 +40,8 @@ gid_t pr_egid; /* effective group id */ uintptr_t pr_addr; /* address of process */ + string pr_psargs; /* process arguments */ + u_int pr_arglen; /* process argument length */ } psinfo_t; #pragma D binding "1.0" translator @@ -54,6 +56,8 @@ pr_gid = T->p_ucred->cr_rgid; pr_egid = T->p_ucred->cr_groups[0]; pr_addr = 0; + pr_psargs = stringof(T->p_args->ar_args); + pr_arglen = T->p_args->ar_length; }; typedef struct lwpsinfo { @@ -89,17 +93,3 @@ #pragma D attributes Stable/Stable/Common curlwpsinfo #pragma D binding "1.0" curlwpsinfo -/* - * ppid, uid and gid are used frequently enough to merit their own inlines... - */ -inline uid_t ppid = curpsinfo->pr_ppid; -#pragma D attributes Stable/Stable/Common ppid -#pragma D binding "1.0" ppid - -inline uid_t uid = curpsinfo->pr_uid; -#pragma D attributes Stable/Stable/Common uid -#pragma D binding "1.0" uid - -inline gid_t gid = curpsinfo->pr_gid; -#pragma D attributes Stable/Stable/Common gid -#pragma D binding "1.0" gid ==== //depot/projects/dtrace7/src/cddl/lib/libnvpair/Makefile#3 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/lib/libumem/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/lib/libuutil/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/lib/libzfs/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/lib/libzpool/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/sbin/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/sbin/Makefile.inc#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/sbin/zfs/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/sbin/zpool/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/usr.bin/Makefile#3 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/usr.bin/Makefile.inc#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/usr.bin/ctfconvert/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/usr.bin/ctfdump/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/usr.bin/ctfmerge/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/usr.bin/sgsmsg/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/usr.bin/ztest/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/usr.sbin/Makefile#3 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/usr.sbin/Makefile.inc#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/usr.sbin/dtrace/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/cddl/usr.sbin/zdb/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/compat/opensolaris/include/alloca.h#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/compat/opensolaris/include/devid.h#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/compat/opensolaris/include/fcntl.h#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/compat/opensolaris/include/fsshare.h#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/compat/opensolaris/include/libintl.h#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/compat/opensolaris/include/mnttab.h#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/compat/opensolaris/include/priv.h#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/compat/opensolaris/include/solaris.h#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 28 00:31:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE7F816A41B; Mon, 28 Jan 2008 00:31:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B90416A418 for ; Mon, 28 Jan 2008 00:31:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4D2A513C468 for ; Mon, 28 Jan 2008 00:31:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0S0VDom068710 for ; Mon, 28 Jan 2008 00:31:13 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0S0VDFY068707 for perforce@freebsd.org; Mon, 28 Jan 2008 00:31:13 GMT (envelope-from jb@freebsd.org) Date: Mon, 28 Jan 2008 00:31:13 GMT Message-Id: <200801280031.m0S0VDFY068707@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134265 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 00:31:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=134265 Change 134265 by jb@jb_freebsd1 on 2008/01/28 00:30:51 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/lib/Makefile#4 integrate .. //depot/projects/dtrace7/src/lib/libproc/Makefile#1 branch .. //depot/projects/dtrace7/src/lib/libproc/_libproc.h#1 branch .. //depot/projects/dtrace7/src/lib/libproc/libproc.h#1 branch .. //depot/projects/dtrace7/src/lib/libproc/proc_create.c#1 branch .. //depot/projects/dtrace7/src/lib/libproc/proc_util.c#1 branch Differences ... ==== //depot/projects/dtrace7/src/lib/Makefile#4 (text+ko) ==== @@ -34,6 +34,7 @@ libgssapi libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ + libpmc libproc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ @@ -62,6 +63,10 @@ _libsdp= libsdp .endif +.if ${MK_GSSAPI} != "no" +_libgssapi= libgssapi +.endif + .if ${MK_IPX} != "no" _libipx= libipx .endif From owner-p4-projects@FreeBSD.ORG Mon Jan 28 01:15:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 495AA16A421; Mon, 28 Jan 2008 01:15:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EAE2116A419 for ; Mon, 28 Jan 2008 01:15:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C45B613C45A for ; Mon, 28 Jan 2008 01:15:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0S1F9AG081639 for ; Mon, 28 Jan 2008 01:15:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0S1F9Ob081636 for perforce@freebsd.org; Mon, 28 Jan 2008 01:15:09 GMT (envelope-from jb@freebsd.org) Date: Mon, 28 Jan 2008 01:15:09 GMT Message-Id: <200801280115.m0S1F9Ob081636@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134270 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 01:15:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=134270 Change 134270 by jb@jb_freebsd1 on 2008/01/28 01:14:12 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/sys/sys/dtrace_bsd.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/sdt.h#1 branch Differences ... ==== //depot/projects/dtrace7/src/sys/sys/dtrace_bsd.h#2 (text+ko) ==== @@ -31,12 +31,60 @@ #ifndef _SYS_DTRACE_BSD_H #define _SYS_DTRACE_BSD_H +/* Forward definitions: */ +struct trapframe; +struct thread; + +/* + * Cyclic clock function type definition used to hook the cyclic + * subsystem into the appropriate timer interrupt. + */ +typedef void (*cyclic_clock_func_t)(struct trapframe *); + +/* + * These external variables are actually machine-dependent, so + * they might not actually exist. + * + * Defining them here avoids a proliferation of header files. + */ +extern cyclic_clock_func_t lapic_cyclic_clock_func[]; + +/* + * The dtrace module handles traps that occur during a DTrace probe. + * This type definition is used in the trap handler to provide a + * hook for the dtrace module to register it's handler with. + */ +typedef int (*dtrace_trap_func_t)(struct trapframe *, u_int); + +int dtrace_trap(struct trapframe *, u_int); + +extern dtrace_trap_func_t dtrace_trap_func; + /* Used by the machine dependent trap() code. */ typedef int (*dtrace_invop_func_t)(uintptr_t, uintptr_t *, uintptr_t); /* Global variable in trap.c */ extern dtrace_invop_func_t dtrace_invop_func; +/* Virtual time hook function type. */ +typedef void (*dtrace_vtime_switch_func_t)(struct thread *); + +extern int dtrace_vtime_active; +extern dtrace_vtime_switch_func_t dtrace_vtime_switch_func; + +/* The fasttrap module hooks into the fork, exit and exit. */ +typedef void (*dtrace_fork_func_t)(struct proc *, struct proc *); +typedef void (*dtrace_execexit_func_t)(struct proc *); + +/* Global variable in kern_fork.c */ +extern dtrace_fork_func_t dtrace_fasttrap_fork; + +/* Global variable in kern_exec.c */ +extern dtrace_execexit_func_t dtrace_fasttrap_exec; + +/* Global variable in kern_exit.c */ +extern dtrace_execexit_func_t dtrace_fasttrap_exit; + /* * Functions which allow the dtrace module to check that the kernel * hooks have been compiled with sufficient space for it's private @@ -45,4 +93,11 @@ size_t kdtrace_proc_size(void); size_t kdtrace_thread_size(void); +/* + * OpenSolaris compatible time functions returning nanoseconds. + * On OpenSolaris these return hrtime_t which we define as uint64_t. + */ +uint64_t dtrace_gethrtime(void); +uint64_t dtrace_gethrestime(void); + #endif /* _SYS_DTRACE_BSD_H */ From owner-p4-projects@FreeBSD.ORG Mon Jan 28 01:16:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84F0D16A419; Mon, 28 Jan 2008 01:16:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 325B116A417 for ; Mon, 28 Jan 2008 01:16:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0BD6213C448 for ; Mon, 28 Jan 2008 01:16:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0S1GASq081688 for ; Mon, 28 Jan 2008 01:16:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0S1GAAZ081685 for perforce@freebsd.org; Mon, 28 Jan 2008 01:16:10 GMT (envelope-from jb@freebsd.org) Date: Mon, 28 Jan 2008 01:16:10 GMT Message-Id: <200801280116.m0S1GAAZ081685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134271 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 01:16:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=134271 Change 134271 by jb@jb_freebsd1 on 2008/01/28 01:15:47 Remove the vmem.h include. Affected files ... .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#5 edit Differences ... ==== //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#5 (text+ko) ==== @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Mon Jan 28 01:22:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CBA116A46C; Mon, 28 Jan 2008 01:22:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE55B16A418 for ; Mon, 28 Jan 2008 01:22:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C790313C465 for ; Mon, 28 Jan 2008 01:22:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0S1MHt4081978 for ; Mon, 28 Jan 2008 01:22:17 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0S1MHTS081975 for perforce@freebsd.org; Mon, 28 Jan 2008 01:22:17 GMT (envelope-from jb@freebsd.org) Date: Mon, 28 Jan 2008 01:22:17 GMT Message-Id: <200801280122.m0S1MHTS081975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 01:22:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=134272 Change 134272 by jb@jb_freebsd1 on 2008/01/28 01:21:52 Remove a couple of definitions I added previously but have since decided they can be avoided. Affected files ... .. //depot/projects/dtrace7/src/include/unistd.h#3 edit Differences ... ==== //depot/projects/dtrace7/src/include/unistd.h#3 (text+ko) ==== @@ -296,8 +296,6 @@ /* Extensions found in Solaris and Linux. */ #define _SC_PHYS_PAGES 121 -#define _SC_NPROCESSORS_MAX 122 -#define _SC_CPUID_MAX 123 /* Keys for the confstr(3) function. */ #if __POSIX_VISIBLE >= 199209 From owner-p4-projects@FreeBSD.ORG Mon Jan 28 01:28:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 542E016A420; Mon, 28 Jan 2008 01:28:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 007A516A41A for ; Mon, 28 Jan 2008 01:28:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E51F413C455 for ; Mon, 28 Jan 2008 01:28:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0S1SNel082149 for ; Mon, 28 Jan 2008 01:28:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0S1SNGl082146 for perforce@freebsd.org; Mon, 28 Jan 2008 01:28:23 GMT (envelope-from sam@freebsd.org) Date: Mon, 28 Jan 2008 01:28:23 GMT Message-Id: <200801280128.m0S1SNGl082146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 01:28:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=134273 Change 134273 by sam@sam_ebb on 2008/01/28 01:27:40 Cleanup debug support: o dev.ral.X.debug controls debug msgs for each device o DPRINTF* use varargs macros o remove painful interdependence of 2560+2661 debug code Temporarily enable debug msgs by default until the driver is fully funcitonal again. Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560.c#10 edit .. //depot/projects/vap/sys/dev/ral/rt2560var.h#6 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#8 edit .. //depot/projects/vap/sys/dev/ral/rt2661var.h#5 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560.c#10 (text) ==== @@ -70,13 +70,19 @@ ((rssi) > (RT2560_NOISE_FLOOR + (sc)->rssi_corr) ? \ ((rssi) - RT2560_NOISE_FLOOR - (sc)->rssi_corr) : 0) +#define RAL_DEBUG #ifdef RAL_DEBUG -#define DPRINTF(x) do { if (ral_debug > 0) printf x; } while (0) -#define DPRINTFN(n, x) do { if (ral_debug >= (n)) printf x; } while (0) -extern int ral_debug; +#define DPRINTF(sc, fmt, ...) do { \ + if (sc->sc_debug > 0) \ + printf(fmt, __VA_ARGS__); \ +} while (0) +#define DPRINTFN(sc, n, fmt, ...) do { \ + if (sc->sc_debug >= (n)) \ + printf(fmt, __VA_ARGS__); \ +} while (0) #else -#define DPRINTF(x) -#define DPRINTFN(n, x) +#define DPRINTF(sc, fmt, ...) +#define DPRINTFN(sc, n, fmt, ...) #endif static struct ieee80211vap *rt2560_vap_create(struct ieee80211com *, @@ -315,6 +321,11 @@ /* * Add a few sysctl knobs. */ +#ifdef RAL_DEBUG + SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "debug", CTLFLAG_RW, &sc->sc_debug, 0, "debug msgs"); +#endif SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "txantenna", CTLFLAG_RW, &sc->tx_ant, 0, "tx antenna (0=auto)"); @@ -920,8 +931,8 @@ /* mark the frame ready for transmission */ desc->flags |= htole32(RT2560_TX_BUSY | RT2560_TX_VALID); - DPRINTFN(15, ("encryption done idx=%u\n", - sc->txq.next_encrypt)); + DPRINTFN(sc, 15, "encryption done idx=%u\n", + sc->txq.next_encrypt); sc->txq.next_encrypt = (sc->txq.next_encrypt + 1) % RT2560_TX_RING_COUNT; @@ -959,7 +970,7 @@ switch (le32toh(desc->flags) & RT2560_TX_RESULT_MASK) { case RT2560_TX_SUCCESS: - DPRINTFN(10, ("data frame sent successfully\n")); + DPRINTFN(sc, 10, "%s\n", "data frame sent successfully"); if (data->id.id_node != NULL) { ral_rssadapt_raise_rate(&rn->rssadapt, &data->id); @@ -968,14 +979,14 @@ break; case RT2560_TX_SUCCESS_RETRY: - DPRINTFN(9, ("data frame sent after %u retries\n", - (le32toh(desc->flags) >> 5) & 0x7)); + DPRINTFN(sc, 9, "data frame sent after %u retries\n", + (le32toh(desc->flags) >> 5) & 0x7); ifp->if_opackets++; break; case RT2560_TX_FAIL_RETRY: - DPRINTFN(9, ("sending data frame failed (too much " - "retries)\n")); + DPRINTFN(sc, 9, "%s\n", + "sending data frame failed (too much retries)"); if (data->id.id_node != NULL) { ral_rssadapt_lower_rate(data->ni, &rn->rssadapt, &data->id); @@ -1002,7 +1013,7 @@ /* descriptor is no longer valid */ desc->flags &= ~htole32(RT2560_TX_VALID); - DPRINTFN(15, ("tx done idx=%u\n", sc->txq.next)); + DPRINTFN(sc, 15, "tx done idx=%u\n", sc->txq.next); sc->txq.queued--; sc->txq.next = (sc->txq.next + 1) % RT2560_TX_RING_COUNT; @@ -1040,17 +1051,17 @@ switch (flags & RT2560_TX_RESULT_MASK) { case RT2560_TX_SUCCESS: - DPRINTFN(10, ("mgt frame sent successfully\n")); + DPRINTFN(sc, 10, "%s\n", "mgt frame sent successfully"); break; case RT2560_TX_SUCCESS_RETRY: - DPRINTFN(9, ("mgt frame sent after %u retries\n", - (flags >> 5) & 0x7)); + DPRINTFN(sc, 9, "mgt frame sent after %u retries\n", + (flags >> 5) & 0x7); break; case RT2560_TX_FAIL_RETRY: - DPRINTFN(9, ("sending mgt frame failed (too much " - "retries)\n")); + DPRINTFN(sc, 9, "%s\n", + "sending mgt frame failed (too much retries)"); break; case RT2560_TX_FAIL_INVALID: @@ -1073,7 +1084,7 @@ /* descriptor is no longer valid */ desc->flags &= ~htole32(RT2560_TX_VALID); - DPRINTFN(15, ("prio done idx=%u\n", sc->prioq.next)); + DPRINTFN(sc, 15, "prio done idx=%u\n", sc->prioq.next); sc->prioq.queued--; sc->prioq.next = (sc->prioq.next + 1) % RT2560_PRIO_RING_COUNT; @@ -1230,7 +1241,7 @@ sc->sc_flags &= ~RAL_INPUT_RUNNING; skip: desc->flags = htole32(RT2560_RX_BUSY); - DPRINTFN(15, ("decryption done idx=%u\n", sc->rxq.cur_decrypt)); + DPRINTFN(sc, 15, "decryption done idx=%u\n", sc->rxq.cur_decrypt); sc->rxq.cur_decrypt = (sc->rxq.cur_decrypt + 1) % RT2560_RX_RING_COUNT; @@ -1269,20 +1280,20 @@ * This should not happen since we did not request * to receive those frames when we filled RXCSR0. */ - DPRINTFN(5, ("PHY or CRC error flags 0x%08x\n", - le32toh(desc->flags))); + DPRINTFN(sc, 5, "PHY or CRC error flags 0x%08x\n", + le32toh(desc->flags)); data->drop = 1; } if (((le32toh(desc->flags) >> 16) & 0xfff) > MCLBYTES) { - DPRINTFN(5, ("bad length\n")); + DPRINTFN(sc, 5, "%s\n", "bad length"); data->drop = 1; } /* mark the frame for decryption */ desc->flags |= htole32(RT2560_RX_CIPHER_BUSY); - DPRINTFN(15, ("rx done idx=%u\n", sc->rxq.cur)); + DPRINTFN(sc, 15, "rx done idx=%u\n", sc->rxq.cur); sc->rxq.cur = (sc->rxq.cur + 1) % RT2560_RX_RING_COUNT; } @@ -1334,7 +1345,7 @@ rt2560_tx_bcn(sc, data->m, data->ni); - DPRINTFN(15, ("beacon expired\n")); + DPRINTFN(sc, 15, "%s", "beacon expired\n"); sc->bcnq.next = (sc->bcnq.next + 1) % RT2560_BEACON_RING_COUNT; } @@ -1343,7 +1354,7 @@ static void rt2560_wakeup_expire(struct rt2560_softc *sc) { - DPRINTFN(2, ("wakeup expired\n")); + DPRINTFN(sc, 2, "%s", "wakeup expired\n"); } void @@ -1541,8 +1552,8 @@ rt2560_setup_tx_desc(sc, desc, RT2560_TX_IFS_NEWBACKOFF | RT2560_TX_TIMESTAMP, m0->m_pkthdr.len, rate, 0, segs->ds_addr); - DPRINTFN(10, ("sending beacon frame len=%u idx=%u rate=%u\n", - m0->m_pkthdr.len, sc->bcnq.cur, rate)); + DPRINTFN(sc, 10, "sending beacon frame len=%u idx=%u rate=%u\n", + m0->m_pkthdr.len, sc->bcnq.cur, rate); bus_dmamap_sync(sc->bcnq.data_dmat, data->map, BUS_DMASYNC_PREWRITE); bus_dmamap_sync(sc->bcnq.desc_dmat, sc->bcnq.desc_map, @@ -1630,8 +1641,8 @@ bus_dmamap_sync(sc->prioq.desc_dmat, sc->prioq.desc_map, BUS_DMASYNC_PREWRITE); - DPRINTFN(10, ("sending mgt frame len=%u idx=%u rate=%u\n", - m0->m_pkthdr.len, sc->prioq.cur, rate)); + DPRINTFN(sc, 10, "sending mgt frame len=%u idx=%u rate=%u\n", + m0->m_pkthdr.len, sc->prioq.cur, rate); /* kick prio */ sc->prioq.queued++; @@ -1699,8 +1710,8 @@ bus_dmamap_sync(sc->prioq.desc_dmat, sc->prioq.desc_map, BUS_DMASYNC_PREWRITE); - DPRINTFN(10, ("sending raw frame len=%u idx=%u rate=%u\n", - m0->m_pkthdr.len, sc->prioq.cur, rate)); + DPRINTFN(sc, 10, "sending raw frame len=%u idx=%u rate=%u\n", + m0->m_pkthdr.len, sc->prioq.cur, rate); /* kick prio */ sc->prioq.queued++; @@ -1926,8 +1937,8 @@ bus_dmamap_sync(sc->txq.desc_dmat, sc->txq.desc_map, BUS_DMASYNC_PREWRITE); - DPRINTFN(10, ("sending data frame len=%u idx=%u rate=%u\n", - m0->m_pkthdr.len, sc->txq.cur_encrypt, rate)); + DPRINTFN(sc, 10, "sending data frame len=%u idx=%u rate=%u\n", + m0->m_pkthdr.len, sc->txq.cur_encrypt, rate); /* kick encrypt */ sc->txq.queued++; @@ -2043,7 +2054,7 @@ tmp = RT2560_BBP_WRITE | RT2560_BBP_BUSY | reg << 8 | val; RAL_WRITE(sc, RT2560_BBPCSR, tmp); - DPRINTFN(15, ("BBP R%u <- 0x%02x\n", reg, val)); + DPRINTFN(sc, 15, "BBP R%u <- 0x%02x\n", reg, val); } static uint8_t @@ -2089,7 +2100,7 @@ /* remember last written value in sc */ sc->rf_regs[reg] = val; - DPRINTFN(15, ("RF R[%u] <- 0x%05x\n", reg & 0x3, val & 0xfffff)); + DPRINTFN(sc, 15, "RF R[%u] <- 0x%05x\n", reg & 0x3, val & 0xfffff); } static void @@ -2112,7 +2123,7 @@ /* adjust txpower using ifconfig settings */ power -= (100 - ic->ic_txpowlimit) / 8; - DPRINTFN(2, ("setting channel to %u, txpower to %u\n", chan, power)); + DPRINTFN(sc, 2, "setting channel to %u, txpower to %u\n", chan, power); switch (sc->rf_rev) { case RT2560_RF_2522: @@ -2222,7 +2233,7 @@ tmp = sc->rf_regs[RAL_RF3] & ~RAL_RF3_AUTOTUNE; rt2560_rf_write(sc, RAL_RF3, tmp); - DPRINTFN(2, ("disabling RF autotune\n")); + DPRINTFN(sc, 2, "%s", "disabling RF autotune\n"); } #endif @@ -2260,7 +2271,7 @@ RT2560_ENABLE_BEACON_GENERATOR; RAL_WRITE(sc, RT2560_CSR14, tmp); - DPRINTF(("enabling TSF synchronization\n")); + DPRINTF(sc, "%s", "enabling TSF synchronization\n"); } static void @@ -2283,8 +2294,8 @@ RAL_WRITE(sc, RT2560_PLCP11MCSR, 0x000b840b); } - DPRINTF(("updating PLCP for %s preamble\n", - (ic->ic_flags & IEEE80211_F_SHPREAMBLE) ? "short" : "long")); + DPRINTF(sc, "updating PLCP for %s preamble\n", + (ic->ic_flags & IEEE80211_F_SHPREAMBLE) ? "short" : "long"); } /* @@ -2318,7 +2329,7 @@ tmp = eifs << 16 | tx_difs; RAL_WRITE(sc, RT2560_CSR19, tmp); - DPRINTF(("setting slottime to %uus\n", slottime)); + DPRINTF(sc, "setting slottime to %uus\n", slottime); } static void @@ -2360,7 +2371,7 @@ tmp = bssid[4] | bssid[5] << 8; RAL_WRITE(sc, RT2560_CSR6, tmp); - DPRINTF(("setting BSSID to %6D\n", bssid, ":")); + DPRINTF(sc, "setting BSSID to %6D\n", bssid, ":"); } static void @@ -2374,7 +2385,7 @@ tmp = addr[4] | addr[5] << 8; RAL_WRITE(sc, RT2560_CSR4, tmp); - DPRINTF(("setting MAC address to %6D\n", addr, ":")); + DPRINTF(sc, "setting MAC address to %6D\n", addr, ":"); } static void @@ -2407,8 +2418,8 @@ RAL_WRITE(sc, RT2560_RXCSR0, tmp); - DPRINTF(("%s promiscuous mode\n", (ifp->if_flags & IFF_PROMISC) ? - "entering" : "leaving")); + DPRINTF(sc, "%s promiscuous mode\n", (ifp->if_flags & IFF_PROMISC) ? + "entering" : "leaving"); } static const char * @@ -2459,8 +2470,8 @@ sc->rssi_corr = RT2560_DEFAULT_RSSI_CORR; else sc->rssi_corr = val & 0xff; - DPRINTF(("rssi correction %d, calibrate 0x%02x\n", - sc->rssi_corr, val)); + DPRINTF(sc, "rssi correction %d, calibrate 0x%02x\n", + sc->rssi_corr, val); } @@ -2579,8 +2590,6 @@ uint32_t tmp; int i; - - rt2560_stop(sc); RAL_LOCK(sc); ==== //depot/projects/vap/sys/dev/ral/rt2560var.h#6 (text) ==== @@ -120,6 +120,7 @@ int sc_tx_timer; int sc_invalid; + int sc_debug; const struct ieee80211_rate_table *sc_currates; /* ==== //depot/projects/vap/sys/dev/ral/rt2661.c#8 (text) ==== @@ -66,14 +66,19 @@ #include #include +#define RAL_DEBUG #ifdef RAL_DEBUG -#define DPRINTF(x) do { if (ral_debug > 0) printf x; } while (0) -#define DPRINTFN(n, x) do { if (ral_debug >= (n)) printf x; } while (0) -int ral_debug = 0; -SYSCTL_INT(_debug, OID_AUTO, ral, CTLFLAG_RW, &ral_debug, 0, "ral debug level"); +#define DPRINTF(sc, fmt, ...) do { \ + if (sc->sc_debug > 0) \ + printf(fmt, __VA_ARGS__); \ +} while (0) +#define DPRINTFN(sc, n, fmt, ...) do { \ + if (sc->sc_debug >= (n)) \ + printf(fmt, __VA_ARGS__); \ +} while (0) #else -#define DPRINTF(x) -#define DPRINTFN(n, x) +#define DPRINTF(sc, fmt, ...) +#define DPRINTFN(sc, n, fmt, ...) #endif static struct ieee80211vap *rt2661_vap_create(struct ieee80211com *, @@ -345,6 +350,11 @@ sc->sc_txtap.wt_ihdr.it_len = htole16(sc->sc_txtap_len); sc->sc_txtap.wt_ihdr.it_present = htole32(RT2661_TX_RADIOTAP_PRESENT); +#ifdef RAL_DEBUG + SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "debug", CTLFLAG_RW, &sc->sc_debug, 0, "debug msgs"); +#endif if (bootverbose) ieee80211_announce(ic); @@ -947,8 +957,8 @@ case RT2661_TX_SUCCESS: retrycnt = RT2661_TX_RETRYCNT(val); - DPRINTFN(10, ("data frame sent successfully after " - "%d retries\n", retrycnt)); + DPRINTFN(sc, 10, "data frame sent successfully after " + "%d retries\n", retrycnt); if (retrycnt == 0 && data->id.id_node != NULL) { ral_rssadapt_raise_rate(&rn->rssadapt, &data->id); @@ -957,8 +967,8 @@ break; case RT2661_TX_RETRY_FAIL: - DPRINTFN(9, ("sending data frame failed (too much " - "retries)\n")); + DPRINTFN(sc, 9, "%s\n", + "sending data frame failed (too much retries)"); if (data->id.id_node != NULL) { ral_rssadapt_lower_rate(ni, &rn->rssadapt, &data->id); @@ -973,7 +983,7 @@ ifp->if_oerrors++; } - DPRINTFN(15, ("tx done q=%d idx=%u\n", qid, txq->stat)); + DPRINTFN(sc, 15, "tx done q=%d idx=%u\n", qid, txq->stat); txq->queued--; if (++txq->stat >= txq->count) /* faster than % count */ @@ -1014,7 +1024,7 @@ /* descriptor is no longer valid */ desc->flags &= ~htole32(RT2661_TX_VALID); - DPRINTFN(15, ("tx dma done q=%p idx=%u\n", txq, txq->next)); + DPRINTFN(sc, 15, "tx dma done q=%p idx=%u\n", txq, txq->next); if (++txq->next >= txq->count) /* faster than % count */ txq->next = 0; @@ -1055,8 +1065,8 @@ * This should not happen since we did not request * to receive those frames when we filled TXRX_CSR0. */ - DPRINTFN(5, ("PHY or CRC error flags 0x%08x\n", - le32toh(desc->flags))); + DPRINTFN(sc, 5, "PHY or CRC error flags 0x%08x\n", + le32toh(desc->flags)); ifp->if_ierrors++; goto skip; } @@ -1164,7 +1174,7 @@ skip: desc->flags |= htole32(RT2661_RX_BUSY); - DPRINTFN(15, ("rx intr idx=%u\n", sc->rxq.cur)); + DPRINTFN(sc, 15, "rx intr idx=%u\n", sc->rxq.cur); sc->rxq.cur = (sc->rxq.cur + 1) % RT2661_RX_RING_COUNT; } @@ -1524,8 +1534,8 @@ bus_dmamap_sync(sc->mgtq.desc_dmat, sc->mgtq.desc_map, BUS_DMASYNC_PREWRITE); - DPRINTFN(10, ("sending mgt frame len=%u idx=%u rate=%u\n", - m0->m_pkthdr.len, sc->mgtq.cur, rate)); + DPRINTFN(sc, 10, "sending mgt frame len=%u idx=%u rate=%u\n", + m0->m_pkthdr.len, sc->mgtq.cur, rate); /* kick mgt */ sc->mgtq.queued++; @@ -1754,8 +1764,8 @@ bus_dmamap_sync(txq->data_dmat, data->map, BUS_DMASYNC_PREWRITE); bus_dmamap_sync(txq->desc_dmat, txq->desc_map, BUS_DMASYNC_PREWRITE); - DPRINTFN(10, ("sending data frame len=%u idx=%u rate=%u\n", - m0->m_pkthdr.len, txq->cur, rate)); + DPRINTFN(sc, 10, "sending data frame len=%u idx=%u rate=%u\n", + m0->m_pkthdr.len, txq->cur, rate); /* kick Tx */ txq->queued++; @@ -1940,7 +1950,7 @@ tmp = RT2661_BBP_BUSY | (reg & 0x7f) << 8 | val; RAL_WRITE(sc, RT2661_PHY_CSR3, tmp); - DPRINTFN(15, ("BBP R%u <- 0x%02x\n", reg, val)); + DPRINTFN(sc, 15, "BBP R%u <- 0x%02x\n", reg, val); } static uint8_t @@ -1996,7 +2006,7 @@ /* remember last written value in sc */ sc->rf_regs[reg] = val; - DPRINTFN(15, ("RF R[%u] <- 0x%05x\n", reg & 3, val & 0x1fffff)); + DPRINTFN(sc, 15, "RF R[%u] <- 0x%05x\n", reg & 3, val & 0x1fffff); } static int @@ -2096,7 +2106,7 @@ RAL_WRITE(sc, RT2661_TXRX_CSR5, mask); - DPRINTF(("Setting basic rate mask to 0x%x\n", mask)); + DPRINTF(sc, "Setting basic rate mask to 0x%x\n", mask); #undef RV } @@ -2258,8 +2268,8 @@ RAL_WRITE(sc, RT2661_TXRX_CSR0, tmp); - DPRINTF(("%s promiscuous mode\n", (ifp->if_flags & IFF_PROMISC) ? - "entering" : "leaving")); + DPRINTF(sc, "%s promiscuous mode\n", (ifp->if_flags & IFF_PROMISC) ? + "entering" : "leaving"); } /* @@ -2363,14 +2373,14 @@ sc->tx_ant = (val >> 2) & 0x3; sc->nb_ant = val & 0x3; - DPRINTF(("RF revision=%d\n", sc->rf_rev)); + DPRINTF(sc, "RF revision=%d\n", sc->rf_rev); val = rt2661_eeprom_read(sc, RT2661_EEPROM_CONFIG2); sc->ext_5ghz_lna = (val >> 6) & 0x1; sc->ext_2ghz_lna = (val >> 4) & 0x1; - DPRINTF(("External 2GHz LNA=%d\nExternal 5GHz LNA=%d\n", - sc->ext_2ghz_lna, sc->ext_5ghz_lna)); + DPRINTF(sc, "External 2GHz LNA=%d\nExternal 5GHz LNA=%d\n", + sc->ext_2ghz_lna, sc->ext_5ghz_lna); val = rt2661_eeprom_read(sc, RT2661_EEPROM_RSSI_2GHZ_OFFSET); if ((val & 0xff) != 0xff) @@ -2394,8 +2404,8 @@ if (sc->ext_5ghz_lna) sc->rssi_5ghz_corr -= 14; - DPRINTF(("RSSI 2GHz corr=%d\nRSSI 5GHz corr=%d\n", - sc->rssi_2ghz_corr, sc->rssi_5ghz_corr)); + DPRINTF(sc, "RSSI 2GHz corr=%d\nRSSI 5GHz corr=%d\n", + sc->rssi_2ghz_corr, sc->rssi_5ghz_corr); val = rt2661_eeprom_read(sc, RT2661_EEPROM_FREQ_OFFSET); if ((val >> 8) != 0xff) @@ -2403,17 +2413,17 @@ if ((val & 0xff) != 0xff) sc->rffreq = val & 0xff; - DPRINTF(("RF prog=%d\nRF freq=%d\n", sc->rfprog, sc->rffreq)); + DPRINTF(sc, "RF prog=%d\nRF freq=%d\n", sc->rfprog, sc->rffreq); /* read Tx power for all a/b/g channels */ for (i = 0; i < 19; i++) { val = rt2661_eeprom_read(sc, RT2661_EEPROM_TXPOWER + i); sc->txpow[i * 2] = (int8_t)(val >> 8); /* signed */ - DPRINTF(("Channel=%d Tx power=%d\n", - rt2661_rf5225_1[i * 2].chan, sc->txpow[i * 2])); + DPRINTF(sc, "Channel=%d Tx power=%d\n", + rt2661_rf5225_1[i * 2].chan, sc->txpow[i * 2]); sc->txpow[i * 2 + 1] = (int8_t)(val & 0xff); /* signed */ - DPRINTF(("Channel=%d Tx power=%d\n", - rt2661_rf5225_1[i * 2 + 1].chan, sc->txpow[i * 2 + 1])); + DPRINTF(sc, "Channel=%d Tx power=%d\n", + rt2661_rf5225_1[i * 2 + 1].chan, sc->txpow[i * 2 + 1]); } /* read vendor-specific BBP values */ @@ -2423,8 +2433,8 @@ continue; /* skip invalid entries */ sc->bbp_prom[i].reg = val >> 8; sc->bbp_prom[i].val = val & 0xff; - DPRINTF(("BBP R%d=%02x\n", sc->bbp_prom[i].reg, - sc->bbp_prom[i].val)); + DPRINTF(sc, "BBP R%d=%02x\n", sc->bbp_prom[i].reg, + sc->bbp_prom[i].val); } } ==== //depot/projects/vap/sys/dev/ral/rt2661var.h#5 (text) ==== @@ -112,6 +112,7 @@ int sc_tx_timer; int sc_invalid; + int sc_debug; /* * The same in both up to here * ------------------------------------------------ From owner-p4-projects@FreeBSD.ORG Mon Jan 28 02:56:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6174716A421; Mon, 28 Jan 2008 02:56:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0DCFA16A419 for ; Mon, 28 Jan 2008 02:56:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA43D13C43E for ; Mon, 28 Jan 2008 02:56:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0S2uwUs087574 for ; Mon, 28 Jan 2008 02:56:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0S2uv80087569 for perforce@freebsd.org; Mon, 28 Jan 2008 02:56:57 GMT (envelope-from jb@freebsd.org) Date: Mon, 28 Jan 2008 02:56:57 GMT Message-Id: <200801280256.m0S2uv80087569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134277 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 02:56:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=134277 Change 134277 by jb@jb_freebsd1 on 2008/01/28 02:56:39 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/lib/libelf/Makefile#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/Version.map#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/_libelf.h#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_begin.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_begin.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_cntl.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_cntl.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_data.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_dump.c#1 branch .. //depot/projects/dtrace7/src/lib/libelf/elf_dump_argv.c#1 branch .. //depot/projects/dtrace7/src/lib/libelf/elf_end.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_end.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_errmsg.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_errmsg.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_errno.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_fill.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_fill.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_flag.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_flagdata.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_getarhdr.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_getarhdr.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_getarsym.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_getarsym.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_getbase.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_getbase.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_getdata.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_getident.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_getident.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_getphnum.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_getscn.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_getshnum.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_getshstrndx.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_hash.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_hash.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_kind.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_kind.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_memory.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_memory.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_next.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_next.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_phnum.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_rand.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_rand.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_rawfile.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_rawfile.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_scn.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_shnum.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_shstrndx.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_strptr.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_strptr.c#3 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_types.m4#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_update.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_update.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_version.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/elf_version.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf.h#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_cap.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_checksum.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_checksum.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_dyn.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_ehdr.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_fsize.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_fsize.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_getcap.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_getclass.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_getclass.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_getdyn.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_getehdr.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_getmove.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_getphdr.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_getrel.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_getrela.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_getshdr.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_getsym.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_getsyminfo.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_getsymshndx.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_move.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_newehdr.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_newphdr.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_phdr.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_rel.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_rela.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_shdr.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_sym.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_syminfo.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_symshndx.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_update_ehdr.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_xlate.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/gelf_xlatetof.3#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/libelf.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/libelf.h#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/libelf_align.c#3 integrate .. //depot/projects/dtrace7/src/lib/libelf/libelf_allocate.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/libelf_ar.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/libelf_checksum.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/libelf_convert.m4#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/libelf_data.c#3 integrate .. //depot/projects/dtrace7/src/lib/libelf/libelf_dump.c#1 branch .. //depot/projects/dtrace7/src/lib/libelf/libelf_ehdr.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/libelf_extended.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/libelf_fsize.m4#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/libelf_msize.m4#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/libelf_phdr.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/libelf_shdr.c#2 integrate .. //depot/projects/dtrace7/src/lib/libelf/libelf_xlate.c#3 integrate Differences ... ==== //depot/projects/dtrace7/src/lib/libelf/Makefile#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/Version.map#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/_libelf.h#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2006 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/elf.3,v 1.3 2006/12/11 09:03:27 jkoshy Exp $ +.\" $FreeBSD: src/lib/libelf/elf.3,v 1.5 2007/11/23 11:29:36 jkoshy Exp $ .\" -.Dd December 11, 2006 +.Dd October 21, 2007 .Os .Dt ELF 3 .Sh NAME @@ -375,6 +375,7 @@ .It Dv SHT_SYMTAB_SHNDX Ta Dv ELF_T_WORD Ta Used with extended section numbering. .It Dv SHT_GNU_verdef Ta Dv ELF_T_VDEF Ta Symbol version definitions. .It Dv SHT_GNU_verneed Ta Dv ELF_T_VNEED Ta Symbol versioning requirements. +.It Dv SHT_GNU_versym Ta Dv ELF_T_HALF Ta Version symbols. .It Dv SHT_SUNW_move Ta Dv ELF_T_MOVE Ta ELF move records. .It Dv SHT_SUNW_syminfo Ta Dv ELF_T_SYMINFO Ta Additional symbol flags. .El @@ -521,6 +522,9 @@ .Xr elf_flagelf 3 , following which the library will use the data offsets and alignments specified by the application when laying out the file. +Application control of file layout is described further in the +.Xr elf_update 3 +manual page. .Pp Gaps in between sections will be filled with the fill character set by function ==== //depot/projects/dtrace7/src/lib/libelf/elf_begin.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_begin.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_cntl.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_cntl.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_data.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_end.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_end.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_errmsg.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_errmsg.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_errno.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_fill.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_fill.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_flag.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_flagdata.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2006 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.2 2006/11/13 09:46:15 ru Exp $ +.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.3 2007/10/22 03:38:43 jkoshy Exp $ .\" -.Dd August 10, 2006 +.Dd October 22, 2007 .Os .Dt ELF_FLAGDATA 3 .Sh NAME @@ -51,7 +51,7 @@ .Ft "unsigned int" .Fn elf_flagshdr "Elf_Scn *scn" "Elf_Cmd cmd" "unsigned int flags" .Sh DESCRIPTION -These functions are used to query, set or reset flag bits on data +These functions are used to query, set or reset flags on data structures associated with an ELF file. .Pp Arguments @@ -59,7 +59,7 @@ .Ar elf and .Ar scn -denote the data structures whose status bits need to be changed. +denote the data structures whose flags need to be changed. These values are allowed to be NULL to simplify error handling in application code. .Pp @@ -70,16 +70,16 @@ .It Dv ELF_C_CLR The argument .Ar flags -specifies the bits to be cleared. +specifies the flags to be cleared. .It Dv ELF_C_SET The argument .Ar flags -specifies the bits to be set. +specifies the flags to be set. .El .Pp The argument .Ar flags -is allowed to have the following bits set: +is allowed to have the following flags set: .Bl -tag -width ELF_F_LAYOUT .It Dv ELF_F_DIRTY Mark the associated data structure as needing to be written back @@ -111,7 +111,7 @@ will return the current set of flags for the data structure being queried. .Sh RETURN VALUES -These functions return the updated bits is successful, and zero if +These functions return the updated flags is successful, and zero if an error is detected. .Sh ERRORS These functions may fail with the following errors: @@ -123,7 +123,7 @@ .It Bq Er ELF_E_ARGUMENT Argument .Ar flags -had unsupported flag bits set. +had unsupported flags set. .It Bq Er ELF_E_ARGUMENT The argument .Ar elf ==== //depot/projects/dtrace7/src/lib/libelf/elf_getarhdr.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_getarhdr.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_getarsym.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_getarsym.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_getbase.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_getbase.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_getdata.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_getident.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_getident.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_getphnum.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_getscn.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2006 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/elf_getscn.3,v 1.2 2006/11/13 09:46:15 ru Exp $ +.\" $FreeBSD: src/lib/libelf/elf_getscn.3,v 1.3 2007/10/22 03:38:43 jkoshy Exp $ .\" -.Dd August 26, 2006 +.Dd October 22, 2007 .Os .Dt ELF_GETSCN 3 .Sh NAME @@ -73,7 +73,7 @@ .Ar elf , and will set the .Dv ELF_F_DIRTY -bit for the new section. +flag on the returned section descriptor. For ELF descriptors opened for writing, the ELF library will automatically create an empty section at index zero .Dv ( SHN_UNDEF ) ==== //depot/projects/dtrace7/src/lib/libelf/elf_getshnum.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_getshstrndx.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_hash.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_hash.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_kind.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_kind.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_memory.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_memory.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_next.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_next.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_phnum.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_rand.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_rand.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_rawfile.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_rawfile.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_scn.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_shnum.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_shstrndx.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_strptr.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_strptr.c#3 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_types.m4#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_update.3#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.4 2007/09/08 08:20:12 jkoshy Exp $ +.\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.5 2007/10/22 03:38:43 jkoshy Exp $ .\" -.Dd September 08, 2007 +.Dd October 22, 2007 .Os .Dt ELF_UPDATE 3 .Sh NAME @@ -63,7 +63,7 @@ .Dv ELF_F_LAYOUT flag has been set on the ELF descriptor, the application assumes full responsibility for the layout of the ELF object. -If this bit is not set, the ELF library will compute the layout of the +If this flag is not set, the ELF library will compute the layout of the file from its associated section descriptors. .Pp It is the application's responsibility to manage the the following ==== //depot/projects/dtrace7/src/lib/libelf/elf_update.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_version.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/elf_version.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf.h#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_cap.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_checksum.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_checksum.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_dyn.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_ehdr.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_fsize.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_fsize.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_getcap.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_getclass.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_getclass.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_getdyn.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_getehdr.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_getmove.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_getphdr.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2006 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/gelf_getphdr.3,v 1.3 2006/12/25 02:24:39 jkoshy Exp $ +.\" $FreeBSD: src/lib/libelf/gelf_getphdr.3,v 1.4 2007/10/21 05:15:07 jkoshy Exp $ .\" -.Dd December 16, 2006 +.Dd October 21, 2007 .Os .Dt GELF_GETPHDR 3 .Sh NAME @@ -57,10 +57,9 @@ descriptors respectively. These descriptors are described in .Xr elf 5 . -The number of entries in this array is specified by the -.Va e_phnum -field of the executable header for ELF descriptor -.Ar elf . +The number of entries in this array may be determined using the +.Xr elf_getphnum 3 +function. .Pp Function .Fn gelf_getphdr @@ -134,6 +133,7 @@ .Xr elf64_getehdr 3 , .Xr elf64_newphdr 3 , .Xr elf_flagphdr 3 , +.Xr elf_getphnum 3 , .Xr gelf 3 , .Xr gelf_getehdr 3 , .Xr gelf_newphdr 3 , ==== //depot/projects/dtrace7/src/lib/libelf/gelf_getrel.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_getrela.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_getshdr.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_getsym.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_getsyminfo.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_getsymshndx.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_move.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_newehdr.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2006 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/gelf_newehdr.3,v 1.3 2006/12/25 02:24:39 jkoshy Exp $ +.\" $FreeBSD: src/lib/libelf/gelf_newehdr.3,v 1.4 2007/10/22 03:38:43 jkoshy Exp $ .\" -.Dd December 16, 2006 +.Dd October 22, 2007 .Os .Dt GELF_NEWEHDR 3 .Sh NAME @@ -122,7 +122,7 @@ .Pp If successful, these three functions set the .Dv ELF_F_DIRTY -bit on ELF descriptor +flag on ELF descriptor .Ar elf . .Sh RETURN VALUES These functions return a pointer to a translated header descriptor ==== //depot/projects/dtrace7/src/lib/libelf/gelf_newphdr.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2006 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/gelf_newphdr.3,v 1.2 2006/11/13 09:46:16 ru Exp $ +.\" $FreeBSD: src/lib/libelf/gelf_newphdr.3,v 1.4 2007/10/22 03:38:43 jkoshy Exp $ .\" -.Dd August 25, 2006 +.Dd October 22, 2007 .Os .Dt GELF_NEWPHDR 3 .Sh NAME @@ -81,14 +81,8 @@ .Ar elf . .Pp The functions set the -.Va e_phnum -field of the executable header for ELF descriptor -.Ar elf -to -.Ar count , -and also set the .Dv ELF_F_DIRTY -bit on the program header table. +flag on the program header table. All members of the returned array of Phdr structures will be initialized to zero. .Pp @@ -132,6 +126,7 @@ .Xr elf64_getphdr 3 , .Xr elf64_newehdr 3 , .Xr elf_flagphdr 3 , +.Xr elf_getphnum 3 , .Xr gelf 3 , .Xr gelf_getphdr 3 , .Xr gelf_newehdr 3 , ==== //depot/projects/dtrace7/src/lib/libelf/gelf_phdr.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_rel.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_rela.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_shdr.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_sym.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_syminfo.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_symshndx.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_update_ehdr.3#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_xlate.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/gelf_xlatetof.3#2 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/gelf_xlatetof.3,v 1.2 2006/11/13 09:46:16 ru Exp $ +.\" $FreeBSD: src/lib/libelf/gelf_xlatetof.3,v 1.3 2007/11/26 03:09:33 jkoshy Exp $ .\" .Dd July 24, 2006 .Os @@ -208,12 +208,6 @@ .It Bq Er ELF_E_DATA The .Ar src -argument had a zero -.Va d_size -field. -.It Bq Er ELF_E_DATA -The -.Ar src argument specified a buffer size that was not an integral multiple of its underlying type. .It Bq Er ELF_E_DATA ==== //depot/projects/dtrace7/src/lib/libelf/libelf.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/libelf.h#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/libelf_align.c#3 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/libelf_allocate.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/libelf_ar.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/libelf_checksum.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/libelf_convert.m4#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/libelf_data.c#3 (text+ko) ==== @@ -78,6 +78,8 @@ case SHT_SUNW_syminfo: return (ELF_T_SYMINFO); #endif + case SHT_AMD64_UNWIND: /* == SHT_IA_64_UNWIND */ + return (ELF_T_BYTE); default: return (-1); } ==== //depot/projects/dtrace7/src/lib/libelf/libelf_ehdr.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/libelf_extended.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/libelf_fsize.m4#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/libelf_msize.m4#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/libelf_phdr.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/libelf_shdr.c#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/lib/libelf/libelf_xlate.c#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Jan 28 02:58:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CB0916A421; Mon, 28 Jan 2008 02:58:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49E0A16A417 for ; Mon, 28 Jan 2008 02:58:00 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 22F2513C447 for ; Mon, 28 Jan 2008 02:58:00 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0S2w0x6087612 for ; Mon, 28 Jan 2008 02:58:00 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0S2w0I9087609 for perforce@freebsd.org; Mon, 28 Jan 2008 02:58:00 GMT (envelope-from sam@freebsd.org) Date: Mon, 28 Jan 2008 02:58:00 GMT Message-Id: <200801280258.m0S2w0I9087609@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134278 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 02:58:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=134278 Change 134278 by sam@sam_ebb on 2008/01/28 02:57:37 initial WDS save q for tmp nodes so when the node is cleaned up we don't die destroying the mtx Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_node.c#25 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#25 (text+ko) ==== @@ -985,6 +985,7 @@ IEEE80211_KEYIX_NONE); /* XXX optimize away */ IEEE80211_NODE_SAVEQ_INIT(ni, "unknown"); + IEEE80211_NODE_WDSQ_INIT(ni, "unknown"); } else { /* XXX msg */ vap->iv_stats.is_rx_nodealloc++; From owner-p4-projects@FreeBSD.ORG Mon Jan 28 03:04:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E04316A41A; Mon, 28 Jan 2008 03:04:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DEEF116A421 for ; Mon, 28 Jan 2008 03:04:07 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C5AB613C459 for ; Mon, 28 Jan 2008 03:04:07 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0S34781089155 for ; Mon, 28 Jan 2008 03:04:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0S347A3089152 for perforce@freebsd.org; Mon, 28 Jan 2008 03:04:07 GMT (envelope-from sam@freebsd.org) Date: Mon, 28 Jan 2008 03:04:07 GMT Message-Id: <200801280304.m0S347A3089152@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 03:04:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=134279 Change 134279 by sam@sam_ebb on 2008/01/28 03:03:29 checkpoint sephe's pending changes (hand transcribed) so I can work on ap mode Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560.c#11 edit .. //depot/projects/vap/sys/dev/ral/rt2560reg.h#3 edit .. //depot/projects/vap/sys/dev/ral/rt2560var.h#7 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560.c#11 (text) ==== @@ -158,7 +158,7 @@ static void rt2560_get_macaddr(struct rt2560_softc *, uint8_t *); static void rt2560_update_promisc(struct rt2560_softc *); static const char *rt2560_get_rf(int); -static void rt2560_read_eeprom(struct rt2560_softc *); +static void rt2560_read_config(struct rt2560_softc *); static int rt2560_bbp_init(struct rt2560_softc *); static void rt2560_set_txantenna(struct rt2560_softc *, int); static void rt2560_set_rxantenna(struct rt2560_softc *, int); @@ -220,7 +220,7 @@ rt2560_get_macaddr(sc, ic->ic_myaddr); /* retrieve RF rev. no and various other things from EEPROM */ - rt2560_read_eeprom(sc); + rt2560_read_config(sc); device_printf(dev, "MAC/BBP RT2560 (rev 0x%02x), RF %s\n", sc->asic_rev, rt2560_get_rf(sc->rf_rev)); @@ -358,7 +358,6 @@ rt2560_stop(sc); RAL_LOCK(sc); - callout_stop(&sc->watchdog_ch); callout_stop(&sc->rssadapt_ch); bpfdetach(ifp); @@ -916,7 +915,13 @@ bus_dmamap_sync(sc->txq.desc_dmat, sc->txq.desc_map, BUS_DMASYNC_POSTREAD); - for (; sc->txq.next_encrypt != hw;) { + while (sc->txq.next_encrypt != hw) { + if (sc->txq.next_encrypt == sc->txq.cur_encrypt) { + printf("hw encrypt %d, cur_encrypt %d\n", hw, + sc->txq.cur_encrypt); + break; + } + desc = &sc->txq.desc[sc->txq.next_encrypt]; if ((le32toh(desc->flags) & RT2560_TX_BUSY) || @@ -1022,9 +1027,16 @@ bus_dmamap_sync(sc->txq.desc_dmat, sc->txq.desc_map, BUS_DMASYNC_PREWRITE); - sc->sc_tx_timer = 0; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - rt2560_start(ifp); + if (sc->prioq.queued == 0 && sc->txq.queued == 0) + sc->sc_tx_timer = 0; + + if (sc->txq.queued < RT2560_TX_RING_COUNT - 1) { + sc->sc_flags &= ~RT2560_F_DATA_OACTIVE; + if ((sc->sc_flags & + (RT2560_F_DATA_OACTIVE | RT2560_F_PRIO_OACTIVE)) == 0) + ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + rt2560_start(ifp); + } } static void @@ -1100,9 +1112,16 @@ bus_dmamap_sync(sc->prioq.desc_dmat, sc->prioq.desc_map, BUS_DMASYNC_PREWRITE); - sc->sc_tx_timer = 0; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - rt2560_start(ifp); + if (sc->prioq.queued == 0 && sc->txq.queued == 0) + sc->sc_tx_timer = 0; + + if (sc->txq.queued < RT2560_PRIO_RING_COUNT - 1) { + sc->sc_flags &= ~RT2560_F_PRIO_OACTIVE; + if ((sc->sc_flags & + (RT2560_F_DATA_OACTIVE | RT2560_F_PRIO_OACTIVE)) == 0) + ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + rt2560_start(ifp); + } } /* @@ -1218,7 +1237,7 @@ bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); } - sc->sc_flags |= RAL_INPUT_RUNNING; + sc->sc_flags |= RT2560_F_INPUT_RUNNING; RAL_UNLOCK(sc); wh = mtod(m, struct ieee80211_frame *); ni = ieee80211_find_rxnode(ic, @@ -1238,7 +1257,7 @@ RT2560_RSSI(sc, desc->rssi), RT2560_NOISE_FLOOR, 0); RAL_LOCK(sc); - sc->sc_flags &= ~RAL_INPUT_RUNNING; + sc->sc_flags &= ~RT2560_F_INPUT_RUNNING; skip: desc->flags = htole32(RT2560_RX_BUSY); DPRINTFN(sc, 15, "decryption done idx=%u\n", sc->rxq.cur_decrypt); @@ -1396,8 +1415,10 @@ if (r & RT2560_DECRYPTION_DONE) rt2560_decryption_intr(sc); - if (r & RT2560_RX_DONE) + if (r & RT2560_RX_DONE) { rt2560_rx_intr(sc); + rt2560_encryption_intr(sc); + } /* re-enable interrupts */ RAL_WRITE(sc, RT2560_CSR8, RT2560_INTR_MASK); @@ -1475,8 +1496,6 @@ desc->flags = htole32(flags); desc->flags |= htole32(len << 16); - desc->flags |= encrypt ? htole32(RT2560_TX_CIPHER_BUSY) : - htole32(RT2560_TX_BUSY | RT2560_TX_VALID); desc->physaddr = htole32(physaddr); desc->wme = htole16( @@ -1508,6 +1527,11 @@ if (rate != 2 && (ic->ic_flags & IEEE80211_F_SHPREAMBLE)) desc->plcp_signal |= 0x08; } + + if (!encrypt) + desc->flags |= htole32(RT2560_TX_VALID); + desc->flags |= encrypt ? htole32(RT2560_TX_CIPHER_BUSY) : + htole32(RT2560_TX_BUSY); } static int @@ -1970,6 +1994,7 @@ if (sc->txq.queued >= RT2560_TX_RING_COUNT - 1) { IFQ_DRV_PREPEND(&ifp->if_snd, m); ifp->if_drv_flags |= IFF_DRV_OACTIVE; + sc->sc_flags |= RT2560_F_DATA_OACTIVE; break; } @@ -1988,7 +2013,6 @@ } sc->sc_tx_timer = 5; - callout_reset(&sc->watchdog_ch, hz, rt2560_watchdog, sc); } RAL_UNLOCK(sc); @@ -1998,16 +2022,24 @@ rt2560_watchdog(void *arg) { struct rt2560_softc *sc = arg; + struct ifnet *ifp = sc->sc_ifp; + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + return; + + rt2560_encryption_intr(sc); + rt2560_tx_intr(sc); + if (sc->sc_tx_timer > 0) { if (--sc->sc_tx_timer == 0) { device_printf(sc->sc_dev, "device timeout\n"); rt2560_init(sc); - sc->sc_ifp->if_oerrors++; + ifp->if_oerrors++; return; } callout_reset(&sc->watchdog_ch, hz, rt2560_watchdog, sc); } + callout_reset(&sc->watchdog_ch, hz, rt2560_watchdog, sc); } static int @@ -2063,6 +2095,16 @@ uint32_t val; int ntries; + for (ntries = 0; ntries < 100; ntries++) { + if (!(RAL_READ(sc, RT2560_BBPCSR) & RT2560_BBP_BUSY)) + break; + DELAY(1); + } + if (ntries == 100) { + device_printf(sc->sc_dev, "could not read from BBP\n"); + return 0; + } + val = RT2560_BBP_BUSY | reg << 8; RAL_WRITE(sc, RT2560_BBPCSR, val); @@ -2438,7 +2480,7 @@ } static void -rt2560_read_eeprom(struct rt2560_softc *sc) +rt2560_read_config(struct rt2560_softc *sc) { uint16_t val; int i; @@ -2454,6 +2496,9 @@ /* read default values for BBP registers */ for (i = 0; i < 16; i++) { val = rt2560_eeprom_read(sc, RT2560_EEPROM_BBP_BASE + i); + if (val == 0 || val == 0xffff) + continue; + sc->bbp_prom[i].reg = val >> 8; sc->bbp_prom[i].val = val & 0xff; } @@ -2461,8 +2506,12 @@ /* read Tx power for all b/g channels */ for (i = 0; i < 14 / 2; i++) { val = rt2560_eeprom_read(sc, RT2560_EEPROM_TXPOWER + i); - sc->txpow[i * 2] = val >> 8; - sc->txpow[i * 2 + 1] = val & 0xff; + sc->txpow[i * 2] = val & 0xff; + sc->txpow[i * 2 + 1] = val >> 8; + } + for (i = 0; i < 14; i++) { + if (sc->txpow[i] > 31) + sc->txpow[i] = 24; } val = rt2560_eeprom_read(sc, RT2560_EEPROM_CALIBRATE); @@ -2520,14 +2569,14 @@ rt2560_bbp_write(sc, rt2560_def_bbp[i].reg, rt2560_def_bbp[i].val); } -#if 0 + /* initialize BBP registers to values stored in EEPROM */ for (i = 0; i < 16; i++) { - if (sc->bbp_prom[i].reg == 0xff) + if (sc->bbp_prom[i].reg == 0 && sc->bbp_prom[i].val == 0) continue; rt2560_bbp_write(sc, sc->bbp_prom[i].reg, sc->bbp_prom[i].val); } -#endif + rt2560_bbp_write(sc, 17, 0x48); /* XXX restore bbp17 */ return 0; #undef N @@ -2622,8 +2671,6 @@ /* set basic rate set (will be updated later) */ RAL_WRITE(sc, RT2560_ARSP_PLCP_1, 0x153); - rt2560_set_txantenna(sc, sc->tx_ant); - rt2560_set_rxantenna(sc, sc->rx_ant); rt2560_update_slot(ifp); rt2560_update_plcp(sc); rt2560_update_led(sc, 0, 0); @@ -2637,6 +2684,9 @@ return; } + rt2560_set_txantenna(sc, sc->tx_ant); + rt2560_set_rxantenna(sc, sc->rx_ant); + /* set default BSS channel */ rt2560_set_chan(sc, ic->ic_curchan); @@ -2664,6 +2714,8 @@ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; + callout_reset(&sc->watchdog_ch, hz, rt2560_watchdog, sc); + ieee80211_start_all(ic); /* start all vap's */ RAL_UNLOCK(sc); @@ -2678,13 +2730,15 @@ struct ifnet *ifp = ic->ic_ifp; volatile int *flags = &sc->sc_flags; - while (*flags & RAL_INPUT_RUNNING) { + while (*flags & RT2560_F_INPUT_RUNNING) { tsleep(sc, 0, "ralrunning", hz/10); } RAL_LOCK(sc); + + callout_stop(&sc->watchdog_ch); + if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - sc->sc_tx_timer = 0; ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); /* abort Tx */ @@ -2707,6 +2761,9 @@ rt2560_reset_tx_ring(sc, &sc->bcnq); rt2560_reset_rx_ring(sc, &sc->rxq); } + sc->sc_tx_timer = 0; + sc->sc_flags &= ~(RT2560_F_PRIO_OACTIVE | RT2560_F_DATA_OACTIVE); + RAL_UNLOCK(sc); } @@ -2729,6 +2786,7 @@ } if (sc->prioq.queued >= RT2560_PRIO_RING_COUNT) { ifp->if_drv_flags |= IFF_DRV_OACTIVE; + sc->sc_flags |= RT2560_F_PRIO_OACTIVE; RAL_UNLOCK(sc); m_freem(m); ieee80211_free_node(ni); @@ -2753,7 +2811,6 @@ goto bad; } sc->sc_tx_timer = 5; - callout_reset(&sc->watchdog_ch, hz, rt2560_watchdog, sc); RAL_UNLOCK(sc); ==== //depot/projects/vap/sys/dev/ral/rt2560reg.h#3 (text) ==== @@ -333,8 +333,8 @@ { RT2560_TXCSR1, 0x07614562 }, \ { RT2560_ARSP_PLCP_0, 0x8c8d8b8a }, \ { RT2560_ACKPCTCSR, 0x7038140a }, \ - { RT2560_ARTCSR1, 0x1d21252d }, \ - { RT2560_ARTCSR2, 0x1919191d }, \ + { RT2560_ARTCSR1, 0x21212929 }, \ + { RT2560_ARTCSR2, 0x1d1d1d1d }, \ { RT2560_RXCSR0, 0xffffffff }, \ { RT2560_RXCSR3, 0xb3aab3af }, \ { RT2560_PCICSR, 0x000003b8 }, \ ==== //depot/projects/vap/sys/dev/ral/rt2560var.h#7 (text) ==== @@ -159,8 +159,10 @@ struct rt2560_tx_radiotap_header sc_txtap; int sc_txtap_len; -#define RAL_INPUT_RUNNING 1 int sc_flags; +#define RT2560_F_INPUT_RUNNING 0x1 +#define RT2560_F_PRIO_OACTIVE 0x2 +#define RT2560_F_DATA_OACTIVE 0x4 }; int rt2560_attach(device_t, int); From owner-p4-projects@FreeBSD.ORG Mon Jan 28 05:27:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EB7516A421; Mon, 28 Jan 2008 05:27:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BBF516A420 for ; Mon, 28 Jan 2008 05:27:37 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3C45613C4D5 for ; Mon, 28 Jan 2008 05:27:37 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0S5RbdU009931 for ; Mon, 28 Jan 2008 05:27:37 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0S5Rahm009928 for perforce@freebsd.org; Mon, 28 Jan 2008 05:27:36 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 28 Jan 2008 05:27:36 GMT Message-Id: <200801280527.m0S5Rahm009928@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 05:27:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=134280 Change 134280 by kmacy@kmacy:pandemonium:toehead on 2008/01/28 05:26:40 - define some missing ddp bits - replace #ifdef notyet with a clearer indication of what needs to go in in some places Affected files ... .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#8 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#9 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#8 edit Differences ... ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#8 (text+ko) ==== @@ -509,7 +509,7 @@ static void handle_urg_ptr(struct socket *so, uint32_t urg_seq) { -#ifdef notyet +#ifdef URGENT_DATA_SUPPORTED struct tcpcb *tp = sototcpcb(so); urg_seq--; /* initially points past the urgent data, per BSD */ @@ -867,7 +867,7 @@ static int t3_set_cong_control(struct socket *so, const char *name) { -#ifdef notyet +#ifdef CONGESTION_CONTROL_SUPPORTED int cong_algo; for (cong_algo = 0; cong_algo < ARRAY_SIZE(t3_cong_ops); cong_algo++) @@ -1512,7 +1512,7 @@ * XXX I need to revisit this */ if ((err = t3_set_cong_control(so, name)) == 0) { -#ifdef notyet +#ifdef CONGESTION_CONTROL_SUPPORTED tp->t_cong_control = strdup(name, M_CXGB); #endif } else @@ -1743,9 +1743,7 @@ "tcb_rpl_as_ddp_complete: seq 0x%x hwbuf %u lskb->len %u", m->m_seq, q->cur_buf, m->m_pkthdr.len); #endif -#ifdef notyet - __skb_queue_tail(&sk->sk_receive_queue, skb); -#endif + sbappend(&so->so_rcv, m); if (__predict_true((so->so_state & SS_NOFDREF) == 0)) sorwakeup(so); } @@ -1772,6 +1770,7 @@ handle_ddp_data(struct toepcb *toep, struct mbuf *m) { struct tcpcb *tp = toep->tp_tp; + struct socket *so; struct ddp_state *q; struct ddp_buf_state *bsp; struct cpl_rx_data *hdr = cplhdr(m); @@ -1802,10 +1801,11 @@ if (!(bsp->flags & DDP_BF_NOFLIP)) q->cur_buf ^= 1; tp->t_rcvtime = ticks; -#ifdef notyet - __skb_queue_tail(&sk->sk_receive_queue, skb); -#endif - /* For now, don't re-enable DDP after a connection fell out of DDP + + so = toeptoso(toep); + sbappend(&so->so_rcv, m); + /* + * For now, don't re-enable DDP after a connection fell out of DDP * mode. */ q->ubuf_ddp_ready = 0; @@ -1848,7 +1848,7 @@ #endif m_adj(m, sizeof(*hdr)); -#ifdef notyet +#ifdef URGENT_DATA_SUPPORTED /* * We don't handle urgent data yet */ @@ -2172,9 +2172,7 @@ if (!(bsp->flags & DDP_BF_NOFLIP)) q->cur_buf ^= 1; tp->t_rcvtime = ticks; -#ifdef notyet - __skb_queue_tail(&sk->sk_receive_queue, skb); -#endif + sbappend(&so->so_rcv, m); if (__predict_true((so->so_state & SS_NOFDREF) == 0)) sorwakeup(so); return (1); @@ -3433,14 +3431,10 @@ fixup_and_send_ofo(so); if (__predict_false(so->so_state & SS_NOFDREF)) { -#ifdef notyet - /* - * XXX not clear what should be done here - * appears to correspond to sorwakeup_locked + /* + * XXX does this even make sense? */ - sk->sk_state_change(sk); - sk_wake_async(so, 0, POLL_OUT); -#endif + sorwakeup(so); } m_free(m); #ifdef notyet @@ -3817,12 +3811,10 @@ sizeof(*getreq); m = m_gethdr_nofail(wrlen); m_set_priority(m, mkprio(CPL_PRIORITY_CONTROL, toep)); -#ifdef notyet - wr = (struct work_request_hdr *)__skb_put(skb, wrlen); + wr = mtod(m, struct work_request_hdr *); wr->wr_hi = htonl(V_WR_OP(FW_WROPCODE_BYPASS)); -#else - wr = mtod(m, struct work_request_hdr *); -#endif + m->m_pkthdr.len = m->m_len = sizeof(wrlen); + lock = (struct cpl_barrier *)(wr + 1); mk_cpl_barrier_ulp(lock); ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#9 (text+ko) ==== @@ -255,7 +255,7 @@ static int so_should_ddp(const struct toepcb *toep, int last_recv_len) { - return toep->tp_ulp_mode == ULP_MODE_TCPDDP && (toep->tp_ddp_state.ubuf == NULL) && + return toep->tp_ulp_mode == ULP_MODE_TCPDDP && (toep->tp_ddp_state.kbuf[0] == NULL) && last_recv_len > TOM_TUNABLE(toep->tp_toedev, ddp_thres) && toep->tp_tp->rcv_wnd > (TOM_TUNABLE(toep->tp_toedev, ddp_copy_limit) + DDP_RSVD_WIN); @@ -575,8 +575,8 @@ if (p->ubuf && user_ddp_ok && !user_ddp_pending && uio->uio_iov->iov_len > p->kbuf[0]->dgl_length && p->ubuf_ddp_ready) { - user_ddp_pending = - !t3_overlay_ubuf(so, uio, (so->so_state & SS_NBIO), flags, 1, 1); + user_ddp_pending = + !t3_overlay_ubuf(so, uio, (so->so_state & SS_NBIO), flags); if (user_ddp_pending) { p->kbuf_posted++; user_ddp_ok = 0; @@ -612,7 +612,7 @@ offset = toep->tp_copied_seq - m->m_seq; if (offset > m->m_pkthdr.len) panic("t3_soreceive: BUG: OFFSET > LEN seq 0x%x " - "skb->len %d flags 0x%x", m->m_seq, + "pktlen %d ddp flags 0x%x", m->m_seq, m->m_pkthdr.len, m->m_ddp_flags); avail = m->m_pkthdr.len - offset; if (len < avail) { @@ -620,7 +620,7 @@ panic("bad state in t3_soreceive\n"); avail = len; } -#ifdef notyet +#ifdef URGENT_DATA_SUPPORTED /* * Check if the data we are preparing to copy contains urgent * data. Either stop short of urgent data or skip it if it's @@ -658,7 +658,7 @@ uio->uio_iov->iov_len > p->kbuf[0]->dgl_length && p->ubuf_ddp_ready) { user_ddp_pending = - !t3_overlay_ubuf(so, uio, (so->so_state & SS_NBIO), flags, 1, 1); + !t3_overlay_ubuf(so, uio, (so->so_state & SS_NBIO), flags); if (user_ddp_pending) { p->kbuf_posted++; user_ddp_ok = 0; @@ -679,7 +679,7 @@ toep->tp_copied_seq += avail; copied += avail; len -= avail; -#ifdef notyet +#ifdef URGENT_DATA_SUPPORTED skip_copy: if (tp->urg_data && after(tp->copied_seq, tp->urg_seq)) tp->urg_data = 0; @@ -704,7 +704,7 @@ } } sbfree(&so->so_rcv, m); - m = so->so_rcv.sb_mb = m_free(m); + m = so->so_rcv.sb_mb = m_free(m); /* XXX need to clean mbuf first */ buffers_freed++; if ((so->so_rcv.sb_mb == NULL) && got_psh) @@ -739,6 +739,7 @@ t3_post_kbuf(so, 1); p->kbuf_posted++; } else if (so_should_ddp(toep, copied)) { + printf("entering ddp\n"); t3_enter_ddp(so, TOM_TUNABLE(TOE_DEV(so), ddp_copy_limit), 0); p->kbuf_posted = 1; ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 (text+ko) ==== @@ -125,22 +125,21 @@ unsigned int npages; struct ddp_gather_list *p; - if (addr >= VM_MAXUSER_ADDRESS) - return (EINVAL); -#if 0 - if (!access_ok(VERIFY_WRITE, addr, len)) + /* + * XXX need x86 agnostic check + */ + if (addr + len > VM_MAXUSER_ADDRESS) return (EFAULT); -#endif + pg_off = addr & ~PAGE_MASK; npages = (pg_off + len + PAGE_SIZE - 1) >> PAGE_SHIFT; p = malloc(sizeof(struct ddp_gather_list) + npages * sizeof(vm_page_t *), M_DEVBUF, M_NOWAIT); - if (!p) + if (p == NULL) return (ENOMEM); - err = vm_fault_hold_user_pages(addr, p->dgl_pages, npages, VM_HOLD_WRITEABLE); - + printf("held pages\n"); if (err) goto free_gl; @@ -157,7 +156,7 @@ p->dgl_length = len; p->dgl_offset = pg_off; p->dgl_nelem = npages; -#ifdef notyet +#ifdef NEED_BUSDMA p->phys_addr[0] = pci_map_page(pdev, p->pages[0], pg_off, PAGE_SIZE - pg_off, PCI_DMA_FROMDEVICE) - pg_off; @@ -165,7 +164,6 @@ p->phys_addr[i] = pci_map_page(pdev, p->pages[i], 0, PAGE_SIZE, PCI_DMA_FROMDEVICE); #endif - *newgl = p; return 0; unpin: @@ -180,7 +178,7 @@ static void unmap_ddp_gl(const struct ddp_gather_list *gl) { -#ifdef notyet +#ifdef NEED_BUSDMA int i; if (!gl->nelem) @@ -198,15 +196,10 @@ static void ddp_gl_free_pages(struct ddp_gather_list *gl, int dirty) { -#ifdef notyet - int i; - - for (i = 0; i < gl->nelem; ++i) { - if (dirty) - set_page_dirty_lock(gl->pages[i]); - put_page(gl->pages[i]); - } -#endif + /* + * XXX need to be able to + */ + vm_fault_unhold_pages(gl->dgl_pages, gl->dgl_nelem); } void @@ -236,9 +229,7 @@ npages = ((addr & ~PAGE_MASK) + len + PAGE_SIZE - 1) >> PAGE_SHIFT; nppods = min(pages2ppods(npages), MAX_PPODS); -#ifdef notyet - nppods = ALIGN(nppods, PPOD_CLUSTER_SIZE); -#endif + nppods = roundup2(nppods, PPOD_CLUSTER_SIZE); err = t3_alloc_ppods(d, nppods, &tag); if (err && nppods > PPOD_CLUSTER_SIZE) { nppods = PPOD_CLUSTER_SIZE; @@ -255,8 +246,6 @@ return (0); } - - /* * Reposts the kernel DDP buffer after it has been previously become full and * invalidated. We just need to reset the offset and adjust the DDP flags. @@ -267,7 +256,7 @@ */ static void t3_repost_kbuf(struct socket *so, unsigned int bufidx, int modulate, - int activate) + int activate) { struct toepcb *toep = sototcpcb(so)->t_toe; struct ddp_state *p = &toep->tp_ddp_state; @@ -278,14 +267,14 @@ p->cur_buf = bufidx; p->kbuf_idx = bufidx; if (!bufidx) - t3_setup_ddpbufs(toep, 0, 0, 0, 0, + t3_setup_ddpbufs(toep, 0, 0, 0, 0, V_TF_DDP_PSH_NO_INVALIDATE(p->kbuf_noinval) | V_TF_DDP_BUF0_VALID(1), V_TF_DDP_PSH_NO_INVALIDATE(1) | V_TF_DDP_OFF(1) | V_TF_DDP_BUF0_VALID(1) | V_TF_DDP_ACTIVE_BUF(activate), modulate); else - t3_setup_ddpbufs(toep, 0, 0, 0, 0, + t3_setup_ddpbufs(toep, 0, 0, 0, 0, V_TF_DDP_PSH_NO_INVALIDATE(p->kbuf_noinval) | V_TF_DDP_BUF1_VALID(1) | V_TF_DDP_ACTIVE_BUF(activate), @@ -426,12 +415,13 @@ */ int t3_overlay_ubuf(struct socket *so, const struct uio *uio, - int nonblock, int rcv_flags, int modulate, int post_kbuf) + int nonblock, int rcv_flags) { int err, len, ubuf_idx; unsigned long flags; struct toepcb *toep = sototcpcb(so)->t_toe; struct ddp_state *p = &toep->tp_ddp_state; + struct ddp_buf_state *dbs; if (p->ubuf == NULL) return (EINVAL); @@ -448,17 +438,15 @@ flags = select_ddp_flags(so, ubuf_idx, nonblock, rcv_flags); - if (post_kbuf) { - struct ddp_buf_state *dbs = &p->buf_state[ubuf_idx ^ 1]; + dbs = &p->buf_state[ubuf_idx ^ 1]; - dbs->cur_offset = 0; - dbs->flags = 0; - dbs->gl = p->kbuf[ubuf_idx ^ 1]; - p->kbuf_idx ^= 1; - flags |= p->kbuf_idx ? - V_TF_DDP_BUF1_VALID(1) | V_TF_DDP_PUSH_DISABLE_1(0) : - V_TF_DDP_BUF0_VALID(1) | V_TF_DDP_PUSH_DISABLE_0(0); - } + dbs->cur_offset = 0; + dbs->flags = 0; + dbs->gl = p->kbuf[ubuf_idx ^ 1]; + p->kbuf_idx ^= 1; + flags |= p->kbuf_idx ? + V_TF_DDP_BUF1_VALID(1) | V_TF_DDP_PUSH_DISABLE_1(0) : + V_TF_DDP_BUF0_VALID(1) | V_TF_DDP_PUSH_DISABLE_0(0); if (ubuf_idx == 0) { t3_overlay_ddpbuf(toep, 0, p->ubuf_tag << 6, p->kbuf_tag[1] << 6, @@ -557,7 +545,8 @@ int t3_enter_ddp(struct socket *so, unsigned int kbuf_size, unsigned int waitall) { - int err = ENOMEM; + int i, err = ENOMEM; + static vm_pindex_t color; unsigned int nppods, kbuf_pages, idx = 0; struct toepcb *toep = sototcpcb(so)->t_toe; struct ddp_state *p = &toep->tp_ddp_state; @@ -576,7 +565,7 @@ p->kbuf[idx] = malloc(sizeof (struct ddp_gather_list) + kbuf_pages * sizeof(vm_page_t *), M_DEVBUF, M_NOWAIT|M_ZERO); - if (!p->kbuf[idx]) + if (p->kbuf[idx] == NULL) goto err; err = t3_alloc_ppods(d, nppods, &p->kbuf_tag[idx]); if (err) @@ -586,20 +575,21 @@ p->kbuf[idx]->dgl_length = kbuf_size; p->kbuf[idx]->dgl_offset = 0; p->kbuf[idx]->dgl_nelem = kbuf_pages; -#ifdef notyet - p->kbuf[idx]->pages = - (struct page **)&p->kbuf[idx]->phys_addr[kbuf_pages]; - + for (i = 0; i < kbuf_pages; ++i) { - - p->kbuf[idx]->pages[i] = alloc_page(sk->sk_allocation); - if (!p->kbuf[idx]->pages[i]) { - p->kbuf[idx]->nelem = i; + p->kbuf[idx]->dgl_pages[i] = vm_page_alloc(NULL, color, + VM_ALLOC_NOOBJ | VM_ALLOC_NORMAL | VM_ALLOC_WIRED | + VM_ALLOC_ZERO); + if (p->kbuf[idx]->dgl_pages[i] == NULL) { + p->kbuf[idx]->dgl_nelem = i; goto err; } - } - +#ifdef NEED_BUSDMA + /* + * XXX we'll need this for VT-d or any platform with an iommu :-/ + * + */ for (i = 0; i < kbuf_pages; ++i) p->kbuf[idx]->phys_addr[i] = pci_map_page(p->pdev, p->kbuf[idx]->pages[i], ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#8 (text+ko) ==== @@ -160,7 +160,7 @@ int rcv_flags, int modulate, int post_kbuf); void t3_cancel_ubuf(struct toepcb *toep); int t3_overlay_ubuf(struct socket *so, const struct uio *uio, int nonblock, - int rcv_flags, int modulate, int post_kbuf); + int rcv_flags); int t3_enter_ddp(struct socket *so, unsigned int kbuf_size, unsigned int waitall); void t3_cleanup_ddp(struct toepcb *toep); void t3_release_ddp_resources(struct toepcb *toep); From owner-p4-projects@FreeBSD.ORG Mon Jan 28 07:07:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18EBA16A46E; Mon, 28 Jan 2008 07:07:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B9CEF16A46C for ; Mon, 28 Jan 2008 07:07:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A8B4E13C44B for ; Mon, 28 Jan 2008 07:07:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0S77LUj023930 for ; Mon, 28 Jan 2008 07:07:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0S77L0V023926 for perforce@freebsd.org; Mon, 28 Jan 2008 07:07:21 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 28 Jan 2008 07:07:21 GMT Message-Id: <200801280707.m0S77L0V023926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134282 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 07:07:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=134282 Change 134282 by kmacy@kmacy:pandemonium:toehead on 2008/01/28 07:06:49 add verbose logging to ddp functions fix missed unlock in new_rx_data Affected files ... .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#10 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_defs.h#3 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 edit Differences ... ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 (text+ko) ==== @@ -1604,7 +1604,7 @@ uint64_t t; __be64 *tcb; - + TRACE_ENTER; /* Note that we only accout for CPL_GET_TCB issued by the DDP code. We * really need a cookie in order to dispatch the RPLs. */ @@ -1621,7 +1621,7 @@ m_freem(m); if (__predict_true((so->so_state & SS_NOFDREF) == 0)) sorwakeup(so); - + TRACE_EXIT; return; } @@ -1680,6 +1680,7 @@ if (__predict_false(so_no_receive(so) && m->m_pkthdr.len)) { handle_excess_rx(toep, m); + TRACE_EXIT; return; } @@ -1719,6 +1720,7 @@ q->kbuf_posted--; panic("length not set"); m_free(m); + TRACE_EXIT; return; } } else { @@ -1726,6 +1728,7 @@ * but it got here way late and nobody cares anymore. */ m_free(m); + TRACE_EXIT; return; } @@ -1746,6 +1749,7 @@ sbappend(&so->so_rcv, m); if (__predict_true((so->so_state & SS_NOFDREF) == 0)) sorwakeup(so); + TRACE_EXIT; } /* @@ -1779,6 +1783,7 @@ if (tp->rcv_nxt == rcv_nxt) return; + TRACE_ENTER; q = &toep->tp_ddp_state; bsp = &q->buf_state[q->cur_buf]; m->m_pkthdr.len = rcv_nxt - tp->rcv_nxt; @@ -1809,6 +1814,7 @@ * mode. */ q->ubuf_ddp_ready = 0; + TRACE_EXIT; } /* @@ -1826,6 +1832,7 @@ if (__predict_false(so_no_receive(so))) { handle_excess_rx(toep, m); + INP_UNLOCK(tp->t_inpcb); return; } @@ -1843,6 +1850,7 @@ TOE_DEV(toeptoso(toep))->name, toep->tp_tid, m->m_seq, tp->rcv_nxt); m_freem(m); + INP_UNLOCK(tp->t_inpcb); return; } #endif @@ -1882,7 +1890,7 @@ DPRINTF("rx_data so=%p flags=0x%x len=%d\n", so, so->so_rcv.sb_flags, m->m_pkthdr.len); sbappend_locked(&so->so_rcv, m); - KASSERT(so->so_rcv.sb_cc < so->so_rcv.sb_mbmax, + KASSERT(so->so_rcv.sb_cc < (so->so_rcv.sb_mbmax << 1), ("so=%p, data contents exceed mbmax, sb_cc=%d sb_mbmax=%d", so, so->so_rcv.sb_cc, so->so_rcv.sb_mbmax)); @@ -1926,7 +1934,8 @@ handle_excess_rx(toep, m); return; } - + + TRACE_ENTER; tp = sototcpcb(so); q = &toep->tp_ddp_state; hdr = cplhdr(m); @@ -1996,6 +2005,8 @@ if ((so->so_state & SS_NOFDREF) == 0) sorwakeup_locked(so); + + TRACE_EXIT; } #define DDP_ERR (F_DDP_PPOD_MISMATCH | F_DDP_LLIMIT_ERR | F_DDP_ULIMIT_ERR |\ @@ -2040,7 +2051,7 @@ handle_excess_rx(toep, m); return; } - + TRACE_ENTER; q = &toep->tp_ddp_state; hdr = cplhdr(m); ddp_report = ntohl(hdr->ddp_report); @@ -2083,6 +2094,7 @@ if ((so->so_state & SS_NOFDREF) == 0) sorwakeup_locked(so); + TRACE_EXIT; } /* @@ -3703,7 +3715,8 @@ unsigned int tid = toep->tp_tid; const struct tom_data *td = TOM_DATA(TOE_DEV(so)); unsigned int ppod_addr = tag * PPOD_SIZE + td->ddp_llimit; - + + TRACE_ENTER; for (i = 0; i < nppods; ++i) { m = m_gethdr_nofail(sizeof(*req) + PPOD_SIZE); m_set_priority(m, mkprio(CPL_PRIORITY_CONTROL, toep)); @@ -3731,6 +3744,8 @@ send_or_defer(toep, m, 0); ppod_addr += PPOD_SIZE; } + + TRACE_EXIT; return (0); } @@ -3878,6 +3893,7 @@ struct cpl_set_tcb_field *req; struct ddp_state *p = &toep->tp_ddp_state; + TRACE_ENTER; wrlen = sizeof(*wr) + 3 * sizeof(*req) + sizeof(*getreq); m = m_gethdr_nofail(wrlen); m_set_priority(m, mkprio(CPL_PRIORITY_CONTROL, toep)); @@ -3932,6 +3948,7 @@ bufidx, tag0, tag1, len); #endif cxgb_ofld_send(TOEP_T3C_DEV(toep), m); + TRACE_EXIT; } /* @@ -3949,6 +3966,7 @@ struct work_request_hdr *wr; struct cpl_set_tcb_field *req; + TRACE_ENTER; wrlen = sizeof(*wr) + sizeof(*req) + (len0 ? sizeof(*req) : 0) + (len1 ? sizeof(*req) : 0) + (modulate ? sizeof(struct cpl_rx_data_ack) : 0); @@ -3994,6 +4012,7 @@ #endif cxgb_ofld_send(TOEP_T3C_DEV(toep), m); + TRACE_EXIT; } void ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#10 (text+ko) ==== @@ -526,6 +526,7 @@ err = sblock(&so->so_rcv, SBLOCKWAIT(flags)); if (err) return (err); + TRACE_ENTER; restart: SOCKBUF_LOCK(&so->so_rcv); len = uio->uio_resid; @@ -757,6 +758,7 @@ SOCKBUF_UNLOCK(&so->so_rcv); sbunlock(&so->so_rcv); + TRACE_EXIT; return (err); } ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_defs.h#3 (text+ko) ==== @@ -40,6 +40,11 @@ #define toeptoso(toep) ((toep)->tp_tp->t_inpcb->inp_socket) #define sototoep(so) (sototcpcb((so))->t_toe) +#define TRACE_ENTER printf("%s:%s entered", __FUNCTION__, __FILE__) +#define TRACE_EXIT printf("%s:%s:%d exited", __FUNCTION__, __FILE__, __LINE__) + + + struct toepcb; struct listen_ctx; ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 (text+ko) ==== @@ -20,6 +20,9 @@ #include #include +#define TRACE_ENTER printf("%s:%s entered", __FUNCTION__, __FILE__) +#define TRACE_EXIT printf("%s:%s:%d exited", __FUNCTION__, __FILE__, __LINE__) + /* * This routine takes a user address range and does the following: * - validate that the user has access to those pages (flags indicates read or write) - if not fail @@ -50,10 +53,11 @@ * and user do not share VA - however, it appears that all FreeBSD * architectures define it */ - pageslen = count * PAGE_SIZE; + pageslen = count * PAGE_SIZE; if (addr + pageslen > VM_MAXUSER_ADDRESS) return (EFAULT); + TRACE_ENTER; td = curthread; map = &td->td_proc->p_vmspace->vm_map; pmap = &td->td_proc->p_vmspace->vm_pmap; @@ -92,8 +96,11 @@ } vm_page_unlock_queues(); - if (faults == 0) + if (faults == 0) { + TRACE_EXIT; return (0); + } + /* * Pages either have insufficient permissions or are not present * trigger a fault where neccessary @@ -124,6 +131,7 @@ if (*pages) vm_page_unhold(*pages); vm_page_unlock_queues(); + TRACE_EXIT; return (EFAULT); } From owner-p4-projects@FreeBSD.ORG Mon Jan 28 17:30:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A636616A46E; Mon, 28 Jan 2008 17:30:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DC4216A46C for ; Mon, 28 Jan 2008 17:30:30 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3DBDF13C43E for ; Mon, 28 Jan 2008 17:30:30 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0SHUUjt005349 for ; Mon, 28 Jan 2008 17:30:30 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0SHUUwU005346 for perforce@freebsd.org; Mon, 28 Jan 2008 17:30:30 GMT (envelope-from csjp@freebsd.org) Date: Mon, 28 Jan 2008 17:30:30 GMT Message-Id: <200801281730.m0SHUUwU005346@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134303 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 17:30:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=134303 Change 134303 by csjp@csjp_xor on 2008/01/28 17:29:58 Make sure we initialize the termid type to AU_IPv4 by default. This fixes a panic when invariants are enabled, as well as ensures that proper records are being generated before being handed off to userspace. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#53 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#53 (text+ko) ==== @@ -553,6 +553,7 @@ { cred->cr_audit.ai_auid = AU_DEFAUDITID; + cred->cr_audit.ai_termid.at_type = AU_IPv4; } void @@ -560,6 +561,7 @@ { cred->cr_audit.ai_auid = AU_DEFAUDITID; + cred->cr_audit.ai_termid.at_type = AU_IPv4; } void From owner-p4-projects@FreeBSD.ORG Mon Jan 28 19:46:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E359016A47A; Mon, 28 Jan 2008 19:46:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9047916A473 for ; Mon, 28 Jan 2008 19:46:55 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8086D13C465 for ; Mon, 28 Jan 2008 19:46:55 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0SJktBv016018 for ; Mon, 28 Jan 2008 19:46:55 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0SJktjb016015 for perforce@freebsd.org; Mon, 28 Jan 2008 19:46:55 GMT (envelope-from imp@freebsd.org) Date: Mon, 28 Jan 2008 19:46:55 GMT Message-Id: <200801281946.m0SJktjb016015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134314 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 19:46:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=134314 Change 134314 by imp@imp_lighthouse on 2008/01/28 19:46:51 When we turn on the COP 1 enable bit, make sure that it turns on before accessing the FPU. In the CPU_NOFPU case, this won't be done, but is needed for those platforms that have to support CPUs with and without math co-processor support. Chances are that CPU_NOFPU turns off other stuff that will kill us later in the boot process, but for now this allows the early startup code to be as agnostic as possible at the cost of a few insturctions. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#12 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#12 (text+ko) ==== @@ -126,11 +126,16 @@ mtc0 t2, MIPS_COP_0_STATUS COP0_SYNC /* Extra nops for the FPU to spin up. */ + mfc0 t2, MIPS_COP_0_STATUS /* Read and store the PrID FPU ID for CPU identification. */ mfc0 t0, MIPS_COP_0_PRID #ifndef CPU_NOFPU + and t2, MIPS_SR_COP_1_BIT + beqz t2, 1f + li t1, 0x0 cfc1 t1, MIPS_FPU_ID +1: #else /* * This platform has no FPU, and attempting to detect one @@ -202,13 +207,6 @@ la sp, _C_LABEL(thread0) lw a0, TD_PCB(sp) subu sp, a0, START_FRAME - mfc0 t1, COP_0_CONFIG, 1 # Check FPU present or not - andi t1, 0x1 - beqz t1, no_fpu - nop - cfc1 t1, FPC_ID # read FPU ID register - sw t1, _C_LABEL(fpu_id) # save FPU ID register -no_fpu: jal _C_LABEL(mi_startup) # mi_startup(frame) nop PANIC("Startup failed!") From owner-p4-projects@FreeBSD.ORG Mon Jan 28 19:51:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E931C16A41A; Mon, 28 Jan 2008 19:51:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9561816A417 for ; Mon, 28 Jan 2008 19:51:00 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D6D113C447 for ; Mon, 28 Jan 2008 19:51:00 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0SJp0Ea016199 for ; Mon, 28 Jan 2008 19:51:00 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0SJp0FT016196 for perforce@freebsd.org; Mon, 28 Jan 2008 19:51:00 GMT (envelope-from imp@freebsd.org) Date: Mon, 28 Jan 2008 19:51:00 GMT Message-Id: <200801281951.m0SJp0FT016196@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134315 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 19:51:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=134315 Change 134315 by imp@imp_lighthouse on 2008/01/28 19:49:58 No need for this in the !SMP case. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#13 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#13 (text+ko) ==== @@ -225,10 +225,6 @@ nop jal _C_LABEL(smp_init_secondary) nop -#else -start_secondary: - b start_secondary - nop #endif VECTOR_END(_locore) From owner-p4-projects@FreeBSD.ORG Mon Jan 28 20:01:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0295216A419; Mon, 28 Jan 2008 20:01:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A421F16A417 for ; Mon, 28 Jan 2008 20:01:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 53CCD13C448 for ; Mon, 28 Jan 2008 20:01:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0SK1Cgi016606 for ; Mon, 28 Jan 2008 20:01:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0SK1Ccd016603 for perforce@freebsd.org; Mon, 28 Jan 2008 20:01:12 GMT (envelope-from imp@freebsd.org) Date: Mon, 28 Jan 2008 20:01:12 GMT Message-Id: <200801282001.m0SK1Ccd016603@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134316 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 20:01:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=134316 Change 134316 by imp@imp_lighthouse on 2008/01/28 20:00:24 Minor nits. Also question the need for the YAMON and CFE sections here. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#14 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#14 (text+ko) ==== @@ -120,13 +120,13 @@ * preserved (namely, clearing interrupt bits), and set * bits we want to explicitly set. */ - mfc0 t2, MIPS_COP_0_STATUS + mfc0 t2, COP_0_STATUS_REG and t2, t0 or t2, t1 - mtc0 t2, MIPS_COP_0_STATUS + mtc0 t2, COP_0_STATUS_REG COP0_SYNC /* Extra nops for the FPU to spin up. */ - mfc0 t2, MIPS_COP_0_STATUS + mfc0 t2, COP_0_STATUS_REG /* Read and store the PrID FPU ID for CPU identification. */ mfc0 t0, MIPS_COP_0_PRID @@ -143,19 +143,23 @@ */ li t1, 0x0 #endif - sw t0, cpu_id - sw t1, fpu_id + sw t0, _C_LABEL(cpu_id) + sw t1, _C_LABEL(fpu_id) /* * Initialize stack and call machine startup. */ - la sp, topstack - START_FRAME + la sp, _C_LABEL(topstack) - START_FRAME la gp, _C_LABEL(_gp) sw zero, START_FRAME - 4(sp) # Zero out old ra for debugger + /*xxximp + * now that we pass a0...a3 to the platform_init routine, do we need + * to stash this stuff here? + */ #ifdef YAMON /* Save YAMON boot environment pointer */ - sw a2, fenvp + sw a2, _C_LABEL(fenvp) #endif #ifdef CFE /* @@ -163,8 +167,8 @@ */ li t1, 0x43464531 bne a3, t1, no_cfe /* Check for "CFE1" signature */ - sw a0, cfe_handle /* Firmware data segment */ - sw a2, cfe_vector /* Firmware entry vector */ + sw a0, _C_LABEL(cfe_handle)/* Firmware data segment */ + sw a2, _C_LABEL(cfe_vector)/* Firmware entry vector */ no_cfe: #endif From owner-p4-projects@FreeBSD.ORG Mon Jan 28 20:13:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE38D16A420; Mon, 28 Jan 2008 20:13:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9396F16A419 for ; Mon, 28 Jan 2008 20:13:27 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6B24F13C447 for ; Mon, 28 Jan 2008 20:13:27 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0SKDRgo019020 for ; Mon, 28 Jan 2008 20:13:27 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0SKDRhY018959 for perforce@freebsd.org; Mon, 28 Jan 2008 20:13:27 GMT (envelope-from imp@freebsd.org) Date: Mon, 28 Jan 2008 20:13:27 GMT Message-Id: <200801282013.m0SKDRhY018959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134317 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 20:13:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=134317 Change 134317 by imp@imp_lighthouse on 2008/01/28 20:12:51 Call the XLR code what it is, rather than #if 0. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#15 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#15 (text+ko) ==== @@ -172,7 +172,11 @@ no_cfe: #endif -#if 0 /* XXX: this is for the xlr mips CPU */ + /* + * The following needs to be done differently for each platform and + * there needs to be a good way to plug this in. + */ +#ifdef CPU_XLR /* * Block all the slave CPUs */ From owner-p4-projects@FreeBSD.ORG Mon Jan 28 22:15:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C65116A46E; Mon, 28 Jan 2008 22:15:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBCA116A46B for ; Mon, 28 Jan 2008 22:15:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ABB2613C459 for ; Mon, 28 Jan 2008 22:15:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0SMFkVO041995 for ; Mon, 28 Jan 2008 22:15:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0SMFk9e041992 for perforce@freebsd.org; Mon, 28 Jan 2008 22:15:46 GMT (envelope-from jb@freebsd.org) Date: Mon, 28 Jan 2008 22:15:46 GMT Message-Id: <200801282215.m0SMFk9e041992@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134329 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 22:15:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=134329 Change 134329 by jb@jb_freebsd1 on 2008/01/28 22:15:23 Remove stuff that is now in a DTrace hooks specific header. Affected files ... .. //depot/projects/dtrace7/src/sys/sys/systm.h#3 edit .. //depot/projects/dtrace7/src/sys/sys/time.h#3 edit Differences ... ==== //depot/projects/dtrace7/src/sys/sys/systm.h#3 (text+ko) ==== @@ -217,12 +217,6 @@ void realitexpire(void *); -/* - * Cyclic clock function type definition used to hook the cyclic - * subsystem into the appropriate timer interrupt. - */ -typedef void (*cyclic_clock_func_t)(void); - void hardclock(int usermode, uintfptr_t pc); void hardclock_cpu(int usermode); void softclock(void *); ==== //depot/projects/dtrace7/src/sys/sys/time.h#3 (text+ko) ==== @@ -304,8 +304,6 @@ void timevaladd(struct timeval *t1, const struct timeval *t2); void timevalsub(struct timeval *t1, const struct timeval *t2); int tvtohz(struct timeval *tv); -uint64_t dtrace_gethrtime(void); -uint64_t dtrace_gethrestime(void); #else /* !_KERNEL */ #include From owner-p4-projects@FreeBSD.ORG Mon Jan 28 22:16:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48F5416A418; Mon, 28 Jan 2008 22:16:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E77A16A478 for ; Mon, 28 Jan 2008 22:16:48 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D9CC213C448 for ; Mon, 28 Jan 2008 22:16:47 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0SMGluM042043 for ; Mon, 28 Jan 2008 22:16:47 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0SMGlhQ042040 for perforce@freebsd.org; Mon, 28 Jan 2008 22:16:47 GMT (envelope-from rrs@cisco.com) Date: Mon, 28 Jan 2008 22:16:47 GMT Message-Id: <200801282216.m0SMGlhQ042040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 22:16:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=134330 Change 134330 by rrs@rrs-mips2-jnpr on 2008/01/28 22:16:36 adds option CPU_ISA_MIPS64 Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#2 (text+ko) ==== @@ -33,6 +33,8 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +options CPU_ISA_MIPS64 + options DDB options KDB options KDB_TRACE From owner-p4-projects@FreeBSD.ORG Mon Jan 28 23:11:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D71B16A41B; Mon, 28 Jan 2008 23:11:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E72DF16A419 for ; Mon, 28 Jan 2008 23:11:44 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D5AC913C4DB for ; Mon, 28 Jan 2008 23:11:44 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0SNBinp048379 for ; Mon, 28 Jan 2008 23:11:44 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0SNBioE048376 for perforce@freebsd.org; Mon, 28 Jan 2008 23:11:44 GMT (envelope-from andre@freebsd.org) Date: Mon, 28 Jan 2008 23:11:44 GMT Message-Id: <200801282311.m0SNBioE048376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 134333 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 23:11:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=134333 Change 134333 by andre@andre_flirtbox on 2008/01/28 23:10:52 Add tcptruncate rule option to ipfw. It is used to test and exercise tcp reassembly queue processing and SACK block tracking. From its man page: tcptruncate Modifies TCP packets by truncating their payload. Positive num- bers truncate from the tail of the packet, negative numbers from the head. At least one byte is left in the payload, even if the truncate size is larger than the whole payload. The diff to /src/sbin/ipfw/ipfw2.[c8] is added as file because this branch doesn't contain userland bits. An example truncating 1% each of the incoming segments from tail and head: ipfw add 100 prob 0.01 allow tcp from any to me tcptruncate 10 ipfw add 100 prob 0.0101 allow tcp from any to me tcptruncate -10 Affected files ... .. //depot/projects/tcp_reass/netinet/ip_fw.h#2 edit .. //depot/projects/tcp_reass/netinet/ip_fw2.c#2 edit .. //depot/projects/tcp_reass/netinet/src-sbin-ipfw-tcptruncate.diff#1 add Differences ... ==== //depot/projects/tcp_reass/netinet/ip_fw.h#2 (text+ko) ==== @@ -161,6 +161,7 @@ O_TAG, /* arg1=tag number */ O_TAGGED, /* arg1=tag number */ + O_TCPTRUNCATE, /* arg1=truncate TCP segment */ O_LAST_OPCODE /* not an opcode! */ }; ==== //depot/projects/tcp_reass/netinet/ip_fw2.c#2 (text+ko) ==== @@ -3025,6 +3025,71 @@ } break; + case O_TCPTRUNCATE: + /* Cut off part of the tcp segment. */ + if (proto == IPPROTO_TCP && offset == 0) { + struct tcphdr *tcp; + uint16_t datalen, hdrlen; + int16_t trunc; + int i; + + if (cmdlen != 1) + break; + + /* Initialize. */ + tcp = TCP(ulp); + hdrlen = ((ip->ip_hl + tcp->th_off) << 2); + datalen = ip_len - hdrlen; + trunc = (int16_t)cmd->arg1; + + /* Never make a zero sized segment. */ + if (datalen < 2 || trunc == 0) + break; + + /* + * Trim from end of segment. + * Adjust ip->ip_len. + * Update TCP checksum. + */ + if (trunc > 0) { + /* Truncating from the tail always works. */ + i = min(datalen - 1, datalen - trunc); + m_adj(m, -i); + } else if (m->m_next == NULL) { + /* Single mbuf, the common case. */ + i = min(datalen - 1, datalen - (+trunc)); + bcopy(mtod(m, caddr_t) + hdrlen, mtod(m, caddr_t), i); + m_adj(m, -i); + } else if (m->m_len == hdrlen && m->m_next != NULL) { + /* Header splitting. */ + i = min(datalen - 1, datalen - (+trunc)); + m_adj(m->m_next, i); + } else + break; + + /* Accounting for the changes. */ + ip->ip_len = m->m_pkthdr.len; + pktlen = ip_len = m->m_pkthdr.len; + + /* Updating checksum, not offloaded. */ + tcp->th_sum = 0; + tcp->th_sum = in_pseudo(ip->ip_src.s_addr, + ip->ip_dst.s_addr, + htons(IPPROTO_TCP + ip_len - + (ip->ip_hl << 2))); + tcp->th_sum = in_cksum_skip(m, ip->ip_len, + ip->ip_hl << 2); + ip->ip_len = htons(ip->ip_len); + ip->ip_off = htons(ip->ip_off); + ip->ip_sum = 0; + ip->ip_sum = in_cksum(m, hlen); + ip->ip_len = htons(ip->ip_len); + ip->ip_off = htons(ip->ip_off); + + match = 1; + } + break; + case O_TCPFLAGS: match = (proto == IPPROTO_TCP && offset == 0 && flags_match(cmd, TCP(ulp)->th_flags)); @@ -4133,6 +4198,7 @@ #endif case O_IP4: case O_TAG: + case O_TCPTRUNCATE: if (cmdlen != F_INSN_SIZE(ipfw_insn)) goto bad_size; break; From owner-p4-projects@FreeBSD.ORG Mon Jan 28 23:28:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A92EB16A420; Mon, 28 Jan 2008 23:28:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6849216A41A for ; Mon, 28 Jan 2008 23:28:08 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5512413C4F0 for ; Mon, 28 Jan 2008 23:28:08 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0SNS8e5049913 for ; Mon, 28 Jan 2008 23:28:08 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0SNS8O0049898 for perforce@freebsd.org; Mon, 28 Jan 2008 23:28:08 GMT (envelope-from andre@freebsd.org) Date: Mon, 28 Jan 2008 23:28:08 GMT Message-Id: <200801282328.m0SNS8O0049898@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 134336 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 23:28:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=134336 Change 134336 by andre@andre_flirtbox on 2008/01/28 23:28:02 Initial branch for work on tcp_new. I will move all files one by one from my current private branch over here in the next few days. Affected files ... .. //depot/projects/tcp_new/Makefile#1 branch .. //depot/projects/tcp_new/amd64/Makefile#1 branch .. //depot/projects/tcp_new/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/tcp_new/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/tcp_new/amd64/acpica/madt.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/tcp_new/amd64/amd64/atomic.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/autoconf.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/bios.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/tcp_new/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/tcp_new/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/db_interface.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/db_trace.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/exception.S#1 branch .. //depot/projects/tcp_new/amd64/amd64/fpu.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/genassym.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/identcpu.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/initcpu.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/io.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/io_apic.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/legacy.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/local_apic.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/locore.S#1 branch .. //depot/projects/tcp_new/amd64/amd64/machdep.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/mem.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/mpboot.S#1 branch .. //depot/projects/tcp_new/amd64/amd64/mptable.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/msi.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/nexus.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/pmap.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/tcp_new/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/support.S#1 branch .. //depot/projects/tcp_new/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/trap.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/tsc.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/compile/.cvsignore#1 branch .. //depot/projects/tcp_new/amd64/conf/.cvsignore#1 branch .. //depot/projects/tcp_new/amd64/conf/DEFAULTS#1 branch .. //depot/projects/tcp_new/amd64/conf/GENERIC#1 branch .. //depot/projects/tcp_new/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/tcp_new/amd64/conf/MAC#1 branch .. //depot/projects/tcp_new/amd64/conf/Makefile#1 branch .. //depot/projects/tcp_new/amd64/conf/NOTES#1 branch .. //depot/projects/tcp_new/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/tcp_new/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/tcp_new/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/tcp_new/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/tcp_new/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/tcp_new/amd64/include/_bus.h#1 branch .. //depot/projects/tcp_new/amd64/include/_inttypes.h#1 branch .. //depot/projects/tcp_new/amd64/include/_limits.h#1 branch .. //depot/projects/tcp_new/amd64/include/_stdint.h#1 branch .. //depot/projects/tcp_new/amd64/include/_types.h#1 branch .. //depot/projects/tcp_new/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/tcp_new/amd64/include/apicreg.h#1 branch .. //depot/projects/tcp_new/amd64/include/apicvar.h#1 branch .. //depot/projects/tcp_new/amd64/include/asm.h#1 branch .. //depot/projects/tcp_new/amd64/include/asmacros.h#1 branch .. //depot/projects/tcp_new/amd64/include/atomic.h#1 branch .. //depot/projects/tcp_new/amd64/include/bus.h#1 branch .. //depot/projects/tcp_new/amd64/include/bus_dma.h#1 branch .. //depot/projects/tcp_new/amd64/include/clock.h#1 branch .. //depot/projects/tcp_new/amd64/include/cpu.h#1 branch .. //depot/projects/tcp_new/amd64/include/cpufunc.h#1 branch .. //depot/projects/tcp_new/amd64/include/cputypes.h#1 branch .. //depot/projects/tcp_new/amd64/include/db_machdep.h#1 branch .. //depot/projects/tcp_new/amd64/include/elf.h#1 branch .. //depot/projects/tcp_new/amd64/include/endian.h#1 branch .. //depot/projects/tcp_new/amd64/include/exec.h#1 branch .. //depot/projects/tcp_new/amd64/include/float.h#1 branch .. //depot/projects/tcp_new/amd64/include/floatingpoint.h#1 branch .. //depot/projects/tcp_new/amd64/include/fpu.h#1 branch .. //depot/projects/tcp_new/amd64/include/frame.h#1 branch .. //depot/projects/tcp_new/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/tcp_new/amd64/include/ieeefp.h#1 branch .. //depot/projects/tcp_new/amd64/include/in_cksum.h#1 branch .. //depot/projects/tcp_new/amd64/include/intr_machdep.h#1 branch .. //depot/projects/tcp_new/amd64/include/iodev.h#1 branch .. //depot/projects/tcp_new/amd64/include/kdb.h#1 branch .. //depot/projects/tcp_new/amd64/include/legacyvar.h#1 branch .. //depot/projects/tcp_new/amd64/include/limits.h#1 branch .. //depot/projects/tcp_new/amd64/include/md_var.h#1 branch .. //depot/projects/tcp_new/amd64/include/memdev.h#1 branch .. //depot/projects/tcp_new/amd64/include/metadata.h#1 branch .. //depot/projects/tcp_new/amd64/include/minidump.h#1 branch .. //depot/projects/tcp_new/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/tcp_new/amd64/include/mptable.h#1 branch .. //depot/projects/tcp_new/amd64/include/mutex.h#1 branch .. //depot/projects/tcp_new/amd64/include/param.h#1 branch .. //depot/projects/tcp_new/amd64/include/pc/bios.h#1 branch .. //depot/projects/tcp_new/amd64/include/pc/display.h#1 branch .. //depot/projects/tcp_new/amd64/include/pcb.h#1 branch .. //depot/projects/tcp_new/amd64/include/pcb_ext.h#1 branch .. //depot/projects/tcp_new/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/tcp_new/amd64/include/pcpu.h#1 branch .. //depot/projects/tcp_new/amd64/include/pmap.h#1 branch .. //depot/projects/tcp_new/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/tcp_new/amd64/include/ppireg.h#1 branch .. //depot/projects/tcp_new/amd64/include/proc.h#1 branch .. //depot/projects/tcp_new/amd64/include/profile.h#1 branch .. //depot/projects/tcp_new/amd64/include/psl.h#1 branch .. //depot/projects/tcp_new/amd64/include/ptrace.h#1 branch .. //depot/projects/tcp_new/amd64/include/reg.h#1 branch .. //depot/projects/tcp_new/amd64/include/reloc.h#1 branch .. //depot/projects/tcp_new/amd64/include/resource.h#1 branch .. //depot/projects/tcp_new/amd64/include/runq.h#1 branch .. //depot/projects/tcp_new/amd64/include/segments.h#1 branch .. //depot/projects/tcp_new/amd64/include/setjmp.h#1 branch .. //depot/projects/tcp_new/amd64/include/sf_buf.h#1 branch .. //depot/projects/tcp_new/amd64/include/sigframe.h#1 branch .. //depot/projects/tcp_new/amd64/include/signal.h#1 branch .. //depot/projects/tcp_new/amd64/include/smp.h#1 branch .. //depot/projects/tcp_new/amd64/include/specialreg.h#1 branch .. //depot/projects/tcp_new/amd64/include/stack.h#1 branch .. //depot/projects/tcp_new/amd64/include/stdarg.h#1 branch .. //depot/projects/tcp_new/amd64/include/sysarch.h#1 branch .. //depot/projects/tcp_new/amd64/include/timerreg.h#1 branch .. //depot/projects/tcp_new/amd64/include/trap.h#1 branch .. //depot/projects/tcp_new/amd64/include/tss.h#1 branch .. //depot/projects/tcp_new/amd64/include/ucontext.h#1 branch .. //depot/projects/tcp_new/amd64/include/varargs.h#1 branch .. //depot/projects/tcp_new/amd64/include/vmparam.h#1 branch .. //depot/projects/tcp_new/amd64/isa/atpic.c#1 branch .. //depot/projects/tcp_new/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/tcp_new/amd64/isa/clock.c#1 branch .. //depot/projects/tcp_new/amd64/isa/elcr.c#1 branch .. //depot/projects/tcp_new/amd64/isa/icu.h#1 branch .. //depot/projects/tcp_new/amd64/isa/isa.c#1 branch .. //depot/projects/tcp_new/amd64/isa/isa.h#1 branch .. //depot/projects/tcp_new/amd64/isa/isa_dma.c#1 branch .. //depot/projects/tcp_new/amd64/isa/nmi.c#1 branch .. //depot/projects/tcp_new/amd64/linux32/Makefile#1 branch .. //depot/projects/tcp_new/amd64/linux32/linux.h#1 branch .. //depot/projects/tcp_new/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/tcp_new/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/tcp_new/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/tcp_new/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/tcp_new/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/tcp_new/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/tcp_new/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/tcp_new/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/tcp_new/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/tcp_new/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/tcp_new/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/tcp_new/amd64/linux32/syscalls.master#1 branch .. //depot/projects/tcp_new/amd64/pci/pci_bus.c#1 branch .. //depot/projects/tcp_new/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/tcp_new/arm/arm/autoconf.c#1 branch .. //depot/projects/tcp_new/arm/arm/bcopy_page.S#1 branch .. //depot/projects/tcp_new/arm/arm/bcopyinout.S#1 branch .. //depot/projects/tcp_new/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/tcp_new/arm/arm/blockio.S#1 branch .. //depot/projects/tcp_new/arm/arm/bootconfig.c#1 branch .. //depot/projects/tcp_new/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/tcp_new/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/tcp_new/arm/arm/copystr.S#1 branch .. //depot/projects/tcp_new/arm/arm/cpufunc.c#1 branch .. //depot/projects/tcp_new/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/tcp_new/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/tcp_new/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/tcp_new/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/tcp_new/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/tcp_new/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/tcp_new/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/tcp_new/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/tcp_new/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/tcp_new/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/tcp_new/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/tcp_new/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/tcp_new/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/tcp_new/arm/arm/cpufunc_asm_xscale_c3.S#1 branch .. //depot/projects/tcp_new/arm/arm/db_disasm.c#1 branch .. //depot/projects/tcp_new/arm/arm/db_interface.c#1 branch .. //depot/projects/tcp_new/arm/arm/db_trace.c#1 branch .. //depot/projects/tcp_new/arm/arm/disassem.c#1 branch .. //depot/projects/tcp_new/arm/arm/dump_machdep.c#1 branch .. //depot/projects/tcp_new/arm/arm/elf_machdep.c#1 branch .. //depot/projects/tcp_new/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/tcp_new/arm/arm/exception.S#1 branch .. //depot/projects/tcp_new/arm/arm/fiq.c#1 branch .. //depot/projects/tcp_new/arm/arm/fiq_subr.S#1 branch .. //depot/projects/tcp_new/arm/arm/fusu.S#1 branch .. //depot/projects/tcp_new/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/tcp_new/arm/arm/genassym.c#1 branch .. //depot/projects/tcp_new/arm/arm/identcpu.c#1 branch .. //depot/projects/tcp_new/arm/arm/in_cksum.c#1 branch .. //depot/projects/tcp_new/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/tcp_new/arm/arm/inckern.S#1 branch .. //depot/projects/tcp_new/arm/arm/intr.c#1 branch .. //depot/projects/tcp_new/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/tcp_new/arm/arm/locore.S#1 branch .. //depot/projects/tcp_new/arm/arm/machdep.c#1 branch .. //depot/projects/tcp_new/arm/arm/mem.c#1 branch .. //depot/projects/tcp_new/arm/arm/nexus.c#1 branch .. //depot/projects/tcp_new/arm/arm/pmap.c#1 branch .. //depot/projects/tcp_new/arm/arm/setcpsr.S#1 branch .. //depot/projects/tcp_new/arm/arm/setstack.s#1 branch .. //depot/projects/tcp_new/arm/arm/stack_machdep.c#1 branch .. //depot/projects/tcp_new/arm/arm/support.S#1 branch .. //depot/projects/tcp_new/arm/arm/swtch.S#1 branch .. //depot/projects/tcp_new/arm/arm/sys_machdep.c#1 branch .. //depot/projects/tcp_new/arm/arm/trap.c#1 branch .. //depot/projects/tcp_new/arm/arm/uio_machdep.c#1 branch .. //depot/projects/tcp_new/arm/arm/undefined.c#1 branch .. //depot/projects/tcp_new/arm/arm/vectors.S#1 branch .. //depot/projects/tcp_new/arm/arm/vm_machdep.c#1 branch .. //depot/projects/tcp_new/arm/at91/at91.c#1 branch .. //depot/projects/tcp_new/arm/at91/at91_mci.c#1 branch .. //depot/projects/tcp_new/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/tcp_new/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/tcp_new/arm/at91/at91_pio.c#1 branch .. //depot/projects/tcp_new/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/tcp_new/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/tcp_new/arm/at91/at91_piovar.h#1 branch .. //depot/projects/tcp_new/arm/at91/at91_pmc.c#1 branch .. //depot/projects/tcp_new/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/tcp_new/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/tcp_new/arm/at91/at91_rtc.c#1 branch .. //depot/projects/tcp_new/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/tcp_new/arm/at91/at91_spi.c#1 branch .. //depot/projects/tcp_new/arm/at91/at91_spireg.h#1 branch .. //depot/projects/tcp_new/arm/at91/at91_ssc.c#1 branch .. //depot/projects/tcp_new/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/tcp_new/arm/at91/at91_st.c#1 branch .. //depot/projects/tcp_new/arm/at91/at91_streg.h#1 branch .. //depot/projects/tcp_new/arm/at91/at91_twi.c#1 branch .. //depot/projects/tcp_new/arm/at91/at91_twiio.h#1 branch .. //depot/projects/tcp_new/arm/at91/at91_twireg.h#1 branch .. //depot/projects/tcp_new/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/tcp_new/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/tcp_new/arm/at91/at91var.h#1 branch .. //depot/projects/tcp_new/arm/at91/files.at91#1 branch .. //depot/projects/tcp_new/arm/at91/files.kb920x#1 branch .. //depot/projects/tcp_new/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/tcp_new/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/tcp_new/arm/at91/if_ate.c#1 branch .. //depot/projects/tcp_new/arm/at91/if_atereg.h#1 branch .. //depot/projects/tcp_new/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/tcp_new/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/tcp_new/arm/at91/std.at91#1 branch .. //depot/projects/tcp_new/arm/at91/std.kb920x#1 branch .. //depot/projects/tcp_new/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/tcp_new/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/tcp_new/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/tcp_new/arm/compile/.cvsignore#1 branch .. //depot/projects/tcp_new/arm/conf/.cvsignore#1 branch .. //depot/projects/tcp_new/arm/conf/AVILA#1 branch .. //depot/projects/tcp_new/arm/conf/AVILA.hints#1 branch .. //depot/projects/tcp_new/arm/conf/BWCT#1 branch .. //depot/projects/tcp_new/arm/conf/BWCT.hints#1 branch .. //depot/projects/tcp_new/arm/conf/CRB#1 branch .. //depot/projects/tcp_new/arm/conf/EP80219#1 branch .. //depot/projects/tcp_new/arm/conf/HL200#1 branch .. //depot/projects/tcp_new/arm/conf/IQ31244#1 branch .. //depot/projects/tcp_new/arm/conf/KB920X#1 branch .. //depot/projects/tcp_new/arm/conf/KB920X.hints#1 branch .. //depot/projects/tcp_new/arm/conf/SIMICS#1 branch .. //depot/projects/tcp_new/arm/conf/SKYEYE#1 branch .. //depot/projects/tcp_new/arm/include/_bus.h#1 branch .. //depot/projects/tcp_new/arm/include/_inttypes.h#1 branch .. //depot/projects/tcp_new/arm/include/_limits.h#1 branch .. //depot/projects/tcp_new/arm/include/_stdint.h#1 branch .. //depot/projects/tcp_new/arm/include/_types.h#1 branch .. //depot/projects/tcp_new/arm/include/armreg.h#1 branch .. //depot/projects/tcp_new/arm/include/asm.h#1 branch .. //depot/projects/tcp_new/arm/include/asmacros.h#1 branch .. //depot/projects/tcp_new/arm/include/atomic.h#1 branch .. //depot/projects/tcp_new/arm/include/blockio.h#1 branch .. //depot/projects/tcp_new/arm/include/bootconfig.h#1 branch .. //depot/projects/tcp_new/arm/include/bus.h#1 branch .. //depot/projects/tcp_new/arm/include/bus_dma.h#1 branch .. //depot/projects/tcp_new/arm/include/clock.h#1 branch .. //depot/projects/tcp_new/arm/include/cpu.h#1 branch .. //depot/projects/tcp_new/arm/include/cpuconf.h#1 branch .. //depot/projects/tcp_new/arm/include/cpufunc.h#1 branch .. //depot/projects/tcp_new/arm/include/db_machdep.h#1 branch .. //depot/projects/tcp_new/arm/include/disassem.h#1 branch .. //depot/projects/tcp_new/arm/include/elf.h#1 branch .. //depot/projects/tcp_new/arm/include/endian.h#1 branch .. //depot/projects/tcp_new/arm/include/exec.h#1 branch .. //depot/projects/tcp_new/arm/include/fiq.h#1 branch .. //depot/projects/tcp_new/arm/include/float.h#1 branch .. //depot/projects/tcp_new/arm/include/floatingpoint.h#1 branch .. //depot/projects/tcp_new/arm/include/fp.h#1 branch .. //depot/projects/tcp_new/arm/include/frame.h#1 branch .. //depot/projects/tcp_new/arm/include/gdb_machdep.h#1 branch .. //depot/projects/tcp_new/arm/include/ieee.h#1 branch .. //depot/projects/tcp_new/arm/include/ieeefp.h#1 branch .. //depot/projects/tcp_new/arm/include/in_cksum.h#1 branch .. //depot/projects/tcp_new/arm/include/intr.h#1 branch .. //depot/projects/tcp_new/arm/include/katelib.h#1 branch .. //depot/projects/tcp_new/arm/include/kdb.h#1 branch .. //depot/projects/tcp_new/arm/include/limits.h#1 branch .. //depot/projects/tcp_new/arm/include/machdep.h#1 branch .. //depot/projects/tcp_new/arm/include/md_var.h#1 branch .. //depot/projects/tcp_new/arm/include/memdev.h#1 branch .. //depot/projects/tcp_new/arm/include/metadata.h#1 branch .. //depot/projects/tcp_new/arm/include/mutex.h#1 branch .. //depot/projects/tcp_new/arm/include/param.h#1 branch .. //depot/projects/tcp_new/arm/include/pcb.h#1 branch .. //depot/projects/tcp_new/arm/include/pcpu.h#1 branch .. //depot/projects/tcp_new/arm/include/pmap.h#1 branch .. //depot/projects/tcp_new/arm/include/pmc_mdep.h#1 branch .. //depot/projects/tcp_new/arm/include/proc.h#1 branch .. //depot/projects/tcp_new/arm/include/profile.h#1 branch .. //depot/projects/tcp_new/arm/include/psl.h#1 branch .. //depot/projects/tcp_new/arm/include/pte.h#1 branch .. //depot/projects/tcp_new/arm/include/ptrace.h#1 branch .. //depot/projects/tcp_new/arm/include/reg.h#1 branch .. //depot/projects/tcp_new/arm/include/reloc.h#1 branch .. //depot/projects/tcp_new/arm/include/resource.h#1 branch .. //depot/projects/tcp_new/arm/include/runq.h#1 branch .. //depot/projects/tcp_new/arm/include/setjmp.h#1 branch .. //depot/projects/tcp_new/arm/include/sf_buf.h#1 branch .. //depot/projects/tcp_new/arm/include/sigframe.h#1 branch .. //depot/projects/tcp_new/arm/include/signal.h#1 branch .. //depot/projects/tcp_new/arm/include/smp.h#1 branch .. //depot/projects/tcp_new/arm/include/stack.h#1 branch .. //depot/projects/tcp_new/arm/include/stdarg.h#1 branch .. //depot/projects/tcp_new/arm/include/swi.h#1 branch .. //depot/projects/tcp_new/arm/include/sysarch.h#1 branch .. //depot/projects/tcp_new/arm/include/trap.h#1 branch .. //depot/projects/tcp_new/arm/include/ucontext.h#1 branch .. //depot/projects/tcp_new/arm/include/undefined.h#1 branch .. //depot/projects/tcp_new/arm/include/utrap.h#1 branch .. //depot/projects/tcp_new/arm/include/vmparam.h#1 branch .. //depot/projects/tcp_new/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/tcp_new/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/tcp_new/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/tcp_new/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/tcp_new/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/tcp_new/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/tcp_new/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/tcp_new/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/tcp_new/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/tcp_new/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/tcp_new/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/tcp_new/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/tcp_new/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/tcp_new/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/tcp_new/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/tcp_new/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/tcp_new/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/tcp_new/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/tcp_new/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/crb_machdep.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/files.crb#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/files.i81342#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/i81342.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/i81342_mcu.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/i81342_pci.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/i81342_space.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/i81342reg.h#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/i81342var.h#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/obio.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/obio_space.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/obiovar.h#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/std.crb#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/std.i81342#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/uart_bus_i81342.c#1 branch .. //depot/projects/tcp_new/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/tcp_new/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/tcp_new/arm/xscale/std.xscale#1 branch .. //depot/projects/tcp_new/arm/xscale/xscalereg.h#1 branch .. //depot/projects/tcp_new/arm/xscale/xscalevar.h#1 branch .. //depot/projects/tcp_new/boot/Makefile#1 branch .. //depot/projects/tcp_new/boot/README#1 branch .. //depot/projects/tcp_new/boot/arm/Makefile#1 branch .. //depot/projects/tcp_new/boot/arm/at91/Makefile#1 branch .. //depot/projects/tcp_new/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/tcp_new/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/tcp_new/boot/arm/at91/boot0/README#1 branch .. //depot/projects/tcp_new/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/tcp_new/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/tcp_new/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/tcp_new/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/tcp_new/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/tcp_new/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/tcp_new/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/tcp_new/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/tcp_new/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/tcp_new/boot/common/Makefile.inc#1 branch .. //depot/projects/tcp_new/boot/common/bcache.c#1 branch .. //depot/projects/tcp_new/boot/common/boot.c#1 branch .. //depot/projects/tcp_new/boot/common/bootstrap.h#1 branch .. //depot/projects/tcp_new/boot/common/commands.c#1 branch .. //depot/projects/tcp_new/boot/common/console.c#1 branch .. //depot/projects/tcp_new/boot/common/dev_net.c#1 branch .. //depot/projects/tcp_new/boot/common/dev_net.h#1 branch .. //depot/projects/tcp_new/boot/common/devopen.c#1 branch .. //depot/projects/tcp_new/boot/common/help.common#1 branch .. //depot/projects/tcp_new/boot/common/interp.c#1 branch .. //depot/projects/tcp_new/boot/common/interp_backslash.c#1 branch .. //depot/projects/tcp_new/boot/common/interp_forth.c#1 branch .. //depot/projects/tcp_new/boot/common/interp_parse.c#1 branch .. //depot/projects/tcp_new/boot/common/isapnp.c#1 branch .. //depot/projects/tcp_new/boot/common/isapnp.h#1 branch .. //depot/projects/tcp_new/boot/common/load.c#1 branch .. //depot/projects/tcp_new/boot/common/load_elf.c#1 branch .. //depot/projects/tcp_new/boot/common/load_elf32.c#1 branch .. //depot/projects/tcp_new/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/tcp_new/boot/common/load_elf64.c#1 branch .. //depot/projects/tcp_new/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/tcp_new/boot/common/load_elf_obj.c#1 branch .. //depot/projects/tcp_new/boot/common/loader.8#1 branch .. //depot/projects/tcp_new/boot/common/ls.c#1 branch .. //depot/projects/tcp_new/boot/common/merge_help.awk#1 branch .. //depot/projects/tcp_new/boot/common/misc.c#1 branch .. //depot/projects/tcp_new/boot/common/module.c#1 branch .. //depot/projects/tcp_new/boot/common/newvers.sh#1 branch .. //depot/projects/tcp_new/boot/common/panic.c#1 branch .. //depot/projects/tcp_new/boot/common/pnp.c#1 branch .. //depot/projects/tcp_new/boot/common/reloc_elf.c#1 branch .. //depot/projects/tcp_new/boot/common/reloc_elf32.c#1 branch .. //depot/projects/tcp_new/boot/common/reloc_elf64.c#1 branch .. //depot/projects/tcp_new/boot/common/ufsread.c#1 branch .. //depot/projects/tcp_new/boot/efi/Makefile#1 branch .. //depot/projects/tcp_new/boot/efi/Makefile.inc#1 branch .. //depot/projects/tcp_new/boot/efi/include/README#1 branch .. //depot/projects/tcp_new/boot/efi/include/efi.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/efiapi.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/eficon.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/efidebug.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/efidef.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/efidevp.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/efierr.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/efifs.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/efilib.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/efinet.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/efipart.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/efiprot.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/efiser.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/tcp_new/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/tcp_new/boot/efi/libefi/Makefile#1 branch .. //depot/projects/tcp_new/boot/efi/libefi/delay.c#1 branch .. //depot/projects/tcp_new/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/tcp_new/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/tcp_new/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/tcp_new/boot/efi/libefi/errno.c#1 branch .. //depot/projects/tcp_new/boot/efi/libefi/handles.c#1 branch .. //depot/projects/tcp_new/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/tcp_new/boot/efi/libefi/time.c#1 branch .. //depot/projects/tcp_new/boot/ficl/Makefile#1 branch .. //depot/projects/tcp_new/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/tcp_new/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/tcp_new/boot/ficl/dict.c#1 branch .. //depot/projects/tcp_new/boot/ficl/ficl.c#1 branch .. //depot/projects/tcp_new/boot/ficl/ficl.h#1 branch .. //depot/projects/tcp_new/boot/ficl/fileaccess.c#1 branch .. //depot/projects/tcp_new/boot/ficl/float.c#1 branch .. //depot/projects/tcp_new/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/tcp_new/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/tcp_new/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/tcp_new/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/tcp_new/boot/ficl/loader.c#1 branch .. //depot/projects/tcp_new/boot/ficl/math64.c#1 branch .. //depot/projects/tcp_new/boot/ficl/math64.h#1 branch .. //depot/projects/tcp_new/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/tcp_new/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/tcp_new/boot/ficl/prefix.c#1 branch .. //depot/projects/tcp_new/boot/ficl/search.c#1 branch .. //depot/projects/tcp_new/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/tcp_new/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/tcp_new/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/tcp_new/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/tcp_new/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/tcp_new/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/tcp_new/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/tcp_new/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/tcp_new/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/tcp_new/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/tcp_new/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/tcp_new/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/tcp_new/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/tcp_new/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/tcp_new/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/tcp_new/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/tcp_new/boot/ficl/stack.c#1 branch .. //depot/projects/tcp_new/boot/ficl/testmain.c#1 branch .. //depot/projects/tcp_new/boot/ficl/tools.c#1 branch .. //depot/projects/tcp_new/boot/ficl/unix.c#1 branch .. //depot/projects/tcp_new/boot/ficl/vm.c#1 branch .. //depot/projects/tcp_new/boot/ficl/words.c#1 branch .. //depot/projects/tcp_new/boot/forth/beastie.4th#1 branch .. //depot/projects/tcp_new/boot/forth/frames.4th#1 branch .. //depot/projects/tcp_new/boot/forth/loader.4th#1 branch .. //depot/projects/tcp_new/boot/forth/loader.4th.8#1 branch .. //depot/projects/tcp_new/boot/forth/loader.conf#1 branch .. //depot/projects/tcp_new/boot/forth/loader.conf.5#1 branch .. //depot/projects/tcp_new/boot/forth/loader.rc#1 branch .. //depot/projects/tcp_new/boot/forth/pnp.4th#1 branch .. //depot/projects/tcp_new/boot/forth/screen.4th#1 branch .. //depot/projects/tcp_new/boot/forth/support.4th#1 branch .. //depot/projects/tcp_new/boot/i386/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/Makefile.inc#1 branch .. //depot/projects/tcp_new/boot/i386/boot0/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/tcp_new/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/tcp_new/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/boot2/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/tcp_new/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/tcp_new/boot/i386/boot2/lib.h#1 branch .. //depot/projects/tcp_new/boot/i386/boot2/sio.S#1 branch .. //depot/projects/tcp_new/boot/i386/btx/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/tcp_new/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/tcp_new/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/tcp_new/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/tcp_new/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/tcp_new/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/tcp_new/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/tcp_new/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/tcp_new/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/tcp_new/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/tcp_new/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/tcp_new/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/tcp_new/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/tcp_new/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/tcp_new/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/tcp_new/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/tcp_new/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/tcp_new/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/tcp_new/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/tcp_new/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/tcp_new/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/pread.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/time.c#1 branch .. //depot/projects/tcp_new/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/tcp_new/boot/i386/loader/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/loader/conf.c#1 branch .. //depot/projects/tcp_new/boot/i386/loader/help.i386#1 branch .. //depot/projects/tcp_new/boot/i386/loader/loader.rc#1 branch .. //depot/projects/tcp_new/boot/i386/loader/main.c#1 branch .. //depot/projects/tcp_new/boot/i386/loader/version#1 branch .. //depot/projects/tcp_new/boot/i386/mbr/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/tcp_new/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/tcp_new/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/tcp_new/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/tcp_new/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/tcp_new/boot/ia64/Makefile#1 branch .. //depot/projects/tcp_new/boot/ia64/Makefile.inc#1 branch .. //depot/projects/tcp_new/boot/ia64/common/Makefile#1 branch .. //depot/projects/tcp_new/boot/ia64/common/autoload.c#1 branch .. //depot/projects/tcp_new/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/tcp_new/boot/ia64/common/copy.c#1 branch .. //depot/projects/tcp_new/boot/ia64/common/devicename.c#1 branch .. //depot/projects/tcp_new/boot/ia64/common/exec.c#1 branch .. //depot/projects/tcp_new/boot/ia64/common/libia64.h#1 branch .. //depot/projects/tcp_new/boot/ia64/efi/Makefile#1 branch .. //depot/projects/tcp_new/boot/ia64/efi/conf.c#1 branch .. //depot/projects/tcp_new/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/tcp_new/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/tcp_new/boot/ia64/efi/main.c#1 branch .. //depot/projects/tcp_new/boot/ia64/efi/start.S#1 branch .. //depot/projects/tcp_new/boot/ia64/efi/version#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/Makefile#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/conf.c#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/delay.c#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/exit.c#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/libski.h#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/main.c#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/start.S#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/time.c#1 branch .. //depot/projects/tcp_new/boot/ia64/ski/version#1 branch .. //depot/projects/tcp_new/boot/ofw/Makefile#1 branch .. //depot/projects/tcp_new/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/tcp_new/boot/ofw/common/main.c#1 branch .. //depot/projects/tcp_new/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/tcp_new/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/tcp_new/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/tcp_new/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/tcp_new/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/tcp_new/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/tcp_new/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/tcp_new/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/tcp_new/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/tcp_new/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/tcp_new/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/tcp_new/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/tcp_new/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/tcp_new/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/tcp_new/boot/pc98/Makefile#1 branch .. //depot/projects/tcp_new/boot/pc98/Makefile.inc#1 branch .. //depot/projects/tcp_new/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/tcp_new/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/tcp_new/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/tcp_new/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/tcp_new/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/tcp_new/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/tcp_new/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/tcp_new/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/tcp_new/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/tcp_new/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/tcp_new/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/tcp_new/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/io.c#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/start.S#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/tcp_new/boot/pc98/boot2/table.c#1 branch .. //depot/projects/tcp_new/boot/pc98/btx/Makefile#1 branch .. //depot/projects/tcp_new/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/tcp_new/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/tcp_new/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/tcp_new/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/tcp_new/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/tcp_new/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/tcp_new/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/tcp_new/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/tcp_new/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/tcp_new/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/tcp_new/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/tcp_new/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/tcp_new/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/tcp_new/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/tcp_new/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/tcp_new/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/tcp_new/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/tcp_new/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/tcp_new/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/tcp_new/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/tcp_new/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/tcp_new/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/tcp_new/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/tcp_new/boot/pc98/loader/Makefile#1 branch .. //depot/projects/tcp_new/boot/pc98/loader/conf.c#1 branch .. //depot/projects/tcp_new/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/tcp_new/boot/pc98/loader/main.c#1 branch .. //depot/projects/tcp_new/boot/powerpc/Makefile#1 branch .. //depot/projects/tcp_new/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/tcp_new/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/tcp_new/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/tcp_new/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/tcp_new/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/tcp_new/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/tcp_new/boot/powerpc/ofw/version#1 branch .. //depot/projects/tcp_new/boot/sparc64/Makefile#1 branch .. //depot/projects/tcp_new/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/tcp_new/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/tcp_new/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/tcp_new/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/tcp_new/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/tcp_new/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/tcp_new/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/tcp_new/boot/sparc64/loader/main.c#1 branch .. //depot/projects/tcp_new/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/tcp_new/boot/sparc64/loader/version#1 branch .. //depot/projects/tcp_new/bsm/audit.h#1 branch .. //depot/projects/tcp_new/bsm/audit_internal.h#1 branch .. //depot/projects/tcp_new/bsm/audit_kevents.h#1 branch .. //depot/projects/tcp_new/bsm/audit_record.h#1 branch .. //depot/projects/tcp_new/cam/README.quirks#1 branch .. //depot/projects/tcp_new/cam/cam.c#1 branch .. //depot/projects/tcp_new/cam/cam.h#1 branch .. //depot/projects/tcp_new/cam/cam_ccb.h#1 branch .. //depot/projects/tcp_new/cam/cam_debug.h#1 branch .. //depot/projects/tcp_new/cam/cam_periph.c#1 branch .. //depot/projects/tcp_new/cam/cam_periph.h#1 branch .. //depot/projects/tcp_new/cam/cam_queue.c#1 branch .. //depot/projects/tcp_new/cam/cam_queue.h#1 branch .. //depot/projects/tcp_new/cam/cam_sim.c#1 branch .. //depot/projects/tcp_new/cam/cam_sim.h#1 branch .. //depot/projects/tcp_new/cam/cam_xpt.c#1 branch .. //depot/projects/tcp_new/cam/cam_xpt.h#1 branch .. //depot/projects/tcp_new/cam/cam_xpt_periph.h#1 branch .. //depot/projects/tcp_new/cam/cam_xpt_sim.h#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_all.c#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_all.h#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_da.c#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_da.h#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_low.c#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_low.h#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_message.h#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_target.c#1 branch .. //depot/projects/tcp_new/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/tcp_new/compat/freebsd32/Makefile#1 branch .. //depot/projects/tcp_new/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/tcp_new/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/tcp_new/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/tcp_new/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/tcp_new/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/tcp_new/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/tcp_new/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/tcp_new/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/tcp_new/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/tcp_new/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/tcp_new/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/tcp_new/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/tcp_new/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/tcp_new/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/tcp_new/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/tcp_new/compat/ia32/ia32_util.h#1 branch .. //depot/projects/tcp_new/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/tcp_new/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_emul.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_emul.h#1 branch .. //depot/projects/tcp_new/compat/linux/linux_file.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_futex.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_futex.h#1 branch .. //depot/projects/tcp_new/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/tcp_new/compat/linux/linux_ipc.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_ipc.h#1 branch .. //depot/projects/tcp_new/compat/linux/linux_mib.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_mib.h#1 branch .. //depot/projects/tcp_new/compat/linux/linux_misc.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_misc.h#1 branch .. //depot/projects/tcp_new/compat/linux/linux_signal.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_signal.h#1 branch .. //depot/projects/tcp_new/compat/linux/linux_socket.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_socket.h#1 branch .. //depot/projects/tcp_new/compat/linux/linux_stats.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/tcp_new/compat/linux/linux_time.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_uid16.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_util.c#1 branch .. //depot/projects/tcp_new/compat/linux/linux_util.h#1 branch .. //depot/projects/tcp_new/compat/ndis/cfg_var.h#1 branch .. //depot/projects/tcp_new/compat/ndis/hal_var.h#1 branch .. //depot/projects/tcp_new/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/tcp_new/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/tcp_new/compat/ndis/ndis_var.h#1 branch .. //depot/projects/tcp_new/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/tcp_new/compat/ndis/pe_var.h#1 branch .. //depot/projects/tcp_new/compat/ndis/resource_var.h#1 branch .. //depot/projects/tcp_new/compat/ndis/subr_hal.c#1 branch .. //depot/projects/tcp_new/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/tcp_new/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/tcp_new/compat/ndis/subr_pe.c#1 branch .. //depot/projects/tcp_new/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/tcp_new/compat/ndis/usbd_var.h#1 branch .. //depot/projects/tcp_new/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/tcp_new/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/tcp_new/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/tcp_new/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/tcp_new/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/tcp_new/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/tcp_new/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/tcp_new/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/tcp_new/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/tcp_new/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/tcp_new/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/tcp_new/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/tcp_new/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/tcp_new/compat/opensolaris/sys/mman.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 28 23:30:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F12BC16A501; Mon, 28 Jan 2008 23:30:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF84D16A4FF for ; Mon, 28 Jan 2008 23:30:10 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 866F413C461 for ; Mon, 28 Jan 2008 23:30:10 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0SNUAto050025 for ; Mon, 28 Jan 2008 23:30:10 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0SNUAeE050022 for perforce@freebsd.org; Mon, 28 Jan 2008 23:30:10 GMT (envelope-from imp@freebsd.org) Date: Mon, 28 Jan 2008 23:30:10 GMT Message-Id: <200801282330.m0SNUAeE050022@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134337 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 23:30:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=134337 Change 134337 by imp@imp_paco-paco on 2008/01/28 23:29:37 Not going very far without my hints file. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON.hints#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 28 23:42:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD3F316A46E; Mon, 28 Jan 2008 23:42:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2D4216A46C for ; Mon, 28 Jan 2008 23:42:23 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7947913C455 for ; Mon, 28 Jan 2008 23:42:23 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0SNgNBx050550 for ; Mon, 28 Jan 2008 23:42:23 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0SNgNuH050547 for perforce@freebsd.org; Mon, 28 Jan 2008 23:42:23 GMT (envelope-from imp@freebsd.org) Date: Mon, 28 Jan 2008 23:42:23 GMT Message-Id: <200801282342.m0SNgNuH050547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134339 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2008 23:42:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=134339 Change 134339 by imp@imp_lighthouse on 2008/01/28 23:41:50 Ooops, I told rrs how to spell this incorrectly. Use correct spelling. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#3 (text+ko) ==== @@ -33,7 +33,7 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options CPU_ISA_MIPS64 +options ISA_MIPS64 options DDB options KDB From owner-p4-projects@FreeBSD.ORG Tue Jan 29 00:34:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87E7D16A418; Tue, 29 Jan 2008 00:34:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D34216A419 for ; Tue, 29 Jan 2008 00:34:19 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3BD1613C468 for ; Tue, 29 Jan 2008 00:34:19 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0T0YJbs055341 for ; Tue, 29 Jan 2008 00:34:19 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0T0YJTs055338 for perforce@freebsd.org; Tue, 29 Jan 2008 00:34:19 GMT (envelope-from imp@freebsd.org) Date: Tue, 29 Jan 2008 00:34:19 GMT Message-Id: <200801290034.m0T0YJTs055338@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134342 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 00:34:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=134342 Change 134342 by imp@imp_lighthouse on 2008/01/29 00:34:08 Remove bogus resetting of the stack before calling mi_start. This makes the stack 8 byte aligned again. Thanks to gonzo for the unaligned observation. We now get to the point of mounting the / file system. I guess I'll have to build me one. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#16 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#16 (text+ko) ==== @@ -211,10 +211,6 @@ jal platform_start sw zero, START_FRAME - 8(sp) # Zero out old fp for debugger - /* Is this necessary here? -- xxximp */ - la sp, _C_LABEL(thread0) - lw a0, TD_PCB(sp) - subu sp, a0, START_FRAME jal _C_LABEL(mi_startup) # mi_startup(frame) nop PANIC("Startup failed!") From owner-p4-projects@FreeBSD.ORG Tue Jan 29 00:52:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D2D516A41B; Tue, 29 Jan 2008 00:52:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 228E616A419 for ; Tue, 29 Jan 2008 00:52:39 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 110D513C457 for ; Tue, 29 Jan 2008 00:52:39 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0T0qcCU064980 for ; Tue, 29 Jan 2008 00:52:38 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0T0qcfL064977 for perforce@freebsd.org; Tue, 29 Jan 2008 00:52:38 GMT (envelope-from imp@freebsd.org) Date: Tue, 29 Jan 2008 00:52:38 GMT Message-Id: <200801290052.m0T0qcfL064977@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134345 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 00:52:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=134345 Change 134345 by imp@imp_lighthouse on 2008/01/29 00:51:37 More nits. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#17 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#17 (text+ko) ==== @@ -176,7 +176,7 @@ * The following needs to be done differently for each platform and * there needs to be a good way to plug this in. */ -#ifdef CPU_XLR +#if defined(SMP) && defined(CPU_XLR) /* * Block all the slave CPUs */ @@ -208,12 +208,14 @@ #endif /* Call the platform-specific startup code. */ - jal platform_start + jal _C_LABEL(platform_start) sw zero, START_FRAME - 8(sp) # Zero out old fp for debugger jal _C_LABEL(mi_startup) # mi_startup(frame) - nop + sw zero, START_FRAME - 8(sp) # Zero out old fp for debugger + PANIC("Startup failed!") + #ifdef SMP start_secondary: move a0, a1 From owner-p4-projects@FreeBSD.ORG Tue Jan 29 04:54:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C1BD16A421; Tue, 29 Jan 2008 04:54:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C1EF16A41A for ; Tue, 29 Jan 2008 04:54:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 271A913C474 for ; Tue, 29 Jan 2008 04:54:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0T4st6J094441 for ; Tue, 29 Jan 2008 04:54:55 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0T4ss6X094438 for perforce@freebsd.org; Tue, 29 Jan 2008 04:54:54 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 29 Jan 2008 04:54:54 GMT Message-Id: <200801290454.m0T4ss6X094438@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134352 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 04:54:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=134352 Change 134352 by kmacy@kmacy:storage:toehead on 2008/01/29 04:54:53 IFC 134350 Affected files ... .. //depot/projects/toehead/etc/defaults/rc.conf#5 integrate .. //depot/projects/toehead/etc/rc.d/ipfw#3 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kgdb.h#4 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/main.c#3 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/trgt.c#4 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/toehead/lib/msun/src/s_exp2f.c#3 integrate .. //depot/projects/toehead/sbin/ffsinfo/ffsinfo.c#2 integrate .. //depot/projects/toehead/share/man/man4/ath.4#2 integrate .. //depot/projects/toehead/share/man/man4/awi.4#2 integrate .. //depot/projects/toehead/share/man/man4/ed.4#3 integrate .. //depot/projects/toehead/share/man/man4/man4.i386/snc.4#2 integrate .. //depot/projects/toehead/share/man/man4/wi.4#2 integrate .. //depot/projects/toehead/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/toehead/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/toehead/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/toehead/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/toehead/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/toehead/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/toehead/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/toehead/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/toehead/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/toehead/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/toehead/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/toehead/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/toehead/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/toehead/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/toehead/sys/kern/subr_bus.c#3 integrate .. //depot/projects/toehead/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/toehead/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/toehead/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/toehead/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/toehead/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/toehead/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/toehead/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/toehead/sys/security/audit/audit.c#2 integrate .. //depot/projects/toehead/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/toehead/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/toehead/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/toehead/sys/sys/bus.h#2 integrate .. //depot/projects/toehead/sys/sys/conf.h#2 integrate .. //depot/projects/toehead/usr.bin/top/machine.c#4 integrate .. //depot/projects/toehead/usr.bin/xargs/xargs.1#3 integrate .. //depot/projects/toehead/usr.sbin/adduser/adduser.8#2 integrate .. //depot/projects/toehead/usr.sbin/adduser/adduser.sh#2 integrate Differences ... ==== //depot/projects/toehead/etc/defaults/rc.conf#5 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.324 2008/01/25 05:23:01 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.326 2008/01/27 15:15:11 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -122,6 +122,7 @@ firewall_nat_enable="NO" # Enable kernel NAT (if firewall_enable == YES) firewall_nat_interface="" # Public interface or IPaddress to use firewall_nat_flags="" # Additional configuration parameters +dummynet_enable="NO" # Load the dummynet(4) module ip_portrange_first="NO" # Set first dynamically allocated port ip_portrange_last="NO" # Set last dynamically allocated port ike_enable="NO" # Enable IKE daemon (usually racoon or isakmpd) @@ -560,7 +561,7 @@ watchdogd_enable="NO" # Start the software watchdog daemon devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules" # Files containing # devfs(8) rules. -devfs_system_ruleset="" # The name of a ruleset to apply to /dev +devfs_system_ruleset="" # The name (NOT number) of a ruleset to apply to /dev devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to # apply (must be mounted already, i.e. fstab(5)) performance_cx_lowest="HIGH" # Online CPU idle state ==== //depot/projects/toehead/etc/rc.d/ipfw#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.16 2008/01/26 14:02:19 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.17 2008/01/27 15:15:12 mtm Exp $ # # PROVIDE: ipfw @@ -14,9 +14,17 @@ name="ipfw" rcvar="firewall_enable" start_cmd="ipfw_start" +start_precmd="ipfw_prestart" stop_cmd="ipfw_stop" required_modules="ipfw" +ipfw_prestart() +{ + if checkyesno dummynet_enable; then + required_modules="$required_modules dummynet" + fi +} + ipfw_start() { # set the firewall rules script if none was specified ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kgdb.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (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: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.8 2008/01/24 19:11:13 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.9 2008/01/28 21:40:10 jhb Exp $ */ #ifndef _KGDB_H_ @@ -48,6 +48,7 @@ extern struct kthr *curkthr; void kgdb_add_kld_cmd(char *, int); +void kgdb_auto_load_klds(void); void kgdb_target(void); void kgdb_trgt_fetch_registers(int); void kgdb_trgt_store_registers(int); ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kld.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.1 2008/01/24 19:11:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.3 2008/01/28 21:45:09 jhb Exp $"); #include #include @@ -41,6 +41,16 @@ #include "kgdb.h" +/* + * TODO + * + * - Use 'target_read_memory()' instead of kvm_read(). + * - Hook into the solib stuff perhaps? + */ + +/* Offsets of fields in linker_file structure. */ +static CORE_ADDR off_address, off_filename, off_pathname, off_next; + static int kld_ok (char *path) { @@ -52,68 +62,72 @@ } /* - * Look for a matching file in the following order: + * Look for a matching file checking for debug suffixes before the raw file: * - filename + ".symbols" (e.g. foo.ko.symbols) * - filename + ".debug" (e.g. foo.ko.debug) * - filename (e.g. foo.ko) - * - dirname(kernel) + filename + ".symbols" (e.g. /boot/kernel/foo.ko.symbols) - * - dirname(kernel) + filename + ".debug" (e.g. /boot/kernel/foo.ko.debug) - * - dirname(kernel) + filename (e.g. /boot/kernel/foo.ko) - * - iterate over each path in the module path looking for: - * - dir + filename + ".symbols" (e.g. /boot/modules/foo.ko.symbols) - * - dir + filename + ".debug" (e.g. /boot/modules/foo.ko.debug) - * - dir + filename (e.g. /boot/modules/foo.ko) + */ +static const char *kld_suffixes[] = { + ".symbols", + ".debug", + "", + NULL +}; + +static int +check_kld_path (char *path, size_t path_size) +{ + const char **suffix; + char *ep; + + ep = path + strlen(path); + suffix = kld_suffixes; + while (*suffix != NULL) { + if (strlcat(path, *suffix, path_size) < path_size) { + if (kld_ok(path)) + return (1); + } + + /* Restore original path to remove suffix. */ + *ep = '\0'; + suffix++; + } + return (0); +} + +/* + * Try to find the path for a kld by looking in the kernel's directory and + * in the various paths in the module path. */ static int find_kld_path (char *filename, char *path, size_t path_size) { CORE_ADDR module_path_addr; - char module_path[PATH_MAX]; + char *module_path; char *kernel_dir, *module_dir, *cp; + int error; - snprintf(path, path_size, "%s.symbols", filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s.debug", filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s", filename); - if (kld_ok(path)) - return (1); kernel_dir = dirname(kernel); if (kernel_dir != NULL) { - snprintf(path, path_size, "%s/%s.symbols", kernel_dir, - filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s/%s.debug", kernel_dir, filename); - if (kld_ok(path)) - return (1); snprintf(path, path_size, "%s/%s", kernel_dir, filename); - if (kld_ok(path)) + if (check_kld_path(path, path_size)) return (1); } module_path_addr = kgdb_parse("linker_path"); - if (module_path_addr != 0 && - kvm_read(kvm, module_path_addr, module_path, sizeof(module_path)) == - sizeof(module_path)) { - module_path[PATH_MAX - 1] = '\0'; - cp = module_path; - while ((module_dir = strsep(&cp, ";")) != NULL) { - snprintf(path, path_size, "%s/%s.symbols", module_dir, - filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s/%s.debug", module_dir, - filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s/%s", module_dir, - filename); - if (kld_ok(path)) - return (1); + if (module_path_addr != 0) { + target_read_string(module_path_addr, &module_path, PATH_MAX, + &error); + if (error == 0) { + make_cleanup(xfree, module_path); + cp = module_path; + while ((module_dir = strsep(&cp, ";")) != NULL) { + snprintf(path, path_size, "%s/%s", module_dir, + filename); + if (check_kld_path(path, path_size)) + return (1); + } } - } + } return (0); } @@ -150,36 +164,29 @@ static int find_kld_address (char *arg, CORE_ADDR *address) { - CORE_ADDR kld, filename_addr; - CORE_ADDR off_address, off_filename, off_next; - char kld_filename[PATH_MAX]; + CORE_ADDR kld; + char *kld_filename; char *filename; - size_t filelen; + int error; - /* Compute offsets of relevant members in struct linker_file. */ - off_address = kgdb_parse("&((struct linker_file *)0)->address"); - off_filename = kgdb_parse("&((struct linker_file *)0)->filename"); - off_next = kgdb_parse("&((struct linker_file *)0)->link.tqe_next"); if (off_address == 0 || off_filename == 0 || off_next == 0) return (0); filename = basename(arg); - filelen = strlen(filename) + 1; - kld = kgdb_parse("linker_files.tqh_first"); - while (kld != 0) { + for (kld = kgdb_parse("linker_files.tqh_first"); kld != 0; + kld = read_pointer(kld + off_next)) { /* Try to read this linker file's filename. */ - filename_addr = read_pointer(kld + off_filename); - if (filename_addr == 0) - goto next_kld; - if (kvm_read(kvm, filename_addr, kld_filename, filelen) != - filelen) - goto next_kld; + target_read_string(read_pointer(kld + off_filename), + &kld_filename, PATH_MAX, &error); + if (error) + continue; /* Compare this kld's filename against our passed in name. */ - if (kld_filename[filelen - 1] != '\0') - goto next_kld; - if (strcmp(kld_filename, filename) != 0) - goto next_kld; + if (strcmp(kld_filename, filename) != 0) { + xfree(kld_filename); + continue; + } + xfree(kld_filename); /* * We found a match, use its address as the base @@ -189,116 +196,212 @@ if (*address == 0) return (0); return (1); - - next_kld: - kld = read_pointer(kld + off_next); } return (0); } +struct add_section_info { + struct section_addr_info *section_addrs; + int sect_index; + CORE_ADDR base_addr; + int add_kld_command; +}; + +static void +add_section (bfd *bfd, asection *sect, void *arg) +{ + struct add_section_info *asi = arg; + CORE_ADDR address; + char *name; + + /* Ignore non-resident sections. */ + if ((bfd_get_section_flags(bfd, sect) & (SEC_ALLOC | SEC_LOAD)) == 0) + return; + + name = xstrdup(bfd_get_section_name(bfd, sect)); + make_cleanup(xfree, name); + address = asi->base_addr + bfd_get_section_vma(bfd, sect); + asi->section_addrs->other[asi->sect_index].name = name; + asi->section_addrs->other[asi->sect_index].addr = address; + asi->section_addrs->other[asi->sect_index].sectindex = sect->index; + if (asi->add_kld_command) + printf_unfiltered("\t%s_addr = %s\n", name, + local_hex_string(address)); + asi->sect_index++; +} + static void -add_section(struct section_addr_info *section_addrs, int *sect_indexp, - char *name, CORE_ADDR address) +load_kld (char *path, CORE_ADDR base_addr, int from_tty, int add_kld_command) { - int sect_index; + struct add_section_info asi; + struct cleanup *cleanup; + bfd *bfd; + + /* Open the kld. */ + bfd = bfd_openr(path, gnutarget); + if (bfd == NULL) + error("\"%s\": can't open: %s", path, + bfd_errmsg(bfd_get_error())); + cleanup = make_cleanup_bfd_close(bfd); + + if (!bfd_check_format(bfd, bfd_object)) + error("\%s\": not an object file", path); + + /* Make sure we have a .text section. */ + if (bfd_get_section_by_name (bfd, ".text") == NULL) + error("\"%s\": can't find text section", path); + + if (add_kld_command) + printf_unfiltered("add symbol table from file \"%s\" at\n", + path); + + /* Build a section table for symbol_file_add() from the bfd sections. */ + asi.section_addrs = alloc_section_addr_info(bfd_count_sections(bfd)); + cleanup = make_cleanup(xfree, asi.section_addrs); + asi.sect_index = 0; + asi.base_addr = base_addr; + asi.add_kld_command = add_kld_command; + bfd_map_over_sections(bfd, add_section, &asi); + + if (from_tty && (!query("%s", ""))) + error("Not confirmed."); + + symbol_file_add(path, from_tty, asi.section_addrs, 0, + add_kld_command ? OBJF_USERLOADED : 0); - sect_index = *sect_indexp; - section_addrs->other[sect_index].name = name; - section_addrs->other[sect_index].addr = address; - printf_unfiltered("\t%s_addr = %s\n", name, - local_hex_string(address)); - sect_index++; - *sect_indexp = sect_index; + do_cleanups(cleanup); } void kgdb_add_kld_cmd (char *arg, int from_tty) { - struct section_addr_info *section_addrs; - struct cleanup *cleanup; char path[PATH_MAX]; - asection *sect; CORE_ADDR base_addr; - bfd *bfd; - CORE_ADDR text_addr, data_addr, bss_addr, rodata_addr; - int sect_count, sect_index; + + /* Try to open the raw path to handle absolute paths first. */ + snprintf(path, sizeof(path), "%s", arg); + if (!check_kld_path(path, sizeof(path))) { - if (!find_kld_path(arg, path, sizeof(path))) { - error("unable to locate kld"); - return; + /* + * If that didn't work, look in the various possible + * paths for the module. + */ + if (!find_kld_path(arg, path, sizeof(path))) { + error("Unable to locate kld"); + return; + } } if (!find_kld_address(arg, &base_addr)) { - error("unable to find kld in kernel"); + error("Unable to find kld in kernel"); return; } - /* Open the kld and find the offsets of the various sections. */ - bfd = bfd_openr(path, gnutarget); - if (bfd == NULL) { - error("\"%s\": can't open: %s", path, - bfd_errmsg(bfd_get_error())); - return; + load_kld(path, base_addr, from_tty, 1); + + reinit_frame_cache(); +} + +static void +dummy_cleanup (void *arg) +{ +} + +static void +load_single_kld (CORE_ADDR kld) +{ + CORE_ADDR address; + char kldpath[PATH_MAX]; + char *path, *filename; + int errcode, path_ok; + + /* Try to read this linker file's filename. */ + target_read_string(read_pointer(kld + off_filename), &filename, + PATH_MAX, &errcode); + if (errcode) + error("Unable to read kld filename"); + + make_cleanup(xfree, filename); + path_ok = 0; + + /* Try to read this linker file's pathname. */ + if (off_pathname != 0) { + target_read_string(read_pointer(kld + off_pathname), &path, + PATH_MAX, &errcode); + if (errcode == 0) { + make_cleanup(xfree, path); + + /* + * If we have a pathname, try to load the kld + * from there. + */ + strlcpy(kldpath, path, sizeof(kldpath)); + if (check_kld_path(kldpath, sizeof(kldpath))) + path_ok = 1; + } } - cleanup = make_cleanup_bfd_close(bfd); + + /* + * If we didn't get a pathname from the linker file path, try + * to find this kld in the various search paths. + */ + if (!path_ok && !find_kld_path(filename, kldpath, sizeof(kldpath))) + error("Unable to find kld file for \"%s\".", filename); - if (!bfd_check_format(bfd, bfd_object)) { - do_cleanups(cleanup); - error("\%s\": not an object file", path); - return; - } + /* Read this kld's base address and add its symbols. */ + address = read_pointer(kld + off_address); + if (address == 0) + error("Invalid address for kld \"%s\"", filename); - data_addr = bss_addr = rodata_addr = 0; - sect = bfd_get_section_by_name (bfd, ".text"); - if (sect == NULL) { - do_cleanups(cleanup); - error("\"%s\": can't find text section", path); - return; - } - text_addr = bfd_get_section_vma(bfd, sect); - sect_count = 1; + load_kld(kldpath, address, 0, 0); - /* Save the offsets of relevant sections. */ - sect = bfd_get_section_by_name (bfd, ".data"); - if (sect != NULL) { - data_addr = bfd_get_section_vma(bfd, sect); - sect_count++; - } + printf_unfiltered("Loaded symbols for kld \"%s\" from \"%s\"\n", + filename, path); +} - sect = bfd_get_section_by_name (bfd, ".bss"); - if (sect != NULL) { - bss_addr = bfd_get_section_vma(bfd, sect); - sect_count++; - } +static int +load_kld_stub (void *arg) +{ + CORE_ADDR kld = *(CORE_ADDR *)arg; - sect = bfd_get_section_by_name (bfd, ".rodata"); - if (sect != NULL) { - rodata_addr = bfd_get_section_vma(bfd, sect); - sect_count++; - } + load_single_kld(kld); - do_cleanups(cleanup); + return (1); +} - printf_unfiltered("add symbol table from file \"%s\" at\n", path); +void +kgdb_auto_load_klds (void) +{ + struct cleanup *cleanup; + CORE_ADDR kld, kernel; + int loaded_kld; - /* Build a section table for symbol_file_add(). */ - section_addrs = alloc_section_addr_info(sect_count); - cleanup = make_cleanup(xfree, section_addrs); - sect_index = 0; - add_section(section_addrs, §_index, ".text", base_addr + text_addr); - if (data_addr != 0) - add_section(section_addrs, §_index, ".data", - base_addr + data_addr); - if (bss_addr != 0) - add_section(section_addrs, §_index, ".bss", - base_addr + bss_addr); - if (rodata_addr != 0) - add_section(section_addrs, §_index, ".rodata", - base_addr + rodata_addr); + /* Compute offsets of relevant members in struct linker_file. */ + off_address = kgdb_parse("&((struct linker_file *)0)->address"); + off_filename = kgdb_parse("&((struct linker_file *)0)->filename"); + off_pathname = kgdb_parse("&((struct linker_file *)0)->pathname"); + off_next = kgdb_parse("&((struct linker_file *)0)->link.tqe_next"); + if (off_address == 0 || off_filename == 0 || off_next == 0) + return; - symbol_file_add(path, from_tty, section_addrs, 0, OBJF_USERLOADED); + /* Walk the list of linker files auto-loading klds. */ + cleanup = make_cleanup(dummy_cleanup, NULL); + loaded_kld = 0; + kld = kgdb_parse("linker_files.tqh_first"); + kernel = kgdb_parse("linker_kernel_file"); + for (kld = kgdb_parse("linker_files.tqh_first"); kld != 0; + kld = read_pointer(kld + off_next)) { + /* Skip the main kernel file. */ + if (kld == kernel) + continue; - reinit_frame_cache(); + if (catch_errors(load_kld_stub, &kld, + "Error while reading kld symbols:\n", RETURN_MASK_ALL)) + loaded_kld = 1; + } do_cleanups(cleanup); + + if (loaded_kld) + reinit_frame_cache(); } ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kthr.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.9 2008/01/18 18:57:27 emaste Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.10 2008/01/28 20:33:19 jhb Exp $"); #include #include @@ -60,10 +60,8 @@ nl[0].n_name = (char *)(uintptr_t)sym; nl[1].n_name = NULL; - if (kvm_nlist(kvm, nl) != 0) { - warnx("kvm_nlist(%s): %s", sym, kvm_geterr(kvm)); + if (kvm_nlist(kvm, nl) != 0) return (0); - } return (nl[0].n_value); } @@ -82,13 +80,17 @@ uintptr_t addr, paddr; addr = kgdb_lookup("_allproc"); - if (addr == 0) + if (addr == 0) { + warnx("kvm_nlist(_allproc): %s", kvm_geterr(kvm)); return (NULL); + } kvm_read(kvm, addr, &paddr, sizeof(paddr)); dumppcb = kgdb_lookup("_dumppcb"); - if (dumppcb == 0) + if (dumppcb == 0) { + warnx("kvm_nlist(_dumppcb): %s", kvm_geterr(kvm)); return (NULL); + } addr = kgdb_lookup("_dumptid"); if (addr != 0) ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/main.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.12 2008/01/17 21:43:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.13 2008/01/28 20:31:30 jhb Exp $"); #include #include @@ -72,6 +72,7 @@ static char kvm_err[_POSIX2_LINE_MAX]; static int dumpnr; +static int quiet; static int verbose; static char crashdir[PATH_MAX]; @@ -239,6 +240,8 @@ * Display the unread portion of the message buffer. This gives the * user a some initial data to work from. */ + if (quiet) + return; bufp = kgdb_parse("msgbufp->msg_ptr"); size = (int)kgdb_parse("msgbufp->msg_size"); rseq = (int)kgdb_parse("msgbufp->msg_rseq"); @@ -302,7 +305,7 @@ struct stat st; struct captured_main_args args; char *s; - int a, ch, quiet, writecore; + int a, ch, writecore; dumpnr = -1; ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/trgt.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.7 2008/01/24 19:11:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.8 2008/01/28 21:40:10 jhb Exp $"); #include #include @@ -239,4 +239,5 @@ add_com ("add-kld", class_files, kgdb_add_kld_cmd, "Usage: add-kld FILE\n\ Load the symbols from the kernel loadable module FILE."); + kgdb_auto_load_klds(); } ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.7 2007/11/16 22:17:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.8 2008/01/28 20:33:19 jhb Exp $"); #include #include @@ -141,8 +141,10 @@ */ if (trunc_page(tss) == 0xffc00000) { addr = kgdb_lookup("_cpu0prvpage"); - if (addr == 0) + if (addr == 0) { + warnx("kvm_nlist(_cpu0prvpage): %s", kvm_geterr(kvm)); return (0); + } if (kvm_read(kvm, addr, &cpu0prvpage, sizeof(cpu0prvpage)) != sizeof(cpu0prvpage)) { warnx("kvm_read: %s", kvm_geterr(kvm)); ==== //depot/projects/toehead/lib/msun/src/s_exp2f.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2f.c,v 1.3 2008/01/19 21:37:14 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2f.c,v 1.4 2008/01/28 01:19:07 das Exp $"); #include @@ -93,12 +93,12 @@ exp2f(float x) { double tv; - float r, t, z; - uint32_t hx, hr, ix, i0; + float t, z; + uint32_t hx, htv, ix, i0; int32_t k; /* Filter out exceptional cases. */ - GET_FLOAT_WORD(hx,x); + GET_FLOAT_WORD(hx, x); ix = hx & 0x7fffffff; /* high word of |x| */ if(ix >= 0x43000000) { /* |x| >= 128 */ if(ix >= 0x7f800000) { @@ -119,25 +119,19 @@ STRICT_ASSIGN(float, t, x + redux); GET_FLOAT_WORD(i0, t); i0 += TBLSIZE / 2; - k = (i0 >> TBLBITS) << 23; + k = (i0 >> TBLBITS) << 20; i0 &= TBLSIZE - 1; t -= redux; z = x - t; /* Compute r = exp2(y) = exp2ft[i0] * p(z). */ tv = exp2ft[i0]; - r = tv + tv * (z * (P1 + z * (P2 + z * (P3 + z * P4)))); + tv = tv + tv * (z * (P1 + z * (P2 + z * (P3 + z * P4)))); - /* Scale by 2**(k>>23). */ - if(k >= -125 << 23) { - if (k != 0) { - GET_FLOAT_WORD(hr, r); - SET_FLOAT_WORD(r, hr + k); - } - return (r); - } else { - GET_FLOAT_WORD(hr, r); - SET_FLOAT_WORD(r, hr + (k + (100 << 23))); - return (r * twom100); + /* Scale by 2**(k>>20). */ + if (k != 0) { + GET_HIGH_WORD(htv, tv); + SET_HIGH_WORD(tv, htv + k); } + return (tv); } ==== //depot/projects/toehead/sbin/ffsinfo/ffsinfo.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ffsinfo/ffsinfo.c,v 1.13 2007/02/14 23:22:33 brian Exp $"; + "$FreeBSD: src/sbin/ffsinfo/ffsinfo.c,v 1.14 2008/01/29 00:20:00 delphij Exp $"; #endif /* not lint */ /* ********************************************************** INCLUDES ***** */ @@ -141,7 +141,7 @@ cfg_lv = 0xff; cfg_in = -2; cfg_cg = -2; - out_file = "-"; + out_file = strdup("-"); while ((ch = getopt(argc, argv, "g:i:l:o:")) != -1) { switch (ch) { ==== //depot/projects/toehead/share/man/man4/ath.4#2 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGES. .\" -.\" $FreeBSD: src/share/man/man4/ath.4,v 1.43 2007/07/01 10:25:06 thompsa Exp $ +.\" $FreeBSD: src/share/man/man4/ath.4,v 1.44 2008/01/28 18:08:40 brueffer Exp $ .\"/ .Dd December 7, 2006 .Dt ATH 4 @@ -256,7 +256,6 @@ .Xr an 4 , .Xr arp 4 , .Xr ath_hal 4 , -.Xr card 4 , .Xr netintro 4 , .Xr pcic 4 , .Xr wi 4 , ==== //depot/projects/toehead/share/man/man4/awi.4#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: awi.4,v 1.6 2000/03/22 11:24:33 onoe Exp $ -.\" $FreeBSD: src/share/man/man4/awi.4,v 1.23 2007/01/30 08:40:03 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/awi.4,v 1.24 2008/01/28 18:08:40 brueffer Exp $ .\" .Dd July 16, 2005 .Dt AWI 4 @@ -126,7 +126,6 @@ .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , -.Xr card 4 , .Xr cnw 4 , .Xr miibus 4 , .Xr netintro 4 , ==== //depot/projects/toehead/share/man/man4/ed.4#3 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ed.4,v 1.55 2008/01/01 21:41:39 imp Exp $ +.\" $FreeBSD: src/share/man/man4/ed.4,v 1.57 2008/01/29 00:13:20 trhodes Exp $ .\" -.Dd January 1, 2008 +.Dd January 27, 2008 .Dt ED 4 .Os .Sh NAME @@ -309,9 +309,6 @@ C-Bus, ISA, PCI and PC Card devices are supported. .Sh DIAGNOSTICS .Bl -diag -.It "ed%d: kernel configured irq %d doesn't match board configured irq %d." -The IRQ number that was specified in the kernel config file (and then compiled -into the kernel) differs from the IRQ that has been set on the interface card. .It "ed%d: failed to clear shared memory at %x - check configuration." When the card was probed at system boot time, the .Nm @@ -321,12 +318,14 @@ Ethernet card's shared memory. Either find the offending card and change its BIOS ROM to be at an address that does not conflict, or change the -.Cd iomem -option in the kernel config file so that the card's shared memory is mapped at a +settings in +.Xr device.hints 5 +that the card's shared memory is mapped at a non-conflicting address. .It "ed%d: Invalid irq configuration (%d) must be 2-5 for 3c503." -The IRQ number that was specified in the kernel config file is not valid for -the 3Com 3c503 card. +The IRQ number that was specified in the +.Xr device.hints 5 +file is not valid for the 3Com 3c503 card. The 3c503 can only be assigned to IRQs 2 through 5. .It "ed%d: Cannot find start of RAM." .It "ed%d: Cannot find any RAM, start : %d, x = %d." @@ -355,6 +354,14 @@ has failed to properly complete. Usually caused by the ISA bus speed being set too fast. +.It "ed%d: Invalid irq configuration (%ld) must be %s for %s" +Indicates the device has a different IRQ than supported or expected. +.It "ed%d: Cannot locate my ports!" +The device is using a different I/O port than the driver knows about. +.It "ed%d: Cannot extract MAC address" +Attempts to get the MAC address failed. +.It "ed%d: Missing mii!" +Probing for an MII bus has failed. .El .Sh CAVEATS Early revision DS8390 chips have problems. @@ -389,6 +396,7 @@ .Xr miibus 4 , .Xr netintro 4 , .Xr ng_ether 4 , +.Xr device.hints 5 , .Xr ifconfig 8 .Sh HISTORY The ==== //depot/projects/toehead/share/man/man4/man4.i386/snc.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/snc.4,v 1.5 2005/07/31 03:30:45 keramida Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/snc.4,v 1.6 2008/01/28 18:08:41 brueffer Exp $ .\" .Dd September 4, 2004 .Dt SNC 4 i386 @@ -113,7 +113,6 @@ invalid packet length. .El .Sh SEE ALSO -.Xr card 4 , .Xr netintro 4 , .Xr bus_alloc_resource_any 9 .Sh HISTORY ==== //depot/projects/toehead/share/man/man4/wi.4#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wi.4,v 1.73 2007/07/11 04:17:02 imp Exp $ +.\" $FreeBSD: src/share/man/man4/wi.4,v 1.74 2008/01/28 18:08:41 brueffer Exp $ .\" $OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $ .\" .Dd July 16, 2005 @@ -351,7 +351,6 @@ .Xr an 4 , .Xr arp 4 , .Xr ath 4 , -.Xr card 4 , .Xr netintro 4 , .Xr pccard 4 , .Xr pccbb 4 , @@ -420,9 +419,6 @@ This tells the PC Card system to use PCI interrupts for this odd beast. It is not possible to know automatically which kind of interrupts to use. OLDCARD devices -.Xr ( pcic 4 -and -.Xr card 4 ) support this device. NEWCARD devices .Xr ( pccbb 4 ==== //depot/projects/toehead/share/man/man5/rc.conf.5#4 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.333 2008/01/23 16:08:35 chinsan Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.334 2008/01/27 15:15:12 mtm Exp $ .\" -.Dd January 23, 2008 +.Dd January 27, 2008 .Dt RC.CONF 5 .Os .Sh NAME @@ -509,6 +509,16 @@ .It Va firewall_nat_flags >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 29 05:13:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0195E16A41A; Tue, 29 Jan 2008 05:13:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A212816A418 for ; Tue, 29 Jan 2008 05:13:16 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8965C13C455 for ; Tue, 29 Jan 2008 05:13:16 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0T5DG5F096522 for ; Tue, 29 Jan 2008 05:13:16 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0T5DG12096428 for perforce@freebsd.org; Tue, 29 Jan 2008 05:13:16 GMT (envelope-from scottl@freebsd.org) Date: Tue, 29 Jan 2008 05:13:16 GMT Message-Id: <200801290513.m0T5DG12096428@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 134353 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 05:13:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=134353 Change 134353 by scottl@scottl-deimos on 2008/01/29 05:12:42 Integrate from xen31 Affected files ... .. //depot/projects/xen31-xenbus/sys/conf/files.i386#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/i386/trap.c#3 integrate .. //depot/projects/xen31-xenbus/sys/i386/include/xen/xenpmap.h#3 integrate .. //depot/projects/xen31-xenbus/sys/i386/xen/pmap.c#6 integrate .. //depot/projects/xen31-xenbus/sys/vm/pmap.h#2 integrate .. //depot/projects/xen31-xenbus/sys/vm/vm_fault.c#2 integrate Differences ... ==== //depot/projects/xen31-xenbus/sys/conf/files.i386#2 (text+ko) ==== @@ -317,7 +317,7 @@ i386/i386/nexus.c standard i386/i386/perfmon.c optional perfmon i386/i386/pmap.c optional native -i386/xen/pmap.c optional xen nowerror +i386/xen/pmap.c optional xen i386/i386/ptrace_machdep.c standard i386/i386/stack_machdep.c optional ddb | stack i386/i386/support.s standard ==== //depot/projects/xen31-xenbus/sys/i386/i386/trap.c#3 (text+ko) ==== @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #ifdef KTRACE @@ -834,7 +835,7 @@ } #ifdef XEN if (rv == KERN_PROTECTION_FAILURE) - printf("SIGBUS: p=%s va=0x%x ftype=0x%x eip=0x%x\n", p->p_comm, va, ftype, frame->tf_eip); + log(LOG_ERR, "SIGBUS: p=%s va=0x%x ftype=0x%x eip=0x%x\n", p->p_comm, va, ftype, frame->tf_eip); #endif return((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV); ==== //depot/projects/xen31-xenbus/sys/i386/include/xen/xenpmap.h#3 (text+ko) ==== @@ -202,13 +202,17 @@ static __inline vm_paddr_t xpmap_mtop(vm_paddr_t mpa) { - return machtophys(mpa) | (mpa & PAGE_MASK); + vm_paddr_t tmp = (mpa & PG_FRAME); + + return machtophys(tmp) | (mpa & ~PG_FRAME); } static __inline vm_paddr_t xpmap_ptom(vm_paddr_t ppa) { - return phystomach(ppa) | (ppa & PAGE_MASK); + vm_paddr_t tmp = (ppa & PG_FRAME); + + return phystomach(tmp) | (ppa & ~PG_FRAME); } static __inline void ==== //depot/projects/xen31-xenbus/sys/i386/xen/pmap.c#6 (text+ko) ==== @@ -213,8 +213,10 @@ #ifdef PAE pt_entry_t pg_nx; +#if !defined(XEN) static uma_zone_t pdptzone; #endif +#endif /* * Data for the pv entry allocation mechanism @@ -270,7 +272,7 @@ static void free_pv_entry(pmap_t pmap, pv_entry_t pv); static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); -static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, +static vm_page_t pmap_enter_quick_locked(multicall_entry_t **mcl, int *count, pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva, vm_page_t *free); @@ -290,7 +292,9 @@ static void pmap_pte_release(pt_entry_t *pte); static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t *); static vm_offset_t pmap_kmem_choose(vm_offset_t addr); -#ifdef PAE +static boolean_t pmap_is_prefaultable_locked(pmap_t pmap, vm_offset_t addr); + +#if defined(PAE) && !defined(XEN) static void *pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); #endif @@ -583,7 +587,7 @@ TAILQ_INIT(&m->md.pv_list); } -#ifdef PAE +#if defined(PAE) && !defined(XEN) static MALLOC_DEFINE(M_PMAPPDPT, "pmap", "pmap pdpt"); @@ -677,7 +681,7 @@ if (pv_chunkbase == NULL) panic("pmap_init: not enough kvm for pv chunks"); pmap_ptelist_init(&pv_vafree, pv_chunkbase, pv_maxchunks); -#ifdef PAE +#if defined(PAE) && !defined(XEN) pdptzone = uma_zcreate("PDPT", NPGPTD * sizeof(pdpt_entry_t), NULL, NULL, NULL, NULL, (NPGPTD * sizeof(pdpt_entry_t)) - 1, UMA_ZONE_VM | UMA_ZONE_NOFREE); @@ -1217,24 +1221,49 @@ void pmap_qenter(vm_offset_t sva, vm_page_t *ma, int count) { - pt_entry_t *endpte, oldpte, *pte; - - oldpte = 0; + pt_entry_t *endpte, *pte; + vm_paddr_t pa; + vm_offset_t va = sva; + int mclcount = 0; + multicall_entry_t mcl[16]; + multicall_entry_t *mclp = mcl; + int error; + pte = vtopte(sva); endpte = pte + count; while (pte < endpte) { - oldpte |= *pte; - PT_SET_VA(pte, VM_PAGE_TO_PHYS(*ma) | pgeflag | PG_RW | PG_V, FALSE); + pa = xpmap_ptom(VM_PAGE_TO_PHYS(*ma)) | pgeflag | PG_RW | PG_V | PG_M | PG_A; + + mclp->op = __HYPERVISOR_update_va_mapping; + mclp->args[0] = va; + mclp->args[1] = (uint32_t)(pa & 0xffffffff); + mclp->args[2] = (uint32_t)(pa >> 32); + mclp->args[3] = (*pte & PG_V) ? UVMF_INVLPG|UVMF_ALL : 0; + + va += PAGE_SIZE; pte++; ma++; + mclp++; + mclcount++; + if (mclcount == 16) { + error = HYPERVISOR_multicall(mcl, mclcount); + mclp = mcl; + mclcount = 0; + KASSERT(error == 0, ("bad multicall %d", error)); + } + } + if (mclcount) { + error = HYPERVISOR_multicall(mcl, mclcount); + KASSERT(error == 0, ("bad multicall %d", error)); } - if ((oldpte & PG_V) != 0) - pmap_invalidate_range(kernel_pmap, sva, sva + count * - PAGE_SIZE); - else - PT_UPDATES_FLUSH(); + +#ifdef INVARIANTS + for (pte = vtopte(sva), mclcount = 0; mclcount < count; mclcount++, pte++) + KASSERT(*pte, ("pte not set for va=0x%x\n", sva + mclcount*PAGE_SIZE)); +#endif } + /* * This routine tears out page mappings from the * kernel -- it is meant only for temporary mappings. @@ -1692,37 +1721,40 @@ void pmap_release(pmap_t pmap) { - vm_page_t m, ptdpg[NPGPTD+1]; + vm_page_t m, ptdpg[2*NPGPTD+1]; vm_paddr_t ma; int i; +#ifdef XEN #ifdef PAE int npgptd = 2*NPGPTD + 1; #else int npgptd = 2*NPGPTD; #endif - +#else + int npgptd = NPGPTD; +#endif KASSERT(pmap->pm_stats.resident_count == 0, ("pmap_release: pmap resident count %ld != 0", pmap->pm_stats.resident_count)); + PT_UPDATES_FLUSH(); pmap_lazyfix(pmap); mtx_lock_spin(&allpmaps_lock); LIST_REMOVE(pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); +#ifdef XEN for (i = 0; i < NPGPTD; i++) ptdpg[i] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdir_shadow + (i*NPDEPG)) & PG_FRAME); + pmap_qremove((vm_offset_t)pmap->pm_pdir_shadow, NPGPTD); +#endif for (i = 0; i < NPGPTD; i++) ptdpg[NPGPTD + i] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdir + (i*NPDEPG)) & PG_FRAME); - -#ifdef PAE + pmap_qremove((vm_offset_t)pmap->pm_pdir, NPGPTD); +#if defined(PAE) && defined(XEN) ptdpg[2*NPGPTD] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdpt)); #endif - PT_UPDATES_FLUSH(); - pmap_qremove((vm_offset_t)pmap->pm_pdir, NPGPTD); - pmap_qremove((vm_offset_t)pmap->pm_pdir_shadow, NPGPTD); - for (i = 0; i < npgptd; i++) { m = ptdpg[i]; ma = xpmap_ptom(VM_PAGE_TO_PHYS(m)); @@ -2695,6 +2727,7 @@ *PMAP1 = 0; sched_unpin(); vm_page_unlock_queues(); + KASSERT(*vtopte(va), ("pte not set for va=0x%x\n", va)); PMAP_UNLOCK(pmap); } @@ -2716,18 +2749,33 @@ { vm_page_t m, mpte; vm_pindex_t diff, psize; - + multicall_entry_t mcl[16]; + multicall_entry_t *mclp = mcl; + int error, count = 0; + VM_OBJECT_LOCK_ASSERT(m_start->object, MA_OWNED); psize = atop(end - start); + mpte = NULL; m = m_start; PMAP_LOCK(pmap); while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { - mpte = pmap_enter_quick_locked(pmap, start + ptoa(diff), m, + mpte = pmap_enter_quick_locked(&mclp, &count, pmap, start + ptoa(diff), m, prot, mpte); m = TAILQ_NEXT(m, listq); + if (count == 16) { + error = HYPERVISOR_multicall(mcl, count); + KASSERT(error == 0, ("bad multicall %d", error)); + mclp = mcl; + count = 0; + } + } + if (count) { + error = HYPERVISOR_multicall(mcl, count); + KASSERT(error == 0, ("bad multicall %d", error)); } - PMAP_UNLOCK(pmap); + + PMAP_UNLOCK(pmap); } /* @@ -2742,20 +2790,54 @@ void pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { + multicall_entry_t mcl, *mclp; + int count = 0; + mclp = &mcl; + + PMAP_LOCK(pmap); + (void) pmap_enter_quick_locked(&mclp, &count, pmap, va, m, prot, NULL); + if (count) + HYPERVISOR_multicall(&mcl, count); + PMAP_UNLOCK(pmap); +} +void +pmap_enter_quick_range(pmap_t pmap, vm_offset_t *addrs, vm_page_t *pages, vm_prot_t *prots, int count) +{ + int i, error, index = 0; + multicall_entry_t mcl[16]; + multicall_entry_t *mclp = mcl; + PMAP_LOCK(pmap); - (void) pmap_enter_quick_locked(pmap, va, m, prot, NULL); + for (i = 0; i < count; i++, addrs++, pages++, prots++) { + if (!pmap_is_prefaultable_locked(pmap, *addrs)) + continue; + + (void) pmap_enter_quick_locked(&mclp, &index, pmap, *addrs, *pages, *prots, NULL); + if (index == 16) { + error = HYPERVISOR_multicall(mcl, index); + mclp = mcl; + index = 0; + KASSERT(error == 0, ("bad multicall %d", error)); + } + } + if (index) { + error = HYPERVISOR_multicall(mcl, index); + KASSERT(error == 0, ("bad multicall %d", error)); + } + PMAP_UNLOCK(pmap); } static vm_page_t -pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, +pmap_enter_quick_locked(multicall_entry_t **mclpp, int *count, pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte) { pt_entry_t *pte; vm_paddr_t pa; vm_page_t free; - + multicall_entry_t *mcl = *mclpp; + KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva || (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0, ("pmap_enter_quick_locked: managed mapping within the clean submap")); @@ -2845,6 +2927,7 @@ pa |= pg_nx; #endif +#if 0 /* * Now validate mapping with RO protection */ @@ -2852,6 +2935,23 @@ pte_store(pte, pa | PG_V | PG_U); else pte_store(pte, pa | PG_V | PG_U | PG_MANAGED); +#else + /* + * Now validate mapping with RO protection + */ + if (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) + pa = xpmap_ptom(pa | PG_V | PG_U); + else + pa = xpmap_ptom(pa | PG_V | PG_U | PG_MANAGED); + + mcl->op = __HYPERVISOR_update_va_mapping; + mcl->args[0] = va; + mcl->args[1] = (uint32_t)(pa & 0xffffffff); + mcl->args[2] = (uint32_t)(pa >> 32); + mcl->args[3] = 0; + *mclpp = mcl + 1; + *count = *count + 1; +#endif return mpte; } @@ -3058,7 +3158,11 @@ * accessed (referenced) bits * during the copy. */ +#if 0 PT_SET_VA_MA(dst_pte, ptetemp & ~(PG_W | PG_M | PG_A), FALSE); +#else + *dst_pte = ptetemp & ~(PG_W | PG_M | PG_A); +#endif dst_pmap->pm_stats.resident_count++; } else { free = NULL; @@ -3407,22 +3511,32 @@ * Return whether or not the specified virtual address is elgible * for prefault. */ -boolean_t -pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr) +static boolean_t +pmap_is_prefaultable_locked(pmap_t pmap, vm_offset_t addr) { pt_entry_t *pte; boolean_t rv = FALSE; - PMAP_LOCK(pmap); + return (rv); + if (*pmap_pde(pmap, addr)) { pte = vtopte(addr); - rv = *pte == 0; + rv = ((*pte & PG_V) == 0); } + return (rv); +} + +boolean_t +pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr) +{ + boolean_t rv; + + PMAP_LOCK(pmap); + rv = pmap_is_prefaultable_locked(pmap, addr); PMAP_UNLOCK(pmap); return (rv); } - void pmap_map_readonly(pmap_t pmap, vm_offset_t va, int len) { ==== //depot/projects/xen31-xenbus/sys/vm/pmap.h#2 (text+ko) ==== @@ -99,6 +99,8 @@ vm_prot_t, boolean_t); void pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot); +void pmap_enter_quick_range(pmap_t pmap, vm_offset_t *addrs, vm_page_t *m, + vm_prot_t *prot, int count); void pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, vm_page_t m_start, vm_prot_t prot); vm_paddr_t pmap_extract(pmap_t pmap, vm_offset_t va); ==== //depot/projects/xen31-xenbus/sys/vm/vm_fault.c#2 (text+ko) ==== @@ -932,12 +932,15 @@ static void vm_fault_prefault(pmap_t pmap, vm_offset_t addra, vm_map_entry_t entry) { - int i; + int i, count; vm_offset_t addr, starta; vm_pindex_t pindex; vm_page_t m; - vm_object_t object; - + vm_object_t object, lobject; + vm_prot_t prots[PAGEORDER_SIZE]; + vm_page_t pages[PAGEORDER_SIZE]; + vm_offset_t addrs[PAGEORDER_SIZE]; + if (pmap != vmspace_pmap(curthread->td_proc->p_vmspace)) return; @@ -949,10 +952,16 @@ } else if (starta > addra) { starta = 0; } - + + for (i = 0; i < PAGEORDER_SIZE; i++) + pages[i] = NULL; + count = 0; + lobject = object; + VM_OBJECT_LOCK(lobject); for (i = 0; i < PAGEORDER_SIZE; i++) { - vm_object_t backing_object, lobject; + vm_object_t backing_object; + addr = addra + prefault_pageorder[i]; if (addr > addra + (PFFOR * PAGE_SIZE)) addr = 0; @@ -964,35 +973,45 @@ continue; pindex = ((addr - entry->start) + entry->offset) >> PAGE_SHIFT; - lobject = object; - VM_OBJECT_LOCK(lobject); while ((m = vm_page_lookup(lobject, pindex)) == NULL && lobject->type == OBJT_DEFAULT && (backing_object = lobject->backing_object) != NULL) { if (lobject->backing_object_offset & PAGE_MASK) break; pindex += lobject->backing_object_offset >> PAGE_SHIFT; + + if (count) { + vm_page_lock_queues(); + pmap_enter_quick_range(pmap, addrs, pages, prots, count); + vm_page_unlock_queues(); + } + count = 0; VM_OBJECT_LOCK(backing_object); VM_OBJECT_UNLOCK(lobject); lobject = backing_object; + } /* * give-up when a page is not in memory */ - if (m == NULL) { - VM_OBJECT_UNLOCK(lobject); + if (m == NULL) break; - } + if (((m->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL) && (m->busy == 0) && (m->flags & PG_FICTITIOUS) == 0) { - - vm_page_lock_queues(); - pmap_enter_quick(pmap, addr, m, entry->protection); - vm_page_unlock_queues(); + pages[count] = m; + prots[count] = entry->protection; + addrs[count] = addr; + count++; } - VM_OBJECT_UNLOCK(lobject); + } + if (count) { + vm_page_lock_queues(); + pmap_enter_quick_range(pmap, addrs, pages, prots, count); + vm_page_unlock_queues(); } + VM_OBJECT_UNLOCK(lobject); } /* From owner-p4-projects@FreeBSD.ORG Tue Jan 29 05:15:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37CC416A419; Tue, 29 Jan 2008 05:15:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D939D16A418 for ; Tue, 29 Jan 2008 05:15:18 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C685113C46E for ; Tue, 29 Jan 2008 05:15:18 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0T5FIH4097286 for ; Tue, 29 Jan 2008 05:15:18 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0T5FIH1097283 for perforce@freebsd.org; Tue, 29 Jan 2008 05:15:18 GMT (envelope-from scottl@freebsd.org) Date: Tue, 29 Jan 2008 05:15:18 GMT Message-Id: <200801290515.m0T5FIH1097283@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 134354 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 05:15:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=134354 Change 134354 by scottl@scottl-deimos on 2008/01/29 05:14:25 Remove sys/i386/xen_bus.c; it's functionality is MI, and most of the work that it needs to do is already being done in xenbus_probe.c Affected files ... .. //depot/projects/xen31-xenbus/sys/conf/files.i386#3 edit .. //depot/projects/xen31-xenbus/sys/i386/xen/xen_bus.c#2 delete Differences ... ==== //depot/projects/xen31-xenbus/sys/conf/files.i386#3 (text+ko) ==== @@ -328,7 +328,6 @@ i386/i386/uio_machdep.c standard i386/i386/vm86.c standard i386/i386/vm_machdep.c standard -i386/xen/xen_bus.c optional xen i386/ibcs2/ibcs2_errno.c optional ibcs2 i386/ibcs2/ibcs2_fcntl.c optional ibcs2 i386/ibcs2/ibcs2_ioctl.c optional ibcs2 From owner-p4-projects@FreeBSD.ORG Tue Jan 29 05:18:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC46316A421; Tue, 29 Jan 2008 05:18:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6859516A41A for ; Tue, 29 Jan 2008 05:18:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5396513C469 for ; Tue, 29 Jan 2008 05:18:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0T5IMtw097379 for ; Tue, 29 Jan 2008 05:18:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0T5IMn1097376 for perforce@freebsd.org; Tue, 29 Jan 2008 05:18:22 GMT (envelope-from jb@freebsd.org) Date: Tue, 29 Jan 2008 05:18:22 GMT Message-Id: <200801290518.m0T5IMn1097376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134355 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 05:18:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=134355 Change 134355 by jb@jb_freebsd1 on 2008/01/29 05:18:15 IF7 Affected files ... .. //depot/projects/dtrace7/src/etc/Makefile#2 integrate .. //depot/projects/dtrace7/src/etc/defaults/rc.conf#3 integrate .. //depot/projects/dtrace7/src/etc/periodic/security/100.chksetuid#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/DAEMON#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/LOGIN#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/Makefile#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/SERVERS#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/accounting#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/amd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/apmd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/bootconf.sh#2 delete .. //depot/projects/dtrace7/src/etc/rc.d/bootparams#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ccd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/cron#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/dhclient#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/dmesg#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/fsck#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ftp-proxy#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/inetd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ipfilter#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ipfs#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ipmon#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ipnat#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ipsec#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/isdnd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/jail#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/kerberos#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/keyserv#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ldconfig#3 integrate .. //depot/projects/dtrace7/src/etc/rc.d/local#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/lockd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/lpd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/motd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/mountd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/moused#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/mrouted#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/newsyslog#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/nfsd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/nfslocking#2 delete .. //depot/projects/dtrace7/src/etc/rc.d/power_profile#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/pwcheck#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/quota#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/rarpd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/resolv#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/root#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/route6d#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/routed#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/rpcbind#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/rtadvd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/rwho#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/savecore#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/securelevel#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/sendmail#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/sshd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/statd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/swap1#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/sysctl#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/syslogd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/timed#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/tmp#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ugidfw#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/var#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/virecover#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ypbind#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/yppasswdd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ypserv#2 integrate .. //depot/projects/dtrace7/src/lib/Makefile#5 integrate .. //depot/projects/dtrace7/src/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/dtrace7/src/sbin/route/route.c#2 integrate .. //depot/projects/dtrace7/src/share/man/man5/src.conf.5#3 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.own.mk#4 integrate .. //depot/projects/dtrace7/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/dtrace7/src/sys/sys/event.h#2 integrate .. //depot/projects/dtrace7/src/tools/build/options/WITHOUT_GSSAPI#1 branch .. //depot/projects/dtrace7/src/tools/build/options/makeman#2 integrate Differences ... ==== //depot/projects/dtrace7/src/etc/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.360.2.2 2007/11/11 02:16:00 mlaier Exp $ +# $FreeBSD: src/etc/Makefile,v 1.360.2.3 2008/01/29 00:18:07 dougb Exp $ .include @@ -78,12 +78,12 @@ afterinstall: .if ${MK_MAN} != "no" - cd ${.CURDIR}/../share/man; ${MAKE} makedb + ${_+_}cd ${.CURDIR}/../share/man; ${MAKE} makedb .endif distribute: - cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION} - cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} + ${_+_}cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION} + ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} .include .if ${TARGET_ENDIANNESS} == "1234" @@ -112,15 +112,15 @@ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \ pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \ ${DESTDIR}/etc/master.passwd - cd ${.CURDIR}/bluetooth; ${MAKE} install - cd ${.CURDIR}/defaults; ${MAKE} install - cd ${.CURDIR}/gss; ${MAKE} install - cd ${.CURDIR}/periodic; ${MAKE} install - cd ${.CURDIR}/rc.d; ${MAKE} install - cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall - cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap - cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt - cd ${.CURDIR}/pam.d; ${MAKE} install + ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install + ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install + ${_+_}cd ${.CURDIR}/gss; ${MAKE} install + ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install + ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install + ${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall + ${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap + ${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt + ${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \ ${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR} cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0600 \ @@ -128,7 +128,7 @@ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \ ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR} .if ${MK_I4B} != "no" - cd ${.CURDIR}/isdn; ${MAKE} install + ${_+_}cd ${.CURDIR}/isdn; ${MAKE} install .endif .if ${MK_BIND_MTREE} != "no" @if [ ! -e ${DESTDIR}/etc/namedb ]; then \ @@ -137,10 +137,10 @@ fi .endif .if ${MK_BIND_ETC} != "no" - cd ${.CURDIR}/namedb; ${MAKE} install + ${_+_}cd ${.CURDIR}/namedb; ${MAKE} install .endif .if ${MK_SENDMAIL} != "no" - cd ${.CURDIR}/sendmail; ${MAKE} distribution + ${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution .endif .if ${MK_OPENSSH} != "no" cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ @@ -239,7 +239,7 @@ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${BIN1} ${BIN2} nsmb.conf opieaccess \ ${DESTDIR}/usr/share/examples/etc - cd ${.CURDIR}/defaults; ${MAKE} install \ + ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \ DESTDIR=${DESTDIR}/usr/share/examples .include ==== //depot/projects/dtrace7/src/etc/defaults/rc.conf#3 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.318.2.2 2008/01/19 17:18:16 maxim Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.318.2.3 2008/01/28 18:52:00 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -236,7 +236,7 @@ # kerberos5_server_enable="NO" # Run a kerberos 5 master server (or NO). kerberos5_server="/usr/libexec/kdc" # path to kerberos 5 KDC -kerberos5_server_flags="" # Additional flags to the kerberos 5 server +kerberos5_server_flags="--detach" # Additional flags to the kerberos 5 server kadmind5_server_enable="NO" # Run kadmind (or NO) kadmind5_server="/usr/libexec/kadmind" # path to kerberos 5 admin daemon kpasswdd_server_enable="NO" # Run kpasswdd (or NO) ==== //depot/projects/dtrace7/src/etc/periodic/security/100.chksetuid#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.8 2005/01/13 15:07:35 glebius Exp $ +# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.8.10.1 2008/01/29 00:18:07 dougb Exp $ # # If there is a global system configuration file, suck it in. @@ -44,7 +44,7 @@ echo "" echo 'Checking setuid files and devices:' # XXX Note that there is the possibility of overrunning the args to ls - MP=`mount -t ufs | egrep -v " no(suid|exec)" | awk '{ print $3 }' | sort` + MP=`mount -t ufs,zfs | egrep -v " no(suid|exec)" | awk '{ print $3 }' | sort` if [ -n "${MP}" ] then set ${MP} ==== //depot/projects/dtrace7/src/etc/rc.d/DAEMON#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: DAEMON,v 1.8 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/DAEMON,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/DAEMON,v 1.5.10.1 2008/01/28 07:55:43 dougb Exp $ # # PROVIDE: DAEMON ==== //depot/projects/dtrace7/src/etc/rc.d/LOGIN#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: LOGIN,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/LOGIN,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/LOGIN,v 1.5.10.1 2008/01/28 07:55:43 dougb Exp $ # # PROVIDE: LOGIN ==== //depot/projects/dtrace7/src/etc/rc.d/Makefile#2 (text+ko) ==== @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.84 2007/09/28 10:38:08 bushman Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.84.2.2 2008/01/29 00:18:08 dougb Exp $ .include @@ -25,7 +24,7 @@ mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 newsyslog nfsclient nfsd \ - nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ + nfsserver nisdomain nsswitch ntpd ntpdate \ othermta \ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ ==== //depot/projects/dtrace7/src/etc/rc.d/NETWORKING#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.13 2007/06/02 05:25:19 dougb Exp $ +# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.13.2.1 2008/01/28 07:55:43 dougb Exp $ # # PROVIDE: NETWORKING NETWORK ==== //depot/projects/dtrace7/src/etc/rc.d/SERVERS#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: SERVERS,v 1.9 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/SERVERS,v 1.7 2006/04/19 05:10:34 delphij Exp $ +# $FreeBSD: src/etc/rc.d/SERVERS,v 1.7.2.1 2008/01/28 07:55:43 dougb Exp $ # # PROVIDE: SERVERS ==== //depot/projects/dtrace7/src/etc/rc.d/accounting#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/accounting,v 1.10 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/accounting,v 1.10.2.1 2008/01/28 07:55:43 dougb Exp $ # # PROVIDE: accounting ==== //depot/projects/dtrace7/src/etc/rc.d/amd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.18.2.1 2007/10/28 20:07:29 mtm Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.18.2.2 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: amd ==== //depot/projects/dtrace7/src/etc/rc.d/apmd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.12 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.12.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: apmd ==== //depot/projects/dtrace7/src/etc/rc.d/bootparams#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: bootparams,v 1.6 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/bootparams,v 1.7 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/bootparams,v 1.7.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: bootparams ==== //depot/projects/dtrace7/src/etc/rc.d/ccd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ccd,v 1.3 2000/05/13 08:45:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ccd,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ccd,v 1.5.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: disks ==== //depot/projects/dtrace7/src/etc/rc.d/cron#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.7 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.7.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: cron ==== //depot/projects/dtrace7/src/etc/rc.d/dhclient#2 (text+ko) ==== @@ -1,12 +1,10 @@ #!/bin/sh # -# $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.28 2007/03/25 19:45:20 mtm Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.28.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: dhclient # KEYWORD: nojail nostart -# . /etc/rc.subr . /etc/network.subr ==== //depot/projects/dtrace7/src/etc/rc.d/dmesg#2 (text+ko) ==== @@ -1,13 +1,12 @@ #!/bin/sh # -# $NetBSD: dmesg,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dmesg,v 1.5 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/dmesg,v 1.5.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: dmesg # REQUIRE: mountcritremote cleanvar # BEFORE: DAEMON -# KEYWORD: Daemon nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/dtrace7/src/etc/rc.d/fsck#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: fsck,v 1.2 2001/06/18 06:42:35 lukem Exp $ -# $FreeBSD: src/etc/rc.d/fsck,v 1.11 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/fsck,v 1.11.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: fsck ==== //depot/projects/dtrace7/src/etc/rc.d/ftp-proxy#2 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ftp-proxy,v 1.1 2007/09/06 21:00:48 mlaier Exp $ +# $FreeBSD: src/etc/rc.d/ftp-proxy,v 1.1.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: ftp-proxy # REQUIRE: DAEMON pf -# . /etc/rc.subr ==== //depot/projects/dtrace7/src/etc/rc.d/inetd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: inetd,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/inetd,v 1.5 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/inetd,v 1.5.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: inetd ==== //depot/projects/dtrace7/src/etc/rc.d/ipfilter#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.28 2007/04/09 08:53:40 des Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.28.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: ipfilter ==== //depot/projects/dtrace7/src/etc/rc.d/ipfs#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipfs,v 1.3 2002/02/11 13:55:42 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfs,v 1.6 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfs,v 1.6.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: ipfs ==== //depot/projects/dtrace7/src/etc/rc.d/ipmon#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipmon,v 1.9 2002/04/18 05:02:01 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipmon,v 1.15 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/ipmon,v 1.15.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: ipmon ==== //depot/projects/dtrace7/src/etc/rc.d/ipnat#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipnat,v 1.15 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/ipnat,v 1.15.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: ipnat ==== //depot/projects/dtrace7/src/etc/rc.d/ipsec#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ipsec,v 1.19 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipsec,v 1.19.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: ipsec ==== //depot/projects/dtrace7/src/etc/rc.d/isdnd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: isdnd,v 1.9 2002/04/10 23:37:13 martin Exp $ -# $FreeBSD: src/etc/rc.d/isdnd,v 1.23 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/isdnd,v 1.23.2.1 2008/01/28 07:55:44 dougb Exp $ # # Mostly based on original script (/etc/rc.isdn) written by Hellmuth Michaelis # ==== //depot/projects/dtrace7/src/etc/rc.d/jail#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.37 2007/05/24 06:01:06 rse Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.37.2.1 2008/01/29 00:18:08 dougb Exp $ # # PROVIDE: jail @@ -8,6 +8,12 @@ # BEFORE: securelevel # KEYWORD: nojail shutdown +# WARNING: This script deals with untrusted data (the data and +# processes inside the jails) and care must be taken when changing the +# code related to this! If you have any doubt whether a change is +# correct and have security impact, please get the patch reviewed by +# the FreeBSD Security Team prior to commit. + . /etc/rc.subr name="jail" ==== //depot/projects/dtrace7/src/etc/rc.d/kerberos#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/kerberos,v 1.6 2007/05/17 11:33:08 mtm Exp $ +# $FreeBSD: src/etc/rc.d/kerberos,v 1.6.2.2 2008/01/28 23:36:54 mtm Exp $ # # PROVIDE: kerberos @@ -10,8 +10,8 @@ name="kerberos5" rcvar="kerberos5_server_enable" -command_args="--detach" load_rc_config $name command="${kerberos5_server}" +kerberos5_flags="${kerberos5_server_flags}" run_rc_command "$1" ==== //depot/projects/dtrace7/src/etc/rc.d/keyserv#2 (text+ko) ==== @@ -1,10 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/keyserv,v 1.3 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/keyserv,v 1.3.10.1 2008/01/28 07:55:44 dougb Exp $ # # Start keyserv if we are running Secure RPC -# # PROVIDE: keyserv # REQUIRE: ypbind ==== //depot/projects/dtrace7/src/etc/rc.d/ldconfig#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.17.2.1 2007/12/18 01:34:09 jhb Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.17.2.2 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: ldconfig ==== //depot/projects/dtrace7/src/etc/rc.d/local#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: local,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/local,v 1.6 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/local,v 1.6.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: local ==== //depot/projects/dtrace7/src/etc/rc.d/lockd#2 (text+ko) ==== @@ -1,8 +1,7 @@ #!/bin/sh # -# $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $ # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm -# $FreeBSD: src/etc/rc.d/lockd,v 1.18 2007/09/03 02:02:31 mtm Exp $ +# $FreeBSD: src/etc/rc.d/lockd,v 1.18.4.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: lockd ==== //depot/projects/dtrace7/src/etc/rc.d/lpd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: lpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/lpd,v 1.8 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/lpd,v 1.8.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: lpd ==== //depot/projects/dtrace7/src/etc/rc.d/motd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: motd,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/motd,v 1.9 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/motd,v 1.9.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: motd ==== //depot/projects/dtrace7/src/etc/rc.d/mountcritlocal#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.14 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.14.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: mountcritlocal ==== //depot/projects/dtrace7/src/etc/rc.d/mountcritremote#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mountcritremote,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.16 2007/04/09 08:53:40 des Exp $ +# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.16.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: mountcritremote ==== //depot/projects/dtrace7/src/etc/rc.d/mountd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mountd,v 1.11 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountd,v 1.19 2007/04/13 10:29:25 pjd Exp $ +# $FreeBSD: src/etc/rc.d/mountd,v 1.19.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: mountd ==== //depot/projects/dtrace7/src/etc/rc.d/moused#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: moused,v 1.1 2001/10/29 23:25:01 augustss Exp $ -# $FreeBSD: src/etc/rc.d/moused,v 1.11 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/moused,v 1.11.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: moused ==== //depot/projects/dtrace7/src/etc/rc.d/mrouted#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mrouted,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/mrouted,v 1.10 2006/09/29 15:45:10 bms Exp $ +# $FreeBSD: src/etc/rc.d/mrouted,v 1.10.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: mrouted ==== //depot/projects/dtrace7/src/etc/rc.d/newsyslog#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: newsyslog,v 1.5 2002/03/24 15:51:26 lukem Exp $ -# $FreeBSD: src/etc/rc.d/newsyslog,v 1.5 2005/12/21 09:54:15 dougb Exp $ +# $FreeBSD: src/etc/rc.d/newsyslog,v 1.5.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: newsyslog ==== //depot/projects/dtrace7/src/etc/rc.d/nfsd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: nfsd,v 1.4 2001/06/16 06:13:10 lukem Exp $ -# $FreeBSD: src/etc/rc.d/nfsd,v 1.13 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/nfsd,v 1.13.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: nfsd ==== //depot/projects/dtrace7/src/etc/rc.d/power_profile#2 (text+ko) ==== @@ -5,7 +5,7 @@ # # Arguments: 0x00 (AC offline, economy) or 0x01 (AC online, performance) # -# $FreeBSD: src/etc/rc.d/power_profile,v 1.11 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/power_profile,v 1.11.2.1 2008/01/29 00:18:08 dougb Exp $ # # PROVIDE: power_profile @@ -15,6 +15,7 @@ . /etc/rc.subr name="power_profile" +stop_cmd=':' LOGGER="logger -t power_profile -p daemon.notice" # Set a given sysctl node to a value. ==== //depot/projects/dtrace7/src/etc/rc.d/pwcheck#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: pwcheck,v 1.4 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/pwcheck,v 1.4 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/pwcheck,v 1.4.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: pwcheck ==== //depot/projects/dtrace7/src/etc/rc.d/quota#2 (text+ko) ==== @@ -1,10 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/quota,v 1.6 2007/01/20 04:24:20 mpp Exp $ +# $FreeBSD: src/etc/rc.d/quota,v 1.6.2.1 2008/01/28 07:55:44 dougb Exp $ # # Enable/Check the quotas (must be after ypbind if using NIS) -# # PROVIDE: quota # REQUIRE: mountcritremote ==== //depot/projects/dtrace7/src/etc/rc.d/rarpd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rarpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/rarpd,v 1.6 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/rarpd,v 1.6.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: rarpd ==== //depot/projects/dtrace7/src/etc/rc.d/resolv#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/resolv,v 1.37 2007/06/02 05:24:39 dougb Exp $ +# $FreeBSD: src/etc/rc.d/resolv,v 1.37.2.1 2008/01/29 00:18:08 dougb Exp $ # # PROVIDE: resolv @@ -34,6 +34,7 @@ . /etc/rc.subr name="resolv" +stop_cmd=':' load_rc_config $name ==== //depot/projects/dtrace7/src/etc/rc.d/root#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: root,v 1.2 2000/05/13 08:45:09 lukem Exp $ -# $FreeBSD: src/etc/rc.d/root,v 1.15 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.15.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: root ==== //depot/projects/dtrace7/src/etc/rc.d/route6d#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: route6d,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/route6d,v 1.9 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/route6d,v 1.9.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: route6d ==== //depot/projects/dtrace7/src/etc/rc.d/routed#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: routed,v 1.7 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/routed,v 1.12 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/routed,v 1.12.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: routed ==== //depot/projects/dtrace7/src/etc/rc.d/rpcbind#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rpcbind,v 1.6 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/rpcbind,v 1.12 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/rpcbind,v 1.12.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: rpcbind ==== //depot/projects/dtrace7/src/etc/rc.d/rtadvd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rtadvd,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/rtadvd,v 1.10 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/rtadvd,v 1.10.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: rtadvd ==== //depot/projects/dtrace7/src/etc/rc.d/rwho#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rwho,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/rwho,v 1.4 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/rwho,v 1.4.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: rwho ==== //depot/projects/dtrace7/src/etc/rc.d/savecore#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: savecore,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/savecore,v 1.10 2004/10/24 13:04:09 des Exp $ +# $FreeBSD: src/etc/rc.d/savecore,v 1.10.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: savecore ==== //depot/projects/dtrace7/src/etc/rc.d/securelevel#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: securelevel,v 1.4 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/securelevel,v 1.10 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/securelevel,v 1.10.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: securelevel ==== //depot/projects/dtrace7/src/etc/rc.d/sendmail#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: sendmail,v 1.14 2002/02/12 01:26:36 lukem Exp $ -# $FreeBSD: src/etc/rc.d/sendmail,v 1.17 2007/06/12 17:33:23 gshapiro Exp $ +# $FreeBSD: src/etc/rc.d/sendmail,v 1.17.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: mail @@ -11,7 +10,7 @@ # XXX - Get together with sendmail mantainer to figure out how to # better handle SENDMAIL_ENABLE and 3rd party MTAs. -# + . /etc/rc.subr name="sendmail" ==== //depot/projects/dtrace7/src/etc/rc.d/sshd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: sshd,v 1.18 2002/04/29 08:23:34 lukem Exp $ -# $FreeBSD: src/etc/rc.d/sshd,v 1.12 2006/08/22 11:17:28 flz Exp $ +# $FreeBSD: src/etc/rc.d/sshd,v 1.12.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: sshd ==== //depot/projects/dtrace7/src/etc/rc.d/statd#2 (text+ko) ==== @@ -1,8 +1,7 @@ #!/bin/sh # -# $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $ # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm Exp -# $FreeBSD: src/etc/rc.d/statd,v 1.17 2007/08/18 04:08:53 mtm Exp $ +# $FreeBSD: src/etc/rc.d/statd,v 1.17.4.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: statd ==== //depot/projects/dtrace7/src/etc/rc.d/swap1#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $ -# $FreeBSD: src/etc/rc.d/swap1,v 1.9 2004/11/05 12:38:27 pjd Exp $ +# $FreeBSD: src/etc/rc.d/swap1,v 1.9.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: localswap ==== //depot/projects/dtrace7/src/etc/rc.d/sysctl#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: sysctl,v 1.12 2002/04/29 12:10:23 lukem Exp $ -# $FreeBSD: src/etc/rc.d/sysctl,v 1.17 2006/05/24 11:36:48 glebius Exp $ +# $FreeBSD: src/etc/rc.d/sysctl,v 1.17.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: sysctl ==== //depot/projects/dtrace7/src/etc/rc.d/syslogd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: syslogd,v 1.12 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/syslogd,v 1.12 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/syslogd,v 1.12.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: syslogd ==== //depot/projects/dtrace7/src/etc/rc.d/timed#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: timed,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/timed,v 1.5 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/timed,v 1.5.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: timed ==== //depot/projects/dtrace7/src/etc/rc.d/tmp#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/tmp,v 1.38 2007/05/24 05:54:37 rse Exp $ +# $FreeBSD: src/etc/rc.d/tmp,v 1.38.2.1 2008/01/29 00:18:08 dougb Exp $ # # PROVIDE: tmp @@ -33,6 +33,7 @@ . /etc/rc.subr name="tmp" +stop_cmd=':' load_rc_config $name ==== //depot/projects/dtrace7/src/etc/rc.d/ugidfw#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 29 05:59:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEBCE16A420; Tue, 29 Jan 2008 05:59:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A449B16A41A for ; Tue, 29 Jan 2008 05:59:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 91D4113C459 for ; Tue, 29 Jan 2008 05:59:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0T5x9pN098869 for ; Tue, 29 Jan 2008 05:59:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0T5x91h098866 for perforce@freebsd.org; Tue, 29 Jan 2008 05:59:09 GMT (envelope-from jb@freebsd.org) Date: Tue, 29 Jan 2008 05:59:09 GMT Message-Id: <200801290559.m0T5x91h098866@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134356 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 05:59:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=134356 Change 134356 by jb@jb_freebsd1 on 2008/01/29 05:58:16 Reset to match the dtrace project. Affected files ... .. //depot/projects/dtrace7/src/share/mk/bsd.lib.mk#4 edit .. //depot/projects/dtrace7/src/share/mk/sys.mk#6 edit Differences ... ==== //depot/projects/dtrace7/src/share/mk/bsd.lib.mk#4 (text+ko) ==== @@ -76,15 +76,9 @@ .cc.po .C.po .cpp.po .cxx.po: ${CXX} ${PO_FLAG} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} -.if defined(CTFCONVERT) - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} -.endif .cc.So .C.So .cpp.So .cxx.So: ${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} -.if defined(CTFCONVERT) - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} -.endif .f.po: ${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} ==== //depot/projects/dtrace7/src/share/mk/sys.mk#6 (text+ko) ==== @@ -45,10 +45,6 @@ .endif .endif -.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "sparc64" -NO_CTF= 1 -.endif - # C Type Format data is required for DTrace CTFFLAGS ?= -L VERSION @@ -234,15 +230,9 @@ .cc .cpp .cxx .C: ${CXX} ${CXXFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} -.if defined(CTFCONVERT) - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} -.endif .cc.o .cpp.o .cxx.o .C.o: ${CXX} ${CXXFLAGS} -c ${.IMPSRC} -.if defined(CTFCONVERT) - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} -.endif .m.o: ${OBJC} ${OBJCFLAGS} -c ${.IMPSRC} From owner-p4-projects@FreeBSD.ORG Tue Jan 29 06:14:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14F4616A420; Tue, 29 Jan 2008 06:14:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD69A16A418 for ; Tue, 29 Jan 2008 06:14:26 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A2B6713C45A for ; Tue, 29 Jan 2008 06:14:26 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0T6EQHj001709 for ; Tue, 29 Jan 2008 06:14:26 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0T6EQP1001706 for perforce@freebsd.org; Tue, 29 Jan 2008 06:14:26 GMT (envelope-from scottl@freebsd.org) Date: Tue, 29 Jan 2008 06:14:26 GMT Message-Id: <200801290614.m0T6EQP1001706@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 134358 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 06:14:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=134358 Change 134358 by scottl@scottl-deimos on 2008/01/29 06:13:41 Probe xenhub child before attaching them. Affected files ... .. //depot/projects/xen31-xenbus/sys/xen/xenbus/xenbus_probe.c#6 edit Differences ... ==== //depot/projects/xen31-xenbus/sys/xen/xenbus/xenbus_probe.c#6 (text+ko) ==== @@ -1078,6 +1078,7 @@ device_set_ivars(child, &xenbus_backend); #endif + bus_generic_probe(dev); bus_generic_attach(dev); } From owner-p4-projects@FreeBSD.ORG Tue Jan 29 06:14:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60E8616A526; Tue, 29 Jan 2008 06:14:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 005BC16A419 for ; Tue, 29 Jan 2008 06:14:26 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CA73913C468 for ; Tue, 29 Jan 2008 06:14:26 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0T6EQqr001715 for ; Tue, 29 Jan 2008 06:14:26 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0T6EQiN001712 for perforce@freebsd.org; Tue, 29 Jan 2008 06:14:26 GMT (envelope-from scottl@freebsd.org) Date: Tue, 29 Jan 2008 06:14:26 GMT Message-Id: <200801290614.m0T6EQiN001712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 134359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 06:14:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=134359 Change 134359 by scottl@scottl-deimos on 2008/01/29 06:14:17 Parent the xc device on xenhub Affected files ... .. //depot/projects/xen31-xenbus/sys/dev/xen/console/console.c#4 edit Differences ... ==== //depot/projects/xen31-xenbus/sys/dev/xen/console/console.c#4 (text+ko) ==== @@ -552,7 +552,7 @@ } } -DRIVER_MODULE(xc, nexus, xc_driver, xc_devclass, 0, 0); +DRIVER_MODULE(xc, xenhub, xc_driver, xc_devclass, 0, 0); /* * Local variables: * mode: C From owner-p4-projects@FreeBSD.ORG Tue Jan 29 07:58:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19A0416A420; Tue, 29 Jan 2008 07:58:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB1FA16A417 for ; Tue, 29 Jan 2008 07:58:18 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AA23B13C4D1 for ; Tue, 29 Jan 2008 07:58:18 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0T7wI0s007817 for ; Tue, 29 Jan 2008 07:58:18 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0T7wIYb007814 for perforce@freebsd.org; Tue, 29 Jan 2008 07:58:18 GMT (envelope-from imp@freebsd.org) Date: Tue, 29 Jan 2008 07:58:18 GMT Message-Id: <200801290758.m0T7wIYb007814@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134360 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 07:58:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=134360 Change 134360 by imp@imp_lighthouse on 2008/01/29 07:57:53 Only relevant for LOCORE. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/regdef.h#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/regdef.h#3 (text+ko) ==== @@ -12,6 +12,7 @@ #ifndef _MACHINE_REGDEF_H_ #define _MACHINE_REGDEF_H_ +#if defined(_LOCORE) /* General purpose CPU register names */ #define zero $0 /* wired zero */ #define AT $at /* assembler temp */ @@ -47,6 +48,6 @@ #define s8 $30 /* callee saved */ #define ra $31 /* return address */ +#endif /* _LOCORE */ + #endif /* !_MACHINE_REGDEF_H_ */ - -/* end of file */ From owner-p4-projects@FreeBSD.ORG Tue Jan 29 08:19:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A27F816A420; Tue, 29 Jan 2008 08:19:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6869516A41A for ; Tue, 29 Jan 2008 08:19:42 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3EB9A13C4D1 for ; Tue, 29 Jan 2008 08:19:42 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0T8Jgtl010587 for ; Tue, 29 Jan 2008 08:19:42 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0T8JgQn010584 for perforce@freebsd.org; Tue, 29 Jan 2008 08:19:42 GMT (envelope-from imp@freebsd.org) Date: Tue, 29 Jan 2008 08:19:42 GMT Message-Id: <200801290819.m0T8JgQn010584@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134361 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 08:19:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=134361 Change 134361 by imp@imp_lighthouse on 2008/01/29 08:18:48 Register definitions Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpu.h#9 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/cpu.h#9 (text+ko) ==== @@ -151,6 +151,12 @@ #define CR_INT_CLOCK CR_INT_5 /* + * The bits in the CONFIG register + */ +#define CFG_K0_UNCACHED 2 +#define CFG_K0_CACHED 3 + +/* * The bits in the context register. */ #define CNTXT_PTE_BASE 0xff800000 From owner-p4-projects@FreeBSD.ORG Tue Jan 29 08:24:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3303516A420; Tue, 29 Jan 2008 08:24:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D45C216A417 for ; Tue, 29 Jan 2008 08:24:47 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C2B1A13C45D for ; Tue, 29 Jan 2008 08:24:47 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0T8Ol6j010880 for ; Tue, 29 Jan 2008 08:24:47 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0T8Olcn010877 for perforce@freebsd.org; Tue, 29 Jan 2008 08:24:47 GMT (envelope-from imp@freebsd.org) Date: Tue, 29 Jan 2008 08:24:47 GMT Message-Id: <200801290824.m0T8Olcn010877@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134362 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 08:24:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=134362 Change 134362 by imp@imp_lighthouse on 2008/01/29 08:24:07 Merge some changes from the cavium tree, lots of work needed here, so you should expect it not to work just yet. o Provide a simple secondary start routine for all cores that come up when we're not doing SMP (I'd think it would be better to pause the core, but I didn't see a way to do that). o Restore stack code. TD_PCB was assumed to be 8 byte aligned, but it seems to only be 4 byte aligned. Cope by clearing bits to make it 8-byte aligned. o On the octeon, save the app descriptor address. The octeon code wants to parse this. This is in the same class as the YAMON and CFE saving, but is it really needed? I don't know. o don't li 0 when moving from zero works better. o Put KSEG0 into cached mode. I don't know why the cavium code does this, but maybe it is to put it into uncached mode easily. o Remove redundant setting of STATUS reg. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#18 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#18 (text+ko) ==== @@ -83,6 +83,10 @@ GLOBAL(cfe_vector) .space 4 #endif +#ifdef CPU_OCTEON +GLOBAL(app_descriptor_addr) + .space 8 +#endif GLOBAL(stackspace) .space NBPG /* Smaller than it should be since it's temp. */ .align 8 @@ -96,10 +100,6 @@ VECTOR(_locore, unknown) /* UNSAFE TO USE a0..a3, since some bootloaders pass that to us */ - # Keep firmware exception handlers until the kernel sets up its own - # exception handlers. - li v0, SR_BOOT_EXC_VEC - mtc0 v0, COP_0_STATUS_REG # Disable interrupts. mtc0 zero, COP_0_CAUSE_REG # Clear soft interrupts /* @@ -125,15 +125,19 @@ or t2, t1 mtc0 t2, COP_0_STATUS_REG COP0_SYNC - /* Extra nops for the FPU to spin up. */ + + /* Make sure KSEG0 is cached */ + li t0, CFG_K0_CACHED + mtc0 t0, MIPS_COP_0_CONFIG + COP0_SYNC + + /* Read and store the PrID FPU ID for CPU identification, if any. */ mfc0 t2, COP_0_STATUS_REG - - /* Read and store the PrID FPU ID for CPU identification. */ mfc0 t0, MIPS_COP_0_PRID #ifndef CPU_NOFPU and t2, MIPS_SR_COP_1_BIT beqz t2, 1f - li t1, 0x0 + move t1, zero cfc1 t1, MIPS_FPU_ID 1: #else @@ -141,7 +145,7 @@ * This platform has no FPU, and attempting to detect one * using the official method causes an exception. */ - li t1, 0x0 + move t1, zero #endif sw t0, _C_LABEL(cpu_id) sw t1, _C_LABEL(fpu_id) @@ -171,6 +175,10 @@ sw a2, _C_LABEL(cfe_vector)/* Firmware entry vector */ no_cfe: #endif +#ifdef CPU_OCTEON + la a0, app_descriptor_addr + sw a3, 0(a0) /* Store app descriptor ptr */ +#endif /* * The following needs to be done differently for each platform and @@ -198,6 +206,18 @@ mtcr t1, t2 #endif +#ifdef CPU_OCTEON /* Maybe this is mips32/64 generic? */ + .set push + .set mips32r2 + rdhwr t0, $0 + .set pop +#else + move t0, zero +#endif + /* Stage the secondary cpu start until later */ + bne t0, zero, start_secondary + nop + #ifdef SMP la t0, _C_LABEL(__pcpu) SET_CPU_PCPU(t0) @@ -211,6 +231,12 @@ jal _C_LABEL(platform_start) sw zero, START_FRAME - 8(sp) # Zero out old fp for debugger + la sp, _C_LABEL(thread0) + lw a0, TD_PCB(sp) + li t0, ~7 + and a0, a0, t0 + subu sp, a0, START_FRAME + jal _C_LABEL(mi_startup) # mi_startup(frame) sw zero, START_FRAME - 8(sp) # Zero out old fp for debugger @@ -231,6 +257,10 @@ nop jal _C_LABEL(smp_init_secondary) nop +#else +start_secondary: + b start_secondary + nop #endif VECTOR_END(_locore) From owner-p4-projects@FreeBSD.ORG Tue Jan 29 08:29:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E43B16A419; Tue, 29 Jan 2008 08:29:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 951AC16A417 for ; Tue, 29 Jan 2008 08:29:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8315413C43E for ; Tue, 29 Jan 2008 08:29:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0T8Tr1F011075 for ; Tue, 29 Jan 2008 08:29:53 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0T8Trrm011072 for perforce@freebsd.org; Tue, 29 Jan 2008 08:29:53 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 29 Jan 2008 08:29:53 GMT Message-Id: <200801290829.m0T8Trrm011072@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134363 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 08:29:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=134363 Change 134363 by kmacy@kmacy:storage:toehead on 2008/01/29 08:28:52 enable timestamps disable socket buffer usage assert don't coalesce on RX for now s/Linux/FreeBSD/ fix lock ordering issue in connection shutdown fix offset accounting for copied_seq in t3_soreceive fix SOCKBUF locking in t3_soreceive enable DDP for nonblocking case for now for testing purposes add some annoying debug info to cxgb_soreceive Affected files ... .. //depot/projects/toehead/sys/dev/cxgb/common/cxgb_t3_hw.c#2 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#10 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#11 edit Differences ... ==== //depot/projects/toehead/sys/dev/cxgb/common/cxgb_t3_hw.c#2 (text+ko) ==== @@ -2503,7 +2503,7 @@ F_TCPCHECKSUMOFFLOAD | V_IPTTL(64)); t3_write_reg(adap, A_TP_TCP_OPTIONS, V_MTUDEFAULT(576) | F_MTUENABLE | V_WINDOWSCALEMODE(1) | - V_TIMESTAMPSMODE(0) | V_SACKMODE(1) | V_SACKRX(1)); + V_TIMESTAMPSMODE(1) | V_SACKMODE(1) | V_SACKRX(1)); t3_write_reg(adap, A_TP_DACK_CONFIG, V_AUTOSTATE3(1) | V_AUTOSTATE2(1) | V_AUTOSTATE1(0) | V_BYTETHRESHOLD(16384) | V_MSSTHRESHOLD(2) | ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#10 (text+ko) ==== @@ -1099,7 +1099,8 @@ * or we need to add this */ so->so_snd.sb_flags |= SB_NOCOALESCE; - + so->so_rcv.sb_flags |= SB_NOCOALESCE; + tp->t_toe = toep; toep->tp_tp = tp; toep->tp_toedev = dev; @@ -1193,7 +1194,7 @@ req = mtod(m, struct cpl_act_open_req *); m->m_pkthdr.len = m->m_len = sizeof(*req); - + req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_ACT_OPEN_REQ, atid)); req->local_port = inp->inp_lport; @@ -1890,10 +1891,17 @@ DPRINTF("rx_data so=%p flags=0x%x len=%d\n", so, so->so_rcv.sb_flags, m->m_pkthdr.len); sbappend_locked(&so->so_rcv, m); + +#ifdef notyet + /* + * We're giving too many credits to the card - but disable this check so we can keep on moving :-| + * + */ KASSERT(so->so_rcv.sb_cc < (so->so_rcv.sb_mbmax << 1), ("so=%p, data contents exceed mbmax, sb_cc=%d sb_mbmax=%d", so, so->so_rcv.sb_cc, so->so_rcv.sb_mbmax)); +#endif INP_UNLOCK(tp->t_inpcb); DPRINTF("sb_cc=%d sb_mbcnt=%d\n", @@ -2389,6 +2397,8 @@ "process_abort_rpl: GTS rpl pending %d", sock_flag(sk, ABORT_RPL_PENDING)); #endif + + INP_INFO_WLOCK(&tcbinfo); INP_LOCK(tp->t_inpcb); if (toep->tp_flags & TP_ABORT_RPL_PENDING) { @@ -2403,16 +2413,14 @@ !is_t3a(TOE_DEV(so))) { if (toep->tp_flags & TP_ABORT_REQ_RCVD) panic("TP_ABORT_REQ_RCVD set"); - INP_INFO_WLOCK(&tcbinfo); - INP_LOCK(tp->t_inpcb); t3_release_offload_resources(toep); tp = tcp_close(tp); - INP_INFO_WUNLOCK(&tcbinfo); } } } if (tp) INP_UNLOCK(tp->t_inpcb); + INP_INFO_WUNLOCK(&tcbinfo); m_free(m); } @@ -2472,7 +2480,7 @@ } /* - * Convert the status code of an ABORT_REQ into a Linux error code. Also + * Convert the status code of an ABORT_REQ into a FreeBSD error code. Also * indicate whether RST should be sent in response. */ static int @@ -2894,7 +2902,8 @@ struct tcphdr th; struct inpcb *inp; int mss, wsf, sack, ts; - + uint32_t rcv_isn = ntohl(req->rcv_isn); + bzero(&to, sizeof(struct tcpopt)); inp = sotoinpcb(lso); @@ -2903,10 +2912,10 @@ */ inc.inc_fport = th.th_sport = req->peer_port; inc.inc_lport = th.th_dport = req->local_port; - toep->tp_iss = th.th_seq = req->rcv_isn; + th.th_seq = req->rcv_isn; th.th_flags = TH_SYN; - toep->tp_delack_seq = toep->tp_rcv_wup = toep->tp_copied_seq = ntohl(req->rcv_isn); + toep->tp_iss = toep->tp_delack_seq = toep->tp_rcv_wup = toep->tp_copied_seq = rcv_isn; inc.inc_isipv6 = 0; inc.inc_len = 0; @@ -3171,7 +3180,7 @@ /* * Called when a connection is established to translate the TCP options - * reported by HW to Linux's native format. + * reported by HW to FreeBSD's native format. */ static void assign_rxopt(struct socket *so, unsigned int opt) ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#11 (text+ko) ==== @@ -527,8 +527,8 @@ if (err) return (err); TRACE_ENTER; + SOCKBUF_LOCK(&so->so_rcv); restart: - SOCKBUF_LOCK(&so->so_rcv); len = uio->uio_resid; m = so->so_rcv.sb_mb; target = (flags & MSG_WAITALL) ? min(len, so->so_rcv.sb_hiwat) : so->so_rcv.sb_lowat; @@ -571,6 +571,7 @@ INP_LOCK(inp); t3_cleanup_rbuf(tp); INP_UNLOCK(inp); + SOCKBUF_LOCK(&so->so_rcv); goto restart; } if (p->ubuf && user_ddp_ok && !user_ddp_pending && @@ -597,6 +598,7 @@ INP_LOCK(inp); t3_cleanup_rbuf(tp); INP_UNLOCK(inp); + SOCKBUF_LOCK(&so->so_rcv); if ((err = sbwait(&so->so_rcv)) != 0) goto done; } @@ -610,10 +612,10 @@ m = so->so_rcv.sb_mb = m_free(m); goto done; } - offset = toep->tp_copied_seq - m->m_seq; - if (offset > m->m_pkthdr.len) - panic("t3_soreceive: BUG: OFFSET > LEN seq 0x%x " - "pktlen %d ddp flags 0x%x", m->m_seq, + offset = toep->tp_copied_seq - m->m_seq + 1 /* OFF by one somewhere :-{ */; + if (offset >= m->m_pkthdr.len) + panic("t3_soreceive: BUG: OFFSET > LEN offset %d copied_seq 0x%x seq 0x%x " + "pktlen %d ddp flags 0x%x", offset, toep->tp_copied_seq, m->m_seq, m->m_pkthdr.len, m->m_ddp_flags); avail = m->m_pkthdr.len - offset; if (len < avail) { @@ -786,21 +788,29 @@ * */ if ((tp->t_flags & TF_TOE) && ((flags & (MSG_WAITALL|MSG_OOB|MSG_PEEK|MSG_DONTWAIT)) == 0) - && ((so->so_state & SS_NBIO) == 0) && (uio->uio_iovcnt == 1) && +#ifdef notyet + && ((so->so_state & SS_NBIO) == 0) +#endif + && (uio->uio_iovcnt == 1) && ((so->so_rcv.sb_state & SBS_CANTRCVMORE) == 0) && (mp0 == NULL)) { tdev = TOE_DEV(so); zcopy_thres = TOM_TUNABLE(tdev, ddp_thres); zcopy_enabled = TOM_TUNABLE(tdev, ddp); + if ((uio->uio_resid > zcopy_thres) && - (uio->uio_iovcnt == 1) && ((so->so_state & SS_NBIO) == 0) + (uio->uio_iovcnt == 1) +#if 0 + && ((so->so_state & SS_NBIO) == 0) +#endif && zcopy_enabled) { - printf("uio_resid=%d zcopy_thres=%d\n", - uio->uio_resid, zcopy_thres); rv = t3_soreceive(so, flagsp, uio); if (rv != EAGAIN) return (rv); } } + if (uio->uio_resid > PAGE_SIZE) + printf("flags=0x%x nonblocking=0x%x iovcnt=%d mp0=%p uio_resid=%d \n", + flags, !!(so->so_state && SS_NBIO), uio->uio_iovcnt, mp0, uio->uio_resid); return pru_soreceive(so, psa, uio, mp0, controlp, flagsp); } From owner-p4-projects@FreeBSD.ORG Tue Jan 29 12:17:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8813816A468; Tue, 29 Jan 2008 12:17:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CA7316A41A for ; Tue, 29 Jan 2008 12:17:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 30E8813C4DD for ; Tue, 29 Jan 2008 12:17:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TCHuCY037301 for ; Tue, 29 Jan 2008 12:17:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TCHtX0037298 for perforce@freebsd.org; Tue, 29 Jan 2008 12:17:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 29 Jan 2008 12:17:55 GMT Message-Id: <200801291217.m0TCHtX0037298@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134372 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 12:17:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=134372 Change 134372 by rwatson@rwatson_cinnamon on 2008/01/29 12:17:34 Add configure tests for ipc_perm fields _key and _seq, as found in recent Mac OS X versions, in addition to the existing consideration of key, __key, seq, and __seq. Regenerate. Submitted by: Eric Hall Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#11 edit .. //depot/projects/trustedbsd/openbsm/configure#35 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#38 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#11 (text+ko) ==== @@ -39,6 +39,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define if ipc_perm._key instead of key */ +#undef HAVE_IPC_PERM__KEY + +/* Define if ipc_perm._seq instead of seq */ +#undef HAVE_IPC_PERM__SEQ + /* Define if ipc_perm.__key instead of key */ #undef HAVE_IPC_PERM___KEY ==== //depot/projects/trustedbsd/openbsm/configure#35 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#35 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#37 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for OpenBSM 1.0. +# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha1. # # Report bugs to . # @@ -729,8 +729,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0' -PACKAGE_STRING='OpenBSM 1.0' +PACKAGE_VERSION='1.1alpha1' +PACKAGE_STRING='OpenBSM 1.1alpha1' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -1399,7 +1399,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.1alpha1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1469,7 +1469,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0:";; + short | recursive ) echo "Configuration of OpenBSM 1.1alpha1:";; esac cat <<\_ACEOF @@ -1573,7 +1573,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0 +OpenBSM configure 1.1alpha1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1587,7 +1587,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0, which was +It was created by OpenBSM $as_me 1.1alpha1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -18998,7 +18998,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0 + VERSION=1.1alpha1 cat >>confdefs.h <<_ACEOF @@ -20403,6 +20403,116 @@ fi +{ echo "$as_me:$LINENO: checking for struct ipc_perm._key" >&5 +echo $ECHO_N "checking for struct ipc_perm._key... $ECHO_C" >&6; } +if test "${ac_cv_member_struct_ipc_perm__key+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (ac_aggr._key) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_ipc_perm__key=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (sizeof ac_aggr._key) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_ipc_perm__key=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_member_struct_ipc_perm__key=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm__key" >&5 +echo "${ECHO_T}$ac_cv_member_struct_ipc_perm__key" >&6; } +if test $ac_cv_member_struct_ipc_perm__key = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_IPC_PERM__KEY +_ACEOF + +fi + + { echo "$as_me:$LINENO: checking for struct ipc_perm.__seq" >&5 echo $ECHO_N "checking for struct ipc_perm.__seq... $ECHO_C" >&6; } if test "${ac_cv_member_struct_ipc_perm___seq+set}" = set; then @@ -20513,6 +20623,116 @@ fi +{ echo "$as_me:$LINENO: checking for struct ipc_perm._seq" >&5 +echo $ECHO_N "checking for struct ipc_perm._seq... $ECHO_C" >&6; } +if test "${ac_cv_member_struct_ipc_perm__seq+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (ac_aggr._seq) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_ipc_perm__seq=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (sizeof ac_aggr._seq) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_ipc_perm__seq=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_member_struct_ipc_perm__seq=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm__seq" >&5 +echo "${ECHO_T}$ac_cv_member_struct_ipc_perm__seq" >&6; } +if test $ac_cv_member_struct_ipc_perm__seq = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_IPC_PERM__SEQ +_ACEOF + +fi + + { echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } if test "${ac_cv_header_time+set}" = set; then @@ -23166,7 +23386,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenBSM $as_me 1.0, which was +This file was extended by OpenBSM $as_me 1.1alpha1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23219,7 +23439,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0 +OpenBSM config.status 1.1alpha1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/trustedbsd/openbsm/configure.ac#38 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.1alpha1], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#37 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#38 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -38,6 +38,13 @@ #include ]) +AC_CHECK_MEMBER([struct ipc_perm._key], +[AC_DEFINE(HAVE_IPC_PERM__KEY,, Define if ipc_perm._key instead of key)], +[],[ +#include +#include +]) + AC_CHECK_MEMBER([struct ipc_perm.__seq], [AC_DEFINE(HAVE_IPC_PERM___SEQ,, Define if ipc_perm.__seq instead of seq)], [],[ @@ -45,6 +52,13 @@ #include ]) +AC_CHECK_MEMBER([struct ipc_perm._seq], +[AC_DEFINE(HAVE_IPC_PERM__SEQ,, Define if ipc_perm._seq instead of seq)], +[],[ +#include +#include +]) + AC_HEADER_TIME AC_STRUCT_TM From owner-p4-projects@FreeBSD.ORG Tue Jan 29 12:23:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B5BC16A468; Tue, 29 Jan 2008 12:23:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2054E16A420 for ; Tue, 29 Jan 2008 12:23:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0D1CB13C45B for ; Tue, 29 Jan 2008 12:23:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TCN26d037591 for ; Tue, 29 Jan 2008 12:23:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TCN2mr037588 for perforce@freebsd.org; Tue, 29 Jan 2008 12:23:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 29 Jan 2008 12:23:02 GMT Message-Id: <200801291223.m0TCN2mr037588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134373 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 12:23:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=134373 Change 134373 by rwatson@rwatson_cinnamon on 2008/01/29 12:22:54 Use ipc_perm._key and ipc_perm._seq when configured. Submitted by: Eric Hall Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#64 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#64 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#63 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#64 $ */ #include @@ -506,15 +506,23 @@ #ifdef HAVE_IPC_PERM___SEQ ADD_U_INT16(dptr, perm->__seq); -#else +#else /* HAVE_IPC_PERM___SEQ */ +#ifdef HAVE_IPC_PERM__SEQ + ADD_U_INT16(dptr, perm->_seq); +#else /* HAVE_IPC_PERM__SEQ */ ADD_U_INT16(dptr, perm->seq); -#endif +#endif /* HAVE_IPC_PERM__SEQ */ +#endif /* HAVE_IPC_PERM___SEQ */ #ifdef HAVE_IPC_PERM___KEY ADD_U_INT32(dptr, perm->__key); -#else +#else /* HAVE_IPC_PERM___KEY */ +#ifdef HAVE_IPC_PERM__KEY + ADD_U_INT32(dptr, perm->_key); +#else /* HAVE_IPC_PERM__KEY */ ADD_U_INT32(dptr, perm->key); -#endif +#endif /* HAVE_IPC_PERM__KEY */ +#endif /* HAVE_IPC_PERM___KEY */ return (t); } From owner-p4-projects@FreeBSD.ORG Tue Jan 29 12:24:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89C6416A41B; Tue, 29 Jan 2008 12:24:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F1AD16A418 for ; Tue, 29 Jan 2008 12:24:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3D05613C458 for ; Tue, 29 Jan 2008 12:24:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TCO4he037660 for ; Tue, 29 Jan 2008 12:24:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TCO4g0037657 for perforce@freebsd.org; Tue, 29 Jan 2008 12:24:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 29 Jan 2008 12:24:04 GMT Message-Id: <200801291224.m0TCO4g0037657@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134374 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 12:24:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=134374 Change 134374 by rwatson@rwatson_cinnamon on 2008/01/29 12:23:58 Reflect Mac OS X 10.5.1 build support, credit Eric Hall, update some references to OpenBSM 1.0 to instead reference OpenBSM 1.1. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#63 edit .. //depot/projects/trustedbsd/openbsm/README#25 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#63 (text+ko) ==== @@ -5,6 +5,7 @@ - Fix bug in audit_write() where we commit an incomplete record in the event there is an error writing the subject token. This was submitted by Diego Giagio. +- Build support for Mac OS X 10.5.1 submitted by Eric Hall. OpenBSM 1.0 @@ -310,4 +311,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#62 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#63 $ ==== //depot/projects/trustedbsd/openbsm/README#25 (text+ko) ==== @@ -1,4 +1,4 @@ -OpenBSM 1.0 +OpenBSM 1.1 Introduction @@ -90,6 +90,7 @@ Martin Voros Diego Giagio Alex Samorukov + Eric Hall In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -111,4 +112,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#24 $ +$P4: //depot/projects/trustedbsd/openbsm/README#25 $ From owner-p4-projects@FreeBSD.ORG Tue Jan 29 16:39:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CF6116A41B; Tue, 29 Jan 2008 16:39:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DED9116A418 for ; Tue, 29 Jan 2008 16:39:31 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CB8F313C4DB for ; Tue, 29 Jan 2008 16:39:31 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TGdVCt076760 for ; Tue, 29 Jan 2008 16:39:31 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TGdVD6076757 for perforce@freebsd.org; Tue, 29 Jan 2008 16:39:31 GMT (envelope-from rrs@cisco.com) Date: Tue, 29 Jan 2008 16:39:31 GMT Message-Id: <200801291639.m0TGdVD6076757@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 16:39:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=134376 Change 134376 by rrs@rrs-mips2-jnpr on 2008/01/29 16:39:02 adds missing reg's Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpuregs.h#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/cpuregs.h#4 (text+ko) ==== @@ -99,7 +99,11 @@ #define MIPS_XKPHYS_TO_PHYS(x) ((x) & 0x0effffffffffffffULL) /* CPU dependent mtc0 hazard hook */ +#ifdef TARGET_OCTEON +#define COP0_SYNC nop; nop; nop; nop; nop; +#else #define COP0_SYNC /* nothing */ +#endif #define COP0_HAZARD_FPUENABLE nop; nop; nop; nop; /* @@ -141,6 +145,7 @@ #define MIPS_SR_COP_USABILITY 0xf0000000 #define MIPS_SR_COP_0_BIT 0x10000000 #define MIPS_SR_COP_1_BIT 0x20000000 +#define MIPS_SR_COP_2_BIT 0x40000000 /* r4k and r3k differences, see below */ @@ -148,6 +153,7 @@ #define MIPS_SR_PX 0x00800000 /* MIPS64 */ #define MIPS_SR_BEV 0x00400000 /* Use boot exception vector */ #define MIPS_SR_TS 0x00200000 +#define MIPS_SR_DE 0x00010000 #define MIPS_SR_INT_IE 0x00000001 /*#define MIPS_SR_MBZ 0x0f8000c0*/ /* Never used, true for r3k */ From owner-p4-projects@FreeBSD.ORG Tue Jan 29 16:39:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D576016A529; Tue, 29 Jan 2008 16:39:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2340716A469 for ; Tue, 29 Jan 2008 16:39:32 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F00E513C4E1 for ; Tue, 29 Jan 2008 16:39:31 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TGdVah076766 for ; Tue, 29 Jan 2008 16:39:31 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TGdVru076763 for perforce@freebsd.org; Tue, 29 Jan 2008 16:39:31 GMT (envelope-from rrs@cisco.com) Date: Tue, 29 Jan 2008 16:39:31 GMT Message-Id: <200801291639.m0TGdVru076763@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 16:39:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=134377 Change 134377 by rrs@rrs-mips2-jnpr on 2008/01/29 16:39:18 Adds the NO FPU Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#4 (text+ko) ==== @@ -34,6 +34,7 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options ISA_MIPS64 +options CPU_NOFPU options DDB options KDB From owner-p4-projects@FreeBSD.ORG Tue Jan 29 16:40:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BB6516A46B; Tue, 29 Jan 2008 16:40:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3809516A421 for ; Tue, 29 Jan 2008 16:40:33 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 28F8C13C4D1 for ; Tue, 29 Jan 2008 16:40:33 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TGeXbn076870 for ; Tue, 29 Jan 2008 16:40:33 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TGeXsC076867 for perforce@freebsd.org; Tue, 29 Jan 2008 16:40:33 GMT (envelope-from rrs@cisco.com) Date: Tue, 29 Jan 2008 16:40:33 GMT Message-Id: <200801291640.m0TGeXsC076867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134378 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 16:40:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=134378 Change 134378 by rrs@rrs-mips2-jnpr on 2008/01/29 16:39:58 Adds all the rest of the target_octeon ifdefs Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#19 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#19 (text+ko) ==== @@ -83,7 +83,7 @@ GLOBAL(cfe_vector) .space 4 #endif -#ifdef CPU_OCTEON +#if defined(TARGET_OCTEON) GLOBAL(app_descriptor_addr) .space 8 #endif @@ -91,6 +91,13 @@ .space NBPG /* Smaller than it should be since it's temp. */ .align 8 GLOBAL(topstack) + + +#if defined(TARGET_OCTEON) + .set mips3 +#endif + + .set noreorder .text @@ -99,7 +106,18 @@ ASM_ENTRY(_start) VECTOR(_locore, unknown) /* UNSAFE TO USE a0..a3, since some bootloaders pass that to us */ +#if defined(TARGET_OCTEON) + /* + * t1: Bits to set explicitly: + * Enable FPU + */ + + /* Set these bits */ + li t1, (MIPS_SR_COP_2_BIT | MIPS_SR_COP_0_BIT | MIPS_SR_PX | MIPS_SR_KX | MIPS_SR_UX | MIPS_SR_SX | MIPS_SR_BEV) + /* Reset these bits */ + li t0, ~(MIPS_SR_DE | MIPS_SR_SOFT_RESET | MIPS_SR_ERL | MIPS_SR_EXL | MIPS_SR_INT_IE) +#else mtc0 zero, COP_0_CAUSE_REG # Clear soft interrupts /* @@ -108,13 +126,12 @@ * Boot exception vectors (firmware-provided) */ li t0, (MIPS_SR_BEV | MIPS_SR_SOFT_RESET) - /* * t1: Bits to set explicitly: * Enable FPU */ li t1, MIPS_SR_COP_1_BIT - +#endif /* * Read coprocessor 0 status register, clear bits not * preserved (namely, clearing interrupt bits), and set @@ -126,6 +143,12 @@ mtc0 t2, COP_0_STATUS_REG COP0_SYNC +#if defined(TARGET_OCTEON) + /* Clear cause register. */ + mtc0 zero, MIPS_COP_0_CAUSE + COP0_SYNC +#endif + /* Make sure KSEG0 is cached */ li t0, CFG_K0_CACHED mtc0 t0, MIPS_COP_0_CONFIG @@ -175,7 +198,7 @@ sw a2, _C_LABEL(cfe_vector)/* Firmware entry vector */ no_cfe: #endif -#ifdef CPU_OCTEON +#if defined(TARGET_OCTEON) la a0, app_descriptor_addr sw a3, 0(a0) /* Store app descriptor ptr */ #endif @@ -206,7 +229,8 @@ mtcr t1, t2 #endif -#ifdef CPU_OCTEON /* Maybe this is mips32/64 generic? */ + +#if defined(TARGET_OCTEON) /* Maybe this is mips32/64 generic? */ .set push .set mips32r2 rdhwr t0, $0 From owner-p4-projects@FreeBSD.ORG Tue Jan 29 16:40:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88FEF16A535; Tue, 29 Jan 2008 16:40:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61DDB16A41B for ; Tue, 29 Jan 2008 16:40:33 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5229313C4D9 for ; Tue, 29 Jan 2008 16:40:33 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TGeXrS076876 for ; Tue, 29 Jan 2008 16:40:33 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TGeXUY076873 for perforce@freebsd.org; Tue, 29 Jan 2008 16:40:33 GMT (envelope-from rrs@cisco.com) Date: Tue, 29 Jan 2008 16:40:33 GMT Message-Id: <200801291640.m0TGeXUY076873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134379 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 16:40:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=134379 Change 134379 by rrs@rrs-mips2-jnpr on 2008/01/29 16:40:30 Fixes since the app reg comes from locore and is extern. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#2 (text+ko) ==== @@ -906,7 +906,7 @@ int octeon_chip_rev_major = 0, octeon_chip_rev_minor = 0, octeon_chip_type = 0; uint32_t cvmx_config_flags = 1; -uint32_t app_descriptor_addr=0; +extern uint32_t app_descriptor_addr; static octeon_boot_descriptor_t *app_desc_ptr; static cvmx_bootinfo_t *cvmx_desc_ptr; From owner-p4-projects@FreeBSD.ORG Tue Jan 29 16:41:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D538616A468; Tue, 29 Jan 2008 16:41:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98FE216A417 for ; Tue, 29 Jan 2008 16:41:34 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 88B0913C442 for ; Tue, 29 Jan 2008 16:41:34 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TGfYnd076929 for ; Tue, 29 Jan 2008 16:41:34 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TGfYgJ076926 for perforce@freebsd.org; Tue, 29 Jan 2008 16:41:34 GMT (envelope-from rrs@cisco.com) Date: Tue, 29 Jan 2008 16:41:34 GMT Message-Id: <200801291641.m0TGfYgJ076926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134380 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 16:41:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=134380 Change 134380 by rrs@rrs-mips2-jnpr on 2008/01/29 16:40:52 fixes so it calls the uart_getenv Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_cpu_octeonusart.c#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_cpu_octeonusart.c#5 (text+ko) ==== @@ -67,9 +67,12 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_getops(&uart_oct16550_class); + struct uart_class *class; + + class = &uart_oct16550_class; + di->ops = uart_getops(class); + di->bas.bst = 0; di->bas.chan = 0; - di->bas.bst = 0; di->bas.regshft = 3; /* Each UART reg is 8 byte addresss apart. 1 * << 3 */ di->bas.rclk = 0; @@ -81,5 +84,6 @@ uart_bus_space_io = MIPS_PHYS_TO_KSEG1(OCTEON_UART0ADR); uart_bus_space_mem = MIPS_PHYS_TO_KSEG1(OCTEON_UART0ADR); di->bas.bsh = OCTEON_UART0ADR; + uart_getenv(devtype, di, class); return (0); } From owner-p4-projects@FreeBSD.ORG Tue Jan 29 17:16:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A47716A468; Tue, 29 Jan 2008 17:16:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FE8C16A417 for ; Tue, 29 Jan 2008 17:16:06 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 10B3913C4E7 for ; Tue, 29 Jan 2008 17:16:06 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0THG5Hu089227 for ; Tue, 29 Jan 2008 17:16:05 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0THG5iG089224 for perforce@freebsd.org; Tue, 29 Jan 2008 17:16:05 GMT (envelope-from cognet@freebsd.org) Date: Tue, 29 Jan 2008 17:16:05 GMT Message-Id: <200801291716.m0THG5iG089224@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 134383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 17:16:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=134383 Change 134383 by cognet@kanar on 2008/01/29 17:15:38 Do not define __NO_STRICT_ALIGNMENT, mips requires strict alignment. Try to use types suitables for both 32 and 64 bits. Approved by: mux (mentor) Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/_bus.h#4 edit .. //depot/projects/mips2-jnpr/src/sys/mips/include/_types.h#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/_bus.h#4 (text+ko) ==== @@ -35,13 +35,13 @@ /* * Bus address and size types */ -typedef uint32_t bus_addr_t; -typedef uint32_t bus_size_t; +typedef uintptr_t bus_addr_t; +typedef uintptr_t bus_size_t; /* * Access methods for bus resources and address space. */ -typedef int bus_space_tag_t; -typedef u_int bus_space_handle_t; +typedef long bus_space_tag_t; +typedef u_long bus_space_handle_t; #endif /* MIPS_INCLUDE__BUS_H */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/_types.h#4 (text+ko) ==== @@ -44,8 +44,6 @@ #error this file needs sys/cdefs.h as a prerequisite #endif -#define __NO_STRICT_ALIGNMENT - /* * Basic types upon which most other types are built. */ @@ -56,6 +54,10 @@ typedef int __int32_t; typedef unsigned int __uint32_t; +#ifdef __mips64 +typedef long __int64_t; +typedef unsigned long __uint64_t; +#else #if defined(lint) /* LONGLONG */ typedef long long __int64_t; @@ -70,13 +72,14 @@ /* LONGLONG */ typedef unsigned long long __uint64_t; #endif +#endif /* * Standard type definitions. */ typedef unsigned long __clock_t; /* clock()... */ typedef unsigned int __cpumask_t; -typedef __int32_t __critical_t; +typedef long __critical_t; typedef double __double_t; typedef double __float_t; typedef long __intfptr_t; @@ -90,16 +93,15 @@ typedef __int16_t __int_least16_t; typedef __int32_t __int_least32_t; typedef __int64_t __int_least64_t; -typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */ -typedef __int32_t __register_t; -typedef __int32_t f_register_t; -typedef __int32_t __segsz_t; /* segment size (in pages) */ -typedef __uint32_t __size_t; /* sizeof() */ -typedef __int32_t __ssize_t; /* byte count or error */ -typedef __int32_t __time_t; /* time()... */ +typedef long __ptrdiff_t; /* ptr1 - ptr2 */ +typedef long __register_t; +typedef long __segsz_t; /* segment size (in pages) */ +typedef long __size_t; /* sizeof() */ +typedef long __ssize_t; /* byte count or error */ +typedef __int64_t __time_t; /* time()... */ typedef unsigned long __uintfptr_t; typedef __uint64_t __uintmax_t; -typedef __uint32_t __uintptr_t; +typedef unsigned long __uintptr_t; typedef __uint32_t __uint_fast8_t; typedef __uint32_t __uint_fast16_t; typedef __uint32_t __uint_fast32_t; @@ -108,10 +110,10 @@ typedef __uint16_t __uint_least16_t; typedef __uint32_t __uint_least32_t; typedef __uint64_t __uint_least64_t; -typedef __uint32_t __u_register_t; -typedef __uint32_t __vm_offset_t; +typedef unsigned long __u_register_t; +typedef unsigned long __vm_offset_t; typedef __int64_t __vm_ooffset_t; -typedef __uint32_t __vm_paddr_t; +typedef unsigned long __vm_paddr_t; typedef __uint64_t __vm_pindex_t; typedef unsigned long __vm_size_t; From owner-p4-projects@FreeBSD.ORG Tue Jan 29 17:18:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3CBA16A477; Tue, 29 Jan 2008 17:18:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9E92316A473 for ; Tue, 29 Jan 2008 17:18:08 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8E12D13C501 for ; Tue, 29 Jan 2008 17:18:08 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0THI8UX091372 for ; Tue, 29 Jan 2008 17:18:08 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0THI85C091363 for perforce@freebsd.org; Tue, 29 Jan 2008 17:18:08 GMT (envelope-from cognet@freebsd.org) Date: Tue, 29 Jan 2008 17:18:08 GMT Message-Id: <200801291718.m0THI85C091363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 134384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 17:18:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=134384 Change 134384 by cognet@kanar on 2008/01/29 17:18:08 Remove amd64ism we won't use for sure. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/sysarch.h#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/sysarch.h#2 (text+ko) ==== @@ -26,34 +26,19 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.24 2005/04/14 16:57:58 peter Exp $ + * $FreeBSD$ */ /* - * Architecture specific syscalls (AMD64) + * Architecture specific syscalls (MIPS) */ #ifndef _MACHINE_SYSARCH_H_ #define _MACHINE_SYSARCH_H_ -#define I386_GET_FSBASE 7 -#define I386_SET_FSBASE 8 -#define I386_GET_GSBASE 9 -#define I386_SET_GSBASE 10 - -/* Leave space for 0-127 for to avoid translating syscalls */ -#define AMD64_GET_FSBASE 128 -#define AMD64_SET_FSBASE 129 -#define AMD64_GET_GSBASE 130 -#define AMD64_SET_GSBASE 131 - #ifndef _KERNEL #include __BEGIN_DECLS -int amd64_get_fsbase(void **); -int amd64_get_gsbase(void **); -int amd64_set_fsbase(void *); -int amd64_set_gsbase(void *); int sysarch(int, void *); __END_DECLS #endif From owner-p4-projects@FreeBSD.ORG Tue Jan 29 17:38:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E5B316A46B; Tue, 29 Jan 2008 17:38:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3307F16A421 for ; Tue, 29 Jan 2008 17:38:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2409713C4E7 for ; Tue, 29 Jan 2008 17:38:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0THcXae093377 for ; Tue, 29 Jan 2008 17:38:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0THcWIX093374 for perforce@freebsd.org; Tue, 29 Jan 2008 17:38:32 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 29 Jan 2008 17:38:32 GMT Message-Id: <200801291738.m0THcWIX093374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 134388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 17:38:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=134388 Change 134388 by hselasky@hselasky_laptop001 on 2008/01/29 17:37:37 Memory reduction. BUS-DMA workaround. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#91 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#91 (text+ko) ==== @@ -2367,6 +2367,25 @@ goto error; } } +#if 1 + /* + * XXX BUS-DMA workaround - FIXME later: + * + * We assume that that the aligment at this point of + * the code is greater than or equal to the size and + * less than two times the size, so that if we double + * the size, the size will be greater than the + * alignment. + * + * The bus-dma system has a check for "alignment" + * being less than "size". If that check fails we end + * up using contigmalloc which is page based even for + * small allocations. Try to avoid that to save + * memory, hence we sometimes to a large number of + * small allocations! + */ + size *= 2; +#endif } /* get the correct DMA tag */ utag = usbd_dma_tag_setup(parent_tag, utag, size, align, utag_max); From owner-p4-projects@FreeBSD.ORG Tue Jan 29 17:41:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 575B416A4B3; Tue, 29 Jan 2008 17:41:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ABC9E16A469 for ; Tue, 29 Jan 2008 17:41:37 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4B90F13C4FF for ; Tue, 29 Jan 2008 17:41:37 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0THfbbp093563 for ; Tue, 29 Jan 2008 17:41:37 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0THfaNe093560 for perforce@freebsd.org; Tue, 29 Jan 2008 17:41:36 GMT (envelope-from cognet@freebsd.org) Date: Tue, 29 Jan 2008 17:41:36 GMT Message-Id: <200801291741.m0THfaNe093560@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 134390 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 17:41:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=134390 Change 134390 by cognet@kanar on 2008/01/29 17:41:17 We increased time_t to 64bits, so the size of the struct kinfo_proc increased.: Affected files ... .. //depot/projects/mips2-jnpr/src/sys/sys/user.h#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/sys/user.h#2 (text+ko) ==== @@ -100,7 +100,7 @@ #define KINFO_PROC_SIZE 768 #endif #ifdef __mips__ -#define KINFO_PROC_SIZE 768 +#define KINFO_PROC_SIZE 792 #endif #ifdef __powerpc__ #define KINFO_PROC_SIZE 768 From owner-p4-projects@FreeBSD.ORG Tue Jan 29 17:41:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C26FC16A542; Tue, 29 Jan 2008 17:41:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1A1F16A46D for ; Tue, 29 Jan 2008 17:41:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7242B13C501 for ; Tue, 29 Jan 2008 17:41:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0THfb1w093569 for ; Tue, 29 Jan 2008 17:41:37 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0THfbIB093566 for perforce@freebsd.org; Tue, 29 Jan 2008 17:41:37 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 29 Jan 2008 17:41:37 GMT Message-Id: <200801291741.m0THfbIB093566@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 134391 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 17:41:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=134391 Change 134391 by hselasky@hselasky_laptop001 on 2008/01/29 17:41:28 Improve memory reduction patch. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#92 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#92 (text+ko) ==== @@ -2384,7 +2384,9 @@ * memory, hence we sometimes to a large number of * small allocations! */ + if (size < USB_PAGE_SIZE) { size *= 2; + } #endif } /* get the correct DMA tag */ From owner-p4-projects@FreeBSD.ORG Tue Jan 29 17:42:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FB7616A420; Tue, 29 Jan 2008 17:42:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7B8316A419 for ; Tue, 29 Jan 2008 17:42:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B80BF13C4FF for ; Tue, 29 Jan 2008 17:42:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0THgcWA093635 for ; Tue, 29 Jan 2008 17:42:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0THgc5i093632 for perforce@freebsd.org; Tue, 29 Jan 2008 17:42:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 29 Jan 2008 17:42:38 GMT Message-Id: <200801291742.m0THgc5i093632@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 134392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 17:42:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=134392 Change 134392 by hselasky@hselasky_laptop001 on 2008/01/29 17:42:34 Style changes by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#93 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#93 (text+ko) ==== @@ -2357,9 +2357,9 @@ if (align != 1) { /* - * The alignment must be greater or equal to the "size" else the - * object can be split between two memory pages and we get a - * problem! + * The alignment must be greater or equal to the + * "size" else the object can be split between two + * memory pages and we get a problem! */ while (align < size) { align *= 2; @@ -2385,7 +2385,7 @@ * small allocations! */ if (size < USB_PAGE_SIZE) { - size *= 2; + size *= 2; } #endif } From owner-p4-projects@FreeBSD.ORG Tue Jan 29 17:47:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A3F316A46C; Tue, 29 Jan 2008 17:47:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB62816A418 for ; Tue, 29 Jan 2008 17:47:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AADB413C4DB for ; Tue, 29 Jan 2008 17:47:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0THljjo093836 for ; Tue, 29 Jan 2008 17:47:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0THliHI093833 for perforce@freebsd.org; Tue, 29 Jan 2008 17:47:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 29 Jan 2008 17:47:44 GMT Message-Id: <200801291747.m0THliHI093833@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 134395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 17:47:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=134395 Change 134395 by hselasky@hselasky_laptop001 on 2008/01/29 17:47:23 Add a sysctl to the "cdce" driver that can be used to force the new 512x4 protocol. The sysctl can be used for experimental purposes, for example when using so-called USB to USB cables which emulate a CDC Ethernet device. Digitus USB to USB cable: USB HS performance before: 6Mbyte/second (max FTP download) USB HS performance after: 13Mbyte/second (max FTP download) Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#50 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#50 (text+ko) ==== @@ -101,10 +101,13 @@ __FUNCTION__,## __VA_ARGS__); } } while (0) static int cdce_debug = 0; +static int cdce_force_512x4 = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, cdce, CTLFLAG_RW, 0, "USB cdce"); SYSCTL_INT(_hw_usb_cdce, OID_AUTO, debug, CTLFLAG_RW, &cdce_debug, 0, "cdce debug level"); +SYSCTL_INT(_hw_usb_cdce, OID_AUTO, force_512x4, CTLFLAG_RW, + &cdce_force_512x4, 0, "cdce force 512x4 protocol"); #else #define DPRINTF(...) #endif @@ -352,7 +355,11 @@ } /* get the interface subclass we are using */ sc->sc_iface_protocol = uaa->iface->idesc->bInterfaceProtocol; - +#ifdef USB_DEBUG + if (cdce_force_512x4) { + sc->sc_iface_protocol = UIPROTO_CDC_ETH_512X4; + } +#endif usbd_set_device_desc(dev); snprintf(sc->sc_name, sizeof(sc->sc_name), "%s", From owner-p4-projects@FreeBSD.ORG Tue Jan 29 17:47:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C672616A534; Tue, 29 Jan 2008 17:47:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DDF0F16A469 for ; Tue, 29 Jan 2008 17:47:45 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CEC4113C4E1 for ; Tue, 29 Jan 2008 17:47:45 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0THljlh093842 for ; Tue, 29 Jan 2008 17:47:45 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0THljIn093839 for perforce@freebsd.org; Tue, 29 Jan 2008 17:47:45 GMT (envelope-from imp@freebsd.org) Date: Tue, 29 Jan 2008 17:47:45 GMT Message-Id: <200801291747.m0THljIn093839@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 17:47:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=134396 Change 134396 by imp@imp_lighthouse on 2008/01/29 17:47:23 Revert this part of cognet's patch. It breaks a lot of things. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/_types.h#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/_types.h#5 (text+ko) ==== @@ -44,6 +44,8 @@ #error this file needs sys/cdefs.h as a prerequisite #endif +#define __NO_STRICT_ALIGNMENT + /* * Basic types upon which most other types are built. */ @@ -54,10 +56,6 @@ typedef int __int32_t; typedef unsigned int __uint32_t; -#ifdef __mips64 -typedef long __int64_t; -typedef unsigned long __uint64_t; -#else #if defined(lint) /* LONGLONG */ typedef long long __int64_t; @@ -72,14 +70,13 @@ /* LONGLONG */ typedef unsigned long long __uint64_t; #endif -#endif /* * Standard type definitions. */ typedef unsigned long __clock_t; /* clock()... */ typedef unsigned int __cpumask_t; -typedef long __critical_t; +typedef __int32_t __critical_t; typedef double __double_t; typedef double __float_t; typedef long __intfptr_t; @@ -93,15 +90,16 @@ typedef __int16_t __int_least16_t; typedef __int32_t __int_least32_t; typedef __int64_t __int_least64_t; -typedef long __ptrdiff_t; /* ptr1 - ptr2 */ -typedef long __register_t; -typedef long __segsz_t; /* segment size (in pages) */ -typedef long __size_t; /* sizeof() */ -typedef long __ssize_t; /* byte count or error */ -typedef __int64_t __time_t; /* time()... */ +typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */ +typedef __int32_t __register_t; +typedef __int32_t f_register_t; +typedef __int32_t __segsz_t; /* segment size (in pages) */ +typedef __uint32_t __size_t; /* sizeof() */ +typedef __int32_t __ssize_t; /* byte count or error */ +typedef __int32_t __time_t; /* time()... */ typedef unsigned long __uintfptr_t; typedef __uint64_t __uintmax_t; -typedef unsigned long __uintptr_t; +typedef __uint32_t __uintptr_t; typedef __uint32_t __uint_fast8_t; typedef __uint32_t __uint_fast16_t; typedef __uint32_t __uint_fast32_t; @@ -110,10 +108,10 @@ typedef __uint16_t __uint_least16_t; typedef __uint32_t __uint_least32_t; typedef __uint64_t __uint_least64_t; -typedef unsigned long __u_register_t; -typedef unsigned long __vm_offset_t; +typedef __uint32_t __u_register_t; +typedef __uint32_t __vm_offset_t; typedef __int64_t __vm_ooffset_t; -typedef unsigned long __vm_paddr_t; +typedef __uint32_t __vm_paddr_t; typedef __uint64_t __vm_pindex_t; typedef unsigned long __vm_size_t; From owner-p4-projects@FreeBSD.ORG Tue Jan 29 17:54:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41E8016A419; Tue, 29 Jan 2008 17:54:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 075A816A417 for ; Tue, 29 Jan 2008 17:54:54 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D48C113C4E8 for ; Tue, 29 Jan 2008 17:54:53 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0THsrX7094166 for ; Tue, 29 Jan 2008 17:54:53 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0THsrnn094163 for perforce@freebsd.org; Tue, 29 Jan 2008 17:54:53 GMT (envelope-from imp@freebsd.org) Date: Tue, 29 Jan 2008 17:54:53 GMT Message-Id: <200801291754.m0THsrnn094163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134397 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 17:54:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=134397 Change 134397 by imp@imp_lighthouse on 2008/01/29 17:53:52 The __NO_STRICT_ALIGNMENT part of this patch was good. Bring it back. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/_types.h#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/_types.h#6 (text+ko) ==== @@ -44,8 +44,6 @@ #error this file needs sys/cdefs.h as a prerequisite #endif -#define __NO_STRICT_ALIGNMENT - /* * Basic types upon which most other types are built. */ From owner-p4-projects@FreeBSD.ORG Tue Jan 29 18:21:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CF8B16A46D; Tue, 29 Jan 2008 18:21:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDFA616A417 for ; Tue, 29 Jan 2008 18:21:22 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A69A513C4D5 for ; Tue, 29 Jan 2008 18:21:22 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TILMHe097520 for ; Tue, 29 Jan 2008 18:21:22 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TILM3C097517 for perforce@freebsd.org; Tue, 29 Jan 2008 18:21:22 GMT (envelope-from rrs@cisco.com) Date: Tue, 29 Jan 2008 18:21:22 GMT Message-Id: <200801291821.m0TILM3C097517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134401 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 18:21:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=134401 Change 134401 by rrs@rrs-mips2-jnpr on 2008/01/29 18:21:13 Setup the size correctly for kproc structure in mips. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/sys/user.h#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/sys/user.h#3 (text+ko) ==== @@ -100,7 +100,7 @@ #define KINFO_PROC_SIZE 768 #endif #ifdef __mips__ -#define KINFO_PROC_SIZE 792 +#define KINFO_PROC_SIZE 816 #endif #ifdef __powerpc__ #define KINFO_PROC_SIZE 768 From owner-p4-projects@FreeBSD.ORG Tue Jan 29 18:24:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78DBB16A52A; Tue, 29 Jan 2008 18:24:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C74E16A474 for ; Tue, 29 Jan 2008 18:24:26 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 19CD613C448 for ; Tue, 29 Jan 2008 18:24:26 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TIOQCt097607 for ; Tue, 29 Jan 2008 18:24:26 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TIOPE6097604 for perforce@freebsd.org; Tue, 29 Jan 2008 18:24:25 GMT (envelope-from cognet@freebsd.org) Date: Tue, 29 Jan 2008 18:24:25 GMT Message-Id: <200801291824.m0TIOPE6097604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 134402 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 18:24:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=134402 Change 134402 by cognet@kanar on 2008/01/29 18:24:08 2nd try to support both 32 and 64 bits. Use fixed size types, to make sure gcc doesn't moan about int vs long. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/_types.h#7 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/_types.h#7 (text+ko) ==== @@ -54,6 +54,10 @@ typedef int __int32_t; typedef unsigned int __uint32_t; +#ifdef __mips64 +typedef long __int64_t; +typedef unsigned long __uint64_t; +#else #if defined(lint) /* LONGLONG */ typedef long long __int64_t; @@ -68,18 +72,28 @@ /* LONGLONG */ typedef unsigned long long __uint64_t; #endif +#endif /* * Standard type definitions. */ -typedef unsigned long __clock_t; /* clock()... */ +typedef __int32_t __clock_t; /* clock()... */ typedef unsigned int __cpumask_t; +#ifdef __mips64 +typedef __int64_t __critical_t; +#else typedef __int32_t __critical_t; +#endif typedef double __double_t; typedef double __float_t; -typedef long __intfptr_t; +#ifdef __mips64 +typedef __int64_t __intfptr_t; +typedef __int64_t __intptr_t; +#else +typedef __int32_t __intfptr_t; +typedef __int32_t __intptr_t; +#endif typedef __int64_t __intmax_t; -typedef long __intptr_t; typedef __int32_t __int_fast8_t; typedef __int32_t __int_fast16_t; typedef __int32_t __int_fast32_t; @@ -88,16 +102,27 @@ typedef __int16_t __int_least16_t; typedef __int32_t __int_least32_t; typedef __int64_t __int_least64_t; +#ifdef __mips64 +typedef __int64_t __ptrdiff_t; +typedef __int64_t __register_t; +typedef __int64_t __segsz_t; +typedef __uint64_t __size_t; +typedef __int64_t __ssize_t; +typedef __uint64_t __uintfptr_t; +typedef __uint64_t __uintptr_t; +typedef __int64_t f_register_t; +#else typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */ typedef __int32_t __register_t; -typedef __int32_t f_register_t; typedef __int32_t __segsz_t; /* segment size (in pages) */ typedef __uint32_t __size_t; /* sizeof() */ typedef __int32_t __ssize_t; /* byte count or error */ -typedef __int32_t __time_t; /* time()... */ -typedef unsigned long __uintfptr_t; +typedef __uint32_t __uintfptr_t; +typedef __uint32_t __uintptr_t; +typedef __int32_t f_register_t; +#endif +typedef __int64_t __time_t; /* time()... */ typedef __uint64_t __uintmax_t; -typedef __uint32_t __uintptr_t; typedef __uint32_t __uint_fast8_t; typedef __uint32_t __uint_fast16_t; typedef __uint32_t __uint_fast32_t; @@ -106,12 +131,19 @@ typedef __uint16_t __uint_least16_t; typedef __uint32_t __uint_least32_t; typedef __uint64_t __uint_least64_t; +#ifdef __mips64 +typedef __uint64_t __u_register_t; +typedef __uint64_t __vm_offset_t; +typedef __uint64_t __vm_paddr_t; +typedef __uint64_t __vm_size_t; +#else typedef __uint32_t __u_register_t; typedef __uint32_t __vm_offset_t; +typedef __uint32_t __vm_paddr_t; +typedef __uint32_t __vm_size_t; +#endif typedef __int64_t __vm_ooffset_t; -typedef __uint32_t __vm_paddr_t; typedef __uint64_t __vm_pindex_t; -typedef unsigned long __vm_size_t; /* * Unusual type definitions. From owner-p4-projects@FreeBSD.ORG Tue Jan 29 18:34:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAEDB16A41B; Tue, 29 Jan 2008 18:34:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97CF116A419 for ; Tue, 29 Jan 2008 18:34:36 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8876E13C457 for ; Tue, 29 Jan 2008 18:34:36 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TIYaGR098040 for ; Tue, 29 Jan 2008 18:34:36 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TIYapg098037 for perforce@freebsd.org; Tue, 29 Jan 2008 18:34:36 GMT (envelope-from rrs@cisco.com) Date: Tue, 29 Jan 2008 18:34:36 GMT Message-Id: <200801291834.m0TIYapg098037@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134403 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 18:34:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=134403 Change 134403 by rrs@rrs-mips2-jnpr on 2008/01/29 18:33:48 Takes out some of my earlier Octeon changes and gets the set down to the min that allow it to work. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#20 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#20 (text+ko) ==== @@ -93,11 +93,6 @@ GLOBAL(topstack) -#if defined(TARGET_OCTEON) - .set mips3 -#endif - - .set noreorder .text @@ -143,12 +138,6 @@ mtc0 t2, COP_0_STATUS_REG COP0_SYNC -#if defined(TARGET_OCTEON) - /* Clear cause register. */ - mtc0 zero, MIPS_COP_0_CAUSE - COP0_SYNC -#endif - /* Make sure KSEG0 is cached */ li t0, CFG_K0_CACHED mtc0 t0, MIPS_COP_0_CONFIG @@ -230,14 +219,8 @@ #endif -#if defined(TARGET_OCTEON) /* Maybe this is mips32/64 generic? */ - .set push - .set mips32r2 - rdhwr t0, $0 - .set pop -#else move t0, zero -#endif + /* Stage the secondary cpu start until later */ bne t0, zero, start_secondary nop From owner-p4-projects@FreeBSD.ORG Tue Jan 29 20:01:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40A8D16A47D; Tue, 29 Jan 2008 20:01:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 064F516A47A for ; Tue, 29 Jan 2008 20:01:10 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E9D9B13C4D5 for ; Tue, 29 Jan 2008 20:01:09 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TK191x004831 for ; Tue, 29 Jan 2008 20:01:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TK19j1004828 for perforce@freebsd.org; Tue, 29 Jan 2008 20:01:09 GMT (envelope-from imp@freebsd.org) Date: Tue, 29 Jan 2008 20:01:09 GMT Message-Id: <200801292001.m0TK19j1004828@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134408 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 20:01:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=134408 Change 134408 by imp@imp_lighthouse on 2008/01/29 20:00:49 We need to read the CPU id on octeons. Move setting the cause register to zero to be done always. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#21 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#21 (text+ko) ==== @@ -101,6 +101,8 @@ ASM_ENTRY(_start) VECTOR(_locore, unknown) /* UNSAFE TO USE a0..a3, since some bootloaders pass that to us */ + mtc0 zero, COP_0_CAUSE_REG # Clear soft interrupts + #if defined(TARGET_OCTEON) /* * t1: Bits to set explicitly: @@ -113,8 +115,6 @@ /* Reset these bits */ li t0, ~(MIPS_SR_DE | MIPS_SR_SOFT_RESET | MIPS_SR_ERL | MIPS_SR_EXL | MIPS_SR_INT_IE) #else - mtc0 zero, COP_0_CAUSE_REG # Clear soft interrupts - /* * t0: Bits to preserve if set: * Soft reset @@ -137,7 +137,6 @@ or t2, t1 mtc0 t2, COP_0_STATUS_REG COP0_SYNC - /* Make sure KSEG0 is cached */ li t0, CFG_K0_CACHED mtc0 t0, MIPS_COP_0_CONFIG @@ -219,7 +218,14 @@ #endif +#if defined(TARGET_OCTEON) /* Maybe this is mips32/64 generic? */ + .set push + .set mips32r2 + rdhwr t0, $0 + .set pop +#else move t0, zero +#endif /* Stage the secondary cpu start until later */ bne t0, zero, start_secondary From owner-p4-projects@FreeBSD.ORG Tue Jan 29 20:43:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 587E216A41B; Tue, 29 Jan 2008 20:43:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0610616A417 for ; Tue, 29 Jan 2008 20:43:57 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA0E113C46E for ; Tue, 29 Jan 2008 20:43:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TKhuid008861 for ; Tue, 29 Jan 2008 20:43:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TKhuV3008858 for perforce@freebsd.org; Tue, 29 Jan 2008 20:43:56 GMT (envelope-from sam@freebsd.org) Date: Tue, 29 Jan 2008 20:43:56 GMT Message-Id: <200801292043.m0TKhuV3008858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134411 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 20:43:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=134411 Change 134411 by sam@sam_ebb on 2008/01/29 20:43:26 promote rssadapt rate control algorithm and do a major overhaul to make it more device independent; seems to work though I may have broken it in the process (but the rssi logic looks very questionable and regardless using the cumulative avg rx rssi to control tx is way wrong--should be using ACK frames) Affected files ... .. //depot/projects/vap/sys/conf/files#14 edit .. //depot/projects/vap/sys/net80211/ieee80211_rssadapt.c#1 add .. //depot/projects/vap/sys/net80211/ieee80211_rssadapt.h#1 add Differences ... ==== //depot/projects/vap/sys/conf/files#14 (text+ko) ==== @@ -910,7 +910,6 @@ dev/puc/pucdata.c optional puc pci dev/ral/rt2560.c optional ral dev/ral/rt2661.c optional ral -dev/ral/if_ralrate.c optional ral dev/ral/if_ral_pci.c optional ral pci dev/random/harvest.c standard dev/random/hash.c optional random @@ -1679,6 +1678,7 @@ net80211/ieee80211_power.c optional wlan net80211/ieee80211_proto.c optional wlan net80211/ieee80211_regdomain.c optional wlan +net80211/ieee80211_rssadapt.c optional wlan_rssadapt net80211/ieee80211_scan.c optional wlan net80211/ieee80211_scan_sta.c optional wlan_scan_sta net80211/ieee80211_sta.c optional wlan From owner-p4-projects@FreeBSD.ORG Tue Jan 29 20:44:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F32A16A420; Tue, 29 Jan 2008 20:44:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 53B4C16A417 for ; Tue, 29 Jan 2008 20:44:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 421E913C44B for ; Tue, 29 Jan 2008 20:44:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TKiw6u008920 for ; Tue, 29 Jan 2008 20:44:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TKiwfe008917 for perforce@freebsd.org; Tue, 29 Jan 2008 20:44:58 GMT (envelope-from sam@freebsd.org) Date: Tue, 29 Jan 2008 20:44:58 GMT Message-Id: <200801292044.m0TKiwfe008917@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134412 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 20:44:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=134412 Change 134412 by sam@sam_ebb on 2008/01/29 20:44:56 convert ral to use wlan_rssadapt instead of its private copy of the code; this is mostly a first step towards ripping rssadapt use out entirely; lightly tested in sta mode on both 2560 and 2661 cards Affected files ... .. //depot/projects/vap/sys/dev/ral/if_ral_pci.c#5 edit .. //depot/projects/vap/sys/dev/ral/if_ralrate.c#4 delete .. //depot/projects/vap/sys/dev/ral/if_ralrate.h#4 delete .. //depot/projects/vap/sys/dev/ral/rt2560.c#12 edit .. //depot/projects/vap/sys/dev/ral/rt2560var.h#8 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#9 edit .. //depot/projects/vap/sys/dev/ral/rt2661var.h#6 edit .. //depot/projects/vap/sys/modules/ral/Makefile#5 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/if_ral_pci.c#5 (text+ko) ==== @@ -50,16 +50,17 @@ #include #include +#include #include #include -#include #include #include MODULE_DEPEND(ral, pci, 1, 1, 1); MODULE_DEPEND(ral, wlan, 1, 1, 1); +MODULE_DEPEND(ral, wlan_rssadapt, 1, 1, 1); struct ral_pci_ident { uint16_t vendor; ==== //depot/projects/vap/sys/dev/ral/rt2560.c#12 (text) ==== @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -62,7 +63,6 @@ #include #include -#include #include #include @@ -108,6 +108,7 @@ struct ieee80211_node_table *); static void rt2560_iter_func(void *, struct ieee80211_node *); static void rt2560_update_rssadapt(void *); +static void rt2560_newassoc(struct ieee80211_node *, int); static int rt2560_newstate(struct ieee80211vap *, enum ieee80211_state, int); static uint16_t rt2560_eeprom_read(struct rt2560_softc *, uint8_t); @@ -211,7 +212,6 @@ MTX_DEF | MTX_RECURSE); callout_init_mtx(&sc->watchdog_ch, &sc->sc_mtx, 0); - callout_init(&sc->rssadapt_ch, CALLOUT_MPSAFE); /* retrieve RT2560 rev. no */ sc->asic_rev = RAL_READ(sc, RT2560_CSR0); @@ -296,6 +296,7 @@ ieee80211_init_channels(ic, NULL, &bands); ieee80211_ifattach(ic); + ic->ic_newassoc = rt2560_newassoc; ic->ic_raw_xmit = rt2560_raw_xmit; ic->ic_updateslot = rt2560_update_slot; ic->ic_node_alloc = rt2560_node_alloc; @@ -358,7 +359,6 @@ rt2560_stop(sc); RAL_LOCK(sc); - callout_stop(&sc->rssadapt_ch); bpfdetach(ifp); ieee80211_ifdetach(ic); @@ -401,6 +401,9 @@ vap->iv_newstate = rt2560_newstate; vap->iv_update_beacon = rt2560_beacon_update; + callout_init(&rvp->rssadapt_ch, CALLOUT_MPSAFE); + ieee80211_rssadapt_init(&rvp->rssadapt, vap); + /* complete setup */ ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); ic->ic_opmode = opmode; @@ -412,6 +415,7 @@ { struct rt2560_vap *rvp = RT2560_VAP(vap); + callout_stop(&rvp->rssadapt_ch); ieee80211_vap_detach(vap); free(rvp, M_80211_VAP); } @@ -748,9 +752,10 @@ static void rt2560_iter_func(void *arg, struct ieee80211_node *ni) { - struct rt2560_node *rn = (struct rt2560_node *)ni; + struct ieee80211vap *vap = arg; - ral_rssadapt_updatestats(&rn->rssadapt); + if (ni->ni_vap == vap) + ieee80211_rssadapt_updatestats(&RT2560_NODE(ni)->rssadapt); } /* @@ -760,15 +765,25 @@ static void rt2560_update_rssadapt(void *arg) { - struct rt2560_softc *sc = arg; - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = arg; + struct rt2560_vap *rvp = RT2560_VAP(vap); + + if (vap->iv_opmode != IEEE80211_M_STA) { + struct ieee80211com *ic = vap->iv_ic; + ieee80211_iterate_nodes(&ic->ic_sta, rt2560_iter_func, arg); + } else + rt2560_iter_func(arg, vap->iv_bss); - RAL_LOCK(sc); + callout_reset(&rvp->rssadapt_ch, hz / 10, rt2560_update_rssadapt, vap); +} - ieee80211_iterate_nodes(&ic->ic_sta, rt2560_iter_func, arg); - callout_reset(&sc->rssadapt_ch, hz / 10, rt2560_update_rssadapt, sc); +static void +rt2560_newassoc(struct ieee80211_node *ni, int isnew) +{ + struct ieee80211vap *vap = ni->ni_vap; - RAL_UNLOCK(sc); + ieee80211_rssadapt_node_init(&RT2560_VAP(vap)->rssadapt, + &RT2560_NODE(ni)->rssadapt, ni); } static int @@ -776,6 +791,7 @@ { struct rt2560_vap *rvp = RT2560_VAP(vap); struct rt2560_softc *sc = vap->iv_ic->ic_ifp->if_softc; + const struct ieee80211_txparam *tp; enum ieee80211_state ostate; struct ieee80211_node *ni; struct mbuf *m; @@ -785,9 +801,9 @@ switch (nstate) { case IEEE80211_S_INIT: - callout_stop(&sc->rssadapt_ch); + if (ostate == IEEE80211_S_RUN) { + callout_stop(&rvp->rssadapt_ch); - if (ostate == IEEE80211_S_RUN) { /* abort TSF synchronization */ RAL_WRITE(sc, RT2560_CSR14, 0); @@ -824,15 +840,19 @@ rt2560_update_led(sc, 1, 0); if (vap->iv_opmode != IEEE80211_M_MONITOR) { - callout_reset(&sc->rssadapt_ch, hz / 10, - rt2560_update_rssadapt, sc); + if (vap->iv_opmode == IEEE80211_M_STA) { + /* fake a join to init the tx rate */ + rt2560_newassoc(ni, 1); + } + + tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; + if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) + callout_reset(&rvp->rssadapt_ch, hz / 10, + rt2560_update_rssadapt, vap); rt2560_enable_tsf_sync(sc); } break; - case IEEE80211_S_SCAN: - case IEEE80211_S_AUTH: - case IEEE80211_S_ASSOC: default: break; } @@ -958,6 +978,7 @@ struct rt2560_tx_desc *desc; struct rt2560_tx_data *data; struct rt2560_node *rn; + struct mbuf *m; bus_dmamap_sync(sc->txq.desc_dmat, sc->txq.desc_map, BUS_DMASYNC_POSTREAD); @@ -972,13 +993,14 @@ break; rn = (struct rt2560_node *)data->ni; + m = data->m; switch (le32toh(desc->flags) & RT2560_TX_RESULT_MASK) { case RT2560_TX_SUCCESS: DPRINTFN(sc, 10, "%s\n", "data frame sent successfully"); - if (data->id.id_node != NULL) { - ral_rssadapt_raise_rate(&rn->rssadapt, - &data->id); + if (data->rix != IEEE80211_FIXED_RATE_NONE) { + ieee80211_rssadapt_tx_complete(&rn->rssadapt, 1, + m->m_pkthdr.len, data->rix, data->rssi); } ifp->if_opackets++; break; @@ -992,9 +1014,9 @@ case RT2560_TX_FAIL_RETRY: DPRINTFN(sc, 9, "%s\n", "sending data frame failed (too much retries)"); - if (data->id.id_node != NULL) { - ral_rssadapt_lower_rate(data->ni, - &rn->rssadapt, &data->id); + if (data->rix != IEEE80211_FIXED_RATE_NONE) { + ieee80211_rssadapt_tx_complete(&rn->rssadapt, 0, + m->m_pkthdr.len, data->rix, data->rssi); } ifp->if_oerrors++; break; @@ -1010,7 +1032,7 @@ bus_dmamap_sync(sc->txq.data_dmat, data->map, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(sc->txq.data_dmat, data->map); - m_freem(data->m); + m_freem(m); data->m = NULL; ieee80211_free_node(data->ni); data->ni = NULL; @@ -1126,7 +1148,7 @@ /* * Some frames were processed by the hardware cipher engine and are ready for - * transmission to the IEEE802.11 layer. + * handoff to the IEEE802.11 layer. */ static void rt2560_decryption_intr(struct rt2560_softc *sc) @@ -1138,7 +1160,6 @@ bus_addr_t physaddr; struct ieee80211_frame *wh; struct ieee80211_node *ni; - struct rt2560_node *rn; struct mbuf *mnew, *m; int hw, error; @@ -1229,8 +1250,6 @@ htole64(((uint64_t)tsf_hi << 32) | tsf_lo); tap->wr_flags = 0; tap->wr_rate = rt2560_rxrate(desc); - tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq); - tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wr_antenna = sc->rx_ant; tap->wr_antsignal = RT2560_RSSI(sc, desc->rssi); @@ -1245,12 +1264,6 @@ if (ni != NULL) { (void) ieee80211_input(ni, m, RT2560_RSSI(sc, desc->rssi), RT2560_NOISE_FLOOR, 0); - - /* give rssi to the rate adatation algorithm */ - rn = (struct rt2560_node *)ni; - ral_rssadapt_input(ni, &rn->rssadapt, - RT2560_RSSI(sc, desc->rssi)); - ieee80211_free_node(ni); } else (void) ieee80211_input_all(ic, m, @@ -1538,7 +1551,8 @@ rt2560_tx_bcn(struct rt2560_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) { - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211com *ic = ni->ni_ic; struct rt2560_tx_desc *desc; struct rt2560_tx_data *data; bus_dma_segment_t segs[RT2560_MAX_SCATTER]; @@ -1547,7 +1561,8 @@ desc = &sc->bcnq.desc[sc->bcnq.cur]; data = &sc->bcnq.data[sc->bcnq.cur]; - rate = IEEE80211_IS_CHAN_5GHZ(ni->ni_chan) ? 12 : 2; + /* XXX maybe a separate beacon rate? */ + rate = vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)].mgmtrate; error = bus_dmamap_load_mbuf_sg(sc->bcnq.data_dmat, data->map, m0, segs, &nsegs, BUS_DMA_NOWAIT); @@ -1592,7 +1607,8 @@ rt2560_tx_mgt(struct rt2560_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) { - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211com *ic = ni->ni_ic; struct rt2560_tx_desc *desc; struct rt2560_tx_data *data; struct ieee80211_frame *wh; @@ -1605,7 +1621,7 @@ desc = &sc->prioq.desc[sc->prioq.cur]; data = &sc->prioq.data[sc->prioq.cur]; - rate = IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan) ? 12 : 2; + rate = vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)].mgmtrate; wh = mtod(m0, struct ieee80211_frame *); @@ -1640,6 +1656,8 @@ data->m = m0; data->ni = ni; + /* management frames are not taken into account for rssadapt */ + data->rix = IEEE80211_FIXED_RATE_NONE; wh = mtod(m0, struct ieee80211_frame *); @@ -1693,6 +1711,7 @@ rate = params->ibp_rate0 & IEEE80211_RATE_VAL; /* XXX validate */ if (rate == 0) { + /* XXX fall back to mcast/mgmt rate? */ m_freem(m0); return EINVAL; } @@ -1805,9 +1824,9 @@ struct ieee80211_rateset *rs; rs = &ni->ni_rates; - rn = (struct rt2560_node *)ni; - ni->ni_txrate = ral_rssadapt_choose(&rn->rssadapt, rs, wh, - m0->m_pkthdr.len, NULL, 0); + rn = RT2560_NODE(ni); + ni->ni_txrate = ieee80211_rssadapt_choose(&rn->rssadapt, rs, + m0->m_pkthdr.len); rate = rs->rs_rates[ni->ni_txrate]; } rate &= IEEE80211_RATE_VAL; @@ -1866,7 +1885,7 @@ data->ni = ni; /* RTS frames are not taken into account for rssadapt */ - data->id.id_node = NULL; + data->rix = IEEE80211_FIXED_RATE_NONE; rt2560_setup_tx_desc(sc, desc, RT2560_TX_ACK | RT2560_TX_MORE_FRAG, m->m_pkthdr.len, rtsrate, 1, @@ -1926,8 +1945,6 @@ tap->wt_flags = 0; tap->wt_rate = rate; - tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq); - tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wt_antenna = sc->tx_ant; bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); @@ -1938,13 +1955,11 @@ /* remember link conditions for rate adaptation algorithm */ if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) { - data->id.id_len = m0->m_pkthdr.len; - data->id.id_rateidx = ni->ni_txrate; - data->id.id_node = ni; + data->rix = ni->ni_txrate; /* XXX probably need last rssi value and not avg */ - data->id.id_rssi = ic->ic_node_getrssi(ni); + data->rssi = ic->ic_node_getrssi(ni); } else - data->id.id_node = NULL; + data->rix = IEEE80211_FIXED_RATE_NONE; if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2560_TX_ACK; @@ -2254,6 +2269,11 @@ RAL_LOCK(sc); rt2560_set_chan(sc, ic->ic_curchan); + + sc->sc_txtap.wt_chan_freq = htole16(ic->ic_curchan->ic_freq); + sc->sc_txtap.wt_chan_flags = htole16(ic->ic_curchan->ic_flags); + sc->sc_rxtap.wr_chan_freq = htole16(ic->ic_curchan->ic_freq); + sc->sc_rxtap.wr_chan_flags = htole16(ic->ic_curchan->ic_flags); RAL_UNLOCK(sc); } ==== //depot/projects/vap/sys/dev/ral/rt2560var.h#8 (text) ==== @@ -55,7 +55,8 @@ bus_dmamap_t map; struct mbuf *m; struct ieee80211_node *ni; - struct ral_rssdesc id; + uint8_t rix; + int8_t rssi; }; struct rt2560_tx_ring { @@ -94,12 +95,15 @@ struct rt2560_node { struct ieee80211_node ni; - struct ral_rssadapt rssadapt; + struct ieee80211_rssadapt_node rssadapt; }; +#define RT2560_NODE(ni) ((struct rt2560_node *)(ni)) struct rt2560_vap { struct ieee80211vap ral_vap; struct ieee80211_beacon_offsets ral_bo; + struct ieee80211_rssadapt rssadapt; + struct callout rssadapt_ch; int (*ral_newstate)(struct ieee80211vap *, enum ieee80211_state, int); @@ -116,7 +120,6 @@ struct mtx sc_mtx; struct callout watchdog_ch; - struct callout rssadapt_ch; int sc_tx_timer; int sc_invalid; ==== //depot/projects/vap/sys/dev/ral/rt2661.c#9 (text) ==== @@ -54,6 +54,7 @@ #include #include #include +#include #include #include @@ -61,7 +62,6 @@ #include #include -#include #include #include #include @@ -102,6 +102,7 @@ struct rt2661_rx_ring *); static struct ieee80211_node *rt2661_node_alloc( struct ieee80211_node_table *); +static void rt2661_newassoc(struct ieee80211_node *, int); static int rt2661_newstate(struct ieee80211vap *, enum ieee80211_state, int); static uint16_t rt2661_eeprom_read(struct rt2661_softc *, uint8_t); @@ -215,7 +216,6 @@ MTX_DEF | MTX_RECURSE); callout_init_mtx(&sc->watchdog_ch, &sc->sc_mtx, 0); - callout_init(&sc->rssadapt_ch, CALLOUT_MPSAFE); /* wait for NIC to initialize */ for (ntries = 0; ntries < 1000; ntries++) { @@ -327,6 +327,7 @@ ieee80211_init_channels(ic, NULL, &bands); ieee80211_ifattach(ic); + ic->ic_newassoc = rt2661_newassoc; ic->ic_node_alloc = rt2661_node_alloc; /* ic->ic_wme.wme_update = rt2661_wme_update;*/ ic->ic_scan_start = rt2661_scan_start; @@ -378,7 +379,6 @@ RAL_LOCK(sc); rt2661_stop_locked(sc); callout_stop(&sc->watchdog_ch); - callout_stop(&sc->rssadapt_ch); bpfdetach(ifp); ieee80211_ifdetach(ic); @@ -425,6 +425,9 @@ vap->iv_update_beacon = rt2661_beacon_update; #endif + callout_init(&rvp->rssadapt_ch, CALLOUT_MPSAFE); + ieee80211_rssadapt_init(&rvp->rssadapt, vap); + /* complete setup */ ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); ic->ic_opmode = opmode; @@ -436,6 +439,7 @@ { struct rt2661_vap *rvp = RT2661_VAP(vap); + callout_stop(&rvp->rssadapt_ch); ieee80211_vap_detach(vap); free(rvp, M_80211_VAP); } @@ -781,9 +785,10 @@ static void rt2661_iter_func(void *arg, struct ieee80211_node *ni) { - struct rt2661_node *rn = (struct rt2661_node *)ni; + struct ieee80211vap *vap = arg; - ral_rssadapt_updatestats(&rn->rssadapt); + if (ni->ni_vap == vap) + ieee80211_rssadapt_updatestats(&RT2661_NODE(ni)->rssadapt); } /* @@ -793,15 +798,25 @@ static void rt2661_update_rssadapt(void *arg) { - struct rt2661_softc *sc = arg; - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = arg; + struct rt2661_vap *rvp = RT2661_VAP(vap); + + if (vap->iv_opmode != IEEE80211_M_STA) { + struct ieee80211com *ic = vap->iv_ic; + ieee80211_iterate_nodes(&ic->ic_sta, rt2661_iter_func, arg); + } else + rt2661_iter_func(arg, vap->iv_bss); - RAL_LOCK(sc); + callout_reset(&rvp->rssadapt_ch, hz / 10, rt2661_update_rssadapt, vap); +} - ieee80211_iterate_nodes(&ic->ic_sta, rt2661_iter_func, arg); - callout_reset(&sc->rssadapt_ch, hz / 10, rt2661_update_rssadapt, sc); +static void +rt2661_newassoc(struct ieee80211_node *ni, int isnew) +{ + struct ieee80211vap *vap = ni->ni_vap; - RAL_UNLOCK(sc); + ieee80211_rssadapt_node_init(&RT2661_VAP(vap)->rssadapt, + &RT2661_NODE(ni)->rssadapt, ni); } static int @@ -810,6 +825,7 @@ struct rt2661_vap *rvp = RT2661_VAP(vap); struct ieee80211com *ic = vap->iv_ic; struct rt2661_softc *sc = ic->ic_ifp->if_softc; + const struct ieee80211_txparam *tp; enum ieee80211_state ostate; struct ieee80211_node *ni; uint32_t tmp; @@ -819,9 +835,9 @@ switch (nstate) { case IEEE80211_S_INIT: - callout_stop(&sc->rssadapt_ch); + if (ostate == IEEE80211_S_RUN) { + callout_stop(&rvp->rssadapt_ch); - if (ostate == IEEE80211_S_RUN) { /* abort TSF synchronization */ tmp = RAL_READ(sc, RT2661_TXRX_CSR9); RAL_WRITE(sc, RT2661_TXRX_CSR9, tmp & ~0x00ffffff); @@ -844,14 +860,19 @@ } if (vap->iv_opmode != IEEE80211_M_MONITOR) { - callout_reset(&sc->rssadapt_ch, hz / 10, - rt2661_update_rssadapt, sc); + if (vap->iv_opmode == IEEE80211_M_STA) { + /* fake a join to init the tx rate */ + rt2661_newassoc(ni, 1); + } + + tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; + if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) + callout_reset(&rvp->rssadapt_ch, hz / 10, + rt2661_update_rssadapt, vap); + rt2661_enable_tsf_sync(sc); } break; - case IEEE80211_S_SCAN: - case IEEE80211_S_AUTH: - case IEEE80211_S_ASSOC: default: break; } @@ -959,9 +980,10 @@ DPRINTFN(sc, 10, "data frame sent successfully after " "%d retries\n", retrycnt); - if (retrycnt == 0 && data->id.id_node != NULL) { - ral_rssadapt_raise_rate(&rn->rssadapt, - &data->id); + if (retrycnt == 0 && + data->rix != IEEE80211_FIXED_RATE_NONE) { + ieee80211_rssadapt_tx_complete(&rn->rssadapt, 1, + m->m_pkthdr.len, data->rix, data->rssi); } ifp->if_opackets++; break; @@ -969,9 +991,9 @@ case RT2661_TX_RETRY_FAIL: DPRINTFN(sc, 9, "%s\n", "sending data frame failed (too much retries)"); - if (data->id.id_node != NULL) { - ral_rssadapt_lower_rate(ni, - &rn->rssadapt, &data->id); + if (data->rix != IEEE80211_FIXED_RATE_NONE) { + ieee80211_rssadapt_tx_complete(&rn->rssadapt, 0, + m->m_pkthdr.len, data->rix, data->rssi); } ifp->if_oerrors++; break; @@ -1043,7 +1065,6 @@ bus_addr_t physaddr; struct ieee80211_frame *wh; struct ieee80211_node *ni; - struct rt2661_node *rn; struct mbuf *mnew, *m; int error; @@ -1139,8 +1160,6 @@ htole64(((uint64_t)tsf_hi << 32) | tsf_lo); tap->wr_flags = 0; tap->wr_rate = rt2661_rxrate(desc); - tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq); - tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wr_antsignal = rssi < 0 ? 0 : rssi; bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); @@ -1159,11 +1178,6 @@ (void) ieee80211_input(ni, m, rssi, RT2661_NOISE_FLOOR, 0); - - /* give rssi to the rate adatation algorithm */ - rn = (struct rt2661_node *)ni; - ral_rssadapt_input(ni, &rn->rssadapt, rssi); - ieee80211_free_node(ni); } else (void) ieee80211_input_all(ic, m, rssi, @@ -1462,7 +1476,8 @@ rt2661_tx_mgt(struct rt2661_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) { - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211com *ic = ni->ni_ic; struct rt2661_tx_desc *desc; struct rt2661_tx_data *data; struct ieee80211_frame *wh; @@ -1475,8 +1490,7 @@ desc = &sc->mgtq.desc[sc->mgtq.cur]; data = &sc->mgtq.data[sc->mgtq.cur]; - /* send mgt frames at the lowest available rate */ - rate = IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan) ? 12 : 2; + rate = vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)].mgmtrate; wh = mtod(m0, struct ieee80211_frame *); @@ -1502,14 +1516,14 @@ tap->wt_flags = 0; tap->wt_rate = rate; - tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq); - tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); } data->m = m0; data->ni = ni; + /* management frames are not taken into account for rssadapt */ + data->rix = IEEE80211_FIXED_RATE_NONE; wh = mtod(m0, struct ieee80211_frame *); @@ -1608,8 +1622,8 @@ rs = &ni->ni_rates; rn = (struct rt2661_node *)ni; - ni->ni_txrate = ral_rssadapt_choose(&rn->rssadapt, rs, - wh, m0->m_pkthdr.len, NULL, 0); + ni->ni_txrate = ieee80211_rssadapt_choose(&rn->rssadapt, rs, + m0->m_pkthdr.len); rate = rs->rs_rates[ni->ni_txrate]; } rate &= IEEE80211_RATE_VAL; @@ -1672,7 +1686,7 @@ data->ni = ni; /* RTS frames are not taken into account for rssadapt */ - data->id.id_node = NULL; + data->rix = IEEE80211_FIXED_RATE_NONE; rt2661_setup_tx_desc(sc, desc, RT2661_TX_NEED_ACK | RT2661_TX_MORE_FRAG, 0, m->m_pkthdr.len, rtsrate, segs, @@ -1742,13 +1756,11 @@ /* remember link conditions for rate adaptation algorithm */ if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) { - data->id.id_len = m0->m_pkthdr.len; - data->id.id_rateidx = ni->ni_txrate; - data->id.id_node = ni; - /* XXX probably want last value, not avg */ - data->id.id_rssi = ic->ic_node_getrssi(ni); + data->rix = ni->ni_txrate; + /* XXX probably need last rssi value and not avg */ + data->rssi = ic->ic_node_getrssi(ni); } else - data->id.id_node = NULL; + data->rix = IEEE80211_FIXED_RATE_NONE; if (!noack && !IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2661_TX_NEED_ACK; @@ -2166,8 +2178,7 @@ u_int i, chan; chan = ieee80211_chan2ieee(ic, c); - if (chan == 0 || chan == IEEE80211_CHAN_ANY) - return; + KASSERT(chan != 0 && chan != IEEE80211_CHAN_ANY, ("chan 0x%x", chan)); /* select the appropriate RF settings based on what EEPROM says */ rfprog = (sc->rfprog == 0) ? rt2661_rf5225_1 : rt2661_rf5225_2; @@ -2956,6 +2967,11 @@ RAL_LOCK(sc); rt2661_set_chan(sc, ic->ic_curchan); + + sc->sc_txtap.wt_chan_freq = htole16(ic->ic_curchan->ic_freq); + sc->sc_txtap.wt_chan_flags = htole16(ic->ic_curchan->ic_flags); + sc->sc_rxtap.wr_chan_freq = htole16(ic->ic_curchan->ic_freq); + sc->sc_rxtap.wr_chan_flags = htole16(ic->ic_curchan->ic_flags); RAL_UNLOCK(sc); } ==== //depot/projects/vap/sys/dev/ral/rt2661var.h#6 (text) ==== @@ -51,7 +51,8 @@ bus_dmamap_t map; struct mbuf *m; struct ieee80211_node *ni; - struct ral_rssdesc id; + uint8_t rix; + int8_t rssi; }; struct rt2661_tx_ring { @@ -87,11 +88,14 @@ struct rt2661_node { struct ieee80211_node ni; - struct ral_rssadapt rssadapt; + struct ieee80211_rssadapt_node rssadapt; }; +#define RT2661_NODE(ni) ((struct rt2661_node *)(ni)) struct rt2661_vap { struct ieee80211vap ral_vap; + struct ieee80211_rssadapt rssadapt; + struct callout rssadapt_ch; int (*ral_newstate)(struct ieee80211vap *, enum ieee80211_state, int); @@ -108,7 +112,6 @@ struct mtx sc_mtx; struct callout watchdog_ch; - struct callout rssadapt_ch; int sc_tx_timer; int sc_invalid; ==== //depot/projects/vap/sys/modules/ral/Makefile#5 (text+ko) ==== @@ -2,8 +2,8 @@ .PATH: ${.CURDIR}/../../dev/ral -KMOD = if_ral -SRCS = rt2560.c rt2661.c if_ralrate.c if_ral_pci.c \ - device_if.h bus_if.h pci_if.h +KMOD= if_ral +SRCS= rt2560.c rt2661.c if_ral_pci.c +SRCS+= device_if.h bus_if.h pci_if.h .include From owner-p4-projects@FreeBSD.ORG Tue Jan 29 20:49:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2AA516A421; Tue, 29 Jan 2008 20:49:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5FBBD16A41B for ; Tue, 29 Jan 2008 20:49:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3735F13C467 for ; Tue, 29 Jan 2008 20:49:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TKn4vU017978 for ; Tue, 29 Jan 2008 20:49:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TKn4Et017975 for perforce@freebsd.org; Tue, 29 Jan 2008 20:49:04 GMT (envelope-from sam@freebsd.org) Date: Tue, 29 Jan 2008 20:49:04 GMT Message-Id: <200801292049.m0TKn4Et017975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134413 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 20:49:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=134413 Change 134413 by sam@sam_ebb on 2008/01/29 20:48:43 add wlan_rssadapt module glue Affected files ... .. //depot/projects/vap/sys/modules/Makefile#10 edit .. //depot/projects/vap/sys/modules/wlan_rssadapt/Makefile#1 add Differences ... ==== //depot/projects/vap/sys/modules/Makefile#10 (text+ko) ==== @@ -304,6 +304,7 @@ wlan_acl \ wlan_amrr \ wlan_ccmp \ + wlan_rssadapt \ wlan_scan_sta \ wlan_tkip \ wlan_wep \ From owner-p4-projects@FreeBSD.ORG Tue Jan 29 21:21:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D02416A41B; Tue, 29 Jan 2008 21:21:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6FE816A418 for ; Tue, 29 Jan 2008 21:21:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C6DE613C465 for ; Tue, 29 Jan 2008 21:21:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TLLbP5027618 for ; Tue, 29 Jan 2008 21:21:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TLLbjt027615 for perforce@freebsd.org; Tue, 29 Jan 2008 21:21:37 GMT (envelope-from jb@freebsd.org) Date: Tue, 29 Jan 2008 21:21:37 GMT Message-Id: <200801292121.m0TLLbjt027615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134414 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 21:21:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=134414 Change 134414 by jb@jb_freebsd1 on 2008/01/29 21:20:54 Undo an over-merge. Affected files ... .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/proc.h#4 edit Differences ... ==== //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/proc.h#4 (text+ko) ==== @@ -75,12 +75,12 @@ ASSERT(len == 0); ASSERT(state == TS_RUN); - error = kproc_create(proc, arg, &p, 0, ZFS_KSTACK_PAGES, + error = kthread_create(proc, arg, &p, 0, ZFS_KSTACK_PAGES, "solthread %p", proc); return (error == 0 ? FIRST_THREAD_IN_PROC(p) : NULL); } -#define thread_exit() kproc_exit(0) +#define thread_exit() kthread_exit(0) #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Tue Jan 29 22:13:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C999716A421; Tue, 29 Jan 2008 22:13:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8EA4A16A418 for ; Tue, 29 Jan 2008 22:13:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 75EA413C46A for ; Tue, 29 Jan 2008 22:13:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TMDWvp031677 for ; Tue, 29 Jan 2008 22:13:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TMDVwv031674 for perforce@freebsd.org; Tue, 29 Jan 2008 22:13:31 GMT (envelope-from jb@freebsd.org) Date: Tue, 29 Jan 2008 22:13:31 GMT Message-Id: <200801292213.m0TMDVwv031674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134416 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 22:13:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=134416 Change 134416 by jb@jb_freebsd1 on 2008/01/29 22:13:29 Undo the over lerge of the locking changes from current. Affected files ... .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 edit .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#4 edit .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/vnode.h#3 edit .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#4 edit .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 edit .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 edit .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#4 edit .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 edit .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 edit .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 edit Differences ... ==== //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 (text+ko) ==== @@ -77,12 +77,12 @@ flags = FREAD; NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, file, td); - error = vn_open_cred(&nd, &flags, 0, curthread->td_ucred, NULL); + error = vn_open_cred(&nd, &flags, 0, td->td_ucred, NULL); NDFREE(&nd, NDF_ONLY_PNBUF); if (error != 0) return (NULL); /* We just unlock so we hold a reference. */ - VOP_UNLOCK(nd.ni_vp, 0); + VOP_UNLOCK(nd.ni_vp, 0, td); return (nd.ni_vp); } @@ -123,9 +123,9 @@ struct vattr va; int error; - vn_lock(vp, LK_SHARED | LK_RETRY); + vn_lock(vp, LK_SHARED | LK_RETRY, td); error = VOP_GETATTR(vp, &va, td->td_ucred, td); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp, 0, td); if (error == 0) *size = (uint64_t)va.va_size; return (error); @@ -176,9 +176,9 @@ auio.uio_resid = size; auio.uio_td = td; - vn_lock(vp, LK_SHARED | LK_RETRY); + vn_lock(vp, LK_SHARED | LK_RETRY, td); error = VOP_READ(vp, &auio, IO_UNIT | IO_SYNC, td->td_ucred); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp, 0, td); return (error != 0 ? -1 : size - auio.uio_resid); } ==== //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#4 (text+ko) ==== @@ -192,9 +192,9 @@ /* * Allocate and initialize the filesystem. */ - vn_lock(vp, LK_SHARED | LK_RETRY); + vn_lock(vp, LK_SHARED | LK_RETRY, td); mp = vfs_mount_alloc(vp, vfsp, fspath, td); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp, 0, td); mp->mnt_optnew = NULL; vfs_setmntopt(mp, "from", fspec, 0); @@ -238,7 +238,7 @@ * mnt_optnew. */ mp->mnt_optnew = NULL; - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); /* * Put the new filesystem on the mount list after root. */ @@ -260,7 +260,7 @@ panic("mount: lost mount"); mountcheckdirs(vp, mvp); vput(mvp); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp, 0, td); if ((mp->mnt_flag & MNT_RDONLY) == 0) error = vfs_allocate_syncvnode(mp); vfs_unbusy(mp, td); @@ -272,7 +272,7 @@ VI_LOCK(vp); vp->v_iflag &= ~VI_MOUNT; VI_UNLOCK(vp); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp, 0, td); vfs_unbusy(mp, td); vfs_mount_destroy(mp); } ==== //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/vnode.h#3 (text+ko) ==== @@ -175,7 +175,7 @@ if (error == 0) { /* We just unlock so we hold a reference. */ VN_HOLD(nd.ni_vp); - VOP_UNLOCK(nd.ni_vp, 0); + VOP_UNLOCK(nd.ni_vp, 0, td); *vpp = nd.ni_vp; } return (error); @@ -213,6 +213,7 @@ static __inline int zfs_vop_fsync(vnode_t *vp, int flag, cred_t *cr) { + struct thread *td = curthread; struct mount *mp; int error, vfslocked; @@ -221,9 +222,9 @@ vfslocked = VFS_LOCK_GIANT(vp->v_mount); if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) goto drop; - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); - error = VOP_FSYNC(vp, MNT_WAIT, curthread); - VOP_UNLOCK(vp, 0); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + error = VOP_FSYNC(vp, MNT_WAIT, td); + VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); drop: VFS_UNLOCK_GIANT(vfslocked); ==== //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#4 (text+ko) ==== @@ -321,7 +321,7 @@ VN_HOLD(pvp); *vpp = pvp; } - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curthread); return (0); } ==== //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 (text+ko) ==== @@ -207,7 +207,7 @@ ctx->gc_state = 2; wakeup_one(&ctx->gc_state); mtx_unlock(&ctx->gc_queue_mtx); - kproc_exit(0); + kthread_exit(0); } msleep(&ctx->gc_queue, &ctx->gc_queue_mtx, PRIBIO | PDROP, "vgeom:io", 0); @@ -440,7 +440,7 @@ vd->vdev_tsd = ctx; - kproc_create(vdev_geom_worker, ctx, NULL, 0, 0, "vdev:worker %s", + kthread_create(vdev_geom_worker, ctx, NULL, 0, 0, "vdev:worker %s", pp->name); return (0); ==== //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 (text+ko) ==== @@ -391,7 +391,7 @@ if (strcmp(nm, "..") == 0) { err = VFS_ROOT(dvp->v_vfsp, LK_EXCLUSIVE, vpp, curthread); if (err == 0) - VOP_UNLOCK(*vpp, 0); + VOP_UNLOCK(*vpp, 0, curthread); } else { err = gfs_dir_lookup(dvp, nm, vpp); } @@ -429,7 +429,7 @@ err = zfsctl_root_lookup(dvp, nm, vpp, NULL, 0, NULL, cr); if (err == 0 && (nm[0] != '.' || nm[1] != '\0')) - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curthread); return (err); } @@ -692,7 +692,7 @@ */ goto domount; } - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curthread); mutex_exit(&sdp->sd_lock); ZFS_EXIT(zfsvfs); return (0); @@ -732,7 +732,7 @@ kmem_free(mountpoint, mountpoint_len); /* FreeBSD: This line was moved from below to avoid a lock recursion. */ if (err == 0) - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curthread); mutex_exit(&sdp->sd_lock); /* @@ -882,7 +882,7 @@ VERIFY(gfs_dir_lookup(vp, "..", &dvp) == 0); sdp = dvp->v_data; - VOP_UNLOCK(dvp, 0); + VOP_UNLOCK(dvp, 0, curthread); if (!(locked = MUTEX_HELD(&sdp->sd_lock))) mutex_enter(&sdp->sd_lock); ==== //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#4 (text+ko) ==== @@ -109,7 +109,7 @@ cn.cn_thread = curthread; cn.cn_flags = SAVENAME; - vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY); + vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY, curthread); switch ((int)lr->lr_common.lrc_txtype) { case TX_CREATE: error = VOP_CREATE(ZTOV(dzp), &vp, &cn, &va); @@ -127,10 +127,10 @@ default: error = ENOTSUP; } - VOP_UNLOCK(ZTOV(dzp), 0); + VOP_UNLOCK(ZTOV(dzp), 0, curthread); if (error == 0 && vp != NULL) { - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp, 0, curthread); VN_RELE(vp); } @@ -162,10 +162,10 @@ cn.cn_lkflags = LK_EXCLUSIVE | LK_RETRY; cn.cn_cred = kcred; cn.cn_thread = curthread; - vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY); + vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY, curthread); error = VOP_LOOKUP(ZTOV(dzp), &vp, &cn); if (error != 0) { - VOP_UNLOCK(ZTOV(dzp), 0); + VOP_UNLOCK(ZTOV(dzp), 0, curthread); goto fail; } @@ -180,7 +180,7 @@ error = ENOTSUP; } vput(vp); - VOP_UNLOCK(ZTOV(dzp), 0); + VOP_UNLOCK(ZTOV(dzp), 0, curthread); fail: VN_RELE(ZTOV(dzp)); @@ -211,11 +211,11 @@ cn.cn_thread = curthread; cn.cn_flags = SAVENAME; - vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY); - vn_lock(ZTOV(zp), LK_EXCLUSIVE | LK_RETRY); + vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY, curthread); + vn_lock(ZTOV(zp), LK_EXCLUSIVE | LK_RETRY, curthread); error = VOP_LINK(ZTOV(dzp), ZTOV(zp), &cn); - VOP_UNLOCK(ZTOV(zp), 0); - VOP_UNLOCK(ZTOV(dzp), 0); + VOP_UNLOCK(ZTOV(zp), 0, curthread); + VOP_UNLOCK(ZTOV(dzp), 0, curthread); VN_RELE(ZTOV(zp)); VN_RELE(ZTOV(dzp)); @@ -255,12 +255,12 @@ scn.cn_lkflags = LK_EXCLUSIVE | LK_RETRY; scn.cn_cred = kcred; scn.cn_thread = td; - vn_lock(ZTOV(sdzp), LK_EXCLUSIVE | LK_RETRY); + vn_lock(ZTOV(sdzp), LK_EXCLUSIVE | LK_RETRY, curthread); error = VOP_LOOKUP(ZTOV(sdzp), &svp, &scn); - VOP_UNLOCK(ZTOV(sdzp), 0); + VOP_UNLOCK(ZTOV(sdzp), 0, curthread); if (error != 0) goto fail; - VOP_UNLOCK(svp, 0); + VOP_UNLOCK(svp, 0, curthread); bzero(&tcn, sizeof(tcn)); tcn.cn_nameptr = tname; @@ -270,12 +270,12 @@ tcn.cn_lkflags = LK_EXCLUSIVE | LK_RETRY; tcn.cn_cred = kcred; tcn.cn_thread = td; - vn_lock(ZTOV(tdzp), LK_EXCLUSIVE | LK_RETRY); + vn_lock(ZTOV(tdzp), LK_EXCLUSIVE | LK_RETRY, curthread); error = VOP_LOOKUP(ZTOV(tdzp), &tvp, &tcn); if (error == EJUSTRETURN) tvp = NULL; else if (error != 0) { - VOP_UNLOCK(ZTOV(tdzp), 0); + VOP_UNLOCK(ZTOV(tdzp), 0, curthread); goto fail; } @@ -360,9 +360,9 @@ ZFS_TIME_DECODE(&va.va_mtime, lr->lr_mtime); vp = ZTOV(zp); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread); error = VOP_SETATTR(vp, &va, kcred, curthread); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp, 0, curthread); VN_RELE(vp); return (error); ==== //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 (text+ko) ==== @@ -663,7 +663,7 @@ error = zfs_zget(zfsvfs, zfsvfs->z_root, &rootzp); if (error == 0) { *vpp = ZTOV(rootzp); - error = vn_lock(*vpp, flags); + error = vn_lock(*vpp, flags, td); (*vpp)->v_vflag |= VV_ROOT; } @@ -763,7 +763,7 @@ *vpp = NULL; else { *vpp = ZTOV(zp); - vn_lock(*vpp, flags); + vn_lock(*vpp, flags, curthread); } ZFS_EXIT(zfsvfs); return (err); @@ -830,7 +830,7 @@ } ZFS_EXIT(zfsvfs); /* XXX: LK_RETRY? */ - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, td); return (0); } @@ -853,7 +853,7 @@ *vpp = ZTOV(zp); /* XXX: LK_RETRY? */ - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, td); vnode_create_vobject(*vpp, zp->z_phys->zp_size, td); ZFS_EXIT(zfsvfs); return (0); ==== //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 (text+ko) ==== @@ -1114,11 +1114,11 @@ if (cnp->cn_flags & ISDOTDOT) { ltype = VOP_ISLOCKED(dvp, td); - VOP_UNLOCK(dvp, 0); + VOP_UNLOCK(dvp, 0, td); } - error = vn_lock(*vpp, cnp->cn_lkflags); + error = vn_lock(*vpp, cnp->cn_lkflags, td); if (cnp->cn_flags & ISDOTDOT) - vn_lock(dvp, ltype | LK_RETRY); + vn_lock(dvp, ltype | LK_RETRY, td); if (error != 0) { VN_RELE(*vpp); *vpp = NULL; @@ -1302,7 +1302,7 @@ if (error == 0) { *vpp = ZTOV(zp); - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, td); } if (dl) @@ -1584,7 +1584,7 @@ zfs_log_create(zilog, tx, TX_MKDIR, dzp, zp, dirname); dmu_tx_commit(tx); - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curthread); zfs_dirent_unlock(dl); @@ -2769,7 +2769,7 @@ if (error == 0) { zfs_log_symlink(zilog, tx, TX_SYMLINK, dzp, zp, name, link); *vpp = ZTOV(zp); - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); + vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, td); } dmu_tx_commit(tx); ==== //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 (text+ko) ==== @@ -85,9 +85,9 @@ ZTOV(zp) = NULL; vhold(vp); mutex_exit(&zp->z_lock); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread); vrecycle(vp, curthread); - VOP_UNLOCK(vp, 0); + VOP_UNLOCK(vp, 0, curthread); vdrop(vp); zfs_znode_free(zp); } else { From owner-p4-projects@FreeBSD.ORG Tue Jan 29 22:22:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 234B916A41A; Tue, 29 Jan 2008 22:22:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C42B116A417 for ; Tue, 29 Jan 2008 22:22:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B2BFF13C45B for ; Tue, 29 Jan 2008 22:22:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TMMiFD032253 for ; Tue, 29 Jan 2008 22:22:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TMMimj032250 for perforce@freebsd.org; Tue, 29 Jan 2008 22:22:44 GMT (envelope-from jb@freebsd.org) Date: Tue, 29 Jan 2008 22:22:44 GMT Message-Id: <200801292222.m0TMMimj032250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134418 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 22:22:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=134418 Change 134418 by jb@jb_freebsd1 on 2008/01/29 22:22:28 Manual merge from the dtrace project. Affected files ... .. //depot/projects/dtrace7/src/sys/modules/Makefile#4 integrate .. //depot/projects/dtrace7/src/sys/modules/zfs/Makefile#3 integrate Differences ... ==== //depot/projects/dtrace7/src/sys/modules/Makefile#4 (text+ko) ==== @@ -23,6 +23,7 @@ ${_arcmsr} \ ${_arcnet} \ ${_arl} \ + ${_asmc} \ ${_asr} \ ata \ ${_ath} \ @@ -64,6 +65,9 @@ cue \ cxgb \ ${_cx} \ + cxgb \ + ${_cyclic} \ + ${_cyclic_test} \ dc \ dcons \ dcons_crom \ @@ -71,6 +75,7 @@ ${_digi} \ ${_dpt} \ ${_drm} \ + ${_dtrace} \ dummynet \ ${_ed} \ ${_elink} \ @@ -124,8 +129,8 @@ ipdivert \ ${_ipfilter} \ ipfw \ + ${_ipmi} \ ip_mroute_mod \ - ${_ipmi} \ ${_ips} \ ${_ipw} \ ${_ipwfw} \ @@ -192,7 +197,9 @@ ${_nve} \ ${_nvram} \ ${_nwfs} \ + ${_nxge} \ ${_oltr} \ + ${_opensolaris} \ ${_padlock} \ patm \ ${_pccard} \ @@ -306,6 +313,8 @@ wlan_acl \ wlan_amrr \ wlan_ccmp \ + wlan_scan_ap \ + wlan_scan_sta \ wlan_tkip \ wlan_wep \ wlan_xauth \ @@ -378,8 +387,15 @@ _cp= cp _cpufreq= cpufreq _cs= cs +.if ${MK_CDDL} != "no" || defined(ALL_MODULES) +_cyclic= cyclic +_cyclic_test= cyclic_test +.endif _digi= digi _drm= drm +.if ${MK_CDDL} != "no" || defined(ALL_MODULES) +_dtrace= dtrace +.endif _ed= ed _elink= elink _em= em @@ -408,6 +424,9 @@ _nwfs= nwfs .endif _oltr= oltr +.if ${MK_CDDL} != "no" || defined(ALL_MODULES) +_opensolaris= opensolaris +.endif _pccard= pccard _pcfclock= pcfclock _pecoff= pecoff @@ -425,7 +444,7 @@ _sr= sr _stg= stg _streams= streams -_tmpfs= tmpfs +_tmpfs= tmpfs _wi= wi _xe= xe .if ${MK_ZFS} != "no" || defined(ALL_MODULES) @@ -437,6 +456,7 @@ _ahb= ahb _arcmsr= arcmsr _arl= arl +_asmc= asmc _asr= asr _bios= bios _ciss= ciss @@ -491,6 +511,7 @@ _agp= agp _an= an _arcmsr= arcmsr +_asmc= asmc _ath= ath _ath_hal= ath_hal _ath_rate_amrr= ath_rate_amrr @@ -501,8 +522,15 @@ _ciss= ciss _coretemp= coretemp _cpufreq= cpufreq +.if ${MK_CDDL} != "no" || defined(ALL_MODULES) +_cyclic= cyclic +_cyclic_test= cyclic_test +.endif _digi= digi _drm= drm +.if ${MK_CDDL} != "no" || defined(ALL_MODULES) +_dtrace= dtrace +.endif _ed= ed _em= em _exca= exca @@ -530,6 +558,9 @@ _nve= nve _nvram= nvram _nxge= nxge +.if ${MK_CDDL} != "no" || defined(ALL_MODULES) +_opensolaris= opensolaris +.endif _pccard= pccard _rr232x= rr232x _safe= safe @@ -555,9 +586,9 @@ # acpi is not enabled because it is broken as a module on ia64 _aic= aic #_ar= ar not 64-bit clean +_an= an _arcnet= arcnet _asr= asr -_an= an _bktr= bktr _cardbus= cardbus _cbb= cbb ==== //depot/projects/dtrace7/src/sys/modules/zfs/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.6 2007/06/08 12:35:47 pjd Exp $ +# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.7 2007/11/28 22:58:09 jb Exp $ KMOD= zfs @@ -12,7 +12,6 @@ SRCS+= nvpair.c .PATH: ${.CURDIR}/../../compat/opensolaris/kern -SRCS+= opensolaris_kmem.c SRCS+= opensolaris_kobj.c SRCS+= opensolaris_kstat.c SRCS+= opensolaris_misc.c @@ -21,14 +20,6 @@ SRCS+= opensolaris_vfs.c SRCS+= opensolaris_zone.c -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" -.PATH: ${.CURDIR}/../../contrib/opensolaris/common/atomic/${MACHINE_ARCH} -SRCS+= atomic.S -.else -.PATH: ${.CURDIR}/../../compat/opensolaris/kern -SRCS+= opensolaris_atomic.c -.endif - .PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/fs SRCS+= gfs.c From owner-p4-projects@FreeBSD.ORG Tue Jan 29 22:40:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73F9D16A41B; Tue, 29 Jan 2008 22:40:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20D2716A46C for ; Tue, 29 Jan 2008 22:40:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1014413C459 for ; Tue, 29 Jan 2008 22:40:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TMe3Sj032979 for ; Tue, 29 Jan 2008 22:40:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TMe2MK032975 for perforce@freebsd.org; Tue, 29 Jan 2008 22:40:02 GMT (envelope-from jb@freebsd.org) Date: Tue, 29 Jan 2008 22:40:02 GMT Message-Id: <200801292240.m0TMe2MK032975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134419 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 22:40:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=134419 Change 134419 by jb@jb_freebsd1 on 2008/01/29 22:39:09 Merge the SMP_MAXCPU definitions from the dtrace project. Affected files ... .. //depot/projects/dtrace7/src/sys/amd64/include/param.h#2 edit .. //depot/projects/dtrace7/src/sys/arm/include/param.h#2 edit .. //depot/projects/dtrace7/src/sys/i386/include/param.h#2 edit .. //depot/projects/dtrace7/src/sys/ia64/include/param.h#2 edit .. //depot/projects/dtrace7/src/sys/modules/Makefile#5 edit .. //depot/projects/dtrace7/src/sys/pc98/include/param.h#2 edit .. //depot/projects/dtrace7/src/sys/powerpc/include/param.h#2 edit .. //depot/projects/dtrace7/src/sys/sparc64/include/param.h#2 edit .. //depot/projects/dtrace7/src/sys/sun4v/include/param.h#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/amd64/include/param.h#2 (text+ko) ==== @@ -79,8 +79,9 @@ #define MACHINE_ARCH "amd64" #endif +#define SMP_MAXCPU 16 #ifdef SMP -#define MAXCPU 16 +#define MAXCPU SMP_MAXCPU #else #define MAXCPU 1 #endif ==== //depot/projects/dtrace7/src/sys/arm/include/param.h#2 (text+ko) ==== @@ -72,8 +72,9 @@ #endif #define MID_MACHINE MID_ARM6 +#define SMP_MAXCPU 2 #ifdef SMP -#define MAXCPU 2 +#define MAXCPU SMP_MAXCPU #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace7/src/sys/i386/include/param.h#2 (text+ko) ==== @@ -65,8 +65,9 @@ #endif #define MID_MACHINE MID_I386 +#define SMP_MAXCPU 16 #ifdef SMP -#define MAXCPU 16 +#define MAXCPU SMP_MAXCPU #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace7/src/sys/ia64/include/param.h#2 (text+ko) ==== @@ -78,8 +78,9 @@ #define MACHINE_ARCH "ia64" #endif +#define SMP_MAXCPU 4 #ifdef SMP -#define MAXCPU 4 +#define MAXCPU SMP_MAXCPU #else #define MAXCPU 1 #endif ==== //depot/projects/dtrace7/src/sys/modules/Makefile#5 (text+ko) ==== @@ -23,7 +23,6 @@ ${_arcmsr} \ ${_arcnet} \ ${_arl} \ - ${_asmc} \ ${_asr} \ ata \ ${_ath} \ @@ -456,7 +455,6 @@ _ahb= ahb _arcmsr= arcmsr _arl= arl -_asmc= asmc _asr= asr _bios= bios _ciss= ciss @@ -511,7 +509,6 @@ _agp= agp _an= an _arcmsr= arcmsr -_asmc= asmc _ath= ath _ath_hal= ath_hal _ath_rate_amrr= ath_rate_amrr ==== //depot/projects/dtrace7/src/sys/pc98/include/param.h#2 (text+ko) ==== ==== //depot/projects/dtrace7/src/sys/powerpc/include/param.h#2 (text+ko) ==== @@ -67,8 +67,9 @@ #endif #define MID_MACHINE MID_POWERPC +#define SMP_MAXCPU 2 #ifdef SMP -#define MAXCPU 2 +#define MAXCPU SMP_MAXCPU #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace7/src/sys/sparc64/include/param.h#2 (text+ko) ==== @@ -59,8 +59,9 @@ #endif #define MID_MACHINE MID_SPARC64 +#define SMP_MAXCPU 16 #ifdef SMP -#define MAXCPU 16 +#define MAXCPU SMP_MAXCPU #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace7/src/sys/sun4v/include/param.h#2 (text+ko) ==== @@ -59,8 +59,9 @@ #endif #define MID_MACHINE MID_SPARC64 +#define SMP_MAXCPU 32 #ifdef SMP -#define MAXCPU 32 +#define MAXCPU SMP_MAXCPU #else #define MAXCPU 1 #endif /* SMP */ From owner-p4-projects@FreeBSD.ORG Tue Jan 29 22:42:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3B8516A421; Tue, 29 Jan 2008 22:42:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60AAA16A41B for ; Tue, 29 Jan 2008 22:42:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4FAC013C45A for ; Tue, 29 Jan 2008 22:42:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TMg6ES033212 for ; Tue, 29 Jan 2008 22:42:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TMg6Zc033209 for perforce@freebsd.org; Tue, 29 Jan 2008 22:42:06 GMT (envelope-from jb@freebsd.org) Date: Tue, 29 Jan 2008 22:42:06 GMT Message-Id: <200801292242.m0TMg6Zc033209@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134420 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2008 22:42:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=134420 Change 134420 by jb@jb_freebsd1 on 2008/01/29 22:41:15 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/sys/sys/kernel.h#4 integrate Differences ... ==== //depot/projects/dtrace7/src/sys/sys/kernel.h#4 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)kernel.h 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/sys/kernel.h,v 1.136 2007/07/27 11:59:57 rwatson Exp $ + * $FreeBSD: src/sys/sys/kernel.h,v 1.138 2007/12/25 18:36:43 rwatson Exp $ */ #ifndef _SYS_KERNEL_H_ @@ -119,8 +119,11 @@ SI_SUB_MAC_LATE = 0x21D0000, /* TrustedBSD MAC subsystem */ SI_SUB_INTRINSIC = 0x2200000, /* proc 0*/ SI_SUB_VM_CONF = 0x2300000, /* config VM, set limits*/ + SI_SUB_DDB_SERVICES = 0x2380000, /* capture, scripting, etc. */ SI_SUB_RUN_QUEUE = 0x2400000, /* set up run queue*/ SI_SUB_KTRACE = 0x2480000, /* ktrace */ + SI_SUB_OPENSOLARIS = 0x2490000, /* OpenSolaris compatibility */ + SI_SUB_CYCLIC = 0x24A0000, /* Cyclic timers */ SI_SUB_AUDIT = 0x24C0000, /* audit */ SI_SUB_CREATE_INIT = 0x2500000, /* create init process*/ SI_SUB_SCHED_IDLE = 0x2600000, /* required idle procs */ @@ -131,6 +134,9 @@ SI_SUB_DEVFS = 0x2F00000, /* devfs ready for devices */ SI_SUB_INIT_IF = 0x3000000, /* prep for net interfaces */ SI_SUB_NETGRAPH = 0x3010000, /* Let Netgraph initialize */ + SI_SUB_DTRACE = 0x3020000, /* DTrace subsystem */ + SI_SUB_DTRACE_PROVIDER = 0x3048000, /* DTrace providers */ + SI_SUB_DTRACE_ANON = 0x308C000, /* DTrace anon enabling */ SI_SUB_DRIVERS = 0x3100000, /* Let Drivers initialize */ SI_SUB_CONFIGURE = 0x3800000, /* Configure devices */ SI_SUB_VFS = 0x4000000, /* virtual filesystem*/ From owner-p4-projects@FreeBSD.ORG Wed Jan 30 00:35:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCC8316A46E; Wed, 30 Jan 2008 00:35:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8771016A46B for ; Wed, 30 Jan 2008 00:35:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7132713C474 for ; Wed, 30 Jan 2008 00:35:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U0Z4sK043149 for ; Wed, 30 Jan 2008 00:35:04 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U0YV7h043083 for perforce@freebsd.org; Wed, 30 Jan 2008 00:34:31 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 30 Jan 2008 00:34:31 GMT Message-Id: <200801300034.m0U0YV7h043083@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134426 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 00:35:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=134426 Change 134426 by kmacy@kmacy_home:ethng on 2008/01/30 00:33:47 IFC 134425 Affected files ... .. //depot/projects/ethng/src/COPYRIGHT#2 integrate .. //depot/projects/ethng/src/LOCKS#2 integrate .. //depot/projects/ethng/src/MAINTAINERS#2 integrate .. //depot/projects/ethng/src/Makefile.inc1#7 integrate .. //depot/projects/ethng/src/ObsoleteFiles.inc#11 integrate .. //depot/projects/ethng/src/UPDATING#9 integrate .. //depot/projects/ethng/src/bin/cp/cp.c#2 integrate .. //depot/projects/ethng/src/bin/mv/mv.c#3 integrate .. //depot/projects/ethng/src/contrib/binutils/libiberty/cp-demangle.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/AUTHORS#2 integrate .. //depot/projects/ethng/src/contrib/cvs/BUGS#2 integrate .. //depot/projects/ethng/src/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/ethng/src/contrib/cvs/FAQ#2 integrate .. //depot/projects/ethng/src/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/projects/ethng/src/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/ethng/src/contrib/cvs/HACKING#2 integrate .. //depot/projects/ethng/src/contrib/cvs/INSTALL#2 integrate .. //depot/projects/ethng/src/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/NEWS#2 integrate .. //depot/projects/ethng/src/contrib/cvs/README#2 integrate .. //depot/projects/ethng/src/contrib/cvs/TESTS#2 integrate .. //depot/projects/ethng/src/contrib/cvs/TODO#2 integrate .. //depot/projects/ethng/src/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/ethng/src/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/ethng/src/contrib/cvs/config.h.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/configure#2 integrate .. //depot/projects/ethng/src/contrib/cvs/configure.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/README#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/clmerge.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/cln_hist.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/ethng/src/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/cvscheck.sh#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/debug_check_log.sh#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/descend.sh#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/log.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/mfpipe.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/pvcs2rcs.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/rcs-to-cvs.sh#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/rcslock.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/ethng/src/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/ethng/src/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/doc/cvs.1#2 integrate .. //depot/projects/ethng/src/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/projects/ethng/src/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/projects/ethng/src/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/ethng/src/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/ethng/src/contrib/cvs/doc/mkman.in#2 delete .. //depot/projects/ethng/src/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/ethng/src/contrib/cvs/doc/stamp-1#2 integrate .. //depot/projects/ethng/src/contrib/cvs/doc/stamp-vti#2 integrate .. //depot/projects/ethng/src/contrib/cvs/doc/version-client.texi#2 integrate .. //depot/projects/ethng/src/contrib/cvs/doc/version.texi#2 integrate .. //depot/projects/ethng/src/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/ethng/src/contrib/cvs/lib/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/lib/fncase.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/lib/getdate#1 branch .. //depot/projects/ethng/src/contrib/cvs/lib/getpass.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/lib/regex.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/lib/system.h#2 integrate .. //depot/projects/ethng/src/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/ethng/src/contrib/cvs/lib/xtime.h#2 integrate .. //depot/projects/ethng/src/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/ethng/src/contrib/cvs/man/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/add.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/checkin.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/classify.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/client.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/client.h#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/create_adm.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/cvsrc.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/edit.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/entries.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/expand_path.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/fileattr.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/hardlink.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/hardlink.h#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/hash.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/hash.h#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/history.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/history.h#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/ignore.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/import.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/log.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/login.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/main.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/myndbm.h#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/no_diff.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/rcscmds.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/release.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/repos.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/root.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/root.h#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/run.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/server.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/server.h#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/stack.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/stack.h#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/status.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/subr.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/update.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/version.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/watch.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/wrapper.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/ethng/src/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/projects/ethng/src/contrib/cvs/tools/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/cvs/tools/README#2 integrate .. //depot/projects/ethng/src/contrib/file/ChangeLog#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/acorn#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/animation#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/apple#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/archive#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/audio#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/blender#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/commands#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/console#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/database#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/efi#1 branch .. //depot/projects/ethng/src/contrib/file/Magdir/elf#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/fortran#1 branch .. //depot/projects/ethng/src/contrib/file/Magdir/java#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/ethng/src/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/ethng/src/contrib/file/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/file/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/file/acinclude.m4#2 integrate .. //depot/projects/ethng/src/contrib/file/aclocal.m4#2 integrate .. //depot/projects/ethng/src/contrib/file/apprentice.c#2 integrate .. //depot/projects/ethng/src/contrib/file/ascmagic.c#2 integrate .. //depot/projects/ethng/src/contrib/file/compress.c#2 integrate .. //depot/projects/ethng/src/contrib/file/config.h.in#2 integrate .. //depot/projects/ethng/src/contrib/file/configure#2 integrate .. //depot/projects/ethng/src/contrib/file/configure.in#2 integrate .. //depot/projects/ethng/src/contrib/file/file.c#2 integrate .. //depot/projects/ethng/src/contrib/file/file.h#2 integrate .. //depot/projects/ethng/src/contrib/file/file.man#2 integrate .. //depot/projects/ethng/src/contrib/file/file_opts.h#1 branch .. //depot/projects/ethng/src/contrib/file/fsmagic.c#2 integrate .. //depot/projects/ethng/src/contrib/file/funcs.c#2 integrate .. //depot/projects/ethng/src/contrib/file/install-sh#2 integrate .. //depot/projects/ethng/src/contrib/file/is_tar.c#2 integrate .. //depot/projects/ethng/src/contrib/file/libmagic.man#2 integrate .. //depot/projects/ethng/src/contrib/file/magic.c#2 integrate .. //depot/projects/ethng/src/contrib/file/magic.h#2 integrate .. //depot/projects/ethng/src/contrib/file/magic.man#2 integrate .. //depot/projects/ethng/src/contrib/file/magic.mime#2 integrate .. //depot/projects/ethng/src/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/ethng/src/contrib/file/names.h#2 integrate .. //depot/projects/ethng/src/contrib/file/patchlevel.h#2 integrate .. //depot/projects/ethng/src/contrib/file/print.c#2 integrate .. //depot/projects/ethng/src/contrib/file/readelf.c#2 integrate .. //depot/projects/ethng/src/contrib/file/readelf.h#2 integrate .. //depot/projects/ethng/src/contrib/file/softmagic.c#2 integrate .. //depot/projects/ethng/src/contrib/gdb/FREEBSD-diffs#1 branch .. //depot/projects/ethng/src/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/NEWS#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/config.guess#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/config.sub#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/configure#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/configure.in#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/headers#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/form/modules#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/include/headers#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/install-sh#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_legacy.3x#1 branch .. //depot/projects/ethng/src/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_opaque.3x#1 branch .. //depot/projects/ethng/src/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/legacy_coding.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/term.5#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/term.7#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/terminfo.tail#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/menu/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/menu/headers#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/misc/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/misc/ncurses-config.in#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/mk-1st.awk#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/mk-hdr.awk#1 branch .. //depot/projects/ethng/src/contrib/ncurses/mkdirs.sh#1 branch .. //depot/projects/ethng/src/contrib/ncurses/mkinstalldirs#2 delete .. //depot/projects/ethng/src/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/key_defined.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_color.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_delwin.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_slkinit.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/memmove.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/use_window.c#1 branch .. //depot/projects/ethng/src/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/modules#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/MKcaptab.sh#1 branch .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/MKcodes.awk#1 branch .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/access.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/db_iterator.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/entries.c#1 branch .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/use_screen.c#1 branch .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/trace/trace_tries.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tty/hardscroll.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/widechar/lib_key_name.c#1 branch .. //depot/projects/ethng/src/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/panel/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/panel/headers#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/panel/modules#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/ethng/src/contrib/ncurses/tack/COPYING#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/HISTORY#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/Makefile.in#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/README#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/ansi.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/charset.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/color.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/control.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/crum.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/edit.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/fun.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/init.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/menu.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/modes.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/modules#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/output.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/pad.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/scan.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/sync.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/sysdep.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/tack.1#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/tack.c#2 delete .. //depot/projects/ethng/src/contrib/ncurses/tack/tack.h#2 delete .. //depot/projects/ethng/src/contrib/openpam/CREDITS#2 integrate .. //depot/projects/ethng/src/contrib/openpam/HISTORY#2 integrate .. //depot/projects/ethng/src/contrib/openpam/INSTALL#2 integrate .. //depot/projects/ethng/src/contrib/openpam/LICENSE#2 integrate .. //depot/projects/ethng/src/contrib/openpam/MANIFEST#2 delete .. //depot/projects/ethng/src/contrib/openpam/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openpam/README#2 integrate .. //depot/projects/ethng/src/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/ethng/src/contrib/openpam/aclocal.m4#2 integrate .. //depot/projects/ethng/src/contrib/openpam/autogen.sh#2 integrate .. //depot/projects/ethng/src/contrib/openpam/bin/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openpam/bin/su/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openpam/bin/su/su.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/compile#1 branch .. //depot/projects/ethng/src/contrib/openpam/config.h.in#2 integrate .. //depot/projects/ethng/src/contrib/openpam/configure#2 integrate .. //depot/projects/ethng/src/contrib/openpam/configure.ac#2 integrate .. //depot/projects/ethng/src/contrib/openpam/configure.in#2 delete .. //depot/projects/ethng/src/contrib/openpam/depcomp#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/ethng/src/contrib/openpam/include/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/openpam/include/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openpam/include/security/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/projects/ethng/src/contrib/openpam/include/security/openpam_attr.h#1 branch .. //depot/projects/ethng/src/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/ethng/src/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/ethng/src/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/projects/ethng/src/contrib/openpam/include/security/pam_modules.h#2 integrate .. //depot/projects/ethng/src/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/projects/ethng/src/contrib/openpam/install-sh#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_findenv.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_free_envlist.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_get_option.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_load.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_log.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_nullconv.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_set_option.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_static.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/openpam_ttyconv.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_acct_mgmt.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_authenticate.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_authenticate_secondary.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_chauthtok.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_close_session.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_end.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_error.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_get_authtok.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_get_data.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_get_item.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_get_mapped_authtok.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_get_mapped_username.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_get_user.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_getenv.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_getenvlist.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_info.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_open_session.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_prompt.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_putenv.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_set_data.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_set_item.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_set_mapped_authtok.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_set_mapped_username.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_setcred.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_setenv.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_sm_acct_mgmt.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_sm_authenticate.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_sm_authenticate_secondary.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_sm_chauthtok.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_sm_close_session.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_sm_get_mapped_username.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_sm_open_session.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_sm_set_mapped_username.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_sm_setcred.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_start.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_strerror.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_verror.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_vinfo.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/ltconfig#2 delete .. //depot/projects/ethng/src/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/ethng/src/contrib/openpam/misc/gendoc.pl#2 integrate .. //depot/projects/ethng/src/contrib/openpam/missing#2 integrate .. //depot/projects/ethng/src/contrib/openpam/mkinstalldirs#2 delete .. //depot/projects/ethng/src/contrib/openpam/modules/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openpam/modules/pam_permit/pam_permit.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate .. //depot/projects/ethng/src/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/ethng/src/contrib/openpam/stamp-h.in#2 delete .. //depot/projects/ethng/src/contrib/top/display.c#2 integrate .. //depot/projects/ethng/src/contrib/top/layout.h#2 integrate .. //depot/projects/ethng/src/contrib/top/machine.h#2 integrate .. //depot/projects/ethng/src/contrib/top/top.c#2 integrate .. //depot/projects/ethng/src/contrib/top/top.h#2 integrate .. //depot/projects/ethng/src/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate .. //depot/projects/ethng/src/etc/defaults/periodic.conf#3 integrate .. //depot/projects/ethng/src/etc/defaults/rc.conf#7 integrate .. //depot/projects/ethng/src/etc/devd.conf#2 integrate .. //depot/projects/ethng/src/etc/namedb/named.conf#3 integrate .. //depot/projects/ethng/src/etc/netstart#2 integrate .. //depot/projects/ethng/src/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/ethng/src/etc/rc#2 integrate .. //depot/projects/ethng/src/etc/rc.d/hostid#2 integrate .. //depot/projects/ethng/src/etc/rc.d/ipfw#2 integrate .. //depot/projects/ethng/src/etc/rc.d/jail#2 integrate .. //depot/projects/ethng/src/etc/rc.d/kerberos#3 integrate .. //depot/projects/ethng/src/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/ethng/src/etc/rc.d/netif#2 integrate .. //depot/projects/ethng/src/etc/rc.d/ppp#4 integrate .. //depot/projects/ethng/src/etc/rc.firewall#2 integrate .. //depot/projects/ethng/src/etc/rc.firewall6#2 integrate .. //depot/projects/ethng/src/etc/rc.subr#3 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/gerrold.limerick#2 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/limerick#4 integrate .. //depot/projects/ethng/src/gnu/lib/csu/Makefile#4 integrate .. //depot/projects/ethng/src/gnu/usr.bin/Makefile#2 integrate .. //depot/projects/ethng/src/gnu/usr.bin/cvs/Makefile#2 integrate .. //depot/projects/ethng/src/gnu/usr.bin/cvs/contrib/Makefile#2 integrate .. //depot/projects/ethng/src/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/ethng/src/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate .. //depot/projects/ethng/src/gnu/usr.bin/gdb/kgdb/kld.c#1 branch .. //depot/projects/ethng/src/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/ethng/src/gnu/usr.bin/gdb/kgdb/main.c#2 integrate .. //depot/projects/ethng/src/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/ethng/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#3 integrate .. //depot/projects/ethng/src/include/fts.h#2 integrate .. //depot/projects/ethng/src/include/unistd.h#2 integrate .. //depot/projects/ethng/src/lib/libarchive/Makefile#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_endian.h#1 branch .. //depot/projects/ethng/src/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_entry_link_resolver.c#1 branch .. //depot/projects/ethng/src/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_entry_strmode.c#1 branch .. //depot/projects/ethng/src/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_read_support_format_mtree.c#1 branch .. //depot/projects/ethng/src/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_write_set_format_cpio.c#3 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_write_set_format_cpio_newc.c#3 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/cpio.5#1 branch .. //depot/projects/ethng/src/lib/libarchive/filter_fork.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/ethng/src/lib/libarchive/libarchive_internals.3#2 integrate .. //depot/projects/ethng/src/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/ethng/src/lib/libarchive/test/README#2 integrate .. //depot/projects/ethng/src/lib/libarchive/test/main.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/test/read_open_memory.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/test/test.h#2 integrate .. //depot/projects/ethng/src/lib/libarchive/test/test_compat_gtar.c#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_compat_gtar_1.tgz.uu#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_compat_zip.c#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_compat_zip_1.zip.uu#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_empty_write.c#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_entry_strmode.c#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_read_format_cpio_odc.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/ethng/src/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/test/test_read_format_mtree.c#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_read_format_tar.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/test/test_read_pax_truncated.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/test/test_tar_large.c#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/ethng/src/lib/libarchive/test/test_write_disk_hardlink.c#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_write_disk_perms.c#3 integrate .. //depot/projects/ethng/src/lib/libarchive/test/test_write_format_cpio.c#3 integrate .. //depot/projects/ethng/src/lib/libarchive/test/test_write_format_cpio_newc.c#1 branch .. //depot/projects/ethng/src/lib/libarchive/test/test_write_format_cpio_odc.c#1 branch .. //depot/projects/ethng/src/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/ethng/src/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/ethng/src/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/ethng/src/lib/libc/gen/feature_present.3#1 branch .. //depot/projects/ethng/src/lib/libc/gen/feature_present.c#1 branch .. //depot/projects/ethng/src/lib/libc/gen/fts-compat.c#2 integrate .. //depot/projects/ethng/src/lib/libc/gen/fts-compat.h#2 integrate .. //depot/projects/ethng/src/lib/libc/gen/fts.3#2 integrate .. //depot/projects/ethng/src/lib/libc/gen/fts.c#2 integrate .. //depot/projects/ethng/src/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/ethng/src/lib/libc/gen/posixshm.c#2 delete .. //depot/projects/ethng/src/lib/libc/gen/sem_open.3#2 integrate .. //depot/projects/ethng/src/lib/libc/gen/shm_open.3#2 delete .. //depot/projects/ethng/src/lib/libc/i386/_fpmath.h#2 integrate .. //depot/projects/ethng/src/lib/libc/ia64/_fpmath.h#2 integrate .. //depot/projects/ethng/src/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/ascii.c#1 branch .. //depot/projects/ethng/src/lib/libc/locale/mblocal.h#3 integrate .. //depot/projects/ethng/src/lib/libc/locale/setrunelocale.c#3 integrate .. //depot/projects/ethng/src/lib/libc/sparc64/_fpmath.h#2 integrate .. //depot/projects/ethng/src/lib/libc/stdlib/grantpt.c#3 integrate .. //depot/projects/ethng/src/lib/libc/stdlib/heapsort.c#2 integrate .. //depot/projects/ethng/src/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/ethng/src/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/ethng/src/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/ethng/src/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/ethng/src/lib/libc/sys/access.2#3 integrate .. //depot/projects/ethng/src/lib/libc/sys/extattr_get_file.2#2 integrate .. //depot/projects/ethng/src/lib/libc/sys/flock.2#2 integrate .. //depot/projects/ethng/src/lib/libc/sys/shm_open.2#1 branch .. //depot/projects/ethng/src/lib/libfetch/ftp.c#4 integrate .. //depot/projects/ethng/src/lib/libkvm/kvm.c#2 integrate .. //depot/projects/ethng/src/lib/libkvm/kvm_file.c#2 integrate .. //depot/projects/ethng/src/lib/libmagic/config.h#2 integrate .. //depot/projects/ethng/src/lib/libpam/libpam/Makefile#2 integrate .. //depot/projects/ethng/src/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/ethng/src/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate .. //depot/projects/ethng/src/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/ethng/src/lib/libthr/Makefile#5 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_sem.c#3 integrate .. //depot/projects/ethng/src/lib/libutil/pty.3#2 integrate .. //depot/projects/ethng/src/lib/libutil/pty.c#3 integrate .. //depot/projects/ethng/src/lib/msun/Makefile#5 integrate .. //depot/projects/ethng/src/lib/msun/Symbol.map#4 integrate .. //depot/projects/ethng/src/lib/msun/amd64/Makefile.inc#3 integrate .. //depot/projects/ethng/src/lib/msun/amd64/s_llrintl.S#1 branch .. //depot/projects/ethng/src/lib/msun/amd64/s_lrintl.S#1 branch .. //depot/projects/ethng/src/lib/msun/amd64/s_rintl.S#1 branch .. //depot/projects/ethng/src/lib/msun/i387/Makefile.inc#3 integrate .. //depot/projects/ethng/src/lib/msun/i387/s_llrintl.S#1 branch .. //depot/projects/ethng/src/lib/msun/i387/s_lrintl.S#1 branch .. //depot/projects/ethng/src/lib/msun/i387/s_rintl.S#1 branch .. //depot/projects/ethng/src/lib/msun/ld128/s_exp2l.c#1 branch .. //depot/projects/ethng/src/lib/msun/ld80/s_exp2l.c#1 branch .. //depot/projects/ethng/src/lib/msun/man/exp.3#2 integrate .. //depot/projects/ethng/src/lib/msun/man/log.3#1 branch .. //depot/projects/ethng/src/lib/msun/man/lrint.3#2 integrate .. //depot/projects/ethng/src/lib/msun/man/rint.3#2 integrate .. //depot/projects/ethng/src/lib/msun/src/e_expf.c#2 integrate .. //depot/projects/ethng/src/lib/msun/src/k_cos.c#2 integrate .. //depot/projects/ethng/src/lib/msun/src/k_rem_pio2.c#2 integrate .. //depot/projects/ethng/src/lib/msun/src/k_rem_pio2f.c#2 delete .. //depot/projects/ethng/src/lib/msun/src/math.h#4 integrate .. //depot/projects/ethng/src/lib/msun/src/math_private.h#3 integrate .. //depot/projects/ethng/src/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/ethng/src/lib/msun/src/s_csqrtf.c#2 integrate .. //depot/projects/ethng/src/lib/msun/src/s_exp2.c#2 integrate .. //depot/projects/ethng/src/lib/msun/src/s_exp2f.c#2 integrate .. //depot/projects/ethng/src/lib/msun/src/s_llrintl.c#1 branch .. //depot/projects/ethng/src/lib/msun/src/s_log1p.c#2 integrate .. //depot/projects/ethng/src/lib/msun/src/s_log1pf.c#2 integrate .. //depot/projects/ethng/src/lib/msun/src/s_lrintl.c#1 branch .. //depot/projects/ethng/src/lib/msun/src/s_nearbyint.c#2 integrate .. //depot/projects/ethng/src/lib/msun/src/s_rint.c#2 integrate .. //depot/projects/ethng/src/lib/msun/src/s_rintf.c#2 integrate .. //depot/projects/ethng/src/lib/msun/src/s_rintl.c#1 branch .. //depot/projects/ethng/src/lib/ncurses/ncurses/Makefile#3 integrate .. //depot/projects/ethng/src/lib/ncurses/ncurses/ncurses_cfg.h#2 integrate .. //depot/projects/ethng/src/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#13 integrate .. //depot/projects/ethng/src/release/doc/share/misc/dev.archlist.txt#8 integrate .. //depot/projects/ethng/src/release/fixit.profile#3 integrate .. //depot/projects/ethng/src/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/ethng/src/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/ethng/src/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/ethng/src/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/ethng/src/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/ethng/src/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/ethng/src/sbin/Makefile#2 integrate .. //depot/projects/ethng/src/sbin/ddb/Makefile#1 branch .. //depot/projects/ethng/src/sbin/ddb/ddb.8#1 branch .. //depot/projects/ethng/src/sbin/ddb/ddb.c#1 branch .. //depot/projects/ethng/src/sbin/ddb/ddb.h#1 branch .. //depot/projects/ethng/src/sbin/ddb/ddb_script.c#1 branch .. //depot/projects/ethng/src/sbin/devd/devd.hh#2 integrate .. //depot/projects/ethng/src/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/ethng/src/sbin/ffsinfo/ffsinfo.c#2 integrate .. //depot/projects/ethng/src/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/projects/ethng/src/sbin/ipfw/ipfw2.c#7 integrate .. //depot/projects/ethng/src/sbin/natd/natd.8#4 integrate .. //depot/projects/ethng/src/sbin/quotacheck/Makefile#2 integrate .. //depot/projects/ethng/src/sbin/quotacheck/preen.c#3 integrate .. //depot/projects/ethng/src/sbin/quotacheck/quotacheck.8#2 integrate .. //depot/projects/ethng/src/sbin/quotacheck/quotacheck.c#3 integrate .. //depot/projects/ethng/src/sbin/quotacheck/quotacheck.h#1 branch .. //depot/projects/ethng/src/sbin/savecore/savecore.8#2 integrate .. //depot/projects/ethng/src/sbin/savecore/savecore.c#2 integrate .. //depot/projects/ethng/src/sbin/setkey/parse.y#3 integrate .. //depot/projects/ethng/src/share/colldef/Makefile#2 integrate .. //depot/projects/ethng/src/share/colldef/README#2 integrate .. //depot/projects/ethng/src/share/colldef/map.ISO8859-9#1 branch .. //depot/projects/ethng/src/share/colldef/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/ethng/src/share/man/man3/tree.3#2 integrate .. //depot/projects/ethng/src/share/man/man4/Makefile#9 integrate .. //depot/projects/ethng/src/share/man/man4/ath.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/atkbd.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/awi.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/axe.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/bge.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/coda.4#1 branch .. //depot/projects/ethng/src/share/man/man4/dcons.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/ddb.4#3 integrate .. //depot/projects/ethng/src/share/man/man4/ed.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/edsc.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/ipmi.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/lagg.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/man4.i386/ep.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/man4.i386/snc.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/mfi.4#3 integrate .. //depot/projects/ethng/src/share/man/man4/mxge.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/ng_car.4#4 integrate .. //depot/projects/ethng/src/share/man/man4/ng_pppoe.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/oldcard.4#2 delete .. //depot/projects/ethng/src/share/man/man4/pci.4#3 integrate .. //depot/projects/ethng/src/share/man/man4/pcib.4#1 branch .. //depot/projects/ethng/src/share/man/man4/puc.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/sched_4bsd.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/sched_ule.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/sf.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/snd_envy24.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/syncache.4#3 integrate .. //depot/projects/ethng/src/share/man/man4/textdump.4#1 branch .. //depot/projects/ethng/src/share/man/man4/vlan.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/wi.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/xl.4#2 integrate .. //depot/projects/ethng/src/share/man/man5/boot.config.5#2 integrate .. //depot/projects/ethng/src/share/man/man5/fstab.5#3 integrate .. //depot/projects/ethng/src/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/ethng/src/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/ethng/src/share/man/man5/src.conf.5#6 integrate .. //depot/projects/ethng/src/share/man/man7/bsd.snmpmod.mk.7#2 integrate .. //depot/projects/ethng/src/share/man/man7/clocks.7#2 integrate .. //depot/projects/ethng/src/share/man/man7/ports.7#3 integrate .. //depot/projects/ethng/src/share/man/man9/BUF_ISLOCKED.9#1 branch .. //depot/projects/ethng/src/share/man/man9/BUF_RECURSED.9#1 branch .. //depot/projects/ethng/src/share/man/man9/BUF_REFCNT.9#2 delete .. //depot/projects/ethng/src/share/man/man9/Makefile#10 integrate .. //depot/projects/ethng/src/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/ethng/src/share/man/man9/lock.9#2 integrate .. //depot/projects/ethng/src/share/man/man9/mbuf_tags.9#2 integrate .. //depot/projects/ethng/src/share/man/man9/style.9#2 integrate .. //depot/projects/ethng/src/share/misc/bsd-family-tree#5 integrate .. //depot/projects/ethng/src/share/misc/committers-ports.dot#4 integrate .. //depot/projects/ethng/src/share/misc/committers-src.dot#4 integrate .. //depot/projects/ethng/src/share/misc/pci_vendors#3 integrate .. //depot/projects/ethng/src/share/mk/bsd.own.mk#5 integrate .. //depot/projects/ethng/src/share/mk/bsd.snmpmod.mk#2 integrate .. //depot/projects/ethng/src/share/mklocale/Makefile#2 integrate .. //depot/projects/ethng/src/share/mklocale/la_LN.US-ASCII.src#2 integrate .. //depot/projects/ethng/src/share/mklocale/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/ethng/src/share/termcap/termcap.src#3 integrate .. //depot/projects/ethng/src/share/timedef/am_ET.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/be_BY.CP1131.src#2 integrate .. //depot/projects/ethng/src/share/timedef/be_BY.CP1251.src#2 integrate .. //depot/projects/ethng/src/share/timedef/be_BY.ISO8859-5.src#2 integrate .. //depot/projects/ethng/src/share/timedef/be_BY.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/bg_BG.CP1251.src#2 integrate .. //depot/projects/ethng/src/share/timedef/bg_BG.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/ca_ES.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/ca_ES.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/cs_CZ.ISO8859-2.src#2 integrate .. //depot/projects/ethng/src/share/timedef/cs_CZ.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/da_DK.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/da_DK.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/de_AT.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/de_AT.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/de_DE.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/de_DE.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/ethng/src/share/timedef/el_GR.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/en_GB.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/en_US.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/es_ES.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/es_ES.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/et_EE.ISO8859-15.src#2 integrate .. //depot/projects/ethng/src/share/timedef/et_EE.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/eu_ES.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/fi_FI.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/fi_FI.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/fr_FR.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/fr_FR.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/he_IL.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/hi_IN.ISCII-DEV.src#2 integrate .. //depot/projects/ethng/src/share/timedef/hr_HR.ISO8859-2.src#2 integrate .. //depot/projects/ethng/src/share/timedef/hr_HR.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/hu_HU.ISO8859-2.src#2 integrate .. //depot/projects/ethng/src/share/timedef/hu_HU.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/hy_AM.ARMSCII-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/hy_AM.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/is_IS.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/is_IS.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/it_IT.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/it_IT.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/ja_JP.SJIS.src#2 integrate .. //depot/projects/ethng/src/share/timedef/ja_JP.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/ja_JP.eucJP.src#2 integrate .. //depot/projects/ethng/src/share/timedef/kk_KZ.PT154.src#2 integrate .. //depot/projects/ethng/src/share/timedef/kk_KZ.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/ko_KR.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/ko_KR.eucKR.src#2 integrate .. //depot/projects/ethng/src/share/timedef/la_LN.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/lt_LT.ISO8859-13.src#2 integrate .. //depot/projects/ethng/src/share/timedef/lt_LT.ISO8859-4.src#2 integrate .. //depot/projects/ethng/src/share/timedef/lt_LT.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/mn_MN.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/nl_NL.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/nn_NO.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/nn_NO.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/no_NO.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/no_NO.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/pl_PL.ISO8859-2.src#2 integrate .. //depot/projects/ethng/src/share/timedef/pl_PL.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/pt_BR.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/pt_BR.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/pt_PT.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/pt_PT.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/ro_RO.ISO8859-2.src#2 integrate .. //depot/projects/ethng/src/share/timedef/ro_RO.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/ru_RU.CP1251.src#2 integrate .. //depot/projects/ethng/src/share/timedef/ru_RU.CP866.src#2 integrate .. //depot/projects/ethng/src/share/timedef/ru_RU.ISO8859-5.src#2 integrate .. //depot/projects/ethng/src/share/timedef/ru_RU.KOI8-R.src#2 integrate .. //depot/projects/ethng/src/share/timedef/ru_RU.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/sk_SK.ISO8859-2.src#2 integrate .. //depot/projects/ethng/src/share/timedef/sk_SK.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/sl_SI.ISO8859-2.src#2 integrate .. //depot/projects/ethng/src/share/timedef/sl_SI.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/sr_YU.ISO8859-2.src#2 integrate .. //depot/projects/ethng/src/share/timedef/sr_YU.ISO8859-5.src#2 integrate .. //depot/projects/ethng/src/share/timedef/sr_YU.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/sv_SE.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/timedef/sv_SE.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/tr_TR.ISO8859-9.src#2 integrate .. //depot/projects/ethng/src/share/timedef/tr_TR.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/uk_UA.CP1251.src#2 integrate .. //depot/projects/ethng/src/share/timedef/uk_UA.ISO8859-5.src#2 integrate .. //depot/projects/ethng/src/share/timedef/uk_UA.KOI8-U.src#2 integrate .. //depot/projects/ethng/src/share/timedef/uk_UA.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/zh_CN.GB18030.src#2 integrate .. //depot/projects/ethng/src/share/timedef/zh_CN.GB2312.src#2 integrate .. //depot/projects/ethng/src/share/timedef/zh_CN.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/timedef/zh_CN.eucCN.src#2 integrate .. //depot/projects/ethng/src/share/timedef/zh_TW.Big5.src#2 integrate .. //depot/projects/ethng/src/share/timedef/zh_TW.UTF-8.src#2 integrate .. //depot/projects/ethng/src/share/zoneinfo/backward#2 integrate .. //depot/projects/ethng/src/share/zoneinfo/europe#3 integrate .. //depot/projects/ethng/src/share/zoneinfo/leapseconds#3 integrate .. //depot/projects/ethng/src/share/zoneinfo/southamerica#4 integrate .. //depot/projects/ethng/src/share/zoneinfo/zone.tab#4 integrate .. //depot/projects/ethng/src/sys/Makefile#2 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/ethng/src/sys/amd64/conf/GENERIC#10 edit .. //depot/projects/ethng/src/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/ethng/src/sys/amd64/include/_types.h#2 integrate .. //depot/projects/ethng/src/sys/amd64/include/float.h#2 integrate .. //depot/projects/ethng/src/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/ethng/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/ethng/src/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/ethng/src/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/ethng/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/ethng/src/sys/arm/arm/support.S#3 integrate .. //depot/projects/ethng/src/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/ethng/src/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/ethng/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 30 01:37:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C01416A420; Wed, 30 Jan 2008 01:37:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6192716A419 for ; Wed, 30 Jan 2008 01:37:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 344D613C4E7 for ; Wed, 30 Jan 2008 01:37:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U1b8hI056243 for ; Wed, 30 Jan 2008 01:37:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U1b8tt056240 for perforce@freebsd.org; Wed, 30 Jan 2008 01:37:08 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 01:37:08 GMT Message-Id: <200801300137.m0U1b8tt056240@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 01:37:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=134427 Change 134427 by jb@jb_freebsd1 on 2008/01/30 01:36:15 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/sys/sys/proc.h#5 edit Differences ... ==== //depot/projects/dtrace7/src/sys/sys/proc.h#5 (text+ko) ==== @@ -301,6 +301,7 @@ struct kaudit_record *td_ar; /* (k) Active audit record, if any. */ int td_syscalls; /* per-thread syscall count (used by NFS :)) */ struct kdtrace_thread *td_dtrace; /* (*) DTrace-specific data. */ + int td_errno; /* Error returned by last syscall. */ }; struct mtx *thread_lock_block(struct thread *); From owner-p4-projects@FreeBSD.ORG Wed Jan 30 02:54:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B597B16A421; Wed, 30 Jan 2008 02:54:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 626DB16A41B for ; Wed, 30 Jan 2008 02:54:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4C1D413C45A for ; Wed, 30 Jan 2008 02:54:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U2sW1S061595 for ; Wed, 30 Jan 2008 02:54:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U2sVn2061592 for perforce@freebsd.org; Wed, 30 Jan 2008 02:54:31 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 02:54:31 GMT Message-Id: <200801300254.m0U2sVn2061592@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134428 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 02:54:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=134428 Change 134428 by jb@jb_freebsd1 on 2008/01/30 02:54:14 Remove a merged reference to a function that only exists in current. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#6 (text+ko) ==== @@ -255,12 +255,6 @@ printf("KMEM_DEBUG: Leaked elements:\n\n"); LIST_FOREACH(i, &kmem_items, next) { printf("address=%p\n", i); - /* - * Cheat and use the DDB routine - * to avoid lock issues. - */ - stack_print_ddb(&i->stack); - printf("\n"); } } mtx_unlock(&kmem_items_mtx); From owner-p4-projects@FreeBSD.ORG Wed Jan 30 04:22:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43A1A16A41A; Wed, 30 Jan 2008 04:22:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E54FE16A41B for ; Wed, 30 Jan 2008 04:22:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B567513C458 for ; Wed, 30 Jan 2008 04:22:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U4M9TN072408 for ; Wed, 30 Jan 2008 04:22:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U4M954072405 for perforce@freebsd.org; Wed, 30 Jan 2008 04:22:09 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 04:22:09 GMT Message-Id: <200801300422.m0U4M954072405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134433 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 04:22:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=134433 Change 134433 by jb@jb_freebsd1 on 2008/01/30 04:21:58 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/sys/kern/kern_dtrace.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_sdt.c#1 branch Differences ... ==== //depot/projects/dtrace7/src/sys/kern/kern_dtrace.c#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jan 30 04:24:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E6A216A41B; Wed, 30 Jan 2008 04:24:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2443516A41A for ; Wed, 30 Jan 2008 04:24:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E7EA513C455 for ; Wed, 30 Jan 2008 04:24:11 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U4OB2L072480 for ; Wed, 30 Jan 2008 04:24:11 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U4OBox072477 for perforce@freebsd.org; Wed, 30 Jan 2008 04:24:11 GMT (envelope-from imp@freebsd.org) Date: Wed, 30 Jan 2008 04:24:11 GMT Message-Id: <200801300424.m0U4OBox072477@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134434 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 04:24:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=134434 Change 134434 by imp@imp_lighthouse on 2008/01/30 04:23:13 Create a generic indirection framework for bus space. This is just copied from arm for the moment. Refinements to follow. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/sys/bs_ind.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jan 30 04:48:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6845C16A468; Wed, 30 Jan 2008 04:48:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E48216A419 for ; Wed, 30 Jan 2008 04:48:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 157A813C461 for ; Wed, 30 Jan 2008 04:48:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U4maM6082611 for ; Wed, 30 Jan 2008 04:48:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U4maYA082608 for perforce@freebsd.org; Wed, 30 Jan 2008 04:48:36 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 04:48:36 GMT Message-Id: <200801300448.m0U4maYA082608@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134436 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 04:48:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=134436 Change 134436 by jb@jb_freebsd1 on 2008/01/30 04:47:37 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/sys/amd64/amd64/tsc.c#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/amd64/amd64/tsc.c#2 (text+ko) ==== @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.208 2007/06/04 18:25:01 dwmalone Exp $"); #include "opt_clock.h" +#include "opt_kdtrace.h" #include #include @@ -44,6 +45,10 @@ #include #include +#ifdef KDTRACE_HOOKS +#include +#endif + #include "cpufreq_if.h" uint64_t tsc_freq; @@ -220,3 +225,18 @@ { return (rdtsc()); } + +#ifdef KDTRACE_HOOKS +/* + * DTrace needs a high resolution time function which can + * be called from a probe context and guaranteed not to have + * instrumented with probes itself. + * + * Returns nanoseconds since boot. + */ +uint64_t +dtrace_gethrtime() +{ + return (rdtsc() * (uint64_t) 1000000000 / tsc_freq); +} +#endif From owner-p4-projects@FreeBSD.ORG Wed Jan 30 04:48:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1315116A531; Wed, 30 Jan 2008 04:48:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8527E16A4AB for ; Wed, 30 Jan 2008 04:48:37 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B7B613C465 for ; Wed, 30 Jan 2008 04:48:37 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U4mb7e082618 for ; Wed, 30 Jan 2008 04:48:37 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U4mbKg082614 for perforce@freebsd.org; Wed, 30 Jan 2008 04:48:37 GMT (envelope-from imp@freebsd.org) Date: Wed, 30 Jan 2008 04:48:37 GMT Message-Id: <200801300448.m0U4mbKg082614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 04:48:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=134437 Change 134437 by imp@imp_lighthouse on 2008/01/30 04:47:37 Trim down bs_ind.h to get rid of the arm specific stuff, change the guard variables, etc. Write new bus.h for arm. Define the arm specific stuff. Add lots of comments. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/arm/include/bus.h#2 edit .. //depot/projects/mips2-jnpr/src/sys/sys/bs_ind.h#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/arm/include/bus.h#2 (text+ko) ==== @@ -1,733 +1,71 @@ -/* $NetBSD: bus.h,v 1.11 2003/07/28 17:35:54 thorpej Exp $ */ - /*- - * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc. + * Copyright (c) 2008 Cisco, Inc. * All rights reserved. * - * This code is derived from software contributed to The NetBSD Foundation - * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, - * NASA Ames Research Center. - * * 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. + * notice, this list of conditions, and the following disclaimer, + * without modification, immediately at the beginning of the file. * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/*- - * Copyright (c) 1996 Charles M. Hannum. All rights reserved. - * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christopher G. Demetriou - * for the NetBSD Project. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD: src/sys/arm/include/bus.h,v 1.9 2006/11/19 23:46:49 sam Exp $ + * $FreeBSD$ */ #ifndef _MACHINE_BUS_H_ #define _MACHINE_BUS_H_ +/* + * Arm uses the generic bus space indirection routines to implement its bus + * space. To setup, one must define bus_addr_t, bus_size_t, + * bus_space_tag_t, and bus_space_handle_t. bus_space_tag_t must be defined + * as + * typedef struct bus_space *bus_space_tag_t; + * for this sys/bs_ind.h to work correctly. + */ #include /* - * int bus_space_map (bus_space_tag_t t, bus_addr_t addr, - * bus_size_t size, int flags, bus_space_handle_t *bshp); - * - * Map a region of bus space. + * Define the bus spaces that we're using in the arm port. */ - #define BUS_SPACE_MAP_CACHEABLE 0x01 #define BUS_SPACE_MAP_LINEAR 0x02 #define BUS_SPACE_MAP_PREFETCHABLE 0x04 -struct bus_space { - /* cookie */ - void *bs_cookie; - - /* mapping/unmapping */ - int (*bs_map) (void *, bus_addr_t, bus_size_t, - int, bus_space_handle_t *); - void (*bs_unmap) (void *, bus_space_handle_t, bus_size_t); - int (*bs_subregion) (void *, bus_space_handle_t, - bus_size_t, bus_size_t, bus_space_handle_t *); - - /* allocation/deallocation */ - int (*bs_alloc) (void *, bus_addr_t, bus_addr_t, - bus_size_t, bus_size_t, bus_size_t, int, - bus_addr_t *, bus_space_handle_t *); - void (*bs_free) (void *, bus_space_handle_t, - bus_size_t); - - /* get kernel virtual address */ - /* barrier */ - void (*bs_barrier) (void *, bus_space_handle_t, - bus_size_t, bus_size_t, int); - - /* read (single) */ - u_int8_t (*bs_r_1) (void *, bus_space_handle_t, bus_size_t); - u_int16_t (*bs_r_2) (void *, bus_space_handle_t, bus_size_t); - u_int32_t (*bs_r_4) (void *, bus_space_handle_t, bus_size_t); - u_int64_t (*bs_r_8) (void *, bus_space_handle_t, bus_size_t); - - /* read multiple */ - void (*bs_rm_1) (void *, bus_space_handle_t, bus_size_t, - u_int8_t *, bus_size_t); - void (*bs_rm_2) (void *, bus_space_handle_t, bus_size_t, - u_int16_t *, bus_size_t); - void (*bs_rm_4) (void *, bus_space_handle_t, - bus_size_t, u_int32_t *, bus_size_t); - void (*bs_rm_8) (void *, bus_space_handle_t, - bus_size_t, u_int64_t *, bus_size_t); - - /* read region */ - void (*bs_rr_1) (void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t); - void (*bs_rr_2) (void *, bus_space_handle_t, - bus_size_t, u_int16_t *, bus_size_t); - void (*bs_rr_4) (void *, bus_space_handle_t, - bus_size_t, u_int32_t *, bus_size_t); - void (*bs_rr_8) (void *, bus_space_handle_t, - bus_size_t, u_int64_t *, bus_size_t); - - /* write (single) */ - void (*bs_w_1) (void *, bus_space_handle_t, - bus_size_t, u_int8_t); - void (*bs_w_2) (void *, bus_space_handle_t, - bus_size_t, u_int16_t); - void (*bs_w_4) (void *, bus_space_handle_t, - bus_size_t, u_int32_t); - void (*bs_w_8) (void *, bus_space_handle_t, - bus_size_t, u_int64_t); - - /* write multiple */ - void (*bs_wm_1) (void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t); - void (*bs_wm_2) (void *, bus_space_handle_t, - bus_size_t, const u_int16_t *, bus_size_t); - void (*bs_wm_4) (void *, bus_space_handle_t, - bus_size_t, const u_int32_t *, bus_size_t); - void (*bs_wm_8) (void *, bus_space_handle_t, - bus_size_t, const u_int64_t *, bus_size_t); - - /* write region */ - void (*bs_wr_1) (void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t); - void (*bs_wr_2) (void *, bus_space_handle_t, - bus_size_t, const u_int16_t *, bus_size_t); - void (*bs_wr_4) (void *, bus_space_handle_t, - bus_size_t, const u_int32_t *, bus_size_t); - void (*bs_wr_8) (void *, bus_space_handle_t, - bus_size_t, const u_int64_t *, bus_size_t); - - /* set multiple */ - void (*bs_sm_1) (void *, bus_space_handle_t, - bus_size_t, u_int8_t, bus_size_t); - void (*bs_sm_2) (void *, bus_space_handle_t, - bus_size_t, u_int16_t, bus_size_t); - void (*bs_sm_4) (void *, bus_space_handle_t, - bus_size_t, u_int32_t, bus_size_t); - void (*bs_sm_8) (void *, bus_space_handle_t, - bus_size_t, u_int64_t, bus_size_t); - - /* set region */ - void (*bs_sr_1) (void *, bus_space_handle_t, - bus_size_t, u_int8_t, bus_size_t); - void (*bs_sr_2) (void *, bus_space_handle_t, - bus_size_t, u_int16_t, bus_size_t); - void (*bs_sr_4) (void *, bus_space_handle_t, - bus_size_t, u_int32_t, bus_size_t); - void (*bs_sr_8) (void *, bus_space_handle_t, - bus_size_t, u_int64_t, bus_size_t); - - /* copy */ - void (*bs_c_1) (void *, bus_space_handle_t, bus_size_t, - bus_space_handle_t, bus_size_t, bus_size_t); - void (*bs_c_2) (void *, bus_space_handle_t, bus_size_t, - bus_space_handle_t, bus_size_t, bus_size_t); - void (*bs_c_4) (void *, bus_space_handle_t, bus_size_t, - bus_space_handle_t, bus_size_t, bus_size_t); - void (*bs_c_8) (void *, bus_space_handle_t, bus_size_t, - bus_space_handle_t, bus_size_t, bus_size_t); - - /* read stream (single) */ - u_int8_t (*bs_r_1_s) (void *, bus_space_handle_t, bus_size_t); - u_int16_t (*bs_r_2_s) (void *, bus_space_handle_t, bus_size_t); - u_int32_t (*bs_r_4_s) (void *, bus_space_handle_t, bus_size_t); - u_int64_t (*bs_r_8_s) (void *, bus_space_handle_t, bus_size_t); - - /* read multiple stream */ - void (*bs_rm_1_s) (void *, bus_space_handle_t, bus_size_t, - u_int8_t *, bus_size_t); - void (*bs_rm_2_s) (void *, bus_space_handle_t, bus_size_t, - u_int16_t *, bus_size_t); - void (*bs_rm_4_s) (void *, bus_space_handle_t, - bus_size_t, u_int32_t *, bus_size_t); - void (*bs_rm_8_s) (void *, bus_space_handle_t, - bus_size_t, u_int64_t *, bus_size_t); - - /* read region stream */ - void (*bs_rr_1_s) (void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t); - void (*bs_rr_2_s) (void *, bus_space_handle_t, - bus_size_t, u_int16_t *, bus_size_t); - void (*bs_rr_4_s) (void *, bus_space_handle_t, - bus_size_t, u_int32_t *, bus_size_t); - void (*bs_rr_8_s) (void *, bus_space_handle_t, - bus_size_t, u_int64_t *, bus_size_t); - - /* write stream (single) */ - void (*bs_w_1_s) (void *, bus_space_handle_t, - bus_size_t, u_int8_t); - void (*bs_w_2_s) (void *, bus_space_handle_t, - bus_size_t, u_int16_t); - void (*bs_w_4_s) (void *, bus_space_handle_t, - bus_size_t, u_int32_t); - void (*bs_w_8_s) (void *, bus_space_handle_t, - bus_size_t, u_int64_t); - - /* write multiple stream */ - void (*bs_wm_1_s) (void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t); - void (*bs_wm_2_s) (void *, bus_space_handle_t, - bus_size_t, const u_int16_t *, bus_size_t); - void (*bs_wm_4_s) (void *, bus_space_handle_t, - bus_size_t, const u_int32_t *, bus_size_t); - void (*bs_wm_8_s) (void *, bus_space_handle_t, - bus_size_t, const u_int64_t *, bus_size_t); - - /* write region stream */ - void (*bs_wr_1_s) (void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t); - void (*bs_wr_2_s) (void *, bus_space_handle_t, - bus_size_t, const u_int16_t *, bus_size_t); - void (*bs_wr_4_s) (void *, bus_space_handle_t, - bus_size_t, const u_int32_t *, bus_size_t); - void (*bs_wr_8_s) (void *, bus_space_handle_t, - bus_size_t, const u_int64_t *, bus_size_t); -}; - - /* - * Utility macros; INTERNAL USE ONLY. + * Bring in the generic indirection routines */ -#define __bs_c(a,b) __CONCAT(a,b) -#define __bs_opname(op,size) __bs_c(__bs_c(__bs_c(bs_,op),_),size) - -#define __bs_rs(sz, t, h, o) \ - (*(t)->__bs_opname(r,sz))((t)->bs_cookie, h, o) -#define __bs_ws(sz, t, h, o, v) \ - (*(t)->__bs_opname(w,sz))((t)->bs_cookie, h, o, v) -#define __bs_nonsingle(type, sz, t, h, o, a, c) \ - (*(t)->__bs_opname(type,sz))((t)->bs_cookie, h, o, a, c) -#define __bs_set(type, sz, t, h, o, v, c) \ - (*(t)->__bs_opname(type,sz))((t)->bs_cookie, h, o, v, c) -#define __bs_copy(sz, t, h1, o1, h2, o2, cnt) \ - (*(t)->__bs_opname(c,sz))((t)->bs_cookie, h1, o1, h2, o2, cnt) - -#define __bs_opname_s(op,size) __bs_c(__bs_c(__bs_c(__bs_c(bs_,op),_),size),_s) -#define __bs_rs_s(sz, t, h, o) \ - (*(t)->__bs_opname_s(r,sz))((t)->bs_cookie, h, o) -#define __bs_ws_s(sz, t, h, o, v) \ - (*(t)->__bs_opname_s(w,sz))((t)->bs_cookie, h, o, v) -#define __bs_nonsingle_s(type, sz, t, h, o, a, c) \ - (*(t)->__bs_opname_s(type,sz))((t)->bs_cookie, h, o, a, c) - +#include /* - * Mapping and unmapping operations. + * Define the largest bus_addr_t and bus_size_t respectively. Maybe these + * should be defined in terms of other constants, but in the ideal bus space + * model, the size of these types is defined to be large enough to hold the + * biggest address that is a natural size on the architecture. While the + * largest address or size might be a subset of that type. */ -#define bus_space_map(t, a, s, c, hp) \ - (*(t)->bs_map)((t)->bs_cookie, (a), (s), (c), (hp)) -#define bus_space_unmap(t, h, s) \ - (*(t)->bs_unmap)((t)->bs_cookie, (h), (s)) -#define bus_space_subregion(t, h, o, s, hp) \ - (*(t)->bs_subregion)((t)->bs_cookie, (h), (o), (s), (hp)) - +#define BUS_SPACE_MAXADDR 0xFFFFFFFFul +#define BUS_SPACE_MAXSIZE 0xFFFFFFFFul /* - * Allocation and deallocation operations. - */ -#define bus_space_alloc(t, rs, re, s, a, b, c, ap, hp) \ - (*(t)->bs_alloc)((t)->bs_cookie, (rs), (re), (s), (a), (b), \ - (c), (ap), (hp)) -#define bus_space_free(t, h, s) \ - (*(t)->bs_free)((t)->bs_cookie, (h), (s)) - -/* - * Bus barrier operations. - */ -#define bus_space_barrier(t, h, o, l, f) \ - (*(t)->bs_barrier)((t)->bs_cookie, (h), (o), (l), (f)) - -#define BUS_SPACE_BARRIER_READ 0x01 -#define BUS_SPACE_BARRIER_WRITE 0x02 - -/* - * Bus read (single) operations. - */ -#define bus_space_read_1(t, h, o) __bs_rs(1,(t),(h),(o)) -#define bus_space_read_2(t, h, o) __bs_rs(2,(t),(h),(o)) -#define bus_space_read_4(t, h, o) __bs_rs(4,(t),(h),(o)) -#define bus_space_read_8(t, h, o) __bs_rs(8,(t),(h),(o)) - -#define bus_space_read_stream_1(t, h, o) __bs_rs_s(1,(t), (h), (o)) -#define bus_space_read_stream_2(t, h, o) __bs_rs_s(2,(t), (h), (o)) -#define bus_space_read_stream_4(t, h, o) __bs_rs_s(4,(t), (h), (o)) -#define bus_space_read_stream_8(t, h, o) __bs_rs_s(8,8,(t),(h),(o)) - -/* - * Bus read multiple operations. - */ -#define bus_space_read_multi_1(t, h, o, a, c) \ - __bs_nonsingle(rm,1,(t),(h),(o),(a),(c)) -#define bus_space_read_multi_2(t, h, o, a, c) \ - __bs_nonsingle(rm,2,(t),(h),(o),(a),(c)) -#define bus_space_read_multi_4(t, h, o, a, c) \ - __bs_nonsingle(rm,4,(t),(h),(o),(a),(c)) -#define bus_space_read_multi_8(t, h, o, a, c) \ - __bs_nonsingle(rm,8,(t),(h),(o),(a),(c)) - -#define bus_space_read_multi_stream_1(t, h, o, a, c) \ - __bs_nonsingle_s(rm,1,(t),(h),(o),(a),(c)) -#define bus_space_read_multi_stream_2(t, h, o, a, c) \ - __bs_nonsingle_s(rm,2,(t),(h),(o),(a),(c)) -#define bus_space_read_multi_stream_4(t, h, o, a, c) \ - __bs_nonsingle_s(rm,4,(t),(h),(o),(a),(c)) -#define bus_space_read_multi_stream_8(t, h, o, a, c) \ - __bs_nonsingle_s(rm,8,(t),(h),(o),(a),(c)) - - -/* - * Bus read region operations. - */ -#define bus_space_read_region_1(t, h, o, a, c) \ - __bs_nonsingle(rr,1,(t),(h),(o),(a),(c)) -#define bus_space_read_region_2(t, h, o, a, c) \ - __bs_nonsingle(rr,2,(t),(h),(o),(a),(c)) -#define bus_space_read_region_4(t, h, o, a, c) \ - __bs_nonsingle(rr,4,(t),(h),(o),(a),(c)) -#define bus_space_read_region_8(t, h, o, a, c) \ - __bs_nonsingle(rr,8,(t),(h),(o),(a),(c)) - -#define bus_space_read_region_stream_1(t, h, o, a, c) \ - __bs_nonsingle_s(rr,1,(t),(h),(o),(a),(c)) -#define bus_space_read_region_stream_2(t, h, o, a, c) \ - __bs_nonsingle_s(rr,2,(t),(h),(o),(a),(c)) -#define bus_space_read_region_stream_4(t, h, o, a, c) \ - __bs_nonsingle_s(rr,4,(t),(h),(o),(a),(c)) -#define bus_space_read_region_stream_8(t, h, o, a, c) \ - __bs_nonsingle_s(rr,8,(t),(h),(o),(a),(c)) - - -/* - * Bus write (single) operations. - */ -#define bus_space_write_1(t, h, o, v) __bs_ws(1,(t),(h),(o),(v)) -#define bus_space_write_2(t, h, o, v) __bs_ws(2,(t),(h),(o),(v)) -#define bus_space_write_4(t, h, o, v) __bs_ws(4,(t),(h),(o),(v)) -#define bus_space_write_8(t, h, o, v) __bs_ws(8,(t),(h),(o),(v)) - -#define bus_space_write_stream_1(t, h, o, v) __bs_ws_s(1,(t),(h),(o),(v)) -#define bus_space_write_stream_2(t, h, o, v) __bs_ws_s(2,(t),(h),(o),(v)) -#define bus_space_write_stream_4(t, h, o, v) __bs_ws_s(4,(t),(h),(o),(v)) -#define bus_space_write_stream_8(t, h, o, v) __bs_ws_s(8,(t),(h),(o),(v)) - - -/* - * Bus write multiple operations. - */ -#define bus_space_write_multi_1(t, h, o, a, c) \ - __bs_nonsingle(wm,1,(t),(h),(o),(a),(c)) -#define bus_space_write_multi_2(t, h, o, a, c) \ - __bs_nonsingle(wm,2,(t),(h),(o),(a),(c)) -#define bus_space_write_multi_4(t, h, o, a, c) \ - __bs_nonsingle(wm,4,(t),(h),(o),(a),(c)) -#define bus_space_write_multi_8(t, h, o, a, c) \ - __bs_nonsingle(wm,8,(t),(h),(o),(a),(c)) - -#define bus_space_write_multi_stream_1(t, h, o, a, c) \ - __bs_nonsingle_s(wm,1,(t),(h),(o),(a),(c)) -#define bus_space_write_multi_stream_2(t, h, o, a, c) \ - __bs_nonsingle_s(wm,2,(t),(h),(o),(a),(c)) -#define bus_space_write_multi_stream_4(t, h, o, a, c) \ - __bs_nonsingle_s(wm,4,(t),(h),(o),(a),(c)) -#define bus_space_write_multi_stream_8(t, h, o, a, c) \ - __bs_nonsingle_s(wm,8,(t),(h),(o),(a),(c)) - - -/* - * Bus write region operations. - */ -#define bus_space_write_region_1(t, h, o, a, c) \ - __bs_nonsingle(wr,1,(t),(h),(o),(a),(c)) -#define bus_space_write_region_2(t, h, o, a, c) \ - __bs_nonsingle(wr,2,(t),(h),(o),(a),(c)) -#define bus_space_write_region_4(t, h, o, a, c) \ - __bs_nonsingle(wr,4,(t),(h),(o),(a),(c)) -#define bus_space_write_region_8(t, h, o, a, c) \ - __bs_nonsingle(wr,8,(t),(h),(o),(a),(c)) - -#define bus_space_write_region_stream_1(t, h, o, a, c) \ - __bs_nonsingle_s(wr,1,(t),(h),(o),(a),(c)) -#define bus_space_write_region_stream_2(t, h, o, a, c) \ - __bs_nonsingle_s(wr,2,(t),(h),(o),(a),(c)) -#define bus_space_write_region_stream_4(t, h, o, a, c) \ - __bs_nonsingle_s(wr,4,(t),(h),(o),(a),(c)) -#define bus_space_write_region_stream_8(t, h, o, a, c) \ - __bs_nonsingle_s(wr,8,(t),(h),(o),(a),(c)) - - -/* - * Set multiple operations. - */ -#define bus_space_set_multi_1(t, h, o, v, c) \ - __bs_set(sm,1,(t),(h),(o),(v),(c)) -#define bus_space_set_multi_2(t, h, o, v, c) \ - __bs_set(sm,2,(t),(h),(o),(v),(c)) -#define bus_space_set_multi_4(t, h, o, v, c) \ - __bs_set(sm,4,(t),(h),(o),(v),(c)) -#define bus_space_set_multi_8(t, h, o, v, c) \ - __bs_set(sm,8,(t),(h),(o),(v),(c)) - - -/* - * Set region operations. - */ -#define bus_space_set_region_1(t, h, o, v, c) \ - __bs_set(sr,1,(t),(h),(o),(v),(c)) -#define bus_space_set_region_2(t, h, o, v, c) \ - __bs_set(sr,2,(t),(h),(o),(v),(c)) -#define bus_space_set_region_4(t, h, o, v, c) \ - __bs_set(sr,4,(t),(h),(o),(v),(c)) -#define bus_space_set_region_8(t, h, o, v, c) \ - __bs_set(sr,8,(t),(h),(o),(v),(c)) - - -/* - * Copy operations. + * bus dma impelemenation, which is described in bus_dma(9) */ -#define bus_space_copy_region_1(t, h1, o1, h2, o2, c) \ - __bs_copy(1, t, h1, o1, h2, o2, c) -#define bus_space_copy_region_2(t, h1, o1, h2, o2, c) \ - __bs_copy(2, t, h1, o1, h2, o2, c) -#define bus_space_copy_region_4(t, h1, o1, h2, o2, c) \ - __bs_copy(4, t, h1, o1, h2, o2, c) -#define bus_space_copy_region_8(t, h1, o1, h2, o2, c) \ - __bs_copy(8, t, h1, o1, h2, o2, c) - -/* - * Macros to provide prototypes for all the functions used in the - * bus_space structure - */ - -#define bs_map_proto(f) \ -int __bs_c(f,_bs_map) (void *t, bus_addr_t addr, \ - bus_size_t size, int cacheable, bus_space_handle_t *bshp); - -#define bs_unmap_proto(f) \ -void __bs_c(f,_bs_unmap) (void *t, bus_space_handle_t bsh, \ - bus_size_t size); - -#define bs_subregion_proto(f) \ -int __bs_c(f,_bs_subregion) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, bus_size_t size, \ - bus_space_handle_t *nbshp); - -#define bs_alloc_proto(f) \ -int __bs_c(f,_bs_alloc) (void *t, bus_addr_t rstart, \ - bus_addr_t rend, bus_size_t size, bus_size_t align, \ - bus_size_t boundary, int cacheable, bus_addr_t *addrp, \ - bus_space_handle_t *bshp); - -#define bs_free_proto(f) \ -void __bs_c(f,_bs_free) (void *t, bus_space_handle_t bsh, \ - bus_size_t size); - -#define bs_mmap_proto(f) \ -int __bs_c(f,_bs_mmap) (struct cdev *, vm_offset_t, vm_paddr_t *, int); - -#define bs_barrier_proto(f) \ -void __bs_c(f,_bs_barrier) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, bus_size_t len, int flags); - -#define bs_r_1_proto(f) \ -u_int8_t __bs_c(f,_bs_r_1) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset); - -#define bs_r_2_proto(f) \ -u_int16_t __bs_c(f,_bs_r_2) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset); - -#define bs_r_4_proto(f) \ -u_int32_t __bs_c(f,_bs_r_4) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset); - -#define bs_r_8_proto(f) \ -u_int64_t __bs_c(f,_bs_r_8) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset); - -#define bs_r_1_s_proto(f) \ -u_int8_t __bs_c(f,_bs_r_1_s) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset); - -#define bs_r_2_s_proto(f) \ -u_int16_t __bs_c(f,_bs_r_2_s) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset); - -#define bs_r_4_s_proto(f) \ -u_int32_t __bs_c(f,_bs_r_4_s) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset); - -#define bs_w_1_proto(f) \ -void __bs_c(f,_bs_w_1) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int8_t value); - -#define bs_w_2_proto(f) \ -void __bs_c(f,_bs_w_2) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int16_t value); - -#define bs_w_4_proto(f) \ -void __bs_c(f,_bs_w_4) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int32_t value); - -#define bs_w_8_proto(f) \ -void __bs_c(f,_bs_w_8) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int64_t value); - -#define bs_w_1_s_proto(f) \ -void __bs_c(f,_bs_w_1_s) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int8_t value); - -#define bs_w_2_s_proto(f) \ -void __bs_c(f,_bs_w_2_s) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int16_t value); - -#define bs_w_4_s_proto(f) \ -void __bs_c(f,_bs_w_4_s) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int32_t value); - -#define bs_rm_1_proto(f) \ -void __bs_c(f,_bs_rm_1) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int8_t *addr, bus_size_t count); - -#define bs_rm_2_proto(f) \ -void __bs_c(f,_bs_rm_2) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int16_t *addr, bus_size_t count); - -#define bs_rm_4_proto(f) \ -void __bs_c(f,_bs_rm_4) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int32_t *addr, bus_size_t count); - -#define bs_rm_8_proto(f) \ -void __bs_c(f,_bs_rm_8) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int64_t *addr, bus_size_t count); - -#define bs_wm_1_proto(f) \ -void __bs_c(f,_bs_wm_1) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, const u_int8_t *addr, bus_size_t count); - -#define bs_wm_2_proto(f) \ -void __bs_c(f,_bs_wm_2) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, const u_int16_t *addr, bus_size_t count); - -#define bs_wm_4_proto(f) \ -void __bs_c(f,_bs_wm_4) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, const u_int32_t *addr, bus_size_t count); - -#define bs_wm_8_proto(f) \ -void __bs_c(f,_bs_wm_8) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, const u_int64_t *addr, bus_size_t count); - -#define bs_rr_1_proto(f) \ -void __bs_c(f, _bs_rr_1) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int8_t *addr, bus_size_t count); - -#define bs_rr_2_proto(f) \ -void __bs_c(f, _bs_rr_2) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int16_t *addr, bus_size_t count); - -#define bs_rr_4_proto(f) \ -void __bs_c(f, _bs_rr_4) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int32_t *addr, bus_size_t count); - -#define bs_rr_8_proto(f) \ -void __bs_c(f, _bs_rr_8) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int64_t *addr, bus_size_t count); - -#define bs_wr_1_proto(f) \ -void __bs_c(f, _bs_wr_1) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, const u_int8_t *addr, bus_size_t count); - -#define bs_wr_2_proto(f) \ -void __bs_c(f, _bs_wr_2) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, const u_int16_t *addr, bus_size_t count); - -#define bs_wr_4_proto(f) \ -void __bs_c(f, _bs_wr_4) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, const u_int32_t *addr, bus_size_t count); - -#define bs_wr_8_proto(f) \ -void __bs_c(f, _bs_wr_8) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, const u_int64_t *addr, bus_size_t count); - -#define bs_sm_1_proto(f) \ -void __bs_c(f,_bs_sm_1) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int8_t value, bus_size_t count); - -#define bs_sm_2_proto(f) \ -void __bs_c(f,_bs_sm_2) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int16_t value, bus_size_t count); - -#define bs_sm_4_proto(f) \ -void __bs_c(f,_bs_sm_4) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int32_t value, bus_size_t count); - -#define bs_sm_8_proto(f) \ -void __bs_c(f,_bs_sm_8) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int64_t value, bus_size_t count); - -#define bs_sr_1_proto(f) \ -void __bs_c(f,_bs_sr_1) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int8_t value, bus_size_t count); - -#define bs_sr_2_proto(f) \ -void __bs_c(f,_bs_sr_2) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int16_t value, bus_size_t count); - -#define bs_sr_4_proto(f) \ -void __bs_c(f,_bs_sr_4) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int32_t value, bus_size_t count); - -#define bs_sr_8_proto(f) \ -void __bs_c(f,_bs_sr_8) (void *t, bus_space_handle_t bsh, \ - bus_size_t offset, u_int64_t value, bus_size_t count); - -#define bs_c_1_proto(f) \ -void __bs_c(f,_bs_c_1) (void *t, bus_space_handle_t bsh1, \ - bus_size_t offset1, bus_space_handle_t bsh2, \ - bus_size_t offset2, bus_size_t count); - -#define bs_c_2_proto(f) \ -void __bs_c(f,_bs_c_2) (void *t, bus_space_handle_t bsh1, \ - bus_size_t offset1, bus_space_handle_t bsh2, \ - bus_size_t offset2, bus_size_t count); - -#define bs_c_4_proto(f) \ -void __bs_c(f,_bs_c_4) (void *t, bus_space_handle_t bsh1, \ - bus_size_t offset1, bus_space_handle_t bsh2, \ - bus_size_t offset2, bus_size_t count); - -#define bs_c_8_proto(f) \ -void __bs_c(f,_bs_c_8) (void *t, bus_space_handle_t bsh1, \ - bus_size_t offset1, bus_space_handle_t bsh2, \ - bus_size_t offset2, bus_size_t count); - -#define bs_protos(f) \ -bs_map_proto(f); \ -bs_unmap_proto(f); \ -bs_subregion_proto(f); \ -bs_alloc_proto(f); \ -bs_free_proto(f); \ -bs_mmap_proto(f); \ -bs_barrier_proto(f); \ -bs_r_1_proto(f); \ -bs_r_2_proto(f); \ -bs_r_4_proto(f); \ -bs_r_8_proto(f); \ -bs_r_1_s_proto(f); \ -bs_r_2_s_proto(f); \ -bs_r_4_s_proto(f); \ -bs_w_1_proto(f); \ -bs_w_2_proto(f); \ -bs_w_4_proto(f); \ -bs_w_8_proto(f); \ -bs_w_1_s_proto(f); \ -bs_w_2_s_proto(f); \ -bs_w_4_s_proto(f); \ -bs_rm_1_proto(f); \ -bs_rm_2_proto(f); \ -bs_rm_4_proto(f); \ -bs_rm_8_proto(f); \ -bs_wm_1_proto(f); \ -bs_wm_2_proto(f); \ -bs_wm_4_proto(f); \ -bs_wm_8_proto(f); \ -bs_rr_1_proto(f); \ -bs_rr_2_proto(f); \ -bs_rr_4_proto(f); \ -bs_rr_8_proto(f); \ -bs_wr_1_proto(f); \ -bs_wr_2_proto(f); \ -bs_wr_4_proto(f); \ -bs_wr_8_proto(f); \ -bs_sm_1_proto(f); \ -bs_sm_2_proto(f); \ -bs_sm_4_proto(f); \ -bs_sm_8_proto(f); \ -bs_sr_1_proto(f); \ -bs_sr_2_proto(f); \ -bs_sr_4_proto(f); \ -bs_sr_8_proto(f); \ -bs_c_1_proto(f); \ -bs_c_2_proto(f); \ -bs_c_4_proto(f); \ -bs_c_8_proto(f); - -#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t) - -#define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF -#define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXADDR 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF -#define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE 0xFFFFFFFF - #include #endif /* _MACHINE_BUS_H_ */ ==== //depot/projects/mips2-jnpr/src/sys/sys/bs_ind.h#2 (text+ko) ==== @@ -70,22 +70,15 @@ * $FreeBSD: src/sys/arm/include/bus.h,v 1.9 2006/11/19 23:46:49 sam Exp $ */ -#ifndef _MACHINE_BUS_H_ -#define _MACHINE_BUS_H_ - -#include +#ifndef _SYS_BS_IND_H_ +#define _SYS_BS_IND_H_ /* - * int bus_space_map (bus_space_tag_t t, bus_addr_t addr, - * bus_size_t size, int flags, bus_space_handle_t *bshp); - * - * Map a region of bus space. + * This file assumes that machine/_bus.h has been included already, and + * that all the relevant bus space defines are defined before this is + * included. */ -#define BUS_SPACE_MAP_CACHEABLE 0x01 -#define BUS_SPACE_MAP_LINEAR 0x02 -#define BUS_SPACE_MAP_PREFETCHABLE 0x04 - struct bus_space { /* cookie */ void *bs_cookie; @@ -723,11 +716,7 @@ #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXADDR 0xFFFFFFFF #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE 0xFFFFFFFF -#include - -#endif /* _MACHINE_BUS_H_ */ +#endif /* _SYS_BS_IND_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jan 30 05:08:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 049F816A41A; Wed, 30 Jan 2008 05:08:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD94F16A418 for ; Wed, 30 Jan 2008 05:08:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8CC5813C455 for ; Wed, 30 Jan 2008 05:08:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U580D8084527 for ; Wed, 30 Jan 2008 05:08:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U57xwS084524 for perforce@freebsd.org; Wed, 30 Jan 2008 05:07:59 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 05:07:59 GMT Message-Id: <200801300507.m0U57xwS084524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134438 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 05:08:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=134438 Change 134438 by jb@jb_freebsd1 on 2008/01/30 05:07:22 Fix the #ifdef. Affected files ... .. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#31 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#31 (text+ko) ==== @@ -887,7 +887,7 @@ #endif /* I feel sleepy */ lock_profile_release_lock(&sched_lock.lock_object); -#ifdef KDTRACE +#ifdef KDTRACE_HOOKS /* * If DTrace has set the active vtime enum to anything * other than INACTIVE (0), then it should have set the From owner-p4-projects@FreeBSD.ORG Wed Jan 30 05:10:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 925A816A418; Wed, 30 Jan 2008 05:10:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3FE4F16A41A for ; Wed, 30 Jan 2008 05:10:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0F3FB13C447 for ; Wed, 30 Jan 2008 05:10:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U5A2Jd084628 for ; Wed, 30 Jan 2008 05:10:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U5A2Zf084625 for perforce@freebsd.org; Wed, 30 Jan 2008 05:10:02 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 05:10:02 GMT Message-Id: <200801300510.m0U5A2Zf084625@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 05:10:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=134439 Change 134439 by jb@jb_freebsd1 on 2008/01/30 05:09:54 Ugh. Fix the #ifdef. Affected files ... .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#27 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/sched_ule.c#27 (text+ko) ==== @@ -1904,7 +1904,7 @@ lock_profile_release_lock(&TDQ_LOCKPTR(tdq)->lock_object); TDQ_LOCKPTR(tdq)->mtx_lock = (uintptr_t)newtd; -#ifdef KDTRACE +#ifdef KDTRACE_HOOKS /* * If DTrace has set the active vtime enum to anything * other than INACTIVE (0), then it should have set the From owner-p4-projects@FreeBSD.ORG Wed Jan 30 05:11:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 252CA16A420; Wed, 30 Jan 2008 05:11:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C68CC16A419 for ; Wed, 30 Jan 2008 05:11:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 95B1013C447 for ; Wed, 30 Jan 2008 05:11:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U5B5vO084752 for ; Wed, 30 Jan 2008 05:11:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U5B5nZ084742 for perforce@freebsd.org; Wed, 30 Jan 2008 05:11:05 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 05:11:05 GMT Message-Id: <200801300511.m0U5B5nZ084742@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134441 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 05:11:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=134441 Change 134441 by jb@jb_freebsd1 on 2008/01/30 05:10:54 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/sys/kern/sched_4bsd.c#3 edit .. //depot/projects/dtrace7/src/sys/kern/sched_ule.c#3 edit Differences ... ==== //depot/projects/dtrace7/src/sys/kern/sched_4bsd.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.106.2.1 2007/12/20 07:15:40 davidxu Exp $"); #include "opt_hwpmc_hooks.h" +#include "opt_kdtrace.h" #include #include @@ -59,6 +60,12 @@ #include #endif +#ifdef KDTRACE_HOOKS +#include +int dtrace_vtime_active; +dtrace_vtime_switch_func_t dtrace_vtime_switch_func; +#endif + /* * INVERSE_ESTCPU_WEIGHT is only suitable for statclock() frequencies in * the range 100-256 Hz (approximately). @@ -901,6 +908,15 @@ PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_OUT); #endif +#ifdef KDTRACE_HOOKS + /* + * If DTrace has set the active vtime enum to anything + * other than INACTIVE (0), then it should have set the + * function to call. + */ + if (dtrace_vtime_active) + (*dtrace_vtime_switch_func)(newtd); +#endif /* I feel sleepy */ cpu_switch(td, newtd, td->td_lock); /* ==== //depot/projects/dtrace7/src/sys/kern/sched_ule.c#3 (text+ko) ==== @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.214.2.2 2007/12/20 07:15:40 davidxu Exp $"); #include "opt_hwpmc_hooks.h" +#include "opt_kdtrace.h" #include "opt_sched.h" #include @@ -68,6 +69,12 @@ #include #endif +#ifdef KDTRACE_HOOKS +#include +int dtrace_vtime_active; +dtrace_vtime_switch_func_t dtrace_vtime_switch_func; +#endif + #include #include @@ -1895,6 +1902,16 @@ PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_OUT); #endif TDQ_LOCKPTR(tdq)->mtx_lock = (uintptr_t)newtd; + +#ifdef KDTRACE_HOOKS + /* + * If DTrace has set the active vtime enum to anything + * other than INACTIVE (0), then it should have set the + * function to call. + */ + if (dtrace_vtime_active) + (*dtrace_vtime_switch_func)(newtd); +#endif cpu_switch(td, newtd, mtx); /* * We may return from cpu_switch on a different cpu. However, From owner-p4-projects@FreeBSD.ORG Wed Jan 30 05:36:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EA3716A468; Wed, 30 Jan 2008 05:36:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BB0A16A419 for ; Wed, 30 Jan 2008 05:36:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 12D2913C45D for ; Wed, 30 Jan 2008 05:36:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U5aVVc086469 for ; Wed, 30 Jan 2008 05:36:31 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U5aVu3086466 for perforce@freebsd.org; Wed, 30 Jan 2008 05:36:31 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 05:36:31 GMT Message-Id: <200801300536.m0U5aVu3086466@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134442 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 05:36:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=134442 Change 134442 by jb@jb_freebsd1 on 2008/01/30 05:36:18 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/sys/kern/kern_fork.c#3 edit Differences ... ==== //depot/projects/dtrace7/src/sys/kern/kern_fork.c#3 (text+ko) ==== @@ -37,6 +37,7 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.282.2.2 2008/01/18 10:02:51 kib Exp $"); +#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_mac.h" @@ -63,6 +64,7 @@ #include #include #include +#include #include #include @@ -75,7 +77,17 @@ #include #include +#ifdef KDTRACE_HOOKS +#include +dtrace_fork_func_t dtrace_fasttrap_fork; +#endif +SDT_PROVIDER_DECLARE(proc); +SDT_PROBE_DEFINE(proc, kernel, , create); +SDT_PROBE_ARGTYPE(proc, kernel, , create, 0, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, , create, 1, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, , create, 2, "int"); + #ifndef _SYS_SYSPROTO_H_ struct fork_args { int dummy; @@ -621,6 +633,13 @@ } /* + * Tell the DTrace fasttrap provider about the new process + * if it has registered an interest. + */ + if (dtrace_fasttrap_fork) + dtrace_fasttrap_fork(p1, p2); + + /* * This begins the section where we must prevent the parent * from being swapped. */ @@ -707,6 +726,8 @@ */ KNOTE_LOCKED(&p1->p_klist, NOTE_FORK | p2->p_pid); + SDT_PROBE(proc, kernel, , create, p2, p1, flags, 0, 0); + PROC_UNLOCK(p1); /* From owner-p4-projects@FreeBSD.ORG Wed Jan 30 05:39:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0CAB16A420; Wed, 30 Jan 2008 05:39:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B64E516A417 for ; Wed, 30 Jan 2008 05:39:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9DA1B13C448 for ; Wed, 30 Jan 2008 05:39:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U5dZvW086561 for ; Wed, 30 Jan 2008 05:39:35 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U5dZYq086558 for perforce@freebsd.org; Wed, 30 Jan 2008 05:39:35 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 05:39:35 GMT Message-Id: <200801300539.m0U5dZYq086558@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134443 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 05:39:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=134443 Change 134443 by jb@jb_freebsd1 on 2008/01/30 05:39:22 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/sys/kern/kern_exit.c#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/kern/kern_exit.c#2 (text+ko) ==== @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.304 2007/06/13 20:01:42 jhb Exp $"); #include "opt_compat.h" +#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_mac.h" @@ -65,6 +66,7 @@ #include #include /* for acct_process() function prototype */ #include +#include #include #include #ifdef KTRACE @@ -82,6 +84,15 @@ #include #include +#ifdef KDTRACE_HOOKS +#include +dtrace_execexit_func_t dtrace_fasttrap_exit; +#endif + +SDT_PROVIDER_DECLARE(proc); +SDT_PROBE_DEFINE(proc, kernel, , exit); +SDT_PROBE_ARGTYPE(proc, kernel, , exit, 0, "int"); + /* Required to be non-static for SysVR4 emulator */ MALLOC_DEFINE(M_ZOMBIE, "zombie", "zombie proc status"); @@ -449,11 +460,29 @@ PROC_LOCK(p); p->p_xstat = rv; p->p_xthread = td; + +#ifdef KDTRACE_HOOKS /* + * Tell the DTrace fasttrap provider about the exit if it + * has declared an interest. + */ + if (dtrace_fasttrap_exit) + dtrace_fasttrap_exit(p); +#endif + + /* * Notify interested parties of our demise. */ KNOTE_LOCKED(&p->p_klist, NOTE_EXIT); +#ifdef KDTRACE_HOOKS + int reason = CLD_EXITED; + if (WCOREDUMP(rv)) + reason = CLD_DUMPED; + else if (WIFSIGNALED(rv)) + reason = CLD_KILLED; + SDT_PROBE(proc, kernel, , exit, reason, 0, 0, 0, 0); +#endif /* * Just delete all entries in the p_klist. At this point we won't * report any more events, and there are nasty race conditions that From owner-p4-projects@FreeBSD.ORG Wed Jan 30 05:42:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F90616A41A; Wed, 30 Jan 2008 05:42:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3BC6316A417 for ; Wed, 30 Jan 2008 05:42:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2334913C43E for ; Wed, 30 Jan 2008 05:42:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U5gdHd086697 for ; Wed, 30 Jan 2008 05:42:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U5gcmS086694 for perforce@freebsd.org; Wed, 30 Jan 2008 05:42:38 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 05:42:38 GMT Message-Id: <200801300542.m0U5gcmS086694@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134444 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 05:42:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=134444 Change 134444 by jb@jb_freebsd1 on 2008/01/30 05:42:24 Add the kernel options #ifdefs which I missed before. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#25 edit .. //depot/projects/dtrace/src/sys/kern/kern_exit.c#18 edit .. //depot/projects/dtrace/src/sys/kern/kern_fork.c#28 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_exec.c#25 (text+ko) ==== @@ -672,12 +672,14 @@ textvp = p->p_textvp; p->p_textvp = ndp->ni_vp; +#ifdef KDTRACE_HOOKS /* * Tell the DTrace fasttrap provider about the exec if it * has declared an interest. */ if (dtrace_fasttrap_exec) dtrace_fasttrap_exec(p); +#endif /* * Notify others that we exec'd, and clear the P_INEXEC flag ==== //depot/projects/dtrace/src/sys/kern/kern_exit.c#18 (text+ko) ==== @@ -460,12 +460,14 @@ p->p_xstat = rv; p->p_xthread = td; +#ifdef KDTRACE_HOOKS /* * Tell the DTrace fasttrap provider about the exit if it * has declared an interest. */ if (dtrace_fasttrap_exit) dtrace_fasttrap_exit(p); +#endif /* * Notify interested parties of our demise. ==== //depot/projects/dtrace/src/sys/kern/kern_fork.c#28 (text+ko) ==== @@ -639,12 +639,14 @@ p2->p_pfsflags = p1->p_pfsflags; } +#ifdef KDTRACE_HOOKS /* * Tell the DTrace fasttrap provider about the new process * if it has registered an interest. */ if (dtrace_fasttrap_fork) dtrace_fasttrap_fork(p1, p2); +#endif /* * This begins the section where we must prevent the parent From owner-p4-projects@FreeBSD.ORG Wed Jan 30 05:46:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E89016A469; Wed, 30 Jan 2008 05:46:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7B7816A421 for ; Wed, 30 Jan 2008 05:46:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AEA6513C4EC for ; Wed, 30 Jan 2008 05:46:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U5khcM086872 for ; Wed, 30 Jan 2008 05:46:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U5khsT086869 for perforce@freebsd.org; Wed, 30 Jan 2008 05:46:43 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 05:46:43 GMT Message-Id: <200801300546.m0U5khsT086869@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 05:46:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=134445 Change 134445 by jb@jb_freebsd1 on 2008/01/30 05:46:13 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/sys/kern/kern_exec.c#4 edit Differences ... ==== //depot/projects/dtrace7/src/sys/kern/kern_exec.c#4 (text+ko) ==== @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.308.2.2 2008/01/18 10:02:51 kib Exp $"); #include "opt_hwpmc_hooks.h" +#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_mac.h" @@ -53,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -82,6 +84,19 @@ #include #include +#ifdef KDTRACE_HOOKS +#include +dtrace_execexit_func_t dtrace_fasttrap_exec; +#endif + +SDT_PROVIDER_DECLARE(proc); +SDT_PROBE_DEFINE(proc, kernel, , exec); +SDT_PROBE_ARGTYPE(proc, kernel, , exec, 0, "char *"); +SDT_PROBE_DEFINE(proc, kernel, , exec_failure); +SDT_PROBE_ARGTYPE(proc, kernel, , exec_failure, 0, "int"); +SDT_PROBE_DEFINE(proc, kernel, , exec_success); +SDT_PROBE_ARGTYPE(proc, kernel, , exec_success, 0, "char *"); + MALLOC_DEFINE(M_PARGS, "proc-args", "Process arguments"); static int sysctl_kern_ps_strings(SYSCTL_HANDLER_ARGS); @@ -347,6 +362,8 @@ imgp->image_header = NULL; + SDT_PROBE(proc, kernel, , exec, args->fname, 0, 0, 0, 0 ); + /* * Translate the file name. namei() returns a vnode pointer * in ni_vp amoung other things. @@ -653,6 +670,15 @@ textvp = p->p_textvp; p->p_textvp = ndp->ni_vp; +#ifdef KDTRACE_HOOKS + /* + * Tell the DTrace fasttrap provider about the exec if it + * has declared an interest. + */ + if (dtrace_fasttrap_exec) + dtrace_fasttrap_exec(p); +#endif + /* * Notify others that we exec'd, and clear the P_INEXEC flag * as we're now a bona fide freshly-execed process. @@ -724,6 +750,9 @@ else crfree(newcred); VOP_UNLOCK(imgp->vp, 0, td); + + SDT_PROBE(proc, kernel, , exec_success, args->fname, 0, 0, 0, 0); + /* * Handle deferred decrement of ref counts. */ From owner-p4-projects@FreeBSD.ORG Wed Jan 30 06:08:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1141616A421; Wed, 30 Jan 2008 06:08:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAAB616A417 for ; Wed, 30 Jan 2008 06:08:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B13B013C467 for ; Wed, 30 Jan 2008 06:08:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U686f0089001 for ; Wed, 30 Jan 2008 06:08:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U686ms088998 for perforce@freebsd.org; Wed, 30 Jan 2008 06:08:06 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 06:08:06 GMT Message-Id: <200801300608.m0U686ms088998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134446 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 06:08:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=134446 Change 134446 by jb@jb_freebsd1 on 2008/01/30 06:07:37 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/sys/kern/kern_proc.c#6 edit Differences ... ==== //depot/projects/dtrace7/src/sys/kern/kern_proc.c#6 (text+ko) ==== @@ -32,6 +32,7 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.252.2.3 2008/01/18 10:02:51 kib Exp $"); +#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_kstack_pages.h" @@ -49,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -66,6 +68,35 @@ #include #include +SDT_PROVIDER_DEFINE(proc); +SDT_PROBE_DEFINE(proc, kernel, ctor , entry); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 0, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 1, "int"); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 2, "void *"); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 3, "int"); +SDT_PROBE_DEFINE(proc, kernel, ctor , return); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 0, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 1, "int"); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 2, "void *"); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 3, "int"); +SDT_PROBE_DEFINE(proc, kernel, dtor , entry); +SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 0, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 1, "int"); +SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 2, "void *"); +SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 3, "struct thread *"); +SDT_PROBE_DEFINE(proc, kernel, dtor , return); +SDT_PROBE_ARGTYPE(proc, kernel, dtor , return, 0, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, dtor , return, 1, "int"); +SDT_PROBE_ARGTYPE(proc, kernel, dtor , return, 2, "void *"); +SDT_PROBE_DEFINE(proc, kernel, init , entry); +SDT_PROBE_ARGTYPE(proc, kernel, init , entry, 0, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, init , entry, 1, "int"); +SDT_PROBE_ARGTYPE(proc, kernel, init , entry, 2, "int"); +SDT_PROBE_DEFINE(proc, kernel, init , return); +SDT_PROBE_ARGTYPE(proc, kernel, init , return, 0, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, init , return, 1, "int"); +SDT_PROBE_ARGTYPE(proc, kernel, init , return, 2, "int"); + MALLOC_DEFINE(M_PGRP, "pgrp", "process group header"); MALLOC_DEFINE(M_SESSION, "session", "session header"); static MALLOC_DEFINE(M_PROC, "proc", "Proc structures"); @@ -131,7 +162,9 @@ struct proc *p; p = (struct proc *)mem; + SDT_PROBE(proc, kernel, ctor , entry, p, size, arg, flags, 0); EVENTHANDLER_INVOKE(process_ctor, p); + SDT_PROBE(proc, kernel, ctor , return, p, size, arg, flags, 0); return (0); } @@ -147,6 +180,7 @@ /* INVARIANTS checks go here */ p = (struct proc *)mem; td = FIRST_THREAD_IN_PROC(p); + SDT_PROBE(proc, kernel, dtor , entry, p, size, arg, td, 0); if (td != NULL) { #ifdef INVARIANTS KASSERT((p->p_numthreads == 1), @@ -165,6 +199,7 @@ EVENTHANDLER_INVOKE(process_dtor, p); if (p->p_ksi != NULL) KASSERT(! KSI_ONQ(p->p_ksi), ("SIGCHLD queue")); + SDT_PROBE(proc, kernel, dtor , return, p, size, arg, 0, 0); } /* @@ -176,6 +211,7 @@ struct proc *p; p = (struct proc *)mem; + SDT_PROBE(proc, kernel, init , entry, p, size, flags, 0, 0); p->p_sched = (struct p_sched *)&p[1]; bzero(&p->p_mtx, sizeof(struct mtx)); mtx_init(&p->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); @@ -183,6 +219,7 @@ TAILQ_INIT(&p->p_threads); /* all threads in proc */ EVENTHANDLER_INVOKE(process_init, p); p->p_stats = pstats_alloc(); + SDT_PROBE(proc, kernel, init , return, p, size, flags, 0, 0); return (0); } From owner-p4-projects@FreeBSD.ORG Wed Jan 30 06:21:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4539516A419; Wed, 30 Jan 2008 06:21:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E600416A417 for ; Wed, 30 Jan 2008 06:21:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCE5713C44B for ; Wed, 30 Jan 2008 06:21:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U6LKvO090439 for ; Wed, 30 Jan 2008 06:21:20 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U6LKsf090436 for perforce@freebsd.org; Wed, 30 Jan 2008 06:21:20 GMT (envelope-from imp@freebsd.org) Date: Wed, 30 Jan 2008 06:21:20 GMT Message-Id: <200801300621.m0U6LKsf090436@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134447 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 06:21:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=134447 Change 134447 by imp@imp_paco-paco on 2008/01/30 06:21:14 Minor refinement Affected files ... .. //depot/projects/mips2-jnpr/src/sys/arm/include/bus.h#3 edit .. //depot/projects/mips2-jnpr/src/sys/sys/bs_ind.h#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/arm/include/bus.h#3 (text+ko) ==== @@ -1,29 +1,32 @@ /*- - * Copyright (c) 2008 Cisco, Inc. - * All rights reserved. + * Copyright (c) 2008, by Cisco Systems, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer, - * without modification, immediately at the beginning of the file. - * 2. Redistributions in binary form must reproduce the above copyright + * modification, are permitted provided that the following conditions are met: + * + * a) Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * b) 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. + * the documentation and/or other materials provided with the distribution. + * + * c) Neither the name of Cisco Systems, Inc. nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER 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$ */ @@ -64,6 +67,18 @@ #define BUS_SPACE_MAXSIZE 0xFFFFFFFFul /* + * Maximum number of dma segments: no restrictions. + */ +#define BUS_SPACE_UNRESTRICTED (~0) + +/* + * Different types of bus space barrier. Not sure if this should be here + * or if these are really common. + */ +#define BUS_SPACE_BARRIER_READ 0x01 +#define BUS_SPACE_BARRIER_WRITE 0x02 + +/* * bus dma impelemenation, which is described in bus_dma(9) */ #include ==== //depot/projects/mips2-jnpr/src/sys/sys/bs_ind.h#3 (text+ko) ==== @@ -298,9 +298,6 @@ #define bus_space_barrier(t, h, o, l, f) \ (*(t)->bs_barrier)((t)->bs_cookie, (h), (o), (l), (f)) -#define BUS_SPACE_BARRIER_READ 0x01 -#define BUS_SPACE_BARRIER_WRITE 0x02 - /* * Bus read (single) operations. */ From owner-p4-projects@FreeBSD.ORG Wed Jan 30 06:28:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E57116A46B; Wed, 30 Jan 2008 06:28:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33D5616A468 for ; Wed, 30 Jan 2008 06:28:31 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1AF1613C442 for ; Wed, 30 Jan 2008 06:28:31 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U6SVGM090849 for ; Wed, 30 Jan 2008 06:28:31 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U6SUdL090846 for perforce@freebsd.org; Wed, 30 Jan 2008 06:28:30 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 06:28:30 GMT Message-Id: <200801300628.m0U6SUdL090846@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134448 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 06:28:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=134448 Change 134448 by jb@jb_freebsd1 on 2008/01/30 06:28:27 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/sys/conf/kern.post.mk#2 edit .. //depot/projects/dtrace7/src/sys/conf/kern.pre.mk#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/conf/kern.post.mk#2 (text+ko) ==== @@ -86,6 +86,9 @@ @rm -f ${.TARGET} @echo linking ${.TARGET} ${SYSTEM_LD} +.if defined(CTFMERGE) + ${SYSTEM_CTFMERGE} +.endif .if !defined(DEBUG) ${OBJCOPY} --strip-debug ${.TARGET} .endif ==== //depot/projects/dtrace7/src/sys/conf/kern.pre.mk#2 (text+ko) ==== @@ -31,6 +31,8 @@ . endif . if ${MACHINE_ARCH} == "amd64" COPTFLAGS?=-O2 -frename-registers -pipe +. elif ${MACHINE_ARCH} == "sparc64" +COPTFLAGS?=-pipe . else COPTFLAGS?=${_MINUS_O} -pipe . endif @@ -79,6 +81,9 @@ # ... and XFS INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs +# ... and OpenSolaris +INCLUDES+= -I$S/contrib/opensolaris/compat + .endif CFLAGS= ${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS} @@ -126,6 +131,12 @@ NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \ ${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c +.if defined(CTFCONVERT) +NORMAL_CTFCONVERT= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.else +NORMAL_CTFCONVERT= +.endif + NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC} GEN_CFILES= $S/$M/$M/genassym.c ${MFILES:T:S/.m$/.c/} @@ -134,6 +145,10 @@ SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS} SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o} SYSTEM_OBJS+= hack.So +.if defined(CTFMERGE) +SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o +LD+= -g +.endif SYSTEM_LD= @${LD} -Bdynamic -T $S/conf/ldscript.$M \ -warn-common -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o From owner-p4-projects@FreeBSD.ORG Wed Jan 30 06:29:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B32D16A421; Wed, 30 Jan 2008 06:29:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6059416A420 for ; Wed, 30 Jan 2008 06:29:32 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 474F513C455 for ; Wed, 30 Jan 2008 06:29:32 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U6TWGP090902 for ; Wed, 30 Jan 2008 06:29:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U6TWdE090899 for perforce@freebsd.org; Wed, 30 Jan 2008 06:29:32 GMT (envelope-from imp@freebsd.org) Date: Wed, 30 Jan 2008 06:29:32 GMT Message-Id: <200801300629.m0U6TWdE090899@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134449 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 06:29:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=134449 Change 134449 by imp@imp_lighthouse on 2008/01/30 06:28:43 Update todo list based on done items. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/TODO#12 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/TODO#12 (text+ko) ==== @@ -7,17 +7,12 @@ o unify cpu.h vs cpureg.h o Look for old vestiges of the array of args for p->p_regs[] and also comments about same. -o cpu.c in mips2 appears to be done in machdep in jnpr. reconcile - cpu.c in jmips is just for the cpu device driver. o Look at the differences between the trampoline code between the two versions as this may lead to problems. Specifically, we have sigcode encoded into locore.S, and some code in sigreturn in pm_machdep.c. Not sure where things are in libc. o What does that assmbler before mi_startup do in locore.S Comment or remove. -o juniper mips adds some mucking with the FPU in after the platform_init - call (well, it was called mips_init in Jmips). Is this relevant to the - merged code, since mips2 did this earlier... o Don't forget John Baldwin's comments on the user switch stuff. XXX add more here XXX o What's defined in assym.s and param.h varies somewhat between the two @@ -26,9 +21,6 @@ variable setting, which is related to something that was omitted from the juniper-mips dump. o cpu init -o I moved where we initialize the msgbuf. We need to make sure that no - printfs happen. This is where the mips2 initializes things, but I've - not audited things to make sure that's really sane. o Double check last merge from mips2 -> cavium code. Something seems wrong in one of the edits. o In the juniper vendor tree, gdb support just showed up. Merge it into @@ -36,6 +28,9 @@ o splhigh still around, is it needed? o PCPU stuff in exception.S appears to be 32-bit only, using only %hi and %lo. Isn't it necessary to use %higher and %highest in the 64-bit case? +o Adapt powerpc to new generic bs implementation. It isn't a slam dunk because + it gratuitously does the stream methods differrently than arm. +o octeon is a 64-bit kernel, so it should be in mips64, not mips32. ************ RRS (below) ********* o obio.c is probably not a good name for the IQ80321 driver From owner-p4-projects@FreeBSD.ORG Wed Jan 30 06:31:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC6AE16A468; Wed, 30 Jan 2008 06:31:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B202816A418 for ; Wed, 30 Jan 2008 06:31:34 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 98DED13C4CC for ; Wed, 30 Jan 2008 06:31:34 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U6VYjj091045 for ; Wed, 30 Jan 2008 06:31:34 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U6VY5h091042 for perforce@freebsd.org; Wed, 30 Jan 2008 06:31:34 GMT (envelope-from imp@freebsd.org) Date: Wed, 30 Jan 2008 06:31:34 GMT Message-Id: <200801300631.m0U6VY5h091042@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 06:31:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=134450 Change 134450 by imp@imp_lighthouse on 2008/01/30 06:31:11 cache.S is redundant. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/conf/files.mips#12 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cache.S#5 delete Differences ... ==== //depot/projects/mips2-jnpr/src/sys/conf/files.mips#12 (text+ko) ==== @@ -28,8 +28,7 @@ # Phase 2 # ---------------------------------------------------------------------- -###mips/mips/cache.S standard -#xxx +# Juniper didn't include this in their code drop. #mips/mips/cpuconf.c standard mips/mips/machdep.c standard mips/mips/mp_machdep.c optional smp From owner-p4-projects@FreeBSD.ORG Wed Jan 30 06:48:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F81B16A469; Wed, 30 Jan 2008 06:48:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C8B0816A417 for ; Wed, 30 Jan 2008 06:48:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AFE9C13C465 for ; Wed, 30 Jan 2008 06:48:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U6mqtY091732 for ; Wed, 30 Jan 2008 06:48:52 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U6mqB6091729 for perforce@freebsd.org; Wed, 30 Jan 2008 06:48:52 GMT (envelope-from imp@freebsd.org) Date: Wed, 30 Jan 2008 06:48:52 GMT Message-Id: <200801300648.m0U6mqB6091729@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134451 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 06:48:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=134451 Change 134451 by imp@imp_lighthouse on 2008/01/30 06:48:22 Prefer uintXX_t to u_intXX_t Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpufunc.h#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/cpufunc.h#5 (text+ko) ==== @@ -131,7 +131,7 @@ #if 0 /* XXX mips64 */ #define MIPS_RDRW64_COP0(n,r) \ -static __inline u_int64_t \ +static __inline uint64_t \ mips_rd_ ## n (void) \ { \ int v0; \ @@ -141,7 +141,7 @@ return (v0); \ } \ static __inline void \ -mips_wr_ ## n (u_int64_t a0) \ +mips_wr_ ## n (uint64_t a0) \ { \ __asm __volatile ("dmtc0 %[a0], $"__XSTRING(r)";" \ __XSTRING(COP0_SYNC)";" \ @@ -162,7 +162,7 @@ #endif #define MIPS_RDRW32_COP0(n,r) \ -static __inline u_int32_t \ +static __inline uint32_t \ mips_rd_ ## n (void) \ { \ int v0; \ @@ -172,7 +172,7 @@ return (v0); \ } \ static __inline void \ -mips_wr_ ## n (u_int32_t a0) \ +mips_wr_ ## n (uint32_t a0) \ { \ __asm __volatile ("mtc0 %[a0], $"__XSTRING(r)";" \ __XSTRING(COP0_SYNC)";" \ @@ -201,7 +201,7 @@ MIPS_RDRW32_COP0(watchlo, MIPS_COP_0_WATCH_LO); MIPS_RDRW32_COP0(watchhi, MIPS_COP_0_WATCH_HI); -static __inline u_int32_t +static __inline uint32_t mips_rd_config_sel1(void) { int v0; @@ -245,13 +245,13 @@ #endif /* _KERNEL */ -#define readb(va) (*(volatile u_int8_t *) (va)) -#define readw(va) (*(volatile u_int16_t *) (va)) -#define readl(va) (*(volatile u_int32_t *) (va)) +#define readb(va) (*(volatile uint8_t *) (va)) +#define readw(va) (*(volatile uint16_t *) (va)) +#define readl(va) (*(volatile uint32_t *) (va)) -#define writeb(va, d) (*(volatile u_int8_t *) (va) = (d)) -#define writew(va, d) (*(volatile u_int16_t *) (va) = (d)) -#define writel(va, d) (*(volatile u_int32_t *) (va) = (d)) +#define writeb(va, d) (*(volatile uint8_t *) (va) = (d)) +#define writew(va, d) (*(volatile uint16_t *) (va) = (d)) +#define writel(va, d) (*(volatile uint32_t *) (va) = (d)) /* * I/O macros. @@ -271,64 +271,64 @@ #define in32(a) inl(a) #define out8rb(a,v) (*(volatile unsigned char*)(a) = (v)) -#define out16rb(a,v) (__out16rb((volatile u_int16_t *)(a), v)) -#define out32rb(a,v) (__out32rb((volatile u_int32_t *)(a), v)) +#define out16rb(a,v) (__out16rb((volatile uint16_t *)(a), v)) +#define out32rb(a,v) (__out32rb((volatile uint32_t *)(a), v)) #define in8rb(a) (*(volatile unsigned char*)(a)) -#define in16rb(a) (__in16rb((volatile u_int16_t *)(a))) -#define in32rb(a) (__in32rb((volatile u_int32_t *)(a))) +#define in16rb(a) (__in16rb((volatile uint16_t *)(a))) +#define in32rb(a) (__in32rb((volatile uint32_t *)(a))) #define _swap_(x) (((x) >> 24) | ((x) << 24) | \ (((x) >> 8) & 0xff00) | (((x) & 0xff00) << 8)) -static __inline void __out32rb(volatile u_int32_t *, u_int32_t); -static __inline void __out16rb(volatile u_int16_t *, u_int16_t); -static __inline u_int32_t __in32rb(volatile u_int32_t *); -static __inline u_int16_t __in16rb(volatile u_int16_t *); +static __inline void __out32rb(volatile uint32_t *, uint32_t); +static __inline void __out16rb(volatile uint16_t *, uint16_t); +static __inline uint32_t __in32rb(volatile uint32_t *); +static __inline uint16_t __in16rb(volatile uint16_t *); static __inline void -__out32rb(volatile u_int32_t *a, u_int32_t v) +__out32rb(volatile uint32_t *a, uint32_t v) { - u_int32_t _v_ = v; + uint32_t _v_ = v; _v_ = _swap_(_v_); out32(a, _v_); } static __inline void -__out16rb(volatile u_int16_t *a, u_int16_t v) +__out16rb(volatile uint16_t *a, uint16_t v) { - u_int16_t _v_; + uint16_t _v_; _v_ = ((v >> 8) & 0xff) | (v << 8); out16(a, _v_); } -static __inline u_int32_t -__in32rb(volatile u_int32_t *a) +static __inline uint32_t +__in32rb(volatile uint32_t *a) { - u_int32_t _v_; + uint32_t _v_; _v_ = in32(a); _v_ = _swap_(_v_); return _v_; } -static __inline u_int16_t -__in16rb(volatile u_int16_t *a) +static __inline uint16_t +__in16rb(volatile uint16_t *a) { - u_int16_t _v_; + uint16_t _v_; _v_ = in16(a); _v_ = ((_v_ >> 8) & 0xff) | (_v_ << 8); return _v_; } -void insb(u_int8_t *, u_int8_t *,int); -void insw(u_int16_t *, u_int16_t *,int); -void insl(u_int32_t *, u_int32_t *,int); -void outsb(u_int8_t *, const u_int8_t *,int); -void outsw(u_int16_t *, const u_int16_t *,int); -void outsl(u_int32_t *, const u_int32_t *,int); +void insb(uint8_t *, uint8_t *,int); +void insw(uint16_t *, uint16_t *,int); +void insl(uint32_t *, uint32_t *,int); +void outsb(uint8_t *, const uint8_t *,int); +void outsw(uint16_t *, const uint16_t *,int); +void outsl(uint32_t *, const uint32_t *,int); u_int loadandclear(volatile u_int *addr); #endif /* !_MACHINE_CPUFUNC_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jan 30 06:55:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D2E916A468; Wed, 30 Jan 2008 06:55:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52B7F16A418 for ; Wed, 30 Jan 2008 06:55:00 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 38F3313C459 for ; Wed, 30 Jan 2008 06:55:00 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U6t007091948 for ; Wed, 30 Jan 2008 06:55:00 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U6t0k1091945 for perforce@freebsd.org; Wed, 30 Jan 2008 06:55:00 GMT (envelope-from imp@freebsd.org) Date: Wed, 30 Jan 2008 06:55:00 GMT Message-Id: <200801300655.m0U6t0k1091945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134452 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 06:55:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=134452 Change 134452 by imp@imp_lighthouse on 2008/01/30 06:53:59 Always more to do. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/TODO#13 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/TODO#13 (text+ko) ==== @@ -31,6 +31,9 @@ o Adapt powerpc to new generic bs implementation. It isn't a slam dunk because it gratuitously does the stream methods differrently than arm. o octeon is a 64-bit kernel, so it should be in mips64, not mips32. +o inb and readb are the same damn thing. Really. We should shoot them both + and all their ilk. This would allow us to have only one bus_tag, which we + need anyway to do the indirection bit right. ************ RRS (below) ********* o obio.c is probably not a good name for the IQ80321 driver From owner-p4-projects@FreeBSD.ORG Wed Jan 30 07:32:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51E6416A420; Wed, 30 Jan 2008 07:32:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13C3116A41A for ; Wed, 30 Jan 2008 07:32:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D79AE13C44B for ; Wed, 30 Jan 2008 07:32:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U7WcYh096463 for ; Wed, 30 Jan 2008 07:32:38 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U7Wcd6096460 for perforce@freebsd.org; Wed, 30 Jan 2008 07:32:38 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 07:32:38 GMT Message-Id: <200801300732.m0U7Wcd6096460@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134453 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 07:32:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=134453 Change 134453 by jb@jb_freebsd1 on 2008/01/30 07:32:28 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/tools/test/dtrace/Makefile#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jan 30 07:37:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B655B16A419; Wed, 30 Jan 2008 07:37:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A9E316A417 for ; Wed, 30 Jan 2008 07:37:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4A28613C45A for ; Wed, 30 Jan 2008 07:37:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U7biSm096702 for ; Wed, 30 Jan 2008 07:37:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U7biXg096699 for perforce@freebsd.org; Wed, 30 Jan 2008 07:37:44 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 07:37:44 GMT Message-Id: <200801300737.m0U7biXg096699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134454 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 07:37:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=134454 Change 134454 by jb@jb_freebsd1 on 2008/01/30 07:37:07 Make this file executable. Affected files ... .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#3 edit Differences ... ==== //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#3 (xtext/text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jan 30 07:43:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BE4016A41A; Wed, 30 Jan 2008 07:43:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0856C16A417 for ; Wed, 30 Jan 2008 07:43:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CC50E13C50F for ; Wed, 30 Jan 2008 07:43:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U7hoVh096950 for ; Wed, 30 Jan 2008 07:43:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U7hoai096947 for perforce@freebsd.org; Wed, 30 Jan 2008 07:43:50 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 07:43:50 GMT Message-Id: <200801300743.m0U7hoai096947@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 07:43:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=134455 Change 134455 by jb@jb_freebsd1 on 2008/01/30 07:43:25 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/usr.sbin/config/mkmakefile.c#2 edit Differences ... ==== //depot/projects/dtrace7/src/usr.sbin/config/mkmakefile.c#2 (text+ko) ==== @@ -735,7 +735,7 @@ printf("config: don't know rules for %s\n", np); break; } - snprintf(cmd, sizeof(cmd), "${%s_%c%s}", ftype, + snprintf(cmd, sizeof(cmd), "${%s_%c%s}; ${NORMAL_CTFCONVERT}", ftype, toupper(och), ftp->f_flags & NOWERROR ? "_NOWERROR" : ""); compilewith = cmd; From owner-p4-projects@FreeBSD.ORG Wed Jan 30 09:45:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5065616A418; Wed, 30 Jan 2008 09:45:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 15CCE16A46B for ; Wed, 30 Jan 2008 09:45:59 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F39D313C45A for ; Wed, 30 Jan 2008 09:45:58 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U9jwIH015494 for ; Wed, 30 Jan 2008 09:45:58 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U9jweA015491 for perforce@freebsd.org; Wed, 30 Jan 2008 09:45:58 GMT (envelope-from rrs@cisco.com) Date: Wed, 30 Jan 2008 09:45:58 GMT Message-Id: <200801300945.m0U9jweA015491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 09:45:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=134458 Change 134458 by rrs@rrs-mips2-jnpr on 2008/01/30 09:45:31 Move over first wave of octeon rgmii drivers. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fau.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fau.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fpa.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fpa.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_ipd.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_ipd.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_pip.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_pko.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_pko.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_rgmx.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_rgmx.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jan 30 09:49:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADDDF16A421; Wed, 30 Jan 2008 09:49:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57B4216A420 for ; Wed, 30 Jan 2008 09:49:02 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3FC5B13C469 for ; Wed, 30 Jan 2008 09:49:02 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U9n2l8015577 for ; Wed, 30 Jan 2008 09:49:02 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U9n2vA015574 for perforce@freebsd.org; Wed, 30 Jan 2008 09:49:02 GMT (envelope-from rrs@cisco.com) Date: Wed, 30 Jan 2008 09:49:02 GMT Message-Id: <200801300949.m0U9n2vA015574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 09:49:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=134459 Change 134459 by rrs@rrs-mips2-jnpr on 2008/01/30 09:48:44 s9indent of part of the octeon files. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fau.c#2 edit .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fau.h#2 edit .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fpa.c#2 edit .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fpa.h#2 edit .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_ipd.c#2 edit .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_ipd.h#2 edit .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_pip.h#2 edit .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_pko.c#2 edit .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_pko.h#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fau.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* -Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights +/* +Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights reserved. Redistribution and use in source and binary forms, with or without @@ -17,25 +17,25 @@ * Neither the name of Cavium Networks nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written - permission. + permission. -This Software, including technical data, may be subject to U.S. export -control laws, including the U.S. Export Administration Act and its -associated regulations, and may be subject to export or import -regulations in other countries. You warrant that You will comply -strictly in all respects with all such regulations and acknowledge that -you have the responsibility to obtain licenses to export, re-export or -import the Software. +This Software, including technical data, may be subject to U.S. export +control laws, including the U.S. Export Administration Act and its +associated regulations, and may be subject to export or import +regulations in other countries. You warrant that You will comply +strictly in all respects with all such regulations and acknowledge that +you have the responsibility to obtain licenses to export, re-export or +import the Software. -TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" -AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS -OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT -TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY -REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT -DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF -TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, -LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION -OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR +TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" +AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS +OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT +TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY +REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT +DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF +TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, +LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION +OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU. */ @@ -56,7 +56,8 @@ * * How do we initialize FAU unit. I don't even think we can reset it. */ -void octeon_fau_init (void) +void +octeon_fau_init(void) { } @@ -66,7 +67,8 @@ * * Let the Fetch/Add unit roll */ -void octeon_fau_enable (void) +void +octeon_fau_enable(void) { } @@ -78,6 +80,7 @@ * * Don't know if we can even do that. */ -void octeon_fau_disable (void) +void +octeon_fau_disable(void) { } ==== //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fau.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights +Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights reserved. Redistribution and use in source and binary forms, with or without @@ -17,25 +17,25 @@ * Neither the name of Cavium Networks nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written - permission. + permission. -This Software, including technical data, may be subject to U.S. export -control laws, including the U.S. Export Administration Act and its -associated regulations, and may be subject to export or import -regulations in other countries. You warrant that You will comply -strictly in all respects with all such regulations and acknowledge that -you have the responsibility to obtain licenses to export, re-export or -import the Software. +This Software, including technical data, may be subject to U.S. export +control laws, including the U.S. Export Administration Act and its +associated regulations, and may be subject to export or import +regulations in other countries. You warrant that You will comply +strictly in all respects with all such regulations and acknowledge that +you have the responsibility to obtain licenses to export, re-export or +import the Software. -TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" -AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS -OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT -TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY -REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT -DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF -TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, -LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION -OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR +TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" +AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS +OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT +TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY +REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT +DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF +TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, +LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION +OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU. */ @@ -55,10 +55,10 @@ typedef enum { - OCTEON_FAU_OP_SIZE_8 = 0, - OCTEON_FAU_OP_SIZE_16 = 1, - OCTEON_FAU_OP_SIZE_32 = 2, - OCTEON_FAU_OP_SIZE_64 = 3 + OCTEON_FAU_OP_SIZE_8 = 0, + OCTEON_FAU_OP_SIZE_16 = 1, + OCTEON_FAU_OP_SIZE_32 = 2, + OCTEON_FAU_OP_SIZE_64 = 3 } octeon_fau_op_size_t; @@ -73,20 +73,18 @@ #define OCTEON_FAU_BITS_REGISTER 10,0 #define OCTEON_FAU_REG_64_ADDR(x) ((x <<3) + OCTEON_FAU_REG_64_START) -typedef enum -{ - OCTEON_FAU_REG_64_START = 0, - OCTEON_FAU_REG_OQ_ADDR_INDEX = OCTEON_FAU_REG_64_ADDR(0), - OCTEON_FAU_REG_OQ_ADDR_END = OCTEON_FAU_REG_64_ADDR(31), - OCTEON_FAU_REG_64_END = OCTEON_FAU_REG_64_ADDR(39), -} octeon_fau_reg_64_t; +typedef enum { + OCTEON_FAU_REG_64_START = 0, + OCTEON_FAU_REG_OQ_ADDR_INDEX = OCTEON_FAU_REG_64_ADDR(0), + OCTEON_FAU_REG_OQ_ADDR_END = OCTEON_FAU_REG_64_ADDR(31), + OCTEON_FAU_REG_64_END = OCTEON_FAU_REG_64_ADDR(39), +} octeon_fau_reg_64_t; #define OCTEON_FAU_REG_32_ADDR(x) ((x <<2) + OCTEON_FAU_REG_32_START) -typedef enum -{ - OCTEON_FAU_REG_32_START = OCTEON_FAU_REG_64_END, - OCTEON_FAU_REG_32_END = OCTEON_FAU_REG_32_ADDR(0), -} octeon_fau_reg_32_t; +typedef enum { + OCTEON_FAU_REG_32_START = OCTEON_FAU_REG_64_END, + OCTEON_FAU_REG_32_END = OCTEON_FAU_REG_32_ADDR(0), +} octeon_fau_reg_32_t; @@ -108,13 +106,14 @@ * 22 bits are available. * @return Address to read from for atomic update */ -static inline uint64_t octeon_fau_atomic_address (uint64_t tagwait, uint64_t reg, - int64_t value) +static inline uint64_t +octeon_fau_atomic_address(uint64_t tagwait, uint64_t reg, + int64_t value) { - return (OCTEON_ADD_IO_SEG(OCTEON_FAU_LOAD_IO_ADDRESS) | - octeon_build_bits(OCTEON_FAU_BITS_INEVAL, value) | - octeon_build_bits(OCTEON_FAU_BITS_TAGWAIT, tagwait) | - octeon_build_bits(OCTEON_FAU_BITS_REGISTER, reg)); + return (OCTEON_ADD_IO_SEG(OCTEON_FAU_LOAD_IO_ADDRESS) | + octeon_build_bits(OCTEON_FAU_BITS_INEVAL, value) | + octeon_build_bits(OCTEON_FAU_BITS_TAGWAIT, tagwait) | + octeon_build_bits(OCTEON_FAU_BITS_REGISTER, reg)); } @@ -131,11 +130,12 @@ * - Step by 8 for 64 bit access. * Returns Address to store for atomic update */ -static inline uint64_t octeon_fau_store_address (uint64_t noadd, uint64_t reg) +static inline uint64_t +octeon_fau_store_address(uint64_t noadd, uint64_t reg) { - return (OCTEON_ADD_IO_SEG(OCTEON_FAU_LOAD_IO_ADDRESS) | - octeon_build_bits(OCTEON_FAU_BITS_NOADD, noadd) | - octeon_build_bits(OCTEON_FAU_BITS_REGISTER, reg)); + return (OCTEON_ADD_IO_SEG(OCTEON_FAU_LOAD_IO_ADDRESS) | + octeon_build_bits(OCTEON_FAU_BITS_NOADD, noadd) | + octeon_build_bits(OCTEON_FAU_BITS_REGISTER, reg)); } @@ -148,9 +148,10 @@ * - Step by 4 for 32 bit access. * @param value Signed value to add. */ -static inline void octeon_fau_atomic_add32 (octeon_fau_reg_32_t reg, int32_t value) +static inline void +octeon_fau_atomic_add32(octeon_fau_reg_32_t reg, int32_t value) { - oct_write32(octeon_fau_store_address(0, reg), value); + oct_write32(octeon_fau_store_address(0, reg), value); } /* @@ -162,11 +163,12 @@ * Note: Only the low 22 bits are available. * returns Value of the register before the update */ -static inline int64_t octeon_fau_fetch_and_add64 (octeon_fau_reg_64_t reg, - int64_t val64) +static inline int64_t +octeon_fau_fetch_and_add64(octeon_fau_reg_64_t reg, + int64_t val64) { - return (oct_read64(octeon_fau_atomic_address(0, reg, val64))); + return (oct_read64(octeon_fau_atomic_address(0, reg, val64))); } /* @@ -178,10 +180,11 @@ * Note: Only the low 22 bits are available. * returns Value of the register before the update */ -static inline int32_t octeon_fau_fetch_and_add32 (octeon_fau_reg_64_t reg, - int32_t val32) +static inline int32_t +octeon_fau_fetch_and_add32(octeon_fau_reg_64_t reg, + int32_t val32) { - return (oct_read32(octeon_fau_atomic_address(0, reg, val32))); + return (oct_read32(octeon_fau_atomic_address(0, reg, val32))); } /* @@ -193,9 +196,10 @@ * - Step by 4 for 32 bit access. * @param value Signed value to write. */ -static inline void octeon_fau_atomic_write32(octeon_fau_reg_32_t reg, int32_t value) +static inline void +octeon_fau_atomic_write32(octeon_fau_reg_32_t reg, int32_t value) { - oct_write32(octeon_fau_store_address(1, reg), value); + oct_write32(octeon_fau_store_address(1, reg), value); } @@ -208,15 +212,17 @@ * - Step by 8 for 64 bit access. * value Signed value to write. */ -static inline void octeon_fau_atomic_write64 (octeon_fau_reg_64_t reg, int64_t value) +static inline void +octeon_fau_atomic_write64(octeon_fau_reg_64_t reg, int64_t value) { - oct_write64(octeon_fau_store_address(1, reg), value); + oct_write64(octeon_fau_store_address(1, reg), value); } -static inline void octeon_fau_atomic_add64 (octeon_fau_reg_64_t reg, int64_t value) +static inline void +octeon_fau_atomic_add64(octeon_fau_reg_64_t reg, int64_t value) { - oct_write64_int64(octeon_fau_store_address(0, reg), value); + oct_write64_int64(octeon_fau_store_address(0, reg), value); } @@ -225,4 +231,4 @@ extern void octeon_fau_disable(void); -#endif /* ___OCTEON_FAU__H___ */ +#endif /* ___OCTEON_FAU__H___ */ ==== //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fpa.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights +Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights reserved. Redistribution and use in source and binary forms, with or without @@ -17,25 +17,25 @@ * Neither the name of Cavium Networks nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written - permission. + permission. -This Software, including technical data, may be subject to U.S. export -control laws, including the U.S. Export Administration Act and its -associated regulations, and may be subject to export or import -regulations in other countries. You warrant that You will comply -strictly in all respects with all such regulations and acknowledge that -you have the responsibility to obtain licenses to export, re-export or -import the Software. +This Software, including technical data, may be subject to U.S. export +control laws, including the U.S. Export Administration Act and its +associated regulations, and may be subject to export or import +regulations in other countries. You warrant that You will comply +strictly in all respects with all such regulations and acknowledge that +you have the responsibility to obtain licenses to export, re-export or +import the Software. -TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" -AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS -OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT -TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY -REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT -DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF -TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, -LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION -OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR +TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" +AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS +OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT +TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY +REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT +DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF +TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, +LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION +OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU. */ @@ -56,70 +56,74 @@ #include "octeon_fpa.h" -//#define FPA_DEBUG 1 +// +#define FPA_DEBUG 1 /* * octeon_dump_fpa * */ -void octeon_dump_fpa (void) +void +octeon_dump_fpa(void) { - int i; - octeon_fpa_ctl_status_t status; - octeon_fpa_queue_available_t q_avail; + int i; + octeon_fpa_ctl_status_t status; + octeon_fpa_queue_available_t q_avail; - status.word64 = oct_read64(OCTEON_FPA_CTL_STATUS); - if (!status.bits.enb) { - printf("\n FPA Disabled"); - /* - * No dumping if disabled - */ - return; - } - printf(" FPA Ctrl-Status-reg 0x%llX := 0x%llX EN %X M1_E %X M0_E %X\n", - OCTEON_FPA_CTL_STATUS, status.word64, - status.bits.enb, status.bits.mem1_err, status.bits.mem0_err); - for (i = 0; i < OCTEON_FPA_QUEUES; i++) { - printf(" Pool: %d\n", i); + status.word64 = oct_read64(OCTEON_FPA_CTL_STATUS); + if (!status.bits.enb) { + printf("\n FPA Disabled"); + /* + * No dumping if disabled + */ + return; + } + printf(" FPA Ctrl-Status-reg 0x%llX := 0x%llX EN %X M1_E %X M0_E %X\n", + OCTEON_FPA_CTL_STATUS, status.word64, + status.bits.enb, status.bits.mem1_err, status.bits.mem0_err); + for (i = 0; i < OCTEON_FPA_QUEUES; i++) { + printf(" Pool: %d\n", i); - q_avail.word64 = oct_read64((OCTEON_FPA_QUEUE_AVAILABLE + (i)*8ull)); - printf(" Avail-reg 0x%llX := Size: 0x%X\n", - (OCTEON_FPA_QUEUE_AVAILABLE + (i)*8ull), q_avail.bits.queue_size); - } + q_avail.word64 = oct_read64((OCTEON_FPA_QUEUE_AVAILABLE + (i) * 8ull)); + printf(" Avail-reg 0x%llX := Size: 0x%X\n", + (OCTEON_FPA_QUEUE_AVAILABLE + (i) * 8ull), q_avail.bits.queue_size); + } } -void octeon_dump_fpa_pool (u_int pool) +void +octeon_dump_fpa_pool(u_int pool) { - octeon_fpa_ctl_status_t status; - octeon_fpa_queue_available_t q_avail; + octeon_fpa_ctl_status_t status; + octeon_fpa_queue_available_t q_avail; - status.word64 = oct_read64(OCTEON_FPA_CTL_STATUS); - if (!status.bits.enb) { - printf("\n FPA Disabled"); - /* - * No dumping if disabled - */ - return; - } - printf(" FPA Ctrl-Status-reg 0x%llX := 0x%llX EN %X M1_E %X M0_E %X\n", - OCTEON_FPA_CTL_STATUS, status.word64, - status.bits.enb, status.bits.mem1_err, status.bits.mem0_err); - q_avail.word64 = oct_read64((OCTEON_FPA_QUEUE_AVAILABLE + (pool)*8ull)); - printf(" FPA Pool: %u Avail-reg 0x%llX := Size: 0x%X\n", pool, - (OCTEON_FPA_QUEUE_AVAILABLE + (pool)*8ull), q_avail.bits.queue_size); + status.word64 = oct_read64(OCTEON_FPA_CTL_STATUS); + if (!status.bits.enb) { + printf("\n FPA Disabled"); + /* + * No dumping if disabled + */ + return; + } + printf(" FPA Ctrl-Status-reg 0x%llX := 0x%llX EN %X M1_E %X M0_E %X\n", + OCTEON_FPA_CTL_STATUS, status.word64, + status.bits.enb, status.bits.mem1_err, status.bits.mem0_err); + q_avail.word64 = oct_read64((OCTEON_FPA_QUEUE_AVAILABLE + (pool) * 8ull)); + printf(" FPA Pool: %u Avail-reg 0x%llX := Size: 0x%X\n", pool, + (OCTEON_FPA_QUEUE_AVAILABLE + (pool) * 8ull), q_avail.bits.queue_size); } -u_int octeon_fpa_pool_size (u_int pool) +u_int +octeon_fpa_pool_size(u_int pool) { - octeon_fpa_queue_available_t q_avail; - u_int size = 0; + octeon_fpa_queue_available_t q_avail; + u_int size = 0; - if (pool < 7) { - q_avail.word64 = oct_read64((OCTEON_FPA_QUEUE_AVAILABLE + (pool)*8ull)); - size = q_avail.bits.queue_size; - } - return (size); + if (pool < 7) { + q_avail.word64 = oct_read64((OCTEON_FPA_QUEUE_AVAILABLE + (pool) * 8ull)); + size = q_avail.bits.queue_size; + } + return (size); } @@ -128,29 +132,31 @@ * * configure fpa with defaults and then mark it enabled. */ -void octeon_enable_fpa (void) +void +octeon_enable_fpa(void) { - int i; - octeon_fpa_ctl_status_t status; - octeon_fpa_fpf_marks_t marks; + int i; + octeon_fpa_ctl_status_t status; + octeon_fpa_fpf_marks_t marks; - for (i = 0; i < OCTEON_FPA_QUEUES; i++) { - marks.word64 = oct_read64((OCTEON_FPA_FPF_MARKS + (i)*8ull)); + for (i = 0; i < OCTEON_FPA_QUEUES; i++) { + marks.word64 = oct_read64((OCTEON_FPA_FPF_MARKS + (i) * 8ull)); - marks.bits.fpf_wr = 0xe0; - oct_write64((OCTEON_FPA_FPF_MARKS + (i)*8ull), marks.word64); - } + marks.bits.fpf_wr = 0xe0; + oct_write64((OCTEON_FPA_FPF_MARKS + (i) * 8ull), marks.word64); + } - /* Enforce a 10 cycle delay between config and enable */ - octeon_wait(10); + /* Enforce a 10 cycle delay between config and enable */ + octeon_wait(10); - status.word64 = 0; - status.bits.enb = 1; - oct_write64(OCTEON_FPA_CTL_STATUS, status.word64); + status.word64 = 0; + status.bits.enb = 1; + oct_write64(OCTEON_FPA_CTL_STATUS, status.word64); } -//#define FPA_DEBUG_TERSE 1 +// +#define FPA_DEBUG_TERSE 1 /* * octeon_fpa_fill_pool_mem @@ -158,70 +164,71 @@ * Fill the specified FPA pool with elem_num number of * elements of size elem_size_words * 8 */ -void octeon_fpa_fill_pool_mem (u_int pool, u_int elem_size_words, u_int elem_num) +void +octeon_fpa_fill_pool_mem(u_int pool, u_int elem_size_words, u_int elem_num) { - void *memory; - u_int bytes, elem_size_bytes; - u_int block_size; + void *memory; + u_int bytes, elem_size_bytes; + u_int block_size; #ifdef FPA_DEBUG - u_int elems = elem_num; - printf(" FPA fill: Pool %u elem_size_words %u Num: %u\n", pool, elem_size_words, elem_num); + u_int elems = elem_num; + + printf(" FPA fill: Pool %u elem_size_words %u Num: %u\n", pool, elem_size_words, elem_num); #endif - elem_size_bytes = elem_size_words * sizeof(uint64_t); - block_size = OCTEON_ALIGN(elem_size_bytes); + elem_size_bytes = elem_size_words * sizeof(uint64_t); + block_size = OCTEON_ALIGN(elem_size_bytes); -// block_size = ((elem_size_bytes / OCTEON_FPA_POOL_ALIGNMENT) + 1) * OCTEON_FPA_POOL_ALIGNMENT; + //block_size = ((elem_size_bytes / OCTEON_FPA_POOL_ALIGNMENT) + 1) * OCTEON_FPA_POOL_ALIGNMENT; - bytes = (elem_num * block_size); + bytes = (elem_num * block_size); #ifdef FPA_DEBUG - printf(" elem_size_bytes = words * 8 = %u; block_size %u\n", elem_size_bytes, block_size); + printf(" elem_size_bytes = words * 8 = %u; block_size %u\n", elem_size_bytes, block_size); #endif #ifdef FPA_DEBUG - int block = 0; + int block = 0; - printf(" %% Filling Pool %u with %u blocks of %u bytes %u words\n", - pool, elem_num, elem_size_bytes, elem_size_words); + printf(" %% Filling Pool %u with %u blocks of %u bytes %u words\n", + pool, elem_num, elem_size_bytes, elem_size_words); #endif -// memory = malloc(bytes, M_DEVBUF, M_NOWAIT | M_ZERO); - memory = contigmalloc(bytes, M_DEVBUF, M_NOWAIT | M_ZERO, - 0, 0x20000000, - OCTEON_FPA_POOL_ALIGNMENT, 0); + //memory = malloc(bytes, M_DEVBUF, M_NOWAIT | M_ZERO); + memory = contigmalloc(bytes, M_DEVBUF, M_NOWAIT | M_ZERO, + 0, 0x20000000, + OCTEON_FPA_POOL_ALIGNMENT, 0); - if (memory == NULL) { - printf(" %% FPA pool %u could not be filled with %u bytes\n", - pool, bytes); - return; - } - - /* - * Forward Align allocated mem to needed alignment. Don't worry about growth, we - * already preallocated extra - */ + if (memory == NULL) { + printf(" %% FPA pool %u could not be filled with %u bytes\n", + pool, bytes); + return; + } + /* + * Forward Align allocated mem to needed alignment. Don't worry + * about growth, we already preallocated extra + */ #ifdef FPA_DEBUG - printf(" %% Huge MemBlock 0x%X Bytes %u\n", memory, bytes); + printf(" %% Huge MemBlock 0x%X Bytes %u\n", memory, bytes); #endif - memory = (void *) OCTEON_ALIGN(memory); + memory = (void *)OCTEON_ALIGN(memory); #ifdef FPA_DEBUG_TERSE - printf("FPA fill: %u Count: %u SizeBytes: %u SizeBytesAligned: %u 1st: 0x%X = 0x%X\n", - pool, elem_num, elem_size_bytes, block_size, memory, OCTEON_PTR2PHYS(memory)); + printf("FPA fill: %u Count: %u SizeBytes: %u SizeBytesAligned: %u 1st: 0x%X = 0x%X\n", + pool, elem_num, elem_size_bytes, block_size, memory, OCTEON_PTR2PHYS(memory)); #endif -// memory = (void *) ((((u_int) memory / OCTEON_FPA_POOL_ALIGNMENT) + 1) * OCTEON_FPA_POOL_ALIGNMENT); + //memory = (void *)((((u_int)memory / OCTEON_FPA_POOL_ALIGNMENT) + 1) * OCTEON_FPA_POOL_ALIGNMENT); - while (elem_num--) { + while (elem_num--) { #ifdef FPA_DEBUG - if (((elems - elem_num) < 4) || (elem_num < 4)) - printf(" %% Block %d: 0x%X Phys 0x%X Bytes %u\n", block, memory, OCTEON_PTR2PHYS(memory), elem_size_bytes); - block++; + if (((elems - elem_num) < 4) || (elem_num < 4)) + printf(" %% Block %d: 0x%X Phys 0x%X Bytes %u\n", block, memory, OCTEON_PTR2PHYS(memory), elem_size_bytes); + block++; #endif - octeon_fpa_free(memory, pool, 0); - memory = (void *) (((u_int) memory) + block_size); - } + octeon_fpa_free(memory, pool, 0); + memory = (void *)(((u_int)memory) + block_size); + } } ==== //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fpa.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights +Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights reserved. Redistribution and use in source and binary forms, with or without @@ -17,25 +17,25 @@ * Neither the name of Cavium Networks nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written - permission. + permission. -This Software, including technical data, may be subject to U.S. export -control laws, including the U.S. Export Administration Act and its -associated regulations, and may be subject to export or import -regulations in other countries. You warrant that You will comply -strictly in all respects with all such regulations and acknowledge that -you have the responsibility to obtain licenses to export, re-export or -import the Software. +This Software, including technical data, may be subject to U.S. export +control laws, including the U.S. Export Administration Act and its +associated regulations, and may be subject to export or import +regulations in other countries. You warrant that You will comply +strictly in all respects with all such regulations and acknowledge that +you have the responsibility to obtain licenses to export, re-export or +import the Software. -TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" -AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS -OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT -TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY -REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT -DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF -TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, -LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION -OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR +TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" +AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS +OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT +TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY +REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT +DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF +TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, +LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION +OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU. */ @@ -50,7 +50,7 @@ #define ___OCTEON_FPA__H___ -#define OCTEON_FPA_FPA_OUTPUT_BUFFER_POOL 2 /* Same in octeon_rgmx.h */ +#define OCTEON_FPA_FPA_OUTPUT_BUFFER_POOL 2 /* Same in octeon_rgmx.h */ /* @@ -60,13 +60,13 @@ * read free pages from L2C for Queue. */ typedef union { - uint64_t word64; - struct { - uint64_t reserved : 42; /* Must be zero */ - uint64_t fpf_wr : 11; /* Write Hi Water mark */ - uint64_t fpf_rd : 11; /* Read Lo Water mark */ - } bits; -} octeon_fpa_fpf_marks_t; + uint64_t word64; + struct { + uint64_t reserved:42; /* Must be zero */ + uint64_t fpf_wr:11; /* Write Hi Water mark */ + uint64_t fpf_rd:11; /* Read Lo Water mark */ + } bits; +} octeon_fpa_fpf_marks_t; /* @@ -76,14 +76,14 @@ * - Use with the CVMX_FPA_CTL_STATUS CSR. */ typedef union { - uint64_t word64; - struct { - uint64_t reserved : 49; /* Must be zero */ - uint64_t enb : 1; /* Enable */ - uint64_t mem1_err : 7; /* ECC flip 1 */ - uint64_t mem0_err : 7; /* ECC flip 0 */ - } bits; -} octeon_fpa_ctl_status_t; + uint64_t word64; + struct { + uint64_t reserved:49; /* Must be zero */ + uint64_t enb:1; /* Enable */ + uint64_t mem1_err:7; /* ECC flip 1 */ + uint64_t mem0_err:7; /* ECC flip 0 */ + } bits; +} octeon_fpa_ctl_status_t; /* @@ -96,24 +96,24 @@ * - Use with the CVMX_FPA_FPF0_SIZE CSR. */ typedef union { - uint64_t word64; - struct { - uint64_t reserved : 52; /* Must be zero */ - /* - * The number of entries assigned in the FPA FIFO (used to hold - * page-pointers) for this Queue. - * The value of this register must divisable by 2, and the FPA will - * ignore bit [0] of this register. - * The total of the FPF_SIZ field of the 8 (0-7)OCTEON_FPA_FPF#_MARKS - * registers must not exceed 2048. - * After writing this field the FPA will need 10 core clock cycles - * to be ready for operation. The assignment of location in - * the FPA FIFO must start with Queue 0, then 1, 2, etc. - * The number of useable entries will be FPF_SIZ-2. - */ - uint64_t fpf_siz : 12; - } bits; -} octeon_fpa_fpf_size_t; + uint64_t word64; + struct { + uint64_t reserved:52; /* Must be zero */ + /* + * The number of entries assigned in the FPA FIFO (used to + * hold page-pointers) for this Queue. The value of this + * register must divisable by 2, and the FPA will ignore bit + * [0] of this register. The total of the FPF_SIZ field of + * the 8 (0-7)OCTEON_FPA_FPF#_MARKS registers must not + * exceed 2048. After writing this field the FPA will need + * 10 core clock cycles to be ready for operation. The + * assignment of location in the FPA FIFO must start with + * Queue 0, then 1, 2, etc. The number of useable entries + * will be FPF_SIZ-2. + */ + uint64_t fpf_siz:12; + } bits; +} octeon_fpa_fpf_size_t; /* *OCTEON_FPA_INT_ENB = FPA's Interrupt Enable @@ -122,15 +122,15 @@ * - Use with the CVMX_FPA_INT_ENB CSR. */ typedef union { - uint64_t word64; - struct { - uint64_t reserved : 60; /* Must be zero */ - uint64_t fed1_dbe : 1; /* Int iff bit3 Int-Sum set */ - uint64_t fed1_sbe : 1; /* Int iff bit2 Int-Sum set */ - uint64_t fed0_dbe : 1; /* Int iff bit1 Int-Sum set */ - uint64_t fed0_sbe : 1; /* Int iff bit0 Int-Sum set */ - } bits; -} octeon_fpa_int_enb_t; + uint64_t word64; + struct { + uint64_t reserved:60; /* Must be zero */ + uint64_t fed1_dbe:1; /* Int iff bit3 Int-Sum set */ + uint64_t fed1_sbe:1; /* Int iff bit2 Int-Sum set */ + uint64_t fed0_dbe:1; /* Int iff bit1 Int-Sum set */ + uint64_t fed0_sbe:1; /* Int iff bit0 Int-Sum set */ + } bits; +} octeon_fpa_int_enb_t; /** *OCTEON_FPA_INT_SUM = FPA's Interrupt Summary Register @@ -139,15 +139,15 @@ * - Use with the CVMX_FPA_INT_SUM CSR. */ typedef union { - uint64_t word64; - struct { - uint64_t reserved : 60; /**< Must be zero */ - uint64_t fed1_dbe : 1; - uint64_t fed1_sbe : 1; - uint64_t fed0_dbe : 1; - uint64_t fed0_sbe : 1; - } bits; -} octeon_fpa_int_sum_t; + uint64_t word64; + struct { + uint64_t reserved:60; /**< Must be zero */ + uint64_t fed1_dbe:1; + uint64_t fed1_sbe:1; + uint64_t fed0_dbe:1; + uint64_t fed0_sbe:1; + } bits; +} octeon_fpa_int_sum_t; /* @@ -157,12 +157,12 @@ * - Use with the CVMX_FPA_QUEX_AVAILABLE(0..7) CSR. */ typedef union { - uint64_t word64; - struct { - uint64_t reserved : 38; /* Must be zero */ - uint64_t queue_size : 26; /* free pages available */ - } bits; -} octeon_fpa_queue_available_t; + uint64_t word64; + struct { + uint64_t reserved:38; /* Must be zero */ + uint64_t queue_size:26; /* free pages available */ + } bits; +} octeon_fpa_queue_available_t; /* @@ -170,12 +170,12 @@ * */ typedef union { - uint64_t word64; - struct { - uint64_t reserved : 39; /* Must be zero */ - uint64_t page_index : 25; /* page_index */ - } bits; -} octeon_fpa_queue_page_index_t; + uint64_t word64; + struct { + uint64_t reserved:39; /* Must be zero */ + uint64_t page_index:25; /* page_index */ + } bits; +} octeon_fpa_queue_page_index_t; #define OCTEON_DID_FPA 5ULL @@ -190,9 +190,10 @@ extern void octeon_dump_fpa_pool(u_int pool); extern u_int octeon_fpa_pool_size(u_int pool); extern void octeon_enable_fpa(void); -extern void octeon_fpa_fill_pool_mem(u_int pool, - u_int block_size_words, - u_int block_num); +extern void +octeon_fpa_fill_pool_mem(u_int pool, + u_int block_size_words, + u_int block_num); /* * octeon_fpa_free @@ -204,21 +205,21 @@ * pool is FPA pool num, ptr is block ptr, num_cache_lines is number of * cache lines to invalidate (not written back). */ -static inline void octeon_fpa_free (void *ptr, u_int pool, - u_int num_cache_lines) +static inline void +octeon_fpa_free(void *ptr, u_int pool, + u_int num_cache_lines) { - octeon_addr_t free_ptr; + octeon_addr_t free_ptr; - free_ptr.word64 = (uint64_t) OCTEON_PTR2PHYS(ptr); + free_ptr.word64 = (uint64_t) OCTEON_PTR2PHYS(ptr); - free_ptr.sfilldidspace.didspace = OCTEON_ADDR_DIDSPACE( - OCTEON_ADDR_FULL_DID(OCTEON_DID_FPA, pool)); + free_ptr.sfilldidspace.didspace = OCTEON_ADDR_DIDSPACE( + OCTEON_ADDR_FULL_DID(OCTEON_DID_FPA, pool)); - /* - * Do not 'sync' - * asm volatile ("sync\n"); - */ - oct_write64(free_ptr.word64, num_cache_lines); + /* + * Do not 'sync' asm volatile ("sync\n"); + */ + oct_write64(free_ptr.word64, num_cache_lines); } @@ -230,32 +231,34 @@ * * Buffer passes away from FPA management to SW control */ -static inline void *octeon_fpa_alloc (u_int pool) +static inline void * +octeon_fpa_alloc(u_int pool) { - uint64_t address; + uint64_t address; - address = oct_read64(OCTEON_ADDR_DID(OCTEON_ADDR_FULL_DID(OCTEON_DID_FPA, - pool))); - if (address) { + address = oct_read64(OCTEON_ADDR_DID(OCTEON_ADDR_FULL_DID(OCTEON_DID_FPA, + pool))); + if (address) { /* * 32 bit FPA pointers only */ - /* - * We only use 32 bit pointers at this time - */ - return ((void *) OCTEON_PHYS2PTR(address & 0xffffffff)); - } - return (NULL); + /* + * We only use 32 bit pointers at this time + */ + return ((void *)OCTEON_PHYS2PTR(address & 0xffffffff)); + } + return (NULL); } -static inline uint64_t octeon_fpa_alloc_phys (u_int pool) +static inline uint64_t +octeon_fpa_alloc_phys(u_int pool) { - return (oct_read64(OCTEON_ADDR_DID(OCTEON_ADDR_FULL_DID(OCTEON_DID_FPA, - pool)))); + return (oct_read64(OCTEON_ADDR_DID(OCTEON_ADDR_FULL_DID(OCTEON_DID_FPA, + pool)))); } @@ -268,20 +271,21 @@ * * Buffer passes away from FPA management to SW control */ -static inline void *octeon_fpa_alloc (u_int pool) +static inline void * +octeon_fpa_alloc(u_int pool) { - uint64_t address; + uint64_t address; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 30 10:00:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9406F16A46B; Wed, 30 Jan 2008 10:00:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 56F3A16A420 for ; Wed, 30 Jan 2008 10:00:14 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3E2CF13C45D for ; Wed, 30 Jan 2008 10:00:14 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UA0ExJ016079 for ; Wed, 30 Jan 2008 10:00:14 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UA0D48016066 for perforce@freebsd.org; Wed, 30 Jan 2008 10:00:13 GMT (envelope-from rrs@cisco.com) Date: Wed, 30 Jan 2008 10:00:13 GMT Message-Id: <200801301000.m0UA0D48016066@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 10:00:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=134460 Change 134460 by rrs@rrs-mips2-jnpr on 2008/01/30 09:59:44 rest of the s9 indent Affected files ... .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_rgmx.c#2 edit .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_rgmx.h#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_rgmx.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights +Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights reserved. Redistribution and use in source and binary forms, with or without @@ -17,25 +17,25 @@ * Neither the name of Cavium Networks nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written - permission. + permission. -This Software, including technical data, may be subject to U.S. export -control laws, including the U.S. Export Administration Act and its -associated regulations, and may be subject to export or import -regulations in other countries. You warrant that You will comply -strictly in all respects with all such regulations and acknowledge that -you have the responsibility to obtain licenses to export, re-export or -import the Software. +This Software, including technical data, may be subject to U.S. export +control laws, including the U.S. Export Administration Act and its +associated regulations, and may be subject to export or import +regulations in other countries. You warrant that You will comply +strictly in all respects with all such regulations and acknowledge that +you have the responsibility to obtain licenses to export, re-export or +import the Software. -TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" -AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS -OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT -TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY -REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT -DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF -TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, -LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION -OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR +TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" +AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS +OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT +TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY +REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT +DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF +TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, +LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION +OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU. */ @@ -114,7 +114,8 @@ #define OCTEON_RGMX_OQUEUE_PER_PORT 8 -#define OCTEON_RGMX_SCHEDULED_ISRS 1 /* Use Scheduled ISRs from kernel tasks */ +#define OCTEON_RGMX_SCHEDULED_ISRS 1 /* Use Scheduled ISRs from + * kernel tasks */ #ifndef POW_MAX_LOOP @@ -133,31 +134,32 @@ /* Driver data */ struct rgmx_softc_dev { - device_t sc_dev; /* Device ID */ - uint64_t link_status; - struct ifnet *ifp; - int sc_unit; + device_t sc_dev; /* Device ID */ + uint64_t link_status; + struct ifnet *ifp; + int sc_unit; - u_int port; - u_int idx; - u_char ieee[6]; + u_int port; + u_int idx; + u_char ieee[6]; - char const * typestr; /* printable name of the interface. */ - u_short txb_size; /* size of TX buffer, in bytes */ + char const *typestr; /* printable name of the interface. */ + u_short txb_size; /* size of TX buffer, in bytes */ - /* Transmission buffer management. */ - u_short txb_free; /* free bytes in TX buffer */ - u_char txb_count; /* number of packets in TX buffer */ - u_char txb_sched; /* number of scheduled packets */ + /* Transmission buffer management. */ + u_short txb_free; /* free bytes in TX buffer */ + u_char txb_count; /* number of packets in TX buffer */ + u_char txb_sched; /* number of scheduled packets */ - /* Media information. */ - struct ifmedia media; /* used by if_media. */ - u_short mbitmap; /* bitmap for supported media; see bit2media */ - int defmedia; /* default media */ - struct ifqueue tx_pending_queue; /* Queue of mbuf given to PKO currently */ - octeon_pko_sw_queue_info_t *outq_ptr; + /* Media information. */ + struct ifmedia media; /* used by if_media. */ + u_short mbitmap; /* bitmap for supported media; see bit2media */ + int defmedia; /* default media */ + struct ifqueue tx_pending_queue; /* Queue of mbuf given to PKO + * currently */ + octeon_pko_sw_queue_info_t *outq_ptr; - struct mtx mtx; + struct mtx mtx; }; @@ -199,8 +201,10 @@ static void octeon_rgmx_isr_link(void *context, int pending); static void octeon_rgmx_isr_rxtx(void *context, int pending); static int octeon_rgmx_intr_fast(void *arg); + #else static int octeon_rgmx_intr(void *arg); + #endif @@ -210,28 +214,30 @@ /* Standard driver entry points. These can be static. */ -static void octeon_rgmx_init (void *); -//static driver_intr_t rgmx_intr; -static int octeon_rgmx_ioctl (struct ifnet *, u_long, caddr_t); -static void octeon_rgmx_output_start (struct ifnet *); -static void octeon_rgmx_output_start_locked (struct ifnet *); +static void octeon_rgmx_init(void *); +//static driver_intr_t rgmx_intr; +static int octeon_rgmx_ioctl(struct ifnet *, u_long, caddr_t); +static void octeon_rgmx_output_start(struct ifnet *); +static void octeon_rgmx_output_start_locked(struct ifnet *); + #if 0 -static void octeon_rgmx_watchdog (struct ifnet *); +static void octeon_rgmx_watchdog(struct ifnet *); + #endif -static int octeon_rgmx_medchange (struct ifnet *); -static void octeon_rgmx_medstat (struct ifnet *, struct ifmediareq *); +static int octeon_rgmx_medchange(struct ifnet *); +static void octeon_rgmx_medstat(struct ifnet *, struct ifmediareq *); /* Mapping between media bitmap (in fe_softc.mbitmap) and ifm_media. */ -static int const bit2media [] = { - IFM_ETHER | IFM_AUTO, - IFM_ETHER | IFM_MANUAL, - IFM_ETHER | IFM_10_T, - IFM_ETHER | IFM_10_2, - IFM_ETHER | IFM_10_5, - IFM_ETHER | IFM_10_FL, - IFM_ETHER | IFM_10_T, - /* More can be added here... */ +static int const bit2media[] = { + IFM_ETHER | IFM_AUTO, + IFM_ETHER | IFM_MANUAL, + IFM_ETHER | IFM_10_T, + IFM_ETHER | IFM_10_2, + IFM_ETHER | IFM_10_5, + IFM_ETHER | IFM_10_FL, + IFM_ETHER | IFM_10_T, + /* More can be added here... */ }; /* Mapping between media bitmap (in fe_softc.mbitmap) and ifm_media. */ @@ -250,116 +256,123 @@ static u_int port_array[OCTEON_RGMX_NUM_PORTS_MAX] = {0}; static u_int num_devices = 0; static octeon_pko_sw_queue_info_t output_queues_array[OCTEON_RGMX_NUM_PORTS_MAX * OCTEON_RGMX_OQUEUE_PER_PORT]; -static struct resource *irq_res; /* Interrupt resource. */ -static void *int_handler_tag; +static struct resource *irq_res;/* Interrupt resource. */ +static void *int_handler_tag; #ifdef OCTEON_RGMX_SCHEDULED_ISRS -struct task link_isr_task; -struct task rxtx_isr_task; +struct task link_isr_task; +struct task rxtx_isr_task; struct taskqueue *tq; /* private task queue */ #endif -static u_int get_rgmx_port_ordinal (u_int port) +static u_int +get_rgmx_port_ordinal(u_int port) { - u_int idx; + u_int idx; - for (idx = 0; idx < OCTEON_RGMX_NUM_PORTS_MAX; idx++) { - if (port_array[idx] == port) { - return (idx); - } - } - return (-1); + for (idx = 0; idx < OCTEON_RGMX_NUM_PORTS_MAX; idx++) { + if (port_array[idx] == port) { + return (idx); + } + } + return (-1); } -static struct rgmx_softc_dev *get_rgmx_softc (u_int port) +static struct rgmx_softc_dev * +get_rgmx_softc(u_int port) { - u_int idx; + u_int idx; - idx = get_rgmx_port_ordinal(port); - if (idx != -1) { - return (rgmx_scdev_array[idx]); - } - return (NULL); + idx = get_rgmx_port_ordinal(port); + if (idx != -1) { + return (rgmx_scdev_array[idx]); + } + return (NULL); } -static void octeon_rgmx_init_sc (struct rgmx_softc_dev *sc, device_t dev, u_int port, u_int num_devices) +static void +octeon_rgmx_init_sc(struct rgmx_softc_dev *sc, device_t dev, u_int port, u_int num_devices) { - int ii; + int ii; - /* No software-controllable media selection. */ - sc->mbitmap = MB_HM; - sc->defmedia = MB_HM; + /* No software-controllable media selection. */ + sc->mbitmap = MB_HM; + sc->defmedia = MB_HM; - sc->sc_dev = dev; - sc->port = port; - sc->idx = num_devices; - sc->link_status = 0; - sc->sc_unit = num_devices; - sc->mbitmap = MB_HT; - sc->defmedia = MB_HT; - sc->tx_pending_queue.ifq_maxlen = NUM_TX_PACKETS; - sc->tx_pending_queue.ifq_head = sc->tx_pending_queue.ifq_tail = NULL; - sc->tx_pending_queue.ifq_len = sc->tx_pending_queue.ifq_drops = 0; - mtx_init(&sc->tx_pending_queue.ifq_mtx, "if->sc->txpq.ifqmtx", NULL, MTX_DEF); + sc->sc_dev = dev; + sc->port = port; + sc->idx = num_devices; + sc->link_status = 0; + sc->sc_unit = num_devices; + sc->mbitmap = MB_HT; + sc->defmedia = MB_HT; + sc->tx_pending_queue.ifq_maxlen = NUM_TX_PACKETS; + sc->tx_pending_queue.ifq_head = sc->tx_pending_queue.ifq_tail = NULL; + sc->tx_pending_queue.ifq_len = sc->tx_pending_queue.ifq_drops = 0; + mtx_init(&sc->tx_pending_queue.ifq_mtx, "if->sc->txpq.ifqmtx", NULL, MTX_DEF); - sc->outq_ptr = &(output_queues_array[num_devices * OCTEON_RGMX_OQUEUE_PER_PORT]); + sc->outq_ptr = &(output_queues_array[num_devices * OCTEON_RGMX_OQUEUE_PER_PORT]); - for (ii = 0; ii < 6; ii++) { - sc->ieee[ii] = octeon_mac_addr[ii]; - } - sc->ieee[5] += get_rgmx_port_ordinal(port); + for (ii = 0; ii < 6; ii++) { + sc->ieee[ii] = octeon_mac_addr[ii]; + } + sc->ieee[5] += get_rgmx_port_ordinal(port); } -static int octeon_rgmx_init_ifnet (struct rgmx_softc_dev *sc) +static int +octeon_rgmx_init_ifnet(struct rgmx_softc_dev *sc) { - struct ifnet *ifp; + struct ifnet *ifp; - ifp = sc->ifp = if_alloc(IFT_ETHER); - if (NULL == ifp) { - device_printf(sc->sc_dev, "can not ifalloc for rgmx port\n"); - return (ENOSPC); - } - /* - * Initialize ifnet structure - */ - ifp->if_softc = sc; - if_initname(sc->ifp, device_get_name(sc->sc_dev), device_get_unit(sc->sc_dev)); - ifp->if_start = octeon_rgmx_output_start; - ifp->if_ioctl = octeon_rgmx_ioctl; - /* Watchdog interface is now deprecated. - ifp->if_watchdog = octeon_rgmx_watchdog; - */ + ifp = sc->ifp = if_alloc(IFT_ETHER); + if (NULL == ifp) { + device_printf(sc->sc_dev, "can not ifalloc for rgmx port\n"); + return (ENOSPC); + } + /* + * Initialize ifnet structure + */ + ifp->if_softc = sc; + if_initname(sc->ifp, device_get_name(sc->sc_dev), device_get_unit(sc->sc_dev)); + ifp->if_start = octeon_rgmx_output_start; + ifp->if_ioctl = octeon_rgmx_ioctl; + /* + * Watchdog interface is now deprecated. ifp->if_watchdog = + * octeon_rgmx_watchdog; + */ ifp->if_hwassist = CSUM_TCP | CSUM_UDP; ifp->if_capabilities = IFCAP_HWCSUM; ifp->if_capenable = ifp->if_capabilities; - ifp->if_init = octeon_rgmx_init; - ifp->if_linkmib = NULL; // &sc->mibdata; - ifp->if_linkmiblen = 0; // sizeof (sc->mibdata); - /* - * Set fixed interface flags. - */ - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; -// | IFF_NEEDSGIANT; - if (ifp->if_snd.ifq_maxlen == 0) - ifp->if_snd.ifq_maxlen = ifqmaxlen; + ifp->if_init = octeon_rgmx_init; + ifp->if_linkmib = NULL; + //&sc->mibdata; + ifp->if_linkmiblen = 0; + //sizeof(sc->mibdata); + /* + * Set fixed interface flags. + */ + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + //|IFF_NEEDSGIANT; + if (ifp->if_snd.ifq_maxlen == 0) + ifp->if_snd.ifq_maxlen = ifqmaxlen; - ifmedia_init(&sc->media, 0, octeon_rgmx_medchange, octeon_rgmx_medstat); - ifmedia_add(&sc->media, bit2media[0], 0, NULL); - ifmedia_set(&sc->media, bit2media[0]); + ifmedia_init(&sc->media, 0, octeon_rgmx_medchange, octeon_rgmx_medstat); + ifmedia_add(&sc->media, bit2media[0], 0, NULL); + ifmedia_set(&sc->media, bit2media[0]); - ether_ifattach(sc->ifp, sc->ieee); - /* Print additional info when attached. */ - device_printf(sc->sc_dev, "type %s, full duplex\n", sc->typestr); + ether_ifattach(sc->ifp, sc->ieee); + /* Print additional info when attached. */ + device_printf(sc->sc_dev, "type %s, full duplex\n", sc->typestr); - return (0); + return (0); } @@ -370,7 +383,8 @@ /* ------------------------------------------------------------------- * * rgmii_identify() * * ------------------------------------------------------------------- */ -static void rgmii_identify (driver_t *drv, device_t parent) +static void +rgmii_identify(driver_t * drv, device_t parent) { BUS_ADD_CHILD(parent, 0, "rgmii", 0); } @@ -379,12 +393,13 @@ /* ------------------------------------------------------------------- * * rgmii_probe() * * ------------------------------------------------------------------- */ -static int rgmii_probe (device_t dev) +static int +rgmii_probe(device_t dev) { if (device_get_unit(dev) != 0) panic("can't probe/attach more rgmii devices\n"); - device_set_desc(dev, "Octeon RGMII"); + device_set_desc(dev, "Octeon RGMII"); return (0); } @@ -393,19 +408,21 @@ /* ------------------------------------------------------------------- * * rgmii_attach() * * ------------------------------------------------------------------- */ -static int rgmii_attach (device_t dev) +static int +rgmii_attach(device_t dev) { - struct rgmx_softc_dev *sc; - device_t child; - int iface, port, nr_ports, error; - void *softc; - int irq_rid; + struct rgmx_softc_dev *sc; + device_t child; + int iface, port, nr_ports, error; + void *softc; + int irq_rid; - octeon_config_hw_units_pre_ports(); + octeon_config_hw_units_pre_ports(); - /* Count interfaces and ports*/ + /* Count interfaces and ports */ octeon_gmxx_inf_mode_t iface_mode; + iface_mode.word64 = 0; for (iface = 0; iface < 2; iface++) { @@ -414,10 +431,10 @@ /* interface is either disabled or SPI */ if (!iface_mode.bits.en) continue; - if (octeon_get_chipid() == OCTEON_CN3020_CHIP) { + if (octeon_get_chipid() == OCTEON_CN3020_CHIP) { nr_ports = 2; } else { - if (iface_mode.bits.type ) { + if (iface_mode.bits.type) { continue; } nr_ports = (octeon_has_4ports()) ? 4 : 3; @@ -427,42 +444,42 @@ for (port = iface * 16; port < iface * 16 + nr_ports; port++) { - child = device_add_child(dev, OCTEON_RGMX_DEV_NAME, num_devices); - if (child == NULL) - panic("%s: device_add_child() failed\n", __func__); + child = device_add_child(dev, OCTEON_RGMX_DEV_NAME, num_devices); + if (child == NULL) + panic("%s: device_add_child() failed\n", __func__); - softc = malloc(sizeof(struct rgmx_softc_dev), M_DEVBUF, M_NOWAIT | M_ZERO); - if (!softc) { - panic("%s malloc failed for softc\n", __func__); - } - device_set_softc(child, softc); - device_set_desc(child, "Octeon RGMII"); - sc = device_get_softc(child); - if (!sc) { - printf(" No sc\n"); - num_devices++; - continue; - } - port_array[num_devices] = port; - rgmx_scdev_array[num_devices] = sc; - RGMX_LOCK_INIT(sc, device_get_nameunit(child)); - octeon_rgmx_init_sc(sc, child, port, num_devices); - octeon_config_hw_units_port(sc, port); - if (octeon_rgmx_init_ifnet(sc)) { - device_printf(dev, " ifinit failed for rgmx port %u\n", port); - return (ENOSPC); - } + softc = malloc(sizeof(struct rgmx_softc_dev), M_DEVBUF, M_NOWAIT | M_ZERO); + if (!softc) { + panic("%s malloc failed for softc\n", __func__); + } + device_set_softc(child, softc); + device_set_desc(child, "Octeon RGMII"); + sc = device_get_softc(child); + if (!sc) { + printf(" No sc\n"); + num_devices++; + continue; + } + port_array[num_devices] = port; + rgmx_scdev_array[num_devices] = sc; + RGMX_LOCK_INIT(sc, device_get_nameunit(child)); + octeon_rgmx_init_sc(sc, child, port, num_devices); + octeon_config_hw_units_port(sc, port); + if (octeon_rgmx_init_ifnet(sc)) { + device_printf(dev, " ifinit failed for rgmx port %u\n", port); + return (ENOSPC); + } /* * Don't call octeon_rgmx_mark_ready() * ifnet will call it indirectly via octeon_rgmx_init() * * octeon_rgmx_mark_ready(sc); */ - num_devices++; - } + num_devices++; + } } - octeon_config_hw_units_post_ports(); + octeon_config_hw_units_post_ports(); irq_rid = 0; irq_res = bus_alloc_resource(dev, SYS_RES_IRQ, &irq_rid, 0, 0, 1, RF_SHAREABLE | RF_ACTIVE); @@ -470,41 +487,37 @@ device_printf(dev, "failed to allocate irq\n"); return (ENXIO); } - - #ifdef OCTEON_RGMX_SCHEDULED_ISRS - /* - * Single task queues for all child devices. Since POW gives us a unified - * interrupt based on POW groups, not based on PORTs. - */ + /* + * Single task queues for all child devices. Since POW gives us a + * unified interrupt based on POW groups, not based on PORTs. + */ TASK_INIT(&rxtx_isr_task, 0, octeon_rgmx_isr_rxtx, NULL); TASK_INIT(&link_isr_task, 0, octeon_rgmx_isr_link, NULL); tq = taskqueue_create_fast("octeon_rgmx_taskq", M_NOWAIT, - taskqueue_thread_enqueue, &tq); + taskqueue_thread_enqueue, &tq); taskqueue_start_threads(&tq, 1, PI_NET, "%s taskq", device_get_nameunit(dev)); error = bus_setup_intr(dev, irq_res, INTR_TYPE_NET, octeon_rgmx_intr_fast, NULL, - NULL, &int_handler_tag); + NULL, &int_handler_tag); if (error != 0) { device_printf(dev, "bus_setup_intr returned %d\n", error); taskqueue_free(tq); - tq = NULL; + tq = NULL; return (error); } - -#else /* OCTEON_RGMX_SCHEDULED_ISRS */ +#else /* OCTEON_RGMX_SCHEDULED_ISRS */ error = bus_setup_intr(dev, irq_res, INTR_TYPE_NET, octeon_rgmx_intr, NULL, - NULL, &int_handler_tag); + NULL, &int_handler_tag); - if (error != 0) { + if (error != 0) { device_printf(dev, "bus_setup_intr returned %d\n", error); - tq = NULL; + tq = NULL; return (error); } +#endif /* OCTEON_RGMX_SCHEDULED_ISRS */ -#endif /* OCTEON_RGMX_SCHEDULED_ISRS */ - return (bus_generic_attach(dev)); } @@ -539,7 +552,7 @@ #define FPA_NOPOOL 0 #define OCTEON_FPA_RX_PACKET_POOL 0 -#define OCTEON_FPA_RX_PACKET_POOL_WORDS 208 /* 2048 bytes */ +#define OCTEON_FPA_RX_PACKET_POOL_WORDS 208 /* 2048 bytes */ #define OCTEON_FPA_RX_PACKET_POOL_ELEM_SIZE (OCTEON_FPA_RX_PACKET_POOL_WORDS) #define OCTEON_FPA_RX_PACKET_POOL_ELEMENTS (MAX_RX_BUFS) #define OCTEON_RX_MAX_SIZE (OCTEON_FPA_RX_PACKET_POOL_WORDS * sizeof(uint64_t)) @@ -550,7 +563,7 @@ #define OCTEON_FPA_WQE_RX_POOL_ELEMENTS (NUM_RX_PACKETS_CTL) #define OCTEON_FPA_TX_PACKET_POOL 2 -#define OCTEON_FPA_TX_PACKET_POOL_WORDS 208 /* 2048 bytes */ +#define OCTEON_FPA_TX_PACKET_POOL_WORDS 208 /* 2048 bytes */ #define OCTEON_FPA_TX_PACKET_POOL_ELEM_SIZE (OCTEON_FPA_TX_PACKET_POOL_WORDS) #define OCTEON_FPA_TX_PACKET_POOL_ELEMENTS (MAX_TX_BUFS) #define OCTEON_TX_MAX_SIZE (OCTEON_FPA_TX_PACKET_POOL_WORDS * sizeof(uint64_t)) @@ -569,22 +582,24 @@ #define RGMX_MAX_PAK_RECEIVE 5000000 -static void octeon_dump_pow_stats (void); +static void octeon_dump_pow_stats(void); #ifdef OCTEON_RGMX_SCHEDULED_ISRS -static void octeon_rgmx_isr_link (void *context, int pending) +static void +octeon_rgmx_isr_link(void *context, int pending) { - octeon_line_status_loop(NULL); + octeon_line_status_loop(NULL); } -static void octeon_rgmx_isr_rxtx (void *context, int pending) +static void +octeon_rgmx_isr_rxtx(void *context, int pending) { - octeon_rx_loop(NULL); + octeon_rx_loop(NULL); } @@ -594,61 +609,61 @@ * *********************************************************************/ -//#define OCTEON_RGMX_POW_TIME_THR_INTS 1 +// +#define OCTEON_RGMX_POW_TIME_THR_INTS 1 -static int octeon_rgmx_intr_fast(void *arg) +static int +octeon_rgmx_intr_fast(void *arg) { - int handled_flag = 0; - uint64_t ciu_summary; + int handled_flag = 0; + uint64_t ciu_summary; - ciu_summary = ciu_get_int_summary(CIU_THIS_CORE, OCTEON_RGMX_CIU_INTX, - OCTEON_RGMX_CIU_ENX); + ciu_summary = ciu_get_int_summary(CIU_THIS_CORE, OCTEON_RGMX_CIU_INTX, + OCTEON_RGMX_CIU_ENX); - if (ciu_summary & CIU_GENTIMER_BITS_ENABLE(CIU_GENTIMER_NUM_1)) { + if (ciu_summary & CIU_GENTIMER_BITS_ENABLE(CIU_GENTIMER_NUM_1)) { - /* - * Timer Interrupt for link status checks - * Acknowledging it will mask it for this cycle. - */ - ciu_clear_int_summary(CIU_THIS_CORE, OCTEON_RGMX_CIU_INTX, - OCTEON_RGMX_CIU_ENX, - CIU_GENTIMER_BITS_ENABLE(CIU_GENTIMER_NUM_1)); + /* + * Timer Interrupt for link status checks Acknowledging it + * will mask it for this cycle. + */ + ciu_clear_int_summary(CIU_THIS_CORE, OCTEON_RGMX_CIU_INTX, + OCTEON_RGMX_CIU_ENX, + CIU_GENTIMER_BITS_ENABLE(CIU_GENTIMER_NUM_1)); taskqueue_enqueue(taskqueue_fast, &link_isr_task); - handled_flag = 1; - } - - if (ciu_summary & OCTEON_POW_ALL_GROUPS_MASK) { + handled_flag = 1; + } + if (ciu_summary & OCTEON_POW_ALL_GROUPS_MASK) { #ifndef OCTEON_RGMX_POW_TIME_THR_INTS /* - * When using POW IQ/DSQ size based interrupts, then - * ack the interrupts right away. So they don't interrupt - * until the queue size goes to 0 again. - */ - oct_write64(OCTEON_POW_WORKQUEUE_INT, - 0x10001 << OCTEON_POW_RX_GROUP_NUM); + * When using POW IQ/DSQ size based interrupts, then ack the + * interrupts right away. So they don't interrupt until the + * queue size goes to 0 again. + */ + oct_write64(OCTEON_POW_WORKQUEUE_INT, + 0x10001 << OCTEON_POW_RX_GROUP_NUM); #else - /* - * We use POW thresholds based interrupt signalled on timer - * countdown. Acknowledge it now so that it doesn't - * interrupt us until next countdown to zero. - */ - oct_write64(OCTEON_POW_WORKQUEUE_INT, - 0x1 << OCTEON_POW_RX_GROUP_NUM); + /* + * We use POW thresholds based interrupt signalled on timer + * countdown. Acknowledge it now so that it doesn't + * interrupt us until next countdown to zero. + */ + oct_write64(OCTEON_POW_WORKQUEUE_INT, + 0x1 << OCTEON_POW_RX_GROUP_NUM); #endif - taskqueue_enqueue(tq, &rxtx_isr_task); - handled_flag = 1; - } - + taskqueue_enqueue(tq, &rxtx_isr_task); + handled_flag = 1; + } return ((handled_flag) ? FILTER_HANDLED : FILTER_STRAY); } -#else /* ! OCTEON_RGMX_SCHEDULED_ISRS */ +#else /* ! OCTEON_RGMX_SCHEDULED_ISRS */ /* @@ -659,50 +674,52 @@ * Also note that the RGMX_LOCK/UNLOCK code will have to checked/added, since that is new and * was not supported with this model. */ -static int octeon_rgmx_intr (void *arg) +static int +octeon_rgmx_intr(void *arg) { - int flag = 0; - uint64_t ciu_summary; + int flag = 0; + uint64_t ciu_summary; - /* - * read ciu to see if any bits are pow - */ - while (1) { - ciu_summary = ciu_get_int_summary(CIU_THIS_CORE, OCTEON_RGMX_CIU_INTX, - OCTEON_RGMX_CIU_ENX); + /* + * read ciu to see if any bits are pow + */ + while (1) { + ciu_summary = ciu_get_int_summary(CIU_THIS_CORE, OCTEON_RGMX_CIU_INTX, + OCTEON_RGMX_CIU_ENX); - if ((ciu_summary & (OCTEON_POW_ALL_GROUPS_MASK | CIU_GENTIMER_BITS_ENABLE(CIU_GENTIMER_NUM_1))) == 0) { - break; - } + if ((ciu_summary & (OCTEON_POW_ALL_GROUPS_MASK | CIU_GENTIMER_BITS_ENABLE(CIU_GENTIMER_NUM_1))) == 0) { + break; + } + flag = 1; - flag = 1; - - if (ciu_summary & OCTEON_POW_ALL_GROUPS_MASK) { - octeon_rx_loop(NULL); - /* - * Acknowledge the interrupt after processing queues. - */ - oct_write64(OCTEON_POW_WORKQUEUE_INT, OCTEON_POW_RX_GROUP_MASK); - } - if (ciu_summary & CIU_GENTIMER_BITS_ENABLE(CIU_GENTIMER_NUM_1)) { - octeon_line_status_loop(NULL); - ciu_clear_int_summary(CIU_THIS_CORE, OCTEON_RGMX_CIU_INTX, - OCTEON_RGMX_CIU_ENX, - CIU_GENTIMER_BITS_ENABLE(CIU_GENTIMER_NUM_1)); - } - } + if (ciu_summary & OCTEON_POW_ALL_GROUPS_MASK) { + octeon_rx_loop(NULL); + /* + * Acknowledge the interrupt after processing + * queues. + */ + oct_write64(OCTEON_POW_WORKQUEUE_INT, OCTEON_POW_RX_GROUP_MASK); + } + if (ciu_summary & CIU_GENTIMER_BITS_ENABLE(CIU_GENTIMER_NUM_1)) { + octeon_line_status_loop(NULL); + ciu_clear_int_summary(CIU_THIS_CORE, OCTEON_RGMX_CIU_INTX, + OCTEON_RGMX_CIU_ENX, + CIU_GENTIMER_BITS_ENABLE(CIU_GENTIMER_NUM_1)); + } + } return ((flag) ? FILTER_HANDLED : FILTER_STRAY); } -#endif /* OCTEON_RGMX_SCHEDULED_ISRS */ +#endif /* OCTEON_RGMX_SCHEDULED_ISRS */ static struct mbuf *octeon_rgmx_build_new_rx_mbuf(struct ifnet *ifp, void *data_start, u_int totlen); -static struct mbuf *octeon_rgmx_build_new_rx_mbuf (struct ifnet *ifp, void *data_start, u_int totlen) +static struct mbuf * +octeon_rgmx_build_new_rx_mbuf(struct ifnet *ifp, void *data_start, u_int totlen) { struct mbuf *m, *m0, *newm; caddr_t newdata; @@ -714,17 +731,15 @@ #endif return (NULL); } - MGETHDR(m0, M_DONTWAIT, MT_DATA); if (m0 == NULL) { return (NULL); - } - - /* Initialize packet header info. */ + } + /* Initialize packet header info. */ m0->m_pkthdr.rcvif = ifp; m0->m_pkthdr.len = totlen; - m0->m_pkthdr.csum_flags = CSUM_IP_CHECKED | CSUM_IP_VALID | CSUM_DATA_VALID | CSUM_PSEUDO_HDR; - m0->m_pkthdr.csum_data = 0xffff; + m0->m_pkthdr.csum_flags = CSUM_IP_CHECKED | CSUM_IP_VALID | CSUM_DATA_VALID | CSUM_PSEUDO_HDR; + m0->m_pkthdr.csum_data = 0xffff; len = MHLEN; m = m0; @@ -735,17 +750,15 @@ goto octeon_rgmx_build_new_rx_mbuf_bad; len = MCLBYTES; } - if (m == m0) { - newdata = (caddr_t) ALIGN(m->m_data + ETHER_HDR_LEN) - ETHER_HDR_LEN; + newdata = (caddr_t)ALIGN(m->m_data + ETHER_HDR_LEN) - ETHER_HDR_LEN; len -= newdata - m->m_data; m->m_data = newdata; } - - /* Set the length of this mbuf. */ + /* Set the length of this mbuf. */ m->m_len = len = min(totlen, len); - bcopy(data_start, mtod(m, caddr_t), len); - data_start = (void *) (((u_long) (data_start)) + len); + bcopy(data_start, mtod(m, caddr_t), len); + data_start = (void *)(((u_long)(data_start)) + len); totlen -= len; if (totlen > 0) { @@ -767,101 +780,126 @@ -//#define DEBUG_RX 1 +// +#define DEBUG_RX 1 -static void octeon_rgmx_rx_process_work (octeon_wqe_t *work, u_int port) +static void +octeon_rgmx_rx_process_work(octeon_wqe_t * work, u_int port) { - struct rgmx_softc_dev *sc; - struct ifnet *ifp; - u_int len; - void *data_start, *new_data_start; - struct mbuf *mbuf; + struct rgmx_softc_dev *sc; + struct ifnet *ifp; + u_int len; + void *data_start, *new_data_start; + struct mbuf *mbuf; -//#define DEBUG_RX_PKT_DUMP 1 + // +#define DEBUG_RX_PKT_DUMP 1 #ifdef DEBUG_RX_PKT_DUMP - int i; u_char *dc; + int i; + u_char *dc; + #endif - - data_start = octeon_pow_pktptr_to_kbuffer(work->packet_ptr); + + data_start = octeon_pow_pktptr_to_kbuffer(work->packet_ptr); -//#define DEBUG_RX2 + // +#define DEBUG_RX2 #ifdef DEBUG_RX2 - printf(" WQE 0x%X: port:%u ", work, port); - printf(" Grp: %u, %llX Tag: %u %llX type: %u 0x%llx\n", - work->grp, work->grp, work->tag, work->tag, work->tag_type, work->tag_type); + printf(" WQE 0x%X: port:%u ", work, port); + printf(" Grp: %u, %llX Tag: %u %llX type: %u 0x%llx\n", + work->grp, work->grp, work->tag, work->tag, work->tag_type, work->tag_type); #endif - if ((port >= OCTEON_RGMX_MIN_PORT) || (port <= OCTEON_RGMX_MAX_PORT)) { + if ((port >= OCTEON_RGMX_MIN_PORT) || (port <= OCTEON_RGMX_MAX_PORT)) { - sc = get_rgmx_softc(port); + sc = get_rgmx_softc(port); - if (!sc || !sc->ifp) { + if (!sc || !sc->ifp) { - printf(" octeon_rgmx_rx_process_work No sc or sc->ifp - port:%u", port); - } else { + printf(" octeon_rgmx_rx_process_work No sc or sc->ifp - port:%u", port); + } else { - ifp = sc->ifp; + ifp = sc->ifp; - if (ifp->if_drv_flags & IFF_DRV_RUNNING) { + if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - if (!work->word2.bits.rcv_error) { + if (!work->word2.bits.rcv_error) { - len = work->len; + len = work->len; - /* - * We cannot pass the same FPA phys-buffer higher up. - * User space will not be able to use this phys-buffer. - * - * Start building a mbuf packet here using data_start & len. - */ + /* + * We cannot pass the same FPA + * phys-buffer higher up. User space + * will not be able to use this + * phys-buffer. + * + * Start building a mbuf packet here + * using data_start & len. + */ - new_data_start = data_start; - if (!work->word2.bits.not_IP) { - new_data_start = (void *) (((unsigned long) (new_data_start)) + 14); - /* mark it as checksum checked */ - } else { - new_data_start = (void *) (((unsigned long) (new_data_start)) + 8); - } + new_data_start = data_start; + if (!work->word2.bits.not_IP) { + new_data_start = (void *)(((unsigned long)(new_data_start)) + 14); + /* + * mark it as checksum + * checked + */ + } else { + new_data_start = (void *)(((unsigned long)(new_data_start)) + 8); + } #ifdef DEBUG_RX_PKT_DUMP - dc = new_data_start; printf("In:\n"); - for (i = 0; i < len; i++) { if (!(i % 16)) printf ("\n"); printf(" %02X", dc[i]); } + dc = new_data_start; + printf("In:\n"); + for (i = 0; i < len; i++) { + if (!(i % 16)) + printf("\n"); + printf(" %02X", dc[i]); + } #endif - - mbuf = octeon_rgmx_build_new_rx_mbuf(ifp, new_data_start, len); - if (mbuf) { -// printf(" Passing pkt to ifp: pkt_len: %u len: %u ", mbuf->m_pkthdr.len, mbuf->m_len); + + mbuf = octeon_rgmx_build_new_rx_mbuf(ifp, new_data_start, len); + if (mbuf) { + //printf(" Passing pkt to ifp: pkt_len: %u len: %u ", mbuf->m_pkthdr.len, mbuf->m_len); #ifdef DEBUG_RX_PKT_DUMP - dc = mtod(mbuf, u_char *); printf("\n"); printf("In: "); - for (i = 0; i < mbuf->m_len; i++) { if (!(i % 16)) printf ("\n"); printf(" %02X", dc[i]); } + dc = mtod(mbuf, u_char *); + printf("\n"); + printf("In: "); + for (i = 0; i < mbuf->m_len; i++) { + if (!(i % 16)) + printf("\n"); + printf(" %02X", dc[i]); + } #endif - /* Feed the packet to upper layer. */ - (*ifp->if_input)(ifp, mbuf); - ifp->if_ipackets++; + /* + * Feed the packet to upper + * layer. + */ + (*ifp->if_input) (ifp, mbuf); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 30 10:02:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C287616A41B; Wed, 30 Jan 2008 10:02:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8803716A419 for ; Wed, 30 Jan 2008 10:02:16 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 725B513C4CC for ; Wed, 30 Jan 2008 10:02:16 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UA2GUA016152 for ; Wed, 30 Jan 2008 10:02:16 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UA2GZX016149 for perforce@freebsd.org; Wed, 30 Jan 2008 10:02:16 GMT (envelope-from rrs@cisco.com) Date: Wed, 30 Jan 2008 10:02:16 GMT Message-Id: <200801301002.m0UA2GZX016149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134461 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 10:02:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=134461 Change 134461 by rrs@rrs-mips2-jnpr on 2008/01/30 10:01:34 adds rgmii driver and friends Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/files.octeon32#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/files.octeon32#6 (text+ko) ==== @@ -12,9 +12,9 @@ #dev/flash/octeon_ebt3000_cf.c optional cf -#dev/le/octeon_fau.c optional rgmii -#dev/le/octeon_fpa.c optional rgmii -#dev/le/octeon_ipd.c optional rgmii -#dev/le/octeon_pko.c optional rgmii -#dev/le/octeon_rgmx.c optional rgmii +dev/rgmii/octeon_fau.c optional rgmii +dev/rgmii/octeon_fpa.c optional rgmii +dev/rgmii/octeon_ipd.c optional rgmii +dev/rgmii/octeon_pko.c optional rgmii +dev/rgmii/octeon_rgmx.c optional rgmii From owner-p4-projects@FreeBSD.ORG Wed Jan 30 10:09:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52D6F16A46C; Wed, 30 Jan 2008 10:09:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1859616A421 for ; Wed, 30 Jan 2008 10:09:24 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 02CE513C474 for ; Wed, 30 Jan 2008 10:09:24 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UA9NnN017581 for ; Wed, 30 Jan 2008 10:09:23 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UA9NQ9017578 for perforce@freebsd.org; Wed, 30 Jan 2008 10:09:23 GMT (envelope-from rrs@cisco.com) Date: Wed, 30 Jan 2008 10:09:23 GMT Message-Id: <200801301009.m0UA9NQ9017578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134463 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 10:09:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=134463 Change 134463 by rrs@rrs-mips2-jnpr on 2008/01/30 10:09:21 adds octeon hack for uint64t on tag. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/_bus.h#5 edit .. //depot/projects/mips2-jnpr/src/sys/mips/include/_bus_octeon.h#1 branch Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/_bus.h#5 (text+ko) ==== @@ -31,7 +31,9 @@ #ifndef MIPS_INCLUDE__BUS_H #define MIPS_INCLUDE__BUS_H - +#ifdef TARGET_OCTEON +#include "_bus_octeon.h" +#else /* * Bus address and size types */ @@ -43,5 +45,5 @@ */ typedef long bus_space_tag_t; typedef u_long bus_space_handle_t; - +#endif #endif /* MIPS_INCLUDE__BUS_H */ From owner-p4-projects@FreeBSD.ORG Wed Jan 30 10:11:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A507316A41A; Wed, 30 Jan 2008 10:11:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A40416A419 for ; Wed, 30 Jan 2008 10:11:26 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3D2B513C45D for ; Wed, 30 Jan 2008 10:11:26 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UABQ1a017738 for ; Wed, 30 Jan 2008 10:11:26 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UABQEX017735 for perforce@freebsd.org; Wed, 30 Jan 2008 10:11:26 GMT (envelope-from rrs@cisco.com) Date: Wed, 30 Jan 2008 10:11:26 GMT Message-Id: <200801301011.m0UABQEX017735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134464 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 10:11:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=134464 Change 134464 by rrs@rrs-mips2-jnpr on 2008/01/30 10:10:31 Adds a few notes Affected files ... .. //depot/projects/mips2-jnpr/src/TODO#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/TODO#2 (text+ko) ==== @@ -28,3 +28,5 @@ trap numbers sigframes traframes +- Patch up horrible octeon hack with _bus.h _bus_octeon.h +- tease apart the packet drivers out of the rgmii driver. From owner-p4-projects@FreeBSD.ORG Wed Jan 30 10:57:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5386716A420; Wed, 30 Jan 2008 10:57:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0031716A419 for ; Wed, 30 Jan 2008 10:57:15 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E016F13C465 for ; Wed, 30 Jan 2008 10:57:15 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UAvFEi024822 for ; Wed, 30 Jan 2008 10:57:15 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UAvFHu024819 for perforce@freebsd.org; Wed, 30 Jan 2008 10:57:15 GMT (envelope-from rrs@cisco.com) Date: Wed, 30 Jan 2008 10:57:15 GMT Message-Id: <200801301057.m0UAvFHu024819@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134466 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 10:57:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=134466 Change 134466 by rrs@rrs-mips2-jnpr on 2008/01/30 10:57:09 Ok, gets the rgmii driver compiling and into my config. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fau.h#3 edit .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fpa.c#3 edit .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fpa.h#3 edit .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_ipd.h#3 edit .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_pko.c#3 edit .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_rgmx.c#3 edit .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_rgmx.h#3 edit .. //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#5 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#3 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_pcmap_regs.h#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fau.h#3 (text+ko) ==== @@ -50,7 +50,7 @@ #ifndef ___OCTEON_FAU__H___ #define ___OCTEON_FAU__H___ - +#include "../../mips32/octeon32/octeon_pcmap_regs.h" ==== //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fpa.c#3 (text+ko) ==== @@ -210,13 +210,13 @@ * about growth, we already preallocated extra */ #ifdef FPA_DEBUG - printf(" %% Huge MemBlock 0x%X Bytes %u\n", memory, bytes); + printf(" %% Huge MemBlock 0x%p Bytes %u\n", memory, bytes); #endif memory = (void *)OCTEON_ALIGN(memory); #ifdef FPA_DEBUG_TERSE - printf("FPA fill: %u Count: %u SizeBytes: %u SizeBytesAligned: %u 1st: 0x%X = 0x%X\n", + printf("FPA fill: %u Count: %u SizeBytes: %u SizeBytesAligned: %u 1st: 0x%p = 0x%X\n", pool, elem_num, elem_size_bytes, block_size, memory, OCTEON_PTR2PHYS(memory)); #endif @@ -225,7 +225,7 @@ while (elem_num--) { #ifdef FPA_DEBUG if (((elems - elem_num) < 4) || (elem_num < 4)) - printf(" %% Block %d: 0x%X Phys 0x%X Bytes %u\n", block, memory, OCTEON_PTR2PHYS(memory), elem_size_bytes); + printf(" %% Block %d: 0x%p Phys 0x%X Bytes %u\n", block, memory, OCTEON_PTR2PHYS(memory), elem_size_bytes); block++; #endif octeon_fpa_free(memory, pool, 0); ==== //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_fpa.h#3 (text+ko) ==== @@ -48,7 +48,7 @@ #ifndef ___OCTEON_FPA__H___ #define ___OCTEON_FPA__H___ - +#include "../../mips32/octeon32/octeon_pcmap_regs.h" #define OCTEON_FPA_FPA_OUTPUT_BUFFER_POOL 2 /* Same in octeon_rgmx.h */ ==== //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_ipd.h#3 (text+ko) ==== @@ -49,7 +49,7 @@ #ifndef ___OCTEON_IPD__H___ #define ___OCTEON_IPD__H___ - +#include "../../mips32/octeon32/octeon_pcmap_regs.h" typedef enum { ==== //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_pko.c#3 (text+ko) ==== @@ -223,7 +223,7 @@ octeon_pko_port_status_t status; octeon_pko_get_port_status(port, 0, &status); - printf("\n Port #%d Pkts %d Bytes %lld DoorBell %lld", + printf("\n Port #%lld Pkts %ld Bytes %lld DoorBell %lld", port, status.packets, status.octets, status.doorbell); } @@ -260,7 +260,7 @@ gmx_int0_ports = (16 >> octeon_pko_gmx_mode.bits.mode0); gmx_int1_ports = (16 >> octeon_pko_gmx_mode.bits.mode1); octeon_pko_crc_ports.word64 = oct_read64(OCTEON_PKO_REG_CRC_ENABLE); - printf("\n Total Queues: 0..%d Ports GMX0 %d GMX1 %d CRC 0x%llX", + printf("\n Total Queues: 0..%d Ports GMX0 %d GMX1 %d CRC 0x%x", queue_max - 1, gmx_int0_ports, gmx_int1_ports, octeon_pko_crc_ports.bits.crc_ports_mask); @@ -279,17 +279,19 @@ if (!octeon_pko_queue_cfg.bits.buf_ptr) continue; printf("\n Port # %d Queue %3d [%d] BufPtr: 0x%llX Mask: %X%s", - octeon_pko_queue_cfg.bits.port, octeon_pko_queue_cfg.bits.queue, - octeon_pko_queue_cfg.bits.index, - octeon_pko_queue_cfg.bits.buf_ptr, octeon_pko_queue_cfg.bits.qos_mask, - (octeon_pko_queue_cfg.bits.tail) ? " Last" : ""); + octeon_pko_queue_cfg.bits.port, + octeon_pko_queue_cfg.bits.queue, + octeon_pko_queue_cfg.bits.index, + octeon_pko_queue_cfg.bits.buf_ptr, + octeon_pko_queue_cfg.bits.qos_mask, + (octeon_pko_queue_cfg.bits.tail) ? " Last" : ""); } printf("\n"); for (port = start_port; port < (end_port + 1); port++) { octeon_pko_get_port_status(port, 0, &status); - printf("\n Port #%d Packets %d Bytes %lld DoorBell %lld", + printf("\n Port #%d Packets %ld Bytes %lld DoorBell %lld", port, status.packets, status.octets, status.doorbell); octeon_pko_doorbell_data_dump(port); @@ -318,7 +320,7 @@ octeon_pko_queue_cfg_t qconfig; if ((port >= OCTEON_PKO_PORTS_MAX) && (port != OCTEON_PKO_PORT_ILLEGAL)) { - printf("\n%% Error: octeon_pko_config_port: Invalid port %llu", port); + printf("\n%% Error: octeon_pko_config_port: Invalid port %u", port); return (OCTEON_PKO_INVALID_PORT); } if ((base_queue + num_queues) > OCTEON_PKO_QUEUES_MAX) { ==== //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_rgmx.c#3 (text+ko) ==== @@ -194,7 +194,9 @@ static void octeon_rgmx_stop(struct rgmx_softc_dev *sc); static void octeon_rgmx_config_speed(u_int port, u_int); static void octeon_dump_rgmx_stats(u_int port); +#ifdef __not_used__ static void rgmx_timer_periodic(void); +#endif static void octeon_rgmx_enable_RED_all(int, int); #ifdef OCTEON_RGMX_SCHEDULED_ISRS @@ -215,7 +217,7 @@ /* Standard driver entry points. These can be static. */ static void octeon_rgmx_init(void *); -//static driver_intr_t rgmx_intr; +/* static driver_intr_t rgmx_intr; */ static int octeon_rgmx_ioctl(struct ifnet *, u_long, caddr_t); static void octeon_rgmx_output_start(struct ifnet *); static void octeon_rgmx_output_start_locked(struct ifnet *); @@ -353,14 +355,14 @@ ifp->if_capenable = ifp->if_capabilities; ifp->if_init = octeon_rgmx_init; ifp->if_linkmib = NULL; - //&sc->mibdata; + /*&sc->mibdata; */ ifp->if_linkmiblen = 0; - //sizeof(sc->mibdata); + /*sizeof(sc->mibdata);*/ /* * Set fixed interface flags. */ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - //|IFF_NEEDSGIANT; + /*|IFF_NEEDSGIANT; */ if (ifp->if_snd.ifq_maxlen == 0) ifp->if_snd.ifq_maxlen = ifqmaxlen; @@ -609,7 +611,7 @@ * *********************************************************************/ -// + #define OCTEON_RGMX_POW_TIME_THR_INTS 1 @@ -780,7 +782,7 @@ -// + #define DEBUG_RX 1 static void @@ -792,7 +794,6 @@ void *data_start, *new_data_start; struct mbuf *mbuf; - // #define DEBUG_RX_PKT_DUMP 1 #ifdef DEBUG_RX_PKT_DUMP int i; @@ -802,12 +803,11 @@ data_start = octeon_pow_pktptr_to_kbuffer(work->packet_ptr); - // #define DEBUG_RX2 #ifdef DEBUG_RX2 - printf(" WQE 0x%X: port:%u ", work, port); - printf(" Grp: %u, %llX Tag: %u %llX type: %u 0x%llx\n", - work->grp, work->grp, work->tag, work->tag, work->tag_type, work->tag_type); + printf(" WQE 0x%p: port:%u ", work, port); + printf(" Grp: %u, %x Tag: %x type: %u 0x%x\n", + work->grp, work->grp, work->tag, work->tag_type, work->tag_type); #endif if ((port >= OCTEON_RGMX_MIN_PORT) || (port <= OCTEON_RGMX_MAX_PORT)) { @@ -860,7 +860,7 @@ mbuf = octeon_rgmx_build_new_rx_mbuf(ifp, new_data_start, len); if (mbuf) { - //printf(" Passing pkt to ifp: pkt_len: %u len: %u ", mbuf->m_pkthdr.len, mbuf->m_len); + /*printf(" Passing pkt to ifp: pkt_len: %u len: %u ", mbuf->m_pkthdr.len, mbuf->m_len); */ #ifdef DEBUG_RX_PKT_DUMP dc = mtod(mbuf, u_char *); @@ -910,7 +910,6 @@ * ------------------------------------------------------------------- */ -// #define OCTEON_VISUAL_RGMX 1 #ifdef OCTEON_VISUAL_RGMX static int where0 = 0; @@ -1012,16 +1011,17 @@ uint64_t xmit_cmd_state; int queue = 0; - //we should randomize queue -#based on core num. Using same - // queue 0 for this - port, by all cores on is less efficient. - - /* - * Prepare the PKO buffer and command word. Cmd Buf Word 0 - * No FAU Set #-segs and #-bytes - */ - pko_cmd.word64 = 0; + /* + * we should randomize queue + * based on core num. Using same + * queue 0 for this + * port, by all cores on is less efficient. + */ + /* + * Prepare the PKO buffer and command word. Cmd Buf Word 0 + * No FAU Set #-segs and #-bytes + */ + pko_cmd.word64 = 0; pko_cmd.bits.segs = 1; pko_cmd.bits.total_bytes = len; if (checksum) { @@ -1035,7 +1035,7 @@ pko_pkt_word.bits.addr = OCTEON_PTR2PHYS(out_buff); pko_pkt_word.bits.pool = OCTEON_FPA_TX_PACKET_POOL; pko_pkt_word.bits.size = 2048; - //dummy.Actual len is above. + /*dummy.Actual len is above. */ #ifdef DEBUG_TX printf(" PKO: 0x%llX 0x%llX ", pko_cmd.word64, pko_pkt_word.word64); @@ -1133,7 +1133,7 @@ IF_DEQUEUE(&sc->tx_pending_queue, m); if (!m) { break; - //Queue became empty now.Break out. + /*Queue became empty now.Break out. */ } /* * Return the mbuf to system. @@ -1143,7 +1143,7 @@ } if (!i) { return; - //Nothing removed from queue. + /*Nothing removed from queue. */ } /* * The transmitter is no more active. Reset output active flag and @@ -1157,8 +1157,10 @@ #define OCTEON_RGMX_FLUSH_N_XMIT_MBUFS_EACH_LOOP 5 #define OCTEON_RGMX_FLUSH_PENDING_MBUFS_MAX 1000 +#ifdef __not_used__ +/* Used in not_used fucntion */ /* - * octeon_rgmx_output_flush + * octeon_rgmx_output_flush timer_periodic * * Drop all packets queued at ifnet layer. */ @@ -1184,6 +1186,7 @@ } } +#endif /* * octeon_rgmx_output_start @@ -1288,7 +1291,6 @@ /* * put the mbuf onto pending queue */ - // #define DEBUG_TX_PKT_DUMP 1 #ifdef DEBUG_TX_PKT_DUMP int ii; @@ -1329,7 +1331,7 @@ * outgoing packets in the transmission buffer. */ ifp->if_oerrors++; - //sc->mibdata.dot3StatsInternalMacTransmitErrors++; + /*sc->mibdata.dot3StatsInternalMacTransmitErrors++;*/ ifp->if_drv_flags |= IFF_DRV_OACTIVE; return; } @@ -1460,7 +1462,7 @@ struct { uint64_t rsvd3:4; uint64_t thr_freq:28; - //R / O + /*R / O */ uint64_t rsvd2:4; uint64_t thr_period:20; uint64_t rsvd:8; @@ -1535,8 +1537,9 @@ #else thr.bits.ds_thr = thr.bits.iq_thr = 1; - //Only if doing - absolute queue - cnt interrupts. + /*Only if doing + *absolute queue - cnt interrupts. + */ oct_write64(OCTEON_POW_WORKQUEUE_INT_THRESHOLD(OCTEON_POW_RX_GROUP_NUM), thr.word64); #endif @@ -1947,7 +1950,6 @@ if (link_status.bits.status != old_link_status.bits.status) { - // #define DEBUG_LINESTATUS if (link_status.bits.status) { #ifdef DEBUG_LINESTATUS @@ -1975,7 +1977,7 @@ } - +#ifdef _not_used_ static void rgmx_timer_periodic(void) { @@ -2002,18 +2004,18 @@ * Now look for anamolous conditions */ if (sc != get_rgmx_softc(port)) { - printf(" port %u sc 0x%X not in sync with index: %u\n", + printf(" port %u sc 0x%p not in sync with index: %u\n", port, sc, index); continue; } if (sc->port != port) { - printf(" port %u sc 0x%X port-> %u not in sync with index: %u\n", + printf(" port %u sc 0x%p port-> %u not in sync with index: %u\n", port, sc, sc->port, index); continue; } ifp = sc->ifp; if (ifp == NULL) { - printf(" port %u sc 0x%X . Bad ifp 0x%X\n", port, sc, ifp); + printf(" port %u sc 0x%p . Bad ifp 0x%p\n", port, sc, ifp); continue; } /* @@ -2032,7 +2034,7 @@ octeon_rgmx_config_speed(port, 1); } } - +#endif static void octeon_dump_pow_stats(void) @@ -2104,16 +2106,15 @@ } } - // #define DEBUG_RGMX_DUMP #ifdef DEBUG_RGMX_DUMP static int count = 0; if (++count > 5) { count = 0; - //octeon_dump_fpa_pool(OCTEON_FPA_RX_PACKET_POOL); - //octeon_dump_fpa_pool(OCTEON_FPA_WQE_RX_POOL); - //octeon_dump_fpa_pool(OCTEON_FPA_TX_PACKET_POOL); + /*octeon_dump_fpa_pool(OCTEON_FPA_RX_PACKET_POOL);*/ + /*octeon_dump_fpa_pool(OCTEON_FPA_WQE_RX_POOL);*/ + /*octeon_dump_fpa_pool(OCTEON_FPA_TX_PACKET_POOL);*/ octeon_dump_rgmx_stats(16); octeon_dump_pow_stats(); } @@ -2291,7 +2292,7 @@ return (retcode); } - +#ifdef __not_used__ /* * octeon_rgmx_free_intr * @@ -2324,7 +2325,7 @@ #endif } - +#endif static device_method_t rgmii_methods[] = { /* Device interface */ ==== //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_rgmx.h#3 (text+ko) ==== @@ -507,8 +507,11 @@ result.word64 = oct_read64(ptr.word64); - printf("WQE Result: 0x%llX No-work %llX Addr %llX Ptr: %llX\n", - result.word64, result.s_work.no_work, result.s_work.addr, OCTEON_PHYS2PTR(result.s_work.addr)); + printf("WQE Result: 0x%llX No-work %x Addr %llX Ptr: %p\n", + result.word64, + result.s_work.no_work, + result.s_work.addr, + OCTEON_PHYS2PTR(result.s_work.addr)); if (result.s_work.no_work || !result.s_work.addr) { return NULL; ==== //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#5 (text+ko) ==== @@ -66,7 +66,7 @@ device md device mem device uart -#device rgmii +device rgmii #options VERBOSE_SYSINIT #options SMP ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#3 (text+ko) ==== @@ -77,19 +77,9 @@ #include "cpuinfo_octeon.h" static struct pcpu pcpu0; -#ifdef OCTEON_SMP -#define pcpup PCPUP -#else -/*struct pcpu *pcpup = &pcpu0;*/ - -#endif struct cpu_info cpu_info_store; -/* Coble core id that was put in pcpu.h by Cavium */ -#define OCTEON_CORE_ID 0 - - /*- * Warner, these I pulled from cpufunc.h in Cavium to * get things compiling they may not be right.. and ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_pcmap_regs.h#2 (text+ko) ==== @@ -1,6 +1,3 @@ - - - #ifndef __OCTEON_PCMAP_REGS_H__ #define __OCTEON_PCMAP_REGS_H__ @@ -11,6 +8,17 @@ #ifndef LOCORE +/* From include/pcpu.h in octeon's port */ +#ifndef OCTEON_SMP +#define OCTEON_CORE_ID 0 +#else +/*#define OCTEON_CORE_ID ((mips_rd_ebase() & 0x3ff))*/ +#define OCTEON_CORE_ID (mips_rd_coreid()) +#endif + + + + /* * Utility inlines & macros */ From owner-p4-projects@FreeBSD.ORG Wed Jan 30 12:11:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E324D16A418; Wed, 30 Jan 2008 12:11:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9018516A468 for ; Wed, 30 Jan 2008 12:11:37 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 23D4D13C54E for ; Wed, 30 Jan 2008 12:11:35 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UCBY3k030940 for ; Wed, 30 Jan 2008 12:11:34 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UCBYOt030937 for perforce@freebsd.org; Wed, 30 Jan 2008 12:11:34 GMT (envelope-from rrs@cisco.com) Date: Wed, 30 Jan 2008 12:11:34 GMT Message-Id: <200801301211.m0UCBYOt030937@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134468 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 12:11:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=134468 Change 134468 by rrs@rrs-mips2-jnpr on 2008/01/30 12:11:09 gets proper prototype in so to end annoying warning. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#4 (text+ko) ==== @@ -1245,6 +1245,8 @@ } +void tick_early_init (uint32_t clock_hz); +void tick_init_params(uint64_t platform_counter_freq, int double_count); void platform_start(__register_t a0 __unused, __register_t a1 __unused, From owner-p4-projects@FreeBSD.ORG Wed Jan 30 14:23:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D31D816A46B; Wed, 30 Jan 2008 14:23:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5FCFC16A47E for ; Wed, 30 Jan 2008 14:23:02 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id 50ED113C455 for ; Wed, 30 Jan 2008 14:23:02 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from zion.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by elvis.mu.org (Postfix) with ESMTP id D886B1A4D7E; Wed, 30 Jan 2008 06:23:01 -0800 (PST) From: John Baldwin To: John Birrell Date: Wed, 30 Jan 2008 09:13:03 -0500 User-Agent: KMail/1.9.7 References: <200801272148.m0RLmWdF053919@repoman.freebsd.org> In-Reply-To: <200801272148.m0RLmWdF053919@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200801300913.03782.jhb@freebsd.org> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 134245 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 14:23:03 -0000 On Sunday 27 January 2008 04:48:32 pm John Birrell wrote: > http://perforce.freebsd.org/chv.cgi?CH=134245 > > Change 134245 by jb@jb_freebsd1 on 2008/01/27 21:47:41 > > The linker lock here is private to code in this file. It is > never a problem with it being locked when any other combination > of locks are already obtained or even if *no* other locks are > obtained. Use SX_NOWITNESS to avoid bogus LOR reports. If witness reports a LOR it is real, it may just not be obvious. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Wed Jan 30 15:26:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A06F16A468; Wed, 30 Jan 2008 15:26:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F15D16A421 for ; Wed, 30 Jan 2008 15:26:08 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 21BDA13C447 for ; Wed, 30 Jan 2008 15:26:08 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UFQ7Lo057073 for ; Wed, 30 Jan 2008 15:26:08 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UFQ7sK057070 for perforce@freebsd.org; Wed, 30 Jan 2008 15:26:07 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 30 Jan 2008 15:26:07 GMT Message-Id: <200801301526.m0UFQ7sK057070@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 134476 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 15:26:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=134476 Change 134476 by gonzo@gonzo_jeeves on 2008/01/30 15:25:17 o Resubmit check for __ASSEMBLER__ presented in changeset 132313 and accidentally backed out. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/endian.h#8 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/endian.h#8 (text+ko) ==== @@ -35,8 +35,10 @@ #include #ifndef _LOCORE +#ifndef __ASSEMBLER__ #include #endif +#endif #ifdef __cplusplus extern "C" { @@ -68,6 +70,7 @@ #endif #ifndef LOCORE +#ifndef __ASSEMBLER__ #if defined(__GNUCLIKE_BUILTIN_CONSTANT_P) && defined(__OPTIMIZE__) #define __is_constant(x) __builtin_constant_p(x) #else @@ -137,6 +140,7 @@ #define __htons(x) (__bswap16((x))) #endif /* _MIPSEB */ +#endif /* __ASSEMBLER__ */ #endif /* LOCORE */ #ifdef __cplusplus From owner-p4-projects@FreeBSD.ORG Wed Jan 30 15:38:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 784D216A421; Wed, 30 Jan 2008 15:38:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2488116A417 for ; Wed, 30 Jan 2008 15:38:21 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1586B13C469 for ; Wed, 30 Jan 2008 15:38:21 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UFcKfx057550 for ; Wed, 30 Jan 2008 15:38:20 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UFcKmE057547 for perforce@freebsd.org; Wed, 30 Jan 2008 15:38:20 GMT (envelope-from swise@FreeBSD.org) Date: Wed, 30 Jan 2008 15:38:20 GMT Message-Id: <200801301538.m0UFcKmE057547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 134477 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 15:38:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=134477 Change 134477 by swise@swise:vic10:iwarp on 2008/01/30 15:38:04 First swipe at using a ksocket for streaming mode connection setup. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.c#5 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#12 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.h#4 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_qp.c#5 edit .. //depot/projects/iwarp/sys/netinet/tcp.h#5 edit .. //depot/projects/iwarp/sys/netinet/tcp_usrreq.c#6 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.c#5 (text+ko) ==== @@ -93,7 +93,9 @@ .add = open_rnic_dev, .remove = close_rnic_dev, .handlers = t3c_handlers, +#if 0 .redirect = iwch_ep_redirect +#endif }; static TAILQ_HEAD( ,iwch_dev) dev_list; @@ -265,3 +267,4 @@ DECLARE_MODULE(iw_cxgb, mod_data, SI_SUB_EXEC, SI_ORDER_ANY); MODULE_DEPEND(iw_cxgb, rdma_core, 1, 1, 1); MODULE_DEPEND(iw_cxgb, if_cxgb, 1, 1, 1); +MODULE_DEPEND(iw_cxgb, t3_tom, 1, 1, 1); ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#12 (text+ko) ==== @@ -1,4 +1,3 @@ - /************************************************************************** Copyright (c) 2007, Chelsio Inc. @@ -47,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -55,11 +55,15 @@ #include #include - #include #include #include +#include #include +#include +#include +#include +#include #include #include @@ -67,6 +71,10 @@ #ifdef CONFIG_DEFINED #include +#include +#include +#include +#include #include #include #include @@ -74,6 +82,10 @@ #include #else #include +#include +#include +#include +#include #include #include #include @@ -124,7 +136,7 @@ static int rcv_win = 256 * 1024; TUNABLE_INT("hw.iw_cxgb.rcv_win", &rcv_win); SYSCTL_UINT(_hw_cxgb, OID_AUTO, rcv_win, CTLFLAG_RDTUN, &rcv_win, 0, - "TCP receive window in bytes (default=256)"); + "TCP receive window in bytes (default=256KB)"); static int snd_win = 32 * 1024; TUNABLE_INT("hw.iw_cxgb.snd_win", &snd_win); @@ -141,16 +153,9 @@ SYSCTL_UINT(_hw_cxgb, OID_AUTO, cong_flavor, CTLFLAG_RDTUN, &cong_flavor, 0, "TCP Congestion control flavor (default=1)"); -static void process_task(void *ctx, int pending); -static struct task mbuf_task; -static struct taskqueue *mbuf_taskq; - -static struct mbuf_head rxq; -static cxgb_cpl_handler_func work_handlers[NUM_CPL_CMDS]; - static void ep_timeout(void *arg); static void connect_reply_upcall(struct iwch_ep *ep, int status); -static struct mbuf *get_mbuf(struct mbuf *m, int len, int flags); +static void iwch_so_upcall(struct socket *so, void *arg, int waitflag); static void start_ep_timer(struct iwch_ep *ep) @@ -178,78 +183,35 @@ put_ep(&ep->com); } -static void -release_tid(struct t3cdev *tdev, u32 hwtid, struct mbuf *m) +static int set_tcpinfo(struct iwch_ep *ep) { - struct cpl_tid_release *req; + struct tcp_info ti; + struct sockopt sopt; + int err; - m = get_mbuf(m, sizeof *req, M_NOWAIT); - if (m == NULL) - return; - req = (struct cpl_tid_release *) mbuf_put(m, sizeof(*req)); - req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); - OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_TID_RELEASE, hwtid)); - m_set_priority(m, CPL_PRIORITY_SETUP); - cxgb_ofld_send(tdev, m); - return; -} + sopt.sopt_dir = SOPT_GET; + sopt.sopt_level = IPPROTO_TCP; + sopt.sopt_name = TCP_INFO; + sopt.sopt_val = (caddr_t)&ti; + sopt.sopt_valsize = sizeof ti; + + err = sogetopt(ep->com.so, &sopt); + if (err) + return -err; + if (!(ti.tcpi_options & TCPI_OPT_TOE)) { + printf("%s connection NOT OFFLOADED!\n", __FUNCTION__); + return -EINVAL; + } -int -iwch_quiesce_tid(struct iwch_ep *ep) -{ - struct cpl_set_tcb_field *req; - struct mbuf *m = get_mbuf(NULL, sizeof(*req), M_NOWAIT); - - if (m == NULL) - return (-ENOMEM); - req = (struct cpl_set_tcb_field *) mbuf_put(m, sizeof(*req)); - req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); - req->wr.wr_lo = htonl(V_WR_TID(ep->hwtid)); - OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SET_TCB_FIELD, ep->hwtid)); - req->reply = 0; - req->cpu_idx = 0; - req->word = htons(W_TCB_RX_QUIESCE); - req->mask = cpu_to_be64(1ULL << S_TCB_RX_QUIESCE); - req->val = cpu_to_be64(1 << S_TCB_RX_QUIESCE); - - m_set_priority(m, CPL_PRIORITY_DATA); - cxgb_ofld_send(ep->com.tdev, m); - return 0; -} - -int -iwch_resume_tid(struct iwch_ep *ep) -{ - struct cpl_set_tcb_field *req; - struct mbuf *m = get_mbuf(NULL, sizeof(*req), M_NOWAIT); - - if (m == NULL) - return (-ENOMEM); - req = (struct cpl_set_tcb_field *) mbuf_put(m, sizeof(*req)); - req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); - req->wr.wr_lo = htonl(V_WR_TID(ep->hwtid)); - OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SET_TCB_FIELD, ep->hwtid)); - req->reply = 0; - req->cpu_idx = 0; - req->word = htons(W_TCB_RX_QUIESCE); - req->mask = cpu_to_be64(1ULL << S_TCB_RX_QUIESCE); - req->val = 0; - - m_set_priority(m, CPL_PRIORITY_DATA); - cxgb_ofld_send(ep->com.tdev, m); - return 0; -} - -static void -set_emss(struct iwch_ep *ep, u16 opt) -{ - PDBG("%s ep %p opt %u\n", __FUNCTION__, ep, opt); - ep->emss = T3C_DATA(ep->com.tdev)->mtus[G_TCPOPT_MSS(opt)] - 40; - if (G_TCPOPT_TSTAMP(opt)) + ep->snd_seq = ti.tcpi_snd_nxt; + ep->rcv_seq = ti.tcpi_rcv_nxt; + ep->emss = ti.__tcpi_snd_mss - sizeof(struct tcpiphdr); + ep->hwtid = TOEPCB(ep->com.so)->tp_tid; /* XXX */ + if (ti.tcpi_options & TCPI_OPT_TIMESTAMPS) ep->emss -= 12; if (ep->emss < 128) ep->emss = 128; - PDBG("emss=%d\n", ep->emss); + return 0; } static enum iwch_ep_state @@ -299,91 +261,62 @@ void __free_ep(struct iwch_ep_common *epc) { PDBG("%s ep %p state %s\n", __FUNCTION__, epc, states[state_read(epc)]); + BUG_ON(epc->so); free(epc, M_DEVBUF); } -static void -release_ep_resources(struct iwch_ep *ep) +int +iwch_quiesce_tid(struct iwch_ep *ep) { - PDBG("%s ep %p tid %d\n", __FUNCTION__, ep, ep->hwtid); - cxgb_remove_tid(ep->com.tdev, (void *)ep, ep->hwtid); - RTFREE(ep->dst); - l2t_release(L2DATA(ep->com.tdev), ep->l2t); - put_ep(&ep->com); -} +#ifdef notyet + struct cpl_set_tcb_field *req; + struct mbuf *m = get_mbuf(NULL, sizeof(*req), M_NOWAIT); -static void -process_task(void *ctx, int pending) -{ - struct mbuf *m = NULL; - void *ep; - struct t3cdev *tdev; - int ret; + if (m == NULL) + return (-ENOMEM); + req = (struct cpl_set_tcb_field *) mbuf_put(m, sizeof(*req)); + req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); + req->wr.wr_lo = htonl(V_WR_TID(ep->hwtid)); + OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SET_TCB_FIELD, ep->hwtid)); + req->reply = 0; + req->cpu_idx = 0; + req->word = htons(W_TCB_RX_QUIESCE); + req->mask = cpu_to_be64(1ULL << S_TCB_RX_QUIESCE); + req->val = cpu_to_be64(1 << S_TCB_RX_QUIESCE); - while ((m = mbufq_dequeue(&rxq))) { - ep = m->m_pkthdr.rcvif; - tdev = (struct t3cdev *)m->m_pkthdr.header; - PDBG("%s dequeued mbuf %p ep %p tdev %p opcode %u\n", __FUNCTION__, m, ep, tdev, G_OPCODE(ntohl(m->m_pkthdr.csum_data))); - ret = work_handlers[G_OPCODE(ntohl(m->m_pkthdr.csum_data))](tdev, m, ep); - if (ret & CPL_RET_BUF_DONE) - m_free(m); - - /* - * ep was referenced in sched(), and is freed here. - */ - put_ep((struct iwch_ep_common *)ep); - } + m_set_priority(m, CPL_PRIORITY_DATA); + cxgb_ofld_send(ep->com.tdev, m); +#endif + return 0; } -static int -status2errno(int status) +int +iwch_resume_tid(struct iwch_ep *ep) { - switch (status) { - case CPL_ERR_NONE: - return 0; - case CPL_ERR_CONN_RESET: - return (-ECONNRESET); - case CPL_ERR_ARP_MISS: - return (-EHOSTUNREACH); - case CPL_ERR_CONN_TIMEDOUT: - return (-ETIMEDOUT); - case CPL_ERR_TCAM_FULL: +#ifdef notyet + struct cpl_set_tcb_field *req; + struct mbuf *m = get_mbuf(NULL, sizeof(*req), M_NOWAIT); + + if (m == NULL) return (-ENOMEM); - case CPL_ERR_CONN_EXIST: - return (-EADDRINUSE); - default: - return (-EIO); - } -} + req = (struct cpl_set_tcb_field *) mbuf_put(m, sizeof(*req)); + req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); + req->wr.wr_lo = htonl(V_WR_TID(ep->hwtid)); + OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SET_TCB_FIELD, ep->hwtid)); + req->reply = 0; + req->cpu_idx = 0; + req->word = htons(W_TCB_RX_QUIESCE); + req->mask = cpu_to_be64(1ULL << S_TCB_RX_QUIESCE); + req->val = 0; -static void -reset_mbuf(struct mbuf *m) -{ - m_set_sgl(m, NULL); - m_set_sgllen(m, 0); - m->m_len = 0; - m->m_pkthdr.len = 0; + m_set_priority(m, CPL_PRIORITY_DATA); + cxgb_ofld_send(ep->com.tdev, m); +#endif + return 0; } -/* - * Try and reuse mbufs already allocated... - */ -static struct mbuf * -get_mbuf(struct mbuf *m, int len, int flags) -{ - if (!m || (m->m_flags & M_EXT)) { - /* - * Assume len is less than MINCLBYTES :-/ - */ - m = m_gethdr(MT_DATA, M_DONTWAIT); - } - reset_mbuf(m); - return (m); -} - static struct rtentry * -find_route(struct t3cdev *dev, __be32 local_ip, - __be32 peer_ip, __be16 local_port, +find_route(__be32 local_ip, __be32 peer_ip, __be16 local_port, __be16 peer_port, u8 tos) { struct route iproute; @@ -398,191 +331,67 @@ return iproute.ro_rt; } -static unsigned int -find_best_mtu(const struct t3c_data *d, unsigned short mtu) -{ - int i = 0; - - while (i < d->nmtus - 1 && d->mtus[i + 1] <= mtu) - ++i; - return i; -} - static void -arp_failure_discard(struct t3cdev *dev, struct mbuf *m) +close_socket(struct iwch_ep_common *epc) { - PDBG("%s t3cdev %p\n", __FUNCTION__, dev); - m_free(m); + soclose(epc->so); + epc->so = NULL; } -/* - * Handle an ARP failure for an active open. - */ static void -act_open_req_arp_failure(struct t3cdev *dev, struct mbuf *m) +abort_socket(struct iwch_ep *ep) { - printf("ARP failure duing connect\n"); - m_free(m); -} + struct sockopt sopt; + int err; + int linger_time=0; -/* - * Handle an ARP failure for a CPL_ABORT_REQ. Change it into a no RST variant - * and send it along. - */ -static void -abort_arp_failure(struct t3cdev *dev, struct mbuf *m) -{ - struct cpl_abort_req *req = cplhdr(m); - - PDBG("%s t3cdev %p\n", __FUNCTION__, dev); - req->cmd = CPL_ABORT_NO_RST; - cxgb_ofld_send(dev, m); -} - -static int -send_halfclose(struct iwch_ep *ep, int flags) -{ - struct cpl_close_con_req *req; - struct mbuf *m; - - PDBG("%s ep %p\n", __FUNCTION__, ep); - m = get_mbuf(NULL, sizeof(*req), flags); - if (m == NULL) { - printf("%s - failed to alloc mbuf\n", __FUNCTION__); - return (-ENOMEM); - } - m_set_priority(m, CPL_PRIORITY_DATA); - set_arp_failure_handler(m, arp_failure_discard); - req = (struct cpl_close_con_req *) mbuf_put(m, sizeof(*req)); - req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_CLOSE_CON)); - req->wr.wr_lo = htonl(V_WR_TID(ep->hwtid)); - OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_CLOSE_CON_REQ, ep->hwtid)); - l2t_send(ep->com.tdev, m, ep->l2t); - return 0; -} - -static int -send_abort(struct iwch_ep *ep, struct mbuf *m, int flags) -{ - struct cpl_abort_req *req; - - PDBG("%s ep %p\n", __FUNCTION__, ep); - m = get_mbuf(m, sizeof(*req), flags); - if (m == NULL) { - printf("%s - failed to alloc mbuf.\n", - __FUNCTION__); - return (-ENOMEM); - } - m_set_priority(m, CPL_PRIORITY_DATA); - set_arp_failure_handler(m, abort_arp_failure); - req = (struct cpl_abort_req *) mbuf_put(m, sizeof(*req)); - req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_HOST_ABORT_CON_REQ)); - req->wr.wr_lo = htonl(V_WR_TID(ep->hwtid)); - OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_ABORT_REQ, ep->hwtid)); - req->cmd = CPL_ABORT_SEND_RST; - l2t_send(ep->com.tdev, m, ep->l2t); - return 0; -} - -static int -send_connect(struct iwch_ep *ep) -{ - struct cpl_act_open_req *req; - struct mbuf *m; - u32 opt0h, opt0l, opt2; - unsigned int mtu_idx; - int wscale; - - PDBG("%s ep %p\n", __FUNCTION__, ep); - - m = get_mbuf(NULL, sizeof(*req), M_NOWAIT); - if (m == NULL) { - printf("%s - failed to alloc mbuf.\n", - __FUNCTION__); - return (-ENOMEM); - } - mtu_idx = find_best_mtu(T3C_DATA(ep->com.tdev), dst_mtu(ep->dst)); - wscale = compute_wscale(rcv_win); - opt0h = V_NAGLE(0) | - V_NO_CONG(nocong) | - V_KEEP_ALIVE(1) | - F_TCAM_BYPASS | - V_WND_SCALE(wscale) | - V_MSS_IDX(mtu_idx) | - V_L2T_IDX(ep->l2t->idx) | V_TX_CHANNEL(ep->l2t->smt_idx); - opt0l = V_TOS((ep->tos >> 2) & M_TOS) | V_RCV_BUFSIZ(rcv_win>>10); - opt2 = V_FLAVORS_VALID(1) | V_CONG_CONTROL_FLAVOR(cong_flavor); - m_set_priority(m, CPL_PRIORITY_SETUP); - set_arp_failure_handler(m, act_open_req_arp_failure); - - req = (struct cpl_act_open_req *) mbuf_put(m, sizeof(*req)); - req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); - OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_ACT_OPEN_REQ, ep->atid)); - req->local_port = ep->com.local_addr.sin_port; - req->peer_port = ep->com.remote_addr.sin_port; - req->local_ip = ep->com.local_addr.sin_addr.s_addr; - req->peer_ip = ep->com.remote_addr.sin_addr.s_addr; - req->opt0h = htonl(opt0h); - req->opt0l = htonl(opt0l); - req->params = 0; - req->opt2 = htonl(opt2); - l2t_send(ep->com.tdev, m, ep->l2t); - return 0; + /* linger_time of 0 forces RST to be sent */ + sopt.sopt_dir = SOPT_SET; + sopt.sopt_level = SOL_SOCKET; + sopt.sopt_name = SO_LINGER; + sopt.sopt_val = (caddr_t)&linger_time; + sopt.sopt_valsize = sizeof linger_time; + err = sosetopt(ep->com.so, &sopt); + if (err) + printf("%s can't set linger to 0, no RST!\n", __FUNCTION__); + close_socket(&ep->com); } static void -send_mpa_req(struct iwch_ep *ep, struct mbuf *m) +send_mpa_req(struct iwch_ep *ep) { int mpalen; - struct tx_data_wr *req; struct mpa_message *mpa; + struct mbuf *m; + int err; PDBG("%s ep %p pd_len %d\n", __FUNCTION__, ep, ep->plen); mpalen = sizeof(*mpa) + ep->plen; - if (mpalen + sizeof(*req) > MHLEN) { - /* - * XXX - */ - - m_free(m); - m = m_gethdr(mpalen + sizeof(*req), M_NOWAIT); - if (m == NULL) { - connect_reply_upcall(ep, ENOMEM); - return; - } + m = m_gethdr(mpalen, M_NOWAIT); + if (m == NULL) { + connect_reply_upcall(ep, -ENOMEM); + return; } - reset_mbuf(m); - m_set_priority(m, CPL_PRIORITY_DATA); - req = (struct tx_data_wr *)mbuf_put(m, sizeof(*req)); - mpa = (struct mpa_message *)mbuf_put(m, mpalen); + mpa = mtod(m, struct mpa_message *); + m->m_len = mpalen; + m->m_pkthdr.len = mpalen; memset(mpa, 0, sizeof(*mpa)); memcpy(mpa->key, MPA_KEY_REQ, sizeof(mpa->key)); mpa->flags = (crc_enabled ? MPA_CRC : 0) | (markers_enabled ? MPA_MARKERS : 0); mpa->private_data_size = htons(ep->plen); mpa->revision = mpa_rev; - if (ep->plen) memcpy(mpa->private_data, ep->mpa_pkt + sizeof(*mpa), ep->plen); - /* - * Reference the mpa mbuf. This ensures the data area - * will remain in memory until the hw acks the tx. - * Function tx_ack() will deref it. - */ - m->m_type = MT_DONTFREE; /* XXX */ - set_arp_failure_handler(m, arp_failure_discard); - req->wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_TX_DATA)); - req->wr_lo = htonl(V_WR_TID(ep->hwtid)); - req->len = htonl(mpalen); - req->param = htonl(V_TX_PORT(ep->l2t->smt_idx) | - V_TX_SNDBUF(snd_win>>15)); - req->flags = htonl(F_TX_INIT); - req->sndseq = htonl(ep->snd_seq); - BUG_ON(ep->mpa_mbuf); - ep->mpa_mbuf = m; - l2t_send(ep->com.tdev, m, ep->l2t); + err = sosend(ep->com.so, NULL, NULL, m, NULL, MSG_DONTWAIT, ep->com.thread); + if (err) { + m_freem(m); + connect_reply_upcall(ep, -ENOMEM); + return; + } + start_ep_timer(ep); state_set(&ep->com, MPA_REQ_SENT); return; @@ -592,21 +401,22 @@ send_mpa_reject(struct iwch_ep *ep, const void *pdata, u8 plen) { int mpalen; - struct tx_data_wr *req; struct mpa_message *mpa; struct mbuf *m; + int err; PDBG("%s ep %p plen %d\n", __FUNCTION__, ep, plen); mpalen = sizeof(*mpa) + plen; - m = get_mbuf(NULL, mpalen + sizeof(*req), M_NOWAIT); + m = m_gethdr(mpalen, M_NOWAIT); if (m == NULL) { printf("%s - cannot alloc mbuf!\n", __FUNCTION__); return (-ENOMEM); } - req = (struct tx_data_wr *)mbuf_put(m, sizeof(*req)); - mpa = (struct mpa_message *) mbuf_put(m, mpalen); + mpa = mtod(m, struct mpa_message *); + m->m_len = mpalen; + m->m_pkthdr.len = mpalen; memset(mpa, 0, sizeof(*mpa)); memcpy(mpa->key, MPA_KEY_REP, sizeof(mpa->key)); mpa->flags = MPA_REJECT; @@ -614,20 +424,8 @@ mpa->private_data_size = htons(plen); if (plen) memcpy(mpa->private_data, pdata, plen); - - m_set_priority(m, CPL_PRIORITY_DATA); - m->m_type = MT_DONTFREE; /* XXX */ - set_arp_failure_handler(m, arp_failure_discard); - req->wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_TX_DATA)); - req->wr_lo = htonl(V_WR_TID(ep->hwtid)); - req->len = htonl(mpalen); - req->param = htonl(V_TX_PORT(ep->l2t->smt_idx) | - V_TX_SNDBUF(snd_win>>15)); - req->flags = htonl(F_TX_INIT); - req->sndseq = htonl(ep->snd_seq); - BUG_ON(ep->mpa_mbuf); - ep->mpa_mbuf = m; - l2t_send(ep->com.tdev, m, ep->l2t); + err = sosend(ep->com.so, NULL, NULL, m, NULL, MSG_DONTWAIT, ep->com.thread); + BUG_ON(err); return 0; } @@ -635,24 +433,21 @@ send_mpa_reply(struct iwch_ep *ep, const void *pdata, u8 plen) { int mpalen; - struct tx_data_wr *req; struct mpa_message *mpa; - int len; struct mbuf *m; PDBG("%s ep %p plen %d\n", __FUNCTION__, ep, plen); mpalen = sizeof(*mpa) + plen; - m = get_mbuf(NULL, mpalen + sizeof(*req), M_NOWAIT); + m = m_gethdr(mpalen, M_NOWAIT); if (m == NULL) { printf("%s - cannot alloc mbuf!\n", __FUNCTION__); return (-ENOMEM); } - m_set_priority(m, CPL_PRIORITY_DATA); - m->m_type = MT_DONTFREE; /* XXX */ - req = (struct tx_data_wr *)mbuf_put(m, sizeof(*req)); - mpa = (struct mpa_message *)mbuf_put(m, mpalen); + mpa = mtod(m, struct mpa_message *); + m->m_len = mpalen; + m->m_pkthdr.len = mpalen; memset(mpa, 0, sizeof(*mpa)); memcpy(mpa->key, MPA_KEY_REP, sizeof(mpa->key)); mpa->flags = (ep->mpa_attr.crc_enabled ? MPA_CRC : 0) | @@ -662,54 +457,17 @@ if (plen) memcpy(mpa->private_data, pdata, plen); - set_arp_failure_handler(m, arp_failure_discard); - len = mpalen; - req->wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_TX_DATA)); - req->wr_lo = htonl(V_WR_TID(ep->hwtid)); - req->len = htonl(len); - req->param = htonl(V_TX_PORT(ep->l2t->smt_idx) | - V_TX_SNDBUF(snd_win>>15)); - req->flags = htonl(F_TX_INIT); - req->sndseq = htonl(ep->snd_seq); - ep->mpa_mbuf = m; state_set(&ep->com, MPA_REP_SENT); - l2t_send(ep->com.tdev, m, ep->l2t); - return 0; + return sosend(ep->com.so, NULL, NULL, m, NULL, MSG_DONTWAIT, + ep->com.thread); } -static int -act_establish(struct t3cdev *tdev, struct mbuf *m, void *ctx) -{ - struct iwch_ep *ep = ctx; - struct cpl_act_establish *req = cplhdr(m); - unsigned int tid = GET_TID(req); - - PDBG("%s ep %p tid %d\n", __FUNCTION__, ep, tid); - - /* setup the hwtid for this connection */ - ep->hwtid = tid; - cxgb_insert_tid(ep->com.tdev, &t3c_client, ep, tid); - - ep->snd_seq = ntohl(req->snd_isn); - ep->rcv_seq = ntohl(req->rcv_isn); - - set_emss(ep, ntohs(req->tcp_opt)); - - /* dealloc the atid */ - cxgb_free_atid(ep->com.tdev, ep->atid); - - /* start MPA negotiation */ - send_mpa_req(ep, m); - - return 0; -} - static void -abort_connection(struct iwch_ep *ep, struct mbuf *m, int flags) +abort_connection(struct iwch_ep *ep) { PDBG("%s ep %p\n", __FILE__, ep); state_set(&ep->com, ABORTING); - send_abort(ep, m, flags); + abort_socket(ep); } static void @@ -827,36 +585,16 @@ } } -static int -update_rx_credits(struct iwch_ep *ep, u32 credits) -{ - struct cpl_rx_data_ack *req; - struct mbuf *m; - - PDBG("%s ep %p credits %u\n", __FUNCTION__, ep, credits); - m = get_mbuf(NULL, sizeof(*req), M_NOWAIT); - if (m == NULL) { - printf("update_rx_credits - cannot alloc mbuf!\n"); - return 0; - } - - req = (struct cpl_rx_data_ack *) mbuf_put(m, sizeof(*req)); - req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); - OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_RX_DATA_ACK, ep->hwtid)); - req->credit_dack = htonl(V_RX_CREDITS(credits) | V_RX_FORCE_ACK(1)); - m_set_priority(m, CPL_PRIORITY_ACK); - cxgb_ofld_send(ep->com.tdev, m); - return credits; -} - static void -process_mpa_reply(struct iwch_ep *ep, struct mbuf *m) +process_mpa_reply(struct iwch_ep *ep) { struct mpa_message *mpa; u16 plen; struct iwch_qp_attributes attrs; enum iwch_qp_attr_mask mask; int err; + struct mbuf *top, *m; + int flags = MSG_DONTWAIT; PDBG("%s ep %p\n", __FUNCTION__, ep); @@ -869,27 +607,43 @@ if (state_read(&ep->com) != MPA_REQ_SENT) return; - /* - * If we get more than the supported amount of private data - * then we must fail this connection. - */ - if (ep->mpa_pkt_len + m->m_len > sizeof(ep->mpa_pkt)) { - err = (-EINVAL); + err = soreceive(ep->com.so, NULL, NULL, &top, NULL, &flags); + + if (err) { + err = -err; goto err; } - /* - * copy the new data into our accumulation buffer. - */ - m_copydata(m, 0, m->m_len, &(ep->mpa_pkt[ep->mpa_pkt_len])); - ep->mpa_pkt_len += m->m_len; + m = top; + do { + /* + * If we get more than the supported amount of private data + * then we must fail this connection. + */ + if (ep->mpa_pkt_len + m->m_len > sizeof(ep->mpa_pkt)) { + err = (-EINVAL); + goto err; + } + + /* + * copy the new data into our accumulation buffer. + */ + m_copydata(m, 0, m->m_len, &(ep->mpa_pkt[ep->mpa_pkt_len])); + ep->mpa_pkt_len += m->m_len; + if (!m->m_next) + m = m->m_nextpkt; + else + m = m->m_next; + } while (m); + + m_freem(top); /* * if we don't even have the mpa message, then bail. */ if (ep->mpa_pkt_len < sizeof(*mpa)) return; - mpa = (struct mpa_message *) ep->mpa_pkt; + mpa = (struct mpa_message *)ep->mpa_pkt; /* Validate MPA header. */ if (mpa->revision != mpa_rev) { @@ -948,6 +702,10 @@ ep->mpa_attr.recv_marker_enabled = markers_enabled; ep->mpa_attr.xmit_marker_enabled = mpa->flags & MPA_MARKERS ? 1 : 0; ep->mpa_attr.version = mpa_rev; + if (set_tcpinfo(ep)) { + printf("%s set_tcpinfo error\n", __FUNCTION__); + goto err; + } PDBG("%s - crc_enabled=%d, recv_marker_enabled=%d, " "xmit_marker_enabled=%d, version=%d\n", __FUNCTION__, ep->mpa_attr.crc_enabled, ep->mpa_attr.recv_marker_enabled, @@ -969,17 +727,20 @@ if (!err) goto out; err: - abort_connection(ep, m, M_NOWAIT); + abort_connection(ep); out: connect_reply_upcall(ep, err); return; } static void -process_mpa_request(struct iwch_ep *ep, struct mbuf *m) +process_mpa_request(struct iwch_ep *ep) { struct mpa_message *mpa; u16 plen; + int flags = MSG_DONTWAIT; + struct mbuf *top, *m; + int err; PDBG("%s ep %p\n", __FUNCTION__, ep); @@ -992,29 +753,52 @@ if (state_read(&ep->com) != MPA_REQ_WAIT) return; - /* - * If we get more than the supported amount of private data - * then we must fail this connection. - */ - if (ep->mpa_pkt_len + m->m_len > sizeof(ep->mpa_pkt)) { - PDBG("%s mpa message too big %d\n", __FUNCTION__, ep->mpa_pkt_len + m->m_len); - abort_connection(ep, m, M_NOWAIT); - return; + err = soreceive(ep->com.so, NULL, NULL, &top, NULL, &flags); + + if (err) { + if (err == EWOULDBLOCK) { + start_ep_timer(ep); + return; + } + goto err; } + m = top; + do { + + /* + * If we get more than the supported amount of private data + * then we must fail this connection. + */ + if (ep->mpa_pkt_len + m->m_len > sizeof(ep->mpa_pkt)) { + PDBG("%s mpa message too big %d\n", __FUNCTION__, + ep->mpa_pkt_len + m->m_len); + goto err; + } + + + /* + * Copy the new data into our accumulation buffer. + */ + m_copydata(m, 0, m->m_len, &(ep->mpa_pkt[ep->mpa_pkt_len])); + ep->mpa_pkt_len += m->m_len; + + if (!m->m_next) + m = m->m_nextpkt; + else + m = m->m_next; + } while (m); - /* - * Copy the new data into our accumulation buffer. - */ - m_copydata(m, 0, m->m_len, &(ep->mpa_pkt[ep->mpa_pkt_len])); - ep->mpa_pkt_len += m->m_len; + m_freem(top); /* * If we don't even have the mpa message, then bail. * We'll continue process when more data arrives. */ if (ep->mpa_pkt_len < sizeof(*mpa)) { - PDBG("%s not enough header %d...waiting...\n", __FUNCTION__, ep->mpa_pkt_len); + start_ep_timer(ep); + PDBG("%s not enough header %d...waiting...\n", __FUNCTION__, + ep->mpa_pkt_len); return; } mpa = (struct mpa_message *) ep->mpa_pkt; @@ -1024,14 +808,12 @@ */ if (mpa->revision != mpa_rev) { PDBG("%s bad mpa rev %d\n", __FUNCTION__, mpa->revision); - abort_connection(ep, m, M_NOWAIT); - return; + goto err; } if (memcmp(mpa->key, MPA_KEY_REQ, sizeof(mpa->key))) { PDBG("%s bad mpa key |%16s|\n", __FUNCTION__, mpa->key); - abort_connection(ep, m, M_NOWAIT); - return; + goto err; } plen = ntohs(mpa->private_data_size); @@ -1041,17 +823,16 @@ */ if (plen > MPA_MAX_PRIVATE_DATA) { PDBG("%s plen too big %d\n", __FUNCTION__, plen); - abort_connection(ep, m, M_NOWAIT); - return; + goto err; } /* * If plen does not account for pkt size */ if (ep->mpa_pkt_len > (sizeof(*mpa) + plen)) { - PDBG("%s more data after private data %d\n", __FUNCTION__, ep->mpa_pkt_len); - abort_connection(ep, m, M_NOWAIT); - return; + PDBG("%s more data after private data %d\n", __FUNCTION__, + ep->mpa_pkt_len); + goto err; } ep->plen = (u8) plen; @@ -1059,7 +840,9 @@ * If we don't have all the pdata yet, then bail. */ if (ep->mpa_pkt_len < (sizeof(*mpa) + plen)) { - PDBG("%s more mpa msg to come %d\n", __FUNCTION__, ep->mpa_pkt_len); + start_ep_timer(ep); + PDBG("%s more mpa msg to come %d\n", __FUNCTION__, + ep->mpa_pkt_len); return; } @@ -1071,6 +854,10 @@ ep->mpa_attr.recv_marker_enabled = markers_enabled; ep->mpa_attr.xmit_marker_enabled = mpa->flags & MPA_MARKERS ? 1 : 0; ep->mpa_attr.version = mpa_rev; + if (set_tcpinfo(ep)) { + printf("%s set_tcpinfo error\n", __FUNCTION__); + goto err; + } PDBG("%s - crc_enabled=%d, recv_marker_enabled=%d, " "xmit_marker_enabled=%d, version=%d\n", __FUNCTION__, ep->mpa_attr.crc_enabled, ep->mpa_attr.recv_marker_enabled, @@ -1081,386 +868,14 @@ /* drive upcall */ connect_request_upcall(ep); return; -} - -static int -rx_data(struct t3cdev *tdev, struct mbuf *m, void *ctx) -{ - struct iwch_ep *ep = ctx; - struct cpl_rx_data *hdr = cplhdr(m); - unsigned int dlen = ntohs(hdr->len); - - PDBG("%s ep %p dlen %u\n", __FUNCTION__, ep, dlen); - - m_adj(m, sizeof(*hdr)); - - /* - * XXX assume pkthdr - */ - m->m_pkthdr.len = m->m_len = dlen; - - ep->rcv_seq += dlen; - BUG_ON(ep->rcv_seq != (ntohl(hdr->seq) + dlen)); - - switch (state_read(&ep->com)) { - case MPA_REQ_SENT: - process_mpa_reply(ep, m); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 30 17:21:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E029F16A478; Wed, 30 Jan 2008 17:21:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4D5316A475 for ; Wed, 30 Jan 2008 17:21:08 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 98BA313C461 for ; Wed, 30 Jan 2008 17:21:08 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UHL8b4077164 for ; Wed, 30 Jan 2008 17:21:08 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UHL8V4077161 for perforce@freebsd.org; Wed, 30 Jan 2008 17:21:08 GMT (envelope-from cognet@freebsd.org) Date: Wed, 30 Jan 2008 17:21:08 GMT Message-Id: <200801301721.m0UHL8V4077161@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 134480 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 17:21:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=134480 Change 134480 by cognet@hulglah on 2008/01/30 17:20:11 We want to be able to build both 32bits and 64bits binaries. Approved by: mux (mentor) Affected files ... .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/libbfd/Makefile.mips#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/libbfd/Makefile.mips#2 (text+ko) ==== @@ -7,10 +7,15 @@ ecoff.c \ ecofflink.c \ elf32.c \ + elf64.c \ elf32-mips.c \ + elf64-mips.c \ elfxx-mips.c \ elf32-target.h \ + elf64-target.h \ elflink.c VECS= ${DEFAULT_VECTOR} \ - bfd_elf32_littlemips_vec + bfd_elf32_littlemips_vec \ + bfd_elf64_bigmips_vec \ + bfd_elf64_littlemips_vec From owner-p4-projects@FreeBSD.ORG Wed Jan 30 18:14:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F91716A41B; Wed, 30 Jan 2008 18:14:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1DE3C16A417; Wed, 30 Jan 2008 18:14:24 +0000 (UTC) (envelope-from raj@semihalf.com) Received: from mail.semihalf.com (mail.semihalf.com [83.15.139.206]) by mx1.freebsd.org (Postfix) with ESMTP id 8039E13C44B; Wed, 30 Jan 2008 18:14:23 +0000 (UTC) (envelope-from raj@semihalf.com) Received: from localhost (unknown [127.0.0.1]) by mail.semihalf.com (Postfix) with ESMTP id DBEF514655; Wed, 30 Jan 2008 19:22:17 +0100 (CET) Received: from mail.semihalf.com ([127.0.0.1]) by localhost (mail.semihalf.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 27122-08; Wed, 30 Jan 2008 19:22:15 +0100 (CET) Message-ID: <47A0BE7A.1030307@semihalf.com> Date: Wed, 30 Jan 2008 19:14:18 +0100 From: Rafal Jaworowski MIME-Version: 1.0 To: Marcel Moolenaar References: <200801230414.m0N4E4ng009323@repoman.freebsd.org> <4797C8E0.4070100@freebsd.org> <4798C436.6090904@gmail.com> <20080125.100006.-262784007.imp@bsdimp.com> <479A17AC.4070004@freebsd.org> <479A26CE.6020104@semihalf.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new at semihalf.com Cc: yanegomi@gmail.com, perforce@FreeBSD.org, marcel@FreeBSD.org, "M. Warner Losh" , grehan@FreeBSD.org Subject: Re: PERFORCE change 133911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 18:14:24 -0000 Hi Marcel, >> IIRC, almost any AIM binary I tried executing caused FP exceptions >> (actually, >> an illegal instrusction ;) on e500, even such that wouldn't be >> expected tu use >> FPU. I didn't investigate this at all, but maybe the compiler was >> using FPRs >> for optimizations or something of that sort, don't know, so the frequency >> might not be that low in reality. > > We didn't see this at all. We typically only saw ntpdate > and top crap out, because they actually use FP. Most of > the binaries were fine without -softfloat. > > Note also that a stray FP status register initialization > operation in crtX can cause all processes to fail, even > if there's no FP in the process. Your problem may have > been caused by libc, crt or libgcc. In fact, we may have > seen it ourselves as well and fixed that place to get to > where we ended up without softfloat (i.e. only ntpdate, > top, etc capping out). Hm, yes, this could be it. Do you happen to recall the proximity of those fixes/changes you have applied back then? It's nothing serious, I'm just curious, maybe I'd give this another spin in free time (he, he). I also had a closer look at your import and it seems to me some further work is required: there are NetBSD definitions/macros missing, and from what I could see bulk of the code is already in the tree: lib/libc/sparc64/fpu. It's some older version than you've pulled in, and sparc64 is apparently using this for libc connection (not sure if this is what Peter was referring to in one of the previous emails?), but we probably should share this and not keep a separate copy. Rafal From owner-p4-projects@FreeBSD.ORG Wed Jan 30 18:28:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51D1416A469; Wed, 30 Jan 2008 18:28:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F369516A41A for ; Wed, 30 Jan 2008 18:28:19 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E8B4713C46B for ; Wed, 30 Jan 2008 18:28:19 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UISJw8083237 for ; Wed, 30 Jan 2008 18:28:19 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UISJRY083234 for perforce@freebsd.org; Wed, 30 Jan 2008 18:28:19 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 30 Jan 2008 18:28:19 GMT Message-Id: <200801301828.m0UISJRY083234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 134482 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 18:28:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=134482 Change 134482 by gonzo@gonzo_jeeves on 2008/01/30 18:27:43 o Register definitions are vital for userland assembler pieces as well, so check for __ASSEMBLY__ here, not _LOCORE Approved by: imp@ Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/regdef.h#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/regdef.h#4 (text+ko) ==== @@ -12,7 +12,7 @@ #ifndef _MACHINE_REGDEF_H_ #define _MACHINE_REGDEF_H_ -#if defined(_LOCORE) +#if defined(__ASSEMBLER__) /* General purpose CPU register names */ #define zero $0 /* wired zero */ #define AT $at /* assembler temp */ @@ -48,6 +48,6 @@ #define s8 $30 /* callee saved */ #define ra $31 /* return address */ -#endif /* _LOCORE */ +#endif /* __ASSEMBLER__ */ #endif /* !_MACHINE_REGDEF_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jan 30 20:42:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C77E16A46E; Wed, 30 Jan 2008 20:42:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F18C116A41A; Wed, 30 Jan 2008 20:42:47 +0000 (UTC) (envelope-from kris@FreeBSD.org) Received: from weak.local (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 48EBD13C47E; Wed, 30 Jan 2008 20:42:47 +0000 (UTC) (envelope-from kris@FreeBSD.org) Message-ID: <47A0E146.60905@FreeBSD.org> Date: Wed, 30 Jan 2008 21:42:46 +0100 From: Kris Kennaway User-Agent: Thunderbird 2.0.0.9 (Macintosh/20071031) MIME-Version: 1.0 To: John Birrell References: <200801272145.m0RLjSqd053790@repoman.freebsd.org> In-Reply-To: <200801272145.m0RLjSqd053790@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 134244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 20:42:48 -0000 John Birrell wrote: > http://perforce.freebsd.org/chv.cgi?CH=134244 > > Change 134244 by jb@jb_freebsd1 on 2008/01/27 21:45:22 > > It seems I need an sx lock to be able to check if it locked. Not sure what you mean by this. All types of locks can check whether they are already held ("locked"). > It's an internal lock here, so the lock consistency is determined > by the code in this file only. > > Specify SX_NOWITNESS to avoid the bogis LOR reports that WITNESS > outputs when internal locks like this are obtained when there > are various other locks already obtained. This lock has no bearing > on the order that other locks are obtained. It is assumed that if you are using an sx lock then your code may sleep while holding it (this is the property that distinguishes sx from rw locks). However, if you sleep while holding a non-sleepable lock (e.g. mutex) then you can deadlock. That is what witness correctly checks for. If you know you will not be sleeping while holding your lock, use an rwlock instead of sx. Kris From owner-p4-projects@FreeBSD.ORG Wed Jan 30 20:52:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6834416A468; Wed, 30 Jan 2008 20:52:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1416D16A41A; Wed, 30 Jan 2008 20:52:06 +0000 (UTC) (envelope-from jb@what-creek.com) Received: from what-creek.com (what-creek.com [66.111.37.70]) by mx1.freebsd.org (Postfix) with ESMTP id B3E5B13C478; Wed, 30 Jan 2008 20:52:05 +0000 (UTC) (envelope-from jb@what-creek.com) Received: by what-creek.com (Postfix, from userid 102) id DF6EF73306; Wed, 30 Jan 2008 20:52:04 +0000 (GMT) Date: Wed, 30 Jan 2008 20:52:04 +0000 From: John Birrell To: John Baldwin Message-ID: <20080130205204.GA68541@what-creek.com> References: <200801272148.m0RLmWdF053919@repoman.freebsd.org> <200801300913.03782.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200801300913.03782.jhb@freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: Perforce Change Reviews Subject: Re: PERFORCE change 134245 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 20:52:06 -0000 On Wed, Jan 30, 2008 at 09:13:03AM -0500, John Baldwin wrote: > On Sunday 27 January 2008 04:48:32 pm John Birrell wrote: > > http://perforce.freebsd.org/chv.cgi?CH=134245 > > > > Change 134245 by jb@jb_freebsd1 on 2008/01/27 21:47:41 > > > > The linker lock here is private to code in this file. It is > > never a problem with it being locked when any other combination > > of locks are already obtained or even if *no* other locks are > > obtained. Use SX_NOWITNESS to avoid bogus LOR reports. > > If witness reports a LOR it is real, it may just not be obvious. Here is some code that demonstrates the problem: static struct mtx test_mtx; MTX_SYSINIT(test, &test_mtx, "Test", MTX_DEF); static int test_list(linker_file_t lf, void *arg) { printf("Linker file name: '%s'\n", lf->filename); return (0); } static void test_thread_func(void *arg) { printf("\n\nI'm a big bad thread, but I'm going to wait a bit... stay tuned...\n"); pause("Waiting a bit...", 5000); printf("The big bad thread is awake and he wants to list the linker files...\n"); linker_file_foreach(test_list, NULL); printf("Lock my wide scope mutex because I have stuff to protect...\n"); mtx_lock(&test_mtx); printf("I've done some stuff that my wide scope lock protected, but now I need to list some linker files...\n"); linker_file_foreach(test_list, NULL); printf("Unlock my wide scope mutex because I done what I needed to do...\n"); mtx_unlock(&test_mtx); printf("I'm done now.\n"); printf("====================\n"); kthread_exit(); } static int test_modevent(module_t mod __unused, int type, void *data __unused) { int error = 0; switch (type) { case MOD_LOAD: printf("--------------------\n"); printf("I am loaded! I can now list the linker files without grabbing any locks...\n"); linker_file_foreach(test_list, NULL); printf("OK, I'm done listing the linker files.\n"); printf("Now I'll create a thread to do some stuff after I've gone.\n"); kthread_add(test_thread_func, NULL, NULL, NULL, 0, 0, "testme"); printf("OK, the thread is created. I'm out of here.\n"); printf("--------------------\n"); break; case MOD_UNLOAD: printf("I am unloading!\n"); break; case MOD_SHUTDOWN: break; default: error = EOPNOTSUPP; break; } return (error); } DEV_MODULE(test, test_modevent, NULL); MODULE_VERSION(test, 1); From owner-p4-projects@FreeBSD.ORG Wed Jan 30 21:30:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B29CF16A469; Wed, 30 Jan 2008 21:30:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76B1416A41B for ; Wed, 30 Jan 2008 21:30:28 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6CC2813C457 for ; Wed, 30 Jan 2008 21:30:28 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ULUS96012422 for ; Wed, 30 Jan 2008 21:30:28 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ULUS79012419 for perforce@freebsd.org; Wed, 30 Jan 2008 21:30:28 GMT (envelope-from swise@FreeBSD.org) Date: Wed, 30 Jan 2008 21:30:28 GMT Message-Id: <200801302130.m0ULUS79012419@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 134485 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 21:30:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=134485 Change 134485 by swise@swise:vic10:iwarp on 2008/01/30 21:29:42 Set sockaddr lengths Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#8 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#8 (text+ko) ==== @@ -58,7 +58,7 @@ #define PFX "krping: " -static int debug = 0; +static int debug = 1; #define DEBUG_LOG if (debug) printf MODULE_AUTHOR("Steve Wise"); @@ -819,6 +819,7 @@ int ret; memset(&sin, 0, sizeof(sin)); + sin.sin_len = sizeof sin; sin.sin_family = AF_INET; sin.sin_addr.s_addr = cb->addr.s_addr; sin.sin_port = cb->port; @@ -995,6 +996,7 @@ int ret; memset(&sin, 0, sizeof(sin)); + sin.sin_len = sizeof sin; sin.sin_family = AF_INET; sin.sin_addr.s_addr = cb->addr.s_addr; sin.sin_port = cb->port; From owner-p4-projects@FreeBSD.ORG Wed Jan 30 21:30:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C17016A514; Wed, 30 Jan 2008 21:30:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9ECD116A421 for ; Wed, 30 Jan 2008 21:30:28 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 949C013C458 for ; Wed, 30 Jan 2008 21:30:28 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ULUS5L012428 for ; Wed, 30 Jan 2008 21:30:28 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ULUSHi012425 for perforce@freebsd.org; Wed, 30 Jan 2008 21:30:28 GMT (envelope-from swise@FreeBSD.org) Date: Wed, 30 Jan 2008 21:30:28 GMT Message-Id: <200801302130.m0ULUSHi012425@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 134486 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 21:30:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=134486 Change 134486 by swise@swise:vic10:iwarp on 2008/01/30 21:29:58 Fixed locking issues on new connection handling. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#13 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#13 (text+ko) ==== @@ -996,7 +996,7 @@ break; case DEAD: PDBG("%s so_error %d IN DEAD STATE!!!!\n", __FUNCTION__, - so->so_error); + ep->com.so->so_error); return; default: BUG_ON(1); @@ -1341,20 +1341,26 @@ ep->backlog = backlog; ep->com.local_addr = cm_id->local_addr; ep->com.thread = curthread; + state_set(&ep->com, LISTEN); err = create_sock(&ep->com); if (err) goto fail1; - err = sobind(ep->com.so, (struct sockaddr *)&ep->com.local_addr, ep->com.thread); - if (err) - goto fail1; + err = sobind(ep->com.so, (struct sockaddr *)&ep->com.local_addr, + ep->com.thread); + if (err) { + printf("sobind failed with errno %d\n", err); + goto fail2; + } - state_set(&ep->com, LISTEN); err = solisten(ep->com.so, ep->backlog, ep->com.thread); if (!err) goto out; +fail2: + close_socket(&ep->com); fail1: + cm_id->rem_ref(cm_id); put_ep(&ep->com); out: return err; @@ -1431,7 +1437,7 @@ static void process_data(struct iwch_ep *ep) { - PDBG("%s ep %p dlen %u\n", __FUNCTION__, ep, dlen); + PDBG("%s ep %p\n", __FUNCTION__, ep); switch (state_read(&ep->com)) { case MPA_REQ_SENT: @@ -1476,16 +1482,12 @@ } TAILQ_REMOVE(&head->so_comp, so, so_list); head->so_qlen--; + SOCK_LOCK(so); so->so_qstate &= ~SQ_COMP; so->so_head = NULL; - SOCK_LOCK(so); soref(so); - SOCKBUF_LOCK(&so->so_rcv); so->so_rcv.sb_flags |= SB_UPCALL; - SOCKBUF_UNLOCK(&so->so_rcv); - SOCKBUF_LOCK(&so->so_snd); so->so_snd.sb_flags |= SB_UPCALL; - SOCKBUF_UNLOCK(&so->so_snd); so->so_state |= SS_NBIO; BUG_ON(!(so->so_state & SS_ISCONNECTED)); BUG_ON(so->so_error); From owner-p4-projects@FreeBSD.ORG Wed Jan 30 21:51:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFB7316A46B; Wed, 30 Jan 2008 21:51:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 954E516A468 for ; Wed, 30 Jan 2008 21:51:51 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A9EE13C461 for ; Wed, 30 Jan 2008 21:51:51 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ULpp5C013258 for ; Wed, 30 Jan 2008 21:51:51 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ULppv9013255 for perforce@freebsd.org; Wed, 30 Jan 2008 21:51:51 GMT (envelope-from csjp@freebsd.org) Date: Wed, 30 Jan 2008 21:51:51 GMT Message-Id: <200801302151.m0ULppv9013255@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134487 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 21:51:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=134487 Change 134487 by csjp@csjp_xor on 2008/01/30 21:51:29 Check to see if this pcap instance was using the zerocopy buffer mode. If it was, delete the mappings. Note that p->buffer gets initialized to one of the mmaped regions in this case, so do not try and free it directly. Affected files ... .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap.c#3 edit Differences ... ==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap.c#3 (text+ko) ==== @@ -44,6 +44,7 @@ #include #else /* WIN32 */ #include +#include #endif /* WIN32 */ #include @@ -738,6 +739,24 @@ void pcap_close_common(pcap_t *p) { +#ifdef BIOCSETBUFMODE + /* + * Check to see if this pcap instance was using the zerocopy buffer + * mode. If it was, delete the mappings. Note that p->buffer + * gets initialized to one of the mmaped regions in this case, so + * do not try and free it directly. + * + * If the regular buffer mode was selected, then it is safe to free + * this memory. + */ + if (p->zerocopy) { + if (p->zbuf1 != MAP_FAILED && p->zbuf1 != NULL) + munmap(p->zbuf1, p->zbufsize); + if (p->zbuf2 != MAP_FAILED && p->zbuf2 != NULL) + munmap(p->zbuf2, p->zbufsize); + p->buffer = NULL; + } else +#endif if (p->buffer != NULL) free(p->buffer); #if !defined(WIN32) && !defined(MSDOS) From owner-p4-projects@FreeBSD.ORG Wed Jan 30 21:52:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E6D616A4D4; Wed, 30 Jan 2008 21:52:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C1B3516A4D0 for ; Wed, 30 Jan 2008 21:52:52 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B723E13C45A for ; Wed, 30 Jan 2008 21:52:52 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ULqqcq013304 for ; Wed, 30 Jan 2008 21:52:52 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ULqqms013301 for perforce@freebsd.org; Wed, 30 Jan 2008 21:52:52 GMT (envelope-from csjp@freebsd.org) Date: Wed, 30 Jan 2008 21:52:52 GMT Message-Id: <200801302152.m0ULqqms013301@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134488 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 21:52:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=134488 Change 134488 by csjp@csjp_xor on 2008/01/30 21:52:12 Make sure the we delete the regions for the correct buffer. Affected files ... .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#20 edit Differences ... ==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#20 (text+ko) ==== @@ -1255,8 +1255,8 @@ if (p->zerocopy) { if (p->zbuf1 != MAP_FAILED && p->zbuf1 != NULL) munmap(p->zbuf1, p->zbufsize); - if (p->zbuf2 != MAP_FAILED && p->zbuf1 != NULL) - munmap(p->zbuf1, p->zbufsize); + if (p->zbuf2 != MAP_FAILED && p->zbuf2 != NULL) + munmap(p->zbuf2, p->zbufsize); } else #endif if (p->buffer != NULL) From owner-p4-projects@FreeBSD.ORG Wed Jan 30 22:18:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F93B16A468; Wed, 30 Jan 2008 22:18:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBA2A16A417; Wed, 30 Jan 2008 22:18:36 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from smtpoutm.mac.com (smtpoutm.mac.com [17.148.16.69]) by mx1.freebsd.org (Postfix) with ESMTP id B51AF13C46A; Wed, 30 Jan 2008 22:18:36 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from mac.com (asmtp009-s [10.150.69.72]) by smtpoutm.mac.com (Xserve/smtpout006/MantshX 4.0) with ESMTP id m0UMIRA1005786; Wed, 30 Jan 2008 14:18:27 -0800 (PST) Received: from mini-g4.jnpr.net (natint3.juniper.net [66.129.224.36]) (authenticated bits=0) by mac.com (Xserve/asmtp009/MantshX 4.0) with ESMTP id m0UMIOZ1018733 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Wed, 30 Jan 2008 14:18:25 -0800 (PST) Message-Id: From: Marcel Moolenaar To: Rafal Jaworowski In-Reply-To: <47A0BE7A.1030307@semihalf.com> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v915) Date: Wed, 30 Jan 2008 14:18:23 -0800 References: <200801230414.m0N4E4ng009323@repoman.freebsd.org> <4797C8E0.4070100@freebsd.org> <4798C436.6090904@gmail.com> <20080125.100006.-262784007.imp@bsdimp.com> <479A17AC.4070004@freebsd.org> <479A26CE.6020104@semihalf.com> <47A0BE7A.1030307@semihalf.com> X-Mailer: Apple Mail (2.915) Cc: yanegomi@gmail.com, perforce@FreeBSD.org, marcel@FreeBSD.org, "M. Warner Losh" , grehan@FreeBSD.org Subject: Re: PERFORCE change 133911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 22:18:37 -0000 On Jan 30, 2008, at 10:14 AM, Rafal Jaworowski wrote: >>> IIRC, almost any AIM binary I tried executing caused FP exceptions >>> (actually, >>> an illegal instrusction ;) on e500, even such that wouldn't be >>> expected tu use >>> FPU. I didn't investigate this at all, but maybe the compiler was >>> using FPRs >>> for optimizations or something of that sort, don't know, so the >>> frequency >>> might not be that low in reality. >> >> We didn't see this at all. We typically only saw ntpdate >> and top crap out, because they actually use FP. Most of >> the binaries were fine without -softfloat. >> >> Note also that a stray FP status register initialization >> operation in crtX can cause all processes to fail, even >> if there's no FP in the process. Your problem may have >> been caused by libc, crt or libgcc. In fact, we may have >> seen it ourselves as well and fixed that place to get to >> where we ended up without softfloat (i.e. only ntpdate, >> top, etc capping out). > > Hm, yes, this could be it. Do you happen to recall the proximity of > those > fixes/changes you have applied back then? It's nothing serious, I'm > just > curious, maybe I'd give this another spin in free time (he, he). I think it was libc. We eliminated fp{g|s}etmask and friends from libc if I'm not mistaken. > I also had a closer look at your import and it seems to me some > further work > is required: I know. I just imported it as-is. I need to glue it into the FreeBSD sources. -- Marcel Moolenaar xcllnt@mac.com From owner-p4-projects@FreeBSD.ORG Wed Jan 30 22:34:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39BF616A469; Wed, 30 Jan 2008 22:34:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A832B16A418 for ; Wed, 30 Jan 2008 22:34:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9D5DB13C467 for ; Wed, 30 Jan 2008 22:34:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UMYGqS017178 for ; Wed, 30 Jan 2008 22:34:16 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UMYG7Y017161 for perforce@freebsd.org; Wed, 30 Jan 2008 22:34:16 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 22:34:16 GMT Message-Id: <200801302234.m0UMYG7Y017161@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134489 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 22:34:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=134489 Change 134489 by jb@jb_freebsd1 on 2008/01/30 22:34:16 IFdtrace. Affected files ... .. //depot/projects/dtrace7/src/sys/kern/subr_smp.c#2 edit .. //depot/projects/dtrace7/src/sys/sys/smp.h#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/kern/subr_smp.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.201 2007/09/11 22:54:09 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.203 2008/01/02 17:09:15 jhb Exp $"); #include #include @@ -74,6 +74,9 @@ SYSCTL_NODE(_kern, OID_AUTO, smp, CTLFLAG_RD, NULL, "Kernel SMP"); +SYSCTL_INT(_kern_smp, OID_AUTO, maxid, CTLFLAG_RD, &mp_maxid, 0, + "Max CPU ID."); + SYSCTL_INT(_kern_smp, OID_AUTO, maxcpus, CTLFLAG_RD, &mp_maxcpus, 0, "Max number of CPUs that the system was compiled for."); @@ -104,10 +107,11 @@ "Forwarding of roundrobin to all other CPUs"); /* Variables needed for SMP rendezvous. */ -static void (*smp_rv_setup_func)(void *arg); -static void (*smp_rv_action_func)(void *arg); -static void (*smp_rv_teardown_func)(void *arg); -static void *smp_rv_func_arg; +static volatile cpumask_t smp_rv_cpumask; +static void (*volatile smp_rv_setup_func)(void *arg); +static void (*volatile smp_rv_action_func)(void *arg); +static void (*volatile smp_rv_teardown_func)(void *arg); +static void * volatile smp_rv_func_arg; static volatile int smp_rv_waiters[3]; /* @@ -286,6 +290,14 @@ return 1; } +void +smp_no_rendevous_barrier(void *dummy) +{ +#ifdef SMP + KASSERT((!smp_started),("smp_no_rendevous called and smp is started")); +#endif +} + /* * All-CPU rendezvous. CPUs are signalled, all execute the setup function * (if specified), rendezvous, execute the action function (if specified), @@ -298,41 +310,57 @@ void smp_rendezvous_action(void) { + cpumask_t map = smp_rv_cpumask; + int i, ncpus = 0; + void* local_func_arg = smp_rv_func_arg; + void (*local_setup_func)(void*) = smp_rv_setup_func; + void (*local_action_func)(void*) = smp_rv_action_func; + void (*local_teardown_func)(void*) = smp_rv_teardown_func; + for (i = 0; i < MAXCPU; i++) + if (((1 << i) & map) != 0 && pcpu_find(i) != NULL) + ncpus++; + /* Ensure we have up-to-date values. */ atomic_add_acq_int(&smp_rv_waiters[0], 1); - while (smp_rv_waiters[0] < mp_ncpus) + while (smp_rv_waiters[0] < ncpus) cpu_spinwait(); /* setup function */ - if (smp_rv_setup_func != NULL) - smp_rv_setup_func(smp_rv_func_arg); + if (local_setup_func != smp_no_rendevous_barrier) { + if (smp_rv_setup_func != NULL) + smp_rv_setup_func(smp_rv_func_arg); - /* spin on entry rendezvous */ - atomic_add_int(&smp_rv_waiters[1], 1); - while (smp_rv_waiters[1] < mp_ncpus) - cpu_spinwait(); + /* spin on entry rendezvous */ + atomic_add_int(&smp_rv_waiters[1], 1); + while (smp_rv_waiters[1] < ncpus) + cpu_spinwait(); + } /* action function */ - if (smp_rv_action_func != NULL) - smp_rv_action_func(smp_rv_func_arg); + if (local_action_func != NULL) + local_action_func(local_func_arg); /* spin on exit rendezvous */ atomic_add_int(&smp_rv_waiters[2], 1); - while (smp_rv_waiters[2] < mp_ncpus) + if (local_teardown_func == smp_no_rendevous_barrier) + return; + while (smp_rv_waiters[2] < ncpus) cpu_spinwait(); /* teardown function */ - if (smp_rv_teardown_func != NULL) - smp_rv_teardown_func(smp_rv_func_arg); + if (local_teardown_func != NULL) + local_teardown_func(local_func_arg); } void -smp_rendezvous(void (* setup_func)(void *), - void (* action_func)(void *), - void (* teardown_func)(void *), - void *arg) +smp_rendezvous_cpus(cpumask_t map, + void (* setup_func)(void *), + void (* action_func)(void *), + void (* teardown_func)(void *), + void *arg) { + int i, ncpus = 0; if (!smp_started) { if (setup_func != NULL) @@ -343,11 +371,16 @@ teardown_func(arg); return; } + + for (i = 0; i < MAXCPU; i++) + if (((1 << i) & map) != 0 && pcpu_find(i) != NULL) + ncpus++; /* obtain rendezvous lock */ mtx_lock_spin(&smp_ipi_mtx); /* set static function pointers */ + smp_rv_cpumask = map & ~(1 << curcpu); smp_rv_setup_func = setup_func; smp_rv_action_func = action_func; smp_rv_teardown_func = teardown_func; @@ -357,14 +390,29 @@ atomic_store_rel_int(&smp_rv_waiters[0], 0); /* signal other processors, which will enter the IPI with interrupts off */ - ipi_all_but_self(IPI_RENDEZVOUS); + ipi_selected(map, IPI_RENDEZVOUS); + + /* Check if the current CPU is in the map */ + if ((map & (1 << curcpu)) != 0) + /* call executor function for the current CPU */ + smp_rendezvous_action(); - /* call executor function */ - smp_rendezvous_action(); + if (teardown_func == smp_no_rendevous_barrier) + while (atomic_load_acq_int(&smp_rv_waiters[2]) < ncpus) + cpu_spinwait(); /* release lock */ mtx_unlock_spin(&smp_ipi_mtx); } + +void +smp_rendezvous(void (* setup_func)(void *), + void (* action_func)(void *), + void (* teardown_func)(void *), + void *arg) +{ + smp_rendezvous_cpus(all_cpus, setup_func, action_func, teardown_func, arg); +} #else /* !SMP */ /* @@ -383,9 +431,24 @@ mp_setvariables_for_up, NULL) void -smp_rendezvous(void (* setup_func)(void *), - void (* action_func)(void *), - void (* teardown_func)(void *), +smp_rendezvous_cpus(cpumask_t map, + void (*setup_func)(void *), + void (*action_func)(void *), + void (*teardown_func)(void *), + void *arg) +{ + if (setup_func != NULL) + setup_func(arg); + if (action_func != NULL) + action_func(arg); + if (teardown_func != NULL) + teardown_func(arg); +} + +void +smp_rendezvous(void (*setup_func)(void *), + void (*action_func)(void *), + void (*teardown_func)(void *), void *arg) { ==== //depot/projects/dtrace7/src/sys/sys/smp.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/sys/smp.h,v 1.85 2005/10/24 21:04:19 jhb Exp $ + * $FreeBSD: src/sys/sys/smp.h,v 1.86 2007/11/08 14:47:55 ups Exp $ */ #ifndef _SYS_SMP_H_ @@ -100,6 +100,7 @@ int restart_cpus(cpumask_t); int stop_cpus(cpumask_t); void smp_rendezvous_action(void); +void smp_no_rendevous_barrier(void *); extern struct mtx smp_ipi_mtx; #endif /* SMP */ @@ -107,6 +108,11 @@ void (*)(void *), void (*)(void *), void *arg); +void smp_rendezvous_cpus(cpumask_t, + void (*)(void *), + void (*)(void *), + void (*)(void *), + void *arg); #endif /* !LOCORE */ #endif /* _KERNEL */ #endif /* _SYS_SMP_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jan 30 22:40:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 493FD16A420; Wed, 30 Jan 2008 22:40:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D2B016A417 for ; Wed, 30 Jan 2008 22:40:24 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0208C13C468 for ; Wed, 30 Jan 2008 22:40:24 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UMeN5F017467 for ; Wed, 30 Jan 2008 22:40:23 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UMeN76017464 for perforce@freebsd.org; Wed, 30 Jan 2008 22:40:23 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 30 Jan 2008 22:40:23 GMT Message-Id: <200801302240.m0UMeN76017464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 134491 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 22:40:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=134491 Change 134491 by pgj@disznohal on 2008/01/30 22:39:35 Add initial Hungarian translation of Chapter 14: Security. Affected files ... .. //depot/projects/docproj_hu/books/handbook/security/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/security/chapter.sgml#4 (text+ko) ==== @@ -4,962 +4,1525 @@ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.316 2007/10/23 07:03:34 dougb Exp $ --> - + + + Matthew Dillon - Much of this chapter has been taken from the - security(7) manual page by + A fejezet legnagyobb részét a security(7) + man oldal alapján írta: - Security - security + Biztonság + biztonság - Synopsis + Áttekintés - This chapter will provide a basic introduction to system security - concepts, some general good rules of thumb, and some advanced topics - under &os;. A lot of the topics covered here can be applied - to system and Internet security in general as well. The Internet - is no longer a friendly place in which everyone - wants to be your kind neighbor. Securing your system is imperative - to protect your data, intellectual property, time, and much more - from the hands of hackers and the like. + Ez a fejezet egy alapvetõ bevezetést ad a + rendszerek biztonsági fogalmaiba, néhány + általános jótanácsot és + néhány komolyabb témát &os; alatt. Az + itt megfogalmazott témák nagy része + egyaránt ráhúzható rendszerünk + és általánosságban véve az + internetes biztonságra is. A internet már nem az + békés hely, ahol mindenki a kedves + szomszéd szerepét játssza. A + rendszerünk bebiztosítása elkerülhetetlen + az adataink, szellemi tulajdonunk, idõnk és még + sok minden más megvédésére az + internetes banditák és hasonlók ellen. - &os; provides an array of utilities and mechanisms to ensure - the integrity and security of your system and network. + A &os; segédprogramok és mechanizmusok + sorát kínálja fel a rendszerünk és + hálózatunk sértetlenségének + és biztonságának + fenntartására. - After reading this chapter, you will know: + A fejezet elolvasása során + megismerjük: - Basic system security concepts, in respect to &os;. + az alapvetõ rendszerbiztonsági fogalmakat, + különös tekintettel a &os;-re - About the various crypt mechanisms available in &os;, - such as DES and MD5. + milyen olyan különbözõ + titkosítási mechanizmusok érthetõek el + a &os;-ben, mint például a + DES és az + MD5 - How to set up one-time password authentication. + hogyan állítsunk be egyszeri jelszavas + azonosítást - How to configure TCP Wrappers for use - with inetd. + hogyan burkoljunk az inetd + segítségével TCP + kapcsolatokat - How to set up KerberosIV on &os; - releases prior to 5.0. + hogyan állítsuk be a + KerberosIV-t a &os; 5.0-nál + korábbi változatain - How to set up Kerberos5 on - &os;. + hogyan állítsuk be a + Kerberos5-t a &os;-n - How to configure IPsec and create a VPN between - &os;/&windows; machines. + hogyan állítsuk be az IPsec-et és + hozzunk létre VPN-t &os;/&windows; + gépek között - + - How to configure and use OpenSSH, &os;'s SSH - implementation. + hogyan állítsuk be és + használjuk az OpenSSH-t, a + &os; SSH + implementációját - What file system ACLs are and how to use them. + mik azok az ACL-ek az + állományrendszerben és miként kell + õket használni - How to use the Portaudit - utility to audit third party software packages installed - from the Ports Collection. + hogyan kell használni a + Portaudit segédprogramot a + Portgyûjteménybõl telepített + külsõs szoftvercsomagok + biztonságosságának + ellenõrzésére - How to utilize the &os; security advisories - publications. + hogyan hasznosítsuk a &os; biztonsági + tanácsait tartalmazó + leírásokat - Have an idea of what Process Accounting is and how to - enable it on &os;. + mit jelent a futó programok + nyilvántartása és hogyan + engedélyezzük azt &os;-n - Before reading this chapter, you should: + A fejezet elolvasásához ajánlott: - Understand basic &os; and Internet concepts. + az alapvetõ &os; és internetes fogalmak + ismerete - Additional security topics are covered throughout this book. - For example, Mandatory Access Control is discussed in and Internet Firewalls are discussed in . + A könyvben további biztonsági + témákról is szó esik, + például a ben a + Kötelezõ + hozzáférésvezérlésrõl + (MAC) és a ben pedig az + internetes tûzfalakról. + - Introduction + Bevezetés - Security is a function that begins and ends with the system - administrator. While all BSD &unix; multi-user systems have some - inherent security, the job of building and maintaining additional - security mechanisms to keep those users honest is - probably one of the single largest undertakings of the sysadmin. - Machines are only as secure as you make them, and security concerns - are ever competing with the human necessity for convenience. &unix; - systems, in general, are capable of running a huge number of - simultaneous processes and many of these processes operate as - servers — meaning that external entities can connect and talk - to them. As yesterday's mini-computers and mainframes become - today's desktops, and as computers become networked and - inter-networked, security becomes an even bigger issue. + A biztonság egy olyan funkció, ami a + rendszergazdától indul és nála is + végzõdik. Míg az összes + többfelhasználós BSD &unix; rendszer + önmagában is valamennyire biztonságos, a + felhasználók + fegyelmezéséhez szükség + további biztonsági mechanizmusok + kiépítése és karbantartása + minden bizonnyal egy rendszergazda egyik legnagyobb + kötelessége. A + számítógépek csak annyira + biztonságosak, mint amennyire beállítjuk + õket, és a biztonsági megfontolások + állandó versenyben vannak az emberi + kényelemmel. A &unix; rendszerek + általánosságban véve + órási mennyiségû program + párhuzamos futtatására képesek, melyek + többsége kiszolgálóként fut + — ami azt jelenti, hogy hozzájuk + kívülrõl érkezõ egyedek + csatlakozhatnak és társaloghatnak velük. Ahogy + a tegnap kicsi és nagy + számítógépei napjaink asztali + gépeivé váltak és ahogy a + számítógépek egyre többen + csatlakoznak hálózatra és internetre, a + biztonság fontossága is egyre jobban + növekszik. - System security also pertains to dealing with various forms of - attack, including attacks that attempt to crash, or otherwise make a - system unusable, but do not attempt to compromise the - root account (break root). - Security concerns - can be split up into several categories: + A rendszerek biztonsága a támadások + különbözõ formáival is foglalkozik, + többek közt olyan támadásokkal, amelyek a + rendszer összeomlását vagy + használhatatlanságát célozzák + meg, de nem próbálják meg veszélybe + sodorni a root felhasználó + hozzáférését (feltörni a + gépet). A biztonsággal kapcsolatos + problémák több kategóriára + oszthatóak: - Denial of service attacks. + A szolgáltatások + mûködésképtelenné + tételére irányuló (DoS) + támadások. - User account compromises. + A felhasználók + hozzáférésének + veszélyeztetése. - Root compromise through accessible servers. + Rendszergazdai jogok megszerzése a közeli + szervereken keresztül. - Root compromise via user accounts. + Rendszergazdai jogok megszerzése a + felhasználói hozzáféréseken + keresztül. - Backdoor creation. + Kiskapuk létrehozása a rendszerben. - DoS attacks + DoS támadás Denial of Service (DoS) - security - DoS attacks + biztonság + DoS támadás Denial of Service (DoS) Denial of Service (DoS) - A denial of service attack is an action that deprives the - machine of needed resources. Typically, DoS attacks are - brute-force mechanisms that attempt to crash or otherwise make a - machine unusable by overwhelming its servers or network stack. Some - DoS attacks try to take advantage of bugs in the networking - stack to crash a machine with a single packet. The latter can only - be fixed by applying a bug fix to the kernel. Attacks on servers - can often be fixed by properly specifying options to limit the load - the servers incur on the system under adverse conditions. - Brute-force network attacks are harder to deal with. A - spoofed-packet attack, for example, is nearly impossible to stop, - short of cutting your system off from the Internet. It may not be - able to take your machine down, but it can saturate your - Internet connection. + A szolgáltatások + mûködésképtelenné + tételére irányuló + támadások olyan tevékenységre utalnak, + amelyek képesek megfosztani egy + számítógépet az + erõforrásaitól. A DoS támadások + többnyire nyers erõvel kivitelezett technikák, + melyek vagy a rendszer összeomlasztását vagy + pedig a használhatatlanná tételét + veszik célba úgy, hogy túlterhelik az + általa felkínált + szolgáltatásokat vagy a hálózati + alrendszert. Egyes DoS támadások a + hálózati alrendszerben rejtõzõ + hibákat igyekeznek kihasználni, amivel akár + egyetlen csomaggal is képesek romba dönteni egy + számítógépet. Ez utóbbit csak + úgy lehet orvosolni, ha a hibát kijavítjuk a + rendszermagban. A szerverekre mért csapásokat + gyakran ki lehet védeni a paramétereik ügyes + beállításával, melyek + segítségével korlátozni tudjuk az + õket ért terhelést egy kellemetlenebb + helyezetben. A nyers erõt alkalmazó + hálózati támadásokkal a legnehezebb + szembenézni. Például az + álcázott támadadások, melyeket szinte + lehetetlen megállítani, remek eszközei + gépünk elvágásának az + internettõl. Ezzel nem csak a gépünket + iktatják ki, hanem az internet csatlakozásunkat is + eldugítják. - security - account compromises + biztonság + a hozzáférések + megszerzése - A user account compromise is even more common than a DoS - attack. Many sysadmins still run standard - telnetd, rlogind, - rshd, - and ftpd servers on their machines. - These servers, by default, do - not operate over encrypted connections. The result is that if you - have any moderate-sized user base, one or more of your users logging - into your system from a remote location (which is the most common - and convenient way to login to a system) will have his or her - password sniffed. The attentive system admin will analyze his - remote access logs looking for suspicious source addresses even for - successful logins. + A DoS támadásoknál még gyakrabban + elõfordulnak a felhasználói + hozzáférések feltörései. A + rendszergazdák többsége még mindig + futtat telnetd, + rlogin, rshd + és ftpd szervereket a + gépén. Ezek a szerverek + alapértelmezés szerint nem titkosított + kapcsolaton keresztül mûködnek. Ebbõl + következik, hogy ha nincsen annyira sok + felhasználónk és közülük + néhányan távoli helyekrõl jelentkeznek + be (ami az egyik leggyakoribb és legkényelmesebb + módja a bejelentkezésnek), akkor elõfordulhat, + hogy valami megneszeli a jelszavaikat. A + körültekintõ rendszergazdák mindig + ellenõrzik a bejelentkezéseket tartalmazó + naplókat és igyekeznek kiszûrni a gyanús + címeket még abban az esetben is, amikor a + bejelentkezés sikeres volt. - One must always assume that once an attacker has access to a - user account, the attacker can break root. - However, the reality is that in a well secured and maintained system, - access to a user account does not necessarily give the attacker - access to root. The distinction is important - because without access to root the attacker - cannot generally hide his tracks and may, at best, be able to do - nothing more than mess with the user's files, or crash the machine. - User account compromises are very common because users tend not to - take the precautions that sysadmins take. + Mindig arra kell gondolni, hogy ha a támadónak + sikerült megszerezni az egyik felhasználó + hozzáférését, akkor akár + képes lehet a root + felhasználó fiókjának + feltörésére is. Azonban a + valóságban egy jól õrzött és + karbantarott rendszer esetén a felhasználói + hozzáférések megszerzése nem + feltétlenül adja a támadó kezére + a root + hozzáférését. Ebben fontos + különbséget tenni, hiszen a + root felhasználó jogai + nélkül a támadó nem képes + elrejteni a nyomait és legjobb esetben sem tud többet + tenni, mint tönkretenni az adott felhasználó + állományait vagy összeomlasztani a rendszert. + A felhasználói hozzáférések + feltörése nagyon gyakran megtörténik, + mivel a felhasználók messze nem annyira + elõvigyázatosak, mint egy rendszergazda. - security - backdoors + biztonság + kiskapuk - System administrators must keep in mind that there are - potentially many ways to break root on a machine. - The attacker may know the root password, - the attacker may find a bug in a root-run server and be able - to break root over a network - connection to that server, or the attacker may know of a bug in - a suid-root program that allows the attacker to break - root once he has broken into a user's account. - If an attacker has found a way to break root - on a machine, the attacker may not have a need - to install a backdoor. Many of the root holes - found and closed to date involve a considerable amount of work - by the attacker to cleanup after himself, so most attackers install - backdoors. A backdoor provides the attacker with a way to easily - regain root access to the system, but it - also gives the smart system administrator a convenient way - to detect the intrusion. - Making it impossible for an attacker to install a backdoor may - actually be detrimental to your security, because it will not - close off the hole the attacker found to break in the first - place. + A rendszergazdáknak mindig észben kell tartani, + hogy egy számítógépen több + módon is meg lehet szerezni a root + felhasználó + hozzáférését. A támadó + megtudhatja a root jelszavát, + hibát fedezhet fel az egyik rendszergazdai + jogosultsággal futó szerverben és + képes feltörni a root + hozzáférést egy hálózati + kapcsolaton keresztül, vagy a támadó olyan + programban talál hibát, aminek + segítségével el tudja érni a + root fiókját egy + felhasználói hozzáférésen + keresztül. Miután a támadó + megtalálta a rendszergazdai jogok + megszerzésének módját, nem + feltétlenül kell kiskapukat elhelyeznie a rendszerbe. + Az eddig talált és lezárt rendszergazdai + jogokat eredményezõ biztonsági rések egy + része viszont akkora mennyiségû munkát + jelentenének a támadónak eltüntetni maga + után a nyomokat, hogy kiskapukat is telepítenek. + Egy ilyen kiskapu segítségével a + támadó ismét könnyedén + hozzájuthat a root + felhasználó + hozzáféréséhez a rendszerben, de ezen + keresztül egy okos rendszergazda képes a + behatolót leleplezni. A kiskapuk lerakásának + megakadályozása valójában káros + a biztonság szempontjából nézve, mert + ezzel nem szüntetjük meg azokat a lyukakat, amin + keresztül a támadó elõször + bejutott. + A támadások elleni védelmet mindig + több vonalban kell megvalósítani, melyeket + így oszthatunk fel: - Security remedies should always be implemented with a - multi-layered onion peel approach and can be - categorized as follows: - - Securing root and staff accounts. + A rendszergazda és a személyzet + hozzáférésének + védelme. - Securing root–run servers - and suid/sgid binaries. + A rendszergazdai jogokkal futó szerverek és + suid/sgid engedélyekkel rendelkezõ programok + védelme. - Securing user accounts. + A felhasználói + hozzáférések védelme. - Securing the password file. + A jelszavakat tároló állomány + védelme. - Securing the kernel core, raw devices, and - file systems. + A rendszermag belsejének, a nyers + eszközök és az állományrendszerek + védelme. - Quick detection of inappropriate changes made to the - system. + A rendszert ért szabálytalan + módosítások gyors + észlelése. - Paranoia. + Állandó paranoia. - The next section of this chapter will cover the above bullet - items in greater depth. + A fejezet most következõ szakaszában az + imént felsorolt elemeket fejtjük ki + mélyebben. + - Securing &os; + A &os; védelme - security - securing &os; + biztonság + a &os; védelme - Command vs. Protocol - Throughout this document, we will use - bold text to refer to an - application, and a monospaced font to refer - to specific commands. Protocols will use a normal font. This - typographical distinction is useful for instances such as ssh, - since it is - a protocol as well as command. + Parancs kontra protokoll + + A dokumentumban a + félkövéren fogjuk + szedni az alkalmazásokat, és + egyenszélességû + betûkkel pedig az adott parancsokra hivatkozunk. A + protokollokat nem különböztetjük meg. Ez a + tipográfiai elkülönítés hasznos + például az ssh egyes vonatkozásainak + esetén, mivel ez egyben egy protokoll és egy + parancs is. - The sections that follow will cover the methods of securing your - &os; system that were mentioned in the last section of this chapter. + A most következõ szakaszok a &os; + védelmének azon módszereit ismertetik, + amelyekrõl a fejezet elõzõ szakaszában + már írtunk. - Securing the <username>root</username> Account and - Staff Accounts + A rendszergazda és a személyzet + hozzáférésének védelme su - First off, do not bother securing staff accounts if you have - not secured the root account. - Most systems have a password assigned to the root - account. The first thing you do is assume - that the password is always compromised. - This does not mean that you should remove the password. The - password is almost always necessary for console access to the - machine. What it does mean is that you should not make it - possible to use the password outside of the console or possibly - even with the &man.su.1; command. For example, make sure that - your ptys are specified as being insecure in the - /etc/ttys file so that direct - root logins - via telnet or rlogin are - disallowed. If using other login services such as - sshd, make sure that direct - root logins are disabled there as well. - You can do this by editing - your /etc/ssh/sshd_config file, and making - sure that PermitRootLogin is set to - NO. Consider every access method — - services such as FTP often fall through the cracks. - Direct root logins should only be allowed - via the system console. + Elõször is: ne törjük magunkat a + személyzeti hozzáférések + biztonságossá tételével, ha + még a rendszergazda + hozzáférését sem tettük + eléggé biztonságossá. A + legtöbb rendszerben a root + hozzáféréshez tartozik egy jelszó. + Elsõként fel kell tennünk, hogy ez a + jelszó mindig megszerezhetõ. + Ez természetesen nem arra utal, hogy el kellene + távolítanunk. A jelszó szinte mindig + szükséges a számítógép + konzolon keresztüli eléréséhez. + Valójában arra akar + rávilágítani, hogy a konzolon + kívül sehol máshol ne lehessen + használni ezt a jelszót, még a &man.su.1; + paranccsal sem. Például gondoskodjunk + róla, hogy az /etc/ttys + állományban megadott + pszeudóterminálokat insecure (nem + biztonságos) típusúnak + állítottuk be, és így a + telnet vagy rlogin + parancsokon keresztül nem lehet rendszergazdaként + bejelentkezni. Ha más szolgáltatáson + keresztül jelentkezünk be, például az + sshd + segítségével, akkor ebben az esetben is + gondoskodjunk róla, hogy itt is letiltottuk a + közvetlen rendszergazdai bejelentkezés + lehetõségét. Ezt úgy tudjuk megtenni, + ha megnyitjuk az /etc/ssh/sshd_config + állományt és a + PermitRootLogin paraméter + értékét átállítjuk + NO-ra. Vegyünk számba minden + lehetséges hozzáférési módot + — az FTP és a hozzá hasonló + módok gyakran átszivárognak a + repedéseken. A rendszergazdának csak a + rendszerkonzolon keresztül szabad tudnia + bejelentkeznie. + wheel - Of course, as a sysadmin you have to be able to get to - root, so we open up a few holes. - But we make sure these holes require additional password - verification to operate. One way to make root - accessible is to add appropriate staff accounts to the - wheel group (in - /etc/group). The staff members placed in the - wheel group are allowed to - su to root. - You should never give staff - members native wheel access by putting them in the - wheel group in their password entry. Staff - accounts should be placed in a staff group, and - then added to the wheel group via the - /etc/group file. Only those staff members - who actually need to have root access - should be placed in the - wheel group. It is also possible, when using - an authentication method such as Kerberos, to use Kerberos' - .k5login file in the root - account to allow a &man.ksu.1; to root - without having to place anyone at all in the - wheel group. This may be the better solution - since the wheel mechanism still allows an - intruder to break root if the intruder - has gotten hold of your - password file and can break into a staff account. While having - the wheel mechanism is better than having - nothing at all, it is not necessarily the safest option. + Természetesen egy rendszergazdának valahogy el + kell érnie a root + hozzáférést, ezért ezzel felnyitunk + néhány biztonsági rést. De + gondoskodjunk róla, hogy ezek a rések + további jelszavakat igényelnek a + mûködésükhöz. A + root hozzáférés + eléréséhez érdemes felvenni + tetszõleges személyzeti (staff) + hozzáféréseket a + wheel csoportba (az + /etc/group állományban). Ha + a személyzet tagjait a wheel + csoportba rakjuk, akkor innen a su paranccsal + fel tudjuk venni a root + felhasználó jogait. A személyzet tagjait + közvetlenül sose vegyük fel a + wheel csoportba a + létrehozásukkor! A személyzet tagjai + elõször kerüljenek egy + staff csoportba, és majd csak + ezután az /etc/group + állományon keresztül a + wheel csoportba. A személyzetnek + csak azon tagjait tegyük ténylegesen a + wheel csoportba, akiknek valóban + szükségük van a root + felhasználó + hozzáférésére. Ha mondjuk a + Kerberost használjuk hitelesítésre, akkor + megcsinálhatjuk azt is, hogy a Kerberos + .k5login állományában + engedélyezzük a &man.ksu.1; parancson keresztül + a root hozzáférés + elérését a wheel + csoport alkalmazása nélkül. Ez a + megoldás talán még jobb is, mivel a + wheel használata esetén a + behatolónak még mindig lehetõsége van + hozzájutni a root + hozzáféréséhez olyankor, amikor a + kezében van a jelszavakat tároló + állomány és meg tudja szerezni a + személyzet valamelyik tagjának + hozzáférését. A + wheel csoport által + felkínált megoldás ugyan jobb, mint a + semmi, de kétségtelenül nem + legbiztonságosabb. - + A személyzeti hozzáférések + és ezáltal a root + hozzáférésének egyik közvetett + módja egy alternatív bejelentkezési + mód használata, ami lényegében a + személyzeti hozzáférések + titkosított jelszavainak + kicsillagozását jelenti. A + &man.vipw.8; parancs használatával a + titkosított jelszavakat ki tudjuk cserélni + egyetlen * karakterre. Ez a + parancs a jelszó alapú hitelesítések + letiltásához frissíteni fogja az + /etc/master.passwd állományt + valamint a felhasználókat és jelszavakat + tartalmazó adatbázist. - An indirect way to secure staff accounts, and ultimately - root access is to use an alternative - login access method and - do what is known as starring out the encrypted - password for the staff accounts. Using the &man.vipw.8; - command, one can replace each instance of an encrypted password - with a single * character. - This command will update the /etc/master.passwd - file and user/password database to disable password-authenticated - logins. + A személyzet egyik tagjának tehát + így néz ki a bejegyzése: - A staff account entry such as: - foobar:R9DT/Fa1/LV9U:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh - Should be changed to this: + Amit erre cserélünk ki: foobar:*:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh - This change will prevent normal logins from occurring, - since the encrypted password will never match - *. With this done, - staff members must use - another mechanism to authenticate themselves such as - &man.kerberos.1; or &man.ssh.1; using a public/private key - pair. When using something like Kerberos, one generally must - secure the machines which run the Kerberos servers and your - desktop workstation. When using a public/private key pair - with ssh, one must generally secure - the machine used to login from (typically - one's workstation). An additional layer of protection can be - added to the key pair by password protecting the key pair when - creating it with &man.ssh-keygen.1;. Being able to - star out the passwords for staff accounts also - guarantees that staff members can only login through secure - access methods that you have set up. This forces all staff - members to use secure, encrypted connections for all of their - sessions, which closes an important hole used by many - intruders: sniffing the network from an unrelated, - less secure machine. + Ez a változtatás meggátolja a + hagyományos bejelentkezéseket, mivel a + titkosított jelszó soha nem fog egyezni a + * karakterrel. Ezután + a személyzet tagjainak más módon kell + azonosítaniuk magukat, például a + &man.kerberos.1; segítségével vagy az + &man.ssh.1; nyilvános/privát + kulcspárjaival. Amikor egy Kerberoshoz hasonló + rendszert használunk, akkor általában a + Kerberos szervereit futtató gépeket és az + asztali munkaállomásunkat kell védeni. + Amikor az ssh-t használjuk nyilvános/privát + kulcspárokkal, általában azt a gépet + kell védenünk ahonnan + bejelentkezünk (ez többnyire egy + munkaállomás). A kulcspárokat bevonhatjuk + egy további védelmi réteggel is, ha a + &man.ssh-keygen.1; paranccsal történõ + létrehozásuk során jelszót is + megadunk. Ha kicsillagozzuk a személyzet + tagjainak jelszavait, akkor biztosra vehetjük, hogy + kizárólag csak az általunk + telepített biztonságos módokon fognak + bejelentkezni. Ennek köszönhetõen a + személyzet minden tagja biztonságos, + titkosított kapcsolatot fog használni, és + ezzel elzárunk egy olyan biztonsági rést, + amit a legtöbb behatoló kihasznál: a + gyengébb védelmû + számítógépek felõl + érkezõ forgalom lehallgatását. + + Egy még közvetettebb védelmi mechanizmus + szerint mindig egy szigorúbb biztonsági szintû + géprõl jelentkezünk be egy + kevésbé biztonságosabb gépre. + Például ha a szerverünk mindenféle + szolgáltatásokat futtat, akkor a + munkaállomásunknak egyetlen egyet sem lenne + szabad. A munkaállomásunk + biztonságossá tételéhez a + lehetõ legkevesebb szolgáltatást szabad csak + futtatnunk, de ha lehet, egyet sem, és mindig + jelszóval védett + képernyõvédõt használjuk. + Természetesen ha a támadó képes + fizikailag hozzáférni a + munkaállomásunkhoz, akkor szinte bármilyen + mélységû védelmet képes + áttörni. Ezt mindenképpen + számításba kell vennünk, azonban ne + felejtsük el, hogy a legtöbb betörési + kísérlet távolról, + hálózaton keresztülrõl érkezik + olyan emberektõl, akik fizikailag nem férnek + hozzá a munkaállomásunkhoz vagy a + szervereinkhez. - The more indirect security mechanisms also assume that you are - logging in from a more restrictive server to a less restrictive - server. For example, if your main box is running all sorts of - servers, your workstation should not be running any. In order for - your workstation to be reasonably secure you should run as few - servers as possible, up to and including no servers at all, and - you should run a password-protected screen blanker. Of course, - given physical access to a workstation an attacker can break any - sort of security you put on it. This is definitely a problem that - you should consider, but you should also consider the fact that the - vast majority of break-ins occur remotely, over a network, from - people who do not have physical access to your workstation or - servers. KerberosIV - Using something like Kerberos also gives you the ability to - disable or change the password for a staff account in one place, - and have it immediately affect all the machines on which the staff - member may have an account. If a staff member's account gets - compromised, the ability to instantly change his password on all - machines should not be underrated. With discrete passwords, - changing a password on N machines can be a mess. You can also - impose re-passwording restrictions with Kerberos: not only can a - Kerberos ticket be made to timeout after a while, but the Kerberos - system can require that the user choose a new password after a - certain period of time (say, once a month). + A Kerberos és a hozzá hasonló + rendszerek használatával egyszerre tudjuk a + személyzet tagjainak jelszavát letiltani vagy + megváltoztatni, ami egybõl + érvényessé válik minden olyan + gépen, ahová az adott felhasználónak + bármilyen hozzáférése is volt. Nem + szabad lebecsülnünk ezt a gyors + jelszóváltási lehetõséget abban + az esetben, ha a személyzet valamelyik tagjának + hozzáférését megszerezték. + Hagyományos jelszavak használatával a + jelszavak megváltoztatása N gépen igazi + káosz. A Kerberosban jelszóváltási + megszorításokat is felállíthatunk: + nem csak a Kerberos által adott jegyek járnak le + idõvel, hanem a Kerberos rendszer meg is követelheti a + felhasználóktól, hogy egy adott idõ + (mondjuk egy hónap) után változtasson + jelszót. - Securing Root-run Servers and SUID/SGID Binaries + A rendszergazdai jogokkal futó szerverek és + SUID/SGID engedélyekkel rendelkezõ programok + védelme - ntalk + ntalk - comsat + comsat - finger + finger - sandboxes + sandboxes - sshd + sshd - telnetd + telnetd - rshd + rshd - rlogind + rlogind - The prudent sysadmin only runs the servers he needs to, no - more, no less. Be aware that third party servers are often the - most bug-prone. For example, running an old version of - imapd or - popper is like giving a universal - root ticket out to the entire world. - Never run a server that you have not checked out carefully. - Many servers do not need to be run as root. - For example, the ntalk, - comsat, and - finger daemons can be run in special >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 30 22:51:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7FD316A46D; Wed, 30 Jan 2008 22:51:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 88DDC16A417 for ; Wed, 30 Jan 2008 22:51:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7C0F213C448 for ; Wed, 30 Jan 2008 22:51:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UMpL5c018097 for ; Wed, 30 Jan 2008 22:51:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UMooU1018088 for perforce@freebsd.org; Wed, 30 Jan 2008 22:50:50 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 30 Jan 2008 22:50:50 GMT Message-Id: <200801302250.m0UMooU1018088@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134497 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 22:51:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=134497 Change 134497 by kmacy@kmacy:entropy:iwarp on 2008/01/30 22:50:28 integrate toehead @134486 Affected files ... .. //depot/projects/iwarp/COPYRIGHT#2 integrate .. //depot/projects/iwarp/LOCKS#2 integrate .. //depot/projects/iwarp/MAINTAINERS#2 integrate .. //depot/projects/iwarp/Makefile.inc1#5 integrate .. //depot/projects/iwarp/ObsoleteFiles.inc#7 integrate .. //depot/projects/iwarp/UPDATING#5 integrate .. //depot/projects/iwarp/bin/cp/cp.c#2 integrate .. //depot/projects/iwarp/bin/mv/mv.c#3 integrate .. //depot/projects/iwarp/contrib/cvs/AUTHORS#2 integrate .. //depot/projects/iwarp/contrib/cvs/BUGS#2 integrate .. //depot/projects/iwarp/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/iwarp/contrib/cvs/FAQ#2 integrate .. //depot/projects/iwarp/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/projects/iwarp/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/iwarp/contrib/cvs/HACKING#2 integrate .. //depot/projects/iwarp/contrib/cvs/INSTALL#2 integrate .. //depot/projects/iwarp/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/NEWS#2 integrate .. //depot/projects/iwarp/contrib/cvs/README#2 integrate .. //depot/projects/iwarp/contrib/cvs/TESTS#2 integrate .. //depot/projects/iwarp/contrib/cvs/TODO#2 integrate .. //depot/projects/iwarp/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/iwarp/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/iwarp/contrib/cvs/config.h.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/configure#2 integrate .. //depot/projects/iwarp/contrib/cvs/configure.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/README#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/clmerge.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/cln_hist.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/iwarp/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/cvscheck.sh#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/debug_check_log.sh#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/descend.sh#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/log.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/mfpipe.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/pvcs2rcs.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/rcs-to-cvs.sh#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/rcslock.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/iwarp/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/iwarp/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/doc/cvs.1#2 integrate .. //depot/projects/iwarp/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/projects/iwarp/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/projects/iwarp/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/iwarp/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/iwarp/contrib/cvs/doc/mkman.in#2 delete .. //depot/projects/iwarp/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/iwarp/contrib/cvs/doc/stamp-1#2 integrate .. //depot/projects/iwarp/contrib/cvs/doc/stamp-vti#2 integrate .. //depot/projects/iwarp/contrib/cvs/doc/version-client.texi#2 integrate .. //depot/projects/iwarp/contrib/cvs/doc/version.texi#2 integrate .. //depot/projects/iwarp/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/iwarp/contrib/cvs/lib/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/lib/fncase.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/lib/getdate#1 branch .. //depot/projects/iwarp/contrib/cvs/lib/getpass.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/lib/regex.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/lib/system.h#2 integrate .. //depot/projects/iwarp/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/iwarp/contrib/cvs/lib/xtime.h#2 integrate .. //depot/projects/iwarp/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/iwarp/contrib/cvs/man/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/add.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/checkin.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/classify.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/client.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/client.h#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/create_adm.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/cvsrc.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/edit.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/entries.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/expand_path.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/fileattr.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/hardlink.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/hardlink.h#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/hash.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/hash.h#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/history.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/history.h#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/ignore.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/import.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/log.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/login.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/main.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/myndbm.h#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/no_diff.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/rcscmds.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/release.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/repos.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/root.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/root.h#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/run.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/server.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/server.h#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/stack.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/stack.h#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/status.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/subr.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/update.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/version.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/watch.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/wrapper.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/iwarp/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/projects/iwarp/contrib/cvs/tools/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/cvs/tools/README#2 integrate .. //depot/projects/iwarp/contrib/file/ChangeLog#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/acorn#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/animation#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/apple#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/archive#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/audio#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/blender#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/commands#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/console#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/database#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/efi#1 branch .. //depot/projects/iwarp/contrib/file/Magdir/elf#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/fortran#1 branch .. //depot/projects/iwarp/contrib/file/Magdir/java#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/iwarp/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/iwarp/contrib/file/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/file/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/file/acinclude.m4#2 integrate .. //depot/projects/iwarp/contrib/file/aclocal.m4#2 integrate .. //depot/projects/iwarp/contrib/file/apprentice.c#2 integrate .. //depot/projects/iwarp/contrib/file/ascmagic.c#2 integrate .. //depot/projects/iwarp/contrib/file/compress.c#2 integrate .. //depot/projects/iwarp/contrib/file/config.h.in#2 integrate .. //depot/projects/iwarp/contrib/file/configure#2 integrate .. //depot/projects/iwarp/contrib/file/configure.in#2 integrate .. //depot/projects/iwarp/contrib/file/file.c#2 integrate .. //depot/projects/iwarp/contrib/file/file.h#2 integrate .. //depot/projects/iwarp/contrib/file/file.man#2 integrate .. //depot/projects/iwarp/contrib/file/file_opts.h#1 branch .. //depot/projects/iwarp/contrib/file/fsmagic.c#2 integrate .. //depot/projects/iwarp/contrib/file/funcs.c#2 integrate .. //depot/projects/iwarp/contrib/file/install-sh#2 integrate .. //depot/projects/iwarp/contrib/file/is_tar.c#2 integrate .. //depot/projects/iwarp/contrib/file/libmagic.man#2 integrate .. //depot/projects/iwarp/contrib/file/magic.c#2 integrate .. //depot/projects/iwarp/contrib/file/magic.h#2 integrate .. //depot/projects/iwarp/contrib/file/magic.man#2 integrate .. //depot/projects/iwarp/contrib/file/magic.mime#2 integrate .. //depot/projects/iwarp/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/iwarp/contrib/file/names.h#2 integrate .. //depot/projects/iwarp/contrib/file/patchlevel.h#2 integrate .. //depot/projects/iwarp/contrib/file/print.c#2 integrate .. //depot/projects/iwarp/contrib/file/readelf.c#2 integrate .. //depot/projects/iwarp/contrib/file/readelf.h#2 integrate .. //depot/projects/iwarp/contrib/file/softmagic.c#2 integrate .. //depot/projects/iwarp/contrib/gdb/FREEBSD-diffs#1 branch .. //depot/projects/iwarp/contrib/libiberty/cp-demangle.c#1 branch .. //depot/projects/iwarp/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/iwarp/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/iwarp/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/iwarp/contrib/ncurses/NEWS#2 integrate .. //depot/projects/iwarp/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/iwarp/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/iwarp/contrib/ncurses/config.guess#2 integrate .. //depot/projects/iwarp/contrib/ncurses/config.sub#2 integrate .. //depot/projects/iwarp/contrib/ncurses/configure#2 integrate .. //depot/projects/iwarp/contrib/ncurses/configure.in#2 integrate .. //depot/projects/iwarp/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/iwarp/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/iwarp/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/iwarp/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/headers#2 integrate .. //depot/projects/iwarp/contrib/ncurses/form/modules#2 integrate .. //depot/projects/iwarp/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/iwarp/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/iwarp/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/iwarp/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/iwarp/contrib/ncurses/include/headers#2 integrate .. //depot/projects/iwarp/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/iwarp/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/iwarp/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/iwarp/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/iwarp/contrib/ncurses/install-sh#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_legacy.3x#1 branch .. //depot/projects/iwarp/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_opaque.3x#1 branch .. //depot/projects/iwarp/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/legacy_coding.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/term.5#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/term.7#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/terminfo.tail#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/iwarp/contrib/ncurses/menu/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/ncurses/menu/headers#2 integrate .. //depot/projects/iwarp/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/iwarp/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/iwarp/contrib/ncurses/misc/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/ncurses/misc/ncurses-config.in#2 integrate .. //depot/projects/iwarp/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/iwarp/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/iwarp/contrib/ncurses/mk-1st.awk#2 integrate .. //depot/projects/iwarp/contrib/ncurses/mk-hdr.awk#1 branch .. //depot/projects/iwarp/contrib/ncurses/mkdirs.sh#1 branch .. //depot/projects/iwarp/contrib/ncurses/mkinstalldirs#2 delete .. //depot/projects/iwarp/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/key_defined.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_color.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_delwin.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_slkinit.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/memmove.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/use_window.c#1 branch .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/modules#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/MKcaptab.sh#1 branch .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/MKcodes.awk#1 branch .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/access.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/db_iterator.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/entries.c#1 branch .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/use_screen.c#1 branch .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/trace/trace_tries.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tty/hardscroll.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/widechar/lib_key_name.c#1 branch .. //depot/projects/iwarp/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/panel/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/ncurses/panel/headers#2 integrate .. //depot/projects/iwarp/contrib/ncurses/panel/modules#2 integrate .. //depot/projects/iwarp/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/iwarp/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/iwarp/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/tack/COPYING#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/HISTORY#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/Makefile.in#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/README#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/ansi.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/charset.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/color.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/control.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/crum.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/edit.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/fun.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/init.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/menu.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/modes.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/modules#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/output.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/pad.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/scan.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/sync.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/sysdep.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/tack.1#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/tack.c#2 delete .. //depot/projects/iwarp/contrib/ncurses/tack/tack.h#2 delete .. //depot/projects/iwarp/contrib/openpam/CREDITS#2 integrate .. //depot/projects/iwarp/contrib/openpam/HISTORY#2 integrate .. //depot/projects/iwarp/contrib/openpam/INSTALL#2 integrate .. //depot/projects/iwarp/contrib/openpam/LICENSE#2 integrate .. //depot/projects/iwarp/contrib/openpam/MANIFEST#2 delete .. //depot/projects/iwarp/contrib/openpam/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openpam/README#2 integrate .. //depot/projects/iwarp/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/iwarp/contrib/openpam/aclocal.m4#2 integrate .. //depot/projects/iwarp/contrib/openpam/autogen.sh#2 integrate .. //depot/projects/iwarp/contrib/openpam/bin/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openpam/bin/su/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openpam/bin/su/su.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/compile#1 branch .. //depot/projects/iwarp/contrib/openpam/config.h.in#2 integrate .. //depot/projects/iwarp/contrib/openpam/configure#2 integrate .. //depot/projects/iwarp/contrib/openpam/configure.ac#2 integrate .. //depot/projects/iwarp/contrib/openpam/configure.in#2 delete .. //depot/projects/iwarp/contrib/openpam/depcomp#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/iwarp/contrib/openpam/include/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/openpam/include/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openpam/include/security/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/projects/iwarp/contrib/openpam/include/security/openpam_attr.h#1 branch .. //depot/projects/iwarp/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/iwarp/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/iwarp/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/projects/iwarp/contrib/openpam/include/security/pam_modules.h#2 integrate .. //depot/projects/iwarp/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/projects/iwarp/contrib/openpam/install-sh#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_findenv.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_free_envlist.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_get_option.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_load.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_log.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_nullconv.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_set_option.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_static.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/openpam_ttyconv.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_acct_mgmt.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_authenticate.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_authenticate_secondary.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_chauthtok.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_close_session.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_end.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_error.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_get_authtok.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_get_data.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_get_item.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_get_mapped_authtok.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_get_mapped_username.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_get_user.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_getenv.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_getenvlist.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_info.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_open_session.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_prompt.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_putenv.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_set_data.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_set_item.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_set_mapped_authtok.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_set_mapped_username.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_setcred.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_setenv.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_sm_acct_mgmt.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_sm_authenticate.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_sm_authenticate_secondary.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_sm_chauthtok.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_sm_close_session.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_sm_get_mapped_username.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_sm_open_session.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_sm_set_mapped_username.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_sm_setcred.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_start.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_strerror.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_verror.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_vinfo.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/ltconfig#2 delete .. //depot/projects/iwarp/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/iwarp/contrib/openpam/misc/gendoc.pl#2 integrate .. //depot/projects/iwarp/contrib/openpam/missing#2 integrate .. //depot/projects/iwarp/contrib/openpam/mkinstalldirs#2 delete .. //depot/projects/iwarp/contrib/openpam/modules/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openpam/modules/pam_permit/pam_permit.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate .. //depot/projects/iwarp/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/iwarp/contrib/openpam/stamp-h.in#2 delete .. //depot/projects/iwarp/contrib/top/display.c#2 integrate .. //depot/projects/iwarp/contrib/top/layout.h#2 integrate .. //depot/projects/iwarp/contrib/top/machine.h#2 integrate .. //depot/projects/iwarp/contrib/top/top.c#2 integrate .. //depot/projects/iwarp/contrib/top/top.h#2 integrate .. //depot/projects/iwarp/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate .. //depot/projects/iwarp/etc/defaults/periodic.conf#3 integrate .. //depot/projects/iwarp/etc/defaults/rc.conf#3 integrate .. //depot/projects/iwarp/etc/devd.conf#2 integrate .. //depot/projects/iwarp/etc/namedb/named.conf#2 integrate .. //depot/projects/iwarp/etc/netstart#2 integrate .. //depot/projects/iwarp/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/iwarp/etc/rc#2 integrate .. //depot/projects/iwarp/etc/rc.d/hostid#2 integrate .. //depot/projects/iwarp/etc/rc.d/ipfw#2 integrate .. //depot/projects/iwarp/etc/rc.d/jail#2 integrate .. //depot/projects/iwarp/etc/rc.d/kerberos#3 integrate .. //depot/projects/iwarp/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/iwarp/etc/rc.d/netif#2 integrate .. //depot/projects/iwarp/etc/rc.d/ppp#3 integrate .. //depot/projects/iwarp/etc/rc.firewall#2 integrate .. //depot/projects/iwarp/etc/rc.firewall6#2 integrate .. //depot/projects/iwarp/etc/rc.subr#2 integrate .. //depot/projects/iwarp/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/iwarp/games/fortune/datfiles/gerrold.limerick#2 integrate .. //depot/projects/iwarp/games/fortune/datfiles/limerick#4 integrate .. //depot/projects/iwarp/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/iwarp/gnu/usr.bin/Makefile#2 integrate .. //depot/projects/iwarp/gnu/usr.bin/cvs/Makefile#2 integrate .. //depot/projects/iwarp/gnu/usr.bin/cvs/contrib/Makefile#2 integrate .. //depot/projects/iwarp/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/iwarp/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate .. //depot/projects/iwarp/gnu/usr.bin/gdb/kgdb/kld.c#1 branch .. //depot/projects/iwarp/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/iwarp/gnu/usr.bin/gdb/kgdb/main.c#2 integrate .. //depot/projects/iwarp/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/iwarp/gnu/usr.bin/gdb/kgdb/trgt_i386.c#3 integrate .. //depot/projects/iwarp/include/fts.h#2 integrate .. //depot/projects/iwarp/include/unistd.h#2 integrate .. //depot/projects/iwarp/lib/libarchive/Makefile#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_endian.h#1 branch .. //depot/projects/iwarp/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_entry_link_resolver.c#1 branch .. //depot/projects/iwarp/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_entry_strmode.c#1 branch .. //depot/projects/iwarp/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_mtree.c#1 branch .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_zip.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/cpio.5#1 branch .. //depot/projects/iwarp/lib/libarchive/filter_fork.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/iwarp/lib/libarchive/libarchive_internals.3#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/README#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/main.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/read_open_memory.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test.h#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_compat_gtar.c#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_compat_gtar_1.tgz.uu#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_compat_zip.c#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_compat_zip_1.zip.uu#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_empty_write.c#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_entry_strmode.c#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_cpio_odc.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_mtree.c#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_tar.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_read_pax_truncated.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_tar_large.c#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_write_disk_hardlink.c#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_write_format_cpio_newc.c#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_write_format_cpio_odc.c#1 branch .. //depot/projects/iwarp/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/iwarp/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/iwarp/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/iwarp/lib/libc/gen/closedir.c#3 integrate .. //depot/projects/iwarp/lib/libc/gen/feature_present.3#1 branch .. //depot/projects/iwarp/lib/libc/gen/feature_present.c#1 branch .. //depot/projects/iwarp/lib/libc/gen/fts-compat.c#2 integrate .. //depot/projects/iwarp/lib/libc/gen/fts-compat.h#2 integrate .. //depot/projects/iwarp/lib/libc/gen/fts.3#2 integrate .. //depot/projects/iwarp/lib/libc/gen/fts.c#2 integrate .. //depot/projects/iwarp/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/iwarp/lib/libc/gen/posixshm.c#2 delete .. //depot/projects/iwarp/lib/libc/gen/sem_open.3#2 integrate .. //depot/projects/iwarp/lib/libc/gen/shm_open.3#2 delete .. //depot/projects/iwarp/lib/libc/i386/_fpmath.h#2 integrate .. //depot/projects/iwarp/lib/libc/ia64/_fpmath.h#2 integrate .. //depot/projects/iwarp/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/iwarp/lib/libc/locale/Makefile.inc#2 integrate .. //depot/projects/iwarp/lib/libc/locale/ascii.c#1 branch .. //depot/projects/iwarp/lib/libc/locale/mblocal.h#3 integrate .. //depot/projects/iwarp/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/iwarp/lib/libc/sparc64/_fpmath.h#2 integrate .. //depot/projects/iwarp/lib/libc/stdlib/grantpt.c#3 integrate .. //depot/projects/iwarp/lib/libc/stdlib/heapsort.c#2 integrate .. //depot/projects/iwarp/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/iwarp/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/iwarp/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/iwarp/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/iwarp/lib/libc/sys/access.2#3 integrate .. //depot/projects/iwarp/lib/libc/sys/flock.2#2 integrate .. //depot/projects/iwarp/lib/libc/sys/shm_open.2#1 branch .. //depot/projects/iwarp/lib/libfetch/ftp.c#3 integrate .. //depot/projects/iwarp/lib/libkvm/kvm.c#2 integrate .. //depot/projects/iwarp/lib/libkvm/kvm_file.c#2 integrate .. //depot/projects/iwarp/lib/libmagic/config.h#2 integrate .. //depot/projects/iwarp/lib/libpam/libpam/Makefile#2 integrate .. //depot/projects/iwarp/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/iwarp/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate .. //depot/projects/iwarp/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/iwarp/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/iwarp/lib/libthr/Makefile#3 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_sem.c#3 integrate .. //depot/projects/iwarp/lib/libutil/pty.3#2 integrate .. //depot/projects/iwarp/lib/libutil/pty.c#3 integrate .. //depot/projects/iwarp/lib/msun/Makefile#3 integrate .. //depot/projects/iwarp/lib/msun/Symbol.map#3 integrate .. //depot/projects/iwarp/lib/msun/amd64/Makefile.inc#3 integrate .. //depot/projects/iwarp/lib/msun/amd64/s_llrintl.S#1 branch .. //depot/projects/iwarp/lib/msun/amd64/s_lrintl.S#1 branch .. //depot/projects/iwarp/lib/msun/amd64/s_rintl.S#1 branch .. //depot/projects/iwarp/lib/msun/i387/Makefile.inc#3 integrate .. //depot/projects/iwarp/lib/msun/i387/s_llrintl.S#1 branch .. //depot/projects/iwarp/lib/msun/i387/s_lrintl.S#1 branch .. //depot/projects/iwarp/lib/msun/i387/s_rintl.S#1 branch .. //depot/projects/iwarp/lib/msun/ld128/s_exp2l.c#1 branch .. //depot/projects/iwarp/lib/msun/ld80/s_exp2l.c#1 branch .. //depot/projects/iwarp/lib/msun/man/exp.3#2 integrate .. //depot/projects/iwarp/lib/msun/man/log.3#1 branch .. //depot/projects/iwarp/lib/msun/man/lrint.3#2 integrate .. //depot/projects/iwarp/lib/msun/man/rint.3#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_expf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/k_cos.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/k_rem_pio2.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/k_rem_pio2f.c#2 delete .. //depot/projects/iwarp/lib/msun/src/math.h#4 integrate .. //depot/projects/iwarp/lib/msun/src/math_private.h#3 integrate .. //depot/projects/iwarp/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_csqrtf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_exp2.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_exp2f.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_llrintl.c#1 branch .. //depot/projects/iwarp/lib/msun/src/s_log1p.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_log1pf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_lrintl.c#1 branch .. //depot/projects/iwarp/lib/msun/src/s_nearbyint.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_rint.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_rintf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_rintl.c#1 branch .. //depot/projects/iwarp/lib/ncurses/ncurses/Makefile#3 integrate .. //depot/projects/iwarp/lib/ncurses/ncurses/ncurses_cfg.h#2 integrate .. //depot/projects/iwarp/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/iwarp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/iwarp/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/iwarp/release/fixit.profile#3 integrate .. //depot/projects/iwarp/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/iwarp/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/iwarp/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/iwarp/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/iwarp/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/iwarp/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/iwarp/sbin/Makefile#2 integrate .. //depot/projects/iwarp/sbin/ddb/Makefile#1 branch .. //depot/projects/iwarp/sbin/ddb/ddb.8#1 branch .. //depot/projects/iwarp/sbin/ddb/ddb.c#1 branch .. //depot/projects/iwarp/sbin/ddb/ddb.h#1 branch .. //depot/projects/iwarp/sbin/ddb/ddb_script.c#1 branch .. //depot/projects/iwarp/sbin/devd/devd.hh#2 integrate .. //depot/projects/iwarp/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/iwarp/sbin/ffsinfo/ffsinfo.c#2 integrate .. //depot/projects/iwarp/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/projects/iwarp/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/iwarp/sbin/natd/natd.8#3 integrate .. //depot/projects/iwarp/sbin/quotacheck/Makefile#2 integrate .. //depot/projects/iwarp/sbin/quotacheck/preen.c#2 integrate .. //depot/projects/iwarp/sbin/quotacheck/quotacheck.8#2 integrate .. //depot/projects/iwarp/sbin/quotacheck/quotacheck.c#2 integrate .. //depot/projects/iwarp/sbin/quotacheck/quotacheck.h#1 branch .. //depot/projects/iwarp/sbin/savecore/savecore.8#2 integrate .. //depot/projects/iwarp/sbin/savecore/savecore.c#2 integrate .. //depot/projects/iwarp/sbin/setkey/parse.y#3 integrate .. //depot/projects/iwarp/share/colldef/Makefile#2 integrate .. //depot/projects/iwarp/share/colldef/README#2 integrate .. //depot/projects/iwarp/share/colldef/map.ISO8859-9#1 branch .. //depot/projects/iwarp/share/colldef/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/iwarp/share/man/man3/tree.3#2 integrate .. //depot/projects/iwarp/share/man/man4/Makefile#6 integrate .. //depot/projects/iwarp/share/man/man4/ath.4#2 integrate .. //depot/projects/iwarp/share/man/man4/awi.4#2 integrate .. //depot/projects/iwarp/share/man/man4/axe.4#2 integrate .. //depot/projects/iwarp/share/man/man4/bge.4#2 integrate .. //depot/projects/iwarp/share/man/man4/coda.4#1 branch .. //depot/projects/iwarp/share/man/man4/dcons.4#2 integrate .. //depot/projects/iwarp/share/man/man4/ddb.4#2 integrate .. //depot/projects/iwarp/share/man/man4/ed.4#2 integrate .. //depot/projects/iwarp/share/man/man4/edsc.4#2 integrate .. //depot/projects/iwarp/share/man/man4/ipmi.4#2 integrate .. //depot/projects/iwarp/share/man/man4/lagg.4#2 integrate .. //depot/projects/iwarp/share/man/man4/man4.i386/ep.4#2 integrate .. //depot/projects/iwarp/share/man/man4/man4.i386/snc.4#2 integrate .. //depot/projects/iwarp/share/man/man4/mfi.4#2 integrate .. //depot/projects/iwarp/share/man/man4/mxge.4#2 integrate .. //depot/projects/iwarp/share/man/man4/ng_car.4#4 integrate .. //depot/projects/iwarp/share/man/man4/ng_pppoe.4#2 integrate .. //depot/projects/iwarp/share/man/man4/oldcard.4#2 delete .. //depot/projects/iwarp/share/man/man4/pci.4#2 integrate .. //depot/projects/iwarp/share/man/man4/pcib.4#1 branch .. //depot/projects/iwarp/share/man/man4/puc.4#2 integrate .. //depot/projects/iwarp/share/man/man4/sched_4bsd.4#2 integrate .. //depot/projects/iwarp/share/man/man4/sched_ule.4#2 integrate .. //depot/projects/iwarp/share/man/man4/sf.4#2 integrate .. //depot/projects/iwarp/share/man/man4/snd_envy24.4#2 integrate .. //depot/projects/iwarp/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/iwarp/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/iwarp/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/iwarp/share/man/man4/syncache.4#3 integrate .. //depot/projects/iwarp/share/man/man4/textdump.4#1 branch .. //depot/projects/iwarp/share/man/man4/vlan.4#2 integrate .. //depot/projects/iwarp/share/man/man4/wi.4#2 integrate .. //depot/projects/iwarp/share/man/man4/xl.4#2 integrate .. //depot/projects/iwarp/share/man/man5/boot.config.5#2 integrate .. //depot/projects/iwarp/share/man/man5/fstab.5#2 integrate .. //depot/projects/iwarp/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/iwarp/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/iwarp/share/man/man5/src.conf.5#4 integrate .. //depot/projects/iwarp/share/man/man7/bsd.snmpmod.mk.7#2 integrate .. //depot/projects/iwarp/share/man/man7/clocks.7#2 integrate .. //depot/projects/iwarp/share/man/man7/ports.7#2 integrate .. //depot/projects/iwarp/share/man/man9/BUF_ISLOCKED.9#1 branch .. //depot/projects/iwarp/share/man/man9/BUF_RECURSED.9#1 branch .. //depot/projects/iwarp/share/man/man9/BUF_REFCNT.9#2 delete .. //depot/projects/iwarp/share/man/man9/Makefile#6 integrate .. //depot/projects/iwarp/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/iwarp/share/man/man9/lock.9#2 integrate .. //depot/projects/iwarp/share/man/man9/mbuf_tags.9#2 integrate .. //depot/projects/iwarp/share/man/man9/style.9#2 integrate .. //depot/projects/iwarp/share/misc/bsd-family-tree#4 integrate .. //depot/projects/iwarp/share/misc/committers-ports.dot#3 integrate .. //depot/projects/iwarp/share/misc/committers-src.dot#3 integrate .. //depot/projects/iwarp/share/misc/pci_vendors#3 integrate .. //depot/projects/iwarp/share/mk/bsd.own.mk#4 integrate .. //depot/projects/iwarp/share/mk/bsd.snmpmod.mk#2 integrate .. //depot/projects/iwarp/share/mklocale/Makefile#2 integrate .. //depot/projects/iwarp/share/mklocale/la_LN.US-ASCII.src#2 integrate .. //depot/projects/iwarp/share/mklocale/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/iwarp/share/termcap/termcap.src#3 integrate .. //depot/projects/iwarp/share/timedef/am_ET.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/be_BY.CP1131.src#2 integrate .. //depot/projects/iwarp/share/timedef/be_BY.CP1251.src#2 integrate .. //depot/projects/iwarp/share/timedef/be_BY.ISO8859-5.src#2 integrate .. //depot/projects/iwarp/share/timedef/be_BY.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/bg_BG.CP1251.src#2 integrate .. //depot/projects/iwarp/share/timedef/bg_BG.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/ca_ES.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/ca_ES.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/cs_CZ.ISO8859-2.src#2 integrate .. //depot/projects/iwarp/share/timedef/cs_CZ.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/da_DK.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/da_DK.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/de_AT.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/de_AT.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/de_DE.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/de_DE.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/iwarp/share/timedef/el_GR.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/en_GB.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/en_US.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/es_ES.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/es_ES.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/et_EE.ISO8859-15.src#2 integrate .. //depot/projects/iwarp/share/timedef/et_EE.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/eu_ES.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/fi_FI.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/fi_FI.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/fr_FR.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/fr_FR.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/he_IL.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/hi_IN.ISCII-DEV.src#2 integrate .. //depot/projects/iwarp/share/timedef/hr_HR.ISO8859-2.src#2 integrate .. //depot/projects/iwarp/share/timedef/hr_HR.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/hu_HU.ISO8859-2.src#2 integrate .. //depot/projects/iwarp/share/timedef/hu_HU.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/hy_AM.ARMSCII-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/hy_AM.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/is_IS.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/is_IS.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/it_IT.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/it_IT.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/ja_JP.SJIS.src#2 integrate .. //depot/projects/iwarp/share/timedef/ja_JP.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/ja_JP.eucJP.src#2 integrate .. //depot/projects/iwarp/share/timedef/kk_KZ.PT154.src#2 integrate .. //depot/projects/iwarp/share/timedef/kk_KZ.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/ko_KR.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/ko_KR.eucKR.src#2 integrate .. //depot/projects/iwarp/share/timedef/la_LN.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/lt_LT.ISO8859-13.src#2 integrate .. //depot/projects/iwarp/share/timedef/lt_LT.ISO8859-4.src#2 integrate .. //depot/projects/iwarp/share/timedef/lt_LT.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/mn_MN.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/nl_NL.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/nn_NO.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/nn_NO.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/no_NO.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/no_NO.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/pl_PL.ISO8859-2.src#2 integrate .. //depot/projects/iwarp/share/timedef/pl_PL.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/pt_BR.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/pt_BR.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/pt_PT.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/pt_PT.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/ro_RO.ISO8859-2.src#2 integrate .. //depot/projects/iwarp/share/timedef/ro_RO.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/ru_RU.CP1251.src#2 integrate .. //depot/projects/iwarp/share/timedef/ru_RU.CP866.src#2 integrate .. //depot/projects/iwarp/share/timedef/ru_RU.ISO8859-5.src#2 integrate .. //depot/projects/iwarp/share/timedef/ru_RU.KOI8-R.src#2 integrate .. //depot/projects/iwarp/share/timedef/ru_RU.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/sk_SK.ISO8859-2.src#2 integrate .. //depot/projects/iwarp/share/timedef/sk_SK.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/sl_SI.ISO8859-2.src#2 integrate .. //depot/projects/iwarp/share/timedef/sl_SI.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/sr_YU.ISO8859-2.src#2 integrate .. //depot/projects/iwarp/share/timedef/sr_YU.ISO8859-5.src#2 integrate .. //depot/projects/iwarp/share/timedef/sr_YU.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/sv_SE.ISO8859-1.src#2 integrate .. //depot/projects/iwarp/share/timedef/sv_SE.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/tr_TR.ISO8859-9.src#2 integrate .. //depot/projects/iwarp/share/timedef/tr_TR.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/uk_UA.CP1251.src#2 integrate .. //depot/projects/iwarp/share/timedef/uk_UA.ISO8859-5.src#2 integrate .. //depot/projects/iwarp/share/timedef/uk_UA.KOI8-U.src#2 integrate .. //depot/projects/iwarp/share/timedef/uk_UA.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/zh_CN.GB18030.src#2 integrate .. //depot/projects/iwarp/share/timedef/zh_CN.GB2312.src#2 integrate .. //depot/projects/iwarp/share/timedef/zh_CN.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/timedef/zh_CN.eucCN.src#2 integrate .. //depot/projects/iwarp/share/timedef/zh_TW.Big5.src#2 integrate .. //depot/projects/iwarp/share/timedef/zh_TW.UTF-8.src#2 integrate .. //depot/projects/iwarp/share/zoneinfo/backward#2 integrate .. //depot/projects/iwarp/share/zoneinfo/europe#2 integrate .. //depot/projects/iwarp/share/zoneinfo/leapseconds#2 integrate .. //depot/projects/iwarp/share/zoneinfo/southamerica#3 integrate .. //depot/projects/iwarp/share/zoneinfo/zone.tab#3 integrate .. //depot/projects/iwarp/sys/Makefile#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/iwarp/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/iwarp/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/iwarp/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/iwarp/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/iwarp/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/iwarp/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/iwarp/sys/amd64/include/_types.h#2 integrate .. //depot/projects/iwarp/sys/amd64/include/float.h#2 integrate .. //depot/projects/iwarp/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/iwarp/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/iwarp/sys/amd64/include/pmc_mdep.h#3 integrate .. //depot/projects/iwarp/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/iwarp/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/iwarp/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/iwarp/sys/arm/arm/pmap.c#7 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 30 23:29:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E95016A46B; Wed, 30 Jan 2008 23:29:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C789C16A421 for ; Wed, 30 Jan 2008 23:29:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BBC1413C4EE for ; Wed, 30 Jan 2008 23:29:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UNT1gd021561 for ; Wed, 30 Jan 2008 23:29:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UNT1E5021558 for perforce@freebsd.org; Wed, 30 Jan 2008 23:29:01 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 23:29:01 GMT Message-Id: <200801302329.m0UNT1E5021558@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134500 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 23:29:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=134500 Change 134500 by jb@jb_freebsd1 on 2008/01/30 23:28:35 IDdtrace. Affected files ... .. //depot/projects/dtrace7/src/sys/kern/link_elf.c#2 edit .. //depot/projects/dtrace7/src/sys/kern/link_elf_obj.c#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/kern/link_elf.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/link_elf.c,v 1.93 2007/05/31 11:51:51 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/link_elf.c,v 1.95 2008/01/13 14:44:09 attilio Exp $"); #include "opt_gdb.h" #include "opt_mac.h" @@ -121,6 +121,9 @@ static int link_elf_each_function_name(linker_file_t, int (*)(const char *, void *), void *); +static int link_elf_each_function_nameval(linker_file_t, + int (*)(linker_file_t, linker_symval_t*, void *), + void *); static void link_elf_reloc_local(linker_file_t); static Elf_Addr elf_lookup(linker_file_t lf, Elf_Size symidx, int deps); @@ -134,6 +137,7 @@ KOBJMETHOD(linker_link_preload_finish, link_elf_link_preload_finish), KOBJMETHOD(linker_lookup_set, link_elf_lookup_set), KOBJMETHOD(linker_each_function_name, link_elf_each_function_name), + KOBJMETHOD(linker_each_function_nameval, link_elf_each_function_nameval), { 0, 0 } }; @@ -572,7 +576,7 @@ vfslocked = NDHASGIANT(&nd); NDFREE(&nd, NDF_ONLY_PNBUF); #ifdef MAC - error = mac_check_kld_load(curthread->td_ucred, nd.ni_vp); + error = mac_kld_check_load(curthread->td_ucred, nd.ni_vp); if (error) { firstpage = NULL; goto out; @@ -1222,6 +1226,30 @@ return (0); } +static int +link_elf_each_function_nameval(linker_file_t file, + int (*callback)(linker_file_t, linker_symval_t *, void *), void *opaque) +{ + linker_symval_t symval; + elf_file_t ef = (elf_file_t)file; + const Elf_Sym* symp; + int i, error; + + /* Exhaustive search */ + for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) { + if (symp->st_value != 0 && + ELF_ST_TYPE(symp->st_info) == STT_FUNC) { + error = link_elf_symbol_values(file, (c_linker_sym_t) symp, &symval); + if (error) + return (error); + error = callback(file, &symval, opaque); + if (error) + return (error); + } + } + return (0); +} + #ifdef __ia64__ /* * Each KLD has its own GP. The GP value for each load module is given by ==== //depot/projects/dtrace7/src/sys/kern/link_elf_obj.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/link_elf_obj.c,v 1.95 2007/05/31 11:51:51 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/link_elf_obj.c,v 1.97 2008/01/13 14:44:09 attilio Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -124,6 +124,9 @@ void ***, void ***, int *); static int link_elf_each_function_name(linker_file_t, int (*)(const char *, void *), void *); +static int link_elf_each_function_nameval(linker_file_t, + int (*)(linker_file_t, linker_symval_t*, void *), + void *); static void link_elf_reloc_local(linker_file_t); static Elf_Addr elf_obj_lookup(linker_file_t lf, Elf_Size symidx, int deps); @@ -138,6 +141,7 @@ KOBJMETHOD(linker_link_preload_finish, link_elf_link_preload_finish), KOBJMETHOD(linker_lookup_set, link_elf_lookup_set), KOBJMETHOD(linker_each_function_name, link_elf_each_function_name), + KOBJMETHOD(linker_each_function_nameval, link_elf_each_function_nameval), { 0, 0 } }; @@ -410,7 +414,7 @@ vfslocked = NDHASGIANT(&nd); NDFREE(&nd, NDF_ONLY_PNBUF); #ifdef MAC - error = mac_check_kld_load(td->td_ucred, nd.ni_vp); + error = mac_kld_check_load(td->td_ucred, nd.ni_vp); if (error) { goto out; } @@ -1064,6 +1068,30 @@ return (0); } +static int +link_elf_each_function_nameval(linker_file_t file, + int (*callback)(linker_file_t, linker_symval_t *, void *), void *opaque) +{ + linker_symval_t symval; + elf_file_t ef = (elf_file_t)file; + const Elf_Sym* symp; + int i, error; + + /* Exhaustive search */ + for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) { + if (symp->st_value != 0 && + ELF_ST_TYPE(symp->st_info) == STT_FUNC) { + error = link_elf_symbol_values(file, (c_linker_sym_t) symp, &symval); + if (error) + return (error); + error = callback(file, &symval, opaque); + if (error) + return (error); + } + } + return (0); +} + /* * Symbol lookup function that can be used when the symbol index is known (ie * in relocations). It uses the symbol index instead of doing a fully fledged From owner-p4-projects@FreeBSD.ORG Wed Jan 30 23:32:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9998D16A41B; Wed, 30 Jan 2008 23:32:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 466B116A418 for ; Wed, 30 Jan 2008 23:32:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3ACCB13C43E for ; Wed, 30 Jan 2008 23:32:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UNW5se021730 for ; Wed, 30 Jan 2008 23:32:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UNW4B0021727 for perforce@freebsd.org; Wed, 30 Jan 2008 23:32:04 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 23:32:04 GMT Message-Id: <200801302332.m0UNW4B0021727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134501 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 23:32:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=134501 Change 134501 by jb@jb_freebsd1 on 2008/01/30 23:31:36 Implement a suggestion from jhb@ to use KLD_MODULE and set MAXCPU to the SMP case instead of adding the SMP_MAXCPU definition. This means that kernel modules should always see the number of CPUs a SMP kernel would support (W^5 == which was what we wanted). Affected files ... .. //depot/projects/dtrace/src/sys/amd64/include/param.h#5 edit .. //depot/projects/dtrace/src/sys/arm/include/param.h#5 edit .. //depot/projects/dtrace/src/sys/i386/include/param.h#5 edit .. //depot/projects/dtrace/src/sys/ia64/include/param.h#5 edit .. //depot/projects/dtrace/src/sys/pc98/include/param.h#4 edit .. //depot/projects/dtrace/src/sys/powerpc/include/param.h#5 edit .. //depot/projects/dtrace/src/sys/sparc64/include/param.h#6 edit .. //depot/projects/dtrace/src/sys/sun4v/include/param.h#6 edit .. //depot/projects/dtrace7/src/sys/amd64/include/param.h#3 edit .. //depot/projects/dtrace7/src/sys/arm/include/param.h#3 edit .. //depot/projects/dtrace7/src/sys/i386/include/param.h#3 edit .. //depot/projects/dtrace7/src/sys/ia64/include/param.h#3 edit .. //depot/projects/dtrace7/src/sys/pc98/include/param.h#3 edit .. //depot/projects/dtrace7/src/sys/powerpc/include/param.h#3 edit .. //depot/projects/dtrace7/src/sys/sparc64/include/param.h#3 edit .. //depot/projects/dtrace7/src/sys/sun4v/include/param.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/amd64/include/param.h#5 (text+ko) ==== @@ -79,13 +79,8 @@ #define MACHINE_ARCH "amd64" #endif -/* - * SMP_MAXCPU - maximum number of CPUs in the kernel. Use this in kernel - * modules to allow for both SMP and !SMP cases. - */ -#define SMP_MAXCPU 16 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 16 #else #define MAXCPU 1 #endif ==== //depot/projects/dtrace/src/sys/arm/include/param.h#5 (text+ko) ==== @@ -72,13 +72,8 @@ #endif #define MID_MACHINE MID_ARM6 -/* - * SMP_MAXCPU - maximum number of CPUs in the kernel. Use this in kernel - * modules to allow for both SMP and !SMP cases. - */ -#define SMP_MAXCPU 2 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 2 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace/src/sys/i386/include/param.h#5 (text+ko) ==== @@ -65,13 +65,8 @@ #endif #define MID_MACHINE MID_I386 -/* - * SMP_MAXCPU - maximum number of CPUs in the kernel. Use this in kernel - * modules to allow for both SMP and !SMP cases. - */ -#define SMP_MAXCPU 16 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 16 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace/src/sys/ia64/include/param.h#5 (text+ko) ==== @@ -78,13 +78,8 @@ #define MACHINE_ARCH "ia64" #endif -/* - * SMP_MAXCPU - maximum number of CPUs in the kernel. Use this in kernel - * modules to allow for both SMP and !SMP cases. - */ -#define SMP_MAXCPU 4 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 4 #else #define MAXCPU 1 #endif ==== //depot/projects/dtrace/src/sys/pc98/include/param.h#4 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/powerpc/include/param.h#5 (text+ko) ==== @@ -67,13 +67,8 @@ #endif #define MID_MACHINE MID_POWERPC -/* - * SMP_MAXCPU - maximum number of CPUs in the kernel. Use this in kernel - * modules to allow for both SMP and !SMP cases. - */ -#define SMP_MAXCPU 2 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 2 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace/src/sys/sparc64/include/param.h#6 (text+ko) ==== @@ -59,13 +59,8 @@ #endif #define MID_MACHINE MID_SPARC64 -/* - * SMP_MAXCPU - maximum number of CPUs in the kernel. Use this in kernel - * modules to allow for both SMP and !SMP cases. - */ -#define SMP_MAXCPU 16 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 16 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace/src/sys/sun4v/include/param.h#6 (text+ko) ==== @@ -59,13 +59,8 @@ #endif #define MID_MACHINE MID_SPARC64 -/* - * SMP_MAXCPU - maximum number of CPUs in the kernel. Use this in kernel - * modules to allow for both SMP and !SMP cases. - */ -#define SMP_MAXCPU 32 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 32 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace7/src/sys/amd64/include/param.h#3 (text+ko) ==== @@ -79,9 +79,8 @@ #define MACHINE_ARCH "amd64" #endif -#define SMP_MAXCPU 16 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 16 #else #define MAXCPU 1 #endif ==== //depot/projects/dtrace7/src/sys/arm/include/param.h#3 (text+ko) ==== @@ -72,9 +72,8 @@ #endif #define MID_MACHINE MID_ARM6 -#define SMP_MAXCPU 2 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 2 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace7/src/sys/i386/include/param.h#3 (text+ko) ==== @@ -65,9 +65,8 @@ #endif #define MID_MACHINE MID_I386 -#define SMP_MAXCPU 16 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 16 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace7/src/sys/ia64/include/param.h#3 (text+ko) ==== @@ -78,9 +78,8 @@ #define MACHINE_ARCH "ia64" #endif -#define SMP_MAXCPU 4 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 4 #else #define MAXCPU 1 #endif ==== //depot/projects/dtrace7/src/sys/pc98/include/param.h#3 (text+ko) ==== ==== //depot/projects/dtrace7/src/sys/powerpc/include/param.h#3 (text+ko) ==== @@ -67,9 +67,8 @@ #endif #define MID_MACHINE MID_POWERPC -#define SMP_MAXCPU 2 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 2 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace7/src/sys/sparc64/include/param.h#3 (text+ko) ==== @@ -59,9 +59,8 @@ #endif #define MID_MACHINE MID_SPARC64 -#define SMP_MAXCPU 16 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 16 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace7/src/sys/sun4v/include/param.h#3 (text+ko) ==== @@ -59,9 +59,8 @@ #endif #define MID_MACHINE MID_SPARC64 -#define SMP_MAXCPU 32 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 32 #else #define MAXCPU 1 #endif /* SMP */ From owner-p4-projects@FreeBSD.ORG Wed Jan 30 23:34:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C33BD16A421; Wed, 30 Jan 2008 23:34:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8792216A419 for ; Wed, 30 Jan 2008 23:34:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7C20213C447 for ; Wed, 30 Jan 2008 23:34:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UNY7CC021846 for ; Wed, 30 Jan 2008 23:34:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UNY7OD021843 for perforce@freebsd.org; Wed, 30 Jan 2008 23:34:07 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 23:34:07 GMT Message-Id: <200801302334.m0UNY7OD021843@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134502 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 23:34:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=134502 Change 134502 by jb@jb_freebsd1 on 2008/01/30 23:33:14 Remove the -DSMP. It hasn't been needed in a while. Affected files ... .. //depot/projects/dtrace/src/sys/modules/cyclic/Makefile#10 edit .. //depot/projects/dtrace7/src/sys/modules/cyclic/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/cyclic/Makefile#10 (text+ko) ==== @@ -12,7 +12,7 @@ -I${.CURDIR}/../.. \ -I${.CURDIR}/../../cddl/cyclic/${MACHINE_ARCH} -CFLAGS+= -DSMP -DDEBUG=1 +CFLAGS+= -DDEBUG=1 IGNORE_PRAGMA= 1 ==== //depot/projects/dtrace7/src/sys/modules/cyclic/Makefile#2 (text+ko) ==== @@ -12,7 +12,7 @@ -I${.CURDIR}/../.. \ -I${.CURDIR}/../../cddl/cyclic/${MACHINE_ARCH} -CFLAGS+= -DSMP -DDEBUG=1 +CFLAGS+= -DDEBUG=1 IGNORE_PRAGMA= 1 From owner-p4-projects@FreeBSD.ORG Wed Jan 30 23:35:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AD9A16A41A; Wed, 30 Jan 2008 23:35:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBD3616A418 for ; Wed, 30 Jan 2008 23:35:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BFF7213C461 for ; Wed, 30 Jan 2008 23:35:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UNZ8Hm021899 for ; Wed, 30 Jan 2008 23:35:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UNZ8KL021896 for perforce@freebsd.org; Wed, 30 Jan 2008 23:35:08 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 23:35:08 GMT Message-Id: <200801302335.m0UNZ8KL021896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134503 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 23:35:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=134503 Change 134503 by jb@jb_freebsd1 on 2008/01/30 23:34:12 On releng7 we need to add the syscall names with the kernel option. Affected files ... .. //depot/projects/dtrace7/src/sys/conf/files#5 edit Differences ... ==== //depot/projects/dtrace7/src/sys/conf/files#5 (text+ko) ==== @@ -1499,6 +1499,7 @@ kern/subr_rtc.c optional genclock kern/subr_sbuf.c standard kern/subr_scanf.c standard +kern/kern_sdt.c optional kdtrace_hooks kern/subr_sleepqueue.c standard kern/subr_smp.c standard kern/subr_stack.c optional ddb @@ -1511,7 +1512,7 @@ kern/sys_pipe.c standard kern/sys_process.c standard kern/sys_socket.c standard -kern/syscalls.c optional witness | invariants +kern/syscalls.c optional witness | invariants | kdtrace_hooks kern/sysv_ipc.c standard kern/sysv_msg.c optional sysvmsg kern/sysv_sem.c optional sysvsem From owner-p4-projects@FreeBSD.ORG Wed Jan 30 23:51:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F26C916A41B; Wed, 30 Jan 2008 23:51:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D78316A419 for ; Wed, 30 Jan 2008 23:51:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 90ECB13C469 for ; Wed, 30 Jan 2008 23:51:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UNpPIC022655 for ; Wed, 30 Jan 2008 23:51:25 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UNpP36022652 for perforce@freebsd.org; Wed, 30 Jan 2008 23:51:25 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 23:51:25 GMT Message-Id: <200801302351.m0UNpP36022652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 23:51:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=134504 Change 134504 by jb@jb_freebsd1 on 2008/01/30 23:50:43 Use the releng7 kthread api. Affected files ... .. //depot/projects/dtrace7/src/sys/cddl/cyclic/cyclic_test.c#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/cddl/cyclic/cyclic_test.c#2 (text+ko) ==== @@ -233,7 +233,7 @@ printf("%s: finished\n",__func__); - kthread_exit(); + kthread_exit(0); } static int @@ -256,7 +256,7 @@ * Execute the tests in a kernel thread to avoid blocking * the sysctl. Look for the results in the syslog. */ - error = kthread_add(cyclic_run_tests, (void *)(uintptr_t) cmd, + error = kthread_create(cyclic_run_tests, (void *)(uintptr_t) cmd, NULL, NULL, 0, 0, "cyctest%d", cmd); break; default: From owner-p4-projects@FreeBSD.ORG Wed Jan 30 23:53:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0E9516A469; Wed, 30 Jan 2008 23:53:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E63C16A419 for ; Wed, 30 Jan 2008 23:53:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5203713C459 for ; Wed, 30 Jan 2008 23:53:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UNrSEk022742 for ; Wed, 30 Jan 2008 23:53:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UNrRlD022739 for perforce@freebsd.org; Wed, 30 Jan 2008 23:53:27 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 23:53:27 GMT Message-Id: <200801302353.m0UNrRlD022739@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134506 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 23:53:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=134506 Change 134506 by jb@jb_freebsd1 on 2008/01/30 23:53:06 Remove stack calls. Affected files ... .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 edit Differences ... ==== //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 (text+ko) ==== @@ -82,7 +82,6 @@ if (p != NULL) { i = p; p = (u_char *)p + sizeof(struct kmem_item); - stack_save(&i->stack); mtx_lock(&kmem_items_mtx); LIST_INSERT_HEAD(&kmem_items, i, next); mtx_unlock(&kmem_items_mtx); @@ -255,12 +254,6 @@ printf("KMEM_DEBUG: Leaked elements:\n\n"); LIST_FOREACH(i, &kmem_items, next) { printf("address=%p\n", i); - /* - * Cheat and use the DDB routine - * to avoid lock issues. - */ - stack_print_ddb(&i->stack); - printf("\n"); } } mtx_unlock(&kmem_items_mtx); From owner-p4-projects@FreeBSD.ORG Wed Jan 30 23:54:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6633B16A478; Wed, 30 Jan 2008 23:54:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC17316A420 for ; Wed, 30 Jan 2008 23:54:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DEFCB13C44B for ; Wed, 30 Jan 2008 23:54:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UNsTKu022792 for ; Wed, 30 Jan 2008 23:54:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UNsTMw022789 for perforce@freebsd.org; Wed, 30 Jan 2008 23:54:29 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 23:54:29 GMT Message-Id: <200801302354.m0UNsTMw022789@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134507 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 23:54:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=134507 Change 134507 by jb@jb_freebsd1 on 2008/01/30 23:54:21 Use MAXCPU rather than SMP_MAXCPU now I've implemented jhb@'s suggestion to use KLD_MODULE in the SMP ifdef. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/cyclic/amd64/cyclic_machdep.c#3 edit .. //depot/projects/dtrace/src/sys/cddl/cyclic/cyclic.c#2 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_debug.c#2 edit .. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris.c#3 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#28 edit .. //depot/projects/dtrace7/src/sys/cddl/cyclic/cyclic.c#2 edit .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_debug.c#2 edit .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris.c#2 edit .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/cyclic/amd64/cyclic_machdep.c#3 (text+ko) ==== @@ -73,7 +73,7 @@ cyclic_uninit(); } -static hrtime_t exp_due[SMP_MAXCPU]; +static hrtime_t exp_due[MAXCPU]; /* * This function is the one registered by the machine dependent ==== //depot/projects/dtrace/src/sys/cddl/cyclic/cyclic.c#2 (text+ko) ==== @@ -1214,7 +1214,7 @@ idp->cyi_omni_hdlr = *omni; - for (i = 0; i < SMP_MAXCPU; i++) { + for (i = 0; i < MAXCPU; i++) { if (pcpu_find(i) == NULL) continue; ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_debug.c#2 (text+ko) ==== @@ -61,11 +61,11 @@ char *first; char *last; char *next; -} dtrace_debug_data[SMP_MAXCPU]; +} dtrace_debug_data[MAXCPU]; static char dtrace_debug_bufr[DTRACE_DEBUG_BUFR_SIZE]; -static volatile u_long dtrace_debug_flag[SMP_MAXCPU]; +static volatile u_long dtrace_debug_flag[MAXCPU]; static void dtrace_debug_lock(int cpu) ==== //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris.c#3 (text+ko) ==== @@ -35,9 +35,9 @@ #include #include -cpu_core_t cpu_core[SMP_MAXCPU]; +cpu_core_t cpu_core[MAXCPU]; kmutex_t cpu_lock; -solaris_cpu_t solaris_cpu[SMP_MAXCPU]; +solaris_cpu_t solaris_cpu[MAXCPU]; /* * OpenSolaris subsystem initialisation. @@ -56,7 +56,7 @@ * that the asserts work. On FreeBSD, if a CPU exists, it is * enabled. */ - for (i = 0; i < SMP_MAXCPU; i++) { + for (i = 0; i < MAXCPU; i++) { solaris_cpu[i].cpuid = i; solaris_cpu[i].cpu_flags &= CPU_ENABLE; } ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#28 (text) ==== @@ -276,7 +276,7 @@ #define vuprintf vprintf #define ttoproc(_a) ((_a)->td_proc) #define crgetzoneid(_a) 0 -#define NCPU SMP_MAXCPU +#define NCPU MAXCPU #define SNOCD 0 #define CPU_ON_INTR(_a) 0 ==== //depot/projects/dtrace7/src/sys/cddl/cyclic/cyclic.c#2 (text+ko) ==== @@ -1214,7 +1214,7 @@ idp->cyi_omni_hdlr = *omni; - for (i = 0; i < SMP_MAXCPU; i++) { + for (i = 0; i < MAXCPU; i++) { if (pcpu_find(i) == NULL) continue; ==== //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_debug.c#2 (text+ko) ==== @@ -61,11 +61,11 @@ char *first; char *last; char *next; -} dtrace_debug_data[SMP_MAXCPU]; +} dtrace_debug_data[MAXCPU]; static char dtrace_debug_bufr[DTRACE_DEBUG_BUFR_SIZE]; -static volatile u_long dtrace_debug_flag[SMP_MAXCPU]; +static volatile u_long dtrace_debug_flag[MAXCPU]; static void dtrace_debug_lock(int cpu) ==== //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris.c#2 (text+ko) ==== @@ -35,9 +35,9 @@ #include #include -cpu_core_t cpu_core[SMP_MAXCPU]; +cpu_core_t cpu_core[MAXCPU]; kmutex_t cpu_lock; -solaris_cpu_t solaris_cpu[SMP_MAXCPU]; +solaris_cpu_t solaris_cpu[MAXCPU]; /* * OpenSolaris subsystem initialisation. @@ -56,7 +56,7 @@ * that the asserts work. On FreeBSD, if a CPU exists, it is * enabled. */ - for (i = 0; i < SMP_MAXCPU; i++) { + for (i = 0; i < MAXCPU; i++) { solaris_cpu[i].cpuid = i; solaris_cpu[i].cpu_flags &= CPU_ENABLE; } ==== //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 (text) ==== @@ -276,7 +276,7 @@ #define vuprintf vprintf #define ttoproc(_a) ((_a)->td_proc) #define crgetzoneid(_a) 0 -#define NCPU SMP_MAXCPU +#define NCPU MAXCPU #define SNOCD 0 #define CPU_ON_INTR(_a) 0 From owner-p4-projects@FreeBSD.ORG Wed Jan 30 23:57:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E290A16A473; Wed, 30 Jan 2008 23:57:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F8DB16A419 for ; Wed, 30 Jan 2008 23:57:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8211713C46B for ; Wed, 30 Jan 2008 23:57:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UNvZm7022971 for ; Wed, 30 Jan 2008 23:57:35 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UNvZjN022968 for perforce@freebsd.org; Wed, 30 Jan 2008 23:57:35 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 30 Jan 2008 23:57:35 GMT Message-Id: <200801302357.m0UNvZjN022968@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134508 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 23:57:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=134508 Change 134508 by kmacy@kmacy:entropy:iwarp on 2008/01/30 23:56:39 remove aio references Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#6 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_defs.h#6 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 (text+ko) ==== @@ -44,7 +44,6 @@ #include #include #include -#include #include #include @@ -1522,14 +1521,6 @@ #endif } else return (err); - } else if (sopt->sopt_name == TCP_AIO) { - aio_op_t **op; - - if (sopt->sopt_td != NULL) - return (EINVAL); - op = sopt->sopt_val; - *op = t3_aio; - return (0); } else { int optval, oldval; struct inpcb *inp; ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#6 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include #include -#include #include #include @@ -818,43 +817,6 @@ return pru_soreceive(so, psa, uio, mp0, controlp, flagsp); } -static int -t3_aio_read(struct socket *so, struct aiocb *cb, struct aiocb *ucb, struct thread *td) -{ - - return (ECANCELED); -} - -static int -t3_aio_write(struct socket *so, struct aiocb *cb, struct aiocb *ucb, struct thread *td) -{ - - return (ECANCELED); -} - -int -t3_aio(struct file *fp, struct aiocb *cb, struct aiocb *ucb, struct thread *td) -{ - int opcode, error; - struct socket *so; - - opcode = cb->aio_lio_opcode; - - if (fp->f_type != DTYPE_SOCKET) - return (EINVAL); - - so = fp->f_data; - if ((opcode != LIO_READ) && (opcode != LIO_WRITE)) - return (ECANCELED); - - if (opcode == LIO_READ) - error = (t3_aio_read(so, cb, ucb, td)); - else - error = (t3_aio_write(so, cb, ucb, td)); - - return (error); -} - void t3_install_socket_ops(struct socket *so) { ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_defs.h#6 (text+ko) ==== @@ -83,8 +83,4 @@ unsigned int len); int t3_get_tcb(struct socket *so); -struct aiocb; -struct file; -int t3_aio(struct file *, struct aiocb *cb, struct aiocb *ucb, struct thread *td); - #endif From owner-p4-projects@FreeBSD.ORG Wed Jan 30 23:59:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D51116A421; Wed, 30 Jan 2008 23:59:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF83516A419; Wed, 30 Jan 2008 23:59:37 +0000 (UTC) (envelope-from grehan@freebsd.org) Received: from dommail.onthenet.com.au (dommail.OntheNet.com.au [203.13.70.57]) by mx1.freebsd.org (Postfix) with ESMTP id 55C6213C455; Wed, 30 Jan 2008 23:59:36 +0000 (UTC) (envelope-from grehan@freebsd.org) Received: from peter-grehans-power-mac-g5.local (dsl-63-249-90-35.cruzio.com [63.249.90.35]) by dommail.onthenet.com.au (MOS 3.7.5a-GA) with ESMTP id DND66507 (AUTH peterg@ptree32.com.au); Thu, 31 Jan 2008 09:59:16 +1000 (EST) Message-ID: <47A10F52.2090503@freebsd.org> Date: Wed, 30 Jan 2008 15:59:14 -0800 From: Peter Grehan User-Agent: Thunderbird 2.0.0.9 (Macintosh/20071031) MIME-Version: 1.0 To: Rafal Jaworowski References: <200801230414.m0N4E4ng009323@repoman.freebsd.org> <4797C8E0.4070100@freebsd.org> <4798C436.6090904@gmail.com> <20080125.100006.-262784007.imp@bsdimp.com> <479A17AC.4070004@freebsd.org> <479A26CE.6020104@semihalf.com> <47A0BE7A.1030307@semihalf.com> In-Reply-To: <47A0BE7A.1030307@semihalf.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: yanegomi@gmail.com, perforce@FreeBSD.org, Marcel Moolenaar , "M. Warner Losh" , marcel@FreeBSD.org Subject: Re: PERFORCE change 133911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: grehan@freebsd.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 23:59:38 -0000 > sparc64 is apparently using this for libc connection (not sure if > this is what Peter was referring to in one of the previous emails?), See libc/sparc64/sys/__sparc_utrap_setup.c for how the user-space trap handlers are setup. Very nice. And it reminded me that PPC should really migrate to having the signal trampoline be in libc ala sparc64 rather than being copied out to and forcing the stack to be executable. later, Peter. From owner-p4-projects@FreeBSD.ORG Wed Jan 30 23:59:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE73816A52A; Wed, 30 Jan 2008 23:59:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2003616A41B for ; Wed, 30 Jan 2008 23:59:38 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 12B8513C457 for ; Wed, 30 Jan 2008 23:59:38 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UNxbZM023455 for ; Wed, 30 Jan 2008 23:59:37 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UNxbFC023449 for perforce@freebsd.org; Wed, 30 Jan 2008 23:59:37 GMT (envelope-from cognet@freebsd.org) Date: Wed, 30 Jan 2008 23:59:37 GMT Message-Id: <200801302359.m0UNxbFC023449@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 134509 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 23:59:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=134509 Change 134509 by cognet@hulglah on 2008/01/30 23:59:18 Use 32bits longs for mips32, and 64bits pointers for mips64. XXX: 64bits atomic operations aren't implemented. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/atomic.h#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/atomic.h#4 (text+ko) ==== @@ -345,6 +345,7 @@ #define atomic_readandset_int atomic_readandset_32 #define atomic_fetchadd_int atomic_fetchadd_32 +#ifdef __mips64 /* Operations on longs. */ #define atomic_set_long atomic_set_64 #define atomic_set_acq_long atomic_set_acq_64 @@ -366,6 +367,48 @@ #define atomic_readandclear_long atomic_readandclear_64 /* Operations on pointers. */ +#define atomic_set_ptr atomic_set_64 +#define atomic_set_acq_ptr atomic_set_acq_64 +#define atomic_set_rel_ptr atomic_set_rel_64 +#define atomic_clear_ptr atomic_clear_64 +#define atomic_clear_acq_ptr atomic_clear_acq_64 +#define atomic_clear_rel_ptr atomic_clear_rel_64 +#define atomic_add_ptr atomic_add_64 +#define atomic_add_acq_ptr atomic_add_acq_64 +#define atomic_add_rel_ptr atomic_add_rel_64 +#define atomic_subtract_ptr atomic_subtract_64 +#define atomic_subtract_acq_ptr atomic_subtract_acq_64 +#define atomic_subtract_rel_ptr atomic_subtract_rel_64 +#define atomic_cmpset_ptr atomic_cmpset_64 +#define atomic_cmpset_acq_ptr atomic_cmpset_acq_64 +#define atomic_cmpset_rel_ptr atomic_cmpset_rel_64 +#define atomic_load_acq_ptr atomic_load_acq_64 +#define atomic_store_rel_ptr atomic_store_rel_64 +#define atomic_readandclear_ptr atomic_readandclear_64 + +#else /* __mips64 */ + +/* Operations on longs. */ +#define atomic_set_long atomic_set_32 +#define atomic_set_acq_long atomic_set_acq_32 +#define atomic_set_rel_long atomic_set_rel_32 +#define atomic_clear_long atomic_clear_32 +#define atomic_clear_acq_long atomic_clear_acq_32 +#define atomic_clear_rel_long atomic_clear_rel_32 +#define atomic_add_long atomic_add_32 +#define atomic_add_acq_long atomic_add_acq_32 +#define atomic_add_rel_long atomic_add_rel_32 +#define atomic_subtract_long atomic_subtract_32 +#define atomic_subtract_acq_long atomic_subtract_acq_32 +#define atomic_subtract_rel_long atomic_subtract_rel_32 +#define atomic_cmpset_long atomic_cmpset_32 +#define atomic_cmpset_acq_long atomic_cmpset_acq_32 +#define atomic_cmpset_rel_long atomic_cmpset_rel_32 +#define atomic_load_acq_long atomic_load_acq_32 +#define atomic_store_rel_long atomic_store_rel_32 +#define atomic_readandclear_long atomic_readandclear_32 + +/* Operations on pointers. */ #define atomic_set_ptr atomic_set_32 #define atomic_set_acq_ptr atomic_set_acq_32 #define atomic_set_rel_ptr atomic_set_rel_32 @@ -384,5 +427,6 @@ #define atomic_load_acq_ptr atomic_load_acq_32 #define atomic_store_rel_ptr atomic_store_rel_32 #define atomic_readandclear_ptr atomic_readandclear_32 +#endif /* __mips64 */ #endif /* ! _MACHINE_ATOMIC_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Jan 31 00:17:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A35316A41B; Thu, 31 Jan 2008 00:17:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA5DB16A419 for ; Thu, 31 Jan 2008 00:17:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C9DAD13C457 for ; Thu, 31 Jan 2008 00:17:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0V0H1k5029552 for ; Thu, 31 Jan 2008 00:17:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V0GuSA029545 for perforce@freebsd.org; Thu, 31 Jan 2008 00:16:56 GMT (envelope-from jb@freebsd.org) Date: Thu, 31 Jan 2008 00:16:56 GMT Message-Id: <200801310016.m0V0GuSA029545@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 00:17:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=134512 Change 134512 by jb@jb_freebsd1 on 2008/01/31 00:16:45 IF7 Affected files ... .. //depot/projects/dtrace7/src/ObsoleteFiles.inc#5 integrate .. //depot/projects/dtrace7/src/contrib/amd/AUTHORS#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/BUGS#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/COPYING#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/ChangeLog#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/FAQ#1 branch .. //depot/projects/dtrace7/src/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/INSTALL#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/NEWS#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/README.attrcache#1 branch .. //depot/projects/dtrace7/src/contrib/amd/README.ldap#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/am_ops.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amd.8#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amd.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amd.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_auto.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_direct.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_error.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_host.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_inherit.c#2 delete .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_link.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_linkx.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_nfsl.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_nfsx.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_program.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_root.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_toplvl.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_union.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amq_subr.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/amq_svc.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/autil.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/clock.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/conf.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/conf_parse.y#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/conf_tok.l#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/get_args.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/info_file.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/info_hesiod.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/info_ldap.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/info_ndbm.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/info_nis.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/info_nisplus.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/info_passwd.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/info_union.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/map.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/mapc.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/mntfs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/nfs_prot_svc.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/nfs_start.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/nfs_subr.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_TEMPLATE.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_cachefs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_cdfs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_efs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_lofs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_mfs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_nfs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_nfs3.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_nullfs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_pcfs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_tfs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_tmpfs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_ufs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_umapfs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_unionfs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_xfs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/opts.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/restart.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/rpc_fwd.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/sched.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/srvr_amfs_auto.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amd/srvr_nfs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amq/amq.8#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amq/amq.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amq/amq.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amq/amq_clnt.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amq/amq_xdr.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amq/pawd.1#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/amq/pawd.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/aux_conf.h.in#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/bootstrap#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/conf/transp/transp_sockets.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/conf/trap/trap_default.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/conf/umount/umount_bsd44.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/doc/am-utils.texi#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/dtrace7/src/contrib/amd/doc/texinfo.tex#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/doc/version.texi#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fixmount/fixmount.8#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fixmount/fixmount.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsi_analyze.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsi_data.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsi_dict.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsi_gram.y#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsi_lex.l#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsi_util.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsinfo.8#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsinfo.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsinfo.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/wr_atab.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/wr_bparam.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/wr_dumpset.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/wr_exportfs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/wr_fstab.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/hlfsd/hlfsd.8#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/hlfsd/hlfsd.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/hlfsd/homedir.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/hlfsd/stubs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/include/am_compat.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/include/am_defs.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/include/am_utils.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/include/am_xdr_func.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/include/amq_defs.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/include/mount_headers1.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/include/mount_headers2.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/ldap-id.ms#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/ldap.schema#1 branch .. //depot/projects/dtrace7/src/contrib/amd/libamu/alloca.c#2 delete .. //depot/projects/dtrace7/src/contrib/amd/libamu/amu.h#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/libamu/hasmntopt.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/libamu/misc_rpc.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/libamu/mount_fs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/libamu/mtab.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/libamu/util.c#2 delete .. //depot/projects/dtrace7/src/contrib/amd/libamu/wire.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/libamu/xdr_func.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/libamu/xutil.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/m4/GNUmakefile#2 delete .. //depot/projects/dtrace7/src/contrib/amd/m4/amdgrep#2 delete .. //depot/projects/dtrace7/src/contrib/amd/m4/amindent#2 delete .. //depot/projects/dtrace7/src/contrib/amd/m4/autopat#2 delete .. //depot/projects/dtrace7/src/contrib/amd/m4/chop-aclocal.pl#2 delete .. //depot/projects/dtrace7/src/contrib/amd/m4/copy-if-newbig#2 delete .. //depot/projects/dtrace7/src/contrib/amd/m4/macros/HEADER#2 delete .. //depot/projects/dtrace7/src/contrib/amd/m4/macros/TRAILER#2 delete .. //depot/projects/dtrace7/src/contrib/amd/m4/mk-aclocal#2 delete .. //depot/projects/dtrace7/src/contrib/amd/m4/mkconf#2 delete .. //depot/projects/dtrace7/src/contrib/amd/m4/rmtspc#2 delete .. //depot/projects/dtrace7/src/contrib/amd/m4/update_build_version#2 delete .. //depot/projects/dtrace7/src/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/am-eject.in#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/amd.conf-sample#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/amd.conf.5#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/amd2ldif.in#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/amd2sun.in#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/automount2amd.8#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/automount2amd.in#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/ctl-amd.in#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/ctl-hlfsd.in#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/expn.1#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/expn.in#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/fix-amd-map.in#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/fixrmtab.in#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/wait4amd.in#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/scripts/wait4amd2die.in#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/tasks#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/vers.m4#1 branch .. //depot/projects/dtrace7/src/contrib/amd/wire-test/wire-test.8#2 integrate .. //depot/projects/dtrace7/src/contrib/amd/wire-test/wire-test.c#2 integrate .. //depot/projects/dtrace7/src/contrib/binutils/libiberty/cp-demangle.c#2 integrate .. //depot/projects/dtrace7/src/contrib/file/.cvsignore#2 delete .. //depot/projects/dtrace7/src/contrib/file/ChangeLog#2 integrate .. //depot/projects/dtrace7/src/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/acorn#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/animation#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/apple#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/archive#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/audio#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/blender#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/commands#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/console#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/database#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/efi#1 branch .. //depot/projects/dtrace7/src/contrib/file/Magdir/elf#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/fortran#1 branch .. //depot/projects/dtrace7/src/contrib/file/Magdir/java#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/file/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/file/acinclude.m4#2 integrate .. //depot/projects/dtrace7/src/contrib/file/aclocal.m4#2 integrate .. //depot/projects/dtrace7/src/contrib/file/apprentice.c#2 integrate .. //depot/projects/dtrace7/src/contrib/file/ascmagic.c#2 integrate .. //depot/projects/dtrace7/src/contrib/file/compress.c#2 integrate .. //depot/projects/dtrace7/src/contrib/file/config.h.in#2 integrate .. //depot/projects/dtrace7/src/contrib/file/configure#2 integrate .. //depot/projects/dtrace7/src/contrib/file/configure.in#2 integrate .. //depot/projects/dtrace7/src/contrib/file/file.c#2 integrate .. //depot/projects/dtrace7/src/contrib/file/file.h#2 integrate .. //depot/projects/dtrace7/src/contrib/file/file.man#2 integrate .. //depot/projects/dtrace7/src/contrib/file/file_opts.h#1 branch .. //depot/projects/dtrace7/src/contrib/file/fsmagic.c#2 integrate .. //depot/projects/dtrace7/src/contrib/file/funcs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/file/install-sh#2 integrate .. //depot/projects/dtrace7/src/contrib/file/is_tar.c#2 integrate .. //depot/projects/dtrace7/src/contrib/file/libmagic.man#2 integrate .. //depot/projects/dtrace7/src/contrib/file/magic.c#2 integrate .. //depot/projects/dtrace7/src/contrib/file/magic.h#2 integrate .. //depot/projects/dtrace7/src/contrib/file/magic.man#2 integrate .. //depot/projects/dtrace7/src/contrib/file/magic.mime#2 integrate .. //depot/projects/dtrace7/src/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/dtrace7/src/contrib/file/names.h#2 integrate .. //depot/projects/dtrace7/src/contrib/file/patchlevel.h#2 integrate .. //depot/projects/dtrace7/src/contrib/file/print.c#2 integrate .. //depot/projects/dtrace7/src/contrib/file/readelf.c#2 integrate .. //depot/projects/dtrace7/src/contrib/file/readelf.h#2 integrate .. //depot/projects/dtrace7/src/contrib/file/softmagic.c#2 integrate .. //depot/projects/dtrace7/src/contrib/one-true-awk/FIXES#2 integrate .. //depot/projects/dtrace7/src/contrib/one-true-awk/FREEBSD-upgrade#2 integrate .. //depot/projects/dtrace7/src/contrib/one-true-awk/b.c#2 integrate .. //depot/projects/dtrace7/src/contrib/one-true-awk/lib.c#2 integrate .. //depot/projects/dtrace7/src/contrib/one-true-awk/main.c#2 integrate .. //depot/projects/dtrace7/src/contrib/one-true-awk/run.c#2 integrate .. //depot/projects/dtrace7/src/contrib/one-true-awk/tran.c#2 integrate .. //depot/projects/dtrace7/src/etc/defaults/rc.conf#4 integrate .. //depot/projects/dtrace7/src/lib/libmagic/config.h#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/Makefile#4 integrate .. //depot/projects/dtrace7/src/share/man/man4/ath.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/awi.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/man4.i386/snc.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/oldcard.4#2 delete .. //depot/projects/dtrace7/src/share/man/man4/wi.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man5/src.conf.5#4 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/le/am7990.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/le/am79900.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/dtrace7/src/sys/netatalk/aarp.c#2 integrate .. //depot/projects/dtrace7/src/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/sys/conf.h#2 integrate .. //depot/projects/dtrace7/src/tools/build/options/WITHOUT_BZIP2#2 integrate .. //depot/projects/dtrace7/src/tools/build/options/WITHOUT_GNU#2 integrate .. //depot/projects/dtrace7/src/tools/build/options/WITHOUT_INSTALLLIB#1 branch .. //depot/projects/dtrace7/src/tools/build/options/WITHOUT_KVM#2 integrate .. //depot/projects/dtrace7/src/tools/build/options/WITHOUT_PAM#2 integrate .. //depot/projects/dtrace7/src/tools/build/options/WITHOUT_TOOLCHAIN#2 integrate .. //depot/projects/dtrace7/src/usr.bin/awk/Makefile#2 integrate .. //depot/projects/dtrace7/src/usr.bin/awk/b.c.diff#2 delete .. //depot/projects/dtrace7/src/usr.bin/awk/lib.c.diff#2 delete .. //depot/projects/dtrace7/src/usr.bin/awk/main.c.diff#2 delete .. //depot/projects/dtrace7/src/usr.bin/awk/run.c.diff#2 delete .. //depot/projects/dtrace7/src/usr.bin/awk/tran.c.diff#2 delete .. //depot/projects/dtrace7/src/usr.bin/file/config.h#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/amd/amd/Makefile#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/amd/fsinfo/Makefile#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/amd/include/amu_autofs_prot.h#1 branch .. //depot/projects/dtrace7/src/usr.sbin/amd/include/aux_conf.h#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/amd/include/build_version.h#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/amd/include/config.h#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/amd/include/newvers.sh#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/amd/libamu/Makefile#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/amd/mk-amd-map/Makefile#2 integrate Differences ... ==== //depot/projects/dtrace7/src/ObsoleteFiles.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.112.2.7 2007/12/13 05:45:06 dougb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.112.2.8 2008/01/30 17:58:15 brueffer Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080126: oldcard.4 removal +OLD_FILES+=usr/share/man/man4/card.4.gz +OLD_FILES+=usr/share/man/man4/oldcard.4.gz # 20071207: Merged with fortunes-o.real OLD_FILES+=usr/share/games/fortune/fortunes2-o OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat ==== //depot/projects/dtrace7/src/contrib/amd/AUTHORS#2 (text+ko) ==== @@ -12,6 +12,11 @@ ports, and new features added. Erez Zadok is the current maintainer of am-utils, as of January 1997. +* Ion Badulescu + +Co-maintainer of am-utils since late 1999: Linux and Solaris autofs support, +Linux NFSv3 support, major code reorganization, etc... + * Randall S. Winchester May 7, 1997: contributed a special version of upl102 that included NFS V.3 @@ -154,7 +159,7 @@ August 10, 1997: netbsd and other bsd systems have a mask flag for pcfs_args (msdos mount). -* Christos Zoulas +* Christos Zoulas September 25, 1997: fix to initialize uid/gid fields of pcfs_args_t on netbsd. @@ -163,9 +168,19 @@ server is down or does not support a portmapper call, then mark it down as version 2, and try again later. +November 29, 2002: compile fixes for NetBSD, a couple of bug fixes (one +already fixed by maintainers) + April 12, 2003: support new "unmount" option, useful to timeout removable local media mounts. +October 12, 2004: patch to support two new amd.conf options, domain_strip +and auto_attrcache. Patch to cleanup NFS attribute-cache flag computation. +Patch to fix an inconsistency in timeouts in the RPC code between socket and +TLI implementations. Patch to print version string (amd -v) after all +options had been initialized, so we can print domain, host, and hostd. +Linux patch to use umount2(2) if umount(2) fails. + * Bill Paul November 5, 1997: NFS v.3 support for AIX 4.2.1, which does *not* include @@ -191,6 +206,8 @@ January 12, 1998: minor bug in output of amd -H. +June 23, 2005: assortment of small compile bugs on aix4, and solaris 5/6/7. + * Thomas Richter January 13, 1998: use case insensitive comparisons for variables that need @@ -302,9 +319,13 @@ * Wolfram Klaus . November 21, 2000: recognize proplist mnttab flag. -* Thomas Klausner +* Thomas Klausner November 21, 2000: lots of NetBSD fixes (many of which are generic). +April 18, 2003: patch to reference am-utils info pages in man page. + +November 28, 2004: small fixes to typos in amd.conf(5) man page. + * Olaf Kirch February 1, 2001: important Linux NFS error number mapping fixed @@ -318,20 +339,92 @@ * Philippe Troin July 12, 2001: Proper handling of GNU getopt, support for optionally -disabling LDAP/Hesiod, fixes for the dev/nodev option on Linux +disabling LDAP/Hesiod, fixes for the dev/nodev option on Linux. Texi +documentation fix. November 28, 2001: Bug fix. Support "nolock" as an NFS option, not a generic mount option. -July 17, 2003: Debian fixes. Null am_pref free. +July 17, 2003: pref:=null core dump fix. libgdbm portability. tcpd/librap +support. And a few other things for the 6.0 branch. * Trond Myklebust January 10, 2002: Proper initialization of the timeo parameter on Linux, TCP _must_ have a timeout 2 orders of magnitude larger than UDP +* George Ross +April 29, 2002: Rework of old code, support for wildcards in LDAP queries, +and an FD leak fix. Amd -A support. + +October 21, 2002: ldap_unbind fix for SIGPIPE, and support for LDAPv3 +protocol version parameter (with Tim Colles ). + +* Matthias Scheler +June 14, 2002: patch to use "xlatecookie" NFS mount option. + +* Jun-ichiro itojun Hagino . +June 11, 2002: minor fixes to support NetBSD 1.6A. + * Sean Fagan March 14, 2003: detect and use the MNT2_GEN_OPT_AUTOMNTFS mount flag on OS X / Darwin. * Hendrik Scholz June 9, 2003: mk-amd-map should open temp db file using O_EXCL. + +* Mark Davies +July 14, 2003: define "xlatecookie" mnttab option if not defined (for +NetBSD). Support null hesiod entries if they start with a ".". + +* Eric S. Raymond +December 9, 2003: fix unbalanced [] typo in fsinfo man page. + +* Martin Blapp +July 6, 2004: recognize fields in pcfs_args_t in FreeBSD 5. + +* Dan Nelson +August 2, 2004: pawd to recognize "host" type mounts. + +* Hauke Fath +August 3, 2004: pawd to recognize "linkx" type mounts. + +* Michael van Elst +September 1, 2004: bug fix to avoid race condition in calls to mntctl on +AIX. + +* Jonathan Chen +October 22, 2004: patch/fix to move mlock/mlockall/plock code after the +fork(). +June 29, 2005: core dump going off end of exported_ap[] array. +September 29, 2005: patch/fix for pawd not to go into an infinite loop. +October 25, 2005: patch/fix for pawd to repeatedly resolve path. + +* David Rage +January 17, 2005: prevent Amd from logging 'Read-only filesystem' errors +when the mount point has an ancestor (i.e. '/') that is mounted read-only. + +* Kevin Layer +January 28, 2005: basic instructions how to setup Amd on Mac OS-X. + +* Dan Ottavio +March 2, 2005: new global amd.conf option debug_mtab_file, to set the debug +mtab file when using debug_options=mtab. Default has changed from "./mtab" +to "/tmp/mtab" to avoid security problem. Bug fixed to ensure that Amd +terminates properly even mtab file doesn't exist. + +* Erik Kline +January 3, 2005: implementation of executable maps for Amd. + +* Jim Zajkowski +March 14, 2005: small patch to amd2ldif. + +* Adam Morley +January 27, 2005: synchronize what amd2ldif does vs. what the ldap.schema +expects. + +* Graeme Wilford +July 4, 2005: buffer overflow in pawd. + +* Steve Plite +September 22, 2005: repair reversed meaning of D_AMQ, so amq will unregister +on exit. ==== //depot/projects/dtrace7/src/contrib/amd/BUGS#2 (text+ko) ==== @@ -1,6 +1,9 @@ LIST OF KNOWN BUGS IN AM-UTILS OR OPERATING SYSTEMS +Note: report am-utils bugs via Bugzilla to https://bugzilla.am-utils.org/ or +by email to the am-utils@am-utils.org mailing list. + (1) mips-sgi-irix* [1A] known to have flaky NFS V.3 and TCP. Amd tends to hang or spin @@ -163,12 +166,15 @@ The Linux kernels don't support Amd's direct mounts very well, leading to erratic behavior: shares that don't get remounted after the first timeout, -inability to restart Amd because its mount points cannot be unmounted, -etc. There are some kernel patches on the am-utils Web site, which solve -these problems. See http://www.am-utils.org/patches/. +inability to restart Amd because its mount points cannot be unmounted, etc. +There are some kernel patches on the am-utils Web site, which solve these +problems. See http://www.am-utils.org/patches/. + +Later 2.4.x kernels completely disallow the hack amd was using for direct +mounts, so another solution will have to be found. -UPDATE: kernels 2.4.10 and later completely disallow the direct mount hack, -so direct mounts are simply not possible on those Linux kernels. +Note: the above is for the old-style amd mount_type = nfs. The autofs mounts +don't support direct mounts at all (due to lack of kernel support). (12) *-aix5.1.0.0 and *-hpux9* @@ -177,14 +183,24 @@ reason you need to run configure directly, run it using 'ksh configure' instead of just 'configure'. -[12A] *-aix5.1.* +[12A] *-aix5.2.* Apparently there is an NFS client side bug in vmount() which causes amd to hang when it starts (and tries to NFS-mount itself). According to IBM engineers, this has to do with partial support code for IPv6: the NFS kernel code doesn't appear to recognize the sin_family of the amd vmount(), -although amd does the right thing. The bug appears to have been fixed in -AIX 5.2. No known fix/patch is available for AIX 5.1 as of now (1/25/2003). +although amd does the right thing. The bug doesn't appear to be in 5.1 or +4.3.3. A fix from IBM is available, APAR number IY41417. + +A binary built on 4.3.3 will not work on 5.2, because the kernel ABIs have +changed. + +[12C] *-aix* + +It is important that you install bos.net.nfs.adt before configuring and +building am-utils. If you don't, you will get compile-time or +configure-time errors, especially when configure tries to find AIX's +definition of struct nfs_args. (13) *-linux and *-darwin6.0 @@ -201,6 +217,87 @@ circumstances the kernel might "forget" about that flag and start using unprivileged ports, causing the same EPERM error above. +(14) Solaris + +The line "%option" in *.l files may cause Solaris /usr/ccs/bin/lex to abort +with the error "missing translation value." This is a bug in Solaris lex. -Erez & Ion. +Moreover, both Solaris yacc and lex produce code that does not pass strict +compilation such as "gcc -Wall -Werror". + +Use GNU Flex and Bison instead. You can download ready-made binaries from +www.sunfreeware.com. Note, however, that sometimes the binaries on +sunfreeware.com don't seem to work, often because they are built against an +older revision of Solaris or build tools. In that case, build a fresh +version of GNU flex and/or bison from the latest stable sources. See +http://www.gnu.org/software/flex/ and http://www.gnu.org/software/bison/. + +(15) Solaris 8 + patch 10899[34]-xx (18 <= xx < 25) or patch 11260[56]-xx + +With this patch, Sun updated the autofs kernel module and automountd +userspace daemon from version 3 to version 4. They also updated the +/usr/include/rpcsvc/autofs_prot.x file, but forgot to regenerate the +autofs_prot.h file. Thus, when amd is compiled, it uses the old header and +thinks it should use autofs version 3, when in fact the kernel now supports +(and expects) only version 4. + +The workaround is to run 'rpcgen -C -h /usr/include/rpcsvc/autofs_prot.x > +/usr/include/rpcsvc/autofs_prot.h' and completely reconfigure and rebuild +am-utils (removing config.cache before running configure). + +The problem is fixed in patch revisions 10899[34]-25 and up. + + +(16) Linux kernel 2.4+ and lofs mounts + +Lofs mounts are not supported by the linux kernel, at all, but since 2.4.0 +the kernel supports a similar type of mount called a bind mount. Its +semantics are closer to those of a hardlink than to those of lofs, and one +of the results is that bind mounts ignore any mount options paseed to them. + +Amd uses bind mounts internally to emulate lofs mounts, which means that +lofs mounts on linux will effectively ignore their mount parameters and +inherit whatever options the original filesystem mounted upon had. + + +(17) autoconf 2.57 + +If you see configure warnings of the following kind: + +configure: WARNING: sys/proc.h: present but cannot be compiled +configure: WARNING: sys/proc.h: check for missing prerequisite headers? +configure: WARNING: sys/proc.h: proceeding with the preprocessor's result +configure: WARNING: ## ------------------------------------ ## +configure: WARNING: ## Report this to bug-autoconf@gnu.org. ## +configure: WARNING: ## ------------------------------------ ## + +please ignore them. They are not real errors, and neither +bug-autoconf@gnu.org nor the am-utils maintainers are interested in hearing +about them. Autoconf simply tries to do more than we need and attempts to +compile each header in isolation, which fails for many system headers. +That's ok, because we only need to know if a header file exists -- we know +how to use it properly ourselves. + +While autoconf does offer a way to specify other files to be included with +the tested header, in order to avoid these warnings, using it would enlarge +the resulting configure script by an order of magnitude, and for no real +gain. Configure is big enough as it is, we don't need any more useless +baggage in it. + +(18) NetBSD 2.0.2, FreeBSD 5.4, OpenBSD 3.7, and quite possibly most other + BSDs and other OSs (as of September 2005) + +Some BSD kernels don't have a way to turn off the NFS attribute cache. They +don't have a 'noac' mount flag, and setting various cache timeout fields in +struct nfs_args doesn't turn off the attribute cache; instead, it sets the +attribute cache timeout to some internal hard-coded default (usually +anywhere from 5-30 seconds). If Amd cannot turn off the NFS attribute +cache, under heavy Amd usage, users could get ESTALE errors from automounted +symlinks, or find that those symlinks point to the wrong place. One +workaround which would minimize this effect is to set auto_attrcache=1 in +your amd.conf, but it doesn't eliminate the problem! The best solutions are +(1) to use Amd in Autofs mode, if it's supported in your OS, and (2) talk to +your OS vendor to support a true "noac" flag. See README.attrcache for more +details. +Erez & the am-utils team. ==== //depot/projects/dtrace7/src/contrib/amd/COPYING#2 (text+ko) ==== @@ -1,4 +1,4 @@ -Copyright (c) 1997-2004 Erez Zadok +Copyright (c) 1997-2006 Erez Zadok Copyright (c) 1989 Jan-Simon Pendry Copyright (c) 1989 Imperial College of Science, Technology & Medicine Copyright (c) 1989 The Regents of the University of California. ==== //depot/projects/dtrace7/src/contrib/amd/ChangeLog#2 (text+ko) ==== @@ -1,29 +1,2595 @@ -2004-05-12 Erez Zadok +2006-05-11 Erez Zadok + + ******************************************************************* + *** Released am-utils-6.1.5 *** + ******************************************************************* + +2006-05-10 Erez Zadok + + * Minor new ports: i386-unknown-freebsd6.1 (RELEASE) + powerpc-apple-darwin8.6.0, and i386-unknown-openbsd3.9. + + * libamu/mount_fs.c (compute_nfs_attrcache_flags): fix signedness + problems on IRIX-6.5. + + * conf/autofs/autofs_solaris_v1.c (xdr_umntrequest): fix + signedness problems on IRIX-6.5. + +2006-05-01 Erez Zadok + + * configure.in: check if libc already includes dbm functionality + (as in FreeBSD 6), then don't bother to check specific libraries + such as libdbm, gdbm, etc. + +2006-04-21 Erez Zadok + + * configure.in: detect G/DBM support via gdbm_compat library + (Debian 3.1). + + * minor new port: powerpc-apple-darwin8.5.0 + +2006-04-20 Erez Zadok + + * scripts/amd.conf-sample, scripts/amd.conf.5, doc/am-utils.texi, + NEWS: document new nfs_allow_any_interface parameter. + + * include/am_compat.h (INADDR_LOOPBACK): define INADDR_LOOPBACK if + not defined, since some systems don't have it. + +2006-04-20 Nick Williams + + * libamu/wire.c (is_interface_local): new boolena function to + determine if address represents any of the local interfaces. + (getwire): more properly check if address equals INADDR_LOOPBACK, + not if IFF_LOOPBACK is not (the latter isn't as correct). + + * include/am_utils.h: extern for new is_interface_local() function. + + * conf/transp/transp_{sockets,tli}.c: don't define INADDR_LOOPBACK + here but in am_compat.h + + * amd/nfs_prot_svc.c (nfs_program_2): if + nfs_allow_any_interface=yes, then allow NFS packets from any local + interface (not just 127.0.0.1). + + * amd/conf.c (gopt_nfs_allow_any_interface): implement the new + amd.conf parameter nfs_allow_any_interface. + + * amd/amd.h (CFM_NFS_ANY_INTERFACE): define new global flag when + al interfaces are acceptable for local NFS packets. + +2006-04-18 Christos Zoulas + + * amd/opts.c: Add support for optionally specifying the hostname + to match against the netgroup in the netgrp and netgrpd selectors. + +2006-04-16 Erez Zadok + + * libamu/mtab.c (hasmntval): fix inverted meaning of error from + hasmntvalerr(). + +2006-04-14 Erez Zadok + + * libamu/mount_fs.c (compute_nfs_attrcache_flags): use new + hasmntvalerr() function to set attribute cache values only if they + were set (regardless whether they were set to zero or a non-zero + value). Before, we were unable to distinguish between an error to + parse an option, and a user who actually wanted to set an + attribute-cache value to 0. This now fixes an important + performance bug that Amd was turning off the attribute caches even + for regular (non-automounter) NFS mounts. + + * libamu/mtab.c (hasmntvalerr): new function to set the value of + an option into an integer, but ONLY if that options was set and + parsed correctly. This function returns 1 on error, 0 on success + (instead of always setting the option value to 0). + (hasmntval): wrapper function around hasmntvalerr, which maintains + backwards compatibility (always sets option value to 0, even on + error to parse the option). + + * amd/nfs_subr.c (fh_to_mp3): use long int printf format for + fhh_pid. + +2006-04-05 Christos Zoulas + + * amd/amfs_generic.c (amfs_lookup_mntfs): fix use-after-free bug + (Coverity). + +2006-03-27 Erez Zadok + + * doc/am-utils.texi, scripts/{amd.conf.5,amd.conf-sample}: + document new nfs_retransmit_counter_toplvl and + nfs_retry_interval_toplvl global amd.conf parameters. + + * amd/conf.c (gopt_nfs_retransmit_counter_toplvl, + (gopt_nfs_retry_interval_toplvl): parse amd.conf + nfs_retransmit_counter_toplvl and nfs_retry_interval_toplvl global + parameters. + + * amd/amfs_toplvl.c (amfs_toplvl_mount): support setting toplvl + timeo/retrans parameters for Amd's toplvl mounts, separately from + all other UDP or NFS mounts. + + * amd/amd.h: define a new timeo/retrans parameter for toplvl + mounts. + +2006-03-22 Erez Zadok + + * minor new port: i386-pc-linux-suse10.1 (beta 8). + +2006-03-21 Christos Zoulas + + * amd/am_ops.c (merge_opts): Remove useless check found by + Coverity; xmalloc never returns NULL. + +2006-03-21 Erez Zadok + + * minor new ports: i386-pc-linux-fc5. + + * amd/info_ldap.c: as of Linux Fedora Core 5 (which comes with + openldap-2.3.9), the ldap.h headers deprecate several functions + used in this file, such as ldap_unbind. You get compile errors + about missing extern definitions. Those externs are still in + , but surrounded by an ifdef LDAP_DEPRECATED. I am + turning on that ifdef at the top of info_ldap.c, under the + assumption that the functions may be deprecated, but they still + work for this (older?) version of the LDAP API. It gets am-utils + to compile, but it is not clear if it will work perfectly. + + * libamu/xdr_func.c (xdr_am_mountres3_ok), amq/amq_xdr.c + (xdr_amq_mount_tree, xdr_amq_mount_tree_p, + xdr_amq_mount_info_list, xdr_amq_mount_tree_list), amq/amq.c + (show_mti), amd/amq_subr.c (xdr_amq_setopt, xdr_amq_mount_subtree, + xdr_amq_mount_tree, xdr_amq_mount_tree_list, xdr_amq_mount_tree), + libamu/xdr_func.c (xdr_am_mountres3_ok): use casing magic to stop + GCC-4.1 from complaining about "dereferencing type-punned pointer + will break strict-aliasing rules" here (but not elsewhere). + +2006-03-20 Christos Zoulas + + * libamu/wire.c: avoid potential dereferencing of a NULL pointer + (Coverity). + + * hlfsd/homedir.c (delay): remove unnecessary check for NULL + pointer (Coverity). + + * fsinfo/fsi_analyze.c (analyze_dkmounts, analyze_mounts, + analyze_mounts): avoid potential dereferencing of a NULL pointer + (Coverity). + + * conf/transp/transp_sockets.c (create_amq_service): avoid + potential dereferencing of a NULL pointer (Coverity). + + * amd/sched.c (sigchld): properly check for the end of the waiting + process list (Coverity). + + * amd/mapc.c (mapc_create): initialize 'modify' to zero (Coverity). + + * amd/autil.c (amfs_mkcacheref, am_unmounted): avoid potential + dereferencing of a NULL pointer (Coverity). + + * amd/amfs_generic.c (amfs_lookup_mntfs): free def_opts before + reusing it (memory leak bug detected by Coverity). + (amfs_bgmount): avoid potential dereferencing of a NULL pointer + (Coverity). + + * amd/am_ops.c (merge_opts): no need to check if newstr is NULL + (bug detected by Coverity). + +2006-03-08 Ion Badulescu + + * amd/nfs_subr.c (mp_to_fh): fixed old-style filehandles--the pid + comparison was failing. + +2006-03-08 Erez Zadok + + * configure.in: properly test for either or + (unfortunately, Autoconf will map both names to the + same $ac_cv_* variable name). Some systems support one header or + another. Patch inspired by work Debian did. + +2006-02-10 Erez Zadok + + ******************************************************************* + *** Released am-utils-6.1.4 *** + ******************************************************************* + +2006-01-04 Erez Zadok + + * doc/am-utils.texi (auto_attrcache Parameter): revise discussion + to mention pros and cons of turning on/off this parameter, + including impact on Amd's performance, and ways to improve + performance while minimizing the window of vulnerability in which + kernel may return the wrong (cached) attributes. + +2006-01-02 Erez Zadok + + * updated copyright year to 2006 on all files. + +2005-12-20 Erez Zadok + + * include/am_utils.h, conf/transp/transp_tli.c (amu_svc_register, + register_autofs_service): use a consistent prototype for the + dispatch function of the autofs service de/registration functions. + +2005-12-03 Erez Zadok + + * minor new ports: i386-unknown-netbsdelf2.1, + i386-unknown-netbsdelf3.0 (RELEASE), and i386-unknown-openbsd3.8. + +2005-12-02 Erez Zadok + + * m4/macros/check_field.m4: remove double inclusion of msdosfs + headers, which are included in mount_header1.h (netbsd 2.1 doesn't + protect which causes compile errors). + +2005-11-08 Erez Zadok + + * minor new port: i386-unknown-freebsd6.0 (RELEASE) + +2005-10-26 Erez Zadok + + * amd/amq_subr.c (amqproc_pawd_1_svc): repeatedly resolve path in + Amd, not in pawd (to avoid repeated network RPCs). + + * amq/pawd.c (transform_dir): move repeated path resolution into Amd. + +2005-10-25 Erez Zadok + + * amq/pawd.c (transform_dir): resolve path repeatedly until + finished. Bug fix from Jonathan Chen . + Added safety check to prevent infinite loops. + +2005-10-19 Erez Zadok + + * doc/am-utils.texi (opts Option): document new pcfs options + longname, nowin95, shortname, user=N, group=N, mask=N, and + dirmask=N. + + * amd/ops_pcfs.c (mount_pcfs): process new pcfs options longname, + nowin95, shortname, user=N, group=N, mask=N, and dirmask=N. + + * include/am_compat.h: provide compatibility mnttab string names, + if needed, for pcfs mount options longname, nowin95, shortname, + user=N, group=N, mask=N, and dirmask=N. + + * include/am_utils.h: extern for hasmntstr(). + + * libamu/mtab.c (hasmntstr): new function to return the string + value following a mount option, up to the next comma-delimited + options. + + * configure.in: check for mnttab and pcfs options longname, + nowin95, and shortname. + + * Makefile.am (EXTRA_DIST_M4): distribute new macro + check_mnt2_pcfs_opt.m4. + + * m4/macros/check_mnt2_pcfs_opt.m4: new macro to check for pcfs + mnttab and mount options. + +2005-10-18 Erez Zadok + + * libamu/mount_fs.c (print_nfs_args): print nfs_args->addr + correctly, depending if it's a pointer or not. + + * conf/sa_dref/sa_dref_*.h: for each NFS_SA_DREF macro, also + #define NFS_ARGS_T_ADDR_IS_POINTER if nfs_args->addr is a pointer + or an embedded structure, so we can tell how to print it. + + * libamu/mount_fs.c (print_nfs_args): print nfs_args->addrlen + field, if it exists. + + * configure.in: check for nfs_args->addrlen field. + + * wire-test/wire-test.c (main), libamu/mount_fs.c + (print_nfs_args), fixmount/fixmount.c (inetresport, + clnt_create_timeout), amq/pawd.c (transform_dir), amq/amq.c + (main), amd/srvr_nfs.c (find_nfs_srvr), amd/autil.c + (amfs_mount): document that as per POSIX, we don't need to set the + sa_len/sin_len fields in struct sockaddr/sockaddr_in. The field + is used only internally in the kernel. See + www.awprofessional.com/articles/article.asp?p=169505&seqNum=2&rl=1 + + * fixmount/fixmount.c (inetresport): initialize sockaddr_in + structure before filling in some fields. + +2005-10-11 Erez Zadok + + * doc/am-utils.texi (nfs_vers, nfs_proto parameters): clarify and + correct mistaken description of nfs_proto. + +2005-10-10 Erez Zadok + + ******************************************************************* + *** Released am-utils-6.1.3 *** + ******************************************************************* + +2005-10-07 Erez Zadok + + * m4/macros/check_mnttab_type.m4: move the test for MOUNT_* to the + very end, after the test using getvfsbyname(). + + * m4/macros/expand_run_string.m4: if the string value returned is + empty, consider it invalid. + + * m4/macros/check_varargs_macros.m4: rewrite macro so it'll + try and compile the varargs test, not just cpp it. Some systems + pass the old cpp test, but not when you actually try to compile + the code (Tru64's cc). + + * conf/autofs/autofs_solaris_v1.h: redefine + autofs_strdup_space_hack as a macro to str3cat(NULL,(s)," ",""). + This works everywhere and we avoid linking problems, inline + functions, etc. + + * conf/autofs/autofs_solaris_v1.c (autofs_mount_fs): remove + autofs_strdup_space_hack() function altogether. + + * m4/macros/os_cflags.m4: remove hack that hardcodes pte_t=u_int. + + * configure.in: test for header. + Test for pte_t, but only on IRIX6 systems. + + * Makefile.am (EXTRA_DIST_M4): distribute new type_pte_t.m4 file. + + * m4/macros/type_pte_t.m4: new test for existence of pte_t + typedef, needed on some IRIX-6.5/gcc systems. + + * m4/macros/header_templates.m4: add missing templates for + HAVE_EXTERN_GETDTABLESIZE, HAVE_EXTERN_GETWD, and + HAVE_EXTERN_UALARM. + + * amd/info_exec.c (exec_map_open): break assignment from inside + conditional, to work around an IRIX-6.5 cc bug. + + * fsinfo/fsi_util.c (set_ether_if), amd/map.c (unmount_mp), + libamu/xutil.c (expand_error), libamu/strutil.c (xsnprintf): avoid + comparison between signed and unsigned integers. + + * conf/autofs/autofs_solaris_v1.h, conf/autofs/autofs_solaris_v1.c + (autofs_strdup_space_hack): move "space_hack" function from static + inline in header, into the only source file that needs it. This + is cleaner and also prevents linking problem with some compilers + that won't apply CPP macros inside static inline functions (for + the strl* functions). + + * amq/pawd.c (find_mt, find_mlp): remove obsolete, inefficient + code. + (transform_dir): call the new, efficient amqproc_pawd_1() routine. + + * amq/amq_clnt.c (amqproc_pawd_1): AMQPROC_PAWD wrapper routine. + + * amq/amq.h (amqproc_pawd_1): extern for amq's AMQPROC_PAWD >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 31 00:20:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 603E616A421; Thu, 31 Jan 2008 00:20:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 24E3816A418 for ; Thu, 31 Jan 2008 00:20:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1696A13C44B for ; Thu, 31 Jan 2008 00:20:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0V0K4lr029715 for ; Thu, 31 Jan 2008 00:20:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V0K4iw029711 for perforce@freebsd.org; Thu, 31 Jan 2008 00:20:04 GMT (envelope-from jb@freebsd.org) Date: Thu, 31 Jan 2008 00:20:04 GMT Message-Id: <200801310020.m0V0K4iw029711@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134513 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 00:20:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=134513 Change 134513 by jb@jb_freebsd1 on 2008/01/31 00:19:42 Buffer my printf thanks. I don't speak gobbledy-gook. Affected files ... .. //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#4 edit Differences ... ==== //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#4 (text+ko) ==== @@ -62,6 +62,7 @@ options ADAPTIVE_GIANT # Giant mutex is adaptive. options STOP_NMI # Stop CPUS using NMI instead of IPI options AUDIT # Security event auditing +options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. options KDTRACE_HOOKS # Kernel DTrace hooks # Make an SMP-capable kernel by default From owner-p4-projects@FreeBSD.ORG Thu Jan 31 03:54:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5092A16A421; Thu, 31 Jan 2008 03:54:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2CB816A418 for ; Thu, 31 Jan 2008 03:54:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DCBA513C442 for ; Thu, 31 Jan 2008 03:54:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0V3stqc053054 for ; Thu, 31 Jan 2008 03:54:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V3steh053051 for perforce@freebsd.org; Thu, 31 Jan 2008 03:54:55 GMT (envelope-from jb@freebsd.org) Date: Thu, 31 Jan 2008 03:54:55 GMT Message-Id: <200801310354.m0V3steh053051@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134520 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 03:54:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=134520 Change 134520 by jb@jb_freebsd1 on 2008/01/31 03:54:13 When looking for a DW_AT_type and one doesn't exist in the specified DIE, there is probably a DW_AT_abstract_origin which will give us what we were looking for. Affected files ... .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_attrval.c#3 edit .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_die.c#3 edit .. //depot/projects/dtrace7/src/lib/libdwarf/libdwarf.h#2 edit Differences ... ==== //depot/projects/dtrace7/src/lib/libdwarf/dwarf_attrval.c#3 (text+ko) ==== @@ -209,10 +209,42 @@ *valp = 0; - if ((av = dwarf_attrval_find(die, attr)) == NULL) { + if ((av = dwarf_attrval_find(die, attr)) == NULL && attr != DW_AT_type) { DWARF_SET_ERROR(err, DWARF_E_NO_ENTRY); ret = DWARF_E_NO_ENTRY; - } else { + } else if (av == NULL && (av = dwarf_attrval_find(die, + DW_AT_abstract_origin)) != NULL) { + Dwarf_Die die1; + Dwarf_Unsigned val; + + switch (av->av_form) { + case DW_FORM_data1: + case DW_FORM_data2: + case DW_FORM_data4: + case DW_FORM_data8: + case DW_FORM_ref1: + case DW_FORM_ref2: + case DW_FORM_ref4: + case DW_FORM_ref8: + case DW_FORM_ref_udata: + val = av->u[0].u64; + + if ((die1 = dwarf_die_find(die, val)) == NULL || + (av = dwarf_attrval_find(die1, attr)) == NULL) { + DWARF_SET_ERROR(err, DWARF_E_NO_ENTRY); + ret = DWARF_E_NO_ENTRY; + } + break; + default: + printf("%s(%d): av->av_form '%s' (0x%lx) not handled\n", + __func__,__LINE__,get_form_desc(av->av_form), + (u_long) av->av_form); + DWARF_SET_ERROR(err, DWARF_E_BAD_FORM); + ret = DWARF_E_BAD_FORM; + } + } + + if (ret == DWARF_E_NONE) { switch (av->av_form) { case DW_FORM_data1: case DW_FORM_data2: ==== //depot/projects/dtrace7/src/lib/libdwarf/dwarf_die.c#3 (text+ko) ==== @@ -175,3 +175,17 @@ return ret; } + +Dwarf_Die +dwarf_die_find(Dwarf_Die die, Dwarf_Unsigned off) +{ + Dwarf_CU cu = die->die_cu; + Dwarf_Die die1; + + STAILQ_FOREACH(die1, &cu->cu_die, die_next) { + if ((off_t) die1->die_offset == off) + return (die1); + } + + return (NULL); +} ==== //depot/projects/dtrace7/src/lib/libdwarf/libdwarf.h#2 (text+ko) ==== @@ -114,6 +114,7 @@ __BEGIN_DECLS Dwarf_Abbrev dwarf_abbrev_find(Dwarf_CU, uint64_t); Dwarf_AttrValue dwarf_attrval_find(Dwarf_Die, Dwarf_Half); +Dwarf_Die dwarf_die_find(Dwarf_Die, Dwarf_Unsigned); const char *dwarf_errmsg(Dwarf_Error *); const char *get_sht_desc(uint32_t); const char *get_attr_desc(uint32_t); From owner-p4-projects@FreeBSD.ORG Thu Jan 31 06:18:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 410E916A41B; Thu, 31 Jan 2008 06:18:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0663016A418 for ; Thu, 31 Jan 2008 06:18:32 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C9F7D13C467 for ; Thu, 31 Jan 2008 06:18:31 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0V6IVOx074562 for ; Thu, 31 Jan 2008 06:18:31 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V6IVfw074559 for perforce@freebsd.org; Thu, 31 Jan 2008 06:18:31 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 31 Jan 2008 06:18:31 GMT Message-Id: <200801310618.m0V6IVfw074559@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134524 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 06:18:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=134524 Change 134524 by kmacy@kmacy:storage:toehead on 2008/01/31 06:18:02 enable ALT_BREAK_TO_DEBUGGER Affected files ... .. //depot/projects/toehead/sys/amd64/conf/GENERIC#4 edit Differences ... ==== //depot/projects/toehead/sys/amd64/conf/GENERIC#4 (text+ko) ==== @@ -310,3 +310,7 @@ device fwip # IP over FireWire (RFC 2734,3146) device dcons # Dumb console driver device dcons_crom # Configuration ROM for dcons + + +options ALT_BREAK_TO_DEBUGGER + From owner-p4-projects@FreeBSD.ORG Thu Jan 31 06:18:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8EB1F16A524; Thu, 31 Jan 2008 06:18:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 15C0E16A419 for ; Thu, 31 Jan 2008 06:18:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F307313C468 for ; Thu, 31 Jan 2008 06:18:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0V6IVH5074568 for ; Thu, 31 Jan 2008 06:18:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V6IVeJ074565 for perforce@freebsd.org; Thu, 31 Jan 2008 06:18:31 GMT (envelope-from sam@freebsd.org) Date: Thu, 31 Jan 2008 06:18:31 GMT Message-Id: <200801310618.m0V6IVeJ074565@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 06:18:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=134525 Change 134525 by sam@sam_ebb on 2008/01/31 06:18:26 sanity-check the country ie before parsing Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_scan.c#14 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_scan.c#14 (text+ko) ==== @@ -1020,6 +1020,10 @@ (const struct ieee80211_country_ie *) ie; int i, nbands, schan, nchan; + if (cie->len < 3) { + printf(" ", cie->len); + return; + } printf(" country [%c%c%c", cie->cc[0], cie->cc[1], cie->cc[2]); nbands = (cie->len - 3) / sizeof(cie->band[0]); for (i = 0; i < nbands; i++) { From owner-p4-projects@FreeBSD.ORG Thu Jan 31 06:19:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7991116A468; Thu, 31 Jan 2008 06:19:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D6F316A417 for ; Thu, 31 Jan 2008 06:19:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 26C0213C45D for ; Thu, 31 Jan 2008 06:19:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0V6JXF8074592 for ; Thu, 31 Jan 2008 06:19:33 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V6JXDE074589 for perforce@freebsd.org; Thu, 31 Jan 2008 06:19:33 GMT (envelope-from sam@freebsd.org) Date: Thu, 31 Jan 2008 06:19:33 GMT Message-Id: <200801310619.m0V6JXDE074589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 06:19:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=134526 Change 134526 by sam@sam_ebb on 2008/01/31 06:19:16 validate the country ie length to make sure we have at least the cc data that is blindly accessed in the scan module; should also allow code to safely parse the band list Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_input.c#25 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_input.c#25 (text+ko) ==== @@ -698,6 +698,17 @@ vap->iv_stats.is_rx_badbintval++; scan->status |= IEEE80211_BPARSE_BINTVAL_INVALID; } + if (scan->country != NULL) { + /* + * Validate we have at least enough data to extract + * the country code. Not sure if we should return an + * error instead of discarding the IE; consider this + * being lenient as we don't depend on the data for + * correct operation. + */ + IEEE80211_VERIFY_LENGTH(scan->country[1], 3 * sizeof(uint8_t), + scan->country = NULL); + } /* * Process HT ie's. This is complicated by our * accepting both the standard ie's and the pre-draft From owner-p4-projects@FreeBSD.ORG Thu Jan 31 06:21:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C327616A420; Thu, 31 Jan 2008 06:21:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6EF6516A417 for ; Thu, 31 Jan 2008 06:21:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5763813C4EA for ; Thu, 31 Jan 2008 06:21:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0V6LZB4074744 for ; Thu, 31 Jan 2008 06:21:35 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V6LZWH074741 for perforce@freebsd.org; Thu, 31 Jan 2008 06:21:35 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 31 Jan 2008 06:21:35 GMT Message-Id: <200801310621.m0V6LZWH074741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134527 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 06:21:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=134527 Change 134527 by kmacy@kmacy:storage:toehead on 2008/01/31 06:21:26 fix ppod setup, rcv_wnd setting, locking on calls handle_excess_rx, accounting for copied_seq, and socket ddp initialization Affected files ... .. //depot/projects/toehead/sys/dev/cxgb/cxgb_offload.c#3 edit .. //depot/projects/toehead/sys/dev/cxgb/cxgb_sge.c#6 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#11 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#12 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#4 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_defs.h#4 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 edit Differences ... ==== //depot/projects/toehead/sys/dev/cxgb/cxgb_offload.c#3 (text+ko) ==== @@ -380,6 +380,8 @@ struct iff_mac *iffmacp; struct ddp_params *ddpp; struct adap_ports *ports; + struct ofld_page_info *rx_page_info; + struct tp_params *tp = &adapter->params.tp; int port; switch (req) { @@ -444,6 +446,11 @@ case FAILOVER_CLEAR: t3_failover_clear(adapter); break; + case GET_RX_PAGE_INFO: + rx_page_info = data; + rx_page_info->page_size = tp->rx_pg_size; + rx_page_info->num = tp->rx_num_pgs; + break; case ULP_ISCSI_GET_PARAMS: case ULP_ISCSI_SET_PARAMS: if (!offload_running(adapter)) ==== //depot/projects/toehead/sys/dev/cxgb/cxgb_sge.c#6 (text+ko) ==== @@ -73,7 +73,11 @@ #endif int txq_fills = 0; -static int recycle_enable = 1; +/* + * XXX don't re-enable this until TOE stops assuming + * we have an m_ext + */ +static int recycle_enable = 0; extern int cxgb_txq_buf_ring_size; int cxgb_cached_allocations; int cxgb_cached; ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#11 (text+ko) ==== @@ -1052,10 +1052,9 @@ /* * Determine the receive window size for a socket. */ -static unsigned int -select_rcv_wnd(struct socket *so) +static unsigned long +select_rcv_wnd(struct toedev *dev, struct socket *so) { - struct toedev *dev = TOE_DEV(so); struct tom_data *d = TOM_DATA(dev); unsigned int wnd; unsigned int max_rcv_wnd; @@ -1063,7 +1062,9 @@ if (tcp_do_autorcvbuf) wnd = tcp_autorcvbuf_max; else - wnd = sbspace(&so->so_rcv); + wnd = so->so_rcv.sb_hiwat; + + /* XXX * For receive coalescing to work effectively we need a receive window @@ -1076,8 +1077,14 @@ max_rcv_wnd = (dev->tod_ttid == TOE_ID_CHELSIO_T3B ? (uint32_t)d->rx_page_size * 23 : MAX_RCV_WND); - - return min(wnd, max_rcv_wnd); + + if (wnd > max_rcv_wnd) + wnd = max_rcv_wnd; + + printf("tcp_autorcvbuf_max=%d hiwat=%d min_win=%d max_win=%d returned=%d\n", + tcp_autorcvbuf_max, so->so_rcv.sb_hiwat, MIN_RCV_WND, MAX_RCV_WND, wnd); + + return ((unsigned long) wnd); } /* @@ -1116,7 +1123,7 @@ * XXX broken * */ - tp->rcv_wnd = select_rcv_wnd(so); + tp->rcv_wnd = select_rcv_wnd(dev, so); toep->tp_ulp_mode = TOM_TUNABLE(dev, ddp) && !(so->so_options & SO_NO_DDP) && tp->rcv_wnd >= MIN_DDP_RCV_WIN ? ULP_MODE_TCPDDP : 0; toep->tp_qset_idx = 0; @@ -1775,7 +1782,6 @@ handle_ddp_data(struct toepcb *toep, struct mbuf *m) { struct tcpcb *tp = toep->tp_tp; - struct socket *so; struct ddp_state *q; struct ddp_buf_state *bsp; struct cpl_rx_data *hdr = cplhdr(m); @@ -1806,10 +1812,6 @@ bsp->cur_offset += m->m_pkthdr.len; if (!(bsp->flags & DDP_BF_NOFLIP)) q->cur_buf ^= 1; - tp->t_rcvtime = ticks; - - so = toeptoso(toep); - sbappend(&so->so_rcv, m); /* * For now, don't re-enable DDP after a connection fell out of DDP * mode. @@ -1837,7 +1839,7 @@ return; } - if (toep->tp_ulp_mode == ULP_MODE_TCPDDP) + if (toep->tp_ulp_mode == ULP_MODE_TCPDDP && toep->tp_ddp_state.kbuf[0]) handle_ddp_data(toep, m); m->m_seq = ntohl(hdr->seq); @@ -1939,7 +1941,11 @@ struct socket *so = toeptoso(toep); if (__predict_false(so_no_receive(so))) { + struct inpcb *inp = sotoinpcb(so); + + INP_LOCK(inp); handle_excess_rx(toep, m); + INP_UNLOCK(inp); return; } @@ -2056,7 +2062,11 @@ unsigned int ddp_report, buf_idx, when; if (__predict_false(so_no_receive(so))) { + struct inpcb *inp = sotoinpcb(so); + + INP_LOCK(inp); handle_excess_rx(toep, m); + INP_UNLOCK(inp); return; } TRACE_ENTER; @@ -3044,14 +3054,15 @@ newtoep->tp_flags = TP_SYN_RCVD; newtoep->tp_tid = tid; newtoep->tp_toedev = tdev; + tp->rcv_wnd = select_rcv_wnd(tdev, so); - printf("inserting tid=%d\n", tid); + printf("inserting tid=%d rcv_wnd=%ld\n", tid, tp->rcv_wnd); cxgb_insert_tid(cdev, d->client, newtoep, tid); SOCK_LOCK(so); LIST_INSERT_HEAD(&lctx->synq_head, newtoep, synq_entry); SOCK_UNLOCK(so); - +#ifdef notyet if (lctx->ulp_mode) { ddp_mbuf = m_gethdr(M_NOWAIT, MT_DATA); @@ -3060,7 +3071,22 @@ else newtoep->tp_ulp_mode = lctx->ulp_mode; } +#else + newtoep->tp_ulp_mode = TOM_TUNABLE(tdev, ddp) && /* !sock_flag(sk, NO_DDP) && */ + tp->rcv_wnd >= MIN_DDP_RCV_WIN ? ULP_MODE_TCPDDP : 0; + printf("ddp=%d rcv_wnd=%ld min_win=%d\n", + TOM_TUNABLE(tdev, ddp), tp->rcv_wnd, MIN_DDP_RCV_WIN); + + if (newtoep->tp_ulp_mode) { + ddp_mbuf = m_gethdr(M_NOWAIT, MT_DATA); + + if (ddp_mbuf == NULL) + newtoep->tp_ulp_mode = 0; + } + +#endif + set_arp_failure_handler(reply_mbuf, pass_accept_rpl_arp_failure); DPRINTF("adding request to syn cache\n"); @@ -3342,7 +3368,7 @@ toep->tp_flags = 0; tp->t_toe = toep; reset_wr_list(toep); - tp->rcv_wnd = select_rcv_wnd(so); + tp->rcv_wnd = select_rcv_wnd(tdev, so); DPRINTF("rcv_wnd=%ld\n", tp->rcv_wnd); install_offload_ops(so); @@ -3725,7 +3751,6 @@ const struct tom_data *td = TOM_DATA(TOE_DEV(so)); unsigned int ppod_addr = tag * PPOD_SIZE + td->ddp_llimit; - TRACE_ENTER; for (i = 0; i < nppods; ++i) { m = m_gethdr_nofail(sizeof(*req) + PPOD_SIZE); m_set_priority(m, mkprio(CPL_PRIORITY_CONTROL, toep)); @@ -3753,8 +3778,6 @@ send_or_defer(toep, m, 0); ppod_addr += PPOD_SIZE; } - - TRACE_EXIT; return (0); } @@ -3975,7 +3998,6 @@ struct work_request_hdr *wr; struct cpl_set_tcb_field *req; - TRACE_ENTER; wrlen = sizeof(*wr) + sizeof(*req) + (len0 ? sizeof(*req) : 0) + (len1 ? sizeof(*req) : 0) + (modulate ? sizeof(struct cpl_rx_data_ack) : 0); @@ -4021,7 +4043,6 @@ #endif cxgb_ofld_send(TOEP_T3C_DEV(toep), m); - TRACE_EXIT; } void ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#12 (text+ko) ==== @@ -255,6 +255,11 @@ static int so_should_ddp(const struct toepcb *toep, int last_recv_len) { + + printf("ulp_mode=%d last_recv_len=%d ddp_thresh=%d rcv_wnd=%ld ddp_copy_limit=%d\n", + toep->tp_ulp_mode, last_recv_len, TOM_TUNABLE(toep->tp_toedev, ddp_thres), + toep->tp_tp->rcv_wnd, (TOM_TUNABLE(toep->tp_toedev, ddp_copy_limit) + DDP_RSVD_WIN)); + return toep->tp_ulp_mode == ULP_MODE_TCPDDP && (toep->tp_ddp_state.kbuf[0] == NULL) && last_recv_len > TOM_TUNABLE(toep->tp_toedev, ddp_thres) && toep->tp_tp->rcv_wnd > @@ -276,28 +281,37 @@ static int m_uiomove(const struct mbuf *m, int offset, int len, struct uio *uio) { - int curlen, err = 0; + int curlen, startlen, resid_init, err = 0; caddr_t buf; - + + DPRINTF("m_uiomove(m=%p, offset=%d, len=%d, ...)\n", + m, offset, len); + + startlen = len; + resid_init = uio->uio_resid; while (m && len) { buf = mtod(m, caddr_t); curlen = m->m_len; - if (offset < curlen) { + if (offset && (offset < curlen)) { curlen -= offset; buf += offset; offset = 0; - } else { + } else if (offset) { offset -= curlen; m = m->m_next; continue; } + err = uiomove(buf, min(len, curlen), uio); + if (err) { + printf("uiomove_frombuf returned %d\n", err); + return (err); + } - err = uiomove_frombuf(buf, min(len, curlen), uio); - if (err) - return (err); - len -= min(len, m->m_len); + len -= min(len, curlen); m = m->m_next; } + DPRINTF("copied %d bytes - resid_init=%d uio_resid=%d\n", + startlen - len, resid_init, uio->uio_resid); return (err); } @@ -310,16 +324,24 @@ copy_data(const struct mbuf *m, int offset, int len, struct uio *uio) { struct iovec *to = uio->uio_iov; + int err; + - if (__predict_true(!is_ddp(m))) /* RX_DATA */ + if (__predict_true(!is_ddp(m))) { /* RX_DATA */ return m_uiomove(m, offset, len, uio); - if (__predict_true(m->m_ddp_flags & DDP_BF_NOCOPY)) { /* user DDP */ + } if (__predict_true(m->m_ddp_flags & DDP_BF_NOCOPY)) { /* user DDP */ + TRACE_ENTER; to->iov_len -= len; to->iov_base = ((caddr_t)to->iov_base) + len; uio->uio_iov = to; + uio->uio_resid -= len; + TRACE_EXIT; return (0); } - return t3_ddp_copy(m, offset, uio, len); /* kernel DDP */ + TRACE_ENTER; + err = t3_ddp_copy(m, offset, uio, len); /* kernel DDP */ + TRACE_EXIT; + return (err); } static void @@ -508,6 +530,9 @@ } + +#define IS_NONBLOCKING(so) ((so)->so_state & SS_NBIO) + static int t3_soreceive(struct socket *so, int *flagsp, struct uio *uio) { @@ -515,18 +540,21 @@ struct toepcb *toep = tp->t_toe; struct mbuf *m; uint32_t offset; - int err, flags, avail, len, buffers_freed = 0, copied = 0; + int err, flags, avail, len, buffers_freed, copied, copied_unacked; int target; /* Read at least this many bytes */ int user_ddp_ok, user_ddp_pending = 0; struct ddp_state *p; struct inpcb *inp = sotoinpcb(so); - + + + copied = copied_unacked = buffers_freed = 0; flags = flagsp ? (*flagsp &~ MSG_EOR) : 0; err = sblock(&so->so_rcv, SBLOCKWAIT(flags)); + if (err) return (err); - TRACE_ENTER; + SOCKBUF_LOCK(&so->so_rcv); restart: len = uio->uio_resid; @@ -572,13 +600,14 @@ t3_cleanup_rbuf(tp); INP_UNLOCK(inp); SOCKBUF_LOCK(&so->so_rcv); + copied_unacked = 0; goto restart; } if (p->ubuf && user_ddp_ok && !user_ddp_pending && uio->uio_iov->iov_len > p->kbuf[0]->dgl_length && p->ubuf_ddp_ready) { user_ddp_pending = - !t3_overlay_ubuf(so, uio, (so->so_state & SS_NBIO), flags); + !t3_overlay_ubuf(so, uio, IS_NONBLOCKING(so), flags); if (user_ddp_pending) { p->kbuf_posted++; user_ddp_ok = 0; @@ -588,6 +617,7 @@ /* One shot at DDP if we already have enough data */ if (copied >= target) user_ddp_ok = 0; + printf("sbwaiting 1\n"); if ((err = sbwait(&so->so_rcv)) != 0) goto done; //for timers to work await_ddp_completion(sk, flags, &timeo); @@ -598,7 +628,10 @@ INP_LOCK(inp); t3_cleanup_rbuf(tp); INP_UNLOCK(inp); - SOCKBUF_LOCK(&so->so_rcv); + SOCKBUF_LOCK(&so->so_rcv); + copied_unacked = 0; + printf("sbwaiting 2\n"); + if ((err = sbwait(&so->so_rcv)) != 0) goto done; } @@ -612,10 +645,12 @@ m = so->so_rcv.sb_mb = m_free(m); goto done; } - offset = toep->tp_copied_seq - m->m_seq + 1 /* OFF by one somewhere :-{ */; + offset = toep->tp_copied_seq + copied_unacked - m->m_seq + 1 /* OFF by one somewhere :-{ */; + DPRINTF("m=%p copied_seq=0x%x copied_unacked=%d m_seq=0x%x offset=%d\n", + m, toep->tp_copied_seq, copied_unacked, m->m_seq, offset); if (offset >= m->m_pkthdr.len) - panic("t3_soreceive: BUG: OFFSET > LEN offset %d copied_seq 0x%x seq 0x%x " - "pktlen %d ddp flags 0x%x", offset, toep->tp_copied_seq, m->m_seq, + panic("t3_soreceive: OFFSET >= LEN offset %d copied_seq 0x%x seq 0x%x " + "pktlen %d ddp flags 0x%x", offset, toep->tp_copied_seq + copied_unacked, m->m_seq, m->m_pkthdr.len, m->m_ddp_flags); avail = m->m_pkthdr.len - offset; if (len < avail) { @@ -630,7 +665,7 @@ * first and we are not delivering urgent data inline. */ if (__predict_false(toep->tp_urg_data)) { - uint32_t urg_offset = tp->rcv_up - tp->copied_seq; + uint32_t urg_offset = tp->rcv_up - tp->copied_seq + copied_unacked; if (urg_offset < avail) { if (urg_offset) { @@ -672,19 +707,28 @@ * If MSG_TRUNC is specified the data is discarded. * XXX need to check pr_atomic */ - if (__predict_true(!(flags & MSG_TRUNC))) + if (__predict_true(!(flags & MSG_TRUNC))) { + int resid = uio->uio_resid; + SOCKBUF_UNLOCK(&so->so_rcv); if ((err = copy_data(m, offset, avail, uio))) { if (err) err = EFAULT; - goto done; + goto done_unlocked; } - - toep->tp_copied_seq += avail; + SOCKBUF_LOCK(&so->so_rcv); + if (!(resid > uio->uio_resid)) + printf("copied zero bytes :-/ resid=%d uio_resid=%d copied=%d copied_unacked=%d\n", + resid, uio->uio_resid, copied, copied_unacked); + } + + sbdrop_locked(&so->so_rcv, avail); + buffers_freed++; copied += avail; + copied_unacked += avail; len -= avail; #ifdef URGENT_DATA_SUPPORTED skip_copy: - if (tp->urg_data && after(tp->copied_seq, tp->urg_seq)) + if (tp->urg_data && after(tp->copied_seq + copied_unacked, tp->urg_seq)) tp->urg_data = 0; #endif /* @@ -706,9 +750,6 @@ p->ubuf_ddp_ready = 1; } } - sbfree(&so->so_rcv, m); - m = so->so_rcv.sb_mb = m_free(m); /* XXX need to clean mbuf first */ - buffers_freed++; if ((so->so_rcv.sb_mb == NULL) && got_psh) goto done; @@ -733,7 +774,7 @@ } user_ddp_pending = 0; } - if (p->kbuf_posted == 0) { + if ((p->kbuf[0] != NULL) && (p->kbuf_posted == 0)) { #ifdef T3_TRACE T3_TRACE0(TIDTB(so), "chelsio_recvmsg: about to exit, repost kbuf"); @@ -741,15 +782,19 @@ t3_post_kbuf(so, 1); p->kbuf_posted++; - } else if (so_should_ddp(toep, copied)) { + } else if (so_should_ddp(toep, copied) +#ifdef notyet + && !IS_NONBLOCKING(so) +#endif + ) { printf("entering ddp\n"); t3_enter_ddp(so, TOM_TUNABLE(TOE_DEV(so), ddp_copy_limit), 0); p->kbuf_posted = 1; - } + } else + printf("user_ddp_pending=%d kbuf[0]=%p kbuf_posted=%d so_should_ddp=%d\n", + user_ddp_pending, p->kbuf[0], p->kbuf_posted, so_should_ddp(toep, copied)); } - if (buffers_freed) - t3_cleanup_rbuf(tp); #ifdef T3_TRACE T3_TRACE5(TIDTB(so), "chelsio_recvmsg <-: copied %d len %d buffers_freed %d " @@ -758,9 +803,15 @@ user_ddp_pending); #endif SOCKBUF_UNLOCK(&so->so_rcv); +done_unlocked: + if (copied) { + INP_LOCK(inp); + t3_cleanup_rbuf(tp); + INP_UNLOCK(inp); + } + sbunlock(&so->so_rcv); - TRACE_EXIT; return (err); } @@ -808,10 +859,6 @@ return (rv); } } - if (uio->uio_resid > PAGE_SIZE) - printf("flags=0x%x nonblocking=0x%x iovcnt=%d mp0=%p uio_resid=%d \n", - flags, !!(so->so_state && SS_NBIO), uio->uio_iovcnt, mp0, uio->uio_resid); - return pru_soreceive(so, psa, uio, mp0, controlp, flagsp); } ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#4 (text+ko) ==== @@ -568,9 +568,11 @@ if (p->kbuf[idx] == NULL) goto err; err = t3_alloc_ppods(d, nppods, &p->kbuf_tag[idx]); - if (err) + if (err) { + printf("t3_alloc_ppods failed err=%d\n", err); goto err; - + } + p->kbuf_nppods[idx] = nppods; p->kbuf[idx]->dgl_length = kbuf_size; p->kbuf[idx]->dgl_offset = 0; @@ -582,6 +584,7 @@ VM_ALLOC_ZERO); if (p->kbuf[idx]->dgl_pages[i] == NULL) { p->kbuf[idx]->dgl_nelem = i; + printf("failed to allocate kbuf pages\n"); goto err; } } @@ -623,13 +626,15 @@ { int page_off; struct ddp_gather_list *gl = (struct ddp_gather_list *)m->m_ddp_gl; - + + TRACE_ENTER; if (!gl->dgl_pages) panic("pages not set\n"); offset += gl->dgl_offset + m->m_cur_offset; page_off = offset & ~PAGE_MASK; + TRACE_EXIT; return uiomove_fromphys(gl->dgl_pages, page_off, len, uio); } @@ -641,8 +646,10 @@ { unsigned int i, j; - if (__predict_false(!td->ppod_map)) + if (__predict_false(!td->ppod_map)) { + printf("ppod_map not set\n"); return (EINVAL); + } mtx_lock(&td->ppod_map_lock); for (i = 0; i < td->nppods; ) { ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_defs.h#4 (text+ko) ==== @@ -40,8 +40,8 @@ #define toeptoso(toep) ((toep)->tp_tp->t_inpcb->inp_socket) #define sototoep(so) (sototcpcb((so))->t_toe) -#define TRACE_ENTER printf("%s:%s entered", __FUNCTION__, __FILE__) -#define TRACE_EXIT printf("%s:%s:%d exited", __FUNCTION__, __FILE__, __LINE__) +#define TRACE_ENTER printf("%s:%s entered\n", __FUNCTION__, __FILE__) +#define TRACE_EXIT printf("%s:%s:%d exited\n", __FUNCTION__, __FILE__, __LINE__) ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 (text+ko) ==== @@ -376,14 +376,12 @@ t->ddp_ulimit = ddp.ulimit; t->pdev = ddp.pdev; t->rx_page_size = rx_page_info.page_size; -#ifdef notyet /* OK if this fails, we just can't do DDP */ t->nppods = (ddp.ulimit + 1 - ddp.llimit) / PPOD_SIZE; - t->ppod_map = t3_alloc_mem(t->nppods); -#endif + t->ppod_map = malloc(t->nppods, M_DEVBUF, M_WAITOK); + mtx_init(&t->ppod_map_lock, "ppod map", NULL, MTX_DEF); #if 0 - spin_lock_init(&t->ppod_map_lock); tom_proc_init(dev); #ifdef CONFIG_SYSCTL t->sysctl = t3_sysctl_register(dev, &t->conf); From owner-p4-projects@FreeBSD.ORG Thu Jan 31 07:01:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4977C16A49A; Thu, 31 Jan 2008 07:01:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D535C16A417 for ; Thu, 31 Jan 2008 07:01:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BDAFA13C4D3 for ; Thu, 31 Jan 2008 07:01:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0V71KF4076186 for ; Thu, 31 Jan 2008 07:01:20 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V71KjK076183 for perforce@freebsd.org; Thu, 31 Jan 2008 07:01:20 GMT (envelope-from imp@freebsd.org) Date: Thu, 31 Jan 2008 07:01:20 GMT Message-Id: <200801310701.m0V71KjK076183@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134530 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 07:01:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=134530 Change 134530 by imp@imp_lighthouse on 2008/01/31 07:01:02 No need to test for both _LOCORE and __ASSEMBLER__, the latter suffices. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/_types.h#8 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/_types.h#8 (text+ko) ==== @@ -102,24 +102,27 @@ typedef __int16_t __int_least16_t; typedef __int32_t __int_least32_t; typedef __int64_t __int_least64_t; +#if defined(__mips64) || defined(ISA_MIPS64) +typedef __int64_t __register_t; +typedef __int64_t f_register_t; +#else +typedef __int32_t __register_t; +typedef __int32_t f_register_t; +#endif #ifdef __mips64 typedef __int64_t __ptrdiff_t; -typedef __int64_t __register_t; typedef __int64_t __segsz_t; typedef __uint64_t __size_t; typedef __int64_t __ssize_t; typedef __uint64_t __uintfptr_t; typedef __uint64_t __uintptr_t; -typedef __int64_t f_register_t; #else typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */ -typedef __int32_t __register_t; typedef __int32_t __segsz_t; /* segment size (in pages) */ typedef __uint32_t __size_t; /* sizeof() */ typedef __int32_t __ssize_t; /* byte count or error */ typedef __uint32_t __uintfptr_t; typedef __uint32_t __uintptr_t; -typedef __int32_t f_register_t; #endif typedef __int64_t __time_t; /* time()... */ typedef __uint64_t __uintmax_t; @@ -131,7 +134,7 @@ typedef __uint16_t __uint_least16_t; typedef __uint32_t __uint_least32_t; typedef __uint64_t __uint_least64_t; -#ifdef __mips64 +#if defined(__mips64) || defined(ISA_MIPS64) typedef __uint64_t __u_register_t; typedef __uint64_t __vm_offset_t; typedef __uint64_t __vm_paddr_t; From owner-p4-projects@FreeBSD.ORG Thu Jan 31 07:02:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 770A216A420; Thu, 31 Jan 2008 07:02:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C30416A418 for ; Thu, 31 Jan 2008 07:02:22 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 24EB913C46A for ; Thu, 31 Jan 2008 07:02:22 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0V72Mhu076244 for ; Thu, 31 Jan 2008 07:02:22 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V72LJt076241 for perforce@freebsd.org; Thu, 31 Jan 2008 07:02:21 GMT (envelope-from imp@freebsd.org) Date: Thu, 31 Jan 2008 07:02:21 GMT Message-Id: <200801310702.m0V72LJt076241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134531 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 07:02:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=134531 Change 134531 by imp@imp_lighthouse on 2008/01/31 07:01:48 No need to test for both _LOCORE and __ASSEMBLER. The latter suffices. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/endian.h#9 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/endian.h#9 (text+ko) ==== @@ -69,8 +69,7 @@ #define BYTE_ORDER _BYTE_ORDER #endif -#ifndef LOCORE -#ifndef __ASSEMBLER__ +#ifndef __ASSEMBLER__ #if defined(__GNUCLIKE_BUILTIN_CONSTANT_P) && defined(__OPTIMIZE__) #define __is_constant(x) __builtin_constant_p(x) #else @@ -140,8 +139,7 @@ #define __htons(x) (__bswap16((x))) #endif /* _MIPSEB */ -#endif /* __ASSEMBLER__ */ -#endif /* LOCORE */ +#endif /* _ASSEMBLER_ */ #ifdef __cplusplus } From owner-p4-projects@FreeBSD.ORG Thu Jan 31 07:05:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F189C16A41A; Thu, 31 Jan 2008 07:05:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9EE0F16A418 for ; Thu, 31 Jan 2008 07:05:25 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8769D13C465 for ; Thu, 31 Jan 2008 07:05:25 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0V75Pn5077528 for ; Thu, 31 Jan 2008 07:05:25 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V75P3v077525 for perforce@freebsd.org; Thu, 31 Jan 2008 07:05:25 GMT (envelope-from imp@freebsd.org) Date: Thu, 31 Jan 2008 07:05:25 GMT Message-Id: <200801310705.m0V75P3v077525@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134532 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 07:05:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=134532 Change 134532 by imp@imp_lighthouse on 2008/01/31 07:04:55 Save 32-bits only on ISA_MIPS32. Save 64 on MIPS64. Even if you are running a 32-bit kernel, you'll need to save 64-bits of registers because the kernel dereferences 64-bit addresses when it is writing to the octeon hardware. This is likely to be typical of all 64-bit machines, so base it off of ISA_MIPS64. There's a hack in types.h that uses ISA_MIPS64 to define a few things, but I'm not sure that's right since this file is exported to userland. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#9 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#9 (text+ko) ==== @@ -243,14 +243,16 @@ * *---------------------------------------------------------------------------- */ -#ifndef MIPS_ISAIII +#if defined(ISA_MIPS32) #define STORE sw /* 32 bit mode regsave instruction */ #define LOAD lw /* 32 bit mode regload instruction */ #define RSIZE 4 /* 32 bit mode register size */ -#else +#elif defined(ISA_MIPS64) #define STORE sd /* 64 bit mode regsave instruction */ #define LOAD ld /* 64 bit mode regload instruction */ #define RSIZE 8 /* 64 bit mode register size */ +#else +#error "Please write code for this isa." #endif #define SAVE_REG(reg, offs, base) \ From owner-p4-projects@FreeBSD.ORG Thu Jan 31 07:17:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A404D16A41A; Thu, 31 Jan 2008 07:17:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 518CB16A417 for ; Thu, 31 Jan 2008 07:17:38 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 39B9913C457 for ; Thu, 31 Jan 2008 07:17:38 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0V7Hck3078824 for ; Thu, 31 Jan 2008 07:17:38 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V7HcgB078821 for perforce@freebsd.org; Thu, 31 Jan 2008 07:17:38 GMT (envelope-from imp@freebsd.org) Date: Thu, 31 Jan 2008 07:17:38 GMT Message-Id: <200801310717.m0V7HcgB078821@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134533 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 07:17:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=134533 Change 134533 by imp@imp_lighthouse on 2008/01/31 07:16:56 __MIPSEB__ rather than _MIPSEB seems to be what is defined. Another needless LOCORE Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/endian.h#10 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/endian.h#10 (text+ko) ==== @@ -34,11 +34,9 @@ #define _MACHINE_ENDIAN_H_ #include -#ifndef _LOCORE #ifndef __ASSEMBLER__ #include #endif -#endif #ifdef __cplusplus extern "C" { @@ -52,11 +50,11 @@ #define _BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ #define _PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ -#ifdef _MIPSEB +#ifdef __MIPSEB__ #define _BYTE_ORDER _BIG_ENDIAN #else #define _BYTE_ORDER _LITTLE_ENDIAN -#endif /* _MIBSEB */ +#endif /* __MIBSEB__ */ /* * Deprecated variants that don't have enough underscores to be useful in more From owner-p4-projects@FreeBSD.ORG Thu Jan 31 07:41:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E01016A419; Thu, 31 Jan 2008 07:41:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B1E516A417 for ; Thu, 31 Jan 2008 07:41:04 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 12BDA13C442 for ; Thu, 31 Jan 2008 07:41:04 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0V7f3XK079735 for ; Thu, 31 Jan 2008 07:41:03 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V7f3TI079732 for perforce@freebsd.org; Thu, 31 Jan 2008 07:41:03 GMT (envelope-from imp@freebsd.org) Date: Thu, 31 Jan 2008 07:41:03 GMT Message-Id: <200801310741.m0V7f3TI079732@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134534 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 07:41:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=134534 Change 134534 by imp@imp_lighthouse on 2008/01/31 07:40:11 Make sure that frame.h and regnum.h match. There were two registers defiend in regnum.h that weren't in frame.h, which meant we were overwriting the FPU part of the frame structure. Since we had CPU_NOFPU defined, this didn't matter... It is still a bug and the down side of doing things the juniper way in frame.h. It looks prettier elsewere... Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/frame.h#4 edit .. //depot/projects/mips2-jnpr/src/sys/mips/include/regnum.h#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/frame.h#4 (text+ko) ==== @@ -79,8 +79,12 @@ /* * FREEBSD_DEVELOPERS_FIXME: * Include any other registers which are CPU-Specific and - * need to be part of the frame here + * need to be part of the frame here. + * + * Also, be sure this matches what is defined in regnum.h */ + register_t ic; /* RM7k and RM9k specific */ + register_t dummy; /* Alignment for 32-bit case */ /* From here and on, only saved user processes. */ @@ -117,6 +121,12 @@ f_register_t f30; f_register_t f31; register_t fsr; + + /* + * COP2 registers may need to be saved here based on the CPU, and those + * might need to be per process, or even for the kernel, so we need + * some thought here. + */ }; /* REVISIT */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/regnum.h#4 (text+ko) ==== @@ -48,7 +48,7 @@ /* * Location of the saved registers relative to ZERO. - * Usage is p->p_regs[XX]. + * This must match struct trapframe defined in frame.h exactly. */ #define ZERO 0 #define AST 1 From owner-p4-projects@FreeBSD.ORG Thu Jan 31 12:16:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 836B716A52C; Thu, 31 Jan 2008 12:16:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 302B916A502 for ; Thu, 31 Jan 2008 12:16:29 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from speedfactory.net (mail.speedfactory.net [66.23.216.219]) by mx1.freebsd.org (Postfix) with ESMTP id 9E57913C43E for ; Thu, 31 Jan 2008 12:16:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (unverified [66.23.211.162]) by speedfactory.net (SurgeMail 3.8s) with ESMTP id 230312693-1834499 for multiple; Thu, 31 Jan 2008 07:15:06 -0500 Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.14.2/8.14.2) with ESMTP id m0VCFpqd018988; Thu, 31 Jan 2008 07:16:20 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: John Birrell Date: Thu, 31 Jan 2008 06:31:54 -0500 User-Agent: KMail/1.9.7 References: <200801272148.m0RLmWdF053919@repoman.freebsd.org> <200801300913.03782.jhb@freebsd.org> <20080130205204.GA68541@what-creek.com> In-Reply-To: <20080130205204.GA68541@what-creek.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200801310631.54935.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Thu, 31 Jan 2008 07:16:20 -0500 (EST) X-Virus-Scanned: ClamAV 0.91.2/5622/Thu Jan 31 06:00:29 2008 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 134245 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 12:16:29 -0000 On Wednesday 30 January 2008 03:52:04 pm John Birrell wrote: > On Wed, Jan 30, 2008 at 09:13:03AM -0500, John Baldwin wrote: > > On Sunday 27 January 2008 04:48:32 pm John Birrell wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=134245 > > > > > > Change 134245 by jb@jb_freebsd1 on 2008/01/27 21:47:41 > > > > > > The linker lock here is private to code in this file. It is > > > never a problem with it being locked when any other combination > > > of locks are already obtained or even if *no* other locks are > > > obtained. Use SX_NOWITNESS to avoid bogus LOR reports. > > > > If witness reports a LOR it is real, it may just not be obvious. > > Here is some code that demonstrates the problem: > > > static struct mtx test_mtx; > MTX_SYSINIT(test, &test_mtx, "Test", MTX_DEF); > > static int > test_list(linker_file_t lf, void *arg) > { > printf("Linker file name: '%s'\n", lf->filename); > return (0); > } > > static void > test_thread_func(void *arg) > { > printf("\n\nI'm a big bad thread, but I'm going to wait a bit... stay tuned...\n"); > > pause("Waiting a bit...", 5000); > > printf("The big bad thread is awake and he wants to list the linker files...\n"); > > linker_file_foreach(test_list, NULL); > > printf("Lock my wide scope mutex because I have stuff to protect...\n"); > > mtx_lock(&test_mtx); > > printf("I've done some stuff that my wide scope lock protected, but now I need to list some linker files...\n"); > > linker_file_foreach(test_list, NULL); This acquires an sx lock (KLD_LOCK) while holding a mutex which isn't permitted as kris@ mentioned in his previous e-mail. Just make test_mtx an sx lock and witness should be fine. Either that or acquire your mutex in the function that linker_file_foreach() invokes rather than holding it while calling into the linker. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Thu Jan 31 13:49:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADE9716A421; Thu, 31 Jan 2008 13:49:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B5F816A418 for ; Thu, 31 Jan 2008 13:49:31 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 275F213C467 for ; Thu, 31 Jan 2008 13:49:31 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0VDnVue039089 for ; Thu, 31 Jan 2008 13:49:31 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0VDnUv6039086 for perforce@freebsd.org; Thu, 31 Jan 2008 13:49:30 GMT (envelope-from cognet@freebsd.org) Date: Thu, 31 Jan 2008 13:49:30 GMT Message-Id: <200801311349.m0VDnUv6039086@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 134545 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 13:49:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=134545 Change 134545 by cognet@hulglah on 2008/01/31 13:49:01 Use __MIPSEB__, not _MIPSEB Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/endian.h#11 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/endian.h#11 (text+ko) ==== @@ -115,7 +115,7 @@ #define __bswap64(x) (__uint64_t)(__is_constant(x) ? __bswap64_const(x) : \ __bswap64_var(x)) -#ifdef _MIPSEB +#ifdef __MIPSEB__ #define __htonl(x) ((__uint32_t)(x)) #define __htons(x) ((__uint16_t)(x)) #define __ntohl(x) ((__uint32_t)(x)) From owner-p4-projects@FreeBSD.ORG Thu Jan 31 14:08:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2BED16A468; Thu, 31 Jan 2008 14:08:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 789F416A418 for ; Thu, 31 Jan 2008 14:08:51 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4446E13C465 for ; Thu, 31 Jan 2008 14:08:51 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0VE8pow041068 for ; Thu, 31 Jan 2008 14:08:51 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0VE8pQY041065 for perforce@freebsd.org; Thu, 31 Jan 2008 14:08:51 GMT (envelope-from cognet@freebsd.org) Date: Thu, 31 Jan 2008 14:08:51 GMT Message-Id: <200801311408.m0VE8pQY041065@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 134546 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 14:08:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=134546 Change 134546 by cognet@hulglah on 2008/01/31 14:08:19 Define ELFDATA2LSB or ELFDATA2MSB depending on the target endianness. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/elf.h#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/elf.h#5 (text+ko) ==== @@ -151,7 +151,11 @@ /* Define "machine" characteristics */ #define ELF_TARG_CLASS ELFCLASS32 +#ifdef __MIPSEB__ #define ELF_TARG_DATA ELFDATA2MSB +#else +#define ELF_TARG_DATA ELFDATA2LSB +#endif #define ELF_TARG_MACH EM_MIPS #define ELF_TARG_VER 1 From owner-p4-projects@FreeBSD.ORG Thu Jan 31 15:32:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B942816A46E; Thu, 31 Jan 2008 15:32:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65A9216A419; Thu, 31 Jan 2008 15:32:14 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 0343B13C468; Thu, 31 Jan 2008 15:32:13 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id m0VFStWE007880; Thu, 31 Jan 2008 08:28:55 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Thu, 31 Jan 2008 08:29:54 -0700 (MST) Message-Id: <20080131.082954.1395413111.imp@bsdimp.com> To: grehan@freebsd.org From: "M. Warner Losh" In-Reply-To: <47A10F52.2090503@freebsd.org> References: <47A0BE7A.1030307@semihalf.com> <47A10F52.2090503@freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: yanegomi@gmail.com, raj@semihalf.com, xcllnt@mac.com, perforce@freebsd.org, marcel@freebsd.org Subject: Re: PERFORCE change 133911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 15:32:15 -0000 In message: <47A10F52.2090503@freebsd.org> Peter Grehan writes: : > sparc64 is apparently using this for libc connection (not sure if : > this is what Peter was referring to in one of the previous emails?), : : See libc/sparc64/sys/__sparc_utrap_setup.c for how the user-space trap : handlers are setup. Very nice. And it reminded me that PPC should really : migrate to having the signal trampoline be in libc ala sparc64 rather : than being copied out to and forcing the stack to be executable. mips too :-) Warner From owner-p4-projects@FreeBSD.ORG Thu Jan 31 15:37:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4279416A418; Thu, 31 Jan 2008 15:37:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E323416A46B for ; Thu, 31 Jan 2008 15:37:26 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C6B3A13C44B for ; Thu, 31 Jan 2008 15:37:26 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0VFbQPQ047718 for ; Thu, 31 Jan 2008 15:37:26 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0VFbPDa047715 for perforce@freebsd.org; Thu, 31 Jan 2008 15:37:25 GMT (envelope-from rrs@cisco.com) Date: Thu, 31 Jan 2008 15:37:25 GMT Message-Id: <200801311537.m0VFbPDa047715@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134549 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 15:37:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=134549 Change 134549 by rrs@rrs-mips2-jnpr on 2008/01/31 15:37:06 Pulls over the TARGET_OCTEON 128 bit cache line entry stuff Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/cache_mipsNN.h#2 edit .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpufunc.h#6 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cache.c#2 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cache_mipsNN.c#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/cache_mipsNN.h#2 (text+ko) ==== @@ -53,3 +53,13 @@ void mipsNN_pdcache_inv_range_32(vm_offset_t, vm_size_t); void mipsNN_pdcache_wb_range_16(vm_offset_t, vm_size_t); void mipsNN_pdcache_wb_range_32(vm_offset_t, vm_size_t); +#ifdef TARGET_OCTEON +void mipsNN_icache_sync_all_128(void); +void mipsNN_icache_sync_range_128(vm_offset_t, vm_size_t); +void mipsNN_icache_sync_range_index_128(vm_offset_t, vm_size_t); +void mipsNN_pdcache_wbinv_all_128(void); +void mipsNN_pdcache_wbinv_range_128(vm_offset_t, vm_size_t); +void mipsNN_pdcache_wbinv_range_index_128(vm_offset_t, vm_size_t); +void mipsNN_pdcache_inv_range_128(vm_offset_t, vm_size_t); +void mipsNN_pdcache_wb_range_128(vm_offset_t, vm_size_t); +#endif ==== //depot/projects/mips2-jnpr/src/sys/mips/include/cpufunc.h#6 (text+ko) ==== @@ -183,6 +183,18 @@ mips_barrier(); \ } struct __hack +#ifdef TARGET_OCTEON +static __inline void mips_sync_icache (void) +{ + __asm __volatile ( + ".set mips64\n" + ".word 0x041f0000\n" + "nop\n" + ".set mips0\n" + : : ); +} +#endif + MIPS_RDRW32_COP0(compare, MIPS_COP_0_COMPARE); MIPS_RDRW32_COP0(config, MIPS_COP_0_CONFIG); MIPS_RDRW32_COP0(count, MIPS_COP_0_COUNT); ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/cache.c#2 (text+ko) ==== @@ -51,6 +51,16 @@ mips_cache_ops.mco_icache_sync_range_index = mipsNN_icache_sync_range_index_32; break; +#ifdef TARGET_OCTEON + case 128: + mips_cache_ops.mco_icache_sync_all = mipsNN_icache_sync_all_128; + mips_cache_ops.mco_icache_sync_range = + mipsNN_icache_sync_range_128; + mips_cache_ops.mco_icache_sync_range_index = + mipsNN_icache_sync_range_index_128; + break; +#endif + #ifdef MIPS_DISABLE_L1_CACHE case 0: mips_cache_ops.mco_icache_sync_all = cache_noop; @@ -96,6 +106,23 @@ mips_cache_ops.mco_intern_pdcache_wb_range = mipsNN_pdcache_wb_range_32; break; +#ifdef TARGET_OCTEON + case 128: + mips_cache_ops.mco_pdcache_wbinv_all = + mips_cache_ops.mco_intern_pdcache_wbinv_all = + mipsNN_pdcache_wbinv_all_128; + mips_cache_ops.mco_pdcache_wbinv_range = + mipsNN_pdcache_wbinv_range_128; + mips_cache_ops.mco_pdcache_wbinv_range_index = + mips_cache_ops.mco_intern_pdcache_wbinv_range_index = + mipsNN_pdcache_wbinv_range_index_128; + mips_cache_ops.mco_pdcache_inv_range = + mipsNN_pdcache_inv_range_128; + mips_cache_ops.mco_pdcache_wb_range = + mips_cache_ops.mco_intern_pdcache_wb_range = + mipsNN_pdcache_wb_range_128; + break; +#endif #ifdef MIPS_DISABLE_L1_CACHE case 0: mips_cache_ops.mco_pdcache_wbinv_all = cache_noop; ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/cache_mipsNN.c#2 (text+ko) ==== @@ -56,6 +56,13 @@ #define SYNC __asm volatile("sync") #endif +#ifdef TARGET_OCTEON +#define SYNCI mips_sync_icache(); +#else +#define SYNCI +#endif + + __asm(".set mips32"); static int picache_size; @@ -545,3 +552,54 @@ SYNC; } + + +#ifdef TARGET_OCTEON + +void +mipsNN_icache_sync_all_128(void) +{ + SYNCI +} + +void +mipsNN_icache_sync_range_128(vm_offset_t va, vm_size_t size) +{ + SYNC; +} + +void +mipsNN_icache_sync_range_index_128(vm_offset_t va, vm_size_t size) +{ +} + + +void +mipsNN_pdcache_wbinv_all_128(void) +{ +} + + +void +mipsNN_pdcache_wbinv_range_128(vm_offset_t va, vm_size_t size) +{ + SYNC; +} + +void +mipsNN_pdcache_wbinv_range_index_128(vm_offset_t va, vm_size_t size) +{ +} + +void +mipsNN_pdcache_inv_range_128(vm_offset_t va, vm_size_t size) +{ +} + +void +mipsNN_pdcache_wb_range_128(vm_offset_t va, vm_size_t size) +{ + SYNC; +} + +#endif From owner-p4-projects@FreeBSD.ORG Thu Jan 31 15:45:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7902C16A420; Thu, 31 Jan 2008 15:45:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2648416A41B for ; Thu, 31 Jan 2008 15:45:36 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 09B8013C4D5 for ; Thu, 31 Jan 2008 15:45:36 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0VFjZ86048101 for ; Thu, 31 Jan 2008 15:45:35 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0VFjZqT048098 for perforce@freebsd.org; Thu, 31 Jan 2008 15:45:35 GMT (envelope-from rrs@cisco.com) Date: Thu, 31 Jan 2008 15:45:35 GMT Message-Id: <200801311545.m0VFjZqT048098@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134551 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 15:45:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=134551 Change 134551 by rrs@rrs-mips2-jnpr on 2008/01/31 15:44:56 one more change for the octeon cpu.c .. needs 128 byte cache lines Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu.c#8 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu.c#8 (text+ko) ==== @@ -105,6 +105,15 @@ cpuinfo->l1.dc_linesize = tmp; cpuinfo->l1.dc_nways = (((cfg1 & MIPS_CONFIG1_DA_MASK) >> MIPS_CONFIG1_DA_SHIFT)) + 1; cpuinfo->l1.dc_nsets = 1 << (((cfg1 & MIPS_CONFIG1_DS_MASK) >> MIPS_CONFIG1_DS_SHIFT) + 6); +#ifdef TARGET_OCTEON + /* + * Octeon does 128 byte line-size. But Config-Sel1 doesn't show + * 128 line-size, 1 Set, 64 ways. + */ + cpuinfo->l1.dc_linesize = 128; + cpuinfo->l1.dc_nsets = 1; + cpuinfo->l1.dc_nways = 64; +#endif cpuinfo->l1.dc_size = cpuinfo->l1.dc_linesize * cpuinfo->l1.dc_nsets * cpuinfo->l1.dc_nways; } From owner-p4-projects@FreeBSD.ORG Thu Jan 31 17:07:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60C9716A419; Thu, 31 Jan 2008 17:07:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EA7916A46B; Thu, 31 Jan 2008 17:07:50 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from smtpoutm.mac.com (smtpoutm.mac.com [17.148.16.70]) by mx1.freebsd.org (Postfix) with ESMTP id E094B13C46A; Thu, 31 Jan 2008 17:07:49 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from mac.com (asmtp003-s [10.150.69.66]) by smtpoutm.mac.com (Xserve/smtpout007/MantshX 4.0) with ESMTP id m0VH7hj7016724; Thu, 31 Jan 2008 09:07:43 -0800 (PST) Received: from mini-g4.jnpr.net (natint3.juniper.net [66.129.224.36]) (authenticated bits=0) by mac.com (Xserve/asmtp003/MantshX 4.0) with ESMTP id m0VH7XMN006099 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Thu, 31 Jan 2008 09:07:35 -0800 (PST) Message-Id: From: Marcel Moolenaar To: "M. Warner Losh" In-Reply-To: <20080131.082954.1395413111.imp@bsdimp.com> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v915) Date: Thu, 31 Jan 2008 09:07:18 -0800 References: <47A0BE7A.1030307@semihalf.com> <47A10F52.2090503@freebsd.org> <20080131.082954.1395413111.imp@bsdimp.com> X-Mailer: Apple Mail (2.915) Cc: yanegomi@gmail.com, raj@semihalf.com, marcel@freebsd.org, perforce@freebsd.org, grehan@freebsd.org Subject: Re: PERFORCE change 133911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 17:07:50 -0000 On Jan 31, 2008, at 7:29 AM, M. Warner Losh wrote: > In message: <47A10F52.2090503@freebsd.org> > Peter Grehan writes: > : > sparc64 is apparently using this for libc connection (not sure if > : > this is what Peter was referring to in one of the previous > emails?), > : > : See libc/sparc64/sys/__sparc_utrap_setup.c for how the user- > space trap > : handlers are setup. Very nice. And it reminded me that PPC should > really > : migrate to having the signal trampoline be in libc ala sparc64 > rather > : than being copied out to and forcing the stack to be executable. > > mips too :-) Ok, ok... Not ia64. The signal trampoline is in the gateway page and not on the stack. On ia64 the stack is already not executable. :-) -- Marcel Moolenaar xcllnt@mac.com From owner-p4-projects@FreeBSD.ORG Thu Jan 31 17:21:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 522DE16A46D; Thu, 31 Jan 2008 17:21:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 172E916A419 for ; Thu, 31 Jan 2008 17:21:15 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0092913C474 for ; Thu, 31 Jan 2008 17:21:15 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0VHLE6e077216 for ; Thu, 31 Jan 2008 17:21:14 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0VHLE2G077213 for perforce@freebsd.org; Thu, 31 Jan 2008 17:21:14 GMT (envelope-from imp@freebsd.org) Date: Thu, 31 Jan 2008 17:21:14 GMT Message-Id: <200801311721.m0VHLE2G077213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134554 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 17:21:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=134554 Change 134554 by imp@imp_lighthouse on 2008/01/31 17:20:22 It is bad kharma to write the same address to multiple TLB entries. Use the KSEG3 addresses from mips2 since they are unique and invalid. Not sure how this code could have ever worked for real mips hardware... Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/tlb.S#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/tlb.S#5 (text+ko) ==== @@ -230,7 +230,7 @@ mtc0 zero, COP_0_STATUS_REG # Disable interrupts ITLBNOPFIX mfc0 t1, COP_0_TLB_WIRED - li v0, MIPS_KSEG0_START # invalid address + li v0, MIPS_KSEG3_START + 0x0fff0000 # invalid address _MFC0 t0, COP_0_TLB_HI # Save the PID _MTC0 v0, COP_0_TLB_HI # Mark entry high as invalid @@ -242,7 +242,10 @@ */ 1: mtc0 t1, COP_0_TLB_INDEX # Set the index register. + ITLBNOPFIX + _MTC0 t0, COP_0_TLB_HI # Restore the PID addu t1, t1, 1 # Increment index. + addu t0, t0, 8 * 1024 MIPS_CPU_NOP_DELAY tlbwi # Write the TLB entry. MIPS_CPU_NOP_DELAY From owner-p4-projects@FreeBSD.ORG Thu Jan 31 18:30:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 811A616A41A; Thu, 31 Jan 2008 18:30:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E5F916A418 for ; Thu, 31 Jan 2008 18:30:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2018313C45D for ; Thu, 31 Jan 2008 18:30:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0VIUWpY082270 for ; Thu, 31 Jan 2008 18:30:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0VIUWeT082267 for perforce@freebsd.org; Thu, 31 Jan 2008 18:30:32 GMT (envelope-from imp@freebsd.org) Date: Thu, 31 Jan 2008 18:30:32 GMT Message-Id: <200801311830.m0VIUWeT082267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134557 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 18:30:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=134557 Change 134557 by imp@imp_lighthouse on 2008/01/31 18:29:40 Move copy of mips_proc0_init out of here too. Minor tweaks to make it more closely match what malta does. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#5 (text+ko) ==== @@ -1139,10 +1139,11 @@ int realmem_bytes; - realmem_bytes = (((octeon_board_real())?256:96) << 20); /* Override. Temporary hard-code */ + /* XXX: Override. Temporary hard-code */ + realmem_bytes = (((octeon_board_real())?256:96) << 20); /* phys_avail regions are in bytes */ phys_avail[0] = (MIPS_KSEG0_TO_PHYS((vm_offset_t)&end) + PAGE_SIZE) & ~(PAGE_SIZE - 1); - phys_avail[1] = realmem_bytes - 64; + phys_avail[1] = phys_avail[0] + realmem_bytes - 64 - 1; #ifdef MEM_EXTEND @@ -1190,17 +1191,9 @@ init_param1(); init_param2(physmem); - mips_cpu_init(); pmap_bootstrap(); - - proc_linkup(&proc0, &thread0); - thread0.td_kstack = kstack0; - pcpu_init(pcpup, 0, sizeof(struct pcpu)); - pcpup->pc_curthread = &thread0; - cpu_thread_alloc(curthread); - pcpup->pc_curpcb = curthread->td_pcb; - + mips_proc0_init(); mutex_init(); #ifdef DDB @@ -1258,8 +1251,7 @@ /* clear the BSS and SBSS segments */ kernend = round_page((vm_offset_t)&end); - -// memset(&edata, 0, kernend - (vm_offset_t)(&edata)); + memset(&edata, 0, kernend - (vm_offset_t)(&edata)); tick_early_init(OCTEON_CLOCK_DEFAULT); /* Quick Default. To avoid divide-by-0 @@ -1269,8 +1261,6 @@ cninit(); printf(" Initialized memory: 0x%p to 0x%lX\n", &edata, ((long) &edata) + ((long)kernend - (long)(&edata))); - mips_boot_params_init(); - mips_wbflush(); mips_init(); uint64_t platform_counter_freq = OCTEON_CLOCK_DEFAULT; tick_init_params(platform_counter_freq, 0); From owner-p4-projects@FreeBSD.ORG Thu Jan 31 18:54:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AE6F16A468; Thu, 31 Jan 2008 18:54:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F11AE16A419 for ; Thu, 31 Jan 2008 18:54:58 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCEA813C474 for ; Thu, 31 Jan 2008 18:54:58 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0VIswKa083118 for ; Thu, 31 Jan 2008 18:54:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0VIswVS083115 for perforce@freebsd.org; Thu, 31 Jan 2008 18:54:58 GMT (envelope-from imp@freebsd.org) Date: Thu, 31 Jan 2008 18:54:58 GMT Message-Id: <200801311854.m0VIswVS083115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134558 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 18:54:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=134558 Change 134558 by imp@imp_lighthouse on 2008/01/31 18:53:57 We can have up to 16 cores. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/param.h#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/param.h#6 (text+ko) ==== @@ -68,7 +68,7 @@ #define MID_MACHINE 0 /* None but has to be defined */ #ifdef SMP -#define MAXSMPCPU 4 +#define MAXSMPCPU 16 #define MAXCPU MAXSMPCPU #else #define MAXSMPCPU 1 From owner-p4-projects@FreeBSD.ORG Fri Feb 1 00:07:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0D3616A419; Fri, 1 Feb 2008 00:07:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B09716A417 for ; Fri, 1 Feb 2008 00:07:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4A7AD13C45A for ; Fri, 1 Feb 2008 00:07:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1107vGn020432 for ; Fri, 1 Feb 2008 00:07:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1107rof020429 for perforce@freebsd.org; Fri, 1 Feb 2008 00:07:53 GMT (envelope-from jb@freebsd.org) Date: Fri, 1 Feb 2008 00:07:53 GMT Message-Id: <200802010007.m1107rof020429@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134568 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 00:07:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=134568 Change 134568 by jb@jb_freebsd1 on 2008/02/01 00:07:49 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#16 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#60 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#37 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#20 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#55 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#29 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/Makefile#5 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/audit/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/basics/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/book.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/boot/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/chapters.ent#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/config/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/disks/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/firewalls/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/geom/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/install/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/jails/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/mail/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/network-servers/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/ports/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/preface/preface.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/security/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/txtfiles.ent#4 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/virtualization/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/flyer/flyer.tex#4 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/mailing-lists.ent#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/trademarks.ent#3 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/ports/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/tabthorpe.key#2 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#24 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/kernelconfig/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/ports/chapter.sgml#10 integrate .. //depot/projects/dtrace/ports/GIDs#16 integrate .. //depot/projects/dtrace/ports/MOVED#64 integrate .. //depot/projects/dtrace/ports/Mk/bsd.emacs.mk#9 integrate .. //depot/projects/dtrace/ports/UIDs#19 integrate .. //depot/projects/dtrace/src/MAINTAINERS#14 integrate .. //depot/projects/dtrace/src/Makefile#18 integrate .. //depot/projects/dtrace/src/contrib/binutils/libiberty/cp-demangle.c#4 integrate .. //depot/projects/dtrace/src/contrib/file/FREEBSD-upgrade#5 integrate .. //depot/projects/dtrace/src/contrib/libiberty/cp-demangle.c#2 delete .. //depot/projects/dtrace/src/contrib/openpam/include/security/openpam_version.h#5 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#28 integrate .. //depot/projects/dtrace/src/etc/rc.d/ipfw#8 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kgdb.h#8 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kthr.c#9 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/main.c#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt.c#7 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_tar.c#13 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_ar.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_compat_tar_hardlink.c#1 branch .. //depot/projects/dtrace/src/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu#1 branch .. //depot/projects/dtrace/src/lib/libc/sys/extattr_get_file.2#5 integrate .. //depot/projects/dtrace/src/lib/libdevstat/devstat.h#4 integrate .. //depot/projects/dtrace/src/lib/libkse/sys/lock.c#5 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_exp2f.c#6 integrate .. //depot/projects/dtrace/src/sbin/ffsinfo/ffsinfo.c#5 integrate .. //depot/projects/dtrace/src/sbin/fsck_msdosfs/boot.c#5 integrate .. //depot/projects/dtrace/src/sbin/fsck_msdosfs/fat.c#4 integrate .. //depot/projects/dtrace/src/sbin/gpt/gpt.c#7 integrate .. //depot/projects/dtrace/src/share/man/man4/ath.4#8 integrate .. //depot/projects/dtrace/src/share/man/man4/atkbd.4#6 integrate .. //depot/projects/dtrace/src/share/man/man4/awi.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/ed.4#6 integrate .. //depot/projects/dtrace/src/share/man/man4/man4.i386/snc.4#4 integrate .. //depot/projects/dtrace/src/share/man/man4/wi.4#6 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#23 integrate .. //depot/projects/dtrace/src/share/man/man9/style.9#7 integrate .. //depot/projects/dtrace/src/sys/amd64/acpica/madt.c#6 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/dump_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/minidump_machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/amd64/include/proc.h#4 integrate .. //depot/projects/dtrace/src/sys/arm/arm/dump_machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#28 integrate .. //depot/projects/dtrace/src/sys/arm/include/pmap.h#12 integrate .. //depot/projects/dtrace/src/sys/cam/cam_xpt.c#17 integrate .. //depot/projects/dtrace/src/sys/conf/files#67 integrate .. //depot/projects/dtrace/src/sys/conf/files.powerpc#16 integrate .. //depot/projects/dtrace/src/sys/conf/options#38 integrate .. //depot/projects/dtrace/src/sys/ddb/db_capture.c#4 integrate .. //depot/projects/dtrace/src/sys/ddb/db_textdump.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/bfe/if_bfe.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/bfe/if_bfereg.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/ciss/ciss.c#13 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/mii/amphy.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/mii/miidevs#12 integrate .. //depot/projects/dtrace/src/sys/dev/mii/nsphy.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/mii/nsphyter.c#1 branch .. //depot/projects/dtrace/src/sys/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/mxge/if_mxge.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#6 integrate .. //depot/projects/dtrace/src/sys/i386/acpica/madt.c#6 integrate .. //depot/projects/dtrace/src/sys/i386/i386/dump_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/i386/minidump_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/include/proc.h#5 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/dump_machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_shutdown.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/subr_bus.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_sockbuf.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#19 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#22 integrate .. //depot/projects/dtrace/src/sys/modules/mii/Makefile#6 integrate .. //depot/projects/dtrace/src/sys/netgraph/netflow/netflow.c#7 integrate .. //depot/projects/dtrace/src/sys/netgraph/netflow/ng_netflow.c#6 integrate .. //depot/projects/dtrace/src/sys/netgraph/netgraph.h#8 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_bpf.c#5 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_iface.c#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_ppp.c#7 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_pppoe.c#10 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_pred1.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_bsd_addr.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_indata.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.c#16 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit.c#13 integrate .. //depot/projects/dtrace/src/sys/security/mac_mls/mac_mls.c#15 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/dump_machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/dump_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/sys/bus.h#8 integrate .. //depot/projects/dtrace/src/sys/sys/conf.h#7 integrate .. //depot/projects/dtrace/src/sys/sys/proc.h#32 integrate .. //depot/projects/dtrace/src/sys/sys/socketvar.h#8 integrate .. //depot/projects/dtrace/src/tools/regression/sockets/unix_sorflush/Makefile#1 branch .. //depot/projects/dtrace/src/tools/regression/sockets/unix_sorflush/unix_sorflush.c#1 branch .. //depot/projects/dtrace/src/usr.bin/file/Makefile#4 integrate .. //depot/projects/dtrace/src/usr.bin/file/file.1#6 delete .. //depot/projects/dtrace/src/usr.bin/file/magic.5#6 delete .. //depot/projects/dtrace/src/usr.bin/top/machine.c#10 integrate .. //depot/projects/dtrace/src/usr.bin/xargs/xargs.1#6 integrate .. //depot/projects/dtrace/src/usr.sbin/Makefile#21 integrate .. //depot/projects/dtrace/src/usr.sbin/adduser/adduser.8#7 integrate .. //depot/projects/dtrace/src/usr.sbin/adduser/adduser.sh#6 integrate .. //depot/projects/dtrace/src/usr.sbin/bootparamd/bootparamd/bootparamd.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/bootparamd/bootparamd/main.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/kbdcontrol/kbdcontrol.1#6 integrate .. //depot/projects/dtrace/src/usr.sbin/kbdcontrol/kbdmap.5#4 integrate .. //depot/projects/dtrace/src/usr.sbin/newsyslog/newsyslog.c#6 integrate .. //depot/projects/dtrace/src/usr.sbin/ofwdump/Makefile#4 integrate .. //depot/projects/dtrace/src/usr.sbin/ofwdump/ofwdump.8#4 integrate .. //depot/projects/dtrace/src/usr.sbin/setfmac/setfmac.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/disks.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/watch/watch.c#4 integrate .. //depot/projects/dtrace/www/en/cgi/dosendpr.cgi#7 integrate .. //depot/projects/dtrace/www/en/developers.sgml#27 integrate .. //depot/projects/dtrace/www/en/news/status/report-2006-04-2006-06.xml#2 integrate .. //depot/projects/dtrace/www/en/news/status/report-2007-04-2007-06.xml#2 integrate .. //depot/projects/dtrace/www/en/news/status/report-2007-07-2007-10.xml#2 integrate .. //depot/projects/dtrace/www/en/releases/6.3R/schedule.sgml#7 integrate .. //depot/projects/dtrace/www/en/releases/7.0R/todo.sgml#5 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#28 integrate .. //depot/projects/dtrace/www/es/Makefile#5 integrate .. //depot/projects/dtrace/www/es/ports/Makefile#5 delete .. //depot/projects/dtrace/www/es/ports/Makefile.inc#3 delete .. //depot/projects/dtrace/www/es/ports/Makefile.inc0#3 delete .. //depot/projects/dtrace/www/es/ports/categories#3 delete .. //depot/projects/dtrace/www/es/ports/packages#3 delete .. //depot/projects/dtrace/www/es/ports/portindex#4 delete .. //depot/projects/dtrace/www/es/ports/ports.inc#3 delete .. //depot/projects/dtrace/www/es/releases/1.1.5/COPYRIGHT.USL#4 delete .. //depot/projects/dtrace/www/es/releases/1.1/Makefile#4 delete .. //depot/projects/dtrace/www/es/releases/2.2.7R/announce.sgml#5 delete .. //depot/projects/dtrace/www/es/releases/2.2.7R/errata.sgml#5 delete .. //depot/projects/dtrace/www/es/releases/2.2.7R/notes.sgml#5 delete .. //depot/projects/dtrace/www/es/releases/3.5R/Makefile#4 delete .. //depot/projects/dtrace/www/es/releases/3.5R/announce.sgml#5 delete .. //depot/projects/dtrace/www/es/releases/3.5R/errata.sgml#5 delete .. //depot/projects/dtrace/www/es/releases/3.5R/notes.sgml#5 delete .. //depot/projects/dtrace/www/es/releases/4.3R/Makefile#4 delete .. //depot/projects/dtrace/www/es/releases/4.3R/announce.sgml#5 delete .. //depot/projects/dtrace/www/es/releases/4.3R/errata.sgml#5 delete .. //depot/projects/dtrace/www/es/releases/4.3R/notes.sgml#5 delete .. //depot/projects/dtrace/www/es/search/Makefile#3 integrate .. //depot/projects/dtrace/www/es/search/atoz.pl#3 delete .. //depot/projects/dtrace/www/es/search/site.pl#3 delete .. //depot/projects/dtrace/www/hu/administration.sgml#3 integrate .. //depot/projects/dtrace/www/hu/community.sgml#2 integrate .. //depot/projects/dtrace/www/hu/index.xsl#4 integrate .. //depot/projects/dtrace/www/hu/platforms/amd64.sgml#3 integrate .. //depot/projects/dtrace/www/hu/projects/projects.sgml#4 integrate .. //depot/projects/dtrace/www/hu/share/sgml/header.l10n.ent#4 integrate .. //depot/projects/dtrace/www/hu/share/sgml/navibar.l10n.ent#3 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#37 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#16 (text+ko) ==== @@ -13,7 +13,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.270 2007/12/19 19:25:51 pav Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.271 2008/01/29 06:00:47 brueffer Exp $ 1999 @@ -1681,14 +1681,6 @@ - If you are using FreeBSD 4.0 or later, - OpenSSH is included in the base system. - If you are using an earlier release, - update and install OpenSSH from the - security/openssh port. - - - If you do not wish to type your password in every time you use &man.ssh.1;, and you use RSA or DSA keys to authenticate, &man.ssh-agent.1; is there for your @@ -1713,7 +1705,7 @@ or $HOME/.ssh/id_rsa.pub) to the person setting you up as a committer so it can be put into yourlogin file in - /c/ssh-keys/ on + /etc/ssh-keys/ on freefall. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#60 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -170,13 +170,12 @@ psm0: model Generic PS/2 mouse, device ID 0 This driver will need to be included in the custom kernel - configuration file or loaded using &man.loader.conf.5;. + configuration file or loaded using &man.loader.conf.5;. On occasion, the data from dmesg will only show system messages instead of the boot probe output. In these situations, the output may be obtained by viewing the - /var/log/dmesg.today and - /var/log/dmesg.yesterday files. + /var/run/dmesg.boot file. Another method of finding hardware is by using the &man.pciconf.8; utility which provides more verbose output. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -307,6 +307,10 @@ &prompt.root; echo /usr/ports/*/*lsof* /usr/ports/sysutils/lsof + + Note that this will return any matched files downloaded into the + /usr/ports/distfiles + directory. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#20 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -52,7 +52,7 @@ How to configure TCP Wrappers for use - with inetd. + with inetd. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#55 (text+ko) ==== @@ -1,7 +1,7 @@ 0.7.1d 0.7.1.d + 10Alpha3 10.a3 + 3Beta7-pre2 3.b7.p2 + 8:f_17 8f.17 @@ -5901,6 +5904,7 @@ Should be defined for the remaining variables to have any effect. + JAVA_VERSION List of space-separated suitable Java versions for @@ -5908,33 +5912,39 @@ specify a range of versions (allowed values: 1.1[+] 1.2[+] 1.3[+] 1.4[+]). + JAVA_OS List of space-separated suitable JDK port operating systems for the port (allowed values: native linux). + JAVA_VENDOR List of space-separated suitable JDK port vendors for the port (allowed values: freebsd bsdjava sun ibm blackdown). + JAVA_BUILD When set, it means that the selected JDK port should be added to the build dependencies of the port. + JAVA_RUN When set, it means that the selected JDK port should be added to the run dependencies of the port. + JAVA_EXTRACT When set, it means that the selected JDK port should be added to the extract dependencies of the port. + USE_JIKES Whether the port should or should not use the @@ -5973,6 +5983,7 @@ The name of the JDK port (e.g. 'java/jdk14'). + JAVA_PORT_VERSION The full version of the JDK port (e.g. @@ -5980,104 +5991,124 @@ two digits of this version number, use ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/}. + JAVA_PORT_OS The operating system used by the JDK port (e.g. 'linux'). + JAVA_PORT_VENDOR The vendor of the JDK port (e.g. 'sun'). + JAVA_PORT_OS_DESCRIPTION Description of the operating system used by the JDK port (e.g. 'Linux'). + JAVA_PORT_VENDOR_DESCRIPTION Description of the vendor of the JDK port (e.g. 'FreeBSD Foundation'). + JAVA_HOME Path to the installation directory of the JDK (e.g. '/usr/local/jdk1.3.1'). + JAVAC Path to the Java compiler to use (e.g. '/usr/local/jdk1.1.8/bin/javac' or '/usr/local/bin/jikes'). + JAR Path to the jar tool to use (e.g. '/usr/local/jdk1.2.2/bin/jar' or '/usr/local/bin/fastjar'). + APPLETVIEWER Path to the appletviewer utility (e.g. '/usr/local/linux-jdk1.2.2/bin/appletviewer'). + JAVA Path to the java executable. Use this for executing Java programs (e.g. '/usr/local/jdk1.3.1/bin/java'). + JAVADOC Path to the javadoc utility program. + JAVAH Path to the javah program. + JAVAP Path to the javap program. + JAVA_KEYTOOL Path to the keytool utility program. This variable is available only if the JDK is Java 1.2 or higher. + JAVA_N2A Path to the native2ascii tool. + JAVA_POLICYTOOL Path to the policytool program. This variable is available only if the JDK is Java 1.2 or higher. + JAVA_SERIALVER Path to the serialver utility program. + RMIC Path to the RMI stub/skeleton generator, rmic. + RMIREGISTRY Path to the RMI registry program, rmiregistry. + RMID Path to the RMI daemon program rmid. This variable is only available if the JDK is Java 1.2 or higher. + JAVA_CLASSES Path to the archive that contains the JDK class @@ -6086,6 +6117,7 @@ JDKs used ${JAVA_HOME}/lib/classes.zip. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 1 03:10:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79D0016A420; Fri, 1 Feb 2008 03:10:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2520F16A419 for ; Fri, 1 Feb 2008 03:10:05 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 197DC13C448 for ; Fri, 1 Feb 2008 03:10:05 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m113A4P8043187 for ; Fri, 1 Feb 2008 03:10:04 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m113A4eG043183 for perforce@freebsd.org; Fri, 1 Feb 2008 03:10:04 GMT (envelope-from imp@freebsd.org) Date: Fri, 1 Feb 2008 03:10:04 GMT Message-Id: <200802010310.m113A4eG043183@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 03:10:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=134570 Change 134570 by imp@imp_lighthouse on 2008/02/01 03:09:15 Since this kernel is a 32-bit kernel, but one that needs to allow 64-bit hardware access, copy the TLBMiss handler to XTLBMiss. This works so long as we don't have any real 64-bit addresses to translate, and allows the 64-bit hardware accesses to succeed. We need to copy over the KX bit setting from the Cavium code drop, but this allows the bcopy that took forever to complete. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#20 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#20 (text+ko) ==== @@ -434,6 +434,12 @@ bcopy(MipsTLBMiss, (void *)TLB_MISS_EXC_VEC, MipsTLBMissEnd - MipsTLBMiss); +#ifdef TARGET_OCTEON +/* Fake, but sufficient, for the 32-bit with 64-bit hardware addresses */ + bcopy(MipsTLBMiss, (void *)XTLB_MISS_EXC_VEC, + MipsTLBMissEnd - MipsTLBMiss); +#endif + bcopy(MipsException, (void *)GEN_EXC_VEC, MipsExceptionEnd - MipsException); From owner-p4-projects@FreeBSD.ORG Fri Feb 1 03:38:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4F6C16A419; Fri, 1 Feb 2008 03:38:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8AAB016A468 for ; Fri, 1 Feb 2008 03:38:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8034513C458 for ; Fri, 1 Feb 2008 03:38:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m113cYBn045391 for ; Fri, 1 Feb 2008 03:38:34 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m113cYKQ045388 for perforce@freebsd.org; Fri, 1 Feb 2008 03:38:34 GMT (envelope-from jb@freebsd.org) Date: Fri, 1 Feb 2008 03:38:34 GMT Message-Id: <200802010338.m113cYKQ045388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134571 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 03:38:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=134571 Change 134571 by jb@jb_freebsd1 on 2008/02/01 03:37:36 Undo an over merge. Affected files ... .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 edit Differences ... ==== //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 (text+ko) ==== @@ -352,7 +352,7 @@ zv->zv_state = 2; wakeup(&zv->zv_state); mtx_unlock(&zv->zv_queue_mtx); - kproc_exit(0); + kthread_exit(0); } msleep(&zv->zv_queue, &zv->zv_queue_mtx, PRIBIO | PDROP, "zvol:io", 0); @@ -543,7 +543,7 @@ bioq_init(&zv->zv_queue); mtx_init(&zv->zv_queue_mtx, "zvol", NULL, MTX_DEF); zv->zv_state = 0; - kproc_create(zvol_worker, zv, NULL, 0, 0, "zvol:worker %s", pp->name); + kthread_create(zvol_worker, zv, NULL, 0, 0, "zvol:worker %s", pp->name); zvol_minors++; end: From owner-p4-projects@FreeBSD.ORG Fri Feb 1 03:41:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA92616A469; Fri, 1 Feb 2008 03:41:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F8F916A418 for ; Fri, 1 Feb 2008 03:41:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B850413C459 for ; Fri, 1 Feb 2008 03:41:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m113fc1M045542 for ; Fri, 1 Feb 2008 03:41:38 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m113fc35045539 for perforce@freebsd.org; Fri, 1 Feb 2008 03:41:38 GMT (envelope-from jb@freebsd.org) Date: Fri, 1 Feb 2008 03:41:38 GMT Message-Id: <200802010341.m113fc35045539@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134572 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 03:41:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=134572 Change 134572 by jb@jb_freebsd1 on 2008/02/01 03:41:00 Add the last piece of the exec_failure probe. Affected files ... .. //depot/projects/dtrace7/src/sys/kern/kern_exec.c#5 edit Differences ... ==== //depot/projects/dtrace7/src/sys/kern/kern_exec.c#5 (text+ko) ==== @@ -815,6 +815,8 @@ p->p_flag &= ~P_INEXEC; PROC_UNLOCK(p); + SDT_PROBE(proc, kernel, , exec_failure, error, 0, 0, 0, 0); + done2: #ifdef MAC mac_execve_exit(imgp); From owner-p4-projects@FreeBSD.ORG Fri Feb 1 03:44:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EEBE16A469; Fri, 1 Feb 2008 03:44:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33A4616A41A for ; Fri, 1 Feb 2008 03:44:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2898813C448 for ; Fri, 1 Feb 2008 03:44:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m113ifKB045677 for ; Fri, 1 Feb 2008 03:44:41 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m113if7r045674 for perforce@freebsd.org; Fri, 1 Feb 2008 03:44:41 GMT (envelope-from jb@freebsd.org) Date: Fri, 1 Feb 2008 03:44:41 GMT Message-Id: <200802010344.m113if7r045674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 03:44:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=134573 Change 134573 by jb@jb_freebsd1 on 2008/02/01 03:44:08 Remove my debugging sysctls. I haven't needed to use them this time around, so I assume that I'm not calling and function from the probe context that the DTrace design says I'm not supposed to. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/fbt/fbt.c#7 edit .. //depot/projects/dtrace7/src/sys/cddl/dev/fbt/fbt.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/fbt/fbt.c#7 (text+ko) ==== @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -64,23 +63,6 @@ MALLOC_DECLARE(M_FBT); MALLOC_DEFINE(M_FBT, "fbt", "Function Boundary Tracing"); -SYSCTL_DECL(_debug_dtrace); -int fbt_debug = 0; -int fbt_filter_0 = 0; -int fbt_filter_1 = 0; -int fbt_filter_2 = 0; -int fbt_filter_3 = 0; -int fbt_filter_len = 0; -char fbt_filter_str[64]; -TUNABLE_INT("debug.dtrace.fbt_debug", &fbt_debug); -SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_debug, CTLFLAG_RW, &fbt_debug, 0, ""); -SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_filter_0, CTLFLAG_RW, &fbt_filter_0, 0, ""); -SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_filter_1, CTLFLAG_RW, &fbt_filter_1, 0, ""); -SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_filter_2, CTLFLAG_RW, &fbt_filter_2, 0, ""); -SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_filter_3, CTLFLAG_RW, &fbt_filter_3, 0, ""); -SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_filter_len, CTLFLAG_RW, &fbt_filter_len, 0, ""); -SYSCTL_STRING(_debug_dtrace, OID_AUTO, fbt_filter_str, CTLFLAG_RW, fbt_filter_str, 0, ""); - #define FBT_PUSHL_EBP 0x55 #define FBT_MOVL_ESP_EBP0_V0 0x8b #define FBT_MOVL_ESP_EBP1_V0 0xec @@ -244,39 +226,6 @@ return (0); } - /* - * These filters are set by sysctl to help debugging the initial - * port of this provider. Normally the wildcard would be - * specified to dtrace via the probe name (e.g. fbt::abc*:entry) - * rather than using these. However, to apply a filter to narrow - * the problem down while running Sun's tests, it is easier to - * set these filters rather than have to modify the tests all the - * time. - */ - if (fbt_filter_0 != 0) { - if (name[0] != fbt_filter_0) - return (0); - if (fbt_filter_1 != 0) { - if (name[1] != fbt_filter_1) - return (0); - if (fbt_filter_2 != 0) { - if (name[2] != fbt_filter_2) - return (0); - if (fbt_filter_3 != 0) { - if (name[3] != fbt_filter_3) - return (0); - } - } - } - } - - /* - * This is an alternate form of filter. The one above is easier to - * set from a shell script though. - */ - if (fbt_filter_len > 0 && strncmp(name, fbt_filter_str, fbt_filter_len) != 0) - return (0); - size = symval->size; instr = (u_int8_t *) symval->value; @@ -552,8 +501,6 @@ } for (; fbt != NULL; fbt = fbt->fbtp_next) { - if (fbt_debug) - printf("fbt_enable %s\n",fbt->fbtp_name); *fbt->fbtp_patchpoint = fbt->fbtp_patchval; } } ==== //depot/projects/dtrace7/src/sys/cddl/dev/fbt/fbt.c#2 (text+ko) ==== @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -64,23 +63,6 @@ MALLOC_DECLARE(M_FBT); MALLOC_DEFINE(M_FBT, "fbt", "Function Boundary Tracing"); -SYSCTL_DECL(_debug_dtrace); -int fbt_debug = 0; -int fbt_filter_0 = 0; -int fbt_filter_1 = 0; -int fbt_filter_2 = 0; -int fbt_filter_3 = 0; -int fbt_filter_len = 0; -char fbt_filter_str[64]; -TUNABLE_INT("debug.dtrace.fbt_debug", &fbt_debug); -SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_debug, CTLFLAG_RW, &fbt_debug, 0, ""); -SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_filter_0, CTLFLAG_RW, &fbt_filter_0, 0, ""); -SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_filter_1, CTLFLAG_RW, &fbt_filter_1, 0, ""); -SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_filter_2, CTLFLAG_RW, &fbt_filter_2, 0, ""); -SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_filter_3, CTLFLAG_RW, &fbt_filter_3, 0, ""); -SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_filter_len, CTLFLAG_RW, &fbt_filter_len, 0, ""); -SYSCTL_STRING(_debug_dtrace, OID_AUTO, fbt_filter_str, CTLFLAG_RW, fbt_filter_str, 0, ""); - #define FBT_PUSHL_EBP 0x55 #define FBT_MOVL_ESP_EBP0_V0 0x8b #define FBT_MOVL_ESP_EBP1_V0 0xec @@ -244,39 +226,6 @@ return (0); } - /* - * These filters are set by sysctl to help debugging the initial - * port of this provider. Normally the wildcard would be - * specified to dtrace via the probe name (e.g. fbt::abc*:entry) - * rather than using these. However, to apply a filter to narrow - * the problem down while running Sun's tests, it is easier to - * set these filters rather than have to modify the tests all the - * time. - */ - if (fbt_filter_0 != 0) { - if (name[0] != fbt_filter_0) - return (0); - if (fbt_filter_1 != 0) { - if (name[1] != fbt_filter_1) - return (0); - if (fbt_filter_2 != 0) { - if (name[2] != fbt_filter_2) - return (0); - if (fbt_filter_3 != 0) { - if (name[3] != fbt_filter_3) - return (0); - } - } - } - } - - /* - * This is an alternate form of filter. The one above is easier to - * set from a shell script though. - */ - if (fbt_filter_len > 0 && strncmp(name, fbt_filter_str, fbt_filter_len) != 0) - return (0); - size = symval->size; instr = (u_int8_t *) symval->value; @@ -552,8 +501,6 @@ } for (; fbt != NULL; fbt = fbt->fbtp_next) { - if (fbt_debug) - printf("fbt_enable %s\n",fbt->fbtp_name); *fbt->fbtp_patchpoint = fbt->fbtp_patchval; } } From owner-p4-projects@FreeBSD.ORG Fri Feb 1 03:45:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD07416A418; Fri, 1 Feb 2008 03:45:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92BCF16A46B for ; Fri, 1 Feb 2008 03:45:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7021913C457 for ; Fri, 1 Feb 2008 03:45:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m113jh1X045754 for ; Fri, 1 Feb 2008 03:45:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m113jhFu045751 for perforce@freebsd.org; Fri, 1 Feb 2008 03:45:43 GMT (envelope-from jb@freebsd.org) Date: Fri, 1 Feb 2008 03:45:43 GMT Message-Id: <200802010345.m113jhFu045751@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134574 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 03:45:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=134574 Change 134574 by jb@jb_freebsd1 on 2008/02/01 03:44:44 SMP_MAXCPU -> MAXCPU. Affected files ... .. //depot/projects/dtrace7/src/sys/cddl/cyclic/amd64/cyclic_machdep.c#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/cddl/cyclic/amd64/cyclic_machdep.c#2 (text+ko) ==== @@ -73,7 +73,7 @@ cyclic_uninit(); } -static hrtime_t exp_due[SMP_MAXCPU]; +static hrtime_t exp_due[MAXCPU]; /* * This function is the one registered by the machine dependent From owner-p4-projects@FreeBSD.ORG Fri Feb 1 03:50:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43DB016A419; Fri, 1 Feb 2008 03:50:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E560716A417 for ; Fri, 1 Feb 2008 03:50:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C294F13C45B for ; Fri, 1 Feb 2008 03:50:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m113omxO046221 for ; Fri, 1 Feb 2008 03:50:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m113omcm046218 for perforce@freebsd.org; Fri, 1 Feb 2008 03:50:48 GMT (envelope-from jb@freebsd.org) Date: Fri, 1 Feb 2008 03:50:48 GMT Message-Id: <200802010350.m113omcm046218@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134575 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 03:50:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=134575 Change 134575 by jb@jb_freebsd1 on 2008/02/01 03:49:52 NULL pointer check. Affected files ... .. //depot/projects/dtrace7/src/contrib/opensolaris/tools/ctf/common/memory.c#2 edit Differences ... ==== //depot/projects/dtrace7/src/contrib/opensolaris/tools/ctf/common/memory.c#2 (text) ==== @@ -71,6 +71,9 @@ { char *newstr; + if (str == NULL) + return (NULL); + if ((newstr = strdup(str)) == NULL) memory_bailout(); From owner-p4-projects@FreeBSD.ORG Fri Feb 1 03:51:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7826E16A41B; Fri, 1 Feb 2008 03:51:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2503A16A419 for ; Fri, 1 Feb 2008 03:51:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1948213C457 for ; Fri, 1 Feb 2008 03:51:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m113pnHC046335 for ; Fri, 1 Feb 2008 03:51:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m113pnm6046332 for perforce@freebsd.org; Fri, 1 Feb 2008 03:51:49 GMT (envelope-from jb@freebsd.org) Date: Fri, 1 Feb 2008 03:51:49 GMT Message-Id: <200802010351.m113pnm6046332@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134576 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 03:51:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=134576 Change 134576 by jb@jb_freebsd1 on 2008/02/01 03:50:58 IFdtrace. Exception handling for fbt. Timer callback for cyclic. Trap handing for safety. And syscall probe mumbo. Affected files ... .. //depot/projects/dtrace7/src/sys/amd64/amd64/exception.S#3 edit .. //depot/projects/dtrace7/src/sys/amd64/amd64/local_apic.c#2 edit .. //depot/projects/dtrace7/src/sys/amd64/amd64/trap.c#4 edit Differences ... ==== //depot/projects/dtrace7/src/sys/amd64/amd64/exception.S#3 (text+ko) ==== @@ -1,8 +1,12 @@ /*- * Copyright (c) 1989, 1990 William F. Jolitz. * Copyright (c) 1990 The Regents of the University of California. + * Copyright (c) 2007 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were developed by A. Joseph Koshy under + * sponsorship from the FreeBSD Foundation and Google, Inc. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -27,11 +31,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.129.2.1 2007/11/21 16:38:54 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.131 2007/12/07 08:20:15 jkoshy Exp $ */ #include "opt_atpic.h" #include "opt_compat.h" +#include "opt_hwpmc_hooks.h" +#include "opt_kdtrace.h" #include #include @@ -39,7 +45,25 @@ #include "assym.s" +#ifdef KDTRACE_HOOKS + .bss + .globl dtrace_invop_jump_addr + .align 8 + .type dtrace_invop_jump_addr, @object + .size dtrace_invop_jump_addr, 8 +dtrace_invop_jump_addr: + .zero 8 + .globl dtrace_invop_calltrap_addr + .align 8 + .type dtrace_invop_calltrap_addr, @object + .size dtrace_invop_calltrap_addr, 8 +dtrace_invop_calltrap_addr: + .zero 8 +#endif .text +#ifdef HWPMC_HOOKS + ENTRY(start_exceptions) +#endif /*****************************************************************************/ /* Trap handling */ @@ -162,6 +186,30 @@ movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) +#ifdef KDTRACE_HOOKS + /* + * DTrace Function Boundary Trace (fbt) and Statically Defined + * Trace (sdt) probes are triggered by int3 (0xcc) which causes + * the #BP (T_BPTFLT) breakpoint interrupt. For all other trap + * types, just handle them in the usual way. + */ + cmpq $T_BPTFLT,TF_TRAPNO(%rsp) + jne calltrap + + /* Check if there is no DTrace hook registered. */ + cmpq $0,dtrace_invop_jump_addr + je calltrap + + /* + * Set our jump address for the jump back in the event that + * the breakpoint wasn't caused by DTrace at all. + */ + movq $calltrap, dtrace_invop_calltrap_addr(%rip) + + /* Jump to the code hooked in by DTrace. */ + movq dtrace_invop_jump_addr, %rax + jmpq *dtrace_invop_jump_addr +#endif .globl calltrap .type calltrap,@function calltrap: @@ -348,6 +396,9 @@ * execute the NMI handler with interrupts disabled to prevent a * nested interrupt from executing an 'iretq' instruction and * inadvertently taking the processor out of NMI mode. + * + * Third, the NMI handler runs on its own stack (tss_ist1), shared + * with the double fault handler. */ IDTVEC(nmi) @@ -386,6 +437,61 @@ movq %rsp, %rdi call trap MEXITCOUNT +#ifdef HWPMC_HOOKS + /* + * Check if the current trap was from user mode and if so + * whether the current thread needs a user call chain to be + * captured. We are still in NMI mode at this point. + */ + testb $SEL_RPL_MASK,TF_CS(%rsp) + jz nocallchain + movq PCPU(CURTHREAD),%rax /* curthread present? */ + orq %rax,%rax + jz nocallchain + testl $TDP_CALLCHAIN,TD_PFLAGS(%rax) /* flagged for capture? */ + jz nocallchain + /* + * A user callchain is to be captured, so: + * - Move execution to the regular kernel stack, to allow for + * nested NMI interrupts. + * - Take the processor out of "NMI" mode by faking an "iret". + * - Enable interrupts, so that copyin() can work. + */ + movq %rsp,%rsi /* source stack pointer */ + movq $TF_SIZE,%rcx + movq PCPU(RSP0),%rbx + subq %rcx,%rbx + movq %rbx,%rdi /* destination stack pointer */ + + shrq $3,%rcx /* trap frame size in long words */ + cld + rep + movsq /* copy trapframe */ + + movl %ss,%eax + pushq %rax /* tf_ss */ + pushq %rbx /* tf_rsp (on kernel stack) */ + pushfq /* tf_rflags */ + movl %cs,%eax + pushq %rax /* tf_cs */ + pushq $outofnmi /* tf_rip */ + iretq +outofnmi: + /* + * At this point the processor has exited NMI mode and is running + * with interrupts turned off on the normal kernel stack. + * We turn interrupts back on, and take the usual 'doreti' exit + * path. + * + * If a pending NMI gets recognized at or after this point, it + * will cause a kernel callchain to be traced. Since this path + * is only taken for NMI interrupts from user space, our `swapgs' + * state is correct for taking the doreti path. + */ + sti + jmp doreti +nocallchain: +#endif testl %ebx,%ebx jz nmi_restoreregs swapgs @@ -556,3 +662,6 @@ movq $0,TF_ADDR(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) jmp calltrap +#ifdef HWPMC_HOOKS + ENTRY(end_exceptions) +#endif ==== //depot/projects/dtrace7/src/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,9 +32,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.42.2.1 2007/11/08 20:09:15 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.43 2007/10/27 13:34:53 jhb Exp $"); #include "opt_hwpmc_hooks.h" +#include "opt_kdtrace.h" #include "opt_ddb.h" @@ -65,6 +66,11 @@ #include #endif +#ifdef KDTRACE_HOOKS +#include +cyclic_clock_func_t lapic_cyclic_clock_func[MAXCPU]; +#endif + /* Sanity checks on IDT vectors. */ CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT); CTASSERT(APIC_TIMER_INT < APIC_LOCAL_INTS); @@ -668,6 +674,17 @@ (*la->la_timer_count)++; critical_enter(); +#ifdef KDTRACE_HOOKS + /* + * If the DTrace hooks are configured and a callback function + * has been registered, then call it to process the high speed + * timers. + */ + int cpu = PCPU_GET(cpuid); + if (lapic_cyclic_clock_func[cpu] != NULL) + (*lapic_cyclic_clock_func[cpu])(frame); +#endif + /* Fire hardclock at hz. */ la->la_hard_ticks += hz; if (la->la_hard_ticks >= lapic_timer_hz) { ==== //depot/projects/dtrace7/src/sys/amd64/amd64/trap.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.319.2.2 2007/12/06 14:20:25 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.324 2007/12/07 08:20:15 jkoshy Exp $"); /* * AMD64 Trap and System call handling @@ -49,6 +49,7 @@ #include "opt_hwpmc_hooks.h" #include "opt_isa.h" #include "opt_kdb.h" +#include "opt_kdtrace.h" #include "opt_ktrace.h" #include @@ -94,6 +95,24 @@ #endif #include +#ifdef KDTRACE_HOOKS +#include + +/* + * This is a hook which is initialised by the dtrace module + * to handle traps which might occur during DTrace probe + * execution. + */ +dtrace_trap_func_t dtrace_trap_func; + +/* + * This is a hook which is initialised by the systrace module + * when it is loaded. This keeps the DTrace syscall provider + * implementation opaque. + */ +systrace_probe_func_t systrace_probe_func; +#endif + extern void trap(struct trapframe *frame); extern void syscall(struct trapframe *frame); void dblfault_handler(struct trapframe *frame); @@ -195,11 +214,28 @@ * the NMI was handled by it and we can return immediately. */ if (type == T_NMI && pmc_intr && - (*pmc_intr)(PCPU_GET(cpuid), (uintptr_t) frame->tf_rip, - TRAPF_USERMODE(frame))) + (*pmc_intr)(PCPU_GET(cpuid), frame)) goto out; #endif +#ifdef KDTRACE_HOOKS + /* + * A trap can occur while DTrace executes a probe. Before + * executing the probe, DTrace blocks re-scheduling and sets + * a flag in it's per-cpu flags to indicate that it doesn't + * want to fault. On returning from the the probe, the no-fault + * flag is cleared and finally re-scheduling is enabled. + * + * If the DTrace kernel module has registered a trap handler, + * call it and if it returns non-zero, assume that it has + * handled the trap and modified the trap frame so that this + * function can return normally. + */ + if (dtrace_trap_func != NULL) + if ((*dtrace_trap_func)(frame, type)) + goto out; +#endif + if ((frame->tf_rflags & PSL_I) == 0) { /* * Buggy application or kernel code has disabled @@ -211,7 +247,7 @@ if (ISPL(frame->tf_cs) == SEL_UPL) printf( "pid %ld (%s): trap %d with interrupts disabled\n", - (long)curproc->p_pid, curproc->p_comm, type); + (long)curproc->p_pid, curthread->td_name, type); else if (type != T_NMI && type != T_BPTFLT && type != T_TRCTRAP) { /* @@ -708,8 +744,8 @@ printf("current process = "); if (curproc) { printf("%lu (%s)\n", - (u_long)curproc->p_pid, curproc->p_comm ? - curproc->p_comm : ""); + (u_long)curproc->p_pid, curthread->td_name ? + curthread->td_name : ""); } else { printf("Idle\n"); } @@ -836,7 +872,7 @@ #endif CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, - td->td_proc->p_pid, td->td_proc->p_comm, code); + td->td_proc->p_pid, td->td_name, code); td->td_syscalls++; @@ -848,9 +884,38 @@ PTRACESTOP_SC(p, td, S_PT_SCE); +#ifdef KDTRACE_HOOKS + /* + * If the systrace module has registered it's probe + * callback and if there is a probe active for the + * syscall 'entry', process the probe. + */ + if (systrace_probe_func != NULL && callp->sy_entry != 0) + (*systrace_probe_func)(callp->sy_entry, code, callp, + args); +#endif + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, argp); AUDIT_SYSCALL_EXIT(error, td); + + /* Save the latest error return value. */ + td->td_errno = error; + +#ifdef KDTRACE_HOOKS + /* Save the error return variable for DTrace to reference. */ + args[0] = error; + args[1] = error; + + /* + * If the systrace module has registered it's probe + * callback and if there is a probe active for the + * syscall 'return', process the probe. + */ + if (systrace_probe_func != NULL && callp->sy_return != 0) + (*systrace_probe_func)(callp->sy_return, code, callp, + args); +#endif } switch (error) { @@ -918,7 +983,7 @@ userret(td, frame); CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, - td->td_proc->p_pid, td->td_proc->p_comm, code); + td->td_proc->p_pid, td->td_name, code); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) From owner-p4-projects@FreeBSD.ORG Fri Feb 1 04:02:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D140E16A421; Fri, 1 Feb 2008 04:02:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E8AD16A417 for ; Fri, 1 Feb 2008 04:02:01 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 73C9913C468 for ; Fri, 1 Feb 2008 04:02:01 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m114218T050998 for ; Fri, 1 Feb 2008 04:02:01 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m11421A1050993 for perforce@freebsd.org; Fri, 1 Feb 2008 04:02:01 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 1 Feb 2008 04:02:01 GMT Message-Id: <200802010402.m11421A1050993@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 134577 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 04:02:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=134577 Change 134577 by pgj@disznohal on 2008/02/01 04:01:53 IFC before translation Affected files ... .. //depot/projects/docproj_hu/books/handbook/disks/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/disks/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2779,27 +2779,12 @@ cp /root/.profile /mnt/root -cp -f /dev/MAKEDEV /mnt/dev -chmod 755 /mnt/dev/MAKEDEV - chmod 500 /mnt/sbin/init chmod 555 /mnt/sbin/fsck /mnt/sbin/mount /mnt/sbin/halt chmod 555 /mnt/bin/sh /mnt/bin/sync chmod 6555 /mnt/sbin/restore # -# create the devices nodes -# -cd /mnt/dev -./MAKEDEV std -./MAKEDEV da0 -./MAKEDEV da1 -./MAKEDEV da2 -./MAKEDEV sa0 -./MAKEDEV pty0 -cd / - -# # create minimum file system table # cat > /mnt/etc/fstab < - &prompt.root; gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c + &prompt.root; gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock &man.gbde.8; will open your editor, permitting you to set various configuration options in a template. For use with UFS1 @@ -3613,7 +3598,11 @@ The gbde init command creates a lock file for your gbde partition that in this example is stored as - /etc/gbde/ad4s1c. + /etc/gbde/ad4s1c.lock. + gbde lock files must end in + .lock in order to be correctly detected by + the + /etc/rc.d/gbde start up script. gbde lock files @@ -3631,7 +3620,7 @@ Attach the Encrypted Partition to the Kernel - &prompt.root; gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c + &prompt.root; gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock You will be asked to provide the passphrase that you selected during the initialization of the encrypted partition. @@ -3708,7 +3697,7 @@ Attach the gbde Partition to the Kernel - &prompt.root; gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c + &prompt.root; gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock You will be asked to provide the passphrase that you selected during initialization of the encrypted @@ -3749,7 +3738,8 @@ &man.rc.conf.5;, for example: gbde_autoattach_all="YES" -gbde_devices="ad4s1c" +gbde_devices="ad4s1c" +gbde_lockdir="/etc/gbde" This will require that the gbde passphrase be entered at boot time. After typing the correct @@ -4099,6 +4089,10 @@ a sectorsize of 4 kilobytes and the detach on last close option set: + geli_swap_flags="-e blowfish -l 128 -s 4096 -d" + + For systems prior to &os; 6.2-RELEASE, use the following line: + geli_swap_flags="-a blowfish -l 128 -s 4096 -d" Please refer to the description of the onetime command From owner-p4-projects@FreeBSD.ORG Fri Feb 1 04:06:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CEBF16A420; Fri, 1 Feb 2008 04:06:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39F8016A46B for ; Fri, 1 Feb 2008 04:06:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D8CDC13C43E for ; Fri, 1 Feb 2008 04:06:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m11465U3052371 for ; Fri, 1 Feb 2008 04:06:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m11465mY052368 for perforce@freebsd.org; Fri, 1 Feb 2008 04:06:05 GMT (envelope-from jb@freebsd.org) Date: Fri, 1 Feb 2008 04:06:05 GMT Message-Id: <200802010406.m11465mY052368@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134578 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 04:06:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=134578 Change 134578 by jb@jb_freebsd1 on 2008/02/01 04:05:05 Add a kernel option to force stack frames to be compiled in. In the past it was just DDB which needed them. Now, in order to pass the DTrace Test Suite we need them. Leaving out this option (and DDB) will give a performance improvement at the expense of less available Function Boundary Trace (fbt) probes. That is, less that 10,000 probes in a GENERIC kernel without the option and over 28,000 with, so it's a lot of functions we can't trace. We need to work on instrumenting the 'sub %rsp' opcodes to avoid needing this option. Affected files ... .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#31 edit .. //depot/projects/dtrace/src/sys/conf/Makefile.amd64#6 edit .. //depot/projects/dtrace/src/sys/conf/options.amd64#9 edit .. //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#5 edit .. //depot/projects/dtrace7/src/sys/conf/Makefile.amd64#2 edit .. //depot/projects/dtrace7/src/sys/conf/options.amd64#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#31 (text+ko) ==== @@ -64,6 +64,8 @@ options STOP_NMI # Stop CPUS using NMI instead of IPI options AUDIT # Security event auditing options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. +options KDTRACE_FRAME # Ensure frames are compiled in +options KDTRACE_HOOKS # Kernel DTrace hooks # Debugging for use in -current options KDB # Enable kernel debugger support. ==== //depot/projects/dtrace/src/sys/conf/Makefile.amd64#6 (text+ko) ==== @@ -32,8 +32,9 @@ .include "$S/conf/kern.pre.mk" DDB_ENABLED!= grep DDB opt_ddb.h || true +DTR_ENABLED!= grep KDTRACE_FRAME opt_kdtrace.h || true HWPMC_ENABLED!= grep HWPMC opt_hwpmc_hooks.h || true -.if !empty(DDB_ENABLED) || !empty(HWPMC_ENABLED) +.if !empty(DDB_ENABLED) || !empty(DTR_ENABLED) || !empty(HWPMC_ENABLED) CFLAGS+= -fno-omit-frame-pointer .endif ==== //depot/projects/dtrace/src/sys/conf/options.amd64#9 (text+ko) ==== @@ -65,6 +65,7 @@ # Debugging STOP_NMI opt_cpu.h +KDTRACE_FRAME opt_kdtrace.h # BPF just-in-time compiler BPF_JITTER opt_bpf.h ==== //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#5 (text+ko) ==== @@ -63,6 +63,7 @@ options STOP_NMI # Stop CPUS using NMI instead of IPI options AUDIT # Security event auditing options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. +options KDTRACE_FRAME # Ensure frames are compiled in options KDTRACE_HOOKS # Kernel DTrace hooks # Make an SMP-capable kernel by default ==== //depot/projects/dtrace7/src/sys/conf/Makefile.amd64#2 (text+ko) ==== @@ -32,7 +32,8 @@ .include "$S/conf/kern.pre.mk" DDB_ENABLED!= grep DDB opt_ddb.h || true -.if !empty(DDB_ENABLED) +DTR_ENABLED!= grep KDTRACE_FRAME opt_kdtrace.h || true +.if !empty(DDB_ENABLED) || !empty(DTR_ENABLED) CFLAGS+= -fno-omit-frame-pointer .endif ==== //depot/projects/dtrace7/src/sys/conf/options.amd64#2 (text+ko) ==== @@ -64,6 +64,7 @@ # Debugging STOP_NMI opt_cpu.h +KDTRACE_FRAME opt_kdtrace.h # BPF just-in-time compiler BPF_JITTER opt_bpf.h From owner-p4-projects@FreeBSD.ORG Fri Feb 1 04:42:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F6AF16A419; Fri, 1 Feb 2008 04:42:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D989816A417 for ; Fri, 1 Feb 2008 04:42:46 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B67A613C457 for ; Fri, 1 Feb 2008 04:42:46 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m114gkCn056118 for ; Fri, 1 Feb 2008 04:42:46 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m114gjgu056115 for perforce@freebsd.org; Fri, 1 Feb 2008 04:42:45 GMT (envelope-from imp@freebsd.org) Date: Fri, 1 Feb 2008 04:42:45 GMT Message-Id: <200802010442.m114gjgu056115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134579 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 04:42:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=134579 Change 134579 by imp@imp_lighthouse on 2008/02/01 04:42:20 I don't think that we want both ISA_MIPS32 and ISA_MIPS64 defined. # however, here begins the plunge into saving 64-bits... Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/std.octeon32#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/std.octeon32#5 (text+ko) ==== @@ -18,4 +18,4 @@ #device clock #device obio #device uart -options ISA_MIPS32 +#options ISA_MIPS32 From owner-p4-projects@FreeBSD.ORG Fri Feb 1 04:46:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A03516A419; Fri, 1 Feb 2008 04:46:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 177AF16A417 for ; Fri, 1 Feb 2008 04:46:51 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0CC3A13C461 for ; Fri, 1 Feb 2008 04:46:51 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m114ko4h056295 for ; Fri, 1 Feb 2008 04:46:50 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m114koOO056292 for perforce@freebsd.org; Fri, 1 Feb 2008 04:46:50 GMT (envelope-from imp@freebsd.org) Date: Fri, 1 Feb 2008 04:46:50 GMT Message-Id: <200802010446.m114koOO056292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134580 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 04:46:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=134580 Change 134580 by imp@imp_lighthouse on 2008/02/01 04:46:06 No need to bzero .bss. The boot loader already does this. There is a need to parse the boot loader's info that was inadvertantly removed from a prior version. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#6 (text+ko) ==== @@ -1024,9 +1024,8 @@ } -void mips_boot_params_init(void); - -void mips_boot_params_init (void) +static void +mips_boot_params_init(void) { int descriptor_not_parsed = 1; @@ -1249,17 +1248,16 @@ mips_platform_init(); - /* clear the BSS and SBSS segments */ + /* The boot loader clears the BSS and SBSS segments */ kernend = round_page((vm_offset_t)&end); - memset(&edata, 0, kernend - (vm_offset_t)(&edata)); - tick_early_init(OCTEON_CLOCK_DEFAULT); /* Quick Default. To avoid divide-by-0 * Later we will get it from * Bootloader/Rom-Mon */ cninit(); - printf(" Initialized memory: 0x%p to 0x%lX\n", &edata, ((long) &edata) + ((long)kernend - (long)(&edata))); + mips_boot_params_init(); + printf(" Initialized memory: 0x%p to 0x%lX\n", &edata, ((long) &edata) + ((long)kernend - (long)(&edata))); mips_init(); uint64_t platform_counter_freq = OCTEON_CLOCK_DEFAULT; From owner-p4-projects@FreeBSD.ORG Fri Feb 1 04:55:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0DAA16A41B; Fri, 1 Feb 2008 04:55:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 762ED16A417 for ; Fri, 1 Feb 2008 04:55:00 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6B69D13C43E for ; Fri, 1 Feb 2008 04:55:00 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m114t0Dg065430 for ; Fri, 1 Feb 2008 04:55:00 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m114sxg2065427 for perforce@freebsd.org; Fri, 1 Feb 2008 04:54:59 GMT (envelope-from imp@freebsd.org) Date: Fri, 1 Feb 2008 04:54:59 GMT Message-Id: <200802010454.m114sxg2065427@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134581 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 04:55:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=134581 Change 134581 by imp@imp_lighthouse on 2008/02/01 04:54:23 Nits. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#7 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#7 (text+ko) ==== @@ -754,12 +754,11 @@ } -extern void mips_platform_init(void); - -void mips_platform_init (void) +static void +mips_platform_init (void) { octeon_ciu_reset(); - octeon_uart_write_string(0, "\nPlatform Starting"); + octeon_uart_write_string(0, "\nPlatform Starting\n"); } @@ -1074,7 +1073,8 @@ #endif } -int octeon_cpu_type(void) +int +octeon_cpu_type(void) { int prid = mips_rd_prid(); @@ -1097,7 +1097,9 @@ default: return -1; } } -unsigned long octeon_get_clock_rate(void) + +unsigned long +octeon_get_clock_rate(void) { return octeon_cpu_clock; } @@ -1263,4 +1265,3 @@ uint64_t platform_counter_freq = OCTEON_CLOCK_DEFAULT; tick_init_params(platform_counter_freq, 0); } - From owner-p4-projects@FreeBSD.ORG Fri Feb 1 05:22:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A480016A4D5; Fri, 1 Feb 2008 05:22:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69C0216A41A for ; Fri, 1 Feb 2008 05:22:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5BCC113C4EB for ; Fri, 1 Feb 2008 05:22:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m115MT7x068480 for ; Fri, 1 Feb 2008 05:22:29 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m115MTPY068477 for perforce@freebsd.org; Fri, 1 Feb 2008 05:22:29 GMT (envelope-from imp@freebsd.org) Date: Fri, 1 Feb 2008 05:22:29 GMT Message-Id: <200802010522.m115MTPY068477@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134582 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 05:22:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=134582 Change 134582 by imp@imp_lighthouse on 2008/02/01 05:22:25 Add some ifdefs for TARGET_OCTEON preservinbg more bits. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#21 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pm_machdep.c#6 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#12 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#21 (text+ko) ==== ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/pm_machdep.c#6 (text+ko) ==== @@ -484,6 +484,10 @@ #else td->td_frame->sr = SR_KSU_USER | SR_EXL;// mips2 also did COP_0_BIT #endif +#ifdef TARGET_OCTEON + td->td_frame->sr |= MIPS_SR_COP_2_BIT | MIPS32_SR_PX | MIPS_SR_UX | + MIPS_SR_KX | MIPS_SR_SX; +#endif /* * FREEBSD_DEVELOPERS_FIXME: * Setup any other CPU-Specific registers (Not MIPS Standard) ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#12 (text+ko) ==== @@ -169,6 +169,9 @@ td2->td_md.md_saved_intr = 1; td2->td_md.md_spinlock_count = 1; +#ifdef TARGET_OCTEON + pcb2->pcb_context.val[11] |= MIPS_SR_COP_2_BIT | MIPS32_SR_PX | MIPS_SR_UX | MIPS_SR_KX | MIPS_SR_SX; +#endif } @@ -304,6 +307,10 @@ /* Dont set IE bit in SR. sched lock release will take care of it */ /* idle_mask is jmips pcb2->pcb_context.val[11] = (ALL_INT_MASK & idle_mask); */ pcb2->pcb_context.val[11] = 0; +#ifdef TARGET_OCTEON + pcb2->pcb_context.val[11] |= MIPS_SR_COP_2_BIT | MIPS_SR_COP_0_BIT | + MIPS32_SR_PX | MIPS_SR_UX | MIPS_SR_KX | MIPS_SR_SX; +#endif /* * FREEBSD_DEVELOPERS_FIXME: @@ -314,6 +321,12 @@ /* SMP Setup to release sched_lock in fork_exit(). */ td->td_md.md_spinlock_count = 1; td->td_md.md_saved_intr = 1; +#if 0 + /* Maybe we need to fix this? */ + td->td_md.md_saved_sr = ( (MIPS_SR_COP_2_BIT | MIPS_SR_COP_0_BIT) | + (MIPS32_SR_PX | MIPS_SR_UX | MIPS_SR_KX | MIPS_SR_SX) | + (MIPS_SR_INT_IE | MIPS_HARD_INT_MASK)); +#endif } /* @@ -347,6 +360,10 @@ tf->a0 = (register_t)arg; tf->sr = SR_KSU_USER | SR_EXL; +#ifdef TARGET_OCTEON + tf->sr |= MIPS_SR_INT_IE | MIPS_SR_COP_0_BIT | MIPS_SR_UX | + MIPS_SR_KX; +#endif /* tf->sr |= (ALL_INT_MASK & idle_mask) | SR_INT_ENAB; */ /**XXX the above may now be wrong -- mips2 implements this as panic */ /* From owner-p4-projects@FreeBSD.ORG Fri Feb 1 06:12:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DC2A16A4A5; Fri, 1 Feb 2008 06:12:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2F6216A49E for ; Fri, 1 Feb 2008 06:12:24 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AAA1513C45A for ; Fri, 1 Feb 2008 06:12:24 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m116COWK071493 for ; Fri, 1 Feb 2008 06:12:24 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m116COkN071490 for perforce@freebsd.org; Fri, 1 Feb 2008 06:12:24 GMT (envelope-from imp@freebsd.org) Date: Fri, 1 Feb 2008 06:12:24 GMT Message-Id: <200802010612.m116COkN071490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134583 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 06:12:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=134583 Change 134583 by imp@imp_lighthouse on 2008/02/01 06:11:51 Remove ISA_MIPS64. It breaks way too many things. Replace it with ISA_MIPS32. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#6 (text+ko) ==== @@ -33,7 +33,7 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options ISA_MIPS64 +options ISA_MIPS32 options CPU_NOFPU options DDB From owner-p4-projects@FreeBSD.ORG Fri Feb 1 06:46:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B16C816A469; Fri, 1 Feb 2008 06:46:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75FE316A41A for ; Fri, 1 Feb 2008 06:46:00 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F61213C4CC for ; Fri, 1 Feb 2008 06:46:00 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m116k0dG073769 for ; Fri, 1 Feb 2008 06:46:00 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m116k0u8073764 for perforce@freebsd.org; Fri, 1 Feb 2008 06:46:00 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 1 Feb 2008 06:46:00 GMT Message-Id: <200802010646.m116k0u8073764@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134584 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 06:46:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=134584 Change 134584 by kmacy@kmacy:storage:toehead on 2008/02/01 06:45:34 - various fixes for ddp socket buffer accounting - verbose logging in ddp path Affected files ... .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#12 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#13 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#5 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_defs.h#5 edit Differences ... ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#12 (text+ko) ==== @@ -578,7 +578,7 @@ * to the HW for the amount of data processed. */ void -t3_cleanup_rbuf(struct tcpcb *tp) +t3_cleanup_rbuf(struct tcpcb *tp, int copied) { struct toepcb *toep = tp->t_toe; struct socket *so; @@ -593,10 +593,14 @@ so = tp->t_inpcb->inp_socket; SOCKBUF_LOCK(&so->so_rcv); - read = toep->tp_enqueued_bytes - so->so_rcv.sb_cc; - toep->tp_copied_seq += read; - toep->tp_enqueued_bytes -= read; + if (copied) + toep->tp_copied_seq += copied; + else { + read = toep->tp_enqueued_bytes - so->so_rcv.sb_cc; + toep->tp_copied_seq += read; + } credits = toep->tp_copied_seq - toep->tp_rcv_wup; + toep->tp_enqueued_bytes = so->so_rcv.sb_cc; SOCKBUF_UNLOCK(&so->so_rcv); if (credits > so->so_rcv.sb_mbmax) @@ -686,7 +690,7 @@ cxgb_toe_rcvd(struct tcpcb *tp) { INP_LOCK_ASSERT(tp->t_inpcb); - t3_cleanup_rbuf(tp); + t3_cleanup_rbuf(tp, 0); return (0); } @@ -1742,6 +1746,7 @@ tp = toep->tp_tp; m->m_ddp_gl = (unsigned char *)bsp->gl; + m->m_flags |= M_DDP; m->m_seq = tp->rcv_nxt; tp->rcv_nxt += m->m_pkthdr.len; tp->t_rcvtime = ticks; @@ -1793,7 +1798,10 @@ TRACE_ENTER; q = &toep->tp_ddp_state; bsp = &q->buf_state[q->cur_buf]; - m->m_pkthdr.len = rcv_nxt - tp->rcv_nxt; + m->m_len = m->m_pkthdr.len = rcv_nxt - tp->rcv_nxt; + + printf("rcv_nxt=0x%x tp->rcv_next=0x%x len=%d\n", + rcv_nxt, tp->rcv_nxt, m->m_pkthdr.len); #ifdef T3_TRACE if ((int)m->m_pkthdr.len < 0) { @@ -1802,11 +1810,14 @@ #endif m->m_ddp_gl = (unsigned char *)bsp->gl; + m->m_flags |= M_DDP; m->m_cur_offset = bsp->cur_offset; m->m_ddp_flags = DDP_BF_PSH | (bsp->flags & DDP_BF_NOCOPY) | 1; if (bsp->flags & DDP_BF_NOCOPY) bsp->flags &= ~DDP_BF_NOCOPY; + printf("ddp flags=0x%x\n", m->m_ddp_flags); + m->m_seq = tp->rcv_nxt; tp->rcv_nxt = rcv_nxt; bsp->cur_offset += m->m_pkthdr.len; @@ -1836,14 +1847,14 @@ if (__predict_false(so_no_receive(so))) { handle_excess_rx(toep, m); INP_UNLOCK(tp->t_inpcb); + TRACE_EXIT; return; } - if (toep->tp_ulp_mode == ULP_MODE_TCPDDP && toep->tp_ddp_state.kbuf[0]) + if (toep->tp_ulp_mode == ULP_MODE_TCPDDP) handle_ddp_data(toep, m); - + m->m_seq = ntohl(hdr->seq); - m->m_ddp_flags = 0; m->m_ulp_mode = 0; /* for iSCSI */ #if VALIDATE_SEQ @@ -1974,7 +1985,7 @@ /* * Overload to store old RCV_NXT */ - m->m_pkthdr.csum_data = tp->rcv_nxt; + m->m_seq = tp->rcv_nxt; tp->rcv_nxt = rcv_nxt; /* @@ -1982,7 +1993,7 @@ * m->m_len here, we need to be very careful that nothing from now on * interprets ->len of this packet the usual way. */ - m->m_len = tp->rcv_nxt - m->m_pkthdr.csum_data; + m->m_len = m->m_pkthdr.len = tp->rcv_nxt - m->m_seq; /* * Figure out where the new data was placed in the buffer and store it @@ -1992,8 +2003,9 @@ end_offset = G_DDP_OFFSET(ddp_report) + ddp_len; m->m_cur_offset = end_offset - m->m_pkthdr.len; m->m_ddp_gl = (unsigned char *)bsp->gl; + m->m_flags |= M_DDP; bsp->cur_offset = end_offset; - + toep->tp_enqueued_bytes += m->m_pkthdr.len; /* * Bit 0 of flags stores whether the DDP buffer is completed. * Note that other parts of the code depend on this being in bit 0. @@ -2001,25 +2013,30 @@ if ((bsp->flags & DDP_BF_NOINVAL) && end_offset != bsp->gl->dgl_length) { panic("spurious ddp completion"); } else { - m->m_pkthdr.csum_flags = !!(ddp_report & F_DDP_BUF_COMPLETE); - if (m->m_pkthdr.csum_flags && !(bsp->flags & DDP_BF_NOFLIP)) + m->m_ddp_flags = !!(ddp_report & F_DDP_BUF_COMPLETE); + if (m->m_ddp_flags && !(bsp->flags & DDP_BF_NOFLIP)) q->cur_buf ^= 1; /* flip buffers */ } if (bsp->flags & DDP_BF_NOCOPY) { - m->m_pkthdr.csum_flags |= (bsp->flags & DDP_BF_NOCOPY); + m->m_ddp_flags |= (bsp->flags & DDP_BF_NOCOPY); bsp->flags &= ~DDP_BF_NOCOPY; } if (ddp_report & F_DDP_PSH) - m->m_pkthdr.csum_flags |= DDP_BF_PSH; + m->m_ddp_flags |= DDP_BF_PSH; tp->t_rcvtime = ticks; + + printf("ddp set and ddp_flags=0x%x len=%d m_seq=0x%x rcv_nxt=0x%x\n", m->m_ddp_flags, m->m_len, m->m_seq, rcv_nxt); + + SOCKBUF_LOCK(&so->so_rcv); sbappendstream_locked(&so->so_rcv, m); if ((so->so_state & SS_NOFDREF) == 0) sorwakeup_locked(so); - + else + SOCKBUF_UNLOCK(&so->so_rcv); TRACE_EXIT; } @@ -2077,7 +2094,7 @@ bsp = &q->buf_state[buf_idx]; when = bsp->cur_offset; - m->m_len = G_DDP_OFFSET(ddp_report) - when; + m->m_pkthdr.len = G_DDP_OFFSET(ddp_report) - when; #ifdef T3_TRACE T3_TRACE5(TIDTB(sk), @@ -2100,6 +2117,7 @@ G_DDP_OFFSET(ddp_report)); #endif m->m_ddp_gl = (unsigned char *)bsp->gl; + m->m_flags |= M_DDP; m->m_pkthdr.csum_flags = (bsp->flags & DDP_BF_NOCOPY) | 1; if (bsp->flags & DDP_BF_NOCOPY) bsp->flags &= ~DDP_BF_NOCOPY; @@ -2193,6 +2211,7 @@ bsp = &q->buf_state[q->cur_buf]; m->m_pkthdr.len = rcv_nxt - tp->rcv_nxt; m->m_ddp_gl = (unsigned char *)bsp->gl; + m->m_flags |= M_DDP; m->m_cur_offset = bsp->cur_offset; m->m_ddp_flags = DDP_BF_PSH | (bsp->flags & DDP_BF_NOCOPY) | 1; @@ -2925,7 +2944,8 @@ th.th_seq = req->rcv_isn; th.th_flags = TH_SYN; - toep->tp_iss = toep->tp_delack_seq = toep->tp_rcv_wup = toep->tp_copied_seq = rcv_isn; + toep->tp_iss = toep->tp_delack_seq = toep->tp_rcv_wup = toep->tp_copied_seq = rcv_isn + 1; + inc.inc_isipv6 = 0; inc.inc_len = 0; @@ -3075,9 +3095,6 @@ newtoep->tp_ulp_mode = TOM_TUNABLE(tdev, ddp) && /* !sock_flag(sk, NO_DDP) && */ tp->rcv_wnd >= MIN_DDP_RCV_WIN ? ULP_MODE_TCPDDP : 0; - printf("ddp=%d rcv_wnd=%ld min_win=%d\n", - TOM_TUNABLE(tdev, ddp), tp->rcv_wnd, MIN_DDP_RCV_WIN); - if (newtoep->tp_ulp_mode) { ddp_mbuf = m_gethdr(M_NOWAIT, MT_DATA); @@ -3085,6 +3102,9 @@ newtoep->tp_ulp_mode = 0; } + printf("ddp=%d rcv_wnd=%ld min_win=%d ulp_mode=%d\n", + TOM_TUNABLE(tdev, ddp), tp->rcv_wnd, MIN_DDP_RCV_WIN, newtoep->tp_ulp_mode); + #endif set_arp_failure_handler(reply_mbuf, pass_accept_rpl_arp_failure); @@ -3369,7 +3389,8 @@ tp->t_toe = toep; reset_wr_list(toep); tp->rcv_wnd = select_rcv_wnd(tdev, so); - DPRINTF("rcv_wnd=%ld\n", tp->rcv_wnd); + tp->rcv_nxt = toep->tp_copied_seq; + printf("rcv_wnd=%ld rcv_nxt=0x%x\n", tp->rcv_wnd, tp->rcv_nxt); install_offload_ops(so); toep->tp_wr_max = toep->tp_wr_avail = TOM_TUNABLE(tdev, max_wrs); ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#13 (text+ko) ==== @@ -303,7 +303,7 @@ } err = uiomove(buf, min(len, curlen), uio); if (err) { - printf("uiomove_frombuf returned %d\n", err); + printf("uiomove returned %d\n", err); return (err); } @@ -559,7 +559,7 @@ restart: len = uio->uio_resid; m = so->so_rcv.sb_mb; - target = (flags & MSG_WAITALL) ? min(len, so->so_rcv.sb_hiwat) : so->so_rcv.sb_lowat; + target = (flags & MSG_WAITALL) ? len : so->so_rcv.sb_lowat; p = &toep->tp_ddp_state; user_ddp_ok = p->ubuf_ddp_ready; p->cancel_ubuf = 0; @@ -597,22 +597,27 @@ if (so->so_rcv.sb_mb && !user_ddp_pending) { SOCKBUF_UNLOCK(&so->so_rcv); INP_LOCK(inp); - t3_cleanup_rbuf(tp); + t3_cleanup_rbuf(tp, copied_unacked); INP_UNLOCK(inp); SOCKBUF_LOCK(&so->so_rcv); copied_unacked = 0; goto restart; } - if (p->ubuf && user_ddp_ok && !user_ddp_pending && + if (p->kbuf[0] && user_ddp_ok && !user_ddp_pending && uio->uio_iov->iov_len > p->kbuf[0]->dgl_length && p->ubuf_ddp_ready) { user_ddp_pending = - !t3_overlay_ubuf(so, uio, IS_NONBLOCKING(so), flags); + !t3_overlay_ubuf(so, uio, 1, 1); if (user_ddp_pending) { p->kbuf_posted++; user_ddp_ok = 0; } + printf("user_ddp_pending=%d\n", user_ddp_pending); } + if (p->kbuf[0] && (p->kbuf_posted == 0)) { + t3_post_kbuf(so, 1); + p->kbuf_posted++; + } if (user_ddp_pending) { /* One shot at DDP if we already have enough data */ if (copied >= target) @@ -626,16 +631,15 @@ else { SOCKBUF_UNLOCK(&so->so_rcv); INP_LOCK(inp); - t3_cleanup_rbuf(tp); + t3_cleanup_rbuf(tp, copied_unacked); INP_UNLOCK(inp); SOCKBUF_LOCK(&so->so_rcv); copied_unacked = 0; printf("sbwaiting 2\n"); - if ((err = sbwait(&so->so_rcv)) != 0) goto done; } - goto restart; + goto restart; got_mbuf: if (m->m_pkthdr.len == 0) { if ((m->m_ddp_flags & DDP_BF_NOCOPY) == 0) @@ -645,9 +649,9 @@ m = so->so_rcv.sb_mb = m_free(m); goto done; } - offset = toep->tp_copied_seq + copied_unacked - m->m_seq + 1 /* OFF by one somewhere :-{ */; - DPRINTF("m=%p copied_seq=0x%x copied_unacked=%d m_seq=0x%x offset=%d\n", - m, toep->tp_copied_seq, copied_unacked, m->m_seq, offset); + offset = toep->tp_copied_seq + copied_unacked - m->m_seq; + printf("m=%p copied_seq=0x%x copied_unacked=%d m_seq=0x%x offset=%d pktlen=%d is_ddp(m)=%d\n", + m, toep->tp_copied_seq, copied_unacked, m->m_seq, offset, m->m_pkthdr.len, is_ddp(m)); if (offset >= m->m_pkthdr.len) panic("t3_soreceive: OFFSET >= LEN offset %d copied_seq 0x%x seq 0x%x " "pktlen %d ddp flags 0x%x", offset, toep->tp_copied_seq + copied_unacked, m->m_seq, @@ -690,19 +694,20 @@ } if (user_ddp_ok && !user_ddp_pending && - /* - * XXX - */ uio->uio_iov->iov_len > p->kbuf[0]->dgl_length && p->ubuf_ddp_ready) { user_ddp_pending = - !t3_overlay_ubuf(so, uio, (so->so_state & SS_NBIO), flags); + !t3_overlay_ubuf(so, uio, 1, 1); if (user_ddp_pending) { p->kbuf_posted++; user_ddp_ok = 0; } - } - + printf("user_ddp_pending=%d\n", user_ddp_pending); + } else + printf("user_ddp_ok=%d user_ddp_pending=%d iov_len=%ld dgl_length=%d ubuf_ddp_ready=%d ulp_mode=%d is_ddp(m)=%d flags=0x%x ubuf=%p kbuf_posted=%d\n", + user_ddp_ok, user_ddp_pending, uio->uio_iov->iov_len, p->kbuf[0] ? p->kbuf[0]->dgl_length : 0, + p->ubuf_ddp_ready, toep->tp_ulp_mode, !!is_ddp(m), m->m_ddp_flags, p->ubuf, p->kbuf_posted); + /* * If MSG_TRUNC is specified the data is discarded. * XXX need to check pr_atomic @@ -739,7 +744,7 @@ unsigned int fl = m->m_ddp_flags; int got_psh = 0; - if (p->ubuf != NULL && is_ddp(m) && (fl & 1)) { + if (p->kbuf[0] != NULL && is_ddp(m) && (fl & 1)) { if (is_ddp_psh(m) && user_ddp_pending) got_psh = 1; @@ -748,6 +753,7 @@ else { p->kbuf_posted--; p->ubuf_ddp_ready = 1; + printf("ubuf ddp ready\n"); } } @@ -756,6 +762,7 @@ } if (len > 0) goto restart; + done: /* @@ -780,6 +787,7 @@ "chelsio_recvmsg: about to exit, repost kbuf"); #endif + printf("posting kbuf\n"); t3_post_kbuf(so, 1); p->kbuf_posted++; } else if (so_should_ddp(toep, copied) @@ -791,9 +799,7 @@ t3_enter_ddp(so, TOM_TUNABLE(TOE_DEV(so), ddp_copy_limit), 0); p->kbuf_posted = 1; - } else - printf("user_ddp_pending=%d kbuf[0]=%p kbuf_posted=%d so_should_ddp=%d\n", - user_ddp_pending, p->kbuf[0], p->kbuf_posted, so_should_ddp(toep, copied)); + } } #ifdef T3_TRACE T3_TRACE5(TIDTB(so), @@ -806,7 +812,7 @@ done_unlocked: if (copied) { INP_LOCK(inp); - t3_cleanup_rbuf(tp); + t3_cleanup_rbuf(tp, copied_unacked); INP_UNLOCK(inp); } ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#5 (text+ko) ==== @@ -260,7 +260,8 @@ { struct toepcb *toep = sototcpcb(so)->t_toe; struct ddp_state *p = &toep->tp_ddp_state; - + TRACE_ENTER; + p->buf_state[bufidx].cur_offset = p->kbuf[bufidx]->dgl_offset; p->buf_state[bufidx].flags = p->kbuf_noinval ? DDP_BF_NOINVAL : 0; p->buf_state[bufidx].gl = p->kbuf[bufidx]; @@ -282,6 +283,7 @@ V_TF_DDP_BUF1_VALID(1) | V_TF_DDP_ACTIVE_BUF(1), modulate); + TRACE_EXIT; } /* @@ -423,13 +425,19 @@ struct ddp_state *p = &toep->tp_ddp_state; struct ddp_buf_state *dbs; - if (p->ubuf == NULL) + + TRACE_ENTER; + if (p->kbuf[0] == NULL) { + TRACE_EXIT; return (EINVAL); - + } + err = setup_uio_ppods(so, uio, 0, &len); - if (err) + if (err) { + TRACE_EXIT; return (err); - + } + ubuf_idx = p->kbuf_idx; p->buf_state[ubuf_idx].flags = DDP_BF_NOFLIP; /* Use existing offset */ @@ -467,6 +475,7 @@ " kbuf_idx %d", p->ubuf_tag, flags, OVERLAY_MASK, ubuf_idx, p->kbuf_idx); #endif + TRACE_EXIT; return (0); } @@ -528,10 +537,11 @@ struct toepcb *toep = sototcpcb(so)->t_toe; struct ddp_state *p = &toep->tp_ddp_state; + TRACE_ENTER; t3_set_ddp_tag(so, p->cur_buf, p->kbuf_tag[p->cur_buf] << 6); t3_set_ddp_buf(so, p->cur_buf, 0, p->kbuf[p->cur_buf]->dgl_length); - t3_repost_kbuf(so, p->cur_buf, modulate, 1); - + t3_repost_kbuf(so, p->cur_buf, modulate, (so->so_state & SS_NBIO)); + TRACE_EXIT; #ifdef T3_TRACE T3_TRACE1(TIDTB(so), "t3_post_kbuf: cur_buf = kbuf_idx = %u ", p->cur_buf); @@ -545,7 +555,7 @@ int t3_enter_ddp(struct socket *so, unsigned int kbuf_size, unsigned int waitall) { - int i, err = ENOMEM; + int i, nonblock, err = ENOMEM; static vm_pindex_t color; unsigned int nppods, kbuf_pages, idx = 0; struct toepcb *toep = sototcpcb(so)->t_toe; @@ -555,11 +565,12 @@ if (kbuf_size > M_TCB_RX_DDP_BUF0_LEN) return (EINVAL); + nonblock = (so->so_state & SS_NBIO); + kbuf_pages = (kbuf_size + PAGE_SIZE - 1) >> PAGE_SHIFT; nppods = pages2ppods(kbuf_pages); p->kbuf_noinval = !!waitall; - p->kbuf_tag[NUM_DDP_KBUF - 1] = -1; for (idx = 0; idx < NUM_DDP_KBUF; idx++) { p->kbuf[idx] = @@ -603,10 +614,11 @@ } t3_set_ddp_tag(so, 0, p->kbuf_tag[0] << 6); t3_set_ddp_buf(so, 0, 0, p->kbuf[0]->dgl_length); - t3_repost_kbuf(so, 0, 0, 1); + t3_repost_kbuf(so, 0, 0, nonblock); t3_set_rcv_coalesce_enable(so, TOM_TUNABLE(TOE_DEV(so), ddp_rcvcoalesce)); + printf("ddp entered\n"); #ifdef T3_TRACE T3_TRACE4(TIDTB(so), "t3_enter_ddp: kbuf_size %u waitall %u tag0 %d tag1 %d", @@ -624,20 +636,27 @@ int t3_ddp_copy(const struct mbuf *m, int offset, struct uio *uio, int len) { - int page_off; + int page_off, resid_init, err; struct ddp_gather_list *gl = (struct ddp_gather_list *)m->m_ddp_gl; TRACE_ENTER; + resid_init = uio->uio_resid; + if (!gl->dgl_pages) panic("pages not set\n"); offset += gl->dgl_offset + m->m_cur_offset; page_off = offset & ~PAGE_MASK; + err = uiomove_fromphys(gl->dgl_pages, page_off, len, uio); + printf("err=%d resid_init=%d uio_resid=%d offset=%d len=%d\n", + err, resid_init, uio->uio_resid, offset, len); + TRACE_EXIT; - return uiomove_fromphys(gl->dgl_pages, page_off, len, uio); + return (err); } + /* * Allocate n page pods. Returns -1 on failure or the page pod tag. */ ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_defs.h#5 (text+ko) ==== @@ -61,7 +61,7 @@ void t3_init_wr_tab(unsigned int wr_len); uint32_t t3_send_rx_credits(struct tcpcb *tp, uint32_t credits, uint32_t dack, int nofail); void t3_send_rx_modulate(struct toepcb *toep); -void t3_cleanup_rbuf(struct tcpcb *tp); +void t3_cleanup_rbuf(struct tcpcb *tp, int copied); void t3_init_socket_ops(void); void t3_install_socket_ops(struct socket *so); From owner-p4-projects@FreeBSD.ORG Fri Feb 1 07:44:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1A1516A46B; Fri, 1 Feb 2008 07:44:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6CED16A417 for ; Fri, 1 Feb 2008 07:44:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 974E413C455 for ; Fri, 1 Feb 2008 07:44:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m117i5hb078232 for ; Fri, 1 Feb 2008 07:44:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m117i4me078229 for perforce@freebsd.org; Fri, 1 Feb 2008 07:44:04 GMT (envelope-from jb@freebsd.org) Date: Fri, 1 Feb 2008 07:44:04 GMT Message-Id: <200802010744.m117i4me078229@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134588 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 07:44:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=134588 Change 134588 by jb@jb_freebsd1 on 2008/02/01 07:43:45 Ifdtrace7 Affected files ... .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_attrval.c#5 edit .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_die.c#3 edit .. //depot/projects/dtrace/src/lib/libdwarf/libdwarf.h#2 edit Differences ... ==== //depot/projects/dtrace/src/lib/libdwarf/dwarf_attrval.c#5 (text+ko) ==== @@ -209,10 +209,42 @@ *valp = 0; - if ((av = dwarf_attrval_find(die, attr)) == NULL) { + if ((av = dwarf_attrval_find(die, attr)) == NULL && attr != DW_AT_type) { DWARF_SET_ERROR(err, DWARF_E_NO_ENTRY); ret = DWARF_E_NO_ENTRY; - } else { + } else if (av == NULL && (av = dwarf_attrval_find(die, + DW_AT_abstract_origin)) != NULL) { + Dwarf_Die die1; + Dwarf_Unsigned val; + + switch (av->av_form) { + case DW_FORM_data1: + case DW_FORM_data2: + case DW_FORM_data4: + case DW_FORM_data8: + case DW_FORM_ref1: + case DW_FORM_ref2: + case DW_FORM_ref4: + case DW_FORM_ref8: + case DW_FORM_ref_udata: + val = av->u[0].u64; + + if ((die1 = dwarf_die_find(die, val)) == NULL || + (av = dwarf_attrval_find(die1, attr)) == NULL) { + DWARF_SET_ERROR(err, DWARF_E_NO_ENTRY); + ret = DWARF_E_NO_ENTRY; + } + break; + default: + printf("%s(%d): av->av_form '%s' (0x%lx) not handled\n", + __func__,__LINE__,get_form_desc(av->av_form), + (u_long) av->av_form); + DWARF_SET_ERROR(err, DWARF_E_BAD_FORM); + ret = DWARF_E_BAD_FORM; + } + } + + if (ret == DWARF_E_NONE) { switch (av->av_form) { case DW_FORM_data1: case DW_FORM_data2: ==== //depot/projects/dtrace/src/lib/libdwarf/dwarf_die.c#3 (text+ko) ==== @@ -175,3 +175,17 @@ return ret; } + +Dwarf_Die +dwarf_die_find(Dwarf_Die die, Dwarf_Unsigned off) +{ + Dwarf_CU cu = die->die_cu; + Dwarf_Die die1; + + STAILQ_FOREACH(die1, &cu->cu_die, die_next) { + if (die1->die_offset == off) + return (die1); + } + + return (NULL); +} ==== //depot/projects/dtrace/src/lib/libdwarf/libdwarf.h#2 (text+ko) ==== @@ -114,6 +114,7 @@ __BEGIN_DECLS Dwarf_Abbrev dwarf_abbrev_find(Dwarf_CU, uint64_t); Dwarf_AttrValue dwarf_attrval_find(Dwarf_Die, Dwarf_Half); +Dwarf_Die dwarf_die_find(Dwarf_Die, Dwarf_Unsigned); const char *dwarf_errmsg(Dwarf_Error *); const char *get_sht_desc(uint32_t); const char *get_attr_desc(uint32_t); From owner-p4-projects@FreeBSD.ORG Fri Feb 1 17:57:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C94CB16A473; Fri, 1 Feb 2008 17:57:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8EE5016A46C for ; Fri, 1 Feb 2008 17:57:51 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 80FD113C45A for ; Fri, 1 Feb 2008 17:57:51 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m11Hvp0r074944 for ; Fri, 1 Feb 2008 17:57:51 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m11HvoBe074941 for perforce@freebsd.org; Fri, 1 Feb 2008 17:57:50 GMT (envelope-from imp@freebsd.org) Date: Fri, 1 Feb 2008 17:57:50 GMT Message-Id: <200802011757.m11HvoBe074941@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134594 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 17:57:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=134594 Change 134594 by imp@imp_lighthouse on 2008/02/01 17:57:35 NFS ROOT Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#7 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#7 (text+ko) ==== @@ -44,21 +44,22 @@ options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options NFSCLIENT #Network Filesystem Client -#options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCLIENT options PSEUDOFS #Pseudo-filesystem framework options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options FFS #Berkeley Fast Filesystem +options BOOTP options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories # Debugging for use in -current -options INVARIANTS #Enable calls of extra sanity checking -options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS #Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -options WITNESS_KDB # break to debugger on witness warnings +#options INVARIANTS #Enable calls of extra sanity checking +#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS #Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +#options WITNESS_KDB # break to debugger on witness warnings device genclock device loop From owner-p4-projects@FreeBSD.ORG Fri Feb 1 18:16:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A95816A41B; Fri, 1 Feb 2008 18:16:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1948B16A419 for ; Fri, 1 Feb 2008 18:16:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0BD3F13C442 for ; Fri, 1 Feb 2008 18:16:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m11IGBTP077797 for ; Fri, 1 Feb 2008 18:16:11 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m11IGBPB077792 for perforce@freebsd.org; Fri, 1 Feb 2008 18:16:11 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 1 Feb 2008 18:16:11 GMT Message-Id: <200802011816.m11IGBPB077792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134595 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 18:16:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=134595 Change 134595 by kmacy@kmacy:storage:toehead on 2008/02/01 18:15:23 fix bounds checks in vm_fault_hold_pages Affected files ... .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 edit Differences ... ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 (text+ko) ==== @@ -37,9 +37,9 @@ vm_fault_hold_user_pages(vm_offset_t addr, vm_page_t *mp, int count, int flags) { - vm_offset_t start, va; + vm_offset_t end, va; vm_paddr_t pa; - int pageslen, faults, rv; + int faults, rv; struct thread *td; vm_map_t map; @@ -53,8 +53,8 @@ * and user do not share VA - however, it appears that all FreeBSD * architectures define it */ - pageslen = count * PAGE_SIZE; - if (addr + pageslen > VM_MAXUSER_ADDRESS) + end = addr + (count * PAGE_SIZE); + if (end > VM_MAXUSER_ADDRESS) return (EFAULT); TRACE_ENTER; @@ -72,7 +72,7 @@ * if so just mark pages as held (and dirty if for write) and return */ vm_page_lock_queues(); - for (start = addr, pages = mp, faults = 0, va = addr; va < start + pageslen; va += PAGE_SIZE, pages++) { + for (pages = mp, faults = 0, va = addr; va < end; va += PAGE_SIZE, pages++) { /* * Assure that we only hold the page once */ @@ -106,7 +106,7 @@ * trigger a fault where neccessary * */ - for (va = start; va < pageslen; va += PAGE_SIZE) { + for (va = addr; va < end; va += PAGE_SIZE) { m = NULL; pa = pmap_extract(pmap, va); rv = 0; @@ -124,10 +124,7 @@ error: vm_page_lock_queues(); - for (pages = mp, - va = start; va < start + pageslen; - va += PAGE_SIZE, - pages++) + for (pages = mp, va = addr; va < end; va += PAGE_SIZE, pages++) if (*pages) vm_page_unhold(*pages); vm_page_unlock_queues(); From owner-p4-projects@FreeBSD.ORG Fri Feb 1 19:38:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 800D116A41A; Fri, 1 Feb 2008 19:38:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E6AE16A418 for ; Fri, 1 Feb 2008 19:38:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 019CB13C43E for ; Fri, 1 Feb 2008 19:38:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m11JcbQZ085014 for ; Fri, 1 Feb 2008 19:38:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m11JcbiW085011 for perforce@freebsd.org; Fri, 1 Feb 2008 19:38:37 GMT (envelope-from jb@freebsd.org) Date: Fri, 1 Feb 2008 19:38:37 GMT Message-Id: <200802011938.m11JcbiW085011@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134597 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 19:38:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=134597 Change 134597 by jb@jb_freebsd1 on 2008/02/01 19:38:22 A few SMP_MAXCPU -> MAXCPU changes I missed. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/cyclic/i386/cyclic_machdep.c#3 edit .. //depot/projects/dtrace/src/sys/cddl/dev/fasttrap/fasttrap.c#6 edit .. //depot/projects/dtrace7/src/sys/cddl/cyclic/i386/cyclic_machdep.c#2 edit .. //depot/projects/dtrace7/src/sys/cddl/dev/fasttrap/fasttrap.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/cyclic/i386/cyclic_machdep.c#3 (text+ko) ==== @@ -73,7 +73,7 @@ cyclic_uninit(); } -static hrtime_t exp_due[SMP_MAXCPU]; +static hrtime_t exp_due[MAXCPU]; /* * This function is the one registered by the machine dependent ==== //depot/projects/dtrace/src/sys/cddl/dev/fasttrap/fasttrap.c#6 (text+ko) ==== @@ -279,7 +279,7 @@ fasttrap_mod_gen++; - for (i = 0; i < SMP_MAXCPU; i++) { + for (i = 0; i < MAXCPU; i++) { mtx_lock(&cpu_core[i].cpuc_pid_lock); mtx_unlock(&cpu_core[i].cpuc_pid_lock); } ==== //depot/projects/dtrace7/src/sys/cddl/cyclic/i386/cyclic_machdep.c#2 (text+ko) ==== @@ -73,7 +73,7 @@ cyclic_uninit(); } -static hrtime_t exp_due[SMP_MAXCPU]; +static hrtime_t exp_due[MAXCPU]; /* * This function is the one registered by the machine dependent ==== //depot/projects/dtrace7/src/sys/cddl/dev/fasttrap/fasttrap.c#2 (text+ko) ==== @@ -279,7 +279,7 @@ fasttrap_mod_gen++; - for (i = 0; i < SMP_MAXCPU; i++) { + for (i = 0; i < MAXCPU; i++) { mtx_lock(&cpu_core[i].cpuc_pid_lock); mtx_unlock(&cpu_core[i].cpuc_pid_lock); } From owner-p4-projects@FreeBSD.ORG Fri Feb 1 21:21:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2E8916A420; Fri, 1 Feb 2008 21:21:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9048016A417 for ; Fri, 1 Feb 2008 21:21:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6A04813C448 for ; Fri, 1 Feb 2008 21:21:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m11LLQGk008964 for ; Fri, 1 Feb 2008 21:21:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m11LLQ8r008961 for perforce@freebsd.org; Fri, 1 Feb 2008 21:21:26 GMT (envelope-from sam@freebsd.org) Date: Fri, 1 Feb 2008 21:21:26 GMT Message-Id: <200802012121.m11LLQ8r008961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134602 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 21:21:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=134602 Change 134602 by sam@sam_ebb on 2008/02/01 21:20:55 unbreak build w/ IEEE80211_DEBUG Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#5 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#5 (text+ko) ==== @@ -99,9 +99,7 @@ static int adhoc_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { -#ifdef IEEE80211_DEBUG struct ieee80211com *ic = vap->iv_ic; -#endif struct ieee80211_node *ni; enum ieee80211_state ostate; From owner-p4-projects@FreeBSD.ORG Fri Feb 1 21:22:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2946816A41B; Fri, 1 Feb 2008 21:22:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAE1F16A419 for ; Fri, 1 Feb 2008 21:22:27 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BD84E13C458 for ; Fri, 1 Feb 2008 21:22:27 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m11LMRrr009009 for ; Fri, 1 Feb 2008 21:22:27 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m11LMRRN009006 for perforce@freebsd.org; Fri, 1 Feb 2008 21:22:27 GMT (envelope-from sam@freebsd.org) Date: Fri, 1 Feb 2008 21:22:27 GMT Message-Id: <200802012122.m11LMRRN009006@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 21:22:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=134604 Change 134604 by sam@sam_ebb on 2008/02/01 21:22:02 add hack a la "show" so db_show_all_cmd_set gets created Affected files ... .. //depot/projects/vap/sys/ddb/db_command.c#7 edit .. //depot/projects/vap/sys/ddb/db_ps.c#5 edit Differences ... ==== //depot/projects/vap/sys/ddb/db_command.c#7 (text+ko) ==== @@ -81,7 +81,6 @@ */ static struct command db_show_all_cmds[] = { - { "procs", db_ps, 0, 0 }, { (char *)0 } }; ==== //depot/projects/vap/sys/ddb/db_ps.c#5 (text+ko) ==== @@ -46,6 +46,15 @@ static void dumpthread(volatile struct proc *p, volatile struct thread *td, int all); +/* + * At least one non-optional show-command must be implemented using + * DB_SHOW_ALL_COMMAND() so that db_show_all_cmd_set gets created. + * Here is one. + */ +DB_SHOW_ALL_COMMAND(procs, db_procs_cmd) +{ + db_ps(addr, have_addr, count, modif); +} /* * Layout: From owner-p4-projects@FreeBSD.ORG Fri Feb 1 21:23:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D87116A468; Fri, 1 Feb 2008 21:23:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A2C116A420 for ; Fri, 1 Feb 2008 21:23:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0CC8E13C447 for ; Fri, 1 Feb 2008 21:23:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m11LNSrp009065 for ; Fri, 1 Feb 2008 21:23:28 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m11LNSqL009062 for perforce@freebsd.org; Fri, 1 Feb 2008 21:23:28 GMT (envelope-from sam@freebsd.org) Date: Fri, 1 Feb 2008 21:23:28 GMT Message-Id: <200802012123.m11LNSqL009062@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 21:23:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=134605 Change 134605 by sam@sam_ebb on 2008/02/01 21:23:17 correct net80211-related dependencies after jhb applied the cluebat in particular this corrects ieee80211_ddb.c being pulled in when ddb is configured but not wlan Affected files ... .. //depot/projects/vap/sys/conf/files#15 edit Differences ... ==== //depot/projects/vap/sys/conf/files#15 (text+ko) ==== @@ -1656,15 +1656,15 @@ net/zlib.c optional crypto | geom_uzip | ipsec | \ mxge | ppp_deflate | netgraph_deflate net80211/ieee80211.c optional wlan -net80211/ieee80211_acl.c optional wlan_acl +net80211/ieee80211_acl.c optional wlan wlan_acl net80211/ieee80211_adhoc.c optional wlan -net80211/ieee80211_amrr.c optional wlan_amrr +net80211/ieee80211_amrr.c optional wlan wlan_amrr net80211/ieee80211_crypto.c optional wlan -net80211/ieee80211_crypto_ccmp.c optional wlan_ccmp +net80211/ieee80211_crypto_ccmp.c optional wlan wlan_ccmp net80211/ieee80211_crypto_none.c optional wlan -net80211/ieee80211_crypto_tkip.c optional wlan_tkip +net80211/ieee80211_crypto_tkip.c optional wlan wlan_tkip net80211/ieee80211_crypto_wep.c optional wlan_wep -net80211/ieee80211_ddb.c optional ddb +net80211/ieee80211_ddb.c optional wlan ddb net80211/ieee80211_dfs.c optional wlan net80211/ieee80211_freebsd.c optional wlan net80211/ieee80211_hostap.c optional wlan @@ -1678,12 +1678,12 @@ net80211/ieee80211_power.c optional wlan net80211/ieee80211_proto.c optional wlan net80211/ieee80211_regdomain.c optional wlan -net80211/ieee80211_rssadapt.c optional wlan_rssadapt +net80211/ieee80211_rssadapt.c optional wlan wlan_rssadapt net80211/ieee80211_scan.c optional wlan -net80211/ieee80211_scan_sta.c optional wlan_scan_sta +net80211/ieee80211_scan_sta.c optional wlan wlan_scan_sta net80211/ieee80211_sta.c optional wlan net80211/ieee80211_wds.c optional wlan -net80211/ieee80211_xauth.c optional wlan_xauth +net80211/ieee80211_xauth.c optional wlan wlan_xauth netatalk/aarp.c optional netatalk netatalk/at_control.c optional netatalk netatalk/at_proto.c optional netatalk From owner-p4-projects@FreeBSD.ORG Fri Feb 1 21:28:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1415016A421; Fri, 1 Feb 2008 21:28:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CDF316A41B for ; Fri, 1 Feb 2008 21:28:34 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8E83D13C461 for ; Fri, 1 Feb 2008 21:28:34 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m11LSY4i009237 for ; Fri, 1 Feb 2008 21:28:34 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m11LSYE7009234 for perforce@freebsd.org; Fri, 1 Feb 2008 21:28:34 GMT (envelope-from sam@freebsd.org) Date: Fri, 1 Feb 2008 21:28:34 GMT Message-Id: <200802012128.m11LSYE7009234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134606 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 21:28:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=134606 Change 134606 by sam@sam_ebb on 2008/02/01 21:27:39 add evil linker set hackery to handle files w/ multiple instances: o introduce _IEEE80211_PROFILE_MODULE to encapsulate the basic module glop o define other module wrappers in terms of _IEEE80211_PROFILE_MODULE and add wrappers to construct a linker set for sub-instances that the module event handler walks o add nrefs counters to modules since _IEEE80211_PROFILE_MODULE uses this to disallow kldunload when dynamic references are present (in the case of wlan_acl this needed to be done and was not but for some other modules there is no way to manage dynamic refs due to the current api's) o add stub module wrapper for rate control algorithms so we're ready when sephe bringins in his framework Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_acl.c#8 edit .. //depot/projects/vap/sys/net80211/ieee80211_amrr.c#6 edit .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#15 edit .. //depot/projects/vap/sys/net80211/ieee80211_rssadapt.c#2 edit .. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#16 edit .. //depot/projects/vap/sys/net80211/ieee80211_xauth.c#8 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_acl.c#8 (text+ko) ==== @@ -91,6 +91,9 @@ static int acl_free_all(struct ieee80211vap *); +/* number of references from net80211 layer */ +static int nrefs = 0; + static int acl_attach(struct ieee80211vap *vap) { @@ -105,6 +108,7 @@ as->as_policy = ACL_POLICY_OPEN; as->as_vap = vap; vap->iv_as = as; + nrefs++; /* NB: we assume caller locking */ return 1; } @@ -113,6 +117,9 @@ { struct aclstate *as = vap->iv_as; + KASSERT(nrefs > 0, ("imbalanced attach/detach")); + nrefs--; /* NB: we assume caller locking */ + acl_free_all(vap); vap->iv_as = NULL; ACL_LOCK_DESTROY(as); ==== //depot/projects/vap/sys/net80211/ieee80211_amrr.c#6 (text+ko) ==== @@ -64,6 +64,9 @@ #define reset_cnt(amn) \ do { (amn)->amn_txcnt = (amn)->amn_retrycnt = 0; } while (0) +/* number of references from net80211 layer */ +static int nrefs = 0; + void ieee80211_amrr_init(struct ieee80211_amrr *amrr, struct ieee80211vap *vap, int amin, int amax) @@ -140,25 +143,4 @@ /* * Module glue. */ -static int -amrr_modevent(module_t mod, int type, void *unused) -{ - switch (type) { - case MOD_LOAD: - if (bootverbose) - printf("wlan_amrr: \n"); - return 0; - case MOD_UNLOAD: - return 0; - } - return EINVAL; -} - -static moduledata_t amrr_mod = { - "wlan_amrr", - amrr_modevent, - 0 -}; -DECLARE_MODULE(wlan_amrr, amrr_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); -MODULE_VERSION(wlan_amrr, 1); -MODULE_DEPEND(wlan_amrr, wlan, 1, 1, 1); +IEEE80211_RATE_MODULE(amrr, 1); ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#15 (text+ko) ==== @@ -283,13 +283,24 @@ void ieee80211_load_module(const char *); -#define IEEE80211_CRYPTO_MODULE(name, version) \ +/* + * A "policy module" is an adjunct module to net80211 that provides + * functionality that typically includes policy decisions. This + * modularity enables extensibility and vendor-supplied functionality. + */ +#define _IEEE80211_POLICY_MODULE(policy, name, version) \ +typedef void (*policy##_setup)(int); \ +SET_DECLARE(policy##_set, policy##_setup); \ static int \ -name##_modevent(module_t mod, int type, void *unused) \ +wlan_##name##_modevent(module_t mod, int type, void *unused) \ { \ + policy##_setup * const *iter, f; \ switch (type) { \ case MOD_LOAD: \ - ieee80211_crypto_register(&name); \ + SET_FOREACH(iter, policy##_set) { \ + f = (void*) *iter; \ + f(type); \ + } \ return 0; \ case MOD_UNLOAD: \ case MOD_QUIESCE: \ @@ -298,100 +309,100 @@ nrefs); \ return EBUSY; \ } \ - if (type == MOD_UNLOAD) \ - ieee80211_crypto_unregister(&name); \ + if (type == MOD_UNLOAD) { \ + SET_FOREACH(iter, policy##_set) { \ + f = (void*) *iter; \ + f(type); \ + } \ + } \ return 0; \ } \ return EINVAL; \ } \ static moduledata_t name##_mod = { \ "wlan_" #name, \ - name##_modevent, \ + wlan_##name##_modevent, \ 0 \ }; \ DECLARE_MODULE(wlan_##name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);\ MODULE_VERSION(wlan_##name, version); \ MODULE_DEPEND(wlan_##name, wlan, 1, 1, 1) -#define IEEE80211_SCANNER_MODULE(name, alg, v, version) \ -static int \ -name##alg##_modevent(module_t mod, int type, void *unused) \ +/* + * Crypto modules implement cipher support. + */ +#define IEEE80211_CRYPTO_MODULE(name, version) \ +_IEEE80211_POLICY_MODULE(crypto, name, version); \ +static void \ +name##_modevent(int type) \ +{ \ + if (type == MOD_LOAD) \ + ieee80211_crypto_register(&name); \ + else \ + ieee80211_crypto_unregister(&name); \ +} \ +TEXT_SET(crypto##_set, name##_modevent) + +/* + * Scanner modules provide scanning policy. + */ +#define IEEE80211_SCANNER_MODULE(name, version) \ + _IEEE80211_POLICY_MODULE(scanner, name, version) + +#define IEEE80211_SCANNER_ALG(name, alg, v) \ +static void \ +name##_modevent(int type) \ { \ - switch (type) { \ - case MOD_LOAD: \ + if (type == MOD_LOAD) \ ieee80211_scanner_register(alg, &v); \ - return 0; \ - case MOD_UNLOAD: \ - case MOD_QUIESCE: \ - if (nrefs) { \ - printf("wlan_##name: still in use (%u dynamic refs)\n",\ - nrefs); \ - return EBUSY; \ - } \ - if (type == MOD_UNLOAD) \ - ieee80211_scanner_unregister(&name); \ - return 0; \ - } \ - return EINVAL; \ + else \ + ieee80211_scanner_unregister(alg, &v); \ } \ -static moduledata_t name##_mod = { \ - "wlan_" #name, \ - name##_modevent, \ - 0 \ -}; \ -DECLARE_MODULE(wlan_##name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);\ -MODULE_VERSION(wlan_##name, version); \ -MODULE_DEPEND(wlan_##name, wlan, 1, 1, 1) +TEXT_SET(scanner_set, name##_modevent); \ +/* + * ACL modules implement acl policy. + */ #define IEEE80211_ACL_MODULE(name, alg, version) \ -static int \ -name##_modevent(module_t mod, int type, void *unused) \ +_IEEE80211_POLICY_MODULE(acl, name, version); \ +static void \ +alg##_modevent(int type) \ { \ - switch (type) { \ - case MOD_LOAD: \ + if (type == MOD_LOAD) \ ieee80211_aclator_register(&alg); \ - return 0; \ - case MOD_UNLOAD: \ - case MOD_QUIESCE: \ - if (type == MOD_UNLOAD) \ - ieee80211_aclator_unregister(&alg); \ - return 0; \ - } \ - return EINVAL; \ + else \ + ieee80211_aclator_unregister(&alg); \ +} \ +TEXT_SET(acl_set, alg##_modevent); \ + +/* + * Authenticator modules handle 802.1x/WPA authentication. + */ +#define IEEE80211_AUTH_MODULE(name, version) \ + _IEEE80211_POLICY_MODULE(auth, name, version) + +#define IEEE80211_AUTH_ALG(name, alg, v) \ +static void \ +name##_modevent(int type) \ +{ \ + if (type == MOD_LOAD) \ + ieee80211_authenticator_register(alg, &v); \ + else \ + ieee80211_authenticator_unregister(alg); \ } \ -static moduledata_t name##_mod = { \ - #name, \ - name##_modevent, \ - 0 \ -}; \ -DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); \ -MODULE_VERSION(name, version); \ -MODULE_DEPEND(name, wlan, 1, 1, 1) +TEXT_SET(auth_set, name##_modevent) -#define IEEE80211_AUTH_MODULE(name, alg, version) \ -static int \ -name##_modevent(module_t mod, int type, void *unused) \ +/* + * Rate control modules provide tx rate control support. + */ +#define IEEE80211_RATE_MODULE(alg, version) \ +_IEEE80211_POLICY_MODULE(rate, alg, version); \ +static void \ +alg##_modevent(int type) \ { \ - switch (type) { \ - case MOD_LOAD: \ - ieee80211_authenticator_register(alg, &name); \ - return 0; \ - case MOD_UNLOAD: \ - case MOD_QUIESCE: \ - if (type == MOD_UNLOAD) \ - ieee80211_authenticator_unregister(alg); \ - return 0; \ - } \ - return EINVAL; \ + /* XXX nothing to do until the rate control framework arrives */\ } \ -static moduledata_t name##_mod = { \ - #name, \ - name##_modevent, \ - 0 \ -}; \ -DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); \ -MODULE_VERSION(name, version); \ -MODULE_DEPEND(name, wlan, 1, 1, 1) +TEXT_SET(rate##_set, alg##_modevent) #endif /* _KERNEL */ /* XXX this stuff belongs elsewhere */ ==== //depot/projects/vap/sys/net80211/ieee80211_rssadapt.c#2 (text+ko) ==== @@ -71,6 +71,9 @@ (parm##_denom - parm##_old) * (new)) / \ parm##_denom) +/* number of references from net80211 layer */ +static int nrefs = 0; + void ieee80211_rssadapt_init(struct ieee80211_rssadapt *rs, struct ieee80211vap *vap) { @@ -220,3 +223,8 @@ else rssadapt_lower_rate(rn, pktlen, rate, rssi); } + +/* + * Module glue. + */ +IEEE80211_RATE_MODULE(rssadapt, 1); ==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#16 (text+ko) ==== @@ -1646,7 +1646,6 @@ IEEE80211_SCANNER_MODULE(adhoc, IEEE80211_M_IBSS, adhoc_default, 1); IEEE80211_SCANNER_MODULE(adhoc, IEEE80211_M_AHDEMO, adhoc_default, 1); IEEE80211_SCANNER_MODULE(ap, IEEE80211_M_HOSTAP, ap_default, 1); -#else static int wlan_scan_modevent(module_t mod, int type, void *unused) { @@ -1682,3 +1681,91 @@ MODULE_VERSION(wlan_scan_sta, 1); MODULE_DEPEND(wlan_scan_sta, wlan, 1, 1, 1); #endif +#if 0 +typedef void (*scanner_setup)(int); +SET_DECLARE(scanner_set, scanner_setup); + +static int +wlan_scan_modevent(module_t mod, int type, void *unused) +{ + scanner_setup * const *iter, f; + + switch (type) { + case MOD_LOAD: + SET_FOREACH(iter, scanner_set) { + f = (void*) *iter; + f(type); + } + return 0; + case MOD_UNLOAD: + case MOD_QUIESCE: + if (nrefs) { + printf("wlan_scan: still in use (%u dynamic refs)\n", + nrefs); + return EBUSY; + } + if (type == MOD_UNLOAD) { + SET_FOREACH(iter, scanner_set) { + f = (void*) *iter; + f(type); + } + } + return 0; + } + return EINVAL; +} +static moduledata_t wlan_scan_mod = { + "wlan_scan_sta", + wlan_scan_modevent, + 0 +}; +DECLARE_MODULE(wlan_scan_sta, wlan_scan_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); +MODULE_VERSION(wlan_scan_sta, 1); +MODULE_DEPEND(wlan_scan_sta, wlan, 1, 1, 1); + +static void +sta_modevent(int type) +{ + if (type == MOD_LOAD) + ieee80211_scanner_register(IEEE80211_M_STA, &sta_default); + else + ieee80211_scanner_unregister(IEEE80211_M_STA, &sta_default); +} +TEXT_SET(scanner_set, sta_modevent); + +static void +ibss_modevent(int type) +{ + if (type == MOD_LOAD) + ieee80211_scanner_register(IEEE80211_M_IBSS, &adhoc_default); + else + ieee80211_scanner_unregister(IEEE80211_M_IBSS, &adhoc_default); +} +TEXT_SET(scanner_set, ibss_modevent); + +static void +ahdemo_modevent(int type) +{ + if (type == MOD_LOAD) + ieee80211_scanner_register(IEEE80211_M_AHDEMO, &adhoc_default); + else + ieee80211_scanner_unregister(IEEE80211_M_AHDEMO, &adhoc_default); +} +TEXT_SET(scanner_set, ahdemo_modevent); + +static void +ap_modevent(int type) +{ + if (type == MOD_LOAD) + ieee80211_scanner_register(IEEE80211_M_HOSTAP, &ap_default); + else + ieee80211_scanner_unregister(IEEE80211_M_HOSTAP, &ap_default); +} +TEXT_SET(scanner_set, ap_modevent); +#else +IEEE80211_SCANNER_MODULE(sta, 1); +IEEE80211_SCANNER_ALG(sta, IEEE80211_M_STA, sta_default); +IEEE80211_SCANNER_ALG(ibss, IEEE80211_M_IBSS, adhoc_default); +IEEE80211_SCANNER_ALG(ahdemo, IEEE80211_M_AHDEMO, adhoc_default); +IEEE80211_SCANNER_ALG(ap, IEEE80211_M_HOSTAP, ap_default); +#endif ==== //depot/projects/vap/sys/net80211/ieee80211_xauth.c#8 (text+ko) ==== @@ -56,6 +56,9 @@ #include +/* XXX number of references from net80211 layer; needed for module code */ +static int nrefs = 0; + /* * One module handles everything for now. May want * to split things up for embedded applications. @@ -68,34 +71,6 @@ .ia_node_leave = NULL, }; -#if 0 -IEEE80211_AUTH_MODULE(xauth, IEEE80211_AUTH_8021X, 1); -IEEE80211_AUTH_MODULE(xauth, IEEE80211_AUTH_WPA, 1); -#else -static int -wlan_xauth_modevent(module_t mod, int type, void *unused) -{ - switch (type) { - case MOD_LOAD: - ieee80211_authenticator_register(IEEE80211_AUTH_8021X, &xauth); - ieee80211_authenticator_register(IEEE80211_AUTH_WPA, &xauth); - return 0; - case MOD_UNLOAD: - case MOD_QUIESCE: - if (type == MOD_UNLOAD) { - ieee80211_authenticator_unregister(IEEE80211_AUTH_8021X); - ieee80211_authenticator_unregister(IEEE80211_AUTH_WPA); - } - return 0; - } - return EINVAL; -} -static moduledata_t wlan_xauth_mod = { - "wlan_xauth", - wlan_xauth_modevent, - 0 -}; -DECLARE_MODULE(wlan_xauth, wlan_xauth_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); -MODULE_VERSION(wlan_xauth, 1); -MODULE_DEPEND(wlan_xauth, wlan, 1, 1, 1); -#endif +IEEE80211_AUTH_MODULE(xauth, 1); +IEEE80211_AUTH_ALG(x8021x, IEEE80211_AUTH_8021X, xauth); +IEEE80211_AUTH_ALG(wpa, IEEE80211_AUTH_WPA, xauth); From owner-p4-projects@FreeBSD.ORG Sat Feb 2 00:04:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF92316A468; Sat, 2 Feb 2008 00:04:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8449716A41B for ; Sat, 2 Feb 2008 00:04:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7585813C461 for ; Sat, 2 Feb 2008 00:04:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1204a7b022898 for ; Sat, 2 Feb 2008 00:04:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1204aHn022895 for perforce@freebsd.org; Sat, 2 Feb 2008 00:04:36 GMT (envelope-from jb@freebsd.org) Date: Sat, 2 Feb 2008 00:04:36 GMT Message-Id: <200802020004.m1204aHn022895@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134611 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 00:04:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=134611 Change 134611 by jb@jb_freebsd1 on 2008/02/02 00:03:45 Is there any documentation for cloning devices on FreeBSD? :-( We don't need to allocate a cloned device number... we get told that. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_clone.c#8 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#29 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#25 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#29 edit .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_clone.c#2 edit .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_load.c#2 edit .. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_unload.c#2 edit .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_clone.c#8 (text+ko) ==== @@ -49,9 +49,6 @@ if (len == 13 && bcmp(name,"dtrace/dtrace",13) != 0) return; - /* Allocate a unique minor number. */ - u = alloc_unr(dtrace_minor); - /* Clone the device to the new minor number. */ if (clone_create(&dtrace_clones, &dtrace_cdevsw, &u, dev, 0) != 0) /* Create the /dev/dtrace/dtraceNN entry. */ ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#29 (text+ko) ==== @@ -98,7 +98,6 @@ #endif dtrace_arena = new_unrhdr(1, INT_MAX, &dtrace_unr_mtx); - dtrace_minor = new_unrhdr(1, INT_MAX, &dtrace_unr_mtx); dtrace_state_cache = kmem_cache_create("dtrace_state_cache", sizeof (dtrace_dstate_percpu_t) * NCPU, DTRACE_STATE_ALIGN, ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#25 (text+ko) ==== @@ -123,7 +123,6 @@ kmem_cache_destroy(dtrace_state_cache); delete_unrhdr(dtrace_arena); - delete_unrhdr(dtrace_minor); if (dtrace_toxrange != NULL) { kmem_free(dtrace_toxrange, 0); ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#29 (text) ==== @@ -197,7 +197,6 @@ static taskq_t *dtrace_taskq; /* task queue */ #else static struct unrhdr *dtrace_arena; /* Probe ID number. */ -static struct unrhdr *dtrace_minor; /* Minor number. */ #endif static dtrace_probe_t **dtrace_probes; /* array of all probes */ static int dtrace_nprobes; /* number of probes */ @@ -14957,6 +14956,7 @@ /* Check if this is not a cloned device. */ if (minor(dev) == 0) return (0); + #endif mutex_enter(&cpu_lock); @@ -14990,6 +14990,9 @@ mutex_exit(&dtrace_lock); mutex_exit(&cpu_lock); + /* Schedule this cloned device to be destroyed. */ + destroy_dev_sched(dev); + return (0); } ==== //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_clone.c#2 (text+ko) ==== @@ -49,9 +49,6 @@ if (len == 13 && bcmp(name,"dtrace/dtrace",13) != 0) return; - /* Allocate a unique minor number. */ - u = alloc_unr(dtrace_minor); - /* Clone the device to the new minor number. */ if (clone_create(&dtrace_clones, &dtrace_cdevsw, &u, dev, 0) != 0) /* Create the /dev/dtrace/dtraceNN entry. */ ==== //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_load.c#2 (text+ko) ==== @@ -98,7 +98,6 @@ #endif dtrace_arena = new_unrhdr(1, INT_MAX, &dtrace_unr_mtx); - dtrace_minor = new_unrhdr(1, INT_MAX, &dtrace_unr_mtx); dtrace_state_cache = kmem_cache_create("dtrace_state_cache", sizeof (dtrace_dstate_percpu_t) * NCPU, DTRACE_STATE_ALIGN, ==== //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_unload.c#2 (text+ko) ==== @@ -123,7 +123,6 @@ kmem_cache_destroy(dtrace_state_cache); delete_unrhdr(dtrace_arena); - delete_unrhdr(dtrace_minor); if (dtrace_toxrange != NULL) { kmem_free(dtrace_toxrange, 0); ==== //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 (text) ==== @@ -197,7 +197,6 @@ static taskq_t *dtrace_taskq; /* task queue */ #else static struct unrhdr *dtrace_arena; /* Probe ID number. */ -static struct unrhdr *dtrace_minor; /* Minor number. */ #endif static dtrace_probe_t **dtrace_probes; /* array of all probes */ static int dtrace_nprobes; /* number of probes */ From owner-p4-projects@FreeBSD.ORG Sat Feb 2 00:43:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35CB516A421; Sat, 2 Feb 2008 00:43:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5D6216A41B for ; Sat, 2 Feb 2008 00:43:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C5B1A13C4E7 for ; Sat, 2 Feb 2008 00:43:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m120hIVX025282 for ; Sat, 2 Feb 2008 00:43:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m120hIQe025279 for perforce@freebsd.org; Sat, 2 Feb 2008 00:43:18 GMT (envelope-from sam@freebsd.org) Date: Sat, 2 Feb 2008 00:43:18 GMT Message-Id: <200802020043.m120hIQe025279@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 134613 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 00:43:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=134613 Change 134613 by sam@sam_ebb on 2008/02/02 00:42:40 IFC @ 134612 Affected files ... .. //depot/projects/vap/Makefile#4 integrate .. //depot/projects/vap/contrib/binutils/libiberty/cp-demangle.c#3 integrate .. //depot/projects/vap/contrib/file/FREEBSD-upgrade#3 integrate .. //depot/projects/vap/contrib/libiberty/cp-demangle.c#2 delete .. //depot/projects/vap/contrib/openpam/include/security/openpam_version.h#4 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kgdb.h#4 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kthr.c#4 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/main.c#4 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/trgt.c#4 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/trgt_i386.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_write_set_format_ar.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_tar_hardlink.c#1 branch .. //depot/projects/vap/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu#1 branch .. //depot/projects/vap/lib/libc/sys/extattr_get_file.2#3 integrate .. //depot/projects/vap/lib/libdevstat/devstat.h#3 integrate .. //depot/projects/vap/lib/libkse/sys/lock.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_exp2f.c#4 integrate .. //depot/projects/vap/sbin/ffsinfo/ffsinfo.c#3 integrate .. //depot/projects/vap/sbin/fsck_msdosfs/boot.c#4 integrate .. //depot/projects/vap/sbin/fsck_msdosfs/fat.c#3 integrate .. //depot/projects/vap/sbin/gpt/gpt.c#3 integrate .. //depot/projects/vap/share/man/man4/ath.4#3 integrate .. //depot/projects/vap/share/man/man4/atkbd.4#3 integrate .. //depot/projects/vap/share/man/man4/awi.4#3 integrate .. //depot/projects/vap/share/man/man4/ed.4#5 integrate .. //depot/projects/vap/share/man/man4/man4.i386/snc.4#3 integrate .. //depot/projects/vap/share/man/man4/wi.4#3 integrate .. //depot/projects/vap/share/man/man9/mbuf.9#3 integrate .. //depot/projects/vap/share/msgdef/Makefile#3 integrate .. //depot/projects/vap/share/msgdef/ko_KR.UTF-8.src#1 branch .. //depot/projects/vap/share/msgdef/ko_KR.eucKR.src#3 integrate .. //depot/projects/vap/sys/amd64/acpica/madt.c#6 integrate .. //depot/projects/vap/sys/amd64/amd64/dump_machdep.c#5 integrate .. //depot/projects/vap/sys/amd64/amd64/minidump_machdep.c#3 integrate .. //depot/projects/vap/sys/amd64/include/proc.h#4 integrate .. //depot/projects/vap/sys/arm/arm/dump_machdep.c#5 integrate .. //depot/projects/vap/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/vap/sys/arm/include/pmap.h#6 integrate .. //depot/projects/vap/sys/cam/cam_xpt.c#7 integrate .. //depot/projects/vap/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/vap/sys/conf/files.powerpc#7 integrate .. //depot/projects/vap/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/vap/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/vap/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/vap/sys/dev/bfe/if_bfereg.h#5 integrate .. //depot/projects/vap/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate .. //depot/projects/vap/sys/dev/hatm/if_hatm_intr.c#5 integrate .. //depot/projects/vap/sys/dev/iscsi/initiator/isc_soc.c#3 integrate .. //depot/projects/vap/sys/dev/lge/if_lge.c#6 integrate .. //depot/projects/vap/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/vap/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/vap/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/vap/sys/dev/patm/if_patm_rx.c#5 integrate .. //depot/projects/vap/sys/dev/pci/pci.c#6 integrate .. //depot/projects/vap/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/vap/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#6 integrate .. //depot/projects/vap/sys/i386/acpica/madt.c#6 integrate .. //depot/projects/vap/sys/i386/i386/dump_machdep.c#5 integrate .. //depot/projects/vap/sys/i386/i386/minidump_machdep.c#3 integrate .. //depot/projects/vap/sys/i386/include/proc.h#6 integrate .. //depot/projects/vap/sys/ia64/ia64/dump_machdep.c#5 integrate .. //depot/projects/vap/sys/kern/kern_mbuf.c#7 integrate .. //depot/projects/vap/sys/kern/kern_shutdown.c#8 integrate .. //depot/projects/vap/sys/kern/uipc_cow.c#5 integrate .. //depot/projects/vap/sys/kern/uipc_mbuf.c#7 integrate .. //depot/projects/vap/sys/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/vap/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/vap/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/vap/sys/kern/vfs_aio.c#8 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#7 integrate .. //depot/projects/vap/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/vap/sys/netgraph/ng_bpf.c#5 integrate .. //depot/projects/vap/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_pppoe.c#7 integrate .. //depot/projects/vap/sys/netinet/sctp_auth.c#3 integrate .. //depot/projects/vap/sys/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/vap/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/vap/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/vap/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/vap/sys/netinet/sctp_peeloff.c#3 integrate .. //depot/projects/vap/sys/netinet/sctputil.c#4 integrate .. //depot/projects/vap/sys/pci/if_wb.c#6 integrate .. //depot/projects/vap/sys/security/audit/audit.c#4 integrate .. //depot/projects/vap/sys/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/dump_machdep.c#3 integrate .. //depot/projects/vap/sys/sun4v/sun4v/dump_machdep.c#3 integrate .. //depot/projects/vap/sys/sys/conf.h#6 integrate .. //depot/projects/vap/sys/sys/mbuf.h#8 integrate .. //depot/projects/vap/sys/sys/param.h#8 integrate .. //depot/projects/vap/sys/sys/proc.h#7 integrate .. //depot/projects/vap/sys/sys/socketvar.h#7 integrate .. //depot/projects/vap/tools/regression/sockets/unix_sorflush/Makefile#1 branch .. //depot/projects/vap/tools/regression/sockets/unix_sorflush/unix_sorflush.c#1 branch .. //depot/projects/vap/usr.bin/file/Makefile#3 integrate .. //depot/projects/vap/usr.bin/file/file.1#3 delete .. //depot/projects/vap/usr.bin/file/magic.5#3 delete .. //depot/projects/vap/usr.bin/top/machine.c#5 integrate .. //depot/projects/vap/usr.sbin/Makefile#4 integrate .. //depot/projects/vap/usr.sbin/bootparamd/bootparamd/bootparamd.c#3 integrate .. //depot/projects/vap/usr.sbin/bootparamd/bootparamd/main.c#3 integrate .. //depot/projects/vap/usr.sbin/kbdcontrol/kbdcontrol.1#3 integrate .. //depot/projects/vap/usr.sbin/kbdcontrol/kbdmap.5#3 integrate .. //depot/projects/vap/usr.sbin/newsyslog/newsyslog.c#3 integrate .. //depot/projects/vap/usr.sbin/ofwdump/Makefile#3 integrate .. //depot/projects/vap/usr.sbin/ofwdump/ofwdump.8#3 integrate .. //depot/projects/vap/usr.sbin/setfmac/setfmac.c#4 integrate .. //depot/projects/vap/usr.sbin/sysinstall/disks.c#3 integrate .. //depot/projects/vap/usr.sbin/watch/watch.c#3 integrate Differences ... ==== //depot/projects/vap/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.344 2007/12/13 00:08:02 imp Exp $ +# $FreeBSD: src/Makefile,v 1.345 2008/01/30 19:33:18 jhb Exp $ # # The user-driven targets are: # @@ -75,6 +75,8 @@ # developer convenience only. They are intentionally not documented and # completely subject to change without notice. # +# For more information, see the build(7) manual page. +# TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ check-old check-old-dirs check-old-files check-old-libs \ checkdpadd clean cleandepend cleandir \ ==== //depot/projects/vap/contrib/binutils/libiberty/cp-demangle.c#3 (text+ko) ==== @@ -2396,6 +2396,8 @@ const char *s; type = cplus_demangle_type (di); + if (type == NULL) + return NULL; /* If we have a type we know how to print, we aren't going to print the type name itself. */ ==== //depot/projects/vap/contrib/file/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,5 +1,5 @@ # ex:ts=8 -$FreeBSD: src/contrib/file/FREEBSD-upgrade,v 1.7 2007/05/24 22:02:49 obrien Exp $ +$FreeBSD: src/contrib/file/FREEBSD-upgrade,v 1.8 2008/01/30 02:48:24 obrien Exp $ Christos Zoulas `file' originals can be found at: ftp://ftp.astron.com/pub/file/ @@ -17,14 +17,14 @@ rm -f missing depcomp rm -f config.{guess,sub} - cvs import -m "Virgin import of Christos Zoulas's FILE 4.21." \ - src/contrib/file ZOULAS file_4_21 + cvs import -m "Virgin import of Christos Zoulas's FILE 4.23." \ + src/contrib/file ZOULAS file_4_23 Never make local changes to ZOULAS `file'. Christos is very willing to work with us to meet our FreeBSD needs. Thus submit any desired changes to him and wait for the next release and vendor import to get them. - + obrien@NUXI.com 15-Sept-2002 ==== //depot/projects/vap/contrib/openpam/include/security/openpam_version.h#4 (text) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_version.h 409 2007-12-21 11:38:50Z des $ + * $Id: openpam_version.h 412 2008-01-29 19:31:46Z des $ */ #ifndef SECURITY_OPENPAM_VERSION_H_INCLUDED @@ -42,4 +42,7 @@ #define OPENPAM_VERSION 20071221 #define OPENPAM_RELEASE "Hydrangea" +/* violates reserved namespace, but can't be removed for legacy reasons */ +#define _OPENPAM + #endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */ ==== //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kgdb.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (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: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.8 2008/01/24 19:11:13 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.11 2008/01/29 23:44:34 jhb Exp $ */ #ifndef _KGDB_H_ @@ -33,6 +33,7 @@ extern kvm_t *kvm; extern char *kernel; +extern bfd *kern_bfd; struct kthr { struct kthr *next; @@ -48,6 +49,8 @@ extern struct kthr *curkthr; void kgdb_add_kld_cmd(char *, int); +void kgdb_auto_load_klds(void); +void kgdb_kld_init(void); void kgdb_target(void); void kgdb_trgt_fetch_registers(int); void kgdb_trgt_store_registers(int); ==== //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kld.c#2 (text+ko) ==== @@ -25,22 +25,39 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.1 2008/01/24 19:11:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.6 2008/01/29 23:44:34 jhb Exp $"); #include #include +#include +#include #include -#include #include +#include +#include +#include #include #include #include #include #include +#include #include "kgdb.h" +struct lm_info { + CORE_ADDR base_address; +}; + +/* Offsets of fields in linker_file structure. */ +static CORE_ADDR off_address, off_filename, off_pathname, off_next; + +/* KVA of 'linker_path' which corresponds to the kern.module_path sysctl .*/ +static CORE_ADDR module_path_addr; + +static struct target_so_ops kld_so_ops; + static int kld_ok (char *path) { @@ -52,68 +69,69 @@ } /* - * Look for a matching file in the following order: + * Look for a matching file checking for debug suffixes before the raw file: * - filename + ".symbols" (e.g. foo.ko.symbols) * - filename + ".debug" (e.g. foo.ko.debug) * - filename (e.g. foo.ko) - * - dirname(kernel) + filename + ".symbols" (e.g. /boot/kernel/foo.ko.symbols) - * - dirname(kernel) + filename + ".debug" (e.g. /boot/kernel/foo.ko.debug) - * - dirname(kernel) + filename (e.g. /boot/kernel/foo.ko) - * - iterate over each path in the module path looking for: - * - dir + filename + ".symbols" (e.g. /boot/modules/foo.ko.symbols) - * - dir + filename + ".debug" (e.g. /boot/modules/foo.ko.debug) - * - dir + filename (e.g. /boot/modules/foo.ko) + */ +static const char *kld_suffixes[] = { + ".debug", + "", + NULL +}; + +static int +check_kld_path (char *path, size_t path_size) +{ + const char **suffix; + char *ep; + + ep = path + strlen(path); + suffix = kld_suffixes; + while (*suffix != NULL) { + if (strlcat(path, *suffix, path_size) < path_size) { + if (kld_ok(path)) + return (1); + } + + /* Restore original path to remove suffix. */ + *ep = '\0'; + suffix++; + } + return (0); +} + +/* + * Try to find the path for a kld by looking in the kernel's directory and + * in the various paths in the module path. */ static int find_kld_path (char *filename, char *path, size_t path_size) { - CORE_ADDR module_path_addr; - char module_path[PATH_MAX]; + char *module_path; char *kernel_dir, *module_dir, *cp; + int error; - snprintf(path, path_size, "%s.symbols", filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s.debug", filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s", filename); - if (kld_ok(path)) - return (1); kernel_dir = dirname(kernel); if (kernel_dir != NULL) { - snprintf(path, path_size, "%s/%s.symbols", kernel_dir, - filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s/%s.debug", kernel_dir, filename); - if (kld_ok(path)) - return (1); snprintf(path, path_size, "%s/%s", kernel_dir, filename); - if (kld_ok(path)) + if (check_kld_path(path, path_size)) return (1); } - module_path_addr = kgdb_parse("linker_path"); - if (module_path_addr != 0 && - kvm_read(kvm, module_path_addr, module_path, sizeof(module_path)) == - sizeof(module_path)) { - module_path[PATH_MAX - 1] = '\0'; - cp = module_path; - while ((module_dir = strsep(&cp, ";")) != NULL) { - snprintf(path, path_size, "%s/%s.symbols", module_dir, - filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s/%s.debug", module_dir, - filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s/%s", module_dir, - filename); - if (kld_ok(path)) - return (1); + if (module_path_addr != 0) { + target_read_string(module_path_addr, &module_path, PATH_MAX, + &error); + if (error == 0) { + make_cleanup(xfree, module_path); + cp = module_path; + while ((module_dir = strsep(&cp, ";")) != NULL) { + snprintf(path, path_size, "%s/%s", module_dir, + filename); + if (check_kld_path(path, path_size)) + return (1); + } } - } + } return (0); } @@ -123,25 +141,12 @@ static CORE_ADDR read_pointer (CORE_ADDR address) { - union { - uint32_t d32; - uint64_t d64; - } val; + CORE_ADDR value; - switch (TARGET_PTR_BIT) { - case 32: - if (kvm_read(kvm, address, &val.d32, sizeof(val.d32)) != - sizeof(val.d32)) - return (0); - return (val.d32); - case 64: - if (kvm_read(kvm, address, &val.d64, sizeof(val.d64)) != - sizeof(val.d64)) - return (0); - return (val.d64); - default: - return (0); - } + if (target_read_memory(address, (char *)&value, TARGET_PTR_BIT / 8) != + 0) + return (0); + return (extract_unsigned_integer(&value, TARGET_PTR_BIT / 8)); } /* @@ -150,36 +155,29 @@ static int find_kld_address (char *arg, CORE_ADDR *address) { - CORE_ADDR kld, filename_addr; - CORE_ADDR off_address, off_filename, off_next; - char kld_filename[PATH_MAX]; + CORE_ADDR kld; + char *kld_filename; char *filename; - size_t filelen; + int error; - /* Compute offsets of relevant members in struct linker_file. */ - off_address = kgdb_parse("&((struct linker_file *)0)->address"); - off_filename = kgdb_parse("&((struct linker_file *)0)->filename"); - off_next = kgdb_parse("&((struct linker_file *)0)->link.tqe_next"); if (off_address == 0 || off_filename == 0 || off_next == 0) return (0); filename = basename(arg); - filelen = strlen(filename) + 1; - kld = kgdb_parse("linker_files.tqh_first"); - while (kld != 0) { + for (kld = kgdb_parse("linker_files.tqh_first"); kld != 0; + kld = read_pointer(kld + off_next)) { /* Try to read this linker file's filename. */ - filename_addr = read_pointer(kld + off_filename); - if (filename_addr == 0) - goto next_kld; - if (kvm_read(kvm, filename_addr, kld_filename, filelen) != - filelen) - goto next_kld; + target_read_string(read_pointer(kld + off_filename), + &kld_filename, PATH_MAX, &error); + if (error) + continue; /* Compare this kld's filename against our passed in name. */ - if (kld_filename[filelen - 1] != '\0') - goto next_kld; - if (strcmp(kld_filename, filename) != 0) - goto next_kld; + if (strcmp(kld_filename, filename) != 0) { + xfree(kld_filename); + continue; + } + xfree(kld_filename); /* * We found a match, use its address as the base @@ -189,116 +187,293 @@ if (*address == 0) return (0); return (1); - - next_kld: - kld = read_pointer(kld + off_next); } return (0); } +struct add_section_info { + struct section_addr_info *section_addrs; + int sect_index; + CORE_ADDR base_addr; + int add_kld_command; +}; + static void -add_section(struct section_addr_info *section_addrs, int *sect_indexp, - char *name, CORE_ADDR address) +add_section (bfd *bfd, asection *sect, void *arg) +{ + struct add_section_info *asi = arg; + CORE_ADDR address; + char *name; + + /* Ignore non-resident sections. */ + if ((bfd_get_section_flags(bfd, sect) & (SEC_ALLOC | SEC_LOAD)) == 0) + return; + + name = xstrdup(bfd_get_section_name(bfd, sect)); + make_cleanup(xfree, name); + address = asi->base_addr + bfd_get_section_vma(bfd, sect); + asi->section_addrs->other[asi->sect_index].name = name; + asi->section_addrs->other[asi->sect_index].addr = address; + asi->section_addrs->other[asi->sect_index].sectindex = sect->index; + if (asi->add_kld_command) + printf_unfiltered("\t%s_addr = %s\n", name, + local_hex_string(address)); + asi->sect_index++; +} + +static void +load_kld (char *path, CORE_ADDR base_addr, int from_tty, int add_kld_command) { - int sect_index; + struct add_section_info asi; + struct cleanup *cleanup; + bfd *bfd; + + /* Open the kld. */ + bfd = bfd_openr(path, gnutarget); + if (bfd == NULL) + error("\"%s\": can't open: %s", path, + bfd_errmsg(bfd_get_error())); + cleanup = make_cleanup_bfd_close(bfd); + + if (!bfd_check_format(bfd, bfd_object)) + error("\%s\": not an object file", path); + + /* Make sure we have a .text section. */ + if (bfd_get_section_by_name (bfd, ".text") == NULL) + error("\"%s\": can't find text section", path); + + if (add_kld_command) + printf_unfiltered("add symbol table from file \"%s\" at\n", + path); + + /* Build a section table for symbol_file_add() from the bfd sections. */ + asi.section_addrs = alloc_section_addr_info(bfd_count_sections(bfd)); + cleanup = make_cleanup(xfree, asi.section_addrs); + asi.sect_index = 0; + asi.base_addr = base_addr; + asi.add_kld_command = add_kld_command; + bfd_map_over_sections(bfd, add_section, &asi); + + if (from_tty && (!query("%s", ""))) + error("Not confirmed."); + + symbol_file_add(path, from_tty, asi.section_addrs, 0, + add_kld_command ? OBJF_USERLOADED : 0); - sect_index = *sect_indexp; - section_addrs->other[sect_index].name = name; - section_addrs->other[sect_index].addr = address; - printf_unfiltered("\t%s_addr = %s\n", name, - local_hex_string(address)); - sect_index++; - *sect_indexp = sect_index; + do_cleanups(cleanup); } void kgdb_add_kld_cmd (char *arg, int from_tty) { - struct section_addr_info *section_addrs; - struct cleanup *cleanup; char path[PATH_MAX]; - asection *sect; CORE_ADDR base_addr; - bfd *bfd; - CORE_ADDR text_addr, data_addr, bss_addr, rodata_addr; - int sect_count, sect_index; + + /* Try to open the raw path to handle absolute paths first. */ + snprintf(path, sizeof(path), "%s", arg); + if (!check_kld_path(path, sizeof(path))) { - if (!find_kld_path(arg, path, sizeof(path))) { - error("unable to locate kld"); - return; + /* + * If that didn't work, look in the various possible + * paths for the module. + */ + if (!find_kld_path(arg, path, sizeof(path))) { + error("Unable to locate kld"); + return; + } } if (!find_kld_address(arg, &base_addr)) { - error("unable to find kld in kernel"); + error("Unable to find kld in kernel"); return; } - /* Open the kld and find the offsets of the various sections. */ - bfd = bfd_openr(path, gnutarget); - if (bfd == NULL) { - error("\"%s\": can't open: %s", path, - bfd_errmsg(bfd_get_error())); - return; + load_kld(path, base_addr, from_tty, 1); + + reinit_frame_cache(); +} + +static void +kld_relocate_section_addresses (struct so_list *so, struct section_table *sec) +{ + + sec->addr += so->lm_info->base_address; + sec->endaddr += so->lm_info->base_address; +} + +static void +kld_free_so (struct so_list *so) +{ + + xfree(so->lm_info); +} + +static void +kld_clear_solib (void) +{ +} + +static void +kld_solib_create_inferior_hook (void) +{ +} + +static void +kld_special_symbol_handling (void) +{ +} + +static struct so_list * +kld_current_sos (void) +{ + struct so_list *head, **prev, *new; + CORE_ADDR kld, kernel; + char *path; + int error; + + prev = &head; + + /* + * Walk the list of linker files creating so_list entries for + * each non-kernel file. + */ + kernel = kgdb_parse("linker_kernel_file"); + for (kld = kgdb_parse("linker_files.tqh_first"); kld != 0; + kld = read_pointer(kld + off_next)) { + /* Skip the main kernel file. */ + if (kld == kernel) + continue; + + new = xmalloc(sizeof(*new)); + memset(new, 0, sizeof(*new)); + + new->lm_info = xmalloc(sizeof(*new->lm_info)); + new->lm_info->base_address = 0; + + /* Read the base filename and store it in so_original_name. */ + target_read_string(read_pointer(kld + off_filename), + &path, sizeof(new->so_original_name), &error); + if (error != 0) { + warning("kld_current_sos: Can't read filename: %s\n", + safe_strerror(error)); + free_so(new); + continue; + } + strlcpy(new->so_original_name, path, + sizeof(new->so_original_name)); + xfree(path); + + /* + * Try to read the pathname (if it exists) and store + * it in so_name. + */ + if (off_pathname != 0) { + target_read_string(read_pointer(kld + off_pathname), + &path, sizeof(new->so_name), &error); + if (error != 0) { + warning( + "kld_current_sos: Can't read pathname for \"%s\": %s\n", + new->so_original_name, + safe_strerror(error)); + strlcpy(new->so_name, new->so_original_name, + sizeof(new->so_name)); + } else { + strlcpy(new->so_name, path, + sizeof(new->so_name)); + xfree(path); + } + } else + strlcpy(new->so_name, new->so_original_name, + sizeof(new->so_name)); + + /* Read this kld's base address. */ + new->lm_info->base_address = read_pointer(kld + off_address); + if (new->lm_info->base_address == 0) { + warning( + "kld_current_sos: Invalid address for kld \"%s\"", + new->so_original_name); + free_so(new); + continue; + } + + /* Append to the list. */ + *prev = new; + prev = &new->next; } - cleanup = make_cleanup_bfd_close(bfd); + + return (head); +} + +static int +kld_open_symbol_file_object (void *from_ttyp) +{ + + return (0); +} + +static int +kld_in_dynsym_resolve_code (CORE_ADDR pc) +{ + + return (0); +} - if (!bfd_check_format(bfd, bfd_object)) { - do_cleanups(cleanup); - error("\%s\": not an object file", path); - return; - } +static int +kld_find_and_open_solib (char *solib, unsigned o_flags, char **temp_pathname) +{ + char path[PATH_MAX]; + int fd; - data_addr = bss_addr = rodata_addr = 0; - sect = bfd_get_section_by_name (bfd, ".text"); - if (sect == NULL) { - do_cleanups(cleanup); - error("\"%s\": can't find text section", path); - return; + *temp_pathname = NULL; + if (!find_kld_path(solib, path, sizeof(path))) { + errno = ENOENT; + return (-1); } - text_addr = bfd_get_section_vma(bfd, sect); - sect_count = 1; + fd = open(path, o_flags, 0); + if (fd >= 0) + *temp_pathname = xstrdup(path); + return (fd); +} - /* Save the offsets of relevant sections. */ - sect = bfd_get_section_by_name (bfd, ".data"); - if (sect != NULL) { - data_addr = bfd_get_section_vma(bfd, sect); - sect_count++; - } +static int +load_klds_stub (void *arg) +{ - sect = bfd_get_section_by_name (bfd, ".bss"); - if (sect != NULL) { - bss_addr = bfd_get_section_vma(bfd, sect); - sect_count++; - } + SOLIB_ADD(NULL, 1, ¤t_target, auto_solib_add); + return (0); +} - sect = bfd_get_section_by_name (bfd, ".rodata"); - if (sect != NULL) { - rodata_addr = bfd_get_section_vma(bfd, sect); - sect_count++; - } +void +kgdb_kld_init (void) +{ + struct cmd_list_element *c; - do_cleanups(cleanup); + /* Compute offsets of relevant members in struct linker_file. */ + off_address = kgdb_parse("&((struct linker_file *)0)->address"); + off_filename = kgdb_parse("&((struct linker_file *)0)->filename"); + off_pathname = kgdb_parse("&((struct linker_file *)0)->pathname"); + off_next = kgdb_parse("&((struct linker_file *)0)->link.tqe_next"); + if (off_address == 0 || off_filename == 0 || off_next == 0) + return; - printf_unfiltered("add symbol table from file \"%s\" at\n", path); + module_path_addr = kgdb_parse("linker_path"); - /* Build a section table for symbol_file_add(). */ - section_addrs = alloc_section_addr_info(sect_count); - cleanup = make_cleanup(xfree, section_addrs); - sect_index = 0; - add_section(section_addrs, §_index, ".text", base_addr + text_addr); - if (data_addr != 0) - add_section(section_addrs, §_index, ".data", - base_addr + data_addr); - if (bss_addr != 0) - add_section(section_addrs, §_index, ".bss", - base_addr + bss_addr); - if (rodata_addr != 0) - add_section(section_addrs, §_index, ".rodata", - base_addr + rodata_addr); + kld_so_ops.relocate_section_addresses = kld_relocate_section_addresses; + kld_so_ops.free_so = kld_free_so; + kld_so_ops.clear_solib = kld_clear_solib; + kld_so_ops.solib_create_inferior_hook = kld_solib_create_inferior_hook; + kld_so_ops.special_symbol_handling = kld_special_symbol_handling; + kld_so_ops.current_sos = kld_current_sos; + kld_so_ops.open_symbol_file_object = kld_open_symbol_file_object; + kld_so_ops.in_dynsym_resolve_code = kld_in_dynsym_resolve_code; + kld_so_ops.find_and_open_solib = kld_find_and_open_solib; - symbol_file_add(path, from_tty, section_addrs, 0, OBJF_USERLOADED); + current_target_so_ops = &kld_so_ops; - reinit_frame_cache(); + catch_errors(load_klds_stub, NULL, NULL, RETURN_MASK_ALL); - do_cleanups(cleanup); + c = add_com("add-kld", class_files, kgdb_add_kld_cmd, + "Usage: add-kld FILE\n\ +Load the symbols from the kernel loadable module FILE."); + set_cmd_completer(c, filename_completer); } ==== //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kthr.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.9 2008/01/18 18:57:27 emaste Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.10 2008/01/28 20:33:19 jhb Exp $"); #include #include @@ -60,10 +60,8 @@ nl[0].n_name = (char *)(uintptr_t)sym; nl[1].n_name = NULL; - if (kvm_nlist(kvm, nl) != 0) { - warnx("kvm_nlist(%s): %s", sym, kvm_geterr(kvm)); + if (kvm_nlist(kvm, nl) != 0) return (0); - } return (nl[0].n_value); } @@ -82,13 +80,17 @@ uintptr_t addr, paddr; addr = kgdb_lookup("_allproc"); - if (addr == 0) + if (addr == 0) { + warnx("kvm_nlist(_allproc): %s", kvm_geterr(kvm)); return (NULL); + } kvm_read(kvm, addr, &paddr, sizeof(paddr)); dumppcb = kgdb_lookup("_dumppcb"); - if (dumppcb == 0) + if (dumppcb == 0) { + warnx("kvm_nlist(_dumppcb): %s", kvm_geterr(kvm)); return (NULL); + } addr = kgdb_lookup("_dumptid"); if (addr != 0) ==== //depot/projects/vap/gnu/usr.bin/gdb/kgdb/main.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.12 2008/01/17 21:43:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.14 2008/01/29 23:37:59 jhb Exp $"); #include #include @@ -72,6 +72,7 @@ static char kvm_err[_POSIX2_LINE_MAX]; static int dumpnr; +static int quiet; static int verbose; static char crashdir[PATH_MAX]; @@ -203,7 +204,6 @@ kgdb_init_target(void) { CORE_ADDR bufp; - bfd *kern_bfd; int size, rseq, wseq; int kern_desc; char c; @@ -227,7 +227,6 @@ } set_gdbarch_from_file (kern_bfd); - bfd_close(kern_bfd); symbol_file_add_main (kernel, 0); if (remote) @@ -239,6 +238,8 @@ * Display the unread portion of the message buffer. This gives the * user a some initial data to work from. */ + if (quiet) + return; bufp = kgdb_parse("msgbufp->msg_ptr"); size = (int)kgdb_parse("msgbufp->msg_size"); rseq = (int)kgdb_parse("msgbufp->msg_rseq"); @@ -302,7 +303,7 @@ struct stat st; struct captured_main_args args; char *s; - int a, ch, quiet, writecore; + int a, ch, writecore; dumpnr = -1; ==== //depot/projects/vap/gnu/usr.bin/gdb/kgdb/trgt.c#4 (text+ko) ==== @@ -25,16 +25,18 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.7 2008/01/24 19:11:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.10 2008/01/29 23:44:34 jhb Exp $"); #include #include #include #include +#include #include #include #include +#include #include #include #include @@ -45,6 +47,8 @@ static struct target_ops kgdb_trgt_ops; +bfd *kern_bfd; + #define KERNOFF (kgdb_kernbase ()) #define INKERNEL(x) ((x) >= KERNOFF) @@ -81,11 +85,8 @@ static void kgdb_trgt_files_info(struct target_ops *target) { - struct target_ops *tb; - tb = find_target_beneath(target); - if (tb->to_files_info != NULL) - tb->to_files_info(tb); + print_section_info(target, kern_bfd); } static void @@ -207,7 +208,7 @@ kgdb_trgt_ops.to_magic = OPS_MAGIC; kgdb_trgt_ops.to_shortname = "kernel"; - kgdb_trgt_ops.to_longname = "kernel core files."; + kgdb_trgt_ops.to_longname = "kernel core files"; kgdb_trgt_ops.to_doc = "Kernel core files."; kgdb_trgt_ops.to_stratum = thread_stratum; kgdb_trgt_ops.to_has_memory = 1; @@ -222,6 +223,12 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 2 02:40:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECE1016A477; Sat, 2 Feb 2008 02:40:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8AEC816A46D for ; Sat, 2 Feb 2008 02:40:51 +0000 (UTC) (envelope-from bright@elvis.mu.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id 7D85E13C468 for ; Sat, 2 Feb 2008 02:40:51 +0000 (UTC) (envelope-from bright@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1192) id 9D6931A4D82; Fri, 1 Feb 2008 18:22:34 -0800 (PST) Date: Fri, 1 Feb 2008 18:22:34 -0800 From: Alfred Perlstein To: Hans Petter Selasky Message-ID: <20080202022234.GR99258@elvis.mu.org> References: <200712020001.lB201XbN000811@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200712020001.lB201XbN000811@repoman.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: Perforce Change Reviews Subject: Re: PERFORCE change 129920 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 02:40:52 -0000 This change makes very little sense. If xfer->frbuffers is a bare pointer, then why add 0 to it? Just pass xfer->frbuffers or use a macro that explains what you are doing. * Hans Petter Selasky [071201 16:01] wrote: > http://perforce.freebsd.org/chv.cgi?CH=129920 > > Change 129920 by hselasky@hselasky_laptop001 on 2007/12/02 00:00:47 > > > "buf_data" will be removed and replaced by "frbuffers + 0". > > Affected files ... > > .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#12 edit > > Differences ... > > ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#12 (text+ko) ==== > > @@ -1286,7 +1286,7 @@ > uipd = urb->iso_frame_desc + x; > uipd->actual_length = xfer->frlengths[x]; > uipd->status = 0; > - usbd_copy_out(&(xfer->buf_data), offset, > + usbd_copy_out(xfer->frbuffers + 0, offset, > ((uint8_t *)(urb->transfer_buffer)) + uipd->offset, > uipd->actual_length); > offset += max_frame; > @@ -1354,7 +1354,7 @@ > for (x = 0; x < urb->number_of_packets; x++) { > uipd = urb->iso_frame_desc + x; > xfer->frlengths[x] = uipd->length; > - usbd_copy_in(&(xfer->buf_data), offset, > + usbd_copy_in(xfer->frbuffers + 0, offset, > ((uint8_t *)(urb->transfer_buffer)) + uipd->offset, > uipd->length); > offset += uipd->length; -- - Alfred Perlstein From owner-p4-projects@FreeBSD.ORG Sat Feb 2 05:26:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 406EF16A41B; Sat, 2 Feb 2008 05:26:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF94116A474 for ; Sat, 2 Feb 2008 05:26:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CEF2A13C455 for ; Sat, 2 Feb 2008 05:26:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m125QJiO066326 for ; Sat, 2 Feb 2008 05:26:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m125QJoA066323 for perforce@freebsd.org; Sat, 2 Feb 2008 05:26:19 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 2 Feb 2008 05:26:19 GMT Message-Id: <200802020526.m125QJoA066323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134629 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 05:26:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=134629 Change 134629 by kmacy@kmacy:storage:toehead on 2008/02/02 05:26:00 register handler for CPL_{GET,SET}_TCB_RPL Affected files ... .. //depot/projects/toehead/sys/dev/cxgb/cxgb_offload.c#4 edit Differences ... ==== //depot/projects/toehead/sys/dev/cxgb/cxgb_offload.c#4 (text+ko) ==== @@ -959,7 +959,7 @@ do_bad_cpl(struct t3cdev *dev, struct mbuf *m) { log(LOG_ERR, "%s: received bad CPL command 0x%x\n", dev->name, - *mtod(m, uint32_t *)); + 0xFF & *mtod(m, uint32_t *)); return (CPL_RET_BUF_DONE | CPL_RET_BAD_MSG); } @@ -1432,7 +1432,9 @@ t3_register_cpl_handler(CPL_RX_DATA_DDP, do_hwtid_rpl); t3_register_cpl_handler(CPL_RX_DDP_COMPLETE, do_hwtid_rpl); t3_register_cpl_handler(CPL_ISCSI_HDR, do_hwtid_rpl); - + t3_register_cpl_handler(CPL_GET_TCB_RPL, do_hwtid_rpl); + t3_register_cpl_handler(CPL_SET_TCB_RPL, do_hwtid_rpl); + EVENTHANDLER_REGISTER(route_arp_update_event, cxgb_arp_update_event, NULL, EVENTHANDLER_PRI_ANY); EVENTHANDLER_REGISTER(route_redirect_event, cxgb_redirect_event, From owner-p4-projects@FreeBSD.ORG Sat Feb 2 05:28:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59BC916A41A; Sat, 2 Feb 2008 05:28:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1EBC416A419 for ; Sat, 2 Feb 2008 05:28:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E00F13C455 for ; Sat, 2 Feb 2008 05:28:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m125SLIZ066388 for ; Sat, 2 Feb 2008 05:28:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m125SLqw066385 for perforce@freebsd.org; Sat, 2 Feb 2008 05:28:21 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 2 Feb 2008 05:28:21 GMT Message-Id: <200802020528.m125SLqw066385@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134630 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 05:28:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=134630 Change 134630 by kmacy@kmacy:storage:toehead on 2008/02/02 05:27:57 fix prot remove tracing add error logging Affected files ... .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_vm.c#4 edit Differences ... ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_vm.c#4 (text+ko) ==== @@ -46,6 +46,7 @@ pmap_t pmap; vm_page_t m, *pages; vm_prot_t prot; + /* * Check that virtual address range is legal @@ -54,16 +55,18 @@ * architectures define it */ end = addr + (count * PAGE_SIZE); - if (end > VM_MAXUSER_ADDRESS) + if (end > VM_MAXUSER_ADDRESS) { + printf("bad address passed\n"); return (EFAULT); + } - TRACE_ENTER; td = curthread; map = &td->td_proc->p_vmspace->vm_map; pmap = &td->td_proc->p_vmspace->vm_pmap; pages = mp; - prot = (flags & VM_HOLD_WRITEABLE) ? VM_PROT_WRITE : VM_PROT_READ; + prot = VM_PROT_READ; + prot |= (flags & VM_HOLD_WRITEABLE) ? VM_PROT_WRITE : 0; bzero(pages, sizeof(vm_page_t *) * count); retry: @@ -97,7 +100,6 @@ vm_page_unlock_queues(); if (faults == 0) { - TRACE_EXIT; return (0); } @@ -117,9 +119,13 @@ rv = vm_fault(map, va, VM_PROT_WRITE, VM_FAULT_DIRTY); } else if (m == NULL) rv = vm_fault(map, va, VM_PROT_READ, VM_FAULT_NORMAL); - if (rv) + if (rv) { + printf("vm_fault bad return rv=%d va=0x%jx\n", rv, va); + goto error; - } + } + } + goto retry; error: @@ -128,7 +134,6 @@ if (*pages) vm_page_unhold(*pages); vm_page_unlock_queues(); - TRACE_EXIT; return (EFAULT); } From owner-p4-projects@FreeBSD.ORG Sat Feb 2 05:34:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E61B16A41B; Sat, 2 Feb 2008 05:34:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF14516A418 for ; Sat, 2 Feb 2008 05:34:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AD41D13C45D for ; Sat, 2 Feb 2008 05:34:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m125YSAe066643 for ; Sat, 2 Feb 2008 05:34:28 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m125YSpr066640 for perforce@freebsd.org; Sat, 2 Feb 2008 05:34:28 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 2 Feb 2008 05:34:28 GMT Message-Id: <200802020534.m125YSpr066640@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134631 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 05:34:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=134631 Change 134631 by kmacy@kmacy:storage:toehead on 2008/02/02 05:33:56 remove most tracing fix ddp buffer calculations dramatically reduce debug noise add DDP_BF_DATA handling Affected files ... .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#13 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#14 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#6 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#9 edit .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_tom.c#4 edit Differences ... ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#13 (text+ko) ==== @@ -1616,7 +1616,6 @@ uint64_t t; __be64 *tcb; - TRACE_ENTER; /* Note that we only accout for CPL_GET_TCB issued by the DDP code. We * really need a cookie in order to dispatch the RPLs. */ @@ -1633,7 +1632,6 @@ m_freem(m); if (__predict_true((so->so_state & SS_NOFDREF) == 0)) sorwakeup(so); - TRACE_EXIT; return; } @@ -1692,7 +1690,6 @@ if (__predict_false(so_no_receive(so) && m->m_pkthdr.len)) { handle_excess_rx(toep, m); - TRACE_EXIT; return; } @@ -1712,7 +1709,7 @@ } #endif m->m_ddp_flags = DDP_BF_PSH | DDP_BF_NOCOPY | 1; - bsp->flags &= ~DDP_BF_NOCOPY; + bsp->flags &= ~(DDP_BF_NOCOPY|DDP_BF_NODATA); q->cur_buf ^= 1; } else if (bsp->flags & DDP_BF_NOFLIP) { @@ -1728,11 +1725,11 @@ * and we need to decrement the posted count. */ if (m->m_pkthdr.len == 0) { - if (ddp_offset == 0) + if (ddp_offset == 0) { q->kbuf_posted--; - panic("length not set"); + bsp->flags |= DDP_BF_NODATA; + } m_free(m); - TRACE_EXIT; return; } } else { @@ -1740,7 +1737,6 @@ * but it got here way late and nobody cares anymore. */ m_free(m); - TRACE_EXIT; return; } @@ -1762,7 +1758,6 @@ sbappend(&so->so_rcv, m); if (__predict_true((so->so_state & SS_NOFDREF) == 0)) sorwakeup(so); - TRACE_EXIT; } /* @@ -1775,9 +1770,10 @@ struct toepcb *toep = (struct toepcb *)ctx; /* OK if socket doesn't exist */ - if (toep == NULL) + if (toep == NULL) { + printf("null toep in do_get_tcb_rpl\n"); return (CPL_RET_BUF_DONE); - + } tcb_rpl_as_ddp_complete(toep, m); return (0); @@ -1950,7 +1946,8 @@ struct cpl_rx_data_ddp *hdr; unsigned int ddp_len, rcv_nxt, ddp_report, end_offset, buf_idx; struct socket *so = toeptoso(toep); - + int nomoredata = 0; + if (__predict_false(so_no_receive(so))) { struct inpcb *inp = sotoinpcb(so); @@ -1960,7 +1957,6 @@ return; } - TRACE_ENTER; tp = sototcpcb(so); q = &toep->tp_ddp_state; hdr = cplhdr(m); @@ -1994,6 +1990,13 @@ * interprets ->len of this packet the usual way. */ m->m_len = m->m_pkthdr.len = tp->rcv_nxt - m->m_seq; + /* + * Length is only meaningful for kbuf + */ + if (!(bsp->flags & DDP_BF_NOCOPY)) + KASSERT(m->m_len <= bsp->gl->dgl_length, + ("length received exceeds ddp pages: len=%d dgl_length=%d", + m->m_len, bsp->gl->dgl_length)); /* * Figure out where the new data was placed in the buffer and store it @@ -2014,7 +2017,7 @@ panic("spurious ddp completion"); } else { m->m_ddp_flags = !!(ddp_report & F_DDP_BUF_COMPLETE); - if (m->m_ddp_flags && !(bsp->flags & DDP_BF_NOFLIP)) + if (m->m_ddp_flags && !(bsp->flags & DDP_BF_NOFLIP)) q->cur_buf ^= 1; /* flip buffers */ } @@ -2025,11 +2028,11 @@ if (ddp_report & F_DDP_PSH) m->m_ddp_flags |= DDP_BF_PSH; - + if (nomoredata) + m->m_ddp_flags |= DDP_BF_NODATA; + tp->t_rcvtime = ticks; - printf("ddp set and ddp_flags=0x%x len=%d m_seq=0x%x rcv_nxt=0x%x\n", m->m_ddp_flags, m->m_len, m->m_seq, rcv_nxt); - SOCKBUF_LOCK(&so->so_rcv); sbappendstream_locked(&so->so_rcv, m); @@ -2037,7 +2040,6 @@ sorwakeup_locked(so); else SOCKBUF_UNLOCK(&so->so_rcv); - TRACE_EXIT; } #define DDP_ERR (F_DDP_PPOD_MISMATCH | F_DDP_LLIMIT_ERR | F_DDP_ULIMIT_ERR |\ @@ -2077,6 +2079,7 @@ struct ddp_buf_state *bsp; struct cpl_rx_ddp_complete *hdr; unsigned int ddp_report, buf_idx, when; + int nomoredata = 0; if (__predict_false(so_no_receive(so))) { struct inpcb *inp = sotoinpcb(so); @@ -2094,7 +2097,7 @@ bsp = &q->buf_state[buf_idx]; when = bsp->cur_offset; - m->m_pkthdr.len = G_DDP_OFFSET(ddp_report) - when; + m->m_len = m->m_pkthdr.len = G_DDP_OFFSET(ddp_report) - when; #ifdef T3_TRACE T3_TRACE5(TIDTB(sk), @@ -2106,9 +2109,12 @@ bsp->cur_offset += m->m_len; - if (!(bsp->flags & DDP_BF_NOFLIP)) + if (!(bsp->flags & DDP_BF_NOFLIP)) { q->cur_buf ^= 1; /* flip buffers */ - + if (G_DDP_OFFSET(ddp_report) < q->kbuf[0]->dgl_length) + nomoredata=1; + } + #ifdef T3_TRACE T3_TRACE4(TIDTB(sk), "process_ddp_complete: tp->rcv_nxt 0x%x cur_offset %u " @@ -2118,9 +2124,12 @@ #endif m->m_ddp_gl = (unsigned char *)bsp->gl; m->m_flags |= M_DDP; - m->m_pkthdr.csum_flags = (bsp->flags & DDP_BF_NOCOPY) | 1; + m->m_ddp_flags = (bsp->flags & DDP_BF_NOCOPY) | 1; if (bsp->flags & DDP_BF_NOCOPY) bsp->flags &= ~DDP_BF_NOCOPY; + if (nomoredata) + m->m_ddp_flags |= DDP_BF_NODATA; + m->m_pkthdr.csum_data = tp->rcv_nxt; tp->rcv_nxt += m->m_len; @@ -2209,7 +2218,7 @@ q = &toep->tp_ddp_state; bsp = &q->buf_state[q->cur_buf]; - m->m_pkthdr.len = rcv_nxt - tp->rcv_nxt; + m->m_len = m->m_pkthdr.len = rcv_nxt - tp->rcv_nxt; m->m_ddp_gl = (unsigned char *)bsp->gl; m->m_flags |= M_DDP; m->m_cur_offset = bsp->cur_offset; @@ -3946,7 +3955,6 @@ struct cpl_set_tcb_field *req; struct ddp_state *p = &toep->tp_ddp_state; - TRACE_ENTER; wrlen = sizeof(*wr) + 3 * sizeof(*req) + sizeof(*getreq); m = m_gethdr_nofail(wrlen); m_set_priority(m, mkprio(CPL_PRIORITY_CONTROL, toep)); @@ -4001,7 +4009,6 @@ bufidx, tag0, tag1, len); #endif cxgb_ofld_send(TOEP_T3C_DEV(toep), m); - TRACE_EXIT; } /* ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#14 (text+ko) ==== @@ -256,7 +256,7 @@ so_should_ddp(const struct toepcb *toep, int last_recv_len) { - printf("ulp_mode=%d last_recv_len=%d ddp_thresh=%d rcv_wnd=%ld ddp_copy_limit=%d\n", + DPRINTF("ulp_mode=%d last_recv_len=%d ddp_thresh=%d rcv_wnd=%ld ddp_copy_limit=%d\n", toep->tp_ulp_mode, last_recv_len, TOM_TUNABLE(toep->tp_toedev, ddp_thres), toep->tp_tp->rcv_wnd, (TOM_TUNABLE(toep->tp_toedev, ddp_copy_limit) + DDP_RSVD_WIN)); @@ -330,17 +330,13 @@ if (__predict_true(!is_ddp(m))) { /* RX_DATA */ return m_uiomove(m, offset, len, uio); } if (__predict_true(m->m_ddp_flags & DDP_BF_NOCOPY)) { /* user DDP */ - TRACE_ENTER; to->iov_len -= len; to->iov_base = ((caddr_t)to->iov_base) + len; uio->uio_iov = to; uio->uio_resid -= len; - TRACE_EXIT; return (0); } - TRACE_ENTER; err = t3_ddp_copy(m, offset, uio, len); /* kernel DDP */ - TRACE_EXIT; return (err); } @@ -607,7 +603,7 @@ uio->uio_iov->iov_len > p->kbuf[0]->dgl_length && p->ubuf_ddp_ready) { user_ddp_pending = - !t3_overlay_ubuf(so, uio, 1, 1); + !t3_overlay_ubuf(so, uio, IS_NONBLOCKING(so), flags, 1, 1); if (user_ddp_pending) { p->kbuf_posted++; user_ddp_ok = 0; @@ -635,7 +631,9 @@ INP_UNLOCK(inp); SOCKBUF_LOCK(&so->so_rcv); copied_unacked = 0; - printf("sbwaiting 2\n"); + if (so->so_rcv.sb_mb) + goto restart; + printf("sbwaiting 2 copied=%d target=%d\n", copied, target); if ((err = sbwait(&so->so_rcv)) != 0) goto done; } @@ -650,8 +648,8 @@ goto done; } offset = toep->tp_copied_seq + copied_unacked - m->m_seq; - printf("m=%p copied_seq=0x%x copied_unacked=%d m_seq=0x%x offset=%d pktlen=%d is_ddp(m)=%d\n", - m, toep->tp_copied_seq, copied_unacked, m->m_seq, offset, m->m_pkthdr.len, is_ddp(m)); + DPRINTF("m=%p copied_seq=0x%x copied_unacked=%d m_seq=0x%x offset=%d pktlen=%d is_ddp(m)=%d\n", + m, toep->tp_copied_seq, copied_unacked, m->m_seq, offset, m->m_pkthdr.len, !!is_ddp(m)); if (offset >= m->m_pkthdr.len) panic("t3_soreceive: OFFSET >= LEN offset %d copied_seq 0x%x seq 0x%x " "pktlen %d ddp flags 0x%x", offset, toep->tp_copied_seq + copied_unacked, m->m_seq, @@ -697,14 +695,14 @@ uio->uio_iov->iov_len > p->kbuf[0]->dgl_length && p->ubuf_ddp_ready) { user_ddp_pending = - !t3_overlay_ubuf(so, uio, 1, 1); + !t3_overlay_ubuf(so, uio, IS_NONBLOCKING(so), flags, 1, 1); if (user_ddp_pending) { p->kbuf_posted++; user_ddp_ok = 0; } - printf("user_ddp_pending=%d\n", user_ddp_pending); + DPRINTF("user_ddp_pending=%d\n", user_ddp_pending); } else - printf("user_ddp_ok=%d user_ddp_pending=%d iov_len=%ld dgl_length=%d ubuf_ddp_ready=%d ulp_mode=%d is_ddp(m)=%d flags=0x%x ubuf=%p kbuf_posted=%d\n", + DPRINTF("user_ddp_ok=%d user_ddp_pending=%d iov_len=%ld dgl_length=%d ubuf_ddp_ready=%d ulp_mode=%d is_ddp(m)=%d flags=0x%x ubuf=%p kbuf_posted=%d\n", user_ddp_ok, user_ddp_pending, uio->uio_iov->iov_len, p->kbuf[0] ? p->kbuf[0]->dgl_length : 0, p->ubuf_ddp_ready, toep->tp_ulp_mode, !!is_ddp(m), m->m_ddp_flags, p->ubuf, p->kbuf_posted); @@ -714,6 +712,7 @@ */ if (__predict_true(!(flags & MSG_TRUNC))) { int resid = uio->uio_resid; + SOCKBUF_UNLOCK(&so->so_rcv); if ((err = copy_data(m, offset, avail, uio))) { if (err) @@ -742,7 +741,7 @@ */ if (avail + offset >= m->m_pkthdr.len) { unsigned int fl = m->m_ddp_flags; - int got_psh = 0; + int exitnow, got_psh = 0, nomoredata = 0; if (p->kbuf[0] != NULL && is_ddp(m) && (fl & 1)) { if (is_ddp_psh(m) && user_ddp_pending) @@ -750,14 +749,17 @@ if (fl & DDP_BF_NOCOPY) user_ddp_pending = 0; - else { + else if ((fl & DDP_BF_NODATA) && IS_NONBLOCKING(so)) { + p->kbuf_posted--; + nomoredata = 1; + } else { p->kbuf_posted--; p->ubuf_ddp_ready = 1; - printf("ubuf ddp ready\n"); } } - if ((so->so_rcv.sb_mb == NULL) && got_psh) + exitnow = got_psh || nomoredata; + if ((so->so_rcv.sb_mb == NULL) && exitnow) goto done; } if (len > 0) @@ -771,6 +773,8 @@ * transitioned to CLOSE but not if it was in that state to begin with. */ if (__predict_true((so->so_state & (SS_ISDISCONNECTING|SS_ISDISCONNECTED)) == 0)) { + SOCKBUF_UNLOCK(&so->so_rcv); + SOCKBUF_LOCK(&so->so_rcv); if (user_ddp_pending) { user_ddp_ok = 0; t3_cancel_ubuf(toep); @@ -787,14 +791,10 @@ "chelsio_recvmsg: about to exit, repost kbuf"); #endif - printf("posting kbuf\n"); t3_post_kbuf(so, 1); p->kbuf_posted++; } else if (so_should_ddp(toep, copied) -#ifdef notyet - && !IS_NONBLOCKING(so) -#endif - ) { + && !IS_NONBLOCKING(so)) { printf("entering ddp\n"); t3_enter_ddp(so, TOM_TUNABLE(TOE_DEV(so), ddp_copy_limit), 0); ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#6 (text+ko) ==== @@ -116,11 +116,11 @@ * a new gather list was allocated it is returned in @newgl. */ static int -t3_pin_pages(bus_dma_tag_t tag, bus_dmamap_t map, unsigned long addr, +t3_pin_pages(bus_dma_tag_t tag, bus_dmamap_t map, vm_offset_t addr, size_t len, struct ddp_gather_list **newgl, const struct ddp_gather_list *gl) { - int i, err; + int i = 0, err; size_t pg_off; unsigned int npages; struct ddp_gather_list *p; @@ -131,7 +131,7 @@ if (addr + len > VM_MAXUSER_ADDRESS) return (EFAULT); - pg_off = addr & ~PAGE_MASK; + pg_off = addr & PAGE_MASK; npages = (pg_off + len + PAGE_SIZE - 1) >> PAGE_SHIFT; p = malloc(sizeof(struct ddp_gather_list) + npages * sizeof(vm_page_t *), M_DEVBUF, M_NOWAIT); @@ -139,13 +139,12 @@ return (ENOMEM); err = vm_fault_hold_user_pages(addr, p->dgl_pages, npages, VM_HOLD_WRITEABLE); - printf("held pages\n"); if (err) goto free_gl; if (gl && gl->dgl_offset == pg_off && gl->dgl_nelem >= npages && gl->dgl_length >= len) { - for (i = 0; i < npages; ++i) + for (i = 0; i < npages; i++) if (p->dgl_pages[i] != gl->dgl_pages[i]) goto different_gl; err = 0; @@ -156,6 +155,8 @@ p->dgl_length = len; p->dgl_offset = pg_off; p->dgl_nelem = npages; + printf("hold %jx -> %jx --- count=%d i=%d\n", addr, addr + npages*PAGE_SIZE, npages, i); + #ifdef NEED_BUSDMA p->phys_addr[0] = pci_map_page(pdev, p->pages[0], pg_off, PAGE_SIZE - pg_off, @@ -165,14 +166,15 @@ PCI_DMA_FROMDEVICE); #endif *newgl = p; - return 0; + return (0); unpin: vm_fault_unhold_pages(p->dgl_pages, npages); free_gl: + free(p, M_DEVBUF); *newgl = NULL; - return err; + return (err); } static void @@ -197,7 +199,7 @@ ddp_gl_free_pages(struct ddp_gather_list *gl, int dirty) { /* - * XXX need to be able to + * XXX mark pages as dirty before unholding */ vm_fault_unhold_pages(gl->dgl_pages, gl->dgl_nelem); } @@ -227,7 +229,7 @@ int err, tag, npages, nppods; struct tom_data *d = TOM_DATA(TOE_DEV(so)); - npages = ((addr & ~PAGE_MASK) + len + PAGE_SIZE - 1) >> PAGE_SHIFT; + npages = ((addr & PAGE_MASK) + len + PAGE_SIZE - 1) >> PAGE_SHIFT; nppods = min(pages2ppods(npages), MAX_PPODS); nppods = roundup2(nppods, PPOD_CLUSTER_SIZE); err = t3_alloc_ppods(d, nppods, &tag); @@ -256,11 +258,10 @@ */ static void t3_repost_kbuf(struct socket *so, unsigned int bufidx, int modulate, - int activate) + int activate, int nonblock) { struct toepcb *toep = sototcpcb(so)->t_toe; struct ddp_state *p = &toep->tp_ddp_state; - TRACE_ENTER; p->buf_state[bufidx].cur_offset = p->kbuf[bufidx]->dgl_offset; p->buf_state[bufidx].flags = p->kbuf_noinval ? DDP_BF_NOINVAL : 0; @@ -283,7 +284,6 @@ V_TF_DDP_BUF1_VALID(1) | V_TF_DDP_ACTIVE_BUF(1), modulate); - TRACE_EXIT; } /* @@ -294,7 +294,7 @@ static __inline unsigned long select_ddp_flags(const struct socket *so, int buf_idx, - int nonblock, int rcv_flags) + int nonblock, int rcv_flags) { if (buf_idx == 1) { if (__predict_false(rcv_flags & MSG_WAITALL)) @@ -338,24 +338,26 @@ struct toepcb *toep = sototcpcb(so)->t_toe; struct ddp_state *p = &toep->tp_ddp_state; struct iovec *iov = uio->uio_iov; - unsigned long addr = (unsigned long)iov->iov_base - oft; + vm_offset_t addr = (vm_offset_t)iov->iov_base - oft; - if (__predict_false(!p->ubuf_nppods)) { + if (__predict_false(p->ubuf_nppods == 0)) { err = alloc_buf1_ppods(so, p, addr, iov->iov_len + oft); if (err) return (err); } len = (p->ubuf_nppods - NUM_SENTINEL_PPODS) * PPOD_PAGES * PAGE_SIZE; - len -= addr & ~PAGE_MASK; + len -= addr & PAGE_MASK; if (len > M_TCB_RX_DDP_BUF0_LEN) len = M_TCB_RX_DDP_BUF0_LEN; len = min(len, sototcpcb(so)->rcv_wnd - 32768); len = min(len, iov->iov_len + oft); - if (len <= p->kbuf[0]->dgl_length) + if (len <= p->kbuf[0]->dgl_length) { + printf("length too short\n"); return (EINVAL); - + } + err = t3_pin_pages(toep->tp_rx_dmat, toep->tp_dmamap, addr, len, &gl, p->ubuf); if (err) return (err); @@ -377,7 +379,6 @@ t3_cancel_ubuf(struct toepcb *toep) { struct ddp_state *p = &toep->tp_ddp_state; - long timeo = MAX_SCHEDULE_TIMEOUT; int ubuf_pending = t3_ddp_ubuf_pending(toep); struct socket *so = toeptoso(toep); @@ -393,12 +394,24 @@ p->buf_state[1].flags & (DDP_BF_NOFLIP | DDP_BF_NOCOPY), p->get_tcb_count); #endif - if (!p->get_tcb_count) + if (p->get_tcb_count == 0) t3_cancel_ddpbuf(toep, p->cur_buf); - do { + else { + int err = 0, timeo, flags, count=0; + timeo = so->so_rcv.sb_timeo; + flags = so->so_rcv.sb_flags; - cv_timedwait(&toep->tp_cv, &toep->tp_tp->t_inpcb->inp_mtx, timeo); - } while (p->get_tcb_count && !(so->so_state & (SS_ISDISCONNECTING|SS_ISDISCONNECTED))); + so->so_rcv.sb_timeo = 3*hz; + while (p->get_tcb_count && !(so->so_state & (SS_ISDISCONNECTING|SS_ISDISCONNECTED))) { + if (count & 0xff) + printf("waiting err=%d get_tcb_count=%d timeo=%d so=%p\n", + err, p->get_tcb_count, so->so_rcv.sb_timeo, so); + count++; + err = sbwait(&so->so_rcv); + } + so->so_rcv.sb_timeo = timeo; + so->so_rcv.sb_flags = flags; + } ubuf_pending = t3_ddp_ubuf_pending(toep); } @@ -417,24 +430,19 @@ */ int t3_overlay_ubuf(struct socket *so, const struct uio *uio, - int nonblock, int rcv_flags) + int nonblock, int rcv_flags, int modulate, int post_kbuf) { int err, len, ubuf_idx; unsigned long flags; struct toepcb *toep = sototcpcb(so)->t_toe; struct ddp_state *p = &toep->tp_ddp_state; - struct ddp_buf_state *dbs; - - TRACE_ENTER; if (p->kbuf[0] == NULL) { - TRACE_EXIT; return (EINVAL); } err = setup_uio_ppods(so, uio, 0, &len); if (err) { - TRACE_EXIT; return (err); } @@ -446,16 +454,18 @@ flags = select_ddp_flags(so, ubuf_idx, nonblock, rcv_flags); - dbs = &p->buf_state[ubuf_idx ^ 1]; - - dbs->cur_offset = 0; - dbs->flags = 0; - dbs->gl = p->kbuf[ubuf_idx ^ 1]; - p->kbuf_idx ^= 1; - flags |= p->kbuf_idx ? - V_TF_DDP_BUF1_VALID(1) | V_TF_DDP_PUSH_DISABLE_1(0) : - V_TF_DDP_BUF0_VALID(1) | V_TF_DDP_PUSH_DISABLE_0(0); - + if (post_kbuf) { + struct ddp_buf_state *dbs = &p->buf_state[ubuf_idx ^ 1]; + + dbs->cur_offset = 0; + dbs->flags = 0; + dbs->gl = p->kbuf[ubuf_idx ^ 1]; + p->kbuf_idx ^= 1; + flags |= p->kbuf_idx ? + V_TF_DDP_BUF1_VALID(1) | V_TF_DDP_PUSH_DISABLE_1(0) : + V_TF_DDP_BUF0_VALID(1) | V_TF_DDP_PUSH_DISABLE_0(0); + } + if (ubuf_idx == 0) { t3_overlay_ddpbuf(toep, 0, p->ubuf_tag << 6, p->kbuf_tag[1] << 6, len); @@ -475,7 +485,6 @@ " kbuf_idx %d", p->ubuf_tag, flags, OVERLAY_MASK, ubuf_idx, p->kbuf_idx); #endif - TRACE_EXIT; return (0); } @@ -540,7 +549,7 @@ TRACE_ENTER; t3_set_ddp_tag(so, p->cur_buf, p->kbuf_tag[p->cur_buf] << 6); t3_set_ddp_buf(so, p->cur_buf, 0, p->kbuf[p->cur_buf]->dgl_length); - t3_repost_kbuf(so, p->cur_buf, modulate, (so->so_state & SS_NBIO)); + t3_repost_kbuf(so, p->cur_buf, modulate, 1, (so->so_state & SS_NBIO)); TRACE_EXIT; #ifdef T3_TRACE T3_TRACE1(TIDTB(so), @@ -614,7 +623,7 @@ } t3_set_ddp_tag(so, 0, p->kbuf_tag[0] << 6); t3_set_ddp_buf(so, 0, 0, p->kbuf[0]->dgl_length); - t3_repost_kbuf(so, 0, 0, nonblock); + t3_repost_kbuf(so, 0, 0, 1, nonblock); t3_set_rcv_coalesce_enable(so, TOM_TUNABLE(TOE_DEV(so), ddp_rcvcoalesce)); @@ -639,20 +648,17 @@ int page_off, resid_init, err; struct ddp_gather_list *gl = (struct ddp_gather_list *)m->m_ddp_gl; - TRACE_ENTER; resid_init = uio->uio_resid; if (!gl->dgl_pages) panic("pages not set\n"); offset += gl->dgl_offset + m->m_cur_offset; - page_off = offset & ~PAGE_MASK; + page_off = offset & PAGE_MASK; + KASSERT(len <= gl->dgl_length, + ("len=%d > dgl_length=%d in ddp_copy\n", len, gl->dgl_length)); err = uiomove_fromphys(gl->dgl_pages, page_off, len, uio); - printf("err=%d resid_init=%d uio_resid=%d offset=%d len=%d\n", - err, resid_init, uio->uio_resid, offset, len); - - TRACE_EXIT; return (err); } ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#9 (text+ko) ==== @@ -128,6 +128,7 @@ DDP_BF_PSH = 1 << 3, /* set in skb->flags if the a DDP was completed with a segment having the PSH flag set */ + DDP_BF_NODATA = 1 << 4, /* buffer completed before filling */ }; #include @@ -135,7 +136,8 @@ /* * Returns 1 if a UBUF DMA buffer might be active. */ -static inline int t3_ddp_ubuf_pending(struct toepcb *toep) +static inline int +t3_ddp_ubuf_pending(struct toepcb *toep) { struct ddp_state *p = &toep->tp_ddp_state; @@ -143,6 +145,9 @@ * but DDP_STATE() is only valid if the connection actually enabled * DDP. */ + if (p->kbuf[0] == NULL) + return (0); + return (p->buf_state[0].flags & (DDP_BF_NOFLIP | DDP_BF_NOCOPY)) || (p->buf_state[1].flags & (DDP_BF_NOFLIP | DDP_BF_NOCOPY)); } @@ -160,7 +165,7 @@ int rcv_flags, int modulate, int post_kbuf); void t3_cancel_ubuf(struct toepcb *toep); int t3_overlay_ubuf(struct socket *so, const struct uio *uio, int nonblock, - int rcv_flags); + int rcv_flags, int modulate, int post_kbuf); int t3_enter_ddp(struct socket *so, unsigned int kbuf_size, unsigned int waitall); void t3_cleanup_ddp(struct toepcb *toep); void t3_release_ddp_resources(struct toepcb *toep); ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_tom.c#4 (text+ko) ==== @@ -264,14 +264,18 @@ return; } +extern void kdb_backetrace(void); + /* * Process a received packet with an unknown/unexpected CPL opcode. */ static int do_bad_cpl(struct t3cdev *cdev, struct mbuf *m, void *ctx) { + kdb_backtrace(); + log(LOG_ERR, "%s: received bad CPL command %u\n", cdev->name, - *mtod(m, unsigned int *)); + 0xFF & *mtod(m, unsigned int *)); return (CPL_RET_BUF_DONE | CPL_RET_BAD_MSG); } From owner-p4-projects@FreeBSD.ORG Sat Feb 2 05:36:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6BE616A41A; Sat, 2 Feb 2008 05:36:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC07816A417 for ; Sat, 2 Feb 2008 05:36:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9B38813C448 for ; Sat, 2 Feb 2008 05:36:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m125aUq1066772 for ; Sat, 2 Feb 2008 05:36:30 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m125aUiZ066769 for perforce@freebsd.org; Sat, 2 Feb 2008 05:36:30 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 2 Feb 2008 05:36:30 GMT Message-Id: <200802020536.m125aUiZ066769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 05:36:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=134632 Change 134632 by kmacy@kmacy:storage:toehead on 2008/02/02 05:35:41 remove call to backtrace Affected files ... .. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_tom.c#5 edit Differences ... ==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_tom.c#5 (text+ko) ==== @@ -264,16 +264,12 @@ return; } -extern void kdb_backetrace(void); - /* * Process a received packet with an unknown/unexpected CPL opcode. */ static int do_bad_cpl(struct t3cdev *cdev, struct mbuf *m, void *ctx) { - kdb_backtrace(); - log(LOG_ERR, "%s: received bad CPL command %u\n", cdev->name, 0xFF & *mtod(m, unsigned int *)); From owner-p4-projects@FreeBSD.ORG Sat Feb 2 06:57:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3CD516A41B; Sat, 2 Feb 2008 06:57:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4382116A417 for ; Sat, 2 Feb 2008 06:57:59 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 32A2C13C442 for ; Sat, 2 Feb 2008 06:57:59 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m126vxhC072377 for ; Sat, 2 Feb 2008 06:57:59 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m126vxk9072374 for perforce@freebsd.org; Sat, 2 Feb 2008 06:57:59 GMT (envelope-from imp@freebsd.org) Date: Sat, 2 Feb 2008 06:57:59 GMT Message-Id: <200802020657.m126vxk9072374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134635 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 06:58:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=134635 Change 134635 by imp@imp_lighthouse on 2008/02/02 06:57:43 Cavium wants a different ldscript than the rest. Cope with this by making it possible to have different ldscripts. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/conf/kern.pre.mk#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/conf/kern.pre.mk#2 (text+ko) ==== @@ -12,6 +12,8 @@ KERNEL_KO?= kernel KERNEL?= kernel KODIR?= /boot/${KERNEL} +LDSCRIPT_NAME?= ldscript.$M +LDSCRIPT?= $S/conf/${LDSCRIPT_NAME} M= ${MACHINE_ARCH} @@ -134,12 +136,12 @@ SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS} SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o} SYSTEM_OBJS+= hack.So -SYSTEM_LD= @${LD} -Bdynamic -T $S/conf/ldscript.$M \ +SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} \ -warn-common -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \ ${SIZE} ${.TARGET} ; chmod 755 ${.TARGET} -SYSTEM_DEP+= $S/conf/ldscript.$M +SYSTEM_DEP+= ${LDSCRIPT} # MKMODULESENV is set here so that port makefiles can augment # them. From owner-p4-projects@FreeBSD.ORG Sat Feb 2 07:18:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64B4A16A469; Sat, 2 Feb 2008 07:18:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11BB316A418; Sat, 2 Feb 2008 07:18:07 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe01.swip.net [212.247.154.1]) by mx1.freebsd.org (Postfix) with ESMTP id 50BC813C46E; Sat, 2 Feb 2008 07:18:06 +0000 (UTC) (envelope-from hselasky@freebsd.org) X-Cloudmark-Score: 0.000000 [] Received: from [85.19.218.18] (account mc467741@c2i.net [85.19.218.18] verified) by mailfe01.swip.net (CommuniGate Pro SMTP 5.1.13) with ESMTPA id 768799855; Sat, 02 Feb 2008 08:18:04 +0100 From: Hans Petter Selasky To: Alfred Perlstein Date: Sat, 2 Feb 2008 08:18:56 +0100 User-Agent: KMail/1.9.7 References: <200712020001.lB201XbN000811@repoman.freebsd.org> <20080202022234.GR99258@elvis.mu.org> In-Reply-To: <20080202022234.GR99258@elvis.mu.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200802020818.57037.hselasky@freebsd.org> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 129920 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 07:18:07 -0000 On Saturday 02 February 2008, Alfred Perlstein wrote: > This change makes very little sense. If xfer->frbuffers is a bare > pointer, then why add 0 to it? Just pass xfer->frbuffers or use a > macro that explains what you are doing. > I can change those to a plain "xfer->frlengths". It was just a reminder for me, because some places we use "xfer->frlengths + 1" and "xfer->frbuffers + 1". I will write a script that converts all of those. --HPS From owner-p4-projects@FreeBSD.ORG Sat Feb 2 08:12:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABD6A16A41A; Sat, 2 Feb 2008 08:12:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7167116A420 for ; Sat, 2 Feb 2008 08:12:17 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F9C513C442 for ; Sat, 2 Feb 2008 08:12:17 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m128CHiH078689 for ; Sat, 2 Feb 2008 08:12:17 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m128CHr6078686 for perforce@freebsd.org; Sat, 2 Feb 2008 08:12:17 GMT (envelope-from imp@freebsd.org) Date: Sat, 2 Feb 2008 08:12:17 GMT Message-Id: <200802020812.m128CHr6078686@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134642 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 08:12:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=134642 Change 134642 by imp@imp_lighthouse on 2008/02/02 08:12:14 Copy over the octeon ld scripts and tell the octeon config files to use them. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/conf/ldscript.mips.octeon.kernel.32#1 branch .. //depot/projects/mips2-jnpr/src/sys/conf/ldscript.mips.octeon.kernel.n32#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/std.octeon32#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/std.octeon32#6 (text+ko) ==== @@ -11,6 +11,7 @@ # XXX here for the moment. Altq is bitten by it, since it looks # XXX for __FreeBSD__ makeoptions EXTRA_C_FLAGS=-D__FreeBSD__=8 +makeoptions LDSCRIPT_NAME=ldscript.mips.octeon.kernel.32 #device pci #device ata #device atadisk From owner-p4-projects@FreeBSD.ORG Sat Feb 2 08:20:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD44816A418; Sat, 2 Feb 2008 08:20:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6972016A421 for ; Sat, 2 Feb 2008 08:20:26 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5834B13C4E8 for ; Sat, 2 Feb 2008 08:20:26 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m128KQds079915 for ; Sat, 2 Feb 2008 08:20:26 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m128KQvw079912 for perforce@freebsd.org; Sat, 2 Feb 2008 08:20:26 GMT (envelope-from imp@freebsd.org) Date: Sat, 2 Feb 2008 08:20:26 GMT Message-Id: <200802020820.m128KQvw079912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134644 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 08:20:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=134644 Change 134644 by imp@imp_lighthouse on 2008/02/02 08:19:36 trad* targets don't exist. Instead, do what the other linkers appear to do that have them and output the start of text to be 81000000. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/conf/ldscript.mips.octeon.kernel.32#2 edit .. //depot/projects/mips2-jnpr/src/sys/conf/ldscript.mips.octeon.kernel.n32#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/conf/ldscript.mips.octeon.kernel.32#2 (text+ko) ==== @@ -1,11 +1,11 @@ -OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips") +OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips") OUTPUT_ARCH(mips) ENTRY(_start) __DYNAMIC = 0; PROVIDE (_DYNAMIC = 0); SECTIONS { - + . = 0x81000000; .text . : { *(.text) *(.dynamic) ==== //depot/projects/mips2-jnpr/src/sys/conf/ldscript.mips.octeon.kernel.n32#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Feb 2 08:40:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FD2616A46D; Sat, 2 Feb 2008 08:40:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 356C716A46B for ; Sat, 2 Feb 2008 08:40:48 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 23C5113C45B for ; Sat, 2 Feb 2008 08:40:48 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m128emNj080595 for ; Sat, 2 Feb 2008 08:40:48 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m128elSV080592 for perforce@freebsd.org; Sat, 2 Feb 2008 08:40:47 GMT (envelope-from rrs@cisco.com) Date: Sat, 2 Feb 2008 08:40:47 GMT Message-Id: <200802020840.m128elSV080592@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 08:40:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=134645 Change 134645 by rrs@rrs-mips2-jnpr on 2008/02/02 08:39:48 Fix so Maxmem gets setup like it does in other platforms. This really only fixes the Physmem print before Avail Memory... but its one of those nags . Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#8 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#8 (text+ko) ==== @@ -1108,6 +1108,7 @@ extern int *end; extern void _start(void); +extern int Maxmem; static void mips_init(void) @@ -1190,6 +1191,8 @@ printf("\nBank 1 = 0x%8X -> 0x%8X\n", phys_avail[2], phys_avail[3]); printf("\nphysmem: 0x%lx", physmem); + Maxmem = physmem; + init_param1(); init_param2(physmem); mips_cpu_init(); From owner-p4-projects@FreeBSD.ORG Sat Feb 2 09:08:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CE0716A41A; Sat, 2 Feb 2008 09:08:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C66BA16A418 for ; Sat, 2 Feb 2008 09:08:44 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.cksoft.de (mail.cksoft.de [62.111.66.27]) by mx1.freebsd.org (Postfix) with ESMTP id 8143F13C459 for ; Sat, 2 Feb 2008 09:08:44 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from localhost (amavis.str.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id 6CBA241C74D; Sat, 2 Feb 2008 09:50:06 +0100 (CET) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([62.111.66.27]) by localhost (amavis.str.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id XFNK4UoHIxdK; Sat, 2 Feb 2008 09:50:05 +0100 (CET) Received: by mail.cksoft.de (Postfix, from userid 66) id E699F41C747; Sat, 2 Feb 2008 09:50:05 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id 03C2044487F; Sat, 2 Feb 2008 08:47:58 +0000 (UTC) Date: Sat, 2 Feb 2008 08:47:58 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: "Randall R. Stewart" In-Reply-To: <200802020840.m128elSV080592@repoman.freebsd.org> Message-ID: <20080202084735.E49429@maildrop.int.zabbadoz.net> References: <200802020840.m128elSV080592@repoman.freebsd.org> X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 134645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 09:08:45 -0000 On Sat, 2 Feb 2008, Randall R. Stewart wrote: > http://perforce.freebsd.org/chv.cgi?CH=134645 > > Change 134645 by rrs@rrs-mips2-jnpr on 2008/02/02 08:39:48 > > Fix so Maxmem gets setup like it does in > other platforms. This really only fixes the Physmem print > before Avail Memory... but its one of those nags . > > Affected files ... > > .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#8 edit > > Differences ... > > ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#8 (text+ko) ==== > > @@ -1108,6 +1108,7 @@ > extern int *end; > extern void _start(void); > > +extern int Maxmem; > > static void > mips_init(void) > @@ -1190,6 +1191,8 @@ > printf("\nBank 1 = 0x%8X -> 0x%8X\n", phys_avail[2], phys_avail[3]); > printf("\nphysmem: 0x%lx", physmem); > > + Maxmem = physmem; > + ist there a reason this variable starts with an uppercase letter? > init_param1(); > init_param2(physmem); > mips_cpu_init(); > -- Bjoern A. Zeeb bzeeb at Zabbadoz dot NeT Software is harder than hardware so better get it right the first time. From owner-p4-projects@FreeBSD.ORG Sat Feb 2 12:13:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE56816A41B; Sat, 2 Feb 2008 12:13:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B3B816A418; Sat, 2 Feb 2008 12:13:02 +0000 (UTC) (envelope-from bright@elvis.mu.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id 4832D13C465; Sat, 2 Feb 2008 12:13:02 +0000 (UTC) (envelope-from bright@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1192) id 0C7D71A4D83; Sat, 2 Feb 2008 04:13:02 -0800 (PST) Date: Sat, 2 Feb 2008 04:13:02 -0800 From: Alfred Perlstein To: Hans Petter Selasky Message-ID: <20080202121301.GY99258@elvis.mu.org> References: <200712020001.lB201XbN000811@repoman.freebsd.org> <20080202022234.GR99258@elvis.mu.org> <200802020818.57037.hselasky@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200802020818.57037.hselasky@freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: Perforce Change Reviews Subject: Re: PERFORCE change 129920 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 12:13:03 -0000 * Hans Petter Selasky [080201 23:18] wrote: > On Saturday 02 February 2008, Alfred Perlstein wrote: > > This change makes very little sense. If xfer->frbuffers is a bare > > pointer, then why add 0 to it? Just pass xfer->frbuffers or use a > > macro that explains what you are doing. > > > > I can change those to a plain "xfer->frlengths". It was just a reminder for > me, because some places we use "xfer->frlengths + 1" and "xfer->frbuffers + > 1". > > I will write a script that converts all of those. What does '+ 1' mean? Is it something special like a channel or something? If so it should be a macro that's more descriptive. -- - Alfred Perlstein From owner-p4-projects@FreeBSD.ORG Sat Feb 2 16:04:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0FCA16A41B; Sat, 2 Feb 2008 16:04:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 665E616A417 for ; Sat, 2 Feb 2008 16:04:28 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 572F613C459 for ; Sat, 2 Feb 2008 16:04:28 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12G4Sn7032531 for ; Sat, 2 Feb 2008 16:04:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12G4S64032528 for perforce@freebsd.org; Sat, 2 Feb 2008 16:04:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 2 Feb 2008 16:04:28 GMT Message-Id: <200802021604.m12G4S64032528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134651 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 16:04:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=134651 Change 134651 by rwatson@rwatson_fledge on 2008/02/02 16:03:40 Add a basic bsmtrace web page and link it up. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#7 edit .. //depot/projects/trustedbsd/www/audit.page#4 edit .. //depot/projects/trustedbsd/www/components.page#8 edit .. //depot/projects/trustedbsd/www/openbsm.page#23 edit .. //depot/projects/trustedbsd/www/sidebar.xml#10 edit Differences ... ==== //depot/projects/trustedbsd/www/Makefile#7 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#6 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#7 $ STYLESHEET= page.xsl @@ -47,6 +47,7 @@ SRCS+= audit.page SRCS+= cap.page SRCS+= acls.page +SRCS+= bsmtrace.page IMGS= components.gif componentsgray.gif IMGS+= developers.gif developersgray.gif docs.gif ==== //depot/projects/trustedbsd/www/audit.page#4 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/audit.page#3 $ + $P4: //depot/projects/trustedbsd/www/audit.page#4 $ @@ -78,6 +78,9 @@ OpenBSM is maintained by the TrustedBSD Project, and new versions are imported into the FreeBSD CVS repository intermittently.

+

BSMtrace is an audit-based host + intrusion dection system.

+

Discussion of the TrustedBSD Audit implementation, as well as the OpenBSM package, takes place on the trustedbsd-audit mailing list.

==== //depot/projects/trustedbsd/www/components.page#8 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/components.page#7 $ + $P4: //depot/projects/trustedbsd/www/components.page#8 $ @@ -90,6 +90,17 @@ ACLs web page for more information.

+ +

BSMtrace

+ +
+

BSMtrace is a fine state + machine-based intrusion detection system that works using + OpenBSM-derived data generated by + the TrustedBSD audit implementation. +

+
+

Event Auditing and OpenBSM

==== //depot/projects/trustedbsd/www/openbsm.page#23 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#22 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#23 $ @@ -85,10 +85,12 @@

OpenBSM is the core user space component of the TrustedBSD Audit Implementation for - FreeBSD, providing tools, libraries, and include files. Pre-releases - of OpenBSM are now available as part of the FreeBSD 7-CURRENT branch, - as integration of audit into the FreeBSD CVS tree is largely - complete.

+ FreeBSD, providing tools, libraries, and include files. OpenBSM + ships with FreeBSD 6.2 and later, with the first full release of + OpenBSM (1.0) in FreeBSD 6.3 and FreeBSD 7.0.

+ +

BSMtrace is a BSM-based host + intrusion detection system that relies on OpenBSM audit trails.

==== //depot/projects/trustedbsd/www/sidebar.xml#10 (text+ko) ==== @@ -5,6 +5,7 @@
  • ACLs
  • Audit
    • +
  • BSMtrace
  • Extended Attributes and UFS2
  • Capabilities
  • GEOM
    • @@ -21,6 +22,7 @@
    • ACLs
    • Audit
      • +
    • BSMtrace
    • Extended Attributes and UFS2
    • Capabilities
    • GEOM
      • From owner-p4-projects@FreeBSD.ORG Sat Feb 2 16:16:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6365316A468; Sat, 2 Feb 2008 16:16:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28FDD16A41B for ; Sat, 2 Feb 2008 16:16:41 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B9B313C45B for ; Sat, 2 Feb 2008 16:16:41 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12GGeA0033893 for ; Sat, 2 Feb 2008 16:16:40 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12GGe2j033890 for perforce@freebsd.org; Sat, 2 Feb 2008 16:16:40 GMT (envelope-from brueffer@freebsd.org) Date: Sat, 2 Feb 2008 16:16:40 GMT Message-Id: <200802021616.m12GGe2j033890@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 134652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 16:16:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=134652 Change 134652 by brueffer@brueffer_haakonia on 2008/02/02 16:16:27 Typo fix. Affected files ... .. //depot/projects/trustedbsd/www/audit.page#5 edit Differences ... ==== //depot/projects/trustedbsd/www/audit.page#5 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/audit.page#4 $ + $P4: //depot/projects/trustedbsd/www/audit.page#5 $ @@ -79,7 +79,7 @@ are imported into the FreeBSD CVS repository intermittently.

      BSMtrace is an audit-based host - intrusion dection system.

      + intrusion detection system.

      Discussion of the TrustedBSD Audit implementation, as well as the OpenBSM package, takes place on the Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC1FD16A468; Sat, 2 Feb 2008 16:26:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7960416A420 for ; Sat, 2 Feb 2008 16:26:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 53F8C13C44B for ; Sat, 2 Feb 2008 16:26:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12GQpho034354 for ; Sat, 2 Feb 2008 16:26:51 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12GQpWt034351 for perforce@freebsd.org; Sat, 2 Feb 2008 16:26:51 GMT (envelope-from imp@freebsd.org) Date: Sat, 2 Feb 2008 16:26:51 GMT Message-Id: <200802021626.m12GQpWt034351@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 16:26:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=134654 Change 134654 by imp@imp_lighthouse on 2008/02/02 16:26:40 Update. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/TODO#14 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/TODO#14 (text+ko) ==== @@ -2,17 +2,15 @@ as $12) This is cpu.h vs cpureg.h or a 'netbsd' vs 'openbsd' argument. See Mips Run uses the latter and seems like a reasonable thing to pick... o Can we remove PDP_ENDIAN? -o Can we remove a.out junk +o Can we remove a.out junk from the asm files. o Can we remove pre-ansi stuff o unify cpu.h vs cpureg.h o Look for old vestiges of the array of args for p->p_regs[] and also comments - about same. + about same. Struct reg, fpgreg seem OBE too. o Look at the differences between the trampoline code between the two versions as this may lead to problems. Specifically, we have sigcode encoded into locore.S, and some code in sigreturn in pm_machdep.c. Not sure where things are in libc. -o What does that assmbler before mi_startup do in locore.S Comment or - remove. o Don't forget John Baldwin's comments on the user switch stuff. XXX add more here XXX o What's defined in assym.s and param.h varies somewhat between the two @@ -34,15 +32,21 @@ o inb and readb are the same damn thing. Really. We should shoot them both and all their ilk. This would allow us to have only one bus_tag, which we need anyway to do the indirection bit right. +o We're not parsing the BIOS info quite right. +o We're not getting memory size at all from the BIOS, but rather are getting + it from the constant of 96... +o RAMDISK support +o Network driver works only on the 36XX sim. It dies in various ways on the + different models. Do we wait for a better code drop from Cavium or fix + this ourselves? +o Can't boot on 5600 sim. +o We die on first vm reference on the real CN3800-EVB-xxxx that I have. ************ RRS (below) ********* o obio.c is probably not a good name for the IQ80321 driver -- obio is On Board I/O. The IQ80321 is a StrongARM eval board... o the locations of the octeon uart stuff is probably not good (in mips/octeon32) -o uart_dev_oct16550.c exists in dev/uart, did Warner move this - over? Or did it already exist, Can't find any reference to - it outside the octeon code (files...) did find a np1650.c though. o Still need to update some of the file locations and s9indent it. o Still need to figure out where the packet units and enet driver should go. From owner-p4-projects@FreeBSD.ORG Sat Feb 2 18:48:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E27416A419; Sat, 2 Feb 2008 18:48:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 53A2616A417 for ; Sat, 2 Feb 2008 18:48:21 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2F38F13C448 for ; Sat, 2 Feb 2008 18:48:21 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12ImLgA053389 for ; Sat, 2 Feb 2008 18:48:21 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12ImL9Q053386 for perforce@freebsd.org; Sat, 2 Feb 2008 18:48:21 GMT (envelope-from cognet@freebsd.org) Date: Sat, 2 Feb 2008 18:48:21 GMT Message-Id: <200802021848.m12ImL9Q053386@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 134660 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 18:48:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=134660 Change 134660 by cognet@cognet-mips on 2008/02/02 18:47:54 Set clock_running to 1, or hardclock() won't ever be called in ticks.c::clock_intr() Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/clock.c#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/clock.c#6 (text+ko) ==== @@ -127,6 +127,7 @@ mips_timer_init(); clock_started++; + clocks_running = 1; } } From owner-p4-projects@FreeBSD.ORG Sat Feb 2 18:51:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6D6E16A421; Sat, 2 Feb 2008 18:51:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9121416A418 for ; Sat, 2 Feb 2008 18:51:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8371913C4E3 for ; Sat, 2 Feb 2008 18:51:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12IpOHo053575 for ; Sat, 2 Feb 2008 18:51:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12IpOE5053572 for perforce@freebsd.org; Sat, 2 Feb 2008 18:51:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 2 Feb 2008 18:51:24 GMT Message-Id: <200802021851.m12IpOE5053572@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134661 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 18:51:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=134661 Change 134661 by rwatson@rwatson_cinnamon on 2008/02/02 18:50:46 Clarify comment. Affected files ... .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#21 edit Differences ... ==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#21 (text+ko) ==== @@ -151,7 +151,9 @@ * shared memory buffers. * * pcap_next_zbuf_shm(): Check for a newly available shared memory buffer, - * and set up p->buffer and cc to reflect one if available. + * and set up p->buffer and cc to reflect one if available. Notice that if + * there was no prior buffer, we select zbuf1 as this will be the first + * buffer filled for a fresh BPF session. */ static int pcap_next_zbuf_shm(pcap_t *p, int *cc) From owner-p4-projects@FreeBSD.ORG Sat Feb 2 18:53:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7582E16A419; Sat, 2 Feb 2008 18:53:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22CC216A417 for ; Sat, 2 Feb 2008 18:53:27 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 163E313C442 for ; Sat, 2 Feb 2008 18:53:27 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12IrQMn053630 for ; Sat, 2 Feb 2008 18:53:26 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12IrQdN053627 for perforce@freebsd.org; Sat, 2 Feb 2008 18:53:26 GMT (envelope-from cognet@freebsd.org) Date: Sat, 2 Feb 2008 18:53:26 GMT Message-Id: <200802021853.m12IrQdN053627@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 134662 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 18:53:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=134662 Change 134662 by cognet@cognet-mips on 2008/02/02 18:53:25 Enable interrupts in nexus_setup_intr() for octeon for now. That's probably not the best place to do it, and it should be moved later, but that's what the cavium port does. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#2 (text+ko) ==== @@ -183,7 +183,11 @@ cpu_establish_hardintr(device_get_nameunit(child), filt, intr, arg, irq, flags, cookiep); +#ifdef TARGET_OCTEON + intr_enable(); +#else intr_restore(sr); +#endif return (0); } From owner-p4-projects@FreeBSD.ORG Sat Feb 2 19:02:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05F8E16A41A; Sat, 2 Feb 2008 19:02:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A757F16A418 for ; Sat, 2 Feb 2008 19:02:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9959413C458 for ; Sat, 2 Feb 2008 19:02:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12J2bfv054031 for ; Sat, 2 Feb 2008 19:02:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12J2b7G054028 for perforce@freebsd.org; Sat, 2 Feb 2008 19:02:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 2 Feb 2008 19:02:37 GMT Message-Id: <200802021902.m12J2b7G054028@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 19:02:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=134663 Change 134663 by rwatson@rwatson_cinnamon on 2008/02/02 19:02:14 Renumber ioctls so that BIOCFEEDBACK has the same ioctl number as in CVS. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.h#21 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.h#21 (text+ko) ==== @@ -147,13 +147,12 @@ /* Obsolete */ #define BIOCGSEESENT BIOCGDIRECTION #define BIOCSSEESENT BIOCSDIRECTION - -#define BIOCGETBUFMODE _IOR('B', 124, u_int) -#define BIOCSETBUFMODE _IOW('B', 125, u_int) -#define BIOCGETZMAX _IOR('B', 126, size_t) -#define BIOCROTZBUF _IOR('B', 127, struct bpf_zbuf) -#define BIOCSETZBUF _IOW('B', 128, struct bpf_zbuf) -#define BIOCFEEDBACK _IOW('B', 129, u_int) +#define BIOCFEEDBACK _IOW('B',124, u_int) +#define BIOCGETBUFMODE _IOR('B',125, u_int) +#define BIOCSETBUFMODE _IOW('B',126, u_int) +#define BIOCGETZMAX _IOR('B',127, size_t) +#define BIOCROTZBUF _IOR('B',128, struct bpf_zbuf) +#define BIOCSETZBUF _IOW('B',129, struct bpf_zbuf) /* Packet directions */ enum bpf_direction { From owner-p4-projects@FreeBSD.ORG Sat Feb 2 19:06:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B8EA16A41B; Sat, 2 Feb 2008 19:06:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1928B16A419 for ; Sat, 2 Feb 2008 19:06:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E623113C4D3 for ; Sat, 2 Feb 2008 19:06:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12J6fsj055409 for ; Sat, 2 Feb 2008 19:06:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12J6f5F055406 for perforce@freebsd.org; Sat, 2 Feb 2008 19:06:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 2 Feb 2008 19:06:41 GMT Message-Id: <200802021906.m12J6f5F055406@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 19:06:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=134664 Change 134664 by rwatson@rwatson_fledge on 2008/02/02 19:06:17 Add BSMtrace page, missed in previous submit. Affected files ... .. //depot/projects/trustedbsd/www/bsmtrace.page#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Feb 2 19:19:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17D0216A41A; Sat, 2 Feb 2008 19:19:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1ADB16A417 for ; Sat, 2 Feb 2008 19:19:55 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C577613C4E9 for ; Sat, 2 Feb 2008 19:19:55 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12JJtTl056820 for ; Sat, 2 Feb 2008 19:19:55 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12JJtIh056817 for perforce@freebsd.org; Sat, 2 Feb 2008 19:19:55 GMT (envelope-from csjp@freebsd.org) Date: Sat, 2 Feb 2008 19:19:55 GMT Message-Id: <200802021919.m12JJtIh056817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134666 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 19:19:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=134666 Change 134666 by csjp@csjp_xor on 2008/02/02 19:18:55 s/fine/finite/g Affected files ... .. //depot/projects/trustedbsd/www/components.page#9 edit Differences ... ==== //depot/projects/trustedbsd/www/components.page#9 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/components.page#8 $ + $P4: //depot/projects/trustedbsd/www/components.page#9 $ @@ -94,7 +94,7 @@

      BSMtrace

      -

      BSMtrace is a fine state +

      BSMtrace is a finite state machine-based intrusion detection system that works using OpenBSM-derived data generated by the TrustedBSD audit implementation. From owner-p4-projects@FreeBSD.ORG Sat Feb 2 19:26:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D51816A41B; Sat, 2 Feb 2008 19:26:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0B1B16A417 for ; Sat, 2 Feb 2008 19:26:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B2D4513C447 for ; Sat, 2 Feb 2008 19:26:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12JQ3ko057134 for ; Sat, 2 Feb 2008 19:26:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12JQ2V9057131 for perforce@freebsd.org; Sat, 2 Feb 2008 19:26:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 2 Feb 2008 19:26:02 GMT Message-Id: <200802021926.m12JQ2V9057131@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 134667 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 19:26:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=134667 Change 134667 by rwatson@rwatson_cinnamon on 2008/02/02 19:25:27 Remove stale comments about structure and the ioctl summary; we have that elsewhere, and the comments are dated from when we did ackzbuf using an ioctl. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.h#22 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.h#22 (text+ko) ==== @@ -105,15 +105,9 @@ #define BPF_BUFMODE_DEFAULT BPF_BUFMODE_BUFFER /* Default. */ -/* - * Struct used by BIOCSETZBUF, BIOCROTZBUF: - * describes up to two zero-copy buffer as used by BPF. - * - * BIOCSETZBUF Set current zero-copy buffer locations (once only). - * BIOCROTZBUF Force rotation of zero-copy buffer(s) - * - * Pointers may be set to NULL to indicate a buffer is not configure, should - * be freed, or is not being acknowledged. +/*- + * Struct used by BIOCSETZBUF, BIOCROTZBUF: describes up to two zero-copy + * buffer as used by BPF. */ struct bpf_zbuf { void *bz_bufa; /* Location of 'a' zero-copy buffer. */ From owner-p4-projects@FreeBSD.ORG Sat Feb 2 19:31:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91D4716A46E; Sat, 2 Feb 2008 19:31:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 54DE716A46B for ; Sat, 2 Feb 2008 19:31:09 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0C15F13C459 for ; Sat, 2 Feb 2008 19:31:09 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12JV89Z057401 for ; Sat, 2 Feb 2008 19:31:08 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12JV8kK057398 for perforce@freebsd.org; Sat, 2 Feb 2008 19:31:08 GMT (envelope-from cognet@freebsd.org) Date: Sat, 2 Feb 2008 19:31:08 GMT Message-Id: <200802021931.m12JV8kK057398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 134668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 19:31:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=134668 Change 134668 by cognet@cognet-mips on 2008/02/02 19:30:11 Revert phys_avail[1] to what it was. make sure phys_avail[2] and phys_avail[3] are 0. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#9 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#9 (text+ko) ==== @@ -1145,7 +1145,8 @@ realmem_bytes = (((octeon_board_real())?256:96) << 20); /* phys_avail regions are in bytes */ phys_avail[0] = (MIPS_KSEG0_TO_PHYS((vm_offset_t)&end) + PAGE_SIZE) & ~(PAGE_SIZE - 1); - phys_avail[1] = phys_avail[0] + realmem_bytes - 64 - 1; + phys_avail[1] = realmem_bytes - 64 - 1; + phys_avail[2] = phys_avail[3] = 0; #ifdef MEM_EXTEND From owner-p4-projects@FreeBSD.ORG Sat Feb 2 20:53:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5687616A509; Sat, 2 Feb 2008 20:53:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 03C5116A506 for ; Sat, 2 Feb 2008 20:53:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D25A213C45D for ; Sat, 2 Feb 2008 20:53:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12KrYon074450 for ; Sat, 2 Feb 2008 20:53:34 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12KrYN8074447 for perforce@freebsd.org; Sat, 2 Feb 2008 20:53:34 GMT (envelope-from jb@freebsd.org) Date: Sat, 2 Feb 2008 20:53:34 GMT Message-Id: <200802022053.m12KrYN8074447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 20:53:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=134673 Change 134673 by jb@jb_freebsd1 on 2008/02/02 20:53:28 Update the includes to match amd64. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#7 (text+ko) ==== @@ -33,8 +33,11 @@ #include #include #include +#include #include #include +#include +#include extern uintptr_t kernelbase; extern uintptr_t dtrace_in_probe_addr; From owner-p4-projects@FreeBSD.ORG Sat Feb 2 21:00:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 320B216A469; Sat, 2 Feb 2008 21:00:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D363016A421 for ; Sat, 2 Feb 2008 21:00:42 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C55D613C4E8 for ; Sat, 2 Feb 2008 21:00:42 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12L0gr8074781 for ; Sat, 2 Feb 2008 21:00:42 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12L0gHr074778 for perforce@freebsd.org; Sat, 2 Feb 2008 21:00:42 GMT (envelope-from rrs@cisco.com) Date: Sat, 2 Feb 2008 21:00:42 GMT Message-Id: <200802022100.m12L0gHr074778@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 134674 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 21:00:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=134674 Change 134674 by rrs@rrs-mips2-jnpr on 2008/02/02 21:00:00 moves over some more octeon specific changes -nexus with OCTEON SMP (even though we are not ready) -bus_space_read/write (8/16) Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#8 edit .. //depot/projects/mips2-jnpr/src/sys/mips/include/bus.h#7 edit .. //depot/projects/mips2-jnpr/src/sys/mips/include/bus_octeon.h#1 add .. //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#8 (text+ko) ==== @@ -43,8 +43,8 @@ options SCHED_4BSD #4BSD scheduler options INET #InterNETworking -options NFSCLIENT #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +#options NFSCLIENT #Network Filesystem Client +#options NFS_ROOT #NFS usable as /, requires NFSCLIENT options PSEUDOFS #Pseudo-filesystem framework options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions @@ -79,6 +79,6 @@ # # Use the following for RFS in mem-device -# options MD_ROOT +options MD_ROOT # options ROOTDEVNAME = \"ufs:md0\" -# options MD_ROOT_SIZE = 40960 +options MD_ROOT_SIZE = 25200 ==== //depot/projects/mips2-jnpr/src/sys/mips/include/bus.h#7 (text+ko) ==== @@ -75,6 +75,9 @@ #ifndef _MACHINE_BUS_H_ #define _MACHINE_BUS_H_ +#ifdef TARGET_OCTEON +#include +#else #include #include @@ -902,4 +905,5 @@ #define bus_space_copy_region_stream_4(t, h1, o1, h2, o2, c) \ bus_space_copy_region_4((t), (h1), (o1), (h2), (o2), (c)) +#endif /* !TARGET_OCTEON */ #endif /* !_MACHINE_BUS_H_ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#3 (text+ko) ==== @@ -184,11 +184,14 @@ cpu_establish_hardintr(device_get_nameunit(child), filt, intr, arg, irq, flags, cookiep); #ifdef TARGET_OCTEON +#ifdef OCTEON_SMP + mp_intr_enable(); +#else intr_enable(); -#else +#endif +#else intr_restore(sr); #endif - return (0); } From owner-p4-projects@FreeBSD.ORG Sat Feb 2 21:15:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C88716A46C; Sat, 2 Feb 2008 21:15:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E74016A468; Sat, 2 Feb 2008 21:15:15 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe07.swip.net [212.247.154.193]) by mx1.freebsd.org (Postfix) with ESMTP id E5D1B13C467; Sat, 2 Feb 2008 21:15:14 +0000 (UTC) (envelope-from hselasky@freebsd.org) X-Cloudmark-Score: 0.000000 [] Received: from [85.19.218.18] (account mc467741@c2i.net [85.19.218.18] verified) by mailfe07.swip.net (CommuniGate Pro SMTP 5.1.13) with ESMTPA id 790384774; Sat, 02 Feb 2008 22:00:13 +0100 From: Hans Petter Selasky To: Alfred Perlstein Date: Sat, 2 Feb 2008 22:01:07 +0100 User-Agent: KMail/1.9.7 References: <200712020001.lB201XbN000811@repoman.freebsd.org> <200802020818.57037.hselasky@freebsd.org> <20080202121301.GY99258@elvis.mu.org> In-Reply-To: <20080202121301.GY99258@elvis.mu.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200802022201.08030.hselasky@freebsd.org> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 129920 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 21:15:16 -0000 On Saturday 02 February 2008, Alfred Perlstein wrote: > * Hans Petter Selasky [080201 23:18] wrote: > > On Saturday 02 February 2008, Alfred Perlstein wrote: > > > This change makes very little sense. If xfer->frbuffers is a bare > > > pointer, then why add 0 to it? Just pass xfer->frbuffers or use a > > > macro that explains what you are doing. > > > > I can change those to a plain "xfer->frlengths". It was just a reminder > > for me, because some places we use "xfer->frlengths + 1" and > > "xfer->frbuffers + 1". > > > > I will write a script that converts all of those. > > What does '+ 1' mean? Is it something special like a channel or something? > > If so it should be a macro that's more descriptive. Hi, "frlengths" and "frbuffers" simply make up an I/O-vector. Usually all elements go the same direction, either IN or OUT relative to the USB Host. The exception is control transfers. These usually have three parts: < DATA IN or OUT > < STATUS direction is opposite of DATA stage> < [frlengths and frbuffers] + 0> < [frlenghts and frbuffers] + 1> < the STATUS does not have any frlenghts or frbuffers entry > --HPS From owner-p4-projects@FreeBSD.ORG Sat Feb 2 22:21:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D18716A420; Sat, 2 Feb 2008 22:21:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3331916A419 for ; Sat, 2 Feb 2008 22:21:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 23B8F13C474 for ; Sat, 2 Feb 2008 22:21:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12ML6ol081968 for ; Sat, 2 Feb 2008 22:21:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12ML6ZF081965 for perforce@freebsd.org; Sat, 2 Feb 2008 22:21:06 GMT (envelope-from jb@freebsd.org) Date: Sat, 2 Feb 2008 22:21:06 GMT Message-Id: <200802022221.m12ML6ZF081965@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134675 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 22:21:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=134675 Change 134675 by jb@jb_freebsd1 on 2008/02/02 22:20:24 Handle the case where witness and invariants aren't in the kernel but the DTrace hooks are... we need the syscall names. Affected files ... .. //depot/projects/dtrace/src/sys/conf/files#68 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/files#68 (text+ko) ==== @@ -1526,7 +1526,7 @@ kern/sys_pipe.c standard kern/sys_process.c standard kern/sys_socket.c standard -kern/syscalls.c optional witness | invariants +kern/syscalls.c optional witness | invariants | kdtrace_hooks kern/sysv_ipc.c standard kern/sysv_msg.c optional sysvmsg kern/sysv_sem.c optional sysvsem From owner-p4-projects@FreeBSD.ORG Sat Feb 2 22:24:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7686016A420; Sat, 2 Feb 2008 22:24:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C45F16A41A for ; Sat, 2 Feb 2008 22:24:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2CA1D13C45B for ; Sat, 2 Feb 2008 22:24:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12MOAY4082057 for ; Sat, 2 Feb 2008 22:24:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12MO9VT082054 for perforce@freebsd.org; Sat, 2 Feb 2008 22:24:09 GMT (envelope-from jb@freebsd.org) Date: Sat, 2 Feb 2008 22:24:09 GMT Message-Id: <200802022224.m12MO9VT082054@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134676 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 22:24:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=134676 Change 134676 by jb@jb_freebsd1 on 2008/02/02 22:24:04 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/sys/i386/i386/trap.c#3 edit Differences ... ==== //depot/projects/dtrace7/src/sys/i386/i386/trap.c#3 (text+ko) ==== @@ -49,6 +49,7 @@ #include "opt_hwpmc_hooks.h" #include "opt_isa.h" #include "opt_kdb.h" +#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_npx.h" #include "opt_trap.h" @@ -102,6 +103,24 @@ #include #endif +#ifdef KDTRACE_HOOKS +#include + +/* + * This is a hook which is initialised by the dtrace module + * to handle traps which might occur during DTrace probe + * execution. + */ +dtrace_trap_func_t dtrace_trap_func; + +/* + * This is a hook which is initialised by the systrace module + * when it is loaded. This keeps the DTrace syscall provider + * implementation opaque. + */ +systrace_probe_func_t systrace_probe_func; +#endif + extern void trap(struct trapframe *frame); extern void syscall(struct trapframe *frame); @@ -219,6 +238,24 @@ goto out; #endif +#ifdef KDTRACE_HOOKS + /* + * A trap can occur while DTrace executes a probe. Before + * executing the probe, DTrace blocks re-scheduling and sets + * a flag in it's per-cpu flags to indicate that it doesn't + * want to fault. On returning from the the probe, the no-fault + * flag is cleared and finally re-scheduling is enabled. + * + * If the DTrace kernel module has registered a trap handler, + * call it and if it returns non-zero, assume that it has + * handled the trap and modified the trap frame so that this + * function can return normally. + */ + if (dtrace_trap_func != NULL) + if ((*dtrace_trap_func)(frame, type)) + goto out; +#endif + if ((frame->tf_eflags & PSL_I) == 0) { /* * Buggy application or kernel code has disabled @@ -1031,9 +1068,34 @@ PTRACESTOP_SC(p, td, S_PT_SCE); +#ifdef KDTRACE_HOOKS + /* + * If the systrace module has registered it's probe + * callback and if there is a probe active for the + * syscall 'entry', process the probe. + */ + if (systrace_probe_func != NULL && callp->sy_entry != 0) + (*systrace_probe_func)(callp->sy_entry, code, callp, + args); +#endif + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args); AUDIT_SYSCALL_EXIT(error, td); + + /* Save the latest error return value. */ + td->td_errno = error; + +#ifdef KDTRACE_HOOKS + /* + * If the systrace module has registered it's probe + * callback and if there is a probe active for the + * syscall 'return', process the probe. + */ + if (systrace_probe_func != NULL && callp->sy_return != 0) + (*systrace_probe_func)(callp->sy_return, code, callp, + args); +#endif } switch (error) { From owner-p4-projects@FreeBSD.ORG Sat Feb 2 22:27:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 110B116A41B; Sat, 2 Feb 2008 22:27:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B285C16A417 for ; Sat, 2 Feb 2008 22:27:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A2FA713C46A for ; Sat, 2 Feb 2008 22:27:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12MRDEF082204 for ; Sat, 2 Feb 2008 22:27:13 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12MRDQt082201 for perforce@freebsd.org; Sat, 2 Feb 2008 22:27:13 GMT (envelope-from jb@freebsd.org) Date: Sat, 2 Feb 2008 22:27:13 GMT Message-Id: <200802022227.m12MRDQt082201@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134677 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 22:27:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=134677 Change 134677 by jb@jb_freebsd1 on 2008/02/02 22:27:05 I prefer to have the probe arguments to a syscall return probe match the entry probe. This avoids having to probe and entry call and save stuff in local variables for use in the return probe. The error variable is saved in the thread structure anyway (and is on Solaris too -- the DTrace test suite checks that), so it doesn't been to be passed in as the return probe arguments when there are more useful things to pass. Affected files ... .. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#22 edit .. //depot/projects/dtrace/src/sys/i386/i386/trap.c#27 edit .. //depot/projects/dtrace7/src/sys/amd64/amd64/trap.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#22 (text+ko) ==== @@ -903,10 +903,6 @@ td->td_errno = error; #ifdef KDTRACE_HOOKS - /* Save the error return variable for DTrace to reference. */ - args[0] = error; - args[1] = error; - /* * If the systrace module has registered it's probe * callback and if there is a probe active for the ==== //depot/projects/dtrace/src/sys/i386/i386/trap.c#27 (text+ko) ==== @@ -1086,10 +1086,6 @@ td->td_errno = error; #ifdef KDTRACE_HOOKS - /* Save the error return variable for DTrace to reference. */ - args[0] = error; - args[1] = error; - /* * If the systrace module has registered it's probe * callback and if there is a probe active for the ==== //depot/projects/dtrace7/src/sys/amd64/amd64/trap.c#5 (text+ko) ==== @@ -903,10 +903,6 @@ td->td_errno = error; #ifdef KDTRACE_HOOKS - /* Save the error return variable for DTrace to reference. */ - args[0] = error; - args[1] = error; - /* * If the systrace module has registered it's probe * callback and if there is a probe active for the From owner-p4-projects@FreeBSD.ORG Sat Feb 2 22:43:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD2B916A420; Sat, 2 Feb 2008 22:43:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 762A916A41A for ; Sat, 2 Feb 2008 22:43:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6355413C458 for ; Sat, 2 Feb 2008 22:43:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12MhXou082918 for ; Sat, 2 Feb 2008 22:43:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12MhWvx082914 for perforce@freebsd.org; Sat, 2 Feb 2008 22:43:32 GMT (envelope-from jb@freebsd.org) Date: Sat, 2 Feb 2008 22:43:32 GMT Message-Id: <200802022243.m12MhWvx082914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134679 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 22:43:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=134679 Change 134679 by jb@jb_freebsd1 on 2008/02/02 22:43:10 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#17 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#5 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#21 integrate .. //depot/projects/dtrace/ports/UPDATING#50 integrate .. //depot/projects/dtrace/src/contrib/file/Magdir/bFLT#4 delete .. //depot/projects/dtrace/src/contrib/file/Magdir/chi#4 delete .. //depot/projects/dtrace/src/contrib/file/Magdir/cvs#4 delete .. //depot/projects/dtrace/src/contrib/file/Magdir/hdf#4 delete .. //depot/projects/dtrace/src/contrib/file/Magdir/impulse#4 delete .. //depot/projects/dtrace/src/contrib/file/Magdir/wordperfect#4 delete .. //depot/projects/dtrace/src/contrib/file/acconfig.h#4 delete .. //depot/projects/dtrace/src/contrib/file/magic.c#6 integrate .. //depot/projects/dtrace/src/contrib/file/missing#4 delete .. //depot/projects/dtrace/src/contrib/file/stamp-h.in#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#15 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/README#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#7 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#6 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#7 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.circlibdep.ksh#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.invalidlibdep.ksh#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdep.ksh#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepfullyconnected.ksh#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#6 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#6 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#6 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#6 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#6 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#6 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.c#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_INVAL.wrongdec4.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.nonprofile.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec1.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec2.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec3.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginexit.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.twoprof.d#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.twoprof.d.out#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#4 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 2 23:02:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38A6016A41B; Sat, 2 Feb 2008 23:02:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA26B16A419 for ; Sat, 2 Feb 2008 23:02:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A6DB213C43E for ; Sat, 2 Feb 2008 23:02:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12N2ts9083649 for ; Sat, 2 Feb 2008 23:02:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12N2tlI083646 for perforce@freebsd.org; Sat, 2 Feb 2008 23:02:55 GMT (envelope-from jb@freebsd.org) Date: Sat, 2 Feb 2008 23:02:55 GMT Message-Id: <200802022302.m12N2tlI083646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134680 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 23:02:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=134680 Change 134680 by jb@jb_freebsd1 on 2008/02/02 23:02:40 Add these files back again after the previous integration deleted them. I had originally integrated these file from //depot/projects/opensolaris which I've since decided to no longer use (and delete), causing p4 to want to delete these files... something I don't want. Hopefully this submit will do the trick. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/OPENSOLARIS.LICENSE#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#16 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/README#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#8 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#7 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#8 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.circlibdep.ksh#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.invalidlibdep.ksh#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdep.ksh#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepfullyconnected.ksh#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#7 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#7 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#7 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#7 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#7 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#7 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.c#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh#6 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_INVAL.wrongdec4.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.nonprofile.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec1.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec2.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec3.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginexit.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.twoprof.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.twoprof.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#5 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.aggrate.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.aggrate.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.statusrate.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.switchrate.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.switchrate.d.out#3 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.basename.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.caller.d#4 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.cleanpath.d#4 add >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 2 23:43:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 733C116A418; Sat, 2 Feb 2008 23:43:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38F0716A421 for ; Sat, 2 Feb 2008 23:43:40 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 27EA913C447 for ; Sat, 2 Feb 2008 23:43:40 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12NheuB087586 for ; Sat, 2 Feb 2008 23:43:40 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12NhdJ8087583 for perforce@freebsd.org; Sat, 2 Feb 2008 23:43:39 GMT (envelope-from cognet@freebsd.org) Date: Sat, 2 Feb 2008 23:43:39 GMT Message-Id: <200802022343.m12NhdJ8087583@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 134685 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 23:43:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=134685 Change 134685 by cognet@cognet-mips on 2008/02/02 23:43:29 Only clear the required bits from SR, instead of zeroing it, for Octeon, or we will lose KX and bad things happen. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#10 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#10 (text+ko) ==== @@ -258,6 +258,17 @@ #define SAVE_REG(reg, offs, base) \ STORE reg, STAND_ARG_SIZE + (RSIZE * offs) (base) +#ifdef TARGET_OCTEON +#define CLEAR_STATUS \ + mfc0 a0, COP_0_STATUS_REG ;\ + li a2, ~(SR_INT_ENAB | SR_EXL | SR_KSU_MASK) ;\ + and a0, a0, a2 ;\ + mtc0 a0, COP_0_STATUS_REG +#else +#define CLEAR_STATUS \ + mtc0 zero, COP_0_STATUS_REG +#endif + #define SAVE_CPU \ SAVE_REG(AT, AST, sp) ;\ SAVE_REG(v0, V0, sp) ;\ @@ -293,7 +304,7 @@ addu v0, sp, KERN_EXC_FRAME_SIZE ;\ SAVE_REG(v0, SP, sp) ;\ addu a0, sp, STAND_ARG_SIZE ;\ - mtc0 zero,COP_0_STATUS_REG ;\ + CLEAR_STATUS ;\ ITLBNOPFIX #ifdef DDB