futpib / slopd / 24604758821

85%

Build Type

push

github

Committed by futpib

Commit Message

fix: wrap DashMap/DashSet in newtypes that only return owned values

The previous `PaneMap = Arc<dashmap::DashMap<...>>` and
`ManagedPanes = Arc<dashmap::DashSet<String>>` type aliases let callers
acquire shard guards (`Ref`/`RefMut`/`Entry`/`Iter`) and hold them across
`.await`.  In production (commit 2bac67b / r163) a `for entry in
managed_panes.iter()` loop held a shard read guard across a
`tmux(...).output().await`, and a concurrent `panes.remove(...)` parked
on the same shard's writer-preferring parking_lot::RwLock — deadlocking
slopd.

Fix by hiding the underlying DashMap/DashSet behind newtype wrappers
that expose only owned-return APIs:

- `PaneMap::{get_or_insert,get,remove}` → `Arc<PaneState>` /
  `Option<Arc<PaneState>>`
- `ManagedPanes::{insert,remove,contains,is_empty,snapshot}` →
  `bool` / `Vec<String>`

`snapshot()` is the only way to iterate; the guards used internally are
released before the Vec is returned, so the caller is free to `.await`
while walking it.

Also drop the `pane_state(panes, pane)` helper — callers now call
`panes.get_or_insert(pane)` directly, which does the same thing with a
clearer name.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Coverage Stats

48 of 48 new or added lines in 1 file covered. (100.0%)

75 existing lines in 1 file now uncovered.

2982 of 3590 relevant lines covered (83.06%)

1196578.88 hits per line