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

Fix possible threading problem.

Browse Source
This commit is contained in:
counterpoint 2015-08-19 17:23:49 +01:00
parent 895989446d
commit 38f78c7239
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/core/poll.c
View File

@ -339,7 +339,7 @@ poll_add_dcb(DCB *dcb)
int
poll_remove_dcb(DCB *dcb)
{
int rc = -1;
int dcbfd, rc = -1;
struct epoll_event ev;
CHK_DCB(dcb);
@ -375,8 +375,11 @@ poll_remove_dcb(DCB *dcb)
* only action for them is already done - the change of state to
* DCB_STATE_NOPOLLING.
*/
/*< Set bit for each maxscale thread */
bitmask_copy(&dcb->memdata.bitmask, poll_bitmask());
dcbfd = dcb->fd;
spinlock_release(&dcb->dcb_initlock);
if (dcb->fd > 0)
if (dcbfd > 0)
{
rc = epoll_ctl(epoll_fd, EPOLL_CTL_DEL, dcb->fd, &ev);
/**
@ -386,8 +389,6 @@ poll_remove_dcb(DCB *dcb)
*/
if (rc) rc = poll_resolve_error(dcb, errno, false);
if (rc) raise(SIGABRT);
/*< Set bit for each maxscale thread */
bitmask_copy(&dcb->memdata.bitmask, poll_bitmask());
}
return rc;
}