fix(turbo-tasks): make turbo-tasks fn callable on wasm

Author: xusd320

Cargo.lock

@@ -441,6 +441,7 @@ urlencoding = "2.1.2"
 vergen = { version = "9.0.6", features = ["cargo"] }
 vergen-gitcl = { version = "1.0.8", features = ["cargo"] }
 webbrowser = "0.8.7"
+wasmtimer = "0.4.2"
 
 [patch.crates-io]
 hyper = { git = "https://github.com/bgw/hyper-rs.git", branch = "v1.6.0-with-macos-intel-miscompilation-workaround" }

Cargo.toml

@@ -57,6 +57,9 @@ turbo-tasks-testing = { workspace = true }
 [target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
 turbo-persistence = { workspace = true }
 
+[target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies]
+wasmtimer = { workspace = true }
+
 [dev-dependencies]
 criterion = { workspace = true, features = ["async_tokio"] }
 regex = { workspace = true }

turbopack/crates/turbo-tasks-backend/Cargo.toml

@@ -14,6 +14,7 @@ use std::{
         atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
     },
     thread::available_parallelism,
+    time::Duration,
 };
 
 use anyhow::{Result, bail};
@@ -22,7 +23,8 @@ use indexmap::IndexSet;
 use parking_lot::{Condvar, Mutex};
 use rustc_hash::{FxHashMap, FxHashSet, FxHasher};
 use smallvec::{SmallVec, smallvec};
-use tokio::time::{Duration, Instant};
+#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
+use tokio::time::{Instant, sleep_until};
 use tracing::field::Empty;
 use turbo_tasks::{
     CellId, FxDashMap, KeyValuePair, RawVc, ReadCellOptions, ReadConsistency, SessionId,
@@ -40,6 +42,8 @@ use turbo_tasks::{
     turbo_tasks,
     util::IdFactoryWithReuse,
 };
+#[cfg(all(target_family = "wasm", target_os = "unknown"))]
+use wasmtimer::{std::Instant, tokio::sleep_until};
 
 pub use self::{operation::AnyOperation, storage::TaskDataCategory};
 #[cfg(feature = "trace_task_dirty")]
@@ -2158,10 +2162,10 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
                                         idle_time = until + IDLE_TIMEOUT;
                                         idle_end_listener = self.idle_end_event.listen()
                                     },
-                                    _ = tokio::time::sleep_until(until) => {
+                                    _ = sleep_until(until) => {
                                         break;
                                     },
-                                    _ = tokio::time::sleep_until(idle_time) => {
+                                    _ = sleep_until(idle_time) => {
                                         if turbo_tasks.is_idle() {
                                             break;
                                         }

turbopack/crates/turbo-tasks-backend/src/backend/mod.rs

@@ -1,3 +1,5 @@
+#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
+use std::time::Instant;
 use std::{
     cmp::{Ordering, max},
     collections::{VecDeque, hash_map::Entry as HashMapEntry},
@@ -6,7 +8,7 @@ use std::{
     num::NonZeroU32,
     ops::ControlFlow,
     thread::yield_now,
-    time::{Duration, Instant},
+    time::Duration,
 };
 
 use anyhow::Result;
@@ -21,6 +23,8 @@ use smallvec::{SmallVec, smallvec};
 ))]
 use tracing::{span::Span, trace_span};
 use turbo_tasks::{FxIndexMap, SessionId, TaskExecutionReason, TaskId};
+#[cfg(all(target_family = "wasm", target_os = "unknown"))]
+use wasmtimer::std::Instant;
 
 #[cfg(feature = "trace_task_dirty")]
 use crate::backend::operation::invalidate::TaskDirtyCause;

turbopack/crates/turbo-tasks-backend/src/backend/operation/aggregation_update.rs

@@ -60,5 +60,8 @@ turbo-tasks-macros = { workspace = true }
 turbo-tasks-malloc = { workspace = true }
 unsize = { workspace = true }
 
+[target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies]
+wasmtimer = { workspace = true }
+
 [build-dependencies]
 turbo-tasks-build = { workspace = true }

turbopack/crates/turbo-tasks/Cargo.toml

@@ -1,3 +1,5 @@
+#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
+use std::time::Instant;
 use std::{
     borrow::Cow,
     cell::RefCell,
@@ -6,13 +8,15 @@ use std::{
     panic,
     pin::Pin,
     task::{Context, Poll},
-    time::{Duration, Instant},
+    time::Duration,
 };
 
 use anyhow::Result;
 use pin_project_lite::pin_project;
 use serde::{Deserialize, Serialize};
 use turbo_tasks_malloc::{AllocationInfo, TurboMalloc};
+#[cfg(all(target_family = "wasm", target_os = "unknown"))]
+use wasmtimer::std::Instant;
 
 use crate::{backend::TurboTasksExecutionErrorMessage, panic_hooks::LAST_ERROR_LOCATION};
 

turbopack/crates/turbo-tasks/src/capture_future.rs

@@ -1,5 +1,9 @@
+#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
 use std::time::Instant;
 
+#[cfg(all(target_family = "wasm", target_os = "unknown"))]
+use wasmtimer::std::Instant;
+
 /// Guard that emits a tracing event when dropped with the duration of the
 /// lifetime of the guard.
 pub struct DurationSpanGuard<F: FnOnce(u64)> {

turbopack/crates/turbo-tasks/src/duration_span.rs

@@ -1,3 +1,5 @@
+#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
+use std::time::Instant;
 use std::{
     any::Any,
     future::Future,
@@ -9,7 +11,7 @@ use std::{
         atomic::{AtomicBool, AtomicUsize, Ordering},
     },
     thread,
-    time::{Duration, Instant},
+    time::Duration,
 };
 
 use anyhow::{Result, anyhow};
@@ -21,6 +23,8 @@ use tokio::{runtime::Handle, select, sync::mpsc::Receiver, task_local};
 use tokio_util::task::TaskTracker;
 use tracing::{Instrument, Level, Span, info_span, instrument, trace_span};
 use turbo_tasks_malloc::TurboMalloc;
+#[cfg(all(target_family = "wasm", target_os = "unknown"))]
+use wasmtimer::std::Instant;
 
 use crate::{
     Completion, InvalidationReason, InvalidationReasonSet, OutputContent, ReadCellOptions,