diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | linuxthreads/ChangeLog | 7 | ||||
| -rw-r--r-- | linuxthreads/Makefile | 4 | ||||
| -rw-r--r-- | linuxthreads/specific.c | 14 | ||||
| -rw-r--r-- | linuxthreads/tst-tsd1.c | 118 | ||||
| -rw-r--r-- | nscd/nscd.init | 10 |
6 files changed, 148 insertions, 10 deletions
@@ -1,3 +1,8 @@ +2005-02-07 Jakub Jelinek <jakub@redhat.com> + + * nscd/nscd.init (reload): Print Reloading nscd: before and a newline + after the status string printed by killproc. + 2004-11-18 Alexandre Oliva <aoliva@redhat.com> * manual/.cvsignore: Add dir-add.texi. diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 7b04bc5bc0..19ac84c98d 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,10 @@ +2005-02-07 Jakub Jelinek <jakub@redhat.com> + + * specific.c (pthread_key_delete): If pthread_create has not been + called yet, clear p_specific for the current thread. + * Makefile (tests): Add tst-tsd1. + * tst-tsd1.c: New test. + 2005-01-08 Andreas Jaeger <aj@suse.de> * pthread.c (init_one_static_tls): Adjust initialization of DTV diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile index 3d8ab38647..4dc890d57a 100644 --- a/linuxthreads/Makefile +++ b/linuxthreads/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1996-2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 1996-2003, 2004, 2005 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -111,7 +111,7 @@ tests = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 $(librt-tests) ex12 ex13 joinrace \ ex17 ex18 tst-cancel tst-context bug-sleep \ tst-cancel1 tst-cancel2 tst-cancel3 tst-cancel4 tst-cancel5 \ tst-cancel6 tst-cancel7 tst-cancel8 tst-popen tst-popen2 tst-attr1 \ - tst-stack1 tst-align + tst-stack1 tst-align tst-tsd1 test-srcs = tst-signal # These tests are linked with libc before libpthread tests-reverse += tst-cancel5 diff --git a/linuxthreads/specific.c b/linuxthreads/specific.c index f54fabaeb9..92eec3d99a 100644 --- a/linuxthreads/specific.c +++ b/linuxthreads/specific.c @@ -104,15 +104,16 @@ int pthread_key_delete(pthread_key_t key) that if the key is reallocated later by pthread_key_create, its associated values will be NULL in all threads. - Do nothing if no threads have been created yet. */ + If no threads have been created yet, clear it just in the + current thread. */ + struct pthread_key_delete_helper_args args; + args.idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE; + args.idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE; if (__pthread_manager_request != -1) { - struct pthread_key_delete_helper_args args; struct pthread_request request; - args.idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE; - args.idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE; args.self = 0; request.req_thread = self; @@ -124,6 +125,11 @@ int pthread_key_delete(pthread_key_t key) (char *) &request, sizeof(request))); suspend(self); } + else + { + if (self->p_specific[args.idx1st] != NULL) + self->p_specific[args.idx1st][args.idx2nd] = NULL; + } pthread_mutex_unlock(&pthread_keys_mutex); return 0; diff --git a/linuxthreads/tst-tsd1.c b/linuxthreads/tst-tsd1.c new file mode 100644 index 0000000000..ba7973f1c4 --- /dev/null +++ b/linuxthreads/tst-tsd1.c @@ -0,0 +1,118 @@ +/* Copyright (C) 2002, 2005 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <pthread.h> +#include <stdio.h> +#include <string.h> + + +static int +do_test (void) +{ + pthread_key_t key1; + pthread_key_t key2; + void *value; + int result = 0; + int err; + + err = pthread_key_create (&key1, NULL); + if (err != 0) + { + printf ("1st key_create failed: %s\n", strerror (err)); + return 1; + } + + /* Initial value must be NULL. */ + value = pthread_getspecific (key1); + if (value != NULL) + { + puts ("1st getspecific != NULL"); + result = 1; + } + + err = pthread_setspecific (key1, (void *) -2l); + if (err != 0) + { + printf ("1st setspecific failed: %s\n", strerror (err)); + return 1; + } + + value = pthread_getspecific (key1); + if (value == NULL) + { + puts ("2nd getspecific == NULL\n"); + result = 1; + } + else if (value != (void *) -2l) + { + puts ("2nd getspecific != -2l\n"); + result = 1; + } + + err = pthread_setspecific (key1, (void *) -3l); + if (err != 0) + { + printf ("2nd setspecific failed: %s\n", strerror (err)); + return 1; + } + + value = pthread_getspecific (key1); + if (value == NULL) + { + puts ("3rd getspecific == NULL\n"); + result = 1; + } + else if (value != (void *) -3l) + { + puts ("3rd getspecific != -2l\n"); + result = 1; + } + + err = pthread_key_delete (key1); + if (err != 0) + { + printf ("key_delete failed: %s\n", strerror (err)); + result = 1; + } + + + err = pthread_key_create (&key2, NULL); + if (err != 0) + { + printf ("2nd key_create failed: %s\n", strerror (err)); + return 1; + } + + if (key1 != key2) + puts ("key1 != key2; no more tests performed"); + else + { + value = pthread_getspecific (key2); + if (value != NULL) + { + puts ("4th getspecific != NULL"); + result = 1; + } + } + + return result; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/nscd/nscd.init b/nscd/nscd.init index d5c1cb9ae3..23e20c3a82 100644 --- a/nscd/nscd.init +++ b/nscd/nscd.init @@ -88,9 +88,9 @@ case "$1" in RETVAL=$? ;; status) - status nscd + status nscd RETVAL=$? - ;; + ;; restart) restart RETVAL=$? @@ -100,9 +100,11 @@ case "$1" in RETVAL=$? ;; reload) - killproc /usr/sbin/nscd -HUP + echo -n $"Reloading $prog: " + killproc /usr/sbin/nscd -HUP RETVAL=$? - ;; + echo + ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" RETVAL=1 |