diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2016-09-14 15:12:54 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-10-17 18:35:49 +0400 |
| commit | 2b47f8ff03845f7ffe2fa3bd583dd4123dae2b61 (patch) | |
| tree | f01e6d2c0b4f094af493d9bbc35e509de763fede /storage/innobase/include/ut0mutex.h | |
| parent | 5608a737ea7b5630452957b82deff4c76406041e (diff) | |
| download | mariadb-git-2b47f8ff03845f7ffe2fa3bd583dd4123dae2b61.tar.gz | |
MDEV-10813 - Clean-up InnoDB atomics, memory barriers and mutexes
Clean-up periodic mutex/rwlock waiters wake up. This was a hack needed to
workaround broken mutexes/rwlocks implementation. We must have sane
implementations now and don't need these anymore: release thread is
guaranteed to wake up waiters.
Removed redundant ifdef that has equivalent code in both branches.
Removed os0atomic.h and os0atomic.ic: not used anymore.
Clean-up unused cmake checks.
Diffstat (limited to 'storage/innobase/include/ut0mutex.h')
| -rw-r--r-- | storage/innobase/include/ut0mutex.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/storage/innobase/include/ut0mutex.h b/storage/innobase/include/ut0mutex.h index 7622948cdc6..e4ab671eece 100644 --- a/storage/innobase/include/ut0mutex.h +++ b/storage/innobase/include/ut0mutex.h @@ -32,7 +32,6 @@ extern ulong srv_spin_wait_delay; extern ulong srv_n_spin_wait_rounds; extern ulong srv_force_recovery_crash; -#include "os0atomic.h" #include "sync0policy.h" #include "ib0mutex.h" #include <set> @@ -45,25 +44,6 @@ extern ulong srv_force_recovery_crash; typedef OSMutex EventMutex; -#ifndef UNIV_DEBUG - -# ifdef HAVE_IB_LINUX_FUTEX -UT_MUTEX_TYPE(TTASFutexMutex, GenericPolicy, FutexMutex); -UT_MUTEX_TYPE(TTASFutexMutex, BlockMutexPolicy, BlockFutexMutex); -# endif /* HAVE_IB_LINUX_FUTEX */ - -UT_MUTEX_TYPE(TTASMutex, GenericPolicy, SpinMutex); -UT_MUTEX_TYPE(TTASMutex, BlockMutexPolicy, BlockSpinMutex); - - -UT_MUTEX_TYPE(OSTrackMutex, GenericPolicy, SysMutex); -UT_MUTEX_TYPE(OSTrackMutex, BlockMutexPolicy, BlockSysMutex); - -UT_MUTEX_TYPE(TTASEventMutex, GenericPolicy, SyncArrayMutex); -UT_MUTEX_TYPE(TTASEventMutex, BlockMutexPolicy, BlockSyncArrayMutex); - -#else /* !UNIV_DEBUG */ - # ifdef HAVE_IB_LINUX_FUTEX UT_MUTEX_TYPE(TTASFutexMutex, GenericPolicy, FutexMutex); UT_MUTEX_TYPE(TTASFutexMutex, BlockMutexPolicy, BlockFutexMutex); @@ -78,8 +58,6 @@ UT_MUTEX_TYPE(OSTrackMutex, BlockMutexPolicy, BlockSysMutex); UT_MUTEX_TYPE(TTASEventMutex, GenericPolicy, SyncArrayMutex); UT_MUTEX_TYPE(TTASEventMutex, BlockMutexPolicy, BlockSyncArrayMutex); -#endif /* !UNIV_DEBUG */ - #ifdef MUTEX_FUTEX /** The default mutex type. */ typedef FutexMutex ib_mutex_t; |