diff options
Diffstat (limited to 'storage/tokudb/tokudb_thread.h')
| -rw-r--r-- | storage/tokudb/tokudb_thread.h | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/storage/tokudb/tokudb_thread.h b/storage/tokudb/tokudb_thread.h index bd89f4dfd9c..53be6a75e3c 100644 --- a/storage/tokudb/tokudb_thread.h +++ b/storage/tokudb/tokudb_thread.h @@ -47,16 +47,16 @@ public: void reinit(pfs_key_t key); void lock( -#ifdef HAVE_PSI_MUTEX_INTERFACE +#if defined(SAFE_MUTEX) || defined(HAVE_PSI_MUTEX_INTERFACE) const char* src_file, uint src_line -#endif // HAVE_PSI_MUTEX_INTERFACE +#endif // SAFE_MUTEX || HAVE_PSI_MUTEX_INTERFACE ); void unlock( -#ifdef HAVE_PSI_MUTEX_INTERFACE +#if defined(SAFE_MUTEX) const char* src_file, uint src_line -#endif // HAVE_PSI_MUTEX_INTERFACE +#endif // SAFE_MUTEX ); #ifdef TOKUDB_DEBUG bool is_owned_by_me(void) const; @@ -223,18 +223,18 @@ inline void mutex_t::reinit(pfs_key_t key) { assert_debug(r == 0); } inline void mutex_t::lock( -#ifdef HAVE_PSI_MUTEX_INTERFACE +#if defined(SAFE_MUTEX) || defined(HAVE_PSI_MUTEX_INTERFACE) const char* src_file, uint src_line -#endif // HAVE_PSI_MUTEX_INTERFACE +#endif // SAFE_MUTEX || HAVE_PSI_MUTEX_INTERFACE ) { assert_debug(is_owned_by_me() == false); int r MY_ATTRIBUTE((unused)) = inline_mysql_mutex_lock(&_mutex -#ifdef HAVE_PSI_MUTEX_INTERFACE +#if defined(SAFE_MUTEX) || defined(HAVE_PSI_MUTEX_INTERFACE) , src_file, src_line -#endif // HAVE_PSI_MUTEX_INTERFACE +#endif // SAFE_MUTEX || HAVE_PSI_MUTEX_INTERFACE ); assert_debug(r == 0); #ifdef TOKUDB_DEBUG @@ -243,15 +243,11 @@ inline void mutex_t::lock( #endif } inline void mutex_t::unlock( -#ifdef HAVE_PSI_MUTEX_INTERFACE +#if defined(SAFE_MUTEX) const char* src_file, uint src_line -#endif // HAVE_PSI_MUTEX_INTERFACE - ) { -#ifndef SAFE_MUTEX - (void)(src_file); - (void)(src_line); #endif // SAFE_MUTEX + ) { #ifdef TOKUDB_DEBUG assert_debug(_owners > 0); assert_debug(is_owned_by_me()); @@ -259,7 +255,7 @@ inline void mutex_t::unlock( _owner = _null_owner; #endif int r MY_ATTRIBUTE((unused)) = inline_mysql_mutex_unlock(&_mutex -#ifdef SAFE_MUTEX +#if defined(SAFE_MUTEX) , src_file, src_line |