fdm: add fdm_event_add() and fdm_event_del()

These functions allow users to modify already registered FDs, to add
or remove events they are interested in.
This commit is contained in:
Daniel Eklöf 2019-11-03 00:22:22 +01:00
parent e09bda322a
commit 89997b97a0
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 55 additions and 1 deletions

53
fdm.c
View file

@ -14,6 +14,7 @@
struct handler {
int fd;
int events;
fdm_handler_t callback;
void *callback_data;
bool deleted;
@ -78,6 +79,7 @@ fdm_add(struct fdm *fdm, int fd, int events, fdm_handler_t handler, void *data)
struct handler *fd_data = malloc(sizeof(*fd_data));
*fd_data = (struct handler) {
.fd = fd,
.events = events,
.callback = handler,
.callback_data = data,
.deleted = false,
@ -91,7 +93,7 @@ fdm_add(struct fdm *fdm, int fd, int events, fdm_handler_t handler, void *data)
};
if (epoll_ctl(fdm->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) {
LOG_ERRNO("failed to register FD with epoll");
LOG_ERRNO("failed to register FD=%d with epoll", fd);
free(fd_data);
tll_pop_back(fdm->fds);
return false;
@ -141,6 +143,55 @@ fdm_del_no_close(struct fdm *fdm, int fd)
return fdm_del_internal(fdm, fd, false);
}
static bool
event_modify(struct fdm *fdm, struct handler *fd, int new_events)
{
if (new_events == fd->events)
return true;
struct epoll_event ev = {
.events = new_events,
.data = {.ptr = fd},
};
if (epoll_ctl(fdm->epoll_fd, EPOLL_CTL_MOD, fd->fd, &ev) < 0) {
LOG_ERRNO("failed to modify FD=%d with epoll (events 0x%08x -> 0x%08x)",
fd->fd, fd->events, new_events);
return false;
}
fd->events = new_events;
return true;
}
bool
fdm_event_add(struct fdm *fdm, int fd, int events)
{
tll_foreach(fdm->fds, it) {
if (it->item->fd != fd)
continue;
return event_modify(fdm, it->item, it->item->events | events);
}
LOG_ERR("FD=%d not registered with the FDM", fd);
return false;
}
bool
fdm_event_del(struct fdm *fdm, int fd, int events)
{
tll_foreach(fdm->fds, it) {
if (it->item->fd != fd)
continue;
return event_modify(fdm, it->item, it->item->events & ~events);
}
LOG_ERR("FD=%d not registered with the FDM", fd);
return false;
}
bool
fdm_poll(struct fdm *fdm)
{

3
fdm.h
View file

@ -13,4 +13,7 @@ bool fdm_add(struct fdm *fdm, int fd, int events, fdm_handler_t handler, void *d
bool fdm_del(struct fdm *fdm, int fd);
bool fdm_del_no_close(struct fdm *fdm, int fd);
bool fdm_event_add(struct fdm *fdm, int fd, int events);
bool fdm_event_del(struct fdm *fdm, int fd, int events);
bool fdm_poll(struct fdm *fdm);