X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fmetadata.h;h=f9307a67859154d56b273f7c039673512b71832c;hp=7f1c7c0248b74bcac1ca782376540a274be9b32a;hb=52c44c6a506cdfae17fd5fd5c6611622d342c128;hpb=5d3d469e410dc5f4a28814ad231336fc174cba56 diff --git a/include/wimlib/metadata.h b/include/wimlib/metadata.h index 7f1c7c02..f9307a67 100644 --- a/include/wimlib/metadata.h +++ b/include/wimlib/metadata.h @@ -1,14 +1,11 @@ #ifndef _WIMLIB_METADATA_H #define _WIMLIB_METADATA_H +#include "wimlib/blob_table.h" #include "wimlib/list.h" #include "wimlib/types.h" #include "wimlib/wim.h" -#ifdef WITH_NTFS_3G -struct _ntfs_volume; -#endif - /* Metadata for a WIM image */ struct wim_image_metadata { @@ -22,81 +19,100 @@ struct wim_image_metadata { /* Pointer to the security data of the image. */ struct wim_security_data *security_data; - /* Pointer to the lookup table entry for this image's metadata resource - */ - struct wim_lookup_table_entry *metadata_lte; + /* Pointer to the blob descriptor for this image's metadata resource. + * If this image metadata is sourced from a WIM file (as opposed to + * being created from scratch) and hasn't been modified from the version + * in that WIM file, then this blob descriptor's data corresponds to the + * WIM backing source. Otherwise, this blob descriptor is a dummy entry + * with blob_location==BLOB_NONEXISTENT. */ + struct blob_descriptor *metadata_blob; /* 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 - * memory for the dentry tree should not be freed when switching to a - * different WIM image. */ - u8 modified : 1; - -#ifdef WITH_NTFS_3G - struct _ntfs_volume *ntfs_vol; -#endif + struct hlist_head inode_list; + + /* Linked list of 'struct blob_descriptor's for blobs that are + * referenced by this image's dentry tree, but have not had their SHA-1 + * message digests calculated yet and therefore have not been inserted + * into the WIMStruct's blob table. This list is appended to when files + * are scanned for inclusion in this WIM image. */ + struct list_head unhashed_blobs; + + /* Are the filecount/bytecount stats (in the XML info) out of date for + * this image? */ + bool stats_outdated; }; +/* Retrieve the metadata of the image in @wim currently selected with + * select_wim_image(). */ static inline struct wim_image_metadata * wim_get_current_image_metadata(WIMStruct *wim) { return wim->image_metadata[wim->current_image - 1]; } -static inline const struct wim_image_metadata * -wim_get_const_current_image_metadata(const WIMStruct *wim) -{ - return wim->image_metadata[wim->current_image - 1]; -} - +/* Retrieve the root dentry of the image in @wim currently selected with + * select_wim_image(). */ static inline struct wim_dentry * -wim_root_dentry(WIMStruct *wim) +wim_get_current_root_dentry(WIMStruct *wim) { return wim_get_current_image_metadata(wim)->root_dentry; } +/* Retrieve the security data of the image in @wim currently selected with + * select_wim_image(). */ static inline struct wim_security_data * -wim_security_data(WIMStruct *wim) +wim_get_current_security_data(WIMStruct *wim) { return wim_get_current_image_metadata(wim)->security_data; } -static inline const struct wim_security_data * -wim_const_security_data(const WIMStruct *wim) +/* Return true iff the specified image has been changed since being read from + * its backing file or has been created from scratch. */ +static inline bool +is_image_dirty(const struct wim_image_metadata *imd) { - return wim_get_const_current_image_metadata(wim)->security_data; + /* The only possible values here are BLOB_NONEXISTENT and BLOB_IN_WIM */ + return imd->metadata_blob->blob_location == BLOB_NONEXISTENT; } -/* Iterate over each inode in a WIM image that has not yet been hashed */ +/* Return true iff the specified image is unchanged since being read from the + * specified backing WIM file. */ +static inline bool +is_image_unchanged_from_wim(const struct wim_image_metadata *imd, + const WIMStruct *wim) +{ + return !is_image_dirty(imd) && imd->metadata_blob->rdesc->wim == wim; +} + +/* Mark the metadata for the specified WIM image "dirty" following changes to + * the image's directory tree. This records that the metadata no longer matches + * the version in the WIM file (if any) and that its stats are out of date. */ +static inline void +mark_image_dirty(struct wim_image_metadata *imd) +{ + blob_release_location(imd->metadata_blob); + imd->stats_outdated = true; +} + +/* Iterate over each inode in a WIM image */ #define image_for_each_inode(inode, imd) \ - list_for_each_entry(inode, &imd->inode_list, i_list) + hlist_for_each_entry(inode, &(imd)->inode_list, i_hlist_node) -/* 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 inode in a WIM image (safe against inode removal) */ +#define image_for_each_inode_safe(inode, tmp, imd) \ + hlist_for_each_entry_safe(inode, tmp, &(imd)->inode_list, i_hlist_node) -/* 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) +/* Iterate over each blob in a WIM image that has not yet been hashed */ +#define image_for_each_unhashed_blob(blob, imd) \ + list_for_each_entry(blob, &(imd)->unhashed_blobs, unhashed_list) -extern void -destroy_image_metadata(struct wim_image_metadata *imd, - struct wim_lookup_table *table, - bool free_metadata_lte); +/* Iterate over each blob in a WIM image that has not yet been hashed (safe + * against blob removal) */ +#define image_for_each_unhashed_blob_safe(blob, tmp, imd) \ + list_for_each_entry_safe(blob, tmp, &(imd)->unhashed_blobs, unhashed_list) extern void -put_image_metadata(struct wim_image_metadata *imd, - struct wim_lookup_table *table); +put_image_metadata(struct wim_image_metadata *imd, struct blob_table *table); extern int append_image_metadata(WIMStruct *wim, struct wim_image_metadata *imd); @@ -104,7 +120,4 @@ append_image_metadata(WIMStruct *wim, struct wim_image_metadata *imd); extern struct wim_image_metadata * new_image_metadata(void) _malloc_attribute; -extern struct wim_image_metadata ** -new_image_metadata_array(unsigned num_images) _malloc_attribute; - #endif /* _WIMLIB_METADATA_H */