Skip to content

Commit 458eac8

Browse files
authored
Properly handle execution time<->energy conversion in v8 host (#4884)
# Description of Changes Fixes a todo. # Expected complexity level and risk 1 # Testing - [x] Checked that conversion ratio is sane.
1 parent 6fc591e commit 458eac8

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

crates/client-api-messages/src/energy.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@ pub struct EnergyQuanta {
1616
impl EnergyQuanta {
1717
pub const ZERO: Self = EnergyQuanta { quanta: 0 };
1818

19+
// per the comment on [`FunctionBudget::DEFAULT_BUDGET`]: 1 second of wasm runtime is roughtly 2 TeV
20+
pub const PER_EXECUTION_SEC: Self = Self::new(2_000_000_000_000);
21+
pub const PER_EXECUTION_NANOSEC: Self = Self::new(Self::PER_EXECUTION_SEC.get() / 1_000_000_000);
22+
1923
#[inline]
20-
pub fn new(quanta: u128) -> Self {
24+
pub const fn new(quanta: u128) -> Self {
2125
Self { quanta }
2226
}
2327

2428
#[inline]
25-
pub fn get(&self) -> u128 {
29+
pub const fn get(&self) -> u128 {
2630
self.quanta
2731
}
2832

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use core::ptr;
1313
use core::sync::atomic::Ordering;
1414
use core::time::Duration;
1515
use core::{ffi::c_void, sync::atomic::AtomicBool};
16-
use spacetimedb_client_api_messages::energy::FunctionBudget;
16+
use spacetimedb_client_api_messages::energy::{EnergyQuanta, FunctionBudget};
1717
use std::sync::Arc;
1818
use v8::{Isolate, IsolateHandle};
1919

@@ -118,7 +118,12 @@ fn budget_to_duration(_budget: FunctionBudget) -> Duration {
118118
/// Returns [`EnergyStats`] for a reducer given its `budget`
119119
/// and the `duration` it took to execute.
120120
pub(super) fn energy_from_elapsed(budget: FunctionBudget, duration: Duration) -> EnergyStats {
121-
let used = duration_to_budget(duration);
121+
let used = duration.as_nanos() * EnergyQuanta::PER_EXECUTION_NANOSEC.get();
122+
// in order for duration_nanos * ev_per_ns >= u64::MAX:
123+
// duration_nanos >= u64::MAX / ev_per_ns
124+
// duration_nanos >= (9223372036854775 ns = 106.75 days)
125+
// so it's unlikely we'll have to worry about it
126+
let used = FunctionBudget::new(u64::try_from(used).unwrap_or(u64::MAX));
122127
let remaining = budget - used;
123128
EnergyStats { budget, remaining }
124129
}

0 commit comments

Comments
 (0)