Changeset bb4d0b5 in mainline for uspace/app

Timestamp:

2025-10-18T19:29:40Z (2 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

3e41cc4

Parents:

856a7b49

Message:

Allow user to decide whether to retry or abort when I/O error occurs.

Location:

uspace/app

Files:

• nav/dlg/ioerrdlg.c (added)
• nav/dlg/ioerrdlg.h (added)
• nav/dlg/newfiledlg.c (modified) (6 diffs)
• nav/meson.build (modified) (2 diffs)
• nav/nav.c (modified) (5 diffs)
• nav/nav.h (modified) (2 diffs)
• nav/newfile.c (modified) (1 diff)
• nav/types/dlg/ioerrdlg.h (added)
• nav/types/nav.h (modified) (2 diffs)
• newfile/newfile.c (modified) (5 diffs)

uspace/app/nav/dlg/newfiledlg.c

@@ -352 +352 @@
 }
 
-/** Destroy prompt dialog.
- *
- * @param dialog Prompt dialog or @c NULL
+/** Destroy new file dialog.
+ *
+ * @param dialog New file dialog or @c NULL
  */
 void new_file_dlg_destroy(new_file_dlg_t *dialog)
@@ -365 +365 @@
 }
 
-/** Set mesage dialog callback.
- *
- * @param dialog Prompt dialog
- * @param cb Prompt dialog callbacks
+/** Set new file dialog callback.
+ *
+ * @param dialog new file dialog
+ * @param cb New file dialog callbacks
  * @param arg Callback argument
  */
@@ -378 +378 @@
 }
 
-/** Prompt dialog window close handler.
+/** New file dialog window close handler.
  *
  * @param window Window
@@ -393 +393 @@
 }
 
-/** Prompt dialog window keyboard event handler.
+/** New file dialog window keyboard event handler.
  *
  * @param window Window
@@ -432 +432 @@
 }
 
-/** Prompt dialog OK button click handler.
+/** New file dialog OK button click handler.
  *
  * @param pbutton Push button
@@ -452 +452 @@
 }
 
-/** Prompt dialog cancel button click handler.
+/** New file dialog cancel button click handler.
  *
  * @param pbutton Push button

uspace/app/nav/meson.build

@@ -29 +29 @@
 deps = [ 'fmgt', 'ui' ]
 src = files(
+        'dlg/ioerrdlg.c',
         'dlg/newfiledlg.c',
         'dlg/progress.c',
@@ -39 +40 @@
 
 test_src = files(
+        'dlg/ioerrdlg.c',
         'dlg/newfiledlg.c',
         'dlg/progress.c',

uspace/app/nav/nav.c

@@ -36 +36 @@
 
 #include <fibril.h>
+#include <fmgt.h>
 #include <gfx/coord.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <str.h>
+#include <str_error.h>
 #include <task.h>
 #include <ui/fixed.h>
@@ -46 +48 @@
 #include <ui/ui.h>
 #include <ui/window.h>
+#include "dlg/ioerrdlg.h"
 #include "menu.h"
 #include "newfile.h"
@@ -87 +90 @@
         .babort = navigator_progress_babort,
         .close = navigator_progress_close
+};
+
+static void navigator_io_err_abort(io_err_dlg_t *, void *);
+static void navigator_io_err_retry(io_err_dlg_t *, void *);
+static void navigator_io_err_close(io_err_dlg_t *, void *);
+
+static io_err_dlg_cb_t navigator_io_err_dlg_cb = {
+        .babort = navigator_io_err_abort,
+        .bretry = navigator_io_err_retry,
+        .close = navigator_io_err_close
 };
 
@@ -244 +257 @@
         }
 
+        fibril_mutex_initialize(&navigator->io_err_act_lock);
+        fibril_condvar_initialize(&navigator->io_err_act_cv);
+        navigator->io_err_act_sel = false;
+
         *rnavigator = navigator;
         return EOK;
@@ -630 +647 @@
 }
 
+/** Called by fmgt to query for I/O error recovery action.
+ *
+ * @param arg Argument (navigator_t *)
+ * @param err I/O error report
+ * @return Recovery action to take.
+ */
+fmgt_error_action_t navigator_io_error_query(void *arg, fmgt_io_error_t *err)
+{
+        navigator_t *nav = (navigator_t *)arg;
+        io_err_dlg_t *dlg;
+        io_err_dlg_params_t params;
+        fmgt_error_action_t err_act;
+        char *text1;
+        errno_t rc;
+        int rv;
+
+        io_err_dlg_params_init(&params);
+        rv = asprintf(&text1, err->optype == fmgt_io_write ?
+            "Error writing file %s." : "Error reading file %s.",
+            err->fname);
+        if (rv < 0)
+                return fmgt_er_abort;
+
+        params.text1 = text1;
+        params.text2 = str_error(err->rc);
+
+        ui_lock(nav->ui);
+        rc = io_err_dlg_create(nav->ui, &params, &dlg);
+        if (rc != EOK) {
+                ui_unlock(nav->ui);
+                free(text1);
+                return fmgt_er_abort;
+        }
+
+        io_err_dlg_set_cb(dlg, &navigator_io_err_dlg_cb, (void *)nav);
+
+        ui_unlock(nav->ui);
+        free(text1);
+
+        fibril_mutex_lock(&nav->io_err_act_lock);
+
+        while (!nav->io_err_act_sel) {
+                fibril_condvar_wait(&nav->io_err_act_cv,
+                    &nav->io_err_act_lock);
+        }
+
+        err_act = nav->io_err_act;
+        nav->io_err_act_sel = false;
+        fibril_mutex_unlock(&nav->io_err_act_lock);
+
+        return err_act;
+}
+
+/** I/O error dialog abort button was pressed.
+ *
+ * @param dlg I/O error dialog
+ * @param arg Argument (navigator_t *)
+ */
+static void navigator_io_err_abort(io_err_dlg_t *dlg, void *arg)
+{
+        navigator_t *nav = (navigator_t *)arg;
+
+        io_err_dlg_destroy(dlg);
+
+        fibril_mutex_lock(&nav->io_err_act_lock);
+        nav->io_err_act = fmgt_er_abort;
+        nav->io_err_act_sel = true;
+        fibril_condvar_signal(&nav->io_err_act_cv);
+        fibril_mutex_unlock(&nav->io_err_act_lock);
+}
+
+/** I/O error dialog retry button was pressed.
+ *
+ * @param dlg I/O error dialog
+ * @param arg Argument (navigator_t *)
+ */
+static void navigator_io_err_retry(io_err_dlg_t *dlg, void *arg)
+{
+        navigator_t *nav = (navigator_t *)arg;
+
+        io_err_dlg_destroy(dlg);
+
+        fibril_mutex_lock(&nav->io_err_act_lock);
+        nav->io_err_act = fmgt_er_retry;
+        nav->io_err_act_sel = true;
+        fibril_condvar_signal(&nav->io_err_act_cv);
+        fibril_mutex_unlock(&nav->io_err_act_lock);
+}
+
+/** I/O error dialog closure requested.
+ *
+ * @param dlg I/O error dialog
+ * @param arg Argument (navigator_t *)
+ */
+static void navigator_io_err_close(io_err_dlg_t *dlg, void *arg)
+{
+        navigator_t *nav = (navigator_t *)arg;
+
+        io_err_dlg_destroy(dlg);
+
+        fibril_mutex_lock(&nav->io_err_act_lock);
+        nav->io_err_act = fmgt_er_abort;
+        nav->io_err_act_sel = true;
+        fibril_condvar_signal(&nav->io_err_act_cv);
+        fibril_mutex_unlock(&nav->io_err_act_lock);
+}
+
 /** @}
  */

uspace/app/nav/nav.h

@@ -38 +38 @@
 
 #include <errno.h>
+#include <fmgt.h>
 #include "types/dlg/progress.h"
 #include "types/nav.h"
@@ -52 +53 @@
 extern errno_t navigator_worker_start(navigator_t *, void (*)(void *),
     void *);
+extern fmgt_error_action_t navigator_io_error_query(void *, fmgt_io_error_t *);
 
 #endif

uspace/app/nav/newfile.c

@@ -69 +69 @@
 static fmgt_cb_t new_file_fmgt_cb = {
         .abort_query = new_file_abort_query,
+        .io_error_query = navigator_io_error_query,
         .progress = new_file_progress,
 };

uspace/app/nav/types/nav.h

@@ -38 +38 @@
 
 #include <fibril.h>
+#include <fmgt.h>
 #include <stdbool.h>
 #include <ui/fixed.h>
@@ -65 +66 @@
         /** Abort current file management operation */
         bool abort_op;
+
+        /** @c true if user selected I/O error recovery action */
+        bool io_err_act_sel;
+        /** Selected I/O error recovery action */
+        fmgt_error_action_t io_err_act;
+        /** Signalled when user selects I/O error recovery action */
+        fibril_condvar_t io_err_act_cv;
+        /** Synchronizes access to I/O error recovery action */
+        fibril_mutex_t io_err_act_lock;
 } navigator_t;
 

uspace/app/newfile/newfile.c

@@ -49 +49 @@
 static bool newfile_abort_query(void *);
 static void newfile_progress(void *, fmgt_progress_t *);
+static fmgt_error_action_t newfile_io_error_query(void *, fmgt_io_error_t *);
 
 static bool prog_upd = false;
+static bool nonint = false;
 static bool quiet = false;
 
@@ -57 +59 @@
 static fmgt_cb_t newfile_fmgt_cb = {
         .abort_query = newfile_abort_query,
-        .progress = newfile_progress
+        .io_error_query = newfile_io_error_query,
+        .progress = newfile_progress,
 };
 
@@ -121 +124 @@
 }
 
+/** Called by fmgt to let user choose I/O error recovery action.
+ *
+ * @param arg Argument (not used)
+ * @param err I/O error report
+ * @return Error recovery action.
+ */
+static fmgt_error_action_t newfile_io_error_query(void *arg,
+    fmgt_io_error_t *err)
+{
+        cons_event_t event;
+        kbd_event_t *ev;
+        errno_t rc;
+
+        (void)arg;
+
+        if (nonint)
+                return fmgt_er_abort;
+
+        if (prog_upd)
+                putchar('\n');
+
+        fprintf(stderr, "I/O error %s file '%s' (%s).\n",
+            err->optype == fmgt_io_write ? "writing" : "reading",
+            err->fname, str_error(err->rc));
+        fprintf(stderr, "[A]bort or [R]etry?\n");
+
+        if (con == NULL)
+                return fmgt_er_abort;
+
+        while (true) {
+                rc = console_get_event(con, &event);
+                if (rc != EOK)
+                        return fmgt_er_abort;
+
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS) {
+                        ev = &event.ev.key;
+                        if ((ev->mods & KM_ALT) == 0 &&
+                            (ev->mods & KM_CTRL) == 0) {
+                                if (ev->c == 'r' || ev->c == 'R')
+                                        return fmgt_er_retry;
+                                if (ev->c == 'a' || ev->c == 'A')
+                                        return fmgt_er_abort;
+                        }
+                }
+
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS) {
+                        ev = &event.ev.key;
+                        if ((ev->mods & KM_ALT) == 0 &&
+                            (ev->mods & KM_SHIFT) == 0 &&
+                            (ev->mods & KM_CTRL) != 0) {
+                                if (ev->key == KC_C)
+                                        return fmgt_er_abort;
+                        }
+                }
+        }
+}
+
 int main(int argc, char *argv[])
 {
@@ -126 +186 @@
         errno_t rc;
         int i;
-        bool nonint = false;
         bool sparse = false;
         char *fsize = NULL;
@@ -210 +269 @@
         rc = fmgt_new_file(fmgt, fname, nbytes, sparse ? nf_sparse : nf_none);
         if (prog_upd)
-                printf("\n");
+                putchar('\n');
         if (rc != EOK) {
                 printf("Error creating file: %s.\n", str_error(rc));