gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Calculate the actual mask to be removed in the eventloop before aeApiDelEvent (#725)

Browse Source 
for kqueue:  
EV_DELETE fails if the specified fd is not associated with the kqfd. If
EVFILT_WRITE is associated but EVFILT_READ is not, then calling
aeApiDelEvent with mask = -1 or `(AE_READABLE|AE_WRITABLE)` will
cause the kevent() to fail with errno = 2(No such file or directory) and
EVFILT_WRITE not dissociated. So we need to calculate the actual mask
to be removed, instead of passing in whatever user provides.

for evport:  
The comment clearly states that aeApiDelEvent "rely on the fact that our
caller has already updated the mask in the eventLoop".

for epoll:  
There's no need to calculate the "actual mask" twice, once in
`aeDeleteFileEvent` and another in `aeApiDelEvent`, let's just use the
mask recorded in the eventLoop.

Fixes #715 

Signed-off-by: wkgcass <wkgcass@hotmail.com>
Co-authored-by: Andy Pan <i@andypan.me>
Co-authored-by: Binbin <binloveplay1314@qq.com>
This commit is contained in:
K.G. Wang 2024-07-09 11:29:44 +08:00 committed by GitHub
parent bbfd041895
commit 548b4e0ea9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ae.c
View File

@ -183,7 +183,9 @@ void aeDeleteFileEvent(aeEventLoop *eventLoop, int fd, int mask) {
* is removed. */
if (mask & AE_WRITABLE) mask |= AE_BARRIER;
aeApiDelEvent(eventLoop, fd, mask);
/* Only remove attached events */
mask = mask & fe->mask;
fe->mask = fe->mask & (~mask);
if (fd == eventLoop->maxfd && fe->mask == AE_NONE) {
/* Update the max fd */
@ -193,6 +195,15 @@ void aeDeleteFileEvent(aeEventLoop *eventLoop, int fd, int mask) {
if (eventLoop->events[j].mask != AE_NONE) break;
eventLoop->maxfd = j;
}
/* Check whether there are events to be removed.
* Note: user may remove the AE_BARRIER without
* touching the actual events. */
if (mask & (AE_READABLE | AE_WRITABLE)) {
/* Must be invoked after the eventLoop mask is modified,
* which is required by evport and epoll */
aeApiDelEvent(eventLoop, fd, mask);
}
}
void *aeGetFileClientData(aeEventLoop *eventLoop, int fd) {

6
src/ae_epoll.c
View File

@ -87,10 +87,12 @@ static int aeApiAddEvent(aeEventLoop *eventLoop, int fd, int mask) {
return 0;
}
static void aeApiDelEvent(aeEventLoop *eventLoop, int fd, int delmask) {
static void aeApiDelEvent(aeEventLoop *eventLoop, int fd, int mask) {
aeApiState *state = eventLoop->apidata;
struct epoll_event ee = {0}; /* avoid valgrind warning */
int mask = eventLoop->events[fd].mask & (~delmask);
/* We rely on the fact that our caller has already updated the mask in the eventLoop. */
mask = eventLoop->events[fd].mask;
ee.events = 0;
if (mask & AE_READABLE) ee.events |= EPOLLIN;