X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fdentry.h;h=afa6aaa4f5747e0cdbb6b017ea40cd899af3f290;hp=b51000a28ff871949caae9f28a1439903fdbb34b;hb=9b9a502863318d6208da2818b1d522346e5eee9e;hpb=aa882e9bb92d998707484d7f6f56e9cf109a7c62

diff --git a/src/dentry.h b/src/dentry.h
index b51000a2..afa6aaa4 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 <string.h>
 
+#ifdef WITH_FUSE
+#include <pthread.h>
+#endif
+
 struct stat;
 struct lookup_table;
 struct WIMStruct;
@@ -22,8 +27,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
@@ -99,9 +104,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.
@@ -127,17 +132,52 @@ 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.
 	 *
@@ -157,50 +197,31 @@ 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)
+
 /*
  * WIM inode.
  *
@@ -225,7 +246,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;
@@ -233,6 +254,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 +288,19 @@ 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 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 */
@@ -279,6 +310,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
 };
 
@@ -291,11 +327,6 @@ struct inode {
 		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,
@@ -305,16 +336,19 @@ 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*), 
+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);
@@ -326,7 +360,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);
 
@@ -346,7 +380,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 bool dentry_add_child(struct dentry * restrict parent,
+			     struct dentry * restrict child);
 
 extern int verify_dentry(struct dentry *dentry, void *wim);
 
@@ -360,11 +395,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);
@@ -374,16 +409,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)
@@ -419,9 +444,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