Date: Fri, 30 Nov 2007 18:17:42 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 129832 for review Message-ID: <200711301817.lAUIHg55068483@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=129832 Change 129832 by peter@peter_overcee on 2007/11/30 18:16:49 IFC @129831 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#42 integrate .. //depot/projects/hammer/cddl/Makefile.inc#3 integrate .. //depot/projects/hammer/cddl/lib/libnvpair/Makefile#3 integrate .. //depot/projects/hammer/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/hammer/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/hammer/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/hammer/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/hammer/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/hammer/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/hammer/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/hammer/etc/freebsd-update.conf#3 integrate .. //depot/projects/hammer/include/elf.h#3 integrate .. //depot/projects/hammer/lib/libkse/Makefile#3 integrate .. //depot/projects/hammer/lib/libkse/arch/amd64/include/atomic_ops.h#2 integrate .. //depot/projects/hammer/lib/libkse/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/hammer/lib/libkse/arch/arm/include/atomic_ops.h#2 integrate .. //depot/projects/hammer/lib/libkse/arch/i386/include/atomic_ops.h#2 integrate .. //depot/projects/hammer/lib/libkse/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/hammer/lib/libkse/arch/ia64/include/atomic_ops.h#2 integrate .. //depot/projects/hammer/lib/libkse/arch/powerpc/include/atomic_ops.h#2 integrate .. //depot/projects/hammer/lib/libkse/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/hammer/lib/libkse/arch/sparc64/include/atomic_ops.h#2 integrate .. //depot/projects/hammer/lib/libkse/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/hammer/lib/libkse/sys/lock.c#3 integrate .. //depot/projects/hammer/lib/libkse/sys/thr_error.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_accept.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_aio_suspend.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_atfork.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_get_np.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_init.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setguardsize.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setinheritsched.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setschedparam.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setscope.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_barrier.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_barrierattr.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_cancel.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_clean.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_close.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_concurrency.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_cond.c#3 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_condattr_init.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_condattr_pshared.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_connect.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_creat.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_create.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_detach.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_equal.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_execve.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_exit.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_fcntl.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_find_thread.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_fork.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_fsync.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_getschedparam.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_info.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_init.c#3 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_join.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_kern.c#3 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_kill.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_main_np.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_mattr_init.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_mattr_kind_np.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_mattr_pshared.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_msync.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_multi_np.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_mutex.c#4 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_mutex_prioceiling.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_mutex_protocol.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_nanosleep.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_once.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_open.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_pause.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_poll.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_priority_queue.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_private.h#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_pselect.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_pspinlock.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_raise.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_read.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_readv.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_resume_np.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_rtld.c#3 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_rwlock.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_select.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_self.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_seterrno.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_setprio.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_setschedparam.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_sig.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_sigaction.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_sigmask.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_sigpending.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_sigprocmask.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_sigwait.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_single_np.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_sleep.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_spec.c#3 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_spinlock.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_stack.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_suspend_np.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_switch_np.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_symbols.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_system.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_tcdrain.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_vfork.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_wait.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_wait4.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_waitpid.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_write.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_writev.c#2 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_yield.c#2 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.ent#23 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.8#9 integrate .. //depot/projects/hammer/share/man/man4/aac.4#15 integrate .. //depot/projects/hammer/share/man/man4/enc.4#5 integrate .. //depot/projects/hammer/share/man/man9/Makefile#76 integrate .. //depot/projects/hammer/share/man/man9/stack.9#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#166 integrate .. //depot/projects/hammer/sys/amd64/amd64/prof_machdep.c#7 integrate .. //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#14 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#26 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#27 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc.c#17 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#39 integrate .. //depot/projects/hammer/sys/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/hammer/sys/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/hammer/sys/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/hammer/sys/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/proc.h#4 integrate .. //depot/projects/hammer/sys/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/hammer/sys/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/procset.h#2 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#35 integrate .. //depot/projects/hammer/sys/dev/amr/amr_cam.c#18 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#71 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#35 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_x86.c#6 integrate .. //depot/projects/hammer/sys/dev/random/yarrow.c#10 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#102 integrate .. //depot/projects/hammer/sys/i386/isa/prof_machdep.c#10 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#43 integrate .. //depot/projects/hammer/sys/modules/zfs/Makefile#5 integrate .. //depot/projects/hammer/sys/net/if_enc.c#3 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.c#19 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.h#13 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_input.c#14 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_output.c#13 integrate .. //depot/projects/hammer/sys/netipsec/xform.h#4 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipip.c#13 integrate .. //depot/projects/hammer/sys/sun4v/include/pcpu.h#6 integrate .. //depot/projects/hammer/sys/sys/_elf_solaris.h#2 delete .. //depot/projects/hammer/sys/sys/elf.h#2 integrate .. //depot/projects/hammer/sys/sys/kernel.h#22 integrate .. //depot/projects/hammer/sys/sys/param.h#97 integrate .. //depot/projects/hammer/sys/sys/pcpu.h#15 integrate .. //depot/projects/hammer/sys/sys/resource.h#14 integrate .. //depot/projects/hammer/sys/sys/stat.h#13 integrate .. //depot/projects/hammer/sys/sys/time.h#12 integrate .. //depot/projects/hammer/sys/sys/types.h#24 integrate .. //depot/projects/hammer/tools/regression/netinet/tcpconnect/README.tcp-md5#1 branch .. //depot/projects/hammer/tools/regression/netinet/tcpconnect/tcpconnect.c#5 integrate .. //depot/projects/hammer/usr.bin/fstat/zfs/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/login/login.1#9 integrate Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#42 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.121 2007/11/27 13:58:25 brix Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks 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,14 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071129: Disabled static versions of libkse by default +.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" +OLD_FILES+=usr/lib/libkse.a +OLD_FILES+=usr/lib/libkse_p.a +OLD_FILES+=usr/lib/libkse_pic.a +.endif +# 20071129: Removed a Solaris compatibility header +OLD_FILES+=usr/include/sys/_elf_solaris.h # 20071108: Removed very crunch OLDCARD support file OLD_FILES+=etc/defaults/pccard.conf # 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64. ==== //depot/projects/hammer/cddl/Makefile.inc#3 (text+ko) ==== @@ -1,3 +1,6 @@ -# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ +# $FreeBSD: src/cddl/Makefile.inc,v 1.3 2007/11/28 22:58:09 jb Exp $ + +OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris +OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris -CFLAGS+= -D_SOLARIS_C_SOURCE +IGNORE_PRAGMA= YES ==== //depot/projects/hammer/cddl/lib/libnvpair/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ +# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.3 2007/11/28 22:58:09 jb Exp $ .PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair @@ -10,8 +10,8 @@ nvpair_alloc_fixed.c \ nvpair.c +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../include # XXX CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include <bsd.lib.mk> ==== //depot/projects/hammer/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 (text+ko) ==== @@ -470,8 +470,6 @@ #define gethrestime_sec() time(NULL) -#define open64(...) open(__VA_ARGS__) -#define pread64(d, p, n, o) pread(d, p, n, o) #define pwrite64(d, p, n, o) pwrite(d, p, n, o) #define readdir64(d) readdir(d) #define SIGPENDING(td) (0) ==== //depot/projects/hammer/etc/freebsd-update.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/freebsd-update.conf,v 1.2 2007/11/12 04:47:57 cperciva Exp $ +# $FreeBSD: src/etc/freebsd-update.conf,v 1.3 2007/11/28 22:45:09 cperciva Exp $ # Trusted keyprint. Changing this is a Bad Idea unless you've received # a PGP-signed email from <security-officer@FreeBSD.org> telling you to @@ -24,7 +24,7 @@ # Paths which start with anything matching an entry in an UpdateIfUnmodified # statement will only be updated if the contents of the file have not been # modified by the user (unless changes are merged; see below). -UpdateIfUnmodified /etc/ /var/ +UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile # When upgrading to a new FreeBSD release, files which match MergeChanges # will have any local changes merged into the version from the new release. ==== //depot/projects/hammer/include/elf.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/elf.h,v 1.9 2006/10/04 07:25:55 jb Exp $ + * $FreeBSD: src/include/elf.h,v 1.10 2007/11/28 22:09:12 jb Exp $ */ /* @@ -38,8 +38,4 @@ #include <sys/elf32.h> #include <sys/elf64.h> -#ifdef _SOLARIS_C_SOURCE -#include <sys/_elf_solaris.h> -#endif - #endif /* !_ELF_H_ */ ==== //depot/projects/hammer/lib/libkse/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libkse/Makefile,v 1.67 2007/11/20 02:07:28 jb Exp $ +# $FreeBSD: src/lib/libkse/Makefile,v 1.69 2007/11/30 17:20:24 deischen Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -10,12 +10,15 @@ .include <bsd.own.mk> -.if (${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no") && \ - ${SHLIBDIR} == "/usr/lib" +.if ${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no" +LIB=kse +.if ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib .endif +.else +SHLIB=kse +.endif -LIB=kse SHLIB_MAJOR= 3 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ @@ -25,12 +28,11 @@ CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH} CFLAGS+=-fno-builtin -CFLAGS+=-fno-strict-aliasing # Uncomment this if you want libkse to contain debug information for # thread locking. CFLAGS+=-D_LOCK_DEBUG -WARNS?=2 +WARNS?=3 # Uncomment this if you want to build a 1:1 threading mode library # however it is no longer strictly conformed to POSIX ==== //depot/projects/hammer/lib/libkse/arch/amd64/include/atomic_ops.h#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/lib/libkse/arch/amd64/include/atomic_ops.h,v 1.3 2007/10/09 13:42:22 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/amd64/include/atomic_ops.h,v 1.4 2007/11/30 17:20:25 deischen Exp $ */ #ifndef _ATOMIC_OPS_H_ @@ -36,7 +36,7 @@ * void atomic_swap64(intptr_t *dst, intptr_t val, intptr_t *res); */ static inline void -atomic_swap64(intptr_t *dst, intptr_t val, intptr_t *res) +atomic_swap64(volatile intptr_t *dst, intptr_t val, intptr_t *res) { __asm __volatile( "xchgq %2, %1; movq %2, %0" @@ -44,7 +44,7 @@ } static inline void -atomic_swap_int(int *dst, int val, int *res) +atomic_swap_int(volatile int *dst, int val, int *res) { __asm __volatile( "xchgl %2, %1; movl %2, %0" @@ -52,6 +52,6 @@ } #define atomic_swap_ptr(d, v, r) \ - atomic_swap64((intptr_t *)(d), (intptr_t)(v), (intptr_t *)(r)) + atomic_swap64((volatile intptr_t *)(d), (intptr_t)(v), (intptr_t *)(r)) #endif ==== //depot/projects/hammer/lib/libkse/arch/amd64/include/pthread_md.h#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/lib/libkse/arch/amd64/include/pthread_md.h,v 1.11 2007/10/09 13:42:22 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/amd64/include/pthread_md.h,v 1.12 2007/11/30 17:20:25 deischen Exp $ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -250,7 +250,7 @@ _amd64_restore_context( &tcb->tcb_tmbx.tm_context.uc_mcontext, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); + (intptr_t *)(void *)&kcb->kcb_kmbx.km_curthread); else _amd64_restore_context( &tcb->tcb_tmbx.tm_context.uc_mcontext, ==== //depot/projects/hammer/lib/libkse/arch/arm/include/atomic_ops.h#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/lib/libkse/arch/arm/include/atomic_ops.h,v 1.4 2007/10/09 13:42:23 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/arm/include/atomic_ops.h,v 1.5 2007/11/30 17:20:25 deischen Exp $ */ #ifndef _ATOMIC_OPS_H_ @@ -39,15 +39,15 @@ * void atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res); */ static inline void -atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res) +atomic_swap32(volatile intptr_t *dst, intptr_t val, intptr_t *res) { *res = __swp(val, dst); } #define atomic_swap_ptr(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #define atomic_swap_int(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #endif ==== //depot/projects/hammer/lib/libkse/arch/i386/include/atomic_ops.h#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/lib/libkse/arch/i386/include/atomic_ops.h,v 1.4 2007/10/09 13:42:23 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/i386/include/atomic_ops.h,v 1.5 2007/11/30 17:20:25 deischen Exp $ */ #ifndef _ATOMIC_OPS_H_ @@ -36,7 +36,7 @@ * void atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res); */ static inline void -atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res) +atomic_swap32(volatile intptr_t *dst, intptr_t val, intptr_t *res) { __asm __volatile( "xchgl %2, %1; movl %2, %0" @@ -44,8 +44,8 @@ } #define atomic_swap_ptr(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #define atomic_swap_int(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #endif ==== //depot/projects/hammer/lib/libkse/arch/i386/include/pthread_md.h#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/lib/libkse/arch/i386/include/pthread_md.h,v 1.17 2007/10/09 13:42:23 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/i386/include/pthread_md.h,v 1.18 2007/11/30 17:20:25 deischen Exp $ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -246,7 +246,7 @@ if (setmbox != 0) _thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); + (intptr_t *)(void *)&kcb->kcb_kmbx.km_curthread); else _thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, 0, NULL); ==== //depot/projects/hammer/lib/libkse/arch/ia64/include/atomic_ops.h#2 (text+ko) ==== @@ -23,25 +23,25 @@ * (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/libkse/arch/ia64/include/atomic_ops.h,v 1.2 2007/10/09 13:42:24 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/ia64/include/atomic_ops.h,v 1.3 2007/11/30 17:20:25 deischen Exp $ */ #ifndef _ATOMIC_OPS_H_ #define _ATOMIC_OPS_H_ static inline void -atomic_swap_int(int *dst, int val, int *res) +atomic_swap_int(volatile int *dst, int val, int *res) { __asm("xchg4 %0=[%2],%1" : "=r"(*res) : "r"(val), "r"(dst)); } static inline void -atomic_swap_long(long *dst, long val, long *res) +atomic_swap_long(volatile long *dst, long val, long *res) { __asm("xchg8 %0=[%2],%1" : "=r"(*res) : "r"(val), "r"(dst)); } #define atomic_swap_ptr(d,v,r) \ - atomic_swap_long((long*)d, (long)v, (long*)r) + atomic_swap_long((volatile long *)d, (long)v, (long *)r) #endif /* _ATOMIC_OPS_H_ */ ==== //depot/projects/hammer/lib/libkse/arch/powerpc/include/atomic_ops.h#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/lib/libkse/arch/powerpc/include/atomic_ops.h,v 1.2 2007/10/09 13:42:24 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/powerpc/include/atomic_ops.h,v 1.3 2007/11/30 17:20:25 deischen Exp $ */ #ifndef _ATOMIC_OPS_H_ @@ -37,7 +37,7 @@ * void atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res); */ static inline void -atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res) +atomic_swap32(volatile intptr_t *dst, intptr_t val, intptr_t *res) { int tmp; @@ -55,8 +55,8 @@ } #define atomic_swap_ptr(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #define atomic_swap_int(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #endif ==== //depot/projects/hammer/lib/libkse/arch/powerpc/include/pthread_md.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/arch/powerpc/include/pthread_md.h,v 1.7 2007/10/09 13:42:24 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/powerpc/include/pthread_md.h,v 1.8 2007/11/30 17:20:26 deischen Exp $ */ /* @@ -280,7 +280,7 @@ tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; if (setmbox) _ppc32_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); + (intptr_t *)(void *)&kcb->kcb_kmbx.km_curthread); else _ppc32_setcontext(mc, 0, NULL); } ==== //depot/projects/hammer/lib/libkse/arch/sparc64/include/atomic_ops.h#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/lib/libkse/arch/sparc64/include/atomic_ops.h,v 1.2 2007/10/09 13:42:25 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/sparc64/include/atomic_ops.h,v 1.3 2007/11/30 17:20:26 deischen Exp $ */ #ifndef _ATOMIC_OPS_H_ @@ -38,7 +38,7 @@ * void atomic_swap_long(long *dst, long val, long *res); */ static __inline void -atomic_swap_long(long *dst, long val, long *res) +atomic_swap_long(volatile long *dst, long val, long *res) { long tmp; long r; @@ -54,7 +54,7 @@ } static __inline void -atomic_swap_int(int *dst, int val, int *res) +atomic_swap_int(volatile int *dst, int val, int *res) { int tmp; int r; @@ -70,6 +70,6 @@ } #define atomic_swap_ptr(dst, val, res) \ - atomic_swap_long((long *)dst, (long)val, (long *)res) + atomic_swap_long((volatile long *)dst, (long)val, (long *)res) #endif ==== //depot/projects/hammer/lib/libkse/arch/sparc64/include/pthread_md.h#2 (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/libkse/arch/sparc64/include/pthread_md.h,v 1.6 2007/10/09 13:42:25 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/sparc64/include/pthread_md.h,v 1.7 2007/11/30 17:20:26 deischen Exp $ */ /* @@ -237,7 +237,7 @@ tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; if (setmbox) _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); + (intptr_t *)(void *)&kcb->kcb_kmbx.km_curthread); else _thr_setcontext(mc, 0, NULL); } else { ==== //depot/projects/hammer/lib/libkse/sys/lock.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/sys/lock.c,v 1.12 2007/11/27 03:16:43 jasone Exp $ + * $FreeBSD: src/lib/libkse/sys/lock.c,v 1.13 2007/11/30 17:20:26 deischen Exp $ */ #include <sys/types.h> @@ -178,11 +178,12 @@ * Atomically swap the head of the lock request with * this request. */ - atomic_swap_ptr(&lck->l_head, lu->lu_myreq, &lu->lu_watchreq); + atomic_swap_ptr((void *)&lck->l_head, lu->lu_myreq, + (void *)&lu->lu_watchreq); if (lu->lu_watchreq->lr_locked != 0) { atomic_store_rel_ptr - ((volatile uintptr_t *)&lu->lu_watchreq->lr_watcher, + ((volatile uintptr_t *)(void *)&lu->lu_watchreq->lr_watcher, (uintptr_t)lu); if ((lck->l_wait == NULL) || ((lck->l_type & LCK_ADAPTIVE) == 0)) { @@ -214,7 +215,7 @@ if (lu->lu_watchreq->lr_active == 0) break; } - atomic_swap_int((int *)&lu->lu_watchreq->lr_locked, + atomic_swap_int(&lu->lu_watchreq->lr_locked, 2, &lval); if (lval == 0) lu->lu_watchreq->lr_locked = 0; @@ -253,18 +254,19 @@ /* Update tail if our request is last. */ if (lu->lu_watchreq->lr_owner == NULL) { - atomic_store_rel_ptr((volatile uintptr_t *)&lck->l_tail, + atomic_store_rel_ptr((volatile uintptr_t *) + (void *)&lck->l_tail, (uintptr_t)lu->lu_myreq); - atomic_store_rel_ptr - ((volatile uintptr_t *)&lu->lu_myreq->lr_owner, + atomic_store_rel_ptr((volatile uintptr_t *) + (void *)&lu->lu_myreq->lr_owner, (uintptr_t)NULL); } else { /* Remove ourselves from the list. */ atomic_store_rel_ptr((volatile uintptr_t *) - &lu->lu_myreq->lr_owner, + (void *)&lu->lu_myreq->lr_owner, (uintptr_t)lu->lu_watchreq->lr_owner); atomic_store_rel_ptr((volatile uintptr_t *) - &lu->lu_watchreq->lr_owner->lu_myreq, + (void *)&lu->lu_watchreq->lr_owner->lu_myreq, (uintptr_t)lu->lu_myreq); } /* @@ -293,7 +295,7 @@ /* Give the lock to the highest priority user. */ if (lck->l_wakeup != NULL) { atomic_swap_int( - (int *)&lu_h->lu_watchreq->lr_locked, + &lu_h->lu_watchreq->lr_locked, 0, &lval); if (lval == 2) /* Notify the sleeper */ @@ -305,7 +307,7 @@ &lu_h->lu_watchreq->lr_locked, 0); } else { if (lck->l_wakeup != NULL) { - atomic_swap_int((int *)&myreq->lr_locked, + atomic_swap_int(&myreq->lr_locked, 0, &lval); if (lval == 2) /* Notify the sleeper */ @@ -326,7 +328,7 @@ lu->lu_watchreq = NULL; lu->lu_myreq->lr_locked = 1; if (lck->l_wakeup) { - atomic_swap_int((int *)&myreq->lr_locked, 0, &lval); + atomic_swap_int(&myreq->lr_locked, 0, &lval); if (lval == 2) /* Notify the sleeper */ lck->l_wakeup(lck, myreq->lr_watcher); @@ -339,7 +341,7 @@ } void -_lock_grant(struct lock *lck /* unused */, struct lockuser *lu) +_lock_grant(struct lock *lck __unused /* unused */, struct lockuser *lu) { atomic_store_rel_int(&lu->lu_watchreq->lr_locked, 3); } ==== //depot/projects/hammer/lib/libkse/sys/thr_error.c#2 (text+ko) ==== @@ -31,8 +31,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/sys/thr_error.c,v 1.10 2007/10/09 13:42:26 obrien Exp $ + * $FreeBSD: src/lib/libkse/sys/thr_error.c,v 1.11 2007/11/30 17:20:26 deischen Exp $ */ +#include <errno.h> #include <pthread.h> #include "libc_private.h" #include "thr_private.h" ==== //depot/projects/hammer/lib/libkse/thread/thr_accept.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libkse/thread/thr_accept.c,v 1.4 2007/10/09 13:42:27 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libkse/thread/thr_accept.c,v 1.5 2007/11/30 17:20:26 deischen Exp $"); #include <sys/types.h> #include <sys/socket.h> @@ -35,6 +35,9 @@ LT10_COMPAT_PRIVATE(__accept); LT10_COMPAT_DEFAULT(accept); +int __accept(int s, struct sockaddr *addr, socklen_t *addrlen); + + __weak_reference(__accept, accept); int ==== //depot/projects/hammer/lib/libkse/thread/thr_aio_suspend.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * 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/libkse/thread/thr_aio_suspend.c,v 1.10 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_aio_suspend.c,v 1.11 2007/11/30 17:20:26 deischen Exp $ */ #include <aio.h> @@ -36,6 +36,11 @@ LT10_COMPAT_PRIVATE(_aio_suspend); LT10_COMPAT_DEFAULT(aio_suspend); + +int +_aio_suspend(const struct aiocb * const iocbs[], int niocb, const struct + timespec *timeout); + __weak_reference(_aio_suspend, aio_suspend); int ==== //depot/projects/hammer/lib/libkse/thread/thr_atfork.c#2 (text+ko) ==== @@ -23,12 +23,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_atfork.c,v 1.3 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_atfork.c,v 1.4 2007/11/30 17:20:26 deischen Exp $ */ +#include "namespace.h" #include <errno.h> #include <stdlib.h> #include <pthread.h> #include <sys/queue.h> +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_atfork); ==== //depot/projects/hammer/lib/libkse/thread/thr_attr_destroy.c#2 (text+ko) ==== @@ -26,11 +26,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_destroy.c,v 1.10 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_destroy.c,v 1.11 2007/11/30 17:20:26 deischen Exp $ */ +#include "namespace.h" #include <stdlib.h> #include <errno.h> #include <pthread.h> +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_destroy); ==== //depot/projects/hammer/lib/libkse/thread/thr_attr_get_np.c#2 (text+ko) ==== @@ -23,12 +23,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_get_np.c,v 1.6 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_get_np.c,v 1.7 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include <errno.h> #include <string.h> #include <pthread.h> #include <pthread_np.h> +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_get_np); ==== //depot/projects/hammer/lib/libkse/thread/thr_attr_getdetachstate.c#2 (text+ko) ==== @@ -26,10 +26,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_getdetachstate.c,v 1.10 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getdetachstate.c,v 1.11 2007/11/30 17:20:26 deischen Exp $ */ +#include "namespace.h" #include <errno.h> #include <pthread.h> +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getdetachstate); ==== //depot/projects/hammer/lib/libkse/thread/thr_attr_getguardsize.c#2 (text+ko) ==== @@ -26,11 +26,13 @@ * 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/libkse/thread/thr_attr_getguardsize.c,v 1.4 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getguardsize.c,v 1.5 2007/11/30 17:20:26 deischen Exp $ */ +#include "namespace.h" #include <errno.h> #include <pthread.h> +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getguardsize); ==== //depot/projects/hammer/lib/libkse/thread/thr_attr_getinheritsched.c#2 (text+ko) ==== @@ -29,10 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_getinheritsched.c,v 1.9 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getinheritsched.c,v 1.10 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include <errno.h> #include <pthread.h> +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getinheritsched); ==== //depot/projects/hammer/lib/libkse/thread/thr_attr_getschedparam.c#2 (text+ko) ==== @@ -29,10 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_getschedparam.c,v 1.9 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getschedparam.c,v 1.10 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include <errno.h> #include <pthread.h> +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getschedparam); ==== //depot/projects/hammer/lib/libkse/thread/thr_attr_getschedpolicy.c#2 (text+ko) ==== @@ -29,10 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_getschedpolicy.c,v 1.9 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getschedpolicy.c,v 1.10 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include <errno.h> #include <pthread.h> +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getschedpolicy); ==== //depot/projects/hammer/lib/libkse/thread/thr_attr_getscope.c#2 (text+ko) ==== @@ -29,10 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_getscope.c,v 1.9 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getscope.c,v 1.10 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include <errno.h> #include <pthread.h> +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getscope); ==== //depot/projects/hammer/lib/libkse/thread/thr_attr_getstack.c#2 (text+ko) ==== @@ -29,10 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_getstack.c,v 1.3 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getstack.c,v 1.4 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include <errno.h> #include <pthread.h> +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getstack); ==== //depot/projects/hammer/lib/libkse/thread/thr_attr_getstackaddr.c#2 (text+ko) ==== @@ -26,10 +26,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711301817.lAUIHg55068483>