X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fdentry.h;h=0d3f89e3b0de54b4386ad7c18dfe62216d6cfc09;hb=82e0045e9a93baed16ca1fa1bbe5accfcf11cf6c;hp=86a1912da48b90f10433f41aa74ecbcae02c80f7;hpb=d0e7f039e4ab206b9fd973c983e3fb841fcd2bf2;p=wimlib diff --git a/src/dentry.h b/src/dentry.h index 86a1912d..0d3f89e3 100644 --- a/src/dentry.h +++ b/src/dentry.h @@ -5,8 +5,13 @@ #include "config.h" #include "list.h" #include "sha1.h" +#include "rbtree.h" #include +#ifdef WITH_FUSE +#include +#endif + struct stat; struct lookup_table; struct WIMStruct; @@ -127,16 +132,51 @@ 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; + /* 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; + u8 visited : 1; + u8 canonical : 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; - /* Linked list of sibling directory entries. */ - struct dentry *next; - struct dentry *prev; - /* * Size of directory entry on disk, in bytes. Typical size is around * 104 to 120 bytes. @@ -163,44 +203,24 @@ struct dentry { * points. */ u64 subdir_offset; - /* Length of short filename, in bytes, not including the terminating - * zero wide-character. */ - u16 short_name_len; + /* Number of references to the dentry tree itself, as in multiple + * WIMStructs */ + u32 refcnt; - /* Length of file name, in bytes, not including the terminating zero - * wide-character. */ - u16 file_name_len; + u32 full_path_utf8_len; - /* Length of the filename converted into UTF-8, in bytes, not including - * the terminating zero byte. */ - u16 file_name_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) + /* * WIM inode. * @@ -233,6 +253,9 @@ struct inode { /* %true iff verify_inode() has run on this dentry. */ u8 verified : 1; + /* temporary flag */ + u8 visited : 1; + /* Number of alternate data streams associated with this inode */ u16 num_ads; @@ -264,12 +287,17 @@ struct inode { /* List of dentries that reference this inode (there should be * link_count of them) */ struct list_head dentry_list; + struct hlist_node hlist; + + struct list_head lte_inode_list; + char *extracted_file; - /* If non-NULL, the children of this inode (implies the inode is a - * directory) */ - struct dentry *children; + /* Root of a red-black tree storing the children of this inode (if + * non-empty, implies the inode is a directory, although that is also + * noted in the @attributes field.) */ + struct rb_root children; #ifdef WITH_FUSE /* wimfs file descriptors table for the inode */ @@ -279,6 +307,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 }; @@ -286,15 +319,7 @@ struct inode { list_for_each_entry((dentry), &(inode)->dentry_list, inode_dentry_list) #define inode_add_dentry(dentry, inode) \ - ({ \ - wimlib_assert((inode)->dentry_list.next != NULL); \ - list_add(&(dentry)->inode_dentry_list, &(inode)->dentry_list); \ - }) - -static inline bool dentry_is_extracted(const struct dentry *dentry) -{ - return dentry->is_extracted; -} + list_add_tail(&(dentry)->inode_dentry_list, &(inode)->dentry_list) static inline bool dentry_is_first_in_inode(const struct dentry *dentry) { @@ -305,14 +330,14 @@ 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); - extern int for_dentry_in_tree(struct dentry *root, int (*visitor)(struct dentry*, void*), void *args); +extern int for_dentry_in_rbtree(struct rb_node *node, + int (*visitor)(struct dentry *, void *), + void *arg); + extern int for_dentry_in_tree_depth(struct dentry *root, int (*visitor)(struct dentry*, void*), void *args); @@ -333,7 +358,10 @@ extern struct dentry *get_parent_dentry(struct WIMStruct *w, const char *path); extern int print_dentry(struct dentry *dentry, void *lookup_table); extern int print_dentry_full_path(struct dentry *entry, void *ignore); +#ifdef WITH_FUSE extern struct dentry *new_dentry(const char *name); +#endif + extern struct dentry *new_dentry_with_inode(const char *name); extern struct dentry *new_dentry_with_timeless_inode(const char *name); @@ -346,10 +374,8 @@ extern void free_dentry_tree(struct dentry *root, extern int increment_dentry_refcnt(struct dentry *dentry, void *ignore); extern void unlink_dentry(struct dentry *dentry); -extern void link_dentry(struct dentry *dentry, struct dentry *parent); - -extern int verify_dentry(struct dentry *dentry, void *wim); - +extern bool dentry_add_child(struct dentry * restrict parent, + struct dentry * restrict child); extern struct ads_entry *inode_get_ads_entry(struct inode *inode, const char *stream_name, @@ -374,16 +400,6 @@ static inline bool dentry_is_root(const struct dentry *dentry) return dentry->parent == dentry; } -static inline bool dentry_is_first_sibling(const struct dentry *dentry) -{ - return dentry_is_root(dentry) || dentry->parent->d_inode->children == dentry; -} - -static inline bool dentry_is_only_child(const struct dentry *dentry) -{ - return dentry->next == dentry; -} - static inline bool inode_is_directory(const struct inode *inode) { return (inode->attributes & FILE_ATTRIBUTE_DIRECTORY) @@ -404,11 +420,6 @@ static inline bool inode_is_symlink(const struct inode *inode) inode->reparse_tag == WIM_IO_REPARSE_TAG_MOUNT_POINT); } -static inline bool dentry_is_symlink(const struct dentry *dentry) -{ - return inode_is_symlink(dentry->d_inode); -} - static inline bool inode_is_regular_file(const struct inode *inode) { return !inode_is_directory(inode) && !inode_is_symlink(inode); @@ -419,9 +430,15 @@ static inline bool dentry_is_regular_file(const struct dentry *dentry) return inode_is_regular_file(dentry->d_inode); } +static inline bool inode_has_children(const struct inode *inode) +{ + return inode->children.rb_node != NULL; +} + static inline bool dentry_is_empty_directory(const struct dentry *dentry) { - return dentry_is_directory(dentry) && dentry->d_inode->children == NULL; + const struct inode *inode = dentry->d_inode; + return inode_is_directory(inode) && !inode_has_children(inode); } #endif