VladPolskiy/MariaDB-open-code
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-15 22:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Threadpool - use EV_ONESHOT with kevent, to prevent race condition when 2

Browse Source 
threads are retrieving events at the same time.
This commit is contained in:
Vladislav Vaintroub
2012-04-12 01:40:44 +02:00
parent f544b21fcb
commit 85a025f30c
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/threadpool_unix.cc
View File

@ -295,7 +295,7 @@ int io_poll_create()
int io_poll_start_read(int pollfd, int fd, void *data)
{
struct kevent ke;
EV_SET(&ke, fd, EVFILT_READ, EV_ADD|EV_ENABLE|EV_CLEAR,
EV_SET(&ke, fd, EVFILT_READ, EV_ADD|EV_ONESHOT,
0, 0, data);
return kevent(pollfd, &ke, 1, 0, 0, 0);
}
@ -303,6 +303,9 @@ int io_poll_start_read(int pollfd, int fd, void *data)
int io_poll_associate_fd(int pollfd, int fd, void *data)
{
struct kevent ke;
EV_SET(&ke, fd, EVFILT_READ, EV_ADD|EV_ONESHOT,
0, 0, data);
return io_poll_start_read(pollfd,fd, data);
}
@ -330,17 +333,6 @@ int io_poll_wait(int pollfd, struct kevent *events, int maxevents, int timeout_m
(timeout_ms >= 0)?&ts:NULL);
}
while (ret == -1 && errno == EINTR);
if (ret > 0)
{
/* Disable monitoring for the events we that we dequeued */
for (int i=0; i < ret; i++)
{
struct kevent *ke = &events[i];
EV_SET(ke, ke->ident, EVFILT_READ, EV_ADD|EV_DISABLE,
0, 0, ke->udata);
}
kevent(pollfd, events, ret, 0, 0, 0);
}
return ret;
}