anvil: fix layer surface fifo deadlock

cmeissl · cmeissl · commit eb87eefeac11 · 2024-12-14T23:04:15.000+01:00
diff --git a/anvil/src/state.rs b/anvil/src/state.rs
@@ -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| {
@@ -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| {

Original file line number	Diff line number	Diff line change
`@@ -819,6 +819,9 @@ impl<BackendData: Backend + 'static> AnvilState<BackendData> {`
`819`	`819`	`}`
`820`	`820`	`});`
`821`	`821`	`}`
	`822`	`+ // Drop the lock to the layer map before calling blocker_cleared, which might end up`
	`823`	`+ // calling the commit handler which in turn again could access the layer map.`
	`824`	`+ std::mem::drop(map);`
`822`	`825`
`823`	`826`	`if let CursorImageStatus::Surface(ref surface) = self.cursor_status {`
`824`	`827`	`with_surfaces_surface_tree(surface, \|surface, states\| {`
`@@ -978,6 +981,9 @@ impl<BackendData: Backend + 'static> AnvilState<BackendData> {`
`978`	`981`	`});`
`979`	`982`	`}`
`980`	`983`	`}`
	`984`	`+ // Drop the lock to the layer map before calling blocker_cleared, which might end up`
	`985`	`+ // calling the commit handler which in turn again could access the layer map.`
	`986`	`+ std::mem::drop(map);`
`981`	`987`
`982`	`988`	`if let CursorImageStatus::Surface(ref surface) = self.cursor_status {`
`983`	`989`	`with_surfaces_surface_tree(surface, \|surface, states\| {`