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/user-event.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/user-event.c')
| -rw-r--r-- | discover/user-event.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/discover/user-event.c b/discover/user-event.c index afc4c43..db12bd1 100644 --- a/discover/user-event.c +++ b/discover/user-event.c @@ -118,7 +118,8 @@ static int user_event_destructor(void *arg) return 0; } -struct user_event *user_event_init(struct device_handler *handler) +struct user_event *user_event_init(struct waitset *waitset, + struct device_handler *handler) { struct sockaddr_un addr; struct user_event *uev; @@ -147,7 +148,7 @@ struct user_event *user_event_init(struct device_handler *handler) strerror(errno)); } - waiter_register(uev->socket, WAIT_IN, user_event_process, uev); + waiter_register(waitset, uev->socket, WAIT_IN, user_event_process, uev); pb_log("%s: waiting on %s\n", __func__, PBOOT_USER_EVENT_SOCKET); |
