diff options
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 13 | ||||
| -rw-r--r-- | linuxthreads/Makefile | 14 | ||||
| -rw-r--r-- | linuxthreads/manager.c | 7 | ||||
| -rw-r--r-- | linuxthreads/pthread.c | 17 | ||||
| -rw-r--r-- | linuxthreads/tst-stack1.c | 98 |
5 files changed, 142 insertions, 7 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 882c478aa4..7691b94ac4 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,16 @@ +2003-12-17 Jakub Jelinek <jakub@redhat.com> + + * manager.c (pthread_free): Call _dl_deallocate_tls even for + p_userstack threads. + * pthread.c (__pthread_initialize_manager): Call _dl_deallocate_tls + on error. + (pthread_onexit_process): Update comment. + * Makefile (tests): Add tst-stack1. Depend on $(objpfx)tst-stack1-mem. + (generated): Add tst-stack1.mtrace and tst-stack1-mem. + (tst-stack1-ENV): Set. + ($(objpfx)tst-stack1-mem): New. + * tst-stack1.c: New test. + 2003-12-16 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/tcb-offsets.sym [!__powerpc64__]: Remove diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile index f3a9c02e5f..df7367b2b3 100644 --- a/linuxthreads/Makefile +++ b/linuxthreads/Makefile @@ -109,11 +109,14 @@ tests = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 $(librt-tests) ex12 ex13 joinrace \ tststack $(tests-nodelete-$(have-z-nodelete)) ecmutex ex14 ex15 ex16 \ 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-cancel6 tst-cancel7 tst-cancel8 tst-popen tst-popen2 tst-attr1 \ + tst-stack1 test-srcs = tst-signal # These tests are linked with libc before libpthread tests-reverse += tst-cancel5 +generated += tst-stack1.mtrace tst-stack1-mem + ifeq ($(build-static),yes) tests += tststatic tst-static-locale tst-cancel-static tests-static += tststatic tst-static-locale tst-cancel-static @@ -139,6 +142,15 @@ tst-tls1modd.so-no-z-defs = yes tst-tls1mode.so-no-z-defs = yes tst-tls1modf.so-no-z-defs = yes +tests: $(objpfx)tst-stack1-mem +tst-stack1-ENV = MALLOC_TRACE=$(objpfx)tst-stack1.mtrace + +# There are still up to 3 objects unfreed: +# manager thread's stack, tls block and dtv +$(objpfx)tst-stack1-mem: $(objpfx)tst-stack1.out + $(common-objpfx)malloc/mtrace $(objpfx)tst-stack1.mtrace > $@ \ + || [ `grep ^0 $@ | wc -l` -le 3 ] + $(test-modules): $(objpfx)%.so: $(objpfx)%.os $(common-objpfx)shlib.lds $(build-module) diff --git a/linuxthreads/manager.c b/linuxthreads/manager.c index 462ce4a0d4..876dd32772 100644 --- a/linuxthreads/manager.c +++ b/linuxthreads/manager.c @@ -903,13 +903,14 @@ static void pthread_free(pthread_descr th) /* Unmap the stack. */ munmap(guardaddr, stacksize + guardsize); + } + #ifdef USE_TLS # if TLS_DTV_AT_TP - th = (pthread_descr) ((char *) th + TLS_PRE_TCB_SIZE); + th = (pthread_descr) ((char *) th + TLS_PRE_TCB_SIZE); # endif - _dl_deallocate_tls (th, true); + _dl_deallocate_tls (th, true); #endif - } } /* Handle threads that have exited */ diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c index 11d2ef7dd1..124aa5243d 100644 --- a/linuxthreads/pthread.c +++ b/linuxthreads/pthread.c @@ -654,7 +654,7 @@ int __pthread_initialize_manager(void) #ifdef USE_TLS /* Allocate memory for the thread descriptor and the dtv. */ - tcbp = _dl_allocate_tls (NULL); + tcbp = _dl_allocate_tls (NULL); if (tcbp == NULL) { free(__pthread_manager_thread_bos); __libc_close(manager_pipe[0]); @@ -783,6 +783,9 @@ int __pthread_initialize_manager(void) #endif } if (__builtin_expect (pid, 0) == -1) { +#ifdef USE_TLS + _dl_deallocate_tls (tcbp, true); +#endif free(__pthread_manager_thread_bos); __libc_close(manager_pipe[0]); __libc_close(manager_pipe[1]); @@ -1014,8 +1017,16 @@ static void pthread_onexit_process(int retcode, void *arg) waitpid(__pthread_manager_thread.p_pid, NULL, __WCLONE); #endif /* Since all threads have been asynchronously terminated - (possibly holding locks), free cannot be used any more. */ - /*free (__pthread_manager_thread_bos);*/ + (possibly holding locks), free cannot be used any more. + For mtrace, we'd like to print something though. */ + /* #ifdef USE_TLS + tcbhead_t *tcbp = (tcbhead_t *) manager_thread; + # if TLS_DTV_AT_TP + tcbp = (tcbhead_t) ((char *) tcbp + TLS_PRE_TCB_SIZE); + # endif + _dl_deallocate_tls (tcbp, true); + #endif + free (__pthread_manager_thread_bos); */ __pthread_manager_thread_bos = __pthread_manager_thread_tos = NULL; } } diff --git a/linuxthreads/tst-stack1.c b/linuxthreads/tst-stack1.c new file mode 100644 index 0000000000..fa9aeddd9c --- /dev/null +++ b/linuxthreads/tst-stack1.c @@ -0,0 +1,98 @@ +/* Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Jakub Jelinek <jakub@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. */ + +/* Test whether pthread_create/pthread_join with user defined stacks + doesn't leak memory. */ + +#include <limits.h> +#include <mcheck.h> +#include <pthread.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> + +static int seen; + +static void * +tf (void *p) +{ + ++seen; + return NULL; +} + +static int +do_test (void) +{ + mtrace (); + + void *stack; + int res = posix_memalign (&stack, getpagesize (), 4 * PTHREAD_STACK_MIN); + if (res) + { + printf ("malloc failed %s\n", strerror (res)); + return 1; + } + + pthread_attr_t attr; + pthread_attr_init (&attr); + + int result = 0; + res = pthread_attr_setstack (&attr, stack, 4 * PTHREAD_STACK_MIN); + if (res) + { + printf ("pthread_attr_setstack failed %d\n", res); + result = 1; + } + + for (int i = 0; i < 16; ++i) + { + /* Create the thread. */ + pthread_t th; + res = pthread_create (&th, &attr, tf, NULL); + if (res) + { + printf ("pthread_create failed %d\n", res); + result = 1; + } + else + { + res = pthread_join (th, NULL); + if (res) + { + printf ("pthread_join failed %d\n", res); + result = 1; + } + } + } + + pthread_attr_destroy (&attr); + + if (seen != 16) + { + printf ("seen %d != 16\n", seen); + result = 1; + } + + free (stack); + return result; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |