Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-07 03:12:33 +01:00
Code Issues Releases Wiki Activity

Fix uselessly allocating one extra WASM page

Browse Source 
spotted as a result of stepping in the code. The issue
is that a uBP "page size" might differ from a WASM
page size, which is always 65536 bytes.
This commit is contained in:
Raymond Hill 2020-05-15 12:03:05 -04:00
parent 2ded039b98
commit 4fa5c6b88e
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/js/hntrie.js
View File

@ -411,25 +411,20 @@ const HNTrieContainer = class {
if ( typeof WebAssembly !== 'object' ) { return false; } if ( typeof WebAssembly !== 'object' ) { return false; }
if ( this.wasmMemory instanceof WebAssembly.Memory ) { return true; } if ( this.wasmMemory instanceof WebAssembly.Memory ) { return true; }
const module = await getWasmModule(); const module = await getWasmModule();
if ( module instanceof WebAssembly.Module === false ) { if ( module instanceof WebAssembly.Module === false ) { return false; }
return false;
}
const memory = new WebAssembly.Memory({ initial: 2 }); const memory = new WebAssembly.Memory({ initial: 2 });
const instance = await WebAssembly.instantiate( const instance = await WebAssembly.instantiate(module, {
module, imports: {
{ memory,
imports: { growBuf: this.growBuf.bind(this, 24, 256)
memory,
growBuf: this.growBuf.bind(this, 24, 256)
}
} }
); });
if ( instance instanceof WebAssembly.Instance === false ) { if ( instance instanceof WebAssembly.Instance === false ) {
return false; return false;
} }
this.wasmMemory = memory; this.wasmMemory = memory;
const curPageCount = memory.buffer.byteLength >>> 16; const curPageCount = memory.buffer.byteLength >>> 16;
const newPageCount = this.buf.byteLength + PAGE_SIZE-1 >>> 16; const newPageCount = roundToPageSize(this.buf.byteLength) >>> 16;
if ( newPageCount > curPageCount ) { if ( newPageCount > curPageCount ) {
memory.grow(newPageCount - curPageCount); memory.grow(newPageCount - curPageCount);
} }

15
src/js/strie.js
View File

@ -690,22 +690,19 @@ const roundToPageSize = v => (v + PAGE_SIZE-1) & ~(PAGE_SIZE-1);
if ( typeof WebAssembly !== 'object' ) { return false; } if ( typeof WebAssembly !== 'object' ) { return false; }
if ( this.wasmMemory instanceof WebAssembly.Memory ) { return true; } if ( this.wasmMemory instanceof WebAssembly.Memory ) { return true; }
const module = await getWasmModule(); const module = await getWasmModule();
if ( module instanceof WebAssembly.Module === false ) { if ( module instanceof WebAssembly.Module === false ) { return false; }
return false;
}
const memory = new WebAssembly.Memory({ const memory = new WebAssembly.Memory({
initial: this.buf8.length >>> 16 initial: roundToPageSize(this.buf8.length) >>> 16
});
const instance = await WebAssembly.instantiate(module, {
imports: { memory, extraHandler: this.extraHandler }
}); });
const instance = await WebAssembly.instantiate(
module,
{ imports: { memory, extraHandler: this.extraHandler } }
);
if ( instance instanceof WebAssembly.Instance === false ) { if ( instance instanceof WebAssembly.Instance === false ) {
return false; return false;
} }
this.wasmMemory = memory; this.wasmMemory = memory;
const curPageCount = memory.buffer.byteLength >>> 16; const curPageCount = memory.buffer.byteLength >>> 16;
const newPageCount = this.buf8.byteLength + PAGE_SIZE-1 >>> 16; const newPageCount = roundToPageSize(this.buf8.byteLength) >>> 16;
if ( newPageCount > curPageCount ) { if ( newPageCount > curPageCount ) {
memory.grow(newPageCount - curPageCount); memory.grow(newPageCount - curPageCount);
} }