Skip to content

M
MariaDB
Commit e84dc567 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge 10.1 into 10.2

parents 625994b7 5eb3e4d8
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 96 deletions
storage/innobase/handler/i_s.cc
View file @ e84dc567
/***************************************************************************** /*****************************************************************************
Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2014, 2018, MariaDB Corporation. Copyright (c) 2014, 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software the terms of the GNU General Public License as published by the Free Software
...@@ -9084,10 +9084,12 @@ i_s_innodb_mutexes_fill_table( ...@@ -9084,10 +9084,12 @@ i_s_innodb_mutexes_fill_table(
} }
OK(field_store_string(fields[MUTEXES_NAME], mutex->cmutex_name)); OK(field_store_string(fields[MUTEXES_NAME], mutex->cmutex_name));
OK(field_store_string(fields[MUTEXES_CREATE_FILE], innobase_basename(mutex->cfile_name))); OK(field_store_string(fields[MUTEXES_CREATE_FILE],
OK(fields[MUTEXES_CREATE_LINE]->store(mutex->cline, true)); innobase_basename(mutex->cfile_name)));
OK(fields[MUTEXES_CREATE_LINE]->store(lock->cline, true));
fields[MUTEXES_CREATE_LINE]->set_notnull(); fields[MUTEXES_CREATE_LINE]->set_notnull();
OK(field_store_ulint(fields[MUTEXES_OS_WAITS], (longlong)mutex->count_os_wait)); OK(fields[MUTEXES_OS_WAITS]->store(lock->count_os_wait, true));
fields[MUTEXES_OS_WAITS]->set_notnull();
OK(schema_table_store_record(thd, tables->table)); OK(schema_table_store_record(thd, tables->table));
} }
...@@ -9108,44 +9110,59 @@ i_s_innodb_mutexes_fill_table( ...@@ -9108,44 +9110,59 @@ i_s_innodb_mutexes_fill_table(
mutex_exit(&mutex_list_mutex); mutex_exit(&mutex_list_mutex);
#endif /* JAN_TODO_FIXME */ #endif /* JAN_TODO_FIXME */
mutex_enter(&rw_lock_list_mutex); {
struct Locking
{
Locking() { mutex_enter(&rw_lock_list_mutex); }
~Locking() { mutex_exit(&rw_lock_list_mutex); }
} locking;
for (lock = UT_LIST_GET_FIRST(rw_lock_list); lock != NULL;
lock = UT_LIST_GET_NEXT(list, lock)) {
if (lock->count_os_wait == 0) {
continue;
}
for (lock = UT_LIST_GET_FIRST(rw_lock_list); lock != NULL; if (buf_pool_is_block_lock(lock)) {
lock = UT_LIST_GET_NEXT(list, lock)) { block_lock = lock;
if (lock->count_os_wait == 0) { block_lock_oswait_count += lock->count_os_wait;
continue; continue;
} }
if (buf_pool_is_block_lock(lock)) { //OK(field_store_string(fields[MUTEXES_NAME],
block_lock = lock; // lock->lock_name));
block_lock_oswait_count += lock->count_os_wait; OK(field_store_string(
continue; fields[MUTEXES_CREATE_FILE],
innobase_basename(lock->cfile_name)));
OK(fields[MUTEXES_CREATE_LINE]->store(lock->cline,
true));
fields[MUTEXES_CREATE_LINE]->set_notnull();
OK(fields[MUTEXES_OS_WAITS]->store(lock->count_os_wait,
true));
fields[MUTEXES_OS_WAITS]->set_notnull();
OK(schema_table_store_record(thd, tables->table));
} }
//OK(field_store_string(fields[MUTEXES_NAME], lock->lock_name)); if (block_lock) {
OK(field_store_string(fields[MUTEXES_CREATE_FILE], innobase_basename(lock->cfile_name))); char buf1[IO_SIZE];
OK(fields[MUTEXES_CREATE_LINE]->store(lock->cline, true));
fields[MUTEXES_CREATE_LINE]->set_notnull(); snprintf(buf1, sizeof buf1, "combined %s",
OK(field_store_ulint(fields[MUTEXES_OS_WAITS], (longlong)lock->count_os_wait)); innobase_basename(block_lock->cfile_name));
OK(schema_table_store_record(thd, tables->table));
} //OK(field_store_string(fields[MUTEXES_NAME],
// block_lock->lock_name));
if (block_lock) { OK(field_store_string(fields[MUTEXES_CREATE_FILE],
char buf1[IO_SIZE]; buf1));
OK(fields[MUTEXES_CREATE_LINE]->store(block_lock->cline,
snprintf(buf1, sizeof buf1, "combined %s", true));
innobase_basename(block_lock->cfile_name)); fields[MUTEXES_CREATE_LINE]->set_notnull();
OK(fields[MUTEXES_OS_WAITS]->store(
//OK(field_store_string(fields[MUTEXES_NAME], block_lock->lock_name)); block_lock_oswait_count, true));
OK(field_store_string(fields[MUTEXES_CREATE_FILE], buf1)); fields[MUTEXES_OS_WAITS]->set_notnull();
OK(fields[MUTEXES_CREATE_LINE]->store(block_lock->cline, true)); OK(schema_table_store_record(thd, tables->table));
fields[MUTEXES_CREATE_LINE]->set_notnull(); }
OK(field_store_ulint(fields[MUTEXES_OS_WAITS], (longlong)block_lock_oswait_count));
OK(schema_table_store_record(thd, tables->table));
} }
mutex_exit(&rw_lock_list_mutex);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
......
storage/xtradb/handler/i_s.cc
View file @ e84dc567
/***************************************************************************** /*****************************************************************************
Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2014, 2018, MariaDB Corporation. Copyright (c) 2014, 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software the terms of the GNU General Public License as published by the Free Software
...@@ -9120,78 +9120,105 @@ i_s_innodb_mutexes_fill_table( ...@@ -9120,78 +9120,105 @@ i_s_innodb_mutexes_fill_table(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
mutex_enter(&mutex_list_mutex); {
struct Locking
{
Locking() { mutex_enter(&mutex_list_mutex); }
~Locking() { mutex_exit(&mutex_list_mutex); }
} locking;
for (mutex = UT_LIST_GET_FIRST(mutex_list); mutex != NULL;
mutex = UT_LIST_GET_NEXT(list, mutex)) {
if (mutex->count_os_wait == 0) {
continue;
}
for (mutex = UT_LIST_GET_FIRST(mutex_list); mutex != NULL; if (buf_pool_is_block_mutex(mutex)) {
mutex = UT_LIST_GET_NEXT(list, mutex)) { block_mutex = mutex;
if (mutex->count_os_wait == 0) { block_mutex_oswait_count
continue; += mutex->count_os_wait;
} continue;
}
if (buf_pool_is_block_mutex(mutex)) { OK(field_store_string(fields[MUTEXES_NAME],
block_mutex = mutex; mutex->cmutex_name));
block_mutex_oswait_count += mutex->count_os_wait; OK(field_store_string(
continue; fields[MUTEXES_CREATE_FILE],
innobase_basename(mutex->cfile_name)));
OK(field_store_ulint(fields[MUTEXES_CREATE_LINE],
mutex->cline));
OK(field_store_ulint(fields[MUTEXES_OS_WAITS],
mutex->count_os_wait));
OK(schema_table_store_record(thd, tables->table));
} }
OK(field_store_string(fields[MUTEXES_NAME], mutex->cmutex_name)); if (block_mutex) {
OK(field_store_string(fields[MUTEXES_CREATE_FILE], innobase_basename(mutex->cfile_name))); char buf1[IO_SIZE];
OK(field_store_ulint(fields[MUTEXES_CREATE_LINE], mutex->cline));
OK(field_store_ulint(fields[MUTEXES_OS_WAITS], (longlong)mutex->count_os_wait)); my_snprintf(buf1, sizeof buf1, "combined %s",
OK(schema_table_store_record(thd, tables->table)); innobase_basename(block_mutex->cfile_name));
}
OK(field_store_string(fields[MUTEXES_NAME],
if (block_mutex) { block_mutex->cmutex_name));
char buf1[IO_SIZE]; OK(field_store_string(fields[MUTEXES_CREATE_FILE],
buf1));
my_snprintf(buf1, sizeof buf1, "combined %s", OK(field_store_ulint(fields[MUTEXES_CREATE_LINE],
innobase_basename(block_mutex->cfile_name)); block_mutex->cline));
OK(field_store_ulint(fields[MUTEXES_OS_WAITS],
OK(field_store_string(fields[MUTEXES_NAME], block_mutex->cmutex_name)); block_mutex_oswait_count));
OK(field_store_string(fields[MUTEXES_CREATE_FILE], buf1)); OK(schema_table_store_record(thd, tables->table));
OK(field_store_ulint(fields[MUTEXES_CREATE_LINE], block_mutex->cline)); }
OK(field_store_ulint(fields[MUTEXES_OS_WAITS], (longlong)block_mutex_oswait_count));
OK(schema_table_store_record(thd, tables->table));
} }
mutex_exit(&mutex_list_mutex); {
struct Locking
{
Locking() { mutex_enter(&rw_lock_list_mutex); }
~Locking() { mutex_exit(&rw_lock_list_mutex); }
} locking;
for (lock = UT_LIST_GET_FIRST(rw_lock_list); lock != NULL;
lock = UT_LIST_GET_NEXT(list, lock)) {
if (lock->count_os_wait == 0) {
continue;
}
mutex_enter(&rw_lock_list_mutex); if (buf_pool_is_block_lock(lock)) {
block_lock = lock;
block_lock_oswait_count += lock->count_os_wait;
continue;
}
for (lock = UT_LIST_GET_FIRST(rw_lock_list); lock != NULL; OK(field_store_string(fields[MUTEXES_NAME],
lock = UT_LIST_GET_NEXT(list, lock)) { lock->lock_name));
if (lock->count_os_wait == 0) { OK(field_store_string(
continue; fields[MUTEXES_CREATE_FILE],
innobase_basename(lock->cfile_name)));
OK(field_store_ulint(fields[MUTEXES_CREATE_LINE],
lock->cline));
OK(field_store_ulint(fields[MUTEXES_OS_WAITS],
lock->count_os_wait));
OK(schema_table_store_record(thd, tables->table));
} }
if (buf_pool_is_block_lock(lock)) { if (block_lock) {
block_lock = lock; char buf1[IO_SIZE];
block_lock_oswait_count += lock->count_os_wait;
continue; my_snprintf(buf1, sizeof buf1, "combined %s",
innobase_basename(block_lock->cfile_name));
OK(field_store_string(fields[MUTEXES_NAME],
block_lock->lock_name));
OK(field_store_string(fields[MUTEXES_CREATE_FILE],
buf1));
OK(field_store_ulint(fields[MUTEXES_CREATE_LINE],
block_lock->cline));
OK(field_store_ulint(fields[MUTEXES_OS_WAITS],
block_lock_oswait_count));
OK(schema_table_store_record(thd, tables->table));
} }
OK(field_store_string(fields[MUTEXES_NAME], lock->lock_name));
OK(field_store_string(fields[MUTEXES_CREATE_FILE], innobase_basename(lock->cfile_name)));
OK(field_store_ulint(fields[MUTEXES_CREATE_LINE], lock->cline));
OK(field_store_ulint(fields[MUTEXES_OS_WAITS], (longlong)lock->count_os_wait));
OK(schema_table_store_record(thd, tables->table));
}
if (block_lock) {
char buf1[IO_SIZE];
my_snprintf(buf1, sizeof buf1, "combined %s",
innobase_basename(block_lock->cfile_name));
OK(field_store_string(fields[MUTEXES_NAME], block_lock->lock_name));
OK(field_store_string(fields[MUTEXES_CREATE_FILE], buf1));
OK(field_store_ulint(fields[MUTEXES_CREATE_LINE], block_lock->cline));
OK(field_store_ulint(fields[MUTEXES_OS_WAITS], (longlong)block_lock_oswait_count));
OK(schema_table_store_record(thd, tables->table));
} }
mutex_exit(&rw_lock_list_mutex);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7