fix benchmark

This commit is contained in:
fakeshadow 2020-12-27 14:16:25 +08:00
parent c35c295b2d
commit 340feeeff9
2 changed files with 15 additions and 8 deletions

View File

@ -31,16 +31,20 @@ fn bench_async_burst(c: &mut Criterion) {
// Maybe add to actix_rt docs // Maybe add to actix_rt docs
let mut rt = actix_rt::System::new("test"); let mut rt = actix_rt::System::new("test");
let srv = test::start(|| { let srv = rt.block_on(async {
App::new() test::start(|| {
.service(web::resource("/").route(web::to(|| HttpResponse::Ok().body(STR)))) App::new().service(
web::resource("/").route(web::to(|| HttpResponse::Ok().body(STR))),
)
})
}); });
let url = srv.url("/"); let url = srv.url("/");
c.bench_function("get_body_async_burst", move |b| { c.bench_function("get_body_async_burst", move |b| {
b.iter_custom(|iters| { b.iter_custom(|iters| {
let client = Client::new().get(url.clone()).freeze().unwrap(); let client =
rt.block_on(async { Client::new().get(url.clone()).freeze().unwrap() });
let start = std::time::Instant::now(); let start = std::time::Instant::now();
// benchmark body // benchmark body

View File

@ -89,7 +89,7 @@ async fn test_start_ssl() {
let (tx, rx) = mpsc::channel(); let (tx, rx) = mpsc::channel();
thread::spawn(move || { thread::spawn(move || {
let sys = actix_rt::System::new("test"); let mut sys = actix_rt::System::new("test");
let builder = ssl_acceptor().unwrap(); let builder = ssl_acceptor().unwrap();
let srv = HttpServer::new(|| { let srv = HttpServer::new(|| {
@ -103,10 +103,13 @@ async fn test_start_ssl() {
.system_exit() .system_exit()
.disable_signals() .disable_signals()
.bind_openssl(format!("{}", addr), builder) .bind_openssl(format!("{}", addr), builder)
.unwrap() .unwrap();
.run();
sys.block_on(async {
let srv = srv.run();
let _ = tx.send((srv, actix_rt::System::current()));
});
let _ = tx.send((srv, actix_rt::System::current()));
let _ = sys.run(); let _ = sys.run();
}); });
let (srv, sys) = rx.recv().unwrap(); let (srv, sys) = rx.recv().unwrap();