diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-02 21:44:58 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-02 21:44:58 +0300 |
| commit | 7a3d34d6456ed719da62a896e5ac6e983b72f3d8 (patch) | |
| tree | 38dc1133cd53a366e7a851cfba6dad1269dcd5a1 /storage/rocksdb/rdb_psi.cc | |
| parent | faeaf978b8c1deaa61d7d408fa6cb4ed03bfcfa3 (diff) | |
| parent | 1d45b3b055511d58c1e820ad497793f30871586e (diff) | |
| download | mariadb-git-7a3d34d6456ed719da62a896e5ac6e983b72f3d8.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/rocksdb/rdb_psi.cc')
| -rw-r--r-- | storage/rocksdb/rdb_psi.cc | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/storage/rocksdb/rdb_psi.cc b/storage/rocksdb/rdb_psi.cc index 361a648bba4..77003b1bb48 100644 --- a/storage/rocksdb/rdb_psi.cc +++ b/storage/rocksdb/rdb_psi.cc @@ -14,7 +14,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef USE_PRAGMA_IMPLEMENTATION -#pragma implementation // gcc: Class implementation +#pragma implementation // gcc: Class implementation #endif #define MYSQL_SERVER 1 @@ -22,9 +22,6 @@ /* The C++ file's header */ #include "./rdb_psi.h" -/* MySQL header files */ -#include <mysql/psi/mysql_stage.h> - namespace myrocks { /* @@ -94,17 +91,14 @@ void init_rocksdb_psi_keys() { const char *const category = "rocksdb"; int count; - if (PSI_server == nullptr) - return; - count = array_elements(all_rocksdb_mutexes); - PSI_server->register_mutex(category, all_rocksdb_mutexes, count); + mysql_mutex_register(category, all_rocksdb_mutexes, count); count = array_elements(all_rocksdb_rwlocks); - PSI_server->register_rwlock(category, all_rocksdb_rwlocks, count); + mysql_rwlock_register(category, all_rocksdb_rwlocks, count); count = array_elements(all_rocksdb_conds); - //TODO Disabling PFS for conditions due to the bug + // TODO(jay) Disabling PFS for conditions due to the bug // https://github.com/MySQLOnRocksDB/mysql-5.6/issues/92 // PSI_server->register_cond(category, all_rocksdb_conds, count); @@ -114,7 +108,7 @@ void init_rocksdb_psi_keys() { count = array_elements(all_rocksdb_threads); mysql_thread_register(category, all_rocksdb_threads, count); } -#else // HAVE_PSI_INTERFACE +#else // HAVE_PSI_INTERFACE void init_rocksdb_psi_keys() {} #endif // HAVE_PSI_INTERFACE |