Skip to content

Don't let a wake slip in between a wait's checks #2

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

Merged
syrusakbary merged 2 commits into from
Oct 28, 2026
Merged

Don't let a wake slip in between a wait's checks #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d9e55f
Don't let a wake slip in between a wait's checks
syrusakbary Oct 28, 2026
230b5eb
Check a wait's handshake with its waker across threads and under loom
syrusakbary Oct 28, 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
49 changes: 49 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,15 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
wat = "1"

# Model checks of the handshake between waiting and waking (`make
# test-loom`), built only with `--cfg loom`.
[target.'cfg(loom)'.dev-dependencies]
loom = "0.7"

[lints.rust]
# `--cfg loom`, above, is expected.
unexpected_cfgs = { level = "warn", check-cfg = ["cfg(loom)"] }

[[bin]]
name = "gui_wasmer"
path = "src/bin/gui_wasmer.rs"
Expand Down
8 changes: 7 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ OUT := tests/programs/out
PROGRAMS := $(patsubst tests/programs/%.c,$(OUT)/%.wasm,$(wildcard tests/programs/*.c)) $(OUT)/link_all.wasm
EXAMPLES := $(patsubst examples/%.c,examples/out/%.wasm,$(wildcard examples/*.c))

.PHONY: all gen check check-header check-winit check-web check-sys fmt lint programs gpu-programs examples test test-gpu test-windows test-page sdl sdl-programs test-sdl imgui-demo test-imgui winit-programs test-winit clean
.PHONY: all gen check check-header check-winit check-web check-sys fmt lint programs gpu-programs examples test test-loom test-gpu test-windows test-page sdl sdl-programs test-sdl imgui-demo test-imgui winit-programs test-winit clean

all: programs examples

Expand Down Expand Up @@ -104,6 +104,12 @@ $(WEBGPU)/lib/wasm32-wasix/libwebgpu.a:
test: programs
$(CARGO) test --features cli

## The handshake between waiting and waking (src/host/wait.rs) under loom,
## in every interleaving and with every store each load may read. The first
## run builds the dependencies again, with `--cfg loom`.
test-loom:
RUSTFLAGS="--cfg loom" $(CARGO) test --release --lib -- wait::model

## Windows drawn on with WebGPU, on the headless host. Needs a GPU adapter;
## WEBGPU_TEST_FALLBACK_ADAPTER=1 asks for a software one.
test-gpu: gpu-programs examples
Expand Down
Loading
Loading