Commit d8373fea authored by Vladislav Vaintroub's avatar Vladislav Vaintroub Committed by Marko Mäkelä

MDEV-24685 - remove IO thread states output from SHOW ENGINE INNODB STATUS

There are no IO threads anymore.
parent c3672038
...@@ -457,11 +457,6 @@ extern ulint srv_dml_needed_delay; ...@@ -457,11 +457,6 @@ extern ulint srv_dml_needed_delay;
#define SRV_MAX_N_IO_THREADS 130 #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 */ /** innodb_purge_threads; the number of purge tasks to use */
extern uint srv_n_purge_threads; extern uint srv_n_purge_threads;
...@@ -596,19 +591,6 @@ srv_boot(void); ...@@ -596,19 +591,6 @@ srv_boot(void);
Frees the data structures created in srv_init(). */ Frees the data structures created in srv_init(). */
void void
srv_free(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. */ /** Wake up the purge if there is work to do. */
void void
......
...@@ -4160,15 +4160,6 @@ os_aio_print(FILE* file) ...@@ -4160,15 +4160,6 @@ os_aio_print(FILE* file)
time_t current_time; time_t current_time;
double time_elapsed; 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); fputs("Pending normal aio reads:", file);
......
...@@ -389,12 +389,6 @@ my_bool innodb_encrypt_temporary_tables; ...@@ -389,12 +389,6 @@ my_bool innodb_encrypt_temporary_tables;
my_bool srv_immediate_scrub_data_uncompressed; 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 time_t srv_last_monitor_time;
static ib_mutex_t srv_innodb_monitor_mutex; static ib_mutex_t srv_innodb_monitor_mutex;
...@@ -617,33 +611,6 @@ srv_print_master_thread_info( ...@@ -617,33 +611,6 @@ srv_print_master_thread_info(
srv_log_writes_and_flush); 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() static void thread_pool_thread_init()
{ {
my_thread_init(); my_thread_init();
......
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