summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2021-01-27 14:17:43 +0100
committerMarko Mäkelä <marko.makela@mariadb.com>2021-01-29 18:02:14 +0200
commitd8373fea5f099b694f0ab14e0d083388915de51c (patch)
tree36b795b3d43eeef4cb59fe582337640793ba2bbe
parentc36720388d598ca3aa1c4d2dab2266656c528b50 (diff)
downloadmariadb-git-d8373fea5f099b694f0ab14e0d083388915de51c.tar.gz
MDEV-24685 - remove IO thread states output from SHOW ENGINE INNODB STATUS
There are no IO threads anymore.
-rw-r--r--storage/innobase/include/srv0srv.h18
-rw-r--r--storage/innobase/os/os0file.cc9
-rw-r--r--storage/innobase/srv/srv0srv.cc33
3 files changed, 0 insertions, 60 deletions
diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
index 47ef62336b8..7dcbf2cd1cb 100644
--- a/storage/innobase/include/srv0srv.h
+++ b/storage/innobase/include/srv0srv.h
@@ -457,11 +457,6 @@ extern ulint srv_dml_needed_delay;
#define SRV_MAX_N_IO_THREADS 130
-/* Array of English strings describing the current state of an
-i/o handler thread */
-extern const char* srv_io_thread_op_info[];
-extern const char* srv_io_thread_function[];
-
/** innodb_purge_threads; the number of purge tasks to use */
extern uint srv_n_purge_threads;
@@ -596,19 +591,6 @@ srv_boot(void);
Frees the data structures created in srv_init(). */
void
srv_free(void);
-/*==========*/
-/*********************************************************************//**
-Sets the info describing an i/o thread current state. */
-void
-srv_set_io_thread_op_info(
-/*======================*/
- ulint i, /*!< in: the 'segment' of the i/o thread */
- const char* str); /*!< in: constant char string describing the
- state */
-/*********************************************************************//**
-Resets the info describing an i/o thread current state. */
-void
-srv_reset_io_thread_op_info();
/** Wake up the purge if there is work to do. */
void
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index ac362e50404..982380b93fb 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -4160,15 +4160,6 @@ os_aio_print(FILE* file)
time_t current_time;
double time_elapsed;
- for (uint i = 0; i < srv_n_file_io_threads; ++i) {
- fprintf(file, "I/O thread %u state: %s (%s)",
- i,
- srv_io_thread_op_info[i],
- srv_io_thread_function[i]);
-
- fprintf(file, "\n");
- }
-
fputs("Pending normal aio reads:", file);
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
index 4daff1842e0..d1f34adeeae 100644
--- a/storage/innobase/srv/srv0srv.cc
+++ b/storage/innobase/srv/srv0srv.cc
@@ -389,12 +389,6 @@ my_bool innodb_encrypt_temporary_tables;
my_bool srv_immediate_scrub_data_uncompressed;
-/* Array of English strings describing the current state of an
-i/o handler thread */
-
-const char* srv_io_thread_op_info[SRV_MAX_N_IO_THREADS];
-const char* srv_io_thread_function[SRV_MAX_N_IO_THREADS];
-
static time_t srv_last_monitor_time;
static ib_mutex_t srv_innodb_monitor_mutex;
@@ -617,33 +611,6 @@ srv_print_master_thread_info(
srv_log_writes_and_flush);
}
-/*********************************************************************//**
-Sets the info describing an i/o thread current state. */
-void
-srv_set_io_thread_op_info(
-/*======================*/
- ulint i, /*!< in: the 'segment' of the i/o thread */
- const char* str) /*!< in: constant char string describing the
- state */
-{
- ut_a(i < SRV_MAX_N_IO_THREADS);
-
- srv_io_thread_op_info[i] = str;
-}
-
-/*********************************************************************//**
-Resets the info describing an i/o thread current state. */
-void
-srv_reset_io_thread_op_info()
-/*=========================*/
-{
- for (ulint i = 0; i < UT_ARR_SIZE(srv_io_thread_op_info); ++i) {
- srv_io_thread_op_info[i] = "not started yet";
- }
-}
-
-
-
static void thread_pool_thread_init()
{
my_thread_init();