mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 15:30:07 +00:00
6162364368
2003-06-22 Ulrich Drepper <drepper@redhat.com> * pthreadP.h (__pthread_mutex_init_internal): Mark hidden. (__pthread_mutex_lock_internal): Likewise. (__pthread_mutex_unlock_internal): Likewise. (__pthread_mutex_unlock_usercnt): Declare. * pthread_mutex_destroy.c: Always fail if used in any way. * pthread_mutex_init.c: Update comment. * pthread_mutex_lock.c: If NO_INCR is not defined adjust __nusers. * pthread_mutex_timedlock.c: Adjust __nusers. * pthread_mutex_trylock.c: Adjust __nusers. * pthread_mutex_unlock.c: Old code is in __pthread_mutex_unlock_usercnt and public interfaces are wrapper with pass additional parameter. __pthread_mutex_unlock_usercnt does not adjust __nusers if second parameter zero. * tst-mutex8.c: New file. * Makefile (tests): Add tst-mutex8. * sysdeps/pthread/pthread_cond_timedwait.c: Call __pthread_mutex_unlock_usercnt. * sysdeps/pthread/pthread_cond_wait.c: Likewise. * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S: Likewise. * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Likewise. * sysdeps/unix/sysv/linux/pthread_mutex_cond_lock.c: Define NO_INCR. * sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h (pthread_mutex_t): Add __nusers. * sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h: Likewise. * pthread_mutex_lock.c: Don't store THREAD_ID in __owner, use TID. * pthread_mutex_timedlock.c: Likewise. * pthread_mutex_trylock.c: Adjust __nusers. * pthread_mutex_unlock.c: Compare with TID not THREAD_ID. * tst-mutex9.c: New file. * Makefile (tests): Add tst-mutex9. * sysdeps/i386/tls.h: Remove THREAD_ID definition. * sysdeps/ia64/tls.h: Likewise. * sysdeps/powerpc/tls.h: Likewise. * sysdeps/s390/tls.h: Likewise. * sysdeps/sh/tls.h: Likewise. * sysdeps/x86_64/tls.h: Likewise. * sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h (pthread_mutex_t): Change type of __owner. * sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h: Likewise.
137 lines
4.0 KiB
C
137 lines
4.0 KiB
C
/* Definition for thread-local data handling. NPTL/SH version.
|
|
Copyright (C) 2003 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
|
|
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. */
|
|
|
|
#ifndef _TLS_H
|
|
#define _TLS_H
|
|
|
|
# include <dl-sysdep.h>
|
|
|
|
#ifndef __ASSEMBLER__
|
|
# include <stddef.h>
|
|
# include <stdint.h>
|
|
|
|
/* Type for the dtv. */
|
|
typedef union dtv
|
|
{
|
|
size_t counter;
|
|
void *pointer;
|
|
} dtv_t;
|
|
|
|
typedef struct
|
|
{
|
|
dtv_t *dtv;
|
|
void *private;
|
|
} tcbhead_t;
|
|
|
|
# define TLS_MULTIPLE_THREADS_IN_TCB 1
|
|
|
|
#else /* __ASSEMBLER__ */
|
|
# include <tcb-offsets.h>
|
|
#endif /* __ASSEMBLER__ */
|
|
|
|
|
|
/* We require TLS support in the tools. */
|
|
#ifndef HAVE_TLS_SUPPORT
|
|
# error "TLS support is required."
|
|
#endif
|
|
|
|
/* Signal that TLS support is available. */
|
|
# define USE_TLS 1
|
|
|
|
#ifndef __ASSEMBLER__
|
|
|
|
/* Get system call information. */
|
|
# include <sysdep.h>
|
|
|
|
/* This is the size of the initial TCB. */
|
|
# define TLS_INIT_TCB_SIZE sizeof (tcbhead_t)
|
|
|
|
/* Alignment requirements for the initial TCB. */
|
|
# define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
|
|
|
|
/* This is the size of the TCB. */
|
|
# define TLS_TCB_SIZE sizeof (tcbhead_t)
|
|
|
|
/* This is the size we need before TCB. */
|
|
# define TLS_PRE_TCB_SIZE sizeof (struct pthread)
|
|
|
|
/* Alignment requirements for the TCB. */
|
|
# define TLS_TCB_ALIGN __alignof__ (struct pthread)
|
|
|
|
/* The TLS blocks start right after the TCB. */
|
|
# define TLS_DTV_AT_TP 1
|
|
|
|
/* Get the thread descriptor definition. */
|
|
# include <nptl/descr.h>
|
|
|
|
/* Install the dtv pointer. The pointer passed is to the element with
|
|
index -1 which contain the length. */
|
|
# define INSTALL_DTV(tcbp, dtvp) \
|
|
((tcbhead_t *) (tcbp))->dtv = (dtvp) + 1
|
|
|
|
/* Install new dtv for current thread. */
|
|
# define INSTALL_NEW_DTV(dtv) \
|
|
({ tcbhead_t *__tcbp; \
|
|
__asm __volatile ("stc gbr,%0" : "=r" (__tcbp)); \
|
|
__tcbp->dtv = (dtv);})
|
|
|
|
/* Return dtv of given thread descriptor. */
|
|
# define GET_DTV(tcbp) \
|
|
(((tcbhead_t *) (tcbp))->dtv)
|
|
|
|
/* Code to initially initialize the thread pointer. This might need
|
|
special attention since 'errno' is not yet available and if the
|
|
operation can cause a failure 'errno' must not be touched. */
|
|
# define TLS_INIT_TP(tcbp, secondcall) \
|
|
({ __asm __volatile ("ldc %0,gbr" : : "r" (tcbp)); 0; })
|
|
|
|
/* Return the address of the dtv for the current thread. */
|
|
# define THREAD_DTV() \
|
|
({ tcbhead_t *__tcbp; \
|
|
__asm __volatile ("stc gbr,%0" : "=r" (__tcbp)); \
|
|
__tcbp->dtv;})
|
|
|
|
/* Return the thread descriptor for the current thread.
|
|
The contained asm must *not* be marked volatile since otherwise
|
|
assignments like
|
|
struct pthread *self = thread_self();
|
|
do not get optimized away. */
|
|
# define THREAD_SELF \
|
|
({ struct pthread *__self; \
|
|
__asm ("stc gbr,%0" : "=r" (__self)); \
|
|
__self - 1;})
|
|
|
|
/* Read member of the thread descriptor directly. */
|
|
# define THREAD_GETMEM(descr, member) (descr->member)
|
|
|
|
/* Same as THREAD_GETMEM, but the member offset can be non-constant. */
|
|
# define THREAD_GETMEM_NC(descr, member, idx) (descr->member[idx])
|
|
|
|
/* Set member of the thread descriptor directly. */
|
|
# define THREAD_SETMEM(descr, member, value) \
|
|
descr->member = (value)
|
|
|
|
/* Same as THREAD_SETMEM, but the member offset can be non-constant. */
|
|
# define THREAD_SETMEM_NC(descr, member, idx, value) \
|
|
descr->member[idx] = (value)
|
|
|
|
#endif /* __ASSEMBLER__ */
|
|
|
|
#endif /* tls.h */
|