[hurd,commited] htl: Fix initializing the key lock
Checks
Commit Message
The static pthread_once_t in the pt-key.h header was creating one
pthread_once_t per includer. We have to use a shared common
pthread_once_t instead.
---
sysdeps/htl/pt-key-create.c | 1 +
sysdeps/htl/pt-key.h | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
@@ -24,6 +24,7 @@
#include <pthreadP.h>
pthread_mutex_t __pthread_key_lock;
+pthread_once_t __pthread_key_once = PTHREAD_ONCE_INIT;
void (**__pthread_key_destructors) (void *arg);
int __pthread_key_size;
@@ -47,14 +47,15 @@ extern int __pthread_key_invalid_count;
/* Protects the above variables. This must be a recursive lock: the
destructors may call pthread_key_delete. */
extern pthread_mutex_t __pthread_key_lock;
+
+/* Protects the initialization of the mutex above. */
+extern pthread_once_t __pthread_key_once;
#include <assert.h>
static inline void
__pthread_key_lock_ready (void)
{
- static pthread_once_t o = PTHREAD_ONCE_INIT;
-
void do_init (void)
{
int err;
@@ -73,5 +74,5 @@ __pthread_key_lock_ready (void)
assert_perror (err);
}
- __pthread_once (&o, do_init);
+ __pthread_once (&__pthread_key_once, do_init);
}