GC

Author: mischnic

Cargo.lock

@@ -70,7 +70,15 @@ static ALLOC: dhat::Alloc = dhat::Alloc;
 #[cfg(not(target_arch = "wasm32"))]
 #[napi::module_init]
 fn init() {
-    use std::panic::{set_hook, take_hook};
+    use std::{
+        cell::RefCell,
+        panic::{set_hook, take_hook},
+        time::{Duration, Instant},
+    };
+
+    thread_local! {
+        static LAST_SWC_ATOM_GC_TIME: RefCell<Option<Instant>> = const { RefCell::new(None) };
+    }
 
     use tokio::runtime::Builder;
     use turbo_tasks::panic_hooks::handle_panic;
@@ -87,6 +95,14 @@ fn init() {
         .on_thread_stop(|| {
             TurboMalloc::thread_stop();
         })
+        .on_thread_park(|| {
+            LAST_SWC_ATOM_GC_TIME.with_borrow_mut(|cell| {
+                if cell.is_none_or(|t| t.elapsed() > Duration::from_secs(2)) {
+                    swc_core::ecma::atoms::hstr::global_atom_store_gc();
+                    *cell = Some(Instant::now());
+                }
+            });
+        })
         .disable_lifo_slot()
         .build()
         .unwrap();

crates/napi/src/lib.rs

@@ -1,4 +1,5 @@
 use std::{
+    cell::RefCell,
     fs::{create_dir_all, write},
     mem::forget,
     path::{Path, PathBuf},
@@ -154,11 +155,23 @@ fn load_next_config() -> RcStr {
 }
 
 fn runtime() -> Runtime {
+    thread_local! {
+        static LAST_SWC_ATOM_GC_TIME: RefCell<Option<Instant>> = const { RefCell::new(None) };
+    }
+
     tokio::runtime::Builder::new_multi_thread()
         .enable_all()
         .on_thread_stop(|| {
             turbo_tasks_malloc::TurboMalloc::thread_stop();
         })
+        .on_thread_park(|| {
+            LAST_SWC_ATOM_GC_TIME.with_borrow_mut(|cell| {
+                if cell.is_none_or(|t| t.elapsed() > Duration::from_secs(2)) {
+                    swc_core::ecma::atoms::hstr::global_atom_store_gc();
+                    *cell = Some(Instant::now());
+                }
+            });
+        })
         .build()
         .context("Failed to build tokio runtime")
         .unwrap()

crates/next-api/benches/hmr.rs

@@ -16,6 +16,7 @@ next-api = { workspace = true }
 next-core = { workspace = true }
 num_cpus = "1.16.0"
 rand = { workspace = true, features = ["small_rng"] }
+swc_core = { workspace = true }
 serde_json = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 tokio-stream = "0.1.15"

crates/next-build-test/Cargo.toml

@@ -1,4 +1,9 @@
-use std::{convert::Infallible, str::FromStr, time::Instant};
+use std::{
+    cell::RefCell,
+    convert::Infallible,
+    str::FromStr,
+    time::{Duration, Instant},
+};
 
 use next_api::project::{DefineEnv, ProjectOptions};
 use next_build_test::{Strategy, main_inner};
@@ -70,12 +75,23 @@ fn main() {
                 factor = 1;
             }
 
+            thread_local! {
+                static LAST_SWC_ATOM_GC_TIME: RefCell<Option<Instant>> = const { RefCell::new(None) };
+            }
             tokio::runtime::Builder::new_multi_thread()
                 .enable_all()
                 .on_thread_stop(|| {
                     TurboMalloc::thread_stop();
                     tracing::debug!("threads stopped");
                 })
+                .on_thread_park(|| {
+                    LAST_SWC_ATOM_GC_TIME.with_borrow_mut(|cell| {
+                        if cell.is_none_or(|t| t.elapsed() > Duration::from_secs(2)) {
+                            swc_core::ecma::atoms::hstr::global_atom_store_gc();
+                            *cell = Some(Instant::now());
+                        }
+                    });
+                })
                 .build()
                 .unwrap()
                 .block_on(async {

crates/next-build-test/src/main.rs

@@ -45,6 +45,7 @@ futures = { workspace = true }
 owo-colors = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }
+swc_core = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["json"] }

turbopack/crates/turbopack-cli/Cargo.toml

@@ -1,7 +1,7 @@
 #![feature(future_join)]
 #![feature(min_specialization)]
 
-use std::path::Path;
+use std::{cell::RefCell, path::Path, time::Instant};
 
 use anyhow::{Context, Result};
 use clap::Parser;
@@ -22,16 +22,30 @@ use turbopack_trace_utils::{
 static ALLOC: TurboMalloc = TurboMalloc;
 
 fn main() {
-    let args = Arguments::parse();
+    thread_local! {
+        static LAST_SWC_ATOM_GC_TIME: RefCell<Option<Instant>> = const { RefCell::new(None) };
+    }
 
     let mut rt = tokio::runtime::Builder::new_multi_thread();
-    rt.enable_all().on_thread_stop(|| {
-        TurboMalloc::thread_stop();
-    });
+    rt.enable_all()
+        .on_thread_stop(|| {
+            TurboMalloc::thread_stop();
+        })
+        .on_thread_park(|| {
+            LAST_SWC_ATOM_GC_TIME.with_borrow_mut(|cell| {
+                use std::time::Duration;
+
+                if cell.is_none_or(|t| t.elapsed() > Duration::from_secs(2)) {
+                    swc_core::ecma::atoms::hstr::global_atom_store_gc();
+                    *cell = Some(Instant::now());
+                }
+            });
+        });
 
     #[cfg(not(codspeed))]
     rt.disable_lifo_slot();
 
+    let args = Arguments::parse();
     rt.build().unwrap().block_on(main_inner(args)).unwrap();
 }