From 594ead2cee181c78dfddd78c2f43c6b7d9697542 Mon Sep 17 00:00:00 2001
From: Stephen Akridge <sakridge@gmail.com>
Date: Sun, 24 Jun 2018 10:12:08 -0700
Subject: [PATCH] Client fixes, poll for unique last id and cache clients

So we don't keep running up the port range
---
 src/bin/client-demo.rs | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/bin/client-demo.rs b/src/bin/client-demo.rs
index c34988a2d845b9..ae15c802676f7b 100644
--- a/src/bin/client-demo.rs
+++ b/src/bin/client-demo.rs
@@ -82,12 +82,12 @@ fn sample_tx_count(
 
 fn generate_and_send_txs(
     client: &mut ThinClient,
+    tx_clients: &Vec<ThinClient>,
     keypair_pairs: &Vec<&[KeyPair]>,
     leader: &ReplicatedData,
     txs: i64,
     last_id: &mut Hash,
     threads: usize,
-    client_addr: Arc<RwLock<SocketAddr>>,
 ) {
     println!(
         "Signing transactions... {} {}",
@@ -115,24 +115,33 @@ fn generate_and_send_txs(
     let transfer_start = Instant::now();
     let sz = transactions.len() / threads;
     let chunks: Vec<_> = transactions.chunks(sz).collect();
-    chunks.into_par_iter().for_each(|txs| {
-        println!(
-            "Transferring 1 unit {} times... to {:?}",
-            txs.len(),
-            leader.transactions_addr
-        );
-        let client = mk_client(&client_addr, &leader);
-        for tx in txs {
-            client.transfer_signed(tx.clone()).unwrap();
-        }
-    });
+    chunks
+        .into_par_iter()
+        .zip(tx_clients)
+        .for_each(|(txs, client)| {
+            println!(
+                "Transferring 1 unit {} times... to {:?}",
+                txs.len(),
+                leader.transactions_addr
+            );
+            for tx in txs {
+                client.transfer_signed(tx.clone()).unwrap();
+            }
+        });
     println!(
         "Transfer done. {:?} ms {} tps",
         duration_as_ms(&transfer_start.elapsed()),
         txs as f32 / (duration_as_s(&transfer_start.elapsed()))
     );
 
-    *last_id = client.get_last_id();
+    loop {
+        let new_id = client.get_last_id();
+        if *last_id != new_id {
+            *last_id = new_id;
+            break;
+        }
+        sleep(Duration::from_millis(100));
+    }
 }
 
 fn main() {
@@ -266,18 +275,22 @@ fn main() {
         })
         .collect();
 
+    let clients = (0..threads)
+        .map(|_| mk_client(&client_addr, &leader))
+        .collect();
+
     // generate and send transactions for the specified duration
     let time = Duration::new(time_sec, 0);
     let now = Instant::now();
     while now.elapsed() < time {
         generate_and_send_txs(
             &mut client,
+            &clients,
             &keypair_pairs,
             &leader,
             txs,
             &mut last_id,
             threads,
-            client_addr.clone(),
         );
     }