forked/h2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix handling Streams.refs in next_incoming

Browse Source 
`Streams.inner.ref` doesn't need to be incremented if we don't
return an `OpaqueStreamRef`.

This prevented the bug in `send_push_promise` from appearing
in the tests.
This commit is contained in:
Michael Beaumont
2020-08-17 21:19:44 +02:00
committed by Sean McArthur
parent e3a358d696
commit 6d80bd454e
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/proto/streams/streams.rs
View File

@@ -557,17 +557,16 @@ where
pub fn next_incoming(&mut self) -> Option<StreamRef<B>> { pub fn next_incoming(&mut self) -> Option<StreamRef<B>> {
let mut me = self.inner.lock().unwrap(); let mut me = self.inner.lock().unwrap();
let me = &mut *me; let me = &mut *me;
let key = me.actions.recv.next_incoming(&mut me.store); me.actions.recv.next_incoming(&mut me.store).map(|key| {
// TODO: ideally, OpaqueStreamRefs::new would do this, but we're holding
// the lock, so it can't.
me.refs += 1;
key.map(|key| {
let stream = &mut me.store.resolve(key); let stream = &mut me.store.resolve(key);
tracing::trace!( tracing::trace!(
"next_incoming; id={:?}, state={:?}", "next_incoming; id={:?}, state={:?}",
stream.id, stream.id,
stream.state stream.state
); );
// TODO: ideally, OpaqueStreamRefs::new would do this, but we're holding
// the lock, so it can't.
me.refs += 1;
StreamRef { StreamRef {
opaque: OpaqueStreamRef::new(self.inner.clone(), stream), opaque: OpaqueStreamRef::new(self.inner.clone(), stream),
send_buffer: self.send_buffer.clone(), send_buffer: self.send_buffer.clone(),