Skip to content

Conversation

@dicej
Copy link
Contributor

@dicej dicej commented Sep 9, 2025

In addition to returning the value produced by the callee, these functions now also return a TaskExit future which resolves once the subtask (and any transitively-created subtasks) have exited. This partially addresses #11600; the next step will be to add a wasmtime-wit-bindgen option to expose the TaskExit value in generated bindings.

@dicej dicej requested a review from alexcrichton September 9, 2025 22:24
@dicej dicej requested a review from a team as a code owner September 9, 2025 22:24
@dicej dicej force-pushed the call-concurrent-task-exit branch 3 times, most recently from 5d9a389 to 95e8b93 Compare September 9, 2025 22:42
In addition to returning the value produced by the callee, these functions now
also return a `TaskExit` future which resolves once the subtask (and any
transitively-created subtasks) have exited.  This partially addresses bytecodealliance#11600;
the next step will be to add a `wasmtime-wit-bindgen` option to expose the
`TaskExit` value in generated bindings.

Signed-off-by: Joel Dice <joel.dice@fermyon.com>
@dicej dicej force-pushed the call-concurrent-task-exit branch from 95e8b93 to 2560a3b Compare September 9, 2025 22:45
@github-actions github-actions bot added the wasmtime:api Related to the API of the `wasmtime` crate itself label Sep 10, 2025
dicej added a commit to dicej/wasmtime that referenced this pull request Sep 10, 2025
This builds on bytecodealliance#11662 by optionally exposing the `TaskExit` return value from
`[Typed]Func::call_concurrent` in the bindings generated for exported functions.

Note that the first commit is shared with bytecodealliance#11662.

Fixes bytecodealliance#11600

Signed-off-by: Joel Dice <joel.dice@fermyon.com>
/// indirectly by the original call to `Instance::call_concurrent` have exited.
#[cfg(feature = "component-model-async")]
pub struct TaskExit<A> {
_accessor: A,
Copy link
Member

Choose a reason for hiding this comment

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

Thinking more on this, two points:

  • One is that I'm starting to think we may want to actually skip the type parameter here and instead have async fn TaskExit::block(self, impl AsAccessor) -> Result<()> or something like that. It helps simplify bindings-generated signatures as well as the signatures of call_* above since we can keep impl AsAccessor instead of threading around the A type parameter.
  • Another is that while I have no doubt "just add a channel" is the easiest way to fix this I think we'll want to avoid that in the future. In addition to the cost of the allocation/management of the Arcs (two layers, one on the sender and one in the channel itself) I feel like channels end up causing more problems than they solve in the long run. For now though it's fine but I think we'll want to have internal documentation along the lines of "it's acknowledged that the accessor isn't actually used in the block implementation but it's here for hypothetical use in the future

`TaskExit` now has an `async fn block` instead of closing over an `impl
AsAccessor` and implementing `Future`.

Signed-off-by: Joel Dice <joel.dice@fermyon.com>
@dicej dicej enabled auto-merge September 10, 2025 16:21
dicej added a commit to dicej/wasmtime that referenced this pull request Sep 10, 2025
This builds on bytecodealliance#11662 by optionally exposing the `TaskExit` return value from
`[Typed]Func::call_concurrent` in the bindings generated for exported functions.

Note that the first two commits are shared with bytecodealliance#11662.

Fixes bytecodealliance#11600

Signed-off-by: Joel Dice <joel.dice@fermyon.com>
@dicej dicej added this pull request to the merge queue Sep 10, 2025
Merged via the queue into bytecodealliance:main with commit f75ae78 Sep 10, 2025
44 checks passed
@dicej dicej deleted the call-concurrent-task-exit branch September 10, 2025 17:00
@alexcrichton alexcrichton moved this to Done in Ship WASIp3 Sep 10, 2025
dicej added a commit to dicej/wasmtime that referenced this pull request Sep 10, 2025
This builds on bytecodealliance#11662 by optionally exposing the `TaskExit` return value from
`[Typed]Func::call_concurrent` in the bindings generated for exported functions.

Note that the first two commits are shared with bytecodealliance#11662.

Fixes bytecodealliance#11600

Signed-off-by: Joel Dice <joel.dice@fermyon.com>
github-merge-queue bot pushed a commit that referenced this pull request Sep 10, 2025
This builds on #11662 by optionally exposing the `TaskExit` return value from
`[Typed]Func::call_concurrent` in the bindings generated for exported functions.

Note that the first two commits are shared with #11662.

Fixes #11600

Signed-off-by: Joel Dice <joel.dice@fermyon.com>
alexcrichton pushed a commit to alexcrichton/wasmtime that referenced this pull request Sep 11, 2025
…ealliance#11662)

* return `TaskExit` future from `[Typed]Func::call_concurrent`

In addition to returning the value produced by the callee, these functions now
also return a `TaskExit` future which resolves once the subtask (and any
transitively-created subtasks) have exited.  This partially addresses bytecodealliance#11600;
the next step will be to add a `wasmtime-wit-bindgen` option to expose the
`TaskExit` value in generated bindings.

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

* address review feedback

`TaskExit` now has an `async fn block` instead of closing over an `impl
AsAccessor` and implementing `Future`.

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

---------

Signed-off-by: Joel Dice <joel.dice@fermyon.com>
alexcrichton pushed a commit to alexcrichton/wasmtime that referenced this pull request Sep 11, 2025
)

This builds on bytecodealliance#11662 by optionally exposing the `TaskExit` return value from
`[Typed]Func::call_concurrent` in the bindings generated for exported functions.

Note that the first two commits are shared with bytecodealliance#11662.

Fixes bytecodealliance#11600

Signed-off-by: Joel Dice <joel.dice@fermyon.com>
alexcrichton added a commit that referenced this pull request Sep 11, 2025
* p3-http: rework `content-length` handling (#11658)

* p3-http: correctly handle `result` future cancellation

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* p3-http: restructure the `content-length` test a bit

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* test(http): keep accepting connections after errors

prtest:full

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* test(p3-http): assert `handle` error on exceeding `content-length`

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* p3-http: perform `content-length` check early

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* test(p3-http): account for `handle` race condition

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* refactor(http): reuse `get_content_length`

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* p3-http: check `content-length` for host bodies

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* doc(p3-http): call out that host bodies are not validated

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* p3-http: refactor body size error send

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* fix(p3-http): do not rely on `Drop` for host body check

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* doc(p3-http): ensure non-default send request is documented

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* doc(p3-http): correct `send_request` doc

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

---------

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* return `TaskExit` future from `[Typed]Func::call_concurrent` (#11662)

* return `TaskExit` future from `[Typed]Func::call_concurrent`

In addition to returning the value produced by the callee, these functions now
also return a `TaskExit` future which resolves once the subtask (and any
transitively-created subtasks) have exited.  This partially addresses #11600;
the next step will be to add a `wasmtime-wit-bindgen` option to expose the
`TaskExit` value in generated bindings.

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

* address review feedback

`TaskExit` now has an `async fn block` instead of closing over an `impl
AsAccessor` and implementing `Future`.

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

---------

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

* Update to wasm-tools 239 (#11660)

Changes include:

* `async` option on some CM intrinsics renamed to `cancellable`
* New `backpressure.{inc,dec}` intrinsics
* New component-model-threading-related intrinsics

New features aren't yet implemented, they're left for future PRs.

* add `task_exit` option to `wasmtime-wit-bindgen` (#11665)

This builds on #11662 by optionally exposing the `TaskExit` return value from
`[Typed]Func::call_concurrent` in the bindings generated for exported functions.

Note that the first two commits are shared with #11662.

Fixes #11600

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

* make `waitable-set.{poll,wait}` and `yield` non-cancellable by default (#11671)

This fixes a divergence between the spec and the implementation.  Thanks (again)
to Luke for providing a test case, which I've added here.

This addresses half of #11582

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

* fix panic in `Instance::set_consumer` when write end is already dropped (#11669)

* fix panic in `Instance::set_consumer` when write end is already dropped

In this case, we can drop the whole stream or future immediately since there's
nothing left to do with it.

Fixes #11621

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

* add test for piping from a stream whose write end is already dropped

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

---------

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

* wasip3: Add support to `wasmtime serve` (#11646)

* wasip3: Add support to `wasmtime serve`

This commit adds support for WASIp3 to `wasmtime serve` by detecting
whether the input component is using a WASIp3 exported interface instead
of a WASIp2 exported interface (similar to how `wasmtime run` detects
which is supported).

* Fix tests

* Log guest result

* fix panic when trapping while handling multiple work items (#11678)

Now we wrap the "ready" set of work items in a struct which will gracefully
dispose of the remainder if we trap or panic while handling one of them.

Fixes #11668

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

* Implement `backpressure.{inc,dec}` (#11661)

Added to the async specification in WebAssembly/component-model#560
these are minor adaptations to the preexisting `backpressure.set`
intrinsic and are intended to replace it. The `backpressure.set`
intrinsic will remain until tooling propagates to understand
`backpressure.{inc,dec}`.

---------

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
Signed-off-by: Joel Dice <joel.dice@fermyon.com>
Co-authored-by: Roman Volosatovs <rvolosatovs@users.noreply.github.com>
Co-authored-by: Joel Dice <joel.dice@fermyon.com>
bongjunj pushed a commit to prosyslab/wasmtime that referenced this pull request Oct 20, 2025
…ealliance#11662)

* return `TaskExit` future from `[Typed]Func::call_concurrent`

In addition to returning the value produced by the callee, these functions now
also return a `TaskExit` future which resolves once the subtask (and any
transitively-created subtasks) have exited.  This partially addresses bytecodealliance#11600;
the next step will be to add a `wasmtime-wit-bindgen` option to expose the
`TaskExit` value in generated bindings.

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

* address review feedback

`TaskExit` now has an `async fn block` instead of closing over an `impl
AsAccessor` and implementing `Future`.

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

---------

Signed-off-by: Joel Dice <joel.dice@fermyon.com>
bongjunj pushed a commit to prosyslab/wasmtime that referenced this pull request Oct 20, 2025
)

This builds on bytecodealliance#11662 by optionally exposing the `TaskExit` return value from
`[Typed]Func::call_concurrent` in the bindings generated for exported functions.

Note that the first two commits are shared with bytecodealliance#11662.

Fixes bytecodealliance#11600

Signed-off-by: Joel Dice <joel.dice@fermyon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

wasmtime:api Related to the API of the `wasmtime` crate itself

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants