Merge 8996e96 into 11a0792

Author: dtlewis290

platforms/unix/vm-display-X11/sqUnixX11.c

@@ -6782,31 +6782,37 @@ int openXDisplay(void)
   return 0;
 }
 
-int forgetXDisplay(void)
-{
-  /* Initialise variables related to the X connection, and
-     make the existing connection to the X Display invalid
-     for any further access from this Squeak image.  Any socket
-     connection to the X server is closed, but the server is
-     not told to terminate any windows or X sessions.  This
-     is used to support fork() for an existing Squeak image,
-     where the child is expected to continue as a headless
-     image, and the parent continues its normal execution. */
 
+static void clearXDisplayVariables()
+{
   displayName= 0;       /* name of display, or 0 for $DISPLAY   */
   stDisplay= null;      /* Squeak display                       */
-  if (isConnectedToXServer)
-  {
-    if (stXfd >= 0)
-      aioDisable(stXfd);
-    close(stXfd);
-  }
   stXfd= -1;		/* X connection file descriptor         */
   stParent= null;
   stWindow= null;       /* Squeak window                        */
   inputContext= 0;
   inputFont= NULL;
   isConnectedToXServer= 0;
+}
+
+
+/* Initialise variables related to the X connection, and make the existing
+ * connection to the X Display invalid for any further access from this
+ * Squeak image.  Any socket connection to the X server is closed, but the
+ * server is not told to terminate any windows or X sessions.  This is
+ * used to support fork() for an existing Squeak image, where the child
+ * is expected to continue as a headless image, and the parent continues
+ * its normal execution.
+ */
+int forgetXDisplay(void)
+{
+  if (isConnectedToXServer)
+    {
+      if (stXfd >= 0)
+        aioDisable(stXfd);
+      close(stXfd);
+      clearXDisplayVariables();
+    }
   return 0;
 }
 
@@ -6828,9 +6834,11 @@ int disconnectXDisplay(void)
 	}
       if (inputFont)
 	XFreeFontSet(stDisplay, inputFont);
+      if (stXfd >= 0)
+        aioDisable(stXfd);
       XCloseDisplay(stDisplay);
+      clearXDisplayVariables();
     }
-  forgetXDisplay();
   return 0;
 }
 

platforms/unix/vm/aio.c

@@ -113,7 +113,7 @@ long	aioDebugLogging = 0;
 #endif
 
 #if HAVE_CONFIG_H && HAVE_EPOLL
-static int epollFd;
+static int epollFd= -1;
 static struct epoll_event** epollEventsByFileDescriptor;
 static size_t epollEventsByFileDescriptorSize;
 
@@ -230,20 +230,31 @@ growEpollEventsByFileDescriptorTo(size_t newSize) {
 	memset(epollEventsByFileDescriptor + epollEventsByFileDescriptorSize, 0, (newSize - epollEventsByFileDescriptorSize) * sizeof(*epollEventsByFileDescriptor));
 	epollEventsByFileDescriptorSize = newSize;
 }
-#endif
 
-void
-aioInit(void)
+static void
+epollInit(void)
 {
-	extern void forceInterruptCheck(int);	/* not really, but hey */
-#if HAVE_CONFIG_H && HAVE_EPOLL
+	if (epollFd >= 0)
+		close(epollFd);
 	epollFd = epoll_create1(EPOLL_CLOEXEC);
 	if (epollFd == -1) {
 		perror("epoll_create1 failed");
 		exit(1);
 	}
 	epollEventsByFileDescriptorSize = 0;
 	epollEventsByFileDescriptor = NULL;
+}
+#endif
+
+
+void
+aioInit(void)
+{
+	extern void forceInterruptCheck(int);	/* not really, but hey */
+#if HAVE_CONFIG_H && HAVE_EPOLL
+	epollInit();
+	if (pthread_atfork(NULL, NULL, epollInit))
+		perror("pthread_atfork");
 #else
 	FD_ZERO(&fdMask);
 	FD_ZERO(&rdMask);