diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-02-27 16:04:23 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-04-15 15:42:26 +0800 |
| commit | 9939af2652ce479645eaa78e891ee06f33845a99 (patch) | |
| tree | 266625d0274f5627b2a5556c95628fccaac3dc3a /ui/test/discover-test.c | |
| parent | 69c459db80abece18b5557d9b8a8098a88329c28 (diff) | |
| download | talos-petitboot-9939af2652ce479645eaa78e891ee06f33845a99.tar.gz talos-petitboot-9939af2652ce479645eaa78e891ee06f33845a99.zip | |
discover-client: interact directly with waitset
Currently, clients need to mess with the discover client fd directly,
and manually register the waiter.
Instead, this change adds a waitset parameter to
discover_client_register, so that the discover client can register
itself, and call discover_client_process directly. This means no proxy
handlers, and no casts to waiter callbacks.
We can also get rid of discover_client_get_fd.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'ui/test/discover-test.c')
| -rw-r--r-- | ui/test/discover-test.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/test/discover-test.c b/ui/test/discover-test.c index f3ef746..ae43b1e 100644 --- a/ui/test/discover-test.c +++ b/ui/test/discover-test.c @@ -44,15 +44,18 @@ static struct discover_client_ops client_ops = { int main(void) { struct discover_client *client; + struct waitset *waitset; - client = discover_client_init(&client_ops, NULL); + waitset = waitset_create(NULL); + + client = discover_client_init(waitset, &client_ops, NULL); if (!client) return -1; for (;;) { int rc; - rc = discover_client_process(client); + rc = waiter_poll(waitset); if (rc) break; } |
