rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-30 10:01:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check for EOF on pipe differs under win32, as it is based on a socket

Browse Source 
implementation.

Claudio Natoli
This commit is contained in:
Bruce Momjian 2004-03-15 16:21:37 +00:00
parent f744c0f760
commit bda6e04ba0
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/postmaster/pgstat.c
View File

@ -13,7 +13,7 @@
* *
* Copyright (c) 2001-2003, PostgreSQL Global Development Group * Copyright (c) 2001-2003, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.60 2004/03/10 21:12:46 momjian Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.61 2004/03/15 16:21:37 momjian Exp $
* ---------- * ----------
*/ */
#include "postgres.h" #include "postgres.h"
@ -1642,6 +1642,7 @@ pgstat_mainChild(PGSTAT_FORK_ARGS)
*/ */
int nread = 0; int nread = 0;
int targetlen = sizeof(PgStat_MsgHdr); /* initial */ int targetlen = sizeof(PgStat_MsgHdr); /* initial */
bool pipeEOF = false;
while (nread < targetlen) while (nread < targetlen)
{ {
@ -1652,13 +1653,23 @@ pgstat_mainChild(PGSTAT_FORK_ARGS)
{ {
if (errno == EINTR) if (errno == EINTR)
continue; continue;
#ifdef WIN32
if (WSAGetLastError() == WSAECONNRESET) /* EOF on the pipe! (win32 socket based implementation) */
{
pipeEOF = true;
break;
}
#endif
ereport(LOG, ereport(LOG,
(errcode_for_socket_access(), (errcode_for_socket_access(),
errmsg("could not read from statistics collector pipe: %m"))); errmsg("could not read from statistics collector pipe: %m")));
exit(1); exit(1);
} }
if (len == 0) /* EOF on the pipe! */ if (len == 0) /* EOF on the pipe! */
{
pipeEOF = true;
break; break;
}
nread += len; nread += len;
if (nread == sizeof(PgStat_MsgHdr)) if (nread == sizeof(PgStat_MsgHdr))
{ {
@ -1683,7 +1694,7 @@ pgstat_mainChild(PGSTAT_FORK_ARGS)
* EOF on the pipe implies that the buffer process exited. * EOF on the pipe implies that the buffer process exited.
* Fall out of outer loop. * Fall out of outer loop.
*/ */
if (len == 0) if (pipeEOF)
break; break;
/* /*