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

Jump to bottom

epoll.c: various fixes #658

Merged
merged 1 commit into from
Aug 13, 2024
Merged

epoll.c: various fixes #658

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
106 changes: 54 additions & 52 deletions third_party/machinarium/sources/epoll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,17 @@ static int mm_epoll_shutdown(mm_poll_t *poll)
return 0;
}

static inline int mm_epoll_is_read_event(const struct epoll_event *ev)
{
return ev->events & EPOLLIN;
}

static inline int mm_epoll_is_write_event(const struct epoll_event *ev)
{
return ev->events & EPOLLOUT || ev->events & EPOLLERR ||
ev->events & EPOLLHUP;
}

static int mm_epoll_step(mm_poll_t *poll, int timeout)
{
mm_epoll_t *epoll = (mm_epoll_t *)poll;
Expand All @@ -74,65 +85,71 @@ static int mm_epoll_step(mm_poll_t *poll, int timeout)
while (i < count) {
struct epoll_event *ev = &epoll->list[i];
mm_fd_t *fd = ev->data.ptr;
if (fd->on_read) {
if (ev->events & EPOLLIN)
fd->on_read(fd);

if (mm_epoll_is_read_event(ev) && (fd->mask & MM_R)) {
assert(fd->on_read);
fd->on_read(fd);
}
if (fd->on_write) {
if (ev->events & EPOLLOUT || ev->events & EPOLLERR ||
ev->events & EPOLLHUP) {
fd->on_write(fd);
}

if (mm_epoll_is_write_event(ev) && (fd->mask & MM_W)) {
assert(fd->on_write);
fd->on_write(fd);
}

i++;
}
return count;
}

static int mm_epoll_add(mm_poll_t *poll, mm_fd_t *fd, int mask)
{
mm_epoll_t *epoll = (mm_epoll_t *)poll;
if ((epoll->count + 1) > epoll->size) {
int size = epoll->size * 2;
void *ptr =
realloc(epoll->list, sizeof(struct epoll_event) * size);
if (ptr == NULL)
return -1;
epoll->list = ptr;
epoll->size = size;
}
struct epoll_event ev;
ev.events = 0;
fd->mask = mask;
if (fd->mask & MM_R)
ev.events |= EPOLLIN;
if (fd->mask & MM_W)
ev.events |= EPOLLOUT;
ev.data.ptr = fd;
int rc = epoll_ctl(epoll->fd, EPOLL_CTL_ADD, fd->fd, &ev);
if (rc == -1)
return -1;
epoll->count++;
return 0;
}

static inline int mm_epoll_modify(mm_poll_t *poll, mm_fd_t *fd, int mask)
{
if (fd->mask == mask)
return 0;
mm_epoll_t *epoll = (mm_epoll_t *)poll;
struct epoll_event ev;
int rc;

ev.events = 0;
if (mask & MM_R)
ev.events |= EPOLLIN;
if (mask & MM_W)
ev.events |= EPOLLOUT;
ev.data.ptr = fd;
int rc = epoll_ctl(epoll->fd, EPOLL_CTL_MOD, fd->fd, &ev);
if (fd->mask == 0) {
mm_epoll_t *epoll = (mm_epoll_t *)poll;
if ((epoll->count + 1) > epoll->size) {
int size = epoll->size * 2;
void *ptr = realloc(epoll->list,
sizeof(struct epoll_event) * size);
if (ptr == NULL)
return -1;
epoll->list = ptr;
epoll->size = size;
}

rc = epoll_ctl(epoll->fd, EPOLL_CTL_ADD, fd->fd, &ev);
if (rc != -1) {
epoll->count++;
}
} else if (mask == 0) {
rc = epoll_ctl(epoll->fd, EPOLL_CTL_DEL, fd->fd, &ev);
if (rc != -1) {
epoll->count--;
}
} else {
rc = epoll_ctl(epoll->fd, EPOLL_CTL_MOD, fd->fd, &ev);
}
if (rc == -1)
return -1;
fd->mask = mask;
return 0;
}

static int mm_epoll_add(mm_poll_t *poll, mm_fd_t *fd, int mask)
{
return mm_epoll_modify(poll, fd, mask);
}

static int mm_epoll_read(mm_poll_t *poll, mm_fd_t *fd, mm_fd_callback_t on_read,
void *arg, int enable)
{
Expand Down Expand Up @@ -182,22 +199,7 @@ static int mm_epoll_read_write(mm_poll_t *poll, mm_fd_t *fd,

static int mm_epoll_del(mm_poll_t *poll, mm_fd_t *fd)
{
mm_epoll_t *epoll = (mm_epoll_t *)poll;
struct epoll_event ev;
ev.events = 0;
if (fd->mask & MM_R)
ev.events |= EPOLLIN;
if (fd->mask & MM_W)
ev.events |= EPOLLOUT;
ev.data.ptr = fd;
fd->mask = 0;
fd->on_write = NULL;
fd->on_write_arg = NULL;
fd->on_read = NULL;
fd->on_read_arg = NULL;
epoll->count--;
assert(epoll->count >= 0);
return epoll_ctl(epoll->fd, EPOLL_CTL_DEL, fd->fd, &ev);
return mm_epoll_read_write(poll, fd, NULL, NULL, 0);
}

mm_pollif_t mm_epoll_if = { .name = "epoll",
Expand Down
Loading