* pthread_key_create.c (__pthread_key_create): Do away with

__pthread_keys_lock.

	* sysdeps/unix/sysv/linux/pthread_setaffinity.c
	(__kernel_cpumask_size): Mark as hidden.
	* sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c: Likewise.
This commit is contained in:
Ulrich Drepper 2006-05-11 17:52:42 +00:00
parent 3d237e425c
commit 04974d6359
4 changed files with 30 additions and 32 deletions

View file

@ -1,5 +1,12 @@
2006-05-11 Ulrich Drepper <drepper@redhat.com>
* pthread_key_create.c (__pthread_key_create): Do away with
__pthread_keys_lock.
* sysdeps/unix/sysv/linux/pthread_setaffinity.c
(__kernel_cpumask_size): Mark as hidden.
* sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c: Likewise.
* sem_open.c (__sem_mappings_lock): Mark as hidden.
* semaphoreP.h (__sem_mappings_lock): Likewise.

View file

@ -1,4 +1,4 @@
/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -19,45 +19,36 @@
#include <errno.h>
#include "pthreadP.h"
#include <atomic.h>
/* Internal mutex for __pthread_keys table handling. */
lll_lock_t __pthread_keys_lock = LLL_LOCK_INITIALIZER;
int
__pthread_key_create (key, destr)
pthread_key_t *key;
void (*destr) (void *);
{
int result = EAGAIN;
size_t cnt;
lll_lock (__pthread_keys_lock);
/* Find a slot in __pthread_kyes which is unused. */
for (cnt = 0; cnt < PTHREAD_KEYS_MAX; ++cnt)
if (KEY_UNUSED (__pthread_keys[cnt].seq)
&& KEY_USABLE (__pthread_keys[cnt].seq))
{
/* We found an unused slot. */
++__pthread_keys[cnt].seq;
for (size_t cnt = 0; cnt < PTHREAD_KEYS_MAX; ++cnt)
{
uintptr_t seq = __pthread_keys[cnt].seq;
/* Remember the destructor. */
__pthread_keys[cnt].destr = destr;
if (KEY_UNUSED (seq) && KEY_USABLE (seq)
/* We found an unused slot. Try to allocate it. */
&& ! atomic_compare_and_exchange_bool_acq (&__pthread_keys[cnt].seq,
seq + 1, seq))
{
/* Remember the destructor. */
__pthread_keys[cnt].destr = destr;
/* Return the key to the caller. */
*key = cnt;
/* Return the key to the caller. */
*key = cnt;
/* The call succeeded. */
result = 0;
/* The call succeeded. */
return 0;
}
}
/* We found a key and can stop now. */
break;
}
lll_unlock (__pthread_keys_lock);
return result;
return EAGAIN;
}
strong_alias (__pthread_key_create, pthread_key_create)
strong_alias (__pthread_key_create, __pthread_key_create_internal)

View file

@ -1,4 +1,4 @@
/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
@ -27,7 +27,7 @@
/* Defined in pthread_setaffinity.c. */
extern size_t __kernel_cpumask_size;
extern size_t __kernel_cpumask_size attribute_hidden;
extern int __determine_cpumask_size (pid_t tid);

View file

@ -1,4 +1,4 @@
/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
@ -25,7 +25,7 @@
#include <shlib-compat.h>
size_t __kernel_cpumask_size;
size_t __kernel_cpumask_size attribute_hidden;
/* Determine the current affinity. As a side affect we learn