X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flookup_table.h;h=7d8474f68f0a8598ca1ea81c3dce3e6267bd8a9f;hb=038eaccece575d04de8d647bb93773b7f3e38ce4;hp=faf62a02bc33039f8c817712b6c8de4aeebeddbf;hpb=d977c5b4f348208e47fd2922f202f3eb60d5d5cb;p=wimlib

diff --git a/src/lookup_table.h b/src/lookup_table.h
index faf62a02..7d8474f6 100644
--- a/src/lookup_table.h
+++ b/src/lookup_table.h
@@ -21,7 +21,17 @@ struct lookup_table {
 	u64 capacity;
 };
 
-/* An entry in the lookup table in the WIM file. */
+struct wimlib_fd;
+
+
+/* 
+ * 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
@@ -36,14 +46,14 @@ struct lookup_table_entry {
 	/* Currently ignored; set to 1 in new lookup table entries. */
 	u16 part_number;
 
-	/* Number of times this lookup table entry is referenced by dentries. */
-	u32 refcnt;
-
 	/* If %true, this lookup table entry corresponds to a symbolic link
 	 * reparse buffer.  @symlink_reparse_data_buf will give the target of
 	 * the symbolic link. */
 	bool is_symlink;
 
+	/* Number of times this lookup table entry is referenced by dentries. */
+	u32 refcnt;
+
 	union {
 		/* SHA1 hash of the file resource pointed to by this lookup
 		 * table entry */
@@ -81,21 +91,12 @@ struct lookup_table_entry {
 			int   other_wim_ctype;
 		};
 
-		struct { /* Used for read-write mounts. */
-
-
-			/* Offset of the stream file_on_disk_fd. */
-			off_t staging_offset;
-
+		struct { /* Used for wimlib_mount */
 
-			/* If file_on_disk_fd, if it is not -1, is the file
-			 * descriptor, opened for reading, for file_on_disk. */
-			int staging_fd;
-
-			/* Number of times the file has been opened.
-			 * file_on_disk_fd can be closed when num_times_opened
-			 * is decremented to 0.  */
-			int staging_num_times_opened;
+			/* File descriptors table for this data stream */
+			struct wimlib_fd **fds;
+			u16 num_allocated_fds;
+			u16 num_opened_fds;
 		};
 	};
 
@@ -109,12 +110,20 @@ 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. */
-	union {
-		u32 out_refcnt;
-		bool refcnt_is_incremented;
-	};
+	u32 out_refcnt;
 	struct resource_entry output_resource_entry;
-	struct dentry *hard_link_sets;
+
+	/* 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);
@@ -125,8 +134,12 @@ extern void lookup_table_insert(struct lookup_table *table,
 extern void lookup_table_unlink(struct lookup_table *table, 
 				struct lookup_table_entry *lte);
 
-extern bool lookup_table_decrement_refcnt(struct lookup_table* table, 
-					  const u8 hash[]);
+extern struct lookup_table_entry *
+lookup_table_decrement_refcnt(struct lookup_table* table, const u8 hash[]);
+
+extern struct lookup_table_entry *
+lte_decrement_refcnt(struct lookup_table_entry *lte,
+		     struct lookup_table *table);
 
 
 extern struct lookup_table_entry *new_lookup_table_entry();
@@ -141,7 +154,7 @@ __lookup_resource(const struct lookup_table *lookup_table, const u8 hash[]);
 extern int lookup_resource(WIMStruct *w, const char *path,
 			   int lookup_flags, struct dentry **dentry_ret,
 			   struct lookup_table_entry **lte_ret,
-			   u8 **hash_ret);
+			   unsigned *stream_idx_ret);
 
 extern int zero_out_refcnts(struct lookup_table_entry *entry, void *ignore);
 
@@ -154,13 +167,9 @@ extern void free_lookup_table(struct lookup_table *table);
 
 extern int write_lookup_table_entry(struct lookup_table_entry *lte, void *__out);
 
-static inline void free_lookup_table_entry(struct lookup_table_entry *lte)
-{
-	if (lte) {
-		FREE(lte->file_on_disk);
-		FREE(lte);
-	}
-}
+extern void free_lookup_table_entry(struct lookup_table_entry *lte);
+
+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)