diff options
Diffstat (limited to 'storage/innobase/lock/lock0lock.cc')
| -rw-r--r-- | storage/innobase/lock/lock0lock.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index 164aa29fe59..414c261d8c2 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -166,7 +166,7 @@ void lock_sys_t::assert_locked(const dict_table_t &table) const { ut_ad(!table.is_temporary()); - const os_thread_id_t current_thread= os_thread_get_curr_id(); + const auto current_thread= std::this_thread::get_id(); if (writer.load(std::memory_order_relaxed) == current_thread) return; ut_ad(readers); @@ -392,13 +392,14 @@ void lock_sys_t::create(ulint n_cells) void lock_sys_t::wr_lock(const char *file, unsigned line) { latch.wr_lock(file, line); - ut_ad(!writer.exchange(os_thread_get_curr_id(), std::memory_order_relaxed)); + ut_ad(writer.exchange(std::this_thread::get_id(), + std::memory_order_relaxed) == std::thread::id()); } /** Release exclusive lock_sys.latch */ void lock_sys_t::wr_unlock() { - ut_ad(writer.exchange(0, std::memory_order_relaxed) == - os_thread_get_curr_id()); + ut_ad(writer.exchange(std::thread::id(), std::memory_order_relaxed) == + std::this_thread::get_id()); latch.wr_unlock(); } |