From 07dab1fccaab7877d2ee97158df4a8c42ce921cd Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Thu, 30 Jan 2025 01:12:29 +0100 Subject: [PATCH 1/2] pass rustflags to windows too --- .cargo/config.toml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index aa9e2d561c2db..ed8c7bf81fa66 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -17,10 +17,22 @@ rustdocflags = [] [target.x86_64-pc-windows-msvc] linker = "rust-lld" -rustflags = ["-C", "target-feature=+crt-static"] +rustflags = [ + "--cfg", + "tokio_unstable", + "-Zshare-generics=y", + "-C", + "target-feature=+crt-static" +] [target.i686-pc-windows-msvc] -rustflags = ["-C", "target-feature=+crt-static"] +rustflags = [ + "--cfg", + "tokio_unstable", + "-Zshare-generics=y", + "-C", + "target-feature=+crt-static" +] [target.aarch64-pc-windows-msvc] linker = "rust-lld" From e565c593ab18bf2303fce60d64b37a23db2971ac Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Wed, 29 Jan 2025 17:35:43 +0100 Subject: [PATCH 2/2] disable lifo slot to make all tasks stealable --- crates/napi/src/lib.rs | 12 ++++++++++++ turbopack/crates/turbopack-cli/src/main.rs | 1 + 2 files changed, 13 insertions(+) diff --git a/crates/napi/src/lib.rs b/crates/napi/src/lib.rs index 0c208bd5c1af1..61a73404ae055 100644 --- a/crates/napi/src/lib.rs +++ b/crates/napi/src/lib.rs @@ -76,6 +76,9 @@ static ALLOC: dhat::Alloc = dhat::Alloc; #[napi::module_init] fn init() { + use tokio::runtime::Builder; + use turbo_tasks_malloc::TurboMalloc; + set_hook(Box::new(|panic_info| { util::log_internal_error_and_inform(&format!( "Panic: {}\nBacktrace: {:?}", @@ -83,6 +86,15 @@ fn init() { Backtrace::new() )); })); + let rt = Builder::new_multi_thread() + .enable_all() + .on_thread_stop(|| { + TurboMalloc::thread_stop(); + }) + .disable_lifo_slot() + .build() + .unwrap(); + create_custom_tokio_runtime(rt); } #[inline] diff --git a/turbopack/crates/turbopack-cli/src/main.rs b/turbopack/crates/turbopack-cli/src/main.rs index ad98f84784903..c5cd7de16e2a7 100644 --- a/turbopack/crates/turbopack-cli/src/main.rs +++ b/turbopack/crates/turbopack-cli/src/main.rs @@ -29,6 +29,7 @@ fn main() { .on_thread_stop(|| { TurboMalloc::thread_stop(); }) + .disable_lifo_slot() .build() .unwrap() .block_on(main_inner(args))