v8: move some InterruptCallbacks to budget.rs

Author: Centril

crates/core/src/host/v8/budget.rs

@@ -4,6 +4,7 @@
 //! as V8 has no native notion of gas/fuel,
 //! so we have to invent one using time and timeouts.
 
+use super::env_on_isolate;
 use crate::host::wasm_common::module_host_actor::EnergyStats;
 use crate::host::wasmtime::{epoch_ticker, ticks_in_duration};
 use core::ptr;
@@ -41,6 +42,21 @@ pub(super) fn with_timeout_and_cb_every<R>(
 /// A callback passed to [`IsolateHandle::request_interrupt`].
 pub(super) type InterruptCallback = extern "C" fn(&mut Isolate, *mut c_void);
 
+/// An [`InterruptCallback`] used by `call_reducer`,
+/// and called by a thread separate to V8 execution
+/// every [`EPOCH_TICKS_PER_SECOND`] ticks (~every 1 second)
+/// to log that the reducer is still running.
+pub(super) extern "C" fn cb_log_long_running(isolate: &mut Isolate, _: *mut c_void) {
+    let env = env_on_isolate(isolate);
+    let database = env.instance_env.replica_ctx.database_identity;
+    let reducer = env.reducer_name();
+    let dur = env.reducer_start().elapsed();
+    tracing::warn!(reducer, ?database, "JavaScript has been running for {dur:?}");
+}
+
+/// An [`InterruptCallback`] that does nothing.
+pub(super) extern "C" fn cb_noop(_: &mut Isolate, _: *mut c_void) {}
+
 /// Spawns a thread that will terminate execution
 /// when `budget` has been used up.
 ///

crates/core/src/host/v8/mod.rs

@@ -1,3 +1,4 @@
+use self::budget::{cb_log_long_running, cb_noop};
 use self::budget::{energy_from_elapsed, with_timeout_and_cb_every};
 use self::de::{deserialize_js, property};
 use self::error::{
@@ -20,7 +21,6 @@ use crate::host::wasm_common::{RowIters, TimingSpanSet};
 use crate::host::wasmtime::EPOCH_TICKS_PER_SECOND;
 use crate::host::{ArgsTuple, Scheduler};
 use crate::{module_host_context::ModuleCreationContext, replica_context::ReplicaContext};
-use core::ffi::c_void;
 use core::str;
 use spacetimedb_client_api_messages::energy::ReducerBudget;
 use spacetimedb_datastore::locking_tx_datastore::MutTxId;
@@ -319,17 +319,6 @@ impl JsInstance {
 
         self.common
             .call_reducer_with_tx(replica_ctx, tx, params, log_traceback, |tx, op, budget| {
-                /// Called by a thread separate to V8 execution
-                /// every [`EPOCH_TICKS_PER_SECOND`] ticks (~every 1 second)
-                /// to log that the reducer is still running.
-                extern "C" fn cb_log_long_running(isolate: &mut Isolate, _: *mut c_void) {
-                    let env = env_on_isolate(isolate);
-                    let database = env.instance_env.replica_ctx.database_identity;
-                    let reducer = env.reducer_name();
-                    let dur = env.reducer_start().elapsed();
-                    tracing::warn!(reducer, ?database, "JavaScript has been running for {dur:?}");
-                }
-
                 // TODO(v8): snapshots
                 // Prepare the isolate with the env.
                 let mut isolate = Isolate::new(<_>::default());
@@ -595,11 +584,10 @@ fn call_reducer_fun<'scope>(
 fn extract_description(program: &str) -> Result<RawModuleDef, DescribeError> {
     let budget = ReducerBudget::DEFAULT_BUDGET;
     let callback_every = EPOCH_TICKS_PER_SECOND;
-    extern "C" fn callback(_: &mut Isolate, _: *mut c_void) {}
 
     let mut isolate = Isolate::new(<_>::default());
     let handle = isolate.thread_safe_handle();
-    with_timeout_and_cb_every(handle, callback_every, callback, budget, || {
+    with_timeout_and_cb_every(handle, callback_every, cb_noop, budget, || {
         with_scope(&mut isolate, |scope| {
             let (def, ..) = extract_description_raw(scope, program)?;
             Ok(def)