#include <stdbool.h>
#include "uloop.h"
+#include "utils.h"
#ifdef USE_KQUEUE
#include <sys/event.h>
#ifdef USE_EPOLL
#include <sys/epoll.h>
#endif
+#include <sys/wait.h>
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-#endif
#define ULOOP_MAX_EVENTS 10
static struct list_head timeouts = LIST_HEAD_INIT(timeouts);
bool uloop_cancelled = false;
bool uloop_handle_sigchld = true;
static bool do_sigchld = false;
+static int cur_fd, cur_nfds;
#ifdef USE_KQUEUE
return kflags;
}
+static struct kevent events[ULOOP_MAX_EVENTS];
+
static int register_poll(struct uloop_fd *fd, unsigned int flags)
{
struct timespec timeout = { 0, 0 };
struct kevent ev[2];
unsigned int changed;
int nev = 0;
+ unsigned int fl = 0;
changed = fd->kqflags ^ flags;
if (changed & ULOOP_EDGE_TRIGGER)
EV_SET(&ev[nev++], fd->fd, EVFILT_WRITE, kflags, 0, 0, fd);
}
- if (nev && (kevent(poll_fd, ev, nev, NULL, 0, &timeout) == -1))
+ if (!flags)
+ fl |= EV_DELETE;
+
+ if (nev && (kevent(poll_fd, ev, nev, NULL, fl, &timeout) == -1))
return -1;
fd->kqflags = flags;
int uloop_fd_delete(struct uloop_fd *sock)
{
+ int i;
+
+ for (i = cur_fd + 1; i < cur_nfds; i++) {
+ if (events[i].udata != sock)
+ continue;
+
+ events[i].udata = NULL;
+ }
+
sock->registered = false;
return register_poll(sock, 0);
}
static void uloop_run_events(int timeout)
{
- struct kevent events[ULOOP_MAX_EVENTS];
struct timespec ts;
int nfds, n;
struct uloop_fd *u = events[n].udata;
unsigned int ev = 0;
- if(events[n].flags & EV_ERROR) {
+ if (!u)
+ continue;
+
+ if (events[n].flags & EV_ERROR) {
u->error = true;
uloop_fd_delete(u);
}
else if (events[n].filter == EVFILT_WRITE)
ev |= ULOOP_WRITE;
- if(events[n].flags & EV_EOF)
+ if (events[n].flags & EV_EOF)
u->eof = true;
else if (!ev)
continue;
- if(u->cb)
+ if (u->cb) {
+ cur_fd = n;
+ cur_nfds = nfds;
u->cb(u, ev);
+ }
}
+ cur_nfds = 0;
}
#endif
return epoll_ctl(poll_fd, op, fd->fd, &ev);
}
+static struct epoll_event events[ULOOP_MAX_EVENTS];
+
int uloop_fd_delete(struct uloop_fd *sock)
{
+ int i;
+
+ for (i = cur_fd + 1; i < cur_nfds; i++) {
+ if (events[i].data.ptr != sock)
+ continue;
+
+ events[i].data.ptr = NULL;
+ }
sock->registered = false;
return epoll_ctl(poll_fd, EPOLL_CTL_DEL, sock->fd, 0);
}
static void uloop_run_events(int timeout)
{
- struct epoll_event events[ULOOP_MAX_EVENTS];
- int nfds, n;
+ int n, nfds;
nfds = epoll_wait(poll_fd, events, ARRAY_SIZE(events), timeout);
for(n = 0; n < nfds; ++n)
struct uloop_fd *u = events[n].data.ptr;
unsigned int ev = 0;
- if(events[n].events & EPOLLERR) {
+ if (!u)
+ continue;
+
+ if(events[n].events & (EPOLLERR|EPOLLHUP)) {
u->error = true;
uloop_fd_delete(u);
}
- if(!(events[n].events & (EPOLLRDHUP|EPOLLIN|EPOLLOUT|EPOLLERR)))
+ if(!(events[n].events & (EPOLLRDHUP|EPOLLIN|EPOLLOUT|EPOLLERR|EPOLLHUP)))
continue;
if(events[n].events & EPOLLRDHUP)
if(events[n].events & EPOLLOUT)
ev |= ULOOP_WRITE;
- if(u->cb)
+ if(u->cb) {
+ cur_fd = n;
+ cur_nfds = nfds;
u->cb(u, ev);
+ }
}
+ cur_nfds = 0;
}
#endif
static int tv_diff(struct timeval *t1, struct timeval *t2)
{
- if (t1->tv_sec != t2->tv_sec)
- return (t1->tv_sec - t2->tv_sec) * 1000;
- else
- return (t1->tv_usec - t2->tv_usec) / 1000;
+ return
+ (t1->tv_sec - t2->tv_sec) * 1000 +
+ (t1->tv_usec - t2->tv_usec) / 1000;
}
int uloop_timeout_add(struct uloop_timeout *timeout)
gettimeofday(&timeout->time, NULL);
time->tv_sec += msecs / 1000;
- time->tv_usec += msecs % 1000;
+ time->tv_usec += (msecs % 1000) * 1000;
if (time->tv_usec > 1000000) {
time->tv_sec++;
- time->tv_usec %= 100000;
+ time->tv_usec %= 1000000;
}
return uloop_timeout_add(timeout);
static void uloop_process_timeouts(struct timeval *tv)
{
- struct uloop_timeout *t, *tmp;
+ struct uloop_timeout *t;
+
+ while (!list_empty(&timeouts)) {
+ t = list_first_entry(&timeouts, struct uloop_timeout, list);
- list_for_each_entry_safe(t, tmp, &timeouts, list) {
if (tv_diff(&t->time, tv) > 0)
break;
}
}
+static void uloop_clear_timeouts(void)
+{
+ struct uloop_timeout *t, *tmp;
+
+ list_for_each_entry_safe(t, tmp, &timeouts, list)
+ uloop_timeout_cancel(t);
+}
+
+static void uloop_clear_processes(void)
+{
+ struct uloop_process *p, *tmp;
+
+ list_for_each_entry_safe(p, tmp, &processes, list)
+ uloop_process_delete(p);
+}
+
void uloop_run(void)
{
struct timeval tv;
close(poll_fd);
poll_fd = -1;
+
+ uloop_clear_timeouts();
+ uloop_clear_processes();
}