| blob | c585c95c50e318e70301dce410d172cc1570694c |
1 ###############################################################################
2 # Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
3 #
4 # Permission is hereby granted, free of charge, to any person obtaining a
5 # copy of this software and associated documentation files (the "Software"),
6 # to deal in the Software without restriction, including without limitation
7 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
8 # and/or sell copies of the Software, and to permit persons to whom the
9 # Software is furnished to do so, subject to the following conditions:
10 #
11 # The above copyright notice and this permission notice (including the next
12 # paragraph) shall be included in all copies or substantial portions of the
13 # Software.
14 #
15 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
18 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21 # DEALINGS IN THE SOFTWARE.
22 #
24 5039226 Whitebox animation causes Solaris desktop hang
26 This problem is caused by a dead lock between java_vm and Xserver:
27 Xserver is grabbed by java_vm and waiting for XUngrabServer, java_vm
28 thought XUngrabServer was already sent and sends another dga lock
29 request to Xserver and blocked on that request. Here is what happened:
30 java_vm threads calls XGrabServer and XUngrabServer and then
31 Solaris_DGA_GetLock, it seems no problem, but the current
32 XUngrabServer requires a XSync call after XUngrabServer in MT
33 environment to make sure Xserver is ungrabbed *before* new lock
34 requests come in. Without this XSync, a dead lock may formed just like
35 this case.
37 diff --git a/src/UngrabSvr.c b/src/UngrabSvr.c
38 index ea00848..cea7f99 100644
39 --- a/src/UngrabSvr.c
40 +++ b/src/UngrabSvr.c
41 @@ -39,6 +39,9 @@ XUngrabServer (
42 GetEmptyReq(UngrabServer, req);
43 UnlockDisplay(dpy);
44 SyncHandle();
45 + /* fix for bug 5039226: desktop hangs */
46 + if (!dpy->synchandler)
47 + XSync(dpy, 0);
48 return 1;
49 }