diff options
Diffstat (limited to 'storage/innobase/include/sync0types.h')
| -rw-r--r-- | storage/innobase/include/sync0types.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/storage/innobase/include/sync0types.h b/storage/innobase/include/sync0types.h index 711225041bc..30d23cbcfac 100644 --- a/storage/innobase/include/sync0types.h +++ b/storage/innobase/include/sync0types.h @@ -160,7 +160,7 @@ V lock_sys_mutex Mutex protecting lock_sys_t | V -trx_sys->mutex Mutex protecting trx_sys_t +trx_sys.mutex Mutex protecting trx_sys_t | V Threads mutex Background thread scheduling mutex @@ -233,6 +233,7 @@ enum latch_level_t { SYNC_REC_LOCK, SYNC_THREADS, SYNC_TRX, + SYNC_RW_TRX_HASH_ELEMENT, SYNC_TRX_SYS, SYNC_LOCK_SYS, SYNC_LOCK_WAIT_SYS, @@ -270,8 +271,6 @@ enum latch_level_t { SYNC_DICT, SYNC_FTS_CACHE, - SYNC_FILE_FORMAT_TAG, - SYNC_DICT_OPERATION, SYNC_TRX_I_S_LAST_READ, @@ -381,12 +380,11 @@ enum latch_id_t { LATCH_ID_SCRUB_STAT_MUTEX, LATCH_ID_DEFRAGMENT_MUTEX, LATCH_ID_BTR_DEFRAGMENT_MUTEX, - LATCH_ID_MTFLUSH_THREAD_MUTEX, - LATCH_ID_MTFLUSH_MUTEX, LATCH_ID_FIL_CRYPT_MUTEX, LATCH_ID_FIL_CRYPT_STAT_MUTEX, LATCH_ID_FIL_CRYPT_DATA_MUTEX, LATCH_ID_FIL_CRYPT_THREADS_MUTEX, + LATCH_ID_RW_TRX_HASH_ELEMENT, LATCH_ID_TEST_MUTEX, LATCH_ID_MAX = LATCH_ID_TEST_MUTEX }; @@ -494,10 +492,10 @@ struct OSMutex { } private: -#ifdef UNIV_DEBUG +#ifdef DBUG_ASSERT_EXISTS /** true if the mutex has been freed/destroyed. */ bool m_freed; -#endif /* UNIV_DEBUG */ +#endif /* DBUG_ASSERT_EXISTS */ sys_mutex_t m_mutex; }; @@ -1159,11 +1157,11 @@ enum rw_lock_flag_t { #ifdef _WIN64 #define my_atomic_addlint(A,B) my_atomic_add64((int64*) (A), (B)) #define my_atomic_loadlint(A) my_atomic_load64((int64*) (A)) -#define my_atomic_caslint(A,B,C) my_atomic_cas64((int64*) (A), (int64*) (B), (C)) +#define my_atomic_storelint(A,B) my_atomic_store64((int64*) (A), (B)) #else #define my_atomic_addlint my_atomic_addlong #define my_atomic_loadlint my_atomic_loadlong -#define my_atomic_caslint my_atomic_caslong +#define my_atomic_storelint my_atomic_storelong #endif /** Simple counter aligned to CACHE_LINE_SIZE |