diff --git a/Cargo.lock b/Cargo.lock index 2cbd2ad..00af942 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -261,9 +261,9 @@ dependencies = [ [[package]] name = "http-compress" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9193af93a7140e2dceb75e23a33bc773cc322a95297469dd504b4f9cbcf3be8" +checksum = "2518cbad4dfd83796e59f4b0f5823dfb34c3f3a4e514636879bd9ae01f23b7ad" dependencies = [ "brotli", "flate2", @@ -283,9 +283,9 @@ dependencies = [ [[package]] name = "http-request" -version = "8.26.0" +version = "8.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3921be374856846ca232a370b84a974610a40da3282a252934fb0ac59375e634" +checksum = "ae0e73b11c2459053a4a961300f76e54d976562c173e93334c6f5d446ff377a6" dependencies = [ "brotli", "flate2", @@ -304,9 +304,9 @@ dependencies = [ [[package]] name = "http-type" -version = "2.20.0" +version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0b5ad0e7eab207dbda362915705f10caf225e73d23b4b3f2c1b2198e596ec9" +checksum = "012401e580fe453f714fe4a3fb5792ed54d0645e70f38f41151c3a5a0dead2f3" dependencies = [ "hex", "http-constant", @@ -320,7 +320,7 @@ dependencies = [ [[package]] name = "hyperlane" -version = "2.30.0" +version = "2.31.0" dependencies = [ "color-output", "http-request", @@ -333,9 +333,9 @@ dependencies = [ [[package]] name = "hyperlane-log" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d686e0afc70fe39965a18ace59f155f3dead96345ea866f80f00114a6bdbd26" +checksum = "c62db1495b844f2b761cef98710ba89ac6d85a21c160b235e8ae7fd396d279fe" dependencies = [ "http-type", "hyperlane-time", diff --git a/Cargo.toml b/Cargo.toml index ed21d5e..48fc758 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hyperlane" -version = "2.30.0" +version = "2.31.0" edition = "2021" authors = ["ltpp-universe "] license = "MIT" @@ -17,9 +17,9 @@ exclude = [ [dependencies] color-output = "6.1.4" -http-request = "8.26.0" -http-type = "2.20.0" -hyperlane-log = "0.15.0" +http-request = "8.29.0" +http-type = "2.21.0" +hyperlane-log = "0.16.0" hyperlane-time = "0.0.1" lombok-macros = "1.5.0" std-macro-extensions = "0.17.6" diff --git a/src/server/config/impl.rs b/src/server/config/impl.rs index 8f152ee..94f1541 100644 --- a/src/server/config/impl.rs +++ b/src/server/config/impl.rs @@ -2,6 +2,7 @@ use super::r#type::ServerConfig; use crate::*; impl<'a> Default for ServerConfig<'a> { + #[inline] fn default() -> Self { Self { host: DEFAULT_HOST, diff --git a/src/server/controller_data/impl.rs b/src/server/controller_data/impl.rs index 374233b..8d239f3 100644 --- a/src/server/controller_data/impl.rs +++ b/src/server/controller_data/impl.rs @@ -3,6 +3,7 @@ use http_type::{Request, Response}; use hyperlane_log::*; impl ControllerData { + #[inline] pub fn new() -> Self { ControllerData { stream: None, diff --git a/src/server/error/impl.rs b/src/server/error/impl.rs index 3cec9a7..a1a53f8 100644 --- a/src/server/error/impl.rs +++ b/src/server/error/impl.rs @@ -8,6 +8,7 @@ use std::{ impl StdError for Error {} impl Display for Error { + #[inline] fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { Self::TcpBindError(data) => write!(f, "Tcp bind error{}{}", COLON_SPACE, data), diff --git a/src/server/impl.rs b/src/server/impl.rs index 9e0dfb0..b0f5707 100644 --- a/src/server/impl.rs +++ b/src/server/impl.rs @@ -14,6 +14,7 @@ use hyperlane_time::*; use std_macro_extensions::*; impl Default for Server { + #[inline] fn default() -> Self { Self { cfg: Arc::new(RwLock::new(ServerConfig::default())), @@ -25,10 +26,12 @@ impl Default for Server { } impl Server { + #[inline] pub fn new() -> Self { Self::default() } + #[inline] pub fn host(&mut self, host: &'static str) -> &mut Self { let _ = self.get_cfg().write().and_then(|mut cfg| { cfg.set_host(host); @@ -37,6 +40,7 @@ impl Server { self } + #[inline] pub fn port(&mut self, port: usize) -> &mut Self { let _ = self.get_cfg().write().and_then(|mut cfg| { cfg.set_port(port); @@ -45,6 +49,7 @@ impl Server { self } + #[inline] pub fn thread_pool_size(&mut self, thread_pool_size: usize) -> &mut Self { let _ = self.get_cfg().write().and_then(|mut cfg| { cfg.set_thread_pool_size(thread_pool_size); @@ -53,6 +58,7 @@ impl Server { self } + #[inline] pub fn log_dir(&mut self, log_dir: &'static str) -> &mut Self { let _ = self.get_cfg().write().and_then(|mut cfg| { cfg.set_log_dir(log_dir); @@ -65,6 +71,7 @@ impl Server { self } + #[inline] pub fn log_size(&mut self, log_size: usize) -> &mut Self { let _ = self.get_cfg().write().and_then(|mut cfg| { cfg.set_log_size(log_size); @@ -77,6 +84,7 @@ impl Server { self } + #[inline] pub fn router(&mut self, route: &'static str, func: F) -> &mut Self where F: 'static + Send + Sync + Fn(&mut ControllerData), @@ -87,6 +95,7 @@ impl Server { self } + #[inline] pub fn middleware(&mut self, func: F) -> &mut Self where F: 'static + Send + Sync + Fn(&mut ControllerData), @@ -97,10 +106,12 @@ impl Server { self } + #[inline] fn common_log(data: &String) -> String { format!("{}: {}{}", current_time(), data.to_string(), HTTP_BR) } + #[inline] pub fn listen(&mut self) -> &mut Self { self.init(); let mut host: &str = EMPTY_STR; @@ -194,6 +205,7 @@ impl Server { self } + #[inline] fn init_log(&self) { let _ = self.get_tmp().read().and_then(|tmp| { log_run(tmp.get_log()); @@ -201,6 +213,7 @@ impl Server { }); } + #[inline] fn init(&self) { self.init_log(); } diff --git a/src/server/thread_pool/impl.rs b/src/server/thread_pool/impl.rs index 9a17d29..f4cd97b 100644 --- a/src/server/thread_pool/impl.rs +++ b/src/server/thread_pool/impl.rs @@ -4,6 +4,7 @@ use crate::*; use std::sync::mpsc::{self, Receiver}; impl ThreadPool { + #[inline] pub fn new(size: usize) -> ThreadPool { let (sender, receiver) = mpsc::channel(); let receiver: ArcMutex>> = Arc::new(Mutex::new(receiver)); @@ -14,6 +15,7 @@ impl ThreadPool { ThreadPool { workers, sender } } + #[inline] pub fn execute(&self, job: F) where F: FnOnce() + Send + 'static, diff --git a/src/server/tmp/impl.rs b/src/server/tmp/impl.rs index 890cf48..4324bda 100644 --- a/src/server/tmp/impl.rs +++ b/src/server/tmp/impl.rs @@ -2,6 +2,7 @@ use super::r#type::Tmp; use crate::*; impl Default for Tmp { + #[inline] fn default() -> Self { Self { running_thread_num: Arc::new(Mutex::new(0)), @@ -11,6 +12,7 @@ impl Default for Tmp { } impl Tmp { + #[inline] pub fn add_thread_num(&mut self) { let _ = self .running_thread_num @@ -21,6 +23,7 @@ impl Tmp { }); } + #[inline] pub fn sub_thread_num(&mut self) { let _ = self .running_thread_num diff --git a/src/server/worker/impl.rs b/src/server/worker/impl.rs index 9da78e6..26c2a14 100644 --- a/src/server/worker/impl.rs +++ b/src/server/worker/impl.rs @@ -4,6 +4,7 @@ use crate::*; use std::{sync::mpsc::Receiver, thread::spawn}; impl Worker { + #[inline] pub fn new(id: usize, receiver: ArcMutex>) -> Worker { let thread = spawn(move || loop { let job = receiver.lock().unwrap().recv().unwrap(); diff --git a/src/utils/thread.rs b/src/utils/thread.rs index 60a7b32..51ca964 100644 --- a/src/utils/thread.rs +++ b/src/utils/thread.rs @@ -1,3 +1,4 @@ +#[inline] pub fn get_thread_count() -> usize { match std::thread::available_parallelism() { Ok(count) => count.get(),