2dc6202fe7
This introduces the `hyper::service` module, which replaces `tokio-service`. Since the trait is specific to hyper, its associated types have been adjusted. It didn't make sense to need to define `Service<Request=http::Request>`, since we already know the context is HTTP. Instead, the request and response bodies are associated types now, and slightly stricter bounds have been placed on `Error`. The helpers `service_fn` and `service_fn_ok` should be sufficient for now to ease creating `Service`s. The `NewService` trait now allows service creation to also be asynchronous. These traits are similar to `tower` in nature, and possibly will be replaced completely by it in the future. For now, hyper defining its own allows the traits to have better context, and prevents breaking changes in `tower` from affecting hyper. Closes #1461 BREAKING CHANGE: The `Service` trait has changed: it has some changed associated types, and `call` is now bound to `&mut self`. The `NewService` trait has changed: it has some changed associated types, and `new_service` now returns a `Future`. `Client` no longer implements `Service` for now. `hyper::server::conn::Serve` now returns `Connecting` instead of `Connection`s, since `new_service` can now return a `Future`. The `Connecting` is a future wrapping the new service future, returning a `Connection` afterwards. In many cases, `Future::flatten` can be used.
101 lines
2.8 KiB
Rust
101 lines
2.8 KiB
Rust
#![feature(test)]
|
|
#![deny(warnings)]
|
|
|
|
extern crate futures;
|
|
extern crate hyper;
|
|
extern crate test;
|
|
extern crate tokio;
|
|
|
|
use std::net::SocketAddr;
|
|
|
|
use futures::{Future, Stream};
|
|
use tokio::runtime::Runtime;
|
|
use tokio::net::TcpListener;
|
|
|
|
use hyper::{Body, Method, Request, Response};
|
|
use hyper::client::HttpConnector;
|
|
use hyper::server::conn::Http;
|
|
|
|
|
|
#[bench]
|
|
fn get_one_at_a_time(b: &mut test::Bencher) {
|
|
let mut rt = Runtime::new().unwrap();
|
|
let addr = spawn_hello(&mut rt);
|
|
|
|
let connector = HttpConnector::new_with_handle(1, rt.reactor().clone());
|
|
let client = hyper::Client::builder()
|
|
.executor(rt.executor())
|
|
.build::<_, Body>(connector);
|
|
|
|
let url: hyper::Uri = format!("http://{}/get", addr).parse().unwrap();
|
|
|
|
b.bytes = 160 * 2 + PHRASE.len() as u64;
|
|
b.iter(move || {
|
|
client.get(url.clone())
|
|
.and_then(|res| {
|
|
res.into_body().for_each(|_chunk| {
|
|
Ok(())
|
|
})
|
|
})
|
|
.wait().expect("client wait");
|
|
});
|
|
}
|
|
|
|
#[bench]
|
|
fn post_one_at_a_time(b: &mut test::Bencher) {
|
|
let mut rt = Runtime::new().unwrap();
|
|
let addr = spawn_hello(&mut rt);
|
|
|
|
let connector = HttpConnector::new_with_handle(1, rt.reactor().clone());
|
|
let client = hyper::Client::builder()
|
|
.executor(rt.executor())
|
|
.build::<_, Body>(connector);
|
|
|
|
let url: hyper::Uri = format!("http://{}/post", addr).parse().unwrap();
|
|
|
|
let post = "foo bar baz quux";
|
|
b.bytes = 180 * 2 + post.len() as u64 + PHRASE.len() as u64;
|
|
b.iter(move || {
|
|
let mut req = Request::new(post.into());
|
|
*req.method_mut() = Method::POST;
|
|
*req.uri_mut() = url.clone();
|
|
client.request(req).and_then(|res| {
|
|
res.into_body().for_each(|_chunk| {
|
|
Ok(())
|
|
})
|
|
}).wait().expect("client wait");
|
|
|
|
});
|
|
}
|
|
|
|
static PHRASE: &'static [u8] = include_bytes!("../CHANGELOG.md"); //b"Hello, World!";
|
|
|
|
fn spawn_hello(rt: &mut Runtime) -> SocketAddr {
|
|
use hyper::service::{service_fn};
|
|
let addr = "127.0.0.1:0".parse().unwrap();
|
|
let listener = TcpListener::bind(&addr).unwrap();
|
|
let addr = listener.local_addr().unwrap();
|
|
|
|
let http = Http::new();
|
|
|
|
let service = service_fn(|req: Request<Body>| {
|
|
req.into_body()
|
|
.concat2()
|
|
.map(|_| {
|
|
Response::new(Body::from(PHRASE))
|
|
})
|
|
});
|
|
|
|
// Specifically only accept 1 connection.
|
|
let srv = listener.incoming()
|
|
.into_future()
|
|
.map_err(|(e, _inc)| panic!("accept error: {}", e))
|
|
.and_then(move |(accepted, _inc)| {
|
|
let socket = accepted.expect("accepted socket");
|
|
http.serve_connection(socket, service)
|
|
.map_err(|_| ())
|
|
});
|
|
rt.spawn(srv);
|
|
return addr
|
|
}
|