diff options
| author | Geoff Levand <geoff@infradead.org> | 2012-03-30 17:20:48 -0700 |
|---|---|---|
| committer | Geoff Levand <geoff@infradead.org> | 2012-03-30 18:10:10 -0700 |
| commit | f4c558294089f7449e6f536300ddd1aa94d2cf20 (patch) | |
| tree | a9a5585a7af753e1e4ddd04a00f3f0f43e91611c /ui | |
| parent | 52b9db95764fcdee9195113d7df225634a19c9f4 (diff) | |
| download | petitboot-f4c558294089f7449e6f536300ddd1aa94d2cf20.zip petitboot-f4c558294089f7449e6f536300ddd1aa94d2cf20.tar.gz | |
Speed up --start-daemon option
Signed-off-by: Geoff Levand <geoff@infradead.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/ncurses/nc-cui.c | 8 | ||||
| -rw-r--r-- | ui/twin/pbt-client.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index 7db482b..b9d8d79 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -556,10 +556,10 @@ struct cui *cui_init(void* platform_info, /* Loop here for scripts that just started the server. */ -start_deamon: - for (i = 10; i; i--) { +retry_start: + for (i = start_deamon ? 2 : 10; i; i--) { client = discover_client_init(&cui_client_ops, cui); - if (client) + if (client || !i) break; pb_log("%s: waiting for server %d\n", __func__, i); sleep(1); @@ -573,7 +573,7 @@ start_deamon: result = pb_start_daemon(); if (!result) - goto start_deamon; + goto retry_start; pb_log("%s: discover_client_init failed.\n", __func__); fprintf(stderr, "%s: error: discover_client_init failed.\n", diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c index 8d7991a..bcd17c9 100644 --- a/ui/twin/pbt-client.c +++ b/ui/twin/pbt-client.c @@ -289,12 +289,12 @@ struct pbt_client *pbt_client_init(enum pbt_twin_backend backend, goto fail_scr_init; /* Loop here for scripts that just started the server. */ -if (1) { -start_deamon: - for (i = 10; i; i--) { + +retry_start: + for (i = start_deamon ? 2 : 10; i; i--) { pbt_client->discover_client = discover_client_init(&pbt_client_ops, pbt_client); - if (pbt_client->discover_client) + if (pbt_client->discover_client || !i) break; pb_log("%s: waiting for server %d\n", __func__, i); sleep(1); @@ -308,7 +308,7 @@ start_deamon: result = pb_start_daemon(); if (!result) - goto start_deamon; + goto retry_start; pb_log("%s: discover_client_init failed.\n", __func__); fprintf(stderr, "%s: error: discover_client_init failed.\n", @@ -330,7 +330,7 @@ start_deamon: waiter_register(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: |
