Lock X updates for all systems and lock around X cleanup at exit (#391)

nbriggs · web-flow · commit e957e331c487 · 2021-08-26T16:29:10.000-07:00
* Lock X updates for all systems and lock around X cleanup at exit

All systems which could generate I/O interrupts on the X file descriptor need
to have locking enabled, or there is a high probability that the X library
will deadlock. This requirement may be removed in the future with restructuring
of the way that the interrupt driven I/O is handled.

Ensure that the appropriate XLOCK/XUNLOCK is done around the X window
closing code.

* Also lock X updates when building with CMake.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,7 +30,7 @@ OPTION(MAIKO_DISPLAY_X11 "Use X11 for display." ON)
 IF(MAIKO_DISPLAY_X11)
   FIND_PACKAGE(X11 REQUIRED)
   SET(MAIKO_DISPLAY_X11_DEFINITIONS
-    "-DXWINDOW"
+    "-DXWINDOW -DLOCK_X_UPDATES"
   )
   SET(MAIKO_DISPLAY_X11_LIBRARIES X11::X11)
   SET(MAIKO_DISPLAY_X11_SRCS
diff --git a/bin/makefile-cygwin.x86_64-x b/bin/makefile-cygwin.x86_64-x
@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -DXWINDOW
+XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
diff --git a/bin/makefile-darwin.386-x b/bin/makefile-darwin.386-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -I/opt/X11/include -DXWINDOW
+XFLAGS = -I/opt/X11/include -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g
diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -I/opt/X11/include -DXWINDOW
+XFLAGS = -I/opt/X11/include -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2
diff --git a/bin/makefile-darwin.ppc-x b/bin/makefile-darwin.ppc-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -I/usr/X11/include -DXWINDOW
+XFLAGS = -I/usr/X11/include -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g
diff --git a/bin/makefile-darwin.x86_64-x b/bin/makefile-darwin.x86_64-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -I/opt/X11/include -DXWINDOW
+XFLAGS = -I/opt/X11/include -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O1 -g
diff --git a/bin/makefile-init-darwin.386 b/bin/makefile-init-darwin.386
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -I/opt/X11/include -DXWINDOW
+XFLAGS = -I/opt/X11/include -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it
 OPTFLAGS =  -O0 -g
diff --git a/bin/makefile-init-darwin.aarch64 b/bin/makefile-init-darwin.aarch64
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
         $(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -I/opt/X11/include -DXWINDOW
+XFLAGS = -I/opt/X11/include -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O0 -g3
diff --git a/bin/makefile-init-darwin.x86_64 b/bin/makefile-init-darwin.x86_64
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -I/opt/X11/include -DXWINDOW
+XFLAGS = -I/opt/X11/include -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O0 -g
diff --git a/bin/makefile-init-linux.x86_64 b/bin/makefile-init-linux.x86_64
@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -DXWINDOW
+XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it
 OPTFLAGS =  -O0 -g
diff --git a/bin/makefile-init-sunos5.sparc b/bin/makefile-init-sunos5.sparc
@@ -30,7 +30,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o
 
-XFLAGS = -DXWINDOW
+XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -g for MAKEINIT, as it needs debugging often.
 OPTFLAGS = -g3 -O0
diff --git a/bin/makefile-linux.386-x b/bin/makefile-linux.386-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -DXWINDOW
+XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
diff --git a/bin/makefile-linux.aarch64-x b/bin/makefile-linux.aarch64-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o
 
-XFLAGS = -DXWINDOW
+XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
diff --git a/bin/makefile-linux.armv7l-x b/bin/makefile-linux.armv7l-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o
 
-XFLAGS = -DXWINDOW
+XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
diff --git a/bin/makefile-linux.x86_64-x b/bin/makefile-linux.x86_64-x
@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -DXWINDOW
+XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
diff --git a/bin/makefile-openbsd.x86_64-x b/bin/makefile-openbsd.x86_64-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -I/usr/X11R6/include -DXWINDOW
+XFLAGS = -I/usr/X11R6/include -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
diff --git a/bin/makefile-sunos5.386-x b/bin/makefile-sunos5.386-x
@@ -22,7 +22,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o
 
-XFLAGS = -DXWINDOW
+XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g
diff --git a/bin/makefile-sunos5.i386-x b/bin/makefile-sunos5.i386-x
@@ -22,7 +22,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o
 
-XFLAGS = -DXWINDOW
+XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
diff --git a/bin/makefile-sunos5.sparc-x b/bin/makefile-sunos5.sparc-x
@@ -29,7 +29,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o
 
-XFLAGS = -DXWINDOW
+XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
diff --git a/bin/makefile-sunos5.x86_64-x b/bin/makefile-sunos5.x86_64-x
@@ -22,7 +22,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o
 
-XFLAGS = -DXWINDOW
+XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g
diff --git a/src/xinit.c b/src/xinit.c
@@ -108,13 +108,15 @@ void lisp_Xexit(DspInterface dsp)
 {
   assert(Lisp_Xinitialized);
 
-#if defined(OS5) && defined(I_SETSIG)
+#if defined(I_SETSIG)
   ioctl(ConnectionNumber(dsp->display_id), I_SETSIG, 0); /* so no interrupts happen during */
 #endif
 
+  XLOCK;
   XDestroySubwindows(dsp->display_id, dsp->LispWindow);
   XDestroyWindow(dsp->display_id, dsp->LispWindow);
   XCloseDisplay(dsp->display_id);
+  XUNLOCK(dsp);
 
   Lisp_Xinitialized = false;
 } /* end lisp_Xexit */

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ OPTION(MAIKO_DISPLAY_X11 "Use X11 for display." ON)`
`30`	`30`	`IF(MAIKO_DISPLAY_X11)`
`31`	`31`	`FIND_PACKAGE(X11 REQUIRED)`
`32`	`32`	`SET(MAIKO_DISPLAY_X11_DEFINITIONS`
`33`		`- "-DXWINDOW"`
	`33`	`+ "-DXWINDOW -DLOCK_X_UPDATES"`
`34`	`34`	`)`
`35`	`35`	`SET(MAIKO_DISPLAY_X11_LIBRARIES X11::X11)`
`36`	`36`	`SET(MAIKO_DISPLAY_X11_SRCS`