mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
hurd: take __USE_EXTERN_INLINES into account and restrict inlines
* hurd/hurd.h (__hurd_fail): Always declare function, and provide inline version only if __USE_EXTERN_INLINES is defined. * hurd/hurd/fd.h (_hurd_fd_error_signal, _hurd_fd_error, __hurd_dfail, __hurd_sockfail): Likewise. (_hurd_fd_get): Always declare functions, and provide inline versions only if __USE_EXTERN_INLINES and _LIBC are defined and IS_IN(libc). * hurd/hurd/port.h (_hurd_port_init, _hurd_port_locked_get, _hurd_port_get, _hurd_port_free, _hurd_port_locked_set, _hurd_port_set): Always declare functions, and provide inline versions only if __USE_EXTERN_INLINES and _LIBC are defined and IS_IN(libc). * hurd/hurd/signal.h (_hurd_self_sigstate, _hurd_critical_section_lock, _hurd_critical_section_unlock): Likewise. * hurd/hurd/threadvar.h (__hurd_threadvar_location_from_sp, * __hurd_threadvar_location): Likewise. * hurd/hurd/userlink.h (_hurd_userlink_link, _hurd_userlink_unlink, _hurd_userlink_clear): Likewise. * mach/lock-intern.h (__spin_lock_init, __spin_lock, __mutex_lock, __mutex_unlock, __mutex_trylock): Always declare functions, and provide inline versions only if __USE_EXTERN_INLINES and _LIBC are defined. * mach/mach/mig_support.h (__mig_strncpy): Likewise. * sysdeps/generic/machine-lock.h (__spin_unlock, __spin_try_lock, __spin_lock_locked): Likewise. * sysdeps/mach/i386/machine-lock.h (__spin_unlock, __spin_try_lock, __spin_lock_locked): Likewise. * mach/spin-lock.c (__USE_EXTERN_INLINES): Define to 1. * hurd/Versions (libc: GLIBC_2.27): Add _hurd_fd_error_signal, _hurd_fd_error, __hurd_dfail, __hurd_sockfail, _hurd_port_locked_set, __hurd_threadvar_location_from_sp, __hurd_threadvar_location, _hurd_userlink_link, _hurd_userlink_unlink, _hurd_userlink_clear.
This commit is contained in:
@ -28,11 +28,15 @@
|
||||
|
||||
/* 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. */
|
||||
@ -40,12 +44,16 @@ 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)
|
||||
{
|
||||
if (! __spin_try_lock (__lock))
|
||||
__spin_lock_solid (__lock);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Name space-clean internal interface to mutex locks.
|
||||
|
||||
@ -70,27 +78,39 @@ extern void __mutex_unlock_solid (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)
|
||||
{
|
||||
if (! __spin_try_lock ((__spin_lock_t *) __lock))
|
||||
__mutex_lock_solid (__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);
|
||||
__mutex_unlock_solid (__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 */
|
||||
|
Reference in New Issue
Block a user