Fixes, comments

[wimlib] / src / lookup_table.h

diff --git a/src/lookup_table.h b/src/lookup_table.h
index ab545f2d3ea94cd38b139af34ab7fee4bdbcaaa9..633c874e17d1f7d1fc8ec03e6c41f722ddd135ff 100644 (file)
--- a/src/lookup_table.h
+++ b/src/lookup_table.h
@@ -136,7 +136,9 @@ struct wim_lookup_table_entry {
        u16 part_number;
 
        /* See enum resource_location above */
-       u16 resource_location;
+       u16 resource_location : 5;
+       u8 unique_size : 1;
+       u8 unhashed : 1;
 
        /* (On-disk field)
         * Number of times this lookup table entry is referenced by dentries.
@@ -156,20 +158,21 @@ struct wim_lookup_table_entry {
                 * the full 20 byte hash just to insert the entry in a hash
                 * table. */
                size_t hash_short;
-       };
-
-       union {
-               #ifdef WITH_FUSE
-               u16 num_opened_fds;
-               #endif
 
-               /* This field is used for the special hardlink or symlink image
-                * extraction mode.   In these mode, all identical files are linked
-                * together, and @extracted_file will be set to the filename of the
-                * first extracted file containing this stream.  */
-               tchar *extracted_file;
+               /* Unhashed entries only (unhashed == 1): this points directly
+                * to the pointer to this 'struct wim_lookup_table_entry'
+                * contained in a 'struct wim_ads_entry' or 'struct wim_inode'.
+                * */
+               struct wim_lookup_table_entry **my_ptr;
        };
 
+       /* When a WIM file is written, out_refcnt starts at 0 and is incremented
+        * whenever the file resource pointed to by this lookup table entry
+        * needs to be written.  The file resource only need to be written when
+        * out_refcnt is nonzero, since otherwise it is not referenced by any
+        * dentries. */
+       u32 out_refcnt;
+
        /* Pointers to somewhere where the stream is actually located.  See the
         * comments for the @resource_location field above. */
        union {
@@ -187,15 +190,20 @@ struct wim_lookup_table_entry {
         * RESOURCE_IN_STAGING_FILE) */
        struct wim_inode *lte_inode;
 
-       /* When a WIM file is written, out_refcnt starts at 0 and is incremented
-        * whenever the file resource pointed to by this lookup table entry
-        * needs to be written.  The file resource only need to be written when
-        * out_refcnt is nonzero, since otherwise it is not referenced by any
-        * dentries. */
-       u32 out_refcnt;
-
        u32 real_refcnt;
 
+       union {
+               #ifdef WITH_FUSE
+               u16 num_opened_fds;
+               #endif
+
+               /* This field is used for the special hardlink or symlink image
+                * extraction mode.   In these mode, all identical files are linked
+                * together, and @extracted_file will be set to the filename of the
+                * first extracted file containing this stream.  */
+               tchar *extracted_file;
+       };
+
        union {
                /* When a WIM file is written, @output_resource_entry is filled
                 * in with the resource entry for the output WIM.  This will not
@@ -208,6 +216,11 @@ struct wim_lookup_table_entry {
 
                struct list_head msg_list;
                struct list_head inode_list;
+
+               struct {
+                       struct hlist_node hash_list_2;
+                       struct list_head write_streams_list;
+               };
        };
 
        /* List of lookup table entries that correspond to streams that have
@@ -216,7 +229,11 @@ struct wim_lookup_table_entry {
         *
         * This field is also used to make other lists of lookup table entries.
         * */
-       struct list_head staging_list;
+       union {
+               struct list_head unhashed_list;
+               struct list_head staging_list;
+               struct list_head extraction_list;
+       };
 };
 
 static inline u64
@@ -307,7 +324,7 @@ for_lookup_table_entry(struct wim_lookup_table *table,
                       void *arg);
 
 extern int
-sort_stream_list_by_wim_position(struct list_head *stream_list);
+cmp_streams_by_wim_position(const void *p1, const void *p2);
 
 extern int
 for_lookup_table_entry_pos_sorted(struct wim_lookup_table *table,
@@ -349,13 +366,6 @@ inode_unresolve_ltes(struct wim_inode *inode);
 extern int
 write_lookup_table_entry(struct wim_lookup_table_entry *lte, void *__out);
 
-static inline struct resource_entry*
-wim_metadata_resource_entry(WIMStruct *w)
-{
-       return &w->image_metadata[
-                       w->current_image - 1].metadata_lte->resource_entry;
-}
-
 static inline struct wim_lookup_table_entry *
 inode_stream_lte_resolved(const struct wim_inode *inode, unsigned stream_idx)
 {
@@ -474,12 +484,16 @@ lookup_table_total_stream_size(struct wim_lookup_table *table);
 
 static inline void
 lookup_table_insert_unhashed(struct wim_lookup_table *table,
-                            struct wim_lookup_table_entry *lte)
+                            struct wim_lookup_table_entry *lte,
+                            struct wim_lookup_table_entry **my_ptr)
 {
-       list_add_tail(&lte->staging_list, table->unhashed_streams);
+       lte->unhashed = 1;
+       list_add_tail(&lte->unhashed_list, table->unhashed_streams);
+       lte->my_ptr = my_ptr;
+       *my_ptr = lte;
 }
 
 extern void
-lookup_table_free_unhashed_streams(struct wim_lookup_table *table);
+free_lte_list(struct list_head *list);
 
 #endif