X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fcompress_parallel.c;h=e083c079ab614a26e83edabdefbcf6fa0e06b102;hb=a9569854dc861d47a79587a78812fab119f1897d;hp=c99c0a86826bc66b841a45ffe1224f57e195f6ab;hpb=affa6147e5c4c72bb22778368743e7203ea8fd79;p=wimlib

diff --git a/src/compress_parallel.c b/src/compress_parallel.c
index c99c0a86..e083c079 100644
--- a/src/compress_parallel.c
+++ b/src/compress_parallel.c
@@ -67,8 +67,8 @@ struct compressor_thread_data {
 struct message {
 	u8 *uncompressed_chunks[MAX_CHUNKS_PER_MSG];
 	u8 *compressed_chunks[MAX_CHUNKS_PER_MSG];
-	unsigned uncompressed_chunk_sizes[MAX_CHUNKS_PER_MSG];
-	unsigned compressed_chunk_sizes[MAX_CHUNKS_PER_MSG];
+	u32 uncompressed_chunk_sizes[MAX_CHUNKS_PER_MSG];
+	u32 compressed_chunk_sizes[MAX_CHUNKS_PER_MSG];
 	size_t num_filled_chunks;
 	size_t num_alloc_chunks;
 	struct list_head list;
@@ -82,7 +82,7 @@ struct parallel_chunk_compressor {
 	struct message_queue chunks_to_compress_queue;
 	struct message_queue compressed_chunks_queue;
 	struct compressor_thread_data *thread_data;
-	unsigned num_threads;
+	unsigned num_thread_data;
 	unsigned num_started_threads;
 
 	struct message *msgs;
@@ -136,7 +136,7 @@ get_avail_memory(void)
 
 default_size:
 	WARNING("Failed to determine available memory; assuming 1 GiB");
-	return 1U << 30;
+	return 1ULL << 30;
 }
 
 static int
@@ -309,7 +309,7 @@ parallel_chunk_compressor_destroy(struct chunk_compressor *_ctx)
 	message_queue_destroy(&ctx->compressed_chunks_queue);
 
 	if (ctx->thread_data != NULL)
-		for (i = 0; i < ctx->num_threads; i++)
+		for (i = 0; i < ctx->num_thread_data; i++)
 			wimlib_free_compressor(ctx->thread_data[i].compressor);
 
 	FREE(ctx->thread_data);
@@ -332,7 +332,7 @@ submit_compression_msg(struct parallel_chunk_compressor *ctx)
 
 static bool
 parallel_chunk_compressor_submit_chunk(struct chunk_compressor *_ctx,
-				       const void *chunk, size_t size)
+				       const void *chunk, u32 size)
 {
 	struct parallel_chunk_compressor *ctx = (struct parallel_chunk_compressor *)_ctx;
 	struct message *msg;
@@ -361,8 +361,8 @@ parallel_chunk_compressor_submit_chunk(struct chunk_compressor *_ctx,
 
 static bool
 parallel_chunk_compressor_get_chunk(struct chunk_compressor *_ctx,
-				    const void **cdata_ret, unsigned *csize_ret,
-				    unsigned *usize_ret)
+				    const void **cdata_ret, u32 *csize_ret,
+				    u32 *usize_ret)
 {
 	struct parallel_chunk_compressor *ctx = (struct parallel_chunk_compressor *)_ctx;
 	struct message *msg;
@@ -417,7 +417,6 @@ new_parallel_chunk_compressor(int out_ctype, u32 out_chunk_size,
 	unsigned desired_num_threads;
 
 	wimlib_assert(out_chunk_size > 0);
-	wimlib_assert(out_ctype != WIMLIB_COMPRESSION_TYPE_NONE);
 
 	if (num_threads == 0)
 		num_threads = get_default_num_threads();
@@ -485,12 +484,11 @@ 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.num_threads = num_threads;
 	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->num_threads = num_threads;
+	ctx->num_thread_data = num_threads;
 
 	ret = message_queue_init(&ctx->chunks_to_compress_queue);
 	if (ret)
@@ -530,16 +528,20 @@ new_parallel_chunk_compressor(int out_ctype, u32 out_chunk_size,
 				     &ctx->thread_data[ctx->num_started_threads]);
 		if (ret) {
 			errno = ret;
-			ret = WIMLIB_ERR_NOMEM;
 			WARNING_WITH_ERRNO("Failed to create compressor thread %u of %u",
 					   ctx->num_started_threads + 1,
 					   num_threads);
+			ret = WIMLIB_ERR_NOMEM;
+			if (ctx->num_started_threads >= 2)
+				break;
 			goto err;
 		}
 	}
 
+	ctx->base.num_threads = ctx->num_started_threads;
+
 	ret = WIMLIB_ERR_NOMEM;
-	ctx->num_messages = num_threads * msgs_per_thread;
+	ctx->num_messages = ctx->num_started_threads * msgs_per_thread;
 	ctx->msgs = allocate_messages(ctx->num_messages,
 				      chunks_per_msg, out_chunk_size);
 	if (ctx->msgs == NULL)