mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-08 17:42:12 +03:00
Update.
2002-02-07 Ulrich Drepper <drepper@redhat.com> * sysdeps/generic/dl-tls.c (_dl_determine_tlsoffset): Account for alignment of the TCB and store total size and alignment of static TLS block in _dl_tls_static_size and _dl_tls_static_align. tls_index is a typedef. * sysdeps/generic/ldsodefs.h: Declare _dl_tls_static_size and _dl_tls_static_align. * sysdeps/i386/dl-tls.h: tls_index is a typedef. * elf/dl-support.c: Define _dl_tls_static_size and _dl_tls_static_align.
This commit is contained in:
@@ -1,3 +1,14 @@
|
||||
2002-02-07 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* internals.h: Move declarations/definitions of
|
||||
__pthread_initial_thread_bos, __pthread_initial_thread,
|
||||
__pthread_manager_thread_bos, __pthread_manager_thread_tos,
|
||||
__pthread_manager_thread, __pthread_nonstandard_stacks, STACK_SIZE,
|
||||
CURRENT_STACK_FRAME, __pthread_find_self, and thread_self...
|
||||
* descr.h: ...here.
|
||||
* sysdeps/i386/tls.h: Add TLS definitions also for !FLOATING_STACKS.
|
||||
Define THREAD_GETMEM accordingly.
|
||||
|
||||
2002-02-06 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* sysdeps/i386/tls.h: Include <stddef.h> for size_t.
|
||||
|
@@ -165,4 +165,71 @@ struct _pthread_descr_struct {
|
||||
32 bytes might give better cache
|
||||
utilization. */
|
||||
|
||||
|
||||
|
||||
/* Limit between the stack of the initial thread (above) and the
|
||||
stacks of other threads (below). Aligned on a STACK_SIZE boundary.
|
||||
Initially 0, meaning that the current thread is (by definition)
|
||||
the initial thread. */
|
||||
|
||||
extern char *__pthread_initial_thread_bos;
|
||||
|
||||
/* Descriptor of the initial thread */
|
||||
|
||||
extern struct _pthread_descr_struct __pthread_initial_thread;
|
||||
|
||||
/* Limits of the thread manager stack. */
|
||||
|
||||
extern char *__pthread_manager_thread_bos;
|
||||
extern char *__pthread_manager_thread_tos;
|
||||
|
||||
/* Descriptor of the manager thread */
|
||||
|
||||
extern struct _pthread_descr_struct __pthread_manager_thread;
|
||||
|
||||
/* Indicate whether at least one thread has a user-defined stack (if 1),
|
||||
or all threads have stacks supplied by LinuxThreads (if 0). */
|
||||
|
||||
extern int __pthread_nonstandard_stacks;
|
||||
|
||||
/* The max size of the thread stack segments. If the default
|
||||
THREAD_SELF implementation is used, this must be a power of two and
|
||||
a multiple of PAGE_SIZE. */
|
||||
#ifndef STACK_SIZE
|
||||
#define STACK_SIZE (2 * 1024 * 1024)
|
||||
#endif
|
||||
|
||||
/* Get some notion of the current stack. Need not be exactly the top
|
||||
of the stack, just something somewhere in the current frame. */
|
||||
#ifndef CURRENT_STACK_FRAME
|
||||
#define CURRENT_STACK_FRAME ({ char __csf; &__csf; })
|
||||
#endif
|
||||
|
||||
/* Recover thread descriptor for the current thread */
|
||||
|
||||
extern pthread_descr __pthread_find_self (void) __attribute__ ((const));
|
||||
|
||||
static inline pthread_descr thread_self (void) __attribute__ ((const));
|
||||
static inline pthread_descr thread_self (void)
|
||||
{
|
||||
#ifdef THREAD_SELF
|
||||
return THREAD_SELF;
|
||||
#else
|
||||
char *sp = CURRENT_STACK_FRAME;
|
||||
if (sp >= __pthread_initial_thread_bos)
|
||||
return &__pthread_initial_thread;
|
||||
else if (sp >= __pthread_manager_thread_bos
|
||||
&& sp < __pthread_manager_thread_tos)
|
||||
return &__pthread_manager_thread;
|
||||
else if (__pthread_nonstandard_stacks)
|
||||
return __pthread_find_self();
|
||||
else
|
||||
#ifdef _STACK_GROWS_DOWN
|
||||
return (pthread_descr)(((unsigned long)sp | (STACK_SIZE-1))+1) - 1;
|
||||
#else
|
||||
return (pthread_descr)((unsigned long)sp &~ (STACK_SIZE-1));
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif /* descr.h */
|
||||
|
@@ -110,30 +110,10 @@ extern int __pthread_sig_debug;
|
||||
|
||||
extern struct pthread_handle_struct __pthread_handles[PTHREAD_THREADS_MAX];
|
||||
|
||||
/* Descriptor of the initial thread */
|
||||
|
||||
extern struct _pthread_descr_struct __pthread_initial_thread;
|
||||
|
||||
/* Descriptor of the manager thread */
|
||||
|
||||
extern struct _pthread_descr_struct __pthread_manager_thread;
|
||||
|
||||
/* Descriptor of the main thread */
|
||||
|
||||
extern pthread_descr __pthread_main_thread;
|
||||
|
||||
/* Limit between the stack of the initial thread (above) and the
|
||||
stacks of other threads (below). Aligned on a STACK_SIZE boundary.
|
||||
Initially 0, meaning that the current thread is (by definition)
|
||||
the initial thread. */
|
||||
|
||||
extern char *__pthread_initial_thread_bos;
|
||||
|
||||
/* Indicate whether at least one thread has a user-defined stack (if 1),
|
||||
or all threads have stacks supplied by LinuxThreads (if 0). */
|
||||
|
||||
extern int __pthread_nonstandard_stacks;
|
||||
|
||||
/* File descriptor for sending requests to the thread manager.
|
||||
Initially -1, meaning that __pthread_initialize_manager must be called. */
|
||||
|
||||
@@ -143,11 +123,6 @@ extern int __pthread_manager_request;
|
||||
|
||||
extern int __pthread_manager_reader;
|
||||
|
||||
/* Limits of the thread manager stack. */
|
||||
|
||||
extern char *__pthread_manager_thread_bos;
|
||||
extern char *__pthread_manager_thread_tos;
|
||||
|
||||
#ifdef FLOATING_STACKS
|
||||
/* Maximum stack size. */
|
||||
extern size_t __pthread_max_stacksize;
|
||||
@@ -202,13 +177,6 @@ static inline int nonexisting_handle(pthread_handle h, pthread_t id)
|
||||
#define PAGE_SIZE (sysconf (_SC_PAGE_SIZE))
|
||||
#endif
|
||||
|
||||
/* The max size of the thread stack segments. If the default
|
||||
THREAD_SELF implementation is used, this must be a power of two and
|
||||
a multiple of PAGE_SIZE. */
|
||||
#ifndef STACK_SIZE
|
||||
#define STACK_SIZE (2 * 1024 * 1024)
|
||||
#endif
|
||||
|
||||
/* The initial size of the thread stack. Must be a multiple of PAGE_SIZE. */
|
||||
#ifndef INITIAL_STACK_SIZE
|
||||
#define INITIAL_STACK_SIZE (4 * PAGE_SIZE)
|
||||
@@ -227,39 +195,6 @@ static inline int nonexisting_handle(pthread_handle h, pthread_t id)
|
||||
#define THREAD_STACK_START_ADDRESS __pthread_initial_thread_bos
|
||||
#endif
|
||||
|
||||
/* Get some notion of the current stack. Need not be exactly the top
|
||||
of the stack, just something somewhere in the current frame. */
|
||||
#ifndef CURRENT_STACK_FRAME
|
||||
#define CURRENT_STACK_FRAME ({ char __csf; &__csf; })
|
||||
#endif
|
||||
|
||||
/* Recover thread descriptor for the current thread */
|
||||
|
||||
extern pthread_descr __pthread_find_self (void) __attribute__ ((const));
|
||||
|
||||
static inline pthread_descr thread_self (void) __attribute__ ((const));
|
||||
static inline pthread_descr thread_self (void)
|
||||
{
|
||||
#ifdef THREAD_SELF
|
||||
return THREAD_SELF;
|
||||
#else
|
||||
char *sp = CURRENT_STACK_FRAME;
|
||||
if (sp >= __pthread_initial_thread_bos)
|
||||
return &__pthread_initial_thread;
|
||||
else if (sp >= __pthread_manager_thread_bos
|
||||
&& sp < __pthread_manager_thread_tos)
|
||||
return &__pthread_manager_thread;
|
||||
else if (__pthread_nonstandard_stacks)
|
||||
return __pthread_find_self();
|
||||
else
|
||||
#ifdef _STACK_GROWS_DOWN
|
||||
return (pthread_descr)(((unsigned long)sp | (STACK_SIZE-1))+1) - 1;
|
||||
#else
|
||||
return (pthread_descr)((unsigned long)sp &~ (STACK_SIZE-1));
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
/* If MEMORY_BARRIER isn't defined in pt-machine.h, assume the architecture
|
||||
doesn't need a memory barrier instruction (e.g. Intel x86). Some
|
||||
architectures distinguish between full, read and write barriers. */
|
||||
|
@@ -42,7 +42,7 @@ typedef struct
|
||||
|
||||
|
||||
/* We can support TLS only if the floating-stack support is available. */
|
||||
#if FLOATING_STACKS && defined HAVE_TLS_SUPPORT
|
||||
#ifdef HAVE_TLS_SUPPORT
|
||||
|
||||
/* Get system call information. */
|
||||
# include <sysdep.h>
|
||||
@@ -94,11 +94,16 @@ typedef struct
|
||||
|
||||
|
||||
/* Return the address of the dtv for the current thread. */
|
||||
# define THREAD_DTV() \
|
||||
# if FLOATING_STACKS
|
||||
# define THREAD_DTV() \
|
||||
({ struct _pthread_descr_struct *__descr; \
|
||||
THREAD_GETMEM (__descr, p_header.data.dtvp); })
|
||||
# else
|
||||
# define THREAD_DTV() \
|
||||
({ struct _pthread_descr_struct *__descr = thread_self (); \
|
||||
THREAD_GETMEM (__descr, p_header.data.dtvp); })
|
||||
# endif
|
||||
|
||||
|
||||
#endif
|
||||
#endif /* HAVE_TLS_SUPPORT */
|
||||
|
||||
#endif /* tls.h */
|
||||
|
Reference in New Issue
Block a user