Skip to content
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

anvil: fix layer surface fifo deadlock #1608

Merged
merged 1 commit into from
Dec 14, 2024
Merged

anvil: fix layer surface fifo deadlock #1608

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions anvil/src/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,9 @@ impl<BackendData: Backend + 'static> AnvilState<BackendData> {
}
});
}
// Drop the lock to the layer map before calling blocker_cleared, which might end up
// calling the commit handler which in turn again could access the layer map.
std::mem::drop(map);

if let CursorImageStatus::Surface(ref surface) = self.cursor_status {
with_surfaces_surface_tree(surface, |surface, states| {
Expand Down Expand Up @@ -978,6 +981,9 @@ impl<BackendData: Backend + 'static> AnvilState<BackendData> {
});
}
}
// Drop the lock to the layer map before calling blocker_cleared, which might end up
// calling the commit handler which in turn again could access the layer map.
std::mem::drop(map);

if let CursorImageStatus::Surface(ref surface) = self.cursor_status {
with_surfaces_surface_tree(surface, |surface, states| {
Expand Down
Loading