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

Jump to bottom

GUACAMOLE-1850: Add locking around cursor to ensure cairo display is not used while being recreated. #456

Merged
merged 1 commit into from
Aug 29, 2023
Merged

GUACAMOLE-1850: Add locking around cursor to ensure cairo display is not used while being recreated. #456

merged 1 commit into from
Aug 29, 2023

Conversation

jmuehlner
Copy link
Contributor

I am seeing the issue described in GUACAMOLE-1850 more often when testing this change.

Adding a mutex to control concurrent access to the surface underlying the socket appears to resolve this issue.

@jmuehlner jmuehlner marked this pull request as ready for review August 29, 2023 00:33
necouchman
necouchman reviewed Aug 29, 2023
View reviewed changes
Copy link
Contributor

@necouchman necouchman left a comment

Choose a reason for hiding this comment

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

Does the guac_common_cursor_resize() not need a lock/unlock?

@jmuehlner
Copy link
Contributor Author

Does the guac_common_cursor_resize() not need a lock/unlock?

The only caller will already have the lock acquired when calling guac_common_cursor_resize(), so it shouldn't need another level of locking. It's static also so nothing outside cursor.c can call it.

@jmuehlner jmuehlner force-pushed the GUAC-1850-fix-concurrent-access-to-cairo-display branch from 60254b6 to 03406fd Compare August 29, 2023 16:32
@jmuehlner jmuehlner marked this pull request as draft August 29, 2023 16:38
@jmuehlner jmuehlner force-pushed the GUAC-1850-fix-concurrent-access-to-cairo-display branch from 03406fd to 9ca2d69 Compare August 29, 2023 16:39
@jmuehlner jmuehlner marked this pull request as ready for review August 29, 2023 16:39
@jmuehlner jmuehlner force-pushed the GUAC-1850-fix-concurrent-access-to-cairo-display branch from 9ca2d69 to 9ae1a79 Compare August 29, 2023 16:42
@jmuehlner jmuehlner force-pushed the GUAC-1850-fix-concurrent-access-to-cairo-display branch from 9ae1a79 to a31bde1 Compare August 29, 2023 16:51
@jmuehlner jmuehlner changed the base branch from master to staging/1.5.4 August 29, 2023 16:51
@mike-jumper mike-jumper merged commit 5e0fb22 into apache:staging/1.5.4 Aug 29, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@necouchman necouchman necouchman left review comments

@neandrake neandrake neandrake left review comments

@mike-jumper mike-jumper mike-jumper approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jmuehlner @neandrake @mike-jumper @necouchman