pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-19 21:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change MaxMemorySize to MaxMemoryPages (#6728)

Browse Source 
* Change `MaxMemorySize` to `MaxMemoryPages`

We should set the max memory for the executor in pages (64KiB) and not in bytes.
The wasm memory is always a multiple of a page and we should use the
same terminology.

* FMT

* Fix warning
This commit is contained in:
Bastian Köcher
2023-02-16 17:10:24 +01:00
committed by GitHub
parent d5a7991429
commit 83eb8453eb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/node/core/pvf/src/executor_intf.rs
+2 -1
View File
@@ -118,9 +118,10 @@ fn params_to_wasmtime_semantics(par: ExecutorParams) -> Result<Semantics, String
} else { } else {
return Err("No default stack limit set".to_owned()) return Err("No default stack limit set".to_owned())
}; };
for p in par.iter() { for p in par.iter() {
match p { match p {
ExecutorParam::MaxMemorySize(mms) => sem.max_memory_size = Some(*mms as usize), ExecutorParam::MaxMemoryPages(mms) => sem.max_memory_size = Some(*mms as usize * 65536),
ExecutorParam::StackLogicalMax(slm) => stack_limit.logical_max = *slm, ExecutorParam::StackLogicalMax(slm) => stack_limit.logical_max = *slm,
ExecutorParam::StackNativeMax(snm) => stack_limit.native_stack_max = *snm, ExecutorParam::StackNativeMax(snm) => stack_limit.native_stack_max = *snm,
ExecutorParam::PrecheckingMaxMemory(_) => (), // TODO: Not implemented yet ExecutorParam::PrecheckingMaxMemory(_) => (), // TODO: Not implemented yet
polkadot/primitives/src/vstaging/executor_params.rs
+3 -4
View File
@@ -27,12 +27,11 @@ use polkadot_core_primitives::Hash;
use scale_info::TypeInfo; use scale_info::TypeInfo;
use sp_std::{ops::Deref, vec, vec::Vec}; use sp_std::{ops::Deref, vec, vec::Vec};
/// A single executor parameter /// The different executor parameters for changing the execution environment semantics.
#[derive(Clone, Debug, Encode, Decode, PartialEq, Eq, TypeInfo)] #[derive(Clone, Debug, Encode, Decode, PartialEq, Eq, TypeInfo)]
pub enum ExecutorParam { pub enum ExecutorParam {
/// ## Parameters setting the executuion environment semantics: /// Maximum number of memory pages (64KiB bytes per page) the executor can allocate.
/// Max. memory size MaxMemoryPages(u32),
MaxMemorySize(u32),
/// Wasm logical stack size limit (max. number of Wasm values on stack) /// Wasm logical stack size limit (max. number of Wasm values on stack)
StackLogicalMax(u32), StackLogicalMax(u32),
/// Executor machine stack size limit, in bytes /// Executor machine stack size limit, in bytes