>From cd5a66b55a00ba70613cfbe45be758a64d2112f8 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Thu, 14 Jan 2016 14:24:09 +0100 Subject: [PATCH 2/4] Error out if waiting on socket readiness without a specified socket. --- src/backend/port/unix_latch.c | 7 ++++--- src/backend/port/win32_latch.c | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/backend/port/unix_latch.c b/src/backend/port/unix_latch.c index f52704b..ad621ea 100644 --- a/src/backend/port/unix_latch.c +++ b/src/backend/port/unix_latch.c @@ -242,9 +242,10 @@ WaitLatchOrSocket(volatile Latch *latch, int wakeEvents, pgsocket sock, int hifd; #endif - /* Ignore WL_SOCKET_* events if no valid socket is given */ - if (sock == PGINVALID_SOCKET) - wakeEvents &= ~(WL_SOCKET_READABLE | WL_SOCKET_WRITEABLE); + /* waiting for socket readiness without a socket indicates a bug */ + if (sock == PGINVALID_SOCKET && + (wakeEvents & (WL_SOCKET_READABLE | WL_SOCKET_WRITEABLE)) != 0) + elog(ERROR, "cannot wait on socket events without a socket"); Assert(wakeEvents != 0); /* must have at least one wake event */ diff --git a/src/backend/port/win32_latch.c b/src/backend/port/win32_latch.c index 80adc13..e101acf 100644 --- a/src/backend/port/win32_latch.c +++ b/src/backend/port/win32_latch.c @@ -119,8 +119,10 @@ WaitLatchOrSocket(volatile Latch *latch, int wakeEvents, pgsocket sock, Assert(wakeEvents != 0); /* must have at least one wake event */ - if ((wakeEvents & WL_LATCH_SET) && latch->owner_pid != MyProcPid) - elog(ERROR, "cannot wait on a latch owned by another process"); + /* waiting for socket readiness without a socket indicates a bug */ + if (sock == PGINVALID_SOCKET && + (wakeEvents & (WL_SOCKET_READABLE | WL_SOCKET_WRITEABLE)) != 0) + elog(ERROR, "cannot wait on socket events without a socket"); /* * Initialize timeout if requested. We must record the current time so -- 2.5.0.400.gff86faf.dirty