PERFORCE change 135363 for review
John Birrell
jb at FreeBSD.org
Wed Feb 13 21:04:49 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=135363
Change 135363 by jb at jb_freebsd1 on 2008/02/14 05:04:17
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile#5 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/compiz-fusion/Makefile#1 branch
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml#1 branch
.. //depot/projects/dtrace/ports/LEGAL#34 integrate
.. //depot/projects/dtrace/ports/MOVED#66 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.xfce.mk#2 integrate
.. //depot/projects/dtrace/src/include/unistd.h#10 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/readlink.2#5 integrate
.. //depot/projects/dtrace/src/lib/libthr/arch/amd64/Makefile.inc#4 integrate
.. //depot/projects/dtrace/src/lib/libthr/arch/arm/Makefile.inc#4 integrate
.. //depot/projects/dtrace/src/lib/libthr/arch/arm/include/pthread_md.h#5 integrate
.. //depot/projects/dtrace/src/lib/libthr/arch/i386/Makefile.inc#4 integrate
.. //depot/projects/dtrace/src/lib/libthr/arch/ia64/Makefile.inc#4 integrate
.. //depot/projects/dtrace/src/lib/libthr/arch/powerpc/Makefile.inc#4 integrate
.. //depot/projects/dtrace/src/lib/libthr/arch/sparc64/Makefile.inc#4 integrate
.. //depot/projects/dtrace/src/lib/libthr/arch/sparc64/include/pthread_md.h#5 integrate
.. //depot/projects/dtrace/src/lib/msun/Makefile#11 integrate
.. //depot/projects/dtrace/src/lib/msun/amd64/Makefile.inc#6 integrate
.. //depot/projects/dtrace/src/lib/msun/amd64/e_remainder.S#1 branch
.. //depot/projects/dtrace/src/lib/msun/amd64/e_remainderf.S#1 branch
.. //depot/projects/dtrace/src/lib/msun/ld128/s_exp2l.c#3 integrate
.. //depot/projects/dtrace/src/lib/msun/ld80/s_exp2l.c#3 integrate
.. //depot/projects/dtrace/src/lib/msun/src/e_remainder.c#4 integrate
.. //depot/projects/dtrace/src/lib/msun/src/e_remainderf.c#4 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_ceill.c#4 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_exp2.c#7 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_exp2f.c#9 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_floorl.c#4 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_truncl.c#5 integrate
.. //depot/projects/dtrace/src/lib/ncurses/ncurses/Makefile#6 integrate
.. //depot/projects/dtrace/src/sbin/mount_nfs/mount_nfs.8#6 integrate
.. //depot/projects/dtrace/src/share/man/man4/hptrr.4#3 integrate
.. //depot/projects/dtrace/src/share/man/man4/mxge.4#6 integrate
.. //depot/projects/dtrace/src/share/man/man9/Makefile#26 integrate
.. //depot/projects/dtrace/src/share/man/man9/lock.9#10 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/busdma_machdep.c#9 integrate
.. //depot/projects/dtrace/src/sys/cam/cam_periph.c#7 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#20 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#20 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#20 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#20 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#20 integrate
.. //depot/projects/dtrace/src/sys/conf/files#70 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_cpu.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/if_mxge.c#13 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/if_mxge_var.h#8 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/mxge_lro.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/rss_eth_z8e.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/rss_ethp_z8e.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/sk/if_sk.c#16 integrate
.. //depot/projects/dtrace/src/sys/dev/sk/if_skreg.h#11 integrate
.. //depot/projects/dtrace/src/sys/dev/syscons/syscons.h#8 integrate
.. //depot/projects/dtrace/src/sys/dev/twe/twe.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdi.c#9 integrate
.. //depot/projects/dtrace/src/sys/fs/coda/cnode.h#4 integrate
.. //depot/projects/dtrace/src/sys/fs/coda/coda_namecache.c#3 delete
.. //depot/projects/dtrace/src/sys/fs/coda/coda_namecache.h#4 delete
.. //depot/projects/dtrace/src/sys/fs/coda/coda_psdev.c#5 integrate
.. //depot/projects/dtrace/src/sys/fs/coda/coda_subr.c#4 integrate
.. //depot/projects/dtrace/src/sys/fs/coda/coda_subr.h#3 integrate
.. //depot/projects/dtrace/src/sys/fs/coda/coda_vnops.c#8 integrate
.. //depot/projects/dtrace/src/sys/fs/coda/coda_vnops.h#4 integrate
.. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_subr.c#7 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#5 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/busdma_machdep.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/init_sysent.c#21 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_lock.c#19 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_module.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_mutex.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_sleepqueue.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/syscalls.c#20 integrate
.. //depot/projects/dtrace/src/sys/kern/syscalls.master#18 integrate
.. //depot/projects/dtrace/src/sys/kern/systrace_args.c#16 integrate
.. //depot/projects/dtrace/src/sys/kern/sysv_shm.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#19 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#20 integrate
.. //depot/projects/dtrace/src/sys/modules/coda/Makefile#5 integrate
.. //depot/projects/dtrace/src/sys/modules/coda5/Makefile#5 integrate
.. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#25 edit
.. //depot/projects/dtrace/src/sys/modules/dtrace/dtmalloc/Makefile#1 add
.. //depot/projects/dtrace/src/sys/net/route.c#13 integrate
.. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vnops.c#10 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_socket.c#16 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_subs.c#12 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vnops.c#14 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfsm_subs.h#4 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/machdep.c#4 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/ofw_machdep.c#4 integrate
.. //depot/projects/dtrace/src/sys/powerpc/conf/NOTES#12 integrate
.. //depot/projects/dtrace/src/sys/powerpc/include/intr_machdep.h#5 integrate
.. //depot/projects/dtrace/src/sys/powerpc/include/openpicreg.h#4 integrate
.. //depot/projects/dtrace/src/sys/powerpc/include/openpicvar.h#5 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powermac/hrowpic.c#6 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powermac/openpic_macio.c#5 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/intr_machdep.c#8 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/openpic.c#6 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/pic_if.m#5 integrate
.. //depot/projects/dtrace/src/sys/powerpc/psim/openpic_iobus.c#5 integrate
.. //depot/projects/dtrace/src/sys/sys/buf.h#9 integrate
.. //depot/projects/dtrace/src/sys/sys/ipc.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/lock.h#9 integrate
.. //depot/projects/dtrace/src/sys/sys/lockmgr.h#15 integrate
.. //depot/projects/dtrace/src/sys/sys/malloc.h#5 edit
.. //depot/projects/dtrace/src/sys/sys/module.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#40 integrate
.. //depot/projects/dtrace/src/sys/sys/shm.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.h#19 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.mk#19 integrate
.. //depot/projects/dtrace/src/sys/sys/syscallsubr.h#10 integrate
.. //depot/projects/dtrace/src/sys/sys/sysproto.h#19 integrate
.. //depot/projects/dtrace/src/usr.sbin/portsnap/phttpget/phttpget.c#7 integrate
.. //depot/projects/dtrace/www/en/docs/books.sgml#11 integrate
.. //depot/projects/dtrace/www/en/gifs/Makefile#7 integrate
.. //depot/projects/dtrace/www/en/gifs/freebsd-basics-cover-front-145.png#1 branch
.. //depot/projects/dtrace/www/en/publish.sgml#8 integrate
.. //depot/projects/dtrace/www/en/releases/7.0R/schedule.sgml#12 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#39 integrate
.. //depot/projects/dtrace/www/share/sgml/release.ent#19 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.53 2006/10/23 15:07:00 yar Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.54 2008/02/12 07:25:23 gabor Exp $
SUBDIR =
SUBDIR+= 5-roadmap
@@ -7,6 +7,7 @@
SUBDIR+= casestudy-argentina.com
SUBDIR+= checkpoint
SUBDIR+= committers-guide
+SUBDIR+= compiz-fusion
SUBDIR+= console-server
SUBDIR+= contributing
SUBDIR+= contributing-ports
==== //depot/projects/dtrace/ports/LEGAL#34 (text+ko) ====
@@ -1,5 +1,5 @@
# Creator: Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.565 2008/02/09 02:01:05 tabthorpe Exp $
+# $FreeBSD: ports/LEGAL,v 1.566 2008/02/13 21:16:26 arved Exp $
**********************************************************************
*** NOTE TO COMMITTERS ***
@@ -364,6 +364,7 @@
jsdk20-solaris2-sparc* java/jsdk No commercial use
jude-community-*.zip devel/jude-community License restrictions
kaffe-* java/kaffe Restrictive copyright
+komodo-* editors/komodo-edit Distribution not permitted
KASH3-* math/kash3 Not for commercial
distribution or use
KDE/ICONS-* x11-themes/kde-icons-* Unclear about licensing
==== //depot/projects/dtrace/ports/MOVED#66 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1536 2008/02/10 23:14:07 alepulver Exp $
+# $FreeBSD: ports/MOVED,v 1.1538 2008/02/13 14:57:31 sat Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -3361,3 +3361,6 @@
net/cactid|net-mgmt/cacti-spine|2008-01-27|project was renamed
x11-wm/wmii-devel|x11-wm/wmii|2008-01-29|Development version no longer necessary
devel/wxGlade-devel||2008-02-11|Has expired: has been the same version as wxGlade for a long time; use it instead
+sysutils/sge|sysutils/sge60|2008-02-12|Splitting into 6.0 and 6.1 versions
+mail/linux-netscape-messenger|mail/thunderbird|2008-02-13|Abandoned by AOL
+www/linux-netscape-navigator|www/firefox|2008-02-13|Abandoned by AOL
==== //depot/projects/dtrace/ports/Mk/bsd.xfce.mk#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: ports/Mk/bsd.xfce.mk,v 1.2 2007/04/11 16:26:45 oliver Exp $
+# $FreeBSD: ports/Mk/bsd.xfce.mk,v 1.3 2008/02/12 18:10:56 oliver Exp $
#
.if !defined(_POSTMKINCLUDED) && !defined(Xfce_Pre_Include)
@@ -15,33 +15,33 @@
_USE_XFCE_ALL= configenv libexo libgui libutil libmcs mcsmanager panel \
thunar wm xfdev
-MASTER_SITE_SUBDIR?= xfce-4.4.1
+MASTER_SITE_SUBDIR?= xfce-4.4.2
configenv_CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
-libexo_BUILD_DEPENDS= libexo>=0.3.2:${PORTSDIR}/x11/libexo
-libexo_RUN_DEPENDS= libexo>=0.3.2:${PORTSDIR}/x11/libexo
+libexo_BUILD_DEPENDS= libexo>=0.3.4:${PORTSDIR}/x11/libexo
+libexo_RUN_DEPENDS= libexo>=0.3.4:${PORTSDIR}/x11/libexo
-libgui_BUILD_DEPENDS= libxfce4gui>=4.4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
-libgui_RUN_DEPENDS= libxfce4gui>=4.4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+libgui_BUILD_DEPENDS= libxfce4gui>=4.4.2:${PORTSDIR}/x11-toolkits/libxfce4gui
+libgui_RUN_DEPENDS= libxfce4gui>=4.4.2:${PORTSDIR}/x11-toolkits/libxfce4gui
-libutil_BUILD_DEPENDS= libxfce4util>=4.4.1:${PORTSDIR}/x11/libxfce4util
-libutil_RUN_DEPENDS= libxfce4util>=4.4.1:${PORTSDIR}/x11/libxfce4util
+libutil_BUILD_DEPENDS= libxfce4util>=4.4.2:${PORTSDIR}/x11/libxfce4util
+libutil_RUN_DEPENDS= libxfce4util>=4.4.2:${PORTSDIR}/x11/libxfce4util
-libmcs_BUILD_DEPENDS= libxfce4mcs>=4.4.1:${PORTSDIR}/x11/libxfce4mcs
-libmcs_RUN_DEPENDS= libxfce4mcs>=4.4.1:${PORTSDIR}/x11/libxfce4mcs
+libmcs_BUILD_DEPENDS= libxfce4mcs>=4.4.2:${PORTSDIR}/x11/libxfce4mcs
+libmcs_RUN_DEPENDS= libxfce4mcs>=4.4.2:${PORTSDIR}/x11/libxfce4mcs
-mcsmanager_BUILD_DEPENDS= xfce4-mcs-manager>=4.4.1:${PORTSDIR}/sysutils/xfce4-mcs-manager
-mcsmanager_RUN_DEPENDS= xfce4-mcs-manager>=4.4.1:${PORTSDIR}/sysutils/xfce4-mcs-manager
+mcsmanager_BUILD_DEPENDS= xfce4-mcs-manager>=4.4.2:${PORTSDIR}/sysutils/xfce4-mcs-manager
+mcsmanager_RUN_DEPENDS= xfce4-mcs-manager>=4.4.2:${PORTSDIR}/sysutils/xfce4-mcs-manager
-panel_BUILD_DEPENDS= xfce4-panel>=4.4.1:${PORTSDIR}/x11-wm/xfce4-panel
-panel_RUN_DEPENDS= xfce4-panel>=4.4.1:${PORTSDIR}/x11-wm/xfce4-panel
+panel_BUILD_DEPENDS= xfce4-panel>=4.4.2:${PORTSDIR}/x11-wm/xfce4-panel
+panel_RUN_DEPENDS= xfce4-panel>=4.4.2:${PORTSDIR}/x11-wm/xfce4-panel
-thunar_BUILD_DEPENDS= Thunar>=0.8.0:${PORTSDIR}/x11-fm/thunar
-thunar_RUN_DEPENDS= Thunar>=0.8.0:${PORTSDIR}/x11-fm/thunar
+thunar_BUILD_DEPENDS= Thunar>=0.9.0:${PORTSDIR}/x11-fm/thunar
+thunar_RUN_DEPENDS= Thunar>=0.9.0:${PORTSDIR}/x11-fm/thunar
-wm_BUILD_DEPENDS= xfce4-wm>=4.4.1:${PORTSDIR}/x11-wm/xfce4-wm
-wm_RUN_DEPENDS= xfce4-wm>=4.4.1:${PORTSDIR}/x11-wm/xfce4-wm
+wm_BUILD_DEPENDS= xfce4-wm>=4.4.2:${PORTSDIR}/x11-wm/xfce4-wm
+wm_RUN_DEPENDS= xfce4-wm>=4.4.2:${PORTSDIR}/x11-wm/xfce4-wm
xfdev_RUN_DEPENDS= xfce4-dev-tools:${PORTSDIR}/devel/xfce4-dev-tools
==== //depot/projects/dtrace/src/include/unistd.h#10 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)unistd.h 8.12 (Berkeley) 4/27/95
- * $FreeBSD: src/include/unistd.h,v 1.82 2008/01/18 08:48:32 davidxu Exp $
+ * $FreeBSD: src/include/unistd.h,v 1.83 2008/02/12 20:09:03 ru Exp $
*/
#ifndef _UNISTD_H_
@@ -405,7 +405,7 @@
/* 1003.1-2001 */
#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
int fchown(int, uid_t, gid_t);
-int readlink(const char *, char *, int);
+ssize_t readlink(const char *, char *, size_t);
#endif
#if __POSIX_VISIBLE >= 200112
int gethostname(char *, size_t);
==== //depot/projects/dtrace/src/lib/libc/sys/readlink.2#5 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)readlink.2 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/sys/readlink.2,v 1.14 2007/01/09 00:28:15 imp Exp $
+.\" $FreeBSD: src/lib/libc/sys/readlink.2,v 1.15 2008/02/12 20:09:03 ru Exp $
.\"
-.Dd June 4, 1993
+.Dd February 12, 2008
.Dt READLINK 2
.Os
.Sh NAME
@@ -38,8 +38,8 @@
.Lb libc
.Sh SYNOPSIS
.In unistd.h
-.Ft int
-.Fn readlink "const char *path" "char *buf" "int bufsiz"
+.Ft ssize_t
+.Fn readlink "const char *path" "char *buf" "size_t bufsiz"
.Sh DESCRIPTION
The
.Fn readlink
@@ -58,7 +58,7 @@
.Fa buf .
.Sh RETURN VALUES
The call returns the count of characters placed in the buffer
-if it succeeds, or a -1 if an error occurs, placing the error
+if it succeeds, or a \-1 if an error occurs, placing the error
code in the global variable
.Va errno .
.Sh ERRORS
==== //depot/projects/dtrace/src/lib/libthr/arch/amd64/Makefile.inc#4 (text+ko) ====
@@ -1,5 +1,5 @@
-#$FreeBSD: src/lib/libthr/arch/amd64/Makefile.inc,v 1.2 2005/04/02 01:19:57 davidxu Exp $
+#$FreeBSD: src/lib/libthr/arch/amd64/Makefile.inc,v 1.3 2008/02/13 05:25:42 obrien Exp $
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
SRCS+= pthread_md.c
==== //depot/projects/dtrace/src/lib/libthr/arch/arm/Makefile.inc#4 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/lib/libthr/arch/arm/Makefile.inc,v 1.2 2005/04/07 22:06:05 cognet Exp $
+# $FreeBSD: src/lib/libthr/arch/arm/Makefile.inc,v 1.3 2008/02/13 05:25:42 obrien Exp $
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
SRCS+= pthread_md.c
==== //depot/projects/dtrace/src/lib/libthr/arch/arm/include/pthread_md.h#5 (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/lib/libthr/arch/arm/include/pthread_md.h,v 1.4 2006/12/15 11:52:00 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/arch/arm/include/pthread_md.h,v 1.5 2008/02/13 05:12:04 obrien Exp $
*/
/*
@@ -43,9 +43,9 @@
* Variant II tcb, first two members are required by rtld.
*/
struct tcb {
- struct tcb *tcb_self; /* required by rtld */
- void *tcb_dtv; /* required by rtld */
- struct pthread *tcb_thread; /* our hook */
+ struct tcb *tcb_self; /* required by rtld */
+ void *tcb_dtv; /* required by rtld */
+ struct pthread *tcb_thread; /* our hook */
void *tcb_spare[1];
};
==== //depot/projects/dtrace/src/lib/libthr/arch/i386/Makefile.inc#4 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/lib/libthr/arch/i386/Makefile.inc,v 1.2 2005/04/02 01:19:58 davidxu Exp $
+# $FreeBSD: src/lib/libthr/arch/i386/Makefile.inc,v 1.3 2008/02/13 05:25:43 obrien Exp $
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
SRCS+= pthread_md.c
==== //depot/projects/dtrace/src/lib/libthr/arch/ia64/Makefile.inc#4 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/lib/libthr/arch/ia64/Makefile.inc,v 1.2 2005/04/02 01:19:58 davidxu Exp $
+# $FreeBSD: src/lib/libthr/arch/ia64/Makefile.inc,v 1.3 2008/02/13 05:25:43 obrien Exp $
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
SRCS+= pthread_md.c
==== //depot/projects/dtrace/src/lib/libthr/arch/powerpc/Makefile.inc#4 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/lib/libthr/arch/powerpc/Makefile.inc,v 1.2 2005/04/02 01:19:59 davidxu Exp $
+# $FreeBSD: src/lib/libthr/arch/powerpc/Makefile.inc,v 1.3 2008/02/13 05:25:43 obrien Exp $
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
SRCS+= pthread_md.c
==== //depot/projects/dtrace/src/lib/libthr/arch/sparc64/Makefile.inc#4 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/lib/libthr/arch/sparc64/Makefile.inc,v 1.3 2005/04/02 01:19:59 davidxu Exp $
+# $FreeBSD: src/lib/libthr/arch/sparc64/Makefile.inc,v 1.4 2008/02/13 05:25:43 obrien Exp $
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
SRCS+= pthread_md.c
==== //depot/projects/dtrace/src/lib/libthr/arch/sparc64/include/pthread_md.h#5 (text+ko) ====
@@ -24,7 +24,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/lib/libthr/arch/sparc64/include/pthread_md.h,v 1.2 2006/12/15 11:52:01 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/arch/sparc64/include/pthread_md.h,v 1.3 2008/02/13 05:12:05 obrien Exp $
*/
/*
@@ -44,9 +44,9 @@
* %g7 points to the structure.
*/
struct tcb {
- struct tcb *tcb_self; /* required by rtld */
- void *tcb_dtv; /* required by rtld */
- struct pthread *tcb_thread; /* our hook */
+ struct tcb *tcb_self; /* required by rtld */
+ void *tcb_dtv; /* required by rtld */
+ struct pthread *tcb_thread; /* our hook */
void *tcb_spare[1];
};
==== //depot/projects/dtrace/src/lib/msun/Makefile#11 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 5.1beta 93/09/24
-# $FreeBSD: src/lib/msun/Makefile,v 1.86 2008/01/18 21:43:10 das Exp $
+# $FreeBSD: src/lib/msun/Makefile,v 1.87 2008/02/13 16:56:52 bde Exp $
#
# ====================================================
# Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
@@ -46,12 +46,12 @@
k_cos.c k_cosf.c k_rem_pio2.c k_sin.c k_sinf.c \
k_tan.c k_tanf.c \
s_asinh.c s_asinhf.c s_atan.c s_atanf.c s_carg.c s_cargf.c \
- s_cbrt.c s_cbrtf.c s_ceil.c s_ceilf.c s_ceill.c \
+ s_cbrt.c s_cbrtf.c s_ceil.c s_ceilf.c \
s_copysign.c s_copysignf.c s_cos.c s_cosf.c \
s_csqrt.c s_csqrtf.c s_erf.c s_erff.c \
s_exp2.c s_exp2f.c s_expm1.c s_expm1f.c s_fabsf.c s_fdim.c \
s_finite.c s_finitef.c \
- s_floor.c s_floorf.c s_floorl.c s_fma.c s_fmaf.c \
+ s_floor.c s_floorf.c s_fma.c s_fmaf.c \
s_fmax.c s_fmaxf.c s_fmaxl.c s_fmin.c \
s_fminf.c s_fminl.c s_frexp.c s_frexpf.c s_ilogb.c s_ilogbf.c \
s_ilogbl.c s_isfinite.c s_isnan.c s_isnormal.c \
@@ -62,8 +62,8 @@
s_nexttowardf.c s_remquo.c s_remquof.c \
s_rint.c s_rintf.c s_round.c s_roundf.c s_roundl.c \
s_scalbln.c s_scalbn.c s_scalbnf.c s_signbit.c \
- s_signgam.c s_significand.c s_significandf.c s_sin.c s_sinf.c s_tan.c \
- s_tanf.c s_tanh.c s_tanhf.c s_trunc.c s_truncf.c s_truncl.c \
+ s_signgam.c s_significand.c s_significandf.c s_sin.c s_sinf.c \
+ s_tan.c s_tanf.c s_tanh.c s_tanhf.c s_trunc.c s_truncf.c \
w_cabs.c w_cabsf.c w_drem.c w_dremf.c
# Location of fpmath.h and _fpmath.h
@@ -78,8 +78,9 @@
COMMON_SRCS+= s_copysignl.c s_fabsl.c s_llrintl.c s_lrintl.c s_modfl.c
.if ${LDBL_PREC} != 53
# If long double != double use these; otherwise, we alias the double versions.
-COMMON_SRCS+= s_exp2l.c s_fmal.c s_frexpl.c s_logbl.c s_nanl.c \
- s_nextafterl.c s_nexttoward.c s_rintl.c s_scalbnl.c
+COMMON_SRCS+= s_ceill.c s_exp2l.c s_floorl.c s_fmal.c s_frexpl.c \
+ s_logbl.c s_nanl.c s_nextafterl.c s_nexttoward.c s_rintl.c \
+ s_scalbnl.c s_truncl.c
.endif
# C99 complex functions
==== //depot/projects/dtrace/src/lib/msun/amd64/Makefile.inc#6 (text+ko) ====
@@ -1,7 +1,8 @@
-# $FreeBSD: src/lib/msun/amd64/Makefile.inc,v 1.7 2008/01/14 02:12:07 das Exp $
+# $FreeBSD: src/lib/msun/amd64/Makefile.inc,v 1.8 2008/02/13 06:01:48 bde Exp $
ARCH_SRCS = e_sqrt.S e_sqrtf.S s_llrint.S s_llrintf.S s_llrintl.S \
s_logbl.S s_lrint.S s_lrintf.S s_lrintl.S \
- s_remquo.S s_remquof.S s_rintl.S s_scalbn.S s_scalbnf.S s_scalbnl.S
+ e_remainder.S e_remainderf.S s_remquo.S s_remquof.S \
+ s_rintl.S s_scalbn.S s_scalbnf.S s_scalbnl.S
LDBL_PREC = 64
SYM_MAPS += ${.CURDIR}/amd64/Symbol.map
==== //depot/projects/dtrace/src/lib/msun/ld128/s_exp2l.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/ld128/s_exp2l.c,v 1.2 2008/02/07 03:17:05 bde Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/ld128/s_exp2l.c,v 1.3 2008/02/13 10:44:44 bde Exp $");
#include <float.h>
#include <stdint.h>
@@ -371,7 +371,7 @@
if (u.xbits.manh != 0
|| u.xbits.manl != 0
|| (hx & 0x8000) == 0)
- return (x); /* x is NaN or +Inf */
+ return (x + x); /* x is NaN or +Inf */
else
return (0.0); /* x is -Inf */
}
==== //depot/projects/dtrace/src/lib/msun/ld80/s_exp2l.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/ld80/s_exp2l.c,v 1.2 2008/02/07 03:17:05 bde Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/ld80/s_exp2l.c,v 1.3 2008/02/13 10:44:44 bde Exp $");
#include <float.h>
#include <stdint.h>
@@ -226,7 +226,7 @@
if (ix >= BIAS + 14) { /* |x| >= 16384 or x is NaN */
if (ix == BIAS + LDBL_MAX_EXP) {
if (u.xbits.man != 1ULL << 63 || (hx & 0x8000) == 0)
- return (x); /* x is NaN or +Inf */
+ return (x + x); /* x is +Inf or NaN */
else
return (0.0); /* x is -Inf */
}
==== //depot/projects/dtrace/src/lib/msun/src/e_remainder.c#4 (text+ko) ====
@@ -11,9 +11,8 @@
* ====================================================
*/
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_remainder.c,v 1.10 2005/02/04 18:26:06 das Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_remainder.c,v 1.11 2008/02/12 17:11:36 bde Exp $");
/* __ieee754_remainder(x,p)
* Return :
@@ -48,7 +47,7 @@
if((hx>=0x7ff00000)|| /* x not finite */
((hp>=0x7ff00000)&& /* p is NaN */
(((hp-0x7ff00000)|lp)!=0)))
- return (x*p)/(x*p);
+ return ((long double)x*p)/((long double)x*p);
if (hp<=0x7fdfffff) x = __ieee754_fmod(x,p+p); /* now x < 2p */
@@ -68,6 +67,7 @@
}
}
GET_HIGH_WORD(hx,x);
+ if ((hx&0x7fffffff)==0) hx = 0;
SET_HIGH_WORD(x,hx^sx);
return x;
}
==== //depot/projects/dtrace/src/lib/msun/src/e_remainderf.c#4 (text+ko) ====
@@ -13,9 +13,8 @@
* ====================================================
*/
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_remainderf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_remainderf.c,v 1.8 2008/02/12 17:11:36 bde Exp $");
#include "math.h"
#include "math_private.h"
@@ -40,7 +39,7 @@
if(hp==0) return (x*p)/(x*p); /* p = 0 */
if((hx>=0x7f800000)|| /* x not finite */
((hp>0x7f800000))) /* p is NaN */
- return (x*p)/(x*p);
+ return ((long double)x*p)/((long double)x*p);
if (hp<=0x7effffff) x = __ieee754_fmodf(x,p+p); /* now x < 2p */
@@ -60,6 +59,7 @@
}
}
GET_FLOAT_WORD(hx,x);
+ if ((hx&0x7fffffff)==0) hx = 0;
SET_FLOAT_WORD(x,hx^sx);
return x;
}
==== //depot/projects/dtrace/src/lib/msun/src/s_ceill.c#4 (text+ko) ====
@@ -11,9 +11,8 @@
* From: @(#)s_ceil.c 5.1 93/09/24
*/
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceill.c,v 1.4 2005/04/28 19:45:55 stefanf Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_ceill.c,v 1.8 2008/02/13 18:16:43 bde Exp $");
/*
* ceill(x)
@@ -63,7 +62,7 @@
if (huge + x > 0.0)
if (u.bits.exp > 0 ||
(u.bits.manh | u.bits.manl) != 0)
- u.e = u.bits.sign ? 0.0 : 1.0;
+ u.e = u.bits.sign ? -0.0 : 1.0;
} else {
uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1);
if (((u.bits.manh & m) | u.bits.manl) == 0)
@@ -100,3 +99,7 @@
}
return (u.e);
}
+
+#if LDBL_MANT_DIG == 53
+__weak_reference(ceil, ceill);
+#endif
==== //depot/projects/dtrace/src/lib/msun/src/s_exp2.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2.c,v 1.5 2008/02/07 03:17:05 bde Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2.c,v 1.6 2008/02/13 10:44:44 bde Exp $");
#include <float.h>
@@ -351,7 +351,7 @@
if(ix >= 0x7ff00000) {
GET_LOW_WORD(lx,x);
if(((ix & 0xfffff) | lx) != 0 || (hx & 0x80000000) == 0)
- return (x); /* x is NaN or +Inf */
+ return (x + x); /* x is NaN or +Inf */
else
return (0.0); /* x is -Inf */
}
==== //depot/projects/dtrace/src/lib/msun/src/s_exp2f.c#9 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2f.c,v 1.6 2008/02/11 05:20:02 bde Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2f.c,v 1.8 2008/02/13 10:44:44 bde Exp $");
#include <float.h>
@@ -93,7 +93,7 @@
float
exp2f(float x)
{
- double tv, twopk, z;
+ double tv, twopk, u, z;
float t;
uint32_t hx, htv, ix, i0;
int32_t k;
@@ -104,7 +104,7 @@
if(ix >= 0x43000000) { /* |x| >= 128 */
if(ix >= 0x7f800000) {
if ((ix & 0x7fffff) != 0 || (hx & 0x80000000) == 0)
- return (x); /* x is NaN or +Inf */
+ return (x + x); /* x is NaN or +Inf */
else
return (0.0); /* x is -Inf */
}
@@ -124,12 +124,13 @@
i0 &= TBLSIZE - 1;
t -= redux;
z = x - t;
+ INSERT_WORDS(twopk, 0x3ff00000 + k, 0);
/* Compute r = exp2(y) = exp2ft[i0] * p(z). */
tv = exp2ft[i0];
- tv = tv + tv * (z * (P1 + z * (P2 + z * (P3 + z * P4))));
+ u = tv * z;
+ tv = tv + u * (P1 + z * P2) + u * (z * z) * (P3 + z * P4);
/* Scale by 2**(k>>20). */
- INSERT_WORDS(twopk, 0x3ff00000 + k, 0);
return (tv * twopk);
}
==== //depot/projects/dtrace/src/lib/msun/src/s_floorl.c#4 (text+ko) ====
@@ -11,9 +11,8 @@
* From: @(#)s_floor.c 5.1 93/09/24
*/
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floorl.c,v 1.4 2005/04/28 19:45:55 stefanf Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_floorl.c,v 1.7 2008/02/13 18:16:43 bde Exp $");
/*
* floorl(x)
@@ -100,3 +99,7 @@
}
return (u.e);
}
+
+#if LDBL_MANT_DIG == 53
+__weak_reference(floor, floorl);
+#endif
==== //depot/projects/dtrace/src/lib/msun/src/s_truncl.c#5 (text+ko) ====
@@ -11,9 +11,8 @@
* From: @(#)s_floor.c 5.1 93/09/24
*/
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_truncl.c,v 1.5 2008/02/08 01:45:52 bde Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_truncl.c,v 1.8 2008/02/13 18:16:43 bde Exp $");
/*
* truncl(x)
@@ -67,3 +66,7 @@
}
return (u.e);
}
+
+#if LDBL_MANT_DIG == 53
+__weak_reference(trunc, truncl);
+#endif
==== //depot/projects/dtrace/src/lib/ncurses/ncurses/Makefile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/ncurses/ncurses/Makefile,v 1.95 2008/02/11 13:39:36 rafan Exp $
+# $FreeBSD: src/lib/ncurses/ncurses/Makefile,v 1.96 2008/02/13 14:34:39 rafan Exp $
SHLIBDIR?= /lib
@@ -841,7 +841,6 @@
curs_terminfo.3 tigetnum.3 \
curs_terminfo.3 tigetstr.3 \
curs_terminfo.3 tparm.3 \
- curs_terminfo.3 tputs.3 \
curs_terminfo.3 vid_attr.3 \
curs_terminfo.3 vid_puts.3 \
curs_terminfo.3 vidattr.3 \
==== //depot/projects/dtrace/src/sbin/mount_nfs/mount_nfs.8#6 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95
-.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.48 2008/02/11 23:23:21 kris Exp $
+.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.50 2008/02/12 09:24:11 ceri Exp $
.\"
-.Dd December 25, 2005
+.Dd February 11, 2008
.Dt MOUNT_NFS 8
.Os
.Sh NAME
@@ -36,7 +36,7 @@
.Nd mount NFS file systems
.Sh SYNOPSIS
.Nm
-.Op Fl 23bcdiLlNPsTU
+.Op Fl 234bcdiLlNPsTU
.Op Fl a Ar maxreadahead
.Op Fl D Ar deadthresh
.Op Fl g Ar maxgroups
==== //depot/projects/dtrace/src/share/man/man4/hptrr.4#3 (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/share/man/man4/hptrr.4,v 1.2 2008/02/06 03:30:13 scottl Exp $
+.\" $FreeBSD: src/share/man/man4/hptrr.4,v 1.3 2008/02/13 18:32:44 brueffer Exp $
.\"
.Dd December 14, 2007
.Dt HPTRR 4
@@ -108,7 +108,7 @@
The
.Nm
device driver first appeared in
-.Fx 5.3 .
+.Fx 6.3 .
.Sh AUTHORS
.An -nosplit
The
==== //depot/projects/dtrace/src/share/man/man4/mxge.4#6 (text+ko) ====
@@ -29,9 +29,9 @@
.\"
.\" * Other names and brands may be claimed as the property of others.
.\"
-.\" $FreeBSD: src/share/man/man4/mxge.4,v 1.8 2008/01/04 12:55:54 gabor Exp $
+.\" $FreeBSD: src/share/man/man4/mxge.4,v 1.9 2008/02/13 08:09:55 brueffer Exp $
.\"
-.Dd September 15, 2006
+.Dd February 13, 2008
.Dt MXGE 4
.Os
.Sh NAME
@@ -53,6 +53,8 @@
if_mxge_load="YES"
mxge_ethp_z8e_load="YES"
mxge_eth_z8e_load="YES"
+mxge_rss_ethp_z8e_load="YES"
+mxge_rss_eth_z8e_load="YES"
.Ed
.Sh DESCRIPTION
The
@@ -60,7 +62,8 @@
driver provides support for PCI Express 10 Gigabit Ethernet adapters based on
the Myricom LANai Z8E chip.
The driver supports Transmit/Receive checksum offload,
-Jumbo Frames as well as TCP segmentation offload (TSO).
+Jumbo Frames, TCP segmentation offload (TSO) as well
+as Large Receive Offload (LRO).
For further hardware information, see
.Pa http://www.myri.com/ .
.Pp
@@ -106,12 +109,44 @@
The default value is 30.
.It Va hw.mxge.skip_pio_read
This value determines whether or not the driver may omit doing a
-pio read in the interrupt handler which ensures that the interrupt
+PIO read in the interrupt handler which ensures that the interrupt
line has been deasserted when using xPIC interrupts.
A non-zero value
may result in lower CPU overhead, however it may also result in
spurious interrupts.
The default value is 0.
+This tunable has no effect when the device is
+using MSI or MSI-X interrupts.
+.It Va hw.mxge.max_slices
+This value determines the maximum number of slices the driver
+will attempt to use.
+The default value is 1.
+A slice is comprised
+of a set of receive queues and an associated interrupt thread.
+When using multiple slices, the NIC hashes traffic to different slices
+based on the value of
+.Va hw.mxge.rss_hash_type .
+Using multiple slices requires that your motherboard and Myri10GE NIC
+both be capable of MSI-X.
+Older Myri10GE NICs can be field upgraded to add
+MSI-X using the "10G NIC Tool Kit" for FreeBSD which is available from
+.Pa http://www.myri.com/scs/download-10g-tools.html .
+.Pp
+.It Va hw.mxge.rss_hash_type
+This value determines how incoming traffic is steered to different
+slices.
+This tunable is ignored when using just a single slice.
+The legal values for this tunable are:
+.Bl -tag -width "XXXX"
+.It 1
+Hash on the source and destination IPv4 addresses.
+.It 2
+Hash on source and destination IPv4 addresses and if the packet
+is TCP, then also hash on the TCP source and destination ports.
+.It 4
+Hash on the TCP or UDP source ports.
+This is the default value.
+.El
.El
.Sh DIAGNOSTICS
.Bl -diag
@@ -121,7 +156,8 @@
A fatal initialization error has occurred.
.It "mxge%d: Could not find firmware image %s"
The appropriate firmware kld module was not installed.
-This is a fatal initialization error.
+This is a non-fatal initialization error, but will
+result in running in a reduced performance mode.
.El
.Sh SUPPORT
For general information and support,
==== //depot/projects/dtrace/src/share/man/man9/Makefile#26 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.324 2008/01/22 21:26:35 attilio Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.326 2008/02/13 21:54:16 attilio Exp $
MAN= accept_filter.9 \
accf_data.9 \
@@ -712,10 +712,10 @@
ktr.9 CTR3.9 \
ktr.9 CTR4.9 \
ktr.9 CTR5.9
-MLINKS+=lock.9 lockcount.9 \
- lock.9 lockdestroy.9 \
+MLINKS+=lock.9 lockdestroy.9 \
lock.9 lockinit.9 \
lock.9 lockmgr.9 \
+ lock.9 lockmgr_assert.9 \
lock.9 lockmgr_disown.9 \
lock.9 lockmgr_printinfo.9 \
lock.9 lockmgr_recursed.9 \
@@ -909,7 +909,6 @@
rman.9 rman_await_resource.9 \
rman.9 rman_deactivate_resource.9 \
rman.9 rman_fini.9 \
- rman.9 rman_fini.9 \
rman.9 rman_get_bushandle.9 \
rman.9 rman_get_bustag.9 \
rman.9 rman_get_device.9 \
==== //depot/projects/dtrace/src/share/man/man9/lock.9#10 (text+ko) ====
@@ -24,9 +24,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
.\" DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/lock.9,v 1.23 2008/02/06 00:50:51 attilio Exp $
+.\" $FreeBSD: src/share/man/man9/lock.9,v 1.24 2008/02/13 21:54:16 attilio Exp $
.\"
-.Dd February 6, 2008
+.Dd February 13, 2008
.Dt LOCK 9
.Os
.Sh NAME
@@ -36,7 +36,8 @@
.Nm lockstatus ,
.Nm lockmgr_disown ,
.Nm lockmgr_printinfo ,
-.Nm lockmgr_recursed
+.Nm lockmgr_recursed ,
+.Nm lockmgr_assert
.Nd "lockmgr family of functions"
.Sh SYNOPSIS
.In sys/types.h
@@ -55,6 +56,11 @@
.Fn lockmgr_printinfo "struct lock *lkp"
.Ft int
.Fn lockmgr_recursed "struct lock *lkp"
+.Pp
+.Cd "options INVARIANTS"
+.Cd "options INVARIANT_SUPPORT"
+.Ft void
+.Fn lockmgr_assert "struct lock *lkp" "int what"
.Sh DESCRIPTION
The
.Fn lockinit
@@ -202,6 +208,69 @@
.Fn lockmgr_recursed
function returns true if the lock is recursed, 0
otherwise.
+.Pp
+When compiled with
+.Cd "options INVARIANTS"
+and
+.Cd "options INVARIANT_SUPPORT" ,
+the
+.Fn lockmgr_assert
+function tests
+.Fa lkp
+for the assertions specified in
+.Fa what ,
+and panics if they are not met.
+One of the following assertions must be specified:
+.Bl -tag -width ".Dv KA_UNLOCKED"
+.It Dv KA_LOCKED
+Assert that the current thread has either a shared or an exclusive lock on the
+.Vt lkp
+lock pointed to by the first argument.
+.It Dv KA_SLOCKED
+Assert that the current thread has a shared lock on the
+.Vt lkp
+lock pointed to by the first argument.
+.It Dv KA_XLOCKED
+Assert that the current thread has an exclusive lock on the
+.Vt lkp
+lock pointed to by the first argument.
+.It Dv KA_UNLOCKED
+Assert that the current thread has no lock on the
+.Vt lkp
+lock pointed to by the first argument.
+.It Dv KA_HELD
+Assert that the a not specified thread has a lock on the
+.Vt lkp
+lock pointed to by the first argument.
+.It Dv KA_UNHELD
+Assert that no thread has a lock on the
+.Vt lkp
+lock pointed to by the first argument.
+.El
+.Pp
+In addition, one of the following optional assertions can be used with
+either an
+.Dv KA_LOCKED ,
+.Dv KA_SLOCKED ,
+or
+.Dv KA_XLOCKED
+assertion:
+.Bl -tag -width ".Dv KA_NOTRECURSED"
+.It Dv KA_RECURSED
+Assert that the current thread has a recursed lock on
+.Fa lkp .
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list