mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20:07 +00:00
fb4cc8a0c2
* hurd/Makefile (routines): Add hurdlock. * hurd/Versions (GLIBC_PRIVATE): Added new entry to export the above interface. (HURD_CTHREADS_0.3): Remove __libc_getspecific. * hurd/hurdpid.c: Include <lowlevellock.h> (_S_msg_proc_newids): Use lll_wait to synchronize. * hurd/hurdsig.c: (reauth_proc): Use __mutex_lock and __mutex_unlock. * hurd/setauth.c: Include <hurdlock.h>, use integer for synchronization. * mach/Makefile (lock-headers): Remove machine-lock.h. * mach/lock-intern.h: Include <lowlevellock.h> instead of <machine-lock.h>. (__spin_lock_t): New type. (__SPIN_LOCK_INITIALIZER): New macro. (__spin_lock, __spin_unlock, __spin_try_lock, __spin_lock_locked, __mutex_init, __mutex_lock_solid, __mutex_unlock_solid, __mutex_lock, __mutex_unlock, __mutex_trylock): Use lll to implement locks. * mach/mutex-init.c: Include <lowlevellock.h> instead of <cthreads.h>. (__mutex_init): Initialize with lll. * manual/errno.texi (EOWNERDEAD, ENOTRECOVERABLE): New errno values. * sysdeps/mach/Makefile: Add libmachuser as dependencies for libs needing lll. * sysdeps/mach/hurd/bits/errno.h: Regenerate. * sysdeps/mach/hurd/cthreads.c (__libc_getspecific): Remove function. * sysdeps/mach/hurd/bits/libc-lock.h: Remove file. * sysdeps/mach/hurd/setpgid.c: Include <lowlevellock.h>. (__setpgid): Use lll for synchronization. * sysdeps/mach/hurd/setsid.c: Likewise with __setsid. * sysdeps/mach/bits/libc-lock.h: Include <tls.h> and <lowlevellock.h> instead of <cthreads.h>. (_IO_lock_inexpensive): New macro (__libc_lock_recursive_t, __rtld_lock_recursive_t): New structures. (__libc_lock_self0): New declaration. (__libc_lock_owner_self): New macro. (__libc_key_t): Remove type. (_LIBC_LOCK_INITIALIZER): New macro. (__libc_lock_define_initialized, __libc_lock_init, __libc_lock_fini, __libc_lock_fini_recursive, __rtld_lock_fini_recursive, __libc_lock_lock, __libc_lock_trylock, __libc_lock_unlock, __libc_lock_define_initialized_recursive, __rtld_lock_define_initialized_recursive, __libc_lock_init_recursive, __libc_lock_trylock_recursive, __libc_lock_lock_recursive, __libc_lock_unlock_recursive, __rtld_lock_initialize, __rtld_lock_trylock_recursive, __rtld_lock_lock_recursive, __rtld_lock_unlock_recursive __libc_once_define, __libc_mutex_unlock): Reimplement with lll. (__libc_lock_define_recursive, __rtld_lock_define_recursive, _LIBC_LOCK_RECURSIVE_INITIALIZER, _RTLD_LOCK_RECURSIVE_INITIALIZER): New macros. Include <libc-lockP.h> to reimplement libc_key* with pthread_key*. * hurd/hurdlock.c: New file. * hurd/hurdlock.h: New file. * mach/lowlevellock.h: New file
138 lines
3.3 KiB
C
138 lines
3.3 KiB
C
/* Copyright (C) 1994-2018 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, see
|
||
<http://www.gnu.org/licenses/>. */
|
||
|
||
#ifndef _LOCK_INTERN_H
|
||
#define _LOCK_INTERN_H
|
||
|
||
#include <sys/cdefs.h>
|
||
#if defined __USE_EXTERN_INLINES && defined _LIBC
|
||
# include <lowlevellock.h>
|
||
#endif
|
||
|
||
#ifndef _EXTERN_INLINE
|
||
#define _EXTERN_INLINE __extern_inline
|
||
#endif
|
||
|
||
/* The type of a spin lock variable. */
|
||
typedef unsigned int __spin_lock_t;
|
||
|
||
/* Static initializer for spinlocks. */
|
||
#define __SPIN_LOCK_INITIALIZER LLL_INITIALIZER
|
||
|
||
/* Initialize LOCK. */
|
||
|
||
extern void __spin_lock_init (__spin_lock_t *__lock);
|
||
|
||
#if defined __USE_EXTERN_INLINES && defined _LIBC
|
||
_EXTERN_INLINE void
|
||
__spin_lock_init (__spin_lock_t *__lock)
|
||
{
|
||
*__lock = __SPIN_LOCK_INITIALIZER;
|
||
}
|
||
#endif
|
||
|
||
|
||
/* Lock LOCK, blocking if we can't get it. */
|
||
extern void __spin_lock_solid (__spin_lock_t *__lock);
|
||
|
||
/* Lock the spin lock LOCK. */
|
||
|
||
extern void __spin_lock (__spin_lock_t *__lock);
|
||
|
||
#if defined __USE_EXTERN_INLINES && defined _LIBC
|
||
_EXTERN_INLINE void
|
||
__spin_lock (__spin_lock_t *__lock)
|
||
{
|
||
lll_lock (__lock, 0);
|
||
}
|
||
#endif
|
||
|
||
/* Unlock LOCK. */
|
||
extern void __spin_unlock (__spin_lock_t *__lock);
|
||
|
||
#if defined __USE_EXTERN_INLINES && defined _LIBC
|
||
_EXTERN_INLINE void
|
||
__spin_unlock (__spin_lock_t *__lock)
|
||
{
|
||
lll_unlock (__lock, 0);
|
||
}
|
||
#endif
|
||
|
||
/* Try to lock LOCK; return nonzero if we locked it, zero if another has. */
|
||
extern int __spin_try_lock (__spin_lock_t *__lock);
|
||
|
||
#if defined __USE_EXTERN_INLINES && defined _LIBC
|
||
_EXTERN_INLINE int
|
||
__spin_try_lock (__spin_lock_t *__lock)
|
||
{
|
||
return (lll_trylock (__lock) == 0);
|
||
}
|
||
#endif
|
||
|
||
/* Return nonzero if LOCK is locked. */
|
||
extern int __spin_lock_locked (__spin_lock_t *__lock);
|
||
|
||
#if defined __USE_EXTERN_INLINES && defined _LIBC
|
||
_EXTERN_INLINE int
|
||
__spin_lock_locked (__spin_lock_t *__lock)
|
||
{
|
||
return (*(volatile __spin_lock_t *)__lock != 0);
|
||
}
|
||
#endif
|
||
|
||
/* Name space-clean internal interface to mutex locks. */
|
||
|
||
/* Initialize the newly allocated mutex lock LOCK for further use. */
|
||
extern void __mutex_init (void *__lock);
|
||
|
||
/* Lock the mutex lock LOCK. */
|
||
|
||
extern void __mutex_lock (void *__lock);
|
||
|
||
#if defined __USE_EXTERN_INLINES && defined _LIBC
|
||
_EXTERN_INLINE void
|
||
__mutex_lock (void *__lock)
|
||
{
|
||
__spin_lock ((__spin_lock_t *)__lock);
|
||
}
|
||
#endif
|
||
|
||
/* Unlock the mutex lock LOCK. */
|
||
|
||
extern void __mutex_unlock (void *__lock);
|
||
|
||
#if defined __USE_EXTERN_INLINES && defined _LIBC
|
||
_EXTERN_INLINE void
|
||
__mutex_unlock (void *__lock)
|
||
{
|
||
__spin_unlock ((__spin_lock_t *)__lock);
|
||
}
|
||
#endif
|
||
|
||
|
||
extern int __mutex_trylock (void *__lock);
|
||
|
||
#if defined __USE_EXTERN_INLINES && defined _LIBC
|
||
_EXTERN_INLINE int
|
||
__mutex_trylock (void *__lock)
|
||
{
|
||
return (__spin_try_lock ((__spin_lock_t *)__lock));
|
||
}
|
||
#endif
|
||
|
||
#endif /* lock-intern.h */
|