hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make response time lock server-specific

Browse Source 
There's no global data being modified inside the method call so a instance
level lock is sufficient.
This commit is contained in:
Markus Mäkelä 2019-07-07 21:20:28 +03:00
parent e516c11ac5
commit 2238faa913
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/core/server.cc
View File

@ -1550,18 +1550,9 @@ bool server_set_disk_space_threshold(SERVER* server, const char* disk_space_thre
return rv;
}
namespace
{
std::mutex ave_write_mutex;
}
void server_add_response_average(SERVER* srv, double ave, int num_samples)
{
Server* server = static_cast<Server*>(srv);
std::lock_guard<std::mutex> guard(ave_write_mutex);
server->response_time_add(ave, num_samples);
static_cast<Server*>(srv)->response_time_add(ave, num_samples);
}
int server_response_time_num_samples(const SERVER* srv)
@ -1589,9 +1580,11 @@ double server_response_time_average(const SERVER* srv)
void Server::response_time_add(double ave, int num_samples)
{
constexpr double drift {1.1};
int current_max = m_response_time.sample_max();
int new_max {0};
std::lock_guard<std::mutex> guard(m_lock);
int current_max = m_response_time.sample_max();
// This server handles more samples than EMA max.
// Increasing max allows all servers to be fairly compared.
if (num_samples >= current_max)