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.

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

Server/shadow: Protect X operations on shared subystem X11 display with X11 display lock #3371

Merged
merged 1 commit into from May 30, 2016

Conversation

realjiangms
Copy link
Contributor

No description provided.

@realjiangms
Copy link
Contributor Author

Lack of X11 Display lock could cause deadlock in X operation eventually

@freerdp-bot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://ci.freerdp.com//job/PullRequestTester/1241/

@bmiklautz
Copy link
Member

@realjiangms did you encounter any dead lock?

@realjiangms
Copy link
Contributor Author

realjiangms commented May 30, 2016

Yes, when I'm testing the mouse draw back fix with an environment that network latency > 200ms.
The backtrace shows deadlock happen in XReply(). It seems X11 always cause deadlock if we don't protect XDisplay with XLockDisplay.

@realjiangms
Copy link
Contributor Author

The blocked threads are mouse input and screen capture

@bmiklautz bmiklautz merged commit 9daf129 into FreeRDP:master May 30, 2016
@bmiklautz
Copy link
Member

@realjiangms thanks!

@realjiangms realjiangms deleted the fix_x11_shadow_race branch May 30, 2016 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants