Heuristic sorting of streams for solid compression

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index 8422d9e10b3d5b9dec5442317106b84f48930a75..27708e235138a6ba282a759a713c2e33f9136968 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -23,7 +23,17 @@
 #  include "config.h"
 #endif
 
+#include <errno.h>
+#include <fcntl.h>
+#ifndef __WIN32__
+#  include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <unistd.h>
+
 #include "wimlib.h"
+#include "wimlib/assert.h"
+#include "wimlib/bitops.h"
 #include "wimlib/dentry.h"
 #include "wimlib/encoding.h"
 #include "wimlib/file_io.h"
@@ -36,28 +46,18 @@
 #include "wimlib/security.h"
 #include "wimlib/wim.h"
 #include "wimlib/xml.h"
-#include "wimlib/version.h"
-
 #ifdef __WIN32__
 #  include "wimlib/win32.h" /* for realpath() replacement */
 #endif
 
-#include <errno.h>
-#include <fcntl.h>
-#ifndef __WIN32__
-#  include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <unistd.h>
-
 static int
-wim_default_pack_compression_type(void)
+wim_default_solid_compression_type(void)
 {
        return WIMLIB_COMPRESSION_TYPE_LZMS;
 }
 
 static u32
-wim_default_pack_chunk_size(int ctype) {
+wim_default_solid_chunk_size(int ctype) {
        switch (ctype) {
        case WIMLIB_COMPRESSION_TYPE_LZMS:
                return 1U << 25; /* 33554432  */
@@ -75,9 +75,9 @@ new_wim_struct(void)
 
        filedes_invalidate(&wim->in_fd);
        filedes_invalidate(&wim->out_fd);
-       wim->out_pack_compression_type = wim_default_pack_compression_type();
-       wim->out_pack_chunk_size = wim_default_pack_chunk_size(
-                                       wim->out_pack_compression_type);
+       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;
 }
@@ -96,7 +96,7 @@ wim_chunk_size_valid(u32 chunk_size, int ctype)
        /* Chunk size must be power of 2.  */
        if (chunk_size == 0)
                return false;
-       order = bsr32(chunk_size);
+       order = fls32(chunk_size);
        if (chunk_size != 1U << order)
                return false;
 
@@ -343,13 +343,7 @@ select_wim_image(WIMStruct *wim, int image)
 
        /* If a valid image is currently selected, its metadata can be freed if
         * it has not been modified.  */
-       if (wim->current_image != WIMLIB_NO_IMAGE) {
-               imd = wim_get_current_image_metadata(wim);
-               if (!imd->modified) {
-                       wimlib_assert(list_empty(&imd->unhashed_streams));
-                       destroy_image_metadata(imd, NULL, false);
-               }
-       }
+       deselect_current_wim_image(wim);
        wim->current_image = image;
        imd = wim_get_current_image_metadata(wim);
        if (imd->root_dentry || imd->modified) {
@@ -362,6 +356,19 @@ select_wim_image(WIMStruct *wim, int image)
        return ret;
 }
 
+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(list_empty(&imd->unhashed_streams));
+               destroy_image_metadata(imd, NULL, false);
+       }
+       wim->current_image = WIMLIB_NO_IMAGE;
+}
 
 /* API function documented in wimlib.h  */
 WIMLIBAPI const tchar *
@@ -535,13 +542,13 @@ wimlib_set_output_compression_type(WIMStruct *wim, int ctype)
 WIMLIBAPI int
 wimlib_set_output_pack_compression_type(WIMStruct *wim, int ctype)
 {
-       int ret = set_out_ctype(ctype, &wim->out_pack_compression_type);
+       int ret = set_out_ctype(ctype, &wim->out_solid_compression_type);
        if (ret)
                return ret;
 
        /* Reset the chunk size if it's no longer valid.  */
-       if (!wim_chunk_size_valid(wim->out_pack_chunk_size, ctype))
-               wim->out_pack_chunk_size = wim_default_pack_chunk_size(ctype);
+       if (!wim_chunk_size_valid(wim->out_solid_chunk_size, ctype))
+               wim->out_solid_chunk_size = wim_default_solid_chunk_size(ctype);
        return 0;
 }
 
@@ -575,14 +582,14 @@ WIMLIBAPI int
 wimlib_set_output_pack_chunk_size(WIMStruct *wim, uint32_t chunk_size)
 {
        if (chunk_size == 0) {
-               wim->out_pack_chunk_size =
-                       wim_default_pack_chunk_size(wim->out_pack_compression_type);
+               wim->out_solid_chunk_size =
+                       wim_default_solid_chunk_size(wim->out_solid_compression_type);
                return 0;
        }
 
        return set_out_chunk_size(chunk_size,
-                                 wim->out_pack_compression_type,
-                                 &wim->out_pack_chunk_size);
+                                 wim->out_solid_compression_type,
+                                 &wim->out_solid_chunk_size);
 }
 
 WIMLIBAPI void
@@ -916,7 +923,9 @@ test_locale_ctype_utf8(void)
 WIMLIBAPI u32
 wimlib_get_version(void)
 {
-       return WIMLIB_VERSION_CODE;
+       return (WIMLIB_MAJOR_VERSION << 20) |
+              (WIMLIB_MINOR_VERSION << 10) |
+               WIMLIB_PATCH_VERSION;
 }
 
 static bool lib_initialized = false;