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

Fix minor formatting oversights

Browse Source 
Code that was not formatted was merged into develop unformatted.
This commit is contained in:
Markus Mäkelä
2018-09-11 07:40:08 +03:00
parent 65c50ca8b7
commit 9b0f016aba
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/maxscale/routingworker.hh
View File

@ -523,10 +523,12 @@ public:
std::mutex lock; std::mutex lock;
mxb::Semaphore sem; mxb::Semaphore sem;
auto n = RoutingWorker::broadcast([&](){ auto n = RoutingWorker::broadcast([&]() {
std::lock_guard<std::mutex> guard(lock); std::lock_guard<std::mutex> guard(lock);
rval.push_back(*get_local_value()); rval.push_back(*get_local_value());
}, &sem, RoutingWorker::EXECUTE_AUTO); },
&sem,
RoutingWorker::EXECUTE_AUTO);
sem.wait_n(n); sem.wait_n(n);
return std::move(rval); return std::move(rval);

8
include/maxscale/statistics.hh
View File

@ -16,8 +16,8 @@
enum ts_stats_type enum ts_stats_type
{ {
TS_STATS_MAX, /**< Maximum value */ TS_STATS_MAX, /**< Maximum value */
TS_STATS_MIX, /**< Minimum value */ TS_STATS_MIX, /**< Minimum value */
TS_STATS_SUM, /**< Sum of all value */ TS_STATS_SUM, /**< Sum of all value */
TS_STATS_AVG /**< Average of all values */ TS_STATS_AVG /**< Average of all values */
}; };

24
maxutils/maxbase/include/maxbase/worker.hh
View File

@ -40,18 +40,18 @@ struct WORKER_STATISTICS
N_QUEUE_TIMES = 30 N_QUEUE_TIMES = 30
}; };
int64_t n_read = 0; /*< Number of read events */ int64_t n_read = 0; /*< Number of read events */
int64_t n_write = 0; /*< Number of write events */ int64_t n_write = 0; /*< Number of write events */
int64_t n_error = 0; /*< Number of error events */ int64_t n_error = 0; /*< Number of error events */
int64_t n_hup = 0; /*< Number of hangup events */ int64_t n_hup = 0; /*< Number of hangup events */
int64_t n_accept = 0; /*< Number of accept events */ int64_t n_accept = 0; /*< Number of accept events */
int64_t n_polls = 0; /*< Number of poll cycles */ int64_t n_polls = 0; /*< Number of poll cycles */
int64_t n_pollev = 0; /*< Number of polls returning events */ int64_t n_pollev = 0; /*< Number of polls returning events */
int64_t n_nbpollev = 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_avg = 0; /*< Average event queue length */
int64_t evq_max = 0; /*< Maximum event queue length */ int64_t evq_max = 0; /*< Maximum event queue length */
int64_t blockingpolls = 0; /*< Number of epoll_waits with a timeout int64_t blockingpolls = 0; /*< Number of epoll_waits with a timeout
* specified */ * specified */
int64_t maxqtime = 0; int64_t maxqtime = 0;
int64_t maxexectime = 0; int64_t maxexectime = 0;
std::array<int64_t, MAXNFDS> n_fds {}; /*< Number of wakeups with particular n_fds value */ std::array<int64_t, MAXNFDS> n_fds {}; /*< Number of wakeups with particular n_fds value */