database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-06 00:02:13 +03:00
Code Activity

Create typedef pgsocket for storing socket descriptors.

Browse Source 
This silences some warnings on Win64. Not using the proper SOCKET datatype
was actually wrong on Win32 as well, but didn't cause any warnings there.

Also create define PGINVALID_SOCKET to indicate an invalid/non-existing
socket, instead of using a hardcoded -1 value.
This commit is contained in:
Magnus Hagander
2010-01-10 14:16:08 +00:00
parent 84b6d5f359
commit 87091cb1f1
9 changed files with 61 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@
*
* Copyright (c) 2001-2010, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.196 2010/01/02 16:57:50 momjian Exp $
* $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.197 2010/01/10 14:16:07 mha Exp $
* ----------
*/
#include "postgres.h"
@@ -130,7 +130,7 @@ PgStat_MsgBgWriter BgWriterStats;
* Local data
* ----------
*/
NON_EXEC_STATIC int pgStatSock = -1;
NON_EXEC_STATIC pgsocket pgStatSock = PGINVALID_SOCKET;
static struct sockaddr_storage pgStatAddr;
@@ -369,7 +369,7 @@ pgstat_init(void)
(errcode_for_socket_access(),
errmsg("could not bind socket for statistics collector: %m")));
closesocket(pgStatSock);
pgStatSock = -1;
pgStatSock = PGINVALID_SOCKET;
continue;
}
@@ -380,7 +380,7 @@ pgstat_init(void)
(errcode_for_socket_access(),
errmsg("could not get address of socket for statistics collector: %m")));
closesocket(pgStatSock);
pgStatSock = -1;
pgStatSock = PGINVALID_SOCKET;
continue;
}
@@ -396,7 +396,7 @@ pgstat_init(void)
(errcode_for_socket_access(),
errmsg("could not connect socket for statistics collector: %m")));
closesocket(pgStatSock);
pgStatSock = -1;
pgStatSock = PGINVALID_SOCKET;
continue;
}
@@ -417,7 +417,7 @@ retry1:
(errcode_for_socket_access(),
errmsg("could not send test message on socket for statistics collector: %m")));
closesocket(pgStatSock);
pgStatSock = -1;
pgStatSock = PGINVALID_SOCKET;
continue;
}
@@ -443,7 +443,7 @@ retry1:
(errcode_for_socket_access(),
errmsg("select() failed in statistics collector: %m")));
closesocket(pgStatSock);
pgStatSock = -1;
pgStatSock = PGINVALID_SOCKET;
continue;
}
if (sel_res == 0 || !FD_ISSET(pgStatSock, &rset))
@@ -458,7 +458,7 @@ retry1:
(errcode(ERRCODE_CONNECTION_FAILURE),
errmsg("test message did not get through on socket for statistics collector")));
closesocket(pgStatSock);
pgStatSock = -1;
pgStatSock = PGINVALID_SOCKET;
continue;
}
@@ -473,7 +473,7 @@ retry2:
(errcode_for_socket_access(),
errmsg("could not receive test message on socket for statistics collector: %m")));
closesocket(pgStatSock);
pgStatSock = -1;
pgStatSock = PGINVALID_SOCKET;
continue;
}
@@ -483,7 +483,7 @@ retry2:
(errcode(ERRCODE_INTERNAL_ERROR),
errmsg("incorrect test message transmission on socket for statistics collector")));
closesocket(pgStatSock);
pgStatSock = -1;
pgStatSock = PGINVALID_SOCKET;
continue;
}
@@ -521,7 +521,7 @@ startup_failed:
if (pgStatSock >= 0)
closesocket(pgStatSock);
pgStatSock = -1;
pgStatSock = PGINVALID_SOCKET;
/*
* Adjust GUC variables to suppress useless activity, and for debugging