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

perf(http2): eagerly poll some futures in h2 dispatchers before allocating in executor

Browse Source
This commit is contained in:
Sean McArthur
2018-10-24 15:04:30 -07:00
parent dcf0347151
commit 94e02ac276
3 changed files with 85 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
benches/end_to_end.rs
View File

@@ -3,6 +3,7 @@
extern crate futures;
extern crate hyper;
extern crate pretty_env_logger;
extern crate test;
extern crate tokio;
@@ -12,50 +13,60 @@ use futures::{Future, Stream};
use tokio::runtime::current_thread::Runtime;
use tokio::net::TcpListener;
use hyper::{Body, Method, Request, Response};
use hyper::{Body, Method, Request, Response, Version};
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(1);
let client = hyper::Client::builder()
.build::<_, Body>(connector);
let url: hyper::Uri = format!("http://{}/get", addr).parse().unwrap();
b.bytes = 160 * 2 + PHRASE.len() as u64;
b.iter(move || {
rt.block_on(client.get(url.clone())
.and_then(|res| {
res.into_body().for_each(|_chunk| {
Ok(())
})
}))
.expect("client wait");
fn http1_get(b: &mut test::Bencher) {
bench_with(b, Version::HTTP_11, || {
Request::new(Body::empty())
});
}
#[bench]
fn post_one_at_a_time(b: &mut test::Bencher) {
fn http1_post(b: &mut test::Bencher) {
bench_with(b, Version::HTTP_11, || {
let mut req = Request::new("foo bar baz quux".into());
*req.method_mut() = Method::POST;
req
});
}
#[bench]
fn http2_get(b: &mut test::Bencher) {
bench_with(b, Version::HTTP_2, || {
Request::new(Body::empty())
});
}
#[bench]
fn http2_post(b: &mut test::Bencher) {
bench_with(b, Version::HTTP_2, || {
let mut req = Request::new("foo bar baz quux".into());
*req.method_mut() = Method::POST;
req
});
}
fn bench_with<F>(b: &mut test::Bencher, version: Version, make_request: F)
where
F: Fn() -> Request<Body>,
{
let mut rt = Runtime::new().unwrap();
let addr = spawn_hello(&mut rt);
let body = b"Hello";
let addr = spawn_hello(&mut rt, body);
let connector = HttpConnector::new(1);
let client = hyper::Client::builder()
.http2_only(version == Version::HTTP_2)
.build::<_, Body>(connector);
let url: hyper::Uri = format!("http://{}/post", addr).parse().unwrap();
let url: hyper::Uri = format!("http://{}/hello", addr).parse().unwrap();
let post = "foo bar baz quux";
b.bytes = 180 * 2 + post.len() as u64 + PHRASE.len() as u64;
b.bytes = body.len() as u64;
b.iter(move || {
let mut req = Request::new(post.into());
*req.method_mut() = Method::POST;
let mut req = make_request();
*req.uri_mut() = url.clone();
rt.block_on(client.request(req).and_then(|res| {
res.into_body().for_each(|_chunk| {
@@ -65,9 +76,7 @@ fn post_one_at_a_time(b: &mut test::Bencher) {
});
}
static PHRASE: &'static [u8] = include_bytes!("../CHANGELOG.md"); //b"Hello, World!";
fn spawn_hello(rt: &mut Runtime) -> SocketAddr {
fn spawn_hello(rt: &mut Runtime, body: &'static [u8]) -> SocketAddr {
use hyper::service::{service_fn};
let addr = "127.0.0.1:0".parse().unwrap();
let listener = TcpListener::bind(&addr).unwrap();
@@ -75,11 +84,11 @@ fn spawn_hello(rt: &mut Runtime) -> SocketAddr {
let http = Http::new();
let service = service_fn(|req: Request<Body>| {
let service = service_fn(move |req: Request<Body>| {
req.into_body()
.concat2()
.map(|_| {
Response::new(Body::from(PHRASE))
.map(move |_| {
Response::new(Body::from(body))
})
});