blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

banking-bench: Migrate to clap 3.1.8

This commit is contained in:
Christian Kamm 2022-04-14 14:27:47 +02:00 committed by Tao Zhu
parent a6742b5838
commit 2c7699eb8c
3 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Cargo.lock generated
View File

@ -745,9 +745,9 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "3.1.6" version = "3.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123" checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c"
dependencies = [ dependencies = [
"atty", "atty",
"bitflags", "bitflags",
@ -762,9 +762,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_derive" name = "clap_derive"
version = "3.1.4" version = "3.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da95d038ede1a964ce99f49cbe27a7fb538d1da595e4b4f70b8c8f338d17bf16" checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1"
dependencies = [ dependencies = [
"heck", "heck",
"proc-macro-error", "proc-macro-error",
@ -3543,7 +3543,7 @@ dependencies = [
name = "rbpf-cli" name = "rbpf-cli"
version = "1.11.0" version = "1.11.0"
dependencies = [ dependencies = [
"clap 3.1.6", "clap 3.1.8",
"serde", "serde",
"serde_json", "serde_json",
"solana-bpf-loader-program", "solana-bpf-loader-program",
@ -4353,7 +4353,7 @@ dependencies = [
name = "solana-banking-bench" name = "solana-banking-bench"
version = "1.11.0" version = "1.11.0"
dependencies = [ dependencies = [
"clap 2.33.3", "clap 3.1.8",
"crossbeam-channel", "crossbeam-channel",
"log", "log",
"rand 0.7.3", "rand 0.7.3",
@ -4418,7 +4418,7 @@ dependencies = [
name = "solana-bench-streamer" name = "solana-bench-streamer"
version = "1.11.0" version = "1.11.0"
dependencies = [ dependencies = [
"clap 3.1.6", "clap 3.1.8",
"crossbeam-channel", "crossbeam-channel",
"solana-net-utils", "solana-net-utils",
"solana-streamer", "solana-streamer",
@ -4515,7 +4515,7 @@ version = "1.11.0"
dependencies = [ dependencies = [
"bzip2", "bzip2",
"cargo_metadata", "cargo_metadata",
"clap 3.1.6", "clap 3.1.8",
"regex", "regex",
"serial_test", "serial_test",
"solana-download-utils", "solana-download-utils",
@ -4528,7 +4528,7 @@ name = "solana-cargo-test-bpf"
version = "1.11.0" version = "1.11.0"
dependencies = [ dependencies = [
"cargo_metadata", "cargo_metadata",
"clap 3.1.6", "clap 3.1.8",
] ]
[[package]] [[package]]
@ -4805,7 +4805,7 @@ name = "solana-dos"
version = "1.11.0" version = "1.11.0"
dependencies = [ dependencies = [
"bincode", "bincode",
"clap 3.1.6", "clap 3.1.8",
"log", "log",
"rand 0.7.3", "rand 0.7.3",
"serde", "serde",
@ -5232,7 +5232,7 @@ name = "solana-log-analyzer"
version = "1.11.0" version = "1.11.0"
dependencies = [ dependencies = [
"byte-unit", "byte-unit",
"clap 3.1.6", "clap 3.1.8",
"serde", "serde",
"serde_json", "serde_json",
"solana-logger 1.11.0", "solana-logger 1.11.0",
@ -5309,7 +5309,7 @@ dependencies = [
name = "solana-net-shaper" name = "solana-net-shaper"
version = "1.11.0" version = "1.11.0"
dependencies = [ dependencies = [
"clap 3.1.6", "clap 3.1.8",
"rand 0.7.3", "rand 0.7.3",
"serde", "serde",
"serde_json", "serde_json",
@ -5321,7 +5321,7 @@ name = "solana-net-utils"
version = "1.11.0" version = "1.11.0"
dependencies = [ dependencies = [
"bincode", "bincode",
"clap 3.1.6", "clap 3.1.8",
"crossbeam-channel", "crossbeam-channel",
"log", "log",
"nix", "nix",
@ -5398,7 +5398,7 @@ dependencies = [
name = "solana-poh-bench" name = "solana-poh-bench"
version = "1.11.0" version = "1.11.0"
dependencies = [ dependencies = [
"clap 3.1.6", "clap 3.1.8",
"log", "log",
"rand 0.7.3", "rand 0.7.3",
"rayon", "rayon",

2
banking-bench/Cargo.toml
View File

@ -9,7 +9,7 @@ homepage = "https://solana.com/"
publish = false publish = false
[dependencies] [dependencies]
clap = "2.33.1" clap = "3.1.8"
crossbeam-channel = "0.5" crossbeam-channel = "0.5"
log = "0.4.14" log = "0.4.14"
rand = "0.7.0" rand = "0.7.0"

29
banking-bench/src/main.rs
View File

@ -1,6 +1,6 @@
#![allow(clippy::integer_arithmetic)] #![allow(clippy::integer_arithmetic)]
use { use {
clap::{crate_description, crate_name, value_t, App, Arg}, clap::{crate_description, crate_name, Arg, Command},
crossbeam_channel::{unbounded, Receiver}, crossbeam_channel::{unbounded, Receiver},
log::*, log::*,
rand::{thread_rng, Rng}, rand::{thread_rng, Rng},
@ -109,55 +109,58 @@ fn bytes_as_usize(bytes: &[u8]) -> usize {
fn main() { fn main() {
solana_logger::setup(); solana_logger::setup();
let matches = App::new(crate_name!()) let matches = Command::new(crate_name!())
.about(crate_description!()) .about(crate_description!())
.version(solana_version::version!()) .version(solana_version::version!())
.arg( .arg(
Arg::with_name("num_chunks") Arg::new("num_chunks")
.long("num-chunks") .long("num-chunks")
.takes_value(true) .takes_value(true)
.value_name("SIZE") .value_name("SIZE")
.help("Number of transaction chunks."), .help("Number of transaction chunks."),
) )
.arg( .arg(
Arg::with_name("packets_per_chunk") Arg::new("packets_per_chunk")
.long("packets-per-chunk") .long("packets-per-chunk")
.takes_value(true) .takes_value(true)
.value_name("SIZE") .value_name("SIZE")
.help("Packets per chunk"), .help("Packets per chunk"),
) )
.arg( .arg(
Arg::with_name("skip_sanity") Arg::new("skip_sanity")
.long("skip-sanity") .long("skip-sanity")
.takes_value(false) .takes_value(false)
.help("Skip transaction sanity execution"), .help("Skip transaction sanity execution"),
) )
.arg( .arg(
Arg::with_name("same_payer") Arg::new("same_payer")
.long("same-payer") .long("same-payer")
.takes_value(false) .takes_value(false)
.help("Use the same payer for transfers"), .help("Use the same payer for transfers"),
) )
.arg( .arg(
Arg::with_name("iterations") Arg::new("iterations")
.long("iterations") .long("iterations")
.takes_value(true) .takes_value(true)
.help("Number of iterations"), .help("Number of iterations"),
) )
.arg( .arg(
Arg::with_name("num_threads") Arg::new("num_threads")
.long("num-threads") .long("num-threads")
.takes_value(true) .takes_value(true)
.help("Number of iterations"), .help("Number of iterations"),
) )
.get_matches(); .get_matches();
let num_threads = let num_threads = matches
value_t!(matches, "num_threads", usize).unwrap_or(BankingStage::num_threads() as usize); .value_of_t::<usize>("num_threads")
.unwrap_or(BankingStage::num_threads() as usize);
// a multiple of packet chunk duplicates to avoid races // a multiple of packet chunk duplicates to avoid races
let num_chunks = value_t!(matches, "num_chunks", usize).unwrap_or(16); let num_chunks = matches.value_of_t::<usize>("num_chunks").unwrap_or(16);
let packets_per_chunk = value_t!(matches, "packets_per_chunk", usize).unwrap_or(192); let packets_per_chunk = matches
let iterations = value_t!(matches, "iterations", usize).unwrap_or(1000); .value_of_t::<usize>("packets_per_chunk")
.unwrap_or(192);
let iterations = matches.value_of_t::<usize>("iterations").unwrap_or(1000);
let total_num_transactions = num_chunks * num_threads * packets_per_chunk; let total_num_transactions = num_chunks * num_threads * packets_per_chunk;
let mint_total = 1_000_000_000_000; let mint_total = 1_000_000_000_000;