summaryrefslogtreecommitdiffstats
path: root/lib/waiter
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-04-10 12:19:13 +1000
committerGeoff Levand <geoff@infradead.org>2013-04-10 10:49:20 -0700
commit37428306a270088bfcb1f94362a0fe5b7a5a888e (patch)
tree5d1aeca3eca44b68a8f8939e3bea44709a953aa9 /lib/waiter
parentee86a0bd989511319adf3467b41b5b2e1f486aa6 (diff)
downloadpetitboot-37428306a270088bfcb1f94362a0fe5b7a5a888e.zip
petitboot-37428306a270088bfcb1f94362a0fe5b7a5a888e.tar.gz
waiter: Don't rely on global variables to keep waiter state
Rather than defining the set of waiters (and pollfds) in waiter.c, add a struct waitset to contain these. A waitset is created with waitset_create, which is passed to the waiter_* functions. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Geoff Levand <geoff@infradead.org>
Diffstat (limited to 'lib/waiter')
-rw-r--r--lib/waiter/waiter.c83
-rw-r--r--lib/waiter/waiter.h8
2 files changed, 57 insertions, 34 deletions
diff --git a/lib/waiter/waiter.c b/lib/waiter/waiter.c
index 0bb213c..ac28436 100644
--- a/lib/waiter/waiter.c
+++ b/lib/waiter/waiter.c
@@ -8,29 +8,48 @@
#include "waiter.h"
struct waiter {
+ struct waitset *set;
int fd;
int events;
waiter_cb callback;
void *arg;
};
-static struct waiter *waiters;
-static int n_waiters;
+struct waitset {
+ struct waiter *waiters;
+ int n_waiters;
+ struct pollfd *pollfds;
+ int n_pollfds;
+};
-struct waiter *waiter_register(int fd, int events,
+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);
+}
+
+struct waiter *waiter_register(struct waitset *set, int fd, int events,
waiter_cb callback, void *arg)
{
- struct waiter *waiter;
+ struct waiter *waiters, *waiter;
- n_waiters++;
+ waiters = talloc_realloc(set, set->waiters,
+ struct waiter, set->n_waiters + 1);
- waiters = talloc_realloc(NULL, waiters, struct waiter, n_waiters);
-
- if(!waiters)
+ if (!waiters)
return NULL;
-
- waiter = &waiters[n_waiters - 1];
+ set->n_waiters++;
+ set->waiters = waiters;
+
+ waiter = &set->waiters[set->n_waiters - 1];
+
+ waiter->set = set;
waiter->fd = fd;
waiter->events = events;
waiter->callback = callback;
@@ -41,47 +60,47 @@ struct waiter *waiter_register(int fd, int events,
void waiter_remove(struct waiter *waiter)
{
+ struct waitset *set = waiter->set;
int i;
- i = waiter - waiters;
- assert(i >= 0 && i < n_waiters);
+ i = waiter - set->waiters;
+ assert(i >= 0 && 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);
}
-int waiter_poll(void)
+int waiter_poll(struct waitset *set)
{
- static struct pollfd *pollfds;
- static int n_pollfds;
int i, rc;
- if (n_waiters != n_pollfds) {
- pollfds = talloc_realloc(NULL, pollfds,
- struct pollfd, n_waiters);
- n_pollfds = n_waiters;
+ if (set->n_waiters != set->n_pollfds) {
+ set->pollfds = talloc_realloc(set, set->pollfds,
+ struct pollfd, set->n_waiters);
+ set->n_pollfds = set->n_waiters;
}
- for (i = 0; i < n_waiters; i++) {
- pollfds[i].fd = waiters[i].fd;
- pollfds[i].events = waiters[i].events;
- pollfds[i].revents = 0;
+ for (i = 0; i < set->n_waiters; i++) {
+ set->pollfds[i].fd = set->waiters[i].fd;
+ set->pollfds[i].events = set->waiters[i].events;
+ set->pollfds[i].revents = 0;
}
- rc = poll(pollfds, n_waiters, -1);
+ rc = poll(set->pollfds, set->n_waiters, -1);
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_waiters; i++) {
+ if (set->pollfds[i].revents) {
+ rc = set->waiters[i].callback(set->waiters[i].arg);
if (rc)
- waiter_remove(&waiters[i]);
+ waiter_remove(&set->waiters[i]);
}
}
diff --git a/lib/waiter/waiter.h b/lib/waiter/waiter.h
index ff8a5ff..ed7f6bb 100644
--- a/lib/waiter/waiter.h
+++ b/lib/waiter/waiter.h
@@ -4,6 +4,7 @@
#include <poll.h>
struct waiter;
+struct waitset;
enum events {
WAIT_IN = POLLIN,
@@ -12,12 +13,15 @@ enum events {
typedef int (*waiter_cb)(void *);
-struct waiter *waiter_register(int fd, int events,
+struct waitset *waitset_create(void *ctx);
+void waitset_destroy(struct waitset *waitset);
+
+struct waiter *waiter_register(struct waitset *waitset, int fd, int events,
waiter_cb callback, void *arg);
void waiter_remove(struct waiter *waiter);
-int waiter_poll(void);
+int waiter_poll(struct waitset *waitset);
#endif /* _WAITER_H */
OpenPOWER on IntegriCloud