X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fdentry.h;h=1e8724cbc973e9665b24321a1297f96aeaa10f69;hp=cb534453abc1b8332dd27f887ee9e47eef48009e;hb=d5b841b4d3243c7c6922d9254fb4e5b9f0b58d41;hpb=140c0920af14b19292e8b7694bb91864c8f52f3c diff --git a/src/dentry.h b/src/dentry.h index cb534453..1e8724cb 100644 --- a/src/dentry.h +++ b/src/dentry.h @@ -5,6 +5,7 @@ #include "config.h" #include "list.h" #include "sha1.h" +#include "rbtree.h" #include struct stat; @@ -22,8 +23,8 @@ struct dentry; * including the stream length field (see below). */ #define WIM_ADS_ENTRY_DISK_SIZE 38 -/* - * Reparse tags documented at +/* + * Reparse tags documented at * http://msdn.microsoft.com/en-us/library/dd541667(v=prot.10).aspx */ #define WIM_IO_REPARSE_TAG_RESERVED_ZERO 0x00000000 @@ -83,6 +84,8 @@ struct ads_entry { char *stream_name_utf8; #ifdef WITH_FUSE + /* Number to identify an alternate data stream even after it's possibly + * been moved or renamed. */ u32 stream_id; #endif }; @@ -97,9 +100,9 @@ static inline bool ads_entries_have_same_name(const struct ads_entry *entry_1, entry_1->stream_name_len) == 0; } -/* +/* * In-memory structure for a WIM directory entry (dentry). There is a directory - * tree for each image in the WIM. + * tree for each image in the WIM. * * Note that this is a directory entry and not an inode. Since NTFS allows hard * links, it's possible for a NTFS inode to correspond to multiple WIM dentries. @@ -131,11 +134,9 @@ struct dentry { /* The parent of this directory entry. */ struct dentry *parent; - /* Linked list of sibling directory entries. */ - struct dentry *next; - struct dentry *prev; + struct rb_node rb_node; - /* + /* * Size of directory entry on disk, in bytes. Typical size is around * 104 to 120 bytes. * @@ -199,6 +200,8 @@ struct dentry { }; }; +#define rbnode_dentry(node) container_of(node, struct dentry, rb_node) + /* * WIM inode. * @@ -223,7 +226,7 @@ struct inode { int32_t security_id; /* %true iff the inode's lookup table entries has been resolved (i.e. - * the @lte field is valid, but the @hash field is not valid) + * the @lte field is valid, but the @hash field is not valid) * * (This is not an on-disk field.) */ u8 resolved : 1; @@ -265,9 +268,10 @@ struct inode { struct hlist_node hlist; 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 */ @@ -294,6 +298,12 @@ static inline bool dentry_is_extracted(const struct dentry *dentry) return dentry->is_extracted; } +static inline bool dentry_is_first_in_inode(const struct dentry *dentry) +{ + return container_of(dentry->d_inode->dentry_list.next, + struct dentry, + inode_dentry_list) == dentry; +} extern u64 dentry_correct_total_length(const struct dentry *dentry); @@ -301,12 +311,16 @@ 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*), +extern int for_dentry_in_tree(struct dentry *root, + int (*visitor)(struct dentry*, void*), void *args); -extern int for_dentry_in_tree_depth(struct dentry *root, - int (*visitor)(struct dentry*, void*), +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); extern int calculate_dentry_full_path(struct dentry *dentry, void *ignore); @@ -318,7 +332,7 @@ extern int get_names(char **name_utf16_ret, char **name_utf8_ret, extern struct dentry *get_dentry(struct WIMStruct *w, const char *path); extern struct inode *wim_pathname_to_inode(struct WIMStruct *w, const char *path); -extern struct dentry *get_dentry_child_with_name(const struct dentry *dentry, +extern struct dentry *get_dentry_child_with_name(const struct dentry *dentry, const char *name); extern struct dentry *get_parent_dentry(struct WIMStruct *w, const char *path); @@ -338,14 +352,11 @@ 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 bool dentry_add_child(struct dentry * restrict parent, + struct dentry * restrict child); -extern void calculate_dir_tree_statistics(struct dentry *root, - struct lookup_table *table, - u64 *dir_count_ret, - u64 *file_count_ret, - u64 *total_bytes_ret, - u64 *hard_link_bytes_ret); +// XXX +#define link_dentry(child, parent) dentry_add_child(parent, child) extern int verify_dentry(struct dentry *dentry, void *wim); @@ -359,11 +370,11 @@ extern struct ads_entry *inode_add_ads(struct inode *dentry, extern void inode_remove_ads(struct inode *inode, u16 idx, struct lookup_table *lookup_table); -extern int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, +extern int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, u64 offset, struct dentry *dentry); -extern int read_dentry_tree(const u8 metadata_resource[], +extern int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len, struct dentry *dentry); extern u8 *write_dentry_tree(const struct dentry *tree, u8 *p); @@ -373,16 +384,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) @@ -418,9 +419,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