5039226.patch revision 1370
341N/A###############################################################################
1370N/A# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
341N/A#
341N/A# Permission is hereby granted, free of charge, to any person obtaining a
919N/A# copy of this software and associated documentation files (the "Software"),
919N/A# to deal in the Software without restriction, including without limitation
919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,
919N/A# and/or sell copies of the Software, and to permit persons to whom the
919N/A# Software is furnished to do so, subject to the following conditions:
919N/A#
919N/A# The above copyright notice and this permission notice (including the next
919N/A# paragraph) shall be included in all copies or substantial portions of the
919N/A# Software.
919N/A#
919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
919N/A# DEALINGS IN THE SOFTWARE.
341N/A#
341N/A
341N/A5039226 Whitebox animation causes Solaris desktop hang
341N/A
341N/AThis problem is caused by a dead lock between java_vm and Xserver:
341N/AXserver is grabbed by java_vm and waiting for XUngrabServer, java_vm
341N/Athought XUngrabServer was already sent and sends another dga lock
341N/Arequest to Xserver and blocked on that request. Here is what happened:
341N/Ajava_vm threads calls XGrabServer and XUngrabServer and then
341N/ASolaris_DGA_GetLock, it seems no problem, but the current
341N/AXUngrabServer requires a XSync call after XUngrabServer in MT
341N/Aenvironment to make sure Xserver is ungrabbed *before* new lock
341N/Arequests come in. Without this XSync, a dead lock may formed just like
341N/Athis case.
341N/A
1370N/Adiff --git a/src/UngrabSvr.c b/src/UngrabSvr.c
1370N/Aindex ea00848..cea7f99 100644
1370N/A--- a/src/UngrabSvr.c
1370N/A+++ b/src/UngrabSvr.c
1064N/A@@ -39,6 +39,9 @@ XUngrabServer (
341N/A GetEmptyReq(UngrabServer, req);
341N/A UnlockDisplay(dpy);
341N/A SyncHandle();
341N/A+ /* fix for bug 5039226: desktop hangs */
688N/A+ if (!dpy->synchandler)
341N/A+ XSync(dpy, 0);
341N/A return 1;
341N/A }
341N/A