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

Fix mistake; tidy format.

Browse Source
This commit is contained in:
Martin Brampton
2015-08-22 19:14:40 +01:00
parent cb74b52601
commit 53c3cc4b41
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/core/poll.c
View File

@ -71,7 +71,7 @@ int max_poll_sleep;
* 24/09/14 Mark Riddoch Introduction of the event queue for processing the * 24/09/14 Mark Riddoch Introduction of the event queue for processing the
* incoming events rather than processing them immediately * incoming events rather than processing them immediately
* in the loop after the epoll_wait. This allows for better * in the loop after the epoll_wait. This allows for better
* thread utilisaiton and fairer scheduling of the event * thread utilisation and fairer scheduling of the event
* processing. * processing.
* 07/07/15 Martin Brampton Simplified add and remove DCB, improve error handling. * 07/07/15 Martin Brampton Simplified add and remove DCB, improve error handling.
* *
@ -96,7 +96,7 @@ static int process_pollq(int thread_id);
static void poll_add_event_to_dcb(DCB* dcb, GWBUF* buf, __uint32_t ev); static void poll_add_event_to_dcb(DCB* dcb, GWBUF* buf, __uint32_t ev);
DCB *eventq = NULL; DCB *eventq = NULL;
SPINLOCK pollqlock = SPINLOCK_INIT; SPINLOCK pollqlock = SPINLOCK_INIT;
/** /**
@ -104,13 +104,13 @@ SPINLOCK pollqlock = SPINLOCK_INIT;
* poll completion, a value of 1 or less is the ideal. * poll completion, a value of 1 or less is the ideal.
*/ */
static double load_average = 0.0; static double load_average = 0.0;
static int load_samples = 0; static int load_samples = 0;
static int load_nfds = 0; static int load_nfds = 0;
static double current_avg = 0.0; static double current_avg = 0.0;
static double *avg_samples = NULL; static double *avg_samples = NULL;
static int *evqp_samples = NULL; static int *evqp_samples = NULL;
static int next_sample = 0; static int next_sample = 0;
static int n_avg_samples; static int n_avg_samples;
/* Thread statistics data */ /* Thread statistics data */
static int n_threads; /*< No. of threads */ static int n_threads; /*< No. of threads */
@ -128,9 +128,9 @@ typedef enum { THREAD_STOPPED, THREAD_IDLE,
*/ */
typedef struct { typedef struct {
THREAD_STATE state; /*< Current thread state */ THREAD_STATE state; /*< Current thread state */
int n_fds; /*< No. of descriptors thread is processing */ int n_fds; /*< No. of descriptors thread is processing */
DCB *cur_dcb; /*< Current DCB being processed */ DCB *cur_dcb; /*< Current DCB being processed */
uint32_t event; /*< Current event being processed */ uint32_t event; /*< Current event being processed */
} THREAD_DATA; } THREAD_DATA;
static THREAD_DATA *thread_data = NULL; /*< Status of each thread */ static THREAD_DATA *thread_data = NULL; /*< Status of each thread */
@ -381,8 +381,8 @@ poll_remove_dcb(DCB *dcb)
dcbfd = dcb->fd; dcbfd = dcb->fd;
spinlock_release(&dcb->dcb_initlock); spinlock_release(&dcb->dcb_initlock);
if (dcbfd > 0) if (dcbfd > 0)
{ {
rc = epoll_ctl(epoll_fd, EPOLL_CTL_DEL, dcb->fd, &ev); rc = epoll_ctl(epoll_fd, EPOLL_CTL_DEL, dcbfd, &ev);
/** /**
* The poll_resolve_error function will always * The poll_resolve_error function will always
* return 0 or crash. So if it returns non-zero result, * return 0 or crash. So if it returns non-zero result,