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

More tweaks

Browse Source
This commit is contained in:
Carl Lerche
2017-08-08 14:26:38 -07:00
parent 8485bf91e7
commit 8a5e0c3046
2 changed files with 53 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/proto/streams/state.rs
View File

@@ -243,6 +243,17 @@ impl State {
} }
} }
/// Returns true if a stream with the current state counts against the
/// concurrency limit.
pub fn is_counted(&self) -> bool {
match self.inner {
Open { .. } => true,
HalfClosedLocal(..) => true,
HalfClosedRemote(..) => true,
_ => false,
}
}
pub fn is_closed(&self) -> bool { pub fn is_closed(&self) -> bool {
match self.inner { match self.inner {
Closed(_) => true, Closed(_) => true,

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

@@ -88,9 +88,10 @@ impl<P, B> Streams<P, B>
} }
}; };
let mut stream = me.store.resolve(key); let stream = me.store.resolve(key);
let ret = if frame.is_trailers() { me.actions.transition(stream, |actions, stream| {
if frame.is_trailers() {
unimplemented!(); unimplemented!();
/* /*
if !frame.is_end_stream() { if !frame.is_end_stream() {
@@ -101,15 +102,9 @@ impl<P, B> Streams<P, B>
try!(me.actions.recv.recv_eos(stream)); try!(me.actions.recv.recv_eos(stream));
*/ */
} else { } else {
try!(me.actions.recv.recv_headers(frame, &mut stream)) actions.recv.recv_headers(frame, stream)
};
// TODO: move this into a fn
if stream.state.is_closed() {
me.actions.dec_num_streams(id);
} }
})
Ok(ret)
} }
pub fn recv_data(&mut self, frame: frame::Data) pub fn recv_data(&mut self, frame: frame::Data)
@@ -120,20 +115,14 @@ impl<P, B> Streams<P, B>
let id = frame.stream_id(); let id = frame.stream_id();
let mut stream = match me.store.find_mut(&id) { let stream = match me.store.find_mut(&id) {
Some(stream) => stream, Some(stream) => stream,
None => return Err(ProtocolError.into()), None => return Err(ProtocolError.into()),
}; };
// Ensure there's enough capacity on the connection before acting on the me.actions.transition(stream, |actions, stream| {
// stream. actions.recv.recv_data(frame, stream)
try!(me.actions.recv.recv_data(frame, &mut stream)); })
if stream.state.is_closed() {
me.actions.dec_num_streams(id);
}
Ok(())
} }
pub fn recv_reset(&mut self, frame: frame::Reset) pub fn recv_reset(&mut self, frame: frame::Reset)
@@ -150,12 +139,11 @@ impl<P, B> Streams<P, B>
None => return Ok(()), None => return Ok(()),
}; };
me.actions.recv.recv_reset(frame, &mut stream)?; me.actions.transition(stream, |actions, stream| {
actions.recv.recv_reset(frame, stream)?;
assert!(stream.state.is_closed()); assert!(stream.state.is_closed());
me.actions.dec_num_streams(id);
Ok(()) Ok(())
})
} }
pub fn recv_err(&mut self, err: &ConnectionError) { pub fn recv_err(&mut self, err: &ConnectionError) {
@@ -338,19 +326,15 @@ impl<P, B> StreamRef<P, B>
let mut me = self.inner.lock().unwrap(); let mut me = self.inner.lock().unwrap();
let me = &mut *me; let me = &mut *me;
let mut stream = me.store.resolve(self.key); let stream = me.store.resolve(self.key);
// Create the data frame // Create the data frame
let frame = frame::Data::from_buf(stream.id, data, end_of_stream); let frame = frame::Data::from_buf(stream.id, data, end_of_stream);
me.actions.transition(stream, |actions, stream| {
// Send the data frame // Send the data frame
me.actions.send.send_data(frame, &mut stream)?; actions.send.send_data(frame, stream)
})
if stream.state.is_closed() {
me.actions.dec_num_streams(stream.id);
}
Ok(())
} }
pub fn poll_data(&mut self) -> Poll<Option<Chunk<P, B>>, ConnectionError> { pub fn poll_data(&mut self) -> Poll<Option<Chunk<P, B>>, ConnectionError> {
@@ -445,4 +429,18 @@ impl<P, B> Actions<P, B>
assert!(!id.is_zero()); assert!(!id.is_zero());
P::is_server() == id.is_server_initiated() P::is_server() == id.is_server_initiated()
} }
fn transition<F, U>(&mut self, mut stream: store::Ptr<B>, f: F) -> U
where F: FnOnce(&mut Self, &mut store::Ptr<B>) -> U,
{
let is_counted = stream.state.is_counted();
let ret = f(self, &mut stream);
if is_counted && stream.state.is_closed() {
self.dec_num_streams(stream.id);
}
ret
}
} }