X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fcompress_parallel.c;h=6aa635bf669803e1ec2500336a0ab163d0d44977;hb=e4cdc80a6d033bb27ac0d1687ca32d0434673128;hp=b3377ffc985ca636ce6d1746b7c939ec7b349524;hpb=d8e380e8314cdb592149a651a19690d102a1865b;p=wimlib

diff --git a/src/compress_parallel.c b/src/compress_parallel.c
index b3377ffc..6aa635bf 100644
--- a/src/compress_parallel.c
+++ b/src/compress_parallel.c
@@ -28,23 +28,15 @@
 #ifdef ENABLE_MULTITHREADED_COMPRESSION
 
 #include <errno.h>
-#include <limits.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#ifdef HAVE_SYS_SYSCTL_H
-#  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;
@@ -94,49 +86,7 @@ struct parallel_chunk_compressor {
 	size_t next_chunk_idx;
 };
 
-static unsigned
-get_default_num_threads(void)
-{
-	long n;
-#ifdef __WIN32__
-	n = win32_get_number_of_processors();
-#else
-	n = sysconf(_SC_NPROCESSORS_ONLN);
-#endif
-	if (n < 1 || n >= UINT_MAX) {
-		WARNING("Failed to determine number of processors; assuming 1.");
-		return 1;
-	}
-	return n;
-}
-
-static u64
-get_avail_memory(void)
-{
-#ifdef __WIN32__
-	u64 phys_bytes = win32_get_avail_memory();
-	if (phys_bytes == 0)
-		goto default_size;
-	return phys_bytes;
-#elif defined(_SC_PAGESIZE) && defined(_SC_PHYS_PAGES)
-	long page_size = sysconf(_SC_PAGESIZE);
-	long num_pages = sysconf(_SC_PHYS_PAGES);
-	if (page_size <= 0 || num_pages <= 0)
-		goto default_size;
-	return ((u64)page_size * (u64)num_pages);
-#else
-	int mib[2] = {CTL_HW, HW_MEMSIZE};
-	u64 memsize;
-	size_t len = sizeof(memsize);
-	if (sysctl(mib, ARRAY_LEN(mib), &memsize, &len, NULL, 0) < 0 || len != 8)
-		goto default_size;
-	return memsize;
-#endif
 
-default_size:
-	WARNING("Failed to determine available memory; assuming 1 GiB");
-	return 1ULL << 30;
-}
 
 static int
 message_queue_init(struct message_queue *q)
@@ -297,7 +247,6 @@ parallel_chunk_compressor_destroy(struct chunk_compressor *_ctx)
 		return;
 
 	if (ctx->num_started_threads != 0) {
-		DEBUG("Terminating %u compressor threads", ctx->num_started_threads);
 		message_queue_terminate(&ctx->chunks_to_compress_queue);
 
 		for (i = 0; i < ctx->num_started_threads; i++)
@@ -425,16 +374,13 @@ new_parallel_chunk_compressor(int out_ctype, u32 out_chunk_size,
 	wimlib_assert(out_chunk_size > 0);
 
 	if (num_threads == 0)
-		num_threads = get_default_num_threads();
+		num_threads = get_available_cpus();
 
-	if (num_threads == 1) {
-		DEBUG("Only 1 thread; Not bothering with "
-		      "parallel chunk compressor.");
+	if (num_threads == 1)
 		return -1;
-	}
 
 	if (max_memory == 0)
-		max_memory = get_avail_memory();
+		max_memory = get_available_memory();
 
 	desired_num_threads = num_threads;
 
@@ -483,11 +429,8 @@ new_parallel_chunk_compressor(int out_ctype, u32 out_chunk_size,
 			desired_num_threads, num_threads);
 	}
 
-	if (num_threads == 1) {
-		DEBUG("Only 1 thread; Not bothering with "
-		      "parallel chunk compressor.");
+	if (num_threads == 1)
 		return -2;
-	}
 
 	ret = WIMLIB_ERR_NOMEM;
 	ctx = CALLOC(1, sizeof(*ctx));
@@ -523,7 +466,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;
@@ -533,8 +477,6 @@ new_parallel_chunk_compressor(int out_ctype, u32 out_chunk_size,
 	     ctx->num_started_threads < num_threads;
 	     ctx->num_started_threads++)
 	{
-		DEBUG("pthread_create thread %u of %u",
-		      ctx->num_started_threads + 1, num_threads);
 		ret = pthread_create(&ctx->thread_data[ctx->num_started_threads].thread,
 				     NULL,
 				     compressor_thread_proc,