fix benches broken with 0282435

scottlamb · Oct 16, 2023 · 33e6a18 · 33e6a18
1 parent 1944f95
commit 33e6a18
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/src/mp4.rs b/server/src/mp4.rs
@@ -3070,7 +3070,7 @@ mod bench {
     #[bench]
     fn serve_generated_bytes(b: &mut test::Bencher) {
         testutil::init();
-        let server = server.get_or_init(BenchServer::new);
+        let server = SERVER.get_or_init(BenchServer::new);
         let p = server.generated_len;
         b.bytes = p;
         let client = reqwest::Client::new();

diff --git a/server/src/web/mod.rs b/server/src/web/mod.rs
@@ -783,7 +783,7 @@ mod bench {
 
     use db::testutil::{self, TestDb};
     use hyper;
-    use std::sync::Arc;
+    use std::sync::{Arc, OnceLock};
     use uuid::Uuid;
 
     struct Server {
@@ -840,12 +840,12 @@ mod bench {
         }
     }
 
-    static SERVER: once_cell::sync::Lazy<Server> = once_cell::sync::Lazy::new(Server::new);
+    static SERVER: OnceLock<Server> = OnceLock::new();
 
     #[bench]
     fn serve_stream_recordings(b: &mut test::Bencher) {
         testutil::init();
-        let server = &*SERVER;
+        let server = SERVER.get_or_init(Server::new);
         let url = reqwest::Url::parse(&format!(
             "{}/api/cameras/{}/main/recordings",
             server.base_url, server.test_camera_uuid