andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

os/inputthread: Force unlock when stopping thread.

Browse Source 
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.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=103782
Signed-off-by: Michal Srb <msrb@suse.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit 71348e99a8)
This commit is contained in:
Michal Srb 2017-11-27 09:59:01 +01:00 committed by Adam Jackson
parent 5c456b6e2a
commit 9cd243f75d
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
os/inputthread.c
View File

@ -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) {