Skip to content

Commit

Permalink
Reduce rw_lock_debug_mutex contention
Browse files Browse the repository at this point in the history
rw_lock_own(), rw_lock_own_flagged(): Traverse the rw_lock_t::debug_list
only after quickly checking if the thread is holding X-latch or SX-latch.
  • Loading branch information
dr-m committed Sep 27, 2019
1 parent 4ec0c34 commit 718fcee
Showing 1 changed file with 22 additions and 2 deletions.
24 changes: 22 additions & 2 deletions storage/innobase/sync/sync0rw.cc
Original file line number Diff line number Diff line change
Expand Up @@ -999,13 +999,22 @@ rw_lock_own(
ut_ad(lock);
ut_ad(rw_lock_validate(lock));

const os_thread_id_t thread_id = os_thread_get_curr_id();

if (!os_thread_eq(lock->writer_thread, thread_id)) {
} else if (lock_type == RW_LOCK_X && rw_lock_get_x_lock_count(lock)) {
return TRUE;
} else if (lock_type == RW_LOCK_SX && rw_lock_get_sx_lock_count(lock)) {
return TRUE;
}

rw_lock_debug_mutex_enter();

for (const rw_lock_debug_t* info = UT_LIST_GET_FIRST(lock->debug_list);
info != NULL;
info = UT_LIST_GET_NEXT(list, info)) {

if (os_thread_eq(info->thread_id, os_thread_get_curr_id())
if (os_thread_eq(info->thread_id, thread_id)
&& info->pass == 0
&& info->lock_type == lock_type) {

Expand All @@ -1030,12 +1039,23 @@ bool rw_lock_own_flagged(const rw_lock_t* lock, rw_lock_flags_t flags)
{
ut_ad(rw_lock_validate(lock));

const os_thread_id_t thread_id = os_thread_get_curr_id();

if (!os_thread_eq(lock->writer_thread, thread_id)) {
} else if ((flags & RW_LOCK_FLAG_X)
&& rw_lock_get_x_lock_count(lock)) {
return true;
} else if ((flags & RW_LOCK_FLAG_SX)
&& rw_lock_get_sx_lock_count(lock)) {
return true;
}

rw_lock_debug_mutex_enter();

for (rw_lock_debug_t* info = UT_LIST_GET_FIRST(lock->debug_list);
info != NULL;
info = UT_LIST_GET_NEXT(list, info)) {
if (!os_thread_eq(info->thread_id, os_thread_get_curr_id())
if (!os_thread_eq(info->thread_id, thread_id)
|| info->pass) {
continue;
}
Expand Down

0 comments on commit 718fcee

Please sign in to comment.