diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/libpq/pqcomm.c | 14 | ||||
| -rw-r--r-- | src/backend/port/win32/socket.c | 25 |
2 files changed, 37 insertions, 2 deletions
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index f4e69742524..8f40c93d892 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -30,7 +30,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.202 2010/01/15 09:19:02 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.203 2010/02/16 19:26:02 mha Exp $ * *------------------------------------------------------------------------- */ @@ -837,9 +837,13 @@ pq_getbyte_if_available(unsigned char *c) } /* Temporarily put the socket into non-blocking mode */ +#ifdef WIN32 + pgwin32_noblock = 1; +#else if (!pg_set_noblock(MyProcPort->sock)) ereport(ERROR, (errmsg("couldn't put socket to non-blocking mode: %m"))); +#endif MyProcPort->noblock = true; PG_TRY(); { @@ -851,16 +855,24 @@ pq_getbyte_if_available(unsigned char *c) * The rest of the backend code assumes the socket is in blocking * mode, so treat failure as FATAL. */ +#ifdef WIN32 + pgwin32_noblock = 0; +#else if (!pg_set_block(MyProcPort->sock)) ereport(FATAL, (errmsg("couldn't put socket to blocking mode: %m"))); +#endif MyProcPort->noblock = false; PG_RE_THROW(); } PG_END_TRY(); +#ifdef WIN32 + pgwin32_noblock = 0; +#else if (!pg_set_block(MyProcPort->sock)) ereport(FATAL, (errmsg("couldn't put socket to blocking mode: %m"))); +#endif MyProcPort->noblock = false; return r; diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c index 8076b8caef5..af42576cab5 100644 --- a/src/backend/port/win32/socket.c +++ b/src/backend/port/win32/socket.c @@ -6,13 +6,26 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.23 2010/01/02 16:57:50 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.24 2010/02/16 19:26:02 mha Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" +/* + * Indicate if pgwin32_recv() should operate in non-blocking mode. + * + * Since the socket emulation layer always sets the actual socket to + * non-blocking mode in order to be able to deliver signals, we must + * specify this in a separate flag if we actually need non-blocking + * operation. + * + * This flag changes the behaviour *globally* for all socket operations, + * so it should only be set for very short periods of time. + */ +int pgwin32_noblock = 0; + #undef socket #undef accept #undef connect @@ -310,6 +323,16 @@ pgwin32_recv(SOCKET s, char *buf, int len, int f) return -1; } + if (pgwin32_noblock) + { + /* + * No data received, and we are in "emulated non-blocking mode", so return + * indicating thta we'd block if we were to continue. + */ + errno = EWOULDBLOCK; + return -1; + } + /* No error, zero bytes (win2000+) or error+WSAEWOULDBLOCK (<=nt4) */ for (n = 0; n < 5; n++) |