compress_parallel.c: Don't bail if not all threads can be created

[wimlib] / src / compress_parallel.c

diff --git a/src/compress_parallel.c b/src/compress_parallel.c
index cb49a24c75d23e2618217d6149ef7d0a47393c8f..e083c079ab614a26e83edabdefbcf6fa0e06b102 100644 (file)
--- a/src/compress_parallel.c
+++ b/src/compress_parallel.c
@@ -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;
@@ -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);
@@ -484,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)
@@ -529,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)