From: Roy Marples <roy@marples.name>
Date: Fri, 23 Jul 2010 16:18:03 +0000 (+0000)
Subject: eloop functions can now specify a queue.
X-Git-Tag: v5.2.7~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adab795a66249ccb456e7eedb43cea64efa3aa21;p=thirdparty%2Fdhcpcd.git

eloop functions can now specify a queue.
This allows us to build future IPv6 queues that do not affect the
main IPv4 queue.
---

diff --git a/eloop.c b/eloop.c
index 5c61445e..f6d5d282 100644
--- a/eloop.c
+++ b/eloop.c
@@ -51,6 +51,7 @@ static struct timeout {
 	struct timeval when;
 	void (*callback)(void *);
 	void *arg;
+	int queue;
 	struct timeout *next;
 } *timeouts;
 static struct timeout *free_timeouts;
@@ -109,7 +110,8 @@ delete_event(int fd)
 }
 
 void
-add_timeout_tv(const struct timeval *when, void (*callback)(void *), void *arg)
+add_q_timeout_tv(int queue,
+    const struct timeval *when, void (*callback)(void *), void *arg)
 {
 	struct timeval w;
 	struct timeout *t, *tt = NULL;
@@ -147,6 +149,7 @@ add_timeout_tv(const struct timeval *when, void (*callback)(void *), void *arg)
 	t->when.tv_usec = w.tv_usec;
 	t->callback = callback;
 	t->arg = arg;
+	t->queue = queue;
 
 	/* The timeout list should be in chronological order,
 	 * soonest first.
@@ -168,28 +171,30 @@ add_timeout_tv(const struct timeval *when, void (*callback)(void *), void *arg)
 }
 
 void
-add_timeout_sec(time_t when, void (*callback)(void *), void *arg)
+add_q_timeout_sec(int queue, time_t when, void (*callback)(void *), void *arg)
 {
 	struct timeval tv;
 
 	tv.tv_sec = when;
 	tv.tv_usec = 0;
-	add_timeout_tv(&tv, callback, arg);
+	add_q_timeout_tv(queue, &tv, callback, arg);
 }
 
 /* This deletes all timeouts for the interface EXCEPT for ones with the
  * callbacks given. Handy for deleting everything apart from the expire
  * timeout. */
-void
-delete_timeouts(void *arg, void (*callback)(void *), ...)
+static void
+v_delete_q_timeouts(int queue, void *arg, void (*callback)(void *), va_list v)
 {
 	struct timeout *t, *tt, *last = NULL;
 	va_list va;
 	void (*f)(void *);
 
 	for (t = timeouts; t && (tt = t->next, 1); t = tt) {
-		if (t->arg == arg && t->callback != callback) {
-			va_start(va, callback);
+		if (t->queue == queue && t->arg == arg &&
+		    t->callback != callback)
+		{
+			va_copy(va, v);
 			while ((f = va_arg(va, void (*)(void *))))
 				if (f == t->callback)
 					break;
@@ -209,12 +214,32 @@ delete_timeouts(void *arg, void (*callback)(void *), ...)
 }
 
 void
-delete_timeout(void (*callback)(void *), void *arg)
+delete_q_timeouts(int queue, void *arg, void (*callback)(void *), ...)
+{
+	va_list va;
+
+	va_start(va, callback);
+	v_delete_q_timeouts(queue, arg, callback, va);
+	va_end(va);
+}
+
+void
+delete_timeouts( void *arg, void (*callback)(void *), ...)
+{
+	va_list va;
+
+	va_start(va, callback);
+	v_delete_q_timeouts(0, arg, callback, va);
+	va_end(va);
+}
+
+void
+delete_q_timeout(int queue, void (*callback)(void *), void *arg)
 {
 	struct timeout *t, *tt, *last = NULL;
 
 	for (t = timeouts; t && (tt = t->next, 1); t = tt) {
-		if (t->arg == arg &&
+		if (t->queue == queue && t->arg == arg &&
 		    (!callback || t->callback == callback))
 		{
 			if (last)
diff --git a/eloop.h b/eloop.h
index d699e1ec..245858a9 100644
--- a/eloop.h
+++ b/eloop.h
@@ -30,11 +30,17 @@
 
 #include <time.h>
 
+#define add_timeout_tv(a, b, c) add_q_timeout_tv(0, a, b, c)
+#define add_timeout_sec(a, b, c) add_q_timeout_sec(0, a, b, c)
+#define delete_timeout(a, b) delete_q_timeout(0, a, b)
+
 void add_event(int fd, void (*)(void *), void *);
 void delete_event(int fd);
-void add_timeout_sec(time_t, void (*)(void *), void *);
-void add_timeout_tv(const struct timeval *, void (*)(void *), void *);
-void delete_timeout(void (*)(void *), void *);
+void add_q_timeout_sec(int queue, time_t, void (*)(void *), void *);
+void add_q_timeout_tv(int queue, const struct timeval *, void (*)(void *),
+    void *);
+void delete_q_timeout(int, void (*)(void *), void *);
+void delete_q_timeouts(int, void *, void (*)(void *), ...);
 void delete_timeouts(void *, void (*)(void *), ...);
 void start_eloop(void);