Make win32.h includable on non-Windows

[wimlib] / src / compress_parallel.c

diff --git a/src/compress_parallel.c b/src/compress_parallel.c
index acf4ea58afc24b4299f7848d22301486c6be5bbe..9b3c8521e34e87a52936b7c9af1cce1d0e5dd973 100644 (file)
--- a/src/compress_parallel.c
+++ b/src/compress_parallel.c
@@ -42,9 +42,7 @@
 #include "wimlib/error.h"
 #include "wimlib/list.h"
 #include "wimlib/util.h"
-#ifdef __WIN32__
-#  include "wimlib/win32.h" /* win32_get_number_of_processors() */
-#endif
+#include "wimlib/win32.h" /* win32_get_number_of_processors() */
 
 struct message_queue {
        struct list_head list;
@@ -329,21 +327,17 @@ submit_compression_msg(struct parallel_chunk_compressor *ctx)
        ctx->next_submit_msg = NULL;
 }
 
-static bool
-parallel_chunk_compressor_submit_chunk(struct chunk_compressor *_ctx,
-                                      const void *chunk, u32 size)
+static void *
+parallel_chunk_compressor_get_chunk_buffer(struct chunk_compressor *_ctx)
 {
        struct parallel_chunk_compressor *ctx = (struct parallel_chunk_compressor *)_ctx;
        struct message *msg;
 
-       wimlib_assert(size > 0);
-       wimlib_assert(size <= ctx->base.out_chunk_size);
-
        if (ctx->next_submit_msg) {
                msg = ctx->next_submit_msg;
        } else {
                if (list_empty(&ctx->available_msgs))
-                       return false;
+                       return NULL;
 
                msg = list_entry(ctx->available_msgs.next, struct message, list);
                list_del(&msg->list);
@@ -351,22 +345,33 @@ parallel_chunk_compressor_submit_chunk(struct chunk_compressor *_ctx,
                msg->num_filled_chunks = 0;
        }
 
-       memcpy(msg->uncompressed_chunks[msg->num_filled_chunks], chunk, size);
-       msg->uncompressed_chunk_sizes[msg->num_filled_chunks] = size;
+       return msg->uncompressed_chunks[msg->num_filled_chunks];
+}
+
+static void
+parallel_chunk_compressor_signal_chunk_filled(struct chunk_compressor *_ctx, u32 usize)
+{
+       struct parallel_chunk_compressor *ctx = (struct parallel_chunk_compressor *)_ctx;
+       struct message *msg;
+
+       wimlib_assert(usize > 0);
+       wimlib_assert(usize <= ctx->base.out_chunk_size);
+       wimlib_assert(ctx->next_submit_msg);
+
+       msg = ctx->next_submit_msg;
+       msg->uncompressed_chunk_sizes[msg->num_filled_chunks] = usize;
        if (++msg->num_filled_chunks == msg->num_alloc_chunks)
                submit_compression_msg(ctx);
-       return true;
 }
 
 static bool
-parallel_chunk_compressor_get_chunk(struct chunk_compressor *_ctx,
-                                   const void **cdata_ret, u32 *csize_ret,
-                                   u32 *usize_ret)
+parallel_chunk_compressor_get_compression_result(struct chunk_compressor *_ctx,
+                                                const void **cdata_ret, u32 *csize_ret,
+                                                u32 *usize_ret)
 {
        struct parallel_chunk_compressor *ctx = (struct parallel_chunk_compressor *)_ctx;
        struct message *msg;
 
-
        if (ctx->next_submit_msg)
                submit_compression_msg(ctx);
 
@@ -490,8 +495,9 @@ new_parallel_chunk_compressor(int out_ctype, u32 out_chunk_size,
        ctx->base.out_ctype = out_ctype;
        ctx->base.out_chunk_size = out_chunk_size;
        ctx->base.destroy = parallel_chunk_compressor_destroy;
-       ctx->base.submit_chunk = parallel_chunk_compressor_submit_chunk;
-       ctx->base.get_chunk = parallel_chunk_compressor_get_chunk;
+       ctx->base.get_chunk_buffer = parallel_chunk_compressor_get_chunk_buffer;
+       ctx->base.signal_chunk_filled = parallel_chunk_compressor_signal_chunk_filled;
+       ctx->base.get_compression_result = parallel_chunk_compressor_get_compression_result;
 
        ctx->num_thread_data = num_threads;
 
@@ -515,7 +521,8 @@ new_parallel_chunk_compressor(int out_ctype, u32 out_chunk_size,
 
                dat->chunks_to_compress_queue = &ctx->chunks_to_compress_queue;
                dat->compressed_chunks_queue = &ctx->compressed_chunks_queue;
-               ret = wimlib_create_compressor(out_ctype, out_chunk_size, 0,
+               ret = wimlib_create_compressor(out_ctype, out_chunk_size,
+                                              WIMLIB_COMPRESSOR_FLAG_DESTRUCTIVE,
                                               &dat->compressor);
                if (ret)
                        goto err;