discover-client: interact directly with waitset

[petitboot] / ui / ncurses / nc-cui.c

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 51c14720dd760b1effc0bdca1600824eba095611..6ef43ee89afa62150004c8ce96a64af1bfbad077 100644 (file)
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -70,19 +70,19 @@ static char *cui_make_item_name(struct pmenu_item *i, struct cui_opt_data *cod)
        char *name;
 
        assert(cod->name);
-       assert(cod->kd);
+       assert(cod->bd);
 
        name = talloc_asprintf(i, "%s:", cod->name);
 
-       if (cod->kd->image)
-               name = talloc_asprintf_append(name, " %s", cod->kd->image);
+       if (cod->bd->image)
+               name = talloc_asprintf_append(name, " %s", cod->bd->image);
 
-       if (cod->kd->initrd)
+       if (cod->bd->initrd)
                name = talloc_asprintf_append(name, " initrd=%s",
-                       cod->kd->initrd);
+                       cod->bd->initrd);
 
-       if (cod->kd->args)
-               name = talloc_asprintf_append(name, " %s", cod->kd->args);
+       if (cod->bd->args)
+               name = talloc_asprintf_append(name, " %s", cod->bd->args);
 
        DBGS("@%s@\n", name);
        return name;
@@ -125,24 +125,24 @@ int cui_run_cmd(struct pmenu_item *item)
 }
 
 /**
- * cui_run_kexec - A generic cb to run kexec.
+ * cui_boot - A generic cb to run kexec.
  */
 
-static int cui_run_kexec(struct pmenu_item *item)
+static int cui_boot(struct pmenu_item *item)
 {
        int result;
        struct cui *cui = cui_from_item(item);
        struct cui_opt_data *cod = cod_from_item(item);
 
        assert(cui->current == &cui->main->scr);
-       assert(cui->on_kexec);
+       assert(cui->on_boot);
 
        pb_log("%s: %s\n", __func__, cod->name);
        nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
 
        def_prog_mode();
 
-       result = cui->on_kexec(cui, cod);
+       result = cui->on_boot(cui, cod);
 
        reset_prog_mode();
        redrawwin(cui->current->main_ncw);
@@ -154,8 +154,8 @@ static int cui_run_kexec(struct pmenu_item *item)
                sleep(cui->dry_run ? 1 : 60);
        }
 
-       pb_log("%s: failed: %s\n", __func__, cod->kd->image);
-       nc_scr_status_printf(cui->current, "Failed: kexec %s", cod->kd->image);
+       pb_log("%s: failed: %s\n", __func__, cod->bd->image);
+       nc_scr_status_printf(cui->current, "Failed: kexec %s", cod->bd->image);
 
        return 0;
 }
@@ -165,7 +165,7 @@ static int cui_run_kexec(struct pmenu_item *item)
  */
 
 static void cui_boot_editor_on_exit(struct boot_editor *boot_editor, enum boot_editor_result boot_editor_result,
-       struct pb_kexec_data *kd)
+       struct pb_boot_data *bd)
 {
        struct cui *cui = cui_from_arg(boot_editor->scr.ui_ctx);
 
@@ -174,11 +174,11 @@ static void cui_boot_editor_on_exit(struct boot_editor *boot_editor, enum boot_e
                struct cui_opt_data *cod = cod_from_item(i);
                char *name;
 
-               assert(kd);
+               assert(bd);
 
-               talloc_steal(i, kd);
-               talloc_free(cod->kd);
-               cod->kd = kd;
+               talloc_steal(i, bd);
+               talloc_free(cod->bd);
+               cod->bd = bd;
 
                name = cui_make_item_name(i, cod);
                pmenu_item_replace(i, name);
@@ -187,9 +187,9 @@ static void cui_boot_editor_on_exit(struct boot_editor *boot_editor, enum boot_e
                set_current_item(cui->main->ncm, i->nci);
 
                pb_log("%s: updating opt '%s'\n", __func__, cod->name);
-               pb_log(" image  '%s'\n", cod->kd->image);
-               pb_log(" initrd '%s'\n", cod->kd->initrd);
-               pb_log(" args   '%s'\n", cod->kd->args);
+               pb_log(" image  '%s'\n", cod->bd->image);
+               pb_log(" initrd '%s'\n", cod->bd->initrd);
+               pb_log(" args   '%s'\n", cod->bd->args);
        }
 
        cui_set_current(cui, &cui->main->scr);
@@ -203,7 +203,7 @@ int cui_boot_editor_run(struct pmenu_item *item)
        struct cui_opt_data *cod = cod_from_item(item);
        struct boot_editor *boot_editor;
 
-       boot_editor = boot_editor_init(cui, cod->kd, cui_boot_editor_on_exit);
+       boot_editor = boot_editor_init(cui, cod->bd, cui_boot_editor_on_exit);
        cui_set_current(cui, &boot_editor->scr);
 
        return 0;
@@ -264,17 +264,6 @@ static int cui_process_js(void *arg)
 
        return 0;
 }
-/**
- * cui_client_process_socket - Process a socket event from the discover server.
- */
-
-static int cui_client_process_socket(void *arg)
-{
-       struct discover_client *client = arg;
-
-       discover_client_process(client);
-       return 0;
-}
 
 /**
  * cui_handle_timeout - Handle the timeout.
@@ -341,11 +330,11 @@ void cui_on_open(struct pmenu *menu)
        i = pmenu_item_alloc(menu);
 
        i->on_edit = cui_boot_editor_run;
-       i->on_execute = cui_run_kexec;
+       i->on_execute = cui_boot;
        i->data = cod = talloc_zero(i, struct cui_opt_data);
 
        cod->name = talloc_asprintf(i, "User item %u:", insert_pt);
-       cod->kd = talloc_zero(i, struct pb_kexec_data);
+       cod->bd = talloc_zero(i, struct pb_boot_data);
 
        pmenu_item_setup(menu, i, insert_pt, talloc_strdup(i, cod->name));
 
@@ -407,18 +396,18 @@ static int cui_device_add(struct device *dev, void *arg)
                opt->ui_info = i = pmenu_item_alloc(cui->main);
 
                i->on_edit = cui_boot_editor_run;
-               i->on_execute = cui_run_kexec;
+               i->on_execute = cui_boot;
                i->data = cod = talloc(i, struct cui_opt_data);
 
                cod->dev = dev;
                cod->opt = opt;
                cod->opt_hash = pb_opt_hash(dev, opt);
                cod->name = opt->name;
-               cod->kd = talloc(i, struct pb_kexec_data);
+               cod->bd = talloc(i, struct pb_boot_data);
 
-               cod->kd->image = talloc_strdup(cod->kd, opt->boot_image_file);
-               cod->kd->initrd = talloc_strdup(cod->kd, opt->initrd_file);
-               cod->kd->args = talloc_strdup(cod->kd, opt->boot_args);
+               cod->bd->image = talloc_strdup(cod->bd, opt->boot_image_file);
+               cod->bd->initrd = talloc_strdup(cod->bd, opt->initrd_file);
+               cod->bd->args = talloc_strdup(cod->bd, opt->boot_args);
 
                name = cui_make_item_name(i, cod);
                pmenu_item_setup(cui->main, i, insert_pt, name);
@@ -426,9 +415,9 @@ static int cui_device_add(struct device *dev, void *arg)
                insert_pt++;
 
                pb_log("%s: adding opt '%s'\n", __func__, cod->name);
-               pb_log("   image  '%s'\n", cod->kd->image);
-               pb_log("   initrd '%s'\n", cod->kd->initrd);
-               pb_log("   args   '%s'\n", cod->kd->args);
+               pb_log("   image  '%s'\n", cod->bd->image);
+               pb_log("   initrd '%s'\n", cod->bd->initrd);
+               pb_log("   args   '%s'\n", cod->bd->args);
 
                /* If this is the default_item select it and start timer. */
 
@@ -533,7 +522,7 @@ static struct discover_client_ops cui_client_ops = {
  */
 
 struct cui *cui_init(void* platform_info,
-       int (*on_kexec)(struct cui *, struct cui_opt_data *),
+       int (*on_boot)(struct cui *, struct cui_opt_data *),
        int (*js_map)(const struct js_event *e), int start_deamon, int dry_run)
 {
        struct cui *cui;
@@ -550,7 +539,7 @@ struct cui *cui_init(void* platform_info,
 
        cui->c_sig = pb_cui_sig;
        cui->platform_info = platform_info;
-       cui->on_kexec = on_kexec;
+       cui->on_boot = on_boot;
        cui->timer.handle_timeout = cui_handle_timeout;
        cui->dry_run = dry_run;
        cui->waitset = waitset_create(cui);
@@ -559,7 +548,8 @@ struct cui *cui_init(void* platform_info,
 
 retry_start:
        for (i = start_deamon ? 2 : 10; i; i--) {
-               client = discover_client_init(&cui_client_ops, cui);
+               client = discover_client_init(cui->waitset,
+                               &cui_client_ops, cui);
                if (client || !i)
                        break;
                pb_log("%s: waiting for server %d\n", __func__, i);
@@ -596,9 +586,6 @@ retry_start:
        atexit(nc_atexit);
        nc_start();
 
-       waiter_register(cui->waitset, discover_client_get_fd(client), WAIT_IN,
-                       cui_client_process_socket, client);
-
        waiter_register(cui->waitset, STDIN_FILENO, WAIT_IN,
                        cui_process_key, cui);