Skip to content

sort: ignore --parallel on WASI #13028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cakebaker wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −9
Open

sort: ignore --parallel on WASI #13028

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/uu/sort/src/sort.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@ pub struct GlobalSettings {
random_source: Option<PathBuf>,
selectors: Vec<FieldSelector>,
separator: Option<u8>,
threads: u64,
line_ending: LineEnding,
buffer_size: usize,
buffer_size_is_explicit: bool,
Expand Down Expand Up @@ -458,7 +457,6 @@ impl Default for GlobalSettings {
random_source: None,
selectors: vec![],
separator: None,
threads: 0,
line_ending: LineEnding::Newline,
buffer_size: FALLBACK_AUTOMATIC_BUF_SIZE,
buffer_size_is_explicit: false,
Expand Down Expand Up @@ -2116,14 +2114,18 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
settings.dictionary_order = dictionary_order;
settings.ignore_non_printing = ignore_non_printing;
settings.ignore_case = ignore_case;
settings.threads = matches
.get_one::<u64>(options::PARALLEL)
.copied()
.unwrap_or_else(|| std::thread::available_parallelism().map_or(1, |n| n.get() as u64));

// WASI doesn't support threads, so we ignore the corresponding option
#[cfg(not(target_os = "wasi"))]
let _ = rayon::ThreadPoolBuilder::new()
.num_threads(settings.threads as usize)
.build_global();
{
let threads = matches
.get_one::<u64>(options::PARALLEL)
.copied()
.unwrap_or_else(|| std::thread::available_parallelism().map_or(1, |n| n.get() as u64));
let _ = rayon::ThreadPoolBuilder::new()
.num_threads(threads as usize)
.build_global();
}

if let Some(size_str) = matches.get_one::<String>(options::BUF_SIZE) {
settings.buffer_size = GlobalSettings::parse_byte_count(size_str).map_err(|e| {
Expand Down
Loading