i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kqueue: Don't notify B_EVENT_INVALID for FDs.

Browse Source 
It isn't sent at all on FreeBSD.

Found while testing #19969: the disconnection was reported twice.

Change-Id: Icaf7abef7c3c3a61fccf5eb9e827e0a6a0fa1228
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10580
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Augustin Cavalier
2026-03-27 01:13:34 +00:00
committed by waddlesplash
parent 498d92cbd7
commit e6d9dc2731
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/bsd/kqueue.cpp
+6 -5
View File
@@ -76,7 +76,8 @@ kevent(int kq,
break; break;
default: default:
return EINVAL; __set_errno(EINVAL);
return -1;
} }
if ((changelist[i].flags & EV_ONESHOT) != 0) if ((changelist[i].flags & EV_ONESHOT) != 0)
@@ -207,13 +208,11 @@ kevent(int kq,
if (waitInfos[i].events < 0) { if (waitInfos[i].events < 0) {
flags |= EV_ERROR; flags |= EV_ERROR;
data = waitInfos[i].events; data = waitInfos[i].events;
} else if ((waitInfos[i].events & B_EVENT_DISCONNECTED) != 0) {
flags |= EV_EOF;
} else if ((waitInfos[i].events & B_EVENT_INVALID) != 0) { } else if ((waitInfos[i].events & B_EVENT_INVALID) != 0) {
switch (waitInfos[i].type) { switch (waitInfos[i].type) {
case B_OBJECT_TYPE_FD: case B_OBJECT_TYPE_FD:
flags |= EV_EOF; // File descriptor was closed. Silently discard the event.
break; continue;
case B_OBJECT_TYPE_THREAD: { case B_OBJECT_TYPE_THREAD: {
fflags |= NOTE_EXIT; fflags |= NOTE_EXIT;
@@ -227,6 +226,8 @@ kevent(int kq,
break; break;
} }
} }
} else if ((waitInfos[i].events & B_EVENT_DISCONNECTED) != 0) {
flags |= EV_EOF;
} else if ((waitInfos[i].events & B_EVENT_ERROR) != 0) { } else if ((waitInfos[i].events & B_EVENT_ERROR) != 0) {
flags |= EV_ERROR; flags |= EV_ERROR;
data = EINVAL; data = EINVAL;