summaryrefslogtreecommitdiff
path: root/tests/misc/sort-spinlock-abuse
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2010-12-18 05:27:46 +0000
committerPádraig Brady <P@draigBrady.com>2010-12-19 00:33:45 +0000
commit0e181024c00b746a930aab6a0cfd9162d7b67ae4 (patch)
tree994336fac3c2c31ab31fa7b1b8700eb12c114243 /tests/misc/sort-spinlock-abuse
parenteea8e7530bf3c469dd7f4e598c993ff7fb4574e9 (diff)
downloadcoreutils-0e181024c00b746a930aab6a0cfd9162d7b67ae4.tar.xz
sort: use at most 8 threads by default
* src/sort.c (main): If --parallel isn't specified, restrict the number of threads to 8 by default. If the --parallel option is specified, then allow any number of threads to be set, independent of the number of processors on the system. * doc/coreutils.texi (sort invocation): Document the changes to determining the number of threads to use. Mention the memory overhead when using multiple threads. * tests/misc/sort-spinlock-abuse: Allow single core systems that support pthreads. * tests/misc/sort-stale-thread-mem: Likewise. * tests/misc/sort-unique-segv: Likewise. * NEWS: Mention the change in behaviour.
Diffstat (limited to 'tests/misc/sort-spinlock-abuse')
-rwxr-xr-xtests/misc/sort-spinlock-abuse3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/misc/sort-spinlock-abuse b/tests/misc/sort-spinlock-abuse
index bbf57534b..67ea89582 100755
--- a/tests/misc/sort-spinlock-abuse
+++ b/tests/misc/sort-spinlock-abuse
@@ -20,7 +20,8 @@
. "${srcdir=.}/init.sh"; path_prepend_ ../src
print_ver_ sort
-test "$(nproc)" = 1 && skip_ "requires a multi-core system"
+grep '^#define HAVE_PTHREAD_T 1' "$CONFIG_HEADER" > /dev/null ||
+ skip_test_ 'requires pthreads'
seq 100000 > in || framework_failure_
mkfifo fifo || framework_failure_