diff options
Diffstat (limited to 'storage/xtradb/include/sync0rw.ic')
| -rw-r--r-- | storage/xtradb/include/sync0rw.ic | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/storage/xtradb/include/sync0rw.ic b/storage/xtradb/include/sync0rw.ic index 097adfded37..3511987dbb0 100644 --- a/storage/xtradb/include/sync0rw.ic +++ b/storage/xtradb/include/sync0rw.ic @@ -874,12 +874,15 @@ pfs_rw_lock_x_lock_func( /* Record the entry of rw x lock request in performance schema */ locker = PSI_RWLOCK_CALL(start_rwlock_wrwait)( - &state, lock->pfs_psi, PSI_RWLOCK_WRITELOCK, file_name, line); + &state, lock->pfs_psi, PSI_RWLOCK_WRITELOCK, + file_name, static_cast<uint>(line)); - rw_lock_x_lock_func(lock, pass, file_name, line); + rw_lock_x_lock_func( + lock, pass, file_name, static_cast<uint>(line)); - if (locker != NULL) + if (locker != NULL) { PSI_RWLOCK_CALL(end_rwlock_wrwait)(locker, 0); + } } else { @@ -946,12 +949,15 @@ pfs_rw_lock_x_lock_func_nowait( /* Record the entry of rw x lock request in performance schema */ locker = PSI_RWLOCK_CALL(start_rwlock_wrwait)( - &state, lock->pfs_psi, PSI_RWLOCK_WRITELOCK, file_name, line); + &state, lock->pfs_psi, PSI_RWLOCK_WRITELOCK, + file_name, static_cast<uint>(line)); ret = rw_lock_x_lock_func_nowait(lock, file_name, line); - if (locker != NULL) - PSI_RWLOCK_CALL(end_rwlock_wrwait)(locker, ret); + if (locker != NULL) { + PSI_RWLOCK_CALL(end_rwlock_wrwait)( + locker, static_cast<int>(ret)); + } } else { @@ -1021,12 +1027,14 @@ pfs_rw_lock_s_lock_func( /* Instrumented to inform we are aquiring a shared rwlock */ locker = PSI_RWLOCK_CALL(start_rwlock_rdwait)( - &state, lock->pfs_psi, PSI_RWLOCK_READLOCK, file_name, line); + &state, lock->pfs_psi, PSI_RWLOCK_READLOCK, + file_name, static_cast<uint>(line)); rw_lock_s_lock_func(lock, pass, file_name, line); - if (locker != NULL) + if (locker != NULL) { PSI_RWLOCK_CALL(end_rwlock_rdwait)(locker, 0); + } } else { @@ -1100,12 +1108,15 @@ pfs_rw_lock_s_lock_low( /* Instrumented to inform we are aquiring a shared rwlock */ locker = PSI_RWLOCK_CALL(start_rwlock_rdwait)( - &state, lock->pfs_psi, PSI_RWLOCK_READLOCK, file_name, line); + &state, lock->pfs_psi, PSI_RWLOCK_READLOCK, + file_name, static_cast<uint>(line)); ret = rw_lock_s_lock_low(lock, pass, file_name, line); - if (locker != NULL) - PSI_RWLOCK_CALL(end_rwlock_rdwait)(locker, ret); + if (locker != NULL) { + PSI_RWLOCK_CALL(end_rwlock_rdwait)( + locker, static_cast<int>(ret)); + } } else { |