diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-05-25 05:21:07 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-05-25 05:21:07 +0000 |
| commit | 0a54ab53f2bbbd380b019dc665047fb3acf37e3a (patch) | |
| tree | cb9ed7fadb5d0b66c121ac42ab2c1b62d67a6b2e /nptl/sysdeps | |
| parent | ddfd0535776c47ec01231ac91fabe8b2e128cfa3 (diff) | |
| download | glibc-0a54ab53f2bbbd380b019dc665047fb3acf37e3a.tar glibc-0a54ab53f2bbbd380b019dc665047fb3acf37e3a.tar.gz glibc-0a54ab53f2bbbd380b019dc665047fb3acf37e3a.tar.bz2 glibc-0a54ab53f2bbbd380b019dc665047fb3acf37e3a.zip | |
* sysdeps/powerpc/tls.h (tcbhead_t): Add gscope_flag.
(THREAD_GSCOPE_FLAG_UNUSED, THREAD_GSCOPE_FLAG_USED,
THREAD_GSCOPE_FLAG_WAIT): Define.
(THREAD_GSCOPE_GET_FLAG, THREAD_GSCOPE_SET_FLAG,
THREAD_GSCOPE_RESET_FLAG, THREAD_GSCOPE_WAIT): Define.
* sysdeps/i386/tls.h (THREAD_GSCOPE_WAIT): Don't use
PTR_DEMANGLE.
(THREAD_GSCOPE_GET_FLAG): Define.
* sysdeps/x86_64/tls.h (THREAD_GSCOPE_GET_FLAG): Define.
* allocatestack.c (__wait_lookup_done): Use THREAD_GSCOPE_GET_FLAG
instead of ->header.gscope_flag directly.
Diffstat (limited to 'nptl/sysdeps')
| -rw-r--r-- | nptl/sysdeps/i386/tls.h | 11 | ||||
| -rw-r--r-- | nptl/sysdeps/powerpc/tls.h | 28 | ||||
| -rw-r--r-- | nptl/sysdeps/x86_64/tls.h | 1 |
3 files changed, 28 insertions, 12 deletions
diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h index 3bdf0f2b04..41e4327b4a 100644 --- a/nptl/sysdeps/i386/tls.h +++ b/nptl/sysdeps/i386/tls.h @@ -454,16 +454,9 @@ union user_desc_init while (0) #define THREAD_GSCOPE_SET_FLAG() \ THREAD_SETMEM (THREAD_SELF, header.gscope_flag, THREAD_GSCOPE_FLAG_USED) -#ifdef PTR_DEMANGLE -# define THREAD_GSCOPE_WAIT() \ - do { void (*ptr) (void) = GL(dl_wait_lookup_done); \ - PTR_DEMANGLE (ptr); \ - ptr (); \ - } while (0) -#else -# define THREAD_GSCOPE_WAIT() \ +#define THREAD_GSCOPE_GET_FLAG(descr) (descr)->header.gscope_flag +#define THREAD_GSCOPE_WAIT() \ GL(dl_wait_lookup_done) () -#endif #endif /* __ASSEMBLER__ */ diff --git a/nptl/sysdeps/powerpc/tls.h b/nptl/sysdeps/powerpc/tls.h index ddaafe23d0..136fe2a100 100644 --- a/nptl/sysdeps/powerpc/tls.h +++ b/nptl/sysdeps/powerpc/tls.h @@ -1,5 +1,5 @@ /* Definition for thread-local data handling. NPTL/PowerPC version. - Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2005, 2006, 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 @@ -63,10 +63,11 @@ typedef union dtv # include <nptl/descr.h> /* The stack_guard is accessed directly by GCC -fstack-protector code, - so it is a part of public ABI. The dtv and pointer_guard fields - are private. */ + so it is a part of public ABI. The dtv, pointer_guard and gscope_flag + fields are private. */ typedef struct { + int gscope_flag; uintptr_t pointer_guard; uintptr_t stack_guard; dtv_t *dtv; @@ -180,6 +181,27 @@ register void *__thread_register __asm__ ("r13"); different value to mean unset l_tls_offset. */ # define NO_TLS_OFFSET -1 +/* Get and set the global scope generation counter in the TCB head. */ +#define THREAD_GSCOPE_FLAG_UNUSED 0 +#define THREAD_GSCOPE_FLAG_USED 1 +#define THREAD_GSCOPE_FLAG_WAIT 2 +#define THREAD_GSCOPE_GET_FLAG(descr) \ + (((tcbhead_t *) ((char *) (descr) \ + + TLS_PRE_TCB_SIZE))[-1].gscope_flag) +#define THREAD_GSCOPE_RESET_FLAG() \ + do \ + { int __res \ + = atomic_exchange_rel (&THREAD_GSCOPE_GET_FLAG (THREAD_SELF), \ + THREAD_GSCOPE_FLAG_UNUSED); \ + if (__res == THREAD_GSCOPE_FLAG_WAIT) \ + lll_futex_wake (&THREAD_GSCOPE_GET_FLAG (THREAD_SELF), 1); \ + } \ + while (0) +#define THREAD_GSCOPE_SET_FLAG() \ + (THREAD_GSCOPE_GET_FLAG (THREAD_SELF) = THREAD_GSCOPE_FLAG_USED) +#define THREAD_GSCOPE_WAIT() \ + GL(dl_wait_lookup_done) () + #endif /* __ASSEMBLER__ */ #endif /* tls.h */ diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h index 5ddaafadad..ab6efc47c3 100644 --- a/nptl/sysdeps/x86_64/tls.h +++ b/nptl/sysdeps/x86_64/tls.h @@ -360,6 +360,7 @@ typedef struct while (0) #define THREAD_GSCOPE_SET_FLAG() \ THREAD_SETMEM (THREAD_SELF, header.gscope_flag, THREAD_GSCOPE_FLAG_USED) +#define THREAD_GSCOPE_GET_FLAG(descr) (descr)->header.gscope_flag #define THREAD_GSCOPE_WAIT() \ GL(dl_wait_lookup_done) () |