#include "config.h"
#include "list.h"
#include "sha1.h"
+#include "rbtree.h"
#include <string.h>
+#ifdef WITH_FUSE
+#include <pthread.h>
+#endif
+
struct stat;
struct lookup_table;
struct WIMStruct;
* 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.
*/
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)
+
/*
* WIM 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;
/* 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 tmp_list;
+
+ 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 */
/* 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
};
list_add(&(dentry)->inode_dentry_list, &(inode)->dentry_list); \
})
-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,
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);
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);
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 int verify_dentry(struct dentry *dentry, void *wim);
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)
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
git://wimlib.net / wimlib / blobdiff