From: George Joseph Date: Tue, 29 Apr 2014 15:09:11 +0000 (+0000) Subject: Add "destroy" implementation for spinlock. X-Git-Tag: 12.3.0-rc1~51 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=492c828a54d49188dcd79c41c2729a2a8a71478d;p=thirdparty%2Fasterisk.git Add "destroy" implementation for spinlock. The original commit for spinlock was missing "destroy" implementations. Most of them are no-ops but phtread_spin and pthread_mutex do need their locks destroyed. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@413102 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/include/asterisk/spinlock.h b/include/asterisk/spinlock.h index c514f03759..dacb58299c 100644 --- a/include/asterisk/spinlock.h +++ b/include/asterisk/spinlock.h @@ -95,6 +95,11 @@ static force_inline int ast_spinlock_unlock(ast_spinlock_t *lock) __sync_lock_release(lock); return 0; } + +static force_inline int ast_spinlock_destroy(ast_spinlock_t *lock) +{ + return 0; +} #endif /*! @@ -145,6 +150,11 @@ static force_inline int ast_spinlock_unlock(ast_spinlock_t *lock) x86chgl(lock, 0); return 0; } + +static force_inline int ast_spinlock_destroy(ast_spinlock_t *lock) +{ + return 0; +} #endif /*! @@ -221,6 +231,11 @@ static force_inline int ast_spinlock_unlock(ast_spinlock_t *lock) return 0; } + +static force_inline int ast_spinlock_destroy(ast_spinlock_t *lock) +{ + return 0; +} #endif /*! @@ -288,6 +303,11 @@ static force_inline int ast_spinlock_unlock(ast_spinlock_t *lock) return 0; } + +static force_inline int ast_spinlock_destroy(ast_spinlock_t *lock) +{ + return 0; +} #endif /*! @@ -322,6 +342,11 @@ static force_inline int ast_spinlock_unlock(ast_spinlock_t *lock) { return pthread_spin_unlock(lock); } + +static force_inline int ast_spinlock_destroy(ast_spinlock_t *lock) +{ + return pthread_spin_destroy(lock); +} #endif /*! @@ -361,6 +386,11 @@ static force_inline int ast_spinlock_unlock(ast_spinlock_t *lock) OSSpinLockUnlock(lock); return 0; } + +static force_inline int ast_spinlock_destroy(ast_spinlock_t *lock) +{ + return 0; +} #endif /*! @@ -396,6 +426,11 @@ static force_inline int ast_spinlock_unlock(ast_spinlock_t *lock) { return pthread_mutex_unlock(lock); } + +static force_inline int ast_spinlock_destroy(ast_spinlock_t *lock) +{ + return pthread_mutex_destroy(lock); +} #endif #if !defined(AST_SPINLOCK_TYPE) @@ -442,4 +477,12 @@ static force_inline int ast_spinlock_trylock(ast_spinlock_t *lock); */ static force_inline int ast_spinlock_unlock(ast_spinlock_t *lock); +/*! + * \brief Destroy a spin lock + * \param lock Address of the lock + * \retval 0 Success + * \retval other Failure + */ +static force_inline int ast_spinlock_destroy(ast_spinlock_t *lock); + #endif /* _ASTERISK_SPINLOCK_H */