Skip to content

Fixes wasi #524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 20, 2022
Merged

Fixes wasi #524

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0239df1
fix
Defman Jan 20, 2022
386ff3c
fix
Defman Jan 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions feather/plugin-host/src/context/wasm/bump.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ impl WasmBump {
deallocate_function,
chunks: Vec::new(),
};
let initial_chunk = this.allocate_chunk(None, None)?;
this.chunks.push(initial_chunk);
Ok(this)
}

Expand Down Expand Up @@ -94,25 +92,20 @@ impl WasmBump {
.context("chunk overflows usize")?,
None => INITIAL_CHUNK_SIZE,
};

let mut align = CHUNK_ALIGN;
if let Some(min_layout) = min_layout {
align = align.max(min_layout.align());
let requested_size =
round_up_to(min_layout.size(), align).context("allocation too large")?;
new_size = new_size.max(requested_size);
}

assert_eq!(align % CHUNK_ALIGN, 0);
assert_eq!(new_size % CHUNK_ALIGN, 0);
let layout = Layout::from_size_align(new_size, align).context("size or align is 0")?;

assert!(new_size >= previous_size.unwrap_or(0) * 2);

let start = self
.allocate_function
.call(layout.size() as u32, layout.align() as u32)?;

Ok(Chunk {
start,
layout,
Expand All @@ -124,21 +117,17 @@ impl WasmBump {
/// all allocated memory.
pub fn reset(&mut self) -> anyhow::Result<()> {
// Free all but the last chunk.
for chunk in self.chunks.drain(..self.chunks.len() - 1) {
for chunk in self.chunks.drain(..self.chunks.len()) {
self.deallocate_function.call(
chunk.start,
chunk.layout.size() as u32,
chunk.layout.align() as u32,
)?;
}

assert_eq!(self.chunks.len(), 1);

// Reset the last chunk's data pointer.
let last_chunk = self.chunks.last_mut().unwrap();
last_chunk
.ptr
.set(last_chunk.start + last_chunk.layout.size() as u32);
// Allocate initial chunk
let chunk = self.allocate_chunk(None, None)?;
self.chunks.push(chunk);

Ok(())
}
Expand Down