X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Ftwin%2Fpbt-client.c;h=48de8160eeee7d1f0877cdc52c13a467c2b4a85a;hp=711248a61dec2da4870f835f0d24538948804f3e;hb=44ab15ff671fae26af2b5c8a5db8bcded677ef74;hpb=604a1ccf072f9f33326fb6dc919c1b6233d40866 diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c index 711248a..48de816 100644 --- a/ui/twin/pbt-client.c +++ b/ui/twin/pbt-client.c @@ -19,15 +19,17 @@ #include "config.h" #endif -#define _GNU_SOURCE #include #include +#include + #include "pbt-client.h" #include "log/log.h" #include "talloc/talloc.h" #include "waiter/waiter.h" +#include "process/process.h" #include "ui/common/discover-client.h" static struct pb_opt_data *pbt_opt_data_from_item(struct pbt_item *item) @@ -46,32 +48,29 @@ 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); - pb_log("%s: %s\n", __func__, pbt_item_name(item)); + pb_debug("%s: %s\n", __func__, pbt_item_name(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); + result = discover_client_boot(item->pbt_client->discover_client, + NULL, opt_data->opt, opt_data->bd); - if (!result) { - //mvaddstr(1, 0, "system is going down now..."); - sleep(60); + if (result) { + pb_log("%s: failed: %s\n", __func__, opt_data->bd->image); + pbt_frame_status_printf(&item->pbt_client->frame, + "Failed: kexec %s", opt_data->bd->image); } - pb_log("%s: failed: %s\n", __func__, opt_data->kd->image); - - pbt_frame_status_printf(&item->pbt_client->frame, "Failed: kexec %s", - opt_data->kd->image); - return 0; } @@ -84,115 +83,104 @@ static int pbt_client_on_edit(struct pbt_item *item) static int pbt_device_add(struct device *dev, struct pbt_client *client) { struct pbt_frame *const frame = &client->frame; - struct pbt_item *device_item; - struct boot_option *opt; + struct pbt_item *item; struct pbt_quad q; const char *icon_file; - struct pbt_item *selected_item = NULL; - pb_log("%s: %p %s: n_options %d\n", __func__, dev, dev->id, + pb_debug("%s: %p %s: n_options %d\n", __func__, dev, dev->id, dev->n_options); pb_protocol_dump_device(dev, "", pb_log_get_stream()); - /* device_item */ - // FIXME: check for existing dev->id icon_file = dev->icon_file ? dev->icon_file : pbt_icon_chooser(dev->id); - device_item = pbt_item_create_reduced(frame->top_menu, dev->id, + item = pbt_item_create_reduced(frame->top_menu, dev->id, frame->top_menu->n_items, icon_file); - if (!device_item) - goto fail_device_item_create; + if (!item) + return -1; - device_item->pb_device = dev; + item->pb_device = dev; + dev->ui_info = item; frame->top_menu->n_items++; /* sub_menu */ - q.x = frame->top_menu->window->pixmap->width; q.y = 0; q.width = frame->top_menu->scr->tscreen->width - q.x; q.height = frame->top_menu->scr->tscreen->height; - device_item->sub_menu = pbt_menu_create(device_item, dev->id, + item->sub_menu = pbt_menu_create(item, dev->id, frame->top_menu->scr, frame->top_menu, &q, &frame->top_menu->layout); - if (!device_item->sub_menu) - goto fail_sub_menu_create; + if (!item->sub_menu) + return -1; + + pbt_menu_show(frame->top_menu, 1); + + return 0; +} + +static int pbt_boot_option_add(struct device *dev, struct boot_option *opt, + struct pbt_client *client) +{ + struct pbt_item *opt_item, *device_item; + struct pb_opt_data *opt_data; - list_for_each_entry(&dev->boot_options, opt, list) { - struct pbt_item *i; - struct pb_opt_data *opt_data; + device_item = dev->ui_info; - i = pbt_item_create(device_item->sub_menu, + opt_item = pbt_item_create(device_item->sub_menu, opt->id, device_item->sub_menu->n_items++, opt->icon_file, opt->name, opt->description); - if (!i) { - assert(0); - break; - } - - i->pb_opt = opt; - i->pbt_client = client; - i->on_execute = pbt_client_run_kexec; - 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->boot_image_file); - opt_data->kd->initrd = talloc_strdup(opt_data->kd, - opt->initrd_file); - opt_data->kd->args = talloc_strdup(opt_data->kd, - opt->boot_args); - opt_data->dev = dev; - opt_data->opt = opt; - opt_data->opt_hash = pb_opt_hash(dev, opt); - - /* Select the first item as default. */ - - if (!selected_item) - selected_item = i; - - /* If this is the default_item select it and start timer. */ - - if (opt_data->opt_hash - == device_item->sub_menu->default_item_hash) { - selected_item = i; - ui_timer_kick(&client->signal_data.timer); - } + opt_item->pb_opt = opt; + opt_item->pbt_client = client; + opt_item->on_execute = pbt_client_boot; + opt_item->on_edit = pbt_client_on_edit; + + opt_item->data = opt_data = talloc(opt_item, struct pb_opt_data); + opt_data->name = opt->name; + opt_data->bd = talloc(opt_item, struct pb_boot_data); + opt_data->bd->image = talloc_strdup(opt_data->bd, + opt->boot_image_file); + opt_data->bd->initrd = talloc_strdup(opt_data->bd, + opt->initrd_file); + opt_data->bd->dtb = talloc_strdup(opt_data->bd, + opt->dtb_file); + opt_data->bd->args = talloc_strdup(opt_data->bd, + opt->boot_args); + opt_data->opt = opt; + opt_data->opt_hash = pb_opt_hash(dev, opt); + + /* If this is the default_item select it and start timer. */ + if (opt_data->opt_hash == device_item->sub_menu->default_item_hash) { + device_item->selected_item = opt_item; + pbt_menu_set_selected(device_item->sub_menu, opt_item); + ui_timer_kick(&client->signal_data.timer); } - pbt_menu_set_selected(device_item->sub_menu, selected_item); + /* Select the first item as default. */ + if (!device_item->selected_item) + pbt_menu_set_selected(device_item->sub_menu, opt_item); - pbt_menu_show(frame->top_menu, 1); twin_screen_update(client->frame.scr->tscreen); return 0; - -fail_sub_menu_create: -fail_device_item_create: - assert(0); - return -1; } 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, + pb_debug("%s: %p %s: n_options %d\n", __func__, dev, dev->id, dev->n_options); pb_protocol_dump_device(dev, "", pb_log_get_stream()); @@ -250,22 +238,21 @@ static void pbt_device_remove(struct device *dev, struct pbt_client *client) static struct discover_client_ops pbt_client_ops = { .device_add = (void *)pbt_device_add, + .boot_option_add = (void *)pbt_boot_option_add, .device_remove = (void *)pbt_device_remove, }; static void pbt_client_destructor(struct pbt_client *client) { - pb_log("%s\n", __func__); + pb_debug("%s\n", __func__); // move to screen twin_x11_destroy(twin_ctx); talloc_free(client->discover_client); memset(client, 0, sizeof(*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 start_deamon) +struct pbt_client *pbt_client_init(enum pbt_twin_backend backend, + unsigned int width, unsigned int height, int start_daemon) { struct pbt_client *pbt_client; unsigned int i; @@ -280,35 +267,40 @@ struct pbt_client *pbt_client_init(enum pbt_twin_backend backend, unsigned int w talloc_set_destructor(pbt_client, (void *)pbt_client_destructor); + pbt_client->waitset = waitset_create(pbt_client); + + process_init(pbt_client, pbt_client->waitset, false); + pbt_client->sig = "pbt_client"; - pbt_client->kexec_cb = kexec_cb; - 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_daemon ? 2 : 10; i; i--) { pbt_client->discover_client - = discover_client_init(&pbt_client_ops, pbt_client); - if (pbt_client->discover_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); sleep(1); } - if (!pbt_client->discover_client && start_deamon) { + if (!pbt_client->discover_client && start_daemon) { int result; - start_deamon = 0; + start_daemon = 0; - result = pb_start_daemon(); + result = pb_start_daemon(pbt_client); 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 +319,6 @@ 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); -} return pbt_client; fail_client_init: