discover: Add helpers for status reporting

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 70e4506c487ace8e7d7ce2b2354296dd82bbe79a..b8825ce7ab868a0e095bee5a413a5c60bda1d312 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -410,25 +410,60 @@ void device_handler_remove(struct device_handler *handler,
        talloc_free(device);
 }
 
-void device_handler_boot_status(void *arg, struct boot_status *status)
+void device_handler_status(struct device_handler *handler,
+               struct status *status)
 {
-       struct device_handler *handler = arg;
-
        discover_server_notify_boot_status(handler->server, status);
 }
 
+static void _device_handler_vstatus(struct device_handler *handler,
+               enum status_type type, const char *fmt, va_list ap)
+{
+       struct status status;
+
+       status.type = type;
+       status.message = talloc_vasprintf(handler, fmt, ap);
+
+       device_handler_status(handler, &status);
+
+       talloc_free(status.message);
+}
+
+void device_handler_status_info(struct device_handler *handler,
+               const char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       _device_handler_vstatus(handler, STATUS_INFO, fmt, ap);
+       va_end(ap);
+}
+
+void device_handler_status_err(struct device_handler *handler,
+               const char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       _device_handler_vstatus(handler, STATUS_ERROR, fmt, ap);
+       va_end(ap);
+}
+
+static void device_handler_boot_status_cb(void *arg, struct status *status)
+{
+       device_handler_status(arg, status);
+}
+
 static void countdown_status(struct device_handler *handler,
                struct discover_boot_option *opt, unsigned int sec)
 {
-       struct boot_status status;
+       struct status status;
 
-       status.type = BOOT_STATUS_INFO;
-       status.progress = -1;
-       status.detail = NULL;
+       status.type = STATUS_INFO;
        status.message = talloc_asprintf(handler,
                        _("Booting in %d sec: %s"), sec, opt->option->name);
 
-       discover_server_notify_boot_status(handler->server, &status);
+       device_handler_status(handler, &status);
 
        talloc_free(status.message);
 }
@@ -462,7 +497,7 @@ static int default_timeout(void *arg)
        platform_pre_boot();
 
        handler->pending_boot = boot(handler, handler->default_boot_option,
-                       NULL, handler->dry_run, device_handler_boot_status,
+                       NULL, handler->dry_run, device_handler_boot_status_cb,
                        handler);
        handler->pending_boot_is_default = true;
        return 0;
@@ -836,11 +871,11 @@ int device_handler_discover(struct device_handler *handler,
                struct discover_device *dev)
 {
        struct discover_context *ctx;
-       struct boot_status *status;
+       struct status *status;
        int rc;
 
-       status = talloc_zero(handler, struct boot_status);
-       status->type = BOOT_STATUS_INFO;
+       status = talloc_zero(handler, struct status);
+       status->type = STATUS_INFO;
        /*
         * TRANSLATORS: this string will be passed the type and identifier
         * of the device. For example, the first parameter could be "Disk",
@@ -850,7 +885,7 @@ int device_handler_discover(struct device_handler *handler,
        status->message = talloc_asprintf(status, _("Processing %s device %s"),
                                device_type_display_name(dev->device->type),
                                dev->device->id);
-       device_handler_boot_status(handler, status);
+       device_handler_status(handler, status);
 
        process_boot_option_queue(handler);
 
@@ -878,7 +913,7 @@ out:
         */
        status->message = talloc_asprintf(status,_("Processing %s complete"),
                                dev->device->id);
-       device_handler_boot_status(handler, status);
+       device_handler_status(handler, status);
 
        talloc_free(status);
        talloc_unlink(handler, ctx);
@@ -891,17 +926,17 @@ int device_handler_dhcp(struct device_handler *handler,
                struct discover_device *dev, struct event *event)
 {
        struct discover_context *ctx;
-       struct boot_status *status;
+       struct status *status;
 
-       status = talloc_zero(handler, struct boot_status);
-       status->type = BOOT_STATUS_INFO;
+       status = talloc_zero(handler, struct status);
+       status->type = STATUS_INFO;
        /*
         * TRANSLATORS: this format specifier will be the name of a network
         * device, like 'eth0'.
         */
        status->message = talloc_asprintf(status, _("Processing dhcp event on %s"),
                                dev->device->id);
-       device_handler_boot_status(handler, status);
+       device_handler_status(handler, status);
 
        /* create our context */
        ctx = device_handler_discover_context_create(handler, dev);
@@ -918,7 +953,7 @@ int device_handler_dhcp(struct device_handler *handler,
         */
        status->message = talloc_asprintf(status,_("Processing %s complete"),
                                dev->device->id);
-       device_handler_boot_status(handler, status);
+       device_handler_status(handler, status);
 
        talloc_free(status);
        talloc_unlink(handler, ctx);
@@ -957,13 +992,13 @@ void device_handler_boot(struct device_handler *handler,
        platform_pre_boot();
 
        handler->pending_boot = boot(handler, opt, cmd, handler->dry_run,
-                       device_handler_boot_status, handler);
+                       device_handler_boot_status_cb, handler);
        handler->pending_boot_is_default = false;
 }
 
 void device_handler_cancel_default(struct device_handler *handler)
 {
-       struct boot_status status;
+       struct status status;
 
        if (handler->timeout_waiter)
                waiter_remove(handler->timeout_waiter);
@@ -985,12 +1020,10 @@ void device_handler_cancel_default(struct device_handler *handler)
 
        handler->default_boot_option = NULL;
 
-       status.type = BOOT_STATUS_INFO;
-       status.progress = -1;
-       status.detail = NULL;
+       status.type = STATUS_INFO;
        status.message = _("Default boot cancelled");
 
-       discover_server_notify_boot_status(handler->server, &status);
+       device_handler_status(handler, &status);
 }
 
 void device_handler_update_config(struct device_handler *handler,
@@ -1082,17 +1115,13 @@ void device_handler_process_url(struct device_handler *handler,
 {
        struct discover_context *ctx;
        struct discover_device *dev;
-       struct boot_status *status;
+       struct status *status;
        struct pb_url *pb_url;
        struct event *event;
        struct param *param;
 
-       status = talloc(handler, struct boot_status);
-
-       status->type = BOOT_STATUS_ERROR;
-       status->progress = 0;
-       status->detail = talloc_asprintf(status,
-                       _("Received config URL %s"), url);
+       status = talloc(handler, struct status);
+       status->type = STATUS_ERROR;
 
        if (!handler->network) {
                status->message = talloc_asprintf(handler,
@@ -1156,11 +1185,11 @@ void device_handler_process_url(struct device_handler *handler,
 
        talloc_unlink(handler, ctx);
 
-       status->type = BOOT_STATUS_INFO;
+       status->type = STATUS_INFO;
        status->message = talloc_asprintf(status, _("Config file %s parsed"),
                                        pb_url->file);
 msg:
-       device_handler_boot_status(handler, status);
+       device_handler_status(handler, status);
        talloc_free(status);
 }