From 0153375730f494855fdb62f4e589f6d11a6563db Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 14 Dec 2001 06:47:35 +0000 Subject: [PATCH] (pthread_key_delete): Don't contact the thread manager if no threads have been created yet. --- linuxthreads/specific.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/linuxthreads/specific.c b/linuxthreads/specific.c index 1a0cab10b68..2dbf2055e59 100644 --- a/linuxthreads/specific.c +++ b/linuxthreads/specific.c @@ -102,25 +102,28 @@ int pthread_key_delete(pthread_key_t key) /* Set the value of the key to NULL in all running threads, so that if the key is reallocated later by pthread_key_create, its - associated values will be NULL in all threads. */ + associated values will be NULL in all threads. - { - struct pthread_key_delete_helper_args args; - struct pthread_request request; + Do nothing if no threads have been created yet. */ - args.idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE; - args.idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE; - args.self = 0; + if (__pthread_manager_request != -1) + { + struct pthread_key_delete_helper_args args; + struct pthread_request request; - request.req_thread = self; - request.req_kind = REQ_FOR_EACH_THREAD; - request.req_args.for_each.arg = &args; - request.req_args.for_each.fn = pthread_key_delete_helper; + args.idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE; + args.idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE; + args.self = 0; - TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request, - (char *) &request, sizeof(request))); - suspend(self); - } + request.req_thread = self; + request.req_kind = REQ_FOR_EACH_THREAD; + request.req_args.for_each.arg = &args; + request.req_args.for_each.fn = pthread_key_delete_helper; + + TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request, + (char *) &request, sizeof(request))); + suspend(self); + } pthread_mutex_unlock(&pthread_keys_mutex); return 0; -- 2.47.2