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

Change DCB to MXS_POLL_DATA in statistics

Browse Source 
Only the address of the data is used, so the code need not be
DCB specific.
This commit is contained in:
Johan Wikman
2017-02-14 19:23:52 +02:00
parent 8500a980ac
commit dec2bcdab2
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/core/poll.cc
View File

@ -155,11 +155,11 @@ typedef enum
*/
typedef struct
{
THREAD_STATE state; /*< Current thread state */
int n_fds; /*< No. of descriptors thread is processing */
DCB *cur_dcb; /*< Current DCB being processed */
uint32_t event; /*< Current event being processed */
uint64_t cycle_start; /*< The time when the poll loop was started */
THREAD_STATE state; /*< Current thread state */
int n_fds; /*< No. of descriptors thread is processing */
MXS_POLL_DATA *cur_data; /*< Current DCB being processed */
uint32_t event; /*< Current event being processed */
uint64_t cycle_start; /*< The time when the poll loop was started */
} THREAD_DATA;
static THREAD_DATA *thread_data = NULL; /*< Status of each thread */
@ -811,7 +811,7 @@ poll_waitevents(void *arg)
ts_stats_increment(pollStats.n_pollev, thread_id);
thread_data[thread_id].n_fds = nfds;
thread_data[thread_id].cur_dcb = NULL;
thread_data[thread_id].cur_data = NULL;
thread_data[thread_id].event = 0;
thread_data[thread_id].state = THREAD_PROCESSING;
@ -854,6 +854,7 @@ poll_waitevents(void *arg)
ts_stats_set_max(queueStats.maxqtime, qtime, thread_id);
MXS_POLL_DATA *data = (MXS_POLL_DATA*)events[i].data.ptr;
thread_data[thread_id].cur_data = data;
thread_data[thread_id].event = events[i].events;
data->handler(data, thread_id, events[i].events);
@ -955,8 +956,6 @@ process_pollq_dcb(DCB *dcb, int thread_id, uint32_t ev)
CHK_DCB(dcb);
thread_data[thread_id].cur_dcb = dcb;
/* It isn't obvious that this is impossible */
/* ss_dassert(dcb->state != DCB_STATE_DISCONNECTED); */
if (DCB_STATE_DISCONNECTED == dcb->state)
@ -1389,7 +1388,7 @@ dShowThreads(DCB *dcb)
" %2d | %-10s | | | |\n",
i, state);
}
else if (thread_data[i].cur_dcb == NULL)
else if (thread_data[i].cur_data == NULL)
{
dcb_printf(dcb,
" %2d | %-10s | %6d | | |\n",
@ -1412,7 +1411,7 @@ dShowThreads(DCB *dcb)
dcb_printf(dcb,
" %2d | %-10s | %6d | %-16p | <%3lu00ms | %s\n",
i, state, thread_data[i].n_fds,
thread_data[i].cur_dcb, 1 + hkheartbeat - dcb->evq.started,
thread_data[i].cur_data, 1 + hkheartbeat - dcb->evq.started,
event_string);
if (from_heap)