From 215cbc90f8db3fc8a70af5572b156f49216c2f70 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Tue, 16 Feb 2010 19:26:02 +0000 Subject: Add emulation of non-blocking sockets to the win32 socket/signal layer, and use this in pq_getbyte_if_available. It's only a limited implementation which swithes the whole emulation layer no non-blocking mode, but that's enough as long as non-blocking is only used during a short period of time, and only one socket is accessed during this time. --- src/backend/libpq/pqcomm.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/backend/libpq/pqcomm.c') diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index f4e6974252..8f40c93d89 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; -- cgit v1.2.1