X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flookup_table.h;h=e5241f8068498ce0504145589551c8cffd8b57b8;hb=e94aa48490fda7524b49478e5aa2dc4b7d03b0a1;hp=81cb50a54fdce86a9bb3bf4d8d1b7dc8a838aa39;hpb=f3e97b29c4a8c564d54b0fd11cd43a9b4cd6a8ad;p=wimlib

diff --git a/src/lookup_table.h b/src/lookup_table.h
index 81cb50a5..e5241f80 100644
--- a/src/lookup_table.h
+++ b/src/lookup_table.h
@@ -40,7 +40,7 @@ struct ntfs_location {
 	tchar *path;
 	utf16lechar *stream_name;
 	u16 stream_name_nchars;
-	struct _ntfs_volume **ntfs_vol_p;
+	struct _ntfs_volume *ntfs_vol;
 	bool is_reparse_point;
 };
 #endif
@@ -135,10 +135,18 @@ struct wim_lookup_table_entry {
 	 */
 	u16 part_number;
 
-	/* See enum resource_location above */
+	/* One of the `enum resource_location' values documented above. */
 	u16 resource_location : 5;
+
+	/* 1 if this stream is a unique size (only set while writing streams). */
 	u8 unique_size : 1;
+
+	/* 1 if this stream had a SHA1-message digest calculated for it yet? */
 	u8 unhashed : 1;
+	
+	u8 deferred : 1;
+
+	u8 no_progress : 1;
 
 	/* (On-disk field)
 	 * Number of times this lookup table entry is referenced by dentries.
@@ -159,24 +167,27 @@ struct wim_lookup_table_entry {
 		 * table. */
 		size_t hash_short;
 
-		/* 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 **back_ptr;
+		/* Unhashed entries only (unhashed == 1): these variables make
+		 * it possible to find the pointer to this 'struct
+		 * wim_lookup_table_entry' contained in either 'struct
+		 * wim_ads_entry' or 'struct wim_inode'.  There can be at most 1
+		 * such pointer, as we can only join duplicate streams after
+		 * they have been hashed.  */
+		struct {
+			struct wim_inode *back_inode;
+			u32 back_stream_id;
+		};
 	};
 
 	/* 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. */
+	 * whenever the stream pointed to by this lookup table entry needs to be
+	 * written.  The stream 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 {
-		void *resource_loc_private;
 		WIMStruct *wim;
 		tchar *file_on_disk;
 		void *attached_buffer;
@@ -188,17 +199,16 @@ struct wim_lookup_table_entry {
 	#endif
 	};
 
-	/* Pointer to inode that contains the opened file descriptors to
-	 * this stream (valid iff resource_location ==
-	 * RESOURCE_IN_STAGING_FILE) */
-	struct wim_inode *lte_inode;
-
+	/* Actual reference count to this stream (only used while
+	 * verifying an image). */
 	u32 real_refcnt;
 
 	union {
-		#ifdef WITH_FUSE
+	#ifdef WITH_FUSE
+		/* Number of times this stream has been opened (used only during
+		 * mounting) */
 		u16 num_opened_fds;
-		#endif
+	#endif
 
 		/* This field is used for the special hardlink or symlink image
 		 * extraction mode.   In these mode, all identical files are linked
@@ -217,7 +227,10 @@ struct wim_lookup_table_entry {
 		 */
 		struct resource_entry output_resource_entry;
 
-		struct list_head msg_list;
+		struct {
+			struct list_head msg_list;
+			struct list_head being_compressed_list;
+		};
 		struct list_head inode_list;
 
 		struct {
@@ -232,7 +245,7 @@ struct wim_lookup_table_entry {
 		struct list_head unhashed_list;
 		struct list_head swm_stream_list;
 		struct list_head extraction_list;
-		struct list_head new_stream_list;
+		struct list_head export_stream_list;
 	};
 };
 
@@ -300,6 +313,7 @@ lookup_table_insert(struct wim_lookup_table *table, struct wim_lookup_table_entr
 static inline void
 lookup_table_unlink(struct wim_lookup_table *table, struct wim_lookup_table_entry *lte)
 {
+	wimlib_assert(!lte->unhashed);
 	hlist_del(&lte->hash_list);
 	wimlib_assert(table->num_entries != 0);
 	table->num_entries--;
@@ -485,12 +499,21 @@ 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 **back_ptr)
+			     struct wim_inode *back_inode,
+			     u32 back_stream_id)
 {
 	lte->unhashed = 1;
+	lte->back_inode = back_inode;
+	lte->back_stream_id = back_stream_id;
 	list_add_tail(&lte->unhashed_list, table->unhashed_streams);
-	lte->back_ptr = back_ptr;
-	*back_ptr = lte;
 }
 
+extern int
+hash_unhashed_stream(struct wim_lookup_table_entry *lte,
+		     struct wim_lookup_table *lookup_table,
+		     struct wim_lookup_table_entry **lte_ret);
+
+extern struct wim_lookup_table_entry **
+retrieve_lte_pointer(struct wim_lookup_table_entry *lte);
+
 #endif