diff options
| -rw-r--r-- | nptl/ChangeLog | 7 | ||||
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/allocatestack.c | 4 | ||||
| -rw-r--r-- | nptl/pthread_create.c | 4 | ||||
| -rw-r--r-- | nptl/tst-key4.c | 117 |
5 files changed, 129 insertions, 5 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 0e8fe795d2..fc30d8db0e 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2003-02-20 Ulrich Drepper <drepper@redhat.com> + + * pthread_create.c (deallocate_tsd): Clear the entire first block + of TSD. + * Makefile (tests): Add tst-key4. + * tst-key4.c: New file. + 2003-02-18 Ulrich Drepper <drepper@redhat.com> * Makefile (tests): Add tst-basic7. diff --git a/nptl/Makefile b/nptl/Makefile index 24bb8de833..7e710082e4 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -133,7 +133,7 @@ tests = tst-attr1 tst-attr2 \ tst-rwlock1 tst-rwlock2 tst-rwlock3 tst-rwlock4 tst-rwlock5 \ tst-rwlock6 tst-rwlock7 \ tst-once1 tst-once2 tst-once3 tst-once4 \ - tst-key1 tst-key2 tst-key3 \ + tst-key1 tst-key2 tst-key3 tst-key4 \ tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 \ tst-barrier1 tst-barrier2 tst-barrier3 \ tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \ diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index 57cb2717ec..94d05b2721 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -145,7 +145,7 @@ get_cached_stack (size_t *sizep, void **memp) /* Release the lock early. */ lll_unlock (stack_cache_lock); - + /* Report size and location of the stack to the caller. */ *sizep = result->stackblock_size; *memp = result->stackblock; @@ -462,7 +462,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, *pdp = pd; #if TLS_TCB_AT_TP - /* The stack begin before the TCB and the static TLS block. */ + /* The stack begins before the TCB and the static TLS block. */ *stack = ((char *) (pd + 1) - __static_tls_size); #else # error "Implement me" diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c index 74f3e9a82a..89152ffeb9 100644 --- a/nptl/pthread_create.c +++ b/nptl/pthread_create.c @@ -162,8 +162,8 @@ deallocate_tsd (struct pthread *pd) } else /* Clear the memory of the first block for reuse. */ - memset (pd->specific[0], '\0', - sizeof (struct pthread_key_data)); + memset (&pd->specific_1stblock, '\0', + sizeof (pd->specific_1stblock)); } else idx += PTHREAD_KEY_1STLEVEL_SIZE; diff --git a/nptl/tst-key4.c b/nptl/tst-key4.c new file mode 100644 index 0000000000..5e641ee32b --- /dev/null +++ b/nptl/tst-key4.c @@ -0,0 +1,117 @@ +/* Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. + + 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 <limits.h> +#include <pthread.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + + +#ifdef PTHREAD_KEYS_MAX +const int max = PTHREAD_KEYS_MAX; +#else +const int max = _POSIX_THREAD_KEYS_MAX; +#endif +static pthread_key_t *keys; + + +static void * +tf1 (void *arg) +{ + int i; + for (i = 0; i < max; ++i) + if (pthread_setspecific (keys[i], (void *) (long int) (i + 1)) != 0) + { + puts ("setspecific failed"); + exit (1); + } + + return NULL; +} + + +static void * +tf2 (void *arg) +{ + int i; + for (i = 0; i < max; ++i) + if (pthread_getspecific (keys[i]) != NULL) + { + printf ("getspecific for key %d not NULL\n", i); + exit (1); + } + + return NULL; +} + + +int +do_test (void) +{ + keys = alloca (max * sizeof (pthread_key_t)); + + int i; + for (i = 0; i < max; ++i) + if (pthread_key_create (&keys[i], NULL) != 0) + { + puts ("key_create failed"); + exit (1); + } + + for (i = 0; i < 10; ++i) + { + int j; +#define N 2 + pthread_t th[N]; + for (j = 0; j < N; ++j) + if (pthread_create (&th[j], NULL, tf1, NULL) != 0) + { + puts ("1st create failed"); + exit (1); + } + + for (j = 0; j < N; ++j) + if (pthread_join (th[j], NULL) != 0) + { + puts ("1st join failed"); + exit (1); + } + + for (j = 0; j < N; ++j) + if (pthread_create (&th[j], NULL, tf2, NULL) != 0) + { + puts ("2nd create failed"); + exit (1); + } + + for (j = 0; j < N; ++j) + if (pthread_join (th[j], NULL) != 0) + { + puts ("2nd join failed"); + exit (1); + } + } + + return 0; +} + + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |