MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-03-31 09:43:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some reqwest upgrade brokenness in benches

Browse Source
This commit is contained in:
Scott Lamb 2020-02-16 23:58:07 -08:00
parent f7da085335
commit a26c3d1649
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mp4.rs
View File

@ -2338,19 +2338,20 @@ mod bench {
testutil::init(); testutil::init();
let server = &*SERVER; let server = &*SERVER;
let p = server.generated_len; let p = server.generated_len;
let mut buf = Vec::with_capacity(p as usize);
b.bytes = p; b.bytes = p;
let client = reqwest::Client::new(); let client = reqwest::Client::new();
let mut rt = tokio::runtime::Runtime::new().unwrap();
let mut run = || { let mut run = || {
let mut resp = rt.block_on(async {
client.get(server.url.clone()) let resp =
.header(reqwest::header::RANGE, format!("bytes=0-{}", p - 1)) client.get(server.url.clone())
.send() .header(reqwest::header::RANGE, format!("bytes=0-{}", p - 1))
.unwrap(); .send()
buf.clear(); .await
use std::io::Read; .unwrap();
let size = resp.read_to_end(&mut buf).unwrap(); let b = resp.bytes().await.unwrap();
assert_eq!(p, size as u64); assert_eq!(p, b.len() as u64);
});
}; };
run(); // warm. run(); // warm.
b.iter(run); b.iter(run);

12
src/web.rs
View File

@ -1398,14 +1398,14 @@ mod bench {
let server = &*SERVER; let server = &*SERVER;
let url = reqwest::Url::parse(&format!("{}/api/cameras/{}/main/recordings", server.base_url, let url = reqwest::Url::parse(&format!("{}/api/cameras/{}/main/recordings", server.base_url,
server.test_camera_uuid)).unwrap(); server.test_camera_uuid)).unwrap();
let mut buf = Vec::new();
let client = reqwest::Client::new(); let client = reqwest::Client::new();
let mut rt = tokio::runtime::Runtime::new().unwrap();
let mut f = || { let mut f = || {
let mut resp = client.get(url.clone()).send().unwrap(); rt.block_on(async {
assert_eq!(resp.status(), reqwest::StatusCode::OK); let resp = client.get(url.clone()).send().await.unwrap();
buf.clear(); assert_eq!(resp.status(), reqwest::StatusCode::OK);
use std::io::Read; let _b = resp.bytes().await.unwrap();
resp.read_to_end(&mut buf).unwrap(); });
}; };
f(); // warm. f(); // warm.
b.iter(f); b.iter(f);