Noratrieb/icefun
1
0
Fork 0
mirror of https://github.com/Noratrieb/icefun.git synced 2026-01-14 12:55:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

loop

Browse source
This commit is contained in:
nora 2023-03-07 15:50:27 +01:00
parent c4644d42c3
commit a434a3de71
2 changed files with 12 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hyper/src/common/exec.rs
View file

@ -18,7 +18,7 @@ pub trait ConnStreamExec<F, B: HttpBody>: Clone {
fn execute_h2stream(&mut self, fut: H2Stream<F, B>); fn execute_h2stream(&mut self, fut: H2Stream<F, B>);
} }
#[cfg(all(feature = "server", any(feature = "http1", feature = "http2")))] #[cfg(all(feature = "server", any(feature = "http1", feature = "http2")))]
pub trait NewSvcExec<I, N, S: HttpService<Body>, E, W: Watcher<I, S, E>>: Clone { pub trait NewSvcExec<I, N, S, E, W: Watcher<I, S, E>>: Clone {
fn execute_new_svc(&mut self, fut: NewSvcTask<I, N, S, E, W>); fn execute_new_svc(&mut self, fut: NewSvcTask<I, N, S, E, W>);
} }
pub(crate) type BoxSendFuture = Pin<Box<dyn Future<Output = ()> + Send>>; pub(crate) type BoxSendFuture = Pin<Box<dyn Future<Output = ()> + Send>>;

35
hyper/src/server/server.rs
View file

@ -12,23 +12,11 @@ use pin_project_lite::pin_project;
use std::error::Error as StdError; use std::error::Error as StdError;
#[cfg(feature = "tcp")] #[cfg(feature = "tcp")]
use tokio::io::{AsyncRead, AsyncWrite}; use tokio::io::{AsyncRead, AsyncWrite};
pin_project! { pub struct Server<I, S, E = Exec> {
#[doc = incoming: I,
" A listening HTTP server that accepts connections in both HTTP1 and HTTP2 by default."] make_service: S,
#[doc = ""] #[doc = protocol: E,
" `Server` is a `Future` mapping a bound listener with a set of service"] #[doc =
" handlers. It is built using the [`Builder`](Builder), and the future"] #[doc =
" completes when the server has been shutdown. It should be run by an"] #[doc =
" `Executor`."]
pub struct Server < I, S, E = Exec > {
#[pin] incoming : I,
make_service : S,
protocol : Http_ < E >,
}
} }
#[derive(Debug)] #[derive(Debug)]
#[cfg_attr(docsrs, doc(cfg(any(feature = "http1", feature = "http2"))))] #[cfg_attr(docsrs, doc(cfg(any(feature = "http1", feature = "http2"))))]
pub struct Builder<I, E = Exec> { pub struct Builder<I, E = Exec> {
@ -52,25 +40,24 @@ impl Server<AddrIncoming, ()> {
} }
} }
#[cfg_attr(docsrs, doc(cfg(any(feature = "http1", feature = "http2"))))] #[cfg_attr(docsrs, doc(cfg(any(feature = "http1", feature = "http2"))))]
impl<I, IO, IE, S, B, E> Future for Server<I, S, E> impl<I, IO, IE, S, B, E> Future for Server<I, S, E>
where where
I: Accept<Conn = IO, Error = IE>, I: Accept<Conn = IO, Error = IE>,
IE: Into<Box<dyn StdError + Send + Sync>>, IE: Into<Box<dyn StdError + Send + Sync>>,
IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
S: MakeServiceRef<IO, Body, ResBody = B>, S: MakeServiceRef<IO, Body, ResBody = B>,
S::Error: Into<Box<dyn StdError + Send + Sync>>,
B: HttpBody + 'static,
B::Error: Into<Box<dyn StdError + Send + Sync>>,
E: ConnStreamExec<<S::Service as HttpService<Body>>::Future, B>,
E: NewSvcExec<IO, S::Future, S::Service, E, NoopWatcher>, E: NewSvcExec<IO, S::Future, S::Service, E, NoopWatcher>,
{ {
type Output = crate::Result<()>; type Output = ();
fn poll(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> { fn poll(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
loop { loop {
let fut = NewSvcTask::new(NoopWatcher); let fut = NewSvcTask::new(NoopWatcher);
self.as_mut().project().protocol.exec.execute_new_svc(fut); unsafe {
self.as_mut()
.get_unchecked_mut()
.protocol
.execute_new_svc(fut);
}
} }
} }
} }