Resource table tracks child relationships #6779
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 5 commits
July 26, 2023 16:29
this is going to be required as part of the shift to resources! so lets do it right now and see how many things break
pchickey
force-pushed
the
pch/resource_lifetimes
branch
from
c7b9bc9
to
91d8865
Compare
elliottt
approved these changes
Aug 1, 2023
Comment on lines
+78
to
+81
| // 0, 1 and 2 are formerly (preview 1) for stdio. To prevent users from assuming these | ||
| // indicies are still valid ways to access stdio, they are deliberately left empty. | ||
| // Once we have a full implementation of resources, this confusion should hopefully be | ||
| // impossible :) |
Co-authored-by: Trevor Elliott <telliott@fastly.com>
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
geekbeast
pushed a commit
to geekbeast/wasmtime
that referenced
this pull request
Aug 1, 2023
* main: (47 commits) Add core dump support to the runtime (bytecodealliance#6513) Resource table tracks child relationships (bytecodealliance#6779) Wasmtime: Move `OnDemandInstanceAllocator` to its own module (bytecodealliance#6790) wasi: Test the stdio streams implementation (bytecodealliance#6764) Don't generate same-named imports in fact modules (bytecodealliance#6783) Wasmtime: Add support for Wasm tail calls (bytecodealliance#6774) Cranelift: Fix `ABIMachineSpec::gen_add_imm` for riscv64 (bytecodealliance#6780) Update the wasm-tools family of crates, disallow empty component types (bytecodealliance#6777) Fix broken link to WASI API documentation (bytecodealliance#6775) A bunch of cleanups for cranelift-codegen-meta (bytecodealliance#6772) Implement component-to-component calls with resources (bytecodealliance#6769) Ignore async_stack_size if async_support is disabled (bytecodealliance#6771) A bunch of minor cleanups (bytecodealliance#6767) Fix flaky tests in preview2 streams (bytecodealliance#6763) Refactor and simplify component trampolines (bytecodealliance#6751) Cranelift: Implement tail calls on riscv64 (bytecodealliance#6749) WASI Preview 2: rewrite streams and pollable implementation (bytecodealliance#6556) cranelift-wasm: Add support for translating Wasm tail calls to CLIF (bytecodealliance#6760) Cranelift: Get tail calls working on aarch64 (bytecodealliance#6723) Implement component model resources in Wasmtime (bytecodealliance#6691) ...
eduardomourar
pushed a commit
to eduardomourar/wasmtime
that referenced
this pull request
Aug 18, 2023
* change all TableError cases to trap, instead of return a runtime error this is going to be required as part of the shift to resources! so lets do it right now and see how many things break * delete dead code * Scaffold out changes to table to track parent and children * fill in more parent/child todos * finish plumbing, HostPollable::TableEntry uses Table::push_child * command-tests: show that wasm that manages stream pollable lifetime wrong traps * Update crates/test-programs/build.rs Co-authored-by: Trevor Elliott <telliott@fastly.com> * doc comments * doc fixes. OccupiedEntry made pub. --------- Co-authored-by: Trevor Elliott <telliott@fastly.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
First off, change all
wasmtime_wasi::preview2::TableErrorcases to trap when converting to a filesystem::Error, streams::Error, etc. This is required by the shift to resources. No tests fail because of this change!Introduce the tracking of children to
wasmtime_wasi::preview2::Table. This required:push_childindicating the parentstruct TableEntry { entry: Box<dyn Any...>, parent: Option<u32>, children: BTreeSet<u32> }. This is the simplest datastructure that could possibly work.OccupiedEntryto not use HashMap's directly, because we need to handle deletion bookkeeping.There is only one child resource in wasmtime-wasi at the moment: a
HostPollable::TableEntryis a pollable resource which refers to a parent with the{ index: u32, ...}. We changedpush_host_pollablemethod on the table extension trait to push that variant withpush_child.I added a unit test to poll.rs showing that a
HostPollable::TableEntrytreats the given index as a parent.I added an integration test to command-tests demonstrating correct management of child lifetimes exits correctly, and incorrect management traps with
TableError::HasChildren.This fixes a crash vector merged as part of #6556