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

XQuartz: mieq: Wait for the server to finish initializing before letting other threads mieqEnqueue

Browse Source 
Avoid possible race condition whereby one thread might call mieqEnqueue before InitAndStartDevices finishes
(cherry picked from commit 94e417ac87)
This commit is contained in:
Jeremy Huddleston 2009-01-16 14:06:46 -08:00
parent 34cb657164
commit 035c36ffa5
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dix/main.c
View File

@ -242,6 +242,12 @@ static int indexForScanlinePad[ 65 ] = {
#endif
#ifdef XQUARTZ
#include <pthread.h>
BOOL serverInitComplete = FALSE;
pthread_mutex_t serverInitCompleteMutex = PTHREAD_MUTEX_INITIALIZER;
pthread_cond_t serverInitCompleteCond = PTHREAD_COND_INITIALIZER;
int dix_main(int argc, char *argv[], char *envp[])
#else
int main(int argc, char *argv[], char *envp[])
@ -445,6 +451,14 @@ int main(int argc, char *argv[], char *envp[])
}
}
#ifdef XQUARTZ
/* Let the other threads know the server is done with its init */
pthread_mutex_lock(&serverInitCompleteMutex);
serverInitComplete = TRUE;
pthread_cond_broadcast(&serverInitCompleteCond);
pthread_mutex_unlock(&serverInitCompleteMutex);
#endif
Dispatch();
/* Now free up whatever must be freed */

25
mi/mieq.c
View File

@ -36,11 +36,6 @@ in this Software without prior written authorization from The Open Group.
#include <dix-config.h>
#endif
#ifdef XQUARTZ
#include <pthread.h>
static pthread_mutex_t miEventQueueMutex = PTHREAD_MUTEX_INITIALIZER;
#endif
# define NEED_EVENTS
# include <X11/X.h>
# include <X11/Xmd.h>
@ -84,6 +79,25 @@ typedef struct _EventQueue {
static EventQueueRec miEventQueue;
#ifdef XQUARTZ
#include <pthread.h>
static pthread_mutex_t miEventQueueMutex = PTHREAD_MUTEX_INITIALIZER;
extern BOOL serverInitComplete;
extern pthread_mutex_t serverInitCompleteMutex;
extern pthread_cond_t serverInitCompleteCond;
static inline void wait_for_server_init(void) {
/* If the server hasn't finished initializing, wait for it... */
if(!serverInitComplete) {
pthread_mutex_lock(&serverInitCompleteMutex);
while(!serverInitComplete)
pthread_cond_wait(&serverInitCompleteCond, &serverInitCompleteMutex);
pthread_mutex_unlock(&serverInitCompleteMutex);
}
}
#endif
Bool
mieqInit(void)
{
@ -111,6 +125,7 @@ void
mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
{
#ifdef XQUARTZ
wait_for_server_init();
pthread_mutex_lock(&miEventQueueMutex);
#endif
unsigned int oldtail = miEventQueue.tail;