aboutsummaryrefslogtreecommitdiff
path: root/src/xz/hardware.c
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2014-06-18 22:07:06 +0300
committerLasse Collin <lasse.collin@tukaani.org>2014-06-18 22:07:06 +0300
commit96864a6ddf91ad693d102ea165f3d7918744d582 (patch)
tree2c92257bac56733c76633227de691d346b987984 /src/xz/hardware.c
parentliblzma: Add lzma_cputhreads(). (diff)
downloadxz-96864a6ddf91ad693d102ea165f3d7918744d582.tar.xz
xz: Use lzma_cputhreads() instead of own copy of tuklib_cpucores().
Diffstat (limited to 'src/xz/hardware.c')
-rw-r--r--src/xz/hardware.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/xz/hardware.c b/src/xz/hardware.c
index 925926ca..ff32f6d3 100644
--- a/src/xz/hardware.c
+++ b/src/xz/hardware.c
@@ -11,7 +11,6 @@
///////////////////////////////////////////////////////////////////////////////
#include "private.h"
-#include "tuklib_cpucores.h"
/// Maximum number of worker threads. This can be set with
@@ -33,10 +32,17 @@ hardware_threads_set(uint32_t n)
{
if (n == 0) {
// Automatic number of threads was requested.
- // Use the number of available CPU cores.
- threads_max = tuklib_cpucores();
+ // If threading support was enabled at build time,
+ // use the number of available CPU cores. Otherwise
+ // use one thread since disabling threading support
+ // omits lzma_cputhreads() from liblzma.
+#ifdef MYTHREAD_ENABLED
+ threads_max = lzma_cputhreads();
if (threads_max == 0)
threads_max = 1;
+#else
+ threads_max = 1;
+#endif
} else {
threads_max = n;
}