luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "kqueue: change EV_OOBAND to EVFILT_EXCEPT+NOTE_OOB (#4597)" (#4623)

Browse Source 
Unsupported on FreeBSD, breaking the build.

This reverts commit b1d30f9489.
This commit is contained in:
Ben Noordhuis 2024-11-26 18:58:45 +01:00 committed by GitHub
parent 556a0f1f0f
commit b7d07d78e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/unix/kqueue.c
View File

@ -37,6 +37,17 @@
#include <fcntl.h> #include <fcntl.h>
#include <time.h> #include <time.h>
/*
* Required on
* - Until at least FreeBSD 11.0
* - Older versions of Mac OS X
*
* http://www.boost.org/doc/libs/1_61_0/boost/asio/detail/kqueue_reactor.hpp
*/
#ifndef EV_OOBAND
#define EV_OOBAND EV_FLAG1
#endif
static void uv__fs_event(uv_loop_t* loop, uv__io_t* w, unsigned int fflags); static void uv__fs_event(uv_loop_t* loop, uv__io_t* w, unsigned int fflags);
@ -220,7 +231,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
} }
if ((w->events & UV__POLLPRI) == 0 && (w->pevents & UV__POLLPRI) != 0) { if ((w->events & UV__POLLPRI) == 0 && (w->pevents & UV__POLLPRI) != 0) {
EV_SET(events + nevents, w->fd, EVFILT_EXCEPT, EV_ADD, NOTE_OOB, 0, 0); EV_SET(events + nevents, w->fd, EV_OOBAND, EV_ADD, 0, 0, 0);
if (++nevents == ARRAY_SIZE(events)) { if (++nevents == ARRAY_SIZE(events)) {
if (kevent(loop->backend_fd, events, nevents, NULL, 0, NULL)) if (kevent(loop->backend_fd, events, nevents, NULL, 0, NULL))
@ -382,7 +393,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
revents |= UV__POLLRDHUP; revents |= UV__POLLRDHUP;
} }
if (ev->filter == EVFILT_EXCEPT) { if (ev->filter == EV_OOBAND) {
if (w->pevents & UV__POLLPRI) if (w->pevents & UV__POLLPRI)
revents |= UV__POLLPRI; revents |= UV__POLLPRI;
else else