From 9939af2652ce479645eaa78e891ee06f33845a99 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Wed, 27 Feb 2013 16:04:23 +0800 Subject: 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 --- ui/ncurses/nc-cui.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'ui/ncurses/nc-cui.c') diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index ae3d7c6..6ef43ee 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -264,17 +264,6 @@ static int cui_process_js(void *arg) return 0; } -/** - * cui_client_process_socket - Process a socket event from the discover server. - */ - -static int cui_client_process_socket(void *arg) -{ - struct discover_client *client = arg; - - discover_client_process(client); - return 0; -} /** * cui_handle_timeout - Handle the timeout. @@ -559,7 +548,8 @@ struct cui *cui_init(void* platform_info, retry_start: for (i = start_deamon ? 2 : 10; i; i--) { - client = discover_client_init(&cui_client_ops, cui); + client = discover_client_init(cui->waitset, + &cui_client_ops, cui); if (client || !i) break; pb_log("%s: waiting for server %d\n", __func__, i); @@ -596,9 +586,6 @@ retry_start: atexit(nc_atexit); nc_start(); - waiter_register(cui->waitset, discover_client_get_fd(client), WAIT_IN, - cui_client_process_socket, client); - waiter_register(cui->waitset, STDIN_FILENO, WAIT_IN, cui_process_key, cui); -- cgit v1.2.1