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

Move stats-collecting to poll_waitevents()

Browse Source 
If the stats-collecting is performed in poll_waitevents() then it
will be collected for all kinds of sockets (when other that DCB
ones can be added).
This commit is contained in:
Johan Wikman
2017-02-14 18:18:52 +02:00
parent 63141bb191
commit 1e47c4aa50
1 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
server/core/poll.cc
View File

@ -838,9 +838,38 @@ poll_waitevents(void *arg)
/* Process of the queue of waiting requests */ /* Process of the queue of waiting requests */
for (int i = 0; i < nfds; i++) for (int i = 0; i < nfds; i++)
{ {
/** Calculate event queue statistics */
uint64_t started = hkheartbeat;
uint64_t qtime = started - thread_data[thread_id].cycle_start;
if (qtime > N_QUEUE_TIMES)
{
queueStats.qtimes[N_QUEUE_TIMES]++;
}
else
{
queueStats.qtimes[qtime]++;
}
ts_stats_set_max(queueStats.maxqtime, qtime, thread_id);
MXS_POLL_DATA *data = (MXS_POLL_DATA*)events[i].data.ptr; MXS_POLL_DATA *data = (MXS_POLL_DATA*)events[i].data.ptr;
data->handler(data, thread_id, events[i].events); data->handler(data, thread_id, events[i].events);
/** Calculate event execution statistics */
qtime = hkheartbeat - started;
if (qtime > N_QUEUE_TIMES)
{
queueStats.exectimes[N_QUEUE_TIMES]++;
}
else
{
queueStats.exectimes[qtime % N_QUEUE_TIMES]++;
}
ts_stats_set_max(queueStats.maxexectime, qtime, thread_id);
} }
dcb_process_idle_sessions(thread_id); dcb_process_idle_sessions(thread_id);
@ -923,21 +952,6 @@ process_pollq_dcb(DCB *dcb, int thread_id, uint32_t ev)
{ {
ss_dassert(dcb->poll.thread.id == thread_id || dcb->dcb_role == DCB_ROLE_SERVICE_LISTENER); ss_dassert(dcb->poll.thread.id == thread_id || dcb->dcb_role == DCB_ROLE_SERVICE_LISTENER);
/** Calculate event queue statistics */
uint64_t started = hkheartbeat;
uint64_t qtime = started - thread_data[thread_id].cycle_start;
if (qtime > N_QUEUE_TIMES)
{
queueStats.qtimes[N_QUEUE_TIMES]++;
}
else
{
queueStats.qtimes[qtime]++;
}
ts_stats_set_max(queueStats.maxqtime, qtime, thread_id);
CHK_DCB(dcb); CHK_DCB(dcb);
thread_data[thread_id].state = THREAD_PROCESSING; thread_data[thread_id].state = THREAD_PROCESSING;
@ -1093,21 +1107,6 @@ process_pollq_dcb(DCB *dcb, int thread_id, uint32_t ev)
} }
} }
#endif #endif
/** Calculate event execution statistics */
qtime = hkheartbeat - started;
if (qtime > N_QUEUE_TIMES)
{
queueStats.exectimes[N_QUEUE_TIMES]++;
}
else
{
queueStats.exectimes[qtime % N_QUEUE_TIMES]++;
}
ts_stats_set_max(queueStats.maxexectime, qtime, thread_id);
return 1; return 1;
} }