Make default number of threads same as CPU cores
This commit is contained in:
1
Cargo.lock
generated
1
Cargo.lock
generated
@@ -221,6 +221,7 @@ dependencies = [
|
||||
"bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"clap 2.29.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"image 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
|
||||
@@ -7,4 +7,5 @@ authors = ["Tim Visée <timvisee@gmail.com>"]
|
||||
bufstream = "0.1"
|
||||
clap = "2.29"
|
||||
image = "0.18"
|
||||
num_cpus = "1.8"
|
||||
regex = "0.2"
|
||||
|
||||
@@ -120,7 +120,7 @@ OPTIONS:
|
||||
-h, --height <PIXELS> Draw height (def: screen height)
|
||||
-x <PIXELS> Draw X offset (def: 0)
|
||||
-y <PIXELS> Draw Y offset (def: 0)
|
||||
-c, --count <COUNT> Number of concurrent threads (def: 4)
|
||||
-c, --count <COUNT> Number of concurrent threads (def: CPUs)
|
||||
-r, --fps <RATE> Frames per second with multiple images (def: 1)
|
||||
|
||||
ARGS:
|
||||
|
||||
@@ -4,9 +4,6 @@ pub const APP_VERSION: &'static str = "0.1";
|
||||
pub const APP_AUTHOR: &'static str = "Tim Visee <timvisee@gmail.com>";
|
||||
pub const APP_ABOUT: &'static str = "A quick pixelflut client, that pwns pixelflut panels.";
|
||||
|
||||
// The default thread count
|
||||
pub const DEFAULT_THREAD_COUNT: usize = 4;
|
||||
|
||||
// The default frames per second rate
|
||||
pub const DEFAULT_IMAGE_FPS: u32 = 1;
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
extern crate clap;
|
||||
extern crate num_cpus;
|
||||
|
||||
use clap::{Arg, ArgMatches, App};
|
||||
|
||||
@@ -50,14 +51,12 @@ impl<'a: 'b, 'b> ArgHandler<'a> {
|
||||
.takes_value(true))
|
||||
.arg(Arg::with_name("x")
|
||||
.short("x")
|
||||
.long("x")
|
||||
.value_name("PIXELS")
|
||||
.help("Draw X offset (def: 0)")
|
||||
.display_order(4)
|
||||
.takes_value(true))
|
||||
.arg(Arg::with_name("y")
|
||||
.short("y")
|
||||
.long("y")
|
||||
.value_name("PIXELS")
|
||||
.help("Draw Y offset (def: 0)")
|
||||
.display_order(5)
|
||||
@@ -68,7 +67,7 @@ impl<'a: 'b, 'b> ArgHandler<'a> {
|
||||
.alias("thread")
|
||||
.alias("threads")
|
||||
.value_name("COUNT")
|
||||
.help("Number of concurrent threads (def: 4)")
|
||||
.help("Number of concurrent threads (def: CPUs)")
|
||||
.display_order(6)
|
||||
.takes_value(true))
|
||||
.arg(Arg::with_name("fps")
|
||||
@@ -95,7 +94,7 @@ impl<'a: 'b, 'b> ArgHandler<'a> {
|
||||
/// Get the thread count.
|
||||
pub fn count(&self) -> usize {
|
||||
self.matches.value_of("count")
|
||||
.unwrap_or(&format!("{}", DEFAULT_THREAD_COUNT))
|
||||
.unwrap_or(&format!("{}", num_cpus::get()))
|
||||
.parse::<usize>()
|
||||
.expect("Invalid count specified")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user