frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/xwin: Only add to XSetIOErrorHandler() handler chain once 

Only use XSetIOErrorHandler() to add to the global XSetIOErrorHandler() chain
once.  If we do it every restart, then we make a loop in the handler chain, and
we end up with a thread spinning in that loop when the server shuts down...

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2013-06-18 19:53:52 +01:00
parent 5819a02d46
commit 7ca9330194
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/xwin/winclipboard/thread.c
View File

@ -113,6 +113,7 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay)
Window iWindow = None; Window iWindow = None;
int iSelectError; int iSelectError;
Bool fShutdown = FALSE; Bool fShutdown = FALSE;
static Bool fErrorHandlerSet = FALSE;
winDebug("winClipboardProc - Hello\n"); winDebug("winClipboardProc - Hello\n");
@ -127,11 +128,15 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay)
ErrorF("winClipboardProc - Warning: Locale not supported by X.\n"); ErrorF("winClipboardProc - Warning: Locale not supported by X.\n");
} }
/* Set error handler */
XSetErrorHandler(winClipboardErrorHandler);
g_winClipboardProcThread = pthread_self(); g_winClipboardProcThread = pthread_self();
g_winClipboardOldIOErrorHandler =
XSetIOErrorHandler(winClipboardIOErrorHandler); /* Set error handler */
if (!fErrorHandlerSet) {
XSetErrorHandler(winClipboardErrorHandler);
g_winClipboardOldIOErrorHandler =
XSetIOErrorHandler(winClipboardIOErrorHandler);
fErrorHandlerSet = TRUE;
}
/* Set jump point for Error exits */ /* Set jump point for Error exits */
if (setjmp(g_jmpEntry)) { if (setjmp(g_jmpEntry)) {