Commit 33e06793 authored by Benjamin Woodruff's avatar Benjamin Woodruff

Update turbopack-cli for benchmarking

parent d6d16414
...@@ -2,14 +2,16 @@ use std::{ ...@@ -2,14 +2,16 @@ use std::{
env::current_dir, env::current_dir,
mem::forget, mem::forget,
path::{MAIN_SEPARATOR, PathBuf}, path::{MAIN_SEPARATOR, PathBuf},
sync::Arc, sync::LazyLock,
}; };
use anyhow::{Context, Result, bail}; use anyhow::{Context, Result, bail};
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, TransientInstance, TryJoinIterExt, TurboTasks, Vc, apply_effects}; use turbo_tasks::{
ResolvedVc, StaticOrArc, TransientInstance, TryJoinIterExt, TurboTasks, Vc, apply_effects,
};
use turbo_tasks_backend::{ use turbo_tasks_backend::{
BackendOptions, NoopBackingStorage, TurboTasksBackend, noop_backing_storage, BackendOptions, NoopBackingStorage, TurboTasksBackend, noop_backing_storage,
}; };
...@@ -60,7 +62,7 @@ use crate::{ ...@@ -60,7 +62,7 @@ use crate::{
type Backend = TurboTasksBackend<NoopBackingStorage>; type Backend = TurboTasksBackend<NoopBackingStorage>;
pub struct TurbopackBuildBuilder { pub struct TurbopackBuildBuilder {
turbo_tasks: Arc<TurboTasks<Backend>>, turbo_tasks: StaticOrArc<TurboTasks<Backend>>,
project_dir: RcStr, project_dir: RcStr,
root_dir: RcStr, root_dir: RcStr,
entry_requests: Vec<EntryRequest>, entry_requests: Vec<EntryRequest>,
...@@ -75,7 +77,11 @@ pub struct TurbopackBuildBuilder { ...@@ -75,7 +77,11 @@ pub struct TurbopackBuildBuilder {
} }
impl TurbopackBuildBuilder { impl TurbopackBuildBuilder {
pub fn new(turbo_tasks: Arc<TurboTasks<Backend>>, project_dir: RcStr, root_dir: RcStr) -> Self { pub fn new(
turbo_tasks: StaticOrArc<TurboTasks<Backend>>,
project_dir: RcStr,
root_dir: RcStr,
) -> Self {
TurbopackBuildBuilder { TurbopackBuildBuilder {
turbo_tasks, turbo_tasks,
project_dir, project_dir,
...@@ -529,14 +535,23 @@ pub async fn build(args: &BuildArguments) -> Result<()> { ...@@ -529,14 +535,23 @@ pub async fn build(args: &BuildArguments) -> Result<()> {
root_dir, root_dir,
} = normalize_dirs(&args.common.dir, &args.common.root)?; } = normalize_dirs(&args.common.dir, &args.common.root)?;
let tt = TurboTasks::new(TurboTasksBackend::new( static TURBO_TASKS_STATIC: LazyLock<bool> =
LazyLock::new(|| std::env::var("NEXT_TURBO_TASKS_STATIC").unwrap() == "1");
let backend = TurboTasksBackend::new(
BackendOptions { BackendOptions {
dependency_tracking: false, dependency_tracking: false,
storage_mode: None, storage_mode: None,
..Default::default() ..Default::default()
}, },
noop_backing_storage(), noop_backing_storage(),
)); );
let tt = if *TURBO_TASKS_STATIC {
println!("Using static turbo tasks");
StaticOrArc::Static(TurboTasks::new_static(backend))
} else {
println!("Using refcounted turbo tasks");
StaticOrArc::Shared(TurboTasks::new(backend))
};
let mut builder = TurbopackBuildBuilder::new(tt.clone(), project_dir, root_dir) let mut builder = TurbopackBuildBuilder::new(tt.clone(), project_dir, root_dir)
.log_detail(args.common.log_detail) .log_detail(args.common.log_detail)
......
...@@ -4,7 +4,7 @@ use std::{ ...@@ -4,7 +4,7 @@ use std::{
io::{Write, stdout}, io::{Write, stdout},
net::{IpAddr, SocketAddr}, net::{IpAddr, SocketAddr},
path::{MAIN_SEPARATOR, PathBuf}, path::{MAIN_SEPARATOR, PathBuf},
sync::Arc, sync::{Arc, LazyLock},
time::{Duration, Instant}, time::{Duration, Instant},
}; };
...@@ -13,7 +13,8 @@ use owo_colors::OwoColorize; ...@@ -13,7 +13,8 @@ use owo_colors::OwoColorize;
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
NonLocalValue, OperationVc, ResolvedVc, TransientInstance, TurboTasks, UpdateInfo, Vc, NonLocalValue, OperationVc, ResolvedVc, StaticOrArc, TransientInstance, TurboTasks, UpdateInfo,
Vc,
trace::TraceRawVcs, trace::TraceRawVcs,
util::{FormatBytes, FormatDuration}, util::{FormatBytes, FormatDuration},
}; };
...@@ -57,7 +58,7 @@ pub(crate) mod web_entry_source; ...@@ -57,7 +58,7 @@ pub(crate) mod web_entry_source;
type Backend = TurboTasksBackend<NoopBackingStorage>; type Backend = TurboTasksBackend<NoopBackingStorage>;
pub struct TurbopackDevServerBuilder { pub struct TurbopackDevServerBuilder {
turbo_tasks: Arc<TurboTasks<Backend>>, turbo_tasks: StaticOrArc<TurboTasks<Backend>>,
project_dir: RcStr, project_dir: RcStr,
root_dir: RcStr, root_dir: RcStr,
entry_requests: Vec<EntryRequest>, entry_requests: Vec<EntryRequest>,
...@@ -74,7 +75,7 @@ pub struct TurbopackDevServerBuilder { ...@@ -74,7 +75,7 @@ pub struct TurbopackDevServerBuilder {
impl TurbopackDevServerBuilder { impl TurbopackDevServerBuilder {
pub fn new( pub fn new(
turbo_tasks: Arc<TurboTasks<Backend>>, turbo_tasks: StaticOrArc<TurboTasks<Backend>>,
project_dir: RcStr, project_dir: RcStr,
root_dir: RcStr, root_dir: RcStr,
) -> TurbopackDevServerBuilder { ) -> TurbopackDevServerBuilder {
...@@ -246,7 +247,7 @@ impl TurbopackDevServerBuilder { ...@@ -246,7 +247,7 @@ impl TurbopackDevServerBuilder {
}; };
let issue_reporter_arc = Arc::new(move || issue_provider.get_issue_reporter()); let issue_reporter_arc = Arc::new(move || issue_provider.get_issue_reporter());
Ok(server.serve(tasks, source, issue_reporter_arc)) Ok(server.serve(tasks.as_api(), source, issue_reporter_arc))
} }
} }
...@@ -369,13 +370,22 @@ pub async fn start_server(args: &DevArguments) -> Result<()> { ...@@ -369,13 +370,22 @@ pub async fn start_server(args: &DevArguments) -> Result<()> {
root_dir, root_dir,
} = normalize_dirs(&args.common.dir, &args.common.root)?; } = normalize_dirs(&args.common.dir, &args.common.root)?;
let tt = TurboTasks::new(TurboTasksBackend::new( static TURBO_TASKS_STATIC: LazyLock<bool> =
LazyLock::new(|| std::env::var("NEXT_TURBO_TASKS_STATIC").unwrap() == "1");
let backend = TurboTasksBackend::new(
BackendOptions { BackendOptions {
storage_mode: None, storage_mode: None,
..Default::default() ..Default::default()
}, },
noop_backing_storage(), noop_backing_storage(),
)); );
let tt = if *TURBO_TASKS_STATIC {
println!("Using static turbo tasks");
StaticOrArc::Static(TurboTasks::new_static(backend))
} else {
println!("Using refcounted turbo tasks");
StaticOrArc::Shared(TurboTasks::new(backend))
};
let tt_clone = tt.clone(); let tt_clone = tt.clone();
......
...@@ -115,7 +115,7 @@ impl DevServer { ...@@ -115,7 +115,7 @@ impl DevServer {
impl DevServerBuilder { impl DevServerBuilder {
pub fn serve( pub fn serve(
self, self,
turbo_tasks: Arc<dyn TurboTasksApi>, turbo_tasks: StaticOrArc<dyn TurboTasksApi>,
source_provider: impl SourceProvider + NonLocalValue + TraceRawVcs + Sync, source_provider: impl SourceProvider + NonLocalValue + TraceRawVcs + Sync,
get_issue_reporter: Arc<dyn Fn() -> Vc<Box<dyn IssueReporter>> + Send + Sync>, get_issue_reporter: Arc<dyn Fn() -> Vc<Box<dyn IssueReporter>> + Send + Sync>,
) -> DevServer { ) -> DevServer {
...@@ -172,7 +172,7 @@ impl DevServerBuilder { ...@@ -172,7 +172,7 @@ impl DevServerBuilder {
method: request.method().clone(), method: request.method().clone(),
uri: request.uri().clone(), uri: request.uri().clone(),
}; };
run_once_with_reason(StaticOrArc::Shared(tt.clone()), reason, async move { run_once_with_reason(tt.clone(), reason, async move {
// TODO: `get_issue_reporter` should be an `OperationVc`, as there's a // TODO: `get_issue_reporter` should be an `OperationVc`, as there's a
// risk it could be a task-local Vc, which is not safe for us to await. // risk it could be a task-local Vc, which is not safe for us to await.
let issue_reporter = get_issue_reporter(); let issue_reporter = get_issue_reporter();
...@@ -253,7 +253,7 @@ impl DevServerBuilder { ...@@ -253,7 +253,7 @@ impl DevServerBuilder {
} }
if !side_effects.is_empty() { if !side_effects.is_empty() {
let join_handle = tokio::spawn(run_once_with_reason( let join_handle = tokio::spawn(run_once_with_reason(
StaticOrArc::Shared(tt.clone()), tt.clone(),
side_effects_reason, side_effects_reason,
async move { async move {
for side_effect in side_effects { for side_effect in side_effects {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment