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

Remove BLOCKING_POLL

Browse Source 
The code was not correct anymore and correcting it does not seem
worthwhile.
This commit is contained in:
Johan Wikman
2017-03-27 09:46:05 +03:00
parent 8e24f847e6
commit 58c1c1a3ca
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/core/poll.cc
View File

@ -595,10 +595,6 @@ poll_resolve_error(DCB *dcb, int errornum, bool adding)
return -1; return -1;
} }
#define BLOCKINGPOLL 0 /*< Set BLOCKING POLL to 1 if using a single thread and to make
* debugging easier.
*/
/** /**
* The main polling loop * The main polling loop
* *
@ -665,10 +661,6 @@ poll_waitevents(void *arg)
while (1) while (1)
{ {
atomic_add(&n_waiting, 1); atomic_add(&n_waiting, 1);
#if BLOCKINGPOLL
nfds = epoll_wait(epoll_fd, events, MAX_EVENTS, -1);
atomic_add(&n_waiting, -1);
#else /* BLOCKINGPOLL */
#if MUTEX_EPOLL #if MUTEX_EPOLL
simple_mutex_lock(&epoll_wait_mutex, TRUE); simple_mutex_lock(&epoll_wait_mutex, TRUE);
#endif #endif
@ -723,7 +715,6 @@ poll_waitevents(void *arg)
#if MUTEX_EPOLL #if MUTEX_EPOLL
simple_mutex_unlock(&epoll_wait_mutex); simple_mutex_unlock(&epoll_wait_mutex);
#endif #endif
#endif /* BLOCKINGPOLL */
if (nfds > 0) if (nfds > 0)
{ {
ts_stats_set(pollStats.evq_length, nfds, thread_id); ts_stats_set(pollStats.evq_length, nfds, thread_id);