Move dtor information from ResourceAny into a Store#8061
Merged
alexcrichton merged 2 commits intoMar 8, 2024
Conversation
This commit moves the internals of the `ResourceAny` type related to destructors into the auxiliary data within a `Store`. This avoids the need to carry around pointers with `ResourceAny` and additionally makes it easier to work with. As part of this commit this also updates the behavior of `ResourceAny::try_from_resource` to no longer need an `InstancePre` and type information. This was required originally to get `ResourceAny::resource_drop` working to drop the host resource. In retrospect I'm not sure if this was the best goal to achieve because `Resource<T>` already has no destructor support and one of the more common use cases for the conversion is to simply turn around and give it back to a component where a component already has enough destructor information. In the end this should make both `ResourceAny` and `Resource<T>` pretty close to "just an index" which is easier to reason about when working with resources than carrying additional pointers.
Member
Author
|
cc @rvolosatovs as this is touching on the work of #7688 |
github-actions
Bot
added
the
wasmtime:api
Subscribe to Label Actioncc @peterhuene DetailsThis issue or pull request has been labeled: "wasmtime:api"Thus the following users have been cc'd because of the following labels:
To subscribe or unsubscribe from this label, edit the |
pchickey
approved these changes
Mar 7, 2024
rvolosatovs
approved these changes
Mar 8, 2024
Member
rvolosatovs
left a comment
rvolosatovs
left a comment
There was a problem hiding this comment.
Looks great, thanks.
Should ResourceIndex be removed altogether and not be returned anymore by LinkerInstance::resource?
It appears that this PR closes #7714
Member
Author
|
Good points! And sorry again for not realizing this is probably the best way to go sooner, I realize this is a bit of a runaround with the API :( |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This commit moves the internals of the
ResourceAnytype related to destructors into the auxiliary data within aStore. This avoids the need to carry around pointers withResourceAnyand additionally makes it easier to work with.As part of this commit this also updates the behavior of
ResourceAny::try_from_resourceto no longer need anInstancePreand type information. This was required originally to getResourceAny::resource_dropworking to drop the host resource. In retrospect I'm not sure if this was the best goal to achieve becauseResource<T>already has no destructor support and one of the more common use cases for the conversion is to simply turn around and give it back to a component where a component already has enough destructor information.In the end this should make both
ResourceAnyandResource<T>pretty close to "just an index" which is easier to reason about when working with resources than carrying additional pointers.Closes #7714