Skip to content

Migrate wasmtime to wasmtime-cpp-api #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
leonm1 wants to merge 14 commits into
base: main
Choose a base branch
from
Draft

Migrate wasmtime to wasmtime-cpp-api #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a2ce119
Use crates_vendor-provided wasmtime-c-api-impl
leonm1 Feb 27, 2026
c7d3365
Run bazel run //bazel/cargo/wasmtime:crates_vendor
leonm1 Feb 27, 2026
67464c1
Remove default feature override from wasmtime Cargo.toml
leonm1 Mar 3, 2026
b38ad81
Move generated exported lib.rs into src/ subdir
leonm1 Mar 3, 2026
082a0ad
Use $(OBJCOPY) in wasmtime build
leonm1 Mar 3, 2026
abfa949
Run cargo-fmt-toml on Cargo.toml
leonm1 Mar 3, 2026
fff9532
Run bazel run //bazel/cargo/wasmtime:crates_vendor
leonm1 Mar 3, 2026
b915a88
Add cmake to s390x docker image
leonm1 Mar 11, 2026
b651e7e
Add fixes for envoy build of wasm filter with wasmtime
leonm1 Mar 12, 2026
053920c
Upgrade wasmtime from 24.0.6 -> 42.0.1
leonm1 Feb 27, 2026
57eadc5
Run bazel run //bazel/cargo/wasmtime:crates_vendor
leonm1 Feb 27, 2026
b0d9e12
Update wasmsign vendored crates to use different repo name
leonm1 Mar 12, 2026
d6abf33
Run bazel run //bazel/cargo/wasmsign:crates_vendor
leonm1 Mar 12, 2026
dbc1f3e
Migrate to wasmtime cpp API
leonm1 Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 0 additions & 61 deletions BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ cc_library(
name = "wasmtime_lib",
srcs = [
"src/common/types.h",
"src/wasmtime/types.h",
"src/wasmtime/wasmtime.cc",
],
hdrs = ["include/proxy-wasm/wasmtime.h"],
Expand Down Expand Up @@ -226,65 +225,6 @@ cc_library(
],
)

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",
],
)

Comment on lines -229 to -287
Copy link
Member

@PiotrSikora PiotrSikora Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sholdn't this be part of #501?

cc_library(
name = "lib",
deps = [
Expand All @@ -299,6 +239,5 @@ cc_library(
[":wasmedge_lib"],
) + proxy_wasm_select_engine_wasmtime(
[":wasmtime_lib"],
[":prefixed_wasmtime_lib"],
),
)
2 changes: 1 addition & 1 deletion bazel/cargo/wasmsign/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ crates_vendor(
generate_target_compatible_with = False,
manifests = [":Cargo.toml"],
mode = "remote",
repository_name = "cu", # shorten generated paths for Windows...
repository_name = "ws", # shorten generated paths for Windows...
tags = ["manual"],
vendor_path = "remote",
)
2 changes: 1 addition & 1 deletion bazel/cargo/wasmsign/remote/BUILD.aho-corasick-1.1.4.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ rust_library(
],
version = "1.1.4",
deps = [
"@cu__memchr-2.7.6//:memchr",
"@ws__memchr-2.7.6//:memchr",
],
)
2 changes: 1 addition & 1 deletion bazel/cargo/wasmsign/remote/BUILD.anyhow-1.0.100.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ rust_library(
],
version = "1.0.100",
deps = [
"@cu__anyhow-1.0.100//:build_script_build",
"@ws__anyhow-1.0.100//:build_script_build",
],
)

Expand Down
4 changes: 2 additions & 2 deletions bazel/cargo/wasmsign/remote/BUILD.base64-0.9.3.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ rust_library(
],
version = "0.9.3",
deps = [
"@cu__byteorder-1.5.0//:byteorder",
"@cu__safemem-0.3.3//:safemem",
"@ws__byteorder-1.5.0//:byteorder",
"@ws__safemem-0.3.3//:safemem",
],
)
8 changes: 4 additions & 4 deletions bazel/cargo/wasmsign/remote/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,25 @@ filegroup(
# Workspace Member Dependencies
alias(
name = "wasmsign2-cli-0.2.6",
actual = "@cu__wasmsign2-cli-0.2.6//:wasmsign2_cli",
actual = "@ws__wasmsign2-cli-0.2.6//:wasmsign2_cli",
tags = ["manual"],
)

alias(
name = "wasmsign2-cli",
actual = "@cu__wasmsign2-cli-0.2.6//:wasmsign2_cli",
actual = "@ws__wasmsign2-cli-0.2.6//:wasmsign2_cli",
tags = ["manual"],
)

# Binaries
alias(
name = "clap__stdio-fixture",
actual = "@cu__clap-3.2.25//:stdio-fixture__bin",
actual = "@ws__clap-3.2.25//:stdio-fixture__bin",
tags = ["manual"],
)

alias(
name = "wasmsign2-cli__wasmsign2",
actual = "@cu__wasmsign2-cli-0.2.6//:wasmsign2__bin",
actual = "@ws__wasmsign2-cli-0.2.6//:wasmsign2__bin",
tags = ["manual"],
)
4 changes: 2 additions & 2 deletions bazel/cargo/wasmsign/remote/BUILD.cc-1.2.50.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ rust_library(
],
version = "1.2.50",
deps = [
"@cu__find-msvc-tools-0.1.5//:find_msvc_tools",
"@cu__shlex-1.3.0//:shlex",
"@ws__find-msvc-tools-0.1.5//:find_msvc_tools",
"@ws__shlex-1.3.0//:shlex",
],
)
24 changes: 12 additions & 12 deletions bazel/cargo/wasmsign/remote/BUILD.clap-3.2.25.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ rust_library(
],
version = "3.2.25",
deps = [
"@cu__bitflags-1.3.2//:bitflags",
"@cu__clap_lex-0.2.4//:clap_lex",
"@cu__indexmap-1.9.3//:indexmap",
"@cu__once_cell-1.21.3//:once_cell",
"@cu__terminal_size-0.2.6//:terminal_size",
"@cu__textwrap-0.16.2//:textwrap",
"@ws__bitflags-1.3.2//:bitflags",
"@ws__clap_lex-0.2.4//:clap_lex",
"@ws__indexmap-1.9.3//:indexmap",
"@ws__once_cell-1.21.3//:once_cell",
"@ws__terminal_size-0.2.6//:terminal_size",
"@ws__textwrap-0.16.2//:textwrap",
],
)

Expand Down Expand Up @@ -114,11 +114,11 @@ rust_binary(
version = "3.2.25",
deps = [
":clap",
"@cu__bitflags-1.3.2//:bitflags",
"@cu__clap_lex-0.2.4//:clap_lex",
"@cu__indexmap-1.9.3//:indexmap",
"@cu__once_cell-1.21.3//:once_cell",
"@cu__terminal_size-0.2.6//:terminal_size",
"@cu__textwrap-0.16.2//:textwrap",
"@ws__bitflags-1.3.2//:bitflags",
"@ws__clap_lex-0.2.4//:clap_lex",
"@ws__indexmap-1.9.3//:indexmap",
"@ws__once_cell-1.21.3//:once_cell",
"@ws__terminal_size-0.2.6//:terminal_size",
"@ws__textwrap-0.16.2//:textwrap",
],
)
2 changes: 1 addition & 1 deletion bazel/cargo/wasmsign/remote/BUILD.clap_lex-0.2.4.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ rust_library(
],
version = "0.2.4",
deps = [
"@cu__os_str_bytes-6.6.1//:os_str_bytes",
"@ws__os_str_bytes-6.6.1//:os_str_bytes",
],
)
4 changes: 2 additions & 2 deletions bazel/cargo/wasmsign/remote/BUILD.crc32fast-1.5.0.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ rust_library(
],
version = "1.5.0",
deps = [
"@cu__cfg-if-1.0.0//:cfg_if",
"@cu__crc32fast-1.5.0//:build_script_build",
"@ws__cfg-if-1.0.0//:cfg_if",
"@ws__crc32fast-1.5.0//:build_script_build",
],
)

Expand Down
6 changes: 3 additions & 3 deletions bazel/cargo/wasmsign/remote/BUILD.displaydoc-0.2.5.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ rust_proc_macro(
],
version = "0.2.5",
deps = [
"@cu__proc-macro2-1.0.103//:proc_macro2",
"@cu__quote-1.0.42//:quote",
"@cu__syn-2.0.111//:syn",
"@ws__proc-macro2-1.0.103//:proc_macro2",
"@ws__quote-1.0.42//:quote",
"@ws__syn-2.0.111//:syn",
],
)
4 changes: 2 additions & 2 deletions bazel/cargo/wasmsign/remote/BUILD.ed25519-compact-2.2.0.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ rust_library(
],
version = "2.2.0",
deps = [
"@cu__ct-codecs-1.1.6//:ct_codecs",
"@cu__getrandom-0.3.4//:getrandom",
"@ws__ct-codecs-1.1.6//:ct_codecs",
"@ws__getrandom-0.3.4//:getrandom",
],
)
2 changes: 1 addition & 1 deletion bazel/cargo/wasmsign/remote/BUILD.env_filter-0.1.4.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ rust_library(
],
version = "0.1.4",
deps = [
"@cu__log-0.4.29//:log",
"@ws__log-0.4.29//:log",
],
)
6 changes: 3 additions & 3 deletions bazel/cargo/wasmsign/remote/BUILD.env_logger-0.11.8.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ rust_library(
],
version = "0.11.8",
deps = [
"@cu__env_filter-0.1.4//:env_filter",
"@cu__jiff-0.2.16//:jiff",
"@cu__log-0.4.29//:log",
"@ws__env_filter-0.1.4//:env_filter",
"@ws__jiff-0.2.16//:jiff",
"@ws__log-0.4.29//:log",
],
)
66 changes: 33 additions & 33 deletions bazel/cargo/wasmsign/remote/BUILD.errno-0.3.14.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,103 +109,103 @@ rust_library(
version = "0.3.14",
deps = select({
"@rules_rust//rust/platform:aarch64-apple-darwin": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:aarch64-apple-ios": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:aarch64-apple-ios-sim": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:aarch64-linux-android": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
"@cu__windows-sys-0.61.2//:windows_sys", # cfg(windows)
"@ws__windows-sys-0.61.2//:windows_sys", # cfg(windows)
],
"@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:armv7-linux-androideabi": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:i686-apple-darwin": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:i686-linux-android": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:i686-pc-windows-msvc": [
"@cu__windows-sys-0.61.2//:windows_sys", # cfg(windows)
"@ws__windows-sys-0.61.2//:windows_sys", # cfg(windows)
],
"@rules_rust//rust/platform:i686-unknown-freebsd": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:i686-unknown-linux-gnu": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:wasm32-unknown-emscripten": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:wasm32-wasip1": [
"@cu__libc-0.2.178//:libc", # cfg(target_os = "wasi")
"@ws__libc-0.2.178//:libc", # cfg(target_os = "wasi")
],
"@rules_rust//rust/platform:wasm32-wasip1-threads": [
"@cu__libc-0.2.178//:libc", # cfg(target_os = "wasi")
"@ws__libc-0.2.178//:libc", # cfg(target_os = "wasi")
],
"@rules_rust//rust/platform:wasm32-wasip2": [
"@cu__libc-0.2.178//:libc", # cfg(target_os = "wasi")
"@ws__libc-0.2.178//:libc", # cfg(target_os = "wasi")
],
"@rules_rust//rust/platform:x86_64-apple-darwin": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:x86_64-apple-ios": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:x86_64-linux-android": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
"@cu__windows-sys-0.61.2//:windows_sys", # cfg(windows)
"@ws__windows-sys-0.61.2//:windows_sys", # cfg(windows)
],
"@rules_rust//rust/platform:x86_64-unknown-freebsd": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
"@cu__libc-0.2.178//:libc", # cfg(unix)
"@ws__libc-0.2.178//:libc", # cfg(unix)
],
"//conditions:default": [],
}),
Expand Down
Loading
Loading