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

Respect heap_pages parameter. (#3420)

Browse Source
This commit is contained in:
Sergei Pepyakin
2019-08-16 15:33:22 +02:00
committed by GitHub
parent 42fb0c7cad
commit f735d067c4
2 changed files with 72 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/executor/src/wasm_runtimes_cache.rs
+27 -12
View File
@@ -86,7 +86,7 @@ struct StateSnapshot {
data_segments: Vec<(u32, Vec<u8>)>,
/// The list of all global mutable variables of the module in their sequential order.
global_mut_values: Vec<RuntimeValue>,
heap_pages: u32,
heap_pages: u64,
}
impl StateSnapshot {
@@ -94,7 +94,7 @@ impl StateSnapshot {
fn take(
module_instance: &WasmModuleInstanceRef,
data_segments: Vec<DataSegment>,
heap_pages: u32,
heap_pages: u64,
) -> Option<Self> {
let prepared_segments = data_segments
.into_iter()
@@ -250,6 +250,12 @@ impl RuntimesCache {
.original_storage_hash(well_known_keys::CODE)
.ok_or(Error::InvalidCode("`CODE` not found in storage.".into()))?;
let heap_pages = ext
.storage(well_known_keys::HEAP_PAGES)
.and_then(|pages| u64::decode(&mut &pages[..]).ok())
.or(default_heap_pages)
.unwrap_or(DEFAULT_HEAP_PAGES);
// This is direct result from fighting with borrowck.
let handle_result =
|cached_result: &Result<Rc<CachedRuntime>, CacheError>| match *cached_result {
@@ -258,10 +264,25 @@ impl RuntimesCache {
};
match self.instances.entry(code_hash.into()) {
Entry::Occupied(o) => handle_result(o.get()),
Entry::Occupied(mut o) => {
let result = o.get_mut();
if let Ok(ref cached_runtime) = result {
if cached_runtime.state_snapshot.heap_pages != heap_pages {
trace!(
target: "runtimes_cache",
"heap_pages were changed. Reinstantiating the instance"
);
*result = Self::create_wasm_instance(wasm_executor, ext, heap_pages);
if let Err(ref err) = result {
warn!(target: "runtimes_cache", "cannot create a runtime: {:?}", err);
}
}
}
handle_result(result)
},
Entry::Vacant(v) => {
trace!(target: "runtimes_cache", "no instance found in cache, creating now.");
let result = Self::create_wasm_instance(wasm_executor, ext, default_heap_pages);
let result = Self::create_wasm_instance(wasm_executor, ext, heap_pages);
if let Err(ref err) = result {
warn!(target: "runtimes_cache", "cannot create a runtime: {:?}", err);
}
@@ -273,7 +294,7 @@ impl RuntimesCache {
fn create_wasm_instance<E: Externalities<Blake2Hasher>>(
wasm_executor: &WasmExecutor,
ext: &mut E,
default_heap_pages: Option<u64>,
heap_pages: u64,
) -> Result<Rc<CachedRuntime>, CacheError> {
let code = ext
.original_storage(well_known_keys::CODE)
@@ -286,18 +307,12 @@ impl RuntimesCache {
// we just loaded and validated the `module` above.
let data_segments = extract_data_segments(&code).ok_or(CacheError::CantDeserializeWasm)?;
let heap_pages = ext
.storage(well_known_keys::HEAP_PAGES)
.and_then(|pages| u64::decode(&mut &pages[..]).ok())
.or(default_heap_pages)
.unwrap_or(DEFAULT_HEAP_PAGES);
// Instantiate this module.
let instance = WasmExecutor::instantiate_module::<E>(heap_pages as usize, &module)
.map_err(CacheError::Instantiation)?;
// Take state snapshot before executing anything.
let state_snapshot = StateSnapshot::take(&instance, data_segments, heap_pages as u32)
let state_snapshot = StateSnapshot::take(&instance, data_segments, heap_pages)
.expect(
"`take` returns `Err` if the module is not valid;
we already loaded module above, thus the `Module` is proven to be valid at this point;