X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fcompress_parallel.c;h=0569b176fcbf2a9842585c7b6e0962bc3d8cf490;hb=de567a8c5dcd0910a8c762d75bf11b9c9683396c;hp=bba4e120687c04ca922549182c691c03d1b5fff8;hpb=aae306916e3c97040650b669e21f30bf32b0839d;p=wimlib

diff --git a/src/compress_parallel.c b/src/compress_parallel.c
index bba4e120..0569b176 100644
--- a/src/compress_parallel.c
+++ b/src/compress_parallel.c
@@ -7,19 +7,18 @@
 /*
  * Copyright (C) 2013 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * 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
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
  *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -28,15 +27,6 @@
 
 #ifdef ENABLE_MULTITHREADED_COMPRESSION
 
-#include "wimlib/assert.h"
-#include "wimlib/chunk_compressor.h"
-#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 <errno.h>
 #include <limits.h>
 #include <pthread.h>
@@ -47,6 +37,15 @@
 #  include <sys/sysctl.h>
 #endif
 
+#include "wimlib/assert.h"
+#include "wimlib/chunk_compressor.h"
+#include "wimlib/error.h"
+#include "wimlib/list.h"
+#include "wimlib/util.h"
+#ifdef __WIN32__
+#  include "wimlib/win32.h" /* win32_get_number_of_processors() */
+#endif
+
 struct message_queue {
 	struct list_head list;
 	pthread_mutex_t lock;
@@ -330,21 +329,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);
@@ -352,22 +347,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);
 
@@ -491,8 +497,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;
 
@@ -516,7 +523,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;