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

bmomjian · bmomjian · commit 9eada5101227 · 2002-10-14T17:15:11.000Z
clear on that point.
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * 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;
 			return 0;
 		}
-		remains.tv_usec = 0;
+		remains.tv_usec = 0;	/* We don't use subsecond timing */
 		rp = &remains;
 
 		/* calculate the finish time based on start + timeout */
 		finish_time = time((time_t *) NULL) + remains.tv_sec;
 	}
 
-	while (rp == NULL || remains.tv_sec > 0 ||
-		   (remains.tv_sec == 0 && remains.tv_usec > 0))
+	while (rp == NULL || remains.tv_sec > 0)
 	{
 		/*
 		 * 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_usec = 0;
 		}
 	}
 	conn->status = CONNECTION_BAD;
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
@@ -25,7 +25,7 @@
  *
  *
  * 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
-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		output_mask;
 	fd_set		except_mask;
 
 	struct timeval tmp_timeout;
-	struct timeval *ptmp_timeout = NULL;
 
 	if (conn->sock < 0)
 	{
@@ -823,14 +822,13 @@ pqWaitTimed(int forRead, int forWrite, PGconn *conn, const struct timeval * time
 		if (NULL != timeout)
 		{
 			/*
-			 * select may modify timeout argument on some platforms use
-			 * copy
+			 * 	select() may modify timeout argument on some platforms so
+			 *	use copy
 			 */
 			tmp_timeout = *timeout;
-			ptmp_timeout = &tmp_timeout;
 		}
 		if (select(conn->sock + 1, &input_mask, &output_mask,
-				   &except_mask, ptmp_timeout) < 0)
+				   &except_mask, &tmp_timeout) < 0)
 		{
 			if (SOCK_ERRNO == EINTR)
 				goto retry5;
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * 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	pqSendSome(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	pqWriteReady(PGconn *conn);
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.208 2002/10/11 04:41:59 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.209 2002/10/14 17:15:11 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1071,15 +1071,14 @@ connectDBComplete(PGconn *conn)`
`1071`	`1071`	`conn->status = CONNECTION_BAD;`
`1072`	`1072`	`return 0;`
`1073`	`1073`	`}`
`1074`		`- remains.tv_usec = 0;`
	`1074`	`+ remains.tv_usec = 0; /* We don't use subsecond timing */`
`1075`	`1075`	`rp = &remains;`
`1076`	`1076`
`1077`	`1077`	`/* calculate the finish time based on start + timeout */`
`1078`	`1078`	`finish_time = time((time_t *) NULL) + remains.tv_sec;`
`1079`	`1079`	`}`
`1080`	`1080`
`1081`		`- while (rp == NULL \|\| remains.tv_sec > 0 \|\|`
`1082`		`- (remains.tv_sec == 0 && remains.tv_usec > 0))`
	`1081`	`+ while (rp == NULL \|\| remains.tv_sec > 0)`
`1083`	`1082`	`{`
`1084`	`1083`	`/*`
`1085`	`1084`	`* Wait, if necessary. Note that the initial state (just after`
`@@ -1133,7 +1132,6 @@ connectDBComplete(PGconn *conn)`
`1133`	`1132`	`}`
`1134`	`1133`
`1135`	`1134`	`remains.tv_sec = finish_time - current_time;`
`1136`		`- remains.tv_usec = 0;`
`1137`	`1135`	`}`
`1138`	`1136`	`}`
`1139`	`1137`	`conn->status = CONNECTION_BAD;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*`
`26`	`26`	`*`
`27`	`27`	`* IDENTIFICATION`
`28`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.80 2002/10/03 17:09:42 momjian Exp $`
	`28`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.81 2002/10/14 17:15:11 momjian Exp $`
`29`	`29`	`*`
`30`	`30`	`*-------------------------------------------------------------------------`
`31`	`31`	`*/`
`@@ -783,14 +783,13 @@ pqWait(int forRead, int forWrite, PGconn *conn)`
`783`	`783`	`}`
`784`	`784`
`785`	`785`	`int`
`786`		`-pqWaitTimed(int forRead, int forWrite, PGconn conn, const struct timeval timeout)`
	`786`	`+pqWaitTimed(int forRead, int forWrite, PGconn conn, const struct timeval timeout)`
`787`	`787`	`{`
`788`	`788`	`fd_set input_mask;`
`789`	`789`	`fd_set output_mask;`
`790`	`790`	`fd_set except_mask;`
`791`	`791`
`792`	`792`	`struct timeval tmp_timeout;`
`793`		`- struct timeval *ptmp_timeout = NULL;`
`794`	`793`
`795`	`794`	`if (conn->sock < 0)`
`796`	`795`	`{`
`@@ -823,14 +822,13 @@ pqWaitTimed(int forRead, int forWrite, PGconn conn, const struct timeval time`
`823`	`822`	`if (NULL != timeout)`
`824`	`823`	`{`
`825`	`824`	`/*`
`826`		`- * select may modify timeout argument on some platforms use`
`827`		`- * copy`
	`825`	`+ * select() may modify timeout argument on some platforms so`
	`826`	`+ * use copy`
`828`	`827`	`*/`
`829`	`828`	`tmp_timeout = *timeout;`
`830`		`- ptmp_timeout = &tmp_timeout;`
`831`	`829`	`}`
`832`	`830`	`if (select(conn->sock + 1, &input_mask, &output_mask,`
`833`		`- &except_mask, ptmp_timeout) < 0)`
	`831`	`+ &except_mask, &tmp_timeout) < 0)`
`834`	`832`	`{`
`835`	`833`	`if (SOCK_ERRNO == EINTR)`
`836`	`834`	`goto retry5;`