Skip to content

Remove num_cpus dependency #858

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

Merged
marco-c merged 2 commits into from
Jun 16, 2022
Merged

Remove num_cpus dependency #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7840ce9
cli: Replace num_cpus with std::available_parallelism
Luni-4 May 25, 2022
e416be5
web: Replace num_cpus with std::available_parallelism
Luni-4 Jun 16, 2022
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
2 changes: 0 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion rust-code-analysis-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ name = "rust-code-analysis-cli"
[dependencies]
clap = { version = "^3.0", features = ["cargo"] }
globset = "^0.4"
num_cpus = "^1.13"
regex = "^1.5"
rust-code-analysis = { path = "..", version = "0.0"}
serde = "^1.0"
Expand Down
8 changes: 7 additions & 1 deletion rust-code-analysis-cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use std::path::{Path, PathBuf};
use std::process;
use std::str::FromStr;
use std::sync::{Arc, Mutex};
use std::thread::available_parallelism;

use formats::Format;

Expand Down Expand Up @@ -394,7 +395,12 @@ fn main() {
let num_jobs = if let Ok(num_jobs) = matches.value_of("num_jobs").unwrap().parse::<usize>() {
std::cmp::max(2, num_jobs) - 1
} else {
std::cmp::max(2, num_cpus::get()) - 1
std::cmp::max(
2,
available_parallelism()
.expect("Unrecoverable: Failed to get thread count")
.get(),
) - 1
};

let line_start = if let Ok(n) = matches.value_of("line_start").unwrap().parse::<usize>() {
Expand Down
1 change: 0 additions & 1 deletion rust-code-analysis-web/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ actix-rt = "^2.6"
actix-web = "^3.3"
clap = { version = "^3.1", features = ["derive"] }
futures = "^0.3"
num_cpus = "^1.13"
rust-code-analysis = { path = "..", version = "0.0" }
serde = "^1.0"
serde_json = "^1.0"
Expand Down
8 changes: 7 additions & 1 deletion rust-code-analysis-web/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#![recursion_limit = "256"]
mod web;

use std::thread::available_parallelism;

use clap::Parser;

use web::server;
Expand Down Expand Up @@ -32,7 +34,11 @@ struct Opts {
async fn main() {
let opts = Opts::parse();

let num_jobs = opts.num_jobs.unwrap_or_else(num_cpus::get);
let num_jobs = opts.num_jobs.unwrap_or_else(|| {
available_parallelism()
.expect("Unrecoverable: Failed to get thread count")
.get()
});

if let Err(e) = server::run(&opts.host, opts.port, num_jobs).await {
eprintln!(
Expand Down