gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add comments and limit digits for tps prints

Browse Source
This commit is contained in:
Stephen Akridge
2018-06-15 10:12:38 -07:00
committed by Greg Fitzgerald
parent af6a07697a
commit 94ededb54c
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/client-demo.rs
View File

@ -65,7 +65,7 @@ fn sample_tx_count(
if tps > max_tps { if tps > max_tps {
max_tps = tps; max_tps = tps;
} }
println!("{}: {} tps", v.transactions_addr, tps); println!("{}: {:.2} tps", v.transactions_addr, tps);
total = tx_count - first_count; total = tx_count - first_count;
println!( println!(
"{}: Total Transactions processed {}", "{}: Total Transactions processed {}",
@ -106,9 +106,10 @@ fn generate_and_send_txs(
let bsps = txs as f64 / ns as f64; let bsps = txs as f64 / ns as f64;
let nsps = ns as f64 / txs as f64; let nsps = ns as f64 / txs as f64;
println!( println!(
"Done. {} thousand signatures per second, {}us per signature", "Done. {:.2} thousand signatures per second, {:.2} us per signature, {} ms total time",
bsps * 1_000_000_f64, bsps * 1_000_000_f64,
nsps / 1_000_f64 nsps / 1_000_f64,
duration_as_ms(&duration),
); );
println!("Transfering {} transactions in {} batches", txs, threads); println!("Transfering {} transactions in {} batches", txs, threads);
@ -247,6 +248,8 @@ fn main() {
println!("Sampling tps every second...",); println!("Sampling tps every second...",);
// Setup a thread per validator to sample every period
// collect the max transaction rate and total tx count seen
let maxes = Arc::new(RwLock::new(Vec::new())); let maxes = Arc::new(RwLock::new(Vec::new()));
let sample_period = 1; // in seconds let sample_period = 1; // in seconds
let v_threads: Vec<_> = validators let v_threads: Vec<_> = validators
@ -264,6 +267,7 @@ fn main() {
}) })
.collect(); .collect();
// generate and send transactions for the specified duration
let time = Duration::new(time_sec, 0); let time = Duration::new(time_sec, 0);
let now = Instant::now(); let now = Instant::now();
while now.elapsed() < time { while now.elapsed() < time {
@ -278,11 +282,13 @@ fn main() {
); );
} }
// Stop the sampling threads so it will collect the stats
signal.store(true, Ordering::Relaxed); signal.store(true, Ordering::Relaxed);
for t in v_threads { for t in v_threads {
t.join().unwrap(); t.join().unwrap();
} }
// Compute/report stats
let mut max_of_maxes = 0.0; let mut max_of_maxes = 0.0;
let mut total_txs = 0; let mut total_txs = 0;
for (max, txs) in maxes.read().unwrap().iter() { for (max, txs) in maxes.read().unwrap().iter() {
@ -292,13 +298,14 @@ fn main() {
total_txs += *txs; total_txs += *txs;
} }
println!( println!(
"\nHighest TPS: {} sampling period {}s total transactions: {} clients: {}", "\nHighest TPS: {:.2} sampling period {}s total transactions: {} clients: {}",
max_of_maxes, max_of_maxes,
sample_period, sample_period,
total_txs, total_txs,
maxes.read().unwrap().len() maxes.read().unwrap().len()
); );
// join the crdt client threads
for t in c_threads { for t in c_threads {
t.join().unwrap(); t.join().unwrap();
} }