*/
/*
- * Copyright (C) 2012, 2013, 2014, 2015 Eric Biggers
+ * Copyright (C) 2012-2016 Eric Biggers
*
* This file is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
if (!wim)
return NULL;
+ wim->refcnt = 1;
filedes_invalidate(&wim->in_fd);
filedes_invalidate(&wim->out_fd);
wim->out_solid_compression_type = wim_default_solid_compression_type();
wim->out_solid_chunk_size = wim_default_solid_chunk_size(
wim->out_solid_compression_type);
- INIT_LIST_HEAD(&wim->subwims);
return wim;
}
return WIMLIB_ERR_NOMEM;
wim->xml_info = xml_new_info_struct();
- wim->blob_table = new_blob_table(9001);
+ wim->blob_table = new_blob_table(64);
if (!wim->xml_info || !wim->blob_table) {
wimlib_free(wim);
return WIMLIB_ERR_NOMEM;
}
static void
-destroy_image_metadata(struct wim_image_metadata *imd,
- struct blob_table *table,
- bool free_metadata_blob_descriptor)
+unload_image_metadata(struct wim_image_metadata *imd)
{
- free_dentry_tree(imd->root_dentry, table);
+ free_dentry_tree(imd->root_dentry, NULL);
imd->root_dentry = NULL;
free_wim_security_data(imd->security_data);
imd->security_data = NULL;
-
- if (free_metadata_blob_descriptor) {
- free_blob_descriptor(imd->metadata_blob);
- imd->metadata_blob = NULL;
- }
- if (!table) {
- struct blob_descriptor *blob, *tmp;
- list_for_each_entry_safe(blob, tmp, &imd->unhashed_blobs, unhashed_list)
- free_blob_descriptor(blob);
- }
- INIT_LIST_HEAD(&imd->unhashed_blobs);
INIT_HLIST_HEAD(&imd->inode_list);
}
+/* Release a reference to the specified image metadata. This assumes that no
+ * WIMStruct has the image selected. */
void
-put_image_metadata(struct wim_image_metadata *imd, struct blob_table *table)
+put_image_metadata(struct wim_image_metadata *imd)
{
- if (imd && --imd->refcnt == 0) {
- destroy_image_metadata(imd, table, true);
- FREE(imd);
- }
+ struct blob_descriptor *blob, *tmp;
+
+ if (!imd)
+ return;
+ wimlib_assert(imd->refcnt > 0);
+ if (--imd->refcnt != 0)
+ return;
+ wimlib_assert(imd->selected_refcnt == 0);
+ unload_image_metadata(imd);
+ list_for_each_entry_safe(blob, tmp, &imd->unhashed_blobs, unhashed_list)
+ free_blob_descriptor(blob);
+ free_blob_descriptor(imd->metadata_blob);
+ FREE(imd);
}
/* Appends the specified image metadata structure to the array of image metadata
{
struct wim_image_metadata **imd_array;
+ if (!wim_has_metadata(wim))
+ return WIMLIB_ERR_METADATA_NOT_FOUND;
+
+ if (wim->hdr.image_count >= MAX_IMAGES)
+ return WIMLIB_ERR_IMAGE_COUNT;
+
imd_array = REALLOC(wim->image_metadata,
sizeof(wim->image_metadata[0]) * (wim->hdr.image_count + 1));
return 0;
}
-struct wim_image_metadata *
-new_image_metadata(void)
+static struct wim_image_metadata *
+new_image_metadata(struct blob_descriptor *metadata_blob,
+ struct wim_security_data *security_data)
{
struct wim_image_metadata *imd;
imd = CALLOC(1, sizeof(*imd));
- if (imd) {
- imd->refcnt = 1;
- INIT_HLIST_HEAD(&imd->inode_list);
- INIT_LIST_HEAD(&imd->unhashed_blobs);
- }
+ if (!imd)
+ return NULL;
+
+ metadata_blob->is_metadata = 1;
+ imd->refcnt = 1;
+ imd->selected_refcnt = 0;
+ imd->root_dentry = NULL;
+ imd->security_data = security_data;
+ imd->metadata_blob = metadata_blob;
+ INIT_HLIST_HEAD(&imd->inode_list);
+ INIT_LIST_HEAD(&imd->unhashed_blobs);
+ imd->stats_outdated = false;
return imd;
}
-static struct wim_image_metadata **
-new_image_metadata_array(unsigned num_images)
+/* Create an image metadata structure for a new empty image. */
+struct wim_image_metadata *
+new_empty_image_metadata(void)
{
- struct wim_image_metadata **imd_array;
-
- imd_array = CALLOC(num_images, sizeof(imd_array[0]));
+ struct blob_descriptor *metadata_blob;
+ struct wim_security_data *security_data;
+ struct wim_image_metadata *imd;
- if (!imd_array)
- return NULL;
- for (unsigned i = 0; i < num_images; i++) {
- imd_array[i] = new_image_metadata();
- if (unlikely(!imd_array[i])) {
- for (unsigned j = 0; j < i; j++)
- put_image_metadata(imd_array[j], NULL);
- FREE(imd_array);
- return NULL;
- }
+ metadata_blob = new_blob_descriptor();
+ security_data = new_wim_security_data();
+ if (metadata_blob && security_data) {
+ metadata_blob->refcnt = 1;
+ imd = new_image_metadata(metadata_blob, security_data);
+ if (imd)
+ return imd;
}
- return imd_array;
+ free_blob_descriptor(metadata_blob);
+ FREE(security_data);
+ return NULL;
}
+/* Create an image metadata structure that refers to the specified metadata
+ * resource and is initially not loaded. */
+struct wim_image_metadata *
+new_unloaded_image_metadata(struct blob_descriptor *metadata_blob)
+{
+ wimlib_assert(metadata_blob->blob_location == BLOB_IN_WIM);
+ return new_image_metadata(metadata_blob, NULL);
+}
/*
* Load the metadata for the specified WIM image into memory and set it
if (!wim_has_metadata(wim))
return WIMLIB_ERR_METADATA_NOT_FOUND;
- /* If a valid image is currently selected, its metadata can be freed if
- * it has not been modified. */
deselect_current_wim_image(wim);
- wim->current_image = image;
- imd = wim_get_current_image_metadata(wim);
- if (imd->root_dentry || imd->modified) {
- ret = 0;
- } else {
+
+ imd = wim->image_metadata[image - 1];
+ if (!is_image_loaded(imd)) {
ret = read_metadata_resource(imd);
if (ret)
- wim->current_image = WIMLIB_NO_IMAGE;
+ return ret;
}
- return ret;
+ wim->current_image = image;
+ imd->selected_refcnt++;
+ return 0;
}
+/*
+ * Deselect the WIMStruct's currently selected image, if any. To reduce memory
+ * usage, possibly unload the newly deselected image's metadata from memory.
+ */
void
deselect_current_wim_image(WIMStruct *wim)
{
struct wim_image_metadata *imd;
+
if (wim->current_image == WIMLIB_NO_IMAGE)
return;
imd = wim_get_current_image_metadata(wim);
- if (!imd->modified) {
+ wimlib_assert(imd->selected_refcnt > 0);
+ imd->selected_refcnt--;
+ wim->current_image = WIMLIB_NO_IMAGE;
+
+ if (can_unload_image(imd)) {
wimlib_assert(list_empty(&imd->unhashed_blobs));
- destroy_image_metadata(imd, NULL, false);
+ unload_image_metadata(imd);
}
- wim->current_image = WIMLIB_NO_IMAGE;
}
/*
}
if (wim->hdr.image_count != 0 && wim->hdr.part_number == 1) {
- wim->image_metadata = new_image_metadata_array(wim->hdr.image_count);
+ wim->image_metadata = CALLOC(wim->hdr.image_count,
+ sizeof(wim->image_metadata[0]));
if (!wim->image_metadata)
return WIMLIB_ERR_NOMEM;
}
if (open_flags & WIMLIB_OPEN_FLAG_FROM_PIPE) {
- wim->blob_table = new_blob_table(9001);
+ wim->blob_table = new_blob_table(64);
if (!wim->blob_table)
return WIMLIB_ERR_NOMEM;
} else {
+ if (wim->hdr.blob_table_reshdr.uncompressed_size == 0 &&
+ wim->hdr.xml_data_reshdr.uncompressed_size == 0)
+ return WIMLIB_ERR_WIM_IS_INCOMPLETE;
ret = read_wim_xml_data(wim);
if (ret)
return 0;
}
-/* API function documented in wimlib.h */
-WIMLIBAPI void
-wimlib_free(WIMStruct *wim)
+/* Release a reference to a WIMStruct. If the reference count reaches 0, the
+ * WIMStruct is freed. */
+void
+wim_decrement_refcnt(WIMStruct *wim)
{
- if (!wim)
+ wimlib_assert(wim->refcnt > 0);
+ if (--wim->refcnt != 0)
return;
-
- while (!list_empty(&wim->subwims)) {
- WIMStruct *subwim;
-
- subwim = list_entry(wim->subwims.next, WIMStruct, subwim_node);
- list_del(&subwim->subwim_node);
- wimlib_free(subwim);
- }
-
if (filedes_valid(&wim->in_fd))
filedes_close(&wim->in_fd);
if (filedes_valid(&wim->out_fd))
filedes_close(&wim->out_fd);
+ wimlib_free_decompressor(wim->decompressor);
+ xml_free_info_struct(wim->xml_info);
+ FREE(wim->filename);
+ FREE(wim);
+}
- free_blob_table(wim->blob_table);
+/* API function documented in wimlib.h */
+WIMLIBAPI void
+wimlib_free(WIMStruct *wim)
+{
+ if (!wim)
+ return;
- wimlib_free_decompressor(wim->decompressor);
+ /* The blob table and image metadata are freed immediately, but other
+ * members of the WIMStruct such as the input file descriptor are
+ * retained until no more exported resources reference the WIMStruct. */
- FREE(wim->filename);
- xml_free_info_struct(wim->xml_info);
- if (wim->image_metadata) {
- for (unsigned i = 0; i < wim->hdr.image_count; i++)
- put_image_metadata(wim->image_metadata[i], NULL);
+ free_blob_table(wim->blob_table);
+ wim->blob_table = NULL;
+ if (wim->image_metadata != NULL) {
+ deselect_current_wim_image(wim);
+ for (int i = 0; i < wim->hdr.image_count; i++)
+ put_image_metadata(wim->image_metadata[i]);
FREE(wim->image_metadata);
+ wim->image_metadata = NULL;
}
- FREE(wim);
+
+ wim_decrement_refcnt(wim);
}
static bool
#else
char *ctype = nl_langinfo(CODESET);
- return (!strstr(ctype, "UTF-8") ||
- !strstr(ctype, "UTF8") ||
- !strstr(ctype, "utf8") ||
- !strstr(ctype, "utf-8"));
+ return (strstr(ctype, "UTF-8") ||
+ strstr(ctype, "UTF8") ||
+ strstr(ctype, "utf8") ||
+ strstr(ctype, "utf-8"));
#endif
}
git://wimlib.net / wimlib / blobdiff