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

Make EPOLLRDHUP conditional to allow CentOS5 builds

Browse Source
This commit is contained in:
Mark Riddoch
2014-09-23 08:04:45 +01:00
parent cd73c33d65
commit a71971cf53
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/poll.c
View File

@ -45,6 +45,8 @@ extern int lm_enabled_logfiles_bitmask;
* zombie management * zombie management
* 29/08/14 Mark Riddoch Addition of thread status data, load average * 29/08/14 Mark Riddoch Addition of thread status data, load average
* etc. * etc.
* 23/09/14 Mark Riddoch Make use of RDHUP conditional to allow CentOS 5
* builds.
* *
* @endverbatim * @endverbatim
*/ */
@ -191,8 +193,12 @@ poll_add_dcb(DCB *dcb)
struct epoll_event ev; struct epoll_event ev;
CHK_DCB(dcb); CHK_DCB(dcb);
#ifdef EPOLLRDHUP
ev.events = EPOLLIN | EPOLLOUT | EPOLLRDHUP | EPOLLHUP | EPOLLET; ev.events = EPOLLIN | EPOLLOUT | EPOLLRDHUP | EPOLLHUP | EPOLLET;
#else
ev.events = EPOLLIN | EPOLLOUT | EPOLLHUP | EPOLLET;
#endif
ev.data.ptr = dcb; ev.data.ptr = dcb;
/*< /*<
@ -631,6 +637,7 @@ DCB *zombies = NULL;
spinlock_release(&dcb->dcb_initlock); spinlock_release(&dcb->dcb_initlock);
} }
#ifdef EPOLLRDHUP
if (ev & EPOLLRDHUP) if (ev & EPOLLRDHUP)
{ {
int eno = 0; int eno = 0;
@ -657,6 +664,7 @@ DCB *zombies = NULL;
else else
spinlock_release(&dcb->dcb_initlock); spinlock_release(&dcb->dcb_initlock);
} }
#endif
} /*< for */ } /*< for */
no_op = FALSE; no_op = FALSE;
} }
@ -785,12 +793,14 @@ char *str;
strcat(str, "|"); strcat(str, "|");
strcat(str, "HUP"); strcat(str, "HUP");
} }
#ifdef EPOLLRDHUP
if (event & EPOLLRDHUP) if (event & EPOLLRDHUP)
{ {
if (*str) if (*str)
strcat(str, "|"); strcat(str, "|");
strcat(str, "RDHUP"); strcat(str, "RDHUP");
} }
#endif
return str; return str;
} }