Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always re-register epoll descriptor. #71

Merged
merged 3 commits into from
Aug 21, 2023
Merged

Always re-register epoll descriptor. #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2610960
Always re-register epoll descriptor.
ioquatix Aug 16, 2023
03662f3
Always re-register kqueue descriptor.
ioquatix Aug 16, 2023
2852d4f
Track the `io` object that was used and flush registration if changed.
ioquatix Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 32 additions & 15 deletions ext/io/event/selector/epoll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ struct IO_Event_Selector_EPoll_Descriptor
{
struct IO_Event_List list;

// The last IO object that was used to register events.
VALUE io;

// The union of all events we are waiting for:
enum IO_Event waiting_events;

Expand Down Expand Up @@ -165,19 +168,24 @@ int events_from_epoll_flags(uint32_t flags)
}

inline static
int IO_Event_Selector_EPoll_Descriptor_update(struct IO_Event_Selector_EPoll *selector, int descriptor, struct IO_Event_Selector_EPoll_Descriptor *epoll_descriptor)
int IO_Event_Selector_EPoll_Descriptor_update(struct IO_Event_Selector_EPoll *selector, VALUE io, int descriptor, struct IO_Event_Selector_EPoll_Descriptor *epoll_descriptor)
{
if (epoll_descriptor->registered_events == epoll_descriptor->waiting_events) {
// All the events we are interested in are already registered.
return 0;
if (epoll_descriptor->io == io) {
if (epoll_descriptor->registered_events == epoll_descriptor->waiting_events) {
// All the events we are interested in are already registered.
return 0;
}
} else {
epoll_descriptor->registered_events = 0;
epoll_descriptor->io = io;
}

if (epoll_descriptor->waiting_events == 0) {
// We are no longer interested in any events.
int result = epoll_ctl(selector->descriptor, EPOLL_CTL_DEL, descriptor, NULL);
if (result == -1) return -1;

epoll_descriptor->registered_events = 0;
if (epoll_descriptor->registered_events) {
// We are no longer interested in any events.
epoll_ctl(selector->descriptor, EPOLL_CTL_DEL, descriptor, NULL);
epoll_descriptor->registered_events = 0;
}

return 0;
}
Expand All @@ -197,22 +205,30 @@ int IO_Event_Selector_EPoll_Descriptor_update(struct IO_Event_Selector_EPoll *se
}

int result = epoll_ctl(selector->descriptor, operation, descriptor, &event);
if (result == -1) return -1;
if (result == -1) {
if (errno == ENOENT) {
result = epoll_ctl(selector->descriptor, EPOLL_CTL_ADD, descriptor, &event);
}

if (result == -1) {
return -1;
}
}

epoll_descriptor->registered_events = epoll_descriptor->waiting_events;

return 1;
}

inline static
int IO_Event_Selector_EPoll_Waiting_register(struct IO_Event_Selector_EPoll *selector, int descriptor, struct IO_Event_Selector_EPoll_Waiting *waiting)
int IO_Event_Selector_EPoll_Waiting_register(struct IO_Event_Selector_EPoll *selector, VALUE io, int descriptor, struct IO_Event_Selector_EPoll_Waiting *waiting)
{
struct IO_Event_Selector_EPoll_Descriptor *epoll_descriptor = IO_Event_Selector_EPoll_Descriptor_lookup(selector, descriptor);

// We are waiting for these events:
epoll_descriptor->waiting_events |= waiting->events;

int result = IO_Event_Selector_EPoll_Descriptor_update(selector, descriptor, epoll_descriptor);
int result = IO_Event_Selector_EPoll_Descriptor_update(selector, io, descriptor, epoll_descriptor);
if (result == -1) return -1;

IO_Event_List_prepend(&epoll_descriptor->list, &waiting->list);
Expand All @@ -226,6 +242,7 @@ void IO_Event_Selector_EPoll_Descriptor_initialize(void *element)
IO_Event_List_initialize(&epoll_descriptor->list);
epoll_descriptor->waiting_events = 0;
epoll_descriptor->registered_events = 0;
epoll_descriptor->io = 0;
}

void IO_Event_Selector_EPoll_Descriptor_free(void *element)
Expand Down Expand Up @@ -402,7 +419,7 @@ VALUE IO_Event_Selector_EPoll_process_wait(VALUE self, VALUE fiber, VALUE _pid,
.events = IO_EVENT_READABLE,
};

int result = IO_Event_Selector_EPoll_Waiting_register(selector, descriptor, &waiting);
int result = IO_Event_Selector_EPoll_Waiting_register(selector, 0, descriptor, &waiting);

if (result == -1) {
close(descriptor);
Expand Down Expand Up @@ -457,7 +474,7 @@ VALUE IO_Event_Selector_EPoll_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE e
.events = RB_NUM2INT(events),
};

int result = IO_Event_Selector_EPoll_Waiting_register(selector, descriptor, &waiting);
int result = IO_Event_Selector_EPoll_Waiting_register(selector, io, descriptor, &waiting);

if (result == -1) {
if (errno == EPERM) {
Expand Down Expand Up @@ -824,7 +841,7 @@ int IO_Event_Selector_EPoll_handle(struct IO_Event_Selector_EPoll *selector, con
}
}

return IO_Event_Selector_EPoll_Descriptor_update(selector, descriptor, epoll_descriptor);
return IO_Event_Selector_EPoll_Descriptor_update(selector, epoll_descriptor->io, descriptor, epoll_descriptor);
}

// TODO This function is not re-entrant and we should document and assert as such.
Expand Down
8 changes: 4 additions & 4 deletions ext/io/event/selector/kqueue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ enum IO_Event events_from_kevent_filter(int filter)
inline static
int IO_Event_Selector_KQueue_Descriptor_update(struct IO_Event_Selector_KQueue *selector, uintptr_t identifier, struct IO_Event_Selector_KQueue_Descriptor *kqueue_descriptor)
{
if (kqueue_descriptor->registered_events == kqueue_descriptor->waiting_events) {
// All the events we are interested in are already registered.
return 0;
}
// if (kqueue_descriptor->registered_events == kqueue_descriptor->waiting_events) {
// // All the events we are interested in are already registered.
// return 0;
// }

int count = 0;
struct kevent kevents[3] = {0};
Expand Down