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/twin | |
| 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/twin')
| -rw-r--r-- | ui/twin/pbt-client.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c index ad418a3..dfbe955 100644 --- a/ui/twin/pbt-client.c +++ b/ui/twin/pbt-client.c @@ -298,7 +298,8 @@ struct pbt_client *pbt_client_init(enum pbt_twin_backend backend, retry_start: for (i = start_deamon ? 2 : 10; i; i--) { pbt_client->discover_client - = discover_client_init(&pbt_client_ops, pbt_client); + = discover_client_init(pbt_client->waitset, + &pbt_client_ops, pbt_client); if (pbt_client->discover_client || !i) break; pb_log("%s: waiting for server %d\n", __func__, i); @@ -332,11 +333,6 @@ retry_start: goto fail_client_init; } - waiter_register(pbt_client->waitset, - discover_client_get_fd(pbt_client->discover_client), - WAIT_IN, (waiter_cb)discover_client_process, - pbt_client->discover_client); - return pbt_client; fail_client_init: |
