File u_os-inputthread-Force-unlock-when-stopping-thr... of Package xorg-x11-server

Overview Repositories Revisions Requests Users Attributes Meta

File u_os-inputthread-Force-unlock-when-stopping-thread.patch of Package xorg-x11-server (Revision f70647c8bb3407abc7794bb4a4c50d77)

Currently displaying revision f70647c8bb3407abc7794bb4a4c50d77 , Show latest

Author: Michal Srb <msrb@suse.com>
Subject: os/inputthread: Force unlock when stopping thread.
Patch-Mainline: To be upstreamed
References: bnc#1062977

The inputthread is kept locked all the time while X server's VT is not active.
If the X server is terminated while not active, it will be stuck forever in
InputThreadFini waiting for the thread to join, but it wouldn't because it is
locked.
---
This fixes the X server termination while its VT is not active. I think it
should be safe to force unlock it from InputThreadFini - X server is
terminating and nothing else should race there, but I am not completely sure.

os/inputthread.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/os/inputthread.c b/os/inputthread.c
index 721e86312..dc4eb9f20 100644
--- a/os/inputthread.c
+++ b/os/inputthread.c
@@ -497,6 +497,7 @@ InputThreadFini(void)
 
     /* Close the pipe to get the input thread to shut down */
     close(hotplugPipeWrite);
+    input_force_unlock();
     pthread_join(inputThreadInfo->thread, NULL);
 
     xorg_list_for_each_entry_safe(dev, next, &inputThreadInfo->devs, node) {
-- 
2.12.3

Places

File u_os-inputthread-Force-unlock-when-stopping-thread.patch of Package xorg-x11-server (Revision f70647c8bb3407abc7794bb4a4c50d77)

Places