diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-10-25 00:30:32 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-10-25 00:30:32 +0200 |
| commit | eb7ef564ba75221a6d250b95c244d20c62e612ad (patch) | |
| tree | 8abe7919b48d8172a282b3a35bb8a180c3d1d86d /mach | |
| parent | 16304d60734428fa7ca74377e479c4bda401353f (diff) | |
| parent | d75af560cf903e0daeb0e92b1f3d516b1d8254df (diff) | |
Merge branch 't/extern_inline' into refs/top-bases/t/tls-threadvar
Diffstat (limited to 'mach')
| -rw-r--r-- | mach/lock-intern.h | 20 | ||||
| -rw-r--r-- | mach/mach/mig_support.h | 3 | ||||
| -rw-r--r-- | mach/spin-lock.c | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/mach/lock-intern.h b/mach/lock-intern.h index 0a5df7aa09..f6e20825ab 100644 --- a/mach/lock-intern.h +++ b/mach/lock-intern.h @@ -28,11 +28,15 @@ /* Initialize LOCK. */ +void __spin_lock_init (__spin_lock_t *__lock); + +#ifdef __USE_EXTERN_INLINES _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. */ +void __spin_lock (__spin_lock_t *__lock); + +#ifdef __USE_EXTERN_INLINES _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. */ +void __mutex_lock (void *__lock); + +#ifdef __USE_EXTERN_INLINES _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. */ +void __mutex_unlock (void *__lock); + +#ifdef __USE_EXTERN_INLINES _EXTERN_INLINE void __mutex_unlock (void *__lock) { __spin_unlock ((__spin_lock_t *) __lock); __mutex_unlock_solid (__lock); } +#endif +int __mutex_trylock (void *__lock); + +#ifdef __USE_EXTERN_INLINES _EXTERN_INLINE int __mutex_trylock (void *__lock) { return __spin_try_lock ((__spin_lock_t *) __lock); } +#endif #endif /* lock-intern.h */ diff --git a/mach/mach/mig_support.h b/mach/mach/mig_support.h index d73eafc9c3..2c0893a9b3 100644 --- a/mach/mach/mig_support.h +++ b/mach/mach/mig_support.h @@ -66,6 +66,8 @@ extern void mig_reply_setup (const mach_msg_header_t *__request, /* Idiocy support function. */ extern vm_size_t mig_strncpy (char *__dst, const char *__src, vm_size_t __len); extern vm_size_t __mig_strncpy (char *__dst, const char *__src, vm_size_t); + +#ifdef __USE_EXTERN_INLINES __extern_inline vm_size_t __mig_strncpy (char *__dst, const char *__src, vm_size_t __len) { @@ -76,6 +78,7 @@ mig_strncpy (char *__dst, const char *__src, vm_size_t __len) { return __mig_strncpy (__dst, __src, __len); } +#endif diff --git a/mach/spin-lock.c b/mach/spin-lock.c index aaebc55cf4..1b1e69c8d6 100644 --- a/mach/spin-lock.c +++ b/mach/spin-lock.c @@ -1,3 +1,4 @@ +#define __USE_EXTERN_INLINES 1 #define _EXTERN_INLINE /* Empty to define the real functions. */ #include "spin-lock.h" |