remove h2 lock as well. rama backend http client is now lock-free at …

…the surface
plabayo · Dec 28, 2024 · 662c97a · 662c97a
1 parent 444547b
commit 662c97a
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 18 deletions.
diff --git a/rama-http-backend/src/client/conn.rs b/rama-http-backend/src/client/conn.rs
@@ -11,7 +11,6 @@ use rama_net::{
 
 use rama_utils::macros::define_inner_service_accessors;
 use std::fmt;
-use tokio::sync::Mutex;
 use tracing::trace;
 
 #[cfg(any(feature = "rustls", feature = "boring"))]
@@ -115,7 +114,7 @@ where
                     }
                 });
 
-                let svc = HttpClientService(SendRequest::Http2(Mutex::new(sender)));
+                let svc = HttpClientService(SendRequest::Http2(sender));
 
                 Ok(EstablishedClientConnection {
                     ctx,

diff --git a/rama-http-backend/src/client/svc.rs b/rama-http-backend/src/client/svc.rs
@@ -9,14 +9,11 @@ use rama_http_types::{
     Method, Request, Response, Version,
 };
 use rama_net::{address::ProxyAddress, http::RequestContext};
-use tokio::sync::Mutex;
 
 #[derive(Debug)]
-// TODO: once we have hyper as `rama_core` we can
-// drop this mutex as there is no inherint reason for `sender` to be mutable...
 pub(super) enum SendRequest<Body> {
     Http1(rama_http_core::client::conn::http1::SendRequest<Body>),
-    Http2(Mutex<rama_http_core::client::conn::http2::SendRequest<Body>>),
+    Http2(rama_http_core::client::conn::http2::SendRequest<Body>),
 }
 
 #[derive(Debug)]
@@ -48,7 +45,7 @@ where
 
         let resp = match &self.0 {
             SendRequest::Http1(sender) => sender.send_request(req).await,
-            SendRequest::Http2(sender) => sender.lock().await.send_request(req).await,
+            SendRequest::Http2(sender) => sender.send_request(req).await,
         }?;
 
         Ok(resp.map(rama_http_types::Body::new))

diff --git a/rama-http-core/src/client/conn/http2.rs b/rama-http-core/src/client/conn/http2.rs
@@ -124,7 +124,7 @@ where
     /// Absolute-form `Uri`s are not required. If received, they will be serialized
     /// as-is.
     pub fn send_request(
-        &mut self,
+        &self,
         req: Request<B>,
     ) -> impl Future<Output = crate::Result<Response<IncomingBody>>> {
         let sent = self.dispatch.send(req);

diff --git a/rama-http-core/src/client/dispatch.rs b/rama-http-core/src/client/dispatch.rs
@@ -136,7 +136,7 @@ impl<T, U> UnboundedSender<T, U> {
             .map_err(|mut e| (e.0).0.take().expect("envelope not dropped").0)
     }
 
-    pub(crate) fn send(&mut self, val: T) -> Result<Promise<U>, T> {
+    pub(crate) fn send(&self, val: T) -> Result<Promise<U>, T> {
         let (tx, rx) = oneshot::channel();
         self.inner
             .send(Envelope(Some((val, Callback::NoRetry(Some(tx))))))

diff --git a/rama-http-core/src/server/conn/auto.rs b/rama-http-core/src/server/conn/auto.rs
@@ -816,7 +816,7 @@ mod tests {
     #[tokio::test]
     async fn http2() {
         let addr = start_server(false, false).await;
-        let mut sender = connect_h2(addr).await;
+        let sender = connect_h2(addr).await;
 
         let response = sender
             .send_request(Request::new(Empty::<Bytes>::new()))
@@ -832,7 +832,7 @@ mod tests {
     #[tokio::test]
     async fn http2_only() {
         let addr = start_server(false, true).await;
-        let mut sender = connect_h2(addr).await;
+        let sender = connect_h2(addr).await;
 
         let response = sender
             .send_request(Request::new(Empty::<Bytes>::new()))
@@ -876,7 +876,7 @@ mod tests {
     #[tokio::test]
     async fn http1_only_fail_if_client_is_http2() {
         let addr = start_server(true, false).await;
-        let mut sender = connect_h2(addr).await;
+        let sender = connect_h2(addr).await;
 
         let _ = sender
             .send_request(Request::new(Empty::<Bytes>::new()))

diff --git a/tests/http-core/client.rs b/tests/http-core/client.rs
@@ -2315,7 +2315,7 @@ mod conn {
         let (tx2, rx2) = oneshot::channel::<()>();
         let mut rxs = vec![rx, rx2];
         for _i in 0..requests {
-            let mut client = clients.pop().unwrap();
+            let client = clients.pop().unwrap();
             let rx = rxs.pop().unwrap();
             let req = Request::builder()
                 .method(Method::CONNECT)
@@ -2530,7 +2530,7 @@ mod conn {
         });
 
         let io = tcp_connect(&addr).await.expect("tcp connect");
-        let (mut client, conn) = conn::http2::Builder::new(Executor::new())
+        let (client, conn) = conn::http2::Builder::new(Executor::new())
             .handshake(io)
             .await
             .expect("http handshake");
@@ -2585,7 +2585,7 @@ mod conn {
         });
 
         let io = tcp_connect(&addr).await.expect("tcp connect");
-        let (mut client, conn) = conn::http2::Builder::new(Executor::new())
+        let (client, conn) = conn::http2::Builder::new(Executor::new())
             .handshake(io)
             .await
             .expect("http handshake");
@@ -2635,7 +2635,7 @@ mod conn {
         });
 
         let io = tcp_connect(&addr).await.expect("tcp connect");
-        let (mut client, conn) = conn::http2::Builder::new(Executor::new())
+        let (client, conn) = conn::http2::Builder::new(Executor::new())
             .handshake::<_, Empty<Bytes>>(io)
             .await
             .expect("http handshake");

diff --git a/tests/http-core/support/mod.rs b/tests/http-core/support/mod.rs
@@ -449,7 +449,7 @@ async fn async_test(cfg: __TestConfig) {
             let stream = TcpStream::connect(addr).await.unwrap();
 
             let res = if http2_only {
-                let (mut sender, conn) =
+                let (sender, conn) =
                     rama::http::core::client::conn::http2::Builder::new(Executor::new())
                         .handshake(stream)
                         .await
@@ -550,7 +550,7 @@ async fn naive_proxy(cfg: ProxyConfig) -> (SocketAddr, impl Future<Output = ()>)
                                 .unwrap();
 
                             let result = if http2_only {
-                                let (mut sender, conn) =
+                                let (sender, conn) =
                                     rama::http::core::client::conn::http2::Builder::new(
                                         Executor::new(),
                                     )