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

Make lambdas in monitor.cc more readable

Browse Source 
Putting the function call and the start of the lambda on different lines
keeps the lambda contents less indented.
This commit is contained in:
Markus Mäkelä
2019-05-24 18:26:51 +03:00
parent 859e930466
commit 752aa9de57
1 changed files with 86 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server/core/monitormanager.cc
View File

@ -129,13 +129,15 @@ void MonitorManager::debug_wait_one_tick()
std::map<Monitor*, long> ticks; std::map<Monitor*, long> ticks;
// Get tick values for all monitors // Get tick values for all monitors
this_unit.foreach_monitor([&ticks](Monitor* mon) { this_unit.foreach_monitor(
[&ticks](Monitor* mon) {
ticks[mon] = mon->ticks(); ticks[mon] = mon->ticks();
return true; return true;
}); });
// Wait for all running monitors to advance at least one tick. // Wait for all running monitors to advance at least one tick.
this_unit.foreach_monitor([&ticks](Monitor* mon) { this_unit.foreach_monitor(
[&ticks](Monitor* mon) {
if (mon->is_running()) if (mon->is_running())
{ {
auto start = steady_clock::now(); auto start = steady_clock::now();
@ -184,7 +186,8 @@ void MonitorManager::start_monitor(Monitor* monitor)
void MonitorManager::populate_services() void MonitorManager::populate_services()
{ {
mxb_assert(Monitor::is_admin_thread()); mxb_assert(Monitor::is_admin_thread());
this_unit.foreach_monitor([](Monitor* pMonitor) -> bool { this_unit.foreach_monitor(
[](Monitor* pMonitor) -> bool {
pMonitor->populate_services(); pMonitor->populate_services();
return true; return true;
}); });
@ -196,7 +199,8 @@ void MonitorManager::populate_services()
void MonitorManager::start_all_monitors() void MonitorManager::start_all_monitors()
{ {
mxb_assert(Monitor::is_admin_thread()); mxb_assert(Monitor::is_admin_thread());
this_unit.foreach_monitor([](Monitor* monitor) { this_unit.foreach_monitor(
[](Monitor* monitor) {
MonitorManager::start_monitor(monitor); MonitorManager::start_monitor(monitor);
return true; return true;
}); });
@ -228,7 +232,8 @@ void MonitorManager::deactivate_monitor(Monitor* monitor)
void MonitorManager::stop_all_monitors() void MonitorManager::stop_all_monitors()
{ {
mxb_assert(Monitor::is_admin_thread()); mxb_assert(Monitor::is_admin_thread());
this_unit.foreach_monitor([](Monitor* monitor) { this_unit.foreach_monitor(
[](Monitor* monitor) {
MonitorManager::stop_monitor(monitor); MonitorManager::stop_monitor(monitor);
return true; return true;
}); });
@ -242,7 +247,8 @@ void MonitorManager::stop_all_monitors()
void MonitorManager::show_all_monitors(DCB* dcb) void MonitorManager::show_all_monitors(DCB* dcb)
{ {
mxb_assert(Monitor::is_admin_thread()); mxb_assert(Monitor::is_admin_thread());
this_unit.foreach_monitor([dcb](Monitor* monitor) { this_unit.foreach_monitor(
[dcb](Monitor* monitor) {
monitor_show(dcb, monitor); monitor_show(dcb, monitor);
return true; return true;
}); });
@ -271,7 +277,8 @@ void MonitorManager::monitor_list(DCB* dcb)
dcb_printf(dcb, "%-20s | Status\n", "Monitor"); dcb_printf(dcb, "%-20s | Status\n", "Monitor");
dcb_printf(dcb, "---------------------+---------------------\n"); dcb_printf(dcb, "---------------------+---------------------\n");
this_unit.foreach_monitor([dcb](Monitor* ptr) { this_unit.foreach_monitor(
[dcb](Monitor* ptr) {
dcb_printf(dcb, "%-20s | %s\n", ptr->name(), ptr->state_string()); dcb_printf(dcb, "%-20s | %s\n", ptr->name(), ptr->state_string());
return true; return true;
}); });
@ -288,7 +295,8 @@ void MonitorManager::monitor_list(DCB* dcb)
Monitor* MonitorManager::find_monitor(const char* name) Monitor* MonitorManager::find_monitor(const char* name)
{ {
Monitor* rval = nullptr; Monitor* rval = nullptr;
this_unit.foreach_monitor([&rval, name](Monitor* ptr) { this_unit.foreach_monitor(
[&rval, name](Monitor* ptr) {
if (ptr->m_name == name) if (ptr->m_name == name)
{ {
rval = ptr; rval = ptr;
@ -307,7 +315,8 @@ std::unique_ptr<ResultSet> MonitorManager::monitor_get_list()
{ {
mxb_assert(Monitor::is_admin_thread()); mxb_assert(Monitor::is_admin_thread());
std::unique_ptr<ResultSet> set = ResultSet::create({"Monitor", "Status"}); std::unique_ptr<ResultSet> set = ResultSet::create({"Monitor", "Status"});
this_unit.foreach_monitor([&set](Monitor* ptr) { this_unit.foreach_monitor(
[&set](Monitor* ptr) {
set->add_row({ptr->m_name, ptr->state_string()}); set->add_row({ptr->m_name, ptr->state_string()});
return true; return true;
}); });
@ -463,7 +472,8 @@ json_t* MonitorManager::monitor_to_json(const Monitor* monitor, const char* host
json_t* MonitorManager::monitor_list_to_json(const char* host) json_t* MonitorManager::monitor_list_to_json(const char* host)
{ {
json_t* rval = json_array(); json_t* rval = json_array();
this_unit.foreach_monitor([rval, host](Monitor* mon) { this_unit.foreach_monitor(
[rval, host](Monitor* mon) {
json_t* json = mon->to_json(host); json_t* json = mon->to_json(host);
if (json) if (json)
{ {
@ -479,7 +489,8 @@ json_t* MonitorManager::monitor_relations_to_server(const SERVER* server, const
{ {
mxb_assert(Monitor::is_admin_thread()); mxb_assert(Monitor::is_admin_thread());
std::vector<std::string> names; std::vector<std::string> names;
this_unit.foreach_monitor([&names, server](Monitor* mon) { this_unit.foreach_monitor(
[&names, server](Monitor* mon) {
// The serverlist of an individual monitor should not change while a // The serverlist of an individual monitor should not change while a
// monitor is running. // monitor is running.
for (MonitorServer* db : mon->servers()) for (MonitorServer* db : mon->servers())