diff options
Diffstat (limited to 'storage/innobase/include/sync0sync.ic')
| -rw-r--r-- | storage/innobase/include/sync0sync.ic | 87 |
1 files changed, 43 insertions, 44 deletions
diff --git a/storage/innobase/include/sync0sync.ic b/storage/innobase/include/sync0sync.ic index 746e73ebee7..ad77ad6d5a4 100644 --- a/storage/innobase/include/sync0sync.ic +++ b/storage/innobase/include/sync0sync.ic @@ -36,7 +36,7 @@ UNIV_INTERN void mutex_set_waiters( /*==============*/ - mutex_t* mutex, /*!< in: mutex */ + ib_mutex_t* mutex, /*!< in: mutex */ ulint n); /*!< in: value to set */ /******************************************************************//** Reserves a mutex for the current thread. If the mutex is reserved, the @@ -46,7 +46,7 @@ UNIV_INTERN void mutex_spin_wait( /*============*/ - mutex_t* mutex, /*!< in: pointer to mutex */ + ib_mutex_t* mutex, /*!< in: pointer to mutex */ const char* file_name, /*!< in: file name where mutex requested */ ulint line); /*!< in: line where requested */ @@ -57,7 +57,7 @@ UNIV_INTERN void mutex_set_debug_info( /*=================*/ - mutex_t* mutex, /*!< in: mutex */ + ib_mutex_t* mutex, /*!< in: mutex */ const char* file_name, /*!< in: file where requested */ ulint line); /*!< in: line where requested */ #endif /* UNIV_SYNC_DEBUG */ @@ -67,7 +67,7 @@ UNIV_INTERN void mutex_signal_object( /*================*/ - mutex_t* mutex); /*!< in: mutex */ + ib_mutex_t* mutex); /*!< in: mutex */ /******************************************************************//** Performs an atomic test-and-set instruction to the lock_word field of a @@ -75,9 +75,9 @@ mutex. @return the previous value of lock_word: 0 or 1 */ UNIV_INLINE byte -mutex_test_and_set( +ib_mutex_test_and_set( /*===============*/ - mutex_t* mutex) /*!< in: mutex */ + ib_mutex_t* mutex) /*!< in: mutex */ { #if defined(HAVE_ATOMIC_BUILTINS) return(os_atomic_test_and_set_byte(&mutex->lock_word, 1)); @@ -105,7 +105,7 @@ UNIV_INLINE void mutex_reset_lock_word( /*==================*/ - mutex_t* mutex) /*!< in: mutex */ + ib_mutex_t* mutex) /*!< in: mutex */ { #if defined(HAVE_ATOMIC_BUILTINS) /* In theory __sync_lock_release should be used to release the lock. @@ -125,7 +125,7 @@ UNIV_INLINE lock_word_t mutex_get_lock_word( /*================*/ - const mutex_t* mutex) /*!< in: mutex */ + const ib_mutex_t* mutex) /*!< in: mutex */ { ut_ad(mutex); @@ -139,7 +139,7 @@ UNIV_INLINE ulint mutex_get_waiters( /*==============*/ - const mutex_t* mutex) /*!< in: mutex */ + const ib_mutex_t* mutex) /*!< in: mutex */ { const volatile ulint* ptr; /*!< declared volatile to ensure that the value is read from memory */ @@ -158,7 +158,7 @@ UNIV_INLINE void mutex_exit_func( /*============*/ - mutex_t* mutex) /*!< in: pointer to mutex */ + ib_mutex_t* mutex) /*!< in: pointer to mutex */ { ut_ad(mutex_own(mutex)); @@ -199,7 +199,7 @@ UNIV_INLINE void mutex_enter_func( /*=============*/ - mutex_t* mutex, /*!< in: pointer to mutex */ + ib_mutex_t* mutex, /*!< in: pointer to mutex */ const char* file_name, /*!< in: file name where locked */ ulint line) /*!< in: line where locked */ { @@ -209,9 +209,7 @@ mutex_enter_func( /* Note that we do not peek at the value of lock_word before trying the atomic test_and_set; we could peek, and possibly save time. */ - ut_d(mutex->count_using++); - - if (!mutex_test_and_set(mutex)) { + if (!ib_mutex_test_and_set(mutex)) { ut_d(mutex->thread_id = os_thread_get_curr_id()); #ifdef UNIV_SYNC_DEBUG mutex_set_debug_info(mutex, file_name, line); @@ -232,28 +230,28 @@ UNIV_INLINE void pfs_mutex_enter_func( /*=================*/ - mutex_t* mutex, /*!< in: pointer to mutex */ + ib_mutex_t* mutex, /*!< in: pointer to mutex */ const char* file_name, /*!< in: file name where locked */ ulint line) /*!< in: line where locked */ { - if (mutex->pfs_psi != NULL) - { + if (mutex->pfs_psi != NULL) { PSI_mutex_locker* locker; PSI_mutex_locker_state state; - locker = PSI_CALL(start_mutex_wait)(&state, mutex->pfs_psi, + locker = PSI_MUTEX_CALL(start_mutex_wait)( + &state, mutex->pfs_psi, PSI_MUTEX_LOCK, file_name, line); mutex_enter_func(mutex, file_name, line); - if (locker != NULL) - PSI_CALL(end_mutex_wait)(locker, 0); - } - else - { + if (locker != NULL) { + PSI_MUTEX_CALL(end_mutex_wait)(locker, 0); + } + } else { mutex_enter_func(mutex, file_name, line); } } + /********************************************************************//** NOTE! Please use the corresponding macro mutex_enter_nowait(), not directly this function! @@ -264,33 +262,33 @@ UNIV_INLINE ulint pfs_mutex_enter_nowait_func( /*========================*/ - mutex_t* mutex, /*!< in: pointer to mutex */ + ib_mutex_t* mutex, /*!< in: pointer to mutex */ const char* file_name, /*!< in: file name where mutex requested */ ulint line) /*!< in: line where requested */ { - ulint ret; + ulint ret; - if (mutex->pfs_psi != NULL) - { + if (mutex->pfs_psi != NULL) { PSI_mutex_locker* locker; PSI_mutex_locker_state state; - locker = PSI_CALL(start_mutex_wait)(&state, mutex->pfs_psi, + locker = PSI_MUTEX_CALL(start_mutex_wait)( + &state, mutex->pfs_psi, PSI_MUTEX_TRYLOCK, file_name, line); ret = mutex_enter_nowait_func(mutex, file_name, line); - if (locker != NULL) - PSI_CALL(end_mutex_wait)(locker, (int) ret); - } - else - { + if (locker != NULL) { + PSI_MUTEX_CALL(end_mutex_wait)(locker, (int) ret); + } + } else { ret = mutex_enter_nowait_func(mutex, file_name, line); } return(ret); } + /******************************************************************//** NOTE! Please use the corresponding macro mutex_exit(), not directly this function! @@ -300,10 +298,11 @@ UNIV_INLINE void pfs_mutex_exit_func( /*================*/ - mutex_t* mutex) /*!< in: pointer to mutex */ + ib_mutex_t* mutex) /*!< in: pointer to mutex */ { - if (mutex->pfs_psi != NULL) - PSI_CALL(unlock_mutex)(mutex->pfs_psi); + if (mutex->pfs_psi != NULL) { + PSI_MUTEX_CALL(unlock_mutex)(mutex->pfs_psi); + } mutex_exit_func(mutex); } @@ -319,7 +318,7 @@ void pfs_mutex_create_func( /*==================*/ mysql_pfs_key_t key, /*!< in: Performance Schema key */ - mutex_t* mutex, /*!< in: pointer to memory */ + ib_mutex_t* mutex, /*!< in: pointer to memory */ # ifdef UNIV_DEBUG const char* cmutex_name, /*!< in: mutex name */ # ifdef UNIV_SYNC_DEBUG @@ -329,7 +328,7 @@ pfs_mutex_create_func( const char* cfile_name, /*!< in: file name where created */ ulint cline) /*!< in: file line where created */ { - mutex->pfs_psi = PSI_CALL(init_mutex)(key, mutex); + mutex->pfs_psi = PSI_MUTEX_CALL(init_mutex)(key, mutex); mutex_create_func(mutex, # ifdef UNIV_DEBUG @@ -341,6 +340,7 @@ pfs_mutex_create_func( cfile_name, cline); } + /******************************************************************//** NOTE! Please use the corresponding macro mutex_free(), not directly this function! @@ -350,11 +350,10 @@ UNIV_INLINE void pfs_mutex_free_func( /*================*/ - mutex_t* mutex) /*!< in: mutex */ + ib_mutex_t* mutex) /*!< in: mutex */ { - if (mutex->pfs_psi != NULL) - { - PSI_CALL(destroy_mutex)(mutex->pfs_psi); + if (mutex->pfs_psi != NULL) { + PSI_MUTEX_CALL(destroy_mutex)(mutex->pfs_psi); mutex->pfs_psi = NULL; } @@ -370,7 +369,7 @@ UNIV_INLINE void os_atomic_dec_ulint_func( /*=====================*/ - mutex_t* mutex, /*!< in: mutex guarding the dec */ + ib_mutex_t* mutex, /*!< in: mutex guarding the dec */ volatile ulint* var, /*!< in/out: variable to decrement */ ulint delta) /*!< in: delta to decrement */ { @@ -391,7 +390,7 @@ UNIV_INLINE void os_atomic_inc_ulint_func( /*=====================*/ - mutex_t* mutex, /*!< in: mutex guarding the increment */ + ib_mutex_t* mutex, /*!< in: mutex guarding the increment */ volatile ulint* var, /*!< in/out: variable to increment */ ulint delta) /*!< in: delta to increment */ { |