Changeset 1ec732a in mainline for uspace/lib/fmgt

Timestamp:

2025-11-28T20:40:11Z (3 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

144fafd

Parents:

3a4c6d9

Message:

Verify file - navigator operation and command-line utility.

Location:

uspace/lib/fmgt

Files:

• include/fmgt.h (modified) (1 diff)
• include/fmgt/flist.h (added)
• include/fmgt/newfile.h (modified) (1 diff)
• include/fmgt/verify.h (added)
• include/fmgt/walk.h (added)
• include/types/fmgt.h (modified) (4 diffs)
• meson.build (modified) (1 diff)
• private/fmgt.h (modified) (1 diff)
• src/flist.c (added)
• src/fmgt.c (modified) (2 diffs)
• src/newfile.c (modified) (3 diffs)
• src/verify.c (added)
• src/walk.c (added)

uspace/lib/fmgt/include/fmgt.h

@@ -42 +42 @@
 #include <stddef.h>
 #include <stdint.h>
+#include "fmgt/flist.h"
 #include "fmgt/newfile.h"
+#include "fmgt/verify.h"
 #include "types/fmgt.h"
 

uspace/lib/fmgt/include/fmgt/newfile.h

@@ -32 +32 @@
 /**
  * @file
- * @brief File management library - creating new files.
+ * @brief Create new files.
  */
 

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

@@ -38 +38 @@
 #define TYPES_FMGT_H
 
+#include <adt/list.h>
 #include <capa.h>
 #include <errno.h>
 #include <fibril_synch.h>
 #include <stdbool.h>
+
+#define FMGT_FILE_COUNT_BUFSIZE 16
 
 /** File management progress update */
@@ -51 +54 @@
         /** Percent of current file processed */
         char curf_percent[5];
+        /** Total number of bytes processed */
+        char total_procb[CAPA_BLOCKS_BUFSIZE];
+        /** Number of files processed */
+        char total_procf[FMGT_FILE_COUNT_BUFSIZE];
 } fmgt_progress_t;
 
@@ -101 +108 @@
         /** Progress was displayed for current file */
         bool curf_progr;
+        /** Total number of processed bytes */
+        uint64_t total_procb;
+        /** Total number of processed files */
+        unsigned total_procf;
         /** Post an immediate initial progress update */
         bool do_init_update;
 } fmgt_t;
 
-/** New file flags. */
+/** New file flags */
 typedef enum {
         nf_none = 0x0,
@@ -111 +122 @@
 } fmgt_nf_flags_t;
 
+/** File list */
+typedef struct {
+        /** List of fmgt_flist_entry_t */
+        list_t files;
+} fmgt_flist_t;
+
+/** File list entry */
+typedef struct {
+        /** Containing file list */
+        fmgt_flist_t *flist;
+        /** Link to flist->files */
+        link_t lfiles;
+        /** File name */
+        char *fname;
+} fmgt_flist_entry_t;
+
+/** File system tree walk callbacks */
+typedef struct {
+        errno_t (*dir_enter)(void *, const char *);
+        errno_t (*dir_leave)(void *, const char *);
+        errno_t (*file)(void *, const char *);
+} fmgt_walk_cb_t;
+
+/** File system tree walk parameters */
+typedef struct {
+        /** List of files or directories (walk roots) */
+        fmgt_flist_t *flist;
+        /** Callbacks */
+        fmgt_walk_cb_t *cb;
+        /** Callback argument */
+        void *arg;
+} fmgt_walk_params_t;
+
 #endif
 

uspace/lib/fmgt/meson.build

@@ -28 +28 @@
 
 src = files(
+        'src/flist.c',
         'src/fmgt.c',
-        'src/newfile.c'
+        'src/newfile.c',
+        'src/verify.c',
+        'src/walk.c'
 )
 

uspace/lib/fmgt/private/fmgt.h

@@ -47 +47 @@
 extern bool fmgt_abort_query(fmgt_t *);
 extern fmgt_error_action_t fmgt_io_error_query(fmgt_t *, fmgt_io_error_t *);
+extern void fmgt_progress_init(fmgt_t *);
+extern void fmgt_progress_init_file(fmgt_t *, const char *);
+extern void fmgt_progress_incr_bytes(fmgt_t *, uint64_t);
+extern void fmgt_progress_incr_files(fmgt_t *);
 extern void fmgt_initial_progress_update(fmgt_t *);
 extern void fmgt_final_progress_update(fmgt_t *);

uspace/lib/fmgt/src/fmgt.c

@@ -104 +104 @@
 }
 
+/** Initialize progress counters at beginning of operation.
+ *
+ * @param fmgt File management object
+ */
+void fmgt_progress_init(fmgt_t *fmgt)
+{
+        fmgt->total_procf = 0;
+        fmgt->total_procb = 0;
+
+        fmgt->curf_procb = 0;
+        fmgt->curf_totalb = 0;
+        fmgt->curf_progr = false;
+}
+
+/** Initialize progress counters at beginning of processing a file.
+ *
+ * @param fmgt File management object
+ * @param fname File name
+ */
+void fmgt_progress_init_file(fmgt_t *fmgt, const char *fname)
+{
+        vfs_stat_t stat;
+        errno_t rc;
+
+        fmgt->curf_procb = 0;
+        fmgt->curf_totalb = 0;
+
+        rc = vfs_stat_path(fname, &stat);
+        if (rc == EOK)
+                fmgt->curf_totalb = stat.size;
+}
+
+/** Increase count of processed bytes.
+ *
+ * @param fmgt File management object
+ * @param nbytes Number of newly processed bytes
+ */
+void fmgt_progress_incr_bytes(fmgt_t *fmgt, uint64_t nbytes)
+{
+        fmgt->curf_procb += nbytes;
+        fmgt->total_procb += nbytes;
+}
+
+/** Increase count of processed files.
+ *
+ * @parma fmgt File management object
+ */
+void fmgt_progress_incr_files(fmgt_t *fmgt)
+{
+        ++fmgt->total_procf;
+}
+
 /** Get progress update report.
  *
@@ -124 +176 @@
         snprintf(progress->curf_percent, sizeof(progress->curf_percent), "%u%%",
             percent);
+        snprintf(progress->total_procf, sizeof(progress->total_procf), "%u",
+            fmgt->total_procf);
+        capa_blocks_format_buf(fmgt->total_procb, 1, progress->total_procb,
+            sizeof(progress->total_procb));
 }
 

uspace/lib/fmgt/src/newfile.c

@@ -30 +30 @@
  * @{
  */
-/** @file File management library - creating new files.
+/** @file Create new files.
  */
 
@@ -109 +109 @@
         }
 
-        fmgt->curf_procb = 0;
-        fmgt->curf_totalb = fsize;
-        fmgt->curf_progr = false;
-        fmgt_timer_start(fmgt);
-
+        /* Clear statistics. */
+        fmgt_progress_init(fmgt);
         fmgt_initial_progress_update(fmgt);
 
@@ -149 +146 @@
                 }
 
-                fmgt->curf_procb += nw;
+                fmgt_progress_incr_bytes(fmgt, nw);
 
                 /* User requested abort? */