[PATCH 1/1] dix: Silence TSan warnings when checking for pending input
Jeremy Huddleston Sequoia
jeremyhu at apple.com
Thu Sep 22 19:07:45 UTC 2016
V2: Moves InputCheckPending() into dix.h
Bumps required version of xproto to 7.0.30
==================
WARNING: ThreadSanitizer: data race (pid=4943)
Read of size 4 at 0x00010c4e3854 by thread T8:
#0 WaitForSomething WaitFor.c:237 (X11.bin+0x00010049216c)
#1 Dispatch dispatch.c:413 (X11.bin+0x000100352ed9)
#2 dix_main main.c:287 (X11.bin+0x00010036e894)
#3 server_thread quartzStartup.c:66 (X11.bin+0x000100039e63)
Previous write of size 4 at 0x00010c4e3854 by thread T12 (mutexes: write M856, write M1976):
#0 mieqEnqueue mieq.c:263 (X11.bin+0x000100448d14)
#1 DarwinSendDDXEvent darwinEvents.c:641 (X11.bin+0x000100033613)
#2 DarwinProcessFDAdditionQueue_thread darwinEvents.c:338 (X11.bin+0x000100032039)
Location is global 'miEventQueue' at 0x00010c4e3850 (X11.bin+0x0001005ab854)
Mutex M856 (0x00010c4c8c80) created at:
#0 pthread_mutex_lock <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x0000000321fe)
#1 DarwinListenOnOpenFD darwinEvents.c:300 (X11.bin+0x000100031607)
#2 socket_handoff bundle-main.c:288 (X11.bin+0x000100002b40)
#3 __do_request_fd_handoff_socket_block_invoke bundle-main.c:379 (X11.bin+0x0001000029ba)
#4 __tsan::invoke_and_release_block(void*) <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x00000005d97b)
#5 _dispatch_client_callout <null>:33 (libdispatch.dylib+0x0000000020ef)
Mutex M1976 (0x00010c4e3d68) created at:
#0 pthread_mutex_init <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x0000000253c3)
#1 input_lock inputthread.c:103 (X11.bin+0x00010049fd10)
#2 TimerSet WaitFor.c:343 (X11.bin+0x0001004926c2)
#3 RootlessQueueRedisplay rootlessScreen.c:594 (X11.bin+0x000100065d7f)
#4 RootlessInstallColormap rootlessScreen.c:514 (X11.bin+0x000100069f1a)
#5 miSpriteInstallColormap misprite.c:562 (X11.bin+0x000100467095)
#6 miCreateDefColormap micmap.c:270 (X11.bin+0x000100440399)
#7 DarwinScreenInit darwin.c:285 (X11.bin+0x0001000303bb)
#8 AddScreen dispatch.c:3908 (X11.bin+0x00010036c417)
#9 InitOutput darwin.c:671 (X11.bin+0x00010002fdeb)
#10 dix_main main.c:197 (X11.bin+0x00010036e228)
#11 server_thread quartzStartup.c:66 (X11.bin+0x000100039e63)
Thread T8 (tid=4198779, running) created by main thread at:
#0 pthread_create <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x000000024490)
#1 create_thread quartzStartup.c:78 (X11.bin+0x000100039dad)
#2 QuartzInitServer quartzStartup.c:95 (X11.bin+0x000100039c16)
#3 X11ApplicationMain X11Application.m:1238 (X11.bin+0x00010001cde4)
#4 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a642)
#5 server_main quartzStartup.c:136 (X11.bin+0x00010003a03b)
#6 do_start_x11_server bundle-main.c:436 (X11.bin+0x000100002eb5)
#7 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x000100004e99)
#8 mach_startup_server mach_startupServer.c:399 (X11.bin+0x000100005734)
#9 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
#10 start <null>:29 (libdyld.dylib+0x000000005254)
Thread T12 (tid=4198797, running) created by thread T8 at:
#0 pthread_create <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x000000024490)
#1 create_thread darwinEvents.c:121 (X11.bin+0x000100031ecf)
#2 DarwinEQInit darwinEvents.c:365 (X11.bin+0x000100031860)
#3 InitInput darwin.c:571 (X11.bin+0x00010002ea09)
#4 dix_main main.c:261 (X11.bin+0x00010036e7ce)
#5 server_thread quartzStartup.c:66 (X11.bin+0x000100039e63)
SUMMARY: ThreadSanitizer: data race WaitFor.c:237 in WaitForSomething
==================
==================
WARNING: ThreadSanitizer: data race (pid=22841)
Write of size 4 at 0x000105bbd864 by main thread (mutexes: write M1945):
#0 mieqEnqueue mieq.c:263 (X11.bin+0x000100448cf4)
#1 DarwinSendDDXEvent darwinEvents.c:642 (X11.bin+0x000100033693)
#2 -[X11Controller set_window_menu:] X11Controller.m:275 (X11.bin+0x0001000222fd)
#3 -[X11Application set_window_menu:] X11Application.m:486 (X11.bin+0x000100018b44)
#4 -[X11Application handleMachMessage:] X11Application.m:177 (X11.bin+0x000100016678)
#5 __NSFireMachPort <null>:69 (Foundation+0x00000009b62b)
#6 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a5f2)
#7 server_main quartzStartup.c:136 (X11.bin+0x000100039ffb)
#8 do_start_x11_server bundle-main.c:436 (X11.bin+0x000100002e65)
#9 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x000100004e49)
#10 mach_startup_server mach_startupServer.c:399 (X11.bin+0x0001000056e4)
#11 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
#12 start <null>:29 (libdyld.dylib+0x000000005254)
Previous read of size 4 at 0x000105bbd864 by thread T7:
#0 Dispatch dispatch.c:434 (X11.bin+0x000100352fc8)
#1 dix_main main.c:287 (X11.bin+0x00010036e874)
#2 server_thread quartzStartup.c:66 (X11.bin+0x000100039e23)
Location is global 'miEventQueue' at 0x000105bbd860 (X11.bin+0x0001005ab864)
Mutex M1945 (0x000105bbdd78) created at:
#0 pthread_mutex_init <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x0000000253c3)
#1 input_lock inputthread.c:103 (X11.bin+0x00010049fd10)
#2 TimerSet WaitFor.c:348 (X11.bin+0x0001004926c2)
#3 RootlessQueueRedisplay rootlessScreen.c:594 (X11.bin+0x000100065d3f)
#4 RootlessInstallColormap rootlessScreen.c:514 (X11.bin+0x000100069eda)
#5 miSpriteInstallColormap misprite.c:562 (X11.bin+0x000100467075)
#6 miCreateDefColormap micmap.c:270 (X11.bin+0x000100440379)
#7 DarwinScreenInit darwin.c:285 (X11.bin+0x00010003036b)
#8 AddScreen dispatch.c:3914 (X11.bin+0x00010036c3f7)
#9 InitOutput darwin.c:671 (X11.bin+0x00010002fd9b)
#10 dix_main main.c:197 (X11.bin+0x00010036e208)
#11 server_thread quartzStartup.c:66 (X11.bin+0x000100039e23)
Thread T7 (tid=4257217, running) created by main thread at:
#0 pthread_create <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x000000024490)
#1 create_thread quartzStartup.c:78 (X11.bin+0x000100039d6d)
#2 QuartzInitServer quartzStartup.c:95 (X11.bin+0x000100039bd6)
#3 X11ApplicationMain X11Application.m:1238 (X11.bin+0x00010001cd94)
#4 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a5f2)
#5 server_main quartzStartup.c:136 (X11.bin+0x000100039ffb)
#6 do_start_x11_server bundle-main.c:436 (X11.bin+0x000100002e65)
#7 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x000100004e49)
#8 mach_startup_server mach_startupServer.c:399 (X11.bin+0x0001000056e4)
#9 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
#10 start <null>:29 (libdyld.dylib+0x000000005254)
SUMMARY: ThreadSanitizer: data race mieq.c:263 in mieqEnqueue
==================
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
CC: Keith Packard <keithp at keithp.com>
---
configure.ac | 2 +-
dix/dispatch.c | 7 +++----
include/dix.h | 6 ++++++
os/WaitFor.c | 2 +-
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index c09b854..922ee0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -812,7 +812,7 @@ APPLEWMPROTO="applewmproto >= 1.4"
LIBXSHMFENCE="xshmfence >= 1.1"
dnl Required modules
-XPROTO="xproto >= 7.0.28"
+XPROTO="xproto >= 7.0.30"
RANDRPROTO="randrproto >= 1.5.0"
RENDERPROTO="renderproto >= 0.11"
XEXTPROTO="xextproto >= 7.2.99.901"
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 26a461b..adcc9cf 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -195,7 +195,7 @@ UpdateCurrentTime(void)
systime.milliseconds = GetTimeInMillis();
if (systime.milliseconds < currentTime.milliseconds)
systime.months++;
- if (*checkForInput[0] != *checkForInput[1])
+ if (InputCheckPending())
ProcessInputEvents();
if (CompareTimeStamps(systime, currentTime) == LATER)
currentTime = systime;
@@ -395,7 +395,6 @@ Dispatch(void)
{
int result;
ClientPtr client;
- HWEventQueuePtr *icheck = checkForInput;
long start_tick;
nextFreeClientID = 1;
@@ -405,7 +404,7 @@ Dispatch(void)
init_client_ready();
while (!dispatchException) {
- if (*icheck[0] != *icheck[1]) {
+ if (InputCheckPending()) {
ProcessInputEvents();
FlushIfCriticalOutputPending();
}
@@ -425,7 +424,7 @@ Dispatch(void)
start_tick = SmartScheduleTime;
while (!isItTimeToYield) {
- if (*icheck[0] != *icheck[1])
+ if (InputCheckPending())
ProcessInputEvents();
FlushIfCriticalOutputPending();
diff --git a/include/dix.h b/include/dix.h
index ae9719a..240018b 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -136,6 +136,12 @@ typedef HWEventQueueType *HWEventQueuePtr;
extern _X_EXPORT HWEventQueuePtr checkForInput[2];
+static inline _X_NOTSAN Bool
+InputCheckPending(void)
+{
+ return (*checkForInput[0] != *checkForInput[1]);
+}
+
typedef struct _TimeStamp {
CARD32 months; /* really ~49.7 days */
CARD32 milliseconds;
diff --git a/os/WaitFor.c b/os/WaitFor.c
index 024df35..7d5aa32 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -234,7 +234,7 @@ WaitForSomething(Bool are_ready)
} else
are_ready = clients_are_ready();
- if (*checkForInput[0] != *checkForInput[1])
+ if (InputCheckPending())
return FALSE;
if (are_ready) {
--
2.10.0 (Apple Git-77)
More information about the xorg-devel
mailing list