diff --git a/include/maxscale/routingworker.hh b/include/maxscale/routingworker.hh index f6513f436..2b8eb0d4f 100644 --- a/include/maxscale/routingworker.hh +++ b/include/maxscale/routingworker.hh @@ -523,10 +523,12 @@ public: std::mutex lock; mxb::Semaphore sem; - auto n = RoutingWorker::broadcast([&](){ - std::lock_guard guard(lock); - rval.push_back(*get_local_value()); - }, &sem, RoutingWorker::EXECUTE_AUTO); + auto n = RoutingWorker::broadcast([&]() { + std::lock_guard guard(lock); + rval.push_back(*get_local_value()); + }, + &sem, + RoutingWorker::EXECUTE_AUTO); sem.wait_n(n); return std::move(rval); diff --git a/include/maxscale/statistics.hh b/include/maxscale/statistics.hh index 577d8a54f..b731af385 100644 --- a/include/maxscale/statistics.hh +++ b/include/maxscale/statistics.hh @@ -16,8 +16,8 @@ enum ts_stats_type { - TS_STATS_MAX, /**< Maximum value */ - TS_STATS_MIX, /**< Minimum value */ - TS_STATS_SUM, /**< Sum of all value */ - TS_STATS_AVG /**< Average of all values */ + TS_STATS_MAX, /**< Maximum value */ + TS_STATS_MIX, /**< Minimum value */ + TS_STATS_SUM, /**< Sum of all value */ + TS_STATS_AVG /**< Average of all values */ }; diff --git a/maxutils/maxbase/include/maxbase/worker.hh b/maxutils/maxbase/include/maxbase/worker.hh index d36316fcd..da5e6f398 100644 --- a/maxutils/maxbase/include/maxbase/worker.hh +++ b/maxutils/maxbase/include/maxbase/worker.hh @@ -40,18 +40,18 @@ struct WORKER_STATISTICS N_QUEUE_TIMES = 30 }; - int64_t n_read = 0; /*< Number of read events */ - int64_t n_write = 0; /*< Number of write events */ - int64_t n_error = 0; /*< Number of error events */ - int64_t n_hup = 0; /*< Number of hangup events */ - int64_t n_accept = 0; /*< Number of accept events */ - int64_t n_polls = 0; /*< Number of poll cycles */ - int64_t n_pollev = 0; /*< Number of polls returning events */ - int64_t n_nbpollev = 0; /*< Number of polls returning events */ - int64_t evq_avg = 0; /*< Average event queue length */ - int64_t evq_max = 0; /*< Maximum event queue length */ - int64_t blockingpolls = 0; /*< Number of epoll_waits with a timeout - * specified */ + int64_t n_read = 0; /*< Number of read events */ + int64_t n_write = 0; /*< Number of write events */ + int64_t n_error = 0; /*< Number of error events */ + int64_t n_hup = 0; /*< Number of hangup events */ + int64_t n_accept = 0; /*< Number of accept events */ + int64_t n_polls = 0; /*< Number of poll cycles */ + int64_t n_pollev = 0; /*< Number of polls returning events */ + int64_t n_nbpollev = 0; /*< Number of polls returning events */ + int64_t evq_avg = 0; /*< Average event queue length */ + int64_t evq_max = 0; /*< Maximum event queue length */ + int64_t blockingpolls = 0; /*< Number of epoll_waits with a timeout + * specified */ int64_t maxqtime = 0; int64_t maxexectime = 0; std::array n_fds {}; /*< Number of wakeups with particular n_fds value */