update clap to v3: bench-streamer

This commit is contained in:
klykov 2022-03-07 18:12:57 +01:00 committed by kirill lykov
parent 01317395e9
commit 22404ca1fc
2 changed files with 6 additions and 6 deletions

View File

@ -9,8 +9,8 @@ homepage = "https://solana.com/"
publish = false publish = false
[dependencies] [dependencies]
clap = "2.33.1"
crossbeam-channel = "0.5" crossbeam-channel = "0.5"
clap = { version = "3.1.5", features = ["cargo"] }
solana-net-utils = { path = "../net-utils", version = "=1.11.0" } solana-net-utils = { path = "../net-utils", version = "=1.11.0" }
solana-streamer = { path = "../streamer", version = "=1.11.0" } solana-streamer = { path = "../streamer", version = "=1.11.0" }
solana-version = { path = "../version", version = "=1.11.0" } solana-version = { path = "../version", version = "=1.11.0" }

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, crossbeam_channel::unbounded,
solana_streamer::{ solana_streamer::{
packet::{Packet, PacketBatch, PacketBatchRecycler, PACKET_DATA_SIZE}, packet::{Packet, PacketBatch, PacketBatchRecycler, PACKET_DATA_SIZE},
@ -57,18 +57,18 @@ fn sink(exit: Arc<AtomicBool>, rvs: Arc<AtomicUsize>, r: PacketBatchReceiver) ->
fn main() -> Result<()> { fn main() -> Result<()> {
let mut num_sockets = 1usize; let mut num_sockets = 1usize;
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-recv-sockets") Arg::new("num-recv-sockets")
.long("num-recv-sockets") .long("num-recv-sockets")
.value_name("NUM") .value_name("NUM")
.takes_value(true) .takes_value(true)
.help("Use NUM receive sockets"), .help("Use NUM receive sockets"),
) )
.arg( .arg(
Arg::with_name("num-producers") Arg::new("num-producers")
.long("num-producers") .long("num-producers")
.value_name("NUM") .value_name("NUM")
.takes_value(true) .takes_value(true)
@ -80,7 +80,7 @@ fn main() -> Result<()> {
num_sockets = max(num_sockets, n.to_string().parse().expect("integer")); num_sockets = max(num_sockets, n.to_string().parse().expect("integer"));
} }
let num_producers = value_t!(matches, "num_producers", u64).unwrap_or(4); let num_producers: u64 = matches.value_of_t("num_producers").unwrap_or(4);
let port = 0; let port = 0;
let ip_addr = IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)); let ip_addr = IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0));