mirror of
https://github.com/fafhrd91/actix-net
synced 2025-02-17 15:53:31 +01:00
* Migrate actix-codec, actix-rt, and actix-threadpool to std::future * update to latest tokio alpha and futures-rs * Migrate actix-service to std::future, This is a squash of ~8 commits, since it included a lot of experimentation. To see the commits, look into the semtexzv/std-future-service-tmp branch. * update futures-rs and tokio * Migrate actix-threadpool to std::future (#59) * Migrate actix-threadpool to std::future * Cosmetic refactor - turn log::error! into log::warn! as it doesn't throw any error - add Clone and Copy impls for Cancelled making it cheap to operate with - apply rustfmt * Bump up crate version to 0.2.0 and pre-fill its changelog * Disable patching 'actix-threadpool' crate in global workspace as unnecessary * Revert patching and fix 'actix-rt' * Migrate actix-rt to std::future (#47) * remove Pin from Service::poll_ready(); simplify combinators api; make code compile * disable tests * update travis config * refactor naming * drop IntoFuture trait * Migrate actix-server to std::future (#50) Still not finished, this is more WIP, this is an aggregation of several commits, which can be found in semtexzv/std-future-server-tmp branch * update actix-server * rename Factor to ServiceFactory * start server worker in start mehtod * update actix-utils * remove IntoTransform trait * Migrate actix-server::ssl::nativetls to std futures (#61) * Refactor 'nativetls' module * Migrate 'actix-server-config' to std futures - remove "uds" feature - disable features by default * Switch NativeTlsAcceptor to use 'tokio-tls' crate * Bikeshed features names and remove unnecessary dependencies for 'actix-server-config' crate * update openssl impl * migrate actix-connect to std::future * migrate actix-ioframe to std::future * update version to alpha.1 * fix boxed service * migrate server rustls support * migratte openssl and rustls connecttors * store the thread's handle with arbiter (#62) * update ssl connect tests * restore service tests * update readme
248 lines
7.0 KiB
Rust
248 lines
7.0 KiB
Rust
use std::fmt;
|
|
use std::pin::Pin;
|
|
use std::task::{Context, Poll};
|
|
|
|
use bytes::BytesMut;
|
|
use futures::{Sink, Stream};
|
|
use log::trace;
|
|
use tokio_codec::Decoder;
|
|
use tokio_io::AsyncRead;
|
|
|
|
use super::framed::Fuse;
|
|
|
|
/// A `Stream` of messages decoded from an `AsyncRead`.
|
|
pub struct FramedRead<T, D> {
|
|
inner: FramedRead2<Fuse<T, D>>,
|
|
}
|
|
|
|
pub struct FramedRead2<T> {
|
|
inner: T,
|
|
eof: bool,
|
|
is_readable: bool,
|
|
buffer: BytesMut,
|
|
}
|
|
|
|
const INITIAL_CAPACITY: usize = 8 * 1024;
|
|
|
|
// ===== impl FramedRead =====
|
|
|
|
impl<T, D> FramedRead<T, D>
|
|
where
|
|
T: AsyncRead,
|
|
D: Decoder,
|
|
{
|
|
/// Creates a new `FramedRead` with the given `decoder`.
|
|
pub fn new(inner: T, decoder: D) -> FramedRead<T, D> {
|
|
FramedRead {
|
|
inner: framed_read2(Fuse(inner, decoder)),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<T, D> FramedRead<T, D> {
|
|
/// Returns a reference to the underlying I/O stream wrapped by
|
|
/// `FramedRead`.
|
|
///
|
|
/// Note that care should be taken to not tamper with the underlying stream
|
|
/// of data coming in as it may corrupt the stream of frames otherwise
|
|
/// being worked with.
|
|
pub fn get_ref(&self) -> &T {
|
|
&self.inner.inner.0
|
|
}
|
|
|
|
/// Returns a mutable reference to the underlying I/O stream wrapped by
|
|
/// `FramedRead`.
|
|
///
|
|
/// Note that care should be taken to not tamper with the underlying stream
|
|
/// of data coming in as it may corrupt the stream of frames otherwise
|
|
/// being worked with.
|
|
pub fn get_mut(&mut self) -> &mut T {
|
|
&mut self.inner.inner.0
|
|
}
|
|
|
|
/// Consumes the `FramedRead`, returning its underlying I/O stream.
|
|
///
|
|
/// Note that care should be taken to not tamper with the underlying stream
|
|
/// of data coming in as it may corrupt the stream of frames otherwise
|
|
/// being worked with.
|
|
pub fn into_inner(self) -> T {
|
|
self.inner.inner.0
|
|
}
|
|
|
|
/// Returns a reference to the underlying decoder.
|
|
pub fn decoder(&self) -> &D {
|
|
&self.inner.inner.1
|
|
}
|
|
|
|
/// Returns a mutable reference to the underlying decoder.
|
|
pub fn decoder_mut(&mut self) -> &mut D {
|
|
&mut self.inner.inner.1
|
|
}
|
|
}
|
|
|
|
impl<T, D> Stream for FramedRead<T, D>
|
|
where
|
|
T: AsyncRead,
|
|
D: Decoder,
|
|
{
|
|
type Item = Result<D::Item, D::Error>;
|
|
|
|
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
|
|
unsafe { self.map_unchecked_mut(|s| &mut s.inner).poll_next(cx) }
|
|
}
|
|
}
|
|
|
|
impl<I, T, D> Sink<I> for FramedRead<T, D>
|
|
where
|
|
T: Sink<I>,
|
|
{
|
|
type Error = T::Error;
|
|
|
|
fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
|
|
unsafe {
|
|
self.map_unchecked_mut(|s| &mut s.inner.inner.0)
|
|
.poll_ready(cx)
|
|
}
|
|
}
|
|
|
|
fn start_send(self: Pin<&mut Self>, item: I) -> Result<(), Self::Error> {
|
|
unsafe {
|
|
self.map_unchecked_mut(|s| &mut s.inner.inner.0)
|
|
.start_send(item)
|
|
}
|
|
}
|
|
|
|
fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
|
|
unsafe {
|
|
self.map_unchecked_mut(|s| &mut s.inner.inner.0)
|
|
.poll_flush(cx)
|
|
}
|
|
}
|
|
|
|
fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
|
|
unsafe {
|
|
self.map_unchecked_mut(|s| &mut s.inner.inner.0)
|
|
.poll_close(cx)
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<T, D> fmt::Debug for FramedRead<T, D>
|
|
where
|
|
T: fmt::Debug,
|
|
D: fmt::Debug,
|
|
{
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
f.debug_struct("FramedRead")
|
|
.field("inner", &self.inner.inner.0)
|
|
.field("decoder", &self.inner.inner.1)
|
|
.field("eof", &self.inner.eof)
|
|
.field("is_readable", &self.inner.is_readable)
|
|
.field("buffer", &self.inner.buffer)
|
|
.finish()
|
|
}
|
|
}
|
|
|
|
// ===== impl FramedRead2 =====
|
|
|
|
pub fn framed_read2<T>(inner: T) -> FramedRead2<T> {
|
|
FramedRead2 {
|
|
inner,
|
|
eof: false,
|
|
is_readable: false,
|
|
buffer: BytesMut::with_capacity(INITIAL_CAPACITY),
|
|
}
|
|
}
|
|
|
|
pub fn framed_read2_with_buffer<T>(inner: T, mut buf: BytesMut) -> FramedRead2<T> {
|
|
if buf.capacity() < INITIAL_CAPACITY {
|
|
let bytes_to_reserve = INITIAL_CAPACITY - buf.capacity();
|
|
buf.reserve(bytes_to_reserve);
|
|
}
|
|
FramedRead2 {
|
|
inner,
|
|
eof: false,
|
|
is_readable: !buf.is_empty(),
|
|
buffer: buf,
|
|
}
|
|
}
|
|
|
|
impl<T> FramedRead2<T> {
|
|
pub fn get_ref(&self) -> &T {
|
|
&self.inner
|
|
}
|
|
|
|
pub fn into_inner(self) -> T {
|
|
self.inner
|
|
}
|
|
|
|
pub fn into_parts(self) -> (T, BytesMut) {
|
|
(self.inner, self.buffer)
|
|
}
|
|
|
|
pub fn get_mut(&mut self) -> &mut T {
|
|
&mut self.inner
|
|
}
|
|
}
|
|
|
|
impl<T> Stream for FramedRead2<T>
|
|
where
|
|
T: tokio_io::AsyncRead + Decoder,
|
|
{
|
|
type Item = Result<T::Item, T::Error>;
|
|
|
|
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
|
|
let mut this = unsafe { self.get_unchecked_mut() };
|
|
loop {
|
|
// Repeatedly call `decode` or `decode_eof` as long as it is
|
|
// "readable". Readable is defined as not having returned `None`. If
|
|
// the upstream has returned EOF, and the decoder is no longer
|
|
// readable, it can be assumed that the decoder will never become
|
|
// readable again, at which point the stream is terminated.
|
|
|
|
if this.is_readable {
|
|
if this.eof {
|
|
match this.inner.decode_eof(&mut this.buffer) {
|
|
Ok(Some(frame)) => return Poll::Ready(Some(Ok(frame))),
|
|
Ok(None) => return Poll::Ready(None),
|
|
Err(e) => return Poll::Ready(Some(Err(e))),
|
|
}
|
|
}
|
|
|
|
trace!("attempting to decode a frame");
|
|
|
|
match this.inner.decode(&mut this.buffer) {
|
|
Ok(Some(frame)) => {
|
|
trace!("frame decoded from buffer");
|
|
return Poll::Ready(Some(Ok(frame)));
|
|
}
|
|
Err(e) => return Poll::Ready(Some(Err(e))),
|
|
_ => {
|
|
// Need more data
|
|
}
|
|
}
|
|
|
|
this.is_readable = false;
|
|
}
|
|
|
|
assert!(!this.eof);
|
|
|
|
// Otherwise, try to read more data and try again. Make sure we've
|
|
// got room for at least one byte to read to ensure that we don't
|
|
// get a spurious 0 that looks like EOF
|
|
this.buffer.reserve(1);
|
|
unsafe {
|
|
match Pin::new_unchecked(&mut this.inner).poll_read(cx, &mut this.buffer) {
|
|
Poll::Pending => return Poll::Pending,
|
|
Poll::Ready(Err(e)) => return Poll::Ready(Some(Err(e.into()))),
|
|
Poll::Ready(Ok(0)) => {
|
|
this.eof = true;
|
|
}
|
|
Poll::Ready(Ok(_cnt)) => {}
|
|
}
|
|
}
|
|
this.is_readable = true;
|
|
}
|
|
}
|
|
}
|