diff options
| author | Gabor Kovesdan <gabor@FreeBSD.org> | 2012-07-04 16:25:11 +0000 |
|---|---|---|
| committer | Gabor Kovesdan <gabor@FreeBSD.org> | 2012-07-04 16:25:11 +0000 |
| commit | 5d5151ae7e57bcbe7df86447fd45a9084e1dd5dc (patch) | |
| tree | cb62917d5adbd30962fdbd50aeef305f7a2a56d8 /usr.bin/sort/sort.c | |
| parent | 7f8492ba48a98dcfa472bfe6bb5de4ff1a703ea1 (diff) | |
| download | src-test2-5d5151ae7e57bcbe7df86447fd45a9084e1dd5dc.tar.gz src-test2-5d5151ae7e57bcbe7df86447fd45a9084e1dd5dc.zip | |
- Change --nthreads parameter to --parallel for GNU compatibility
- Change default sort method to mergesort, which has a better worst case
performance than qsort
Submitted by: Oleg Moskalenko <oleg.moskalenko@citrix.com>
Notes
Notes:
svn path=/head/; revision=238108
Diffstat (limited to 'usr.bin/sort/sort.c')
| -rw-r--r-- | usr.bin/sort/sort.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c index dd0ed6828311..0668bdfc559b 100644 --- a/usr.bin/sort/sort.c +++ b/usr.bin/sort/sort.c @@ -91,7 +91,7 @@ const char *nlsstr[] = { "", "[--heapsort] [--mergesort] [--radixsort] [--qsort] " "[--mmap] " #if defined(SORT_THREADS) - "[--nthreads thread_no] " + "[--parallel thread_no] " #endif "[--human-numeric-sort] " "[--version-sort] [--random-sort [--random-source file]] " @@ -132,7 +132,7 @@ enum VERSION_OPT, DEBUG_OPT, #if defined(SORT_THREADS) - NTHREADS_OPT, + PARALLEL_OPT, #endif RANDOMSOURCE_OPT, COMPRESSPROGRAM_OPT, @@ -171,7 +171,7 @@ struct option long_options[] = { { "numeric-sort", no_argument, NULL, 'n' }, { "output", required_argument, NULL, 'o' }, #if defined(SORT_THREADS) - { "nthreads", required_argument, NULL, NTHREADS_OPT }, + { "parallel", required_argument, NULL, PARALLEL_OPT }, #endif { "qsort", no_argument, NULL, QSORT_OPT }, { "radixsort", no_argument, NULL, RADIXSORT_OPT }, @@ -1119,7 +1119,7 @@ main(int argc, char **argv) } break; #if defined(SORT_THREADS) - case NTHREADS_OPT: + case PARALLEL_OPT: nthreads = (size_t)(atoi(optarg)); if (nthreads < 1) nthreads = 1; |