tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/client/http_client.rs: use async for upload_speedtest()

Browse Source
This commit is contained in:
Dietmar Maurer 2019-09-06 08:55:47 +02:00
parent bbd055bf45
commit 54a5a885a3
1 changed files with 23 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/client/http_client.rs
View File

@ -993,7 +993,7 @@ impl BackupClient {
}) })
} }
pub fn upload_speedtest(&self) -> impl Future<Output = Result<usize, Error>> { pub async fn upload_speedtest(&self) -> Result<usize, Error> {
let mut data = vec![]; let mut data = vec![];
// generate pseudo random byte sequence // generate pseudo random byte sequence
@ -1006,52 +1006,36 @@ impl BackupClient {
let item_len = data.len(); let item_len = data.len();
let repeat = Arc::new(AtomicUsize::new(0)); let mut repeat = 0;
let repeat2 = repeat.clone();
let (upload_queue, upload_result) = Self::response_queue(); let (upload_queue, upload_result) = Self::response_queue();
let start_time = std::time::Instant::now(); let start_time = std::time::Instant::now();
let h2 = self.h2.clone(); loop {
repeat += 1;
if start_time.elapsed().as_secs() >= 5 {
break;
}
futures::stream::repeat(data) let mut upload_queue = upload_queue.clone();
.take_while(move |_| {
let repeat = Arc::clone(&repeat);
async move {
repeat.fetch_add(1, Ordering::SeqCst);
start_time.elapsed().as_secs() < 5
}
})
.map(Ok)
.try_for_each(move |data| {
let h2 = h2.clone();
let mut upload_queue = upload_queue.clone(); println!("send test data ({} bytes)", data.len());
let request = H2Client::request_builder("localhost", "POST", "speedtest", None).unwrap();
let request_future = self.h2.send_request(request, Some(bytes::Bytes::from(data.clone()))).await?;
println!("send test data ({} bytes)", data.len()); upload_queue.send(request_future).await?;
let request = H2Client::request_builder("localhost", "POST", "speedtest", None).unwrap(); }
h2.send_request(request, Some(bytes::Bytes::from(data)))
.and_then(move |response| async move { drop(upload_queue); // close queue
upload_queue
.send(response) let _ = upload_result.await?;
.await
.map_err(Error::from) println!("Uploaded {} chunks in {} seconds.", repeat, start_time.elapsed().as_secs());
}) let speed = ((item_len*1000000*(repeat as usize))/(1024*1024))/(start_time.elapsed().as_micros() as usize);
}) println!("Time per request: {} microseconds.", (start_time.elapsed().as_micros())/(repeat as u128));
.then(move |result| async move {
println!("RESULT {:?}", result); Ok(speed)
upload_result.await?.and(result)
})
.and_then(move |_| {
let repeat = repeat2.load(Ordering::SeqCst);
println!("Uploaded {} chunks in {} seconds.", repeat, start_time.elapsed().as_secs());
let speed = ((item_len*1000000*(repeat as usize))/(1024*1024))/(start_time.elapsed().as_micros() as usize);
if repeat > 0 {
println!("Time per request: {} microseconds.", (start_time.elapsed().as_micros())/(repeat as u128));
}
futures::future::ok(speed)
})
} }
} }