feat: in-place replacement for std::Mutex usage

+ introduce parking_lot for better performence lock primitives
+ introduce DashMap for faster atomic hashmap management
+ adapt API usage to new primitives (no need to unwrap)

lightway-core/Cargo.toml

@@ -29,6 +29,7 @@ metrics.workspace = true
 more-asserts.workspace = true
 num_enum = "0.7.0"
 once_cell = "1.19.0"
+parking_lot = "0.12"
 pnet.workspace = true
 rand.workspace = true
 rand_core = "0.6.4"

lightway-core/src/connection.rs

@@ -6,13 +6,14 @@ mod io_adapter;
 mod key_update;
 
 use bytes::{Bytes, BytesMut};
+use parking_lot::Mutex;
 use rand::Rng;
 use std::borrow::Cow;
 use std::net::AddrParseError;
 use std::num::{NonZeroU16, Wrapping};
 use std::{
     net::SocketAddr,
-    sync::{Arc, Mutex},
+    sync::Arc,
     time::{Duration, Instant},
 };
 use thiserror::Error;
@@ -936,7 +937,7 @@ impl<AppState: Send> Connection<AppState> {
                 ref mut pending_session_id,
                 ..
             } => {
-                let new_session_id = rng.lock().unwrap().gen();
+                let new_session_id = rng.lock().gen();
 
                 self.session.io_cb_mut().set_session_id(new_session_id);
 

lightway-core/src/connection/builders.rs

@@ -278,7 +278,7 @@ impl<'a, AppState: Send + 'static> ServerConnectionBuilder<'a, AppState> {
         let auth = ctx.auth.clone();
         let ip_pool = ctx.ip_pool.clone();
 
-        let session_id = ctx.rng.lock().unwrap().gen();
+        let session_id = ctx.rng.lock().gen();
 
         let outside_mtu = MAX_OUTSIDE_MTU;
 

lightway-core/src/context.rs

@@ -1,8 +1,9 @@
 pub mod ip_pool;
 mod server_auth;
 
+use parking_lot::Mutex;
 use rand::SeedableRng;
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
 use thiserror::Error;
 
 use crate::{

lightway-server/Cargo.toml

@@ -24,6 +24,7 @@ bytes.workspace = true
 bytesize.workspace = true
 clap.workspace = true
 ctrlc.workspace = true
+dashmap = "6.1.0"
 delegate.workspace = true
 educe.workspace = true
 ipnet.workspace = true
@@ -33,6 +34,7 @@ lightway-app-utils.workspace = true
 lightway-core = { workspace = true, features = ["postquantum"] }
 metrics.workspace = true
 metrics-util = "0.19.0"
+parking_lot = "0.12.3"
 pnet.workspace = true
 ppp = "2.2.0"
 pwhash = "1.0.0"

lightway-server/src/connection.rs

@@ -1,8 +1,9 @@
 use bytes::BytesMut;
 use delegate::delegate;
+use parking_lot::Mutex;
 use std::{
     net::{Ipv4Addr, SocketAddr},
-    sync::{Arc, Mutex, Weak},
+    sync::{Arc, Weak},
 };
 use tracing::{trace, warn};
 
@@ -80,11 +81,9 @@ impl Connection {
 
         conn.lw_conn
             .lock()
-            .unwrap()
             .app_state_mut()
             .conn
             .set(Arc::downgrade(&conn))
-            .unwrap();
 
         let mut join_set = tokio::task::JoinSet::new();
         ticker_task.spawn(Arc::downgrade(&conn), &mut join_set);
@@ -93,7 +92,7 @@ impl Connection {
     }
 
     delegate! {
-        to self.lw_conn.lock().unwrap() {
+        to self.lw_conn.lock() {
             pub fn tls_protocol_version(&self) -> ProtocolVersion;
             pub fn connection_type(&self) -> ConnectionType;
             pub fn session_id(&self) -> SessionId;
@@ -143,7 +142,7 @@ impl Connection {
     }
 
     pub fn begin_session_id_rotation(self: &Arc<Self>) {
-        let mut conn = self.lw_conn.lock().unwrap();
+        let mut conn = self.lw_conn.lock();
 
         // A rotation is already in flight, nothing to be done this
         // time.
@@ -169,12 +168,12 @@ impl Connection {
     // Use this only during shutdown, after clearing all connections from
     // connection_manager
     pub fn lw_disconnect(self: Arc<Self>) -> ConnectionResult<()> {
-        self.lw_conn.lock().unwrap().disconnect()
+        self.lw_conn.lock().disconnect()
     }
 
     pub fn disconnect(&self) -> ConnectionResult<()> {
         self.manager.remove_connection(self);
-        self.lw_conn.lock().unwrap().disconnect()
+        self.lw_conn.lock().disconnect()
     }
 }