diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-04-10 12:19:13 +1000 |
|---|---|---|
| committer | Geoff Levand <geoff@infradead.org> | 2013-04-10 10:49:20 -0700 |
| commit | 37428306a270088bfcb1f94362a0fe5b7a5a888e (patch) | |
| tree | 5d1aeca3eca44b68a8f8939e3bea44709a953aa9 /discover/discover-server.c | |
| parent | ee86a0bd989511319adf3467b41b5b2e1f486aa6 (diff) | |
| download | talos-petitboot-37428306a270088bfcb1f94362a0fe5b7a5a888e.tar.gz talos-petitboot-37428306a270088bfcb1f94362a0fe5b7a5a888e.zip | |
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 'discover/discover-server.c')
| -rw-r--r-- | discover/discover-server.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/discover/discover-server.c b/discover/discover-server.c index f4e96c0..21e15da 100644 --- a/discover/discover-server.c +++ b/discover/discover-server.c @@ -22,6 +22,7 @@ struct discover_server { int socket; + struct waitset *waitset; struct waiter *waiter; struct list clients; struct device_handler *device_handler; @@ -184,7 +185,7 @@ void discover_server_set_device_source(struct discover_server *server, server->device_handler = handler; } -struct discover_server *discover_server_init(void) +struct discover_server *discover_server_init(struct waitset *waitset) { struct discover_server *server; struct sockaddr_un addr; @@ -194,6 +195,7 @@ struct discover_server *discover_server_init(void) return NULL; server->waiter = NULL; + server->waitset = waitset; list_init(&server->clients); unlink(PB_SOCKET_PATH); @@ -219,8 +221,8 @@ struct discover_server *discover_server_init(void) goto out_err; } - server->waiter = waiter_register(server->socket, WAIT_IN, - discover_server_process, server); + server->waiter = waiter_register(server->waitset, server->socket, + WAIT_IN, discover_server_process, server); return server; |
