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

Addition for shutdown mechanism for the gateway

Browse Source 
Addition of stop and restart service

Fix for telnetd in Makefile

Fix for printing the server names in services
This commit is contained in:
Mark Riddoch
2013-06-25 14:00:18 +02:00
parent 72223fd4cf
commit 34fdbdb34d
11 changed files with 167 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/poll.c
View File

@ -37,6 +37,7 @@
*/
static int epoll_fd = -1; /**< The epoll file descriptor */
static int shutdown = 0; /**< Flag the shutdown of the poll subsystem */
/**
* The polling statistics
@ -117,12 +118,18 @@ int i, nfds;
while (1)
{
atomic_add(&pollStats.n_polls, 1);
if ((nfds = epoll_wait(epoll_fd, events, MAX_EVENTS, -1)) == -1)
if ((nfds = epoll_wait(epoll_fd, events, MAX_EVENTS, 0)) == -1)
{
}
else
else if (nfds == 0)
{
if ((nfds = epoll_wait(epoll_fd, events, MAX_EVENTS, EPOLL_TIMEOUT)) == -1)
{
}
}
if (nfds > 0)
{
atomic_add(&pollStats.n_polls, 1);
for (i = 0; i < nfds; i++)
{
DCB *dcb = (DCB *)events[i].data.ptr;
@ -158,9 +165,22 @@ int i, nfds;
}
}
}
if (shutdown)
{
return;
}
}
}
/**
* Shutdown the polling loop
*/
void
poll_shutdown()
{
shutdown = 1;
}
/**
* Debug routine to print the polling statistics
*