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

XQuartz: Use a rwlock instead of a mutex to protect window_hash in the pthread case 

Concurrent reads are acceptable, so using an rwlock should be better.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston 2011-04-23 18:09:11 -07:00
parent 5cb31cd0cb
commit 29d471663e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/xquartz/xpr/xprFrame.c
View File

@ -69,7 +69,7 @@ static x_hash_table *window_hash;
#ifdef HAVE_LIBDISPATCH #ifdef HAVE_LIBDISPATCH
static dispatch_queue_t window_hash_serial_q; static dispatch_queue_t window_hash_serial_q;
#else #else
static pthread_mutex_t window_hash_mutex; static pthread_rwlock_t window_hash_rwlock;
#endif #endif
/* Prototypes for static functions */ /* Prototypes for static functions */
@ -192,9 +192,9 @@ xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
x_hash_table_insert(window_hash, pFrame->wid, pFrame); x_hash_table_insert(window_hash, pFrame->wid, pFrame);
}); });
#else #else
pthread_mutex_lock(&window_hash_mutex); pthread_rwlock_wrlock(&window_hash_rwlock);
x_hash_table_insert(window_hash, pFrame->wid, pFrame); x_hash_table_insert(window_hash, pFrame->wid, pFrame);
pthread_mutex_unlock(&window_hash_mutex); pthread_rwlock_wrlock(&window_hash_rwlock);
#endif #endif
xprSetNativeProperty(pFrame); xprSetNativeProperty(pFrame);
@ -216,9 +216,9 @@ xprDestroyFrame(RootlessFrameID wid)
x_hash_table_remove(window_hash, wid); x_hash_table_remove(window_hash, wid);
}); });
#else #else
pthread_mutex_lock(&window_hash_mutex); pthread_rwlock_wrlock(&window_hash_rwlock);
x_hash_table_remove(window_hash, wid); x_hash_table_remove(window_hash, wid);
pthread_mutex_unlock(&window_hash_mutex); pthread_rwlock_unlock(&window_hash_rwlock);
#endif #endif
err = xp_destroy_window(x_cvt_vptr_to_uint(wid)); err = xp_destroy_window(x_cvt_vptr_to_uint(wid));
@ -292,9 +292,9 @@ static void xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid) {
winRec = x_hash_table_lookup(window_hash, wid, NULL); winRec = x_hash_table_lookup(window_hash, wid, NULL);
}); });
#else #else
pthread_mutex_lock(&window_hash_mutex); pthread_rwlock_rdlock(&window_hash_rwlock);
winRec = x_hash_table_lookup(window_hash, wid, NULL); winRec = x_hash_table_lookup(window_hash, wid, NULL);
pthread_mutex_unlock(&window_hash_mutex); pthread_rwlock_unlock(&window_hash_rwlock);
#endif #endif
if(winRec) { if(winRec) {
@ -479,7 +479,7 @@ xprInit(ScreenPtr pScreen)
#ifdef HAVE_LIBDISPATCH #ifdef HAVE_LIBDISPATCH
assert((window_hash_serial_q = dispatch_queue_create(BUNDLE_ID_PREFIX".X11.xpr_window_hash", NULL))); assert((window_hash_serial_q = dispatch_queue_create(BUNDLE_ID_PREFIX".X11.xpr_window_hash", NULL)));
#else #else
assert(0 == pthread_mutex_init(&window_hash_mutex, NULL)); assert(0 == pthread_rwlock_init(&window_hash_rwlock, NULL));
#endif #endif
return TRUE; return TRUE;
@ -500,9 +500,9 @@ xprGetXWindow(xp_window_id wid)
}); });
#else #else
RootlessWindowRec *winRec; RootlessWindowRec *winRec;
pthread_mutex_lock(&window_hash_mutex); pthread_rwlock_rdlock(&window_hash_rwlock);
winRec = x_hash_table_lookup(window_hash, x_cvt_uint_to_vptr(wid), NULL); winRec = x_hash_table_lookup(window_hash, x_cvt_uint_to_vptr(wid), NULL);
pthread_mutex_unlock(&window_hash_mutex); pthread_rwlock_unlock(&window_hash_rwlock);
#endif #endif
return winRec != NULL ? winRec->win : NULL; return winRec != NULL ? winRec->win : NULL;