T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the injection count of fuel in a store from u32 to u64 (#3048)

Browse Source 
* Change the injection count of fuel in a store from u32 to u64

This commit updates the type of the amount of times to inject fuel in
the `out_of_fuel_async_yield` to `u64` instead of `u32`. This should
allow effectively infinite fuel to get injected, even if a small amount
of fuel is injected per iteration.

Closes #2927
Closes #3046

* Fix tokio example
This commit is contained in:
Alex Crichton
2021-07-01 10:46:21 -05:00
committed by GitHub
parent 7453bd5f0d
commit b9985fe2e5
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/wasmtime/src/func.rs
View File

@@ -1606,7 +1606,7 @@ impl<T> Caller<'_, T> {
///
/// For more information see
/// [`Store::out_of_fuel_async_yield`](crate::Store::out_of_fuel_async_yield)
pub fn out_of_fuel_async_yield(&mut self, injection_count: u32, fuel_to_inject: u64) {
pub fn out_of_fuel_async_yield(&mut self, injection_count: u64, fuel_to_inject: u64) {
self.store
.out_of_fuel_async_yield(injection_count, fuel_to_inject)
}

8
crates/wasmtime/src/store.rs
View File

@@ -178,7 +178,7 @@ struct StoreInstance {
enum OutOfGas {
Trap,
InjectFuel {
injection_count: u32,
injection_count: u64,
fuel_to_inject: u64,
},
}
@@ -558,7 +558,7 @@ impl<T> Store<T> {
///
/// This method will panic if it is not called on a store associated with an [async
/// config](crate::Config::async_support).
pub fn out_of_fuel_async_yield(&mut self, injection_count: u32, fuel_to_inject: u64) {
pub fn out_of_fuel_async_yield(&mut self, injection_count: u64, fuel_to_inject: u64) {
self.inner
.out_of_fuel_async_yield(injection_count, fuel_to_inject)
}
@@ -655,7 +655,7 @@ impl<'a, T> StoreContextMut<'a, T> {
/// runs out.
///
/// For more information see [`Store::out_of_fuel_async_yield`]
pub fn out_of_fuel_async_yield(&mut self, injection_count: u32, fuel_to_inject: u64) {
pub fn out_of_fuel_async_yield(&mut self, injection_count: u64, fuel_to_inject: u64) {
self.0
.out_of_fuel_async_yield(injection_count, fuel_to_inject)
}
@@ -838,7 +838,7 @@ impl StoreInnermost {
self.out_of_gas_behavior = OutOfGas::Trap;
}
fn out_of_fuel_async_yield(&mut self, injection_count: u32, fuel_to_inject: u64) {
fn out_of_fuel_async_yield(&mut self, injection_count: u64, fuel_to_inject: u64) {
assert!(
self.async_support(),
"cannot use `out_of_fuel_async_yield` without enabling async support in the config"