refactor(smartengine): add a layer of indirection to support alternative wasm runtimes #3151
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
xxchan
commented
Apr 15, 2023
There was a problem hiding this comment.
This file is extracted from engine.rs without any change.
xxchan
commented
Apr 15, 2023
crates/fluvio-smartengine/src/lib.rs
Outdated
Comment on lines
1
to
6
| cfg_if::cfg_if! { | ||
| if #[cfg(feature = "engine")] { | ||
| pub(crate) mod memory; | ||
| pub(crate) mod transforms; | ||
| pub(crate) mod init; | ||
| pub(crate) mod error; | ||
| pub mod metrics; | ||
| mod engine; | ||
| mod state; | ||
| pub use engine::*; | ||
| pub mod instance; | ||
| } | ||
| } |
There was a problem hiding this comment.
The new engine mod will correspond to the feature engine. The implementations are moved to engine::wasmtime_engine.
|
@sehz PTAL. Thanks 🙏 |
morenol
reviewed
Apr 15, 2023
crates/fluvio-smartengine/Cargo.toml
Outdated
Comment on lines
15
to
19
| engine = ["wasmtime"] | ||
| engine = ["wasmtime-engine"] | ||
| wasi = ["wasmtime-wasi", "engine"] | ||
| transformation = ["serde_json", "serde_yaml"] | ||
| default = ["engine"] | ||
|
|
||
| wasmtime-engine = ["wasmtime", "wasmtime-wasi"] |
There was a problem hiding this comment.
with this update, wasmtime-wasi dependency will be pulled by default, could you update it to keep current behavior?
There was a problem hiding this comment.
Ok, this should be a mistake.
|
Thanks for the work. It's still bit large. What I suggest is to split this into separate PR: |
xxchan
changed the title
bors bot
pushed a commit
that referenced
this pull request
Apr 17, 2023
This PR is part of #3151 (see more context there), containing only trivial code reorganizations, without any actual changes. To summarize: - a new `engine` mod, corresponding to the feature `engine`. The implementations are moved to `engine::wasmtime_engine`. - There are some reusable code not coupled with the engine. So I extracted them into a new module `config`.
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.
Context of this PR: I'm working on integrating WasmEdge as an alternative runtime for Fluvio smartengine. (WasmEdge/WasmEdge#2231)
Currently, the code of smartengine is highly coupled with Wasmtime, so it would be a little bit hard (or dirty) to support alternative wasm engines. This PR improves the situation in 2 ways:
config.smartenginecrate, which are depended on by other crates, aren't very clear. So I reorganized it: Public structs are defined inengine/mod.rs. The implementation details are represented as aninnerfield, and can be imported according to which feature is enabled. This style is learned from backtrace-rs and getrandom (e.g., https://github.com/rust-lang/backtrace-rs/blob/b3e5bb857773fcc6fc8247374264bd4c8acd5387/src/backtrace/mod.rs)P.S. here's the WIP work of WasmEdge support xxchan#1. It's almost finished. But I think splitting it into smaller ones would be easier to review, and get quicker feedback. Besides, I think the refactoring is generally trivial, and makes some sense whether or not WasmEdge is accepted as a new engine, so I submitted this PR first :)