Skip to content

perf: defer send buffer locking while receiving #933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
brentechols wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −7
Draft

perf: defer send buffer locking while receiving #933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions src/proto/streams/streams.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,6 @@ impl Inner {
}

let actions = &mut self.actions;
let mut send_buffer = send_buffer.inner.lock().unwrap();
let send_buffer = &mut *send_buffer;

self.counts.transition(stream, |counts, stream| {
tracing::trace!(
Expand All @@ -551,8 +549,9 @@ impl Inner {
Ok(()) => Ok(()),
Err(RecvHeaderBlockError::Oversize(resp)) => {
if let Some(resp) = resp {
let mut send_buffer = send_buffer.inner.lock().unwrap();
let sent = actions.send.send_headers(
resp, send_buffer, stream, counts, &mut actions.task);
resp, &mut send_buffer, stream, counts, &mut actions.task);
debug_assert!(sent.is_ok(), "oversize response should not fail");

actions.send.schedule_implicit_reset(
Expand Down Expand Up @@ -581,7 +580,7 @@ impl Inner {
actions.recv.recv_trailers(frame, stream)
};

actions.reset_on_recv_stream_err(send_buffer, stream, counts, res)
actions.reset_on_recv_stream_err_deferred(send_buffer, stream, counts, res)
})
}

Expand Down Expand Up @@ -633,8 +632,6 @@ impl Inner {
};

let actions = &mut self.actions;
let mut send_buffer = send_buffer.inner.lock().unwrap();
let send_buffer = &mut *send_buffer;

self.counts.transition(stream, |counts, stream| {
let sz = frame.flow_controlled_len();
Expand All @@ -648,7 +645,7 @@ impl Inner {
.recv
.release_connection_capacity(sz as WindowSize, &mut None);
}
actions.reset_on_recv_stream_err(send_buffer, stream, counts, res)
actions.reset_on_recv_stream_err_deferred(send_buffer, stream, counts, res)
})
}

Expand Down Expand Up @@ -1739,6 +1736,21 @@ impl Actions {
})
}

fn reset_on_recv_stream_err_deferred<B>(
&mut self,
send_buffer: &SendBuffer<B>,
stream: &mut store::Ptr,
counts: &mut Counts,
res: Result<(), Error>,
) -> Result<(), Error> {
if matches!(res, Err(Error::Reset(..))) {
let mut send_buffer = send_buffer.inner.lock().unwrap();
self.reset_on_recv_stream_err(&mut send_buffer, stream, counts, res)
} else {
res
}
}

fn reset_on_recv_stream_err<B>(
&mut self,
buffer: &mut Buffer<Frame<B>>,
Expand Down