Factor out taskrun

This commit is contained in:
Dominik Werder
2021-04-08 20:39:04 +02:00
parent 3b062b2f5c
commit 20fe590c88
7 changed files with 41 additions and 51 deletions

View File

@@ -766,7 +766,7 @@ const WEEK: u64 = DAY * 7;
#[test]
fn agg_x_dim_0() {
crate::run(async { agg_x_dim_0_inner().await; Ok(()) }).unwrap();
taskrun::run(async { agg_x_dim_0_inner().await; Ok(()) }).unwrap();
}
async fn agg_x_dim_0_inner() {
@@ -812,7 +812,7 @@ async fn agg_x_dim_0_inner() {
#[test]
fn agg_x_dim_1() {
crate::run(async { agg_x_dim_1_inner().await; Ok(()) }).unwrap();
taskrun::run(async { agg_x_dim_1_inner().await; Ok(()) }).unwrap();
}
async fn agg_x_dim_1_inner() {

View File

@@ -929,26 +929,3 @@ impl futures_core::Stream for RawConcatChannelReader {
}
}
fn run<T, F: std::future::Future<Output=Result<T, Error>>>(f: F) -> Result<T, Error> {
tracing_init();
tokio::runtime::Builder::new_multi_thread()
.worker_threads(12)
.max_blocking_threads(256)
.enable_all()
.build()
.unwrap()
.block_on(async {
f.await
})
}
pub fn tracing_init() {
tracing_subscriber::fmt()
//.with_timer(tracing_subscriber::fmt::time::uptime())
.with_target(true)
.with_thread_names(true)
//.with_max_level(tracing::Level::INFO)
.with_env_filter(tracing_subscriber::EnvFilter::new("info,retrieval=trace,disk=trace,tokio_postgres=info"))
.init();
}