AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

NPTL: Clean up THREAD_SYSINFO macros.

Browse Source
This commit is contained in:
Roland McGrath 2014-10-17 15:03:00 -07:00
parent 184ee94010
commit 674b89786e
6 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,5 +1,16 @@
2014-10-17 Roland McGrath <roland@hack.frob.com>
* sysdeps/i386/nptl/tls.h
(THREAD_SELF_SYSINFO, THREAD_SYSINFO): Macros removed.
[NEED_DL_SYSINFO] (SETUP_THREAD_SYSINFO, CHECK_THREAD_SYSINFO):
New macros.
* sysdeps/ia64/nptl/tls.h [NEED_DL_SYSINFO]
(SETUP_THREAD_SYSINFO, CHECK_THREAD_SYSINFO): New macros.
* nptl/allocatestack.c (allocate_stack) [NEED_DL_SYSINFO]:
Call SETUP_THREAD_SYSINFO instead of doing an assignment.
* nptl/createthread.c (create_thread) [NEED_DL_SYSINFO]:
Call CHECK_THREAD_SYSINFO instead of doing an assert.
* nptl/nptl-init.c (__pthread_initialize_minimal_internal):
Conditionalize FUTEX_PRIVATE_FLAG and FUTEX_CLOCK_REALTIME probes
on [__NR_futex].

6
nptl/allocatestack.c
View File

@ -430,8 +430,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
#endif
#ifdef NEED_DL_SYSINFO
/* Copy the sysinfo value from the parent. */
THREAD_SYSINFO(pd) = THREAD_SELF_SYSINFO;
SETUP_THREAD_SYSINFO (pd);
#endif
/* The process ID is also the same as that of the caller. */
@ -567,8 +566,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
#endif
#ifdef NEED_DL_SYSINFO
/* Copy the sysinfo value from the parent. */
THREAD_SYSINFO(pd) = THREAD_SELF_SYSINFO;
SETUP_THREAD_SYSINFO (pd);
#endif
/* Don't allow setxid until cloned. */

2
nptl/createthread.c
View File

@ -234,7 +234,7 @@ create_thread (struct pthread *pd, const struct pthread_attr *attr,
}
#ifdef NEED_DL_SYSINFO
assert (THREAD_SELF_SYSINFO == THREAD_SYSINFO (pd));
CHECK_THREAD_SYSINFO (pd);
#endif
/* Determine whether the newly created threads has to be started

2
nptl/nptl-init.c
View File

@ -304,8 +304,10 @@ __pthread_initialize_minimal_internal (void)
/* Minimal initialization of the thread descriptor. */
struct pthread *pd = THREAD_SELF;
#ifdef __NR_set_tid_address
INTERNAL_SYSCALL_DECL (err);
pd->pid = pd->tid = INTERNAL_SYSCALL (set_tid_address, err, 1, &pd->tid);
#endif
THREAD_SETMEM (pd, specific[0], &pd->specific_1stblock[0]);
THREAD_SETMEM (pd, user_stack, true);
if (LLL_LOCK_INITIALIZER != 0)

9
sysdeps/i386/nptl/tls.h
View File

@ -141,9 +141,6 @@ union user_desc_init
# define GET_DTV(descr) \
(((tcbhead_t *) (descr))->dtv)
#define THREAD_SELF_SYSINFO THREAD_GETMEM (THREAD_SELF, header.sysinfo)
#define THREAD_SYSINFO(pd) ((pd)->header.sysinfo)
/* Macros to load from and store into segment registers. */
# ifndef TLS_GET_GS
# define TLS_GET_GS() \
@ -154,9 +151,13 @@ union user_desc_init
__asm ("movw %w0, %%gs" :: "q" (val))
# endif
#if defined NEED_DL_SYSINFO
#ifdef NEED_DL_SYSINFO
# define INIT_SYSINFO \
_head->sysinfo = GLRO(dl_sysinfo)
# define SETUP_THREAD_SYSINFO(pd) \
((pd)->header.sysinfo = THREAD_GETMEM (THREAD_SELF, header.sysinfo))
# define CHECK_THREAD_SYSINFO(pd) \
assert ((pd)->header.sysinfo == THREAD_GETMEM (THREAD_SELF, header.sysinfo))
#else
# define INIT_SYSINFO
#endif

6
sysdeps/ia64/nptl/tls.h
View File

@ -109,8 +109,12 @@ register struct pthread *__thread_self __asm__("r13");
#define THREAD_SYSINFO(pd) \
(((tcbhead_t *) ((char *) (pd) + TLS_PRE_TCB_SIZE))->__private)
#if defined NEED_DL_SYSINFO
#ifdef NEED_DL_SYSINFO
# define INIT_SYSINFO THREAD_SELF_SYSINFO = (void *) GLRO(dl_sysinfo)
# define SETUP_THREAD_SYSINFO(pd) \
(THREAD_SYSINFO (pd) = THREAD_SELF_SYSINFO)
# define CHECK_THREAD_SYSINFO(pd) \
assert (THREAD_SYSINFO (pd) == THREAD_SELF_SYSINFO)
#else
# define INIT_SYSINFO NULL
#endif