diff options
author | Thomas Schwinge <thomas@schwinge.name> | 2011-10-20 17:04:43 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@schwinge.name> | 2011-10-20 17:07:46 +0200 |
commit | 081c7aeb4d4de82ab615db565c60dd776a385c34 (patch) | |
tree | 2730963b4c865851b0a17d65d03ba7131245785f | |
parent | 75f6fe21205a87d1942492cb34e8aab482008a78 (diff) | |
parent | 577976c386d89696ec392fdfbb77ea153ddd6588 (diff) |
Merge branch 'tls'
Conflicts:
ChangeLog
Makefile
pthread/pt-exit.c
pthread/pt-internal.h
sysdeps/mach/hurd/ia32/pt-setup.c
sysdeps/mach/hurd/pt-docancel.c
sysdeps/mach/hurd/pt-sysdep.h
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | TODO | 3 | ||||
-rw-r--r-- | pthread/pt-create.c | 11 | ||||
-rw-r--r-- | pthread/pt-exit.c | 7 | ||||
-rw-r--r-- | pthread/pt-internal.h | 29 | ||||
-rw-r--r-- | sysdeps/mach/hurd/ia32/pt-machdep.c | 39 | ||||
-rw-r--r-- | sysdeps/mach/hurd/ia32/pt-setup.c | 9 | ||||
-rw-r--r-- | sysdeps/mach/hurd/pt-docancel.c | 6 | ||||
-rw-r--r-- | sysdeps/mach/hurd/pt-sysdep.h | 12 |
9 files changed, 100 insertions, 19 deletions
@@ -1,6 +1,6 @@ # # Copyright (C) 1994, 1995, 1996, 1997, 2000, 2002, 2004, 2005, 2006, 2007, -# 2008 Free Software Foundation, Inc. +# 2008, 2011 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -182,6 +182,7 @@ installhdrsubdir := . include ../Makeconf CPPFLAGS += \ + -DENABLE_TLS \ $(addprefix -I, $(SYSDEP_PATH)) \ -imacros $(srcdir)/include/libc-symbols.h \ -imacros $(srcdir)/not-in-libc.h @@ -140,6 +140,9 @@ Use them consistently and correctly and start by reading http://sources.redhat.com/ml/libc-alpha/2002-08/msg00278.html. +** TLS + Support for TLS is only implemented for Mach/Hurd (x86). + * L4 Specific Issues ** Stack *** Size diff --git a/pthread/pt-create.c b/pthread/pt-create.c index 8f62b78..346c697 100644 --- a/pthread/pt-create.c +++ b/pthread/pt-create.c @@ -129,6 +129,13 @@ __pthread_create_internal (struct __pthread **thread, if (err) goto failed_thread_alloc; +#ifdef ENABLE_TLS + pthread->tcb = _dl_allocate_tls (NULL); + if (!pthread->tcb) + goto failed_thread_tls_alloc; + pthread->tcb->tcb = pthread->tcb; +#endif /* ENABLE_TLS */ + /* And initialize the rest of the machine context. This may include additional machine- and system-specific initializations that prove convenient. */ @@ -194,6 +201,10 @@ __pthread_create_internal (struct __pthread **thread, failed_sigstate: __pthread_sigstate_destroy (pthread); failed_setup: +#ifdef ENABLE_TLS + _dl_deallocate_tls (pthread->tcb, 1); + failed_thread_tls_alloc: +#endif /* ENABLE_TLS */ __pthread_thread_dealloc (pthread); __pthread_thread_halt (pthread); failed_thread_alloc: diff --git a/pthread/pt-exit.c b/pthread/pt-exit.c index 3b3853e..c01efda 100644 --- a/pthread/pt-exit.c +++ b/pthread/pt-exit.c @@ -1,5 +1,5 @@ /* Thread termination. - Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2005, 2007, 2011 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 @@ -69,6 +69,11 @@ pthread_exit (void *status) if (self->cancel_state == PTHREAD_CANCEL_ENABLE && self->cancel_pending) status = PTHREAD_CANCELED; +#ifdef ENABLE_TLS + if (self->tcb) + _dl_deallocate_tls (self->tcb, 1); +#endif /* ENABLE_TLS */ + switch (self->state) { default: diff --git a/pthread/pt-internal.h b/pthread/pt-internal.h index cb441d0..3f69d2d 100644 --- a/pthread/pt-internal.h +++ b/pthread/pt-internal.h @@ -1,5 +1,5 @@ /* Internal defenitions for pthreads library. - Copyright (C) 2000, 2005, 2006, 2008 Free Software Foundation, Inc. + Copyright (C) 2000, 2005, 2006, 2007, 2008 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 @@ -54,6 +54,16 @@ enum pthread_state # define PTHREAD_SYSDEP_MEMBERS #endif +#ifdef ENABLE_TLS +/* Type of the TCB. */ +typedef struct +{ + void *tcb; /* Points to this structure. */ + void *dtv; /* Vector of pointers to TLS data. */ + thread_t self; /* This thread's control port. */ +} tcbhead_t; +#endif /* ENABLE_TLS */ + /* This structure describes a POSIX thread. */ struct __pthread { @@ -89,6 +99,10 @@ struct __pthread PTHREAD_SYSDEP_MEMBERS +#ifdef ENABLE_TLS + tcbhead_t *tcb; +#endif /* ENABLE_TLS */ + struct __pthread *next, **prevp; }; @@ -287,4 +301,17 @@ const struct __pthread_rwlockattr __pthread_default_rwlockattr; /* Default condition attributes. */ const struct __pthread_condattr __pthread_default_condattr; + +#ifdef ENABLE_TLS + +/* From glibc. */ + +/* Dynamic linker TLS allocation. */ +extern void *_dl_allocate_tls(void *); + +/* Dynamic linker TLS deallocation. */ +extern void _dl_deallocate_tls(void *, int); + +#endif /* ENABLE_TLS */ + #endif /* pt-internal.h */ diff --git a/sysdeps/mach/hurd/ia32/pt-machdep.c b/sysdeps/mach/hurd/ia32/pt-machdep.c index face46c..f3c8cf5 100644 --- a/sysdeps/mach/hurd/ia32/pt-machdep.c +++ b/sysdeps/mach/hurd/ia32/pt-machdep.c @@ -1,5 +1,5 @@ /* Machine dependent pthreads code. Hurd/i386 version. - Copyright (C) 2000,02 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2007 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 @@ -21,12 +21,28 @@ #include <mach.h> #include <mach/i386/thread_status.h> +#include <mach/i386/mach_i386.h> +#include <mach/mig_errors.h> #include <mach/thread_status.h> +#define HURD_TLS_DESC_DECL(desc, tcb) \ + struct descriptor desc = \ + { /* low word: */ \ + 0xffff /* limit 0..15 */ \ + | (((unsigned int) (tcb)) << 16) /* base 0..15 */ \ + , /* high word: */ \ + ((((unsigned int) (tcb)) >> 16) & 0xff) /* base 16..23 */ \ + | ((0x12 | 0x60 | 0x80) << 8) /* access = ACC_DATA_W|ACC_PL_U|ACC_P */ \ + | (0xf << 16) /* limit 16..19 */ \ + | ((4 | 8) << 20) /* granularity = SZ_32|SZ_G */ \ + | (((unsigned int) (tcb)) & 0xff000000) /* base 24..31 */ \ + } + int -__thread_set_pcsp (thread_t thread, +__thread_set_pcsptp (thread_t thread, int set_ip, void *ip, - int set_sp, void *sp) + int set_sp, void *sp, + int set_tp, void *tp) { error_t err; struct i386_thread_state state; @@ -34,7 +50,7 @@ __thread_set_pcsp (thread_t thread, state_count = i386_THREAD_STATE_COUNT; - err = __thread_get_state (thread, i386_THREAD_STATE, + err = __thread_get_state (thread, i386_REGS_SEGS_STATE, (thread_state_t) &state, &state_count); if (err) return err; @@ -43,8 +59,21 @@ __thread_set_pcsp (thread_t thread, state.uesp = (unsigned int) sp; if (set_ip) state.eip = (unsigned int) ip; + if (set_tp) { + HURD_TLS_DESC_DECL(desc, tp); + int sel; + + asm ("mov %%gs, %w0" : "=q" (sel) : "0" (0)); + if (__builtin_expect (sel, 0x48) & 4) /* LDT selector */ + err = __i386_set_ldt (thread, sel, &desc, 1); + else + err = __i386_set_gdt (thread, &sel, desc); + if (err) + return err; + state.gs = sel; + } - err = __thread_set_state (thread, i386_THREAD_STATE, + err = __thread_set_state (thread, i386_REGS_SEGS_STATE, (thread_state_t) &state, i386_THREAD_STATE_COUNT); if (err) diff --git a/sysdeps/mach/hurd/ia32/pt-setup.c b/sysdeps/mach/hurd/ia32/pt-setup.c index 7eb223c..5420dc8 100644 --- a/sysdeps/mach/hurd/ia32/pt-setup.c +++ b/sysdeps/mach/hurd/ia32/pt-setup.c @@ -1,5 +1,5 @@ /* Setup thread stack. Hurd/i386 version. - Copyright (C) 2000, 2002, 2005, 2008 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2005, 2007, 2008 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 @@ -91,12 +91,15 @@ __pthread_setup (struct __pthread *thread, thread->mcontext.pc = entry_point; thread->mcontext.sp = stack_setup (thread, start_routine, arg); + thread->tcb->self = thread->kernel_thread; + ktid = __mach_thread_self (); if (thread->kernel_thread != ktid) { - err = __thread_set_pcsp (thread->kernel_thread, + err = __thread_set_pcsptp (thread->kernel_thread, 1, thread->mcontext.pc, - 1, thread->mcontext.sp); + 1, thread->mcontext.sp, + 1, thread->tcb); assert_perror (err); } __mach_port_deallocate (__mach_task_self (), ktid); diff --git a/sysdeps/mach/hurd/pt-docancel.c b/sysdeps/mach/hurd/pt-docancel.c index b81a5c7..105c6fd 100644 --- a/sysdeps/mach/hurd/pt-docancel.c +++ b/sysdeps/mach/hurd/pt-docancel.c @@ -1,5 +1,5 @@ /* Cancel a thread. - Copyright (C) 2002, 2008 Free Software Foundation, Inc. + Copyright (C) 2002, 2007, 2008 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 @@ -52,8 +52,8 @@ __pthread_do_cancel (struct __pthread *p) err = __thread_abort (p->kernel_thread); assert_perror (err); - err = __thread_set_pcsp (p->kernel_thread, - 1, (void *) call_exit, 0, 0); + err = __thread_set_pcsptp (p->kernel_thread, + 1, (void *) call_exit, 0, 0, 0, 0); assert_perror (err); err = __thread_resume (p->kernel_thread); diff --git a/sysdeps/mach/hurd/pt-sysdep.h b/sysdeps/mach/hurd/pt-sysdep.h index f14a136..13e235d 100644 --- a/sysdeps/mach/hurd/pt-sysdep.h +++ b/sysdeps/mach/hurd/pt-sysdep.h @@ -1,5 +1,5 @@ /* Internal defenitions for pthreads library. - Copyright (C) 2000, 2002, 2008 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2007, 2008 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 @@ -60,11 +60,13 @@ __pthread_stack_dealloc (void *stackaddr, size_t stacksize) __vm_deallocate (__mach_task_self (), (vm_offset_t) stackaddr, stacksize); } -/* Change thread THREAD's program counter to PC if SET_PC is true and - its stack pointer to SP if SET_IP is true. */ -extern int __thread_set_pcsp (thread_t thread, +/* Change thread THREAD's program counter to PC if SET_PC is true, + its stack pointer to SP if SET_IP is true, and its thread pointer + to TP if SET_TP is true. */ +extern int __thread_set_pcsptp (thread_t thread, int set_pc, void *pc, - int set_sp, void *sp); + int set_sp, void *sp, + int set_tp, void *tp); #endif /* pt-sysdep.h */ |