Turn the wasmtime-runtime crate into the wasmtime::runtime::vm module
#8501
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
github-actions
bot
added
wasmtime:api
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as outdated.
This comment was marked as outdated.
fitzgen
changed the title
wasmtime-runtime as crate::runtime::vm internally in the wasmtime cratewasmtime-runtime crate into the crate::runtime::vm module
fitzgen
force-pushed
the
wasmtime-runtime-as-vm
branch
5 times, most recently
from
e7401eb
to
371aeba
Compare
fitzgen
force-pushed
the
wasmtime-runtime-as-vm
branch
from
371aeba
to
73cbcf2
Compare
fitzgen
changed the title
wasmtime-runtime crate into the crate::runtime::vm modulewasmtime-runtime crate into the wasmtime::runtime::vm module
alexcrichton
approved these changes
Apr 30, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
prtest:full
|
How do I call |
|
Ah it's no longer possible to call the function after this change as it's private to the |
|
Adding to what Alex said: that function was never intended to be exposed to or used by Wasmtime embedders. The |
Oh, I did not realize that is possible. I fairly recently ported my code over from Wasmer, so I am not super familiar with API yet. That is indeed a nicer way of doing it... Thanks for the quick responses! |
|
@kaimast no problem! Feel free to pop into our Zulip or file an issue if you have any more questions. |
jameysharp
added a commit
to jameysharp/wasmtime
that referenced
this pull request
Jul 12, 2024
In the past, the wasmtime-runtime crate couldn't directly call `get_wasm_trap` because the registry of loaded modules was in the wasmtime crate, so it called through a global function pointer registered with `init_traps` instead. Since the two crates were merged in bytecodealliance#8501, we no longer need this indirection. While I'm here, I've also split the former `get_wasm_trap` function into two parts: `lookup_code` finds a loaded module that had been previously registered with `register_code`, and the `lookup_trap_code` step is now done at the call site in `test_if_trap`. This makes the module registry more broadly useful.
jameysharp
added a commit
to jameysharp/wasmtime
that referenced
this pull request
Jul 12, 2024
In the past, the wasmtime-runtime crate couldn't directly call `get_wasm_trap` because the registry of loaded modules was in the wasmtime crate, so it called through a global function pointer registered with `init_traps` instead. Since the two crates were merged in bytecodealliance#8501, we no longer need this indirection. While I'm here, I've also split the former `get_wasm_trap` function into two parts: `lookup_code` finds a loaded module that had been previously registered with `register_code`, and the `lookup_trap_code` step is now done by a helper on `CodeMemory`. This makes the module registry more broadly useful. I also simplified the code lookup step in two ways: - I removed a redundant check from the code lookup. `BTreeMap::range` will only return entries where `end >= pc`, so the `end < pc` condition is always false. - I used checked_sub instead of writing both the comparison and subtraction explicitly.
jameysharp
added a commit
to jameysharp/wasmtime
that referenced
this pull request
Jul 12, 2024
In the past, the wasmtime-runtime crate couldn't directly call `get_wasm_trap` because the registry of loaded modules was in the wasmtime crate, so it called through a global function pointer registered with `init_traps` instead. Since the two crates were merged in bytecodealliance#8501, we no longer need this indirection. While I'm here, I've also split the former `get_wasm_trap` function into two parts: `lookup_code` finds a loaded module that had been previously registered with `register_code`, and the `lookup_trap_code` step is now done by a helper on `CodeMemory`. This makes the module registry more broadly useful. I also simplified the code lookup step in two ways: - I removed a redundant check from the code lookup. `BTreeMap::range` will only return entries where `end >= pc`, so the `end < pc` condition is always false. - I used checked_sub instead of writing both the comparison and subtraction explicitly.
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jul 15, 2024
In the past, the wasmtime-runtime crate couldn't directly call `get_wasm_trap` because the registry of loaded modules was in the wasmtime crate, so it called through a global function pointer registered with `init_traps` instead. Since the two crates were merged in #8501, we no longer need this indirection. While I'm here, I've also split the former `get_wasm_trap` function into two parts: `lookup_code` finds a loaded module that had been previously registered with `register_code`, and the `lookup_trap_code` step is now done by a helper on `CodeMemory`. This makes the module registry more broadly useful. I also simplified the code lookup step in two ways: - I removed a redundant check from the code lookup. `BTreeMap::range` will only return entries where `end >= pc`, so the `end < pc` condition is always false. - I used checked_sub instead of writing both the comparison and subtraction explicitly.
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.
We want to merge them together because there is no abstraction or layering or boundary between them in practice, and our architectures and designs have, at times, been constrained by this artificial crate boundary and what is visible in which crate and this has forced us to use nasty workarounds like defining traits in
wasmtime-runtimethat get implemented inwasmtimeand used as dynamic trait objects insidewasmtime-runtime. Merging them will allow us to remove these hacks.