Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitaae5403

Browse files
committed
On win32, retry reading when WSARecv returns WSAEWOULDBLOCK. There seem
to be cases when at least Windows 2000 can do this even though selectjust indicated that the socket is readable.Per report and analysis from Cyril VELTER.
1 parent0e92f98 commitaae5403

File tree

1 file changed

+30
-10
lines changed

1 file changed

+30
-10
lines changed

‎src/backend/port/win32/socket.c

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.17 2007/01/26 20:06:52 tgl Exp $
9+
* $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.18 2007/06/04 13:39:28 mha Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -291,6 +291,7 @@ pgwin32_recv(SOCKET s, char *buf, int len, int f)
291291
intr;
292292
DWORDb;
293293
DWORDflags=f;
294+
intn;
294295

295296
if (pgwin32_poll_signals())
296297
return-1;
@@ -312,17 +313,36 @@ pgwin32_recv(SOCKET s, char *buf, int len, int f)
312313

313314
/* No error, zero bytes (win2000+) or error+WSAEWOULDBLOCK (<=nt4) */
314315

315-
if (pgwin32_waitforsinglesocket(s,FD_READ |FD_CLOSE |FD_ACCEPT,
316-
INFINITE)==0)
317-
return-1;
318-
319-
r=WSARecv(s,&wbuf,1,&b,&flags,NULL,NULL);
320-
if (r==SOCKET_ERROR)
316+
for (n=0;n<5;n++)
321317
{
322-
TranslateSocketError();
323-
return-1;
318+
if (pgwin32_waitforsinglesocket(s,FD_READ |FD_CLOSE |FD_ACCEPT,
319+
INFINITE)==0)
320+
return-1;/* errno already set */
321+
322+
r=WSARecv(s,&wbuf,1,&b,&flags,NULL,NULL);
323+
if (r==SOCKET_ERROR)
324+
{
325+
if (WSAGetLastError()==WSAEWOULDBLOCK)
326+
{
327+
/*
328+
* There seem to be cases on win2k (at least) where WSARecv
329+
* can return WSAEWOULDBLOCK even when pgwin32_waitforsinglesocket
330+
* claims the socket is readable. In this case, just sleep for a
331+
* moment and try again. We try up to 5 times - if it fails more than
332+
* that it's not likely to ever come back.
333+
*/
334+
pg_usleep(10000);
335+
continue;
336+
}
337+
TranslateSocketError();
338+
return-1;
339+
}
340+
returnb;
324341
}
325-
returnb;
342+
ereport(NOTICE,
343+
(errmsg_internal("Failed to read from ready socket (after retries)")));
344+
errno=EWOULDBLOCK;
345+
return-1;
326346
}
327347

328348
int

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp