X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=46fecd2c15566deaa12df3a94e896c0a939e4a0d;hp=8e71310ef5e614b38e9475478a117e7fed66f18d;hb=0f9597ab801ad4591e943bd7efcb8f1549997fdd;hpb=aed58c439015f7f7372d9ee70c767ed9dd366dd7 diff --git a/discover/device-handler.c b/discover/device-handler.c index 8e71310..46fecd2 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -30,6 +30,12 @@ struct device_handler { struct discover_device **devices; unsigned int n_devices; + struct waitset *waitset; + struct waiter *timeout_waiter; + bool default_enabled; + unsigned int sec_to_boot; + + struct discover_boot_option *default_boot_option; struct list unresolved_boot_options; }; @@ -176,6 +182,7 @@ void device_handler_destroy(struct device_handler *handler) * to keep struct device_handler opaque. */ struct device_handler *device_handler_init( struct discover_server *server __attribute__((unused)), + struct waitset *waitset __attribute__((unused)), int dry_run __attribute__((unused))) { struct device_handler *handler; @@ -274,7 +281,7 @@ static int umount_device(struct discover_device *dev) } struct device_handler *device_handler_init(struct discover_server *server, - int dry_run) + struct waitset *waitset, int dry_run) { struct device_handler *handler; @@ -282,7 +289,10 @@ struct device_handler *device_handler_init(struct discover_server *server, handler->devices = NULL; handler->n_devices = 0; handler->server = server; + handler->waitset = waitset; handler->dry_run = dry_run; + handler->default_boot_option = NULL; + handler->default_enabled = true; list_init(&handler->unresolved_boot_options); /* set up our mount point base */ @@ -373,6 +383,71 @@ static void device_handler_remove(struct device_handler *handler, talloc_free(device); } +static void boot_status(void *arg, struct boot_status *status) +{ + struct device_handler *handler = arg; + + discover_server_notify_boot_status(handler->server, status); +} + +static void countdown_status(struct device_handler *handler, + struct discover_boot_option *opt, unsigned int sec) +{ + struct boot_status status; + + status.type = BOOT_STATUS_INFO; + status.progress = -1; + status.detail = NULL; + status.message = talloc_asprintf(handler, + "Booting %s in %d sec", opt->option->name, sec); + + discover_server_notify_boot_status(handler->server, &status); + + talloc_free(status.message); +} + +static int default_timeout(void *arg) +{ + struct device_handler *handler = arg; + struct discover_boot_option *opt; + + if (!handler->default_boot_option) + return 0; + + opt = handler->default_boot_option; + + if (handler->sec_to_boot) { + countdown_status(handler, opt, handler->sec_to_boot); + handler->sec_to_boot--; + handler->timeout_waiter = waiter_register_timeout( + handler->waitset, 1000, + default_timeout, handler); + return 0; + } + + pb_log("Timeout expired, booting default option %s\n", opt->option->id); + + boot(handler, handler->default_boot_option, NULL, + handler->dry_run, boot_status, handler); + return 0; +} + +static void set_default(struct device_handler *handler, + struct discover_boot_option *opt) +{ + if (handler->default_boot_option) + return; + + if (!handler->default_enabled) + return; + + pb_log("Boot option %s set as default\n", opt->option->id); + + handler->default_boot_option = opt; + handler->sec_to_boot = DEFAULT_BOOT_TIMEOUT_SEC; + default_timeout(handler); +} + static bool resource_is_resolved(struct resource *res) { return !res || res->resolved; @@ -388,12 +463,17 @@ static bool __attribute__((used)) boot_option_is_resolved( resource_is_resolved(opt->icon); } -static bool resource_resolve(struct resource *res, struct parser *parser, +static bool resource_resolve(struct resource *res, const char *name, + struct discover_boot_option *opt, struct device_handler *handler) { + struct parser *parser = opt->source; + if (resource_is_resolved(res)) return true; + pb_log("Attempting to resolve resource %s->%s with parser %s\n", + opt->option->id, name, parser->name); parser->resolve_resource(handler, res); return res->resolved; @@ -402,12 +482,13 @@ static bool resource_resolve(struct resource *res, struct parser *parser, static bool boot_option_resolve(struct discover_boot_option *opt, struct device_handler *handler) { - return resource_resolve(opt->boot_image, opt->source, handler) && - resource_resolve(opt->initrd, opt->source, handler) && - resource_resolve(opt->icon, opt->source, handler); + return resource_resolve(opt->boot_image, "boot_image", opt, handler) && + resource_resolve(opt->initrd, "initrd", opt, handler) && + resource_resolve(opt->icon, "icon", opt, handler); } -static void boot_option_finalise(struct discover_boot_option *opt) +static void boot_option_finalise(struct device_handler *handler, + struct discover_boot_option *opt) { assert(boot_option_is_resolved(opt)); @@ -425,6 +506,9 @@ static void boot_option_finalise(struct discover_boot_option *opt) opt->option->icon_file = opt->icon->url->full; opt->option->device_id = opt->device->device->id; + + if (opt->option->is_default) + set_default(handler, opt); } static void process_boot_option_queue(struct device_handler *handler) @@ -434,13 +518,18 @@ static void process_boot_option_queue(struct device_handler *handler) list_for_each_entry_safe(&handler->unresolved_boot_options, opt, tmp, list) { + pb_log("queue: attempting resolution for %s\n", + opt->option->id); + if (!boot_option_resolve(opt, handler)) continue; + pb_log("\tresolved!\n"); + list_remove(&opt->list); - list_add(&opt->device->boot_options, &opt->list); + list_add_tail(&opt->device->boot_options, &opt->list); talloc_steal(opt->device, opt); - boot_option_finalise(opt); + boot_option_finalise(handler, opt); discover_server_notify_boot_option_add(handler->server, opt->option); } @@ -477,6 +566,7 @@ static void context_commit(struct device_handler *handler, /* this new device might be able to resolve existing boot * options */ + pb_log("New device %s, processing queue\n", dev->device->id); process_boot_option_queue(handler); } @@ -486,9 +576,12 @@ static void context_commit(struct device_handler *handler, list_remove(&opt->list); if (boot_option_resolve(opt, handler)) { - list_add(&dev->boot_options, &opt->list); + pb_log("boot option %s is resolved, " + "sending to clients\n", + opt->option->id); + list_add_tail(&dev->boot_options, &opt->list); talloc_steal(dev, opt); - boot_option_finalise(opt); + boot_option_finalise(handler, opt); discover_server_notify_boot_option_add(handler->server, opt->option); } else { @@ -690,13 +783,6 @@ int device_handler_event(struct device_handler *handler, return handlers[event->type][event->action](handler, event); } -static void boot_status(void *arg, struct boot_status *status) -{ - struct device_handler *handler = arg; - - discover_server_notify_boot_status(handler->server, status); -} - static struct discover_boot_option *find_boot_option_by_id( struct device_handler *handler, const char *id) { @@ -723,4 +809,30 @@ void device_handler_boot(struct device_handler *handler, boot(handler, opt, cmd, handler->dry_run, boot_status, handler); } + +void device_handler_cancel_default(struct device_handler *handler) +{ + struct boot_status status; + + if (handler->timeout_waiter) + waiter_remove(handler->timeout_waiter); + + handler->timeout_waiter = NULL; + handler->default_enabled = false; + + /* we only send status if we had a default boot option queued */ + if (!handler->default_boot_option) + return; + + pb_log("Cancelling default boot option\n"); + + handler->default_boot_option = NULL; + + status.type = BOOT_STATUS_INFO; + status.progress = -1; + status.detail = NULL; + status.message = "Default boot cancelled"; + + discover_server_notify_boot_status(handler->server, &status); +} #endif