Skip to content

Commit dbdf72a

Browse files
author
aibek.bukabayev [email protected]
committed
Addressing review comments
1 parent 2aaa812 commit dbdf72a

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

sql/conn_handler/connection_handler_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class Thread_pool_connection_handler : public Connection_handler {
135135

136136
uint get_max_threads() const override { return threadpool_max_threads; }
137137

138-
void post_daemonize_init() override { start_timer_thread(); }
138+
void post_daemonize_init() override { tp_start_timer_thread(); }
139139
};
140140

141141
#endif // CONNECTION_HANDLER_IMPL_INCLUDED

sql/mysqld.cc

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8158,13 +8158,10 @@ int mysqld_main(int argc, char **argv)
81588158
}
81598159
#endif
81608160

8161-
if (Connection_handler_manager::thread_handling ==
8162-
Connection_handler_manager::SCHEDULER_THREAD_POOL) {
8163-
// If --thread-handling=pool-of-threads is specified,
8164-
// the timer thread should start only after the daemon process has begun,
8165-
// provided that --daemonize was also specified.
8166-
Connection_handler_manager::get_instance()->post_daemonize_init();
8167-
}
8161+
// Post daemonization operations performed
8162+
// such as initializing the timer_thread when using
8163+
// --thread-handling=pool-of-threads
8164+
Connection_handler_manager::get_instance()->post_daemonize_init();
81688165

81698166
#ifndef _WIN32
81708167
user_info = check_user(mysqld_user);

sql/threadpool.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,6 @@ extern void tp_set_threadpool_size(uint val) noexcept;
8181
extern void tp_set_threadpool_stall_limit(uint val) noexcept;
8282

8383
/* Function to start the timer thread */
84-
extern void start_timer_thread() noexcept;
84+
extern void tp_start_timer_thread() noexcept;
8585

8686
#endif /* THREADPOOL_INCLUDED */

sql/threadpool_unix.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ static void start_timer(pool_timer_t *timer) noexcept {
612612
DBUG_VOID_RETURN;
613613
}
614614

615-
void start_timer_thread() noexcept {
615+
void tp_start_timer_thread() noexcept {
616616
pool_timer.tick_interval = threadpool_stall_limit;
617617
start_timer(&pool_timer);
618618
}

0 commit comments

Comments
 (0)