Fix typos, comments in <pthread.h>
Andreas Jaeger
aj@suse.de
Thu Dec 30 09:59:00 GMT 1999
>>>>> Ulrich Drepper writes:
Ulrich> Andreas Jaeger <aj@suse.de> writes:
>> Shouldn't we move the declarations to libc-lock.h and only install
>> libc-lock.h for those systems that need it?
Ulrich> Seems to be ok.
Here comes the patch to do it. The only internal function in
<pthread.h> is now __pthread_initialize which is used by malloc.
Can we move it somewhere else ?
Andreas
1999-12-30 Andreas Jaeger <aj@suse.de>
* sysdeps/pthread/pthread.h: Move internal functions to...
* sysdeps/pthread/bits/libc-lock.h: ...here.
============================================================
Index: linuxthreads/sysdeps/pthread/pthread.h
--- linuxthreads/sysdeps/pthread/pthread.h 1999/12/29 17:47:18 1.13
+++ linuxthreads/sysdeps/pthread/pthread.h 1999/12/30 17:34:53
@@ -270,27 +270,20 @@
/* Initialize MUTEX using attributes in *MUTEX_ATTR, or use the
default values if later is NULL. */
-extern int __pthread_mutex_init (pthread_mutex_t *__mutex,
- __const pthread_mutexattr_t *__mutex_attr)
- __THROW;
extern int pthread_mutex_init (pthread_mutex_t *__mutex,
__const pthread_mutexattr_t *__mutex_attr)
__THROW;
/* Destroy MUTEX. */
-extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex) __THROW;
extern int pthread_mutex_destroy (pthread_mutex_t *__mutex) __THROW;
/* Try to lock MUTEX. */
-extern int __pthread_mutex_trylock (pthread_mutex_t *__mutex) __THROW;
extern int pthread_mutex_trylock (pthread_mutex_t *__mutex) __THROW;
/* Wait until lock for MUTEX becomes available and lock it. */
-extern int __pthread_mutex_lock (pthread_mutex_t *__mutex) __THROW;
extern int pthread_mutex_lock (pthread_mutex_t *__mutex) __THROW;
/* Unlock MUTEX. */
-extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex) __THROW;
extern int pthread_mutex_unlock (pthread_mutex_t *__mutex) __THROW;
@@ -298,19 +291,15 @@
/* Initialize mutex attribute object ATTR with default attributes
(kind is PTHREAD_MUTEX_FAST_NP). */
-extern int __pthread_mutexattr_init (pthread_mutexattr_t *__attr) __THROW;
extern int pthread_mutexattr_init (pthread_mutexattr_t *__attr) __THROW;
/* Destroy mutex attribute object ATTR. */
-extern int __pthread_mutexattr_destroy (pthread_mutexattr_t *__attr) __THROW;
extern int pthread_mutexattr_destroy (pthread_mutexattr_t *__attr) __THROW;
#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 (pthread_mutexattr_t *__attr,
- int __kind) __THROW;
extern int pthread_mutexattr_settype (pthread_mutexattr_t *__attr, int __kind)
__THROW;
@@ -419,8 +408,6 @@
associated to that key when the key is destroyed.
DESTR_FUNCTION is not called if the value associated is NULL when
the key is destroyed. */
-extern int __pthread_key_create (pthread_key_t *__key,
- void (*__destr_function) (void *)) __THROW;
extern int pthread_key_create (pthread_key_t *__key,
void (*__destr_function) (void *)) __THROW;
@@ -428,13 +415,10 @@
extern int pthread_key_delete (pthread_key_t __key) __THROW;
/* Store POINTER in the thread-specific data slot identified by KEY. */
-extern int __pthread_setspecific (pthread_key_t __key,
- __const void *__pointer) __THROW;
extern int pthread_setspecific (pthread_key_t __key,
__const void *__pointer) __THROW;
/* Return current value of the thread-specific data slot identified by KEY. */
-extern void *__pthread_getspecific (pthread_key_t __key) __THROW;
extern void *pthread_getspecific (pthread_key_t __key) __THROW;
@@ -444,8 +428,6 @@
only once, even if pthread_once is executed several times with the
same ONCE_CONTROL argument. ONCE_CONTROL must point to a static or
extern variable initialized to PTHREAD_ONCE_INIT. */
-extern int __pthread_once (pthread_once_t *__once_control,
- void (*__init_routine) (void)) __THROW;
extern int pthread_once (pthread_once_t *__once_control,
void (*__init_routine) (void)) __THROW;
@@ -533,9 +515,6 @@
first called before FORK), and the PARENT and CHILD handlers are called
in FIFO (first added, first called). */
-extern int __pthread_atfork (void (*__prepare) (void),
- void (*__parent) (void),
- void (*__child) (void)) __THROW;
extern int pthread_atfork (void (*__prepare) (void),
void (*__parent) (void),
void (*__child) (void)) __THROW;
============================================================
Index: linuxthreads/sysdeps/pthread/bits/libc-lock.h
--- linuxthreads/sysdeps/pthread/bits/libc-lock.h 1999/04/28 21:58:18 1.9
+++ linuxthreads/sysdeps/pthread/bits/libc-lock.h 1999/12/30 17:34:53
@@ -166,6 +166,43 @@
#define __libc_atfork(PREPARE, PARENT, CHILD) \
(__pthread_atfork != NULL ? __pthread_atfork (PREPARE, PARENT, CHILD) : 0)
+/* Functions that are used by this file and are internal to the GNU C
+ library. */
+
+extern int __pthread_mutex_init (pthread_mutex_t *__mutex,
+ __const pthread_mutexattr_t *__mutex_attr);
+
+extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex);
+
+extern int __pthread_mutex_trylock (pthread_mutex_t *__mutex);
+
+extern int __pthread_mutex_lock (pthread_mutex_t *__mutex);
+
+extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex);
+
+extern int __pthread_mutexattr_init (pthread_mutexattr_t *__attr);
+
+extern int __pthread_mutexattr_destroy (pthread_mutexattr_t *__attr);
+
+extern int __pthread_mutexattr_settype (pthread_mutexattr_t *__attr,
+ int __kind);
+
+extern int __pthread_key_create (pthread_key_t *__key,
+ void (*__destr_function) (void *));
+
+extern int __pthread_setspecific (pthread_key_t __key,
+ __const void *__pointer);
+
+extern void *__pthread_getspecific (pthread_key_t __key);
+
+extern int __pthread_once (pthread_once_t *__once_control,
+ void (*__init_routine) (void));
+
+extern int __pthread_atfork (void (*__prepare) (void),
+ void (*__parent) (void),
+ void (*__child) (void));
+
+
/* Make the pthread functions weak so that we can elide them from
single-threaded processes. */
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.rhein-neckar.de
More information about the Libc-hacker
mailing list