Save memory by using a singly-linked list for extraction aliases

[wimlib] / include / wimlib / apply.h

diff --git a/include/wimlib/apply.h b/include/wimlib/apply.h
index 3d7873e7499fcc7c60e7b025159e56b8e2fa8972..ad21418ef5f92f6516914dff6c2ebeef5271c894 100644 (file)
--- a/include/wimlib/apply.h
+++ b/include/wimlib/apply.h
@@ -32,7 +32,7 @@ struct wim_features {
 };
 
 struct blob_descriptor;
-struct read_blob_list_callbacks;
+struct read_blob_callbacks;
 struct apply_operations;
 struct wim_dentry;
 
@@ -69,7 +69,7 @@ struct apply_ctx {
        unsigned long invalid_sequence;
        unsigned long num_blobs_remaining;
        struct list_head blob_list;
-       const struct read_blob_list_callbacks *saved_cbs;
+       const struct read_blob_callbacks *saved_cbs;
        struct blob_descriptor *cur_blob;
        u64 cur_blob_offset;
        struct filedes tmpfile_fd;
@@ -103,10 +103,10 @@ maybe_do_file_progress(struct apply_ctx *ctx, enum wimlib_progress_msg msg)
 }
 
 extern int
-start_file_structure_phase(struct apply_ctx *ctx, uint64_t end_file_count);
+start_file_structure_phase(struct apply_ctx *ctx, u64 end_file_count);
 
 extern int
-start_file_metadata_phase(struct apply_ctx *ctx, uint64_t end_file_count);
+start_file_metadata_phase(struct apply_ctx *ctx, u64 end_file_count);
 
 /* Report that a file was created, prior to blob extraction.  */
 static inline int
@@ -134,14 +134,16 @@ report_apply_error(struct apply_ctx *ctx, int error_code, const tchar *path)
        return report_error(ctx->progfunc, ctx->progctx, error_code, path);
 }
 
-/* Returns any of the aliases of an inode that are being extracted.  */
-#define inode_first_extraction_dentry(inode)           \
-       list_first_entry(&(inode)->i_extraction_aliases,        \
-                        struct wim_dentry, d_extraction_alias_node)
+#define inode_first_extraction_dentry(inode)                           \
+       ((inode)->i_first_extraction_alias)
+
+#define inode_for_each_extraction_alias(dentry, inode)                 \
+       for (dentry = inode_first_extraction_dentry(inode);             \
+            dentry != NULL;                                            \
+            dentry = dentry->d_next_extraction_alias)
 
 extern int
-extract_blob_list(struct apply_ctx *ctx,
-                   const struct read_blob_list_callbacks *cbs);
+extract_blob_list(struct apply_ctx *ctx, const struct read_blob_callbacks *cbs);
 
 /*
  * Represents an extraction backend.
@@ -200,10 +202,9 @@ struct apply_operations {
         * TODO: really, the extraction backends should be responsible for
         * generating 'd_extraction_name'.
         *
-        * Each dentry will refer to a valid inode in 'd_inode'.
-        * 'd_inode->i_extraction_aliases' will contain a list of just the
-        * dentries of that inode being extracted.  This will be a (possibly
-        * nonproper) subset of the 'd_inode->i_dentry' list.
+        * Each dentry will refer to a valid inode in 'd_inode'.  Each inode
+        * will contain a list of dentries of that inode being extracted; this
+        * list may be shorter than the inode's full dentry list.
         *
         * The blobs required to be extracted will already be prepared in
         * 'apply_ctx'.  The extraction backend should call extract_blob_list()