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

refactor(http): Remove new_state and use nested match for http1 in connection state update.

Browse Source
This commit is contained in:
leonardo.yvens
2016-07-27 09:06:07 -03:00
parent e5841365dd
commit c6eea3761b
1 changed files with 72 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
src/http/conn.rs
View File

@@ -672,49 +672,29 @@ impl<H: MessageHandler<T>, T: Transport> State<H, T> {
fn update<F, K>(&mut self, next: Next, factory: &F) where F: MessageHandlerFactory<K, T>, K: Key { fn update<F, K>(&mut self, next: Next, factory: &F) where F: MessageHandlerFactory<K, T>, K: Key {
let timeout = next.timeout; let timeout = next.timeout;
let state = mem::replace(self, State::Closed); let state = mem::replace(self, State::Closed);
let new_state = match (state, next.interest) { match (state, next.interest) {
(_, Next_::Remove) => State::Closed, (_, Next_::Remove) | (State::Closed, _) => return, // Keep State::Closed.
(State::Closed, _) => State::Closed, (State::Init { .. }, e) =>
(State::Init { timeout, .. }, e) => State::Init { { mem::replace(self, State::Init { interest: e, timeout: timeout} ); },
interest: e, (State::Http1(mut http1), next_) => {
timeout: timeout, match next_ {
}, Next_::Remove => unreachable!(), // Covered in (_, Next_::Remove) case above.
(State::Http1(http1), Next_::End) => { Next_::End => {
let reading = match http1.reading { let reading = match http1.reading {
Reading::Body(ref decoder) | Reading::Body(ref decoder) |
Reading::Wait(ref decoder) if decoder.is_eof() => { Reading::Wait(ref decoder) if decoder.is_eof() => {
if http1.keep_alive { if http1.keep_alive {
Reading::KeepAlive Reading::KeepAlive
} else { } else {
Reading::Closed Reading::Closed
} }
}, },
Reading::KeepAlive => http1.reading, Reading::KeepAlive => http1.reading,
_ => Reading::Closed, _ => Reading::Closed,
}; };
let writing = match http1.writing { let writing = match http1.writing {
Writing::Wait(encoder) | Writing::Wait(encoder) |
Writing::Ready(encoder) => { Writing::Ready(encoder) => {
if encoder.is_eof() {
if http1.keep_alive {
Writing::KeepAlive
} else {
Writing::Closed
}
} else if let Some(buf) = encoder.finish() {
Writing::Chunk(Chunk {
buf: buf.bytes,
pos: buf.pos,
next: (h1::Encoder::length(0), Next::end())
})
} else {
Writing::Closed
}
}
Writing::Chunk(mut chunk) => {
if chunk.is_written() {
let encoder = chunk.next.0;
//TODO: de-dupe this code and from Writing::Ready
if encoder.is_eof() { if encoder.is_eof() {
if http1.keep_alive { if http1.keep_alive {
Writing::KeepAlive Writing::KeepAlive
@@ -730,32 +710,50 @@ impl<H: MessageHandler<T>, T: Transport> State<H, T> {
} else { } else {
Writing::Closed Writing::Closed
} }
} else {
chunk.next.1 = next;
Writing::Chunk(chunk)
} }
}, Writing::Chunk(mut chunk) => {
_ => Writing::Closed, if chunk.is_written() {
}; let encoder = chunk.next.0;
match (reading, writing) { //TODO: de-dupe this code and from Writing::Ready
(Reading::KeepAlive, Writing::KeepAlive) => { if encoder.is_eof() {
let next = factory.keep_alive_interest(); if http1.keep_alive {
State::Init { Writing::KeepAlive
interest: next.interest, } else {
timeout: next.timeout, Writing::Closed
}
} else if let Some(buf) = encoder.finish() {
Writing::Chunk(Chunk {
buf: buf.bytes,
pos: buf.pos,
next: (h1::Encoder::length(0), Next::end())
})
} else {
Writing::Closed
}
} else {
chunk.next.1 = next;
Writing::Chunk(chunk)
}
},
_ => return, // Keep State::Closed.
};
match (reading, writing) {
(Reading::KeepAlive, Writing::KeepAlive) => {
let next = factory.keep_alive_interest();
mem::replace(self, State::Init {
interest: next.interest,
timeout: next.timeout,
});
return;
},
(reading, Writing::Chunk(chunk)) => {
http1.reading = reading;
http1.writing = Writing::Chunk(chunk);
} }
}, _ => return // Keep State::Closed.
(reading, Writing::Chunk(chunk)) => {
State::Http1(Http1 {
reading: reading,
writing: Writing::Chunk(chunk),
.. http1
})
} }
_ => State::Closed },
} Next_::Read => {
},
(State::Http1(mut http1), Next_::Read) => {
http1.reading = match http1.reading { http1.reading = match http1.reading {
Reading::Init => Reading::Parse, Reading::Init => Reading::Parse,
Reading::Wait(decoder) => Reading::Body(decoder), Reading::Wait(decoder) => Reading::Body(decoder),
@@ -791,10 +789,8 @@ impl<H: MessageHandler<T>, T: Transport> State<H, T> {
}, },
same => same same => same
}; };
State::Http1(http1)
}, },
(State::Http1(mut http1), Next_::Write) => { Next_::Write => {
http1.writing = match http1.writing { http1.writing = match http1.writing {
Writing::Wait(encoder) => Writing::Ready(encoder), Writing::Wait(encoder) => Writing::Ready(encoder),
Writing::Init => Writing::Head, Writing::Init => Writing::Head,
@@ -818,9 +814,8 @@ impl<H: MessageHandler<T>, T: Transport> State<H, T> {
}, },
same => same same => same
}; };
State::Http1(http1)
}, },
(State::Http1(mut http1), Next_::ReadWrite) => { Next_::ReadWrite => {
http1.reading = match http1.reading { http1.reading = match http1.reading {
Reading::Init => Reading::Parse, Reading::Init => Reading::Parse,
Reading::Wait(decoder) => Reading::Body(decoder), Reading::Wait(decoder) => Reading::Body(decoder),
@@ -836,9 +831,8 @@ impl<H: MessageHandler<T>, T: Transport> State<H, T> {
}, },
same => same same => same
}; };
State::Http1(http1)
}, },
(State::Http1(mut http1), Next_::Wait) => { Next_::Wait => {
http1.reading = match http1.reading { http1.reading = match http1.reading {
Reading::Body(decoder) => Reading::Wait(decoder), Reading::Body(decoder) => Reading::Wait(decoder),
same => same same => same
@@ -853,21 +847,12 @@ impl<H: MessageHandler<T>, T: Transport> State<H, T> {
}, },
same => same same => same
}; };
State::Http1(http1)
} }
}; }
let new_state = match new_state { http1.timeout = timeout;
State::Init { interest, .. } => State::Init { mem::replace(self, State::Http1(http1));
timeout: timeout, }
interest: interest, };
},
State::Http1(mut http1) => {
http1.timeout = timeout;
State::Http1(http1)
}
other => other
};
mem::replace(self, new_state);
} }
} }