X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fwaiter%2Fwaiter.c;h=513ab608af3a3115ec6a39d58a0645dee129cd56;hp=68f483acac03adaea7955cf91dd1fc2f2197a75a;hb=658d9e98eec02f92e3cf263a1bb27beb3d395b2f;hpb=e058e90117300125af7b6e93eb0e5aeb23543af9

diff --git a/lib/waiter/waiter.c b/lib/waiter/waiter.c
index 68f483a..513ab60 100644
--- a/lib/waiter/waiter.c
+++ b/lib/waiter/waiter.c
@@ -1,84 +1,249 @@
 
 #include <poll.h>
+#include <stdbool.h>
 #include <string.h>
 #include <assert.h>
+#include <sys/time.h>
 
 #include <talloc/talloc.h>
 
 #include "waiter.h"
 
 struct waiter {
+	enum {
+		WAITER_IO,
+		WAITER_TIME,
+	}		type;
+	struct waitset	*set;
 	int		fd;
 	int		events;
+	struct timeval	timeout;
 	waiter_cb	callback;
 	void		*arg;
 };
 
-static struct waiter *waiters;
-static int n_waiters;
+struct waitset {
+	struct waiter	**waiters;
+	int		n_waiters;
+	bool		waiters_changed;
+
+	struct timeval	next_timeout;
+
+	/* These are kept consistent over each call to waiter_poll, as
+	 * set->waiters may be updated (by waiters' callbacks calling
+	 * waiter_register or waiter_remove) during iteration. */
+	struct pollfd	*pollfds;
+	int		n_pollfds;
+	struct waiter	**io_waiters;
+	int		n_io_waiters;
+	struct waiter	**time_waiters;
+	int		n_time_waiters;
+};
 
-struct waiter *waiter_register(int fd, int events,
-		waiter_cb callback, void *arg)
+struct waitset *waitset_create(void *ctx)
+{
+	struct waitset *set = talloc_zero(ctx, struct waitset);
+	return set;
+}
+
+void waitset_destroy(struct waitset *set)
+{
+	talloc_free(set);
+}
+
+static struct waiter *waiter_new(struct waitset *set)
 {
-	struct waiter *waiter;
+	struct waiter **waiters, *waiter;
 
-	n_waiters++;
+	waiter = talloc(set->waiters, struct waiter);
+	if (!waiter)
+		return NULL;
 
-	waiters = talloc_realloc(NULL, waiters, struct waiter, n_waiters);
-	waiter = &waiters[n_waiters - 1];
+	waiters = talloc_realloc(set, set->waiters,
+			struct waiter *, set->n_waiters + 1);
 
+	if (!waiters) {
+		talloc_free(waiter);
+		return NULL;
+	}
+
+	set->waiters_changed = true;
+	set->waiters = waiters;
+	set->n_waiters++;
+
+	set->waiters[set->n_waiters - 1] = waiter;
+	return waiter;
+}
+
+struct waiter *waiter_register_io(struct waitset *set, int fd, int events,
+		waiter_cb callback, void *arg)
+{
+	struct waiter *waiter = waiter_new(set);
+
+	waiter->type = WAITER_IO;
+	waiter->set = set;
 	waiter->fd = fd;
 	waiter->events = events;
 	waiter->callback = callback;
 	waiter->arg = arg;
 
-	return 0;
+	return waiter;
+}
+
+struct waiter *waiter_register_timeout(struct waitset *set, int delay_ms,
+		waiter_cb callback, void *arg)
+{
+	struct waiter *waiter = waiter_new(set);
+	struct timeval now, delay;
+
+	delay.tv_sec = delay_ms / 1000;
+	delay.tv_usec = 1000 * (delay_ms % 1000);
+
+	gettimeofday(&now, NULL);
+
+	timeradd(&now, &delay, &waiter->timeout);
+
+	waiter->type = WAITER_TIME;
+	waiter->set = set;
+	waiter->callback = callback;
+	waiter->arg = arg;
+
+	return waiter;
 }
 
 void waiter_remove(struct waiter *waiter)
 {
+	struct waitset *set = waiter->set;
 	int i;
 
-	i = waiter - waiters;
-	assert(i >= 0 && i < n_waiters);
+	for (i = 0; i < set->n_waiters; i++)
+		if (set->waiters[i] == waiter)
+			break;
+
+	assert(i < set->n_waiters);
 
-	n_waiters--;
-	memmove(&waiters[i], &waiters[i+1],
-		(n_waiters - i) * sizeof(waiters[0]));
+	set->n_waiters--;
+	memmove(&set->waiters[i], &set->waiters[i+1],
+		(set->n_waiters - i) * sizeof(set->waiters[0]));
 
-	waiters = talloc_realloc(NULL, waiters, struct waiter, n_waiters);
+	set->waiters = talloc_realloc(set->waiters, set->waiters,
+			struct waiter *, set->n_waiters);
+	set->waiters_changed = true;
+
+	talloc_free(waiter);
 }
 
-int waiter_poll(void)
+static void update_waiters(struct waitset *set)
 {
-	static struct pollfd *pollfds;
-	static int n_pollfds;
-	int i, rc;
+	int n_io, n_time, i_io, i_time, i;
+
+	if (!set->waiters_changed)
+		return;
+
+	n_io = n_time = 0;
+
+	for (i = 0; i < set->n_waiters; i++) {
+		if (set->waiters[i]->type == WAITER_IO)
+			n_io++;
+		else if (set->waiters[i]->type == WAITER_TIME)
+			n_time++;
+	}
+
+	/* realloc if counts have changed */
+	if (set->n_io_waiters != n_io) {
+		set->io_waiters = talloc_realloc(set, set->io_waiters,
+				struct waiter *, n_io);
+		set->pollfds = talloc_realloc(set, set->pollfds,
+				struct pollfd, n_io);
+		set->n_io_waiters = n_io;
+	}
+	if (set->n_time_waiters != n_time) {
+		set->time_waiters = talloc_realloc(set, set->time_waiters,
+				struct waiter *, n_time);
+		set->n_time_waiters = n_time;
+	}
+
+	/* IO waiters: copy to io_waiters, populate pollfds */
+	for (i = i_io = 0; i < set->n_waiters; i++) {
+		struct waiter *waiter = set->waiters[i];
+
+		if (waiter->type != WAITER_IO)
+			continue;
+
+		set->pollfds[i_io].fd = waiter->fd;
+		set->pollfds[i_io].events = waiter->events;
+		set->io_waiters[i_io] = waiter;
+		i_io++;
+	}
+
+	/* time waiters: copy to time_waiters, calculate next expiry */
+	timerclear(&set->next_timeout);
+	for (i = i_time = 0; i < set->n_waiters; i++) {
+		struct waiter *waiter = set->waiters[i];
 
-	if (n_waiters != n_pollfds) {
-		pollfds = talloc_realloc(NULL, pollfds,
-				struct pollfd, n_waiters);
-		n_pollfds = n_waiters;
+		if (waiter->type != WAITER_TIME)
+			continue;
+
+		if (!timerisset(&set->next_timeout) ||
+				timercmp(&waiter->timeout,
+					&set->next_timeout, <))
+			set->next_timeout = waiter->timeout;
+
+		set->time_waiters[i_time] = waiter;
+		i_time++;
 	}
+}
 
-	for (i = 0; i < n_waiters; i++) {
-		pollfds[i].fd = waiters[i].fd;
-		pollfds[i].events = waiters[i].events;
-		pollfds[i].revents = 0;
+int waiter_poll(struct waitset *set)
+{
+	struct timeval now, timeout;
+	int timeout_ms;
+	int i, rc;
+
+	/* If the waiters have been updated, we need to update our
+	 * consistent copy */
+	update_waiters(set);
+
+	if (timerisset(&set->next_timeout)) {
+		gettimeofday(&now, NULL);
+		timersub(&set->next_timeout, &now, &timeout);
+		timeout_ms = timeout.tv_sec * 1000 +
+				timeout.tv_usec / 1000;
+		if (timeout_ms < 0)
+			timeout_ms = 0;
+	} else {
+		timeout_ms = -1;
 	}
 
-	rc = poll(pollfds, n_waiters, -1);
 
-	if (rc <= 0)
+	rc = poll(set->pollfds, set->n_io_waiters, timeout_ms);
+
+	if (rc < 0)
 		return rc;
 
-	for (i = 0; i < n_waiters; i++) {
-		if (pollfds[i].revents) {
-			rc = waiters[i].callback(waiters[i].arg);
+	for (i = 0; i < set->n_io_waiters; i++) {
+		struct waiter *waiter = set->io_waiters[i];
+
+		if (!set->pollfds[i].revents)
+			continue;
+		rc = waiter->callback(waiter->arg);
+
+		if (rc)
+			waiter_remove(waiter);
+	}
+
+	if (set->n_time_waiters > 0)
+		gettimeofday(&now, NULL);
+
+	for (i = 0; i < set->n_time_waiters; i++) {
+		struct waiter *waiter = set->time_waiters[i];
+
+		if (timercmp(&waiter->timeout, &now, >))
+			continue;
+
+		waiter->callback(waiter->arg);
 
-			if (rc)
-				waiter_remove(&waiters[i]);
-		}
+		waiter_remove(waiter);
 	}
 
 	return 0;