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

* 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.
2026-01-25 19:46:21 +00:00 · 2021-08-26 16:29:10 -07:00
parent 934a86fbb5
commit e957e331c4
21 changed files with 23 additions and 21 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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