From c9806fc2f9b68be8942740da508eaaf0695d020e Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 31 Mar 2011 19:04:56 -0400 Subject: greatly simplify pthread_key_create (~20% size reduction) --- src/thread/pthread_key_create.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/thread') diff --git a/src/thread/pthread_key_create.c b/src/thread/pthread_key_create.c index 52c09734..c703bfe3 100644 --- a/src/thread/pthread_key_create.c +++ b/src/thread/pthread_key_create.c @@ -9,18 +9,17 @@ static void nodtor(void *dummy) int pthread_key_create(pthread_key_t *k, void (*dtor)(void *)) { static void (*keys[PTHREAD_KEYS_MAX])(void *); - int i = (uintptr_t)&k / 16 % PTHREAD_KEYS_MAX; - int j = i; + unsigned i = (uintptr_t)&k / 16 % PTHREAD_KEYS_MAX; + unsigned j = i; pthread_self(); libc.tsd_keys = keys; if (!dtor) dtor = nodtor; - /* Cheap trick - &k cannot match any destructor pointer */ - while (a_cas_p(keys+j, 0, &k) - && (j=(j+1)%PTHREAD_KEYS_MAX) != i); - if (keys[j] != (void (*)(void *))&k) - return EAGAIN; - keys[j] = dtor; - *k = j; - return 0; + do { + if (!a_cas_p(keys+j, 0, dtor)) { + *k = j; + return 0; + } + } while ((j=(j+1)%PTHREAD_KEYS_MAX) != i); + return EAGAIN; } -- cgit v1.2.1