Date: Wed, 22 Oct 2003 19:26:33 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 40239 for review Message-ID: <200310230226.h9N2QXiH054919@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=40239 Change 40239 by rwatson@rwatson_paprika on 2003/10/22 19:25:57 Integrate trustedbsd_sebsd include tree forward to 39070, the last major integration of the trustedbsd_mac branch, which brings in many of the major changes in the last four months to the main FreeBSD tree. This includes substantial lock pushdown, threading bug fixes, compiler upgrades, et al. Affected files ... .. //depot/projects/trustedbsd/sebsd/include/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/include/pthread.h#4 integrate .. //depot/projects/trustedbsd/sebsd/include/unistd.h#4 integrate .. //depot/projects/trustedbsd/sebsd/include/varargs.h#1 branch Differences ... ==== //depot/projects/trustedbsd/sebsd/include/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.204 2003/07/04 19:54:06 ru Exp $ +# $FreeBSD: src/include/Makefile,v 1.205 2003/09/01 03:28:25 kan Exp $ # # Doing a "make install" builds /usr/include. @@ -16,10 +16,10 @@ resolv.h rune.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h \ stdbool.h stddef.h stdio.h stdlib.h strhash.h string.h stringlist.h \ strings.h sysexits.h tar.h time.h timeconv.h timers.h ttyent.h \ - ulimit.h unistd.h utime.h utmp.h uuid.h vis.h wchar.h wctype.h \ - wordexp.h + ulimit.h unistd.h utime.h utmp.h uuid.h varargs.h vis.h wchar.h \ + wctype.h wordexp.h -MHDRS= float.h floatingpoint.h stdarg.h varargs.h +MHDRS= float.h floatingpoint.h stdarg.h # posix4/mqueue.h is useless without an implementation and isn't installed: PHDRS= sched.h semaphore.h _semaphore.h ksem.h# mqueue.h ==== //depot/projects/trustedbsd/sebsd/include/pthread.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread.h,v 1.28 2003/04/20 01:53:12 jdp Exp $ + * $FreeBSD: src/include/pthread.h,v 1.31 2003/09/09 06:57:51 davidxu Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ @@ -52,6 +52,7 @@ #define PTHREAD_KEYS_MAX 256 #define PTHREAD_STACK_MIN 1024 #define PTHREAD_THREADS_MAX ULONG_MAX +#define PTHREAD_BARRIER_SERIAL_THREAD -1 /* * Flags for threads and thread attributes. @@ -95,6 +96,9 @@ struct pthread_once; struct pthread_rwlock; struct pthread_rwlockattr; +struct pthread_barrier; +struct pthread_barrier_attr; +struct pthread_spinlock; /* * Primitive system data type definitions required by P1003.1c. @@ -113,6 +117,9 @@ typedef struct pthread_once pthread_once_t; typedef struct pthread_rwlock *pthread_rwlock_t; typedef struct pthread_rwlockattr *pthread_rwlockattr_t; +typedef struct pthread_barrier *pthread_barrier_t; +typedef struct pthread_barrierattr *pthread_barrierattr_t; +typedef struct pthread_spinlock *pthread_spinlock_t; /* * Additional type definitions: @@ -203,6 +210,15 @@ int pthread_attr_setstack(pthread_attr_t *, void *, size_t); int pthread_attr_setstackaddr(pthread_attr_t *, void *); int pthread_attr_setdetachstate(pthread_attr_t *, int); +int pthread_barrier_destroy(pthread_barrier_t *); +int pthread_barrier_init(pthread_barrier_t *, + const pthread_barrierattr_t *, unsigned); +int pthread_barrier_wait(pthread_barrier_t *); +int pthread_barrierattr_destroy(pthread_barrierattr_t *); +int pthread_barrierattr_getpshared(const pthread_barrierattr_t *, + int *); +int pthread_barrierattr_init(pthread_barrierattr_t *); +int pthread_barrierattr_setpshared(pthread_barrierattr_t *, int); void pthread_cleanup_pop(int); void pthread_cleanup_push(void (*) (void *), void *routine_arg); int pthread_condattr_destroy(pthread_condattr_t *); @@ -236,12 +252,18 @@ const pthread_mutexattr_t *); int pthread_mutex_lock(pthread_mutex_t *); int pthread_mutex_trylock(pthread_mutex_t *); +int pthread_mutex_timedlock(pthread_mutex_t *, + const struct timespec *); int pthread_mutex_unlock(pthread_mutex_t *); int pthread_once(pthread_once_t *, void (*) (void)); int pthread_rwlock_destroy(pthread_rwlock_t *); int pthread_rwlock_init(pthread_rwlock_t *, const pthread_rwlockattr_t *); int pthread_rwlock_rdlock(pthread_rwlock_t *); +int pthread_rwlock_timedrdlock(pthread_rwlock_t *, + const struct timespec *); +int pthread_rwlock_timedrwlock(pthread_rwlock_t *, + const struct timespec *); int pthread_rwlock_tryrdlock(pthread_rwlock_t *); int pthread_rwlock_trywrlock(pthread_rwlock_t *); int pthread_rwlock_unlock(pthread_rwlock_t *); @@ -255,6 +277,11 @@ int pthread_setspecific(pthread_key_t, const void *); int pthread_sigmask(int, const sigset_t *, sigset_t *); +int pthread_spin_init(pthread_spinlock_t *, int); +int pthread_spin_destroy(pthread_spinlock_t *); +int pthread_spin_lock(pthread_spinlock_t *); +int pthread_spin_trylock(pthread_spinlock_t *); +int pthread_spin_unlock(pthread_spinlock_t *); int pthread_cancel(pthread_t); int pthread_setcancelstate(int, int *); int pthread_setcanceltype(int, int *); ==== //depot/projects/trustedbsd/sebsd/include/unistd.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.68 2003/07/01 12:09:06 bde Exp $ + * $FreeBSD: src/include/unistd.h,v 1.69 2003/08/19 20:39:49 wollman Exp $ */ #ifndef _UNISTD_H_ @@ -404,7 +404,7 @@ int readlink(const char *, char *, int); #endif #if __POSIX_VISIBLE >= 200112 -int gethostname(char *, int /* socklen_t */); +int gethostname(char *, size_t); int setegid(gid_t); int seteuid(uid_t); #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310230226.h9N2QXiH054919>