mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

libpq connection_timeout doesn't do subsecond timing, so make the code

Browse Source 
clear on that point.
This commit is contained in:
Bruce Momjian 2002-10-14 17:15:11 +00:00
parent 8f2a289d78
commit 9eada51012
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/interfaces/libpq/fe-connect.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.208 2002/10/11 04:41:59 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.209 2002/10/14 17:15:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1071,15 +1071,14 @@ connectDBComplete(PGconn *conn)
conn->status = CONNECTION_BAD; conn->status = CONNECTION_BAD;
return 0; return 0;
} }
remains.tv_usec = 0; remains.tv_usec = 0; /* We don't use subsecond timing */
rp = &remains; rp = &remains;
/* calculate the finish time based on start + timeout */ /* calculate the finish time based on start + timeout */
finish_time = time((time_t *) NULL) + remains.tv_sec; finish_time = time((time_t *) NULL) + remains.tv_sec;
} }
while (rp == NULL || remains.tv_sec > 0 || while (rp == NULL || remains.tv_sec > 0)
(remains.tv_sec == 0 && remains.tv_usec > 0))
{ {
/* /*
* Wait, if necessary. Note that the initial state (just after * Wait, if necessary. Note that the initial state (just after
@ -1133,7 +1132,6 @@ connectDBComplete(PGconn *conn)
} }
remains.tv_sec = finish_time - current_time; remains.tv_sec = finish_time - current_time;
remains.tv_usec = 0;
} }
} }
conn->status = CONNECTION_BAD; conn->status = CONNECTION_BAD;

12
src/interfaces/libpq/fe-misc.c
View File

@ -25,7 +25,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.80 2002/10/03 17:09:42 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.81 2002/10/14 17:15:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -783,14 +783,13 @@ pqWait(int forRead, int forWrite, PGconn *conn)
} }
int int
pqWaitTimed(int forRead, int forWrite, PGconn *conn, const struct timeval * timeout) pqWaitTimed(int forRead, int forWrite, PGconn *conn, const struct timeval *timeout)
{ {
fd_set input_mask; fd_set input_mask;
fd_set output_mask; fd_set output_mask;
fd_set except_mask; fd_set except_mask;
struct timeval tmp_timeout; struct timeval tmp_timeout;
struct timeval *ptmp_timeout = NULL;
if (conn->sock < 0) if (conn->sock < 0)
{ {
@ -823,14 +822,13 @@ retry5:
if (NULL != timeout) if (NULL != timeout)
{ {
/* /*
* select may modify timeout argument on some platforms use * select() may modify timeout argument on some platforms so
* copy * use copy
*/ */
tmp_timeout = *timeout; tmp_timeout = *timeout;
ptmp_timeout = &tmp_timeout;
} }
if (select(conn->sock + 1, &input_mask, &output_mask, if (select(conn->sock + 1, &input_mask, &output_mask,
&except_mask, ptmp_timeout) < 0) &except_mask, &tmp_timeout) < 0)
{ {
if (SOCK_ERRNO == EINTR) if (SOCK_ERRNO == EINTR)
goto retry5; goto retry5;

4
src/interfaces/libpq/libpq-int.h
View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: libpq-int.h,v 1.58 2002/10/03 17:09:42 momjian Exp $ * $Id: libpq-int.h,v 1.59 2002/10/14 17:15:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -340,7 +340,7 @@ extern int pqReadData(PGconn *conn);
extern int pqFlush(PGconn *conn); extern int pqFlush(PGconn *conn);
extern int pqSendSome(PGconn *conn); extern int pqSendSome(PGconn *conn);
extern int pqWait(int forRead, int forWrite, PGconn *conn); extern int pqWait(int forRead, int forWrite, PGconn *conn);
extern int pqWaitTimed(int forRead, int forWrite, PGconn *conn, const struct timeval * timeout); extern int pqWaitTimed(int forRead, int forWrite, PGconn *conn, const struct timeval *timeout);
extern int pqReadReady(PGconn *conn); extern int pqReadReady(PGconn *conn);
extern int pqWriteReady(PGconn *conn); extern int pqWriteReady(PGconn *conn);