Force pgwin32_recv into nonblock mode when called from pgstat.c.

tglsfdc · tglsfdc · commit f1ca51549e9e · 2012-05-14T10:57:07.000-04:00
This should get rid of the usage of pgwin32_waitforsinglesocket entirely,
and perhaps thereby remove the race condition that's evidently still
present on some versions of Windows.  The previous arrangement was a bit
unsafe anyway, since waiting at the recv() would not allow pgstat to notice
postmaster death.
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
@@ -3117,9 +3117,21 @@ PgstatCollectorMain(int argc, char *argv[])
 			/*
 			 * Try to receive and process a message.  This will not block,
 			 * since the socket is set to non-blocking mode.
+			 *
+			 * XXX On Windows, we have to force pgwin32_recv to cooperate.
+			 * This is extremely broken and should be fixed someday.
 			 */
+#ifdef WIN32
+			pgwin32_noblock = 1;
+#endif
+
 			len = recv(pgStatSock, (char *) &msg,
 					   sizeof(PgStat_Msg), 0);
+
+#ifdef WIN32
+			pgwin32_noblock = 0;
+#endif
+
 			if (len < 0)
 			{
 				if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR)
