diff options
Diffstat (limited to 'nio.c')
| -rw-r--r-- | nio.c | 210 |
1 files changed, 136 insertions, 74 deletions
@@ -1,5 +1,6 @@ #include "nio.h" +#include <errno.h> #include <stdint.h> #include <stdlib.h> #ifdef ENABLE_EPOLL @@ -11,9 +12,9 @@ void nio_init(struct nio * io) { io->nready = -1; io->poll_max_fds = 0; - io->poll_cur_fds = 0; io->poll_fds = NULL; io->poll_ptrs = NULL; + io->poll_fds_set = NULL; io->epoll_fd = -1; io->max_events = 0; io->events = NULL; @@ -27,13 +28,15 @@ int nio_use_poll(struct nio * io, nfds_t max_fds) io->poll_max_fds = max_fds; io->poll_fds = (struct pollfd *)calloc(max_fds, sizeof(*io->poll_fds)); io->poll_ptrs = calloc(max_fds, sizeof(*io->poll_ptrs)); + io->poll_fds_set = calloc(max_fds, sizeof(*io->poll_fds_set)); for (size_t i = 0; i < max_fds; ++i) { io->poll_fds[i].fd = -1; } - return io->poll_fds == NULL || io->poll_ptrs == NULL; // return NIO_ERROR_INTERNAL on error + return io->poll_fds == NULL || io->poll_ptrs == NULL || io->poll_fds_set == NULL; // return NIO_ERROR_INTERNAL on + // error } int nio_use_epoll(struct nio * io, int max_events) @@ -46,7 +49,7 @@ int nio_use_epoll(struct nio * io, int max_events) io->max_events = max_events; io->events = calloc(max_events, sizeof(struct epoll_event)); - return io->events == NULL || io->epoll_fd < 0; + return io->events == NULL || io->epoll_fd < 0; // return NIO_ERROR_INTERNAL on error #else (void)io; (void)max_events; @@ -57,9 +60,13 @@ int nio_use_epoll(struct nio * io, int max_events) int nio_add_fd(struct nio * io, int fd, int event_flags, void * ptr) { + if (fd < 0) + return NIO_ERROR_INTERNAL; + #ifdef ENABLE_EPOLL if (io->epoll_fd >= 0) { + int rv; struct epoll_event event = {}; if (ptr == NULL) @@ -78,7 +85,11 @@ int nio_add_fd(struct nio * io, int fd, int event_flags, void * ptr) if (event.events == 0) return NIO_ERROR_INTERNAL; - return epoll_ctl(io->epoll_fd, EPOLL_CTL_ADD, fd, &event); + while ((rv = epoll_ctl(io->epoll_fd, EPOLL_CTL_ADD, fd, &event)) != 0 && errno == EINTR) + { + /* If epoll_ctl() was interrupted by the system, repeat. */ + } + return rv; } else #endif @@ -87,9 +98,6 @@ int nio_add_fd(struct nio * io, int fd, int event_flags, void * ptr) struct pollfd * unused_pollfd = NULL; void ** unused_ptr = NULL; - if (io->poll_cur_fds == io->poll_max_fds || fd < 0) - return NIO_ERROR_INTERNAL; - for (size_t i = 0; i < io->poll_max_fds; ++i) { if (io->poll_fds[i].fd < 0) @@ -112,9 +120,8 @@ int nio_add_fd(struct nio * io, int fd, int event_flags, void * ptr) unused_pollfd->fd = fd; *unused_ptr = ptr; - io->poll_cur_fds++; - return NIO_ERROR_SUCCESS; + return NIO_SUCCESS; } return NIO_ERROR_INTERNAL; @@ -122,9 +129,13 @@ int nio_add_fd(struct nio * io, int fd, int event_flags, void * ptr) int nio_mod_fd(struct nio * io, int fd, int event_flags, void * ptr) { + if (fd < 0) + return NIO_ERROR_INTERNAL; + #ifdef ENABLE_EPOLL if (io->epoll_fd >= 0) { + int rv; struct epoll_event event = {}; if (ptr == NULL) @@ -143,43 +154,43 @@ int nio_mod_fd(struct nio * io, int fd, int event_flags, void * ptr) if (event.events == 0) return NIO_ERROR_INTERNAL; - return epoll_ctl(io->epoll_fd, EPOLL_CTL_MOD, fd, &event); + while ((rv = epoll_ctl(io->epoll_fd, EPOLL_CTL_MOD, fd, &event)) != 0 && errno == EINTR) + { + /* If epoll_ctl() was interrupted by the system, repeat. */ + } + return rv; } else #endif if (io->poll_max_fds > 0) { - struct pollfd * unused_pollfd = NULL; - void ** unused_ptr = NULL; - - if (io->poll_cur_fds == io->poll_max_fds || fd < 0) - return NIO_ERROR_INTERNAL; + struct pollfd * used_pollfd = NULL; + void ** used_ptr = NULL; for (size_t i = 0; i < io->poll_max_fds; ++i) { - if (io->poll_fds[i].fd < 0) + if (io->poll_fds[i].fd == fd) { - unused_pollfd = &io->poll_fds[i]; - unused_ptr = &io->poll_ptrs[i]; + used_pollfd = &io->poll_fds[i]; + used_ptr = &io->poll_ptrs[i]; break; } } - if (unused_pollfd == NULL) + if (used_pollfd == NULL) return NIO_ERROR_INTERNAL; - unused_pollfd->events = 0; + used_pollfd->events = 0; if ((event_flags & NIO_EVENT_INPUT) != 0) - unused_pollfd->events |= POLLIN; + used_pollfd->events |= POLLIN; if ((event_flags & NIO_EVENT_OUTPUT) != 0) - unused_pollfd->events |= POLLOUT; - if (unused_pollfd->events == 0) + used_pollfd->events |= POLLOUT; + if (used_pollfd->events == 0) return NIO_ERROR_INTERNAL; - unused_pollfd->fd = fd; - *unused_ptr = ptr; - io->poll_cur_fds++; + used_pollfd->fd = fd; + *used_ptr = ptr; - return NIO_ERROR_SUCCESS; + return NIO_SUCCESS; } return NIO_ERROR_INTERNAL; @@ -187,38 +198,43 @@ int nio_mod_fd(struct nio * io, int fd, int event_flags, void * ptr) int nio_del_fd(struct nio * io, int fd) { + if (fd < 0) + return NIO_ERROR_INTERNAL; + #ifdef ENABLE_EPOLL if (io->epoll_fd >= 0) { - return epoll_ctl(io->epoll_fd, EPOLL_CTL_DEL, fd, NULL); + int rv; + + while ((rv = epoll_ctl(io->epoll_fd, EPOLL_CTL_DEL, fd, NULL)) != 0 && errno == EINTR) + { + /* If epoll_ctl() was interrupted by the system, repeat. */ + } + return rv; } else #endif if (io->poll_max_fds > 0) { - struct pollfd * unused_pollfd = NULL; - void ** unused_ptr = NULL; - - if (io->poll_cur_fds == io->poll_max_fds || fd < 0) - return NIO_ERROR_INTERNAL; + struct pollfd * used_pollfd = NULL; + void ** used_ptr = NULL; for (size_t i = 0; i < io->poll_max_fds; ++i) { - if (io->poll_fds[i].fd < 0) + if (io->poll_fds[i].fd == fd) { - unused_pollfd = &io->poll_fds[i]; - unused_ptr = &io->poll_ptrs[i]; + used_pollfd = &io->poll_fds[i]; + used_ptr = &io->poll_ptrs[i]; break; } } - if (unused_pollfd == NULL) + if (used_pollfd == NULL) return NIO_ERROR_INTERNAL; - unused_pollfd->fd = -1; - *unused_ptr = NULL; - io->poll_cur_fds--; + used_pollfd->fd = -1; + *used_ptr = NULL; - return NIO_ERROR_SUCCESS; + return NIO_SUCCESS; } return NIO_ERROR_INTERNAL; @@ -229,7 +245,11 @@ int nio_run(struct nio * io, int timeout) #ifdef ENABLE_EPOLL if (io->epoll_fd >= 0) { - io->nready = epoll_wait(io->epoll_fd, io->events, io->max_events, timeout); + do + { + io->nready = epoll_wait(io->epoll_fd, io->events, io->max_events, timeout); + } while (io->nready < 0 && errno == EINTR); + if (io->nready < 0) return NIO_ERROR_SYSTEM; } @@ -237,60 +257,73 @@ int nio_run(struct nio * io, int timeout) #endif if (io->poll_max_fds > 0) { - io->nready = poll(io->poll_fds, io->poll_max_fds, timeout); + do + { + io->nready = poll(io->poll_fds, io->poll_max_fds, timeout); + } while (io->nready < 0 && errno == EINTR); + if (io->nready < 0) return NIO_ERROR_SYSTEM; - else - io->nready = io->poll_max_fds; + + if (io->nready > 0) + { + for (nfds_t i = 0, j = 0; i < io->poll_max_fds; ++i) + { + if (io->poll_fds[i].fd >= 0 && io->poll_fds[i].revents != 0) + { + io->poll_fds_set[j++] = i; + } + } + } } - return NIO_ERROR_SUCCESS; + return NIO_SUCCESS; } -int nio_check(struct nio * io, int index, int events) +int nio_check(struct nio * io, int index, int event_flags) { - if (index < 0 || index >= io->nready) + if (nio_is_valid(io, index) != NIO_SUCCESS) return NIO_ERROR_INTERNAL; #ifdef ENABLE_EPOLL - if (io->epoll_fd >= 0 && index < io->max_events) + if (io->epoll_fd >= 0) { uint32_t epoll_events = 0; - if ((events & NIO_EVENT_INPUT) != 0) + if ((event_flags & NIO_EVENT_INPUT) != 0) epoll_events |= EPOLLIN; - if ((events & NIO_EVENT_OUTPUT) != 0) + if ((event_flags & NIO_EVENT_OUTPUT) != 0) epoll_events |= EPOLLOUT; - if ((events & NIO_EVENT_ERROR) != 0) + if ((event_flags & NIO_EVENT_ERROR) != 0) epoll_events |= EPOLLERR | EPOLLHUP; if (epoll_events == 0) return NIO_ERROR_INTERNAL; - struct epoll_event * ee = (struct epoll_event *)io->events; - if ((ee[index].events & epoll_events) == 0) + struct epoll_event const * const events = (struct epoll_event *)io->events; + if ((events[index].events & epoll_events) == 0) return NIO_ERROR_INTERNAL; - return NIO_ERROR_SUCCESS; + return NIO_SUCCESS; } else #endif - if (io->poll_max_fds > 0 && index < (int)io->poll_max_fds) + if (io->poll_max_fds > 0) { short int poll_events = 0; - if ((events & NIO_EVENT_INPUT) != 0) + if ((event_flags & NIO_EVENT_INPUT) != 0) poll_events |= POLLIN; - if ((events & NIO_EVENT_OUTPUT) != 0) + if ((event_flags & NIO_EVENT_OUTPUT) != 0) poll_events |= POLLOUT; - if ((events & NIO_EVENT_ERROR) != 0) + if ((event_flags & NIO_EVENT_ERROR) != 0) poll_events |= POLLERR | POLLHUP; if (poll_events == 0) return NIO_ERROR_INTERNAL; - if ((io->poll_fds[index].revents & poll_events) == 0) + if ((io->poll_fds[io->poll_fds_set[index]].revents & poll_events) == 0) return NIO_ERROR_INTERNAL; - return NIO_ERROR_SUCCESS; + return NIO_SUCCESS; } return NIO_ERROR_INTERNAL; @@ -302,34 +335,62 @@ int nio_is_valid(struct nio * io, int index) return NIO_ERROR_INTERNAL; #ifdef ENABLE_EPOLL - if (io->epoll_fd >= 0 && index <= io->max_events) + if (io->epoll_fd >= 0) { - return NIO_ERROR_SUCCESS; + return NIO_SUCCESS; } else #endif - if (io->poll_max_fds > 0 && index < (int)io->poll_max_fds) + if (io->poll_max_fds > 0 && io->poll_fds[io->poll_fds_set[index]].fd >= 0) { - if (io->poll_fds[index].revents != 0) - return NIO_ERROR_SUCCESS; + return NIO_SUCCESS; } return NIO_ERROR_INTERNAL; } -int nio_has_input(struct nio * io, int index) +int nio_get_fd(struct nio * io, int index) { - return nio_check(io, index, NIO_EVENT_INPUT); -} + if (nio_is_valid(io, index) != NIO_SUCCESS) + return -1; -int nio_can_output(struct nio * io, int index) -{ - return nio_check(io, index, NIO_EVENT_OUTPUT); +#ifdef ENABLE_EPOLL + if (io->epoll_fd >= 0) + { + struct epoll_event const * const events = (struct epoll_event *)io->events; + + return events[index].data.fd; + } + else +#endif + if (io->poll_max_fds > 0) + { + return io->poll_fds[io->poll_fds_set[index]].fd; + } + + return -1; } -int nio_has_error(struct nio * io, int index) +void * nio_get_ptr(struct nio * io, int index) { - return nio_check(io, index, NIO_EVENT_ERROR); + if (nio_is_valid(io, index) != NIO_SUCCESS) + return NULL; + +#ifdef ENABLE_EPOLL + if (io->epoll_fd >= 0) + { + struct epoll_event * const events = (struct epoll_event *)io->events; + + return events[index].data.ptr; + } + else +#endif + if (io->poll_max_fds > 0) + { + return io->poll_ptrs[io->poll_fds_set[index]]; + } + + return NULL; } void nio_free(struct nio * io) @@ -351,5 +412,6 @@ void nio_free(struct nio * io) #endif free(io->poll_fds); free(io->poll_ptrs); + free(io->poll_fds_set); free(io->events); } |