Merge pull request #77 from sansing/perf/optimise-memory-allocations

rholshausen · web-flow · commit 475c3441f36d · 2025-05-09T16:26:34.000+10:00
Optimise memory allocations
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,6 +22,7 @@ http = "0.2.9"
 hyper = { version = "0.14.26", features = ["full"] }
 itertools = "0.10.5"
 maplit = "1.0.2"
+mimalloc = "0.1.46"
 pact_matching = "~1.1.0"
 pact_verifier = "~1.0.0"
 pact_models = "~1.1.2"
diff --git a/src/main.rs b/src/main.rs
@@ -90,6 +90,7 @@ use std::str::FromStr;
 
 use clap::{Command, Arg, ArgMatches, ArgAction, command, crate_version};
 use clap::error::ErrorKind;
+use mimalloc::MiMalloc;
 use pact_models::prelude::*;
 use regex::Regex;
 use tracing::{debug, error, info, warn};
@@ -103,6 +104,9 @@ mod pact_support;
 mod server;
 mod loading;
 
+#[global_allocator]
+static GLOBAL: MiMalloc = MiMalloc;
+
 #[tokio::main]
 async fn main() -> Result<(), ExitCode> {
   let args: Vec<String> = env::args().collect();
diff --git a/src/server.rs b/src/server.rs
@@ -1,6 +1,7 @@
 use std::future::{Ready, ready};
 use std::pin::Pin;
 use std::process::ExitCode;
+use std::sync::Arc;
 
 use anyhow::anyhow;
 use futures::executor::block_on;
@@ -29,6 +30,10 @@ use crate::{pact_support, PactSource};
 
 #[derive(Clone)]
 pub struct ServerHandler {
+  shared: Arc<Shared>,
+}
+
+pub struct Shared {
   sources: Vec<(V4Pact, PactSource)>,
   auto_cors: bool,
   cors_referer: bool,
@@ -45,7 +50,7 @@ struct ServerHandlerFactory {
 impl ServerHandlerFactory {
   pub fn new(handler: ServerHandler) -> Self {
     ServerHandlerFactory {
-      inner: handler
+      inner: handler,
     }
   }
 }
@@ -79,12 +84,14 @@ impl ServerHandler {
     empty_provider_states: bool
   ) ->  ServerHandler {
     ServerHandler {
-      sources,
-      auto_cors,
-      cors_referer,
-      provider_state,
-      provider_state_header_name,
-      empty_provider_states
+      shared: Arc::new(Shared {
+        sources,
+        auto_cors,
+        cors_referer,
+        provider_state,
+        provider_state_header_name,
+        empty_provider_states
+      })
     }
   }
 
@@ -118,12 +125,13 @@ impl Service<HyperRequest<Body>> for ServerHandler {
   }
 
   fn call(&mut self, req: HyperRequest<Body>) -> Self::Future {
-    let auto_cors = self.auto_cors;
-    let cors_referer = self.cors_referer;
-    let sources = self.sources.clone();
-    let provider_state = self.provider_state.clone();
-    let provider_state_header_name = self.provider_state_header_name.clone();
-    let empty_provider_states = self.empty_provider_states;
+    let shared = self.shared.as_ref();
+    let auto_cors = shared.auto_cors;
+    let cors_referer = shared.cors_referer;
+    let sources = shared.sources.clone();
+    let provider_state = shared.provider_state.clone();
+    let provider_state_header_name = shared.provider_state_header_name.clone();
+    let empty_provider_states = shared.empty_provider_states;
 
     Box::pin(async move {
       let (parts, body) = req.into_parts();
