astelm/telemt
1
0
Fork 0
mirror of https://github.com/telemt/telemt.git synced 2026-10-10 19:35:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rustfmt

Browse Source
This commit is contained in:
Alexey
2026-09-25 19:46:31 +03:00
parent 2d63fcf376
commit 326c0ecdb9
128 changed files with 914 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/web/session/downlink.rs
+16 -38
View File
@@ -116,21 +116,18 @@ impl WebSession {
});
}
if !state.pending_frames.is_empty() {
let batch = match self.take_down_batch_locked(
&mut state,
&mut effects,
cursor,
) {
Ok(batch) => batch,
Err(ManagerError::Backpressure) => {
return Err(ManagerError::Backpressure);
}
Err(error) => {
drop(state);
self.close(SessionCloseReason::Protocol);
return Err(error);
}
};
let batch =
match self.take_down_batch_locked(&mut state, &mut effects, cursor) {
Ok(batch) => batch,
Err(ManagerError::Backpressure) => {
return Err(ManagerError::Backpressure);
}
Err(error) => {
drop(state);
self.close(SessionCloseReason::Protocol);
return Err(error);
}
};
let result = PollResult {
body: batch.body.clone(),
next_cursor: batch.next_cursor,
@@ -300,12 +297,7 @@ impl WebSession {
state.pending_control_items = state.pending_control_items.saturating_sub(items);
}
if let Some(manager) = self.manager.upgrade() {
effects.notify(manager.release_pending_quiet(
self.profile_key,
bytes,
items,
control,
));
effects.notify(manager.release_pending_quiet(self.profile_key, bytes, items, control));
}
}
@@ -417,14 +409,7 @@ impl WebSession {
last.encoded[4..8].copy_from_slice(&payload_len.to_be_bytes());
return true;
}
self.queue_frame_locked(
state,
effects,
FrameType::Data,
stream_id,
payload,
false,
)
self.queue_frame_locked(state, effects, FrameType::Data, stream_id, payload, false)
}
fn queue_frame_locked(
@@ -437,14 +422,8 @@ impl WebSession {
control: bool,
) -> bool {
if self.carrier().uses_lanes() {
return self.queue_lane_frame_locked(
state,
effects,
frame_type,
stream_id,
payload,
control,
);
return self
.queue_lane_frame_locked(state, effects, frame_type, stream_id, payload, control);
}
let cost = frame::HEADER_BYTES + payload.len() + QUEUE_ITEM_COST;
let class = if control {
@@ -476,7 +455,6 @@ impl WebSession {
effects.notify(Arc::clone(&self.down_notify));
true
}
}
#[cfg(test)]
src/web/session/downlink_tests.rs
+8 -2
View File
@@ -89,7 +89,10 @@ async fn queued_frame_notifies_only_after_releasing_session_lock() {
}));
let mut context = Context::from_waker(&waker);
let mut notified = Box::pin(session.down_notify.notified());
assert!(matches!(notified.as_mut().poll(&mut context), Poll::Pending));
assert!(matches!(
notified.as_mut().poll(&mut context),
Poll::Pending
));
queue_close(&session);
@@ -109,7 +112,10 @@ async fn budget_release_notifies_only_after_session_accounting_and_unlock() {
}));
let mut context = Context::from_waker(&waker);
let mut notified = Box::pin(manager.budget_notify().notified_owned());
assert!(matches!(notified.as_mut().poll(&mut context), Poll::Pending));
assert!(matches!(
notified.as_mut().poll(&mut context),
Poll::Pending
));
session.with_state_effects(|state, effects| {
let bytes = state.pending_control_bytes;
src/web/session/effects.rs
+4 -8
View File
@@ -78,8 +78,7 @@ impl DeferredSessionEffects {
/// Defers one RawWaker drop without delivering a readiness signal.
pub(super) fn drop_waker(&mut self, waker: Waker) {
self.callbacks
.push(DeferredSessionEffect::DropWaker(waker));
self.callbacks.push(DeferredSessionEffect::DropWaker(waker));
}
/// Defers one exact notification without coalescing sibling effects.
@@ -89,8 +88,7 @@ impl DeferredSessionEffects {
/// Retains a detached response batch until its lease can drop safely.
pub(super) fn retain_batch(&mut self, batch: DownBatch) {
self.retained
.push(RetainedSessionResource::Batch(batch));
self.retained.push(RetainedSessionResource::Batch(batch));
}
/// Retains transient semaphore capacity until state publication completes.
@@ -173,10 +171,8 @@ mod tests {
impl Wake for PermitOrderWake {
fn wake(self: Arc<Self>) {
self.observed_release.store(
self.semaphore.available_permits(),
Ordering::Release,
);
self.observed_release
.store(self.semaphore.available_permits(), Ordering::Release);
}
}
src/web/session/lane_uplink.rs
+1 -7
View File
@@ -181,13 +181,7 @@ impl WebSession {
&mut unused_items,
&mut progress,
);
self.release_locked(
&mut state,
&mut effects,
unused_bytes,
unused_items,
false,
);
self.release_locked(&mut state, &mut effects, unused_bytes, unused_items, false);
if let Some(lane) = state.carrier_lanes.get_mut(&lane_id) {
lane.up_active = false;
if applied {
src/web/session/lifecycle.rs
+6 -11
View File
@@ -190,12 +190,11 @@ impl WebSession {
{
return None;
}
let released =
self.release_on_close_locked(
&mut state,
SessionCloseReason::CarrierSuperseded,
effects,
);
let released = self.release_on_close_locked(
&mut state,
SessionCloseReason::CarrierSuperseded,
effects,
);
Some(CarrierSupersedeCompletion {
session: self,
released,
@@ -264,11 +263,7 @@ impl WebSession {
{
return None;
}
Some(self.release_on_close_locked(
&mut state,
SessionCloseReason::PeerIdle,
effects,
))
Some(self.release_on_close_locked(&mut state, SessionCloseReason::PeerIdle, effects))
}
fn release_on_close_locked(
src/web/session/stream_io/tests.rs
+2 -3
View File
@@ -1,8 +1,8 @@
use std::collections::VecDeque;
use std::mem::ManuallyDrop;
use std::net::SocketAddr;
use std::sync::{Arc, Barrier, Weak};
use std::sync::atomic::{AtomicBool, AtomicU8, AtomicUsize, Ordering};
use std::sync::{Arc, Barrier, Weak};
use std::task::{Context, Poll, RawWaker, RawWakerVTable, Waker};
use bytes::Bytes;
@@ -63,8 +63,7 @@ impl CallbackProbe {
self.clone_while_locked.store(true, Ordering::Release);
return;
};
if self.clone_action.swap(CLONE_ACTION_NONE, Ordering::AcqRel)
== CLONE_ACTION_INSERT_DATA
if self.clone_action.swap(CLONE_ACTION_NONE, Ordering::AcqRel) == CLONE_ACTION_INSERT_DATA
&& let Some(stream) = state
.streams
.get_mut(&self.stream.id)
src/web/session/uplink.rs
+1 -7
View File
@@ -149,13 +149,7 @@ impl WebSession {
&mut unused_items,
&mut progress,
);
self.release_locked(
&mut state,
&mut effects,
unused_bytes,
unused_items,
false,
);
self.release_locked(&mut state, &mut effects, unused_bytes, unused_items, false);
if !applied {
Err(ManagerError::Closed)
} else {
src/web/session/websocket.rs
+4 -18
View File
@@ -14,8 +14,8 @@ use crate::web::manager::ManagerError;
// Reservation ownership keeps pre-OPEN quota and exact lane identity transactional.
mod reservation;
pub(crate) use reservation::{WebSocketLaneReservation, WebSocketProbeReservation};
use reservation::WebSocketLaneReservationPhase;
pub(crate) use reservation::{WebSocketLaneReservation, WebSocketProbeReservation};
impl WebSession {
/// Reserves the only automatic WebSocket probe before any HTTP 101 response.
@@ -268,13 +268,7 @@ impl WebSession {
&mut unused_items,
&mut progress,
);
self.release_locked(
&mut state,
&mut effects,
unused_bytes,
unused_items,
false,
);
self.release_locked(&mut state, &mut effects, unused_bytes, unused_items, false);
if let Some(lane) = state.carrier_lanes.get_mut(&lane_id) {
lane.up_active = false;
if applied {
@@ -385,21 +379,13 @@ impl WebSession {
state.active_peer_ports.remove(&claim.peer_port)
};
if lane_matches {
self.remember_closed_locked(
&mut state,
&mut effects,
claim.lane.lane_id,
);
self.remember_closed_locked(&mut state, &mut effects, claim.lane.lane_id);
if state
.carrier_lanes
.get(&claim.lane.lane_id)
.is_some_and(|lane| lane.instance == claim.lane.instance)
{
self.release_lane_locked(
&mut state,
&mut effects,
claim.lane.lane_id,
);
self.release_lane_locked(&mut state, &mut effects, claim.lane.lane_id);
}
}
release_port
src/web/session/websocket/reservation.rs
+1 -4
View File
@@ -156,10 +156,7 @@ impl WebSocketLaneReservation {
Ok(())
}
pub(super) fn mark_stream_owned(
&mut self,
stream: StreamIdentity,
) -> Result<(), ManagerError> {
pub(super) fn mark_stream_owned(&mut self, stream: StreamIdentity) -> Result<(), ManagerError> {
if self.phase != WebSocketLaneReservationPhase::Transferred || self.stream != Some(stream) {
return Err(ManagerError::Protocol);
}