Migrate wasmtime to wasmtime-cpp-api#503
Draft
leonm1 wants to merge 14 commits intoproxy-wasm:mainfrom
Draft
Conversation
leonm1
force-pushed
the
api/wasmtime
branch
3 times, most recently
from
40e3040 to
68ebe57
Compare
PiotrSikora
requested changes
Mar 2, 2026
Member
PiotrSikora
left a comment
PiotrSikora
left a comment
There was a problem hiding this comment.
Implements memory limiting and execution termination for wasmtime.
Could you split this off into a separate PR? I think it's just a few lines, so it should be doable, and I think those changes warrant a proper review instead of being bundled in this mass refactor. Thanks!
leonm1
force-pushed
the
api/wasmtime
branch
2 times, most recently
from
680dc57 to
5982aca
Compare
Always uses prefixed wasmtime-c-api-impl, otherwise the prefixed implementation bitrots. Prefixes the headers in the repo rule to allow for globbing, which is not possible in a genrule. The crates_vendor-provided wasmtime-c-api-impl provided build allows us to upgrade wasmtime solely by changing the version number in the Cargo.toml file (and the corresponding repo in bazel/repositories.bzl for the C headers). Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Matt Leon <mattleon@google.com>
CMake is used by the wasm-c-api crate's build.rs. Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Matt Leon <mattleon@google.com>
Updating wasmtime updated a dependency used by wasmsign to an incompatible version. They're not used as part of the same build, so separate their dependency graphs by giving wasmsign its own repo name. Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Matt Leon <mattleon@google.com>
Hides many of the implementation details of the wasm-c-api.
Note: adds `wat` feature to wasmtime c headers to fix the following build error, but note that `wat` support is not enabled in the wasmtime build, this just adds the headers to allow the cpp api to compile.
```
external/com_github_bytecodealliance_wasmtime/crates/c-api/include/wasmtime/module.hh:39:17: error: use of undeclared identifier 'wat2wasm'
39 | auto wasm = wat2wasm(wat);
| ^
1 error generated.
```
Signed-off-by: Matt Leon <mattleon@google.com>
PiotrSikora
reviewed
Mar 12, 2026
Comment on lines
-229
to
-287
| genrule( | ||
| name = "prefixed_wasmtime_sources", | ||
| srcs = [ | ||
| "src/wasmtime/types.h", | ||
| "src/wasmtime/wasmtime.cc", | ||
| ], | ||
| outs = [ | ||
| "src/wasmtime/prefixed_types.h", | ||
| "src/wasmtime/prefixed_wasmtime.cc", | ||
| ], | ||
| cmd = """ | ||
| for file in $(SRCS); do | ||
| sed -e 's/wasm_/wasmtime_wasm_/g' \ | ||
| -e 's/include\\/wasm.h/include\\/prefixed_wasm.h/g' \ | ||
| -e 's/wasmtime\\/types.h/wasmtime\\/prefixed_types.h/g' \ | ||
| $$file >$(@D)/$$(dirname $$file)/prefixed_$$(basename $$file) | ||
| done | ||
| """, | ||
| ) | ||
|
|
||
| cc_library( | ||
| name = "prefixed_wasmtime_lib", | ||
| srcs = [ | ||
| "src/common/types.h", | ||
| "src/wasmtime/prefixed_types.h", | ||
| "src/wasmtime/prefixed_wasmtime.cc", | ||
| ], | ||
| hdrs = ["include/proxy-wasm/wasmtime.h"], | ||
| copts = [ | ||
| "-DWASM_API_EXTERN=", | ||
| ], | ||
| defines = [ | ||
| "PROXY_WASM_HAS_RUNTIME_WASMTIME", | ||
| "PROXY_WASM_HOST_ENGINE_WASMTIME", | ||
| ], | ||
| # See: https://bytecodealliance.github.io/wasmtime/c-api/ | ||
| linkopts = select({ | ||
| "@platforms//os:macos": [], | ||
| "@platforms//os:windows": [ | ||
| "ws2_32.lib", | ||
| "advapi32.lib", | ||
| "userenv.lib", | ||
| "ntdll.lib", | ||
| "shell32.lib", | ||
| "ole32.lib", | ||
| "bcrypt.lib", | ||
| ], | ||
| "//conditions:default": [ | ||
| "-ldl", | ||
| "-lm", | ||
| "-lpthread", | ||
| ], | ||
| }), | ||
| deps = [ | ||
| ":wasm_vm_headers", | ||
| "@com_github_bytecodealliance_wasmtime//:prefixed_wasmtime_lib", | ||
| ], | ||
| ) | ||
|
|
PiotrSikora
reviewed
Mar 12, 2026
Member
PiotrSikora
left a comment
PiotrSikora
left a comment
There was a problem hiding this comment.
Uhm, looking at the passed arguments in failed tests, it seems like some endianness conversions are broken.
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
2 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.
Hides many of the implementation details of the wasm-c-api.
Implements memory limiting and execution termination for wasmtime.
Built off of #502.