Changeset bb4d0b5 in mainline for uspace/lib

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/lib/fmgt

Files:

• include/types/fmgt.h (modified) (2 diffs)
• src/fmgt.c (modified) (5 diffs)

uspace/lib/fmgt/include/types/fmgt.h

@@ -39 +39 @@
 
 #include <capa.h>
+#include <errno.h>
 #include <fibril_synch.h>
 #include <stdbool.h>
@@ -52 +53 @@
 } fmgt_progress_t;
 
+/** File management I/O operation type */
+typedef enum {
+        /** Read */
+        fmgt_io_read,
+        /** Write */
+        fmgt_io_write
+} fmgt_io_op_type_t;
+
+/** File management I/O error report */
+typedef struct {
+        /** File name */
+        const char *fname;
+        /** Operation type */
+        fmgt_io_op_type_t optype;
+        /** Error code */
+        errno_t rc;
+} fmgt_io_error_t;
+
+/** File management I/O error recovery action */
+typedef enum {
+        /** Retry */
+        fmgt_er_retry,
+        /** Abort */
+        fmgt_er_abort
+} fmgt_error_action_t;
+
 /** File management callbacks */
 typedef struct {
         bool (*abort_query)(void *);
+        fmgt_error_action_t (*io_error_query)(void *, fmgt_io_error_t *);
         void (*progress)(void *, fmgt_progress_t *);
 } fmgt_cb_t;

uspace/lib/fmgt/src/fmgt.c

@@ -221 +221 @@
 }
 
+/** Stop progress update timer.
+ *
+ * @param fmgt File management object
+ */
+static void fmgt_timer_stop(fmgt_t *fmgt)
+{
+        (void)fibril_timer_clear(fmgt->timer);
+}
+
 /** Query caller whether operation should be aborted.
  *
@@ -232 +241 @@
         else
                 return false;
+}
+
+/** Query caller how to recover from I/O error.
+ *
+ * @param fmgt File management object
+ * @param err I/O error report
+ * @return What error recovery action should be taken.
+ */
+static fmgt_error_action_t fmgt_io_error_query(fmgt_t *fmgt,
+    fmgt_io_error_t *err)
+{
+        if (fmgt->cb != NULL && fmgt->cb->io_error_query != NULL)
+                return fmgt->cb->io_error_query(fmgt->cb_arg, err);
+        else
+                return fmgt_er_abort;
 }
 
@@ -250 +274 @@
         uint64_t now;
         char *buffer;
+        fmgt_io_error_t err;
+        fmgt_error_action_t action;
         errno_t rc;
 
@@ -270 +296 @@
         fmgt_initial_progress_update(fmgt);
 
+        /* Create sparse file? */
         if ((flags & nf_sparse) != 0) {
                 fmgt->curf_procb = fsize - 1;
@@ -280 +307 @@
                         now = BUFFER_SIZE;
 
-                rc = vfs_write(fd, &pos, buffer, now, &nw);
+                do {
+                        rc = vfs_write(fd, &pos, buffer, now, &nw);
+                        if (rc == EOK)
+                                break;
+
+                        /* I/O error */
+                        err.fname = fname;
+                        err.optype = fmgt_io_write;
+                        err.rc = rc;
+                        fmgt_timer_stop(fmgt);
+                        action = fmgt_io_error_query(fmgt, &err);
+                        fmgt_timer_start(fmgt);
+                } while (action == fmgt_er_retry);
+
+                /* Not recovered? */
                 if (rc != EOK) {
                         free(buffer);