database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.6' into 10.11

Browse Source
This commit is contained in:
Sergei Golubchik
2024-04-22 11:00:03 +02:00
parent 75488a57f2 e83d92ee5e
commit 018d537ec1
418 changed files with 7074 additions and 2930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tpool/tpool_generic.cc
View File

@@ -628,7 +628,7 @@ void thread_pool_generic::check_idle(std::chrono::system_clock::time_point now)
}
/* Switch timer off after 1 minute of idle time */
if (now - idle_since > max_idle_time)
if (now - idle_since > max_idle_time && m_active_threads.empty())
{
idle_since= invalid_timestamp;
switch_timer(timer_state_t::OFF);
@@ -729,6 +729,13 @@ bool thread_pool_generic::add_thread()
if (n_threads >= m_max_threads)
return false;
/*
Deadlock danger exists, so monitor pool health
with maintenance timer.
*/
switch_timer(timer_state_t::ON);
if (n_threads >= m_min_threads)
{
auto now = std::chrono::system_clock::now();
@@ -739,8 +746,6 @@ bool thread_pool_generic::add_thread()
Throttle thread creation and wakeup deadlock detection timer,
if is it off.
*/
switch_timer(timer_state_t::ON);
return false;
}
}
@@ -801,6 +806,7 @@ thread_pool_generic::thread_pool_generic(int min_threads, int max_threads) :
m_tasks_dequeued(),
m_wakeups(),
m_spurious_wakeups(),
m_timer_state(timer_state_t::ON),
m_in_shutdown(),
m_timestamp(),
m_long_tasks_count(),
@@ -813,6 +819,7 @@ thread_pool_generic::thread_pool_generic(int min_threads, int max_threads) :
m_maintenance_timer(thread_pool_generic::maintenance_func, this, nullptr)
{
set_concurrency();
// start the timer
m_maintenance_timer.set_time(0, (int)m_timer_interval.count());
}