bump nofile limit

zephyrchien · Aug 28, 2022 · 91671f0 · 91671f0
1 parent f392cb7
commit 91671f0
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cmd/Cargo.toml b/cmd/Cargo.toml
@@ -10,7 +10,8 @@ license = "GPL-3.0"
 
 [dependencies]
 anyhow = "1"
-realm_io = "0.3.2"
+realm_io = "0.3.4"
+realm_syscall = "0.1.6"
 kaminari = { version = "0.9.2", features = ["ws"] }
 tokio = { version = "1.9", features = ["rt", "net", "macros"] }
 

diff --git a/cmd/src/client.rs b/cmd/src/client.rs
@@ -9,7 +9,7 @@ use kaminari::trick::Ref;
 use kaminari::AsyncConnect;
 use kaminari::nop::NopConnect;
 use kaminari::ws::WsConnect;
-#[cfg(any(feature="tls-rustls", feature="tls-openssl"))]
+#[cfg(any(feature = "tls-rustls", feature = "tls-openssl"))]
 use kaminari::tls::TlsConnect;
 
 use kaminari_cmd::{Endpoint, parse_cmd, parse_env};
@@ -19,7 +19,7 @@ async fn main() -> Result<()> {
     let (Endpoint { local, remote }, options) = parse_env().or_else(|_| parse_cmd())?;
 
     let ws = opt::get_ws_conf(&options);
-    #[cfg(any(feature="tls-rustls", feature="tls-openssl"))]
+    #[cfg(any(feature = "tls-rustls", feature = "tls-openssl"))]
     let tls = opt::get_tls_client_conf(&options);
 
     eprintln!("listen: {}", &local);
@@ -29,13 +29,16 @@ async fn main() -> Result<()> {
         eprintln!("ws: {}", ws)
     }
 
-    #[cfg(any(feature="tls-rustls", feature="tls-openssl"))]
+    #[cfg(any(feature = "tls-rustls", feature = "tls-openssl"))]
     if let Some(tls) = &tls {
         eprintln!("tls: {}", &tls);
     }
 
     let lis = TcpListener::bind(local).await?;
 
+    #[cfg(all(unix, not(target_os = "android")))]
+    let _ = realm_syscall::bump_nofile_limit();
+
     macro_rules! run {
         ($cc: expr) => {
             println!("connect: {}", $cc.as_ref());
@@ -75,7 +78,7 @@ async fn main() -> Result<()> {
         }
     }
 
-    #[cfg(any(feature="tls-rustls", feature="tls-openssl"))]
+    #[cfg(any(feature = "tls-rustls", feature = "tls-openssl"))]
     match (ws, tls) {
         (None, None) => {
             let client = NopConnect {};
@@ -95,7 +98,7 @@ async fn main() -> Result<()> {
         }
     };
 
-    #[cfg(not(any(feature="tls-rustls", feature="tls-openssl")))]
+    #[cfg(not(any(feature = "tls-rustls", feature = "tls-openssl")))]
     if let Some(ws) = ws {
         let client = WsConnect::new(NopConnect {}, ws);
         run_ws_each!(client);

diff --git a/cmd/src/server.rs b/cmd/src/server.rs
@@ -9,7 +9,7 @@ use kaminari::trick::Ref;
 use kaminari::AsyncAccept;
 use kaminari::nop::NopAccept;
 use kaminari::ws::WsAccept;
-#[cfg(any(feature="tls-rustls", feature="tls-openssl"))]
+#[cfg(any(feature = "tls-rustls", feature = "tls-openssl"))]
 use kaminari::tls::TlsAccept;
 
 use kaminari_cmd::{Endpoint, parse_cmd, parse_env};
@@ -30,7 +30,7 @@ async fn main() -> Result<()> {
 
     let ws = opt::get_ws_conf(&options);
 
-    #[cfg(any(feature="tls-rustls", feature="tls-openssl"))]
+    #[cfg(any(feature = "tls-rustls", feature = "tls-openssl"))]
     let tls = opt::get_tls_server_conf(&options);
 
     eprintln!("listen: {}", &local);
@@ -40,13 +40,16 @@ async fn main() -> Result<()> {
         eprintln!("ws: {}", ws)
     }
 
-    #[cfg(any(feature="tls-rustls", feature="tls-openssl"))]
+    #[cfg(any(feature = "tls-rustls", feature = "tls-openssl"))]
     if let Some(tls) = &tls {
         eprintln!("tls: {}", &tls);
     }
 
     let lis = TcpListener::bind(local).await?;
 
+    #[cfg(all(unix, not(target_os = "android")))]
+    let _ = realm_syscall::bump_nofile_limit();
+
     macro_rules! run {
         ($ac: expr) => {
             println!("accept: {}", $ac.as_ref());
@@ -64,7 +67,7 @@ async fn main() -> Result<()> {
         };
     }
 
-    #[cfg(any(feature="tls-rustls", feature="tls-openssl"))]
+    #[cfg(any(feature = "tls-rustls", feature = "tls-openssl"))]
     match (ws, tls) {
         (None, None) => {
             let server = NopAccept {};
@@ -84,7 +87,7 @@ async fn main() -> Result<()> {
         }
     };
 
-    #[cfg(not(any(feature="tls-rustls", feature="tls-openssl")))]
+    #[cfg(not(any(feature = "tls-rustls", feature = "tls-openssl")))]
     if let Some(ws) = ws {
         let server = WsAccept::new(NopAccept {}, ws);
         run!(Ref::new(&server));