From 0e181024c00b746a930aab6a0cfd9162d7b67ae4 Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Sat, 18 Dec 2010 05:27:46 +0000 Subject: 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. --- tests/misc/sort-unique-segv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/misc/sort-unique-segv') diff --git a/tests/misc/sort-unique-segv b/tests/misc/sort-unique-segv index 55a74147f..c4854f903 100755 --- a/tests/misc/sort-unique-segv +++ b/tests/misc/sort-unique-segv @@ -19,7 +19,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' cat <<\EOF > in || framework_failure_ -- cgit v1.2.3-54-g00ecf