X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Ftwin%2Fpbt-client.c;h=ad418a32e2e95941c9d7186471890f070da3f815;hp=8d7991a415d9370e42205d83fc328a7b0b50d6ee;hb=1b0b59295d0500764c5096753f7cd11bf3ab5df4;hpb=52b9db95764fcdee9195113d7df225634a19c9f4

diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c
index 8d7991a..ad418a3 100644
--- a/ui/twin/pbt-client.c
+++ b/ui/twin/pbt-client.c
@@ -23,6 +23,8 @@
 #include <assert.h>
 #include <string.h>
 
+#include <pb-protocol/pb-protocol.h>
+
 #include "pbt-client.h"
 
 #include "log/log.h"
@@ -46,10 +48,11 @@ void pbt_frame_status_printf(struct pbt_frame *frame, const char *format, ...)
 
 	va_start(ap, format);
 	// TODO
+	(void)frame;
 	va_end(ap);
 }
 
-static int pbt_client_run_kexec(struct pbt_item *item)
+static int pbt_client_boot(struct pbt_item *item)
 {
 	int result;
 	struct pb_opt_data *opt_data = pbt_opt_data_from_item(item);
@@ -59,17 +62,17 @@ static int pbt_client_run_kexec(struct pbt_item *item)
 	pbt_frame_status_printf(&item->pbt_client->frame, "Booting %s...",
 		pbt_item_name(item));
 
-	assert(item->pbt_client->kexec_cb);
-	result = item->pbt_client->kexec_cb(item->pbt_client, opt_data);
+	assert(item->pbt_client->boot_cb);
+	result = item->pbt_client->boot_cb(item->pbt_client, opt_data);
 
 	if (!result) {
 		sleep(item->pbt_client->dry_run ? 1 : 60);
 	}
 
-	pb_log("%s: failed: %s\n", __func__, opt_data->kd->image);
+	pb_log("%s: failed: %s\n", __func__, opt_data->bd->image);
 
 	pbt_frame_status_printf(&item->pbt_client->frame, "Failed: kexec %s",
-		opt_data->kd->image);
+		opt_data->bd->image);
 
 	return 0;
 }
@@ -137,17 +140,17 @@ static int pbt_device_add(struct device *dev, struct pbt_client *client)
 
 		i->pb_opt = opt;
 		i->pbt_client = client;
-		i->on_execute = pbt_client_run_kexec;
+		i->on_execute = pbt_client_boot;
 		i->on_edit = pbt_client_on_edit;
 
 		i->data = opt_data = talloc(i, struct pb_opt_data);
 		opt_data->name = opt->name;
-		opt_data->kd = talloc(i, struct pb_kexec_data);
-		opt_data->kd->image = talloc_strdup(opt_data->kd,
+		opt_data->bd = talloc(i, struct pb_boot_data);
+		opt_data->bd->image = talloc_strdup(opt_data->bd,
 			opt->boot_image_file);
-		opt_data->kd->initrd = talloc_strdup(opt_data->kd,
+		opt_data->bd->initrd = talloc_strdup(opt_data->bd,
 			opt->initrd_file);
-		opt_data->kd->args = talloc_strdup(opt_data->kd,
+		opt_data->bd->args = talloc_strdup(opt_data->bd,
 			opt->boot_args);
 		opt_data->dev = dev;
 		opt_data->opt = opt;
@@ -184,12 +187,11 @@ static void pbt_device_remove(struct device *dev, struct pbt_client *client)
 {
 	struct pbt_frame *const frame = &client->frame;
 	struct list *i_list = frame->top_menu->item_list;
+	twin_window_t *last_window = NULL;
 	struct pbt_item *removed_item;
 	struct pbt_item *prev_item;
 	struct pbt_item *next_item;
 	struct pbt_item *i;
-	twin_window_t *last_window;
-	struct boot_option *opt;
 
 	pb_log("%s: %p %s: n_options %d\n", __func__, dev, dev->id,
 		dev->n_options);
@@ -263,7 +265,7 @@ static void pbt_client_destructor(struct pbt_client *client)
 
 struct pbt_client *pbt_client_init(enum pbt_twin_backend backend,
 	unsigned int width, unsigned int height,
-	int (*kexec_cb)(struct pbt_client *, struct pb_opt_data *),
+	int (*boot_cb)(struct pbt_client *, struct pb_opt_data *),
 	int start_deamon, int dry_run)
 {
 	struct pbt_client *pbt_client;
@@ -279,22 +281,25 @@ struct pbt_client *pbt_client_init(enum pbt_twin_backend backend,
 
 	talloc_set_destructor(pbt_client, (void *)pbt_client_destructor);
 
+	pbt_client->waitset = waitset_create(pbt_client);
+
 	pbt_client->sig = "pbt_client";
-	pbt_client->kexec_cb = kexec_cb;
+	pbt_client->boot_cb = boot_cb;
 	pbt_client->dry_run = dry_run;
-	pbt_client->frame.scr = pbt_scr_init(pbt_client, backend, width, height,
-		NULL, NULL);
+	pbt_client->frame.scr = pbt_scr_init(pbt_client, pbt_client->waitset,
+			backend, width, height, NULL, NULL);
+
 
 	if (!pbt_client->frame.scr)
 		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 +313,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",
@@ -327,10 +332,11 @@ start_deamon:
 		goto fail_client_init;
 	}
 
-	waiter_register(discover_client_get_fd(pbt_client->discover_client),
-		WAIT_IN, (waiter_cb)discover_client_process,
-		pbt_client->discover_client);
-}
+	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: