Skip to content

Commit

Permalink
MDEV-33046 - delete unnecessary synchronization with dict_stats_mutex
Browse files Browse the repository at this point in the history
Timer has internal synchronization, so that calling
set_time concurrently is not a problem.
  • Loading branch information
vaintroub committed Dec 21, 2023
1 parent a3dd7ea commit 7cc332b
Showing 1 changed file with 4 additions and 17 deletions.
21 changes: 4 additions & 17 deletions storage/innobase/dict/dict0stats_bg.cc
Expand Up @@ -411,7 +411,6 @@ static bool dict_stats_process_entry_from_recalc_pool()
}

static tpool::timer* dict_stats_timer;
static std::mutex dict_stats_mutex;

static void dict_stats_func(void*)
{
Expand All @@ -422,26 +421,15 @@ static void dict_stats_func(void*)

void dict_stats_start()
{
std::lock_guard<std::mutex> lk(dict_stats_mutex);
if (!dict_stats_timer)
dict_stats_timer= srv_thread_pool->create_timer(dict_stats_func);
DBUG_ASSERT(!dict_stats_timer);
dict_stats_timer= srv_thread_pool->create_timer(dict_stats_func);
}


static void dict_stats_schedule(int ms)
{
std::unique_lock<std::mutex> lk(dict_stats_mutex, std::defer_lock);
/*
Use try_lock() to avoid deadlock in dict_stats_shutdown(), which
uses dict_stats_mutex too. If there is simultaneous timer reschedule,
the first one will win, which is fine.
*/
if (!lk.try_lock())
{
return;
}
if (dict_stats_timer)
dict_stats_timer->set_time(ms,0);
DBUG_ASSERT(dict_stats_timer);
dict_stats_timer->set_time(ms,0);
}

void dict_stats_schedule_now()
Expand All @@ -452,7 +440,6 @@ void dict_stats_schedule_now()
/** Shut down the dict_stats_thread. */
void dict_stats_shutdown()
{
std::lock_guard<std::mutex> lk(dict_stats_mutex);
delete dict_stats_timer;
dict_stats_timer= 0;
}

0 comments on commit 7cc332b

Please sign in to comment.