Make lookup table use hlist

[wimlib] / src / lookup_table.h

diff --git a/src/lookup_table.h b/src/lookup_table.h
index b59eff22a227ffcb52b7bad11d81a547a925e1e3..871981430124d4f0c6ade031313847535457bae2 100644 (file)
--- a/src/lookup_table.h
+++ b/src/lookup_table.h
@@ -16,7 +16,7 @@
  * offsets and sizes of uncompressed or compressed file resources.  It is
  * implemented as a hash table. */
 struct lookup_table {
-       struct lookup_table_entry **array;
+       struct hlist_head *array;
        u64 num_entries;
        u64 capacity;
 };
@@ -24,12 +24,18 @@ struct lookup_table {
 struct wimlib_fd;
 
 
-/* An entry in the lookup table in the WIM file. */
+/* 
+ * An entry in the lookup table in the WIM file. 
+ *
+ * It is used to find data streams for files in the WIM. 
+ *
+ * The lookup_table_entry for a given dentry in the WIM is found using the SHA1
+ * message digest field. 
+ */
 struct lookup_table_entry {
 
-       /* The next struct lookup_table_entry in the hash bucket.  NULL if this is the
-        * last one. */
-       struct lookup_table_entry *next;
+       /* List of lookup table entries in this hash bucket */
+       struct hlist_node hash_list;
 
        /* @resource_entry is read from the lookup table in the WIM
         * file; it says where to find the file resource in the WIM
@@ -83,7 +89,10 @@ struct lookup_table_entry {
                        /* Compression type used in other WIM. */
                        int   other_wim_ctype;
                };
-               struct {
+
+               struct { /* Used for wimlib_mount */
+
+                       /* File descriptors table for this data stream */
                        struct wimlib_fd **fds;
                        u16 num_allocated_fds;
                        u16 num_opened_fds;
@@ -101,13 +110,19 @@ struct lookup_table_entry {
         * output_resource_entry is the struct resource_entry for the position of the
         * file resource when written to the output file. */
        u32 out_refcnt;
-       union {
-               struct resource_entry output_resource_entry;
-               struct {
-                       struct list_head staging_list;
-                       struct list_head lte_group_list;
-               };
-       };
+       struct resource_entry output_resource_entry;
+
+       /* Circular linked list of streams that share the same lookup table
+        * entry
+        * 
+        * This list of streams may include streams from different hard link
+        * sets that happen to be the same.  */
+       struct list_head lte_group_list;
+
+       /* List of lookup table entries that correspond to streams that have
+        * been extracted to the staging directory when modifying a read-write
+        * mounted WIM. */
+       struct list_head staging_list;
 };
 
 extern struct lookup_table *new_lookup_table(size_t capacity);
@@ -115,8 +130,13 @@ extern struct lookup_table *new_lookup_table(size_t capacity);
 extern void lookup_table_insert(struct lookup_table *table, 
                                struct lookup_table_entry *lte);
 
-extern void lookup_table_unlink(struct lookup_table *table, 
-                               struct lookup_table_entry *lte);
+/* Unlinks a lookup table entry from the table; does not free it. */
+static inline void lookup_table_unlink(struct lookup_table *table, 
+                                      struct lookup_table_entry *lte)
+{
+       hlist_del(&lte->hash_list);
+       table->num_entries--;
+}
 
 extern struct lookup_table_entry *
 lookup_table_decrement_refcnt(struct lookup_table* table, const u8 hash[]);
@@ -133,7 +153,7 @@ extern int for_lookup_table_entry(struct lookup_table *table,
                                  void *arg);
 
 extern struct lookup_table_entry *
-__lookup_resource(const struct lookup_table *lookup_table, const u8 hash[]);
+__lookup_resource(const struct lookup_table *table, const u8 hash[]);
 
 extern int lookup_resource(WIMStruct *w, const char *path,
                           int lookup_flags, struct dentry **dentry_ret,
@@ -153,8 +173,7 @@ extern int write_lookup_table_entry(struct lookup_table_entry *lte, void *__out)
 
 extern void free_lookup_table_entry(struct lookup_table_entry *lte);
 
-extern void resolve_lookup_table_entries(struct dentry *root,
-                                        struct lookup_table *table);
+extern int dentry_resolve_ltes(struct dentry *dentry, void *__table);
 
 /* Writes the lookup table to the output file. */
 static inline int write_lookup_table(struct lookup_table *table, FILE *out)