diff options
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 9 | ||||
| -rw-r--r-- | linuxthreads/Versions | 2 | ||||
| -rw-r--r-- | linuxthreads/mutex.c | 2 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/pthread/pthread.h | 29 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/unix/sysv/linux/bits/sigthread.h | 32 |
5 files changed, 56 insertions, 18 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index c149bdde9c..e5fff7590d 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,12 @@ +1998-07-08 22:26 Ulrich Drepper <drepper@cygnus.com> + + * Versions: Add pthread_mutexattr_gettype, pthread_mutexattr_settype. + * mutex.c: Define weak alias pthread_mutexattr_gettype and + pthread_mutexattr_settype. + * sysdeps/pthread/pthread.h: Declare these functions. + Move pthread_sigmask and pthread_kill declaration in separate header. + * sysdeps/unix/sysv/linux/bits/sigthread.h: New file. + 1998-07-07 15:20 Ulrich Drepper <drepper@cygnus.com> * Makefile: Add rules to compile and run tests. diff --git a/linuxthreads/Versions b/linuxthreads/Versions index 2df1490804..abb237962a 100644 --- a/linuxthreads/Versions +++ b/linuxthreads/Versions @@ -91,5 +91,7 @@ libpthread { pthread_attr_getstacksize; pthread_attr_setstacksize; pthread_getconcurrency; pthread_setconcurrency; + + pthread_mutexattr_gettype; pthread_mutexattr_settype; } } diff --git a/linuxthreads/mutex.c b/linuxthreads/mutex.c index 54504bfbc3..44a17d5b5a 100644 --- a/linuxthreads/mutex.c +++ b/linuxthreads/mutex.c @@ -154,6 +154,7 @@ int __pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind) return 0; } weak_alias (__pthread_mutexattr_setkind_np, pthread_mutexattr_setkind_np) +weak_alias (__pthread_mutexattr_setkind_np, pthread_mutexattr_settype) int __pthread_mutexattr_getkind_np(const pthread_mutexattr_t *attr, int *kind) { @@ -161,6 +162,7 @@ int __pthread_mutexattr_getkind_np(const pthread_mutexattr_t *attr, int *kind) return 0; } weak_alias (__pthread_mutexattr_getkind_np, pthread_mutexattr_getkind_np) +weak_alias (__pthread_mutexattr_getkind_np, pthread_mutexattr_gettype) /* Once-only execution */ diff --git a/linuxthreads/sysdeps/pthread/pthread.h b/linuxthreads/sysdeps/pthread/pthread.h index 1d402e6329..5ae6211c85 100644 --- a/linuxthreads/sysdeps/pthread/pthread.h +++ b/linuxthreads/sysdeps/pthread/pthread.h @@ -314,15 +314,17 @@ extern int pthread_mutexattr_init __P ((pthread_mutexattr_t *__attr)); extern int __pthread_mutexattr_destroy __P ((pthread_mutexattr_t *__attr)); extern int pthread_mutexattr_destroy __P ((pthread_mutexattr_t *__attr)); -/* Set the mutex kind attribute in *ATTR to KIND (either PTHREAD_MUTEX_FAST_NP - or PTHREAD_MUTEX_RECURSIVE_NP). */ -extern int __pthread_mutexattr_setkind_np __P ((pthread_mutexattr_t *__attr, - int __kind)); -extern int pthread_mutexattr_setkind_np __P ((pthread_mutexattr_t *__attr, - int __kind)); +#ifdef __USE_UNIX98 +/* Set the mutex kind attribute in *ATTR to KIND (either PTHREAD_MUTEX_NORMAL, + PTHREAD_MUTEX_RECURSIVE, PTHREAD_MUTEX_ERRORCHECK, or + PTHREAD_MUTEX_DEFAULT). */ +extern int pthread_mutexattr_settype __P ((pthread_mutexattr_t *__attr, + int __kind)); + /* Return in *KIND the mutex kind attribute in *ATTR. */ -extern int pthread_mutexattr_getkind_np __P ((__const pthread_mutexattr_t *__attr, - int *__kind)); +extern int pthread_mutexattr_gettype __P ((__const pthread_mutexattr_t *__attr, + int *__kind)); +#endif /* Functions for handling conditional variables. */ @@ -525,16 +527,7 @@ extern void _pthread_cleanup_pop_restore __P ((struct _pthread_cleanup_buffer *_ #endif /* Functions for handling signals. */ - -/* Modify the signal mask for the calling thread. The arguments have - the same meaning as for sigprocmask(2). */ - -extern int pthread_sigmask __P ((int __how, __const sigset_t *__newmask, - sigset_t *__oldmask)); - -/* Send signal SIGNO to the given thread. */ - -extern int pthread_kill __P ((pthread_t __thread, int __signo)); +#include <bits/sigthread.h> /* Functions for handling process creation and process execution. */ diff --git a/linuxthreads/sysdeps/unix/sysv/linux/bits/sigthread.h b/linuxthreads/sysdeps/unix/sysv/linux/bits/sigthread.h new file mode 100644 index 0000000000..e3aa7178bf --- /dev/null +++ b/linuxthreads/sysdeps/unix/sysv/linux/bits/sigthread.h @@ -0,0 +1,32 @@ +/* Signal handling function for threaded programs. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#if !defined _SIGNAL_H && !defined _PTHREAD_H +# error "Never include this file directly. Use <pthread.h> instead" +#endif + +/* Functions for handling signals. */ + +/* Modify the signal mask for the calling thread. The arguments have + the same meaning as for sigprocmask(2). */ +extern int pthread_sigmask __P ((int __how, __const sigset_t *__newmask, + sigset_t *__oldmask)); + +/* Send signal SIGNO to the given thread. */ +extern int pthread_kill __P ((pthread_t __thread, int __signo)); |