From aa1200be318ad54438419a4f8e702812429b470e Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Wed, 6 Nov 2024 23:46:05 +0100 Subject: [PATCH 1/3] use new backend by default --- crates/napi/src/next_api/utils.rs | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/crates/napi/src/next_api/utils.rs b/crates/napi/src/next_api/utils.rs index 7969477c91959..0d19fcfda94d9 100644 --- a/crates/napi/src/next_api/utils.rs +++ b/crates/napi/src/next_api/utils.rs @@ -1,5 +1,5 @@ use std::{ - collections::HashMap, env, future::Future, ops::Deref, path::PathBuf, sync::Arc, time::Duration, + collections::HashMap, future::Future, ops::Deref, path::PathBuf, sync::Arc, time::Duration, }; use anyhow::{anyhow, Context, Result}; @@ -12,7 +12,9 @@ use serde::Serialize; use turbo_tasks::{ trace::TraceRawVcs, OperationVc, ReadRef, TaskId, TryJoinIterExt, TurboTasks, UpdateInfo, Vc, }; -use turbo_tasks_backend::{default_backing_storage, DefaultBackingStorage}; +use turbo_tasks_backend::{ + default_backing_storage, noop_backing_storage, DefaultBackingStorage, NoopBackingStorage, +}; use turbo_tasks_fs::FileContent; use turbopack_core::{ diagnostics::{Diagnostic, DiagnosticContextExt, PlainDiagnostic}, @@ -25,7 +27,7 @@ use crate::util::log_internal_error_and_inform; #[derive(Clone)] pub enum NextTurboTasks { - Memory(Arc>), + Memory(Arc>>), PersistentCaching( Arc>>, ), @@ -108,7 +110,7 @@ impl NextTurboTasks { pub fn memory_backend(&self) -> Option<&turbo_tasks_memory::MemoryBackend> { match self { - NextTurboTasks::Memory(turbo_tasks) => Some(turbo_tasks.backend()), + NextTurboTasks::Memory(_) => None, NextTurboTasks::PersistentCaching(_) => None, } } @@ -124,7 +126,7 @@ impl NextTurboTasks { pub fn create_turbo_tasks( output_path: PathBuf, persistent_caching: bool, - memory_limit: usize, + _memory_limit: usize, ) -> Result { Ok(if persistent_caching { let dirty_suffix = if crate::build::GIT_CLEAN @@ -162,11 +164,15 @@ pub fn create_turbo_tasks( ), )) } else { - let mut backend = turbo_tasks_memory::MemoryBackend::new(memory_limit); - if env::var_os("NEXT_TURBOPACK_PRINT_TASK_INVALIDATION").is_some() { - backend.print_task_invalidation(true); - } - NextTurboTasks::Memory(TurboTasks::new(backend)) + NextTurboTasks::Memory(TurboTasks::new( + turbo_tasks_backend::TurboTasksBackend::new( + turbo_tasks_backend::BackendOptions { + storage_mode: None, + ..Default::default() + }, + noop_backing_storage(), + ), + )) }) } From ffb933ba79116651f930b4d727283af09bb49003 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Fri, 15 Nov 2024 17:13:16 +0100 Subject: [PATCH 2/3] fix bench name --- turbopack/crates/turbo-tasks-backend/benches/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/turbopack/crates/turbo-tasks-backend/benches/mod.rs b/turbopack/crates/turbo-tasks-backend/benches/mod.rs index b11aaaf8116e1..7428b611e5db8 100644 --- a/turbopack/crates/turbo-tasks-backend/benches/mod.rs +++ b/turbopack/crates/turbo-tasks-backend/benches/mod.rs @@ -7,11 +7,11 @@ pub(crate) mod scope_stress; pub(crate) mod stress; criterion_group!( - name = turbo_tasks_memory_stress; + name = turbo_tasks_backend_stress; config = Criterion::default(); targets = stress::fibonacci, scope_stress::scope_stress ); -criterion_main!(turbo_tasks_memory_stress); +criterion_main!(turbo_tasks_backend_stress); pub fn register() { turbo_tasks::register(); From 0c7cbc207a8674188e0645d75eb8c0595fee47e6 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Fri, 15 Nov 2024 17:13:32 +0100 Subject: [PATCH 3/3] use new backend for turbopack-tests --- Cargo.lock | 2 +- turbopack/crates/turbopack-tests/Cargo.toml | 2 +- turbopack/crates/turbopack-tests/tests/execution.rs | 10 ++++++++-- turbopack/crates/turbopack-tests/tests/snapshot.rs | 10 ++++++++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d5882969dbb2..36fe15c6643d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9904,11 +9904,11 @@ dependencies = [ "tokio", "turbo-rcstr", "turbo-tasks", + "turbo-tasks-backend", "turbo-tasks-build", "turbo-tasks-bytes", "turbo-tasks-env", "turbo-tasks-fs", - "turbo-tasks-memory", "turbopack", "turbopack-browser", "turbopack-cli-utils", diff --git a/turbopack/crates/turbopack-tests/Cargo.toml b/turbopack/crates/turbopack-tests/Cargo.toml index a5345623dd36b..8586807bbaf96 100644 --- a/turbopack/crates/turbopack-tests/Cargo.toml +++ b/turbopack/crates/turbopack-tests/Cargo.toml @@ -30,7 +30,7 @@ turbo-tasks = { workspace = true } turbo-tasks-bytes = { workspace = true } turbo-tasks-env = { workspace = true } turbo-tasks-fs = { workspace = true } -turbo-tasks-memory = { workspace = true } +turbo-tasks-backend = { workspace = true } turbopack-browser = { workspace = true, features = ["test"] } turbopack-cli-utils = { workspace = true } turbopack-core = { workspace = true, features = ["issue_path"] } diff --git a/turbopack/crates/turbopack-tests/tests/execution.rs b/turbopack/crates/turbopack-tests/tests/execution.rs index 5d867f6b47901..5088076904911 100644 --- a/turbopack/crates/turbopack-tests/tests/execution.rs +++ b/turbopack/crates/turbopack-tests/tests/execution.rs @@ -15,13 +15,13 @@ use turbo_tasks::{ apply_effects, debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs, Completion, NonLocalValue, OperationVc, ResolvedVc, TryJoinIterExt, TurboTasks, Value, Vc, }; +use turbo_tasks_backend::{noop_backing_storage, BackendOptions, TurboTasksBackend}; use turbo_tasks_bytes::stream::SingleValue; use turbo_tasks_env::CommandLineProcessEnv; use turbo_tasks_fs::{ json::parse_json_with_source_context, util::sys_to_unix, DiskFileSystem, FileContent, FileSystem, FileSystemEntryType, FileSystemPath, }; -use turbo_tasks_memory::MemoryBackend; use turbopack::{ ecmascript::TreeShakingMode, module_options::{EcmascriptOptionsContext, ModuleOptionsContext, TypescriptTransformOptions}, @@ -168,7 +168,13 @@ async fn run(resource: PathBuf, snapshot_mode: IssueSnapshotMode) -> Result Result<()> { register(); - let tt = TurboTasks::new(MemoryBackend::default()); + let tt = TurboTasks::new(TurboTasksBackend::new( + BackendOptions { + storage_mode: None, + ..Default::default() + }, + noop_backing_storage(), + )); let task = tt.spawn_once_task(async move { let emit_op = run_inner_operation(resource.to_str().unwrap().into()); emit_op.read_strongly_consistent().await?;