|
|
@@ -32,7 +32,7 @@ impl TestHarness {
|
|
|
// Create a BridgeAuth
|
|
|
let mut ba = BridgeAuth::new(bdb.pubkey);
|
|
|
|
|
|
- // Make 15 open invitation bridges, in 5 sets of 3
|
|
|
+ // Make 3 x num_buckets open invitation bridges, in sets of 3
|
|
|
for _ in 0..num_buckets {
|
|
|
let bucket = [
|
|
|
BridgeLine::random(),
|
|
|
@@ -41,7 +41,7 @@ impl TestHarness {
|
|
|
];
|
|
|
ba.add_openinv_bridges(bucket, &mut bdb);
|
|
|
}
|
|
|
- // Add 5 more hot spare buckets
|
|
|
+ // Add hot_spare more hot spare buckets
|
|
|
for _ in 0..hot_spare {
|
|
|
let bucket = [
|
|
|
BridgeLine::random(),
|
|
|
@@ -817,8 +817,8 @@ fn protocol_tests() {
|
|
|
let mut req_t_size: Vec<f64> = Vec::new();
|
|
|
let mut resp_t_size: Vec<f64> = Vec::new();
|
|
|
let mut resp_handle_t_size: Vec<f64> = Vec::new();
|
|
|
- for _i in 0..1000 {
|
|
|
- let (perf_stat, (_cred, _bridgeline)) = th.open_invite();
|
|
|
+ for _ in 0..1000 {
|
|
|
+ let (perf_stat, _) = th.open_invite();
|
|
|
req_size.push(perf_stat.req_len as f64);
|
|
|
req_t_size.push(perf_stat.req_t.as_secs_f64());
|
|
|
resp_size.push(perf_stat.resp_len as f64);
|
|
|
@@ -837,8 +837,8 @@ fn protocol_tests() {
|
|
|
let resp_handle_t_std_dev =
|
|
|
standard_deviation(&resp_handle_t_size, Some(mean_resp_handle_t_size));
|
|
|
|
|
|
- println!("Average Request Size = {:?}", mean_req_size);
|
|
|
- println!("Request Standard Deviation = {:?}", req_std_dev);
|
|
|
+ println!("Average Request Size = {}", mean_req_size);
|
|
|
+ println!("Request Standard Deviation = {}", req_std_dev);
|
|
|
println!(
|
|
|
"Average Request Time = {:?}",
|
|
|
Duration::from_secs_f64(mean_req_t_size)
|
|
|
@@ -847,8 +847,8 @@ fn protocol_tests() {
|
|
|
"Request time Standard Deviation = {:?}",
|
|
|
Duration::from_secs_f64(req_t_std_dev)
|
|
|
);
|
|
|
- println!("Average Response Size = {:?}", mean_resp_size);
|
|
|
- println!("Response Standard Deviation = {:?}", resp_std_dev);
|
|
|
+ println!("Average Response Size = {}", mean_resp_size);
|
|
|
+ println!("Response Standard Deviation = {}", resp_std_dev);
|
|
|
println!(
|
|
|
"Average Response Time = {:?}",
|
|
|
Duration::from_secs_f64(mean_resp_t_size)
|
|
|
@@ -889,8 +889,8 @@ fn protocol_tests() {
|
|
|
let mut req_t_size2: Vec<f64> = Vec::new();
|
|
|
let mut resp_t_size2: Vec<f64> = Vec::new();
|
|
|
let mut resp_handle_t_size2: Vec<f64> = Vec::new();
|
|
|
- for _i in 0..1000 {
|
|
|
- let (perf_stat2, (_cred2, _bridgeline2)) = th.open_invite();
|
|
|
+ for _ in 0..1000 {
|
|
|
+ let (perf_stat2, _) = th.open_invite();
|
|
|
req_size2.push(perf_stat2.req_len as f64);
|
|
|
req_t_size2.push(perf_stat2.req_t.as_secs_f64());
|
|
|
resp_size2.push(perf_stat2.resp_len as f64);
|
|
|
@@ -909,8 +909,8 @@ fn protocol_tests() {
|
|
|
let resp_handle_t_std_dev2 =
|
|
|
standard_deviation(&resp_handle_t_size2, Some(mean_resp_handle_t_size2));
|
|
|
|
|
|
- println!("Average Request size = {:?}", mean_req_size2);
|
|
|
- println!("Request Standard Deviation = {:?}", req_std_dev2);
|
|
|
+ println!("Average Request size = {}", mean_req_size2);
|
|
|
+ println!("Request Standard Deviation = {}", req_std_dev2);
|
|
|
println!(
|
|
|
"Average Request Time = {:?}",
|
|
|
Duration::from_secs_f64(mean_req_t_size)
|
|
|
@@ -919,8 +919,8 @@ fn protocol_tests() {
|
|
|
"Request time Standard Deviation = {:?}",
|
|
|
Duration::from_secs_f64(req_t_std_dev2)
|
|
|
);
|
|
|
- println!("Average Response size = {:?}", mean_resp_size2);
|
|
|
- println!("Response Standard Deviation = {:?}", resp_std_dev2);
|
|
|
+ println!("Average Response size = {}", mean_resp_size2);
|
|
|
+ println!("Response Standard Deviation = {}", resp_std_dev2);
|
|
|
println!(
|
|
|
"Average Response Time = {:?}",
|
|
|
Duration::from_secs_f64(mean_resp_t_size2)
|
onyinyang