diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-28 12:42:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-28 12:42:45 +0200 |
| commit | 6cf29ab0df3131d097b9f811d8a887b54d1afca5 (patch) | |
| tree | 2236238339cff253472045674efc2e0211ebff52 /storage/innobase/include/sync0rw.ic | |
| parent | c1bcb2055ebab1e9d3e0e99b3626f78d477badd1 (diff) | |
| download | mariadb-git-6cf29ab0df3131d097b9f811d8a887b54d1afca5.tar.gz | |
MDEV-12146 Deprecate and remove innodb_instrument_semaphores
MDEV-7618 introduced configuration parameter innodb_instrument_semaphores
in MariaDB Server 10.1. The parameter seems to only affect the rw-lock
X-latch acquisition. Extra fields are added to rw_lock_t to remember one
X-latch holder or waiter. These fields are not being consulted or reported
anywhere. This is basically only adding code bloat.
If the intention is to debug hangs or deadlocks, we have better tools for
that in the debug server, and for the non-debug server, core dumps can
reveal a lot. For example, the mini-transaction memo records the
currently held buffer block or index rw-locks, to be released at
mtr_t::commit().
The configuration parameter innodb_instrument_semaphores will be
deprecated in 10.2.5 and removed in 10.3.0.
rw_lock_t: Remove the members lock_name, file_name, line, thread_id
which did not affect any output.
Diffstat (limited to 'storage/innobase/include/sync0rw.ic')
| -rw-r--r-- | storage/innobase/include/sync0rw.ic | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/storage/innobase/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic index d67e26d961d..0d2c28d9d19 100644 --- a/storage/innobase/include/sync0rw.ic +++ b/storage/innobase/include/sync0rw.ic @@ -2,6 +2,7 @@ Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. +Copyright (c) 2017, MariaDB Corporation. All Rights Reserved. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -250,14 +251,6 @@ rw_lock_s_lock_low( lock->last_s_file_name = file_name; lock->last_s_line = line; - /* - if (srv_instrument_semaphores) { - lock->thread_id = os_thread_get_curr_id(); - lock->file_name = file_name; - lock->line = line; - } - */ - return(TRUE); /* locking succeeded */ } @@ -342,14 +335,6 @@ rw_lock_x_lock_func_nowait( ut_d(rw_lock_add_debug_info(lock, 0, RW_LOCK_X, file_name, line)); - /* - if (srv_instrument_semaphores) { - lock->thread_id = os_thread_get_curr_id(); - lock->file_name = file_name; - lock->line = line; - } - */ - lock->last_x_file_name = file_name; lock->last_x_line = line; @@ -507,7 +492,6 @@ pfs_rw_lock_create_func( # ifdef UNIV_DEBUG latch_level_t level, /*!< in: level */ # endif /* UNIV_DEBUG */ - const char* cmutex_name, /*!< in: mutex name */ const char* cfile_name, /*!< in: file name where created */ ulint cline) /*!< in: file line where created */ { @@ -521,7 +505,6 @@ pfs_rw_lock_create_func( #ifdef UNIV_DEBUG level, #endif /* UNIV_DEBUG */ - cmutex_name, cfile_name, cline); } |