X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwimlib_internal.h;h=da17c9ec0613ce0490ea498767641c29a4ebada9;hp=18f027387136009dfd737937372a711f3728eb52;hb=43dcc8bb71d6c7b6118f81d87e61ff865f7e89a5;hpb=13c6ce3160fce7c40008d1d182325c8b42450d1e

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 18f02738..da17c9ec 100644
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -239,10 +239,12 @@ struct wim_security_data {
 /* Metadata for a WIM image */
 struct wim_image_metadata {
 
+	/* Number of WIMStruct's that are sharing this image metadata (from
+	 * calls to wimlib_export_image().) */
 	unsigned long refcnt;
 
 	/* Pointer to the root dentry of the image. */
-	struct wim_dentry    *root_dentry;
+	struct wim_dentry *root_dentry;
 
 	/* Pointer to the security data of the image. */
 	struct wim_security_data *security_data;
@@ -251,9 +253,14 @@ struct wim_image_metadata {
 	 */
 	struct wim_lookup_table_entry *metadata_lte;
 
-	/* Linked list of inodes of this image */
-	struct hlist_head inode_list;
+	/* Linked list of 'struct wim_inode's for this image. */
+	struct list_head inode_list;
 
+	/* Linked list of 'struct wim_lookup_table_entry's for this image that
+	 * are referred to in the dentry tree, but have not had a SHA1 message
+	 * digest calculated yet and therefore have not been inserted into the
+	 * WIM's lookup table.  This list is added to during wimlib_add_image()
+	 * and wimlib_mount_image() (read-write only). */
 	struct list_head unhashed_streams;
 
 	/* 1 iff the dentry tree has been modified.  If this is the case, the
@@ -261,8 +268,9 @@ struct wim_image_metadata {
 	 * different WIM image. */
 	u8 modified : 1;
 
-	/* 1 iff this image has been mounted read-write */
-	u8 has_been_mounted_rw : 1;
+#ifdef WITH_NTFS_3G
+	struct _ntfs_volume *ntfs_vol;
+#endif
 };
 
 /* The opaque structure exposed to the wimlib API. */
@@ -271,7 +279,7 @@ struct WIMStruct {
 	/* A pointer to the file indicated by @filename, opened for reading. */
 	FILE *fp;
 
-#ifdef WITH_FUSE
+#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
 	/* Extra file pointers to be used by concurrent readers */
 	FILE **fp_tab;
 	size_t num_allocated_fps;
@@ -303,10 +311,6 @@ struct WIMStruct {
 	/* Temporary field */
 	void *private;
 
-#ifdef WITH_NTFS_3G
-	struct _ntfs_volume *ntfs_vol;
-#endif
-
 	/* The currently selected image, indexed starting at 1.  If not 0,
 	 * subtract 1 from this to get the index of the current image in the
 	 * image_metadata array. */
@@ -356,6 +360,43 @@ resource_is_compressed(const struct resource_entry *entry)
 	return (entry->flags & WIM_RESHDR_FLAG_COMPRESSED);
 }
 
+/* Iterate over each inode in a WIM image that has not yet been hashed */
+#define image_for_each_inode(inode, imd) \
+	list_for_each_entry(inode, &imd->inode_list, i_list)
+
+/* Iterate over each stream in a WIM image that has not yet been hashed */
+#define image_for_each_unhashed_stream(lte, imd) \
+	list_for_each_entry(lte, &imd->unhashed_streams, unhashed_list)
+
+/* Iterate over each stream in a WIM image that has not yet been hashed (safe
+ * against stream removal) */
+#define image_for_each_unhashed_stream_safe(lte, tmp, imd) \
+	list_for_each_entry_safe(lte, tmp, &imd->unhashed_streams, unhashed_list)
+
+#if 1
+#  define copy_resource_entry(dst, src) memcpy(dst, src, sizeof(struct resource_entry))
+#  define zero_resource_entry(entry) memset(entry, 0, sizeof(struct resource_entry))
+#else
+static inline void
+copy_resource_entry(struct resource_entry *dst,
+		    const struct resource_entry *src)
+{
+	BUILD_BUG_ON(sizeof(struct resource_entry) != 24);
+	((u64*)dst)[0] = ((u64*)src)[0];
+	((u64*)dst)[1] = ((u64*)src)[1];
+	((u64*)dst)[2] = ((u64*)src)[2];
+}
+
+static inline void
+zero_resource_entry(struct resource_entry *entry)
+{
+	BUILD_BUG_ON(sizeof(struct resource_entry) != 24);
+	((u64*)entry)[0] = 0;
+	((u64*)entry)[1] = 0;
+	((u64*)entry)[2] = 0;
+}
+#endif
+
 /* add_image.c */
 
 extern bool
@@ -392,7 +433,7 @@ struct wim_inode_table {
 	 *   number with some other inode until assign_inode_numbers() is
 	 *   called.
 	 */
-	struct hlist_head extra_inodes;
+	struct list_head extra_inodes;
 };
 
 extern int
@@ -402,9 +443,12 @@ extern int
 inode_table_new_dentry(struct wim_inode_table *table, const tchar *name,
 		       u64 ino, u64 devno, struct wim_dentry **dentry_ret);
 
+extern void
+inode_ref_streams(struct wim_inode *inode);
+
 extern void
 inode_table_prepare_inode_list(struct wim_inode_table *table,
-			       struct hlist_head *head);
+			       struct list_head *head);
 
 static inline void
 destroy_inode_table(struct wim_inode_table *table)
@@ -414,7 +458,7 @@ destroy_inode_table(struct wim_inode_table *table)
 
 
 extern int
-dentry_tree_fix_inodes(struct wim_dentry *root, struct hlist_head *inode_list);
+dentry_tree_fix_inodes(struct wim_dentry *root, struct list_head *inode_list);
 
 /* header.c */
 
@@ -518,10 +562,13 @@ build_dentry_tree_ntfs(struct wim_dentry **root_p,
 		       wimlib_progress_func_t progress_func,
 		       void *extra_arg);
 
+extern int
+do_ntfs_umount(struct _ntfs_volume *vol);
+
 /* resource.c */
 
 #define WIMLIB_RESOURCE_FLAG_RAW		0x1
-#define WIMLIB_RESOURCE_FLAG_MULTITHREADED	0x2
+#define WIMLIB_RESOURCE_FLAG_THREADSAFE_READ	0x2
 #define WIMLIB_RESOURCE_FLAG_RECOMPRESS		0x4
 
 extern int
@@ -561,6 +608,9 @@ extern int
 extract_wim_resource_to_fd(const struct wim_lookup_table_entry *lte,
 			   int fd, u64 size);
 
+extern int
+sha1_resource(struct wim_lookup_table_entry *lte);
+
 extern int
 copy_resource(struct wim_lookup_table_entry *lte, void *w);
 
@@ -628,6 +678,9 @@ new_image_metadata();
 extern struct wim_image_metadata **
 new_image_metadata_array(unsigned num_images);
 
+extern int
+wim_checksum_unhashed_streams(WIMStruct *w);
+
 /* write.c */
 
 /* Internal use only */