aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyril Zhang <cyril@freebsdfoundation.org>2021-06-17 17:40:16 +0000
committerMark Johnston <markj@FreeBSD.org>2021-06-17 17:53:03 +0000
commit68d3790ba0bce162f9fcaed09cfecd9adeab3943 (patch)
tree5f5f203b79dea9c08ca3723e86bb3f1273667fea
parenta877965fa3da218bceaaa0f51c4d7770e64e6df0 (diff)
downloadsrc-68d3790ba0bce162f9fcaed09cfecd9adeab3943.tar.gz
src-68d3790ba0bce162f9fcaed09cfecd9adeab3943.zip
sort: Change default algorithm to mergesort
This results in a significant improvement in the runtime of sort(1) when radix sort cannot be used. This comes at the expense of increased memory usage, but this is small relative to sort's overall memory usage. PR: 255551 Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D30319
-rw-r--r--usr.bin/sort/file.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/sort/file.h b/usr.bin/sort/file.h
index 724928a7c050..70b46fecaca1 100644
--- a/usr.bin/sort/file.h
+++ b/usr.bin/sort/file.h
@@ -41,8 +41,8 @@
#define SORT_HEAPSORT 3
#define SORT_RADIXSORT 4
-#define DEFAULT_SORT_ALGORITHM SORT_HEAPSORT
-#define DEFAULT_SORT_FUNC heapsort
+#define DEFAULT_SORT_ALGORITHM SORT_MERGESORT
+#define DEFAULT_SORT_FUNC mergesort
/*
* List of data to be sorted.