Save original xml_data only when needed

[wimlib] / src / wimlib_internal.h

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 91f99ebfa947af9ea1c263d41cc5705a8fcc4dd1..8f4d295804873a3046b7f94680e47145b6f9aea3 100644 (file)
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -31,7 +31,7 @@
 #include "list.h"
 #include "wimlib.h"
 
-#ifdef WITH_FUSE
+#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
 #include <pthread.h>
 #endif
 
@@ -268,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. */
@@ -278,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;
@@ -294,9 +295,6 @@ struct WIMStruct {
        /* The lookup table for the WIM file. */
        struct wim_lookup_table *lookup_table;
 
-       /* Pointer to the XML data read from the WIM file (UTF16LE-encoded). */
-       utf16lechar *xml_data;
-
        /* Information retrieved from the XML data, arranged in an orderly
         * manner. */
        struct wim_info *wim_info;
@@ -310,10 +308,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. */
@@ -363,12 +357,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
@@ -534,10 +559,15 @@ build_dentry_tree_ntfs(struct wim_dentry **root_p,
                       wimlib_progress_func_t progress_func,
                       void *extra_arg);
 
+#ifdef WITH_NTFS_3G
+extern int
+do_ntfs_umount(struct _ntfs_volume *vol);
+#endif
+
 /* 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
@@ -577,6 +607,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);
 
@@ -644,6 +677,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 */