add buffer_params() api

.github/workflows/linux.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - 1.45.0 # MSRV
+          - 1.46.0 # MSRV
           - stable
           - nightly
 
@@ -43,7 +43,7 @@ jobs:
           key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache cargo tarpaulin
-        if: matrix.version == '1.45.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        if: matrix.version == '1.46.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
         uses: actions/cache@v1
         with:
           path: ~/.cargo/bin
@@ -57,19 +57,19 @@ jobs:
           args: --all --all-features --no-fail-fast -- --nocapture
 
       - name: Install tarpaulin
-        if: matrix.version == '1.45.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        if: matrix.version == '1.46.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
         continue-on-error: true
         run: |
           cargo install cargo-tarpaulin
 
       - name: Generate coverage report
-        if: matrix.version == '1.45.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        if: matrix.version == '1.46.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
         continue-on-error: true
         run: |
           cargo tarpaulin --out Xml --all --all-features
 
       - name: Upload to Codecov
-        if: matrix.version == '1.45.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        if: matrix.version == '1.46.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
         continue-on-error: true
         uses: codecov/codecov-action@v1
         with:

ntex/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.3.10] - 2021-03-15
+
+* add buffer_params() api
+
 ## [0.3.9] - 2021-03-15
 
 * framed: refactor api

ntex/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex"
-version = "0.3.9"
+version = "0.3.10"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Framework for composable network services"
 readme = "README.md"

ntex/README.md

@@ -7,7 +7,7 @@
 [![codecov](https://codecov.io/gh/ntex-rs/ntex/branch/master/graph/badge.svg)](https://codecov.io/gh/ntex-rs/ntex) 
 [![crates.io](https://meritbadge.herokuapp.com/ntex)](https://crates.io/crates/ntex) 
 [![Documentation](https://docs.rs/ntex/badge.svg)](https://docs.rs/ntex) 
-[![Version](https://img.shields.io/badge/rustc-1.45+-lightgray.svg)](https://blog.rust-lang.org/2020/03/12/Rust-1.45.html) 
+[![Version](https://img.shields.io/badge/rustc-1.46+-lightgray.svg)](https://blog.rust-lang.org/2020/08/27/Rust-1.46.0.html) 
 ![License](https://img.shields.io/crates/l/ntex.svg) 
 
   </p>
@@ -24,7 +24,7 @@
 ## Documentation & community resources
 
 * [Documentation](https://docs.rs/ntex)
-* Minimum supported Rust version: 1.45 or later
+* Minimum supported Rust version: 1.46 or later
 
 ## License
 

ntex/src/framed/dispatcher.rs

@@ -685,7 +685,7 @@ mod tests {
                 }
             }),
         );
-        state.set_buffer_sizes(8 * 1024, 16 * 1024, 1024);
+        state.set_buffer_params(8 * 1024, 16 * 1024, 1024);
         crate::rt::spawn(disp.map(|_| ()));
 
         let buf = client.read_any();

ntex/src/framed/state.rs

@@ -191,7 +191,7 @@ impl State {
     /// Set read/write buffer sizes
     ///
     /// By default read max buf size is 8kb, write max buf size is 8kb
-    pub fn set_buffer_sizes(
+    pub fn set_buffer_params(
         &self,
         max_read_buf_size: u16,
         max_write_buf_size: u16,

ntex/src/http/builder.rs

@@ -114,30 +114,18 @@ where
     }
 
     #[inline]
-    /// Set read buffer high water mark size
+    /// Set read/write buffer params
     ///
-    /// By default read hw is 8kb
+    /// By default read buffer is 8kb, write buffer is 8kb
-    pub fn read_high_watermark(mut self, hw: u16) -> Self {
+    pub fn buffer_params(
-        self.read_hw = hw;
+        mut self,
-        self
+        max_read_buf_size: u16,
-    }
+        max_write_buf_size: u16,
-
+        min_buf_size: u16,
-    #[inline]
+    ) -> Self {
-    /// Set write buffer high watermark size
+        self.read_hw = max_read_buf_size;
-    ///
+        self.write_hw = max_write_buf_size;
-    /// By default write hw is 8kb
+        self.lw = min_buf_size;
-    pub fn write_high_watermark(mut self, hw: u16) -> Self {
-        self.write_hw = hw;
-        self
-    }
-
-    #[inline]
-    /// Set buffer low watermark size
-    ///
-    /// Low watermark is the same for read and write buffers.
-    /// By default low watermark value is 1kb.
-    pub fn low_watermark(mut self, lw: u16) -> Self {
-        self.lw = lw;
         self
     }
 
@@ -287,4 +275,28 @@ where
             .upgrade(self.upgrade)
             .on_connect(self.on_connect)
     }
+
+    #[inline]
+    #[doc(hidden)]
+    #[deprecated(since = "0.3.10")]
+    pub fn read_high_watermark(mut self, hw: u16) -> Self {
+        self.read_hw = hw;
+        self
+    }
+
+    #[inline]
+    #[doc(hidden)]
+    #[deprecated(since = "0.3.10")]
+    pub fn write_high_watermark(mut self, hw: u16) -> Self {
+        self.write_hw = hw;
+        self
+    }
+
+    #[inline]
+    #[doc(hidden)]
+    #[deprecated(since = "0.3.10")]
+    pub fn low_watermark(mut self, lw: u16) -> Self {
+        self.lw = lw;
+        self
+    }
 }

ntex/src/http/h1/dispatcher.rs

@@ -897,7 +897,7 @@ mod tests {
         client.remote_buffer_cap(4096);
 
         let mut h1 = h1(server, |_| ok::<_, io::Error>(Response::Ok().finish()));
-        h1.inner.state.set_buffer_sizes(16 * 1024, 16 * 1024, 1024);
+        h1.inner.state.set_buffer_params(16 * 1024, 16 * 1024, 1024);
 
         let mut decoder = ClientCodec::default();
 

ntex/src/web/server.rs

@@ -233,28 +233,43 @@ where
     }
 
     #[inline]
-    /// Set read buffer high water mark size
+    /// Set read/write buffer params
     ///
-    /// By default read hw is 8kb
+    /// By default read buffer is 8kb, write buffer is 8kb
+    pub fn buffer_params(
+        self,
+        max_read_buf_size: u16,
+        max_write_buf_size: u16,
+        min_buf_size: u16,
+    ) -> Self {
+        {
+            let mut cfg = self.config.lock().unwrap();
+            cfg.read_hw = max_read_buf_size;
+            cfg.write_hw = max_write_buf_size;
+            cfg.lw = min_buf_size;
+        }
+        self
+    }
+
+    #[inline]
+    #[doc(hidden)]
+    #[deprecated(since = "0.3.10")]
     pub fn read_high_watermark(self, hw: u16) -> Self {
         self.config.lock().unwrap().read_hw = hw;
         self
     }
 
     #[inline]
-    /// Set write buffer high watermark size
+    #[doc(hidden)]
-    ///
+    #[deprecated(since = "0.3.10")]
-    /// By default write hw is 8kb
     pub fn write_high_watermark(self, hw: u16) -> Self {
         self.config.lock().unwrap().write_hw = hw;
         self
     }
 
     #[inline]
-    /// Set buffer low watermark size
+    #[doc(hidden)]
-    ///
+    #[deprecated(since = "0.3.10")]
-    /// Low watermark is the same for read and write buffers.
-    /// By default low watermark value is 1kb.
     pub fn low_watermark(self, lw: u16) -> Self {
         self.config.lock().unwrap().lw = lw;
         self
@@ -284,9 +299,7 @@ where
                     .keep_alive(c.keep_alive)
                     .client_timeout(c.client_timeout)
                     .disconnect_timeout(c.client_disconnect)
-                    .low_watermark(c.lw)
+                    .buffer_params(c.read_hw, c.write_hw, c.lw)
-                    .read_high_watermark(c.read_hw)
-                    .write_high_watermark(c.write_hw)
                     .finish(map_config(factory(), move |_| cfg.clone()))
                     .tcp()
             },
@@ -331,9 +344,7 @@ where
                     .client_timeout(c.client_timeout)
                     .disconnect_timeout(c.client_disconnect)
                     .ssl_handshake_timeout(c.handshake_timeout)
-                    .low_watermark(c.lw)
+                    .buffer_params(c.read_hw, c.write_hw, c.lw)
-                    .read_high_watermark(c.read_hw)
-                    .write_high_watermark(c.write_hw)
                     .finish(map_config(factory(), move |_| cfg.clone()))
                     .openssl(acceptor.clone())
             },
@@ -378,9 +389,7 @@ where
                     .client_timeout(c.client_timeout)
                     .disconnect_timeout(c.client_disconnect)
                     .ssl_handshake_timeout(c.handshake_timeout)
-                    .low_watermark(c.lw)
+                    .buffer_params(c.read_hw, c.write_hw, c.lw)
-                    .read_high_watermark(c.read_hw)
-                    .write_high_watermark(c.write_hw)
                     .finish(map_config(factory(), move |_| cfg.clone()))
                     .rustls(config.clone())
             },
@@ -500,9 +509,7 @@ where
                 HttpService::build()
                     .keep_alive(c.keep_alive)
                     .client_timeout(c.client_timeout)
-                    .low_watermark(c.lw)
+                    .buffer_params(c.read_hw, c.write_hw, c.lw)
-                    .read_high_watermark(c.read_hw)
-                    .write_high_watermark(c.write_hw)
                     .finish(map_config(factory(), move |_| config.clone())),
             )
         })?;
@@ -541,9 +548,7 @@ where
                         HttpService::build()
                             .keep_alive(c.keep_alive)
                             .client_timeout(c.client_timeout)
-                            .low_watermark(c.lw)
+                            .buffer_params(c.read_hw, c.write_hw, c.lw)
-                            .read_high_watermark(c.read_hw)
-                            .write_high_watermark(c.write_hw)
                             .finish(map_config(factory(), move |_| config.clone())),
                     )
             },