Updates to prepare for in-place compaction support

Update some names and comments to clarify they mean overwrites via
append.  No changes in behavior.

diff --git a/include/wimlib.h b/include/wimlib.h
index bdb2c33ea88e4be8fd6401d7f4929481d34426fc..260f03e88fca6073295b9e95389936b80a0c776a 100644 (file)
--- a/include/wimlib.h
+++ b/include/wimlib.h
@@ -3588,22 +3588,21 @@ wimlib_open_wim_with_progress(const wimlib_tchar *wim_file,
 /**
  * @ingroup G_writing_and_overwriting_wims
  *
 /**
  * @ingroup G_writing_and_overwriting_wims
  *

- * Commit a ::WIMStruct to disk, overwriting its backing file or appending to it
- * as needed.
+ * Commit a ::WIMStruct to disk, updating its backing file.

  *
  *

- * There are two alternative ways in which changes may be committed:
+ * There are several alternative ways in which changes may be committed:

  *
  *   1. Full rebuild: write the updated WIM to a temporary file, then rename the
  *     temporary file to the original.
  *   2. Appending: append updates to the new original WIM file, then overwrite
  *     its header such that those changes become visible to new readers.
  *
  *
  *   1. Full rebuild: write the updated WIM to a temporary file, then rename the
  *     temporary file to the original.
  *   2. Appending: append updates to the new original WIM file, then overwrite
  *     its header such that those changes become visible to new readers.
  *

- * Append mode is often much faster, but it wastes some amount of space due to
- * leaving "holes" in the WIM file.  Because of the greater efficiency,
- * wimlib_overwrite() normally defaults to append mode.  However,
- * ::WIMLIB_WRITE_FLAG_REBUILD can be used to explicitly request a full rebuild.
- * In addition, if wimlib_delete_image() has been used on the ::WIMStruct, then
- * the default mode switches to rebuild mode, and
+ * Append mode is often much faster than a full rebuild, but it wastes some
+ * amount of space due to leaving "holes" in the WIM file.  Because of the
+ * greater efficiency, wimlib_overwrite() normally defaults to append mode.
+ * However, ::WIMLIB_WRITE_FLAG_REBUILD can be used to explicitly request a full
+ * rebuild.  In addition, if wimlib_delete_image() has been used on the
+ * ::WIMStruct, then the default mode switches to rebuild mode, and

  * ::WIMLIB_WRITE_FLAG_SOFT_DELETE can be used to explicitly request append
  * mode.
  *
  * ::WIMLIB_WRITE_FLAG_SOFT_DELETE can be used to explicitly request append
  * mode.
  *

diff --git a/include/wimlib/write.h b/include/wimlib/write.h
index 008c36412980d2a04b6880d3758ce53131bd6898..53e7d571654844d8abb909a5264c01f1fd230b29 100644 (file)
--- a/include/wimlib/write.h
+++ b/include/wimlib/write.h
@@ -6,7 +6,7 @@
 
 /* Internal use only */
 #define WIMLIB_WRITE_FLAG_FILE_DESCRIPTOR              0x80000000
 
 /* Internal use only */
 #define WIMLIB_WRITE_FLAG_FILE_DESCRIPTOR              0x80000000

-#define WIMLIB_WRITE_FLAG_OVERWRITE                    0x40000000
+#define WIMLIB_WRITE_FLAG_APPEND                       0x40000000

 #define WIMLIB_WRITE_FLAG_NO_NEW_BLOBS                 0x20000000
 #define WIMLIB_WRITE_FLAG_USE_EXISTING_TOTALBYTES      0x10000000
 #define WIMLIB_WRITE_FLAG_NO_METADATA                  0x08000000
 #define WIMLIB_WRITE_FLAG_NO_NEW_BLOBS                 0x20000000
 #define WIMLIB_WRITE_FLAG_USE_EXISTING_TOTALBYTES      0x10000000
 #define WIMLIB_WRITE_FLAG_NO_METADATA                  0x08000000

diff --git a/src/write.c b/src/write.c
index 34f6283325dd47bb6eaabce49a32fdae9cc839c8..13ff87a7cc6b8e162be8c6c806b9b00804d9de45 100644 (file)
--- a/src/write.c
+++ b/src/write.c
@@ -28,7 +28,7 @@
 
 #if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK)
 /* On BSD, this should be included before "wimlib/list.h" so that "wimlib/list.h" can
 
 #if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK)
 /* On BSD, this should be included before "wimlib/list.h" so that "wimlib/list.h" can

- * overwrite the LIST_HEAD macro. */
+ * override the LIST_HEAD macro. */

 #  include <sys/file.h>
 #endif
 
 #  include <sys/file.h>
 #endif
 


@@ -118,7 +118,7 @@ blob_filtered(const struct blob_descriptor *blob,
        write_flags = ctx->write_flags;
        wim = ctx->wim;
 
        write_flags = ctx->write_flags;
        wim = ctx->wim;
 

-       if (write_flags & WIMLIB_WRITE_FLAG_OVERWRITE &&
+       if (write_flags & WIMLIB_WRITE_FLAG_APPEND &&

            blob->blob_location == BLOB_IN_WIM &&
            blob->rdesc->wim == wim)
                return 1;
            blob->blob_location == BLOB_IN_WIM &&
            blob->rdesc->wim == wim)
                return 1;


@@ -141,7 +141,7 @@ blob_hard_filtered(const struct blob_descriptor *blob,
 static inline bool
 may_soft_filter_blobs(const struct filter_context *ctx)
 {
 static inline bool
 may_soft_filter_blobs(const struct filter_context *ctx)
 {

-       return ctx && (ctx->write_flags & WIMLIB_WRITE_FLAG_OVERWRITE);
+       return ctx && (ctx->write_flags & WIMLIB_WRITE_FLAG_APPEND);

 }
 
 static inline bool
 }
 
 static inline bool


@@ -1972,9 +1972,9 @@ filter_blob_list_for_write(struct list_head *blob_list,
  *     STREAMS_OK:  For writes of all images, assume that all blobs in the blob
  *     table of @wim and the per-image lists of unhashed blobs should be taken
  *     as-is, and image metadata should not be searched for references.  This
  *     STREAMS_OK:  For writes of all images, assume that all blobs in the blob
  *     table of @wim and the per-image lists of unhashed blobs should be taken
  *     as-is, and image metadata should not be searched for references.  This

- *     does not exclude filtering with OVERWRITE and SKIP_EXTERNAL_WIMS, below.
+ *     does not exclude filtering with APPEND and SKIP_EXTERNAL_WIMS, below.

  *
  *

- *     OVERWRITE:  Blobs already present in @wim shall not be returned in
+ *     APPEND:  Blobs already present in @wim shall not be returned in

  *     @blob_list_ret.
  *
  *     SKIP_EXTERNAL_WIMS:  Blobs already present in a WIM file, but not @wim,
  *     @blob_list_ret.
  *
  *     SKIP_EXTERNAL_WIMS:  Blobs already present in a WIM file, but not @wim,


@@ -1994,9 +1994,9 @@ filter_blob_list_for_write(struct list_head *blob_list,
  *     the blobs in @blob_list_ret.
  *
  *     This list will be a proper superset of @blob_list_ret if and only if
  *     the blobs in @blob_list_ret.
  *
  *     This list will be a proper superset of @blob_list_ret if and only if

- *     WIMLIB_WRITE_FLAG_OVERWRITE was specified in @write_flags and some of
- *     the blobs that would otherwise need to be written were already located
- *     in the WIM file.
+ *     WIMLIB_WRITE_FLAG_APPEND was specified in @write_flags and some of the
+ *     blobs that would otherwise need to be written were already located in
+ *     the WIM file.

  *
  *     All blobs in this list will have @out_refcnt set to the number of
  *     references to the blob in the output WIM.  If
  *
  *     All blobs in this list will have @out_refcnt set to the number of
  *     references to the blob in the output WIM.  If


@@ -2140,7 +2140,7 @@ write_metadata_resources(WIMStruct *wim, int image, int write_flags)
                if (imd->modified) {
                        ret = write_metadata_resource(wim, i,
                                                      write_resource_flags);
                if (imd->modified) {
                        ret = write_metadata_resource(wim, i,
                                                      write_resource_flags);

-               } else if (write_flags & WIMLIB_WRITE_FLAG_OVERWRITE) {
+               } else if (write_flags & WIMLIB_WRITE_FLAG_APPEND) {

                        blob_set_out_reshdr_for_reuse(imd->metadata_blob);
                        ret = 0;
                } else {
                        blob_set_out_reshdr_for_reuse(imd->metadata_blob);
                        ret = 0;
                } else {


@@ -2215,7 +2215,7 @@ write_blob_table(WIMStruct *wim, int image, int write_flags,
        int ret;
 
        /* Set output resource metadata for blobs already present in WIM.  */
        int ret;
 
        /* Set output resource metadata for blobs already present in WIM.  */

-       if (write_flags & WIMLIB_WRITE_FLAG_OVERWRITE) {
+       if (write_flags & WIMLIB_WRITE_FLAG_APPEND) {

                struct blob_descriptor *blob;
                list_for_each_entry(blob, blob_table_list, blob_table_list) {
                        if (blob->blob_location == BLOB_IN_WIM &&
                struct blob_descriptor *blob;
                list_for_each_entry(blob, blob_table_list, blob_table_list) {
                        if (blob->blob_location == BLOB_IN_WIM &&


@@ -2298,14 +2298,13 @@ finish_write(WIMStruct *wim, int image, int write_flags,
                                wim->out_hdr.boot_idx - 1]->metadata_blob->out_reshdr);
        }
 
                                wim->out_hdr.boot_idx - 1]->metadata_blob->out_reshdr);
        }
 

-       /* If overwriting the WIM file containing an integrity table in-place,
-        * we'd like to re-use the information in the old integrity table
-        * instead of recalculating it.  But we might overwrite the old
-        * integrity table when we expand the XML data.  Read it into memory
-        * just in case.  */
-       if ((write_flags & (WIMLIB_WRITE_FLAG_OVERWRITE |
+       /* If appending to a WIM file containing an integrity table, we'd like
+        * to re-use the information in the old integrity table instead of
+        * recalculating it.  But we might overwrite the old integrity table
+        * when we expand the XML data.  Read it into memory just in case.  */
+       if ((write_flags & (WIMLIB_WRITE_FLAG_APPEND |

                            WIMLIB_WRITE_FLAG_CHECK_INTEGRITY)) ==
                            WIMLIB_WRITE_FLAG_CHECK_INTEGRITY)) ==

-               (WIMLIB_WRITE_FLAG_OVERWRITE |
+               (WIMLIB_WRITE_FLAG_APPEND |

                 WIMLIB_WRITE_FLAG_CHECK_INTEGRITY)
            && wim_has_integrity_table(wim))
        {
                 WIMLIB_WRITE_FLAG_CHECK_INTEGRITY)
            && wim_has_integrity_table(wim))
        {


@@ -2843,8 +2842,8 @@ check_resource_offset(struct blob_descriptor *blob, void *_wim)
 }
 
 /* Make sure no file or metadata resources are located after the XML data (or
 }
 
 /* Make sure no file or metadata resources are located after the XML data (or

- * integrity table if present)--- otherwise we can't safely overwrite the WIM in
- * place and we return WIMLIB_ERR_RESOURCE_ORDER.  */
+ * integrity table if present)--- otherwise we can't safely append to the WIM
+ * file and we return WIMLIB_ERR_RESOURCE_ORDER.  */

 static int
 check_resource_offsets(WIMStruct *wim, off_t end_offset)
 {
 static int
 check_resource_offsets(WIMStruct *wim, off_t end_offset)
 {


@@ -2914,7 +2913,7 @@ check_resource_offsets(WIMStruct *wim, off_t end_offset)
  *                   XML data (variable size)
  *                   Integrity table (optional) (variable size)
  *
  *                   XML data (variable size)
  *                   Integrity table (optional) (variable size)
  *

- * This method allows an image to be appended to a large WIM very quickly, and
+ * This function allows an image to be appended to a large WIM very quickly, and

  * is crash-safe except in the case of write re-ordering, but the disadvantage
  * is that a small hole is left in the WIM where the old blob table, xml data,
  * and integrity table were.  (These usually only take up a small amount of
  * is crash-safe except in the case of write re-ordering, but the disadvantage
  * is that a small hole is left in the WIM where the old blob table, xml data,
  * and integrity table were.  (These usually only take up a small amount of


@@ -2952,7 +2951,7 @@ overwrite_wim_inplace(WIMStruct *wim, int write_flags, unsigned num_threads)
                write_flags |= WIMLIB_WRITE_FLAG_SOLID;
 
        /* Set additional flags for overwrite.  */
                write_flags |= WIMLIB_WRITE_FLAG_SOLID;
 
        /* Set additional flags for overwrite.  */

-       write_flags |= WIMLIB_WRITE_FLAG_OVERWRITE |
+       write_flags |= WIMLIB_WRITE_FLAG_APPEND |

                       WIMLIB_WRITE_FLAG_STREAMS_OK;
 
        /* Make sure there is no data after the XML data, except possibily an
                       WIMLIB_WRITE_FLAG_STREAMS_OK;
 
        /* Make sure there is no data after the XML data, except possibily an


@@ -3121,8 +3120,8 @@ overwrite_wim_via_tmpfile(WIMStruct *wim, int write_flags, unsigned num_threads)
                             &progress, wim->progctx);
 }
 
                             &progress, wim->progctx);
 }
 

-/* Determine if the specified WIM file may be updated by appending in-place
- * rather than writing and replacing it with an entirely new file.  */
+/* Determine if the specified WIM file may be updated in-place rather than by
+ * writing and replacing it with an entirely new file.  */

 static bool
 can_overwrite_wim_inplace(const WIMStruct *wim, int write_flags)
 {
 static bool
 can_overwrite_wim_inplace(const WIMStruct *wim, int write_flags)
 {