Fix sequential extraction, and include progress info

[wimlib] / src / dentry.h

diff --git a/src/dentry.h b/src/dentry.h
index 1e8724cbc973e9665b24321a1297f96aeaa10f69..2e2ba8bf23d128529a4b5b2702f76cdfc539f87a 100644 (file)
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -8,6 +8,10 @@
 #include "rbtree.h"
 #include <string.h>
 
+#ifdef WITH_FUSE
+#include <pthread.h>
+#endif
+
 struct stat;
 struct lookup_table;
 struct WIMStruct;
@@ -128,14 +132,49 @@ static inline bool ads_entries_have_same_name(const struct ads_entry *entry_1,
  * hardlink.c).
  */
 struct dentry {
+       /* Byte 0 */
+
        /* The inode for this dentry */
        struct inode *d_inode;
 
-       /* The parent of this directory entry. */
-       struct dentry *parent;
+       /* Byte 8 */
 
+       /* Red-black tree of sibling dentries */
        struct rb_node rb_node;
 
+       /* Byte 32 */
+
+       /* Length of short filename, in bytes, not including the terminating
+        * zero wide-character. */
+       u16 short_name_len;
+
+       /* Length of file name, in bytes, not including the terminating zero
+        * wide-character. */
+       u16 file_name_len;
+
+       /* Length of the filename converted into UTF-8, in bytes, not including
+        * the terminating zero byte. */
+       u16 file_name_utf8_len;
+
+       u8 is_extracted : 1;
+
+       /* Byte 40 */
+
+       /* Pointer to the filename converted to UTF-8 (malloc()ed buffer). */
+       char *file_name_utf8;
+
+       /* Byte 48 */
+
+       struct list_head tmp_list;
+
+       /* Byte 64 */
+
+       /* List of dentries in the inode (hard link set)  */
+       struct list_head inode_dentry_list;
+
+       /* The parent of this directory entry. */
+       struct dentry *parent;
+
        /*
         * Size of directory entry on disk, in bytes.  Typical size is around
         * 104 to 120 bytes.
@@ -156,48 +195,27 @@ struct dentry {
         */
        u64 length;
 
+
        /* The offset, from the start of the uncompressed WIM metadata resource
         * for this image, of this dentry's child dentries.  0 if the directory
         * entry has no children, which is the case for regular files or reparse
         * points. */
        u64 subdir_offset;
 
-       /* Length of short filename, in bytes, not including the terminating
-        * zero wide-character. */
-       u16 short_name_len;
-
-       /* Length of file name, in bytes, not including the terminating zero
-        * wide-character. */
-       u16 file_name_len;
+       /* Number of references to the dentry tree itself, as in multiple
+        * WIMStructs */
+       u32 refcnt;
 
-       /* Length of the filename converted into UTF-8, in bytes, not including
-        * the terminating zero byte. */
-       u16 file_name_utf8_len;
+       u32   full_path_utf8_len;
 
-       /* Pointer to the short filename (malloc()ed buffer) */
+       /* Pointer to the UTF-16 short filename (malloc()ed buffer) */
        char *short_name;
 
-       /* Pointer to the filename (malloc()ed buffer). */
+       /* Pointer to the UTF-16 filename (malloc()ed buffer). */
        char *file_name;
 
-       /* Pointer to the filename converted to UTF-8 (malloc()ed buffer). */
-       char *file_name_utf8;
-
-       /* Full path to this dentry (malloc()ed buffer). */
+       /* Full path (UTF-8) to this dentry (malloc()ed buffer). */
        char *full_path_utf8;
-       u32   full_path_utf8_len;
-
-       /* Number of references to the dentry tree itself, as in multiple
-        * WIMStructs */
-       u32 refcnt;
-
-       /* List of dentries in the inode (hard link set)  */
-       struct list_head inode_dentry_list;
-
-       union {
-               struct list_head tmp_list;
-               bool is_extracted;
-       };
 };
 
 #define rbnode_dentry(node) container_of(node, struct dentry, rb_node)
@@ -234,6 +252,9 @@ struct inode {
        /* %true iff verify_inode() has run on this dentry. */
        u8 verified : 1;
 
+       /* temporary flag */
+       u8 found    : 1;
+
        /* Number of alternate data streams associated with this inode */
        u16 num_ads;
 
@@ -281,6 +302,11 @@ struct inode {
 
        /* Next alternate data stream ID to be assigned */
        u32 next_stream_id;
+
+       /* This mutex protects the inode's file descriptors table during
+        * read-only mounts.  Read-write mounts are still restricted to 1
+        * thread. */
+       pthread_mutex_t i_mutex;
 #endif
 };
 
@@ -307,7 +333,6 @@ static inline bool dentry_is_first_in_inode(const struct dentry *dentry)
 
 extern u64 dentry_correct_total_length(const struct dentry *dentry);
 
-extern void stbuf_to_inode(const struct stat *stbuf, struct inode *inode);
 extern int inode_to_stbuf(const struct inode *inode,
                          struct lookup_table_entry *lte, struct stat *stbuf);
 
@@ -355,9 +380,6 @@ extern void unlink_dentry(struct dentry *dentry);
 extern bool dentry_add_child(struct dentry * restrict parent,
                             struct dentry * restrict child);
 
-// XXX
-#define link_dentry(child, parent) dentry_add_child(parent, child)
-
 extern int verify_dentry(struct dentry *dentry, void *wim);