X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=uloop.c;h=f5032418ed6697bf5035cbe3cdedf1c3ff85880b;hp=9ebeca6791b97e313d8b3c82081c778f63fbe056;hb=6a7fb7d8df308d18167051447fa489de389588df;hpb=827ad8337e88ec9e0bf73a8af1d6cf8555e8ef3d

diff --git a/uloop.c b/uloop.c
index 9ebeca6..f503241 100644
--- a/uloop.c
+++ b/uloop.c
@@ -1,7 +1,7 @@
 /*
  * uloop - event loop implementation
  *
- * Copyright (C) 2010-2013 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2010-2016 Felix Fietkau <nbd@openwrt.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -58,242 +58,77 @@ static struct list_head processes = LIST_HEAD_INIT(processes);
 
 static int poll_fd = -1;
 bool uloop_cancelled = false;
+static int uloop_status = 0;
 static bool do_sigchld = false;
 
 static struct uloop_fd_event cur_fds[ULOOP_MAX_EVENTS];
 static int cur_fd, cur_nfds;
+static int uloop_run_depth = 0;
 
-#ifdef USE_KQUEUE
-
-int uloop_init(void)
-{
-	struct timespec timeout = { 0, 0 };
-	struct kevent ev = {};
-
-	if (poll_fd >= 0)
-		return 0;
-
-	poll_fd = kqueue();
-	if (poll_fd < 0)
-		return -1;
-
-	EV_SET(&ev, SIGCHLD, EVFILT_SIGNAL, EV_ADD, 0, 0, 0);
-	kevent(poll_fd, &ev, 1, NULL, 0, &timeout);
+int uloop_fd_add(struct uloop_fd *sock, unsigned int flags);
 
-	return 0;
-}
+#ifdef USE_KQUEUE
+#include "uloop-kqueue.c"
+#endif
 
+#ifdef USE_EPOLL
+#include "uloop-epoll.c"
+#endif
 
-static uint16_t get_flags(unsigned int flags, unsigned int mask)
+static void waker_consume(struct uloop_fd *fd, unsigned int events)
 {
-	uint16_t kflags = 0;
-
-	if (!(flags & mask))
-		return EV_DELETE;
+	char buf[4];
 
-	kflags = EV_ADD;
-	if (flags & ULOOP_EDGE_TRIGGER)
-		kflags |= EV_CLEAR;
-
-	return kflags;
+	while (read(fd->fd, buf, 4) > 0)
+		;
 }
 
-static struct kevent events[ULOOP_MAX_EVENTS];
-
-static int register_kevent(struct uloop_fd *fd, unsigned int flags)
-{
-	struct timespec timeout = { 0, 0 };
-	struct kevent ev[2];
-	int nev = 0;
-	unsigned int fl = 0;
-	unsigned int changed;
-	uint16_t kflags;
-
-	if (flags & ULOOP_EDGE_DEFER)
-		flags &= ~ULOOP_EDGE_TRIGGER;
-
-	changed = flags ^ fd->flags;
-	if (changed & ULOOP_EDGE_TRIGGER)
-		changed |= flags;
-
-	if (changed & ULOOP_READ) {
-		kflags = get_flags(flags, ULOOP_READ);
-		EV_SET(&ev[nev++], fd->fd, EVFILT_READ, kflags, 0, 0, fd);
-	}
-
-	if (changed & ULOOP_WRITE) {
-		kflags = get_flags(flags, ULOOP_WRITE);
-		EV_SET(&ev[nev++], fd->fd, EVFILT_WRITE, kflags, 0, 0, fd);
-	}
-
-	if (!flags)
-		fl |= EV_DELETE;
-
-	fd->flags = flags;
-	if (kevent(poll_fd, ev, nev, NULL, fl, &timeout) == -1)
-		return -1;
-
-	return 0;
-}
-
-static int register_poll(struct uloop_fd *fd, unsigned int flags)
-{
-	if (flags & ULOOP_EDGE_TRIGGER)
-		flags |= ULOOP_EDGE_DEFER;
-	else
-		flags &= ~ULOOP_EDGE_DEFER;
-
-	return register_kevent(fd, flags);
-}
+static int waker_pipe = -1;
+static struct uloop_fd waker_fd = {
+	.fd = -1,
+	.cb = waker_consume,
+};
 
-static int __uloop_fd_delete(struct uloop_fd *fd)
+static void waker_init_fd(int fd)
 {
-	return register_poll(fd, 0);
+	fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+	fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
 }
 
-static int uloop_fetch_events(int timeout)
+static int waker_init(void)
 {
-	struct timespec ts;
-	int nfds, n;
-
-	if (timeout >= 0) {
-		ts.tv_sec = timeout / 1000;
-		ts.tv_nsec = (timeout % 1000) * 1000000;
-	}
-
-	nfds = kevent(poll_fd, NULL, 0, events, ARRAY_SIZE(events), timeout >= 0 ? &ts : NULL);
-	for (n = 0; n < nfds; n++) {
-		struct uloop_fd_event *cur = &cur_fds[n];
-		struct uloop_fd *u = events[n].udata;
-		unsigned int ev = 0;
-
-		cur->fd = u;
-		if (!u)
-			continue;
-
-		if (events[n].flags & EV_ERROR) {
-			u->error = true;
-			if (!(u->flags & ULOOP_ERROR_CB))
-				uloop_fd_delete(u);
-		}
-
-		if(events[n].filter == EVFILT_READ)
-			ev |= ULOOP_READ;
-		else if (events[n].filter == EVFILT_WRITE)
-			ev |= ULOOP_WRITE;
-
-		if (events[n].flags & EV_EOF)
-			u->eof = true;
-		else if (!ev)
-			cur->fd = NULL;
-
-		cur->events = ev;
-		if (u->flags & ULOOP_EDGE_DEFER) {
-			u->flags &= ~ULOOP_EDGE_DEFER;
-			u->flags |= ULOOP_EDGE_TRIGGER;
-			register_kevent(u, u->flags);
-		}
-	}
-	return nfds;
-}
-
-#endif
-
-#ifdef USE_EPOLL
-
-/**
- * FIXME: uClibc < 0.9.30.3 does not define EPOLLRDHUP for Linux >= 2.6.17
- */
-#ifndef EPOLLRDHUP
-#define EPOLLRDHUP 0x2000
-#endif
+	int fds[2];
 
-int uloop_init(void)
-{
-	if (poll_fd >= 0)
+	if (waker_pipe >= 0)
 		return 0;
 
-	poll_fd = epoll_create(32);
-	if (poll_fd < 0)
+	if (pipe(fds) < 0)
 		return -1;
 
-	fcntl(poll_fd, F_SETFD, fcntl(poll_fd, F_GETFD) | FD_CLOEXEC);
-	return 0;
-}
-
-static int register_poll(struct uloop_fd *fd, unsigned int flags)
-{
-	struct epoll_event ev;
-	int op = fd->registered ? EPOLL_CTL_MOD : EPOLL_CTL_ADD;
-
-	memset(&ev, 0, sizeof(struct epoll_event));
+	waker_init_fd(fds[0]);
+	waker_init_fd(fds[1]);
+	waker_pipe = fds[1];
 
-	if (flags & ULOOP_READ)
-		ev.events |= EPOLLIN | EPOLLRDHUP;
+	waker_fd.fd = fds[0];
+	waker_fd.cb = waker_consume;
+	uloop_fd_add(&waker_fd, ULOOP_READ);
 
-	if (flags & ULOOP_WRITE)
-		ev.events |= EPOLLOUT;
-
-	if (flags & ULOOP_EDGE_TRIGGER)
-		ev.events |= EPOLLET;
-
-	ev.data.fd = fd->fd;
-	ev.data.ptr = fd;
-	fd->flags = flags;
-
-	return epoll_ctl(poll_fd, op, fd->fd, &ev);
-}
-
-static struct epoll_event events[ULOOP_MAX_EVENTS];
-
-static int __uloop_fd_delete(struct uloop_fd *sock)
-{
-	sock->flags = 0;
-	return epoll_ctl(poll_fd, EPOLL_CTL_DEL, sock->fd, 0);
+	return 0;
 }
 
-static int uloop_fetch_events(int timeout)
+int uloop_init(void)
 {
-	int n, nfds;
-
-	nfds = epoll_wait(poll_fd, events, ARRAY_SIZE(events), timeout);
-	for (n = 0; n < nfds; ++n) {
-		struct uloop_fd_event *cur = &cur_fds[n];
-		struct uloop_fd *u = events[n].data.ptr;
-		unsigned int ev = 0;
-
-		cur->fd = u;
-		if (!u)
-			continue;
-
-		if (events[n].events & (EPOLLERR|EPOLLHUP)) {
-			u->error = true;
-			if (!(u->flags & ULOOP_ERROR_CB))
-				uloop_fd_delete(u);
-		}
-
-		if(!(events[n].events & (EPOLLRDHUP|EPOLLIN|EPOLLOUT|EPOLLERR|EPOLLHUP))) {
-			cur->fd = NULL;
-			continue;
-		}
-
-		if(events[n].events & EPOLLRDHUP)
-			u->eof = true;
-
-		if(events[n].events & EPOLLIN)
-			ev |= ULOOP_READ;
-
-		if(events[n].events & EPOLLOUT)
-			ev |= ULOOP_WRITE;
+	if (uloop_init_pollfd() < 0)
+		return -1;
 
-		cur->events = ev;
+	if (waker_init() < 0) {
+		uloop_done();
+		return -1;
 	}
 
-	return nfds;
+	return 0;
 }
 
-#endif
-
 static bool uloop_fd_stack_event(struct uloop_fd *fd, int events)
 {
 	struct uloop_fd_stack *cur;
@@ -531,6 +366,9 @@ static void uloop_handle_processes(void)
 
 	while (1) {
 		pid = waitpid(-1, &ret, WNOHANG);
+		if (pid < 0 && errno == EINTR)
+			continue;
+
 		if (pid <= 0)
 			return;
 
@@ -548,14 +386,28 @@ static void uloop_handle_processes(void)
 
 }
 
+static void uloop_signal_wake(void)
+{
+	do {
+		if (write(waker_pipe, "w", 1) < 0) {
+			if (errno == EINTR)
+				continue;
+		}
+		break;
+	} while (1);
+}
+
 static void uloop_handle_sigint(int signo)
 {
+	uloop_status = signo;
 	uloop_cancelled = true;
+	uloop_signal_wake();
 }
 
 static void uloop_sigchld(int signo)
 {
 	do_sigchld = true;
+	uloop_signal_wake();
 }
 
 static void uloop_install_handler(int signum, void (*handler)(int), struct sigaction* old, bool add)
@@ -663,43 +515,63 @@ static void uloop_clear_processes(void)
 		uloop_process_delete(p);
 }
 
-void uloop_run(void)
+bool uloop_cancelling(void)
 {
-	static int recursive_calls = 0;
+	return uloop_run_depth > 0 && uloop_cancelled;
+}
+
+int uloop_run_timeout(int timeout)
+{
+	int next_time = 0;
 	struct timeval tv;
 
 	/*
 	 * Handlers are only updated for the first call to uloop_run() (and restored
 	 * when this call is done).
 	 */
-	if (!recursive_calls++)
+	if (!uloop_run_depth++)
 		uloop_setup_signals(true);
 
+	uloop_status = 0;
 	uloop_cancelled = false;
-	while(!uloop_cancelled)
+	while (!uloop_cancelled)
 	{
 		uloop_gettime(&tv);
 		uloop_process_timeouts(&tv);
-		if (uloop_cancelled)
-			break;
 
 		if (do_sigchld)
 			uloop_handle_processes();
+
+		if (uloop_cancelled)
+			break;
+
 		uloop_gettime(&tv);
-		uloop_run_events(uloop_get_next_timeout(&tv));
+
+		next_time = uloop_get_next_timeout(&tv);
+		if (timeout > 0 && next_time < timeout)
+			timeout = next_time;
+		uloop_run_events(timeout);
 	}
 
-	if (!--recursive_calls)
+	if (!--uloop_run_depth)
 		uloop_setup_signals(false);
+
+	return uloop_status;
 }
 
 void uloop_done(void)
 {
-	if (poll_fd < 0)
-		return;
+	if (poll_fd >= 0) {
+		close(poll_fd);
+		poll_fd = -1;
+	}
 
-	close(poll_fd);
-	poll_fd = -1;
+	if (waker_pipe >= 0) {
+		uloop_fd_delete(&waker_fd);
+		close(waker_pipe);
+		close(waker_fd.fd);
+		waker_pipe = -1;
+	}
 
 	uloop_clear_timeouts();
 	uloop_clear_processes();